diff --git a/CMakeLists.txt b/CMakeLists.txt
index 29e41047a1..4e8b26e254 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,6 +5,8 @@ cmake_minimum_required(VERSION 2.6)
 
 option(ANDROID "Enables a build for Android" OFF)
 option(USE_EGL "Enables EGL OpenGL Interface" OFF)
+option(USE_X11 "Enables X11 Support" ON)
+option(USE_WAYLAND "Enables Wayland Support" OFF)
 option(USE_GLES "Enables GLES And EGL, disables OGL" OFF)
 option(DISABLE_WX "Disable wxWidgets (use CLI interface)" OFF)
 
@@ -114,6 +116,8 @@ if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "^arm")
 	add_definitions(-marm -march=armv7-a)
 	add_definitions(-D_M_ARM=1)
 	add_definitions(-D_M_GENERIC=1)
+# Set generic options so you don't have to pass anything to cmake to build ARM
+	set(USE_GLES 1)
 endif()
 
 # Set these next two lines to test generic
@@ -168,8 +172,8 @@ if(APPLE)
 	set(ENV{PATH} /usr/bin:/bin:/usr/sbin:/sbin)
 
 	# Some of our code contains Objective C constructs.
-	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -x objective-c")
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -x objective-c++")
+	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -x objective-c -stdlib=libc++")
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -x objective-c++ -stdlib=libc++")
 	# Avoid mistaking an object file for a source file on the link command line.
 	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -x none")
 
@@ -180,10 +184,10 @@ if(APPLE)
 	# This is inserted into the Info.plist as well.
 	# Note that the SDK determines the maximum version of which optional
 	# features can be used, not the minimum required version to run.
-	set(OSX_MIN_VERSION "10.5.4")
+	set(OSX_MIN_VERSION "10.7")
 	set(TARGET_FLAGS "${TARGET_FLAGS} -mmacosx-version-min=${OSX_MIN_VERSION}")
-	set(SYSROOT_LEGACY_PATH "/Developer/SDKs/MacOSX10.6.sdk")
-	set(SYSROOT_PATH "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.6.sdk")
+	set(SYSROOT_LEGACY_PATH "/Developer/SDKs/MacOSX10.7.sdk")
+	set(SYSROOT_PATH "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk")
 	if(EXISTS "${SYSROOT_PATH}/")
         set(TARGET_SYSROOT ${SYSROOT_PATH})
 	elseif(EXISTS "${SYSROOT_LEGACY_PATH}/")
@@ -197,8 +201,8 @@ if(APPLE)
 	# This avoids a warning when linking with QuickTime.
 	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-no_arch_warnings")
 	# Specify target CPUs.
-	set(TARGET_FLAGS "${TARGET_FLAGS} -Xarch_x86_64 -mssse3")
-	set(TARGET_FLAGS "${TARGET_FLAGS} -Xarch_x86_64 -march=core2")
+	set(TARGET_FLAGS "${TARGET_FLAGS} -mssse3")
+	set(TARGET_FLAGS "${TARGET_FLAGS} -march=core2")
 	# Target flags apply to both C and C++ compilation.
 	# CMake passes these to the compiler on the link command line as well.
 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${TARGET_FLAGS}")
@@ -247,9 +251,9 @@ if(CMAKE_BUILD_TYPE STREQUAL Debug)
 	set(wxWidgets_USE_DEBUG ON CACHE BOOL "Use wxWidgets Debugging")
 endif(CMAKE_BUILD_TYPE STREQUAL Debug)
 
-if(CMAKE_BUILD_TYPE STREQUAL Release)
+if(CMAKE_BUILD_TYPE STREQUAL Release AND NOT APPLE)
 	add_definitions(-fomit-frame-pointer)
-endif(CMAKE_BUILD_TYPE STREQUAL Release)
+endif()
 
 if(FASTLOG)
 	add_definitions(-DDEBUGFAST)
@@ -263,16 +267,28 @@ if(USE_GLES)
 	add_definitions(-DUSE_EGL=1)
 	set(USE_EGL True)
 endif()
+# For now Wayland and EGL are tied to each other.
+# The alternative would be an shm path
+if(USE_WAYLAND)
+	add_definitions(-DUSE_EGL)
+	set(USE_EGL 1)
+endif()
 
 if(USE_EGL)
 	message("EGL OpenGL interface enabled")
 	add_definitions(-DUSE_EGL=1)
+else()
+# Using GLX
+	set(USE_X11 1)
+	set(USE_WAYLAND 0)
 endif()
 add_definitions(-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE)
 
 if(ANDROID)
 	message("Building for Android")
 	add_definitions(-DANDROID)
+	set(USE_X11 0)
+	set(USE_WAYLAND 0)
 endif()
 ########################################
 # Dependency checking
@@ -348,29 +364,53 @@ if(NOT ANDROID)
 		message("OpenAL NOT found, disabling OpenAL sound backend")
 	endif(OPENAL_FOUND)
 
+	if(UNIX AND NOT APPLE)
+# Note: The convention is to check USE_X11 or USE_WAYLAND where needed.
+# This is where we detect platforms and set the variables accordingly.
+		pkg_check_modules(WAYLAND wayland-egl wayland-client wayland-cursor)
+		if(USE_WAYLAND AND WAYLAND_FOUND)
+			pkg_check_modules(XKBCOMMON xkbcommon)
+			if(XKBCOMMON_FOUND)
+				set(USE_WAYLAND 1)
+				add_definitions(-DHAVE_WAYLAND)
+				include_directories(${WAYLAND_INCLUDE_DIR})
+				message("Wayland support enabled")
+			endif(XKBCOMMON_FOUND)
+		else()
+			set(USE_WAYLAND 0)
+			message("Wayland support disabled")
+			add_definitions(-DHAVE_WAYLAND=0)
+		endif(USE_WAYLAND AND WAYLAND_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(X11_FOUND)
+		if(USE_X11 AND X11_FOUND)
+			set(USE_X11 1)
 			add_definitions(-DHAVE_X11=1)
 			include_directories(${X11_INCLUDE_DIR})
-			message("X11 found")
+			message("X11 support enabled")
 		else()
-			message(FATAL_ERROR "X11 is required but not found")
-		endif(X11_FOUND)
-	else()
-		add_definitions(-DHAVE_X11=0)
+			set(USE_X11 0)
+			SET(X11_FOUND "")
+			message("X11 support disabled")
+			add_definitions(-DHAVE_X11=0)
+		endif(USE_X11 AND X11_FOUND)
+	
+		if (NOT USE_WAYLAND AND NOT USE_X11)
+			message(FATAL_ERROR "\n"
+			"No suitable display platform found\n"
+			"Requires wayland or x11 to run")
+		endif()
 	endif()
 
-	if(X11_FOUND)
+	if(USE_X11)
 		check_lib(XRANDR Xrandr)
+		if(XRANDR_FOUND)
+			add_definitions(-DHAVE_XRANDR=1)
+		else()
+			add_definitions(-DHAVE_XRANDR=0)
+		endif(XRANDR_FOUND)
 	endif()
-	if(XRANDR_FOUND)
-		add_definitions(-DHAVE_XRANDR=1)
-	else()
-		add_definitions(-DHAVE_XRANDR=0)
-	endif(XRANDR_FOUND)
-
 	if(ENCODE_FRAMEDUMPS)
 		check_libav()
 	endif()
@@ -442,6 +482,13 @@ else()
 	set(LZO lzo2)
 endif()
 
+if(ANDROID)
+	message("Using static libpng from Externals")
+	add_subdirectory(Externals/libpng)
+	include_directories(Externals/libpng)
+	set(PNG libpng)
+endif()
+
 if(OPENAL_FOUND)
 	if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
 		check_lib(SOUNDTOUCH SoundTouch soundtouch/soundtouch.h QUIET)
diff --git a/Data/User/GameConfig/G2BE5G.ini b/Data/User/GameConfig/G2BE5G.ini
index 53f2ebdc82..6c7f2952e2 100644
--- a/Data/User/GameConfig/G2BE5G.ini
+++ b/Data/User/GameConfig/G2BE5G.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.
+EmulationIssues = 
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
diff --git a/Data/User/GameConfig/G2BP7D.ini b/Data/User/GameConfig/G2BP7D.ini
index 27dca0e7c1..c1959c3d87 100644
--- a/Data/User/GameConfig/G2BP7D.ini
+++ b/Data/User/GameConfig/G2BP7D.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.
+EmulationIssues = 
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
diff --git a/Data/User/GameConfig/G3FE69.ini b/Data/User/GameConfig/G3FE69.ini
index 2f628b7bab..6e902ad0fa 100644
--- a/Data/User/GameConfig/G3FE69.ini
+++ b/Data/User/GameConfig/G3FE69.ini
@@ -15,7 +15,6 @@ PH_ZFar =
 [Gecko]
 [Core]
 MMU = 1
-VBeam = 1
 BlockMerging = 1
 [Video_Settings]

 SafeTextureCacheColorSamples = 0
diff --git a/Data/User/GameConfig/G3FF69.ini b/Data/User/GameConfig/G3FF69.ini
index 7367649d4b..37af95e657 100644
--- a/Data/User/GameConfig/G3FF69.ini
+++ b/Data/User/GameConfig/G3FF69.ini
@@ -15,7 +15,6 @@ PH_ZFar =
 [Gecko]
 [Core]
 MMU = 1
-VBeam = 1
 BlockMerging = 1
 [Video_Settings]

 SafeTextureCacheColorSamples = 0
diff --git a/Data/User/GameConfig/G3FP69.ini b/Data/User/GameConfig/G3FP69.ini
index 0272d70fde..cd74b017bf 100644
--- a/Data/User/GameConfig/G3FP69.ini
+++ b/Data/User/GameConfig/G3FP69.ini
@@ -15,7 +15,6 @@ PH_ZFar =
 [Gecko]
 [Core]
 MMU = 1
-VBeam = 1
 BlockMerging = 1
 [Video_Settings]

 SafeTextureCacheColorSamples = 0
diff --git a/Data/User/GameConfig/G3RD52.ini b/Data/User/GameConfig/G3RD52.ini
index e939d6e28a..826ce9cf01 100644
--- a/Data/User/GameConfig/G3RD52.ini
+++ b/Data/User/GameConfig/G3RD52.ini
@@ -3,7 +3,7 @@
 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.
+EmulationIssues = 
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
diff --git a/Data/User/GameConfig/G3RE52.ini b/Data/User/GameConfig/G3RE52.ini
index 15a742f636..9c8fe2f404 100644
--- a/Data/User/GameConfig/G3RE52.ini
+++ b/Data/User/GameConfig/G3RE52.ini
@@ -3,7 +3,7 @@
 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.
+EmulationIssues = 
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
diff --git a/Data/User/GameConfig/G3RF52.ini b/Data/User/GameConfig/G3RF52.ini
index cde2d9a8ca..f4309889ee 100644
--- a/Data/User/GameConfig/G3RF52.ini
+++ b/Data/User/GameConfig/G3RF52.ini
@@ -3,7 +3,7 @@
 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.
+EmulationIssues = 
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
diff --git a/Data/User/GameConfig/G3RP52.ini b/Data/User/GameConfig/G3RP52.ini
index bb42289bd9..da409f4bb3 100644
--- a/Data/User/GameConfig/G3RP52.ini
+++ b/Data/User/GameConfig/G3RP52.ini
@@ -3,7 +3,7 @@
 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.
+EmulationIssues = 
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
diff --git a/Data/User/GameConfig/G4FD69.ini b/Data/User/GameConfig/G4FD69.ini
index 4de9d5c61d..529b2e1109 100644
--- a/Data/User/GameConfig/G4FD69.ini
+++ b/Data/User/GameConfig/G4FD69.ini
@@ -3,7 +3,7 @@
 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 and the videos are messed up.
+EmulationIssues = Videos are messed up, skip them.
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
diff --git a/Data/User/GameConfig/G4FE69.ini b/Data/User/GameConfig/G4FE69.ini
index f4b303cd32..858c03275b 100644
--- a/Data/User/GameConfig/G4FE69.ini
+++ b/Data/User/GameConfig/G4FE69.ini
@@ -3,7 +3,7 @@
 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 and the videos are messed up.
+EmulationIssues = Videos are messed up, skip them.
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
diff --git a/Data/User/GameConfig/G4FF69.ini b/Data/User/GameConfig/G4FF69.ini
index 688bde8ea9..d44ff00823 100644
--- a/Data/User/GameConfig/G4FF69.ini
+++ b/Data/User/GameConfig/G4FF69.ini
@@ -3,7 +3,7 @@
 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 and the videos are messed up.
+EmulationIssues = Videos are messed up, skip them.
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
diff --git a/Data/User/GameConfig/G4FP69.ini b/Data/User/GameConfig/G4FP69.ini
index f4b303cd32..858c03275b 100644
--- a/Data/User/GameConfig/G4FP69.ini
+++ b/Data/User/GameConfig/G4FP69.ini
@@ -3,7 +3,7 @@
 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 and the videos are messed up.
+EmulationIssues = Videos are messed up, skip them.
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
diff --git a/Data/User/GameConfig/G6NE69.ini b/Data/User/GameConfig/G6NE69.ini
index 9759e5911d..e46faccb19 100644
--- a/Data/User/GameConfig/G6NE69.ini
+++ b/Data/User/GameConfig/G6NE69.ini
@@ -2,7 +2,7 @@
 [Core] Values set here will override the main dolphin settings.
 TLBHack = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Sound issues need LLE audio to be fixed and the videos are messed up.
+EmulationIssues = Videos are messed up, skip them.
 EmulationStateId = 4
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
diff --git a/Data/User/GameConfig/G6NP69.ini b/Data/User/GameConfig/G6NP69.ini
index 314a7ae4f5..50f5f76d98 100644
--- a/Data/User/GameConfig/G6NP69.ini
+++ b/Data/User/GameConfig/G6NP69.ini
@@ -2,7 +2,7 @@
 [Core] Values set here will override the main dolphin settings.
 TLBHack = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Sound issues need LLE audio to be fixed and the videos are messed up.
+EmulationIssues = Videos are messed up, skip them.
 EmulationStateId = 4
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
diff --git a/Data/User/GameConfig/G9TD52.ini b/Data/User/GameConfig/G9TD52.ini
index 95f5d1837b..b82d844554 100644
--- a/Data/User/GameConfig/G9TD52.ini
+++ b/Data/User/GameConfig/G9TD52.ini
@@ -3,7 +3,7 @@
 TLBHack = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = Needs LLE audio for proper sound.
+EmulationIssues = 
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
diff --git a/Data/User/GameConfig/G9TE52.ini b/Data/User/GameConfig/G9TE52.ini
index 8ce046e142..899e3227c5 100644
--- a/Data/User/GameConfig/G9TE52.ini
+++ b/Data/User/GameConfig/G9TE52.ini
@@ -3,7 +3,7 @@
 TLBHack = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = Needs LLE audio for proper sound.
+EmulationIssues = 
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
diff --git a/Data/User/GameConfig/G9TF52.ini b/Data/User/GameConfig/G9TF52.ini
index 625316cf7e..90ba7b3830 100644
--- a/Data/User/GameConfig/G9TF52.ini
+++ b/Data/User/GameConfig/G9TF52.ini
@@ -3,7 +3,7 @@
 TLBHack = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = Needs LLE audio for proper sound.
+EmulationIssues = 
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
diff --git a/Data/User/GameConfig/G9TI52.ini b/Data/User/GameConfig/G9TI52.ini
index b4e063dc8e..901fc18224 100644
--- a/Data/User/GameConfig/G9TI52.ini
+++ b/Data/User/GameConfig/G9TI52.ini
@@ -3,7 +3,7 @@
 TLBHack = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = Needs LLE audio for proper sound.
+EmulationIssues = 
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
diff --git a/Data/User/GameConfig/G9TP52.ini b/Data/User/GameConfig/G9TP52.ini
index a00d3fb255..2a1d999a03 100644
--- a/Data/User/GameConfig/G9TP52.ini
+++ b/Data/User/GameConfig/G9TP52.ini
@@ -3,7 +3,7 @@
 TLBHack = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = Needs LLE audio for proper sound.
+EmulationIssues = 
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
diff --git a/Data/User/GameConfig/GALE01.ini b/Data/User/GameConfig/GALE01.ini
index 0b2aee3d48..66924cd847 100644
--- a/Data/User/GameConfig/GALE01.ini
+++ b/Data/User/GameConfig/GALE01.ini
@@ -214,5 +214,5 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [Video_Settings]
-EFBScale = 1
+EFBScale = -1
 [Gecko]
diff --git a/Data/User/GameConfig/GALJ01.ini b/Data/User/GameConfig/GALJ01.ini
index 06f866ebdb..f50aa54642 100644
--- a/Data/User/GameConfig/GALJ01.ini
+++ b/Data/User/GameConfig/GALJ01.ini
@@ -13,5 +13,5 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [Video_Settings]
-EFBScale = 1
+EFBScale = -1
 [Gecko]
diff --git a/Data/User/GameConfig/GALP01.ini b/Data/User/GameConfig/GALP01.ini
index 991c10e0f5..226cd4d9da 100644
--- a/Data/User/GameConfig/GALP01.ini
+++ b/Data/User/GameConfig/GALP01.ini
@@ -105,6 +105,6 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [Video_Settings]
-EFBScale = 1
+EFBScale = -1
 [Gecko]
 
diff --git a/Data/User/GameConfig/GBLE52.ini b/Data/User/GameConfig/GBLE52.ini
index 198f4eeb94..fc202bc14a 100644
--- a/Data/User/GameConfig/GBLE52.ini
+++ b/Data/User/GameConfig/GBLE52.ini
@@ -1,7 +1,7 @@
 # GBLE52 - BLOODY ROAR(R): PRIMAL FURY
 [Core] Values set here will override the main dolphin settings.
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Needs real xfb for videos to display and LLE audio for video sound.
+EmulationIssues = Needs real xfb for videos to display.
 EmulationStateId = 4
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
diff --git a/Data/User/GameConfig/GBLP52.ini b/Data/User/GameConfig/GBLP52.ini
index a7eca2fb72..44d86d392f 100644
--- a/Data/User/GameConfig/GBLP52.ini
+++ b/Data/User/GameConfig/GBLP52.ini
@@ -1,7 +1,7 @@
 # GBLP52 - BLOODY ROAR(R): PRIMAL FURY
 [Core] Values set here will override the main dolphin settings.
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Needs real xfb for videos to display and LLE audio for video sound.
+EmulationIssues = Needs real xfb for videos to display.
 EmulationStateId = 4
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
diff --git a/Data/User/GameConfig/GBME7F.ini b/Data/User/GameConfig/GBME7F.ini
index c02bf0fc8b..b36675174b 100644
--- a/Data/User/GameConfig/GBME7F.ini
+++ b/Data/User/GameConfig/GBME7F.ini
@@ -2,7 +2,7 @@
 [Core] Values set here will override the main dolphin settings.
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = Needs real xfb for videos to show up and "LLE audio" for sound during videos.
+EmulationIssues = Needs real xfb for videos to show up.
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
diff --git a/Data/User/GameConfig/GBMP7F.ini b/Data/User/GameConfig/GBMP7F.ini
index 6daf1691f3..19a5c51643 100644
--- a/Data/User/GameConfig/GBMP7F.ini
+++ b/Data/User/GameConfig/GBMP7F.ini
@@ -2,7 +2,7 @@
 [Core] Values set here will override the main dolphin settings.
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = Needs real xfb for videos to show up and "LLE audio" for sound during videos.
+EmulationIssues = Needs real xfb for videos to show up.
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
diff --git a/Data/User/GameConfig/GBSE8P.ini b/Data/User/GameConfig/GBSE8P.ini
index 5b91e4fe54..03767ab6df 100644
--- a/Data/User/GameConfig/GBSE8P.ini
+++ b/Data/User/GameConfig/GBSE8P.ini
@@ -3,7 +3,7 @@
 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.
+EmulationIssues = 
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
diff --git a/Data/User/GameConfig/GBSP8P.ini b/Data/User/GameConfig/GBSP8P.ini
index c21ff6f50b..64de2f4068 100644
--- a/Data/User/GameConfig/GBSP8P.ini
+++ b/Data/User/GameConfig/GBSP8P.ini
@@ -3,7 +3,7 @@
 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.
+EmulationIssues = 
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
diff --git a/Data/User/GameConfig/GC6E01.ini b/Data/User/GameConfig/GC6E01.ini
index b745ef89b2..66fb0df6db 100644
--- a/Data/User/GameConfig/GC6E01.ini
+++ b/Data/User/GameConfig/GC6E01.ini
@@ -14,5 +14,5 @@ PH_ZNear =
 PH_ZFar = 
 [Gecko]
 [Video_Settings]
-EFBScale = 1

+EFBScale = -1

 SafeTextureCacheColorSamples = 0
diff --git a/Data/User/GameConfig/GC6P01.ini b/Data/User/GameConfig/GC6P01.ini
index 4ebad29a0f..73709894da 100644
--- a/Data/User/GameConfig/GC6P01.ini
+++ b/Data/User/GameConfig/GC6P01.ini
@@ -14,5 +14,5 @@ PH_ZNear =
 PH_ZFar = 
 [Gecko]
 [Video_Settings]
-EFBScale = 1

+EFBScale = -1

 SafeTextureCacheColorSamples = 0
diff --git a/Data/User/GameConfig/GCPE6S.ini b/Data/User/GameConfig/GCPE6S.ini
index d483b5b255..4cc5e2880b 100644
--- a/Data/User/GameConfig/GCPE6S.ini
+++ b/Data/User/GameConfig/GCPE6S.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 real xfb for videos to appear and LLE audio for them to have sound.
+EmulationIssues = Needs real xfb for videos to appear.
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
diff --git a/Data/User/GameConfig/GCPP6S.ini b/Data/User/GameConfig/GCPP6S.ini
index b088ab6a74..f05ed0c294 100644
--- a/Data/User/GameConfig/GCPP6S.ini
+++ b/Data/User/GameConfig/GCPP6S.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 real xfb for videos to appear and LLE audio for them to have sound.
+EmulationIssues = Needs real xfb for videos to appear.
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
diff --git a/Data/User/GameConfig/GEND69.ini b/Data/User/GameConfig/GEND69.ini
index c7b7c6f2eb..7f10cedea9 100644
--- a/Data/User/GameConfig/GEND69.ini
+++ b/Data/User/GameConfig/GEND69.ini
@@ -2,7 +2,7 @@
 [Core] Values set here will override the main dolphin settings.
 TLBHack = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Needs LLE audio for proper sound.
+EmulationIssues = 
 EmulationStateId = 4
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
diff --git a/Data/User/GameConfig/GENE69.ini b/Data/User/GameConfig/GENE69.ini
index cb4b698140..ccbd75120c 100644
--- a/Data/User/GameConfig/GENE69.ini
+++ b/Data/User/GameConfig/GENE69.ini
@@ -2,7 +2,7 @@
 [Core] Values set here will override the main dolphin settings.
 TLBHack = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Needs LLE audio for proper sound.
+EmulationIssues = 
 EmulationStateId = 4
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
diff --git a/Data/User/GameConfig/GENP69.ini b/Data/User/GameConfig/GENP69.ini
index a29ab3d236..d09fbe846d 100644
--- a/Data/User/GameConfig/GENP69.ini
+++ b/Data/User/GameConfig/GENP69.ini
@@ -2,7 +2,7 @@
 [Core] Values set here will override the main dolphin settings.
 TLBHack = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Needs LLE audio for proper sound.
+EmulationIssues = 
 EmulationStateId = 4
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
diff --git a/Data/User/GameConfig/GENS69.ini b/Data/User/GameConfig/GENS69.ini
index fc8dd1c8fe..2a22825215 100644
--- a/Data/User/GameConfig/GENS69.ini
+++ b/Data/User/GameConfig/GENS69.ini
@@ -2,7 +2,7 @@
 [Core] Values set here will override the main dolphin settings.
 TLBHack = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Needs LLE audio for proper sound.
+EmulationIssues = 
 EmulationStateId = 4
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
diff --git a/Data/User/GameConfig/GEYE69.ini b/Data/User/GameConfig/GEYE69.ini
index ebf5159b27..ebdea57aa7 100644
--- a/Data/User/GameConfig/GEYE69.ini
+++ b/Data/User/GameConfig/GEYE69.ini
@@ -3,7 +3,7 @@
 TLBHack = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = Videos are messed up, needs LLE audio for proper sound.
+EmulationIssues = Videos are messed up, skip them.
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
diff --git a/Data/User/GameConfig/GF5E69.ini b/Data/User/GameConfig/GF5E69.ini
index 79b7cf1fd5..eb1fd53fad 100644
--- a/Data/User/GameConfig/GF5E69.ini
+++ b/Data/User/GameConfig/GF5E69.ini
@@ -2,7 +2,7 @@
 [Core] Values set here will override the main dolphin settings.
 TLBHack = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Sound issues need LLE audio to be fixed and the videos are messed up.
+EmulationIssues = Videos are messed up, skip them.
 EmulationStateId = 4
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
diff --git a/Data/User/GameConfig/GF6E69.ini b/Data/User/GameConfig/GF6E69.ini
index d812a5d154..770a2c2a6a 100644
--- a/Data/User/GameConfig/GF6E69.ini
+++ b/Data/User/GameConfig/GF6E69.ini
@@ -3,7 +3,7 @@
 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 and the videos are messed up.
+EmulationIssues = Videos are messed up, skip them.
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
diff --git a/Data/User/GameConfig/GF6F69.ini b/Data/User/GameConfig/GF6F69.ini
index 2696bcb453..b1b162f832 100644
--- a/Data/User/GameConfig/GF6F69.ini
+++ b/Data/User/GameConfig/GF6F69.ini
@@ -3,7 +3,7 @@
 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 and the videos are messed up.
+EmulationIssues = Videos are messed up, skip them.
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
diff --git a/Data/User/GameConfig/GF7E01.ini b/Data/User/GameConfig/GF7E01.ini
index f2107ac50e..c45903999d 100644
--- a/Data/User/GameConfig/GF7E01.ini
+++ b/Data/User/GameConfig/GF7E01.ini
@@ -77,7 +77,7 @@ PH_ZNear =
 PH_ZFar = 
 [Gecko]
 [Video_Settings]
-EFBScale = 1

+EFBScale = -1

 SafeTextureCacheColorSamples = 512
 [Video_Hacks]
 EFBToTextureEnable = False
diff --git a/Data/User/GameConfig/GF7P01.ini b/Data/User/GameConfig/GF7P01.ini
index c7da03cff4..4fef9f4188 100644
--- a/Data/User/GameConfig/GF7P01.ini
+++ b/Data/User/GameConfig/GF7P01.ini
@@ -74,7 +74,7 @@ PH_ZNear =
 PH_ZFar = 
 [Gecko]
 [Video_Settings]
-EFBScale = 1

+EFBScale = -1

 SafeTextureCacheColorSamples = 512
 [Video_Hacks]
 EFBToTextureEnable = False
diff --git a/Data/User/GameConfig/GFAD69.ini b/Data/User/GameConfig/GFAD69.ini
index 5abba727c5..dc38e8bb7a 100644
--- a/Data/User/GameConfig/GFAD69.ini
+++ b/Data/User/GameConfig/GFAD69.ini
@@ -3,7 +3,7 @@
 TLBHack = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = Sound issues need LLE plugin and videos are messed up.
+EmulationIssues = Videos are messed up, skip them.
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
diff --git a/Data/User/GameConfig/GFAE69.ini b/Data/User/GameConfig/GFAE69.ini
index f41893cbb3..b8703789f9 100644
--- a/Data/User/GameConfig/GFAE69.ini
+++ b/Data/User/GameConfig/GFAE69.ini
@@ -3,7 +3,7 @@
 TLBHack = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = Sound issues need LLE plugin and videos are messed up.
+EmulationIssues = Videos are messed up, skip them.
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
diff --git a/Data/User/GameConfig/GFAP69.ini b/Data/User/GameConfig/GFAP69.ini
index 97426b2f38..c201ae85d0 100644
--- a/Data/User/GameConfig/GFAP69.ini
+++ b/Data/User/GameConfig/GFAP69.ini
@@ -3,7 +3,7 @@
 TLBHack = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = Sound issues need LLE plugin and videos are messed up.
+EmulationIssues = Videos are messed up, skip them.
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
diff --git a/Data/User/GameConfig/GFAS69.ini b/Data/User/GameConfig/GFAS69.ini
index 1fd280f110..12b3ef55ae 100644
--- a/Data/User/GameConfig/GFAS69.ini
+++ b/Data/User/GameConfig/GFAS69.ini
@@ -3,7 +3,7 @@
 TLBHack = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = Sound issues need LLE plugin and videos are messed up.
+EmulationIssues = Videos are messed up, skip them.
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
diff --git a/Data/User/GameConfig/GFDD69.ini b/Data/User/GameConfig/GFDD69.ini
index 9fb2a9d2b4..114fae85c8 100644
--- a/Data/User/GameConfig/GFDD69.ini
+++ b/Data/User/GameConfig/GFDD69.ini
@@ -2,7 +2,7 @@
 [Core] Values set here will override the main dolphin settings.
 TLBHack = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Needs LLE audio to play. Slow (r7473)
+EmulationIssues = 
 EmulationStateId = 4
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
diff --git a/Data/User/GameConfig/GFDE69.ini b/Data/User/GameConfig/GFDE69.ini
index c335dec16c..091738a730 100644
--- a/Data/User/GameConfig/GFDE69.ini
+++ b/Data/User/GameConfig/GFDE69.ini
@@ -2,7 +2,7 @@
 [Core] Values set here will override the main dolphin settings.
 TLBHack = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Needs LLE audio to play. Slow (r7473)
+EmulationIssues = 
 EmulationStateId = 4
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
diff --git a/Data/User/GameConfig/GFEE01.ini b/Data/User/GameConfig/GFEE01.ini
index 65fd49c822..f5ff977720 100644
--- a/Data/User/GameConfig/GFEE01.ini
+++ b/Data/User/GameConfig/GFEE01.ini
@@ -6,7 +6,7 @@
 [EmuState]
 #The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = Use the LLE plugin to solve some sound issues (r6730).
+EmulationIssues = 
 [OnFrame]
 [ActionReplay]
 $Max/Infinite Health(IKE)
diff --git a/Data/User/GameConfig/GFEJ01.ini b/Data/User/GameConfig/GFEJ01.ini
index f64f5db0ad..7e75c716de 100644
--- a/Data/User/GameConfig/GFEJ01.ini
+++ b/Data/User/GameConfig/GFEJ01.ini
@@ -5,7 +5,7 @@
 0x80204ce8=500
 [EmuState]
 #The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues = Use the LLE plugin to solve some sound issues (r6730).
+EmulationStateId = 4
+EmulationIssues = 
 [OnFrame]
 [ActionReplay]
diff --git a/Data/User/GameConfig/GFEP01.ini b/Data/User/GameConfig/GFEP01.ini
index 731e5023f8..8ebc18add8 100644
--- a/Data/User/GameConfig/GFEP01.ini
+++ b/Data/User/GameConfig/GFEP01.ini
@@ -7,7 +7,7 @@ SkipIdle = 0
 [EmuState]
 #The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 5
-EmulationIssues = Use the LLE plugin to solve some sound issues (r6730).
+EmulationIssues = 
 [OnFrame]
 [ActionReplay]
 [Video]
diff --git a/Data/User/GameConfig/GFYE69.ini b/Data/User/GameConfig/GFYE69.ini
index 4afc12a954..6100e5913c 100644
--- a/Data/User/GameConfig/GFYE69.ini
+++ b/Data/User/GameConfig/GFYE69.ini
@@ -3,7 +3,7 @@
 TLBHack = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = Sound issues need LLE plugin and videos are messed up.
+EmulationIssues = Videos are messed up, skip them.
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 $Master Code
diff --git a/Data/User/GameConfig/GFYP69.ini b/Data/User/GameConfig/GFYP69.ini
index 8d497995d1..9f6a5b344f 100644
--- a/Data/User/GameConfig/GFYP69.ini
+++ b/Data/User/GameConfig/GFYP69.ini
@@ -3,7 +3,7 @@
 TLBHack = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = Sound issues need LLE plugin and videos are messed up.
+EmulationIssues = Videos are messed up, skip them.
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
diff --git a/Data/User/GameConfig/GG5E52.ini b/Data/User/GameConfig/GG5E52.ini
index 1b292d43b3..97f50e2871 100644
--- a/Data/User/GameConfig/GG5E52.ini
+++ b/Data/User/GameConfig/GG5E52.ini
@@ -2,7 +2,7 @@
 [Core] Values set here will override the main dolphin settings.
 TLBHack = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = LLE audio fixes sound issues.
+EmulationIssues = 
 EmulationStateId = 4
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
diff --git a/Data/User/GameConfig/GGYE41.ini b/Data/User/GameConfig/GGYE41.ini
index d803a7d8d2..a34b296af9 100644
--- a/Data/User/GameConfig/GGYE41.ini
+++ b/Data/User/GameConfig/GGYE41.ini
@@ -3,7 +3,7 @@
 TLBHack = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 3
-EmulationIssues = Needs Real XFB for videos to show up, lle for sound issues.(r6932)
+EmulationIssues = Needs Real XFB for videos to show up.
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
diff --git a/Data/User/GameConfig/GGYP41.ini b/Data/User/GameConfig/GGYP41.ini
index db510165eb..f1a715cbe3 100644
--- a/Data/User/GameConfig/GGYP41.ini
+++ b/Data/User/GameConfig/GGYP41.ini
@@ -3,7 +3,7 @@
 TLBHack = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 3
-EmulationIssues = Needs Real XFB for videos to show up, lle for sound issues.(r6932)
+EmulationIssues = Needs Real XFB for videos to show up.
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
diff --git a/Data/User/GameConfig/GH2E69.ini b/Data/User/GameConfig/GH2E69.ini
index b1f64e6ef7..8c27de59c8 100644
--- a/Data/User/GameConfig/GH2E69.ini
+++ b/Data/User/GameConfig/GH2E69.ini
@@ -2,7 +2,7 @@
 [Core] Values set here will override the main dolphin settings.
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 3
-EmulationIssues = Intro videos are messed up, skip them. Needs LLE audio for proper sound and the game is slow.
+EmulationIssues = Intro videos are messed up, skip them. The game is slow.
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
diff --git a/Data/User/GameConfig/GH2P69.ini b/Data/User/GameConfig/GH2P69.ini
index 006dad78dc..060155d7fd 100644
--- a/Data/User/GameConfig/GH2P69.ini
+++ b/Data/User/GameConfig/GH2P69.ini
@@ -2,7 +2,7 @@
 [Core] Values set here will override the main dolphin settings.
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 3
-EmulationIssues = Intro videos are messed up, skip them. Needs LLE audio for proper sound and the game is slow.
+EmulationIssues = Intro videos are messed up, skip them. The game is slow.
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
diff --git a/Data/User/GameConfig/GHYE6S.ini b/Data/User/GameConfig/GHYE6S.ini
new file mode 100644
index 0000000000..0da41c41bb
--- /dev/null
+++ b/Data/User/GameConfig/GHYE6S.ini
@@ -0,0 +1,19 @@
+# GHYE6S - HauntedMansion
+[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/GJXE51.ini b/Data/User/GameConfig/GJXE51.ini
index d503dffbef..8895c14962 100644
--- a/Data/User/GameConfig/GJXE51.ini
+++ b/Data/User/GameConfig/GJXE51.ini
@@ -7,8 +7,8 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [EmuState]
-EmulationStateId = 3
-EmulationIssues = Slow,needs mmu and lle audio plugin for proper audio(r7411).
+EmulationStateId = 4
+EmulationIssues = Slow because it needs mmu to run.
 [OnFrame]
 [ActionReplay]
 [Gecko]
diff --git a/Data/User/GameConfig/GJZE52.ini b/Data/User/GameConfig/GJZE52.ini
index 3a9b1eb46e..857ea359e9 100644
--- a/Data/User/GameConfig/GJZE52.ini
+++ b/Data/User/GameConfig/GJZE52.ini
@@ -3,7 +3,7 @@
 TLBHack = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = LLE audio fixes some sound issues.
+EmulationIssues = 
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
diff --git a/Data/User/GameConfig/GLYE69.ini b/Data/User/GameConfig/GLYE69.ini
index da2c0b1537..420abad7c2 100644
--- a/Data/User/GameConfig/GLYE69.ini
+++ b/Data/User/GameConfig/GLYE69.ini
@@ -2,7 +2,7 @@
 [Core] Values set here will override the main dolphin settings.
 TLBHack = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Sound issues need LLE audio to be fixed and the videos are messed up.
+EmulationIssues = Videos are messed up, skip them.
 EmulationStateId = 4
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
diff --git a/Data/User/GameConfig/GLYP69.ini b/Data/User/GameConfig/GLYP69.ini
index 84392be595..db5615e290 100644
--- a/Data/User/GameConfig/GLYP69.ini
+++ b/Data/User/GameConfig/GLYP69.ini
@@ -2,7 +2,7 @@
 [Core] Values set here will override the main dolphin settings.
 TLBHack = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Sound issues need LLE audio to be fixed and the videos are messed up.
+EmulationIssues = Videos are messed up, skip them.
 EmulationStateId = 4
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
diff --git a/Data/User/GameConfig/GM4E01.ini b/Data/User/GameConfig/GM4E01.ini
index c63b0d8a1b..5daa37570e 100644
--- a/Data/User/GameConfig/GM4E01.ini
+++ b/Data/User/GameConfig/GM4E01.ini
@@ -128,4 +128,3 @@ PH_ZNear =
 PH_ZFar = 
 [Gecko]
 [Core]
-VBeam = 1
diff --git a/Data/User/GameConfig/GM4J01.ini b/Data/User/GameConfig/GM4J01.ini
index 9431bc933a..b9d39df920 100644
--- a/Data/User/GameConfig/GM4J01.ini
+++ b/Data/User/GameConfig/GM4J01.ini
@@ -14,4 +14,3 @@ PH_ZNear =
 PH_ZFar = 
 [Gecko]
 [Core]
-VBeam = 1
diff --git a/Data/User/GameConfig/GM4P01.ini b/Data/User/GameConfig/GM4P01.ini
index f9cd8b3a71..1ab428de05 100644
--- a/Data/User/GameConfig/GM4P01.ini
+++ b/Data/User/GameConfig/GM4P01.ini
@@ -139,4 +139,3 @@ $Goraud Shading
 [Video]
 ProjectionHack = 0
 [Core]
-VBeam = 1
diff --git a/Data/User/GameConfig/GM6EE9.ini b/Data/User/GameConfig/GM6EE9.ini
index fa3425b423..5997d56d3c 100644
--- a/Data/User/GameConfig/GM6EE9.ini
+++ b/Data/User/GameConfig/GM6EE9.ini
@@ -3,7 +3,7 @@
 TLBHack = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = Use LLE plugin for proper ingame sound. MMU speed hack is needed for balloon bombs or the game crashes.
+EmulationIssues = MMU speed hack is needed for balloon bombs or the game crashes.
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
diff --git a/Data/User/GameConfig/GM6PE9.ini b/Data/User/GameConfig/GM6PE9.ini
index 0ae13640de..eba6dfdcfe 100644
--- a/Data/User/GameConfig/GM6PE9.ini
+++ b/Data/User/GameConfig/GM6PE9.ini
@@ -3,7 +3,7 @@
 TLBHack = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = Use LLE plugin for proper ingame sound. MMU speed hack is needed for balloon bombs or the game crashes.
+EmulationIssues = MMU speed hack is needed for balloon bombs or the game crashes.
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
diff --git a/Data/User/GameConfig/GN8E69.ini b/Data/User/GameConfig/GN8E69.ini
index 3129860bb7..56b7c88dc5 100644
--- a/Data/User/GameConfig/GN8E69.ini
+++ b/Data/User/GameConfig/GN8E69.ini
@@ -2,7 +2,7 @@
 [Core] Values set here will override the main dolphin settings.
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = Sound issues need LLE audio to be fixed and the videos are messed up.
+EmulationIssues = Videos are messed up, skip them.
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
diff --git a/Data/User/GameConfig/GN8P69.ini b/Data/User/GameConfig/GN8P69.ini
index f56f46bfcd..4d3c3167af 100644
--- a/Data/User/GameConfig/GN8P69.ini
+++ b/Data/User/GameConfig/GN8P69.ini
@@ -2,7 +2,7 @@
 [Core] Values set here will override the main dolphin settings.
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = Sound issues need LLE audio to be fixed and the videos are messed up.
+EmulationIssues = Videos are messed up, skip them.
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
diff --git a/Data/User/GameConfig/GNLE69.ini b/Data/User/GameConfig/GNLE69.ini
index 68dcf3183b..74535e5040 100644
--- a/Data/User/GameConfig/GNLE69.ini
+++ b/Data/User/GameConfig/GNLE69.ini
@@ -2,7 +2,7 @@
 [Core] Values set here will override the main dolphin settings.
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = Sound issues need LLE audio to be fixed and the videos are messed up.
+EmulationIssues = Videos are messed up, skip them.
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
diff --git a/Data/User/GameConfig/GOAE52.ini b/Data/User/GameConfig/GOAE52.ini
index 2d0371aa41..dbfb379652 100644
--- a/Data/User/GameConfig/GOAE52.ini
+++ b/Data/User/GameConfig/GOAE52.ini
@@ -3,7 +3,7 @@
 TLBHack = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = LLE audio fixes sound issues.
+EmulationIssues = 
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
diff --git a/Data/User/GameConfig/GOYD69.ini b/Data/User/GameConfig/GOYD69.ini
index 21e74e2cb4..a2fd2afaf1 100644
--- a/Data/User/GameConfig/GOYD69.ini
+++ b/Data/User/GameConfig/GOYD69.ini
@@ -2,7 +2,7 @@
 [Core] Values set here will override the main dolphin settings.
 TLBHack = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Videos are messed up. Use LLE for proper sound.(r7446)
+EmulationIssues = Videos are messed up, skip them.
 EmulationStateId = 4
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
diff --git a/Data/User/GameConfig/GOYE69.ini b/Data/User/GameConfig/GOYE69.ini
index 6dc35e5ada..808f83e4e9 100644
--- a/Data/User/GameConfig/GOYE69.ini
+++ b/Data/User/GameConfig/GOYE69.ini
@@ -2,7 +2,7 @@
 [Core] Values set here will override the main dolphin settings.
 TLBHack = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Videos are messed up. Use LLE for proper sound.(r7446)
+EmulationIssues = Videos are messed up, skip them.
 EmulationStateId = 4
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
diff --git a/Data/User/GameConfig/GOYF69.ini b/Data/User/GameConfig/GOYF69.ini
index dbbedced45..0df6b4c9cc 100644
--- a/Data/User/GameConfig/GOYF69.ini
+++ b/Data/User/GameConfig/GOYF69.ini
@@ -2,7 +2,7 @@
 [Core] Values set here will override the main dolphin settings.
 TLBHack = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Videos are messed up. Use LLE for proper sound.(r7446)
+EmulationIssues = Videos are messed up, skip them.
 EmulationStateId = 4
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
diff --git a/Data/User/GameConfig/GRQE41.ini b/Data/User/GameConfig/GRQE41.ini
index b03f78efd5..a077944376 100644
--- a/Data/User/GameConfig/GRQE41.ini
+++ b/Data/User/GameConfig/GRQE41.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 = 2
-EmulationIssues = Needs lle audio for sound and real XFB for videos to show up.
+EmulationIssues = Needs real XFB for videos to show up.
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
diff --git a/Data/User/GameConfig/GRUE78.ini b/Data/User/GameConfig/GRUE78.ini
index 3b0bb35f75..2ec6ad5185 100644
--- a/Data/User/GameConfig/GRUE78.ini
+++ b/Data/User/GameConfig/GRUE78.ini
@@ -1,7 +1,7 @@
 # GRUE78 - Power Rangers Dino Thunder
 [Core] Values set here will override the main dolphin settings.
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Needs LLE audio for proper sound and Real XFB to display videos.
+EmulationIssues = Needs Real XFB to display videos.
 EmulationStateId = 4
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
diff --git a/Data/User/GameConfig/GSOE8P.ini b/Data/User/GameConfig/GSOE8P.ini
index fd473fc5c8..82a4d6ad50 100644
--- a/Data/User/GameConfig/GSOE8P.ini
+++ b/Data/User/GameConfig/GSOE8P.ini
@@ -1,8 +1,8 @@
 # GSOE8P - Sonic Mega Collection (US)
 [Core] 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 = Everything playable with glitches, sound requires LLE, videos require Real XFB
+EmulationStateId = 4
+EmulationIssues = 
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
@@ -15,4 +15,5 @@ PH_ZFar =
 [Gecko]
 [Video_Settings]
 UseXFB = True
-UseRealXFB = True
+UseRealXFB = False
+SafeTextureCacheColorSamples = 512
diff --git a/Data/User/GameConfig/GSOP8P.ini b/Data/User/GameConfig/GSOP8P.ini
index c23e732791..92dad7a5f0 100644
--- a/Data/User/GameConfig/GSOP8P.ini
+++ b/Data/User/GameConfig/GSOP8P.ini
@@ -1,8 +1,8 @@
 # GSOP8P - Sonic Mega Collection (EU)
 [Core] Values set here will override the main dolphin settings.
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues = Everything playable with glitches, sound requires LLE, videos require Real XFB
+EmulationStateId = 4
+EmulationIssues = 
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
@@ -15,4 +15,5 @@ PH_ZFar =
 [Gecko]
 [Video_Settings]
 UseXFB = True
-UseRealXFB = True
+UseRealXFB = False
+SafeTextureCacheColorSamples = 512
diff --git a/Data/User/GameConfig/GSWE64.ini b/Data/User/GameConfig/GSWE64.ini
index 75f82caf63..95246f3c8f 100644
--- a/Data/User/GameConfig/GSWE64.ini
+++ b/Data/User/GameConfig/GSWE64.ini
@@ -3,7 +3,6 @@
 MMU = 1
 BAT = 1
 FastDiscSpeed = 1
-VBeam = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationIssues = 
 EmulationStateId = 3
diff --git a/Data/User/GameConfig/GSWP64.ini b/Data/User/GameConfig/GSWP64.ini
index c580edee4f..3083317042 100644
--- a/Data/User/GameConfig/GSWP64.ini
+++ b/Data/User/GameConfig/GSWP64.ini
@@ -3,7 +3,6 @@
 MMU = 1
 BAT = 1
 FastDiscSpeed = 1
-VBeam = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationIssues = 
 EmulationStateId = 3
diff --git a/Data/User/GameConfig/GSWS64.ini b/Data/User/GameConfig/GSWS64.ini
index 8bcb77f296..5f3512743a 100644
--- a/Data/User/GameConfig/GSWS64.ini
+++ b/Data/User/GameConfig/GSWS64.ini
@@ -3,7 +3,6 @@
 MMU = 1
 BAT = 1
 FastDiscSpeed = 1
-VBeam = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationIssues = 
 EmulationStateId = 3
diff --git a/Data/User/GameConfig/GTZE41.ini b/Data/User/GameConfig/GTZE41.ini
index be20078a64..a6ee052467 100644
--- a/Data/User/GameConfig/GTZE41.ini
+++ b/Data/User/GameConfig/GTZE41.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 real Xfb for videos to display and LLE audio for proper sound and stability (hle freezes ingame).
+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/GTZP41.ini b/Data/User/GameConfig/GTZP41.ini
index 4a350e41c6..64aa83e7d5 100644
--- a/Data/User/GameConfig/GTZP41.ini
+++ b/Data/User/GameConfig/GTZP41.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 real Xfb for videos to display and LLE audio for proper sound and stability (hle freezes ingame).
+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/GUBE69.ini b/Data/User/GameConfig/GUBE69.ini
index c7ec4b728b..aa9a2e5cda 100644
--- a/Data/User/GameConfig/GUBE69.ini
+++ b/Data/User/GameConfig/GUBE69.ini
@@ -3,7 +3,7 @@
 TLBHack = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = LLE audio is needed to fix some sound issues.
+EmulationIssues = 
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
diff --git a/Data/User/GameConfig/GUBP69.ini b/Data/User/GameConfig/GUBP69.ini
index 3903b90352..44239942f8 100644
--- a/Data/User/GameConfig/GUBP69.ini
+++ b/Data/User/GameConfig/GUBP69.ini
@@ -3,7 +3,7 @@
 TLBHack = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = LLE audio is needed to fix some sound issues.
+EmulationIssues = 
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
diff --git a/Data/User/GameConfig/GWOE5G.ini b/Data/User/GameConfig/GWOE5G.ini
index 44ebf853ef..5b634129a8 100644
--- a/Data/User/GameConfig/GWOE5G.ini
+++ b/Data/User/GameConfig/GWOE5G.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 to get ingame.
+EmulationIssues = 
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
diff --git a/Data/User/GameConfig/GXBE69.ini b/Data/User/GameConfig/GXBE69.ini
index 715bc44c3c..d7bdd11a66 100644
--- a/Data/User/GameConfig/GXBE69.ini
+++ b/Data/User/GameConfig/GXBE69.ini
@@ -1,7 +1,7 @@
 # GXBE69 - SSX3
 [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 = Has problematic intro videos(skip them).Use LLE plugin for the sound issues(r6598).
+EmulationIssues = Has problematic intro videos(skip them).
 EmulationStateId = 4
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
diff --git a/Data/User/GameConfig/GXBP69.ini b/Data/User/GameConfig/GXBP69.ini
index ba86019fc1..480834b7ef 100644
--- a/Data/User/GameConfig/GXBP69.ini
+++ b/Data/User/GameConfig/GXBP69.ini
@@ -1,7 +1,7 @@
 # GXBP69 - SSX3
 [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 = Has problematic intro videos(skip them).Use LLE plugin for the sound issues(r6598).
+EmulationIssues = Has problematic intro videos(skip them).
 EmulationStateId = 4
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
diff --git a/Data/User/GameConfig/GXFE69.ini b/Data/User/GameConfig/GXFE69.ini
index d74632b761..5a188fea53 100644
--- a/Data/User/GameConfig/GXFE69.ini
+++ b/Data/User/GameConfig/GXFE69.ini
@@ -2,8 +2,8 @@
 [Core] Values set here will override the main dolphin settings.
 TLBHack = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues = Sound issues need LLE plugin and videos are messed up. Unstable (crashes ingame).
+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]
diff --git a/Data/User/GameConfig/GXFF69.ini b/Data/User/GameConfig/GXFF69.ini
index 10a4862537..f02b269863 100644
--- a/Data/User/GameConfig/GXFF69.ini
+++ b/Data/User/GameConfig/GXFF69.ini
@@ -2,8 +2,8 @@
 [Core] Values set here will override the main dolphin settings.
 TLBHack = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues = Sound issues need LLE plugin and videos are messed up. Unstable (crashes ingame).
+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]
diff --git a/Data/User/GameConfig/GXFP69.ini b/Data/User/GameConfig/GXFP69.ini
index ea3f4ead57..fc7a74e739 100644
--- a/Data/User/GameConfig/GXFP69.ini
+++ b/Data/User/GameConfig/GXFP69.ini
@@ -2,8 +2,8 @@
 [Core] Values set here will override the main dolphin settings.
 TLBHack = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues = Sound issues need LLE plugin and videos are messed up. Unstable (crashes ingame).
+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]
diff --git a/Data/User/GameConfig/GXOE69.ini b/Data/User/GameConfig/GXOE69.ini
index 9284e2b63c..1772f72f2b 100644
--- a/Data/User/GameConfig/GXOE69.ini
+++ b/Data/User/GameConfig/GXOE69.ini
@@ -3,7 +3,7 @@
 TLBHack = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = Has problematic intro videos (skip them). Use LLE audio to fix sound issues.
+EmulationIssues = Has problematic intro videos (skip them).
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
diff --git a/Data/User/GameConfig/GXOX69.ini b/Data/User/GameConfig/GXOX69.ini
index 16a87d0840..a92484bacc 100644
--- a/Data/User/GameConfig/GXOX69.ini
+++ b/Data/User/GameConfig/GXOX69.ini
@@ -3,7 +3,7 @@
 TLBHack = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = Has problematic intro videos (skip them). Use LLE audio to fix sound issues.
+EmulationIssues = Has problematic intro videos (skip them).
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
diff --git a/Data/User/GameConfig/GXXE01.ini b/Data/User/GameConfig/GXXE01.ini
index ad0e45abdf..f18d342d29 100644
--- a/Data/User/GameConfig/GXXE01.ini
+++ b/Data/User/GameConfig/GXXE01.ini
@@ -15,5 +15,5 @@ PH_ZNear =
 PH_ZFar = 
 [Gecko]
 [Video_Settings]
-EFBScale = 1

+EFBScale = -1

 SafeTextureCacheColorSamples = 0
diff --git a/Data/User/GameConfig/GXXP01.ini b/Data/User/GameConfig/GXXP01.ini
index 16c64c1fa6..96db3fdd6a 100644
--- a/Data/User/GameConfig/GXXP01.ini
+++ b/Data/User/GameConfig/GXXP01.ini
@@ -15,5 +15,5 @@ PH_ZNear =
 PH_ZFar = 
 [Gecko]
 [Video_Settings]
-EFBScale = 1

+EFBScale = -1

 SafeTextureCacheColorSamples = 0
diff --git a/Data/User/GameConfig/GZ2P01.ini b/Data/User/GameConfig/GZ2P01.ini
index bb6c58e20e..a226bf296d 100644
--- a/Data/User/GameConfig/GZ2P01.ini
+++ b/Data/User/GameConfig/GZ2P01.ini
@@ -6,8 +6,7 @@
 [EmuState]
 #The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-Issues="low FPS in big areas, no working sound"
-EmulationIssues = No Sound
+EmulationIssues = 
 [OnFrame]
 [ActionReplay]
 $(M)
diff --git a/Data/User/GameConfig/R7XE69.ini b/Data/User/GameConfig/R7XE69.ini
index 37dc50c356..709135c321 100644
--- a/Data/User/GameConfig/R7XE69.ini
+++ b/Data/User/GameConfig/R7XE69.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 = Videos are messed up, needs LLE audio for proper sound.
+EmulationIssues = Videos are messed up, skip them.
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
diff --git a/Data/User/GameConfig/R7XJ13.ini b/Data/User/GameConfig/R7XJ13.ini
index d888766ae8..10836026e3 100644
--- a/Data/User/GameConfig/R7XJ13.ini
+++ b/Data/User/GameConfig/R7XJ13.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 = Videos are messed up, needs LLE audio for proper sound.
+EmulationIssues = Videos are messed up, skip them.
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
diff --git a/Data/User/GameConfig/R7XP69.ini b/Data/User/GameConfig/R7XP69.ini
index 0cf1f33ccc..4674fe0e5c 100644
--- a/Data/User/GameConfig/R7XP69.ini
+++ b/Data/User/GameConfig/R7XP69.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 = Videos are messed up, needs LLE audio for proper sound.
+EmulationIssues = Videos are messed up, skip them.
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
diff --git a/Data/User/GameConfig/RBHE08.ini b/Data/User/GameConfig/RBHE08.ini
index 80fb2a796e..2def435787 100644
--- a/Data/User/GameConfig/RBHE08.ini
+++ b/Data/User/GameConfig/RBHE08.ini
@@ -1,6 +1,5 @@
 # RBHE08 - Resident Evil Archives: Resident Evil Zero
 [Core] Values set here will override the main dolphin settings.
-VBeam = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 5
 EmulationIssues = 
diff --git a/Data/User/GameConfig/RBHJ08.ini b/Data/User/GameConfig/RBHJ08.ini
index 7ed45e1ee7..6ff5f267ba 100644
--- a/Data/User/GameConfig/RBHJ08.ini
+++ b/Data/User/GameConfig/RBHJ08.ini
@@ -1,6 +1,5 @@
 # RBHJ08 - Biohazard 0
 [Core] Values set here will override the main dolphin settings.
-VBeam = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 5
 EmulationIssues = 
diff --git a/Data/User/GameConfig/RBHP08.ini b/Data/User/GameConfig/RBHP08.ini
index ee4c6ec35f..0703e1fc4f 100644
--- a/Data/User/GameConfig/RBHP08.ini
+++ b/Data/User/GameConfig/RBHP08.ini
@@ -1,6 +1,5 @@
 # RBHP08 - Resident Evil Archives: Resident Evil Zero
 [Core] Values set here will override the main dolphin settings.
-VBeam = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 5
 EmulationIssues = 
diff --git a/Data/User/GameConfig/RBWE01.ini b/Data/User/GameConfig/RBWE01.ini
index a2cad6ff7d..8d6362e959 100644
--- a/Data/User/GameConfig/RBWE01.ini
+++ b/Data/User/GameConfig/RBWE01.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 proper sound.
+EmulationIssues = 
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
diff --git a/Data/User/GameConfig/RBWP01.ini b/Data/User/GameConfig/RBWP01.ini
index 5422388866..896089fd8c 100644
--- a/Data/User/GameConfig/RBWP01.ini
+++ b/Data/User/GameConfig/RBWP01.ini
@@ -2,7 +2,7 @@
 [Core] Values set here will override the main dolphin settings.
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = Needs LLE audio for proper sound.
+EmulationIssues = 
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
diff --git a/Data/User/GameConfig/RMLEH4.ini b/Data/User/GameConfig/RMLEH4.ini
index 9f46bde99a..0c7e830a80 100644
--- a/Data/User/GameConfig/RMLEH4.ini
+++ b/Data/User/GameConfig/RMLEH4.ini
@@ -3,7 +3,7 @@
 TLBHack = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = Use LLE audio to solve some sound issues.
+EmulationIssues = 
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
diff --git a/Data/User/GameConfig/RMLJH4.ini b/Data/User/GameConfig/RMLJH4.ini
index 44f37e8c50..0bf357494c 100644
--- a/Data/User/GameConfig/RMLJH4.ini
+++ b/Data/User/GameConfig/RMLJH4.ini
@@ -3,7 +3,7 @@
 TLBHack = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = Use LLE audio to solve some sound issues.
+EmulationIssues = 
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
diff --git a/Data/User/GameConfig/RMLK52.ini b/Data/User/GameConfig/RMLK52.ini
index 47adb3efe8..073a3307d7 100644
--- a/Data/User/GameConfig/RMLK52.ini
+++ b/Data/User/GameConfig/RMLK52.ini
@@ -3,7 +3,7 @@
 TLBHack = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = Use LLE audio to solve some sound issues.
+EmulationIssues = 
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
diff --git a/Data/User/GameConfig/RMLP7U.ini b/Data/User/GameConfig/RMLP7U.ini
index 7dd5feeb6a..33b3c45275 100644
--- a/Data/User/GameConfig/RMLP7U.ini
+++ b/Data/User/GameConfig/RMLP7U.ini
@@ -3,7 +3,7 @@
 TLBHack = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = Use LLE audio to solve some sound issues.
+EmulationIssues = 
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
diff --git a/Data/User/GameConfig/RMLPH4.ini b/Data/User/GameConfig/RMLPH4.ini
index d9f964d486..b923c7441a 100644
--- a/Data/User/GameConfig/RMLPH4.ini
+++ b/Data/User/GameConfig/RMLPH4.ini
@@ -3,7 +3,7 @@
 TLBHack = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = Use LLE audio to solve some sound issues.
+EmulationIssues = 
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
diff --git a/Data/User/GameConfig/RO9EFS.ini b/Data/User/GameConfig/RO9EFS.ini
index 060aae9fad..711f3b2305 100644
--- a/Data/User/GameConfig/RO9EFS.ini
+++ b/Data/User/GameConfig/RO9EFS.ini
@@ -12,7 +12,7 @@ PH_ZNear =
 PH_ZFar = 
 [EmuState]
 EmulationStateId = 4
-EmulationIssues = Needs lle plugin for sound ingame(r7411)
+EmulationIssues = 
 [OnFrame]
 [ActionReplay]
 [Gecko]
diff --git a/Data/User/GameConfig/RO9PNK.ini b/Data/User/GameConfig/RO9PNK.ini
index 4001b97540..038001d969 100644
--- a/Data/User/GameConfig/RO9PNK.ini
+++ b/Data/User/GameConfig/RO9PNK.ini
@@ -12,7 +12,7 @@ PH_ZNear =
 PH_ZFar = 
 [EmuState]
 EmulationStateId = 4
-EmulationIssues = Needs lle plugin for sound ingame(r7411)
+EmulationIssues = 
 [OnFrame]
 [ActionReplay]
 [Gecko]
\ No newline at end of file
diff --git a/Data/User/GameConfig/RSFE7U.ini b/Data/User/GameConfig/RSFE7U.ini
index bf6e9e87c4..2a73e4c057 100644
--- a/Data/User/GameConfig/RSFE7U.ini
+++ b/Data/User/GameConfig/RSFE7U.ini
@@ -14,4 +14,4 @@ PH_ZNear =
 PH_ZFar = 
 [Gecko]
 [Video_Settings]
-EFBScale = 1
+EFBScale = -1
diff --git a/Data/User/GameConfig/RSFJ99.ini b/Data/User/GameConfig/RSFJ99.ini
index 1113f6e7e9..07277538a3 100644
--- a/Data/User/GameConfig/RSFJ99.ini
+++ b/Data/User/GameConfig/RSFJ99.ini
@@ -14,4 +14,4 @@ PH_ZNear =
 PH_ZFar = 
 [Gecko]
 [Video_Settings]
-EFBScale = 1
+EFBScale = -1
diff --git a/Data/User/GameConfig/RSFP99.ini b/Data/User/GameConfig/RSFP99.ini
index ec07d38569..a5d15c4adc 100644
--- a/Data/User/GameConfig/RSFP99.ini
+++ b/Data/User/GameConfig/RSFP99.ini
@@ -14,4 +14,4 @@ PH_ZNear =
 PH_ZFar = 
 [Gecko]
 [Video_Settings]
-EFBScale = 1
+EFBScale = -1
diff --git a/Data/User/GameConfig/RSXE69.ini b/Data/User/GameConfig/RSXE69.ini
index 7934f8b283..141a7c1ce0 100644
--- a/Data/User/GameConfig/RSXE69.ini
+++ b/Data/User/GameConfig/RSXE69.ini
@@ -2,7 +2,7 @@
 [Core] Values set here will override the main dolphin settings.
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 3
-EmulationIssues = Needs Wii nand dump and LLE for proper audio (reconnect wiimote if necessary). EFB cpu access gives proper bloom for a speed hit.
+EmulationIssues = Needs Wii nand dump (reconnect wiimote if necessary). EFB cpu access gives proper bloom for a speed hit.
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
diff --git a/Data/User/GameConfig/RSXJ13.ini b/Data/User/GameConfig/RSXJ13.ini
index a1cf8f5497..9663796d11 100644
--- a/Data/User/GameConfig/RSXJ13.ini
+++ b/Data/User/GameConfig/RSXJ13.ini
@@ -2,7 +2,7 @@
 [Core] Values set here will override the main dolphin settings.
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 3
-EmulationIssues = Needs Wii nand dump and LLE for proper audio (reconnect wiimote if necessary). EFB cpu access gives proper bloom for a speed hit.
+EmulationIssues = Needs Wii nand dump (reconnect wiimote if necessary). EFB cpu access gives proper bloom for a speed hit.
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
diff --git a/Data/User/GameConfig/RSXK69.ini b/Data/User/GameConfig/RSXK69.ini
index d3ccded18d..f7eb2ac1ca 100644
--- a/Data/User/GameConfig/RSXK69.ini
+++ b/Data/User/GameConfig/RSXK69.ini
@@ -2,7 +2,7 @@
 [Core] Values set here will override the main dolphin settings.
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 3
-EmulationIssues = Needs Wii nand dump and LLE for proper audio (reconnect wiimote if necessary). EFB cpu access gives proper bloom for a speed hit.
+EmulationIssues = Needs Wii nand dump (reconnect wiimote if necessary). EFB cpu access gives proper bloom for a speed hit.
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
diff --git a/Data/User/GameConfig/RSXP69.ini b/Data/User/GameConfig/RSXP69.ini
index c9b8ade9e5..418672638d 100644
--- a/Data/User/GameConfig/RSXP69.ini
+++ b/Data/User/GameConfig/RSXP69.ini
@@ -2,7 +2,7 @@
 [Core] Values set here will override the main dolphin settings.
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 3
-EmulationIssues = Needs Wii nand dump and LLE for proper audio (reconnect wiimote if necessary). EFB cpu access gives proper bloom for a speed hit.
+EmulationIssues = Needs Wii nand dump (reconnect wiimote if necessary). EFB cpu access gives proper bloom for a speed hit.
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
diff --git a/Data/User/GameConfig/S75E69.ini b/Data/User/GameConfig/S75E69.ini
index 77dde099c5..314bf62a62 100644
--- a/Data/User/GameConfig/S75E69.ini
+++ b/Data/User/GameConfig/S75E69.ini
@@ -14,6 +14,6 @@ PH_ZNear =
 PH_ZFar = 
 [Gecko]
 [Video_Settings]

-EFBScale = 1
+EFBScale = -1
 SafeTextureCacheColorSamples = 512
 
diff --git a/Data/User/GameConfig/S75P69.ini b/Data/User/GameConfig/S75P69.ini
index 00225d65fe..edbfd2b746 100644
--- a/Data/User/GameConfig/S75P69.ini
+++ b/Data/User/GameConfig/S75P69.ini
@@ -14,4 +14,4 @@ PH_ZNear =
 PH_ZFar = 
 [Gecko]
 [Video_Settings]

-EFBScale = 1
+EFBScale = -1
diff --git a/Data/User/GameConfig/SEMJ01.ini b/Data/User/GameConfig/SEMJ01.ini
index f0740ca7a3..280438a489 100644
--- a/Data/User/GameConfig/SEMJ01.ini
+++ b/Data/User/GameConfig/SEMJ01.ini
@@ -14,7 +14,7 @@ PH_ZNear =
 PH_ZFar = 
 [Gecko]
 [Video_Settings]
-EFBScale = 1

+EFBScale = -1

 SafeTextureCacheColorSamples = 0
 [Video_Enhancements]
 ForceFiltering = False
diff --git a/Data/User/GameConfig/SEMY4Q.ini b/Data/User/GameConfig/SEMY4Q.ini
index 817f8387e0..f01579ade7 100644
--- a/Data/User/GameConfig/SEMY4Q.ini
+++ b/Data/User/GameConfig/SEMY4Q.ini
@@ -14,7 +14,7 @@ PH_ZNear =
 PH_ZFar = 
 [Gecko]
 [Video_Settings]
-EFBScale = 1

+EFBScale = -1

 SafeTextureCacheColorSamples = 0
 [Video_Enhancements]
 ForceFiltering = False
diff --git a/Data/User/GameConfig/SEMZ4Q.ini b/Data/User/GameConfig/SEMZ4Q.ini
index 515a1bd029..1e828432f2 100644
--- a/Data/User/GameConfig/SEMZ4Q.ini
+++ b/Data/User/GameConfig/SEMZ4Q.ini
@@ -14,7 +14,7 @@ PH_ZNear =
 PH_ZFar = 
 [Gecko]
 [Video_Settings]
-EFBScale = 1

+EFBScale = -1

 SafeTextureCacheColorSamples = 0
 [Video_Enhancements]
 ForceFiltering = False
diff --git a/Data/User/GameConfig/SERE4Q.ini b/Data/User/GameConfig/SERE4Q.ini
index fbc9fa9d3c..526cd7fcda 100644
--- a/Data/User/GameConfig/SERE4Q.ini
+++ b/Data/User/GameConfig/SERE4Q.ini
@@ -14,6 +14,6 @@ PH_ZNear =
 PH_ZFar = 
 [Gecko]
 [Video_Settings]
-EFBScale = 1

+EFBScale = -1

 SafeTextureCacheColorSamples = 0
 [Wii]

diff --git a/Data/User/GameConfig/SERF4Q.ini b/Data/User/GameConfig/SERF4Q.ini
index cd2fca395e..266abd0d76 100644
--- a/Data/User/GameConfig/SERF4Q.ini
+++ b/Data/User/GameConfig/SERF4Q.ini
@@ -14,6 +14,6 @@ PH_ZNear =
 PH_ZFar = 
 [Gecko]
 [Video_Settings]
-EFBScale = 1

+EFBScale = -1

 SafeTextureCacheColorSamples = 0
 [Wii]

diff --git a/Data/User/GameConfig/SERP4Q.ini b/Data/User/GameConfig/SERP4Q.ini
index 7e332b8bcd..300b9d7e8b 100644
--- a/Data/User/GameConfig/SERP4Q.ini
+++ b/Data/User/GameConfig/SERP4Q.ini
@@ -14,6 +14,6 @@ PH_ZNear =
 PH_ZFar = 
 [Gecko]
 [Video_Settings]
-EFBScale = 1

+EFBScale = -1

 SafeTextureCacheColorSamples = 0
 [Wii]

diff --git a/Data/User/GameConfig/SMOE41.ini b/Data/User/GameConfig/SMOE41.ini
index 3c61475544..9edd71f38d 100644
--- a/Data/User/GameConfig/SMOE41.ini
+++ b/Data/User/GameConfig/SMOE41.ini
@@ -2,7 +2,7 @@
 [Core] Values set here will override the main dolphin settings.
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = Sound noise eliminated using LLE audio. With hle disable idleskip for normal dance school speed.
+EmulationIssues = 
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
diff --git a/Data/User/GameConfig/SMOP41.ini b/Data/User/GameConfig/SMOP41.ini
index b9f913a639..18b790ac12 100644
--- a/Data/User/GameConfig/SMOP41.ini
+++ b/Data/User/GameConfig/SMOP41.ini
@@ -2,7 +2,7 @@
 [Core] Values set here will override the main dolphin settings.
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = Sound noise eliminated using LLE audio. With hle disable idleskip for normal dance school speed.
+EmulationIssues = 
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
diff --git a/Data/User/GameConfig/SMOX41.ini b/Data/User/GameConfig/SMOX41.ini
index 929a58f076..e8fa62ff14 100644
--- a/Data/User/GameConfig/SMOX41.ini
+++ b/Data/User/GameConfig/SMOX41.ini
@@ -2,7 +2,7 @@
 [Core] Values set here will override the main dolphin settings.
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = Sound noise eliminated using LLE audio. With hle disable idleskip for normal dance school speed.
+EmulationIssues = 
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
diff --git a/Data/User/GameConfig/SNCE8P.ini b/Data/User/GameConfig/SNCE8P.ini
index c259d40061..2be325922b 100644
--- a/Data/User/GameConfig/SNCE8P.ini
+++ b/Data/User/GameConfig/SNCE8P.ini
@@ -14,6 +14,6 @@ PH_ZNear =
 PH_ZFar = 0.01
 [Gecko]
 [Video_Settings]
-EFBScale = 1
+EFBScale = -1
 [Video_Hacks]
 EFBAccessEnable = False
diff --git a/Data/User/GameConfig/SNCJ8P.ini b/Data/User/GameConfig/SNCJ8P.ini
index 7de58c7a00..f49713339b 100644
--- a/Data/User/GameConfig/SNCJ8P.ini
+++ b/Data/User/GameConfig/SNCJ8P.ini
@@ -14,6 +14,6 @@ PH_ZNear =
 PH_ZFar = 0.01
 [Gecko]
 [Video_Settings]
-EFBScale = 1
+EFBScale = -1
 [Video_Hacks]
 EFBAccessEnable = False
diff --git a/Data/User/GameConfig/SNCP8P.ini b/Data/User/GameConfig/SNCP8P.ini
index 39a221d578..9f78dc824b 100644
--- a/Data/User/GameConfig/SNCP8P.ini
+++ b/Data/User/GameConfig/SNCP8P.ini
@@ -14,6 +14,6 @@ PH_ZNear =
 PH_ZFar = 0.01
 [Gecko]
 [Video_Settings]
-EFBScale = 1
+EFBScale = -1
 [Video_Hacks]
 EFBAccessEnable = False
diff --git a/Data/User/GameConfig/SNJE69.ini b/Data/User/GameConfig/SNJE69.ini
index b3b7720c46..3b2c5f6834 100644
--- a/Data/User/GameConfig/SNJE69.ini
+++ b/Data/User/GameConfig/SNJE69.ini
@@ -1,7 +1,7 @@
 # SNJE69 - NBA JAM
 [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 = Initial slowdowns, no commentary & other sound issues that LLE plugin can fix (r6598)
+EmulationIssues = 
 EmulationStateId = 4
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
diff --git a/Data/User/GameConfig/SNJP69.ini b/Data/User/GameConfig/SNJP69.ini
index 72ab8eb62f..134e803548 100644
--- a/Data/User/GameConfig/SNJP69.ini
+++ b/Data/User/GameConfig/SNJP69.ini
@@ -1,7 +1,7 @@
 # SNJP69 - NBA JAM
 [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 = Initial slowdowns, no commentary & other sound issues that LLE plugin can fix (r6598)
+EmulationIssues = 
 EmulationStateId = 4
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
diff --git a/Data/User/GameConfig/SPDE52.ini b/Data/User/GameConfig/SPDE52.ini
index dae5e74567..ea50df3a7d 100644
--- a/Data/User/GameConfig/SPDE52.ini
+++ b/Data/User/GameConfig/SPDE52.ini
@@ -2,7 +2,7 @@
 [Core] Values set here will override the main dolphin settings.
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 3
-EmulationIssues = Needs LLE audio for sound ingame. Graphic glitches.
+EmulationIssues = Graphic glitches.
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
diff --git a/Data/User/GameConfig/SPDP52.ini b/Data/User/GameConfig/SPDP52.ini
index 39f2a95725..246eb0ddd7 100644
--- a/Data/User/GameConfig/SPDP52.ini
+++ b/Data/User/GameConfig/SPDP52.ini
@@ -2,7 +2,7 @@
 [Core] Values set here will override the main dolphin settings.
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 3
-EmulationIssues = Needs LLE audio for sound ingame. Graphic glitches.
+EmulationIssues = Graphic glitches.
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
diff --git a/Data/User/GameConfig/SQME52.ini b/Data/User/GameConfig/SQME52.ini
index c78a968d6d..c4d9f1bf26 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.
+EmulationIssues = 
 [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 544354b081..0aa97ec05f 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.
+EmulationIssues = 
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
diff --git a/Data/User/GameConfig/STHP8P.ini b/Data/User/GameConfig/STHP8P.ini
index 32caf26a15..2e8678dac4 100644
--- a/Data/User/GameConfig/STHP8P.ini
+++ b/Data/User/GameConfig/STHP8P.ini
@@ -14,7 +14,7 @@ PH_ZNear =
 PH_ZFar = 
 [EmuState]
 EmulationStateId = 4
-EmulationIssues = Use LLE audio for sound issues.(r7483)
+EmulationIssues = 
 [OnFrame]
 [ActionReplay]
 [Gecko]
diff --git a/Data/User/GameConfig/SVME01.ini b/Data/User/GameConfig/SVME01.ini
index f5b581ab6a..56ea6df84d 100644
--- a/Data/User/GameConfig/SVME01.ini
+++ b/Data/User/GameConfig/SVME01.ini
@@ -2,7 +2,7 @@
 [Core] Values set here will override the main dolphin settings.
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = Use LLE audio to fix sound.
+EmulationIssues = 
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
diff --git a/Data/User/GameConfig/SVMJ01.ini b/Data/User/GameConfig/SVMJ01.ini
index 52eb8b9311..b29e4821a4 100644
--- a/Data/User/GameConfig/SVMJ01.ini
+++ b/Data/User/GameConfig/SVMJ01.ini
@@ -2,7 +2,7 @@
 [Core] Values set here will override the main dolphin settings.
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = Use LLE audio to fix sound.
+EmulationIssues = 
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
diff --git a/Data/User/GameConfig/SVMP01.ini b/Data/User/GameConfig/SVMP01.ini
index 68776a58ab..0652795a4f 100644
--- a/Data/User/GameConfig/SVMP01.ini
+++ b/Data/User/GameConfig/SVMP01.ini
@@ -2,7 +2,7 @@
 [Core] Values set here will override the main dolphin settings.
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = Use LLE audio to fix sound.
+EmulationIssues = 
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
diff --git a/Data/User/GameConfig/SX4J01.ini b/Data/User/GameConfig/SX4J01.ini
index 12d93d6744..70a248d5d7 100644
--- a/Data/User/GameConfig/SX4J01.ini
+++ b/Data/User/GameConfig/SX4J01.ini
@@ -3,7 +3,7 @@
 BlockMerging = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = The game randomly freezes. Use LLE audio for sound issues. Per pixel lighting creates a glitch in ether cave with direct 3d 9.
+EmulationIssues = The game randomly freezes. Per pixel lighting creates a glitch in ether cave with direct 3d 9.
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
diff --git a/Data/User/GameConfig/SX4P01.ini b/Data/User/GameConfig/SX4P01.ini
index b5988e291b..801db4f13a 100644
--- a/Data/User/GameConfig/SX4P01.ini
+++ b/Data/User/GameConfig/SX4P01.ini
@@ -3,7 +3,7 @@
 BlockMerging = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = The game randomly freezes. Use LLE audio for sound issues. Per pixel lighting creates a glitch in ether cave with direct 3d 9.
+EmulationIssues = The game randomly freezes. Per pixel lighting creates a glitch in ether cave with direct 3d 9.
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
diff --git a/Externals/android-menudrawer/.gitignore b/Externals/android-menudrawer/.gitignore
new file mode 100644
index 0000000000..fdb137a854
--- /dev/null
+++ b/Externals/android-menudrawer/.gitignore
@@ -0,0 +1,30 @@
+/*
+
+!.gitignore
+!.travis.yml
+!CHANGELOG.md
+!README.md
+!LICENSE
+!checkstyle.xml
+!pom.xml
+
+!art/
+
+!library/
+library/*
+!library/src/
+!library/res/
+!library/AndroidManifest.xml
+!library/build.xml
+!library/pom.xml
+!library/project.properties
+
+!samples/
+samples/*
+!samples/src/
+!samples/res/
+!samples/libs/
+!samples/AndroidManifest.xml
+!samples/build.xml
+!samples/pom.xml
+!samples/project.properties
diff --git a/Externals/android-menudrawer/.travis.yml b/Externals/android-menudrawer/.travis.yml
new file mode 100644
index 0000000000..ee6ec5ca1f
--- /dev/null
+++ b/Externals/android-menudrawer/.travis.yml
@@ -0,0 +1,18 @@
+language: java
+
+notifications:
+  email: false
+
+before_install:
+  - wget http://dl.google.com/android/android-sdk_r21.0.1-linux.tgz
+  - tar -zxf android-sdk_r21.0.1-linux.tgz
+  - export ANDROID_HOME=~/builds/SimonVT/android-menudrawer/android-sdk-linux
+  - export PATH=${PATH}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools
+  - TOOLS=$(android list sdk --no-ui | grep "Android SDK Platform-tools" | cut -d"-" -f1)
+  - android update sdk --filter "$TOOLS" --no-ui --force
+  - SDK=$(android list sdk --no-ui | grep ", API 16," | cut -d"-" -f1)
+  - android update sdk --filter "$SDK" --no-ui --force
+
+install:
+  - "mvn package --quiet -DskipTests"
+  - "mvn verify"
diff --git a/Externals/android-menudrawer/CHANGELOG.md b/Externals/android-menudrawer/CHANGELOG.md
new file mode 100644
index 0000000000..a570a8e420
--- /dev/null
+++ b/Externals/android-menudrawer/CHANGELOG.md
@@ -0,0 +1,44 @@
+Change Log
+==========
+
+Version 2.0.2 *(2013-03-31)*
+----------------------------
+ * Added listener that makes it possible to disabllow intercepting touch events over
+   certain views
+ * Added setter for the maximum animation duration
+ * Added getter for menu size
+ * Added methods that enable/disable indicator animation
+ * Fix: Removed log statements
+ * Fix: Drawing the active indicator might cause crash if the active view is not a
+        child of the MenuDrawer
+ * Fix: Crash in static drawer if no active indicator bitmap was set
+
+Version 2.0.1 *(2013-02-12)*
+----------------------------
+ * Indicator now animates between active views
+ * Fixed restoring state for right/bottom drawer
+
+Version 2.0.0 *(2013-01-23)*
+----------------------------
+
+ * Major API changes
+
+    * All classes are now in the net.simonvt.menudrawer package.
+    * MenuDrawerManager no longet exists. Menu is added with MenuDrawer#attach(...).
+    * Drawer position is now selected with Position enums instead of int constants.
+    * Width methods/attributes have been renamed to 'size'.
+
+ * Added top/bottom drawer.
+ * Added static (non-draggable, always visible) drawers.
+ * The touch bezel size is now configurable with MenuDrawer#setTouchBezelSize(int).
+ * MenuDrawer#saveState() now only required when dragging the entire window.
+ * Drawers can now be used in XML layouts.
+ * Fix: Scroller class caused conflicts with other libraries.
+ * Fix: No more overdraw when the drawer is closed.
+ * Fix: Content no longer falls behind when slowly dragging.
+
+
+Version 1.0.0 *(2012-10-30)*
+----------------------------
+
+Initial release.
diff --git a/Externals/android-menudrawer/LICENSE b/Externals/android-menudrawer/LICENSE
new file mode 100644
index 0000000000..7a4a3ea242
--- /dev/null
+++ b/Externals/android-menudrawer/LICENSE
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
\ No newline at end of file
diff --git a/Externals/android-menudrawer/README.md b/Externals/android-menudrawer/README.md
new file mode 100644
index 0000000000..1773274860
--- /dev/null
+++ b/Externals/android-menudrawer/README.md
@@ -0,0 +1,96 @@
+MenuDrawer
+==========
+
+A slide-out menu implementation, which allows users to navigate between views
+in your app. Most commonly the menu is revealed by either dragging the edge
+of the screen, or clicking the 'up' button in the action bar.
+
+
+Features
+--------
+
+ * The menu can be positioned along all four edges.
+ * Supports attaching an always visible, non-draggable menu, which is useful
+   on e.g. tablets.
+ * The menu can wrap both the content and the entire window.
+ * Allows the drawer to be opened by dragging the edge, the entire screen or
+   not at all.
+ * Can be used in XML layouts.
+ * Indicator that shows which screen is currently visible.
+
+
+Usage
+=====
+
+This library is very simple to use. It requires no extension of custom classes,
+it's simply added to an activity by calling one of the `MenuDrawer#attach(...)`
+methods.
+
+For more examples on how to use this library, check out the sample app.
+
+
+Left menu
+---------
+```java
+public class SampleActivity extends Activity {
+
+    private MenuDrawer mDrawer;
+
+    @Override
+    protected void onCreate(Bundle state) {
+        super.onCreate(state);
+        mDrawer = MenuDrawer.attach(this);
+        mDrawer.setContentView(R.layout.activity_sample);
+        mDrawer.setMenuView(R.layout.menu_sample);
+    }
+}
+```
+
+
+Right menu
+----------
+```java
+public class SampleActivity extends Activity {
+
+    private MenuDrawer mDrawer;
+
+    @Override
+    protected void onCreate(Bundle state) {
+        super.onCreate(state);
+        mDrawer = MenuDrawer.attach(this, Position.RIGHT);
+        mDrawer.setContentView(R.layout.activity_sample);
+        mDrawer.setMenuView(R.layout.menu_sample);
+    }
+}
+```
+
+
+Credits
+=======
+
+ * Cyril Mottier for his [articles][1] on the pattern
+
+
+License
+=======
+
+    Copyright 2012 Simon Vig Therkildsen
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+
+
+
+
+
+ [1]: http://android.cyrilmottier.com/?p=658
diff --git a/Externals/android-menudrawer/art/menu_arrow.svg b/Externals/android-menudrawer/art/menu_arrow.svg
new file mode 100644
index 0000000000..05f205a3bf
--- /dev/null
+++ b/Externals/android-menudrawer/art/menu_arrow.svg
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="33"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="arrow dropshadow.svg"
+   inkscape:export-filename="C:\Users\SimonVT\Desktop\menu_arrow_hdpi.png"
+   inkscape:export-xdpi="135"
+   inkscape:export-ydpi="135">
+  <defs
+     id="defs4">
+    <filter
+       inkscape:collect="always"
+       id="filter3800"
+       x="-0.20999995"
+       width="1.4199999"
+       y="-0.084000008"
+       height="1.168">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="1.0500001"
+         id="feGaussianBlur3802" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="15.839192"
+     inkscape:cx="-0.29262145"
+     inkscape:cy="18.116185"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1680"
+     inkscape:window-height="998"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1019.3622)">
+    <path
+       style="fill:#1a1a1a;fill-opacity:1;fill-rule:evenodd;stroke:none;filter:url(#filter3800)"
+       d="M 13.999507,1050.8622 2,1035.8623 13.999517,1020.8622 c 4e-6,30.0455 0.0011,-0.01 -1e-5,30 z"
+       id="rect2989-7"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccc" />
+    <path
+       style="fill:#e8e8e8;fill-opacity:1;fill-rule:evenodd;stroke:none"
+       d="M 15.999508,1050.8622 4,1035.8623 15.999517,1020.8622 c 4e-6,30.0455 0.0011,-0.01 -9e-6,30 z"
+       id="rect2989"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccc" />
+  </g>
+</svg>
diff --git a/Externals/android-menudrawer/checkstyle.xml b/Externals/android-menudrawer/checkstyle.xml
new file mode 100644
index 0000000000..beb2c4a7e6
--- /dev/null
+++ b/Externals/android-menudrawer/checkstyle.xml
@@ -0,0 +1,120 @@
+<?xml version="1.0"?>
+<!DOCTYPE module PUBLIC
+    "-//Puppy Crawl//DTD Check Configuration 1.2//EN"
+    "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
+
+<module name="Checker">
+    <module name="NewlineAtEndOfFile"/>
+    <module name="FileLength"/>
+    <module name="FileTabCharacter"/>
+
+    <!-- Trailing spaces -->
+    <module name="RegexpSingleline">
+        <property name="format" value="\s+$"/>
+        <property name="message" value="Line has trailing spaces."/>
+    </module>
+
+    <module name="TreeWalker">
+        <property name="cacheFile" value="${checkstyle.cache.file}"/>
+
+        <!-- Checks for Javadoc comments.                     -->
+        <!-- See http://checkstyle.sf.net/config_javadoc.html -->
+        <!--module name="JavadocMethod"/-->
+        <!--module name="JavadocType"/-->
+        <!--module name="JavadocVariable"/-->
+        <module name="JavadocStyle"/>
+
+
+        <!-- Checks for Naming Conventions.                  -->
+        <!-- See http://checkstyle.sf.net/config_naming.html -->
+        <module name="ConstantName"/>
+        <module name="LocalFinalVariableName"/>
+        <module name="LocalVariableName"/>
+        <module name="MemberName"/>
+        <module name="MethodName"/>
+        <module name="PackageName"/>
+        <module name="ParameterName"/>
+        <module name="StaticVariableName"/>
+        <module name="TypeName"/>
+
+
+        <!-- Checks for imports                              -->
+        <!-- See http://checkstyle.sf.net/config_import.html -->
+        <module name="AvoidStarImport"/>
+        <module name="IllegalImport"/> <!-- defaults to sun.* packages -->
+        <module name="RedundantImport"/>
+        <module name="UnusedImports"/>
+
+
+        <!-- Checks for Size Violations.                    -->
+        <!-- See http://checkstyle.sf.net/config_sizes.html -->
+        <module name="LineLength">
+            <property name="max" value="120"/>
+        </module>
+        <module name="MethodLength"/>
+        <!--module name="ParameterNumber"/-->
+
+
+        <!-- Checks for whitespace                               -->
+        <!-- See http://checkstyle.sf.net/config_whitespace.html -->
+        <module name="GenericWhitespace"/>
+        <module name="EmptyForIteratorPad"/>
+        <module name="MethodParamPad"/>
+        <module name="NoWhitespaceAfter"/>
+        <module name="NoWhitespaceBefore"/>
+        <module name="OperatorWrap"/>
+        <module name="ParenPad"/>
+        <module name="TypecastParenPad"/>
+        <module name="WhitespaceAfter"/>
+        <module name="WhitespaceAround"/>
+
+
+        <!-- Modifier Checks                                    -->
+        <!-- See http://checkstyle.sf.net/config_modifiers.html -->
+        <module name="ModifierOrder"/>
+        <module name="RedundantModifier"/>
+
+
+        <!-- Checks for blocks. You know, those {}'s         -->
+        <!-- See http://checkstyle.sf.net/config_blocks.html -->
+        <!--module name="AvoidNestedBlocks"/-->
+        <!--module name="EmptyBlock"/-->
+        <module name="LeftCurly"/>
+        <!--module name="NeedBraces"/-->
+        <module name="RightCurly"/>
+
+
+        <!-- Checks for common coding problems               -->
+        <!-- See http://checkstyle.sf.net/config_coding.html -->
+        <!--module name="AvoidInlineConditionals"/-->
+        <module name="CovariantEquals"/>
+        <!--module name="DoubleCheckedLocking"/-->
+        <module name="EmptyStatement"/>
+        <module name="EqualsAvoidNull"/>
+        <module name="EqualsHashCode"/>
+        <!--module name="HiddenField"/-->
+        <module name="IllegalInstantiation"/>
+        <!--module name="InnerAssignment"/-->
+        <!--module name="MagicNumber"/-->
+        <!--module name="MissingSwitchDefault"/-->
+        <module name="RedundantThrows"/>
+        <module name="SimplifyBooleanExpression"/>
+        <module name="SimplifyBooleanReturn"/>
+
+        <!-- Checks for class design                         -->
+        <!-- See http://checkstyle.sf.net/config_design.html -->
+        <!--module name="DesignForExtension"/-->
+        <module name="FinalClass"/>
+        <module name="HideUtilityClassConstructor"/>
+        <module name="InterfaceIsType"/>
+        <!--module name="VisibilityModifier"/-->
+
+
+        <!-- Miscellaneous other checks.                   -->
+        <!-- See http://checkstyle.sf.net/config_misc.html -->
+        <module name="ArrayTypeStyle"/>
+        <!--module name="FinalParameters"/-->
+        <module name="TodoComment"/>
+        <module name="UpperEll"/>
+    </module>
+</module>
diff --git a/Externals/android-menudrawer/library/AndroidManifest.xml b/Externals/android-menudrawer/library/AndroidManifest.xml
new file mode 100644
index 0000000000..a77d28a931
--- /dev/null
+++ b/Externals/android-menudrawer/library/AndroidManifest.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+      package="net.simonvt.menudrawer"
+      android:versionCode="3"
+      android:versionName="2.0.1">
+
+    <uses-sdk android:minSdkVersion="7" android:targetSdkVersion="16" />
+</manifest>
diff --git a/Externals/android-menudrawer/library/build.xml b/Externals/android-menudrawer/library/build.xml
new file mode 100644
index 0000000000..e5eb1dc0d0
--- /dev/null
+++ b/Externals/android-menudrawer/library/build.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="menudrawer" default="help">
+
+    <!-- The local.properties file is created and updated by the 'android' tool.
+         It contains the path to the SDK. It should *NOT* be checked into
+         Version Control Systems. -->
+    <property file="local.properties" />
+
+    <!-- The ant.properties file can be created by you. It is only edited by the
+         'android' tool to add properties to it.
+         This is the place to change some Ant specific build properties.
+         Here are some properties you may want to change/update:
+
+         source.dir
+             The name of the source directory. Default is 'src'.
+         out.dir
+             The name of the output directory. Default is 'bin'.
+
+         For other overridable properties, look at the beginning of the rules
+         files in the SDK, at tools/ant/build.xml
+
+         Properties related to the SDK location or the project target should
+         be updated using the 'android' tool with the 'update' action.
+
+         This file is an integral part of the build system for your
+         application and should be checked into Version Control Systems.
+
+         -->
+    <property file="ant.properties" />
+
+    <!-- if sdk.dir was not set from one of the property file, then
+         get it from the ANDROID_HOME env var.
+         This must be done before we load project.properties since
+         the proguard config can use sdk.dir -->
+    <property environment="env" />
+    <condition property="sdk.dir" value="${env.ANDROID_HOME}">
+        <isset property="env.ANDROID_HOME" />
+    </condition>
+
+    <!-- The project.properties file is created and updated by the 'android'
+         tool, as well as ADT.
+
+         This contains project specific properties such as project target, and library
+         dependencies. Lower level build properties are stored in ant.properties
+         (or in .classpath for Eclipse projects).
+
+         This file is an integral part of the build system for your
+         application and should be checked into Version Control Systems. -->
+    <loadproperties srcFile="project.properties" />
+
+    <!-- quick check on sdk.dir -->
+    <fail
+            message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through the ANDROID_HOME environment variable."
+            unless="sdk.dir"
+    />
+
+    <!--
+        Import per project custom build rules if present at the root of the project.
+        This is the place to put custom intermediary targets such as:
+            -pre-build
+            -pre-compile
+            -post-compile (This is typically used for code obfuscation.
+                           Compiled code location: ${out.classes.absolute.dir}
+                           If this is not done in place, override ${out.dex.input.absolute.dir})
+            -post-package
+            -post-build
+            -pre-clean
+    -->
+    <import file="custom_rules.xml" optional="true" />
+
+    <!-- Import the actual build file.
+
+         To customize existing targets, there are two options:
+         - Customize only one target:
+             - copy/paste the target into this file, *before* the
+               <import> task.
+             - customize it to your needs.
+         - Customize the whole content of build.xml
+             - copy/paste the content of the rules files (minus the top node)
+               into this file, replacing the <import> task.
+             - customize to your needs.
+
+         ***********************
+         ****** IMPORTANT ******
+         ***********************
+         In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
+         in order to avoid having your file be overridden by tools such as "android update project"
+    -->
+    <!-- version-tag: 1 -->
+    <import file="${sdk.dir}/tools/ant/build.xml" />
+
+</project>
diff --git a/Externals/android-menudrawer/library/pom.xml b/Externals/android-menudrawer/library/pom.xml
new file mode 100644
index 0000000000..b5bd881040
--- /dev/null
+++ b/Externals/android-menudrawer/library/pom.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>net.simonvt</groupId>
+        <artifactId>android-menudrawer-parent</artifactId>
+        <version>2.0.3-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>android-menudrawer</artifactId>
+    <name>Android MenuDrawer</name>
+    <packaging>apklib</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.google.android</groupId>
+            <artifactId>android</artifactId>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <sourceDirectory>src</sourceDirectory>
+
+        <plugins>
+            <plugin>
+                <groupId>com.jayway.maven.plugins.android.generation2</groupId>
+                <artifactId>android-maven-plugin</artifactId>
+                <extensions>true</extensions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/Externals/android-menudrawer/library/project.properties b/Externals/android-menudrawer/library/project.properties
new file mode 100644
index 0000000000..c81c2d97f5
--- /dev/null
+++ b/Externals/android-menudrawer/library/project.properties
@@ -0,0 +1,16 @@
+# This file is automatically generated by Android Tools.
+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
+#
+# This file must be checked in Version Control Systems.
+#
+# To customize properties used by the Ant build system edit
+# "ant.properties", and override values to adapt the script to your
+# project structure.
+#
+# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
+#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
+
+android.library=true
+# Project target.
+target=android-17
+
diff --git a/Externals/android-menudrawer/library/res/values/attrs.xml b/Externals/android-menudrawer/library/res/values/attrs.xml
new file mode 100644
index 0000000000..c8ec779700
--- /dev/null
+++ b/Externals/android-menudrawer/library/res/values/attrs.xml
@@ -0,0 +1,43 @@
+<resources>
+
+    <!-- Reference to a style for the menu drawer. -->
+    <attr name="menuDrawerStyle" format="reference" />
+
+    <!-- Styleables used for styling the menu drawer. -->
+    <declare-styleable name="MenuDrawer">
+
+        <!-- Drawable to use for the background of the content. -->
+        <attr name="mdContentBackground" format="reference" />
+
+        <!-- Drawable to use for the background of the menu. -->
+        <attr name="mdMenuBackground" format="reference" />
+
+        <!-- The size of the menu. -->
+        <attr name="mdMenuSize" format="dimension" />
+
+        <!-- Drawable used as indicator for the active view. -->
+        <attr name="mdActiveIndicator" format="reference" />
+
+        <!-- Defines whether the content will have a dropshadow onto the menu. Default is true. -->
+        <attr name="mdDropShadowEnabled" format="boolean" />
+
+        <!-- The size of the drop shadow. Default is 6dp -->
+        <attr name="mdDropShadowSize" format="dimension" />
+
+        <!-- The color of the drop shadow. Default is #FF000000. -->
+        <attr name="mdDropShadowColor" format="color" />
+
+        <!-- Drawable used for the drop shadow. -->
+        <attr name="mdDropShadow" format="reference" />
+
+        <!-- The touch bezel size. -->
+        <attr name="mdTouchBezelSize" format="dimension" />
+
+        <!-- Whether the indicator should be animated between active views. -->
+        <attr name="mdAllowIndicatorAnimation" format="boolean" />
+
+        <!-- The maximum animation duration -->
+        <attr name="mdMaxAnimationDuration" format="integer" />
+    </declare-styleable>
+
+</resources>
diff --git a/Externals/android-menudrawer/library/res/values/colors.xml b/Externals/android-menudrawer/library/res/values/colors.xml
new file mode 100644
index 0000000000..2866c6abe6
--- /dev/null
+++ b/Externals/android-menudrawer/library/res/values/colors.xml
@@ -0,0 +1,6 @@
+<resources>
+
+    <!-- The default background of the menu. -->
+    <color name="md__defaultBackground">#FF555555</color>
+
+</resources>
diff --git a/Externals/android-menudrawer/library/res/values/ids.xml b/Externals/android-menudrawer/library/res/values/ids.xml
new file mode 100644
index 0000000000..c6001910b0
--- /dev/null
+++ b/Externals/android-menudrawer/library/res/values/ids.xml
@@ -0,0 +1,20 @@
+<resources>
+
+    <!-- ID used when defining the content layout in XML. -->
+    <item name="mdContent" type="id" />
+
+    <!-- ID used when defining the menu layout in XML. -->
+    <item name="mdMenu" type="id" />
+
+    <!-- The ID of the content container. -->
+    <item name="md__content" type="id" />
+
+    <!-- The ID of the menu container. -->
+    <item name="md__menu" type="id" />
+
+    <!-- The ID of the drawer. -->
+    <item name="md__drawer" type="id" />
+
+    <!-- Used with View#setTag(int) to specify a position for the active view. -->
+    <item name="mdActiveViewPosition" type="id" />
+</resources>
diff --git a/Externals/android-menudrawer/library/res/values/styles.xml b/Externals/android-menudrawer/library/res/values/styles.xml
new file mode 100644
index 0000000000..415be6d229
--- /dev/null
+++ b/Externals/android-menudrawer/library/res/values/styles.xml
@@ -0,0 +1,11 @@
+<resources>
+
+    <style name="Widget" />
+
+    <!-- Base theme for the menu drawer. -->
+    <style name="Widget.MenuDrawer">
+        <item name="mdMenuBackground">@color/md__defaultBackground</item>
+        <item name="mdContentBackground">?android:attr/windowBackground</item>
+    </style>
+
+</resources>
diff --git a/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/BottomDrawer.java b/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/BottomDrawer.java
new file mode 100644
index 0000000000..17f41e2c4c
--- /dev/null
+++ b/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/BottomDrawer.java
@@ -0,0 +1,226 @@
+package net.simonvt.menudrawer;
+
+import android.app.Activity;
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.drawable.GradientDrawable;
+import android.util.AttributeSet;
+import android.view.MotionEvent;
+
+public class BottomDrawer extends VerticalDrawer {
+
+    private int mIndicatorLeft;
+
+    BottomDrawer(Activity activity, int dragMode) {
+        super(activity, dragMode);
+    }
+
+    public BottomDrawer(Context context) {
+        super(context);
+    }
+
+    public BottomDrawer(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public BottomDrawer(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+    }
+
+    @Override
+    public void openMenu(boolean animate) {
+        animateOffsetTo(-mMenuSize, 0, animate);
+    }
+
+    @Override
+    public void closeMenu(boolean animate) {
+        animateOffsetTo(0, 0, animate);
+    }
+
+    @Override
+    public void setDropShadowColor(int color) {
+        final int endColor = color & 0x00FFFFFF;
+        mDropShadowDrawable = new GradientDrawable(GradientDrawable.Orientation.TOP_BOTTOM,
+                new int[] {
+                        color,
+                        endColor,
+                });
+        invalidate();
+    }
+
+    @Override
+    protected void onLayout(boolean changed, int l, int t, int r, int b) {
+        final int width = r - l;
+        final int height = b - t;
+        final int offsetPixels = (int) mOffsetPixels;
+        final int menuSize = mMenuSize;
+
+        mMenuContainer.layout(0, height - menuSize, width, height);
+        offsetMenu(offsetPixels);
+
+        if (USE_TRANSLATIONS) {
+            mContentContainer.layout(0, 0, width, height);
+        } else {
+            mContentContainer.layout(0, offsetPixels, width, height + offsetPixels);
+        }
+    }
+
+    /**
+     * Offsets the menu relative to its original position based on the position of the content.
+     *
+     * @param offsetPixels The number of pixels the content if offset.
+     */
+    private void offsetMenu(int offsetPixels) {
+        if (mOffsetMenu && mMenuSize != 0) {
+            final int height = getHeight();
+            final int menuSize = mMenuSize;
+            final float openRatio = (menuSize + (float) offsetPixels) / menuSize;
+
+            if (USE_TRANSLATIONS) {
+                if (offsetPixels != 0) {
+                    final int offset = (int) (0.25f * (openRatio * menuSize));
+                    mMenuContainer.setTranslationY(offset);
+                } else {
+                    mMenuContainer.setTranslationY(height + menuSize);
+                }
+
+            } else {
+                final int oldMenuTop = mMenuContainer.getTop();
+                final int offsetBy = (int) (0.25f * (openRatio * menuSize));
+                final int offset = height - mMenuSize + offsetBy - oldMenuTop;
+                mMenuContainer.offsetTopAndBottom(offset);
+                mMenuContainer.setVisibility(offsetPixels == 0 ? INVISIBLE : VISIBLE);
+            }
+        }
+    }
+
+    @Override
+    protected void drawDropShadow(Canvas canvas, int offsetPixels) {
+        final int width = getWidth();
+        final int height = getHeight();
+
+        mDropShadowDrawable.setBounds(0, height + offsetPixels, width, height + offsetPixels + mDropShadowSize);
+        mDropShadowDrawable.draw(canvas);
+    }
+
+    @Override
+    protected void drawMenuOverlay(Canvas canvas, int offsetPixels) {
+        final int width = getWidth();
+        final int height = getHeight();
+        final float openRatio = ((float) Math.abs(offsetPixels)) / mMenuSize;
+
+        mMenuOverlay.setBounds(0, height + offsetPixels, width, height);
+        mMenuOverlay.setAlpha((int) (MAX_MENU_OVERLAY_ALPHA * (1.f - openRatio)));
+        mMenuOverlay.draw(canvas);
+    }
+
+    @Override
+    protected void drawIndicator(Canvas canvas, int offsetPixels) {
+        if (mActiveView != null && isViewDescendant(mActiveView)) {
+            Integer position = (Integer) mActiveView.getTag(R.id.mdActiveViewPosition);
+            final int pos = position == null ? 0 : position;
+
+            if (pos == mActivePosition) {
+                final int height = getHeight();
+                final int menuHeight = mMenuSize;
+                final int indicatorHeight = mActiveIndicator.getHeight();
+
+                final float openRatio = ((float) Math.abs(offsetPixels)) / menuHeight;
+
+                mActiveView.getDrawingRect(mActiveRect);
+                offsetDescendantRectToMyCoords(mActiveView, mActiveRect);
+                final int indicatorWidth = mActiveIndicator.getWidth();
+
+                final float interpolatedRatio = 1.f - INDICATOR_INTERPOLATOR.getInterpolation((1.f - openRatio));
+                final int interpolatedHeight = (int) (indicatorHeight * interpolatedRatio);
+
+                final int indicatorBottom = height + offsetPixels + interpolatedHeight;
+                final int indicatorTop = indicatorBottom - indicatorHeight;
+                if (mIndicatorAnimating) {
+                    final int finalLeft = mActiveRect.left + ((mActiveRect.width() - indicatorWidth) / 2);
+                    final int startLeft = mIndicatorStartPos;
+                    final int diff = finalLeft - startLeft;
+                    final int startOffset = (int) (diff * mIndicatorOffset);
+                    mIndicatorLeft = startLeft + startOffset;
+                } else {
+                    mIndicatorLeft = mActiveRect.left + ((mActiveRect.width() - indicatorWidth) / 2);
+                }
+
+                canvas.save();
+                canvas.clipRect(mIndicatorLeft, height + offsetPixels, mIndicatorLeft + indicatorWidth,
+                        indicatorBottom);
+                canvas.drawBitmap(mActiveIndicator, mIndicatorLeft, indicatorTop, null);
+                canvas.restore();
+            }
+        }
+    }
+
+    @Override
+    protected int getIndicatorStartPos() {
+        return mIndicatorLeft;
+    }
+
+    @Override
+    protected void initPeekScroller() {
+        final int dx = -mMenuSize / 3;
+        mPeekScroller.startScroll(0, 0, dx, 0, PEEK_DURATION);
+    }
+
+    @Override
+    protected void onOffsetPixelsChanged(int offsetPixels) {
+        if (USE_TRANSLATIONS) {
+            mContentContainer.setTranslationY(offsetPixels);
+            offsetMenu(offsetPixels);
+            invalidate();
+        } else {
+            mContentContainer.offsetTopAndBottom(offsetPixels - mContentContainer.getTop());
+            offsetMenu(offsetPixels);
+            invalidate();
+        }
+    }
+
+    //////////////////////////////////////////////////////////////////////
+    // Touch handling
+    //////////////////////////////////////////////////////////////////////
+
+    @Override
+    protected boolean isContentTouch(MotionEvent ev) {
+        return ev.getY() < getHeight() + mOffsetPixels;
+    }
+
+    @Override
+    protected boolean onDownAllowDrag(MotionEvent ev) {
+        final int height = getHeight();
+        return (!mMenuVisible && mInitialMotionY >= height - mTouchSize)
+                || (mMenuVisible && mInitialMotionY <= height + mOffsetPixels);
+    }
+
+    @Override
+    protected boolean onMoveAllowDrag(MotionEvent ev, float diff) {
+        final int height = getHeight();
+        return (!mMenuVisible && mInitialMotionY >= height - mTouchSize && (diff < 0))
+                || (mMenuVisible && mInitialMotionY <= height + mOffsetPixels);
+    }
+
+    @Override
+    protected void onMoveEvent(float dx) {
+        setOffsetPixels(Math.max(Math.min(mOffsetPixels + dx, 0), -mMenuSize));
+    }
+
+    @Override
+    protected void onUpEvent(MotionEvent ev) {
+        final int offsetPixels = (int) mOffsetPixels;
+
+        if (mIsDragging) {
+            mVelocityTracker.computeCurrentVelocity(1000, mMaxVelocity);
+            final int initialVelocity = (int) mVelocityTracker.getXVelocity();
+            mLastMotionY = ev.getY();
+            animateOffsetTo(mVelocityTracker.getYVelocity() < 0 ? -mMenuSize : 0, initialVelocity,
+                    true);
+
+            // Close the menu when content is clicked while the menu is visible.
+        } else if (mMenuVisible && ev.getY() < getHeight() + offsetPixels) {
+            closeMenu();
+        }
+    }
+}
diff --git a/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/BottomStaticDrawer.java b/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/BottomStaticDrawer.java
new file mode 100644
index 0000000000..df4b5f4997
--- /dev/null
+++ b/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/BottomStaticDrawer.java
@@ -0,0 +1,85 @@
+package net.simonvt.menudrawer;
+
+import android.app.Activity;
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.drawable.GradientDrawable;
+import android.util.AttributeSet;
+
+public class BottomStaticDrawer extends StaticDrawer {
+
+    private int mIndicatorLeft;
+
+    BottomStaticDrawer(Activity activity, int dragMode) {
+        super(activity, dragMode);
+    }
+
+    public BottomStaticDrawer(Context context) {
+        super(context);
+    }
+
+    public BottomStaticDrawer(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public BottomStaticDrawer(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+    }
+
+    @Override
+    protected void initDrawer(Context context, AttributeSet attrs, int defStyle) {
+        super.initDrawer(context, attrs, defStyle);
+        mPosition = Position.BOTTOM;
+    }
+
+    @Override
+    public void setDropShadowColor(int color) {
+        final int endColor = color & 0x00FFFFFF;
+        mDropShadowDrawable = new GradientDrawable(GradientDrawable.Orientation.TOP_BOTTOM, new int[] {
+                color,
+                endColor,
+        });
+        invalidate();
+    }
+
+    @Override
+    protected void drawIndicator(Canvas canvas) {
+        if (mActiveView != null && isViewDescendant(mActiveView)) {
+            Integer position = (Integer) mActiveView.getTag(R.id.mdActiveViewPosition);
+            final int pos = position == null ? 0 : position;
+
+            if (pos == mActivePosition) {
+                final int height = getHeight();
+                final int menuHeight = mMenuSize;
+                final int indicatorHeight = mActiveIndicator.getHeight();
+
+                mActiveView.getDrawingRect(mActiveRect);
+                offsetDescendantRectToMyCoords(mActiveView, mActiveRect);
+                final int indicatorWidth = mActiveIndicator.getWidth();
+
+                final int indicatorTop = height - menuHeight;
+                final int indicatorBottom = indicatorTop + indicatorHeight;
+                if (mIndicatorAnimating) {
+                    final int finalLeft = mActiveRect.left + ((mActiveRect.width() - indicatorWidth) / 2);
+                    final int startLeft = mIndicatorStartPos;
+                    final int diff = finalLeft - startLeft;
+                    final int startOffset = (int) (diff * mIndicatorOffset);
+                    mIndicatorLeft = startLeft + startOffset;
+                } else {
+                    mIndicatorLeft = mActiveRect.left + ((mActiveRect.width() - indicatorWidth) / 2);
+                }
+
+                canvas.save();
+                canvas.clipRect(mIndicatorLeft, indicatorTop, mIndicatorLeft + indicatorWidth,
+                        indicatorBottom);
+                canvas.drawBitmap(mActiveIndicator, mIndicatorLeft, indicatorTop, null);
+                canvas.restore();
+            }
+        }
+    }
+
+    @Override
+    protected int getIndicatorStartPos() {
+        return mIndicatorLeft;
+    }
+}
diff --git a/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/BuildLayerFrameLayout.java b/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/BuildLayerFrameLayout.java
new file mode 100644
index 0000000000..45f5aa13c5
--- /dev/null
+++ b/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/BuildLayerFrameLayout.java
@@ -0,0 +1,99 @@
+package net.simonvt.menudrawer;
+
+import android.content.Context;
+import android.graphics.Canvas;
+import android.util.AttributeSet;
+import android.widget.FrameLayout;
+
+/**
+ * FrameLayout which caches the hardware layer if available.
+ * <p/>
+ * If it's not posted twice the layer either wont be built on start, or it'll be built twice.
+ */
+public class BuildLayerFrameLayout extends FrameLayout {
+
+    private boolean mChanged;
+
+    private boolean mHardwareLayersEnabled = true;
+
+    private boolean mAttached;
+
+    private boolean mFirst = true;
+
+    public BuildLayerFrameLayout(Context context) {
+        super(context);
+        if (MenuDrawer.USE_TRANSLATIONS) {
+            setLayerType(LAYER_TYPE_HARDWARE, null);
+        }
+    }
+
+    public BuildLayerFrameLayout(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        if (MenuDrawer.USE_TRANSLATIONS) {
+            setLayerType(LAYER_TYPE_HARDWARE, null);
+        }
+    }
+
+    public BuildLayerFrameLayout(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+        if (MenuDrawer.USE_TRANSLATIONS) {
+            setLayerType(LAYER_TYPE_HARDWARE, null);
+        }
+    }
+
+    void setHardwareLayersEnabled(boolean enabled) {
+        mHardwareLayersEnabled = enabled;
+    }
+
+    @Override
+    protected void onAttachedToWindow() {
+        super.onAttachedToWindow();
+        mAttached = true;
+    }
+
+    @Override
+    protected void onDetachedFromWindow() {
+        super.onDetachedFromWindow();
+        mAttached = false;
+    }
+
+    @Override
+    protected void onSizeChanged(int w, int h, int oldw, int oldh) {
+        super.onSizeChanged(w, h, oldw, oldh);
+
+        if (MenuDrawer.USE_TRANSLATIONS && mHardwareLayersEnabled) {
+            post(new Runnable() {
+                @Override
+                public void run() {
+                    mChanged = true;
+                    invalidate();
+                }
+            });
+        }
+    }
+
+    @Override
+    protected void dispatchDraw(Canvas canvas) {
+        super.dispatchDraw(canvas);
+
+        if (mChanged && MenuDrawer.USE_TRANSLATIONS) {
+            post(new Runnable() {
+                @Override
+                public void run() {
+                    if (mAttached) {
+                        final int layerType = getLayerType();
+                        // If it's already a hardware layer, it'll be built anyway.
+                        if (layerType != LAYER_TYPE_HARDWARE || mFirst) {
+                            mFirst = false;
+                            setLayerType(LAYER_TYPE_HARDWARE, null);
+                            buildLayer();
+                            setLayerType(LAYER_TYPE_NONE, null);
+                        }
+                    }
+                }
+            });
+
+            mChanged = false;
+        }
+    }
+}
diff --git a/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/ColorDrawable.java b/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/ColorDrawable.java
new file mode 100644
index 0000000000..10a35e7fae
--- /dev/null
+++ b/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/ColorDrawable.java
@@ -0,0 +1,170 @@
+/*
+ * Copyright (C) 2008 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package net.simonvt.menudrawer;
+
+import android.content.res.Resources;
+import android.graphics.Canvas;
+import android.graphics.ColorFilter;
+import android.graphics.Paint;
+import android.graphics.PixelFormat;
+import android.graphics.drawable.Drawable;
+
+/**
+ * A specialized Drawable that fills the Canvas with a specified color.
+ * Note that a ColorDrawable ignores the ColorFilter.
+ * <p/>
+ * <p>It can be defined in an XML file with the <code>&lt;color></code> element.</p>
+ *
+ * @attr ref android.R.styleable#ColorDrawable_color
+ */
+public class ColorDrawable extends Drawable {
+
+    private ColorState mState;
+    private final Paint mPaint = new Paint();
+
+    /** Creates a new black ColorDrawable. */
+    public ColorDrawable() {
+        this(null);
+    }
+
+    /**
+     * Creates a new ColorDrawable with the specified color.
+     *
+     * @param color The color to draw.
+     */
+    public ColorDrawable(int color) {
+        this(null);
+        setColor(color);
+    }
+
+    private ColorDrawable(ColorState state) {
+        mState = new ColorState(state);
+    }
+
+    @Override
+    public int getChangingConfigurations() {
+        return super.getChangingConfigurations() | mState.mChangingConfigurations;
+    }
+
+    @Override
+    public void draw(Canvas canvas) {
+        if ((mState.mUseColor >>> 24) != 0) {
+            mPaint.setColor(mState.mUseColor);
+            canvas.drawRect(getBounds(), mPaint);
+        }
+    }
+
+    /**
+     * Gets the drawable's color value.
+     *
+     * @return int The color to draw.
+     */
+    public int getColor() {
+        return mState.mUseColor;
+    }
+
+    /**
+     * Sets the drawable's color value. This action will clobber the results of prior calls to
+     * {@link #setAlpha(int)} on this object, which side-affected the underlying color.
+     *
+     * @param color The color to draw.
+     */
+    public void setColor(int color) {
+        if (mState.mBaseColor != color || mState.mUseColor != color) {
+            invalidateSelf();
+            mState.mBaseColor = mState.mUseColor = color;
+        }
+    }
+
+    /**
+     * Returns the alpha value of this drawable's color.
+     *
+     * @return A value between 0 and 255.
+     */
+    public int getAlpha() {
+        return mState.mUseColor >>> 24;
+    }
+
+    /**
+     * Sets the color's alpha value.
+     *
+     * @param alpha The alpha value to set, between 0 and 255.
+     */
+    public void setAlpha(int alpha) {
+        alpha += alpha >> 7;   // make it 0..256
+        int baseAlpha = mState.mBaseColor >>> 24;
+        int useAlpha = baseAlpha * alpha >> 8;
+        int oldUseColor = mState.mUseColor;
+        mState.mUseColor = (mState.mBaseColor << 8 >>> 8) | (useAlpha << 24);
+        if (oldUseColor != mState.mUseColor) {
+            invalidateSelf();
+        }
+    }
+
+    /**
+     * Setting a color filter on a ColorDrawable has no effect.
+     *
+     * @param colorFilter Ignore.
+     */
+    public void setColorFilter(ColorFilter colorFilter) {
+    }
+
+    public int getOpacity() {
+        switch (mState.mUseColor >>> 24) {
+            case 255:
+                return PixelFormat.OPAQUE;
+            case 0:
+                return PixelFormat.TRANSPARENT;
+        }
+        return PixelFormat.TRANSLUCENT;
+    }
+
+    @Override
+    public ConstantState getConstantState() {
+        mState.mChangingConfigurations = getChangingConfigurations();
+        return mState;
+    }
+
+    static final class ColorState extends ConstantState {
+
+        int mBaseColor; // base color, independent of setAlpha()
+        int mUseColor;  // basecolor modulated by setAlpha()
+        int mChangingConfigurations;
+
+        ColorState(ColorState state) {
+            if (state != null) {
+                mBaseColor = state.mBaseColor;
+                mUseColor = state.mUseColor;
+            }
+        }
+
+        @Override
+        public Drawable newDrawable() {
+            return new ColorDrawable(this);
+        }
+
+        @Override
+        public Drawable newDrawable(Resources res) {
+            return new ColorDrawable(this);
+        }
+
+        @Override
+        public int getChangingConfigurations() {
+            return mChangingConfigurations;
+        }
+    }
+}
diff --git a/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/DraggableDrawer.java b/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/DraggableDrawer.java
new file mode 100644
index 0000000000..77fc98e5d3
--- /dev/null
+++ b/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/DraggableDrawer.java
@@ -0,0 +1,672 @@
+package net.simonvt.menudrawer;
+
+import android.app.Activity;
+import android.content.Context;
+import android.graphics.Canvas;
+import android.os.Build;
+import android.os.Bundle;
+import android.os.Parcelable;
+import android.util.AttributeSet;
+import android.view.MotionEvent;
+import android.view.VelocityTracker;
+import android.view.View;
+import android.view.ViewConfiguration;
+import android.view.ViewGroup;
+import android.view.animation.AccelerateInterpolator;
+import android.view.animation.Interpolator;
+
+public abstract class DraggableDrawer extends MenuDrawer {
+
+    /**
+     * Key used when saving menu visibility state.
+     */
+    private static final String STATE_MENU_VISIBLE = "net.simonvt.menudrawer.MenuDrawer.menuVisible";
+
+    /**
+     * Interpolator used for stretching/retracting the active indicator.
+     */
+    protected static final Interpolator INDICATOR_INTERPOLATOR = new AccelerateInterpolator();
+
+    /**
+     * Interpolator used for peeking at the drawer.
+     */
+    private static final Interpolator PEEK_INTERPOLATOR = new PeekInterpolator();
+
+    /**
+     * The maximum alpha of the dark menu overlay used for dimming the menu.
+     */
+    protected static final int MAX_MENU_OVERLAY_ALPHA = 185;
+
+    /**
+     * Default delay from {@link #peekDrawer()} is called until first animation is run.
+     */
+    private static final long DEFAULT_PEEK_START_DELAY = 5000;
+
+    /**
+     * Default delay between each subsequent animation, after {@link #peekDrawer()} has been called.
+     */
+    private static final long DEFAULT_PEEK_DELAY = 10000;
+
+    /**
+     * The duration of the peek animation.
+     */
+    protected static final int PEEK_DURATION = 5000;
+
+    /**
+     * Distance in dp from closed position from where the drawer is considered closed with regards to touch events.
+     */
+    private static final int CLOSE_ENOUGH = 3;
+
+    /**
+     * Slop before starting a drag.
+     */
+    protected int mTouchSlop;
+
+    /**
+     * Runnable used when the peek animation is running.
+     */
+    protected final Runnable mPeekRunnable = new Runnable() {
+        @Override
+        public void run() {
+            peekDrawerInvalidate();
+        }
+    };
+
+    /**
+     * Runnable used when animating the drawer open/closed.
+     */
+    private final Runnable mDragRunnable = new Runnable() {
+        @Override
+        public void run() {
+            postAnimationInvalidate();
+        }
+    };
+
+    /**
+     * Current left position of the content.
+     */
+    protected float mOffsetPixels;
+
+    /**
+     * Indicates whether the drawer is currently being dragged.
+     */
+    protected boolean mIsDragging;
+
+    /**
+     * The initial X position of a drag.
+     */
+    protected float mInitialMotionX;
+
+    /**
+     * The initial Y position of a drag.
+     */
+    protected float mInitialMotionY;
+
+    /**
+     * The last X position of a drag.
+     */
+    protected float mLastMotionX = -1;
+
+    /**
+     * The last Y position of a drag.
+     */
+    protected float mLastMotionY = -1;
+
+    /**
+     * Default delay between each subsequent animation, after {@link #peekDrawer()} has been called.
+     */
+    protected long mPeekDelay;
+
+    /**
+     * Scroller used for the peek drawer animation.
+     */
+    protected Scroller mPeekScroller;
+
+    /**
+     * Velocity tracker used when animating the drawer open/closed after a drag.
+     */
+    protected VelocityTracker mVelocityTracker;
+
+    /**
+     * Maximum velocity allowed when animating the drawer open/closed.
+     */
+    protected int mMaxVelocity;
+
+    /**
+     * Indicates whether the menu should be offset when dragging the drawer.
+     */
+    protected boolean mOffsetMenu = true;
+
+    /**
+     * Distance in px from closed position from where the drawer is considered closed with regards to touch events.
+     */
+    protected int mCloseEnough;
+
+    /**
+     * Runnable used for first call to {@link #startPeek()} after {@link #peekDrawer()}  has been called.
+     */
+    private Runnable mPeekStartRunnable;
+
+    /**
+     * Scroller used when animating the drawer open/closed.
+     */
+    private Scroller mScroller;
+
+    /**
+     * Indicates whether the current layer type is {@link android.view.View#LAYER_TYPE_HARDWARE}.
+     */
+    private boolean mLayerTypeHardware;
+
+    DraggableDrawer(Activity activity, int dragMode) {
+        super(activity, dragMode);
+    }
+
+    public DraggableDrawer(Context context) {
+        super(context);
+    }
+
+    public DraggableDrawer(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public DraggableDrawer(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+    }
+
+    @Override
+    protected void initDrawer(Context context, AttributeSet attrs, int defStyle) {
+        super.initDrawer(context, attrs, defStyle);
+
+        final ViewConfiguration configuration = ViewConfiguration.get(context);
+        mTouchSlop = configuration.getScaledTouchSlop();
+        mMaxVelocity = configuration.getScaledMaximumFlingVelocity();
+
+        mScroller = new Scroller(context, MenuDrawer.SMOOTH_INTERPOLATOR);
+        mPeekScroller = new Scroller(context, DraggableDrawer.PEEK_INTERPOLATOR);
+
+        mCloseEnough = dpToPx(DraggableDrawer.CLOSE_ENOUGH);
+    }
+
+    public void toggleMenu(boolean animate) {
+        if (mDrawerState == STATE_OPEN || mDrawerState == STATE_OPENING) {
+            closeMenu(animate);
+        } else if (mDrawerState == STATE_CLOSED || mDrawerState == STATE_CLOSING) {
+            openMenu(animate);
+        }
+    }
+
+    public boolean isMenuVisible() {
+        return mMenuVisible;
+    }
+
+    public void setMenuSize(final int size) {
+        mMenuSize = size;
+        mMenuSizeSet = true;
+        if (mDrawerState == STATE_OPEN || mDrawerState == STATE_OPENING) {
+            setOffsetPixels(mMenuSize);
+        }
+        requestLayout();
+        invalidate();
+    }
+
+    public void setOffsetMenuEnabled(boolean offsetMenu) {
+        if (offsetMenu != mOffsetMenu) {
+            mOffsetMenu = offsetMenu;
+            requestLayout();
+            invalidate();
+        }
+    }
+
+    public boolean getOffsetMenuEnabled() {
+        return mOffsetMenu;
+    }
+
+    public void peekDrawer() {
+        peekDrawer(DEFAULT_PEEK_START_DELAY, DEFAULT_PEEK_DELAY);
+    }
+
+    public void peekDrawer(long delay) {
+        peekDrawer(DEFAULT_PEEK_START_DELAY, delay);
+    }
+
+    public void peekDrawer(final long startDelay, final long delay) {
+        if (startDelay < 0) {
+            throw new IllegalArgumentException("startDelay must be zero or larger.");
+        }
+        if (delay < 0) {
+            throw new IllegalArgumentException("delay must be zero or larger");
+        }
+
+        removeCallbacks(mPeekRunnable);
+        removeCallbacks(mPeekStartRunnable);
+
+        mPeekDelay = delay;
+        mPeekStartRunnable = new Runnable() {
+            @Override
+            public void run() {
+                startPeek();
+            }
+        };
+        postDelayed(mPeekStartRunnable, startDelay);
+    }
+
+    public void setHardwareLayerEnabled(boolean enabled) {
+        if (enabled != mHardwareLayersEnabled) {
+            mHardwareLayersEnabled = enabled;
+            mMenuContainer.setHardwareLayersEnabled(enabled);
+            mContentContainer.setHardwareLayersEnabled(enabled);
+            stopLayerTranslation();
+        }
+    }
+
+    public int getTouchMode() {
+        return mTouchMode;
+    }
+
+    public void setTouchMode(int mode) {
+        if (mTouchMode != mode) {
+            mTouchMode = mode;
+            updateTouchAreaSize();
+        }
+    }
+
+    public void setTouchBezelSize(int size) {
+        mTouchBezelSize = size;
+    }
+
+    public int getTouchBezelSize() {
+        return mTouchBezelSize;
+    }
+
+    /**
+     * Sets the number of pixels the content should be offset.
+     *
+     * @param offsetPixels The number of pixels to offset the content by.
+     */
+    protected void setOffsetPixels(float offsetPixels) {
+        final int oldOffset = (int) mOffsetPixels;
+        final int newOffset = (int) offsetPixels;
+
+        mOffsetPixels = offsetPixels;
+
+        if (newOffset != oldOffset) {
+            onOffsetPixelsChanged(newOffset);
+            mMenuVisible = newOffset != 0;
+        }
+    }
+
+    /**
+     * Called when the number of pixels the content should be offset by has changed.
+     *
+     * @param offsetPixels The number of pixels to offset the content by.
+     */
+    protected abstract void onOffsetPixelsChanged(int offsetPixels);
+
+    /**
+     * If possible, set the layer type to {@link android.view.View#LAYER_TYPE_HARDWARE}.
+     */
+    protected void startLayerTranslation() {
+        if (USE_TRANSLATIONS && mHardwareLayersEnabled && !mLayerTypeHardware) {
+            mLayerTypeHardware = true;
+            mContentContainer.setLayerType(View.LAYER_TYPE_HARDWARE, null);
+            mMenuContainer.setLayerType(View.LAYER_TYPE_HARDWARE, null);
+        }
+    }
+
+    /**
+     * If the current layer type is {@link android.view.View#LAYER_TYPE_HARDWARE}, this will set it to
+     * {@link View#LAYER_TYPE_NONE}.
+     */
+    private void stopLayerTranslation() {
+        if (mLayerTypeHardware) {
+            mLayerTypeHardware = false;
+            mContentContainer.setLayerType(View.LAYER_TYPE_NONE, null);
+            mMenuContainer.setLayerType(View.LAYER_TYPE_NONE, null);
+        }
+    }
+
+    /**
+     * Compute the touch area based on the touch mode.
+     */
+    protected void updateTouchAreaSize() {
+        if (mTouchMode == TOUCH_MODE_BEZEL) {
+            mTouchSize = mTouchBezelSize;
+        } else if (mTouchMode == TOUCH_MODE_FULLSCREEN) {
+            mTouchSize = getMeasuredWidth();
+        } else {
+            mTouchSize = 0;
+        }
+    }
+
+    /**
+     * Called when a drag has been ended.
+     */
+    protected void endDrag() {
+        mIsDragging = false;
+
+        if (mVelocityTracker != null) {
+            mVelocityTracker.recycle();
+            mVelocityTracker = null;
+        }
+    }
+
+    /**
+     * Stops ongoing animation of the drawer.
+     */
+    protected void stopAnimation() {
+        removeCallbacks(mDragRunnable);
+        mScroller.abortAnimation();
+        stopLayerTranslation();
+    }
+
+    /**
+     * Called when a drawer animation has successfully completed.
+     */
+    private void completeAnimation() {
+        mScroller.abortAnimation();
+        final int finalX = mScroller.getFinalX();
+        setOffsetPixels(finalX);
+        setDrawerState(finalX == 0 ? STATE_CLOSED : STATE_OPEN);
+        stopLayerTranslation();
+    }
+
+    /**
+     * Moves the drawer to the position passed.
+     *
+     * @param position The position the content is moved to.
+     * @param velocity Optional velocity if called by releasing a drag event.
+     * @param animate  Whether the move is animated.
+     */
+    protected void animateOffsetTo(int position, int velocity, boolean animate) {
+        endDrag();
+        endPeek();
+
+        final int startX = (int) mOffsetPixels;
+        final int dx = position - startX;
+        if (dx == 0 || !animate) {
+            setOffsetPixels(position);
+            setDrawerState(position == 0 ? STATE_CLOSED : STATE_OPEN);
+            stopLayerTranslation();
+            return;
+        }
+
+        int duration;
+
+        velocity = Math.abs(velocity);
+        if (velocity > 0) {
+            duration = 4 * Math.round(1000.f * Math.abs((float) dx / velocity));
+        } else {
+            duration = (int) (600.f * Math.abs((float) dx / mMenuSize));
+        }
+
+        duration = Math.min(duration, mMaxAnimationDuration);
+
+        if (dx > 0) {
+            setDrawerState(STATE_OPENING);
+            mScroller.startScroll(startX, 0, dx, 0, duration);
+        } else {
+            setDrawerState(STATE_CLOSING);
+            mScroller.startScroll(startX, 0, dx, 0, duration);
+        }
+
+        startLayerTranslation();
+
+        postAnimationInvalidate();
+    }
+
+    /**
+     * Callback when each frame in the drawer animation should be drawn.
+     */
+    private void postAnimationInvalidate() {
+        if (mScroller.computeScrollOffset()) {
+            final int oldX = (int) mOffsetPixels;
+            final int x = mScroller.getCurrX();
+
+            if (x != oldX) setOffsetPixels(x);
+            if (x != mScroller.getFinalX()) {
+                postOnAnimation(mDragRunnable);
+                return;
+            }
+        }
+
+        completeAnimation();
+    }
+
+    /**
+     * Starts peek drawer animation.
+     */
+    protected void startPeek() {
+        initPeekScroller();
+
+        startLayerTranslation();
+        peekDrawerInvalidate();
+    }
+
+    protected abstract void initPeekScroller();
+
+    /**
+     * Callback when each frame in the peek drawer animation should be drawn.
+     */
+    private void peekDrawerInvalidate() {
+        if (mPeekScroller.computeScrollOffset()) {
+            final int oldX = (int) mOffsetPixels;
+            final int x = mPeekScroller.getCurrX();
+            if (x != oldX) setOffsetPixels(x);
+
+            if (!mPeekScroller.isFinished()) {
+                postOnAnimation(mPeekRunnable);
+                return;
+
+            } else if (mPeekDelay > 0) {
+                mPeekStartRunnable = new Runnable() {
+                    @Override
+                    public void run() {
+                        startPeek();
+                    }
+                };
+                postDelayed(mPeekStartRunnable, mPeekDelay);
+            }
+        }
+
+        completePeek();
+    }
+
+    /**
+     * Called when the peek drawer animation has successfully completed.
+     */
+    private void completePeek() {
+        mPeekScroller.abortAnimation();
+
+        setOffsetPixels(0);
+
+        setDrawerState(STATE_CLOSED);
+        stopLayerTranslation();
+    }
+
+    /**
+     * Stops ongoing peek drawer animation.
+     */
+    protected void endPeek() {
+        removeCallbacks(mPeekStartRunnable);
+        removeCallbacks(mPeekRunnable);
+        stopLayerTranslation();
+    }
+
+    protected boolean isCloseEnough() {
+        return Math.abs(mOffsetPixels) <= mCloseEnough;
+    }
+
+    /**
+     * Returns true if the touch event occurs over the content.
+     *
+     * @param ev The motion event.
+     * @return True if the touch event occurred over the content, false otherwise.
+     */
+    protected abstract boolean isContentTouch(MotionEvent ev);
+
+    /**
+     * Returns true if dragging the content should be allowed.
+     *
+     * @param ev The motion event.
+     * @return True if dragging the content should be allowed, false otherwise.
+     */
+    protected abstract boolean onDownAllowDrag(MotionEvent ev);
+
+    /**
+     * Tests scrollability within child views of v given a delta of dx.
+     *
+     * @param v      View to test for horizontal scrollability
+     * @param checkV Whether the view should be checked for draggability
+     * @param dx     Delta scrolled in pixels
+     * @param x      X coordinate of the active touch point
+     * @param y      Y coordinate of the active touch point
+     * @return true if child views of v can be scrolled by delta of dx.
+     */
+    protected boolean canChildScrollHorizontally(View v, boolean checkV, int dx, int x, int y) {
+        if (v instanceof ViewGroup) {
+            final ViewGroup group = (ViewGroup) v;
+
+            final int count = group.getChildCount();
+            // Count backwards - let topmost views consume scroll distance first.
+            for (int i = count - 1; i >= 0; i--) {
+                final View child = group.getChildAt(i);
+
+                final int childLeft = child.getLeft() + supportGetTranslationX(child);
+                final int childRight = child.getRight() + supportGetTranslationX(child);
+                final int childTop = child.getTop() + supportGetTranslationY(child);
+                final int childBottom = child.getBottom() + supportGetTranslationY(child);
+
+                if (x >= childLeft && x < childRight && y >= childTop && y < childBottom
+                        &&  canChildScrollHorizontally(child, true, dx, x - childLeft, y - childTop)) {
+                    return true;
+                }
+            }
+        }
+
+        return checkV && mOnInterceptMoveEventListener.isViewDraggable(v, dx, x, y);
+    }
+
+    /**
+     * Tests scrollability within child views of v given a delta of dx.
+     *
+     * @param v      View to test for horizontal scrollability
+     * @param checkV Whether the view should be checked for draggability
+     * @param dx     Delta scrolled in pixels
+     * @param x      X coordinate of the active touch point
+     * @param y      Y coordinate of the active touch point
+     * @return true if child views of v can be scrolled by delta of dx.
+     */
+    protected boolean canChildScrollVertically(View v, boolean checkV, int dx, int x, int y) {
+        if (v instanceof ViewGroup) {
+            final ViewGroup group = (ViewGroup) v;
+
+            final int count = group.getChildCount();
+            // Count backwards - let topmost views consume scroll distance first.
+            for (int i = count - 1; i >= 0; i--) {
+                final View child = group.getChildAt(i);
+
+                final int childLeft = child.getLeft() + supportGetTranslationX(child);
+                final int childRight = child.getRight() + supportGetTranslationX(child);
+                final int childTop = child.getTop() + supportGetTranslationY(child);
+                final int childBottom = child.getBottom() + supportGetTranslationY(child);
+
+                if (x >= childLeft && x < childRight && y >= childTop && y < childBottom
+                        && canChildScrollVertically(child, true, dx, x - childLeft, y - childTop)) {
+                    return true;
+                }
+            }
+        }
+
+        return checkV && mOnInterceptMoveEventListener.isViewDraggable(v, dx, x, y);
+    }
+
+    private int supportGetTranslationY(View v) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
+            return (int) v.getTranslationY();
+        }
+
+        return 0;
+    }
+
+    private int supportGetTranslationX(View v) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
+            return (int) v.getTranslationX();
+        }
+
+        return 0;
+    }
+
+    /**
+     * Returns true if dragging the content should be allowed.
+     *
+     * @param ev The motion event.
+     * @return True if dragging the content should be allowed, false otherwise.
+     */
+    protected abstract boolean onMoveAllowDrag(MotionEvent ev, float dx);
+
+    /**
+     * Called when a move event has happened while dragging the content is in progress.
+     *
+     * @param dx The X difference between the last motion event and the current motion event.
+     */
+    protected abstract void onMoveEvent(float dx);
+
+    /**
+     * Called when {@link android.view.MotionEvent#ACTION_UP} of {@link android.view.MotionEvent#ACTION_CANCEL} is
+     * delivered to {@link net.simonvt.menudrawer.MenuDrawer#onTouchEvent(android.view.MotionEvent)}.
+     *
+     * @param ev The motion event.
+     */
+    protected abstract void onUpEvent(MotionEvent ev);
+
+    @Override
+    protected void dispatchDraw(Canvas canvas) {
+        super.dispatchDraw(canvas);
+        final int offsetPixels = (int) mOffsetPixels;
+
+        if (offsetPixels != 0) drawMenuOverlay(canvas, offsetPixels);
+        if (mDropShadowEnabled) drawDropShadow(canvas, offsetPixels);
+        if (mActiveIndicator != null) drawIndicator(canvas, offsetPixels);
+    }
+
+    /**
+     * Called when the content drop shadow should be drawn.
+     *
+     * @param canvas       The canvas on which to draw.
+     * @param offsetPixels Value in pixels indicating the offset.
+     */
+    protected abstract void drawDropShadow(Canvas canvas, int offsetPixels);
+
+    /**
+     * Called when the menu overlay should be drawn.
+     *
+     * @param canvas       The canvas on which to draw.
+     * @param offsetPixels Value in pixels indicating the offset.
+     */
+    protected abstract void drawMenuOverlay(Canvas canvas, int offsetPixels);
+
+    /**
+     * Called when the active indicator should be drawn.
+     *
+     * @param canvas       The canvas on which to draw.
+     * @param offsetPixels Value in pixels indicating the offset.
+     */
+    protected abstract void drawIndicator(Canvas canvas, int offsetPixels);
+
+    void saveState(Bundle state) {
+        final boolean menuVisible = mDrawerState == STATE_OPEN || mDrawerState == STATE_OPENING;
+        state.putBoolean(STATE_MENU_VISIBLE, menuVisible);
+    }
+
+    public void restoreState(Parcelable in) {
+        super.restoreState(in);
+        Bundle state = (Bundle) in;
+        final boolean menuOpen = state.getBoolean(STATE_MENU_VISIBLE);
+        if (menuOpen) {
+            openMenu(false);
+        } else {
+            setOffsetPixels(0);
+        }
+        mDrawerState = menuOpen ? STATE_OPEN : STATE_CLOSED;
+    }
+}
diff --git a/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/FloatScroller.java b/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/FloatScroller.java
new file mode 100644
index 0000000000..df5b445cd7
--- /dev/null
+++ b/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/FloatScroller.java
@@ -0,0 +1,175 @@
+/*
+ * Copyright (C) 2006 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package net.simonvt.menudrawer;
+
+import android.view.animation.AnimationUtils;
+import android.view.animation.Interpolator;
+
+/**
+ * This class encapsulates scrolling.  The duration of the scroll
+ * can be passed in the constructor and specifies the maximum time that
+ * the scrolling animation should take.  Past this time, the scrolling is
+ * automatically moved to its final stage and computeScrollOffset()
+ * will always return false to indicate that scrolling is over.
+ */
+public class FloatScroller {
+
+    private float mStart;
+    private float mFinal;
+
+    private float mCurr;
+    private long mStartTime;
+    private int mDuration;
+    private float mDurationReciprocal;
+    private float mDeltaX;
+    private boolean mFinished;
+    private Interpolator mInterpolator;
+
+    /**
+     * Create a Scroller with the specified interpolator. If the interpolator is
+     * null, the default (viscous) interpolator will be used. Specify whether or
+     * not to support progressive "flywheel" behavior in flinging.
+     */
+    public FloatScroller(Interpolator interpolator) {
+        mFinished = true;
+        mInterpolator = interpolator;
+    }
+
+    /**
+     * Returns whether the scroller has finished scrolling.
+     *
+     * @return True if the scroller has finished scrolling, false otherwise.
+     */
+    public final boolean isFinished() {
+        return mFinished;
+    }
+
+    /**
+     * Force the finished field to a particular value.
+     *
+     * @param finished The new finished value.
+     */
+    public final void forceFinished(boolean finished) {
+        mFinished = finished;
+    }
+
+    /**
+     * Returns how long the scroll event will take, in milliseconds.
+     *
+     * @return The duration of the scroll in milliseconds.
+     */
+    public final int getDuration() {
+        return mDuration;
+    }
+
+    /**
+     * Returns the current offset in the scroll.
+     *
+     * @return The new offset as an absolute distance from the origin.
+     */
+    public final float getCurr() {
+        return mCurr;
+    }
+
+    /**
+     * Returns the start offset in the scroll.
+     *
+     * @return The start offset as an absolute distance from the origin.
+     */
+    public final float getStart() {
+        return mStart;
+    }
+
+    /**
+     * Returns where the scroll will end. Valid only for "fling" scrolls.
+     *
+     * @return The final offset as an absolute distance from the origin.
+     */
+    public final float getFinal() {
+        return mFinal;
+    }
+
+    public boolean computeScrollOffset() {
+        if (mFinished) {
+            return false;
+        }
+
+        int timePassed = (int) (AnimationUtils.currentAnimationTimeMillis() - mStartTime);
+
+        if (timePassed < mDuration) {
+            float x = timePassed * mDurationReciprocal;
+            x = mInterpolator.getInterpolation(x);
+            mCurr = mStart + x * mDeltaX;
+
+        } else {
+            mCurr = mFinal;
+            mFinished = true;
+        }
+        return true;
+    }
+
+    public void startScroll(float start, float delta, int duration) {
+        mFinished = false;
+        mDuration = duration;
+        mStartTime = AnimationUtils.currentAnimationTimeMillis();
+        mStart = start;
+        mFinal = start + delta;
+        mDeltaX = delta;
+        mDurationReciprocal = 1.0f / (float) mDuration;
+    }
+
+    /**
+     * Stops the animation. Contrary to {@link #forceFinished(boolean)},
+     * aborting the animating cause the scroller to move to the final x and y
+     * position
+     *
+     * @see #forceFinished(boolean)
+     */
+    public void abortAnimation() {
+        mCurr = mFinal;
+        mFinished = true;
+    }
+
+    /**
+     * Extend the scroll animation. This allows a running animation to scroll
+     * further and longer, when used with {@link #setFinal(float)}.
+     *
+     * @param extend Additional time to scroll in milliseconds.
+     * @see #setFinal(float)
+     */
+    public void extendDuration(int extend) {
+        int passed = timePassed();
+        mDuration = passed + extend;
+        mDurationReciprocal = 1.0f / mDuration;
+        mFinished = false;
+    }
+
+    /**
+     * Returns the time elapsed since the beginning of the scrolling.
+     *
+     * @return The elapsed time in milliseconds.
+     */
+    public int timePassed() {
+        return (int) (AnimationUtils.currentAnimationTimeMillis() - mStartTime);
+    }
+
+    public void setFinal(float newVal) {
+        mFinal = newVal;
+        mDeltaX = mFinal - mStart;
+        mFinished = false;
+    }
+}
diff --git a/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/HorizontalDrawer.java b/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/HorizontalDrawer.java
new file mode 100644
index 0000000000..6f1c8300f7
--- /dev/null
+++ b/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/HorizontalDrawer.java
@@ -0,0 +1,207 @@
+package net.simonvt.menudrawer;
+
+import android.app.Activity;
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.MotionEvent;
+import android.view.VelocityTracker;
+
+public abstract class HorizontalDrawer extends DraggableDrawer {
+
+    private static final String TAG = "HorizontalDrawer";
+
+    HorizontalDrawer(Activity activity, int dragMode) {
+        super(activity, dragMode);
+    }
+
+    public HorizontalDrawer(Context context) {
+        super(context);
+    }
+
+    public HorizontalDrawer(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public HorizontalDrawer(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+    }
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        final int widthMode = MeasureSpec.getMode(widthMeasureSpec);
+        final int heightMode = MeasureSpec.getMode(heightMeasureSpec);
+
+        if (widthMode != MeasureSpec.EXACTLY || heightMode != MeasureSpec.EXACTLY) {
+            throw new IllegalStateException("Must measure with an exact size");
+        }
+
+        final int width = MeasureSpec.getSize(widthMeasureSpec);
+        final int height = MeasureSpec.getSize(heightMeasureSpec);
+
+        if (!mMenuSizeSet) mMenuSize = (int) (width * 0.8f);
+        if (mOffsetPixels == -1) openMenu(false);
+
+        final int menuWidthMeasureSpec = getChildMeasureSpec(widthMeasureSpec, 0, mMenuSize);
+        final int menuHeightMeasureSpec = getChildMeasureSpec(widthMeasureSpec, 0, height);
+        mMenuContainer.measure(menuWidthMeasureSpec, menuHeightMeasureSpec);
+
+        final int contentWidthMeasureSpec = getChildMeasureSpec(widthMeasureSpec, 0, width);
+        final int contentHeightMeasureSpec = getChildMeasureSpec(widthMeasureSpec, 0, height);
+        mContentContainer.measure(contentWidthMeasureSpec, contentHeightMeasureSpec);
+
+        setMeasuredDimension(width, height);
+
+        updateTouchAreaSize();
+    }
+
+    @Override
+    public boolean onInterceptTouchEvent(MotionEvent ev) {
+        final int action = ev.getAction() & MotionEvent.ACTION_MASK;
+
+        if (action == MotionEvent.ACTION_DOWN && mMenuVisible && isCloseEnough()) {
+            setOffsetPixels(0);
+            stopAnimation();
+            endPeek();
+            setDrawerState(STATE_CLOSED);
+        }
+
+        // Always intercept events over the content while menu is visible.
+        if (mMenuVisible && isContentTouch(ev)) return true;
+
+        if (mTouchMode == TOUCH_MODE_NONE) {
+            return false;
+        }
+
+        if (action != MotionEvent.ACTION_DOWN) {
+            if (mIsDragging) return true;
+        }
+
+        switch (action) {
+            case MotionEvent.ACTION_DOWN: {
+                mLastMotionX = mInitialMotionX = ev.getX();
+                mLastMotionY = mInitialMotionY = ev.getY();
+                final boolean allowDrag = onDownAllowDrag(ev);
+
+                if (allowDrag) {
+                    setDrawerState(mMenuVisible ? STATE_OPEN : STATE_CLOSED);
+                    stopAnimation();
+                    endPeek();
+                    mIsDragging = false;
+                }
+                break;
+            }
+
+            case MotionEvent.ACTION_MOVE: {
+                final float x = ev.getX();
+                final float dx = x - mLastMotionX;
+                final float xDiff = Math.abs(dx);
+                final float y = ev.getY();
+                final float yDiff = Math.abs(y - mLastMotionY);
+
+                if (xDiff > mTouchSlop && xDiff > yDiff) {
+                    if (mOnInterceptMoveEventListener != null && mTouchMode == TOUCH_MODE_FULLSCREEN
+                            && canChildScrollHorizontally(mContentContainer, false, (int) dx, (int) x, (int) y)) {
+                        endDrag(); // Release the velocity tracker
+                        return false;
+                    }
+
+                    final boolean allowDrag = onMoveAllowDrag(ev, dx);
+
+                    if (allowDrag) {
+                        setDrawerState(STATE_DRAGGING);
+                        mIsDragging = true;
+                        mLastMotionX = x;
+                        mLastMotionY = y;
+                    }
+                }
+                break;
+            }
+
+            /**
+             * If you click really fast, an up or cancel event is delivered here.
+             * Just snap content to whatever is closest.
+             * */
+            case MotionEvent.ACTION_CANCEL:
+            case MotionEvent.ACTION_UP: {
+                if (Math.abs(mOffsetPixels) > mMenuSize / 2) {
+                    openMenu();
+                } else {
+                    closeMenu();
+                }
+                break;
+            }
+        }
+
+        if (mVelocityTracker == null) mVelocityTracker = VelocityTracker.obtain();
+        mVelocityTracker.addMovement(ev);
+
+        return mIsDragging;
+    }
+
+    @Override
+    public boolean onTouchEvent(MotionEvent ev) {
+        if (!mMenuVisible && !mIsDragging && (mTouchMode == TOUCH_MODE_NONE)) {
+            return false;
+        }
+        final int action = ev.getAction() & MotionEvent.ACTION_MASK;
+
+        if (mVelocityTracker == null) mVelocityTracker = VelocityTracker.obtain();
+        mVelocityTracker.addMovement(ev);
+
+        switch (action) {
+            case MotionEvent.ACTION_DOWN: {
+                mLastMotionX = mInitialMotionX = ev.getX();
+                mLastMotionY = mInitialMotionY = ev.getY();
+                final boolean allowDrag = onDownAllowDrag(ev);
+
+                if (allowDrag) {
+                    stopAnimation();
+                    endPeek();
+                    startLayerTranslation();
+                }
+                break;
+            }
+
+            case MotionEvent.ACTION_MOVE: {
+                if (!mIsDragging) {
+                    final float x = ev.getX();
+                    final float dx = x - mLastMotionX;
+                    final float xDiff = Math.abs(dx);
+                    final float y = ev.getY();
+                    final float yDiff = Math.abs(y - mLastMotionY);
+
+                    if (xDiff > mTouchSlop && xDiff > yDiff) {
+                        final boolean allowDrag = onMoveAllowDrag(ev, dx);
+
+                        if (allowDrag) {
+                            setDrawerState(STATE_DRAGGING);
+                            mIsDragging = true;
+                            mLastMotionX = x - mInitialMotionX > 0
+                                    ? mInitialMotionX + mTouchSlop
+                                    : mInitialMotionX - mTouchSlop;
+                        }
+                    }
+                }
+
+                if (mIsDragging) {
+                    startLayerTranslation();
+
+                    final float x = ev.getX();
+                    final float dx = x - mLastMotionX;
+
+                    mLastMotionX = x;
+                    onMoveEvent(dx);
+                }
+                break;
+            }
+
+            case MotionEvent.ACTION_CANCEL:
+            case MotionEvent.ACTION_UP: {
+                onUpEvent(ev);
+                break;
+            }
+        }
+
+        return true;
+    }
+}
diff --git a/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/LeftDrawer.java b/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/LeftDrawer.java
new file mode 100644
index 0000000000..59a4fc4ce2
--- /dev/null
+++ b/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/LeftDrawer.java
@@ -0,0 +1,212 @@
+package net.simonvt.menudrawer;
+
+import android.app.Activity;
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.drawable.GradientDrawable;
+import android.util.AttributeSet;
+import android.view.MotionEvent;
+
+public class LeftDrawer extends HorizontalDrawer {
+
+    private int mIndicatorTop;
+
+    LeftDrawer(Activity activity, int dragMode) {
+        super(activity, dragMode);
+    }
+
+    public LeftDrawer(Context context) {
+        super(context);
+    }
+
+    public LeftDrawer(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public LeftDrawer(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+    }
+
+    @Override
+    public void openMenu(boolean animate) {
+        animateOffsetTo(mMenuSize, 0, animate);
+    }
+
+    @Override
+    public void closeMenu(boolean animate) {
+        animateOffsetTo(0, 0, animate);
+    }
+
+    @Override
+    public void setDropShadowColor(int color) {
+        final int endColor = color & 0x00FFFFFF;
+        mDropShadowDrawable = new GradientDrawable(GradientDrawable.Orientation.RIGHT_LEFT, new int[] {
+                color,
+                endColor,
+        });
+        invalidate();
+    }
+
+    @Override
+    protected void onLayout(boolean changed, int l, int t, int r, int b) {
+        final int width = r - l;
+        final int height = b - t;
+        final int offsetPixels = (int) mOffsetPixels;
+
+        mMenuContainer.layout(0, 0, mMenuSize, height);
+        offsetMenu(offsetPixels);
+
+        if (USE_TRANSLATIONS) {
+            mContentContainer.layout(0, 0, width, height);
+        } else {
+            mContentContainer.layout(offsetPixels, 0, width + offsetPixels, height);
+        }
+    }
+
+    /**
+     * Offsets the menu relative to its original position based on the position of the content.
+     *
+     * @param offsetPixels The number of pixels the content if offset.
+     */
+    private void offsetMenu(int offsetPixels) {
+        if (mOffsetMenu && mMenuSize != 0) {
+            final int menuWidth = mMenuSize;
+            final float openRatio = (menuWidth - (float) offsetPixels) / menuWidth;
+
+            if (USE_TRANSLATIONS) {
+                if (offsetPixels > 0) {
+                    final int menuLeft = (int) (0.25f * (-openRatio * menuWidth));
+                    mMenuContainer.setTranslationX(menuLeft);
+                } else {
+                    mMenuContainer.setTranslationX(-menuWidth);
+                }
+
+            } else {
+                final int oldMenuLeft = mMenuContainer.getLeft();
+                final int offset = (int) (0.25f * (-openRatio * menuWidth)) - oldMenuLeft;
+                mMenuContainer.offsetLeftAndRight(offset);
+                mMenuContainer.setVisibility(offsetPixels == 0 ? INVISIBLE : VISIBLE);
+            }
+        }
+    }
+
+    @Override
+    protected void drawDropShadow(Canvas canvas, int offsetPixels) {
+        final int height = getHeight();
+
+        mDropShadowDrawable.setBounds(offsetPixels - mDropShadowSize, 0, offsetPixels, height);
+        mDropShadowDrawable.draw(canvas);
+    }
+
+    @Override
+    protected void drawMenuOverlay(Canvas canvas, int offsetPixels) {
+        final int height = getHeight();
+        final float openRatio = ((float) offsetPixels) / mMenuSize;
+
+        mMenuOverlay.setBounds(0, 0, offsetPixels, height);
+        mMenuOverlay.setAlpha((int) (MAX_MENU_OVERLAY_ALPHA * (1.f - openRatio)));
+        mMenuOverlay.draw(canvas);
+    }
+
+    @Override
+    protected void drawIndicator(Canvas canvas, int offsetPixels) {
+        if (mActiveView != null && isViewDescendant(mActiveView)) {
+            Integer position = (Integer) mActiveView.getTag(R.id.mdActiveViewPosition);
+            final int pos = position == null ? 0 : position;
+
+            if (pos == mActivePosition) {
+                final float openRatio = ((float) offsetPixels) / mMenuSize;
+
+                mActiveView.getDrawingRect(mActiveRect);
+                offsetDescendantRectToMyCoords(mActiveView, mActiveRect);
+
+                final float interpolatedRatio = 1.f - INDICATOR_INTERPOLATOR.getInterpolation((1.f - openRatio));
+                final int interpolatedWidth = (int) (mActiveIndicator.getWidth() * interpolatedRatio);
+
+                if (mIndicatorAnimating) {
+                    final int indicatorFinalTop = mActiveRect.top + ((mActiveRect.height()
+                            - mActiveIndicator.getHeight()) / 2);
+                    final int indicatorStartTop = mIndicatorStartPos;
+                    final int diff = indicatorFinalTop - indicatorStartTop;
+                    final int startOffset = (int) (diff * mIndicatorOffset);
+                    mIndicatorTop = indicatorStartTop + startOffset;
+                } else {
+                    mIndicatorTop = mActiveRect.top + ((mActiveRect.height() - mActiveIndicator.getHeight()) / 2);
+                }
+                final int right = offsetPixels;
+                final int left = right - interpolatedWidth;
+
+                canvas.save();
+                canvas.clipRect(left, 0, right, getHeight());
+                canvas.drawBitmap(mActiveIndicator, left, mIndicatorTop, null);
+                canvas.restore();
+            }
+        }
+    }
+
+    @Override
+    protected int getIndicatorStartPos() {
+        return mIndicatorTop;
+    }
+
+    @Override
+    protected void initPeekScroller() {
+        final int dx = mMenuSize / 3;
+        mPeekScroller.startScroll(0, 0, dx, 0, PEEK_DURATION);
+    }
+
+    @Override
+    protected void onOffsetPixelsChanged(int offsetPixels) {
+        if (USE_TRANSLATIONS) {
+            mContentContainer.setTranslationX(offsetPixels);
+            offsetMenu(offsetPixels);
+            invalidate();
+        } else {
+            mContentContainer.offsetLeftAndRight(offsetPixels - mContentContainer.getLeft());
+            offsetMenu(offsetPixels);
+            invalidate();
+        }
+    }
+
+    //////////////////////////////////////////////////////////////////////
+    // Touch handling
+    //////////////////////////////////////////////////////////////////////
+
+    @Override
+    protected boolean isContentTouch(MotionEvent ev) {
+        return ev.getX() > mOffsetPixels;
+    }
+
+    @Override
+    protected boolean onDownAllowDrag(MotionEvent ev) {
+        return (!mMenuVisible && mInitialMotionX <= mTouchSize)
+                || (mMenuVisible && mInitialMotionX >= mOffsetPixels);
+    }
+
+    @Override
+    protected boolean onMoveAllowDrag(MotionEvent ev, float diff) {
+        return (!mMenuVisible && mInitialMotionX <= mTouchSize && (diff > 0))
+                || (mMenuVisible && mInitialMotionX >= mOffsetPixels);
+    }
+
+    @Override
+    protected void onMoveEvent(float dx) {
+        setOffsetPixels(Math.min(Math.max(mOffsetPixels + dx, 0), mMenuSize));
+    }
+
+    @Override
+    protected void onUpEvent(MotionEvent ev) {
+        final int offsetPixels = (int) mOffsetPixels;
+
+        if (mIsDragging) {
+            mVelocityTracker.computeCurrentVelocity(1000, mMaxVelocity);
+            final int initialVelocity = (int) mVelocityTracker.getXVelocity();
+            mLastMotionX = ev.getX();
+            animateOffsetTo(mVelocityTracker.getXVelocity() > 0 ? mMenuSize : 0, initialVelocity, true);
+
+            // Close the menu when content is clicked while the menu is visible.
+        } else if (mMenuVisible && ev.getX() > offsetPixels) {
+            closeMenu();
+        }
+    }
+}
diff --git a/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/LeftStaticDrawer.java b/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/LeftStaticDrawer.java
new file mode 100644
index 0000000000..47fa75a356
--- /dev/null
+++ b/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/LeftStaticDrawer.java
@@ -0,0 +1,80 @@
+package net.simonvt.menudrawer;
+
+import android.app.Activity;
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.drawable.GradientDrawable;
+import android.util.AttributeSet;
+
+public class LeftStaticDrawer extends StaticDrawer {
+
+    private int mIndicatorTop;
+
+    LeftStaticDrawer(Activity activity, int dragMode) {
+        super(activity, dragMode);
+    }
+
+    public LeftStaticDrawer(Context context) {
+        super(context);
+    }
+
+    public LeftStaticDrawer(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public LeftStaticDrawer(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+    }
+
+    @Override
+    protected void initDrawer(Context context, AttributeSet attrs, int defStyle) {
+        super.initDrawer(context, attrs, defStyle);
+        mPosition = Position.LEFT;
+    }
+
+    @Override
+    public void setDropShadowColor(int color) {
+        final int endColor = color & 0x00FFFFFF;
+        mDropShadowDrawable = new GradientDrawable(GradientDrawable.Orientation.RIGHT_LEFT, new int[] {
+                color,
+                endColor,
+        });
+        invalidate();
+    }
+
+    @Override
+    protected void drawIndicator(Canvas canvas) {
+        if (mActiveView != null && isViewDescendant(mActiveView)) {
+            Integer position = (Integer) mActiveView.getTag(R.id.mdActiveViewPosition);
+            final int pos = position == null ? 0 : position;
+
+            if (pos == mActivePosition) {
+                mActiveView.getDrawingRect(mActiveRect);
+                offsetDescendantRectToMyCoords(mActiveView, mActiveRect);
+
+                if (mIndicatorAnimating) {
+                    final int indicatorFinalTop = mActiveRect.top + ((mActiveRect.height()
+                            - mActiveIndicator.getHeight()) / 2);
+                    final int indicatorStartTop = mIndicatorStartPos;
+                    final int diff = indicatorFinalTop - indicatorStartTop;
+                    final int startOffset = (int) (diff * mIndicatorOffset);
+                    mIndicatorTop = indicatorStartTop + startOffset;
+                } else {
+                    mIndicatorTop = mActiveRect.top + ((mActiveRect.height() - mActiveIndicator.getHeight()) / 2);
+                }
+                final int right = mMenuSize;
+                final int left = right - mActiveIndicator.getWidth();
+
+                canvas.save();
+                canvas.clipRect(left, 0, right, getHeight());
+                canvas.drawBitmap(mActiveIndicator, left, mIndicatorTop, null);
+                canvas.restore();
+            }
+        }
+    }
+
+    @Override
+    protected int getIndicatorStartPos() {
+        return mIndicatorTop;
+    }
+}
diff --git a/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/MenuDrawer.java b/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/MenuDrawer.java
new file mode 100644
index 0000000000..7f998e44b4
--- /dev/null
+++ b/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/MenuDrawer.java
@@ -0,0 +1,1151 @@
+package net.simonvt.menudrawer;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.Rect;
+import android.graphics.drawable.Drawable;
+import android.os.Build;
+import android.os.Bundle;
+import android.os.Parcel;
+import android.os.Parcelable;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.ViewParent;
+import android.view.ViewTreeObserver;
+import android.view.animation.Interpolator;
+
+public abstract class MenuDrawer extends ViewGroup {
+
+    /**
+     * Callback interface for changing state of the drawer.
+     */
+    public interface OnDrawerStateChangeListener {
+
+        /**
+         * Called when the drawer state changes.
+         *
+         * @param oldState The old drawer state.
+         * @param newState The new drawer state.
+         */
+        void onDrawerStateChange(int oldState, int newState);
+    }
+
+    /**
+     * Callback that is invoked when the drawer is in the process of deciding whether it should intercept the touch
+     * event. This lets the listener decide if the pointer is on a view that would disallow dragging of the drawer.
+     * This is only called when the touch mode is {@link #TOUCH_MODE_FULLSCREEN}.
+     */
+    public interface OnInterceptMoveEventListener {
+
+        /**
+         * Called for each child the pointer i on when the drawer is deciding whether to intercept the touch event.
+         *
+         * @param v  View to test for draggability
+         * @param dx Delta drag in pixels
+         * @param x  X coordinate of the active touch point
+         * @param y  Y coordinate of the active touch point
+         * @return true if view is draggable by delta dx.
+         */
+        boolean isViewDraggable(View v, int dx, int x, int y);
+    }
+
+    /**
+     * Tag used when logging.
+     */
+    private static final String TAG = "MenuDrawer";
+
+    /**
+     * Indicates whether debug code should be enabled.
+     */
+    private static final boolean DEBUG = false;
+
+    /**
+     * The time between each frame when animating the drawer.
+     */
+    protected static final int ANIMATION_DELAY = 1000 / 60;
+
+    /**
+     * The default touch bezel size of the drawer in dp.
+     */
+    private static final int DEFAULT_DRAG_BEZEL_DP = 24;
+
+    /**
+     * The default drop shadow size in dp.
+     */
+    private static final int DEFAULT_DROP_SHADOW_DP = 6;
+
+    /**
+     * Drag mode for sliding only the content view.
+     */
+    public static final int MENU_DRAG_CONTENT = 0;
+
+    /**
+     * Drag mode for sliding the entire window.
+     */
+    public static final int MENU_DRAG_WINDOW = 1;
+
+    /**
+     * Disallow opening the drawer by dragging the screen.
+     */
+    public static final int TOUCH_MODE_NONE = 0;
+
+    /**
+     * Allow opening drawer only by dragging on the edge of the screen.
+     */
+    public static final int TOUCH_MODE_BEZEL = 1;
+
+    /**
+     * Allow opening drawer by dragging anywhere on the screen.
+     */
+    public static final int TOUCH_MODE_FULLSCREEN = 2;
+
+    /**
+     * Indicates that the drawer is currently closed.
+     */
+    public static final int STATE_CLOSED = 0;
+
+    /**
+     * Indicates that the drawer is currently closing.
+     */
+    public static final int STATE_CLOSING = 1;
+
+    /**
+     * Indicates that the drawer is currently being dragged by the user.
+     */
+    public static final int STATE_DRAGGING = 2;
+
+    /**
+     * Indicates that the drawer is currently opening.
+     */
+    public static final int STATE_OPENING = 4;
+
+    /**
+     * Indicates that the drawer is currently open.
+     */
+    public static final int STATE_OPEN = 8;
+
+    /**
+     * Indicates whether to use {@link View#setTranslationX(float)} when positioning views.
+     */
+    static final boolean USE_TRANSLATIONS = Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB_MR1;
+
+    /**
+     * Time to animate the indicator to the new active view.
+     */
+    static final int INDICATOR_ANIM_DURATION = 800;
+
+    /**
+     * The maximum animation duration.
+     */
+    private static final int DEFAULT_ANIMATION_DURATION = 600;
+
+    /**
+     * Interpolator used when animating the drawer open/closed.
+     */
+    protected static final Interpolator SMOOTH_INTERPOLATOR = new SmoothInterpolator();
+
+    /**
+     * Drawable used as menu overlay.
+     */
+    protected Drawable mMenuOverlay;
+
+    /**
+     * Defines whether the drop shadow is enabled.
+     */
+    protected boolean mDropShadowEnabled;
+
+    /**
+     * Drawable used as content drop shadow onto the menu.
+     */
+    protected Drawable mDropShadowDrawable;
+
+    /**
+     * The size of the content drop shadow.
+     */
+    protected int mDropShadowSize;
+
+    /**
+     * Bitmap used to indicate the active view.
+     */
+    protected Bitmap mActiveIndicator;
+
+    /**
+     * The currently active view.
+     */
+    protected View mActiveView;
+
+    /**
+     * Position of the active view. This is compared to View#getTag(R.id.mdActiveViewPosition) when drawing the
+     * indicator.
+     */
+    protected int mActivePosition;
+
+    /**
+     * Whether the indicator should be animated between positions.
+     */
+    private boolean mAllowIndicatorAnimation;
+
+    /**
+     * Used when reading the position of the active view.
+     */
+    protected final Rect mActiveRect = new Rect();
+
+    /**
+     * Temporary {@link Rect} used for deciding whether the view should be invalidated so the indicator can be redrawn.
+     */
+    private final Rect mTempRect = new Rect();
+
+    /**
+     * The custom menu view set by the user.
+     */
+    private View mMenuView;
+
+    /**
+     * The parent of the menu view.
+     */
+    protected BuildLayerFrameLayout mMenuContainer;
+
+    /**
+     * The parent of the content view.
+     */
+    protected BuildLayerFrameLayout mContentContainer;
+
+    /**
+     * The size of the menu (width or height depending on the gravity).
+     */
+    protected int mMenuSize;
+
+    /**
+     * Indicates whether the menu size has been set explicity either via the theme or by calling
+     * {@link #setMenuSize(int)}.
+     */
+    protected boolean mMenuSizeSet;
+
+    /**
+     * Indicates whether the menu is currently visible.
+     */
+    protected boolean mMenuVisible;
+
+    /**
+     * The drag mode of the drawer. Can be either {@link #MENU_DRAG_CONTENT} or {@link #MENU_DRAG_WINDOW}.
+     */
+    private int mDragMode = MENU_DRAG_CONTENT;
+
+    /**
+     * The current drawer state.
+     *
+     * @see #STATE_CLOSED
+     * @see #STATE_CLOSING
+     * @see #STATE_DRAGGING
+     * @see #STATE_OPENING
+     * @see #STATE_OPEN
+     */
+    protected int mDrawerState = STATE_CLOSED;
+
+    /**
+     * The touch bezel size of the drawer in px.
+     */
+    protected int mTouchBezelSize;
+
+    /**
+     * The touch area size of the drawer in px.
+     */
+    protected int mTouchSize;
+
+    /**
+     * Listener used to dispatch state change events.
+     */
+    private OnDrawerStateChangeListener mOnDrawerStateChangeListener;
+
+    /**
+     * Touch mode for the Drawer.
+     * Possible values are {@link #TOUCH_MODE_NONE}, {@link #TOUCH_MODE_BEZEL} or {@link #TOUCH_MODE_FULLSCREEN}
+     * Default: {@link #TOUCH_MODE_BEZEL}
+     */
+    protected int mTouchMode = TOUCH_MODE_BEZEL;
+
+    /**
+     * Indicates whether to use {@link View#LAYER_TYPE_HARDWARE} when animating the drawer.
+     */
+    protected boolean mHardwareLayersEnabled = true;
+
+    /**
+     * The Activity the drawer is attached to.
+     */
+    private Activity mActivity;
+
+    /**
+     * Scroller used when animating the indicator to a new position.
+     */
+    private FloatScroller mIndicatorScroller;
+
+    /**
+     * Runnable used when animating the indicator to a new position.
+     */
+    private Runnable mIndicatorRunnable = new Runnable() {
+        @Override
+        public void run() {
+            animateIndicatorInvalidate();
+        }
+    };
+
+    /**
+     * The start position of the indicator when animating it to a new position.
+     */
+    protected int mIndicatorStartPos;
+
+    /**
+     * [0..1] value indicating the current progress of the animation.
+     */
+    protected float mIndicatorOffset;
+
+    /**
+     * Whether the indicator is currently animating.
+     */
+    protected boolean mIndicatorAnimating;
+
+    /**
+     * Bundle used to hold the drawers state.
+     */
+    protected Bundle mState;
+
+    /**
+     * The maximum duration of open/close animations.
+     */
+    protected int mMaxAnimationDuration = DEFAULT_ANIMATION_DURATION;
+
+    /**
+     * Callback that lets the listener override intercepting of touch events.
+     */
+    protected OnInterceptMoveEventListener mOnInterceptMoveEventListener;
+
+    /**
+     * Attaches the MenuDrawer to the Activity.
+     *
+     * @param activity The activity that the MenuDrawer will be attached to.
+     * @return The created MenuDrawer instance.
+     */
+    public static MenuDrawer attach(Activity activity) {
+        return attach(activity, MENU_DRAG_CONTENT);
+    }
+
+    /**
+     * Attaches the MenuDrawer to the Activity.
+     *
+     * @param activity The activity the menu drawer will be attached to.
+     * @param dragMode The drag mode of the drawer. Can be either {@link MenuDrawer#MENU_DRAG_CONTENT}
+     *                 or {@link MenuDrawer#MENU_DRAG_WINDOW}.
+     * @return The created MenuDrawer instance.
+     */
+    public static MenuDrawer attach(Activity activity, int dragMode) {
+        return attach(activity, dragMode, Position.LEFT);
+    }
+
+    /**
+     * Attaches the MenuDrawer to the Activity.
+     *
+     * @param activity The activity the menu drawer will be attached to.
+     * @param position Where to position the menu.
+     * @return The created MenuDrawer instance.
+     */
+    public static MenuDrawer attach(Activity activity, Position position) {
+        return attach(activity, MENU_DRAG_CONTENT, position);
+    }
+
+    /**
+     * Attaches the MenuDrawer to the Activity.
+     *
+     * @param activity The activity the menu drawer will be attached to.
+     * @param dragMode The drag mode of the drawer. Can be either {@link MenuDrawer#MENU_DRAG_CONTENT}
+     *                 or {@link MenuDrawer#MENU_DRAG_WINDOW}.
+     * @param position Where to position the menu.
+     * @return The created MenuDrawer instance.
+     */
+    public static MenuDrawer attach(Activity activity, int dragMode, Position position) {
+        return attach(activity, dragMode, position, false);
+    }
+
+    /**
+     * Attaches the MenuDrawer to the Activity.
+     *
+     * @param activity     The activity the menu drawer will be attached to.
+     * @param dragMode     The drag mode of the drawer. Can be either {@link MenuDrawer#MENU_DRAG_CONTENT}
+     *                     or {@link MenuDrawer#MENU_DRAG_WINDOW}.
+     * @param position     Where to position the menu.
+     * @param attachStatic Whether a static (non-draggable, always visible) drawer should be used.
+     * @return The created MenuDrawer instance.
+     */
+    public static MenuDrawer attach(Activity activity, int dragMode, Position position, boolean attachStatic) {
+        MenuDrawer menuDrawer = createMenuDrawer(activity, dragMode, position, attachStatic);
+        menuDrawer.setId(R.id.md__drawer);
+
+        switch (dragMode) {
+            case MenuDrawer.MENU_DRAG_CONTENT:
+                attachToContent(activity, menuDrawer);
+                break;
+
+            case MenuDrawer.MENU_DRAG_WINDOW:
+                attachToDecor(activity, menuDrawer);
+                break;
+
+            default:
+                throw new RuntimeException("Unknown menu mode: " + dragMode);
+        }
+
+        return menuDrawer;
+    }
+
+    /**
+     * Constructs the appropriate MenuDrawer based on the position.
+     */
+    private static MenuDrawer createMenuDrawer(Activity activity, int dragMode, Position position,
+            boolean attachStatic) {
+        if (attachStatic) {
+            switch (position) {
+                case LEFT:
+                    return new LeftStaticDrawer(activity, dragMode);
+                case RIGHT:
+                    return new RightStaticDrawer(activity, dragMode);
+                case TOP:
+                    return new TopStaticDrawer(activity, dragMode);
+                case BOTTOM:
+                    return new BottomStaticDrawer(activity, dragMode);
+                default:
+                    throw new IllegalArgumentException("position must be one of LEFT, TOP, RIGHT or BOTTOM");
+            }
+        }
+
+        switch (position) {
+            case LEFT:
+                return new LeftDrawer(activity, dragMode);
+            case RIGHT:
+                return new RightDrawer(activity, dragMode);
+            case TOP:
+                return new TopDrawer(activity, dragMode);
+            case BOTTOM:
+                return new BottomDrawer(activity, dragMode);
+            default:
+                throw new IllegalArgumentException("position must be one of LEFT, TOP, RIGHT or BOTTOM");
+        }
+    }
+
+    /**
+     * Attaches the menu drawer to the content view.
+     */
+    private static void attachToContent(Activity activity, MenuDrawer menuDrawer) {
+        /**
+         * Do not call mActivity#setContentView.
+         * E.g. if using with a ListActivity, Activity#setContentView is overridden and dispatched to
+         * MenuDrawer#setContentView, which then again would call Activity#setContentView.
+         */
+        ViewGroup content = (ViewGroup) activity.findViewById(android.R.id.content);
+        content.removeAllViews();
+        content.addView(menuDrawer, LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT);
+    }
+
+    /**
+     * Attaches the menu drawer to the window.
+     */
+    private static void attachToDecor(Activity activity, MenuDrawer menuDrawer) {
+        ViewGroup decorView = (ViewGroup) activity.getWindow().getDecorView();
+        ViewGroup decorChild = (ViewGroup) decorView.getChildAt(0);
+
+        decorView.removeAllViews();
+        decorView.addView(menuDrawer, LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT);
+
+        menuDrawer.mContentContainer.addView(decorChild, decorChild.getLayoutParams());
+    }
+
+    MenuDrawer(Activity activity, int dragMode) {
+        this(activity);
+
+        mActivity = activity;
+        mDragMode = dragMode;
+    }
+
+    public MenuDrawer(Context context) {
+        this(context, null);
+    }
+
+    public MenuDrawer(Context context, AttributeSet attrs) {
+        this(context, attrs, R.attr.menuDrawerStyle);
+    }
+
+    public MenuDrawer(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+        initDrawer(context, attrs, defStyle);
+    }
+
+    protected void initDrawer(Context context, AttributeSet attrs, int defStyle) {
+        setWillNotDraw(false);
+        setFocusable(false);
+
+        TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.MenuDrawer, R.attr.menuDrawerStyle,
+                R.style.Widget_MenuDrawer);
+
+        final Drawable contentBackground = a.getDrawable(R.styleable.MenuDrawer_mdContentBackground);
+        final Drawable menuBackground = a.getDrawable(R.styleable.MenuDrawer_mdMenuBackground);
+
+        mMenuSize = a.getDimensionPixelSize(R.styleable.MenuDrawer_mdMenuSize, -1);
+        mMenuSizeSet = mMenuSize != -1;
+
+        final int indicatorResId = a.getResourceId(R.styleable.MenuDrawer_mdActiveIndicator, 0);
+        if (indicatorResId != 0) {
+            mActiveIndicator = BitmapFactory.decodeResource(getResources(), indicatorResId);
+        }
+
+        mDropShadowEnabled = a.getBoolean(R.styleable.MenuDrawer_mdDropShadowEnabled, true);
+
+        mDropShadowDrawable = a.getDrawable(R.styleable.MenuDrawer_mdDropShadow);
+
+        if (mDropShadowDrawable == null) {
+            final int dropShadowColor = a.getColor(R.styleable.MenuDrawer_mdDropShadowColor, 0xFF000000);
+            setDropShadowColor(dropShadowColor);
+        }
+
+        mDropShadowSize = a.getDimensionPixelSize(R.styleable.MenuDrawer_mdDropShadowSize,
+                dpToPx(DEFAULT_DROP_SHADOW_DP));
+
+        mTouchBezelSize = a.getDimensionPixelSize(R.styleable.MenuDrawer_mdTouchBezelSize,
+                dpToPx(DEFAULT_DRAG_BEZEL_DP));
+
+        mAllowIndicatorAnimation = a.getBoolean(R.styleable.MenuDrawer_mdAllowIndicatorAnimation, false);
+
+        mMaxAnimationDuration = a.getInt(R.styleable.MenuDrawer_mdMaxAnimationDuration, DEFAULT_ANIMATION_DURATION);
+
+        a.recycle();
+
+        mMenuContainer = new BuildLayerFrameLayout(context);
+        mMenuContainer.setId(R.id.md__menu);
+        mMenuContainer.setBackgroundDrawable(menuBackground);
+        super.addView(mMenuContainer, -1, new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT));
+
+        mContentContainer = new NoClickThroughFrameLayout(context);
+        mContentContainer.setId(R.id.md__content);
+        mContentContainer.setBackgroundDrawable(contentBackground);
+        super.addView(mContentContainer, -1, new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT));
+
+        mMenuOverlay = new ColorDrawable(0xFF000000);
+
+        mIndicatorScroller = new FloatScroller(SMOOTH_INTERPOLATOR);
+    }
+
+    @Override
+    public void addView(View child, int index, LayoutParams params) {
+        int childCount = mMenuContainer.getChildCount();
+        if (childCount == 0) {
+            mMenuContainer.addView(child, index, params);
+            return;
+        }
+
+        childCount = mContentContainer.getChildCount();
+        if (childCount == 0) {
+            mContentContainer.addView(child, index, params);
+            return;
+        }
+
+        throw new IllegalStateException("MenuDrawer can only hold two child views");
+    }
+
+    protected int dpToPx(int dp) {
+        return (int) (getResources().getDisplayMetrics().density * dp + 0.5f);
+    }
+
+    protected boolean isViewDescendant(View v) {
+        ViewParent parent = v.getParent();
+        while (parent != null) {
+            if (parent == this) {
+                return true;
+            }
+
+            parent = parent.getParent();
+        }
+
+        return false;
+    }
+
+    @Override
+    protected void onAttachedToWindow() {
+        super.onAttachedToWindow();
+        getViewTreeObserver().addOnScrollChangedListener(mScrollListener);
+    }
+
+    @Override
+    protected void onDetachedFromWindow() {
+        getViewTreeObserver().removeOnScrollChangedListener(mScrollListener);
+        super.onDetachedFromWindow();
+    }
+
+    /**
+     * Toggles the menu open and close with animation.
+     */
+    public void toggleMenu() {
+        toggleMenu(true);
+    }
+
+    /**
+     * Toggles the menu open and close.
+     *
+     * @param animate Whether open/close should be animated.
+     */
+    public abstract void toggleMenu(boolean animate);
+
+    /**
+     * Animates the menu open.
+     */
+    public void openMenu() {
+        openMenu(true);
+    }
+
+    /**
+     * Opens the menu.
+     *
+     * @param animate Whether open/close should be animated.
+     */
+    public abstract void openMenu(boolean animate);
+
+    /**
+     * Animates the menu closed.
+     */
+    public void closeMenu() {
+        closeMenu(true);
+    }
+
+    /**
+     * Closes the menu.
+     *
+     * @param animate Whether open/close should be animated.
+     */
+    public abstract void closeMenu(boolean animate);
+
+    /**
+     * Indicates whether the menu is currently visible.
+     *
+     * @return True if the menu is open, false otherwise.
+     */
+    public abstract boolean isMenuVisible();
+
+    /**
+     * Set the size of the menu drawer when open.
+     *
+     * @param size The size of the menu.
+     */
+    public abstract void setMenuSize(int size);
+
+    /**
+     * Returns the size of the menu.
+     *
+     * @return The size of the menu.
+     */
+    public int getMenuSize() {
+        return mMenuSize;
+    }
+
+    /**
+     * Set the active view.
+     * If the mdActiveIndicator attribute is set, this View will have the indicator drawn next to it.
+     *
+     * @param v The active view.
+     */
+    public void setActiveView(View v) {
+        setActiveView(v, 0);
+    }
+
+    /**
+     * Set the active view.
+     * If the mdActiveIndicator attribute is set, this View will have the indicator drawn next to it.
+     *
+     * @param v        The active view.
+     * @param position Optional position, usually used with ListView. v.setTag(R.id.mdActiveViewPosition, position)
+     *                 must be called first.
+     */
+    public void setActiveView(View v, int position) {
+        final View oldView = mActiveView;
+        mActiveView = v;
+        mActivePosition = position;
+
+        if (mAllowIndicatorAnimation && oldView != null) {
+            startAnimatingIndicator();
+        }
+
+        invalidate();
+    }
+
+    /**
+     * Sets whether the indicator should be animated between active views.
+     *
+     * @param animate Whether the indicator should be animated between active views.
+     */
+    public void setAllowIndicatorAnimation(boolean animate) {
+        if (animate != mAllowIndicatorAnimation) {
+            mAllowIndicatorAnimation = animate;
+            completeAnimatingIndicator();
+        }
+    }
+
+    /**
+     * Indicates whether the indicator should be animated between active views.
+     *
+     * @return Whether the indicator should be animated between active views.
+     */
+    public boolean getAllowIndicatorAnimation() {
+        return mAllowIndicatorAnimation;
+    }
+
+    /**
+     * Scroll listener that checks whether the active view has moved before the drawer is invalidated.
+     */
+    private ViewTreeObserver.OnScrollChangedListener mScrollListener = new ViewTreeObserver.OnScrollChangedListener() {
+        @Override
+        public void onScrollChanged() {
+            if (mActiveView != null && isViewDescendant(mActiveView)) {
+                mActiveView.getDrawingRect(mTempRect);
+                offsetDescendantRectToMyCoords(mActiveView, mTempRect);
+                if (mTempRect.left != mActiveRect.left || mTempRect.top != mActiveRect.top
+                        || mTempRect.right != mActiveRect.right || mTempRect.bottom != mActiveRect.bottom) {
+                    invalidate();
+                }
+            }
+        }
+    };
+
+    /**
+     * Starts animating the indicator to a new position.
+     */
+    private void startAnimatingIndicator() {
+        mIndicatorStartPos = getIndicatorStartPos();
+        mIndicatorAnimating = true;
+        mIndicatorScroller.startScroll(0.0f, 1.0f, INDICATOR_ANIM_DURATION);
+
+        animateIndicatorInvalidate();
+    }
+
+    /**
+     * Returns the start position of the indicator.
+     *
+     * @return The start position of the indicator.
+     */
+    protected abstract int getIndicatorStartPos();
+
+    /**
+     * Callback when each frame in the indicator animation should be drawn.
+     */
+    private void animateIndicatorInvalidate() {
+        if (mIndicatorScroller.computeScrollOffset()) {
+            mIndicatorOffset = mIndicatorScroller.getCurr();
+            invalidate();
+
+            if (!mIndicatorScroller.isFinished()) {
+                postOnAnimation(mIndicatorRunnable);
+                return;
+            }
+        }
+
+        completeAnimatingIndicator();
+    }
+
+    /**
+     * Called when the indicator animation has completed.
+     */
+    private void completeAnimatingIndicator() {
+        mIndicatorOffset = 1.0f;
+        mIndicatorAnimating = false;
+        invalidate();
+    }
+
+    /**
+     * Enables or disables offsetting the menu when dragging the drawer.
+     *
+     * @param offsetMenu True to offset the menu, false otherwise.
+     */
+    public abstract void setOffsetMenuEnabled(boolean offsetMenu);
+
+    /**
+     * Indicates whether the menu is being offset when dragging the drawer.
+     *
+     * @return True if the menu is being offset, false otherwise.
+     */
+    public abstract boolean getOffsetMenuEnabled();
+
+    public int getDrawerState() {
+        return mDrawerState;
+    }
+
+    /**
+     * Register a callback to be invoked when the drawer state changes.
+     *
+     * @param listener The callback that will run.
+     */
+    public void setOnDrawerStateChangeListener(OnDrawerStateChangeListener listener) {
+        mOnDrawerStateChangeListener = listener;
+    }
+
+    /**
+     * Register a callback that will be invoked when the drawer is about to intercept touch events.
+     *
+     * @param listener The callback that will be invoked.
+     */
+    public void setOnInterceptMoveEventListener(OnInterceptMoveEventListener listener) {
+        mOnInterceptMoveEventListener = listener;
+    }
+
+    /**
+     * Defines whether the drop shadow is enabled.
+     *
+     * @param enabled Whether the drop shadow is enabled.
+     */
+    public void setDropShadowEnabled(boolean enabled) {
+        mDropShadowEnabled = enabled;
+        invalidate();
+    }
+
+    /**
+     * Sets the color of the drop shadow.
+     *
+     * @param color The color of the drop shadow.
+     */
+    public abstract void setDropShadowColor(int color);
+
+    /**
+     * Sets the drawable of the drop shadow.
+     *
+     * @param drawable The drawable of the drop shadow.
+     */
+    public void setDropShadow(Drawable drawable) {
+        mDropShadowDrawable = drawable;
+        invalidate();
+    }
+
+    /**
+     * Sets the drawable of the drop shadow.
+     *
+     * @param resId The resource identifier of the the drawable.
+     */
+    public void setDropShadow(int resId) {
+        setDropShadow(getResources().getDrawable(resId));
+    }
+
+    /**
+     * Returns the drawable of the drop shadow.
+     */
+    public Drawable getDropShadow() {
+        return mDropShadowDrawable;
+    }
+
+    /**
+     * Sets the size of the drop shadow.
+     *
+     * @param size The size of the drop shadow in px.
+     */
+    public void setDropShadowSize(int size) {
+        mDropShadowSize = size;
+        invalidate();
+    }
+
+    /**
+     * Animates the drawer slightly open until the user opens the drawer.
+     */
+    public abstract void peekDrawer();
+
+    /**
+     * Animates the drawer slightly open. If delay is larger than 0, this happens until the user opens the drawer.
+     *
+     * @param delay The delay (in milliseconds) between each run of the animation. If 0, this animation is only run
+     *              once.
+     */
+    public abstract void peekDrawer(long delay);
+
+    /**
+     * Animates the drawer slightly open. If delay is larger than 0, this happens until the user opens the drawer.
+     *
+     * @param startDelay The delay (in milliseconds) until the animation is first run.
+     * @param delay      The delay (in milliseconds) between each run of the animation. If 0, this animation is only run
+     *                   once.
+     */
+    public abstract void peekDrawer(long startDelay, long delay);
+
+    /**
+     * Enables or disables the user of {@link View#LAYER_TYPE_HARDWARE} when animations views.
+     *
+     * @param enabled Whether hardware layers are enabled.
+     */
+    public abstract void setHardwareLayerEnabled(boolean enabled);
+
+    /**
+     * Sets the maximum duration of open/close animations.
+     * @param duration The maximum duration in milliseconds.
+     */
+    public void setMaxAnimationDuration(int duration) {
+        mMaxAnimationDuration = duration;
+    }
+
+    /**
+     * Returns the ViewGroup used as a parent for the menu view.
+     *
+     * @return The menu view's parent.
+     */
+    public ViewGroup getMenuContainer() {
+        return mMenuContainer;
+    }
+
+    /**
+     * Returns the ViewGroup used as a parent for the content view.
+     *
+     * @return The content view's parent.
+     */
+    public ViewGroup getContentContainer() {
+        if (mDragMode == MENU_DRAG_CONTENT) {
+            return mContentContainer;
+        } else {
+            return (ViewGroup) findViewById(android.R.id.content);
+        }
+    }
+
+    /**
+     * Set the menu view from a layout resource.
+     *
+     * @param layoutResId Resource ID to be inflated.
+     */
+    public void setMenuView(int layoutResId) {
+        mMenuContainer.removeAllViews();
+        mMenuView = LayoutInflater.from(getContext()).inflate(layoutResId, mMenuContainer, false);
+        mMenuContainer.addView(mMenuView);
+    }
+
+    /**
+     * Set the menu view to an explicit view.
+     *
+     * @param view The menu view.
+     */
+    public void setMenuView(View view) {
+        setMenuView(view, new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT));
+    }
+
+    /**
+     * Set the menu view to an explicit view.
+     *
+     * @param view   The menu view.
+     * @param params Layout parameters for the view.
+     */
+    public void setMenuView(View view, LayoutParams params) {
+        mMenuView = view;
+        mMenuContainer.removeAllViews();
+        mMenuContainer.addView(view, params);
+    }
+
+    /**
+     * Returns the menu view.
+     *
+     * @return The menu view.
+     */
+    public View getMenuView() {
+        return mMenuView;
+    }
+
+    /**
+     * Set the content from a layout resource.
+     *
+     * @param layoutResId Resource ID to be inflated.
+     */
+    public void setContentView(int layoutResId) {
+        switch (mDragMode) {
+            case MenuDrawer.MENU_DRAG_CONTENT:
+                mContentContainer.removeAllViews();
+                LayoutInflater.from(getContext()).inflate(layoutResId, mContentContainer, true);
+                break;
+
+            case MenuDrawer.MENU_DRAG_WINDOW:
+                mActivity.setContentView(layoutResId);
+                break;
+        }
+    }
+
+    /**
+     * Set the content to an explicit view.
+     *
+     * @param view The desired content to display.
+     */
+    public void setContentView(View view) {
+        setContentView(view, new ViewGroup.LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT));
+    }
+
+    /**
+     * Set the content to an explicit view.
+     *
+     * @param view   The desired content to display.
+     * @param params Layout parameters for the view.
+     */
+    public void setContentView(View view, LayoutParams params) {
+        switch (mDragMode) {
+            case MenuDrawer.MENU_DRAG_CONTENT:
+                mContentContainer.removeAllViews();
+                mContentContainer.addView(view, params);
+                break;
+
+            case MenuDrawer.MENU_DRAG_WINDOW:
+                mActivity.setContentView(view, params);
+                break;
+        }
+    }
+
+    protected void setDrawerState(int state) {
+        if (state != mDrawerState) {
+            final int oldState = mDrawerState;
+            mDrawerState = state;
+            if (mOnDrawerStateChangeListener != null) mOnDrawerStateChangeListener.onDrawerStateChange(oldState, state);
+            if (DEBUG) logDrawerState(state);
+        }
+    }
+
+    protected void logDrawerState(int state) {
+        switch (state) {
+            case STATE_CLOSED:
+                Log.d(TAG, "[DrawerState] STATE_CLOSED");
+                break;
+
+            case STATE_CLOSING:
+                Log.d(TAG, "[DrawerState] STATE_CLOSING");
+                break;
+
+            case STATE_DRAGGING:
+                Log.d(TAG, "[DrawerState] STATE_DRAGGING");
+                break;
+
+            case STATE_OPENING:
+                Log.d(TAG, "[DrawerState] STATE_OPENING");
+                break;
+
+            case STATE_OPEN:
+                Log.d(TAG, "[DrawerState] STATE_OPEN");
+                break;
+
+            default:
+                Log.d(TAG, "[DrawerState] Unknown: " + state);
+        }
+    }
+
+    /**
+     * Returns the touch mode.
+     */
+    public abstract int getTouchMode();
+
+    /**
+     * Sets the drawer touch mode. Possible values are {@link #TOUCH_MODE_NONE}, {@link #TOUCH_MODE_BEZEL} or
+     * {@link #TOUCH_MODE_FULLSCREEN}.
+     *
+     * @param mode The touch mode.
+     */
+    public abstract void setTouchMode(int mode);
+
+    /**
+     * Sets the size of the touch bezel.
+     *
+     * @param size The touch bezel size in px.
+     */
+    public abstract void setTouchBezelSize(int size);
+
+    /**
+     * Returns the size of the touch bezel in px.
+     */
+    public abstract int getTouchBezelSize();
+
+    @Override
+    public void postOnAnimation(Runnable action) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
+            super.postOnAnimation(action);
+        } else {
+            postDelayed(action, ANIMATION_DELAY);
+        }
+    }
+
+    @Override
+    protected boolean fitSystemWindows(Rect insets) {
+        if (mDragMode == MENU_DRAG_WINDOW) {
+            mMenuContainer.setPadding(0, insets.top, 0, 0);
+        }
+        return super.fitSystemWindows(insets);
+    }
+
+    /**
+     * Saves the state of the drawer.
+     *
+     * @return Returns a Parcelable containing the drawer state.
+     */
+    public final Parcelable saveState() {
+        if (mState == null) mState = new Bundle();
+        saveState(mState);
+        return mState;
+    }
+
+    void saveState(Bundle state) {
+        // State saving isn't required for subclasses.
+    }
+
+    /**
+     * Restores the state of the drawer.
+     *
+     * @param in A parcelable containing the drawer state.
+     */
+    public void restoreState(Parcelable in) {
+        mState = (Bundle) in;
+    }
+
+    @Override
+    protected Parcelable onSaveInstanceState() {
+        Parcelable superState = super.onSaveInstanceState();
+        SavedState state = new SavedState(superState);
+
+        if (mState == null) mState = new Bundle();
+        saveState(mState);
+
+        state.mState = mState;
+        return state;
+    }
+
+    @Override
+    protected void onRestoreInstanceState(Parcelable state) {
+        SavedState savedState = (SavedState) state;
+        super.onRestoreInstanceState(savedState.getSuperState());
+
+        restoreState(savedState.mState);
+    }
+
+    static class SavedState extends BaseSavedState {
+
+        Bundle mState;
+
+        public SavedState(Parcelable superState) {
+            super(superState);
+        }
+
+        public SavedState(Parcel in) {
+            super(in);
+            mState = in.readBundle();
+        }
+
+        @Override
+        public void writeToParcel(Parcel dest, int flags) {
+            super.writeToParcel(dest, flags);
+            dest.writeBundle(mState);
+        }
+
+        @SuppressWarnings("UnusedDeclaration")
+        public static final Creator<SavedState> CREATOR = new Creator<SavedState>() {
+            @Override
+            public SavedState createFromParcel(Parcel in) {
+                return new SavedState(in);
+            }
+
+            @Override
+            public SavedState[] newArray(int size) {
+                return new SavedState[size];
+            }
+        };
+    }
+}
diff --git a/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/NoClickThroughFrameLayout.java b/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/NoClickThroughFrameLayout.java
new file mode 100644
index 0000000000..9462282cb1
--- /dev/null
+++ b/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/NoClickThroughFrameLayout.java
@@ -0,0 +1,28 @@
+package net.simonvt.menudrawer;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.MotionEvent;
+
+/**
+ * FrameLayout which doesn't let touch events propagate to views positioned behind it in the view hierarchy.
+ */
+public class NoClickThroughFrameLayout extends BuildLayerFrameLayout {
+
+    public NoClickThroughFrameLayout(Context context) {
+        super(context);
+    }
+
+    public NoClickThroughFrameLayout(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public NoClickThroughFrameLayout(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+    }
+
+    @Override
+    public boolean onTouchEvent(MotionEvent event) {
+        return true;
+    }
+}
diff --git a/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/PeekInterpolator.java b/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/PeekInterpolator.java
new file mode 100644
index 0000000000..d0c7600f66
--- /dev/null
+++ b/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/PeekInterpolator.java
@@ -0,0 +1,28 @@
+package net.simonvt.menudrawer;
+
+import android.view.animation.Interpolator;
+
+public class PeekInterpolator implements Interpolator {
+
+    private static final String TAG = "PeekInterpolator";
+
+    private static final SinusoidalInterpolator SINUSOIDAL_INTERPOLATOR = new SinusoidalInterpolator();
+
+    @Override
+    public float getInterpolation(float input) {
+        float result;
+
+        if (input < 1.f / 3.f) {
+            result = SINUSOIDAL_INTERPOLATOR.getInterpolation(input * 3);
+
+        } else if (input > 2.f / 3.f) {
+            final float val = ((input + 1.f / 3.f) - 1.f) * 3.f;
+            result = 1.f - SINUSOIDAL_INTERPOLATOR.getInterpolation(val);
+
+        } else {
+            result = 1.f;
+        }
+
+        return result;
+    }
+}
diff --git a/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/Position.java b/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/Position.java
new file mode 100644
index 0000000000..e1a3dd3a46
--- /dev/null
+++ b/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/Position.java
@@ -0,0 +1,18 @@
+package net.simonvt.menudrawer;
+
+/**
+ * Enums used for positioning the drawer.
+ */
+public enum Position {
+    // Positions the drawer to the left of the content.
+    LEFT,
+
+    // Positions the drawer above the content.
+    TOP,
+
+    // Positions the drawer to the right of the content.
+    RIGHT,
+
+    // Positions the drawer below the content.
+    BOTTOM,
+}
diff --git a/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/RightDrawer.java b/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/RightDrawer.java
new file mode 100644
index 0000000000..5d75904aac
--- /dev/null
+++ b/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/RightDrawer.java
@@ -0,0 +1,234 @@
+package net.simonvt.menudrawer;
+
+import android.app.Activity;
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.drawable.GradientDrawable;
+import android.util.AttributeSet;
+import android.view.MotionEvent;
+
+public class RightDrawer extends HorizontalDrawer {
+
+    private int mIndicatorTop;
+
+    RightDrawer(Activity activity, int dragMode) {
+        super(activity, dragMode);
+    }
+
+    public RightDrawer(Context context) {
+        super(context);
+    }
+
+    public RightDrawer(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public RightDrawer(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+    }
+
+    @Override
+    public void openMenu(boolean animate) {
+        animateOffsetTo(-mMenuSize, 0, animate);
+    }
+
+    @Override
+    public void closeMenu(boolean animate) {
+        animateOffsetTo(0, 0, animate);
+    }
+
+    @Override
+    public void setDropShadowColor(int color) {
+        final int endColor = color & 0x00FFFFFF;
+        mDropShadowDrawable = new GradientDrawable(GradientDrawable.Orientation.LEFT_RIGHT, new int[] {
+                color,
+                endColor,
+        });
+        invalidate();
+    }
+
+    @Override
+    protected void onLayout(boolean changed, int l, int t, int r, int b) {
+        final int width = r - l;
+        final int height = b - t;
+        final int offsetPixels = (int) mOffsetPixels;
+
+        mMenuContainer.layout(width - mMenuSize, 0, width, height);
+        offsetMenu(offsetPixels);
+
+        if (USE_TRANSLATIONS) {
+            mContentContainer.layout(0, 0, width, height);
+        } else {
+            mContentContainer.layout(offsetPixels, 0, width + offsetPixels, height);
+        }
+    }
+
+    /**
+     * Offsets the menu relative to its original position based on the position of the content.
+     *
+     * @param offsetPixels The number of pixels the content if offset.
+     */
+    private void offsetMenu(int offsetPixels) {
+        if (mOffsetMenu && mMenuSize != 0) {
+            final int menuWidth = mMenuSize;
+            final float openRatio = (menuWidth + (float) offsetPixels) / menuWidth;
+
+            if (USE_TRANSLATIONS) {
+                if (offsetPixels != 0) {
+                    final int offset = (int) (0.25f * (openRatio * menuWidth));
+                    mMenuContainer.setTranslationX(offset);
+                } else {
+                    mMenuContainer.setTranslationX(-menuWidth);
+                }
+
+            } else {
+                final int width = getWidth();
+                final int oldMenuRight = mMenuContainer.getRight();
+                final int newRight = width + (int) (0.25f * (openRatio * menuWidth));
+                final int offset = newRight - oldMenuRight;
+                mMenuContainer.offsetLeftAndRight(offset);
+                mMenuContainer.setVisibility(offsetPixels == 0 ? INVISIBLE : VISIBLE);
+            }
+        }
+    }
+
+    @Override
+    protected void drawDropShadow(Canvas canvas, int offsetPixels) {
+        final int height = getHeight();
+        final int width = getWidth();
+        final int left = width + offsetPixels;
+        final int right = left + mDropShadowSize;
+
+        mDropShadowDrawable.setBounds(left, 0, right, height);
+        mDropShadowDrawable.draw(canvas);
+    }
+
+    @Override
+    protected void drawMenuOverlay(Canvas canvas, int offsetPixels) {
+        final int height = getHeight();
+        final int width = getWidth();
+        final int left = width + offsetPixels;
+        final int right = width;
+        final float openRatio = ((float) Math.abs(offsetPixels)) / mMenuSize;
+
+        mMenuOverlay.setBounds(left, 0, right, height);
+        mMenuOverlay.setAlpha((int) (MAX_MENU_OVERLAY_ALPHA * (1.f - openRatio)));
+        mMenuOverlay.draw(canvas);
+    }
+
+    @Override
+    protected void drawIndicator(Canvas canvas, int offsetPixels) {
+        if (mActiveView != null && isViewDescendant(mActiveView)) {
+            Integer position = (Integer) mActiveView.getTag(R.id.mdActiveViewPosition);
+            final int pos = position == null ? 0 : position;
+
+            if (pos == mActivePosition) {
+                final int width = getWidth();
+                final int menuWidth = mMenuSize;
+                final int indicatorWidth = mActiveIndicator.getWidth();
+
+                final int contentRight = width + offsetPixels;
+                final float openRatio = ((float) Math.abs(offsetPixels)) / menuWidth;
+
+                mActiveView.getDrawingRect(mActiveRect);
+                offsetDescendantRectToMyCoords(mActiveView, mActiveRect);
+
+                final float interpolatedRatio = 1.f - INDICATOR_INTERPOLATOR.getInterpolation((1.f - openRatio));
+                final int interpolatedWidth = (int) (indicatorWidth * interpolatedRatio);
+
+                final int indicatorRight = contentRight + interpolatedWidth;
+                final int indicatorLeft = indicatorRight - indicatorWidth;
+
+                if (mIndicatorAnimating) {
+                    final int indicatorFinalTop = mActiveRect.top + ((mActiveRect.height()
+                            - mActiveIndicator.getHeight()) / 2);
+                    final int indicatorStartTop = mIndicatorStartPos;
+                    final int diff = indicatorFinalTop - indicatorStartTop;
+                    final int startOffset = (int) (diff * mIndicatorOffset);
+                    mIndicatorTop = indicatorStartTop + startOffset;
+                } else {
+                    mIndicatorTop = mActiveRect.top + ((mActiveRect.height() - mActiveIndicator.getHeight()) / 2);
+                }
+
+                canvas.save();
+                canvas.clipRect(contentRight, 0, indicatorRight, getHeight());
+                canvas.drawBitmap(mActiveIndicator, indicatorLeft, mIndicatorTop, null);
+                canvas.restore();
+            }
+        }
+    }
+
+    @Override
+    protected int getIndicatorStartPos() {
+        return mIndicatorTop;
+    }
+
+    @Override
+    protected void initPeekScroller() {
+        final int dx = -mMenuSize / 3;
+        mPeekScroller.startScroll(0, 0, dx, 0, PEEK_DURATION);
+    }
+
+    @Override
+    protected void onOffsetPixelsChanged(int offsetPixels) {
+        if (USE_TRANSLATIONS) {
+            mContentContainer.setTranslationX(offsetPixels);
+            offsetMenu(offsetPixels);
+            invalidate();
+        } else {
+            mContentContainer.offsetLeftAndRight(offsetPixels - mContentContainer.getLeft());
+            offsetMenu(offsetPixels);
+            invalidate();
+        }
+    }
+
+    //////////////////////////////////////////////////////////////////////
+    // Touch handling
+    //////////////////////////////////////////////////////////////////////
+
+    @Override
+    protected boolean isContentTouch(MotionEvent ev) {
+        return ev.getX() < getWidth() + mOffsetPixels;
+    }
+
+    @Override
+    protected boolean onDownAllowDrag(MotionEvent ev) {
+        final int width = getWidth();
+        final int initialMotionX = (int) mInitialMotionX;
+
+        return (!mMenuVisible && initialMotionX >= width - mTouchSize)
+                || (mMenuVisible && initialMotionX <= width + mOffsetPixels);
+    }
+
+    @Override
+    protected boolean onMoveAllowDrag(MotionEvent ev, float diff) {
+        final int width = getWidth();
+        final int initialMotionX = (int) mInitialMotionX;
+
+        return (!mMenuVisible && initialMotionX >= width - mTouchSize && (diff < 0))
+                || (mMenuVisible && initialMotionX <= width + mOffsetPixels);
+    }
+
+    @Override
+    protected void onMoveEvent(float dx) {
+        final float newOffset = Math.max(Math.min(mOffsetPixels + dx, 0), -mMenuSize);
+        setOffsetPixels(newOffset);
+    }
+
+    @Override
+    protected void onUpEvent(MotionEvent ev) {
+        final int offsetPixels = (int) mOffsetPixels;
+        final int width = getWidth();
+
+        if (mIsDragging) {
+            mVelocityTracker.computeCurrentVelocity(1000, mMaxVelocity);
+            final int initialVelocity = (int) mVelocityTracker.getXVelocity();
+            mLastMotionX = ev.getX();
+            animateOffsetTo(mVelocityTracker.getXVelocity() > 0 ? 0 : -mMenuSize, initialVelocity, true);
+
+            // Close the menu when content is clicked while the menu is visible.
+        } else if (mMenuVisible && ev.getX() < width + offsetPixels) {
+            closeMenu();
+        }
+    }
+}
diff --git a/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/RightStaticDrawer.java b/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/RightStaticDrawer.java
new file mode 100644
index 0000000000..2027b43acc
--- /dev/null
+++ b/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/RightStaticDrawer.java
@@ -0,0 +1,87 @@
+package net.simonvt.menudrawer;
+
+import android.app.Activity;
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.drawable.GradientDrawable;
+import android.util.AttributeSet;
+
+public class RightStaticDrawer extends StaticDrawer {
+
+    private int mIndicatorTop;
+
+    RightStaticDrawer(Activity activity, int dragMode) {
+        super(activity, dragMode);
+    }
+
+    public RightStaticDrawer(Context context) {
+        super(context);
+    }
+
+    public RightStaticDrawer(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public RightStaticDrawer(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+    }
+
+    @Override
+    protected void initDrawer(Context context, AttributeSet attrs, int defStyle) {
+        super.initDrawer(context, attrs, defStyle);
+        mPosition = Position.RIGHT;
+    }
+
+    @Override
+    public void setDropShadowColor(int color) {
+        final int endColor = color & 0x00FFFFFF;
+        mDropShadowDrawable = new GradientDrawable(GradientDrawable.Orientation.LEFT_RIGHT, new int[] {
+                color,
+                endColor,
+        });
+        invalidate();
+    }
+
+    @Override
+    protected void drawIndicator(Canvas canvas) {
+        if (mActiveView != null && isViewDescendant(mActiveView)) {
+            Integer position = (Integer) mActiveView.getTag(R.id.mdActiveViewPosition);
+            final int pos = position == null ? 0 : position;
+
+            if (pos == mActivePosition) {
+                final int width = getWidth();
+                final int menuWidth = mMenuSize;
+                final int indicatorWidth = mActiveIndicator.getWidth();
+
+                final int contentRight = width - menuWidth;
+
+                mActiveView.getDrawingRect(mActiveRect);
+                offsetDescendantRectToMyCoords(mActiveView, mActiveRect);
+
+                final int indicatorRight = contentRight + indicatorWidth;
+                final int indicatorLeft = contentRight;
+
+                if (mIndicatorAnimating) {
+                    final int indicatorFinalTop = mActiveRect.top + ((mActiveRect.height()
+                            - mActiveIndicator.getHeight()) / 2);
+                    final int indicatorStartTop = mIndicatorStartPos;
+                    final int diff = indicatorFinalTop - indicatorStartTop;
+                    final int startOffset = (int) (diff * mIndicatorOffset);
+                    mIndicatorTop = indicatorStartTop + startOffset;
+                } else {
+                    mIndicatorTop = mActiveRect.top + ((mActiveRect.height() - mActiveIndicator.getHeight()) / 2);
+                }
+
+                canvas.save();
+                canvas.clipRect(contentRight, 0, indicatorRight, getHeight());
+                canvas.drawBitmap(mActiveIndicator, indicatorLeft, mIndicatorTop, null);
+                canvas.restore();
+            }
+        }
+    }
+
+    @Override
+    protected int getIndicatorStartPos() {
+        return mIndicatorTop;
+    }
+}
diff --git a/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/Scroller.java b/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/Scroller.java
new file mode 100644
index 0000000000..58f0fc54e5
--- /dev/null
+++ b/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/Scroller.java
@@ -0,0 +1,505 @@
+/*
+ * Copyright (C) 2006 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package net.simonvt.menudrawer;
+
+import android.content.Context;
+import android.hardware.SensorManager;
+import android.os.Build;
+import android.util.FloatMath;
+import android.view.ViewConfiguration;
+import android.view.animation.AnimationUtils;
+import android.view.animation.Interpolator;
+
+
+/**
+ * This class encapsulates scrolling.  The duration of the scroll
+ * can be passed in the constructor and specifies the maximum time that
+ * the scrolling animation should take.  Past this time, the scrolling is
+ * automatically moved to its final stage and computeScrollOffset()
+ * will always return false to indicate that scrolling is over.
+ */
+public class Scroller  {
+    private int mMode;
+
+    private int mStartX;
+    private int mStartY;
+    private int mFinalX;
+    private int mFinalY;
+
+    private int mMinX;
+    private int mMaxX;
+    private int mMinY;
+    private int mMaxY;
+
+    private int mCurrX;
+    private int mCurrY;
+    private long mStartTime;
+    private int mDuration;
+    private float mDurationReciprocal;
+    private float mDeltaX;
+    private float mDeltaY;
+    private boolean mFinished;
+    private Interpolator mInterpolator;
+    private boolean mFlywheel;
+
+    private float mVelocity;
+
+    private static final int DEFAULT_DURATION = 250;
+    private static final int SCROLL_MODE = 0;
+    private static final int FLING_MODE = 1;
+
+    private static final float DECELERATION_RATE = (float) (Math.log(0.75) / Math.log(0.9));
+    private static final float ALPHA = 800; // pixels / seconds
+    private static final float START_TENSION = 0.4f; // Tension at start: (0.4 * total T, 1.0 * Distance)
+    private static final float END_TENSION = 1.0f - START_TENSION;
+    private static final int NB_SAMPLES = 100;
+    private static final float[] SPLINE = new float[NB_SAMPLES + 1];
+
+    private float mDeceleration;
+    private final float mPpi;
+
+    static {
+        float xMin = 0.0f;
+        for (int i = 0; i <= NB_SAMPLES; i++) {
+            final float t = (float) i / NB_SAMPLES;
+            float xMax = 1.0f;
+            float x, tx, coef;
+            while (true) {
+                x = xMin + (xMax - xMin) / 2.0f;
+                coef = 3.0f * x * (1.0f - x);
+                tx = coef * ((1.0f - x) * START_TENSION + x * END_TENSION) + x * x * x;
+                if (Math.abs(tx - t) < 1E-5) break;
+                if (tx > t) xMax = x;
+                else xMin = x;
+            }
+            final float d = coef + x * x * x;
+            SPLINE[i] = d;
+        }
+        SPLINE[NB_SAMPLES] = 1.0f;
+
+        // This controls the viscous fluid effect (how much of it)
+        sViscousFluidScale = 8.0f;
+        // must be set to 1.0 (used in viscousFluid())
+        sViscousFluidNormalize = 1.0f;
+        sViscousFluidNormalize = 1.0f / viscousFluid(1.0f);
+    }
+
+    private static float sViscousFluidScale;
+    private static float sViscousFluidNormalize;
+
+    /**
+     * Create a Scroller with the default duration and interpolator.
+     */
+    public Scroller(Context context) {
+        this(context, null);
+    }
+
+    /**
+     * Create a Scroller with the specified interpolator. If the interpolator is
+     * null, the default (viscous) interpolator will be used. "Flywheel" behavior will
+     * be in effect for apps targeting Honeycomb or newer.
+     */
+    public Scroller(Context context, Interpolator interpolator) {
+        this(context, interpolator,
+                context.getApplicationInfo().targetSdkVersion >= Build.VERSION_CODES.HONEYCOMB);
+    }
+
+    /**
+     * Create a Scroller with the specified interpolator. If the interpolator is
+     * null, the default (viscous) interpolator will be used. Specify whether or
+     * not to support progressive "flywheel" behavior in flinging.
+     */
+    public Scroller(Context context, Interpolator interpolator, boolean flywheel) {
+        mFinished = true;
+        mInterpolator = interpolator;
+        mPpi = context.getResources().getDisplayMetrics().density * 160.0f;
+        mDeceleration = computeDeceleration(ViewConfiguration.getScrollFriction());
+        mFlywheel = flywheel;
+    }
+
+    /**
+     * The amount of friction applied to flings. The default value
+     * is {@link android.view.ViewConfiguration#getScrollFriction}.
+     *
+     * @param friction A scalar dimension-less value representing the coefficient of
+     *         friction.
+     */
+    public final void setFriction(float friction) {
+        mDeceleration = computeDeceleration(friction);
+    }
+
+    private float computeDeceleration(float friction) {
+        return SensorManager.GRAVITY_EARTH   // g (m/s^2)
+                      * 39.37f               // inch/meter
+                      * mPpi                 // pixels per inch
+                      * friction;
+    }
+
+    /**
+     *
+     * Returns whether the scroller has finished scrolling.
+     *
+     * @return True if the scroller has finished scrolling, false otherwise.
+     */
+    public final boolean isFinished() {
+        return mFinished;
+    }
+
+    /**
+     * Force the finished field to a particular value.
+     *
+     * @param finished The new finished value.
+     */
+    public final void forceFinished(boolean finished) {
+        mFinished = finished;
+    }
+
+    /**
+     * Returns how long the scroll event will take, in milliseconds.
+     *
+     * @return The duration of the scroll in milliseconds.
+     */
+    public final int getDuration() {
+        return mDuration;
+    }
+
+    /**
+     * Returns the current X offset in the scroll.
+     *
+     * @return The new X offset as an absolute distance from the origin.
+     */
+    public final int getCurrX() {
+        return mCurrX;
+    }
+
+    /**
+     * Returns the current Y offset in the scroll.
+     *
+     * @return The new Y offset as an absolute distance from the origin.
+     */
+    public final int getCurrY() {
+        return mCurrY;
+    }
+
+    /**
+     * Returns the current velocity.
+     *
+     * @return The original velocity less the deceleration. Result may be
+     * negative.
+     */
+    public float getCurrVelocity() {
+        return mVelocity - mDeceleration * timePassed() / 2000.0f;
+    }
+
+    /**
+     * Returns the start X offset in the scroll.
+     *
+     * @return The start X offset as an absolute distance from the origin.
+     */
+    public final int getStartX() {
+        return mStartX;
+    }
+
+    /**
+     * Returns the start Y offset in the scroll.
+     *
+     * @return The start Y offset as an absolute distance from the origin.
+     */
+    public final int getStartY() {
+        return mStartY;
+    }
+
+    /**
+     * Returns where the scroll will end. Valid only for "fling" scrolls.
+     *
+     * @return The final X offset as an absolute distance from the origin.
+     */
+    public final int getFinalX() {
+        return mFinalX;
+    }
+
+    /**
+     * Returns where the scroll will end. Valid only for "fling" scrolls.
+     *
+     * @return The final Y offset as an absolute distance from the origin.
+     */
+    public final int getFinalY() {
+        return mFinalY;
+    }
+
+    /**
+     * Call this when you want to know the new location.  If it returns true,
+     * the animation is not yet finished.  loc will be altered to provide the
+     * new location.
+     */
+    public boolean computeScrollOffset() {
+        if (mFinished) {
+            return false;
+        }
+
+        int timePassed = (int) (AnimationUtils.currentAnimationTimeMillis() - mStartTime);
+
+        if (timePassed < mDuration) {
+            switch (mMode) {
+            case SCROLL_MODE:
+                float x = timePassed * mDurationReciprocal;
+
+                if (mInterpolator == null)
+                    x = viscousFluid(x);
+                else
+                    x = mInterpolator.getInterpolation(x);
+
+                mCurrX = mStartX + Math.round(x * mDeltaX);
+                mCurrY = mStartY + Math.round(x * mDeltaY);
+                break;
+            case FLING_MODE:
+                final float t = (float) timePassed / mDuration;
+                final int index = (int) (NB_SAMPLES * t);
+                final float tInf = (float) index / NB_SAMPLES;
+                final float tSup = (float) (index + 1) / NB_SAMPLES;
+                final float dInf = SPLINE[index];
+                final float dSup = SPLINE[index + 1];
+                final float distanceCoef = dInf + (t - tInf) / (tSup - tInf) * (dSup - dInf);
+
+                mCurrX = mStartX + Math.round(distanceCoef * (mFinalX - mStartX));
+                // Pin to mMinX <= mCurrX <= mMaxX
+                mCurrX = Math.min(mCurrX, mMaxX);
+                mCurrX = Math.max(mCurrX, mMinX);
+
+                mCurrY = mStartY + Math.round(distanceCoef * (mFinalY - mStartY));
+                // Pin to mMinY <= mCurrY <= mMaxY
+                mCurrY = Math.min(mCurrY, mMaxY);
+                mCurrY = Math.max(mCurrY, mMinY);
+
+                if (mCurrX == mFinalX && mCurrY == mFinalY) {
+                    mFinished = true;
+                }
+
+                break;
+            }
+        } else {
+            mCurrX = mFinalX;
+            mCurrY = mFinalY;
+            mFinished = true;
+        }
+        return true;
+    }
+
+    /**
+     * Start scrolling by providing a starting point and the distance to travel.
+     * The scroll will use the default value of 250 milliseconds for the
+     * duration.
+     *
+     * @param startX Starting horizontal scroll offset in pixels. Positive
+     *        numbers will scroll the content to the left.
+     * @param startY Starting vertical scroll offset in pixels. Positive numbers
+     *        will scroll the content up.
+     * @param dx Horizontal distance to travel. Positive numbers will scroll the
+     *        content to the left.
+     * @param dy Vertical distance to travel. Positive numbers will scroll the
+     *        content up.
+     */
+    public void startScroll(int startX, int startY, int dx, int dy) {
+        startScroll(startX, startY, dx, dy, DEFAULT_DURATION);
+    }
+
+    /**
+     * Start scrolling by providing a starting point and the distance to travel.
+     *
+     * @param startX Starting horizontal scroll offset in pixels. Positive
+     *        numbers will scroll the content to the left.
+     * @param startY Starting vertical scroll offset in pixels. Positive numbers
+     *        will scroll the content up.
+     * @param dx Horizontal distance to travel. Positive numbers will scroll the
+     *        content to the left.
+     * @param dy Vertical distance to travel. Positive numbers will scroll the
+     *        content up.
+     * @param duration Duration of the scroll in milliseconds.
+     */
+    public void startScroll(int startX, int startY, int dx, int dy, int duration) {
+        mMode = SCROLL_MODE;
+        mFinished = false;
+        mDuration = duration;
+        mStartTime = AnimationUtils.currentAnimationTimeMillis();
+        mStartX = startX;
+        mStartY = startY;
+        mFinalX = startX + dx;
+        mFinalY = startY + dy;
+        mDeltaX = dx;
+        mDeltaY = dy;
+        mDurationReciprocal = 1.0f / (float) mDuration;
+    }
+
+    /**
+     * Start scrolling based on a fling gesture. The distance travelled will
+     * depend on the initial velocity of the fling.
+     *
+     * @param startX Starting point of the scroll (X)
+     * @param startY Starting point of the scroll (Y)
+     * @param velocityX Initial velocity of the fling (X) measured in pixels per
+     *        second.
+     * @param velocityY Initial velocity of the fling (Y) measured in pixels per
+     *        second
+     * @param minX Minimum X value. The scroller will not scroll past this
+     *        point.
+     * @param maxX Maximum X value. The scroller will not scroll past this
+     *        point.
+     * @param minY Minimum Y value. The scroller will not scroll past this
+     *        point.
+     * @param maxY Maximum Y value. The scroller will not scroll past this
+     *        point.
+     */
+    public void fling(int startX, int startY, int velocityX, int velocityY,
+            int minX, int maxX, int minY, int maxY) {
+        // Continue a scroll or fling in progress
+        if (mFlywheel && !mFinished) {
+            float oldVel = getCurrVelocity();
+
+            float dx = (float) (mFinalX - mStartX);
+            float dy = (float) (mFinalY - mStartY);
+            float hyp = FloatMath.sqrt(dx * dx + dy * dy);
+
+            float ndx = dx / hyp;
+            float ndy = dy / hyp;
+
+            float oldVelocityX = ndx * oldVel;
+            float oldVelocityY = ndy * oldVel;
+            if (Math.signum(velocityX) == Math.signum(oldVelocityX)
+                    && Math.signum(velocityY) == Math.signum(oldVelocityY)) {
+                velocityX += oldVelocityX;
+                velocityY += oldVelocityY;
+            }
+        }
+
+        mMode = FLING_MODE;
+        mFinished = false;
+
+        float velocity = FloatMath.sqrt(velocityX * velocityX + velocityY * velocityY);
+
+        mVelocity = velocity;
+        final double l = Math.log(START_TENSION * velocity / ALPHA);
+        mDuration = (int) (1000.0 * Math.exp(l / (DECELERATION_RATE - 1.0)));
+        mStartTime = AnimationUtils.currentAnimationTimeMillis();
+        mStartX = startX;
+        mStartY = startY;
+
+        float coeffX = velocity == 0 ? 1.0f : velocityX / velocity;
+        float coeffY = velocity == 0 ? 1.0f : velocityY / velocity;
+
+        int totalDistance =
+                (int) (ALPHA * Math.exp(DECELERATION_RATE / (DECELERATION_RATE - 1.0) * l));
+
+        mMinX = minX;
+        mMaxX = maxX;
+        mMinY = minY;
+        mMaxY = maxY;
+
+        mFinalX = startX + Math.round(totalDistance * coeffX);
+        // Pin to mMinX <= mFinalX <= mMaxX
+        mFinalX = Math.min(mFinalX, mMaxX);
+        mFinalX = Math.max(mFinalX, mMinX);
+
+        mFinalY = startY + Math.round(totalDistance * coeffY);
+        // Pin to mMinY <= mFinalY <= mMaxY
+        mFinalY = Math.min(mFinalY, mMaxY);
+        mFinalY = Math.max(mFinalY, mMinY);
+    }
+
+    static float viscousFluid(float x) {
+        x *= sViscousFluidScale;
+        if (x < 1.0f) {
+            x -= (1.0f - (float) Math.exp(-x));
+        } else {
+            float start = 0.36787944117f;   // 1/e == exp(-1)
+            x = 1.0f - (float) Math.exp(1.0f - x);
+            x = start + x * (1.0f - start);
+        }
+        x *= sViscousFluidNormalize;
+        return x;
+    }
+
+    /**
+     * Stops the animation. Contrary to {@link #forceFinished(boolean)},
+     * aborting the animating cause the scroller to move to the final x and y
+     * position
+     *
+     * @see #forceFinished(boolean)
+     */
+    public void abortAnimation() {
+        mCurrX = mFinalX;
+        mCurrY = mFinalY;
+        mFinished = true;
+    }
+
+    /**
+     * Extend the scroll animation. This allows a running animation to scroll
+     * further and longer, when used with {@link #setFinalX(int)} or {@link #setFinalY(int)}.
+     *
+     * @param extend Additional time to scroll in milliseconds.
+     * @see #setFinalX(int)
+     * @see #setFinalY(int)
+     */
+    public void extendDuration(int extend) {
+        int passed = timePassed();
+        mDuration = passed + extend;
+        mDurationReciprocal = 1.0f / mDuration;
+        mFinished = false;
+    }
+
+    /**
+     * Returns the time elapsed since the beginning of the scrolling.
+     *
+     * @return The elapsed time in milliseconds.
+     */
+    public int timePassed() {
+        return (int) (AnimationUtils.currentAnimationTimeMillis() - mStartTime);
+    }
+
+    /**
+     * Sets the final position (X) for this scroller.
+     *
+     * @param newX The new X offset as an absolute distance from the origin.
+     * @see #extendDuration(int)
+     * @see #setFinalY(int)
+     */
+    public void setFinalX(int newX) {
+        mFinalX = newX;
+        mDeltaX = mFinalX - mStartX;
+        mFinished = false;
+    }
+
+    /**
+     * Sets the final position (Y) for this scroller.
+     *
+     * @param newY The new Y offset as an absolute distance from the origin.
+     * @see #extendDuration(int)
+     * @see #setFinalX(int)
+     */
+    public void setFinalY(int newY) {
+        mFinalY = newY;
+        mDeltaY = mFinalY - mStartY;
+        mFinished = false;
+    }
+
+    /**
+     * @hide
+     */
+    public boolean isScrollingInDirection(float xvel, float yvel) {
+        return !mFinished && Math.signum(xvel) == Math.signum(mFinalX - mStartX)
+                && Math.signum(yvel) == Math.signum(mFinalY - mStartY);
+    }
+}
diff --git a/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/SinusoidalInterpolator.java b/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/SinusoidalInterpolator.java
new file mode 100644
index 0000000000..e79051a06b
--- /dev/null
+++ b/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/SinusoidalInterpolator.java
@@ -0,0 +1,15 @@
+package net.simonvt.menudrawer;
+
+import android.view.animation.Interpolator;
+
+/**
+ * Interpolator which, when drawn from 0 to 1, looks like half a sine-wave. Used for smoother opening/closing when
+ * peeking at the drawer.
+ */
+public class SinusoidalInterpolator implements Interpolator {
+
+    @Override
+    public float getInterpolation(float input) {
+        return (float) (0.5f + 0.5f * Math.sin(input * Math.PI - Math.PI / 2.f));
+    }
+}
diff --git a/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/SmoothInterpolator.java b/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/SmoothInterpolator.java
new file mode 100644
index 0000000000..cfdcb69bf3
--- /dev/null
+++ b/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/SmoothInterpolator.java
@@ -0,0 +1,12 @@
+package net.simonvt.menudrawer;
+
+import android.view.animation.Interpolator;
+
+public class SmoothInterpolator implements Interpolator {
+
+    @Override
+    public float getInterpolation(float t) {
+        t -= 1.0f;
+        return t * t * t * t * t + 1.0f;
+    }
+}
diff --git a/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/StaticDrawer.java b/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/StaticDrawer.java
new file mode 100644
index 0000000000..879f2c9504
--- /dev/null
+++ b/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/StaticDrawer.java
@@ -0,0 +1,208 @@
+package net.simonvt.menudrawer;
+
+import android.app.Activity;
+import android.content.Context;
+import android.graphics.Canvas;
+import android.util.AttributeSet;
+
+public abstract class StaticDrawer extends MenuDrawer {
+
+    protected Position mPosition;
+
+    StaticDrawer(Activity activity, int dragMode) {
+        super(activity, dragMode);
+    }
+
+    public StaticDrawer(Context context) {
+        super(context);
+    }
+
+    public StaticDrawer(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public StaticDrawer(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+    }
+
+    @Override
+    protected void dispatchDraw(Canvas canvas) {
+        super.dispatchDraw(canvas);
+        if (mDropShadowEnabled) drawDropShadow(canvas);
+        if (mActiveIndicator != null) drawIndicator(canvas);
+    }
+
+    private void drawDropShadow(Canvas canvas) {
+        final int width = getWidth();
+        final int height = getHeight();
+        final int menuSize = mMenuSize;
+        final int dropShadowSize = mDropShadowSize;
+
+        switch (mPosition) {
+            case LEFT:
+                mDropShadowDrawable.setBounds(menuSize - dropShadowSize, 0, menuSize, height);
+                break;
+
+            case TOP:
+                mDropShadowDrawable.setBounds(0, menuSize - dropShadowSize, width, menuSize);
+                break;
+
+            case RIGHT:
+                mDropShadowDrawable.setBounds(width - menuSize, 0, width - menuSize + dropShadowSize, height);
+                break;
+
+            case BOTTOM:
+                mDropShadowDrawable.setBounds(0, height - menuSize, width, height - menuSize + dropShadowSize);
+                break;
+        }
+
+        mDropShadowDrawable.draw(canvas);
+    }
+
+    protected abstract void drawIndicator(Canvas canvas);
+
+    @Override
+    protected void onLayout(boolean changed, int l, int t, int r, int b) {
+        final int width = r - l;
+        final int height = b - t;
+
+        switch (mPosition) {
+            case LEFT:
+                mMenuContainer.layout(0, 0, mMenuSize, height);
+                mContentContainer.layout(mMenuSize, 0, width, height);
+                break;
+
+            case RIGHT:
+                mMenuContainer.layout(width - mMenuSize, 0, width, height);
+                mContentContainer.layout(0, 0, width - mMenuSize, height);
+                break;
+
+            case TOP:
+                mMenuContainer.layout(0, 0, width, mMenuSize);
+                mContentContainer.layout(0, mMenuSize, width, height);
+                break;
+
+            case BOTTOM:
+                mMenuContainer.layout(0, height - mMenuSize, width, height);
+                mContentContainer.layout(0, 0, width, height - mMenuSize);
+                break;
+        }
+    }
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        final int widthMode = MeasureSpec.getMode(widthMeasureSpec);
+        final int heightMode = MeasureSpec.getMode(heightMeasureSpec);
+
+        if (widthMode != MeasureSpec.EXACTLY || heightMode != MeasureSpec.EXACTLY) {
+            throw new IllegalStateException("Must measure with an exact size");
+        }
+
+        final int width = MeasureSpec.getSize(widthMeasureSpec);
+        final int height = MeasureSpec.getSize(heightMeasureSpec);
+
+        if (!mMenuSizeSet) mMenuSize = (int) (height * 0.25f);
+
+        switch (mPosition) {
+            case LEFT:
+            case RIGHT: {
+                final int childHeightMeasureSpec = MeasureSpec.makeMeasureSpec(height, MeasureSpec.EXACTLY);
+
+                final int menuWidth = mMenuSize;
+                final int menuWidthMeasureSpec = MeasureSpec.makeMeasureSpec(menuWidth, MeasureSpec.EXACTLY);
+
+                final int contentWidth = width - menuWidth;
+                final int contentWidthMeasureSpec = MeasureSpec.makeMeasureSpec(contentWidth, MeasureSpec.EXACTLY);
+
+                mContentContainer.measure(contentWidthMeasureSpec, childHeightMeasureSpec);
+                mMenuContainer.measure(menuWidthMeasureSpec, childHeightMeasureSpec);
+                break;
+            }
+
+            case TOP:
+            case BOTTOM: {
+                final int childWidthMeasureSpec = MeasureSpec.makeMeasureSpec(width, MeasureSpec.EXACTLY);
+
+                final int menuHeight = mMenuSize;
+                final int menuHeightMeasureSpec = MeasureSpec.makeMeasureSpec(menuHeight, MeasureSpec.EXACTLY);
+
+                final int contentHeight = height - menuHeight;
+                final int contentHeightMeasureSpec = MeasureSpec.makeMeasureSpec(contentHeight, MeasureSpec.EXACTLY);
+
+                mContentContainer.measure(childWidthMeasureSpec, contentHeightMeasureSpec);
+                mMenuContainer.measure(childWidthMeasureSpec, menuHeightMeasureSpec);
+                break;
+            }
+        }
+
+        setMeasuredDimension(width, height);
+    }
+
+    @Override
+    public void toggleMenu(boolean animate) {
+    }
+
+    @Override
+    public void openMenu(boolean animate) {
+    }
+
+    @Override
+    public void closeMenu(boolean animate) {
+    }
+
+    @Override
+    public boolean isMenuVisible() {
+        return true;
+    }
+
+    @Override
+    public void setMenuSize(int size) {
+        mMenuSize = size;
+        mMenuSizeSet = true;
+        requestLayout();
+        invalidate();
+    }
+
+    @Override
+    public void setOffsetMenuEnabled(boolean offsetMenu) {
+    }
+
+    @Override
+    public boolean getOffsetMenuEnabled() {
+        return false;
+    }
+
+    @Override
+    public void peekDrawer() {
+    }
+
+    @Override
+    public void peekDrawer(long delay) {
+    }
+
+    @Override
+    public void peekDrawer(long startDelay, long delay) {
+    }
+
+    @Override
+    public void setHardwareLayerEnabled(boolean enabled) {
+    }
+
+    @Override
+    public int getTouchMode() {
+        return TOUCH_MODE_NONE;
+    }
+
+    @Override
+    public void setTouchMode(int mode) {
+    }
+
+    @Override
+    public void setTouchBezelSize(int size) {
+    }
+
+    @Override
+    public int getTouchBezelSize() {
+        return 0;
+    }
+}
diff --git a/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/TopDrawer.java b/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/TopDrawer.java
new file mode 100644
index 0000000000..0af2c6bad8
--- /dev/null
+++ b/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/TopDrawer.java
@@ -0,0 +1,216 @@
+package net.simonvt.menudrawer;
+
+import android.app.Activity;
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.drawable.GradientDrawable;
+import android.util.AttributeSet;
+import android.view.MotionEvent;
+
+public class TopDrawer extends VerticalDrawer {
+
+    private int mIndicatorLeft;
+
+    TopDrawer(Activity activity, int dragMode) {
+        super(activity, dragMode);
+    }
+
+    public TopDrawer(Context context) {
+        super(context);
+    }
+
+    public TopDrawer(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public TopDrawer(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+    }
+
+    @Override
+    public void openMenu(boolean animate) {
+        animateOffsetTo(mMenuSize, 0, animate);
+    }
+
+    @Override
+    public void closeMenu(boolean animate) {
+        animateOffsetTo(0, 0, animate);
+    }
+
+    @Override
+    public void setDropShadowColor(int color) {
+        final int endColor = color & 0x00FFFFFF;
+        mDropShadowDrawable = new GradientDrawable(GradientDrawable.Orientation.BOTTOM_TOP,
+                new int[] {
+                        color,
+                        endColor,
+                });
+        invalidate();
+    }
+
+    @Override
+    protected void onLayout(boolean changed, int l, int t, int r, int b) {
+        final int width = r - l;
+        final int height = b - t;
+        final int offsetPixels = (int) mOffsetPixels;
+
+        mMenuContainer.layout(0, 0, width, mMenuSize);
+        offsetMenu(offsetPixels);
+
+        if (USE_TRANSLATIONS) {
+            mContentContainer.layout(0, 0, width, height);
+        } else {
+            mContentContainer.layout(0, offsetPixels, width, height + offsetPixels);
+        }
+    }
+
+    /**
+     * Offsets the menu relative to its original position based on the position of the content.
+     *
+     * @param offsetPixels The number of pixels the content if offset.
+     */
+    private void offsetMenu(int offsetPixels) {
+        if (mOffsetMenu && mMenuSize != 0) {
+            final int menuSize = mMenuSize;
+            final float openRatio = (menuSize - (float) offsetPixels) / menuSize;
+
+            if (USE_TRANSLATIONS) {
+                if (offsetPixels > 0) {
+                    final int offset = (int) (0.25f * (-openRatio * menuSize));
+                    mMenuContainer.setTranslationY(offset);
+                } else {
+                    mMenuContainer.setTranslationY(-menuSize);
+                }
+
+            } else {
+                final int oldMenuTop = mMenuContainer.getTop();
+                final int offset = (int) (0.25f * (-openRatio * menuSize)) - oldMenuTop;
+                mMenuContainer.offsetTopAndBottom(offset);
+                mMenuContainer.setVisibility(offsetPixels == 0 ? INVISIBLE : VISIBLE);
+            }
+        }
+    }
+
+    @Override
+    protected void drawDropShadow(Canvas canvas, int offsetPixels) {
+        final int width = getWidth();
+
+        mDropShadowDrawable.setBounds(0, offsetPixels - mDropShadowSize, width, offsetPixels);
+        mDropShadowDrawable.draw(canvas);
+    }
+
+    @Override
+    protected void drawMenuOverlay(Canvas canvas, int offsetPixels) {
+        final int width = getWidth();
+        final float openRatio = ((float) offsetPixels) / mMenuSize;
+
+        mMenuOverlay.setBounds(0, 0, width, offsetPixels);
+        mMenuOverlay.setAlpha((int) (MAX_MENU_OVERLAY_ALPHA * (1.f - openRatio)));
+        mMenuOverlay.draw(canvas);
+    }
+
+    @Override
+    protected void drawIndicator(Canvas canvas, int offsetPixels) {
+        if (mActiveView != null && isViewDescendant(mActiveView)) {
+            Integer position = (Integer) mActiveView.getTag(R.id.mdActiveViewPosition);
+            final int pos = position == null ? 0 : position;
+
+            if (pos == mActivePosition) {
+                final int menuHeight = mMenuSize;
+                final int indicatorHeight = mActiveIndicator.getHeight();
+
+                final float openRatio = ((float) offsetPixels) / menuHeight;
+
+                mActiveView.getDrawingRect(mActiveRect);
+                offsetDescendantRectToMyCoords(mActiveView, mActiveRect);
+                final int indicatorWidth = mActiveIndicator.getWidth();
+
+                final float interpolatedRatio = 1.f - INDICATOR_INTERPOLATOR.getInterpolation((1.f - openRatio));
+                final int interpolatedHeight = (int) (indicatorHeight * interpolatedRatio);
+
+                final int indicatorTop = offsetPixels - interpolatedHeight;
+                if (mIndicatorAnimating) {
+                    final int finalLeft = mActiveRect.left + ((mActiveRect.width() - indicatorWidth) / 2);
+                    final int startLeft = mIndicatorStartPos;
+                    final int diff = finalLeft - startLeft;
+                    final int startOffset = (int) (diff * mIndicatorOffset);
+                    mIndicatorLeft = startLeft + startOffset;
+                } else {
+                    mIndicatorLeft = mActiveRect.left + ((mActiveRect.width() - indicatorWidth) / 2);
+                }
+
+                canvas.save();
+                canvas.clipRect(mIndicatorLeft, indicatorTop, mIndicatorLeft + indicatorWidth, offsetPixels);
+                canvas.drawBitmap(mActiveIndicator, mIndicatorLeft, indicatorTop, null);
+                canvas.restore();
+            }
+        }
+    }
+
+    @Override
+    protected int getIndicatorStartPos() {
+        return mIndicatorLeft;
+    }
+
+    @Override
+    protected void initPeekScroller() {
+        final int dx = mMenuSize / 3;
+        mPeekScroller.startScroll(0, 0, dx, 0, PEEK_DURATION);
+    }
+
+    @Override
+    protected void onOffsetPixelsChanged(int offsetPixels) {
+        if (USE_TRANSLATIONS) {
+            mContentContainer.setTranslationY(offsetPixels);
+            offsetMenu(offsetPixels);
+            invalidate();
+        } else {
+            mContentContainer.offsetTopAndBottom(offsetPixels - mContentContainer.getTop());
+            offsetMenu(offsetPixels);
+            invalidate();
+        }
+    }
+
+    //////////////////////////////////////////////////////////////////////
+    // Touch handling
+    //////////////////////////////////////////////////////////////////////
+
+    @Override
+    protected boolean isContentTouch(MotionEvent ev) {
+        return ev.getY() > mOffsetPixels;
+    }
+
+    @Override
+    protected boolean onDownAllowDrag(MotionEvent ev) {
+        return (!mMenuVisible && mInitialMotionY <= mTouchSize)
+                || (mMenuVisible && mInitialMotionY >= mOffsetPixels);
+    }
+
+    @Override
+    protected boolean onMoveAllowDrag(MotionEvent ev, float diff) {
+        return (!mMenuVisible && mInitialMotionY <= mTouchSize && (diff > 0))
+                || (mMenuVisible && mInitialMotionY >= mOffsetPixels);
+    }
+
+    @Override
+    protected void onMoveEvent(float dx) {
+        setOffsetPixels(Math.min(Math.max(mOffsetPixels + dx, 0), mMenuSize));
+    }
+
+    @Override
+    protected void onUpEvent(MotionEvent ev) {
+        final int offsetPixels = (int) mOffsetPixels;
+
+        if (mIsDragging) {
+            mVelocityTracker.computeCurrentVelocity(1000, mMaxVelocity);
+            final int initialVelocity = (int) mVelocityTracker.getXVelocity();
+            mLastMotionY = ev.getY();
+            animateOffsetTo(mVelocityTracker.getYVelocity() > 0 ? mMenuSize : 0, initialVelocity,
+                    true);
+
+            // Close the menu when content is clicked while the menu is visible.
+        } else if (mMenuVisible && ev.getY() > offsetPixels) {
+            closeMenu();
+        }
+    }
+}
diff --git a/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/TopStaticDrawer.java b/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/TopStaticDrawer.java
new file mode 100644
index 0000000000..ac846148b1
--- /dev/null
+++ b/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/TopStaticDrawer.java
@@ -0,0 +1,82 @@
+package net.simonvt.menudrawer;
+
+import android.app.Activity;
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.drawable.GradientDrawable;
+import android.util.AttributeSet;
+
+public class TopStaticDrawer extends StaticDrawer {
+
+    private int mIndicatorLeft;
+
+    TopStaticDrawer(Activity activity, int dragMode) {
+        super(activity, dragMode);
+    }
+
+    public TopStaticDrawer(Context context) {
+        super(context);
+    }
+
+    public TopStaticDrawer(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public TopStaticDrawer(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+    }
+
+    @Override
+    protected void initDrawer(Context context, AttributeSet attrs, int defStyle) {
+        super.initDrawer(context, attrs, defStyle);
+        mPosition = Position.TOP;
+    }
+
+    @Override
+    public void setDropShadowColor(int color) {
+        final int endColor = color & 0x00FFFFFF;
+        mDropShadowDrawable = new GradientDrawable(GradientDrawable.Orientation.BOTTOM_TOP, new int[] {
+                color,
+                endColor,
+        });
+        invalidate();
+    }
+
+    @Override
+    protected void drawIndicator(Canvas canvas) {
+        if (mActiveView != null && isViewDescendant(mActiveView)) {
+            Integer position = (Integer) mActiveView.getTag(R.id.mdActiveViewPosition);
+            final int pos = position == null ? 0 : position;
+
+            if (pos == mActivePosition) {
+                final int menuHeight = mMenuSize;
+                final int indicatorHeight = mActiveIndicator.getHeight();
+
+                mActiveView.getDrawingRect(mActiveRect);
+                offsetDescendantRectToMyCoords(mActiveView, mActiveRect);
+                final int indicatorWidth = mActiveIndicator.getWidth();
+
+                final int indicatorTop = menuHeight - indicatorHeight;
+                if (mIndicatorAnimating) {
+                    final int finalLeft = mActiveRect.left + ((mActiveRect.width() - indicatorWidth) / 2);
+                    final int startLeft = mIndicatorStartPos;
+                    final int diff = finalLeft - startLeft;
+                    final int startOffset = (int) (diff * mIndicatorOffset);
+                    mIndicatorLeft = startLeft + startOffset;
+                } else {
+                    mIndicatorLeft = mActiveRect.left + ((mActiveRect.width() - indicatorWidth) / 2);
+                }
+
+                canvas.save();
+                canvas.clipRect(mIndicatorLeft, indicatorTop, mIndicatorLeft + indicatorWidth, menuHeight);
+                canvas.drawBitmap(mActiveIndicator, mIndicatorLeft, indicatorTop, null);
+                canvas.restore();
+            }
+        }
+    }
+
+    @Override
+    protected int getIndicatorStartPos() {
+        return mIndicatorLeft;
+    }
+}
diff --git a/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/VerticalDrawer.java b/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/VerticalDrawer.java
new file mode 100644
index 0000000000..415d49896e
--- /dev/null
+++ b/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/VerticalDrawer.java
@@ -0,0 +1,216 @@
+package net.simonvt.menudrawer;
+
+import android.app.Activity;
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.MotionEvent;
+import android.view.VelocityTracker;
+
+public abstract class VerticalDrawer extends DraggableDrawer {
+
+    VerticalDrawer(Activity activity, int dragMode) {
+        super(activity, dragMode);
+    }
+
+    public VerticalDrawer(Context context) {
+        super(context);
+    }
+
+    public VerticalDrawer(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public VerticalDrawer(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+    }
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        final int widthMode = MeasureSpec.getMode(widthMeasureSpec);
+        final int heightMode = MeasureSpec.getMode(heightMeasureSpec);
+
+        if (widthMode != MeasureSpec.EXACTLY || heightMode != MeasureSpec.EXACTLY) {
+            throw new IllegalStateException("Must measure with an exact size");
+        }
+
+        final int width = MeasureSpec.getSize(widthMeasureSpec);
+        final int height = MeasureSpec.getSize(heightMeasureSpec);
+
+        if (!mMenuSizeSet) mMenuSize = (int) (height * 0.25f);
+        if (mOffsetPixels == -1) openMenu(false);
+
+        final int menuWidthMeasureSpec = getChildMeasureSpec(widthMeasureSpec, 0, width);
+        final int menuHeightMeasureSpec = getChildMeasureSpec(widthMeasureSpec, 0, mMenuSize);
+        mMenuContainer.measure(menuWidthMeasureSpec, menuHeightMeasureSpec);
+
+        final int contentWidthMeasureSpec = getChildMeasureSpec(widthMeasureSpec, 0, width);
+        final int contentHeightMeasureSpec = getChildMeasureSpec(widthMeasureSpec, 0, height);
+        mContentContainer.measure(contentWidthMeasureSpec, contentHeightMeasureSpec);
+
+        setMeasuredDimension(width, height);
+
+        updateTouchAreaSize();
+    }
+
+    @Override
+    public boolean onInterceptTouchEvent(MotionEvent ev) {
+        final int action = ev.getAction() & MotionEvent.ACTION_MASK;
+
+        if (action == MotionEvent.ACTION_DOWN && mMenuVisible && isCloseEnough()) {
+            setOffsetPixels(0);
+            stopAnimation();
+            endPeek();
+            setDrawerState(STATE_CLOSED);
+        }
+
+        // Always intercept events over the content while menu is visible.
+        if (mMenuVisible && isContentTouch(ev)) {
+            return true;
+        }
+
+        if (mTouchMode == TOUCH_MODE_NONE) {
+            return false;
+        }
+
+        if (action != MotionEvent.ACTION_DOWN) {
+            if (mIsDragging) {
+                return true;
+            }
+        }
+
+        switch (action) {
+            case MotionEvent.ACTION_DOWN: {
+                mLastMotionX = mInitialMotionX = ev.getX();
+                mLastMotionY = mInitialMotionY = ev.getY();
+                final boolean allowDrag = onDownAllowDrag(ev);
+
+                if (allowDrag) {
+                    setDrawerState(mMenuVisible ? STATE_OPEN : STATE_CLOSED);
+                    stopAnimation();
+                    endPeek();
+                    mIsDragging = false;
+                }
+                break;
+            }
+
+            case MotionEvent.ACTION_MOVE: {
+                final float x = ev.getX();
+                final float dx = x - mLastMotionX;
+                final float xDiff = Math.abs(dx);
+                final float y = ev.getY();
+                final float dy = y - mLastMotionY;
+                final float yDiff = Math.abs(dy);
+
+                if (yDiff > mTouchSlop && yDiff > xDiff) {
+                    if (mOnInterceptMoveEventListener != null && mTouchMode == TOUCH_MODE_FULLSCREEN
+                            && canChildScrollVertically(mContentContainer, false, (int) dx, (int) x, (int) y)) {
+                        endDrag(); // Release the velocity tracker
+                        return false;
+                    }
+
+                    final boolean allowDrag = onMoveAllowDrag(ev, dy);
+
+                    if (allowDrag) {
+                        setDrawerState(STATE_DRAGGING);
+                        mIsDragging = true;
+                        mLastMotionX = x;
+                        mLastMotionY = y;
+                    }
+                }
+                break;
+            }
+
+            /**
+             * If you click really fast, an up or cancel event is delivered here. Just snap content to
+             * whatever is closest.
+             */
+            case MotionEvent.ACTION_CANCEL:
+            case MotionEvent.ACTION_UP: {
+                if (Math.abs(mOffsetPixels) > mMenuSize / 2) {
+                    openMenu();
+                } else {
+                    closeMenu();
+                }
+                break;
+            }
+        }
+
+        if (mVelocityTracker == null) {
+            mVelocityTracker = VelocityTracker.obtain();
+        }
+        mVelocityTracker.addMovement(ev);
+
+        return mIsDragging;
+    }
+
+    @Override
+    public boolean onTouchEvent(MotionEvent ev) {
+        if (!mMenuVisible && !mIsDragging && (mTouchMode == TOUCH_MODE_NONE)) {
+            return false;
+        }
+        final int action = ev.getAction() & MotionEvent.ACTION_MASK;
+
+        if (mVelocityTracker == null) {
+            mVelocityTracker = VelocityTracker.obtain();
+        }
+        mVelocityTracker.addMovement(ev);
+
+        switch (action) {
+            case MotionEvent.ACTION_DOWN: {
+                mLastMotionX = mInitialMotionX = ev.getX();
+                mLastMotionY = mInitialMotionY = ev.getY();
+                final boolean allowDrag = onDownAllowDrag(ev);
+
+                if (allowDrag) {
+                    stopAnimation();
+                    endPeek();
+                    startLayerTranslation();
+                }
+                break;
+            }
+
+            case MotionEvent.ACTION_MOVE: {
+                if (!mIsDragging) {
+                    final float x = ev.getX();
+                    final float dx = x - mLastMotionX;
+                    final float xDiff = Math.abs(dx);
+                    final float y = ev.getY();
+                    final float dy = y - mLastMotionY;
+                    final float yDiff = Math.abs(dy);
+
+                    if (yDiff > mTouchSlop && yDiff > xDiff) {
+                        final boolean allowDrag = onMoveAllowDrag(ev, dy);
+
+                        if (allowDrag) {
+                            setDrawerState(STATE_DRAGGING);
+                            mIsDragging = true;
+                            mLastMotionY = y - mInitialMotionY > 0
+                                    ? mInitialMotionY + mTouchSlop
+                                    : mInitialMotionY - mTouchSlop;
+                        }
+                    }
+                }
+
+                if (mIsDragging) {
+                    startLayerTranslation();
+
+                    final float y = ev.getY();
+                    final float dy = y - mLastMotionY;
+
+                    mLastMotionY = y;
+                    onMoveEvent(dy);
+                }
+                break;
+            }
+
+            case MotionEvent.ACTION_CANCEL:
+            case MotionEvent.ACTION_UP: {
+                onUpEvent(ev);
+                break;
+            }
+        }
+
+        return true;
+    }
+
+}
diff --git a/Externals/android-menudrawer/pom.xml b/Externals/android-menudrawer/pom.xml
new file mode 100644
index 0000000000..eda6dd9125
--- /dev/null
+++ b/Externals/android-menudrawer/pom.xml
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.sonatype.oss</groupId>
+        <artifactId>oss-parent</artifactId>
+        <version>7</version>
+    </parent>
+
+    <groupId>net.simonvt</groupId>
+    <artifactId>android-menudrawer-parent</artifactId>
+    <packaging>pom</packaging>
+    <version>2.0.3-SNAPSHOT</version>
+
+    <name>Android MenuDrawer (Parent)</name>
+    <description>A menu drawer implementation which allows dragging of both the content, and the entire window.</description>
+    <url>https://github.com/SimonVT/android-menudrawer</url>
+    <inceptionYear>2012</inceptionYear>
+
+    <modules>
+        <module>library</module>
+        <module>samples</module>
+    </modules>
+
+    <scm>
+        <url>http://github.com/SimonVT/android-menudrawer/</url>
+        <connection>scm:git:git://github.com/SimonVT/android-menudrawer.git</connection>
+        <developerConnection>scm:git:git@github.com:SimonVT/android-menudrawer.git</developerConnection>
+      <tag>HEAD</tag>
+  </scm>
+
+    <licenses>
+        <license>
+            <name>Apache License Version 2.0</name>
+            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+            <distribution>repo</distribution>
+        </license>
+    </licenses>
+
+    <issueManagement>
+        <system>GitHub Issues</system>
+        <url>https://github.com/SimonVT/android-menudrawer/issues</url>
+    </issueManagement>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+
+        <java.version>1.6</java.version>
+        <android.version>4.1.1.4</android.version>
+        <android.platform>16</android.platform>
+
+        <android-support.version>r7</android-support.version>
+    </properties>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>com.google.android</groupId>
+                <artifactId>android</artifactId>
+                <version>${android.version}</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-compiler-plugin</artifactId>
+                    <version>3.0</version>
+                    <configuration>
+                        <source>${java.version}</source>
+                        <target>${java.version}</target>
+                    </configuration>
+                </plugin>
+
+                <plugin>
+                    <groupId>com.jayway.maven.plugins.android.generation2</groupId>
+                    <artifactId>android-maven-plugin</artifactId>
+                    <version>3.5.1</version>
+                    <configuration>
+                        <sdk>
+                            <platform>${android.platform}</platform>
+                        </sdk>
+                    </configuration>
+                    <extensions>true</extensions>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-release-plugin</artifactId>
+                <version>2.4</version>
+                <configuration>
+                    <autoVersionSubmodules>true</autoVersionSubmodules>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+                <version>2.9.1</version>
+                <configuration>
+                    <failsOnError>true</failsOnError>
+                    <!-- Relative to module directory. -->
+                    <configLocation>../checkstyle.xml</configLocation>
+                    <consoleOutput>true</consoleOutput>
+                </configuration>
+                <executions>
+                    <execution>
+                        <phase>verify</phase>
+                        <goals>
+                            <goal>checkstyle</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/Externals/android-menudrawer/samples/AndroidManifest.xml b/Externals/android-menudrawer/samples/AndroidManifest.xml
new file mode 100644
index 0000000000..7323fa61b3
--- /dev/null
+++ b/Externals/android-menudrawer/samples/AndroidManifest.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="net.simonvt.menudrawer.samples"
+    android:versionCode="3"
+    android:versionName="2.0.1">
+
+    <uses-sdk android:minSdkVersion="7" android:targetSdkVersion="17" />
+
+    <application
+        android:label="@string/app_name"
+        android:icon="@drawable/ic_launcher"
+        android:theme="@style/SampleTheme">
+
+        <activity
+            android:name="SamplesActivity"
+            android:label="@string/app_name"
+            android:launchMode="singleTop" >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+        <activity android:name="net.simonvt.menudrawer.samples.WindowSample" />
+        <activity android:name="net.simonvt.menudrawer.samples.ContentSample" />
+        <activity android:name="net.simonvt.menudrawer.samples.ListActivitySample" />
+        <activity android:name="net.simonvt.menudrawer.samples.ActionBarOverlaySample" />
+        <activity android:name="net.simonvt.menudrawer.samples.ViewPagerSample" />
+        <activity
+            android:name="net.simonvt.menudrawer.samples.RightMenuSample"
+            android:theme="@style/SampleTheme.RightDrawer" />
+        <activity
+            android:name="net.simonvt.menudrawer.samples.TopMenuSample"
+            android:theme="@style/SampleTheme.TopDrawer">
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value="net.simonvt.menudrawer.samples.SamplesActivity" />
+        </activity>
+        <activity
+            android:name="net.simonvt.menudrawer.samples.BottomMenuSample"
+            android:theme="@style/SampleTheme.BottomDrawer" />
+        <activity
+            android:name="net.simonvt.menudrawer.samples.LayoutSample"
+            android:theme="@style/SampleTheme.TopDrawer" />
+        <activity android:name="net.simonvt.menudrawer.samples.StaticDrawerSample" />
+    </application>
+
+</manifest>
diff --git a/Externals/android-menudrawer/samples/build.xml b/Externals/android-menudrawer/samples/build.xml
new file mode 100644
index 0000000000..9eb8fb98ea
--- /dev/null
+++ b/Externals/android-menudrawer/samples/build.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="menudrawersamples" default="help">
+
+    <!-- The local.properties file is created and updated by the 'android' tool.
+         It contains the path to the SDK. It should *NOT* be checked into
+         Version Control Systems. -->
+    <property file="local.properties" />
+
+    <!-- The ant.properties file can be created by you. It is only edited by the
+         'android' tool to add properties to it.
+         This is the place to change some Ant specific build properties.
+         Here are some properties you may want to change/update:
+
+         source.dir
+             The name of the source directory. Default is 'src'.
+         out.dir
+             The name of the output directory. Default is 'bin'.
+
+         For other overridable properties, look at the beginning of the rules
+         files in the SDK, at tools/ant/build.xml
+
+         Properties related to the SDK location or the project target should
+         be updated using the 'android' tool with the 'update' action.
+
+         This file is an integral part of the build system for your
+         application and should be checked into Version Control Systems.
+
+         -->
+    <property file="ant.properties" />
+
+    <!-- if sdk.dir was not set from one of the property file, then
+         get it from the ANDROID_HOME env var.
+         This must be done before we load project.properties since
+         the proguard config can use sdk.dir -->
+    <property environment="env" />
+    <condition property="sdk.dir" value="${env.ANDROID_HOME}">
+        <isset property="env.ANDROID_HOME" />
+    </condition>
+
+    <!-- The project.properties file is created and updated by the 'android'
+         tool, as well as ADT.
+
+         This contains project specific properties such as project target, and library
+         dependencies. Lower level build properties are stored in ant.properties
+         (or in .classpath for Eclipse projects).
+
+         This file is an integral part of the build system for your
+         application and should be checked into Version Control Systems. -->
+    <loadproperties srcFile="project.properties" />
+
+    <!-- quick check on sdk.dir -->
+    <fail
+            message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through the ANDROID_HOME environment variable."
+            unless="sdk.dir"
+    />
+
+    <!--
+        Import per project custom build rules if present at the root of the project.
+        This is the place to put custom intermediary targets such as:
+            -pre-build
+            -pre-compile
+            -post-compile (This is typically used for code obfuscation.
+                           Compiled code location: ${out.classes.absolute.dir}
+                           If this is not done in place, override ${out.dex.input.absolute.dir})
+            -post-package
+            -post-build
+            -pre-clean
+    -->
+    <import file="custom_rules.xml" optional="true" />
+
+    <!-- Import the actual build file.
+
+         To customize existing targets, there are two options:
+         - Customize only one target:
+             - copy/paste the target into this file, *before* the
+               <import> task.
+             - customize it to your needs.
+         - Customize the whole content of build.xml
+             - copy/paste the content of the rules files (minus the top node)
+               into this file, replacing the <import> task.
+             - customize to your needs.
+
+         ***********************
+         ****** IMPORTANT ******
+         ***********************
+         In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
+         in order to avoid having your file be overridden by tools such as "android update project"
+    -->
+    <!-- version-tag: 1 -->
+    <import file="${sdk.dir}/tools/ant/build.xml" />
+
+</project>
diff --git a/Externals/android-menudrawer/samples/libs/android-support-v4-r10.jar b/Externals/android-menudrawer/samples/libs/android-support-v4-r10.jar
new file mode 100644
index 0000000000..feaf44f801
Binary files /dev/null and b/Externals/android-menudrawer/samples/libs/android-support-v4-r10.jar differ
diff --git a/Externals/android-menudrawer/samples/pom.xml b/Externals/android-menudrawer/samples/pom.xml
new file mode 100644
index 0000000000..5baaac769b
--- /dev/null
+++ b/Externals/android-menudrawer/samples/pom.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>net.simonvt</groupId>
+        <artifactId>android-menudrawer-parent</artifactId>
+        <version>2.0.3-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>android-menudrawer-sample</artifactId>
+    <name>Android MenuDrawer Sample</name>
+    <packaging>apk</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.google.android</groupId>
+            <artifactId>android</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>net.simonvt</groupId>
+            <artifactId>android-menudrawer</artifactId>
+            <version>${project.version}</version>
+            <type>apklib</type>
+        </dependency>
+        <dependency>
+            <groupId>com.google.android</groupId>
+            <artifactId>support-v4</artifactId>
+            <version>${android-support.version}</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <sourceDirectory>src</sourceDirectory>
+
+        <plugins>
+            <plugin>
+                <groupId>com.jayway.maven.plugins.android.generation2</groupId>
+                <artifactId>android-maven-plugin</artifactId>
+                <extensions>true</extensions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/Externals/android-menudrawer/samples/project.properties b/Externals/android-menudrawer/samples/project.properties
new file mode 100644
index 0000000000..1561d7a9a1
--- /dev/null
+++ b/Externals/android-menudrawer/samples/project.properties
@@ -0,0 +1,15 @@
+# This file is automatically generated by Android Tools.
+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
+#
+# This file must be checked in Version Control Systems.
+#
+# To customize properties used by the Ant build system edit
+# "ant.properties", and override values to adapt the script to your
+# project structure.
+#
+# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
+#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
+
+# Project target.
+target=android-17
+android.library.reference.1=../library
diff --git a/Externals/android-menudrawer/samples/res/drawable-hdpi-v14/menu_arrow.png b/Externals/android-menudrawer/samples/res/drawable-hdpi-v14/menu_arrow.png
new file mode 100644
index 0000000000..add3b36186
Binary files /dev/null and b/Externals/android-menudrawer/samples/res/drawable-hdpi-v14/menu_arrow.png differ
diff --git a/Externals/android-menudrawer/samples/res/drawable-hdpi-v14/menu_arrow_bottom.png b/Externals/android-menudrawer/samples/res/drawable-hdpi-v14/menu_arrow_bottom.png
new file mode 100644
index 0000000000..47e9c9045c
Binary files /dev/null and b/Externals/android-menudrawer/samples/res/drawable-hdpi-v14/menu_arrow_bottom.png differ
diff --git a/Externals/android-menudrawer/samples/res/drawable-hdpi-v14/menu_arrow_right.png b/Externals/android-menudrawer/samples/res/drawable-hdpi-v14/menu_arrow_right.png
new file mode 100644
index 0000000000..4ae9df9b78
Binary files /dev/null and b/Externals/android-menudrawer/samples/res/drawable-hdpi-v14/menu_arrow_right.png differ
diff --git a/Externals/android-menudrawer/samples/res/drawable-hdpi-v14/menu_arrow_top.png b/Externals/android-menudrawer/samples/res/drawable-hdpi-v14/menu_arrow_top.png
new file mode 100644
index 0000000000..ab4ed80eea
Binary files /dev/null and b/Externals/android-menudrawer/samples/res/drawable-hdpi-v14/menu_arrow_top.png differ
diff --git a/Externals/android-menudrawer/samples/res/drawable-hdpi/ic_action_refresh_dark.png b/Externals/android-menudrawer/samples/res/drawable-hdpi/ic_action_refresh_dark.png
new file mode 100644
index 0000000000..bb9d855f77
Binary files /dev/null and b/Externals/android-menudrawer/samples/res/drawable-hdpi/ic_action_refresh_dark.png differ
diff --git a/Externals/android-menudrawer/samples/res/drawable-hdpi/ic_action_select_all_dark.png b/Externals/android-menudrawer/samples/res/drawable-hdpi/ic_action_select_all_dark.png
new file mode 100644
index 0000000000..c87c3f8370
Binary files /dev/null and b/Externals/android-menudrawer/samples/res/drawable-hdpi/ic_action_select_all_dark.png differ
diff --git a/Externals/android-menudrawer/samples/res/drawable-hdpi/ic_launcher.png b/Externals/android-menudrawer/samples/res/drawable-hdpi/ic_launcher.png
new file mode 100644
index 0000000000..96a442e5b8
Binary files /dev/null and b/Externals/android-menudrawer/samples/res/drawable-hdpi/ic_launcher.png differ
diff --git a/Externals/android-menudrawer/samples/res/drawable-hdpi/ic_menu_moreoverflow_normal_holo_light.png b/Externals/android-menudrawer/samples/res/drawable-hdpi/ic_menu_moreoverflow_normal_holo_light.png
new file mode 100644
index 0000000000..bb6aef1d06
Binary files /dev/null and b/Externals/android-menudrawer/samples/res/drawable-hdpi/ic_menu_moreoverflow_normal_holo_light.png differ
diff --git a/Externals/android-menudrawer/samples/res/drawable-hdpi/md__category_background.9.png b/Externals/android-menudrawer/samples/res/drawable-hdpi/md__category_background.9.png
new file mode 100644
index 0000000000..43a20adcb1
Binary files /dev/null and b/Externals/android-menudrawer/samples/res/drawable-hdpi/md__category_background.9.png differ
diff --git a/Externals/android-menudrawer/samples/res/drawable-hdpi/md__list_focused_holo.9.png b/Externals/android-menudrawer/samples/res/drawable-hdpi/md__list_focused_holo.9.png
new file mode 100644
index 0000000000..555270842a
Binary files /dev/null and b/Externals/android-menudrawer/samples/res/drawable-hdpi/md__list_focused_holo.9.png differ
diff --git a/Externals/android-menudrawer/samples/res/drawable-hdpi/md__list_longpressed_holo.9.png b/Externals/android-menudrawer/samples/res/drawable-hdpi/md__list_longpressed_holo.9.png
new file mode 100644
index 0000000000..4ea7afa00e
Binary files /dev/null and b/Externals/android-menudrawer/samples/res/drawable-hdpi/md__list_longpressed_holo.9.png differ
diff --git a/Externals/android-menudrawer/samples/res/drawable-hdpi/md__list_pressed_holo_dark.9.png b/Externals/android-menudrawer/samples/res/drawable-hdpi/md__list_pressed_holo_dark.9.png
new file mode 100644
index 0000000000..5654cd6942
Binary files /dev/null and b/Externals/android-menudrawer/samples/res/drawable-hdpi/md__list_pressed_holo_dark.9.png differ
diff --git a/Externals/android-menudrawer/samples/res/drawable-hdpi/md__list_selector_disabled_holo_dark.9.png b/Externals/android-menudrawer/samples/res/drawable-hdpi/md__list_selector_disabled_holo_dark.9.png
new file mode 100644
index 0000000000..f6fd30dcdc
Binary files /dev/null and b/Externals/android-menudrawer/samples/res/drawable-hdpi/md__list_selector_disabled_holo_dark.9.png differ
diff --git a/Externals/android-menudrawer/samples/res/drawable-hdpi/menu_arrow.png b/Externals/android-menudrawer/samples/res/drawable-hdpi/menu_arrow.png
new file mode 100644
index 0000000000..c28d98f3bb
Binary files /dev/null and b/Externals/android-menudrawer/samples/res/drawable-hdpi/menu_arrow.png differ
diff --git a/Externals/android-menudrawer/samples/res/drawable-hdpi/menu_arrow_bottom.png b/Externals/android-menudrawer/samples/res/drawable-hdpi/menu_arrow_bottom.png
new file mode 100644
index 0000000000..4cbe8cbed4
Binary files /dev/null and b/Externals/android-menudrawer/samples/res/drawable-hdpi/menu_arrow_bottom.png differ
diff --git a/Externals/android-menudrawer/samples/res/drawable-hdpi/menu_arrow_right.png b/Externals/android-menudrawer/samples/res/drawable-hdpi/menu_arrow_right.png
new file mode 100644
index 0000000000..2fb6a937e6
Binary files /dev/null and b/Externals/android-menudrawer/samples/res/drawable-hdpi/menu_arrow_right.png differ
diff --git a/Externals/android-menudrawer/samples/res/drawable-hdpi/menu_arrow_top.png b/Externals/android-menudrawer/samples/res/drawable-hdpi/menu_arrow_top.png
new file mode 100644
index 0000000000..41f6c6a859
Binary files /dev/null and b/Externals/android-menudrawer/samples/res/drawable-hdpi/menu_arrow_top.png differ
diff --git a/Externals/android-menudrawer/samples/res/drawable-mdpi-v14/menu_arrow.png b/Externals/android-menudrawer/samples/res/drawable-mdpi-v14/menu_arrow.png
new file mode 100644
index 0000000000..26d7759516
Binary files /dev/null and b/Externals/android-menudrawer/samples/res/drawable-mdpi-v14/menu_arrow.png differ
diff --git a/Externals/android-menudrawer/samples/res/drawable-mdpi-v14/menu_arrow_bottom.png b/Externals/android-menudrawer/samples/res/drawable-mdpi-v14/menu_arrow_bottom.png
new file mode 100644
index 0000000000..af8e7b909d
Binary files /dev/null and b/Externals/android-menudrawer/samples/res/drawable-mdpi-v14/menu_arrow_bottom.png differ
diff --git a/Externals/android-menudrawer/samples/res/drawable-mdpi-v14/menu_arrow_right.png b/Externals/android-menudrawer/samples/res/drawable-mdpi-v14/menu_arrow_right.png
new file mode 100644
index 0000000000..21deedfcac
Binary files /dev/null and b/Externals/android-menudrawer/samples/res/drawable-mdpi-v14/menu_arrow_right.png differ
diff --git a/Externals/android-menudrawer/samples/res/drawable-mdpi-v14/menu_arrow_top.png b/Externals/android-menudrawer/samples/res/drawable-mdpi-v14/menu_arrow_top.png
new file mode 100644
index 0000000000..1f5d61a278
Binary files /dev/null and b/Externals/android-menudrawer/samples/res/drawable-mdpi-v14/menu_arrow_top.png differ
diff --git a/Externals/android-menudrawer/samples/res/drawable-mdpi/ic_action_refresh_dark.png b/Externals/android-menudrawer/samples/res/drawable-mdpi/ic_action_refresh_dark.png
new file mode 100644
index 0000000000..bd611e8e24
Binary files /dev/null and b/Externals/android-menudrawer/samples/res/drawable-mdpi/ic_action_refresh_dark.png differ
diff --git a/Externals/android-menudrawer/samples/res/drawable-mdpi/ic_action_select_all_dark.png b/Externals/android-menudrawer/samples/res/drawable-mdpi/ic_action_select_all_dark.png
new file mode 100644
index 0000000000..252ecbb0ed
Binary files /dev/null and b/Externals/android-menudrawer/samples/res/drawable-mdpi/ic_action_select_all_dark.png differ
diff --git a/Externals/android-menudrawer/samples/res/drawable-mdpi/ic_launcher.png b/Externals/android-menudrawer/samples/res/drawable-mdpi/ic_launcher.png
new file mode 100644
index 0000000000..359047dfa4
Binary files /dev/null and b/Externals/android-menudrawer/samples/res/drawable-mdpi/ic_launcher.png differ
diff --git a/Externals/android-menudrawer/samples/res/drawable-mdpi/ic_menu_moreoverflow_normal_holo_light.png b/Externals/android-menudrawer/samples/res/drawable-mdpi/ic_menu_moreoverflow_normal_holo_light.png
new file mode 100644
index 0000000000..01d681697f
Binary files /dev/null and b/Externals/android-menudrawer/samples/res/drawable-mdpi/ic_menu_moreoverflow_normal_holo_light.png differ
diff --git a/Externals/android-menudrawer/samples/res/drawable-mdpi/md__category_background.9.png b/Externals/android-menudrawer/samples/res/drawable-mdpi/md__category_background.9.png
new file mode 100644
index 0000000000..af0bc168d5
Binary files /dev/null and b/Externals/android-menudrawer/samples/res/drawable-mdpi/md__category_background.9.png differ
diff --git a/Externals/android-menudrawer/samples/res/drawable-mdpi/md__list_focused_holo.9.png b/Externals/android-menudrawer/samples/res/drawable-mdpi/md__list_focused_holo.9.png
new file mode 100644
index 0000000000..00f05d8c97
Binary files /dev/null and b/Externals/android-menudrawer/samples/res/drawable-mdpi/md__list_focused_holo.9.png differ
diff --git a/Externals/android-menudrawer/samples/res/drawable-mdpi/md__list_longpressed_holo.9.png b/Externals/android-menudrawer/samples/res/drawable-mdpi/md__list_longpressed_holo.9.png
new file mode 100644
index 0000000000..3bf8e03623
Binary files /dev/null and b/Externals/android-menudrawer/samples/res/drawable-mdpi/md__list_longpressed_holo.9.png differ
diff --git a/Externals/android-menudrawer/samples/res/drawable-mdpi/md__list_pressed_holo_dark.9.png b/Externals/android-menudrawer/samples/res/drawable-mdpi/md__list_pressed_holo_dark.9.png
new file mode 100644
index 0000000000..6e77525d2d
Binary files /dev/null and b/Externals/android-menudrawer/samples/res/drawable-mdpi/md__list_pressed_holo_dark.9.png differ
diff --git a/Externals/android-menudrawer/samples/res/drawable-mdpi/md__list_selector_disabled_holo_dark.9.png b/Externals/android-menudrawer/samples/res/drawable-mdpi/md__list_selector_disabled_holo_dark.9.png
new file mode 100644
index 0000000000..92da2f0dd3
Binary files /dev/null and b/Externals/android-menudrawer/samples/res/drawable-mdpi/md__list_selector_disabled_holo_dark.9.png differ
diff --git a/Externals/android-menudrawer/samples/res/drawable-mdpi/menu_arrow.png b/Externals/android-menudrawer/samples/res/drawable-mdpi/menu_arrow.png
new file mode 100644
index 0000000000..ecacda7113
Binary files /dev/null and b/Externals/android-menudrawer/samples/res/drawable-mdpi/menu_arrow.png differ
diff --git a/Externals/android-menudrawer/samples/res/drawable-mdpi/menu_arrow_bottom.png b/Externals/android-menudrawer/samples/res/drawable-mdpi/menu_arrow_bottom.png
new file mode 100644
index 0000000000..3dce461a3d
Binary files /dev/null and b/Externals/android-menudrawer/samples/res/drawable-mdpi/menu_arrow_bottom.png differ
diff --git a/Externals/android-menudrawer/samples/res/drawable-mdpi/menu_arrow_right.png b/Externals/android-menudrawer/samples/res/drawable-mdpi/menu_arrow_right.png
new file mode 100644
index 0000000000..3222d034e9
Binary files /dev/null and b/Externals/android-menudrawer/samples/res/drawable-mdpi/menu_arrow_right.png differ
diff --git a/Externals/android-menudrawer/samples/res/drawable-mdpi/menu_arrow_top.png b/Externals/android-menudrawer/samples/res/drawable-mdpi/menu_arrow_top.png
new file mode 100644
index 0000000000..cde43fd2b1
Binary files /dev/null and b/Externals/android-menudrawer/samples/res/drawable-mdpi/menu_arrow_top.png differ
diff --git a/Externals/android-menudrawer/samples/res/drawable-xhdpi-v14/menu_arrow.png b/Externals/android-menudrawer/samples/res/drawable-xhdpi-v14/menu_arrow.png
new file mode 100644
index 0000000000..6bdcc62e1a
Binary files /dev/null and b/Externals/android-menudrawer/samples/res/drawable-xhdpi-v14/menu_arrow.png differ
diff --git a/Externals/android-menudrawer/samples/res/drawable-xhdpi-v14/menu_arrow_bottom.png b/Externals/android-menudrawer/samples/res/drawable-xhdpi-v14/menu_arrow_bottom.png
new file mode 100644
index 0000000000..aba9001f33
Binary files /dev/null and b/Externals/android-menudrawer/samples/res/drawable-xhdpi-v14/menu_arrow_bottom.png differ
diff --git a/Externals/android-menudrawer/samples/res/drawable-xhdpi-v14/menu_arrow_right.png b/Externals/android-menudrawer/samples/res/drawable-xhdpi-v14/menu_arrow_right.png
new file mode 100644
index 0000000000..85591b81d5
Binary files /dev/null and b/Externals/android-menudrawer/samples/res/drawable-xhdpi-v14/menu_arrow_right.png differ
diff --git a/Externals/android-menudrawer/samples/res/drawable-xhdpi-v14/menu_arrow_top.png b/Externals/android-menudrawer/samples/res/drawable-xhdpi-v14/menu_arrow_top.png
new file mode 100644
index 0000000000..b81c74749d
Binary files /dev/null and b/Externals/android-menudrawer/samples/res/drawable-xhdpi-v14/menu_arrow_top.png differ
diff --git a/Externals/android-menudrawer/samples/res/drawable-xhdpi/ic_action_refresh_dark.png b/Externals/android-menudrawer/samples/res/drawable-xhdpi/ic_action_refresh_dark.png
new file mode 100644
index 0000000000..a7fdc0dfcb
Binary files /dev/null and b/Externals/android-menudrawer/samples/res/drawable-xhdpi/ic_action_refresh_dark.png differ
diff --git a/Externals/android-menudrawer/samples/res/drawable-xhdpi/ic_action_select_all_dark.png b/Externals/android-menudrawer/samples/res/drawable-xhdpi/ic_action_select_all_dark.png
new file mode 100644
index 0000000000..f193a8bb31
Binary files /dev/null and b/Externals/android-menudrawer/samples/res/drawable-xhdpi/ic_action_select_all_dark.png differ
diff --git a/Externals/android-menudrawer/samples/res/drawable-xhdpi/ic_launcher.png b/Externals/android-menudrawer/samples/res/drawable-xhdpi/ic_launcher.png
new file mode 100644
index 0000000000..71c6d760f0
Binary files /dev/null and b/Externals/android-menudrawer/samples/res/drawable-xhdpi/ic_launcher.png differ
diff --git a/Externals/android-menudrawer/samples/res/drawable-xhdpi/ic_menu_moreoverflow_normal_holo_light.png b/Externals/android-menudrawer/samples/res/drawable-xhdpi/ic_menu_moreoverflow_normal_holo_light.png
new file mode 100644
index 0000000000..930ca8d95e
Binary files /dev/null and b/Externals/android-menudrawer/samples/res/drawable-xhdpi/ic_menu_moreoverflow_normal_holo_light.png differ
diff --git a/Externals/android-menudrawer/samples/res/drawable-xhdpi/md__category_background.9.png b/Externals/android-menudrawer/samples/res/drawable-xhdpi/md__category_background.9.png
new file mode 100644
index 0000000000..942d72e65b
Binary files /dev/null and b/Externals/android-menudrawer/samples/res/drawable-xhdpi/md__category_background.9.png differ
diff --git a/Externals/android-menudrawer/samples/res/drawable-xhdpi/md__list_focused_holo.9.png b/Externals/android-menudrawer/samples/res/drawable-xhdpi/md__list_focused_holo.9.png
new file mode 100644
index 0000000000..b545f8e578
Binary files /dev/null and b/Externals/android-menudrawer/samples/res/drawable-xhdpi/md__list_focused_holo.9.png differ
diff --git a/Externals/android-menudrawer/samples/res/drawable-xhdpi/md__list_longpressed_holo.9.png b/Externals/android-menudrawer/samples/res/drawable-xhdpi/md__list_longpressed_holo.9.png
new file mode 100644
index 0000000000..eda10e6123
Binary files /dev/null and b/Externals/android-menudrawer/samples/res/drawable-xhdpi/md__list_longpressed_holo.9.png differ
diff --git a/Externals/android-menudrawer/samples/res/drawable-xhdpi/md__list_pressed_holo_dark.9.png b/Externals/android-menudrawer/samples/res/drawable-xhdpi/md__list_pressed_holo_dark.9.png
new file mode 100644
index 0000000000..e4b33935a3
Binary files /dev/null and b/Externals/android-menudrawer/samples/res/drawable-xhdpi/md__list_pressed_holo_dark.9.png differ
diff --git a/Externals/android-menudrawer/samples/res/drawable-xhdpi/md__list_selector_disabled_holo_dark.9.png b/Externals/android-menudrawer/samples/res/drawable-xhdpi/md__list_selector_disabled_holo_dark.9.png
new file mode 100644
index 0000000000..88726b6916
Binary files /dev/null and b/Externals/android-menudrawer/samples/res/drawable-xhdpi/md__list_selector_disabled_holo_dark.9.png differ
diff --git a/Externals/android-menudrawer/samples/res/drawable-xhdpi/menu_arrow.png b/Externals/android-menudrawer/samples/res/drawable-xhdpi/menu_arrow.png
new file mode 100644
index 0000000000..b159937237
Binary files /dev/null and b/Externals/android-menudrawer/samples/res/drawable-xhdpi/menu_arrow.png differ
diff --git a/Externals/android-menudrawer/samples/res/drawable-xhdpi/menu_arrow_bottom.png b/Externals/android-menudrawer/samples/res/drawable-xhdpi/menu_arrow_bottom.png
new file mode 100644
index 0000000000..77a088fdce
Binary files /dev/null and b/Externals/android-menudrawer/samples/res/drawable-xhdpi/menu_arrow_bottom.png differ
diff --git a/Externals/android-menudrawer/samples/res/drawable-xhdpi/menu_arrow_right.png b/Externals/android-menudrawer/samples/res/drawable-xhdpi/menu_arrow_right.png
new file mode 100644
index 0000000000..17b5250d1d
Binary files /dev/null and b/Externals/android-menudrawer/samples/res/drawable-xhdpi/menu_arrow_right.png differ
diff --git a/Externals/android-menudrawer/samples/res/drawable-xhdpi/menu_arrow_top.png b/Externals/android-menudrawer/samples/res/drawable-xhdpi/menu_arrow_top.png
new file mode 100644
index 0000000000..2c2f749008
Binary files /dev/null and b/Externals/android-menudrawer/samples/res/drawable-xhdpi/menu_arrow_top.png differ
diff --git a/Externals/android-menudrawer/samples/res/drawable/md__list_selector_background_transition_holo_dark.xml b/Externals/android-menudrawer/samples/res/drawable/md__list_selector_background_transition_holo_dark.xml
new file mode 100644
index 0000000000..1d43396d8a
--- /dev/null
+++ b/Externals/android-menudrawer/samples/res/drawable/md__list_selector_background_transition_holo_dark.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<transition xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/md__list_pressed_holo_dark"  />
+    <item android:drawable="@drawable/md__list_longpressed_holo"  />
+</transition>
diff --git a/Externals/android-menudrawer/samples/res/drawable/md__list_selector_holo_dark.xml b/Externals/android-menudrawer/samples/res/drawable/md__list_selector_holo_dark.xml
new file mode 100644
index 0000000000..bd71aa8b6e
--- /dev/null
+++ b/Externals/android-menudrawer/samples/res/drawable/md__list_selector_holo_dark.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_window_focused="false" android:drawable="@color/md__transparent" />
+
+    <!-- Even though these two point to the same resource, have two states so the drawable will invalidate itself when coming out of pressed state. -->
+    <item android:state_focused="true"  android:state_enabled="false" android:state_pressed="true" android:drawable="@drawable/md__list_selector_disabled_holo_dark" />
+    <item android:state_focused="true"  android:state_enabled="false"                              android:drawable="@drawable/md__list_selector_disabled_holo_dark" />
+    <item android:state_focused="true"                                android:state_pressed="true" android:drawable="@drawable/md__list_selector_background_transition_holo_dark" />
+    <item android:state_focused="false"                               android:state_pressed="true" android:drawable="@drawable/md__list_selector_background_transition_holo_dark" />
+    <item android:state_focused="true"                                                             android:drawable="@drawable/md__list_focused_holo" />
+</selector>
diff --git a/Externals/android-menudrawer/samples/res/layout/activity_bottommenu.xml b/Externals/android-menudrawer/samples/res/layout/activity_bottommenu.xml
new file mode 100644
index 0000000000..ee576195e2
--- /dev/null
+++ b/Externals/android-menudrawer/samples/res/layout/activity_bottommenu.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:gravity="center"
+    android:orientation="vertical"
+    android:padding="16dp" >
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/sample_bottommenu" />
+
+    <TextView
+        android:id="@+id/contentText"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="10dp"
+        android:textStyle="bold" />
+
+</LinearLayout>
diff --git a/Externals/android-menudrawer/samples/res/layout/activity_contentsample.xml b/Externals/android-menudrawer/samples/res/layout/activity_contentsample.xml
new file mode 100644
index 0000000000..54140e71e7
--- /dev/null
+++ b/Externals/android-menudrawer/samples/res/layout/activity_contentsample.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:gravity="center"
+    android:orientation="vertical"
+    android:padding="16dp">
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/sample_content" />
+
+    <TextView
+        android:id="@+id/contentText"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
+
+    <SeekBar
+        android:id="@+id/seekBar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+
+</LinearLayout>
diff --git a/Externals/android-menudrawer/samples/res/layout/activity_layoutsample.xml b/Externals/android-menudrawer/samples/res/layout/activity_layoutsample.xml
new file mode 100644
index 0000000000..83684116b4
--- /dev/null
+++ b/Externals/android-menudrawer/samples/res/layout/activity_layoutsample.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<net.simonvt.menudrawer.TopDrawer xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/drawer"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    app:mdMenuSize="64dp">
+
+    <LinearLayout
+        android:id="@id/mdMenu"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:padding="10dp" >
+
+        <TextView
+            android:id="@+id/item1"
+            style="@style/MenuDrawer.Widget.Title"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:drawableLeft="@drawable/ic_action_refresh_dark"
+            android:onClick="onDrawerItemClick"
+            android:tag="Item no. 1"
+            android:text="Item 1" />
+
+        <TextView
+            android:id="@+id/item2"
+            style="@style/MenuDrawer.Widget.Title"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:drawableLeft="@drawable/ic_action_select_all_dark"
+            android:onClick="onDrawerItemClick"
+            android:tag="Item no. 2"
+            android:text="Item 2" />
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@id/mdContent"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:gravity="center"
+        android:orientation="vertical"
+        android:padding="16dp" >
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/sample_layout" />
+
+        <TextView
+            android:id="@+id/contentText"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:textStyle="bold" />
+
+    </LinearLayout>
+
+</net.simonvt.menudrawer.TopDrawer>
diff --git a/Externals/android-menudrawer/samples/res/layout/activity_rightmenu.xml b/Externals/android-menudrawer/samples/res/layout/activity_rightmenu.xml
new file mode 100644
index 0000000000..ad1a6b7601
--- /dev/null
+++ b/Externals/android-menudrawer/samples/res/layout/activity_rightmenu.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:gravity="center"
+    android:orientation="vertical"
+    android:padding="16dp">
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/sample_rightmenu" />
+
+    <TextView
+        android:id="@+id/contentText"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
+
+</LinearLayout>
diff --git a/Externals/android-menudrawer/samples/res/layout/activity_staticsample.xml b/Externals/android-menudrawer/samples/res/layout/activity_staticsample.xml
new file mode 100644
index 0000000000..e6cb5622c7
--- /dev/null
+++ b/Externals/android-menudrawer/samples/res/layout/activity_staticsample.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:gravity="center"
+    android:orientation="vertical"
+    android:padding="16dp">
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/sample_static" />
+
+    <TextView
+        android:id="@+id/contentText"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
+
+</LinearLayout>
diff --git a/Externals/android-menudrawer/samples/res/layout/activity_topmenu.xml b/Externals/android-menudrawer/samples/res/layout/activity_topmenu.xml
new file mode 100644
index 0000000000..d288cfa5aa
--- /dev/null
+++ b/Externals/android-menudrawer/samples/res/layout/activity_topmenu.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:gravity="center"
+    android:orientation="vertical"
+    android:padding="16dp" >
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/sample_topmenu" />
+
+    <TextView
+        android:id="@+id/contentText"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="10dp"
+        android:textStyle="bold" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/Externals/android-menudrawer/samples/res/layout/activity_viewpagersample.xml b/Externals/android-menudrawer/samples/res/layout/activity_viewpagersample.xml
new file mode 100644
index 0000000000..6efa747ebe
--- /dev/null
+++ b/Externals/android-menudrawer/samples/res/layout/activity_viewpagersample.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.v4.view.ViewPager xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/view_pager"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"/>
\ No newline at end of file
diff --git a/Externals/android-menudrawer/samples/res/layout/activity_windowsample.xml b/Externals/android-menudrawer/samples/res/layout/activity_windowsample.xml
new file mode 100644
index 0000000000..a23003f22b
--- /dev/null
+++ b/Externals/android-menudrawer/samples/res/layout/activity_windowsample.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:gravity="center"
+    android:orientation="vertical"
+    android:padding="16dp">
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/sample_window" />
+
+    <TextView
+        android:id="@+id/contentText"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
+
+</LinearLayout>
diff --git a/Externals/android-menudrawer/samples/res/layout/list_row_sample.xml b/Externals/android-menudrawer/samples/res/layout/list_row_sample.xml
new file mode 100644
index 0000000000..edd6d1f67a
--- /dev/null
+++ b/Externals/android-menudrawer/samples/res/layout/list_row_sample.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:minHeight="64dp"
+    android:orientation="vertical">
+
+    <TextView
+        android:id="@+id/title"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingLeft="16dp"
+        android:paddingRight="16dp"
+        android:paddingTop="8dp"
+        android:singleLine="true"
+        android:textAppearance="?android:attr/textAppearanceMedium" />
+
+    <TextView
+        android:id="@+id/summary"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingBottom="8dp"
+        android:paddingLeft="16dp"
+        android:paddingRight="16dp"
+        android:textAppearance="?android:attr/textAppearanceSmall" />
+</LinearLayout>
diff --git a/Externals/android-menudrawer/samples/res/layout/main.xml b/Externals/android-menudrawer/samples/res/layout/main.xml
new file mode 100644
index 0000000000..6dd71bd26a
--- /dev/null
+++ b/Externals/android-menudrawer/samples/res/layout/main.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:gravity="center"
+    android:orientation="vertical">
+
+    <Button
+        android:id="@+id/windowSample"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Window sample" />
+
+    <Button
+        android:id="@+id/overlayWindowSample"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Action Bar overlay window sample" />
+
+    <Button
+        android:id="@+id/contentSample"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Content sample" />
+
+    <Button
+        android:id="@+id/listActivitySample"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="ListActivity sample" />
+
+</LinearLayout>
+
diff --git a/Externals/android-menudrawer/samples/res/layout/menu_bottom.xml b/Externals/android-menudrawer/samples/res/layout/menu_bottom.xml
new file mode 100644
index 0000000000..4ec6a6b993
--- /dev/null
+++ b/Externals/android-menudrawer/samples/res/layout/menu_bottom.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal"
+    android:padding="10dp" >
+
+    <TextView
+        android:id="@+id/item1"
+        style="@style/MenuDrawer.Widget.Title"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:drawableLeft="@drawable/ic_action_refresh_dark"
+        android:onClick="onDrawerItemClick"
+        android:tag="Item no. 1"
+        android:text="Item 1" />
+
+    <TextView
+        android:id="@+id/item2"
+        style="@style/MenuDrawer.Widget.Title"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:drawableLeft="@drawable/ic_action_select_all_dark"
+        android:onClick="onDrawerItemClick"
+        android:tag="Item no. 2"
+        android:text="Item 2" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/Externals/android-menudrawer/samples/res/layout/menu_row_category.xml b/Externals/android-menudrawer/samples/res/layout/menu_row_category.xml
new file mode 100644
index 0000000000..36ffd58bac
--- /dev/null
+++ b/Externals/android-menudrawer/samples/res/layout/menu_row_category.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    style="@style/MenuDrawer.Widget.Category" />
diff --git a/Externals/android-menudrawer/samples/res/layout/menu_row_item.xml b/Externals/android-menudrawer/samples/res/layout/menu_row_item.xml
new file mode 100644
index 0000000000..b13619d08c
--- /dev/null
+++ b/Externals/android-menudrawer/samples/res/layout/menu_row_item.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    style="@style/MenuDrawer.Widget.Title" />
diff --git a/Externals/android-menudrawer/samples/res/layout/menu_scrollview.xml b/Externals/android-menudrawer/samples/res/layout/menu_scrollview.xml
new file mode 100644
index 0000000000..5cb1ad9350
--- /dev/null
+++ b/Externals/android-menudrawer/samples/res/layout/menu_scrollview.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/scrollView"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/item1"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:drawableLeft="@drawable/ic_action_refresh_dark"
+            android:text="Item 1"
+            style="@style/MenuDrawer.Widget.Title" />
+
+        <TextView
+            android:id="@+id/item2"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:drawableLeft="@drawable/ic_action_select_all_dark"
+            android:text="Item 2"
+            style="@style/MenuDrawer.Widget.Title" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="Cat 1"
+            style="@style/MenuDrawer.Widget.Category" />
+
+        <TextView
+            android:id="@+id/item3"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:drawableLeft="@drawable/ic_action_refresh_dark"
+            android:text="Item 3"
+            style="@style/MenuDrawer.Widget.Title" />
+
+        <TextView
+            android:id="@+id/item4"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:drawableLeft="@drawable/ic_action_select_all_dark"
+            android:text="Item 4"
+            style="@style/MenuDrawer.Widget.Title" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="Cat 2"
+            style="@style/MenuDrawer.Widget.Category" />
+
+        <TextView
+            android:id="@+id/item5"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:drawableLeft="@drawable/ic_action_refresh_dark"
+            android:text="Item 5"
+            style="@style/MenuDrawer.Widget.Title" />
+
+        <TextView
+            android:id="@+id/item6"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:drawableLeft="@drawable/ic_action_select_all_dark"
+            android:text="Item 6"
+            style="@style/MenuDrawer.Widget.Title" />
+
+    </LinearLayout>
+</ScrollView>
diff --git a/Externals/android-menudrawer/samples/res/layout/menu_top.xml b/Externals/android-menudrawer/samples/res/layout/menu_top.xml
new file mode 100644
index 0000000000..4ec6a6b993
--- /dev/null
+++ b/Externals/android-menudrawer/samples/res/layout/menu_top.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal"
+    android:padding="10dp" >
+
+    <TextView
+        android:id="@+id/item1"
+        style="@style/MenuDrawer.Widget.Title"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:drawableLeft="@drawable/ic_action_refresh_dark"
+        android:onClick="onDrawerItemClick"
+        android:tag="Item no. 1"
+        android:text="Item 1" />
+
+    <TextView
+        android:id="@+id/item2"
+        style="@style/MenuDrawer.Widget.Title"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:drawableLeft="@drawable/ic_action_select_all_dark"
+        android:onClick="onDrawerItemClick"
+        android:tag="Item no. 2"
+        android:text="Item 2" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/Externals/android-menudrawer/samples/res/values-v14/colors.xml b/Externals/android-menudrawer/samples/res/values-v14/colors.xml
new file mode 100644
index 0000000000..0c1ed99453
--- /dev/null
+++ b/Externals/android-menudrawer/samples/res/values-v14/colors.xml
@@ -0,0 +1,4 @@
+<resources>
+
+    <color name="windowBackground">#FFE8E8E8</color>
+</resources>
diff --git a/Externals/android-menudrawer/samples/res/values-v14/themes.xml b/Externals/android-menudrawer/samples/res/values-v14/themes.xml
new file mode 100644
index 0000000000..bc74b6d378
--- /dev/null
+++ b/Externals/android-menudrawer/samples/res/values-v14/themes.xml
@@ -0,0 +1,7 @@
+<resources>
+
+    <style name="SampleBase" parent="@android:style/Theme.Holo.Light">
+        <item name="android:windowBackground">@color/windowBackground</item>
+    </style>
+
+</resources>
diff --git a/Externals/android-menudrawer/samples/res/values/colors.xml b/Externals/android-menudrawer/samples/res/values/colors.xml
new file mode 100644
index 0000000000..b98e21355e
--- /dev/null
+++ b/Externals/android-menudrawer/samples/res/values/colors.xml
@@ -0,0 +1,6 @@
+<resources>
+
+    <color name="md__transparent">#00000000</color>
+
+    <color name="md__defaultBackground">#FF555555</color>
+</resources>
diff --git a/Externals/android-menudrawer/samples/res/values/strings.xml b/Externals/android-menudrawer/samples/res/values/strings.xml
new file mode 100644
index 0000000000..90f33a30a9
--- /dev/null
+++ b/Externals/android-menudrawer/samples/res/values/strings.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="app_name">MenuDrawerSamples</string>
+
+    <string name="sample_content">Sample of dragging the content.\nThe menu consists of a ListView, for which the
+        active position is saved through configuration changes.\nAdditionally, if the menu is open, a back press will
+        close it.
+    </string>
+
+    <string name="sample_window">Sample of dragging the entire window.\nThe menu is a simple ScrollView, with a click
+        listener set on each item.\nThe drawer will animate slightly open, to make it more discoverable.\nAdditionally,
+        if the menu is open, a back press will close it.
+    </string>
+
+    <string name="sample_listactivity">Sample of how to use the drawer with ListActivity.\nWhen running on ICS or
+        greater, the ActionBar up button will blink until clicked by the user. This is done to make the menu more
+        discoverable.\nAdditionally, if the menu is open, a back press will close it.
+    </string>
+
+    <string name="sample_rightmenu">This sample shows how to position the menu to the right of the content.\nRun on
+        an API14+ device to see how it interacts with the overflow button.
+    </string>
+
+    <string name="sample_topmenu">This sample shows how to position the menu above the content.</string>
+
+    <string name="sample_bottommenu">This sample shows how to position the menu below the content.</string>
+
+    <string name="sample_layout">This sample shows how to use the drawer in a layout file.
+        \nThe top drawer is used in this sample.
+    </string>
+
+    <string name="sample_static">This sample shows how to attach a drawer that is always visible.</string>
+</resources>
diff --git a/Externals/android-menudrawer/samples/res/values/styles.xml b/Externals/android-menudrawer/samples/res/values/styles.xml
new file mode 100644
index 0000000000..04b6f5f355
--- /dev/null
+++ b/Externals/android-menudrawer/samples/res/values/styles.xml
@@ -0,0 +1,55 @@
+<resources>
+
+    <style name="MenuDrawer" />
+
+    <style name="MenuDrawer.Widget" />
+
+    <style name="MenuDrawer.Widget.Category">
+        <item name="android:textStyle">bold</item>
+        <item name="android:textColor">?android:attr/textColorSecondaryInverse</item>
+        <item name="android:textSize">14sp</item>
+        <item name="android:textAllCaps">true</item>
+
+        <item name="android:gravity">center_vertical</item>
+        <item name="android:paddingLeft">16dp</item>
+        <item name="android:background">@drawable/md__category_background</item>
+
+        <item name="android:singleLine">true</item>
+        <item name="android:ellipsize">end</item>
+    </style>
+
+    <style name="MenuDrawer.Widget.Title">
+        <item name="android:background">@drawable/md__list_selector_holo_dark</item>
+        <item name="android:textAppearance">?android:attr/textAppearance</item>
+        <item name="android:textColor">?android:attr/textColorPrimaryInverse</item>
+        <item name="android:textSize">18sp</item>
+        <item name="android:paddingLeft">16dp</item>
+        <item name="android:paddingRight">32dp</item>
+        <item name="android:paddingTop">8dp</item>
+        <item name="android:paddingBottom">8dp</item>
+        <item name="android:drawablePadding">16dp</item>
+        <item name="android:gravity">center_vertical</item>
+    </style>
+
+    <style name="MenuDrawerStyle" parent="Widget.MenuDrawer">
+        <item name="mdActiveIndicator">@drawable/menu_arrow</item>
+        <item name="mdMenuSize">250dp</item>
+    </style>
+
+    <style name="MenuDrawerStyle.Right" parent="Widget.MenuDrawer">
+        <item name="mdActiveIndicator">@drawable/menu_arrow_right</item>
+        <item name="mdMenuSize">150dp</item>
+    </style>
+
+    <style name="MenuDrawerStyle.Top" parent="Widget.MenuDrawer">
+        <item name="mdActiveIndicator">@drawable/menu_arrow_top</item>
+        <item name="mdMenuSize">64dp</item>
+        <item name="mdAllowIndicatorAnimation">true</item>
+    </style>
+
+    <style name="MenuDrawerStyle.Bottom" parent="Widget.MenuDrawer">
+        <item name="mdActiveIndicator">@drawable/menu_arrow_bottom</item>
+        <item name="mdMenuSize">64dp</item>
+    </style>
+
+</resources>
diff --git a/Externals/android-menudrawer/samples/res/values/themes.xml b/Externals/android-menudrawer/samples/res/values/themes.xml
new file mode 100644
index 0000000000..653c78f39b
--- /dev/null
+++ b/Externals/android-menudrawer/samples/res/values/themes.xml
@@ -0,0 +1,23 @@
+<resources>
+
+    <style name="SampleBase" parent="@android:style/Theme.Light" />
+
+    <style name="SampleTheme" parent="SampleBase">
+
+        <item name="menuDrawerStyle">@style/MenuDrawerStyle</item>
+    </style>
+
+    <style name="SampleTheme.RightDrawer" parent="SampleBase">
+
+        <item name="menuDrawerStyle">@style/MenuDrawerStyle.Right</item>
+    </style>
+
+    <style name="SampleTheme.TopDrawer" parent="SampleBase">
+        <item name="menuDrawerStyle">@style/MenuDrawerStyle.Top</item>
+    </style>
+
+    <style name="SampleTheme.BottomDrawer" parent="SampleBase">
+        <item name="menuDrawerStyle">@style/MenuDrawerStyle.Bottom</item>
+    </style>
+
+</resources>
diff --git a/Externals/android-menudrawer/samples/src/net/simonvt/menudrawer/samples/ActionBarOverlaySample.java b/Externals/android-menudrawer/samples/src/net/simonvt/menudrawer/samples/ActionBarOverlaySample.java
new file mode 100644
index 0000000000..e703a9506e
--- /dev/null
+++ b/Externals/android-menudrawer/samples/src/net/simonvt/menudrawer/samples/ActionBarOverlaySample.java
@@ -0,0 +1,13 @@
+package net.simonvt.menudrawer.samples;
+
+import android.os.Bundle;
+import android.view.Window;
+
+public class ActionBarOverlaySample extends WindowSample {
+
+    @Override
+    public void onCreate(Bundle inState) {
+        requestWindowFeature(Window.FEATURE_ACTION_BAR_OVERLAY);
+        super.onCreate(inState);
+    }
+}
diff --git a/Externals/android-menudrawer/samples/src/net/simonvt/menudrawer/samples/BottomMenuSample.java b/Externals/android-menudrawer/samples/src/net/simonvt/menudrawer/samples/BottomMenuSample.java
new file mode 100644
index 0000000000..66cd73d671
--- /dev/null
+++ b/Externals/android-menudrawer/samples/src/net/simonvt/menudrawer/samples/BottomMenuSample.java
@@ -0,0 +1,43 @@
+package net.simonvt.menudrawer.samples;
+
+import net.simonvt.menudrawer.MenuDrawer;
+import net.simonvt.menudrawer.Position;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.TextView;
+
+/**
+ * Sample class illustrating how to add a menu drawer above the content area.
+ */
+public class BottomMenuSample extends Activity implements OnClickListener {
+
+    private MenuDrawer mMenuDrawer;
+    private TextView mContentTextView;
+
+    @Override
+    protected void onCreate(Bundle inState) {
+        super.onCreate(inState);
+
+        mMenuDrawer = MenuDrawer.attach(this, MenuDrawer.MENU_DRAG_CONTENT, Position.BOTTOM);
+        mMenuDrawer.setTouchMode(MenuDrawer.TOUCH_MODE_FULLSCREEN);
+        mMenuDrawer.setContentView(R.layout.activity_bottommenu);
+        mMenuDrawer.setMenuView(R.layout.menu_bottom);
+
+        mContentTextView = (TextView) findViewById(R.id.contentText);
+        findViewById(R.id.item1).setOnClickListener(this);
+        findViewById(R.id.item2).setOnClickListener(this);
+    }
+
+    /**
+     * Click handler for bottom drawer items.
+     */
+    @Override
+    public void onClick(View v) {
+        String tag = (String) v.getTag();
+        mContentTextView.setText(String.format("%s clicked.", tag));
+        mMenuDrawer.setActiveView(v);
+    }
+}
diff --git a/Externals/android-menudrawer/samples/src/net/simonvt/menudrawer/samples/ContentSample.java b/Externals/android-menudrawer/samples/src/net/simonvt/menudrawer/samples/ContentSample.java
new file mode 100644
index 0000000000..b07019ce67
--- /dev/null
+++ b/Externals/android-menudrawer/samples/src/net/simonvt/menudrawer/samples/ContentSample.java
@@ -0,0 +1,218 @@
+package net.simonvt.menudrawer.samples;
+
+import net.simonvt.menudrawer.MenuDrawer;
+
+import android.app.Activity;
+import android.os.Build;
+import android.os.Bundle;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.AdapterView;
+import android.widget.BaseAdapter;
+import android.widget.ListView;
+import android.widget.SeekBar;
+import android.widget.TextView;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ContentSample extends Activity {
+
+    private static final String STATE_ACTIVE_POSITION = "net.simonvt.menudrawer.samples.ContentSample.activePosition";
+    private static final String STATE_CONTENT_TEXT = "net.simonvt.menudrawer.samples.ContentSample.contentText";
+
+    private MenuDrawer mMenuDrawer;
+
+    private MenuAdapter mAdapter;
+    private ListView mList;
+
+    private int mActivePosition = -1;
+    private String mContentText;
+    private TextView mContentTextView;
+
+    @Override
+    protected void onCreate(Bundle inState) {
+        super.onCreate(inState);
+
+        if (inState != null) {
+            mActivePosition = inState.getInt(STATE_ACTIVE_POSITION);
+            mContentText = inState.getString(STATE_CONTENT_TEXT);
+        }
+
+        mMenuDrawer = MenuDrawer.attach(this, MenuDrawer.MENU_DRAG_CONTENT);
+        mMenuDrawer.setContentView(R.layout.activity_contentsample);
+        mMenuDrawer.setTouchMode(MenuDrawer.TOUCH_MODE_FULLSCREEN);
+
+        List<Object> items = new ArrayList<Object>();
+        items.add(new Item("Item 1", R.drawable.ic_action_refresh_dark));
+        items.add(new Item("Item 2", R.drawable.ic_action_select_all_dark));
+        items.add(new Category("Cat 1"));
+        items.add(new Item("Item 3", R.drawable.ic_action_refresh_dark));
+        items.add(new Item("Item 4", R.drawable.ic_action_select_all_dark));
+        items.add(new Category("Cat 2"));
+        items.add(new Item("Item 5", R.drawable.ic_action_refresh_dark));
+        items.add(new Item("Item 6", R.drawable.ic_action_select_all_dark));
+        items.add(new Category("Cat 3"));
+        items.add(new Item("Item 7", R.drawable.ic_action_refresh_dark));
+        items.add(new Item("Item 8", R.drawable.ic_action_select_all_dark));
+        items.add(new Category("Cat 4"));
+        items.add(new Item("Item 9", R.drawable.ic_action_refresh_dark));
+        items.add(new Item("Item 10", R.drawable.ic_action_select_all_dark));
+
+        mList = new ListView(this);
+        mAdapter = new MenuAdapter(items);
+        mList.setAdapter(mAdapter);
+        mList.setOnItemClickListener(mItemClickListener);
+
+        mMenuDrawer.setMenuView(mList);
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
+            getActionBar().setDisplayHomeAsUpEnabled(true);
+        }
+
+        mContentTextView = (TextView) findViewById(R.id.contentText);
+        mContentTextView.setText(mContentText);
+
+        mMenuDrawer.setOnInterceptMoveEventListener(new MenuDrawer.OnInterceptMoveEventListener() {
+            @Override
+            public boolean isViewDraggable(View v, int dx, int x, int y) {
+                return v instanceof SeekBar;
+            }
+        });
+    }
+
+    private AdapterView.OnItemClickListener mItemClickListener = new AdapterView.OnItemClickListener() {
+        @Override
+        public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+            mActivePosition = position;
+            mMenuDrawer.setActiveView(view, position);
+            mContentTextView.setText(((TextView) view).getText());
+            mMenuDrawer.closeMenu();
+        }
+    };
+
+    @Override
+    protected void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+        outState.putInt(STATE_ACTIVE_POSITION, mActivePosition);
+        outState.putString(STATE_CONTENT_TEXT, mContentText);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case android.R.id.home:
+                mMenuDrawer.toggleMenu();
+                return true;
+        }
+
+        return super.onOptionsItemSelected(item);
+    }
+
+    @Override
+    public void onBackPressed() {
+        final int drawerState = mMenuDrawer.getDrawerState();
+        if (drawerState == MenuDrawer.STATE_OPEN || drawerState == MenuDrawer.STATE_OPENING) {
+            mMenuDrawer.closeMenu();
+            return;
+        }
+
+        super.onBackPressed();
+    }
+
+    private static class Item {
+
+        String mTitle;
+        int mIconRes;
+
+        Item(String title, int iconRes) {
+            mTitle = title;
+            mIconRes = iconRes;
+        }
+    }
+
+    private static class Category {
+
+        String mTitle;
+
+        Category(String title) {
+            mTitle = title;
+        }
+    }
+
+    private class MenuAdapter extends BaseAdapter {
+
+        private List<Object> mItems;
+
+        MenuAdapter(List<Object> items) {
+            mItems = items;
+        }
+
+        @Override
+        public int getCount() {
+            return mItems.size();
+        }
+
+        @Override
+        public Object getItem(int position) {
+            return mItems.get(position);
+        }
+
+        @Override
+        public long getItemId(int position) {
+            return position;
+        }
+
+        @Override
+        public int getItemViewType(int position) {
+            return getItem(position) instanceof Item ? 0 : 1;
+        }
+
+        @Override
+        public int getViewTypeCount() {
+            return 2;
+        }
+
+        @Override
+        public boolean isEnabled(int position) {
+            return getItem(position) instanceof Item;
+        }
+
+        @Override
+        public boolean areAllItemsEnabled() {
+            return false;
+        }
+
+        @Override
+        public View getView(int position, View convertView, ViewGroup parent) {
+            View v = convertView;
+            Object item = getItem(position);
+
+            if (item instanceof Category) {
+                if (v == null) {
+                    v = getLayoutInflater().inflate(R.layout.menu_row_category, parent, false);
+                }
+
+                ((TextView) v).setText(((Category) item).mTitle);
+
+            } else {
+                if (v == null) {
+                    v = getLayoutInflater().inflate(R.layout.menu_row_item, parent, false);
+                }
+
+                TextView tv = (TextView) v;
+                tv.setText(((Item) item).mTitle);
+                tv.setCompoundDrawablesWithIntrinsicBounds(((Item) item).mIconRes, 0, 0, 0);
+            }
+
+            v.setTag(R.id.mdActiveViewPosition, position);
+
+            if (position == mActivePosition) {
+                mMenuDrawer.setActiveView(v, position);
+            }
+
+            return v;
+        }
+    }
+}
diff --git a/Externals/android-menudrawer/samples/src/net/simonvt/menudrawer/samples/LayoutSample.java b/Externals/android-menudrawer/samples/src/net/simonvt/menudrawer/samples/LayoutSample.java
new file mode 100644
index 0000000000..bb219960d1
--- /dev/null
+++ b/Externals/android-menudrawer/samples/src/net/simonvt/menudrawer/samples/LayoutSample.java
@@ -0,0 +1,36 @@
+package net.simonvt.menudrawer.samples;
+
+import net.simonvt.menudrawer.MenuDrawer;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.TextView;
+
+public class LayoutSample extends Activity implements View.OnClickListener {
+
+    private MenuDrawer mDrawer;
+    private TextView mContentTextView;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_layoutsample);
+        mDrawer = (MenuDrawer) findViewById(R.id.drawer);
+        mDrawer.setTouchMode(MenuDrawer.TOUCH_MODE_FULLSCREEN);
+
+        mContentTextView = (TextView) findViewById(R.id.contentText);
+        findViewById(R.id.item1).setOnClickListener(this);
+        findViewById(R.id.item2).setOnClickListener(this);
+    }
+
+    /**
+     * Click handler for top drawer items.
+     */
+    @Override
+    public void onClick(View v) {
+        String tag = (String) v.getTag();
+        mContentTextView.setText(String.format("%s clicked.", tag));
+        mDrawer.setActiveView(v);
+    }
+}
diff --git a/Externals/android-menudrawer/samples/src/net/simonvt/menudrawer/samples/ListActivitySample.java b/Externals/android-menudrawer/samples/src/net/simonvt/menudrawer/samples/ListActivitySample.java
new file mode 100644
index 0000000000..fb7e74925a
--- /dev/null
+++ b/Externals/android-menudrawer/samples/src/net/simonvt/menudrawer/samples/ListActivitySample.java
@@ -0,0 +1,91 @@
+package net.simonvt.menudrawer.samples;
+
+import net.simonvt.menudrawer.MenuDrawer;
+
+import android.app.ListActivity;
+import android.os.Build;
+import android.os.Bundle;
+import android.os.Handler;
+import android.view.Gravity;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.ArrayAdapter;
+import android.widget.ListView;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ListActivitySample extends ListActivity {
+
+    private static final String STATE_MENUDRAWER = "net.simonvt.menudrawer.samples.ListActivitySample.menuDrawer";
+
+    private MenuDrawer mMenuDrawer;
+
+    private Handler mHandler;
+    private Runnable mToggleUpRunnable;
+    private boolean mDisplayUp = true;
+
+    @Override
+    public void onCreate(Bundle inState) {
+        super.onCreate(inState);
+
+        mMenuDrawer = MenuDrawer.attach(this, MenuDrawer.MENU_DRAG_CONTENT);
+
+        TextView menuView = new TextView(this);
+        menuView.setGravity(Gravity.CENTER);
+        menuView.setTextColor(0xFFFFFFFF);
+        final int padding = dpToPx(16);
+        menuView.setPadding(padding, padding, padding, padding);
+        menuView.setText(R.string.sample_listactivity);
+        mMenuDrawer.setMenuView(menuView);
+        mMenuDrawer.setOffsetMenuEnabled(false);
+
+        List<String> items = new ArrayList<String>();
+        for (int i = 1; i <= 20; i++) {
+            items.add("Item " + i);
+        }
+
+        setListAdapter(new ArrayAdapter<String>(this, android.R.layout.simple_list_item_1, items));
+    }
+
+    private int dpToPx(int dp) {
+        return (int) (getResources().getDisplayMetrics().density * dp + 0.5f);
+    }
+
+    @Override
+    public void setContentView(int layoutResID) {
+        // This override is only needed when using MENU_DRAG_CONTENT.
+        mMenuDrawer.setContentView(layoutResID);
+        onContentChanged();
+    }
+
+    @Override
+    protected void onListItemClick(ListView l, View v, int position, long id) {
+        String str = (String) getListAdapter().getItem(position);
+        Toast.makeText(this, "Clicked: " + str, Toast.LENGTH_SHORT).show();
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case android.R.id.home:
+                mMenuDrawer.toggleMenu();
+                return true;
+        }
+
+        return super.onOptionsItemSelected(item);
+    }
+
+    @Override
+    public void onBackPressed() {
+        final int drawerState = mMenuDrawer.getDrawerState();
+        if (drawerState == MenuDrawer.STATE_OPEN || drawerState == MenuDrawer.STATE_OPENING) {
+            mMenuDrawer.closeMenu();
+            return;
+        }
+
+        super.onBackPressed();
+    }
+}
diff --git a/Externals/android-menudrawer/samples/src/net/simonvt/menudrawer/samples/RightMenuSample.java b/Externals/android-menudrawer/samples/src/net/simonvt/menudrawer/samples/RightMenuSample.java
new file mode 100644
index 0000000000..fda93d973e
--- /dev/null
+++ b/Externals/android-menudrawer/samples/src/net/simonvt/menudrawer/samples/RightMenuSample.java
@@ -0,0 +1,215 @@
+package net.simonvt.menudrawer.samples;
+
+import net.simonvt.menudrawer.MenuDrawer;
+import net.simonvt.menudrawer.Position;
+
+import android.app.Activity;
+import android.os.Build;
+import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.AdapterView;
+import android.widget.BaseAdapter;
+import android.widget.ListView;
+import android.widget.TextView;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class RightMenuSample extends Activity {
+
+    private static final String STATE_ACTIVE_POSITION = "net.simonvt.menudrawer.samples.RightMenuSample.activePosition";
+    private static final String STATE_CONTENT_TEXT = "net.simonvt.menudrawer.samples.RightMenuSample.contentText";
+
+    private static final int MENU_OVERFLOW = 1;
+
+    private MenuDrawer mMenuDrawer;
+
+    private MenuAdapter mAdapter;
+    private ListView mList;
+
+    private int mActivePosition = -1;
+    private String mContentText;
+    private TextView mContentTextView;
+
+    @Override
+    protected void onCreate(Bundle inState) {
+        super.onCreate(inState);
+
+        if (inState != null) {
+            mActivePosition = inState.getInt(STATE_ACTIVE_POSITION);
+            mContentText = inState.getString(STATE_CONTENT_TEXT);
+        }
+
+        mMenuDrawer = MenuDrawer.attach(this, MenuDrawer.MENU_DRAG_CONTENT, Position.RIGHT);
+        mMenuDrawer.setContentView(R.layout.activity_rightmenu);
+
+        List<Object> items = new ArrayList<Object>();
+        items.add(new Item("Item 1", R.drawable.ic_action_refresh_dark));
+        items.add(new Item("Item 2", R.drawable.ic_action_select_all_dark));
+        items.add(new Category("Cat 1"));
+        items.add(new Item("Item 3", R.drawable.ic_action_refresh_dark));
+        items.add(new Item("Item 4", R.drawable.ic_action_select_all_dark));
+        items.add(new Category("Cat 2"));
+        items.add(new Item("Item 5", R.drawable.ic_action_refresh_dark));
+        items.add(new Item("Item 6", R.drawable.ic_action_select_all_dark));
+
+        // A custom ListView is needed so the drawer can be notified when it's scrolled. This is to update the position
+        // of the arrow indicator.
+        mList = new ListView(this);
+        mAdapter = new MenuAdapter(items);
+        mList.setAdapter(mAdapter);
+        mList.setOnItemClickListener(mItemClickListener);
+
+        mMenuDrawer.setMenuView(mList);
+
+        mContentTextView = (TextView) findViewById(R.id.contentText);
+        mContentTextView.setText(mContentText);
+    }
+
+    private AdapterView.OnItemClickListener mItemClickListener = new AdapterView.OnItemClickListener() {
+        @Override
+        public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+            mActivePosition = position;
+            mMenuDrawer.setActiveView(view, position);
+            mContentTextView.setText(((TextView) view).getText());
+            mMenuDrawer.closeMenu();
+        }
+    };
+
+    @Override
+    protected void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+        outState.putInt(STATE_ACTIVE_POSITION, mActivePosition);
+        outState.putString(STATE_CONTENT_TEXT, mContentText);
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        MenuItem overflowItem = menu.add(0, MENU_OVERFLOW, 0, null);
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
+            overflowItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
+        }
+        overflowItem.setIcon(R.drawable.ic_menu_moreoverflow_normal_holo_light);
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case MENU_OVERFLOW:
+                mMenuDrawer.toggleMenu();
+                return true;
+        }
+
+        return super.onOptionsItemSelected(item);
+    }
+
+    @Override
+    public void onBackPressed() {
+        final int drawerState = mMenuDrawer.getDrawerState();
+        if (drawerState == MenuDrawer.STATE_OPEN || drawerState == MenuDrawer.STATE_OPENING) {
+            mMenuDrawer.closeMenu();
+            return;
+        }
+
+        super.onBackPressed();
+    }
+
+    private static class Item {
+
+        String mTitle;
+        int mIconRes;
+
+        Item(String title, int iconRes) {
+            mTitle = title;
+            mIconRes = iconRes;
+        }
+    }
+
+    private static class Category {
+
+        String mTitle;
+
+        Category(String title) {
+            mTitle = title;
+        }
+    }
+
+    private class MenuAdapter extends BaseAdapter {
+
+        private List<Object> mItems;
+
+        MenuAdapter(List<Object> items) {
+            mItems = items;
+        }
+
+        @Override
+        public int getCount() {
+            return mItems.size();
+        }
+
+        @Override
+        public Object getItem(int position) {
+            return mItems.get(position);
+        }
+
+        @Override
+        public long getItemId(int position) {
+            return position;
+        }
+
+        @Override
+        public int getItemViewType(int position) {
+            return getItem(position) instanceof Item ? 0 : 1;
+        }
+
+        @Override
+        public int getViewTypeCount() {
+            return 2;
+        }
+
+        @Override
+        public boolean isEnabled(int position) {
+            return getItem(position) instanceof Item;
+        }
+
+        @Override
+        public boolean areAllItemsEnabled() {
+            return false;
+        }
+
+        @Override
+        public View getView(int position, View convertView, ViewGroup parent) {
+            View v = convertView;
+            Object item = getItem(position);
+
+            if (item instanceof Category) {
+                if (v == null) {
+                    v = getLayoutInflater().inflate(R.layout.menu_row_category, parent, false);
+                }
+
+                ((TextView) v).setText(((Category) item).mTitle);
+
+            } else {
+                if (v == null) {
+                    v = getLayoutInflater().inflate(R.layout.menu_row_item, parent, false);
+                }
+
+                TextView tv = (TextView) v;
+                tv.setText(((Item) item).mTitle);
+                tv.setCompoundDrawablesWithIntrinsicBounds(((Item) item).mIconRes, 0, 0, 0);
+            }
+
+            v.setTag(R.id.mdActiveViewPosition, position);
+
+            if (position == mActivePosition) {
+                mMenuDrawer.setActiveView(v, position);
+            }
+
+            return v;
+        }
+    }
+}
diff --git a/Externals/android-menudrawer/samples/src/net/simonvt/menudrawer/samples/SamplesActivity.java b/Externals/android-menudrawer/samples/src/net/simonvt/menudrawer/samples/SamplesActivity.java
new file mode 100644
index 0000000000..32aa28fac1
--- /dev/null
+++ b/Externals/android-menudrawer/samples/src/net/simonvt/menudrawer/samples/SamplesActivity.java
@@ -0,0 +1,99 @@
+package net.simonvt.menudrawer.samples;
+
+import android.app.ListActivity;
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+import android.widget.ListView;
+import android.widget.TextView;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class SamplesActivity extends ListActivity {
+
+    private SamplesAdapter mAdapter;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        mAdapter = new SamplesAdapter();
+
+        mAdapter.addSample("Content sample", "Only the content area is dragged.", ContentSample.class);
+        mAdapter.addSample("ListActivity sample", "Shows how to use the drawer with a ListActivity.",
+                ListActivitySample.class);
+        mAdapter.addSample("Window sample", "The entire window is dragged.", WindowSample.class);
+        mAdapter.addSample("ActionBar overlay sample", "A window sample, where the ActionBar is an overlay",
+                ActionBarOverlaySample.class);
+        mAdapter.addSample("Right menu", "The menu is positioned to the right of the content", RightMenuSample.class);
+        mAdapter.addSample("Top menu", "The menu is positioned above the content", TopMenuSample.class);
+        mAdapter.addSample("Bottom menu", "The menu is positioned below the content", BottomMenuSample.class);
+        mAdapter.addSample("Touch Mode", "The menu touch behavior change according to different"
+                + " content view state (Ex: View Pager)", ViewPagerSample.class);
+        mAdapter.addSample("Layout xml", "The drawer and its menu and content is defined in XML", LayoutSample.class);
+        mAdapter.addSample("Static drawer", "The drawer is always visible", StaticDrawerSample.class);
+
+        setListAdapter(mAdapter);
+    }
+
+    @Override
+    protected void onListItemClick(ListView l, View v, int position, long id) {
+        SampleItem sample = (SampleItem) mAdapter.getItem(position);
+        Intent i = new Intent(this, sample.mClazz);
+        startActivity(i);
+    }
+
+    private static class SampleItem {
+
+        String mTitle;
+        String mSummary;
+        Class mClazz;
+
+        public SampleItem(String title, String summary, Class clazz) {
+            mTitle = title;
+            mSummary = summary;
+            mClazz = clazz;
+        }
+    }
+
+    public class SamplesAdapter extends BaseAdapter {
+
+        private List<SampleItem> mSamples = new ArrayList<SampleItem>();
+
+        public void addSample(String title, String summary, Class clazz) {
+            mSamples.add(new SampleItem(title, summary, clazz));
+        }
+
+        @Override
+        public int getCount() {
+            return mSamples.size();
+        }
+
+        @Override
+        public Object getItem(int position) {
+            return mSamples.get(position);
+        }
+
+        @Override
+        public long getItemId(int position) {
+            return position;
+        }
+
+        @Override
+        public View getView(int position, View convertView, ViewGroup parent) {
+            SampleItem sample = (SampleItem) getItem(position);
+
+            View v = convertView;
+            if (v == null) {
+                v = getLayoutInflater().inflate(R.layout.list_row_sample, parent, false);
+            }
+
+            ((TextView) v.findViewById(R.id.title)).setText(sample.mTitle);
+            ((TextView) v.findViewById(R.id.summary)).setText(sample.mSummary);
+
+            return v;
+        }
+    }
+}
diff --git a/Externals/android-menudrawer/samples/src/net/simonvt/menudrawer/samples/StaticDrawerSample.java b/Externals/android-menudrawer/samples/src/net/simonvt/menudrawer/samples/StaticDrawerSample.java
new file mode 100644
index 0000000000..5a4c52dc5f
--- /dev/null
+++ b/Externals/android-menudrawer/samples/src/net/simonvt/menudrawer/samples/StaticDrawerSample.java
@@ -0,0 +1,175 @@
+package net.simonvt.menudrawer.samples;
+
+import net.simonvt.menudrawer.MenuDrawer;
+import net.simonvt.menudrawer.Position;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.AdapterView;
+import android.widget.BaseAdapter;
+import android.widget.ListView;
+import android.widget.TextView;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class StaticDrawerSample extends Activity {
+
+    private static final String STATE_ACTIVE_POSITION = "net.simonvt.menudrawer.samples.ContentSample.activePosition";
+    private static final String STATE_CONTENT_TEXT = "net.simonvt.menudrawer.samples.ContentSample.contentText";
+
+    private MenuDrawer mMenuDrawer;
+
+    private MenuAdapter mAdapter;
+    private ListView mList;
+
+    private int mActivePosition = -1;
+    private String mContentText;
+    private TextView mContentTextView;
+
+    @Override
+    protected void onCreate(Bundle inState) {
+        super.onCreate(inState);
+
+        if (inState != null) {
+            mActivePosition = inState.getInt(STATE_ACTIVE_POSITION);
+            mContentText = inState.getString(STATE_CONTENT_TEXT);
+        }
+
+        mMenuDrawer = MenuDrawer.attach(this, MenuDrawer.MENU_DRAG_CONTENT, Position.LEFT, true);
+        mMenuDrawer.setContentView(R.layout.activity_contentsample);
+
+        List<Object> items = new ArrayList<Object>();
+        items.add(new Item("Item 1", R.drawable.ic_action_refresh_dark));
+        items.add(new Item("Item 2", R.drawable.ic_action_select_all_dark));
+        items.add(new Category("Cat 1"));
+        items.add(new Item("Item 3", R.drawable.ic_action_refresh_dark));
+        items.add(new Item("Item 4", R.drawable.ic_action_select_all_dark));
+        items.add(new Category("Cat 2"));
+        items.add(new Item("Item 5", R.drawable.ic_action_refresh_dark));
+        items.add(new Item("Item 6", R.drawable.ic_action_select_all_dark));
+
+        mList = new ListView(this);
+        mAdapter = new MenuAdapter(items);
+        mList.setAdapter(mAdapter);
+        mList.setOnItemClickListener(mItemClickListener);
+
+        mMenuDrawer.setMenuView(mList);
+
+        mContentTextView = (TextView) findViewById(R.id.contentText);
+        mContentTextView.setText(mContentText);
+    }
+
+    private AdapterView.OnItemClickListener mItemClickListener = new AdapterView.OnItemClickListener() {
+        @Override
+        public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+            mActivePosition = position;
+            mMenuDrawer.setActiveView(view, position);
+            mContentTextView.setText(((TextView) view).getText());
+        }
+    };
+
+    @Override
+    protected void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+        outState.putInt(STATE_ACTIVE_POSITION, mActivePosition);
+        outState.putString(STATE_CONTENT_TEXT, mContentText);
+    }
+
+    private static class Item {
+
+        String mTitle;
+        int mIconRes;
+
+        Item(String title, int iconRes) {
+            mTitle = title;
+            mIconRes = iconRes;
+        }
+    }
+
+    private static class Category {
+
+        String mTitle;
+
+        Category(String title) {
+            mTitle = title;
+        }
+    }
+
+    private class MenuAdapter extends BaseAdapter {
+
+        private List<Object> mItems;
+
+        MenuAdapter(List<Object> items) {
+            mItems = items;
+        }
+
+        @Override
+        public int getCount() {
+            return mItems.size();
+        }
+
+        @Override
+        public Object getItem(int position) {
+            return mItems.get(position);
+        }
+
+        @Override
+        public long getItemId(int position) {
+            return position;
+        }
+
+        @Override
+        public int getItemViewType(int position) {
+            return getItem(position) instanceof Item ? 0 : 1;
+        }
+
+        @Override
+        public int getViewTypeCount() {
+            return 2;
+        }
+
+        @Override
+        public boolean isEnabled(int position) {
+            return getItem(position) instanceof Item;
+        }
+
+        @Override
+        public boolean areAllItemsEnabled() {
+            return false;
+        }
+
+        @Override
+        public View getView(int position, View convertView, ViewGroup parent) {
+            View v = convertView;
+            Object item = getItem(position);
+
+            if (item instanceof Category) {
+                if (v == null) {
+                    v = getLayoutInflater().inflate(R.layout.menu_row_category, parent, false);
+                }
+
+                ((TextView) v).setText(((Category) item).mTitle);
+
+            } else {
+                if (v == null) {
+                    v = getLayoutInflater().inflate(R.layout.menu_row_item, parent, false);
+                }
+
+                TextView tv = (TextView) v;
+                tv.setText(((Item) item).mTitle);
+                tv.setCompoundDrawablesWithIntrinsicBounds(((Item) item).mIconRes, 0, 0, 0);
+            }
+
+            v.setTag(R.id.mdActiveViewPosition, position);
+
+            if (position == mActivePosition) {
+                mMenuDrawer.setActiveView(v, position);
+            }
+
+            return v;
+        }
+    }
+}
diff --git a/Externals/android-menudrawer/samples/src/net/simonvt/menudrawer/samples/TopMenuSample.java b/Externals/android-menudrawer/samples/src/net/simonvt/menudrawer/samples/TopMenuSample.java
new file mode 100644
index 0000000000..1c87f888c2
--- /dev/null
+++ b/Externals/android-menudrawer/samples/src/net/simonvt/menudrawer/samples/TopMenuSample.java
@@ -0,0 +1,75 @@
+package net.simonvt.menudrawer.samples;
+
+import net.simonvt.menudrawer.MenuDrawer;
+import net.simonvt.menudrawer.Position;
+
+import android.app.Activity;
+import android.os.Build;
+import android.os.Bundle;
+import android.support.v4.app.NavUtils;
+import android.support.v4.view.MenuItemCompat;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.TextView;
+
+/**
+ * Sample class illustrating how to add a menu drawer above the content area.
+ */
+public class TopMenuSample extends Activity implements OnClickListener {
+
+    private static final int MENU_OVERFLOW = 1;
+
+    private MenuDrawer mMenuDrawer;
+    private TextView mContentTextView;
+
+    @Override
+    protected void onCreate(Bundle inState) {
+        super.onCreate(inState);
+
+        mMenuDrawer = MenuDrawer.attach(this, MenuDrawer.MENU_DRAG_CONTENT, Position.TOP);
+        mMenuDrawer.setTouchMode(MenuDrawer.TOUCH_MODE_FULLSCREEN);
+        mMenuDrawer.setContentView(R.layout.activity_topmenu);
+        mMenuDrawer.setMenuView(R.layout.menu_top);
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH)
+            getActionBar().setDisplayHomeAsUpEnabled(true);
+
+        mContentTextView = (TextView) findViewById(R.id.contentText);
+        findViewById(R.id.item1).setOnClickListener(this);
+        findViewById(R.id.item2).setOnClickListener(this);
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        MenuItem overflowItem = menu.add(0, MENU_OVERFLOW, 0, null);
+        MenuItemCompat.setShowAsAction(overflowItem, MenuItem.SHOW_AS_ACTION_ALWAYS);
+
+        overflowItem.setIcon(R.drawable.ic_menu_moreoverflow_normal_holo_light);
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case android.R.id.home:
+                NavUtils.navigateUpFromSameTask(this);
+                return true;
+            case MENU_OVERFLOW:
+                mMenuDrawer.toggleMenu();
+                return true;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
+    /**
+     * Click handler for top drawer items.
+     */
+    @Override
+    public void onClick(View v) {
+        String tag = (String) v.getTag();
+        mContentTextView.setText(String.format("%s clicked.", tag));
+        mMenuDrawer.setActiveView(v);
+    }
+}
diff --git a/Externals/android-menudrawer/samples/src/net/simonvt/menudrawer/samples/ViewPagerSample.java b/Externals/android-menudrawer/samples/src/net/simonvt/menudrawer/samples/ViewPagerSample.java
new file mode 100644
index 0000000000..41f17c97d9
--- /dev/null
+++ b/Externals/android-menudrawer/samples/src/net/simonvt/menudrawer/samples/ViewPagerSample.java
@@ -0,0 +1,300 @@
+package net.simonvt.menudrawer.samples;
+
+import net.simonvt.menudrawer.MenuDrawer;
+
+import android.content.Context;
+import android.os.Build;
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentActivity;
+import android.support.v4.app.FragmentPagerAdapter;
+import android.support.v4.view.ViewPager;
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.AdapterView;
+import android.widget.BaseAdapter;
+import android.widget.FrameLayout;
+import android.widget.ListView;
+import android.widget.TextView;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ViewPagerSample extends FragmentActivity {
+
+    private static final String STATE_ACTIVE_POSITION = "net.simonvt.menudrawer.samples.ContentSample.activePosition";
+
+    private MenuDrawer mMenuDrawer;
+
+    private MenuAdapter mAdapter;
+    private ListView mList;
+
+    private int mActivePosition = -1;
+    private PagerAdapter mPagerAdapter;
+    private ViewPager mViewPager;
+
+    @Override
+    protected void onCreate(Bundle inState) {
+        super.onCreate(inState);
+
+        if (inState != null) {
+            mActivePosition = inState.getInt(STATE_ACTIVE_POSITION);
+        }
+
+        mMenuDrawer = MenuDrawer.attach(this, MenuDrawer.MENU_DRAG_CONTENT);
+        mMenuDrawer.setContentView(R.layout.activity_viewpagersample);
+
+        List<Object> items = new ArrayList<Object>();
+        items.add(new Item("Item 1", R.drawable.ic_action_refresh_dark));
+        items.add(new Item("Item 2", R.drawable.ic_action_select_all_dark));
+        items.add(new Category("Cat 1"));
+        items.add(new Item("Item 3", R.drawable.ic_action_refresh_dark));
+        items.add(new Item("Item 4", R.drawable.ic_action_select_all_dark));
+        items.add(new Category("Cat 2"));
+        items.add(new Item("Item 5", R.drawable.ic_action_refresh_dark));
+        items.add(new Item("Item 6", R.drawable.ic_action_select_all_dark));
+
+        // A custom ListView is needed so the drawer can be notified when it's
+        // scrolled. This is to update the position
+        // of the arrow indicator.
+        mList = new ListView(this);
+        mAdapter = new MenuAdapter(items);
+        mList.setAdapter(mAdapter);
+        mList.setOnItemClickListener(mItemClickListener);
+
+        mMenuDrawer.setMenuView(mList);
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
+            getActionBar().setDisplayHomeAsUpEnabled(true);
+        }
+
+        mMenuDrawer.setTouchMode(MenuDrawer.TOUCH_MODE_FULLSCREEN);
+
+        mViewPager = (ViewPager) findViewById(R.id.view_pager);
+        mViewPager
+                .setOnPageChangeListener(new ViewPager.SimpleOnPageChangeListener() {
+                    @Override
+                    public void onPageSelected(final int position) {
+                        mMenuDrawer.setTouchMode(position == 0
+                                ? MenuDrawer.TOUCH_MODE_FULLSCREEN
+                                : MenuDrawer.TOUCH_MODE_NONE);
+                    }
+                });
+
+        mPagerAdapter = new PagerAdapter(this);
+        mPagerAdapter.addTab(TextViewFragment.class, null);
+        mPagerAdapter.addTab(TextViewFragment.class, null);
+        mPagerAdapter.addTab(TextViewFragment.class, null);
+
+        mViewPager.setAdapter(mPagerAdapter);
+    }
+
+    private AdapterView.OnItemClickListener mItemClickListener = new AdapterView.OnItemClickListener() {
+        @Override
+        public void onItemClick(AdapterView<?> parent, View view, int position,
+                long id) {
+            mActivePosition = position;
+            mMenuDrawer.setActiveView(view, position);
+            mMenuDrawer.closeMenu();
+        }
+    };
+
+    @Override
+    protected void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+        outState.putInt(STATE_ACTIVE_POSITION, mActivePosition);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case android.R.id.home:
+                mMenuDrawer.toggleMenu();
+                return true;
+        }
+
+        return super.onOptionsItemSelected(item);
+    }
+
+    @Override
+    public void onBackPressed() {
+        final int drawerState = mMenuDrawer.getDrawerState();
+        if (drawerState == MenuDrawer.STATE_OPEN
+                || drawerState == MenuDrawer.STATE_OPENING) {
+            mMenuDrawer.closeMenu();
+            return;
+        }
+
+        super.onBackPressed();
+    }
+
+    private static final class Item {
+
+        String mTitle;
+        int mIconRes;
+
+        Item(String title, int iconRes) {
+            mTitle = title;
+            mIconRes = iconRes;
+        }
+    }
+
+    private static final class Category {
+
+        String mTitle;
+
+        Category(String title) {
+            mTitle = title;
+        }
+    }
+
+    private class MenuAdapter extends BaseAdapter {
+
+        private List<Object> mItems;
+
+        MenuAdapter(List<Object> items) {
+            mItems = items;
+        }
+
+        @Override
+        public int getCount() {
+            return mItems.size();
+        }
+
+        @Override
+        public Object getItem(int position) {
+            return mItems.get(position);
+        }
+
+        @Override
+        public long getItemId(int position) {
+            return position;
+        }
+
+        @Override
+        public int getItemViewType(int position) {
+            return getItem(position) instanceof Item ? 0 : 1;
+        }
+
+        @Override
+        public int getViewTypeCount() {
+            return 2;
+        }
+
+        @Override
+        public boolean isEnabled(int position) {
+            return getItem(position) instanceof Item;
+        }
+
+        @Override
+        public boolean areAllItemsEnabled() {
+            return false;
+        }
+
+        @Override
+        public View getView(int position, View convertView, ViewGroup parent) {
+            View v = convertView;
+            Object item = getItem(position);
+
+            if (item instanceof Category) {
+                if (v == null) {
+                    v = getLayoutInflater().inflate(R.layout.menu_row_category,
+                            parent, false);
+                }
+
+                ((TextView) v).setText(((Category) item).mTitle);
+
+            } else {
+                if (v == null) {
+                    v = getLayoutInflater().inflate(R.layout.menu_row_item,
+                            parent, false);
+                }
+
+                TextView tv = (TextView) v;
+                tv.setText(((Item) item).mTitle);
+                tv.setCompoundDrawablesWithIntrinsicBounds(
+                        ((Item) item).mIconRes, 0, 0, 0);
+            }
+
+            v.setTag(R.id.mdActiveViewPosition, position);
+
+            if (position == mActivePosition) {
+                mMenuDrawer.setActiveView(v, position);
+            }
+
+            return v;
+        }
+    }
+
+    /**
+     * This is a helper class that implements the management of tabs and all
+     * details of connecting a ViewPager with associated TabHost. It relies on a
+     * trick. Normally a tab host has a simple API for supplying a View or
+     * Intent that each tab will show. This is not sufficient for switching
+     * between pages. So instead we make the content part of the tab host 0dp
+     * high (it is not shown) and the TabsAdapter supplies its own dummy view to
+     * show as the tab content. It listens to changes in tabs, and takes care of
+     * switch to the correct paged in the ViewPager whenever the selected tab
+     * changes.
+     */
+    public static class PagerAdapter extends FragmentPagerAdapter {
+
+        private final Context mContext;
+        private final ArrayList<TabInfo> mTabs = new ArrayList<TabInfo>();
+
+        static final class TabInfo {
+
+            private final Class<?> mClss;
+            private final Bundle mArgs;
+
+            TabInfo(Class<?> aClass, Bundle args) {
+                mClss = aClass;
+                mArgs = args;
+            }
+        }
+
+        public PagerAdapter(FragmentActivity activity) {
+            super(activity.getSupportFragmentManager());
+            mContext = activity;
+        }
+
+        @Override
+        public int getCount() {
+            return mTabs.size();
+        }
+
+        @Override
+        public Fragment getItem(int position) {
+            TabInfo info = mTabs.get(position);
+            return Fragment.instantiate(mContext, info.mClss.getName(),
+                    info.mArgs);
+        }
+
+        public void addTab(Class<?> clss, Bundle args) {
+            TabInfo info = new TabInfo(clss, args);
+            mTabs.add(info);
+            notifyDataSetChanged();
+        }
+
+    }
+
+    public static class TextViewFragment extends Fragment {
+
+        @Override
+        public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                Bundle savedInstanceState) {
+            FrameLayout frameLayout = new FrameLayout(getActivity());
+            frameLayout.setLayoutParams(new FrameLayout.LayoutParams(
+                    FrameLayout.LayoutParams.MATCH_PARENT,
+                    FrameLayout.LayoutParams.MATCH_PARENT, Gravity.CENTER));
+
+            TextView tv = new TextView(getActivity());
+            tv.setText("This is an example of a Fragment in a View Pager");
+            frameLayout.addView(tv);
+            return frameLayout;
+        }
+    }
+}
diff --git a/Externals/android-menudrawer/samples/src/net/simonvt/menudrawer/samples/WindowSample.java b/Externals/android-menudrawer/samples/src/net/simonvt/menudrawer/samples/WindowSample.java
new file mode 100644
index 0000000000..cc433b77d5
--- /dev/null
+++ b/Externals/android-menudrawer/samples/src/net/simonvt/menudrawer/samples/WindowSample.java
@@ -0,0 +1,99 @@
+package net.simonvt.menudrawer.samples;
+
+import net.simonvt.menudrawer.MenuDrawer;
+
+import android.app.Activity;
+import android.os.Build;
+import android.os.Bundle;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.TextView;
+
+public class WindowSample extends Activity implements View.OnClickListener {
+
+    private static final String STATE_MENUDRAWER = "net.simonvt.menudrawer.samples.WindowSample.menuDrawer";
+    private static final String STATE_ACTIVE_VIEW_ID = "net.simonvt.menudrawer.samples.WindowSample.activeViewId";
+
+    private MenuDrawer mMenuDrawer;
+    private TextView mContentTextView;
+
+    private int mActiveViewId;
+
+    @Override
+    public void onCreate(Bundle inState) {
+        super.onCreate(inState);
+        if (inState != null) {
+            mActiveViewId = inState.getInt(STATE_ACTIVE_VIEW_ID);
+        }
+
+        mMenuDrawer = MenuDrawer.attach(this, MenuDrawer.MENU_DRAG_WINDOW);
+        mMenuDrawer.setContentView(R.layout.activity_windowsample);
+        mMenuDrawer.setMenuView(R.layout.menu_scrollview);
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
+            getActionBar().setDisplayHomeAsUpEnabled(true);
+        }
+
+        mContentTextView = (TextView) findViewById(R.id.contentText);
+
+        findViewById(R.id.item1).setOnClickListener(this);
+        findViewById(R.id.item2).setOnClickListener(this);
+        findViewById(R.id.item3).setOnClickListener(this);
+        findViewById(R.id.item4).setOnClickListener(this);
+        findViewById(R.id.item5).setOnClickListener(this);
+        findViewById(R.id.item6).setOnClickListener(this);
+
+        TextView activeView = (TextView) findViewById(mActiveViewId);
+        if (activeView != null) {
+            mMenuDrawer.setActiveView(activeView);
+            mContentTextView.setText("Active item: " + activeView.getText());
+        }
+
+        // This will animate the drawer open and closed until the user manually drags it. Usually this would only be
+        // called on first launch.
+        mMenuDrawer.peekDrawer();
+    }
+
+    @Override
+    protected void onRestoreInstanceState(Bundle inState) {
+        super.onRestoreInstanceState(inState);
+        mMenuDrawer.restoreState(inState.getParcelable(STATE_MENUDRAWER));
+    }
+
+    @Override
+    protected void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+        outState.putParcelable(STATE_MENUDRAWER, mMenuDrawer.saveState());
+        outState.putInt(STATE_ACTIVE_VIEW_ID, mActiveViewId);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case android.R.id.home:
+                mMenuDrawer.toggleMenu();
+                return true;
+        }
+
+        return super.onOptionsItemSelected(item);
+    }
+
+    @Override
+    public void onBackPressed() {
+        final int drawerState = mMenuDrawer.getDrawerState();
+        if (drawerState == MenuDrawer.STATE_OPEN || drawerState == MenuDrawer.STATE_OPENING) {
+            mMenuDrawer.closeMenu();
+            return;
+        }
+
+        super.onBackPressed();
+    }
+
+    @Override
+    public void onClick(View v) {
+        mMenuDrawer.setActiveView(v);
+        mContentTextView.setText("Active item: " + ((TextView) v).getText());
+        mMenuDrawer.closeMenu();
+        mActiveViewId = v.getId();
+    }
+}
diff --git a/Externals/libpng/CMakeLists.txt b/Externals/libpng/CMakeLists.txt
index 52d34af6a7..b30749ee86 100644
--- a/Externals/libpng/CMakeLists.txt
+++ b/Externals/libpng/CMakeLists.txt
@@ -1,19 +1,21 @@
-set(SRCS
-	"png.c"
-	"pngerror.c"
-	"pngget.c"
-	"pngmem.c"
-	"pngpread.c"
-	"pngread.c"
-	"pngrio.c"
-	"pngrtran.c"
-	"pngrutil.c"
-	"pngset.c"
-	"pngtrans.c"
-	"pngwio.c"
-	"pngwrite.c"
-	"pngwtran.c"
-	"pngwutil.c"
-	)
-
-add_library(png STATIC ${SRCS})
+# OUR SOURCES
+set(SRCS
+  png.h
+  pngconf.h
+  png.c
+  pngerror.c
+  pngget.c
+  pngmem.c
+  pngpread.c
+  pngread.c
+  pngrio.c
+  pngrtran.c
+  pngrutil.c
+  pngset.c
+  pngtrans.c
+  pngwio.c
+  pngwrite.c
+  pngwtran.c
+  pngwutil.c
+)
+add_library(png STATIC ${SRCS})
diff --git a/Externals/libpng/png.c b/Externals/libpng/png.c
index 764f47c20c..2672820474 100644
--- a/Externals/libpng/png.c
+++ b/Externals/libpng/png.c
@@ -1,2362 +1,1100 @@
-
-/* png.c - location for general purpose libpng functions
- *
- * Last changed in libpng 1.5.1 [February 3, 2011]
- * Copyright (c) 1998-2011 Glenn Randers-Pehrson
- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
- *
- * This code is released under the libpng license.
- * For conditions of distribution and use, see the disclaimer
- * and license in png.h
- */
-
-#include "pngpriv.h"
-
-/* Generate a compiler error if there is an old png.h in the search path. */
-typedef png_libpng_version_1_5_1 Your_png_h_is_not_version_1_5_1;
-
-/* Tells libpng that we have already handled the first "num_bytes" bytes
- * of the PNG file signature.  If the PNG data is embedded into another
- * stream we can set num_bytes = 8 so that libpng will not attempt to read
- * or write any of the magic bytes before it starts on the IHDR.
- */
-
-#ifdef PNG_READ_SUPPORTED
-void PNGAPI
-png_set_sig_bytes(png_structp png_ptr, int num_bytes)
-{
-   png_debug(1, "in png_set_sig_bytes");
-
-   if (png_ptr == NULL)
-      return;
-
-   if (num_bytes > 8)
-      png_error(png_ptr, "Too many bytes for PNG signature");
-
-   png_ptr->sig_bytes = (png_byte)(num_bytes < 0 ? 0 : num_bytes);
-}
-
-/* Checks whether the supplied bytes match the PNG signature.  We allow
- * checking less than the full 8-byte signature so that those apps that
- * already read the first few bytes of a file to determine the file type
- * can simply check the remaining bytes for extra assurance.  Returns
- * an integer less than, equal to, or greater than zero if sig is found,
- * respectively, to be less than, to match, or be greater than the correct
- * PNG signature (this is the same behaviour as strcmp, memcmp, etc).
- */
-int PNGAPI
-png_sig_cmp(png_const_bytep sig, png_size_t start, png_size_t num_to_check)
-{
-   png_byte png_signature[8] = {137, 80, 78, 71, 13, 10, 26, 10};
-
-   if (num_to_check > 8)
-      num_to_check = 8;
-
-   else if (num_to_check < 1)
-      return (-1);
-
-   if (start > 7)
-      return (-1);
-
-   if (start + num_to_check > 8)
-      num_to_check = 8 - start;
-
-   return ((int)(png_memcmp(&sig[start], &png_signature[start], num_to_check)));
-}
-
-#endif /* PNG_READ_SUPPORTED */
-
-#if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED)
-/* Function to allocate memory for zlib */
-PNG_FUNCTION(voidpf /* PRIVATE */,
-png_zalloc,(voidpf png_ptr, uInt items, uInt size),PNG_ALLOCATED)
-{
-   png_voidp ptr;
-   png_structp p=(png_structp)png_ptr;
-   png_uint_32 save_flags=p->flags;
-   png_alloc_size_t num_bytes;
-
-   if (png_ptr == NULL)
-      return (NULL);
-
-   if (items > PNG_UINT_32_MAX/size)
-   {
-     png_warning (p, "Potential overflow in png_zalloc()");
-     return (NULL);
-   }
-   num_bytes = (png_alloc_size_t)items * size;
-
-   p->flags|=PNG_FLAG_MALLOC_NULL_MEM_OK;
-   ptr = (png_voidp)png_malloc((png_structp)png_ptr, num_bytes);
-   p->flags=save_flags;
-
-   return ((voidpf)ptr);
-}
-
-/* Function to free memory for zlib */
-void /* PRIVATE */
-png_zfree(voidpf png_ptr, voidpf ptr)
-{
-   png_free((png_structp)png_ptr, (png_voidp)ptr);
-}
-
-/* Reset the CRC variable to 32 bits of 1's.  Care must be taken
- * in case CRC is > 32 bits to leave the top bits 0.
- */
-void /* PRIVATE */
-png_reset_crc(png_structp png_ptr)
-{
-   png_ptr->crc = crc32(0, Z_NULL, 0);
-}
-
-/* Calculate the CRC over a section of data.  We can only pass as
- * much data to this routine as the largest single buffer size.  We
- * also check that this data will actually be used before going to the
- * trouble of calculating it.
- */
-void /* PRIVATE */
-png_calculate_crc(png_structp png_ptr, png_const_bytep ptr, png_size_t length)
-{
-   int need_crc = 1;
-
-   if (png_ptr->chunk_name[0] & 0x20)                     /* ancillary */
-   {
-      if ((png_ptr->flags & PNG_FLAG_CRC_ANCILLARY_MASK) ==
-          (PNG_FLAG_CRC_ANCILLARY_USE | PNG_FLAG_CRC_ANCILLARY_NOWARN))
-         need_crc = 0;
-   }
-
-   else                                                    /* critical */
-   {
-      if (png_ptr->flags & PNG_FLAG_CRC_CRITICAL_IGNORE)
-         need_crc = 0;
-   }
-
-   if (need_crc)
-      png_ptr->crc = crc32(png_ptr->crc, ptr, (uInt)length);
-}
-
-/* Allocate the memory for an info_struct for the application.  We don't
- * really need the png_ptr, but it could potentially be useful in the
- * future.  This should be used in favour of malloc(png_sizeof(png_info))
- * and png_info_init() so that applications that want to use a shared
- * libpng don't have to be recompiled if png_info changes size.
- */
-PNG_FUNCTION(png_infop,PNGAPI
-png_create_info_struct,(png_structp png_ptr),PNG_ALLOCATED)
-{
-   png_infop info_ptr;
-
-   png_debug(1, "in png_create_info_struct");
-
-   if (png_ptr == NULL)
-      return (NULL);
-
-#ifdef PNG_USER_MEM_SUPPORTED
-   info_ptr = (png_infop)png_create_struct_2(PNG_STRUCT_INFO,
-      png_ptr->malloc_fn, png_ptr->mem_ptr);
-#else
-   info_ptr = (png_infop)png_create_struct(PNG_STRUCT_INFO);
-#endif
-   if (info_ptr != NULL)
-      png_info_init_3(&info_ptr, png_sizeof(png_info));
-
-   return (info_ptr);
-}
-
-/* This function frees the memory associated with a single info struct.
- * Normally, one would use either png_destroy_read_struct() or
- * png_destroy_write_struct() to free an info struct, but this may be
- * useful for some applications.
- */
-void PNGAPI
-png_destroy_info_struct(png_structp png_ptr, png_infopp info_ptr_ptr)
-{
-   png_infop info_ptr = NULL;
-
-   png_debug(1, "in png_destroy_info_struct");
-
-   if (png_ptr == NULL)
-      return;
-
-   if (info_ptr_ptr != NULL)
-      info_ptr = *info_ptr_ptr;
-
-   if (info_ptr != NULL)
-   {
-      png_info_destroy(png_ptr, info_ptr);
-
-#ifdef PNG_USER_MEM_SUPPORTED
-      png_destroy_struct_2((png_voidp)info_ptr, png_ptr->free_fn,
-          png_ptr->mem_ptr);
-#else
-      png_destroy_struct((png_voidp)info_ptr);
-#endif
-      *info_ptr_ptr = NULL;
-   }
-}
-
-/* Initialize the info structure.  This is now an internal function (0.89)
- * and applications using it are urged to use png_create_info_struct()
- * instead.
- */
-
-void PNGAPI
-png_info_init_3(png_infopp ptr_ptr, png_size_t png_info_struct_size)
-{
-   png_infop info_ptr = *ptr_ptr;
-
-   png_debug(1, "in png_info_init_3");
-
-   if (info_ptr == NULL)
-      return;
-
-   if (png_sizeof(png_info) > png_info_struct_size)
-   {
-      png_destroy_struct(info_ptr);
-      info_ptr = (png_infop)png_create_struct(PNG_STRUCT_INFO);
-      *ptr_ptr = info_ptr;
-   }
-
-   /* Set everything to 0 */
-   png_memset(info_ptr, 0, png_sizeof(png_info));
-}
-
-void PNGAPI
-png_data_freer(png_structp png_ptr, png_infop info_ptr,
-   int freer, png_uint_32 mask)
-{
-   png_debug(1, "in png_data_freer");
-
-   if (png_ptr == NULL || info_ptr == NULL)
-      return;
-
-   if (freer == PNG_DESTROY_WILL_FREE_DATA)
-      info_ptr->free_me |= mask;
-
-   else if (freer == PNG_USER_WILL_FREE_DATA)
-      info_ptr->free_me &= ~mask;
-
-   else
-      png_warning(png_ptr,
-         "Unknown freer parameter in png_data_freer");
-}
-
-void PNGAPI
-png_free_data(png_structp png_ptr, png_infop info_ptr, png_uint_32 mask,
-   int num)
-{
-   png_debug(1, "in png_free_data");
-
-   if (png_ptr == NULL || info_ptr == NULL)
-      return;
-
-#ifdef PNG_TEXT_SUPPORTED
-   /* Free text item num or (if num == -1) all text items */
-   if ((mask & PNG_FREE_TEXT) & info_ptr->free_me)
-   {
-      if (num != -1)
-      {
-         if (info_ptr->text && info_ptr->text[num].key)
-         {
-            png_free(png_ptr, info_ptr->text[num].key);
-            info_ptr->text[num].key = NULL;
-         }
-      }
-
-      else
-      {
-         int i;
-         for (i = 0; i < info_ptr->num_text; i++)
-             png_free_data(png_ptr, info_ptr, PNG_FREE_TEXT, i);
-         png_free(png_ptr, info_ptr->text);
-         info_ptr->text = NULL;
-         info_ptr->num_text=0;
-      }
-   }
-#endif
-
-#ifdef PNG_tRNS_SUPPORTED
-   /* Free any tRNS entry */
-   if ((mask & PNG_FREE_TRNS) & info_ptr->free_me)
-   {
-      png_free(png_ptr, info_ptr->trans_alpha);
-      info_ptr->trans_alpha = NULL;
-      info_ptr->valid &= ~PNG_INFO_tRNS;
-   }
-#endif
-
-#ifdef PNG_sCAL_SUPPORTED
-   /* Free any sCAL entry */
-   if ((mask & PNG_FREE_SCAL) & info_ptr->free_me)
-   {
-#if defined(PNG_FIXED_POINT_SUPPORTED) && !defined(PNG_FLOATING_POINT_SUPPORTED)
-      png_free(png_ptr, info_ptr->scal_s_width);
-      png_free(png_ptr, info_ptr->scal_s_height);
-      info_ptr->scal_s_width = NULL;
-      info_ptr->scal_s_height = NULL;
-#endif
-      info_ptr->valid &= ~PNG_INFO_sCAL;
-   }
-#endif
-
-#ifdef PNG_pCAL_SUPPORTED
-   /* Free any pCAL entry */
-   if ((mask & PNG_FREE_PCAL) & info_ptr->free_me)
-   {
-      png_free(png_ptr, info_ptr->pcal_purpose);
-      png_free(png_ptr, info_ptr->pcal_units);
-      info_ptr->pcal_purpose = NULL;
-      info_ptr->pcal_units = NULL;
-      if (info_ptr->pcal_params != NULL)
-         {
-            int i;
-            for (i = 0; i < (int)info_ptr->pcal_nparams; i++)
-            {
-               png_free(png_ptr, info_ptr->pcal_params[i]);
-               info_ptr->pcal_params[i] = NULL;
-            }
-            png_free(png_ptr, info_ptr->pcal_params);
-            info_ptr->pcal_params = NULL;
-         }
-      info_ptr->valid &= ~PNG_INFO_pCAL;
-   }
-#endif
-
-#ifdef PNG_iCCP_SUPPORTED
-   /* Free any iCCP entry */
-   if ((mask & PNG_FREE_ICCP) & info_ptr->free_me)
-   {
-      png_free(png_ptr, info_ptr->iccp_name);
-      png_free(png_ptr, info_ptr->iccp_profile);
-      info_ptr->iccp_name = NULL;
-      info_ptr->iccp_profile = NULL;
-      info_ptr->valid &= ~PNG_INFO_iCCP;
-   }
-#endif
-
-#ifdef PNG_sPLT_SUPPORTED
-   /* Free a given sPLT entry, or (if num == -1) all sPLT entries */
-   if ((mask & PNG_FREE_SPLT) & info_ptr->free_me)
-   {
-      if (num != -1)
-      {
-         if (info_ptr->splt_palettes)
-         {
-            png_free(png_ptr, info_ptr->splt_palettes[num].name);
-            png_free(png_ptr, info_ptr->splt_palettes[num].entries);
-            info_ptr->splt_palettes[num].name = NULL;
-            info_ptr->splt_palettes[num].entries = NULL;
-         }
-      }
-
-      else
-      {
-         if (info_ptr->splt_palettes_num)
-         {
-            int i;
-            for (i = 0; i < (int)info_ptr->splt_palettes_num; i++)
-               png_free_data(png_ptr, info_ptr, PNG_FREE_SPLT, i);
-
-            png_free(png_ptr, info_ptr->splt_palettes);
-            info_ptr->splt_palettes = NULL;
-            info_ptr->splt_palettes_num = 0;
-         }
-         info_ptr->valid &= ~PNG_INFO_sPLT;
-      }
-   }
-#endif
-
-#ifdef PNG_UNKNOWN_CHUNKS_SUPPORTED
-   if (png_ptr->unknown_chunk.data)
-   {
-      png_free(png_ptr, png_ptr->unknown_chunk.data);
-      png_ptr->unknown_chunk.data = NULL;
-   }
-
-   if ((mask & PNG_FREE_UNKN) & info_ptr->free_me)
-   {
-      if (num != -1)
-      {
-          if (info_ptr->unknown_chunks)
-          {
-             png_free(png_ptr, info_ptr->unknown_chunks[num].data);
-             info_ptr->unknown_chunks[num].data = NULL;
-          }
-      }
-
-      else
-      {
-         int i;
-
-         if (info_ptr->unknown_chunks_num)
-         {
-            for (i = 0; i < info_ptr->unknown_chunks_num; i++)
-               png_free_data(png_ptr, info_ptr, PNG_FREE_UNKN, i);
-
-            png_free(png_ptr, info_ptr->unknown_chunks);
-            info_ptr->unknown_chunks = NULL;
-            info_ptr->unknown_chunks_num = 0;
-         }
-      }
-   }
-#endif
-
-#ifdef PNG_hIST_SUPPORTED
-   /* Free any hIST entry */
-   if ((mask & PNG_FREE_HIST)  & info_ptr->free_me)
-   {
-      png_free(png_ptr, info_ptr->hist);
-      info_ptr->hist = NULL;
-      info_ptr->valid &= ~PNG_INFO_hIST;
-   }
-#endif
-
-   /* Free any PLTE entry that was internally allocated */
-   if ((mask & PNG_FREE_PLTE) & info_ptr->free_me)
-   {
-      png_zfree(png_ptr, info_ptr->palette);
-      info_ptr->palette = NULL;
-      info_ptr->valid &= ~PNG_INFO_PLTE;
-      info_ptr->num_palette = 0;
-   }
-
-#ifdef PNG_INFO_IMAGE_SUPPORTED
-   /* Free any image bits attached to the info structure */
-   if ((mask & PNG_FREE_ROWS) & info_ptr->free_me)
-   {
-      if (info_ptr->row_pointers)
-      {
-         int row;
-         for (row = 0; row < (int)info_ptr->height; row++)
-         {
-            png_free(png_ptr, info_ptr->row_pointers[row]);
-            info_ptr->row_pointers[row] = NULL;
-         }
-         png_free(png_ptr, info_ptr->row_pointers);
-         info_ptr->row_pointers = NULL;
-      }
-      info_ptr->valid &= ~PNG_INFO_IDAT;
-   }
-#endif
-
-   if (num != -1)
-      mask &= ~PNG_FREE_MUL;
-
-   info_ptr->free_me &= ~mask;
-}
-
-/* This is an internal routine to free any memory that the info struct is
- * pointing to before re-using it or freeing the struct itself.  Recall
- * that png_free() checks for NULL pointers for us.
- */
-void /* PRIVATE */
-png_info_destroy(png_structp png_ptr, png_infop info_ptr)
-{
-   png_debug(1, "in png_info_destroy");
-
-   png_free_data(png_ptr, info_ptr, PNG_FREE_ALL, -1);
-
-#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
-   if (png_ptr->num_chunk_list)
-   {
-      png_free(png_ptr, png_ptr->chunk_list);
-      png_ptr->chunk_list = NULL;
-      png_ptr->num_chunk_list = 0;
-   }
-#endif
-
-   png_info_init_3(&info_ptr, png_sizeof(png_info));
-}
-#endif /* defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED) */
-
-/* This function returns a pointer to the io_ptr associated with the user
- * functions.  The application should free any memory associated with this
- * pointer before png_write_destroy() or png_read_destroy() are called.
- */
-png_voidp PNGAPI
-png_get_io_ptr(png_structp png_ptr)
-{
-   if (png_ptr == NULL)
-      return (NULL);
-
-   return (png_ptr->io_ptr);
-}
-
-#if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED)
-#  ifdef PNG_STDIO_SUPPORTED
-/* Initialize the default input/output functions for the PNG file.  If you
- * use your own read or write routines, you can call either png_set_read_fn()
- * or png_set_write_fn() instead of png_init_io().  If you have defined
- * PNG_NO_STDIO, you must use a function of your own because "FILE *" isn't
- * necessarily available.
- */
-void PNGAPI
-png_init_io(png_structp png_ptr, png_FILE_p fp)
-{
-   png_debug(1, "in png_init_io");
-
-   if (png_ptr == NULL)
-      return;
-
-   png_ptr->io_ptr = (png_voidp)fp;
-}
-#  endif
-
-#  ifdef PNG_TIME_RFC1123_SUPPORTED
-/* Convert the supplied time into an RFC 1123 string suitable for use in
- * a "Creation Time" or other text-based time string.
- */
-png_const_charp PNGAPI
-png_convert_to_rfc1123(png_structp png_ptr, png_const_timep ptime)
-{
-   static PNG_CONST char short_months[12][4] =
-        {"Jan", "Feb", "Mar", "Apr", "May", "Jun",
-         "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"};
-
-   if (png_ptr == NULL)
-      return (NULL);
-
-   if (png_ptr->time_buffer == NULL)
-   {
-      png_ptr->time_buffer = (png_charp)png_malloc(png_ptr, (png_uint_32)(29*
-         png_sizeof(char)));
-   }
-
-#    ifdef USE_FAR_KEYWORD
-   {
-      char near_time_buf[29];
-      png_snprintf6(near_time_buf, 29, "%d %s %d %02d:%02d:%02d +0000",
-          ptime->day % 32, short_months[(ptime->month - 1) % 12],
-          ptime->year, ptime->hour % 24, ptime->minute % 60,
-          ptime->second % 61);
-      png_memcpy(png_ptr->time_buffer, near_time_buf,
-          29*png_sizeof(char));
-   }
-#    else
-   png_snprintf6(png_ptr->time_buffer, 29, "%d %s %d %02d:%02d:%02d +0000",
-       ptime->day % 32, short_months[(ptime->month - 1) % 12],
-       ptime->year, ptime->hour % 24, ptime->minute % 60,
-       ptime->second % 61);
-#    endif
-   return png_ptr->time_buffer;
-}
-#  endif /* PNG_TIME_RFC1123_SUPPORTED */
-
-#endif /* defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED) */
-
-png_const_charp PNGAPI
-png_get_copyright(png_const_structp png_ptr)
-{
-   PNG_UNUSED(png_ptr)  /* Silence compiler warning about unused png_ptr */
-#ifdef PNG_STRING_COPYRIGHT
-   return PNG_STRING_COPYRIGHT
-#else
-#  ifdef __STDC__
-   return PNG_STRING_NEWLINE \
-     "libpng version 1.5.1 - February 3, 2011" PNG_STRING_NEWLINE \
-     "Copyright (c) 1998-2011 Glenn Randers-Pehrson" PNG_STRING_NEWLINE \
-     "Copyright (c) 1996-1997 Andreas Dilger" PNG_STRING_NEWLINE \
-     "Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc." \
-     PNG_STRING_NEWLINE;
-#  else
-      return "libpng version 1.5.1 - February 3, 2011\
-      Copyright (c) 1998-2011 Glenn Randers-Pehrson\
-      Copyright (c) 1996-1997 Andreas Dilger\
-      Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.";
-#  endif
-#endif
-}
-
-/* The following return the library version as a short string in the
- * format 1.0.0 through 99.99.99zz.  To get the version of *.h files
- * used with your application, print out PNG_LIBPNG_VER_STRING, which
- * is defined in png.h.
- * Note: now there is no difference between png_get_libpng_ver() and
- * png_get_header_ver().  Due to the version_nn_nn_nn typedef guard,
- * it is guaranteed that png.c uses the correct version of png.h.
- */
-png_const_charp PNGAPI
-png_get_libpng_ver(png_const_structp png_ptr)
-{
-   /* Version of *.c files used when building libpng */
-   return png_get_header_ver(png_ptr);
-}
-
-png_const_charp PNGAPI
-png_get_header_ver(png_const_structp png_ptr)
-{
-   /* Version of *.h files used when building libpng */
-   PNG_UNUSED(png_ptr)  /* Silence compiler warning about unused png_ptr */
-   return PNG_LIBPNG_VER_STRING;
-}
-
-png_const_charp PNGAPI
-png_get_header_version(png_const_structp png_ptr)
-{
-   /* Returns longer string containing both version and date */
-   PNG_UNUSED(png_ptr)  /* Silence compiler warning about unused png_ptr */
-#ifdef __STDC__
-   return PNG_HEADER_VERSION_STRING
-#  ifndef PNG_READ_SUPPORTED
-   "     (NO READ SUPPORT)"
-#  endif
-   PNG_STRING_NEWLINE;
-#else
-   return PNG_HEADER_VERSION_STRING;
-#endif
-}
-
-#if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED)
-#  ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
-int PNGAPI
-png_handle_as_unknown(png_structp png_ptr, png_const_bytep chunk_name)
-{
-   /* Check chunk_name and return "keep" value if it's on the list, else 0 */
-   int i;
-   png_bytep p;
-   if (png_ptr == NULL || chunk_name == NULL || png_ptr->num_chunk_list<=0)
-      return 0;
-
-   p = png_ptr->chunk_list + png_ptr->num_chunk_list*5 - 5;
-   for (i = png_ptr->num_chunk_list; i; i--, p -= 5)
-      if (!png_memcmp(chunk_name, p, 4))
-        return ((int)*(p + 4));
-   return 0;
-}
-#  endif
-#endif /* defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED) */
-
-#ifdef PNG_READ_SUPPORTED
-/* This function, added to libpng-1.0.6g, is untested. */
-int PNGAPI
-png_reset_zstream(png_structp png_ptr)
-{
-   if (png_ptr == NULL)
-      return Z_STREAM_ERROR;
-
-   return (inflateReset(&png_ptr->zstream));
-}
-#endif /* PNG_READ_SUPPORTED */
-
-/* This function was added to libpng-1.0.7 */
-png_uint_32 PNGAPI
-png_access_version_number(void)
-{
-   /* Version of *.c files used when building libpng */
-   return((png_uint_32)PNG_LIBPNG_VER);
-}
-
-
-
-#if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED)
-#  ifdef PNG_SIZE_T
-/* Added at libpng version 1.2.6 */
-   PNG_EXTERN png_size_t PNGAPI png_convert_size PNGARG((size_t size));
-png_size_t PNGAPI
-png_convert_size(size_t size)
-{
-   if (size > (png_size_t)-1)
-      PNG_ABORT();  /* We haven't got access to png_ptr, so no png_error() */
-
-   return ((png_size_t)size);
-}
-#  endif /* PNG_SIZE_T */
-
-/* Added at libpng version 1.2.34 and 1.4.0 (moved from pngset.c) */
-#  ifdef PNG_CHECK_cHRM_SUPPORTED
-
-int /* PRIVATE */
-png_check_cHRM_fixed(png_structp png_ptr,
-   png_fixed_point white_x, png_fixed_point white_y, png_fixed_point red_x,
-   png_fixed_point red_y, png_fixed_point green_x, png_fixed_point green_y,
-   png_fixed_point blue_x, png_fixed_point blue_y)
-{
-   int ret = 1;
-   unsigned long xy_hi,xy_lo,yx_hi,yx_lo;
-
-   png_debug(1, "in function png_check_cHRM_fixed");
-
-   if (png_ptr == NULL)
-      return 0;
-
-   if (white_x < 0 || white_y <= 0 ||
-         red_x < 0 ||   red_y <  0 ||
-       green_x < 0 || green_y <  0 ||
-        blue_x < 0 ||  blue_y <  0)
-   {
-      png_warning(png_ptr,
-        "Ignoring attempt to set negative chromaticity value");
-      ret = 0;
-   }
-   if (white_x > (png_fixed_point)PNG_UINT_31_MAX ||
-       white_y > (png_fixed_point)PNG_UINT_31_MAX ||
-         red_x > (png_fixed_point)PNG_UINT_31_MAX ||
-         red_y > (png_fixed_point)PNG_UINT_31_MAX ||
-       green_x > (png_fixed_point)PNG_UINT_31_MAX ||
-       green_y > (png_fixed_point)PNG_UINT_31_MAX ||
-        blue_x > (png_fixed_point)PNG_UINT_31_MAX ||
-        blue_y > (png_fixed_point)PNG_UINT_31_MAX )
-   {
-      png_warning(png_ptr,
-        "Ignoring attempt to set chromaticity value exceeding 21474.83");
-      ret = 0;
-   }
-   if (white_x > 100000L - white_y)
-   {
-      png_warning(png_ptr, "Invalid cHRM white point");
-      ret = 0;
-   }
-
-   if (red_x > 100000L - red_y)
-   {
-      png_warning(png_ptr, "Invalid cHRM red point");
-      ret = 0;
-   }
-
-   if (green_x > 100000L - green_y)
-   {
-      png_warning(png_ptr, "Invalid cHRM green point");
-      ret = 0;
-   }
-
-   if (blue_x > 100000L - blue_y)
-   {
-      png_warning(png_ptr, "Invalid cHRM blue point");
-      ret = 0;
-   }
-
-   png_64bit_product(green_x - red_x, blue_y - red_y, &xy_hi, &xy_lo);
-   png_64bit_product(green_y - red_y, blue_x - red_x, &yx_hi, &yx_lo);
-
-   if (xy_hi == yx_hi && xy_lo == yx_lo)
-   {
-      png_warning(png_ptr,
-         "Ignoring attempt to set cHRM RGB triangle with zero area");
-      ret = 0;
-   }
-
-   return ret;
-}
-#  endif /* PNG_CHECK_cHRM_SUPPORTED */
-
-void /* PRIVATE */
-png_check_IHDR(png_structp png_ptr,
-   png_uint_32 width, png_uint_32 height, int bit_depth,
-   int color_type, int interlace_type, int compression_type,
-   int filter_type)
-{
-   int error = 0;
-
-   /* Check for width and height valid values */
-   if (width == 0)
-   {
-      png_warning(png_ptr, "Image width is zero in IHDR");
-      error = 1;
-   }
-
-   if (height == 0)
-   {
-      png_warning(png_ptr, "Image height is zero in IHDR");
-      error = 1;
-   }
-
-#  ifdef PNG_SET_USER_LIMITS_SUPPORTED
-   if (width > png_ptr->user_width_max || width > PNG_USER_WIDTH_MAX)
-
-#  else
-   if (width > PNG_USER_WIDTH_MAX)
-#  endif
-   {
-      png_warning(png_ptr, "Image width exceeds user limit in IHDR");
-      error = 1;
-   }
-
-#  ifdef PNG_SET_USER_LIMITS_SUPPORTED
-   if (height > png_ptr->user_height_max || height > PNG_USER_HEIGHT_MAX)
-#  else
-   if (height > PNG_USER_HEIGHT_MAX)
-#  endif
-   {
-      png_warning(png_ptr, "Image height exceeds user limit in IHDR");
-      error = 1;
-   }
-
-   if (width > PNG_UINT_31_MAX)
-   {
-      png_warning(png_ptr, "Invalid image width in IHDR");
-      error = 1;
-   }
-
-   if (height > PNG_UINT_31_MAX)
-   {
-      png_warning(png_ptr, "Invalid image height in IHDR");
-      error = 1;
-   }
-
-   if (width > (PNG_UINT_32_MAX
-                 >> 3)      /* 8-byte RGBA pixels */
-                 - 48       /* bigrowbuf hack */
-                 - 1        /* filter byte */
-                 - 7*8      /* rounding of width to multiple of 8 pixels */
-                 - 8)       /* extra max_pixel_depth pad */
-      png_warning(png_ptr, "Width is too large for libpng to process pixels");
-
-   /* Check other values */
-   if (bit_depth != 1 && bit_depth != 2 && bit_depth != 4 &&
-       bit_depth != 8 && bit_depth != 16)
-   {
-      png_warning(png_ptr, "Invalid bit depth in IHDR");
-      error = 1;
-   }
-
-   if (color_type < 0 || color_type == 1 ||
-       color_type == 5 || color_type > 6)
-   {
-      png_warning(png_ptr, "Invalid color type in IHDR");
-      error = 1;
-   }
-
-   if (((color_type == PNG_COLOR_TYPE_PALETTE) && bit_depth > 8) ||
-       ((color_type == PNG_COLOR_TYPE_RGB ||
-         color_type == PNG_COLOR_TYPE_GRAY_ALPHA ||
-         color_type == PNG_COLOR_TYPE_RGB_ALPHA) && bit_depth < 8))
-   {
-      png_warning(png_ptr, "Invalid color type/bit depth combination in IHDR");
-      error = 1;
-   }
-
-   if (interlace_type >= PNG_INTERLACE_LAST)
-   {
-      png_warning(png_ptr, "Unknown interlace method in IHDR");
-      error = 1;
-   }
-
-   if (compression_type != PNG_COMPRESSION_TYPE_BASE)
-   {
-      png_warning(png_ptr, "Unknown compression method in IHDR");
-      error = 1;
-   }
-
-#  ifdef PNG_MNG_FEATURES_SUPPORTED
-   /* Accept filter_method 64 (intrapixel differencing) only if
-    * 1. Libpng was compiled with PNG_MNG_FEATURES_SUPPORTED and
-    * 2. Libpng did not read a PNG signature (this filter_method is only
-    *    used in PNG datastreams that are embedded in MNG datastreams) and
-    * 3. The application called png_permit_mng_features with a mask that
-    *    included PNG_FLAG_MNG_FILTER_64 and
-    * 4. The filter_method is 64 and
-    * 5. The color_type is RGB or RGBA
-    */
-   if ((png_ptr->mode & PNG_HAVE_PNG_SIGNATURE) &&
-       png_ptr->mng_features_permitted)
-      png_warning(png_ptr, "MNG features are not allowed in a PNG datastream");
-
-   if (filter_type != PNG_FILTER_TYPE_BASE)
-   {
-      if (!((png_ptr->mng_features_permitted & PNG_FLAG_MNG_FILTER_64) &&
-          (filter_type == PNG_INTRAPIXEL_DIFFERENCING) &&
-          ((png_ptr->mode & PNG_HAVE_PNG_SIGNATURE) == 0) &&
-          (color_type == PNG_COLOR_TYPE_RGB ||
-          color_type == PNG_COLOR_TYPE_RGB_ALPHA)))
-      {
-         png_warning(png_ptr, "Unknown filter method in IHDR");
-         error = 1;
-      }
-
-      if (png_ptr->mode & PNG_HAVE_PNG_SIGNATURE)
-      {
-         png_warning(png_ptr, "Invalid filter method in IHDR");
-         error = 1;
-      }
-   }
-
-#  else
-   if (filter_type != PNG_FILTER_TYPE_BASE)
-   {
-      png_warning(png_ptr, "Unknown filter method in IHDR");
-      error = 1;
-   }
-#  endif
-
-   if (error == 1)
-      png_error(png_ptr, "Invalid IHDR data");
-}
-
-#if defined(PNG_sCAL_SUPPORTED) || defined(PNG_pCAL_SUPPORTED)
-/* ASCII to fp functions */
-/* Check an ASCII formated floating point value, see the more detailed
- * comments in pngpriv.h
- */
-/* The following is used internally to preserve the 'valid' flag */
-#define png_fp_add(state, flags) ((state) |= (flags))
-#define png_fp_set(state, value)\
-   ((state) = (value) | ((state) & PNG_FP_WAS_VALID))
-
-/* Internal type codes: bits above the base state! */
-#define PNG_FP_SIGN   0  /* [+-] */
-#define PNG_FP_DOT    4  /* . */
-#define PNG_FP_DIGIT  8  /* [0123456789] */
-#define PNG_FP_E     12  /* [Ee] */
-
-int /* PRIVATE */
-png_check_fp_number(png_const_charp string, png_size_t size, int *statep,
-   png_size_tp whereami)
-{
-   int state = *statep;
-   png_size_t i = *whereami;
-
-   while (i < size)
-   {
-      int type;
-      /* First find the type of the next character */
-      {
-         char ch = string[i];
-
-         if (ch >= 48 && ch <= 57)
-            type = PNG_FP_DIGIT;
-
-         else switch (ch)
-         {
-         case 43: case 45:  type = PNG_FP_SIGN;  break;
-         case 46:           type = PNG_FP_DOT;   break;
-         case 69: case 101: type = PNG_FP_E;     break;
-         default:           goto PNG_FP_End;
-         }
-      }
-
-      /* Now deal with this type according to the current
-       * state, the type is arranged to not overlap the
-       * bits of the PNG_FP_STATE.
-       */
-      switch ((state & PNG_FP_STATE) + type)
-      {
-      case PNG_FP_INTEGER + PNG_FP_SIGN:
-         if (state & PNG_FP_SAW_ANY)
-            goto PNG_FP_End; /* not a part of the number */
-
-         png_fp_add(state, PNG_FP_SAW_SIGN);
-         break;
-
-      case PNG_FP_INTEGER + PNG_FP_DOT:
-         /* Ok as trailer, ok as lead of fraction. */
-         if (state & PNG_FP_SAW_DOT) /* two dots */
-            goto PNG_FP_End;
-
-         else if (state & PNG_FP_SAW_DIGIT) /* trailing dot? */
-            png_fp_add(state, PNG_FP_SAW_DOT);
-
-         else
-            png_fp_set(state, PNG_FP_FRACTION | PNG_FP_SAW_DOT);
-
-         break;
-
-      case PNG_FP_INTEGER + PNG_FP_DIGIT:
-         if (state & PNG_FP_SAW_DOT) /* delayed fraction */
-            png_fp_set(state, PNG_FP_FRACTION | PNG_FP_SAW_DOT);
-
-         png_fp_add(state, PNG_FP_SAW_DIGIT + PNG_FP_WAS_VALID);
-
-         break;
-      case PNG_FP_INTEGER + PNG_FP_E:
-         if ((state & PNG_FP_SAW_DIGIT) == 0)
-            goto PNG_FP_End;
-
-         png_fp_set(state, PNG_FP_EXPONENT);
-
-         break;
-
-   /* case PNG_FP_FRACTION + PNG_FP_SIGN:
-         goto PNG_FP_End; ** no sign in exponent */
-
-   /* case PNG_FP_FRACTION + PNG_FP_DOT:
-         goto PNG_FP_End; ** Because SAW_DOT is always set */
-
-      case PNG_FP_FRACTION + PNG_FP_DIGIT:
-         png_fp_add(state, PNG_FP_SAW_DIGIT + PNG_FP_WAS_VALID);
-         break;
-
-      case PNG_FP_FRACTION + PNG_FP_E:
-         /* This is correct because the trailing '.' on an
-          * integer is handled above - so we can only get here
-          * with the sequence ".E" (with no preceding digits).
-          */
-         if ((state & PNG_FP_SAW_DIGIT) == 0)
-            goto PNG_FP_End;
-
-         png_fp_set(state, PNG_FP_EXPONENT);
-
-         break;
-
-      case PNG_FP_EXPONENT + PNG_FP_SIGN:
-         if (state & PNG_FP_SAW_ANY)
-            goto PNG_FP_End; /* not a part of the number */
-
-         png_fp_add(state, PNG_FP_SAW_SIGN);
-
-         break;
-
-   /* case PNG_FP_EXPONENT + PNG_FP_DOT:
-         goto PNG_FP_End; */
-
-      case PNG_FP_EXPONENT + PNG_FP_DIGIT:
-         png_fp_add(state, PNG_FP_SAW_DIGIT + PNG_FP_WAS_VALID);
-
-         break;
-
-   /* case PNG_FP_EXPONEXT + PNG_FP_E:
-         goto PNG_FP_End; */
-
-      default: goto PNG_FP_End; /* I.e. break 2 */
-      }
-
-      /* The character seems ok, continue. */
-      ++i;
-   }
-
-PNG_FP_End:
-   /* Here at the end, update the state and return the correct
-    * return code.
-    */
-   *statep = state;
-   *whereami = i;
-
-   return (state & PNG_FP_SAW_DIGIT) != 0;
-}
-
-
-/* The same but for a complete string. */
-int
-png_check_fp_string(png_const_charp string, png_size_t size)
-{
-   int        state=0;
-   png_size_t char_index=0;
-
-   return png_check_fp_number(string, size, &state, &char_index) &&
-      (char_index == size || string[char_index] == 0);
-}
-#endif /* pCAL or sCAL */
-
-#ifdef PNG_READ_sCAL_SUPPORTED
-#  ifdef PNG_FLOATING_POINT_SUPPORTED
-/* Utility used below - a simple accurate power of ten from an integral
- * exponent.
- */
-static double
-png_pow10(int power)
-{
-   int recip = 0;
-   double d = 1;
-
-   /* Handle negative exponent with a reciprocal at the end because
-    * 10 is exact whereas .1 is inexact in base 2
-    */
-   if (power < 0)
-   {
-      if (power < DBL_MIN_10_EXP) return 0;
-      recip = 1, power = -power;
-   }
-
-   if (power > 0)
-   {
-      /* Decompose power bitwise. */
-      double mult = 10;
-      do
-      {
-         if (power & 1) d *= mult;
-         mult *= mult;
-         power >>= 1;
-      }
-      while (power > 0);
-
-      if (recip) d = 1/d;
-   }
-   /* else power is 0 and d is 1 */
-
-   return d;
-}
-
-/* Function to format a floating point value in ASCII with a given
- * precision.
- */
-void /* PRIVATE */
-png_ascii_from_fp(png_structp png_ptr, png_charp ascii, png_size_t size,
-    double fp, unsigned int precision)
-{
-   /* We use standard functions from math.h, but not printf because
-    * that would require stdio.  The caller must supply a buffer of
-    * sufficient size or we will png_error.  The tests on size and
-    * the space in ascii[] consumed are indicated below.
-    */
-   if (precision < 1)
-      precision = DBL_DIG;
-
-   /* Enforce the limit of the implementation precision too. */
-   if (precision > DBL_DIG+1)
-      precision = DBL_DIG+1;
-
-   /* Basic sanity checks */
-   if (size >= precision+5) /* See the requirements below. */
-   {
-      if (fp < 0)
-      {
-         fp = -fp;
-         *ascii++ = 45; /* '-'  PLUS 1 TOTAL 1*/
-         --size;
-      }
-
-      if (fp >= DBL_MIN && fp <= DBL_MAX)
-      {
-         int exp_b10;       /* A base 10 exponent */
-         double base;   /* 10^exp_b10 */
-
-         /* First extract a base 10 exponent of the number,
-          * the calculation below rounds down when converting
-          * from base 2 to base 10 (multiply by log10(2) -
-          * 0.3010, but 77/256 is 0.3008, so exp_b10 needs to
-          * be increased.  Note that the arithmetic shift
-          * performs a floor() unlike C arithmetic - using a
-          * C multiply would break the following for negative
-          * exponents.
-          */
-         (void)frexp(fp, &exp_b10); /* exponent to base 2 */
-
-         exp_b10 = (exp_b10 * 77) >> 8; /* <= exponent to base 10 */
-
-         /* Avoid underflow here. */
-         base = png_pow10(exp_b10); /* May underflow */
-
-         while (base < DBL_MIN || base < fp)
-         {
-            /* And this may overflow. */
-            double test = png_pow10(exp_b10+1);
-
-            if (test <= DBL_MAX)
-               ++exp_b10, base = test;
-
-            else
-               break;
-         }
-
-         /* Normalize fp and correct exp_b10, after this fp is in the
-          * range [.1,1) and exp_b10 is both the exponent and the digit
-          * *before* which the decimal point should be inserted
-          * (starting with 0 for the first digit).  Note that this
-          * works even if 10^exp_b10 is out of range because of the
-          * test on DBL_MAX above.
-          */
-         fp /= base;
-         while (fp >= 1) fp /= 10, ++exp_b10;
-
-         /* Because of the code above fp may, at this point, be
-          * less than .1, this is ok because the code below can
-          * handle the leading zeros this generates, so no attempt
-          * is made to correct that here.
-          */
-
-         {
-            int czero, clead, cdigits;
-            char exponent[10];
-
-            /* Allow up to two leading zeros - this will not lengthen
-             * the number compared to using E-n.
-             */
-            if (exp_b10 < 0 && exp_b10 > -3) /* PLUS 3 TOTAL 4 */
-            {
-               czero = -exp_b10; /* PLUS 2 digits: TOTAL 3 */
-               exp_b10 = 0;      /* Dot added below before first output. */
-            }
-            else
-               czero = 0;    /* No zeros to add */
-
-            /* Generate the digit list, stripping trailing zeros and
-             * inserting a '.' before a digit if the exponent is 0.
-             */
-            clead = czero; /* Count of leading zeros */
-            cdigits = 0;   /* Count of digits in list. */
-
-            do
-            {
-               double d;
-
-               fp *= 10;
-               /* Use modf here, not floor and subtract, so that
-                * the separation is done in one step.  At the end
-                * of the loop don't break the number into parts so
-                * that the final digit is rounded.
-                */
-               if (cdigits+czero-clead+1 < (int)precision)
-                  fp = modf(fp, &d);
-
-               else
-               {
-                  d = floor(fp + .5);
-
-                  if (d > 9)
-                  {
-                     /* Rounding up to 10, handle that here. */
-                     if (czero > 0)
-                     {
-                        --czero, d = 1;
-                        if (cdigits == 0) --clead;
-                     }
-                     else
-                     {
-                        while (cdigits > 0 && d > 9)
-                        {
-                           int ch = *--ascii;
-
-                           if (exp_b10 != (-1))
-                              ++exp_b10;
-
-                           else if (ch == 46)
-                           {
-                              ch = *--ascii, ++size;
-                              /* Advance exp_b10 to '1', so that the
-                               * decimal point happens after the
-                               * previous digit.
-                               */
-                              exp_b10 = 1;
-                           }
-
-                           --cdigits;
-                           d = ch - 47;  /* I.e. 1+(ch-48) */
-                        }
-
-                        /* Did we reach the beginning? If so adjust the
-                         * exponent but take into account the leading
-                         * decimal point.
-                         */
-                        if (d > 9)  /* cdigits == 0 */
-                        {
-                           if (exp_b10 == (-1))
-                           {
-                              /* Leading decimal point (plus zeros?), if
-                               * we lose the decimal point here it must
-                               * be reentered below.
-                               */
-                              int ch = *--ascii;
-
-                              if (ch == 46)
-                                 ++size, exp_b10 = 1;
-
-                              /* Else lost a leading zero, so 'exp_b10' is
-                               * still ok at (-1)
-                               */
-                           }
-                           else
-                              ++exp_b10;
-
-                           /* In all cases we output a '1' */
-                           d = 1;
-                        }
-                     }
-                  }
-                  fp = 0; /* Guarantees termination below. */
-               }
-
-               if (d == 0)
-               {
-                  ++czero;
-                  if (cdigits == 0) ++clead;
-               }
-               else
-               {
-                  /* Included embedded zeros in the digit count. */
-                  cdigits += czero - clead;
-                  clead = 0;
-
-                  while (czero > 0)
-                  {
-                     /* exp_b10 == (-1) means we just output the decimal
-                      * place - after the DP don't adjust 'exp_b10' any
-                      * more!
-                      */
-                     if (exp_b10 != (-1))
-                     {
-                        if (exp_b10 == 0) *ascii++ = 46, --size;
-                        /* PLUS 1: TOTAL 4 */
-                        --exp_b10;
-                     }
-                     *ascii++ = 48, --czero;
-                  }
-
-                  if (exp_b10 != (-1))
-                  {
-                     if (exp_b10 == 0) *ascii++ = 46, --size; /* counted
-                                                                 above */
-                     --exp_b10;
-                  }
-                  *ascii++ = (char)(48 + (int)d), ++cdigits;
-               }
-            }
-            while (cdigits+czero-clead < (int)precision && fp > DBL_MIN);
-
-            /* The total output count (max) is now 4+precision */
-
-            /* Check for an exponent, if we don't need one we are
-             * done and just need to terminate the string.  At
-             * this point exp_b10==(-1) is effectively if flag - it got
-             * to '-1' because of the decrement after outputing
-             * the decimal point above (the exponent required is
-             * *not* -1!)
-             */
-            if (exp_b10 >= (-1) && exp_b10 <= 2)
-            {
-               /* The following only happens if we didn't output the
-                * leading zeros above for negative exponent, so this
-                * doest add to the digit requirement.  Note that the
-                * two zeros here can only be output if the two leading
-                * zeros were *not* output, so this doesn't increase
-                * the output count.
-                */
-               while (--exp_b10 >= 0) *ascii++ = 48;
-
-               *ascii = 0;
-
-               /* Total buffer requirement (including the '\0') is
-                * 5+precision - see check at the start.
-                */
-               return;
-            }
-
-            /* Here if an exponent is required, adjust size for
-             * the digits we output but did not count.  The total
-             * digit output here so far is at most 1+precision - no
-             * decimal point and no leading or trailing zeros have
-             * been output.
-             */
-            size -= cdigits;
-
-            *ascii++ = 69, --size;    /* 'E': PLUS 1 TOTAL 2+precision*/
-            if (exp_b10 < 0)
-            {
-               *ascii++ = 45, --size; /* '-': PLUS 1 TOTAL 3+precision */
-               exp_b10 = -exp_b10;
-            }
-
-            cdigits = 0;
-
-            while (exp_b10 > 0)
-            {
-               exponent[cdigits++] = (char)(48 + exp_b10 % 10);
-               exp_b10 /= 10;
-            }
-
-            /* Need another size check here for the exponent digits, so
-             * this need not be considered above.
-             */
-            if ((int)size > cdigits)
-            {
-               while (cdigits > 0) *ascii++ = exponent[--cdigits];
-
-               *ascii = 0;
-
-               return;
-            }
-         }
-      }
-      else if (!(fp >= DBL_MIN))
-      {
-         *ascii++ = 48; /* '0' */
-         *ascii = 0;
-         return;
-      }
-      else
-      {
-         *ascii++ = 105; /* 'i' */
-         *ascii++ = 110; /* 'n' */
-         *ascii++ = 102; /* 'f' */
-         *ascii = 0;
-         return;
-      }
-   }
-
-   /* Here on buffer too small. */
-   png_error(png_ptr, "ASCII conversion buffer too small");
-}
-
-#  endif /* FLOATING_POINT */
-
-#  ifdef PNG_FIXED_POINT_SUPPORTED
-/* Function to format a fixed point value in ASCII.
- */
-void /* PRIVATE */
-png_ascii_from_fixed(png_structp png_ptr, png_charp ascii, png_size_t size,
-    png_fixed_point fp)
-{
-   /* Require space for 10 decimal digits, a decimal point, a minus sign and a
-    * trailing \0, 13 characters:
-    */
-   if (size > 12)
-   {
-      png_uint_32 num;
-
-      /* Avoid overflow here on the minimum integer. */
-      if (fp < 0)
-         *ascii++ = 45, --size, num = -fp;
-      else
-         num = fp;
-
-      if (num <= 0x80000000U) /* else overflowed */
-      {
-         unsigned int ndigits = 0, first = 16/*flag value*/;
-         char digits[10];
-
-         while (num)
-         {
-            /* Split the low digit off num: */
-            unsigned int tmp = num/10;
-            num -= tmp*10;
-            digits[ndigits++] = (char)(48 + num);
-            /* Record the first non-zero digit, note that this is a number
-             * starting at 1, it's not actually the array index.
-             */
-            if (first == 16 && num > 0)
-               first = ndigits;
-            num = tmp;
-         }
-
-         if (ndigits > 0)
-         {
-            while (ndigits > 5) *ascii++ = digits[--ndigits];
-            /* The remaining digits are fractional digits, ndigits is '5' or
-             * smaller at this point.  It is certainly not zero.  Check for a
-             * non-zero fractional digit:
-             */
-            if (first <= 5)
-            {
-               unsigned int i;
-               *ascii++ = 46; /* decimal point */
-               /* ndigits may be <5 for small numbers, output leading zeros
-                * then ndigits digits to first:
-                */
-               i = 5;
-               while (ndigits < i) *ascii++ = 48, --i;
-               while (ndigits >= first) *ascii++ = digits[--ndigits];
-               /* Don't output the trailing zeros! */
-            }
-         }
-         else
-            *ascii++ = 48;
-
-         /* And null terminate the string: */
-         *ascii = 0;
-         return;
-      }
-   }
-
-   /* Here on buffer too small. */
-   png_error(png_ptr, "ASCII conversion buffer too small");
-}
-#   endif /* FIXED_POINT */
-#endif /* READ_SCAL */
-
-#if defined(PNG_FLOATING_POINT_SUPPORTED) && \
-   !defined(PNG_FIXED_POINT_MACRO_SUPPORTED)
-png_fixed_point
-png_fixed(png_structp png_ptr, double fp, png_const_charp text)
-{
-   double r = floor(100000 * fp + .5);
-
-   if (r > 2147483647. || r < -2147483648.)
-      png_fixed_error(png_ptr, text);
-
-   return (png_fixed_point)r;
-}
-#endif
-
-#if defined(PNG_READ_GAMMA_SUPPORTED) || \
-    defined(PNG_INCH_CONVERSIONS_SUPPORTED) || defined(PNG__READ_pHYs_SUPPORTED)
-/* muldiv functions */
-/* This API takes signed arguments and rounds the result to the nearest
- * integer (or, for a fixed point number - the standard argument - to
- * the nearest .00001).  Overflow and divide by zero are signalled in
- * the result, a boolean - true on success, false on overflow.
- */
-int
-png_muldiv(png_fixed_point_p res, png_fixed_point a, png_int_32 times,
-    png_int_32 divisor)
-{
-   /* Return a * times / divisor, rounded. */
-   if (divisor != 0)
-   {
-      if (a == 0 || times == 0)
-      {
-         *res = 0;
-         return 1;
-      }
-      else
-      {
-#ifdef PNG_FLOATING_ARITHMETIC_SUPPORTED
-         double r = a;
-         r *= times;
-         r /= divisor;
-         r = floor(r+.5);
-
-         /* A png_fixed_point is a 32 bit integer. */
-         if (r <= 2147483647. && r >= -2147483648.)
-         {
-            *res = (png_fixed_point)r;
-            return 1;
-         }
-#else
-         int negative = 0;
-         png_uint_32 A, T, D;
-         png_uint_32 s16, s32, s00;
-
-         if (a < 0)
-            negative = 1, A = -a;
-         else
-            A = a;
-
-         if (times < 0)
-            negative = !negative, T = -times;
-         else
-            T = times;
-
-         if (divisor < 0)
-            negative = !negative, D = -divisor;
-         else
-            D = divisor;
-
-         /* Following can't overflow because the arguments only
-          * have 31 bits each, however the result may be 32 bits.
-          */
-         s16 = (A >> 16) * (T & 0xffff) +
-                           (A & 0xffff) * (T >> 16);
-         /* Can't overflow because the a*times bit is only 30
-          * bits at most.
-          */
-         s32 = (A >> 16) * (T >> 16) + (s16 >> 16);
-         s00 = (A & 0xffff) * (T & 0xffff);
-
-         s16 = (s16 & 0xffff) << 16;
-         s00 += s16;
-
-         if (s00 < s16)
-            ++s32; /* carry */
-
-         if (s32 < D) /* else overflow */
-         {
-            /* s32.s00 is now the 64 bit product, do a standard
-             * division, we know that s32 < D, so the maximum
-             * required shift is 31.
-             */
-            int bitshift = 32;
-            png_fixed_point result = 0; /* NOTE: signed */
-
-            while (--bitshift >= 0)
-            {
-               png_uint_32 d32, d00;
-
-               if (bitshift > 0)
-                  d32 = D >> (32-bitshift), d00 = D << bitshift;
-
-               else
-                  d32 = 0, d00 = D;
-
-               if (s32 > d32)
-               {
-                  if (s00 < d00) --s32; /* carry */
-                  s32 -= d32, s00 -= d00, result += 1<<bitshift;
-               }
-
-               else
-                  if (s32 == d32 && s00 >= d00)
-                     s32 = 0, s00 -= d00, result += 1<<bitshift;
-            }
-
-            /* Handle the rounding. */
-            if (s00 >= (D >> 1))
-               ++result;
-
-            if (negative)
-               result = -result;
-
-            /* Check for overflow. */
-            if ((negative && result <= 0) || (!negative && result >= 0))
-            {
-               *res = result;
-               return 1;
-            }
-         }
-#endif
-      }
-   }
-
-   return 0;
-}
-#endif /* READ_GAMMA || INCH_CONVERSIONS */
-
-#if defined(PNG_READ_GAMMA_SUPPORTED) || defined(PNG_INCH_CONVERSIONS_SUPPORTED)
-/* The following is for when the caller doesn't much care about the
- * result.
- */
-png_fixed_point
-png_muldiv_warn(png_structp png_ptr, png_fixed_point a, png_int_32 times,
-    png_int_32 divisor)
-{
-   png_fixed_point result;
-
-   if (png_muldiv(&result, a, times, divisor))
-      return result;
-
-   png_warning(png_ptr, "fixed point overflow ignored");
-   return 0;
-}
-#endif
-
-#ifdef PNG_READ_GAMMA_SUPPORTED /* more fixed point functions for gammma */
-/* Calculate a reciprocal, return 0 on div-by-zero or overflow. */
-png_fixed_point
-png_reciprocal(png_fixed_point a)
-{
-#ifdef PNG_FLOATING_ARITHMETIC_SUPPORTED
-   double r = floor(1E10/a+.5);
-
-   if (r <= 2147483647. && r >= -2147483648.)
-      return (png_fixed_point)r;
-#else
-   png_fixed_point res;
-
-   if (png_muldiv(&res, 100000, 100000, a))
-      return res;
-#endif
-
-   return 0; /* error/overflow */
-}
-
-/* A local convenience routine. */
-static png_fixed_point
-png_product2(png_fixed_point a, png_fixed_point b)
-{
-   /* The required result is 1/a * 1/b; the following preserves accuracy. */
-#ifdef PNG_FLOATING_ARITHMETIC_SUPPORTED
-   double r = a * 1E-5;
-   r *= b;
-   r = floor(r+.5);
-
-   if (r <= 2147483647. && r >= -2147483648.)
-      return (png_fixed_point)r;
-#else
-   png_fixed_point res;
-
-   if (png_muldiv(&res, a, b, 100000))
-      return res;
-#endif
-
-   return 0; /* overflow */
-}
-
-/* The inverse of the above. */
-png_fixed_point
-png_reciprocal2(png_fixed_point a, png_fixed_point b)
-{
-   /* The required result is 1/a * 1/b; the following preserves accuracy. */
-#ifdef PNG_FLOATING_ARITHMETIC_SUPPORTED
-   double r = 1E15/a;
-   r /= b;
-   r = floor(r+.5);
-
-   if (r <= 2147483647. && r >= -2147483648.)
-      return (png_fixed_point)r;
-#else
-   /* This may overflow because the range of png_fixed_point isn't symmetric,
-    * but this API is only used for the product of file and screen gamma so it
-    * doesn't matter that the smallest number it can produce is 1/21474, not
-    * 1/100000
-    */
-   png_fixed_point res = png_product2(a, b);
-
-   if (res != 0)
-      return png_reciprocal(res);
-#endif
-
-   return 0; /* overflow */
-}
-#endif /* READ_GAMMA */
-
-#ifdef PNG_CHECK_cHRM_SUPPORTED
-/* Added at libpng version 1.2.34 (Dec 8, 2008) and 1.4.0 (Jan 2,
- * 2010: moved from pngset.c) */
-/*
- *    Multiply two 32-bit numbers, V1 and V2, using 32-bit
- *    arithmetic, to produce a 64 bit result in the HI/LO words.
- *
- *                  A B
- *                x C D
- *               ------
- *              AD || BD
- *        AC || CB || 0
- *
- *    where A and B are the high and low 16-bit words of V1,
- *    C and D are the 16-bit words of V2, AD is the product of
- *    A and D, and X || Y is (X << 16) + Y.
-*/
-
-void /* PRIVATE */
-png_64bit_product (long v1, long v2, unsigned long *hi_product,
-    unsigned long *lo_product)
-{
-   int a, b, c, d;
-   long lo, hi, x, y;
-
-   a = (v1 >> 16) & 0xffff;
-   b = v1 & 0xffff;
-   c = (v2 >> 16) & 0xffff;
-   d = v2 & 0xffff;
-
-   lo = b * d;                   /* BD */
-   x = a * d + c * b;            /* AD + CB */
-   y = ((lo >> 16) & 0xffff) + x;
-
-   lo = (lo & 0xffff) | ((y & 0xffff) << 16);
-   hi = (y >> 16) & 0xffff;
-
-   hi += a * c;                  /* AC */
-
-   *hi_product = (unsigned long)hi;
-   *lo_product = (unsigned long)lo;
-}
-#endif /* CHECK_cHRM */
-
-#ifdef PNG_READ_GAMMA_SUPPORTED /* gamma table code */
-#ifndef PNG_FLOATING_ARITHMETIC_SUPPORTED
-/* Fixed point gamma.
- *
- * To calculate gamma this code implements fast log() and exp() calls using only
- * fixed point arithmetic.  This code has sufficient precision for either 8 or
- * 16 bit sample values.
- *
- * The tables used here were calculated using simple 'bc' programs, but C double
- * precision floating point arithmetic would work fine.  The programs are given
- * at the head of each table.
- *
- * 8 bit log table
- *   This is a table of -log(value/255)/log(2) for 'value' in the range 128 to
- *   255, so it's the base 2 logarithm of a normalized 8 bit floating point
- *   mantissa.  The numbers are 32 bit fractions.
- */
-static png_uint_32
-png_8bit_l2[128] =
-{
-#  if PNG_DO_BC
-      for (i=128;i<256;++i) { .5 - l(i/255)/l(2)*65536*65536; }
-#  endif
-   4270715492U, 4222494797U, 4174646467U, 4127164793U, 4080044201U, 4033279239U,
-   3986864580U, 3940795015U, 3895065449U, 3849670902U, 3804606499U, 3759867474U,
-   3715449162U, 3671346997U, 3627556511U, 3584073329U, 3540893168U, 3498011834U,
-   3455425220U, 3413129301U, 3371120137U, 3329393864U, 3287946700U, 3246774933U,
-   3205874930U, 3165243125U, 3124876025U, 3084770202U, 3044922296U, 3005329011U,
-   2965987113U, 2926893432U, 2888044853U, 2849438323U, 2811070844U, 2772939474U,
-   2735041326U, 2697373562U, 2659933400U, 2622718104U, 2585724991U, 2548951424U,
-   2512394810U, 2476052606U, 2439922311U, 2404001468U, 2368287663U, 2332778523U,
-   2297471715U, 2262364947U, 2227455964U, 2192742551U, 2158222529U, 2123893754U,
-   2089754119U, 2055801552U, 2022034013U, 1988449497U, 1955046031U, 1921821672U,
-   1888774511U, 1855902668U, 1823204291U, 1790677560U, 1758320682U, 1726131893U,
-   1694109454U, 1662251657U, 1630556815U, 1599023271U, 1567649391U, 1536433567U,
-   1505374214U, 1474469770U, 1443718700U, 1413119487U, 1382670639U, 1352370686U,
-   1322218179U, 1292211689U, 1262349810U, 1232631153U, 1203054352U, 1173618059U,
-   1144320946U, 1115161701U, 1086139034U, 1057251672U, 1028498358U, 999877854U,
-   971388940U, 943030410U, 914801076U, 886699767U, 858725327U, 830876614U,
-   803152505U, 775551890U, 748073672U, 720716771U, 693480120U, 666362667U,
-   639363374U, 612481215U, 585715177U, 559064263U, 532527486U, 506103872U,
-   479792461U, 453592303U, 427502463U, 401522014U, 375650043U, 349885648U,
-   324227938U, 298676034U, 273229066U, 247886176U, 222646516U, 197509248U,
-   172473545U, 147538590U, 122703574U, 97967701U, 73330182U, 48790236U,
-   24347096U, 0U
-#if 0
-   /* The following are the values for 16 bit tables - these work fine for the 8
-    * bit conversions but produce very slightly larger errors in the 16 bit log
-    * (about 1.2 as opposed to 0.7 absolute error in the final value).  To use
-    * these all the shifts below must be adjusted appropriately.
-    */
-   65166, 64430, 63700, 62976, 62257, 61543, 60835, 60132, 59434, 58741, 58054,
-   57371, 56693, 56020, 55352, 54689, 54030, 53375, 52726, 52080, 51439, 50803,
-   50170, 49542, 48918, 48298, 47682, 47070, 46462, 45858, 45257, 44661, 44068,
-   43479, 42894, 42312, 41733, 41159, 40587, 40020, 39455, 38894, 38336, 37782,
-   37230, 36682, 36137, 35595, 35057, 34521, 33988, 33459, 32932, 32408, 31887,
-   31369, 30854, 30341, 29832, 29325, 28820, 28319, 27820, 27324, 26830, 26339,
-   25850, 25364, 24880, 24399, 23920, 23444, 22970, 22499, 22029, 21562, 21098,
-   20636, 20175, 19718, 19262, 18808, 18357, 17908, 17461, 17016, 16573, 16132,
-   15694, 15257, 14822, 14390, 13959, 13530, 13103, 12678, 12255, 11834, 11415,
-   10997, 10582, 10168, 9756, 9346, 8937, 8531, 8126, 7723, 7321, 6921, 6523,
-   6127, 5732, 5339, 4947, 4557, 4169, 3782, 3397, 3014, 2632, 2251, 1872, 1495,
-   1119, 744, 372
-#endif
-};
-
-static png_int_32
-png_log8bit(unsigned int x)
-{
-   unsigned int lg2 = 0;
-   /* Each time 'x' is multiplied by 2, 1 must be subtracted off the final log,
-    * because the log is actually negate that means adding 1.  The final
-    * returned value thus has the range 0 (for 255 input) to 7.994 (for 1
-    * input), return 7.99998 for the overflow (log 0) case - so the result is
-    * always at most 19 bits.
-    */
-   if ((x &= 0xff) == 0)
-      return 0xffffffff;
-
-   if ((x & 0xf0) == 0)
-      lg2  = 4, x <<= 4;
-
-   if ((x & 0xc0) == 0)
-      lg2 += 2, x <<= 2;
-
-   if ((x & 0x80) == 0)
-      lg2 += 1, x <<= 1;
-
-   /* result is at most 19 bits, so this cast is safe: */
-   return (png_int_32)((lg2 << 16) + ((png_8bit_l2[x-128]+32768)>>16));
-}
-
-/* The above gives exact (to 16 binary places) log2 values for 8 bit images,
- * for 16 bit images we use the most significant 8 bits of the 16 bit value to
- * get an approximation then multiply the approximation by a correction factor
- * determined by the remaining up to 8 bits.  This requires an additional step
- * in the 16 bit case.
- *
- * We want log2(value/65535), we have log2(v'/255), where:
- *
- *    value = v' * 256 + v''
- *          = v' * f
- *
- * So f is value/v', which is equal to (256+v''/v') since v' is in the range 128
- * to 255 and v'' is in the range 0 to 255 f will be in the range 256 to less
- * than 258.  The final factor also needs to correct for the fact that our 8 bit
- * value is scaled by 255, whereas the 16 bit values must be scaled by 65535.
- *
- * This gives a final formula using a calculated value 'x' which is value/v' and
- * scaling by 65536 to match the above table:
- *
- *   log2(x/257) * 65536
- *
- * Since these numbers are so close to '1' we can use simple linear
- * interpolation between the two end values 256/257 (result -368.61) and 258/257
- * (result 367.179).  The values used below are scaled by a further 64 to give
- * 16 bit precision in the interpolation:
- *
- * Start (256): -23591
- * Zero  (257):      0
- * End   (258):  23499
- */
-static png_int_32
-png_log16bit(png_uint_32 x)
-{
-   unsigned int lg2 = 0;
-
-   /* As above, but now the input has 16 bits. */
-   if ((x &= 0xffff) == 0)
-      return 0xffffffff;
-
-   if ((x & 0xff00) == 0)
-      lg2  = 8, x <<= 8;
-
-   if ((x & 0xf000) == 0)
-      lg2 += 4, x <<= 4;
-
-   if ((x & 0xc000) == 0)
-      lg2 += 2, x <<= 2;
-
-   if ((x & 0x8000) == 0)
-      lg2 += 1, x <<= 1;
-
-   /* Calculate the base logarithm from the top 8 bits as a 28 bit fractional
-    * value.
-    */
-   lg2 <<= 28;
-   lg2 += (png_8bit_l2[(x>>8)-128]+8) >> 4;
-
-   /* Now we need to interpolate the factor, this requires a division by the top
-    * 8 bits.  Do this with maximum precision.
-    */
-   x = ((x << 16) + (x >> 9)) / (x >> 8);
-
-   /* Since we divided by the top 8 bits of 'x' there will be a '1' at 1<<24,
-    * the value at 1<<16 (ignoring this) will be 0 or 1; this gives us exactly
-    * 16 bits to interpolate to get the low bits of the result.  Round the
-    * answer.  Note that the end point values are scaled by 64 to retain overall
-    * precision and that 'lg2' is current scaled by an extra 12 bits, so adjust
-    * the overall scaling by 6-12.  Round at every step.
-    */
-   x -= 1U << 24;
-
-   if (x <= 65536U) /* <= '257' */
-      lg2 += ((23591U * (65536U-x)) + (1U << (16+6-12-1))) >> (16+6-12);
-
-   else
-      lg2 -= ((23499U * (x-65536U)) + (1U << (16+6-12-1))) >> (16+6-12);
-
-   /* Safe, because the result can't have more than 20 bits: */
-   return (png_int_32)((lg2 + 2048) >> 12);
-}
-
-/* The 'exp()' case must invert the above, taking a 20 bit fixed point
- * logarithmic value and returning a 16 or 8 bit number as appropriate.  In
- * each case only the low 16 bits are relevant - the fraction - since the
- * integer bits (the top 4) simply determine a shift.
- *
- * The worst case is the 16 bit distinction between 65535 and 65534, this
- * requires perhaps spurious accuracty in the decoding of the logarithm to
- * distinguish log2(65535/65534.5) - 10^-5 or 17 bits.  There is little chance
- * of getting this accuracy in practice.
- *
- * To deal with this the following exp() function works out the exponent of the
- * frational part of the logarithm by using an accurate 32 bit value from the
- * top four fractional bits then multiplying in the remaining bits.
- */
-static png_uint_32
-png_32bit_exp[16] =
-{
-#  if PNG_DO_BC
-      for (i=0;i<16;++i) { .5 + e(-i/16*l(2))*2^32; }
-#  endif
-   /* NOTE: the first entry is deliberately set to the maximum 32 bit value. */
-   4294967295U, 4112874773U, 3938502376U, 3771522796U, 3611622603U, 3458501653U,
-   3311872529U, 3171459999U, 3037000500U, 2908241642U, 2784941738U, 2666869345U,
-   2553802834U, 2445529972U, 2341847524U, 2242560872U
-};
-
-/* Adjustment table; provided to explain the numbers in the code below. */
-#if PNG_DO_BC
-for (i=11;i>=0;--i){ print i, " ", (1 - e(-(2^i)/65536*l(2))) * 2^(32-i), "\n"}
-   11 44937.64284865548751208448
-   10 45180.98734845585101160448
-    9 45303.31936980687359311872
-    8 45364.65110595323018870784
-    7 45395.35850361789624614912
-    6 45410.72259715102037508096
-    5 45418.40724413220722311168
-    4 45422.25021786898173001728
-    3 45424.17186732298419044352
-    2 45425.13273269940811464704
-    1 45425.61317555035558641664
-    0 45425.85339951654943850496
-#endif
-
-static png_uint_32
-png_exp(png_fixed_point x)
-{
-   if (x > 0 && x <= 0xfffff) /* Else overflow or zero (underflow) */
-   {
-      /* Obtain a 4 bit approximation */
-      png_uint_32 e = png_32bit_exp[(x >> 12) & 0xf];
-
-      /* Incorporate the low 12 bits - these decrease the returned value by
-       * multiplying by a number less than 1 if the bit is set.  The multiplier
-       * is determined by the above table and the shift. Notice that the values
-       * converge on 45426 and this is used to allow linear interpolation of the
-       * low bits.
-       */
-      if (x & 0x800)
-         e -= (((e >> 16) * 44938U) +  16U) >> 5;
-
-      if (x & 0x400)
-         e -= (((e >> 16) * 45181U) +  32U) >> 6;
-
-      if (x & 0x200)
-         e -= (((e >> 16) * 45303U) +  64U) >> 7;
-
-      if (x & 0x100)
-         e -= (((e >> 16) * 45365U) + 128U) >> 8;
-
-      if (x & 0x080)
-         e -= (((e >> 16) * 45395U) + 256U) >> 9;
-
-      if (x & 0x040)
-         e -= (((e >> 16) * 45410U) + 512U) >> 10;
-
-      /* And handle the low 6 bits in a single block. */
-      e -= (((e >> 16) * 355U * (x & 0x3fU)) + 256U) >> 9;
-
-      /* Handle the upper bits of x. */
-      e >>= x >> 16;
-      return e;
-   }
-
-   /* Check for overflow */
-   if (x <= 0)
-      return png_32bit_exp[0];
-
-   /* Else underflow */
-   return 0;
-}
-
-static png_byte
-png_exp8bit(png_fixed_point lg2)
-{
-   /* Get a 32 bit value: */
-   png_uint_32 x = png_exp(lg2);
-
-   /* Convert the 32 bit value to 0..255 by multiplying by 256-1, note that the
-    * second, rounding, step can't overflow because of the first, subtraction,
-    * step.
-    */
-   x -= x >> 8;
-   return (png_byte)((x + 0x7fffffU) >> 24);
-}
-
-static png_uint_16
-png_exp16bit(png_fixed_point lg2)
-{
-   /* Get a 32 bit value: */
-   png_uint_32 x = png_exp(lg2);
-
-   /* Convert the 32 bit value to 0..65535 by multiplying by 65536-1: */
-   x -= x >> 16;
-   return (png_uint_16)((x + 32767U) >> 16);
-}
-#endif /* FLOATING_ARITHMETIC */
-
-png_byte
-png_gamma_8bit_correct(unsigned int value, png_fixed_point gamma_val)
-{
-   if (value > 0 && value < 255)
-   {
-#     ifdef PNG_FLOATING_ARITHMETIC_SUPPORTED
-         double r = floor(255*pow(value/255.,gamma_val*.00001)+.5);
-         return (png_byte)r;
-#     else
-         png_int_32 lg2 = png_log8bit(value);
-         png_fixed_point res;
-
-         if (png_muldiv(&res, gamma_val, lg2, PNG_FP_1))
-            return png_exp8bit(res);
-
-         /* Overflow. */
-         value = 0;
-#     endif
-   }
-
-   return (png_byte)value;
-}
-
-png_uint_16
-png_gamma_16bit_correct(unsigned int value, png_fixed_point gamma_val)
-{
-   if (value > 0 && value < 65535)
-   {
-#     ifdef PNG_FLOATING_ARITHMETIC_SUPPORTED
-         double r = floor(65535*pow(value/65535.,gamma_val*.00001)+.5);
-         return (png_uint_16)r;
-#     else
-         png_int_32 lg2 = png_log16bit(value);
-         png_fixed_point res;
-
-         if (png_muldiv(&res, gamma_val, lg2, PNG_FP_1))
-            return png_exp16bit(res);
-
-         /* Overflow. */
-         value = 0;
-#     endif
-   }
-
-   return (png_uint_16)value;
-}
-
-/* This does the right thing based on the bit_depth field of the
- * png_struct, interpreting values as 8 or 16 bit.  While the result
- * is nominally a 16 bit value if bit depth is 8 then the result is
- * 8 bit (as are the arguments.)
- */
-png_uint_16 /* PRIVATE */
-png_gamma_correct(png_structp png_ptr, unsigned int value,
-    png_fixed_point gamma_val)
-{
-   if (png_ptr->bit_depth == 8)
-      return png_gamma_8bit_correct(value, gamma_val);
-
-   else
-      return png_gamma_16bit_correct(value, gamma_val);
-}
-
-/* This is the shared test on whether a gamma value is 'significant' - whether
- * it is worth doing gamma correction.
- */
-int /* PRIVATE */
-png_gamma_significant(png_fixed_point gamma_val)
-{
-   return gamma_val < PNG_FP_1 - PNG_GAMMA_THRESHOLD_FIXED ||
-       gamma_val > PNG_FP_1 + PNG_GAMMA_THRESHOLD_FIXED;
-}
-
-/* Internal function to build a single 16 bit table - the table consists of
- * 'num' 256 entry subtables, where 'num' is determined by 'shift' - the amount
- * to shift the input values right (or 16-number_of_signifiant_bits).
- *
- * The caller is responsible for ensuring that the table gets cleaned up on
- * png_error (i.e. if one of the mallocs below fails) - i.e. the *table argument
- * should be somewhere that will be cleaned.
- */
-static void
-png_build_16bit_table(png_structp png_ptr, png_uint_16pp *ptable,
-   PNG_CONST unsigned int shift, PNG_CONST png_fixed_point gamma_val)
-{
-   /* Various values derived from 'shift': */
-   PNG_CONST unsigned int num = 1U << (8U - shift);
-   PNG_CONST unsigned int max = (1U << (16U - shift))-1U;
-   PNG_CONST unsigned int max_by_2 = 1U << (15U-shift);
-   unsigned int i;
-
-   png_uint_16pp table = *ptable =
-       (png_uint_16pp)png_calloc(png_ptr, num * png_sizeof(png_uint_16p));
-
-   for (i = 0; i < num; i++)
-   {
-      png_uint_16p sub_table = table[i] =
-          (png_uint_16p)png_malloc(png_ptr, 256 * png_sizeof(png_uint_16));
-
-      /* The 'threshold' test is repeated here because it can arise for one of
-       * the 16 bit tables even if the others don't hit it.
-       */
-      if (png_gamma_significant(gamma_val))
-      {
-         /* The old code would overflow at the end and this would cause the
-          * 'pow' function to return a result >1, resulting in an
-          * arithmetic error.  This code follows the spec exactly; ig is
-          * the recovered input sample, it always has 8-16 bits.
-          *
-          * We want input * 65535/max, rounded, the arithmetic fits in 32
-          * bits (unsigned) so long as max <= 32767.
-          */
-         unsigned int j;
-         for (j = 0; j < 256; j++)
-         {
-            png_uint_32 ig = (j << (8-shift)) + i;
-#           ifdef PNG_FLOATING_ARITHMETIC_SUPPORTED
-               /* Inline the 'max' scaling operation: */
-               double d = floor(65535*pow(ig/(double)max, gamma_val*.00001)+.5);
-               sub_table[j] = (png_uint_16)d;
-#           else
-               if (shift)
-                  ig = (ig * 65535U + max_by_2)/max;
-
-               sub_table[j] = png_gamma_16bit_correct(ig, gamma_val);
-#           endif
-         }
-      }
-      else
-      {
-         /* We must still build a table, but do it the fast way. */
-         unsigned int j;
-
-         for (j = 0; j < 256; j++)
-         {
-            png_uint_32 ig = (j << (8-shift)) + i;
-
-            if (shift)
-               ig = (ig * 65535U + max_by_2)/max;
-
-            sub_table[j] = (png_uint_16)ig;
-         }
-      }
-   }
-}
-
-/* NOTE: this function expects the *inverse* of the overall gamma transformation
- * required.
- */
-static void
-png_build_16to8_table(png_structp png_ptr, png_uint_16pp *ptable,
-   PNG_CONST unsigned int shift, PNG_CONST png_fixed_point gamma_val)
-{
-   PNG_CONST unsigned int num = 1U << (8U - shift);
-   PNG_CONST unsigned int max = (1U << (16U - shift))-1U;
-   unsigned int i;
-   png_uint_32 last;
-
-   png_uint_16pp table = *ptable =
-       (png_uint_16pp)png_calloc(png_ptr, num * png_sizeof(png_uint_16p));
-
-   /* 'num' is the number of tables and also the number of low bits of low
-    * bits of the input 16 bit value used to select a table.  Each table is
-    * itself index by the high 8 bits of the value.
-    */
-   for (i = 0; i < num; i++)
-      table[i] = (png_uint_16p)png_malloc(png_ptr,
-          256 * png_sizeof(png_uint_16));
-
-   /* 'gamma_val' is set to the reciprocal of the value calculated above, so
-    * pow(out,g) is an *input* value.  'last' is the last input value set.
-    *
-    * In the loop 'i' is used to find output values.  Since the output is 8
-    * bit there are only 256 possible values.  The tables are set up to
-    * select the closest possible output value for each input by finding
-    * the input value at the boundary between each pair of output values
-    * and filling the table up to that boundary with the lower output
-    * value.
-    *
-    * The boundary values are 0.5,1.5..253.5,254.5.  Since these are 9 bit
-    * values the code below uses a 16 bit value in i; the values start at
-    * 128.5 (for 0.5) and step by 257, for a total of 254 values (the last
-    * entries are filled with 255).  Start i at 128 and fill all 'last'
-    * table entries <= 'max'
-    */
-   last = 0;
-   for (i = 0; i < 255; ++i) /* 8 bit output value */
-   {
-      /* Find the corresponding maximum input value */
-      png_uint_16 out = (png_uint_16)(i * 257U); /* 16 bit output value */
-
-      /* Find the boundary value in 16 bits: */
-      png_uint_32 bound = png_gamma_16bit_correct(out+128U, gamma_val);
-
-      /* Adjust (round) to (16-shift) bits: */
-      bound = (bound * max + 32768U)/65535U + 1U;
-
-      while (last < bound)
-      {
-         table[last & (0xffU >> shift)][last >> (8U - shift)] = out;
-         last++;
-      }
-   }
-
-   /* And fill in the final entries. */
-   while (last < (num << 8))
-   {
-      table[last & (0xff >> shift)][last >> (8U - shift)] = 65535U;
-      last++;
-   }
-}
-
-/* Build a single 8 bit table: same as the 16 bit case but much simpler (and
- * typically much faster).  Note that libpng currently does no sBIT processing
- * (apparently contrary to the spec) so a 256 entry table is always generated.
- */
-static void
-png_build_8bit_table(png_structp png_ptr, png_bytepp ptable,
-   PNG_CONST png_fixed_point gamma_val)
-{
-   unsigned int i;
-   png_bytep table = *ptable = (png_bytep)png_malloc(png_ptr, 256);
-
-   if (png_gamma_significant(gamma_val)) for (i=0; i<256; i++)
-      table[i] = png_gamma_8bit_correct(i, gamma_val);
-
-   else for (i=0; i<256; ++i)
-      table[i] = (png_byte)i;
-}
-
-/* We build the 8- or 16-bit gamma tables here.  Note that for 16-bit
- * tables, we don't make a full table if we are reducing to 8-bit in
- * the future.  Note also how the gamma_16 tables are segmented so that
- * we don't need to allocate > 64K chunks for a full 16-bit table.
- */
-void /* PRIVATE */
-png_build_gamma_table(png_structp png_ptr, int bit_depth)
-{
-  png_debug(1, "in png_build_gamma_table");
-
-  if (bit_depth <= 8)
-  {
-     png_build_8bit_table(png_ptr, &png_ptr->gamma_table,
-         png_ptr->screen_gamma > 0 ?  png_reciprocal2(png_ptr->gamma,
-         png_ptr->screen_gamma) : PNG_FP_1);
-
-#if defined(PNG_READ_BACKGROUND_SUPPORTED) || \
-   defined(PNG_READ_RGB_TO_GRAY_SUPPORTED)
-     if (png_ptr->transformations & ((PNG_BACKGROUND) | PNG_RGB_TO_GRAY))
-     {
-        png_build_8bit_table(png_ptr, &png_ptr->gamma_to_1,
-            png_reciprocal(png_ptr->gamma));
-
-        png_build_8bit_table(png_ptr, &png_ptr->gamma_from_1,
-            png_ptr->screen_gamma > 0 ?  png_reciprocal(png_ptr->screen_gamma) :
-            png_ptr->gamma/* Probably doing rgb_to_gray */);
-     }
-#endif /* PNG_READ_BACKGROUND_SUPPORTED || PNG_RGB_TO_GRAY_SUPPORTED */
-  }
-  else
-  {
-     png_byte shift, sig_bit;
-
-     if (png_ptr->color_type & PNG_COLOR_MASK_COLOR)
-     {
-        sig_bit = png_ptr->sig_bit.red;
-
-        if (png_ptr->sig_bit.green > sig_bit)
-           sig_bit = png_ptr->sig_bit.green;
-
-        if (png_ptr->sig_bit.blue > sig_bit)
-           sig_bit = png_ptr->sig_bit.blue;
-     }
-     else
-        sig_bit = png_ptr->sig_bit.gray;
-
-     /* 16 bit gamma code uses this equation:
-      *
-      *   ov = table[(iv & 0xff) >> gamma_shift][iv >> 8]
-      *
-      * Where 'iv' is the input color value and 'ov' is the output value -
-      * pow(iv, gamma).
-      *
-      * Thus the gamma table consists of up to 256 256 entry tables.  The table
-      * is selected by the (8-gamma_shift) most significant of the low 8 bits of
-      * the color value then indexed by the upper 8 bits:
-      *
-      *   table[low bits][high 8 bits]
-      *
-      * So the table 'n' corresponds to all those 'iv' of:
-      *
-      *   <all high 8 bit values><n << gamma_shift>..<(n+1 << gamma_shift)-1>
-      *
-      */
-     if (sig_bit > 0 && sig_bit < 16U)
-        shift = (png_byte)(16U - sig_bit); /* shift == insignificant bits */
-
-     else
-        shift = 0; /* keep all 16 bits */
-
-     if (png_ptr->transformations & PNG_16_TO_8)
-     {
-        /* PNG_MAX_GAMMA_8 is the number of bits to keep - effectively
-         * the significant bits in the *input* when the output will
-         * eventually be 8 bits.  By default it is 11.
-         */
-        if (shift < (16U - PNG_MAX_GAMMA_8))
-           shift = (16U - PNG_MAX_GAMMA_8);
-     }
-
-     if (shift > 8U)
-        shift = 8U; /* Guarantees at least one table! */
-
-     png_ptr->gamma_shift = shift;
-
-#ifdef PNG_16BIT_SUPPORTED
-     if (png_ptr->transformations & (PNG_16_TO_8 | PNG_BACKGROUND))
-#endif
-         png_build_16to8_table(png_ptr, &png_ptr->gamma_16_table, shift,
-         png_ptr->screen_gamma > 0 ? png_product2(png_ptr->gamma,
-         png_ptr->screen_gamma) : PNG_FP_1);
-
-#ifdef PNG_16BIT_SUPPORTED
-     else
-         png_build_16bit_table(png_ptr, &png_ptr->gamma_16_table, shift,
-         png_ptr->screen_gamma > 0 ? png_reciprocal2(png_ptr->gamma,
-         png_ptr->screen_gamma) : PNG_FP_1);
-#endif
-
-#if defined(PNG_READ_BACKGROUND_SUPPORTED) || \
-   defined(PNG_READ_RGB_TO_GRAY_SUPPORTED)
-     if (png_ptr->transformations & (PNG_BACKGROUND | PNG_RGB_TO_GRAY))
-     {
-        png_build_16bit_table(png_ptr, &png_ptr->gamma_16_to_1, shift,
-            png_reciprocal(png_ptr->gamma));
-
-        /* Notice that the '16 from 1' table should be full precision, however
-         * the lookup on this table still uses gamma_shift, so it can't be.
-         * TODO: fix this.
-         */
-        png_build_16bit_table(png_ptr, &png_ptr->gamma_16_from_1, shift,
-            png_ptr->screen_gamma > 0 ? png_reciprocal(png_ptr->screen_gamma) :
-            png_ptr->gamma/* Probably doing rgb_to_gray */);
-     }
-#endif /* PNG_READ_BACKGROUND_SUPPORTED || PNG_RGB_TO_GRAY_SUPPORTED */
-  }
-}
-#endif /* READ_GAMMA */
-#endif /* defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED) */
+
+/* png.c - location for general purpose libpng functions
+ *
+ * Last changed in libpng 1.2.46 [February 25, 2011]
+ * Copyright (c) 1998-2011 Glenn Randers-Pehrson
+ * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
+ * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
+ *
+ * This code is released under the libpng license.
+ * For conditions of distribution and use, see the disclaimer
+ * and license in png.h
+ */
+
+#define PNG_INTERNAL
+#define PNG_NO_EXTERN
+#define PNG_NO_PEDANTIC_WARNINGS
+#include "png.h"
+
+/* Generate a compiler error if there is an old png.h in the search path. */
+typedef version_1_2_50 Your_png_h_is_not_version_1_2_50;
+
+/* Version information for C files.  This had better match the version
+ * string defined in png.h.
+ */
+
+#ifdef PNG_USE_GLOBAL_ARRAYS
+/* png_libpng_ver was changed to a function in version 1.0.5c */
+PNG_CONST char png_libpng_ver[18] = PNG_LIBPNG_VER_STRING;
+
+#ifdef PNG_READ_SUPPORTED
+
+/* png_sig was changed to a function in version 1.0.5c */
+/* Place to hold the signature string for a PNG file. */
+PNG_CONST png_byte FARDATA png_sig[8] = {137, 80, 78, 71, 13, 10, 26, 10};
+#endif /* PNG_READ_SUPPORTED */
+
+/* Invoke global declarations for constant strings for known chunk types */
+PNG_IHDR;
+PNG_IDAT;
+PNG_IEND;
+PNG_PLTE;
+PNG_bKGD;
+PNG_cHRM;
+PNG_gAMA;
+PNG_hIST;
+PNG_iCCP;
+PNG_iTXt;
+PNG_oFFs;
+PNG_pCAL;
+PNG_sCAL;
+PNG_pHYs;
+PNG_sBIT;
+PNG_sPLT;
+PNG_sRGB;
+PNG_tEXt;
+PNG_tIME;
+PNG_tRNS;
+PNG_zTXt;
+
+#ifdef PNG_READ_SUPPORTED
+/* Arrays to facilitate easy interlacing - use pass (0 - 6) as index */
+
+/* Start of interlace block */
+PNG_CONST int FARDATA png_pass_start[] = {0, 4, 0, 2, 0, 1, 0};
+
+/* Offset to next interlace block */
+PNG_CONST int FARDATA png_pass_inc[] = {8, 8, 4, 4, 2, 2, 1};
+
+/* Start of interlace block in the y direction */
+PNG_CONST int FARDATA png_pass_ystart[] = {0, 0, 4, 0, 2, 0, 1};
+
+/* Offset to next interlace block in the y direction */
+PNG_CONST int FARDATA png_pass_yinc[] = {8, 8, 8, 4, 4, 2, 2};
+
+/* Height of interlace block.  This is not currently used - if you need
+ * it, uncomment it here and in png.h
+PNG_CONST int FARDATA png_pass_height[] = {8, 8, 4, 4, 2, 2, 1};
+*/
+
+/* Mask to determine which pixels are valid in a pass */
+PNG_CONST int FARDATA png_pass_mask[] =
+    {0x80, 0x08, 0x88, 0x22, 0xaa, 0x55, 0xff};
+
+/* Mask to determine which pixels to overwrite while displaying */
+PNG_CONST int FARDATA png_pass_dsp_mask[]
+   = {0xff, 0x0f, 0xff, 0x33, 0xff, 0x55, 0xff};
+
+#endif /* PNG_READ_SUPPORTED */
+#endif /* PNG_USE_GLOBAL_ARRAYS */
+
+/* Tells libpng that we have already handled the first "num_bytes" bytes
+ * of the PNG file signature.  If the PNG data is embedded into another
+ * stream we can set num_bytes = 8 so that libpng will not attempt to read
+ * or write any of the magic bytes before it starts on the IHDR.
+ */
+
+#ifdef PNG_READ_SUPPORTED
+void PNGAPI
+png_set_sig_bytes(png_structp png_ptr, int num_bytes)
+{
+   png_debug(1, "in png_set_sig_bytes");
+
+   if (png_ptr == NULL)
+      return;
+
+   if (num_bytes > 8)
+      png_error(png_ptr, "Too many bytes for PNG signature.");
+
+   png_ptr->sig_bytes = (png_byte)(num_bytes < 0 ? 0 : num_bytes);
+}
+
+/* Checks whether the supplied bytes match the PNG signature.  We allow
+ * checking less than the full 8-byte signature so that those apps that
+ * already read the first few bytes of a file to determine the file type
+ * can simply check the remaining bytes for extra assurance.  Returns
+ * an integer less than, equal to, or greater than zero if sig is found,
+ * respectively, to be less than, to match, or be greater than the correct
+ * PNG signature (this is the same behaviour as strcmp, memcmp, etc).
+ */
+int PNGAPI
+png_sig_cmp(png_bytep sig, png_size_t start, png_size_t num_to_check)
+{
+   png_byte png_signature[8] = {137, 80, 78, 71, 13, 10, 26, 10};
+   if (num_to_check > 8)
+      num_to_check = 8;
+   else if (num_to_check < 1)
+      return (-1);
+
+   if (start > 7)
+      return (-1);
+
+   if (start + num_to_check > 8)
+      num_to_check = 8 - start;
+
+   return ((int)(png_memcmp(&sig[start], &png_signature[start], num_to_check)));
+}
+
+#if defined(PNG_1_0_X) || defined(PNG_1_2_X)
+/* (Obsolete) function to check signature bytes.  It does not allow one
+ * to check a partial signature.  This function might be removed in the
+ * future - use png_sig_cmp().  Returns true (nonzero) if the file is PNG.
+ */
+int PNGAPI
+png_check_sig(png_bytep sig, int num)
+{
+  return ((int)!png_sig_cmp(sig, (png_size_t)0, (png_size_t)num));
+}
+#endif
+#endif /* PNG_READ_SUPPORTED */
+
+#if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED)
+/* Function to allocate memory for zlib and clear it to 0. */
+#ifdef PNG_1_0_X
+voidpf PNGAPI
+#else
+voidpf /* PRIVATE */
+#endif
+png_zalloc(voidpf png_ptr, uInt items, uInt size)
+{
+   png_voidp ptr;
+   png_structp p=(png_structp)png_ptr;
+   png_uint_32 save_flags=p->flags;
+   png_uint_32 num_bytes;
+
+   if (png_ptr == NULL)
+      return (NULL);
+   if (items > PNG_UINT_32_MAX/size)
+   {
+     png_warning (p, "Potential overflow in png_zalloc()");
+     return (NULL);
+   }
+   num_bytes = (png_uint_32)items * size;
+
+   p->flags|=PNG_FLAG_MALLOC_NULL_MEM_OK;
+   ptr = (png_voidp)png_malloc((png_structp)png_ptr, num_bytes);
+   p->flags=save_flags;
+
+#if defined(PNG_1_0_X) && !defined(PNG_NO_ZALLOC_ZERO)
+   if (ptr == NULL)
+       return ((voidpf)ptr);
+
+   if (num_bytes > (png_uint_32)0x8000L)
+   {
+      png_memset(ptr, 0, (png_size_t)0x8000L);
+      png_memset((png_bytep)ptr + (png_size_t)0x8000L, 0,
+         (png_size_t)(num_bytes - (png_uint_32)0x8000L));
+   }
+   else
+   {
+      png_memset(ptr, 0, (png_size_t)num_bytes);
+   }
+#endif
+   return ((voidpf)ptr);
+}
+
+/* Function to free memory for zlib */
+#ifdef PNG_1_0_X
+void PNGAPI
+#else
+void /* PRIVATE */
+#endif
+png_zfree(voidpf png_ptr, voidpf ptr)
+{
+   png_free((png_structp)png_ptr, (png_voidp)ptr);
+}
+
+/* Reset the CRC variable to 32 bits of 1's.  Care must be taken
+ * in case CRC is > 32 bits to leave the top bits 0.
+ */
+void /* PRIVATE */
+png_reset_crc(png_structp png_ptr)
+{
+   png_ptr->crc = crc32(0, Z_NULL, 0);
+}
+
+/* Calculate the CRC over a section of data.  We can only pass as
+ * much data to this routine as the largest single buffer size.  We
+ * also check that this data will actually be used before going to the
+ * trouble of calculating it.
+ */
+void /* PRIVATE */
+png_calculate_crc(png_structp png_ptr, png_bytep ptr, png_size_t length)
+{
+   int need_crc = 1;
+
+   if (png_ptr->chunk_name[0] & 0x20)                     /* ancillary */
+   {
+      if ((png_ptr->flags & PNG_FLAG_CRC_ANCILLARY_MASK) ==
+          (PNG_FLAG_CRC_ANCILLARY_USE | PNG_FLAG_CRC_ANCILLARY_NOWARN))
+         need_crc = 0;
+   }
+   else                                                    /* critical */
+   {
+      if (png_ptr->flags & PNG_FLAG_CRC_CRITICAL_IGNORE)
+         need_crc = 0;
+   }
+
+   if (need_crc)
+      png_ptr->crc = crc32(png_ptr->crc, ptr, (uInt)length);
+}
+
+/* Allocate the memory for an info_struct for the application.  We don't
+ * really need the png_ptr, but it could potentially be useful in the
+ * future.  This should be used in favour of malloc(png_sizeof(png_info))
+ * and png_info_init() so that applications that want to use a shared
+ * libpng don't have to be recompiled if png_info changes size.
+ */
+png_infop PNGAPI
+png_create_info_struct(png_structp png_ptr)
+{
+   png_infop info_ptr;
+
+   png_debug(1, "in png_create_info_struct");
+
+   if (png_ptr == NULL)
+      return (NULL);
+
+#ifdef PNG_USER_MEM_SUPPORTED
+   info_ptr = (png_infop)png_create_struct_2(PNG_STRUCT_INFO,
+      png_ptr->malloc_fn, png_ptr->mem_ptr);
+#else
+   info_ptr = (png_infop)png_create_struct(PNG_STRUCT_INFO);
+#endif
+   if (info_ptr != NULL)
+      png_info_init_3(&info_ptr, png_sizeof(png_info));
+
+   return (info_ptr);
+}
+
+/* This function frees the memory associated with a single info struct.
+ * Normally, one would use either png_destroy_read_struct() or
+ * png_destroy_write_struct() to free an info struct, but this may be
+ * useful for some applications.
+ */
+void PNGAPI
+png_destroy_info_struct(png_structp png_ptr, png_infopp info_ptr_ptr)
+{
+   png_infop info_ptr = NULL;
+
+   png_debug(1, "in png_destroy_info_struct");
+
+   if (png_ptr == NULL)
+      return;
+
+   if (info_ptr_ptr != NULL)
+      info_ptr = *info_ptr_ptr;
+
+   if (info_ptr != NULL)
+   {
+      png_info_destroy(png_ptr, info_ptr);
+
+#ifdef PNG_USER_MEM_SUPPORTED
+      png_destroy_struct_2((png_voidp)info_ptr, png_ptr->free_fn,
+          png_ptr->mem_ptr);
+#else
+      png_destroy_struct((png_voidp)info_ptr);
+#endif
+      *info_ptr_ptr = NULL;
+   }
+}
+
+/* Initialize the info structure.  This is now an internal function (0.89)
+ * and applications using it are urged to use png_create_info_struct()
+ * instead.
+ */
+#if defined(PNG_1_0_X) || defined(PNG_1_2_X)
+#undef png_info_init
+void PNGAPI
+png_info_init(png_infop info_ptr)
+{
+   /* We only come here via pre-1.0.12-compiled applications */
+   png_info_init_3(&info_ptr, 0);
+}
+#endif
+
+void PNGAPI
+png_info_init_3(png_infopp ptr_ptr, png_size_t png_info_struct_size)
+{
+   png_infop info_ptr = *ptr_ptr;
+
+   png_debug(1, "in png_info_init_3");
+
+   if (info_ptr == NULL)
+      return;
+
+   if (png_sizeof(png_info) > png_info_struct_size)
+   {
+      png_destroy_struct(info_ptr);
+      info_ptr = (png_infop)png_create_struct(PNG_STRUCT_INFO);
+      *ptr_ptr = info_ptr;
+   }
+
+   /* Set everything to 0 */
+   png_memset(info_ptr, 0, png_sizeof(png_info));
+}
+
+#ifdef PNG_FREE_ME_SUPPORTED
+void PNGAPI
+png_data_freer(png_structp png_ptr, png_infop info_ptr,
+   int freer, png_uint_32 mask)
+{
+   png_debug(1, "in png_data_freer");
+
+   if (png_ptr == NULL || info_ptr == NULL)
+      return;
+
+   if (freer == PNG_DESTROY_WILL_FREE_DATA)
+      info_ptr->free_me |= mask;
+   else if (freer == PNG_USER_WILL_FREE_DATA)
+      info_ptr->free_me &= ~mask;
+   else
+      png_warning(png_ptr,
+         "Unknown freer parameter in png_data_freer.");
+}
+#endif
+
+void PNGAPI
+png_free_data(png_structp png_ptr, png_infop info_ptr, png_uint_32 mask,
+   int num)
+{
+   png_debug(1, "in png_free_data");
+
+   if (png_ptr == NULL || info_ptr == NULL)
+      return;
+
+#ifdef PNG_TEXT_SUPPORTED
+   /* Free text item num or (if num == -1) all text items */
+#ifdef PNG_FREE_ME_SUPPORTED
+   if ((mask & PNG_FREE_TEXT) & info_ptr->free_me)
+#else
+   if (mask & PNG_FREE_TEXT)
+#endif
+   {
+      if (num != -1)
+      {
+         if (info_ptr->text && info_ptr->text[num].key)
+         {
+            png_free(png_ptr, info_ptr->text[num].key);
+            info_ptr->text[num].key = NULL;
+         }
+      }
+      else
+      {
+         int i;
+         for (i = 0; i < info_ptr->num_text; i++)
+             png_free_data(png_ptr, info_ptr, PNG_FREE_TEXT, i);
+         png_free(png_ptr, info_ptr->text);
+         info_ptr->text = NULL;
+         info_ptr->num_text=0;
+      }
+   }
+#endif
+
+#ifdef PNG_tRNS_SUPPORTED
+   /* Free any tRNS entry */
+#ifdef PNG_FREE_ME_SUPPORTED
+   if ((mask & PNG_FREE_TRNS) & info_ptr->free_me)
+#else
+   if ((mask & PNG_FREE_TRNS) && (png_ptr->flags & PNG_FLAG_FREE_TRNS))
+#endif
+   {
+      png_free(png_ptr, info_ptr->trans);
+      info_ptr->trans = NULL;
+      info_ptr->valid &= ~PNG_INFO_tRNS;
+#ifndef PNG_FREE_ME_SUPPORTED
+      png_ptr->flags &= ~PNG_FLAG_FREE_TRNS;
+#endif
+   }
+#endif
+
+#ifdef PNG_sCAL_SUPPORTED
+   /* Free any sCAL entry */
+#ifdef PNG_FREE_ME_SUPPORTED
+   if ((mask & PNG_FREE_SCAL) & info_ptr->free_me)
+#else
+   if (mask & PNG_FREE_SCAL)
+#endif
+   {
+#if defined(PNG_FIXED_POINT_SUPPORTED) && !defined(PNG_FLOATING_POINT_SUPPORTED)
+      png_free(png_ptr, info_ptr->scal_s_width);
+      png_free(png_ptr, info_ptr->scal_s_height);
+      info_ptr->scal_s_width = NULL;
+      info_ptr->scal_s_height = NULL;
+#endif
+      info_ptr->valid &= ~PNG_INFO_sCAL;
+   }
+#endif
+
+#ifdef PNG_pCAL_SUPPORTED
+   /* Free any pCAL entry */
+#ifdef PNG_FREE_ME_SUPPORTED
+   if ((mask & PNG_FREE_PCAL) & info_ptr->free_me)
+#else
+   if (mask & PNG_FREE_PCAL)
+#endif
+   {
+      png_free(png_ptr, info_ptr->pcal_purpose);
+      png_free(png_ptr, info_ptr->pcal_units);
+      info_ptr->pcal_purpose = NULL;
+      info_ptr->pcal_units = NULL;
+      if (info_ptr->pcal_params != NULL)
+         {
+            int i;
+            for (i = 0; i < (int)info_ptr->pcal_nparams; i++)
+            {
+               png_free(png_ptr, info_ptr->pcal_params[i]);
+               info_ptr->pcal_params[i] = NULL;
+            }
+            png_free(png_ptr, info_ptr->pcal_params);
+            info_ptr->pcal_params = NULL;
+         }
+      info_ptr->valid &= ~PNG_INFO_pCAL;
+   }
+#endif
+
+#ifdef PNG_iCCP_SUPPORTED
+   /* Free any iCCP entry */
+#ifdef PNG_FREE_ME_SUPPORTED
+   if ((mask & PNG_FREE_ICCP) & info_ptr->free_me)
+#else
+   if (mask & PNG_FREE_ICCP)
+#endif
+   {
+      png_free(png_ptr, info_ptr->iccp_name);
+      png_free(png_ptr, info_ptr->iccp_profile);
+      info_ptr->iccp_name = NULL;
+      info_ptr->iccp_profile = NULL;
+      info_ptr->valid &= ~PNG_INFO_iCCP;
+   }
+#endif
+
+#ifdef PNG_sPLT_SUPPORTED
+   /* Free a given sPLT entry, or (if num == -1) all sPLT entries */
+#ifdef PNG_FREE_ME_SUPPORTED
+   if ((mask & PNG_FREE_SPLT) & info_ptr->free_me)
+#else
+   if (mask & PNG_FREE_SPLT)
+#endif
+   {
+      if (num != -1)
+      {
+         if (info_ptr->splt_palettes)
+         {
+            png_free(png_ptr, info_ptr->splt_palettes[num].name);
+            png_free(png_ptr, info_ptr->splt_palettes[num].entries);
+            info_ptr->splt_palettes[num].name = NULL;
+            info_ptr->splt_palettes[num].entries = NULL;
+         }
+      }
+      else
+      {
+         if (info_ptr->splt_palettes_num)
+         {
+            int i;
+            for (i = 0; i < (int)info_ptr->splt_palettes_num; i++)
+               png_free_data(png_ptr, info_ptr, PNG_FREE_SPLT, i);
+
+            png_free(png_ptr, info_ptr->splt_palettes);
+            info_ptr->splt_palettes = NULL;
+            info_ptr->splt_palettes_num = 0;
+         }
+         info_ptr->valid &= ~PNG_INFO_sPLT;
+      }
+   }
+#endif
+
+#ifdef PNG_UNKNOWN_CHUNKS_SUPPORTED
+   if (png_ptr->unknown_chunk.data)
+   {
+      png_free(png_ptr, png_ptr->unknown_chunk.data);
+      png_ptr->unknown_chunk.data = NULL;
+   }
+
+#ifdef PNG_FREE_ME_SUPPORTED
+   if ((mask & PNG_FREE_UNKN) & info_ptr->free_me)
+#else
+   if (mask & PNG_FREE_UNKN)
+#endif
+   {
+      if (num != -1)
+      {
+          if (info_ptr->unknown_chunks)
+          {
+             png_free(png_ptr, info_ptr->unknown_chunks[num].data);
+             info_ptr->unknown_chunks[num].data = NULL;
+          }
+      }
+      else
+      {
+         int i;
+
+         if (info_ptr->unknown_chunks_num)
+         {
+            for (i = 0; i < (int)info_ptr->unknown_chunks_num; i++)
+               png_free_data(png_ptr, info_ptr, PNG_FREE_UNKN, i);
+
+            png_free(png_ptr, info_ptr->unknown_chunks);
+            info_ptr->unknown_chunks = NULL;
+            info_ptr->unknown_chunks_num = 0;
+         }
+      }
+   }
+#endif
+
+#ifdef PNG_hIST_SUPPORTED
+   /* Free any hIST entry */
+#ifdef PNG_FREE_ME_SUPPORTED
+   if ((mask & PNG_FREE_HIST)  & info_ptr->free_me)
+#else
+   if ((mask & PNG_FREE_HIST) && (png_ptr->flags & PNG_FLAG_FREE_HIST))
+#endif
+   {
+      png_free(png_ptr, info_ptr->hist);
+      info_ptr->hist = NULL;
+      info_ptr->valid &= ~PNG_INFO_hIST;
+#ifndef PNG_FREE_ME_SUPPORTED
+      png_ptr->flags &= ~PNG_FLAG_FREE_HIST;
+#endif
+   }
+#endif
+
+   /* Free any PLTE entry that was internally allocated */
+#ifdef PNG_FREE_ME_SUPPORTED
+   if ((mask & PNG_FREE_PLTE) & info_ptr->free_me)
+#else
+   if ((mask & PNG_FREE_PLTE) && (png_ptr->flags & PNG_FLAG_FREE_PLTE))
+#endif
+   {
+      png_zfree(png_ptr, info_ptr->palette);
+      info_ptr->palette = NULL;
+      info_ptr->valid &= ~PNG_INFO_PLTE;
+#ifndef PNG_FREE_ME_SUPPORTED
+      png_ptr->flags &= ~PNG_FLAG_FREE_PLTE;
+#endif
+      info_ptr->num_palette = 0;
+   }
+
+#ifdef PNG_INFO_IMAGE_SUPPORTED
+   /* Free any image bits attached to the info structure */
+#ifdef PNG_FREE_ME_SUPPORTED
+   if ((mask & PNG_FREE_ROWS) & info_ptr->free_me)
+#else
+   if (mask & PNG_FREE_ROWS)
+#endif
+   {
+      if (info_ptr->row_pointers)
+      {
+         int row;
+         for (row = 0; row < (int)info_ptr->height; row++)
+         {
+            png_free(png_ptr, info_ptr->row_pointers[row]);
+            info_ptr->row_pointers[row] = NULL;
+         }
+         png_free(png_ptr, info_ptr->row_pointers);
+         info_ptr->row_pointers = NULL;
+      }
+      info_ptr->valid &= ~PNG_INFO_IDAT;
+   }
+#endif
+
+#ifdef PNG_FREE_ME_SUPPORTED
+   if (num == -1)
+      info_ptr->free_me &= ~mask;
+   else
+      info_ptr->free_me &= ~(mask & ~PNG_FREE_MUL);
+#endif
+}
+
+/* This is an internal routine to free any memory that the info struct is
+ * pointing to before re-using it or freeing the struct itself.  Recall
+ * that png_free() checks for NULL pointers for us.
+ */
+void /* PRIVATE */
+png_info_destroy(png_structp png_ptr, png_infop info_ptr)
+{
+   png_debug(1, "in png_info_destroy");
+
+   png_free_data(png_ptr, info_ptr, PNG_FREE_ALL, -1);
+
+#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
+   if (png_ptr->num_chunk_list)
+   {
+      png_free(png_ptr, png_ptr->chunk_list);
+      png_ptr->chunk_list = NULL;
+      png_ptr->num_chunk_list = 0;
+   }
+#endif
+
+   png_info_init_3(&info_ptr, png_sizeof(png_info));
+}
+#endif /* defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED) */
+
+/* This function returns a pointer to the io_ptr associated with the user
+ * functions.  The application should free any memory associated with this
+ * pointer before png_write_destroy() or png_read_destroy() are called.
+ */
+png_voidp PNGAPI
+png_get_io_ptr(png_structp png_ptr)
+{
+   if (png_ptr == NULL)
+      return (NULL);
+   return (png_ptr->io_ptr);
+}
+
+#if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED)
+#ifdef PNG_STDIO_SUPPORTED
+/* Initialize the default input/output functions for the PNG file.  If you
+ * use your own read or write routines, you can call either png_set_read_fn()
+ * or png_set_write_fn() instead of png_init_io().  If you have defined
+ * PNG_NO_STDIO, you must use a function of your own because "FILE *" isn't
+ * necessarily available.
+ */
+void PNGAPI
+png_init_io(png_structp png_ptr, png_FILE_p fp)
+{
+   png_debug(1, "in png_init_io");
+
+   if (png_ptr == NULL)
+      return;
+
+   png_ptr->io_ptr = (png_voidp)fp;
+}
+#endif
+
+#ifdef PNG_TIME_RFC1123_SUPPORTED
+/* Convert the supplied time into an RFC 1123 string suitable for use in
+ * a "Creation Time" or other text-based time string.
+ */
+png_charp PNGAPI
+png_convert_to_rfc1123(png_structp png_ptr, png_timep ptime)
+{
+   static PNG_CONST char short_months[12][4] =
+        {"Jan", "Feb", "Mar", "Apr", "May", "Jun",
+         "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"};
+
+   if (png_ptr == NULL)
+      return (NULL);
+   if (png_ptr->time_buffer == NULL)
+   {
+      png_ptr->time_buffer = (png_charp)png_malloc(png_ptr, (png_uint_32)(29*
+         png_sizeof(char)));
+   }
+
+#ifdef _WIN32_WCE
+   {
+      wchar_t time_buf[29];
+      wsprintf(time_buf, TEXT("%d %S %d %02d:%02d:%02d +0000"),
+          ptime->day % 32, short_months[(ptime->month - 1) % 12],
+        ptime->year, ptime->hour % 24, ptime->minute % 60,
+          ptime->second % 61);
+      WideCharToMultiByte(CP_ACP, 0, time_buf, -1, png_ptr->time_buffer,
+          29, NULL, NULL);
+   }
+#else
+#ifdef USE_FAR_KEYWORD
+   {
+      char near_time_buf[29];
+      png_snprintf6(near_time_buf, 29, "%d %s %d %02d:%02d:%02d +0000",
+          ptime->day % 32, short_months[(ptime->month - 1) % 12],
+          ptime->year, ptime->hour % 24, ptime->minute % 60,
+          ptime->second % 61);
+      png_memcpy(png_ptr->time_buffer, near_time_buf,
+          29*png_sizeof(char));
+   }
+#else
+   png_snprintf6(png_ptr->time_buffer, 29, "%d %s %d %02d:%02d:%02d +0000",
+       ptime->day % 32, short_months[(ptime->month - 1) % 12],
+       ptime->year, ptime->hour % 24, ptime->minute % 60,
+       ptime->second % 61);
+#endif
+#endif /* _WIN32_WCE */
+   return ((png_charp)png_ptr->time_buffer);
+}
+#endif /* PNG_TIME_RFC1123_SUPPORTED */
+
+#endif /* defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED) */
+
+png_charp PNGAPI
+png_get_copyright(png_structp png_ptr)
+{
+   png_ptr = png_ptr;  /* Silence compiler warning about unused png_ptr */
+#ifdef PNG_STRING_COPYRIGHT
+      return PNG_STRING_COPYRIGHT
+#else
+#ifdef __STDC__
+   return ((png_charp) PNG_STRING_NEWLINE \
+     "libpng version 1.2.50 - July 10, 2012" PNG_STRING_NEWLINE \
+     "Copyright (c) 1998-2011 Glenn Randers-Pehrson" PNG_STRING_NEWLINE \
+     "Copyright (c) 1996-1997 Andreas Dilger" PNG_STRING_NEWLINE \
+     "Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc." \
+     PNG_STRING_NEWLINE);
+#else
+      return ((png_charp) "libpng version 1.2.50 - July 10, 2012\
+      Copyright (c) 1998-2011 Glenn Randers-Pehrson\
+      Copyright (c) 1996-1997 Andreas Dilger\
+      Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.");
+#endif
+#endif
+}
+
+/* The following return the library version as a short string in the
+ * format 1.0.0 through 99.99.99zz.  To get the version of *.h files
+ * used with your application, print out PNG_LIBPNG_VER_STRING, which
+ * is defined in png.h.
+ * Note: now there is no difference between png_get_libpng_ver() and
+ * png_get_header_ver().  Due to the version_nn_nn_nn typedef guard,
+ * it is guaranteed that png.c uses the correct version of png.h.
+ */
+png_charp PNGAPI
+png_get_libpng_ver(png_structp png_ptr)
+{
+   /* Version of *.c files used when building libpng */
+   png_ptr = png_ptr;  /* Silence compiler warning about unused png_ptr */
+   return ((png_charp) PNG_LIBPNG_VER_STRING);
+}
+
+png_charp PNGAPI
+png_get_header_ver(png_structp png_ptr)
+{
+   /* Version of *.h files used when building libpng */
+   png_ptr = png_ptr;  /* Silence compiler warning about unused png_ptr */
+   return ((png_charp) PNG_LIBPNG_VER_STRING);
+}
+
+png_charp PNGAPI
+png_get_header_version(png_structp png_ptr)
+{
+   /* Returns longer string containing both version and date */
+   png_ptr = png_ptr;  /* Silence compiler warning about unused png_ptr */
+#ifdef __STDC__
+   return ((png_charp) PNG_HEADER_VERSION_STRING
+#ifndef PNG_READ_SUPPORTED
+   "     (NO READ SUPPORT)"
+#endif
+   PNG_STRING_NEWLINE);
+#else
+   return ((png_charp) PNG_HEADER_VERSION_STRING);
+#endif
+}
+
+#if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED)
+#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
+int PNGAPI
+png_handle_as_unknown(png_structp png_ptr, png_bytep chunk_name)
+{
+   /* Check chunk_name and return "keep" value if it's on the list, else 0 */
+   int i;
+   png_bytep p;
+   if (png_ptr == NULL || chunk_name == NULL || png_ptr->num_chunk_list<=0)
+      return 0;
+   p = png_ptr->chunk_list + png_ptr->num_chunk_list*5 - 5;
+   for (i = png_ptr->num_chunk_list; i; i--, p -= 5)
+      if (!png_memcmp(chunk_name, p, 4))
+        return ((int)*(p + 4));
+   return 0;
+}
+#endif
+
+/* This function, added to libpng-1.0.6g, is untested. */
+int PNGAPI
+png_reset_zstream(png_structp png_ptr)
+{
+   if (png_ptr == NULL)
+      return Z_STREAM_ERROR;
+   return (inflateReset(&png_ptr->zstream));
+}
+#endif /* defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED) */
+
+/* This function was added to libpng-1.0.7 */
+png_uint_32 PNGAPI
+png_access_version_number(void)
+{
+   /* Version of *.c files used when building libpng */
+   return((png_uint_32) PNG_LIBPNG_VER);
+}
+
+
+#if defined(PNG_READ_SUPPORTED) && defined(PNG_ASSEMBLER_CODE_SUPPORTED)
+#ifndef PNG_1_0_X
+/* This function was added to libpng 1.2.0 */
+int PNGAPI
+png_mmx_support(void)
+{
+   /* Obsolete, to be removed from libpng-1.4.0 */
+    return -1;
+}
+#endif /* PNG_1_0_X */
+#endif /* PNG_READ_SUPPORTED && PNG_ASSEMBLER_CODE_SUPPORTED */
+
+#if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED)
+#ifdef PNG_SIZE_T
+/* Added at libpng version 1.2.6 */
+   PNG_EXTERN png_size_t PNGAPI png_convert_size PNGARG((size_t size));
+png_size_t PNGAPI
+png_convert_size(size_t size)
+{
+   if (size > (png_size_t)-1)
+      PNG_ABORT();  /* We haven't got access to png_ptr, so no png_error() */
+   return ((png_size_t)size);
+}
+#endif /* PNG_SIZE_T */
+
+/* Added at libpng version 1.2.34 and 1.4.0 (moved from pngset.c) */
+#ifdef PNG_cHRM_SUPPORTED
+#ifdef PNG_CHECK_cHRM_SUPPORTED
+
+/*
+ *    Multiply two 32-bit numbers, V1 and V2, using 32-bit
+ *    arithmetic, to produce a 64 bit result in the HI/LO words.
+ *
+ *                  A B
+ *                x C D
+ *               ------
+ *              AD || BD
+ *        AC || CB || 0
+ *
+ *    where A and B are the high and low 16-bit words of V1,
+ *    C and D are the 16-bit words of V2, AD is the product of
+ *    A and D, and X || Y is (X << 16) + Y.
+*/
+
+void /* PRIVATE */
+png_64bit_product (long v1, long v2, unsigned long *hi_product,
+   unsigned long *lo_product)
+{
+   int a, b, c, d;
+   long lo, hi, x, y;
+
+   a = (v1 >> 16) & 0xffff;
+   b = v1 & 0xffff;
+   c = (v2 >> 16) & 0xffff;
+   d = v2 & 0xffff;
+
+   lo = b * d;                   /* BD */
+   x = a * d + c * b;            /* AD + CB */
+   y = ((lo >> 16) & 0xffff) + x;
+
+   lo = (lo & 0xffff) | ((y & 0xffff) << 16);
+   hi = (y >> 16) & 0xffff;
+
+   hi += a * c;                  /* AC */
+
+   *hi_product = (unsigned long)hi;
+   *lo_product = (unsigned long)lo;
+}
+
+int /* PRIVATE */
+png_check_cHRM_fixed(png_structp png_ptr,
+   png_fixed_point white_x, png_fixed_point white_y, png_fixed_point red_x,
+   png_fixed_point red_y, png_fixed_point green_x, png_fixed_point green_y,
+   png_fixed_point blue_x, png_fixed_point blue_y)
+{
+   int ret = 1;
+   unsigned long xy_hi,xy_lo,yx_hi,yx_lo;
+
+   png_debug(1, "in function png_check_cHRM_fixed");
+
+   if (png_ptr == NULL)
+      return 0;
+
+   if (white_x < 0 || white_y <= 0 ||
+         red_x < 0 ||   red_y <  0 ||
+       green_x < 0 || green_y <  0 ||
+        blue_x < 0 ||  blue_y <  0)
+   {
+      png_warning(png_ptr,
+        "Ignoring attempt to set negative chromaticity value");
+      ret = 0;
+   }
+   if (white_x > (png_fixed_point) PNG_UINT_31_MAX ||
+       white_y > (png_fixed_point) PNG_UINT_31_MAX ||
+         red_x > (png_fixed_point) PNG_UINT_31_MAX ||
+         red_y > (png_fixed_point) PNG_UINT_31_MAX ||
+       green_x > (png_fixed_point) PNG_UINT_31_MAX ||
+       green_y > (png_fixed_point) PNG_UINT_31_MAX ||
+        blue_x > (png_fixed_point) PNG_UINT_31_MAX ||
+        blue_y > (png_fixed_point) PNG_UINT_31_MAX )
+   {
+      png_warning(png_ptr,
+        "Ignoring attempt to set chromaticity value exceeding 21474.83");
+      ret = 0;
+   }
+   if (white_x > 100000L - white_y)
+   {
+      png_warning(png_ptr, "Invalid cHRM white point");
+      ret = 0;
+   }
+   if (red_x > 100000L - red_y)
+   {
+      png_warning(png_ptr, "Invalid cHRM red point");
+      ret = 0;
+   }
+   if (green_x > 100000L - green_y)
+   {
+      png_warning(png_ptr, "Invalid cHRM green point");
+      ret = 0;
+   }
+   if (blue_x > 100000L - blue_y)
+   {
+      png_warning(png_ptr, "Invalid cHRM blue point");
+      ret = 0;
+   }
+
+   png_64bit_product(green_x - red_x, blue_y - red_y, &xy_hi, &xy_lo);
+   png_64bit_product(green_y - red_y, blue_x - red_x, &yx_hi, &yx_lo);
+
+   if (xy_hi == yx_hi && xy_lo == yx_lo)
+   {
+      png_warning(png_ptr,
+         "Ignoring attempt to set cHRM RGB triangle with zero area");
+      ret = 0;
+   }
+
+   return ret;
+}
+#endif /* PNG_CHECK_cHRM_SUPPORTED */
+#endif /* PNG_cHRM_SUPPORTED */
+
+void /* PRIVATE */
+png_check_IHDR(png_structp png_ptr,
+   png_uint_32 width, png_uint_32 height, int bit_depth,
+   int color_type, int interlace_type, int compression_type,
+   int filter_type)
+{
+   int error = 0;
+
+   /* Check for width and height valid values */
+   if (width == 0)
+   {
+      png_warning(png_ptr, "Image width is zero in IHDR");
+      error = 1;
+   }
+
+   if (height == 0)
+   {
+      png_warning(png_ptr, "Image height is zero in IHDR");
+      error = 1;
+   }
+
+#ifdef PNG_SET_USER_LIMITS_SUPPORTED
+   if (width > png_ptr->user_width_max || width > PNG_USER_WIDTH_MAX)
+#else
+   if (width > PNG_USER_WIDTH_MAX)
+#endif
+   {
+      png_warning(png_ptr, "Image width exceeds user limit in IHDR");
+      error = 1;
+   }
+
+#ifdef PNG_SET_USER_LIMITS_SUPPORTED
+   if (height > png_ptr->user_height_max || height > PNG_USER_HEIGHT_MAX)
+#else
+   if (height > PNG_USER_HEIGHT_MAX)
+#endif
+   {
+      png_warning(png_ptr, "Image height exceeds user limit in IHDR");
+      error = 1;
+   }
+
+   if (width > PNG_UINT_31_MAX)
+   {
+      png_warning(png_ptr, "Invalid image width in IHDR");
+      error = 1;
+   }
+
+   if ( height > PNG_UINT_31_MAX)
+   {
+      png_warning(png_ptr, "Invalid image height in IHDR");
+      error = 1;
+   }
+
+   if ( width > (PNG_UINT_32_MAX
+                 >> 3)      /* 8-byte RGBA pixels */
+                 - 64       /* bigrowbuf hack */
+                 - 1        /* filter byte */
+                 - 7*8      /* rounding of width to multiple of 8 pixels */
+                 - 8)       /* extra max_pixel_depth pad */
+      png_warning(png_ptr, "Width is too large for libpng to process pixels");
+
+   /* Check other values */
+   if (bit_depth != 1 && bit_depth != 2 && bit_depth != 4 &&
+       bit_depth != 8 && bit_depth != 16)
+   {
+      png_warning(png_ptr, "Invalid bit depth in IHDR");
+      error = 1;
+   }
+
+   if (color_type < 0 || color_type == 1 ||
+       color_type == 5 || color_type > 6)
+   {
+      png_warning(png_ptr, "Invalid color type in IHDR");
+      error = 1;
+   }
+
+   if (((color_type == PNG_COLOR_TYPE_PALETTE) && bit_depth > 8) ||
+       ((color_type == PNG_COLOR_TYPE_RGB ||
+         color_type == PNG_COLOR_TYPE_GRAY_ALPHA ||
+         color_type == PNG_COLOR_TYPE_RGB_ALPHA) && bit_depth < 8))
+   {
+      png_warning(png_ptr, "Invalid color type/bit depth combination in IHDR");
+      error = 1;
+   }
+
+   if (interlace_type >= PNG_INTERLACE_LAST)
+   {
+      png_warning(png_ptr, "Unknown interlace method in IHDR");
+      error = 1;
+   }
+
+   if (compression_type != PNG_COMPRESSION_TYPE_BASE)
+   {
+      png_warning(png_ptr, "Unknown compression method in IHDR");
+      error = 1;
+   }
+
+#ifdef PNG_MNG_FEATURES_SUPPORTED
+   /* Accept filter_method 64 (intrapixel differencing) only if
+    * 1. Libpng was compiled with PNG_MNG_FEATURES_SUPPORTED and
+    * 2. Libpng did not read a PNG signature (this filter_method is only
+    *    used in PNG datastreams that are embedded in MNG datastreams) and
+    * 3. The application called png_permit_mng_features with a mask that
+    *    included PNG_FLAG_MNG_FILTER_64 and
+    * 4. The filter_method is 64 and
+    * 5. The color_type is RGB or RGBA
+    */
+   if ((png_ptr->mode & PNG_HAVE_PNG_SIGNATURE) &&
+       png_ptr->mng_features_permitted)
+      png_warning(png_ptr, "MNG features are not allowed in a PNG datastream");
+
+   if (filter_type != PNG_FILTER_TYPE_BASE)
+   {
+      if (!((png_ptr->mng_features_permitted & PNG_FLAG_MNG_FILTER_64) &&
+         (filter_type == PNG_INTRAPIXEL_DIFFERENCING) &&
+         ((png_ptr->mode & PNG_HAVE_PNG_SIGNATURE) == 0) &&
+         (color_type == PNG_COLOR_TYPE_RGB ||
+         color_type == PNG_COLOR_TYPE_RGB_ALPHA)))
+      {
+         png_warning(png_ptr, "Unknown filter method in IHDR");
+         error = 1;
+      }
+
+      if (png_ptr->mode & PNG_HAVE_PNG_SIGNATURE)
+      {
+         png_warning(png_ptr, "Invalid filter method in IHDR");
+         error = 1;
+      }
+   }
+
+#else
+   if (filter_type != PNG_FILTER_TYPE_BASE)
+   {
+      png_warning(png_ptr, "Unknown filter method in IHDR");
+      error = 1;
+   }
+#endif
+
+   if (error == 1)
+      png_error(png_ptr, "Invalid IHDR data");
+}
+#endif /* defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED) */
diff --git a/Externals/libpng/png.h b/Externals/libpng/png.h
index 100f56dba2..ffa6c1c4e2 100644
--- a/Externals/libpng/png.h
+++ b/Externals/libpng/png.h
@@ -1,2280 +1,3810 @@
-
-/* png.h - header file for PNG reference library
- *
- * libpng version 1.5.1 - February 3, 2011
- * Copyright (c) 1998-2011 Glenn Randers-Pehrson
- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
- *
- * This code is released under the libpng license (See LICENSE, below)
- *
- * Authors and maintainers:
- *   libpng versions 0.71, May 1995, through 0.88, January 1996: Guy Schalnat
- *   libpng versions 0.89c, June 1996, through 0.96, May 1997: Andreas Dilger
- *   libpng versions 0.97, January 1998, through 1.5.1 - February 3, 2011: Glenn
- *   See also "Contributing Authors", below.
- *
- * Note about libpng version numbers:
- *
- *   Due to various miscommunications, unforeseen code incompatibilities
- *   and occasional factors outside the authors' control, version numbering
- *   on the library has not always been consistent and straightforward.
- *   The following table summarizes matters since version 0.89c, which was
- *   the first widely used release:
- *
- *    source                 png.h  png.h  shared-lib
- *    version                string   int  version
- *    -------                ------ -----  ----------
- *    0.89c "1.0 beta 3"     0.89      89  1.0.89
- *    0.90  "1.0 beta 4"     0.90      90  0.90  [should have been 2.0.90]
- *    0.95  "1.0 beta 5"     0.95      95  0.95  [should have been 2.0.95]
- *    0.96  "1.0 beta 6"     0.96      96  0.96  [should have been 2.0.96]
- *    0.97b "1.00.97 beta 7" 1.00.97   97  1.0.1 [should have been 2.0.97]
- *    0.97c                  0.97      97  2.0.97
- *    0.98                   0.98      98  2.0.98
- *    0.99                   0.99      98  2.0.99
- *    0.99a-m                0.99      99  2.0.99
- *    1.00                   1.00     100  2.1.0 [100 should be 10000]
- *    1.0.0      (from here on, the   100  2.1.0 [100 should be 10000]
- *    1.0.1       png.h string is   10001  2.1.0
- *    1.0.1a-e    identical to the  10002  from here on, the shared library
- *    1.0.2       source version)   10002  is 2.V where V is the source code
- *    1.0.2a-b                      10003  version, except as noted.
- *    1.0.3                         10003
- *    1.0.3a-d                      10004
- *    1.0.4                         10004
- *    1.0.4a-f                      10005
- *    1.0.5 (+ 2 patches)           10005
- *    1.0.5a-d                      10006
- *    1.0.5e-r                      10100 (not source compatible)
- *    1.0.5s-v                      10006 (not binary compatible)
- *    1.0.6 (+ 3 patches)           10006 (still binary incompatible)
- *    1.0.6d-f                      10007 (still binary incompatible)
- *    1.0.6g                        10007
- *    1.0.6h                        10007  10.6h (testing xy.z so-numbering)
- *    1.0.6i                        10007  10.6i
- *    1.0.6j                        10007  2.1.0.6j (incompatible with 1.0.0)
- *    1.0.7beta11-14        DLLNUM  10007  2.1.0.7beta11-14 (binary compatible)
- *    1.0.7beta15-18           1    10007  2.1.0.7beta15-18 (binary compatible)
- *    1.0.7rc1-2               1    10007  2.1.0.7rc1-2 (binary compatible)
- *    1.0.7                    1    10007  (still compatible)
- *    1.0.8beta1-4             1    10008  2.1.0.8beta1-4
- *    1.0.8rc1                 1    10008  2.1.0.8rc1
- *    1.0.8                    1    10008  2.1.0.8
- *    1.0.9beta1-6             1    10009  2.1.0.9beta1-6
- *    1.0.9rc1                 1    10009  2.1.0.9rc1
- *    1.0.9beta7-10            1    10009  2.1.0.9beta7-10
- *    1.0.9rc2                 1    10009  2.1.0.9rc2
- *    1.0.9                    1    10009  2.1.0.9
- *    1.0.10beta1              1    10010  2.1.0.10beta1
- *    1.0.10rc1                1    10010  2.1.0.10rc1
- *    1.0.10                   1    10010  2.1.0.10
- *    1.0.11beta1-3            1    10011  2.1.0.11beta1-3
- *    1.0.11rc1                1    10011  2.1.0.11rc1
- *    1.0.11                   1    10011  2.1.0.11
- *    1.0.12beta1-2            2    10012  2.1.0.12beta1-2
- *    1.0.12rc1                2    10012  2.1.0.12rc1
- *    1.0.12                   2    10012  2.1.0.12
- *    1.1.0a-f                 -    10100  2.1.1.0a-f (branch abandoned)
- *    1.2.0beta1-2             2    10200  2.1.2.0beta1-2
- *    1.2.0beta3-5             3    10200  3.1.2.0beta3-5
- *    1.2.0rc1                 3    10200  3.1.2.0rc1
- *    1.2.0                    3    10200  3.1.2.0
- *    1.2.1beta1-4             3    10201  3.1.2.1beta1-4
- *    1.2.1rc1-2               3    10201  3.1.2.1rc1-2
- *    1.2.1                    3    10201  3.1.2.1
- *    1.2.2beta1-6            12    10202  12.so.0.1.2.2beta1-6
- *    1.0.13beta1             10    10013  10.so.0.1.0.13beta1
- *    1.0.13rc1               10    10013  10.so.0.1.0.13rc1
- *    1.2.2rc1                12    10202  12.so.0.1.2.2rc1
- *    1.0.13                  10    10013  10.so.0.1.0.13
- *    1.2.2                   12    10202  12.so.0.1.2.2
- *    1.2.3rc1-6              12    10203  12.so.0.1.2.3rc1-6
- *    1.2.3                   12    10203  12.so.0.1.2.3
- *    1.2.4beta1-3            13    10204  12.so.0.1.2.4beta1-3
- *    1.0.14rc1               13    10014  10.so.0.1.0.14rc1
- *    1.2.4rc1                13    10204  12.so.0.1.2.4rc1
- *    1.0.14                  10    10014  10.so.0.1.0.14
- *    1.2.4                   13    10204  12.so.0.1.2.4
- *    1.2.5beta1-2            13    10205  12.so.0.1.2.5beta1-2
- *    1.0.15rc1-3             10    10015  10.so.0.1.0.15rc1-3
- *    1.2.5rc1-3              13    10205  12.so.0.1.2.5rc1-3
- *    1.0.15                  10    10015  10.so.0.1.0.15
- *    1.2.5                   13    10205  12.so.0.1.2.5
- *    1.2.6beta1-4            13    10206  12.so.0.1.2.6beta1-4
- *    1.0.16                  10    10016  10.so.0.1.0.16
- *    1.2.6                   13    10206  12.so.0.1.2.6
- *    1.2.7beta1-2            13    10207  12.so.0.1.2.7beta1-2
- *    1.0.17rc1               10    10017  12.so.0.1.0.17rc1
- *    1.2.7rc1                13    10207  12.so.0.1.2.7rc1
- *    1.0.17                  10    10017  12.so.0.1.0.17
- *    1.2.7                   13    10207  12.so.0.1.2.7
- *    1.2.8beta1-5            13    10208  12.so.0.1.2.8beta1-5
- *    1.0.18rc1-5             10    10018  12.so.0.1.0.18rc1-5
- *    1.2.8rc1-5              13    10208  12.so.0.1.2.8rc1-5
- *    1.0.18                  10    10018  12.so.0.1.0.18
- *    1.2.8                   13    10208  12.so.0.1.2.8
- *    1.2.9beta1-3            13    10209  12.so.0.1.2.9beta1-3
- *    1.2.9beta4-11           13    10209  12.so.0.9[.0]
- *    1.2.9rc1                13    10209  12.so.0.9[.0]
- *    1.2.9                   13    10209  12.so.0.9[.0]
- *    1.2.10beta1-7           13    10210  12.so.0.10[.0]
- *    1.2.10rc1-2             13    10210  12.so.0.10[.0]
- *    1.2.10                  13    10210  12.so.0.10[.0]
- *    1.4.0beta1-5            14    10400  14.so.0.0[.0]
- *    1.2.11beta1-4           13    10211  12.so.0.11[.0]
- *    1.4.0beta7-8            14    10400  14.so.0.0[.0]
- *    1.2.11                  13    10211  12.so.0.11[.0]
- *    1.2.12                  13    10212  12.so.0.12[.0]
- *    1.4.0beta9-14           14    10400  14.so.0.0[.0]
- *    1.2.13                  13    10213  12.so.0.13[.0]
- *    1.4.0beta15-36          14    10400  14.so.0.0[.0]
- *    1.4.0beta37-87          14    10400  14.so.14.0[.0]
- *    1.4.0rc01               14    10400  14.so.14.0[.0]
- *    1.4.0beta88-109         14    10400  14.so.14.0[.0]
- *    1.4.0rc02-08            14    10400  14.so.14.0[.0]
- *    1.4.0                   14    10400  14.so.14.0[.0]
- *    1.4.1beta01-03          14    10401  14.so.14.1[.0]
- *    1.4.1rc01               14    10401  14.so.14.1[.0]
- *    1.4.1beta04-12          14    10401  14.so.14.1[.0]
- *    1.4.1                   14    10401  14.so.14.1[.0]
- *    1.4.2                   14    10402  14.so.14.2[.0]
- *    1.4.3                   14    10403  14.so.14.3[.0]
- *    1.4.4                   14    10404  14.so.14.4[.0]
- *    1.5.0beta01-58          15    10500  15.so.15.0[.0]
- *    1.5.0rc01-07            15    10500  15.so.15.0[.0]
- *    1.5.0                   15    10500  15.so.15.0[.0]
- *    1.5.1beta01-11          15    10501  15.so.15.1[.0]
- *    1.5.1rc01-02            15    10501  15.so.15.1[.0]
- *    1.5.1                   15    10501  15.so.15.1[.0]
- *
- *   Henceforth the source version will match the shared-library major
- *   and minor numbers; the shared-library major version number will be
- *   used for changes in backward compatibility, as it is intended.  The
- *   PNG_LIBPNG_VER macro, which is not used within libpng but is available
- *   for applications, is an unsigned integer of the form xyyzz corresponding
- *   to the source version x.y.z (leading zeros in y and z).  Beta versions
- *   were given the previous public release number plus a letter, until
- *   version 1.0.6j; from then on they were given the upcoming public
- *   release number plus "betaNN" or "rcN".
- *
- *   Binary incompatibility exists only when applications make direct access
- *   to the info_ptr or png_ptr members through png.h, and the compiled
- *   application is loaded with a different version of the library.
- *
- *   DLLNUM will change each time there are forward or backward changes
- *   in binary compatibility (e.g., when a new feature is added).
- *
- * See libpng-manual.txt or libpng.3 for more information.  The PNG
- * specification is available as a W3C Recommendation and as an ISO
- * Specification, <http://www.w3.org/TR/2003/REC-PNG-20031110/
- */
-
-/*
- * COPYRIGHT NOTICE, DISCLAIMER, and LICENSE:
- *
- * If you modify libpng you may insert additional notices immediately following
- * this sentence.
- *
- * This code is released under the libpng license.
- *
- * libpng versions 1.2.6, August 15, 2004, through 1.5.1, February 3, 2011, are
- * Copyright (c) 2004, 2006-2011 Glenn Randers-Pehrson, and are
- * distributed according to the same disclaimer and license as libpng-1.2.5
- * with the following individual added to the list of Contributing Authors:
- *
- *    Cosmin Truta
- *
- * libpng versions 1.0.7, July 1, 2000, through 1.2.5, October 3, 2002, are
- * Copyright (c) 2000-2002 Glenn Randers-Pehrson, and are
- * distributed according to the same disclaimer and license as libpng-1.0.6
- * with the following individuals added to the list of Contributing Authors:
- *
- *    Simon-Pierre Cadieux
- *    Eric S. Raymond
- *    Gilles Vollant
- *
- * and with the following additions to the disclaimer:
- *
- *    There is no warranty against interference with your enjoyment of the
- *    library or against infringement.  There is no warranty that our
- *    efforts or the library will fulfill any of your particular purposes
- *    or needs.  This library is provided with all faults, and the entire
- *    risk of satisfactory quality, performance, accuracy, and effort is with
- *    the user.
- *
- * libpng versions 0.97, January 1998, through 1.0.6, March 20, 2000, are
- * Copyright (c) 1998, 1999, 2000 Glenn Randers-Pehrson, and are
- * distributed according to the same disclaimer and license as libpng-0.96, 
- * with the following individuals added to the list of Contributing Authors:
- *
- *    Tom Lane
- *    Glenn Randers-Pehrson
- *    Willem van Schaik
- *
- * libpng versions 0.89, June 1996, through 0.96, May 1997, are
- * Copyright (c) 1996, 1997 Andreas Dilger
- * Distributed according to the same disclaimer and license as libpng-0.88, 
- * with the following individuals added to the list of Contributing Authors:
- *
- *    John Bowler
- *    Kevin Bracey
- *    Sam Bushell
- *    Magnus Holmgren
- *    Greg Roelofs
- *    Tom Tanner
- *
- * libpng versions 0.5, May 1995, through 0.88, January 1996, are
- * Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.
- *
- * For the purposes of this copyright and license, "Contributing Authors"
- * is defined as the following set of individuals:
- *
- *    Andreas Dilger
- *    Dave Martindale
- *    Guy Eric Schalnat
- *    Paul Schmidt
- *    Tim Wegner
- *
- * The PNG Reference Library is supplied "AS IS".  The Contributing Authors
- * and Group 42, Inc. disclaim all warranties, expressed or implied, 
- * including, without limitation, the warranties of merchantability and of
- * fitness for any purpose.  The Contributing Authors and Group 42, Inc.
- * assume no liability for direct, indirect, incidental, special, exemplary, 
- * or consequential damages, which may result from the use of the PNG
- * Reference Library, even if advised of the possibility of such damage.
- *
- * Permission is hereby granted to use, copy, modify, and distribute this
- * source code, or portions hereof, for any purpose, without fee, subject
- * to the following restrictions:
- *
- *   1. The origin of this source code must not be misrepresented.
- *
- *   2. Altered versions must be plainly marked as such and must not
- *      be misrepresented as being the original source.
- *
- *   3. This Copyright notice may not be removed or altered from
- *      any source or altered source distribution.
- *
- * The Contributing Authors and Group 42, Inc. specifically permit, without
- * fee, and encourage the use of this source code as a component to
- * supporting the PNG file format in commercial products.  If you use this
- * source code in a product, acknowledgment is not required but would be
- * appreciated.
- */
-
-/*
- * A "png_get_copyright" function is available, for convenient use in "about"
- * boxes and the like:
- *
- *     printf("%s", png_get_copyright(NULL));
- *
- * Also, the PNG logo (in PNG format, of course) is supplied in the
- * files "pngbar.png" and "pngbar.jpg (88x31) and "pngnow.png" (98x31).
- */
-
-/*
- * Libpng is OSI Certified Open Source Software.  OSI Certified is a
- * certification mark of the Open Source Initiative.
- */
-
-/*
- * The contributing authors would like to thank all those who helped
- * with testing, bug fixes, and patience.  This wouldn't have been
- * possible without all of you.
- *
- * Thanks to Frank J. T. Wojcik for helping with the documentation.
- */
-
-/*
- * Y2K compliance in libpng:
- * =========================
- *
- *    February 3, 2011
- *
- *    Since the PNG Development group is an ad-hoc body, we can't make
- *    an official declaration.
- *
- *    This is your unofficial assurance that libpng from version 0.71 and
- *    upward through 1.5.1 are Y2K compliant.  It is my belief that
- *    earlier versions were also Y2K compliant.
- *
- *    Libpng only has three year fields.  One is a 2-byte unsigned integer
- *    that will hold years up to 65535.  The other two hold the date in text
- *    format, and will hold years up to 9999.
- *
- *    The integer is
- *        "png_uint_16 year" in png_time_struct.
- *
- *    The strings are
- *        "png_charp time_buffer" in png_struct and
- *        "near_time_buffer", which is a local character string in png.c.
- *
- *    There are seven time-related functions:
- *        png.c: png_convert_to_rfc_1123() in png.c
- *          (formerly png_convert_to_rfc_1152() in error)
- *        png_convert_from_struct_tm() in pngwrite.c, called in pngwrite.c
- *        png_convert_from_time_t() in pngwrite.c
- *        png_get_tIME() in pngget.c
- *        png_handle_tIME() in pngrutil.c, called in pngread.c
- *        png_set_tIME() in pngset.c
- *        png_write_tIME() in pngwutil.c, called in pngwrite.c
- *
- *    All handle dates properly in a Y2K environment.  The
- *    png_convert_from_time_t() function calls gmtime() to convert from system
- *    clock time, which returns (year - 1900), which we properly convert to
- *    the full 4-digit year.  There is a possibility that applications using
- *    libpng are not passing 4-digit years into the png_convert_to_rfc_1123()
- *    function, or that they are incorrectly passing only a 2-digit year
- *    instead of "year - 1900" into the png_convert_from_struct_tm() function, 
- *    but this is not under our control.  The libpng documentation has always
- *    stated that it works with 4-digit years, and the APIs have been
- *    documented as such.
- *
- *    The tIME chunk itself is also Y2K compliant.  It uses a 2-byte unsigned
- *    integer to hold the year, and can hold years as large as 65535.
- *
- *    zlib, upon which libpng depends, is also Y2K compliant.  It contains
- *    no date-related code.
- *
- *       Glenn Randers-Pehrson
- *       libpng maintainer
- *       PNG Development Group
- */
-
-#ifndef PNG_H
-#define PNG_H
-
-/* This is not the place to learn how to use libpng. The file libpng-manual.txt
- * describes how to use libpng, and the file example.c summarizes it
- * with some code on which to build.  This file is useful for looking
- * at the actual function definitions and structure components.
- */
-
-/* Version information for png.h - this should match the version in png.c */
-#define PNG_LIBPNG_VER_STRING "1.5.1"
-#define PNG_HEADER_VERSION_STRING \
-     " libpng version 1.5.1 - February 3, 2011\n"
-
-#define PNG_LIBPNG_VER_SONUM   15
-#define PNG_LIBPNG_VER_DLLNUM  15
-
-/* These should match the first 3 components of PNG_LIBPNG_VER_STRING: */
-#define PNG_LIBPNG_VER_MAJOR   1
-#define PNG_LIBPNG_VER_MINOR   5
-#define PNG_LIBPNG_VER_RELEASE 1
-/* This should match the numeric part of the final component of
- * PNG_LIBPNG_VER_STRING, omitting any leading zero:
- */
-
-#define PNG_LIBPNG_VER_BUILD  0
-
-/* Release Status */
-#define PNG_LIBPNG_BUILD_ALPHA    1
-#define PNG_LIBPNG_BUILD_BETA     2
-#define PNG_LIBPNG_BUILD_RC       3
-#define PNG_LIBPNG_BUILD_STABLE   4
-#define PNG_LIBPNG_BUILD_RELEASE_STATUS_MASK 7
-
-/* Release-Specific Flags */
-#define PNG_LIBPNG_BUILD_PATCH    8 /* Can be OR'ed with
-                                       PNG_LIBPNG_BUILD_STABLE only */
-#define PNG_LIBPNG_BUILD_PRIVATE 16 /* Cannot be OR'ed with
-                                       PNG_LIBPNG_BUILD_SPECIAL */
-#define PNG_LIBPNG_BUILD_SPECIAL 32 /* Cannot be OR'ed with
-                                       PNG_LIBPNG_BUILD_PRIVATE */
-
-#define PNG_LIBPNG_BUILD_BASE_TYPE PNG_LIBPNG_BUILD_BETA
-
-/* Careful here.  At one time, Guy wanted to use 082, but that would be octal.
- * We must not include leading zeros.
- * Versions 0.7 through 1.0.0 were in the range 0 to 100 here (only
- * version 1.0.0 was mis-numbered 100 instead of 10000).  From
- * version 1.0.1 it's    xxyyzz, where x=major, y=minor, z=release
- */
-#define PNG_LIBPNG_VER 10501 /* 1.5.1 */
-
-/* Library configuration: these options cannot be changed after
- * the library has been built.
- */
-#ifndef PNGLCONF_H
-    /* If pnglibconf.h is missing, you can
-     * copy scripts/pnglibconf.h.prebuilt to pnglibconf.h
-     */
-#   include "pnglibconf.h"
-#endif
-
-#ifndef PNG_VERSION_INFO_ONLY
-/* Standard header files (not needed for the version info) */
-#  ifdef PNG_SETJMP_SUPPORTED
-#    include <setjmp.h>
-#  endif
-
-/* Need the time information for converting tIME chunks, it
- * defines struct tm:
- */
-#ifdef PNG_CONVERT_tIME_SUPPORTED
-   /* "time.h" functions are not supported on all operating systems */
-#  include <time.h>
-#endif
-
-/* Machine specific configuration. */
-#  include "pngconf.h"
-#endif
-
-/*
- * Added at libpng-1.2.8
- *
- * Ref MSDN: Private as priority over Special
- * VS_FF_PRIVATEBUILD File *was not* built using standard release
- * procedures. If this value is given, the StringFileInfo block must
- * contain a PrivateBuild string.
- *
- * VS_FF_SPECIALBUILD File *was* built by the original company using
- * standard release procedures but is a variation of the standard
- * file of the same version number. If this value is given, the
- * StringFileInfo block must contain a SpecialBuild string.
- */
-
-#ifdef PNG_USER_PRIVATEBUILD /* From pnglibconf.h */
-#  define PNG_LIBPNG_BUILD_TYPE \
-       (PNG_LIBPNG_BUILD_BASE_TYPE | PNG_LIBPNG_BUILD_PRIVATE)
-#else
-#  ifdef PNG_LIBPNG_SPECIALBUILD
-#    define PNG_LIBPNG_BUILD_TYPE \
-         (PNG_LIBPNG_BUILD_BASE_TYPE | PNG_LIBPNG_BUILD_SPECIAL)
-#  else
-#    define PNG_LIBPNG_BUILD_TYPE (PNG_LIBPNG_BUILD_BASE_TYPE)
-#  endif
-#endif
-
-#ifndef PNG_VERSION_INFO_ONLY
-
-/* Inhibit C++ name-mangling for libpng functions but not for system calls. */
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/* Version information for C files, stored in png.c.  This had better match
- * the version above.
- */
-#define png_libpng_ver png_get_header_ver(NULL)
-
-/* This file is arranged in several sections:
- *
- * 1. Any configuration options that can be specified by for the application
- *    code when it is built.  (Build time configuration is in pnglibconf.h)
- * 2. Type definitions (base types are defined in pngconf.h), structure
- *    definitions.
- * 3. Exported library functions.
- *
- * The library source code has additional files (principally pngpriv.h) that
- * allow configuration of the library.
- */
-/* Section 1: run time configuration
- * See pnglibconf.h for build time configuration
- *
- * Run time configuration allows the application to choose between
- * implementations of certain arithmetic APIs.  The default is set
- * at build time and recorded in pnglibconf.h, but it is safe to
- * override these (and only these) settings.  Note that this won't
- * change what the library does, only application code, and the
- * settings can (and probably should) be made on a per-file basis
- * by setting the #defines before including png.h
- *
- * Use macros to read integers from PNG data or use the exported
- * functions?
- *   PNG_USE_READ_MACROS: use the macros (see below)  Note that
- *     the macros evaluate their argument multiple times.
- *   PNG_NO_USE_READ_MACROS: call the relevant library function.
- *
- * Use the alternative algorithm for compositing alpha samples that
- * does not use division?
- *   PNG_READ_COMPOSITE_NODIV_SUPPORTED: use the 'no division'
- *      algorithm.
- *   PNG_NO_READ_COMPOSITE_NODIV: use the 'division' algorithm.
- *
- * How to handle benign errors if PNG_ALLOW_BENIGN_ERRORS is
- * false?
- *   PNG_ALLOW_BENIGN_ERRORS: map calls to the benign error
- *      APIs to png_warning.
- * Otherwise the calls are mapped to png_error.
- */
-
-/* Section 2: type definitions, including structures and compile time
- * constants.
- * See pngconf.h for base types that vary by machine/system
- */
-
-/* This triggers a compiler error in png.c, if png.c and png.h
- * do not agree upon the version number.
- */
-typedef char* png_libpng_version_1_5_1;
-
-/* Three color definitions.  The order of the red, green, and blue, (and the
- * exact size) is not important, although the size of the fields need to
- * be png_byte or png_uint_16 (as defined below).
- */
-typedef struct png_color_struct
-{
-   png_byte red;
-   png_byte green;
-   png_byte blue;
-} png_color;
-typedef png_color FAR * png_colorp;
-typedef PNG_CONST png_color FAR * png_const_colorp;
-typedef png_color FAR * FAR * png_colorpp;
-
-typedef struct png_color_16_struct
-{
-   png_byte index;    /* used for palette files */
-   png_uint_16 red;   /* for use in red green blue files */
-   png_uint_16 green;
-   png_uint_16 blue;
-   png_uint_16 gray;  /* for use in grayscale files */
-} png_color_16;
-typedef png_color_16 FAR * png_color_16p;
-typedef PNG_CONST png_color_16 FAR * png_const_color_16p;
-typedef png_color_16 FAR * FAR * png_color_16pp;
-
-typedef struct png_color_8_struct
-{
-   png_byte red;   /* for use in red green blue files */
-   png_byte green;
-   png_byte blue;
-   png_byte gray;  /* for use in grayscale files */
-   png_byte alpha; /* for alpha channel files */
-} png_color_8;
-typedef png_color_8 FAR * png_color_8p;
-typedef PNG_CONST png_color_8 FAR * png_const_color_8p;
-typedef png_color_8 FAR * FAR * png_color_8pp;
-
-/*
- * The following two structures are used for the in-core representation
- * of sPLT chunks.
- */
-typedef struct png_sPLT_entry_struct
-{
-   png_uint_16 red;
-   png_uint_16 green;
-   png_uint_16 blue;
-   png_uint_16 alpha;
-   png_uint_16 frequency;
-} png_sPLT_entry;
-typedef png_sPLT_entry FAR * png_sPLT_entryp;
-typedef PNG_CONST png_sPLT_entry FAR * png_const_sPLT_entryp;
-typedef png_sPLT_entry FAR * FAR * png_sPLT_entrypp;
-
-/*  When the depth of the sPLT palette is 8 bits, the color and alpha samples
- *  occupy the LSB of their respective members, and the MSB of each member
- *  is zero-filled.  The frequency member always occupies the full 16 bits.
- */
-
-typedef struct png_sPLT_struct
-{
-   png_charp name;           /* palette name */
-   png_byte depth;           /* depth of palette samples */
-   png_sPLT_entryp entries;  /* palette entries */
-   png_int_32 nentries;      /* number of palette entries */
-} png_sPLT_t;
-typedef png_sPLT_t FAR * png_sPLT_tp;
-typedef PNG_CONST png_sPLT_t FAR * png_const_sPLT_tp;
-typedef png_sPLT_t FAR * FAR * png_sPLT_tpp;
-
-#ifdef PNG_TEXT_SUPPORTED
-/* png_text holds the contents of a text/ztxt/itxt chunk in a PNG file, 
- * and whether that contents is compressed or not.  The "key" field
- * points to a regular zero-terminated C string.  The "text", "lang", and
- * "lang_key" fields can be regular C strings, empty strings, or NULL pointers.
- * However, the * structure returned by png_get_text() will always contain
- * regular zero-terminated C strings (possibly empty), never NULL pointers, 
- * so they can be safely used in printf() and other string-handling functions.
- */
-typedef struct png_text_struct
-{
-   int  compression;       /* compression value:
-                             -1: tEXt, none
-                              0: zTXt, deflate
-                              1: iTXt, none
-                              2: iTXt, deflate  */
-   png_charp key;          /* keyword, 1-79 character description of "text" */
-   png_charp text;         /* comment, may be an empty string (ie "")
-                              or a NULL pointer */
-   png_size_t text_length; /* length of the text string */
-   png_size_t itxt_length; /* length of the itxt string */
-   png_charp lang;         /* language code, 0-79 characters
-                              or a NULL pointer */
-   png_charp lang_key;     /* keyword translated UTF-8 string, 0 or more
-                              chars or a NULL pointer */
-} png_text;
-typedef png_text FAR * png_textp;
-typedef PNG_CONST png_text FAR * png_const_textp;
-typedef png_text FAR * FAR * png_textpp;
-#endif
-
-/* Supported compression types for text in PNG files (tEXt, and zTXt).
- * The values of the PNG_TEXT_COMPRESSION_ defines should NOT be changed. */
-#define PNG_TEXT_COMPRESSION_NONE_WR -3
-#define PNG_TEXT_COMPRESSION_zTXt_WR -2
-#define PNG_TEXT_COMPRESSION_NONE    -1
-#define PNG_TEXT_COMPRESSION_zTXt     0
-#define PNG_ITXT_COMPRESSION_NONE     1
-#define PNG_ITXT_COMPRESSION_zTXt     2
-#define PNG_TEXT_COMPRESSION_LAST     3  /* Not a valid value */
-
-/* png_time is a way to hold the time in an machine independent way.
- * Two conversions are provided, both from time_t and struct tm.  There
- * is no portable way to convert to either of these structures, as far
- * as I know.  If you know of a portable way, send it to me.  As a side
- * note - PNG has always been Year 2000 compliant!
- */
-typedef struct png_time_struct
-{
-   png_uint_16 year; /* full year, as in, 1995 */
-   png_byte month;   /* month of year, 1 - 12 */
-   png_byte day;     /* day of month, 1 - 31 */
-   png_byte hour;    /* hour of day, 0 - 23 */
-   png_byte minute;  /* minute of hour, 0 - 59 */
-   png_byte second;  /* second of minute, 0 - 60 (for leap seconds) */
-} png_time;
-typedef png_time FAR * png_timep;
-typedef PNG_CONST png_time FAR * png_const_timep;
-typedef png_time FAR * FAR * png_timepp;
-
-#if defined(PNG_UNKNOWN_CHUNKS_SUPPORTED) || \
-    defined(PNG_HANDLE_AS_UNKNOWN_SUPPORTED)
-/* png_unknown_chunk is a structure to hold queued chunks for which there is
- * no specific support.  The idea is that we can use this to queue
- * up private chunks for output even though the library doesn't actually
- * know about their semantics.
- */
-typedef struct png_unknown_chunk_t
-{
-    png_byte name[5];
-    png_byte *data;
-    png_size_t size;
-
-    /* libpng-using applications should NOT directly modify this byte. */
-    png_byte location; /* mode of operation at read time */
-}
-png_unknown_chunk;
-typedef png_unknown_chunk FAR * png_unknown_chunkp;
-typedef PNG_CONST png_unknown_chunk FAR * png_const_unknown_chunkp;
-typedef png_unknown_chunk FAR * FAR * png_unknown_chunkpp;
-#endif
-
-typedef struct png_info_def png_info;
-typedef png_info FAR * png_infop;
-typedef PNG_CONST png_info FAR * png_const_infop;
-typedef png_info FAR * FAR * png_infopp;
-
-/* Maximum positive integer used in PNG is (2^31)-1 */
-#define PNG_UINT_31_MAX ((png_uint_32)0x7fffffffL)
-#define PNG_UINT_32_MAX ((png_uint_32)(-1))
-#define PNG_SIZE_MAX ((png_size_t)(-1))
-
-/* These are constants for fixed point values encoded in the
- * PNG specification manner (x100000)
- */
-#define PNG_FP_1    100000
-#define PNG_FP_HALF  50000
-
-/* These describe the color_type field in png_info. */
-/* color type masks */
-#define PNG_COLOR_MASK_PALETTE    1
-#define PNG_COLOR_MASK_COLOR      2
-#define PNG_COLOR_MASK_ALPHA      4
-
-/* color types.  Note that not all combinations are legal */
-#define PNG_COLOR_TYPE_GRAY 0
-#define PNG_COLOR_TYPE_PALETTE  (PNG_COLOR_MASK_COLOR | PNG_COLOR_MASK_PALETTE)
-#define PNG_COLOR_TYPE_RGB        (PNG_COLOR_MASK_COLOR)
-#define PNG_COLOR_TYPE_RGB_ALPHA  (PNG_COLOR_MASK_COLOR | PNG_COLOR_MASK_ALPHA)
-#define PNG_COLOR_TYPE_GRAY_ALPHA (PNG_COLOR_MASK_ALPHA)
-/* aliases */
-#define PNG_COLOR_TYPE_RGBA  PNG_COLOR_TYPE_RGB_ALPHA
-#define PNG_COLOR_TYPE_GA  PNG_COLOR_TYPE_GRAY_ALPHA
-
-/* This is for compression type. PNG 1.0-1.2 only define the single type. */
-#define PNG_COMPRESSION_TYPE_BASE 0 /* Deflate method 8, 32K window */
-#define PNG_COMPRESSION_TYPE_DEFAULT PNG_COMPRESSION_TYPE_BASE
-
-/* This is for filter type. PNG 1.0-1.2 only define the single type. */
-#define PNG_FILTER_TYPE_BASE      0 /* Single row per-byte filtering */
-#define PNG_INTRAPIXEL_DIFFERENCING 64 /* Used only in MNG datastreams */
-#define PNG_FILTER_TYPE_DEFAULT   PNG_FILTER_TYPE_BASE
-
-/* These are for the interlacing type.  These values should NOT be changed. */
-#define PNG_INTERLACE_NONE        0 /* Non-interlaced image */
-#define PNG_INTERLACE_ADAM7       1 /* Adam7 interlacing */
-#define PNG_INTERLACE_LAST        2 /* Not a valid value */
-
-/* These are for the oFFs chunk.  These values should NOT be changed. */
-#define PNG_OFFSET_PIXEL          0 /* Offset in pixels */
-#define PNG_OFFSET_MICROMETER     1 /* Offset in micrometers (1/10^6 meter) */
-#define PNG_OFFSET_LAST           2 /* Not a valid value */
-
-/* These are for the pCAL chunk.  These values should NOT be changed. */
-#define PNG_EQUATION_LINEAR       0 /* Linear transformation */
-#define PNG_EQUATION_BASE_E       1 /* Exponential base e transform */
-#define PNG_EQUATION_ARBITRARY    2 /* Arbitrary base exponential transform */
-#define PNG_EQUATION_HYPERBOLIC   3 /* Hyperbolic sine transformation */
-#define PNG_EQUATION_LAST         4 /* Not a valid value */
-
-/* These are for the sCAL chunk.  These values should NOT be changed. */
-#define PNG_SCALE_UNKNOWN         0 /* unknown unit (image scale) */
-#define PNG_SCALE_METER           1 /* meters per pixel */
-#define PNG_SCALE_RADIAN          2 /* radians per pixel */
-#define PNG_SCALE_LAST            3 /* Not a valid value */
-
-/* These are for the pHYs chunk.  These values should NOT be changed. */
-#define PNG_RESOLUTION_UNKNOWN    0 /* pixels/unknown unit (aspect ratio) */
-#define PNG_RESOLUTION_METER      1 /* pixels/meter */
-#define PNG_RESOLUTION_LAST       2 /* Not a valid value */
-
-/* These are for the sRGB chunk.  These values should NOT be changed. */
-#define PNG_sRGB_INTENT_PERCEPTUAL 0
-#define PNG_sRGB_INTENT_RELATIVE   1
-#define PNG_sRGB_INTENT_SATURATION 2
-#define PNG_sRGB_INTENT_ABSOLUTE   3
-#define PNG_sRGB_INTENT_LAST       4 /* Not a valid value */
-
-/* This is for text chunks */
-#define PNG_KEYWORD_MAX_LENGTH     79
-
-/* Maximum number of entries in PLTE/sPLT/tRNS arrays */
-#define PNG_MAX_PALETTE_LENGTH    256
-
-/* These determine if an ancillary chunk's data has been successfully read
- * from the PNG header, or if the application has filled in the corresponding
- * data in the info_struct to be written into the output file.  The values
- * of the PNG_INFO_<chunk> defines should NOT be changed.
- */
-#define PNG_INFO_gAMA 0x0001
-#define PNG_INFO_sBIT 0x0002
-#define PNG_INFO_cHRM 0x0004
-#define PNG_INFO_PLTE 0x0008
-#define PNG_INFO_tRNS 0x0010
-#define PNG_INFO_bKGD 0x0020
-#define PNG_INFO_hIST 0x0040
-#define PNG_INFO_pHYs 0x0080
-#define PNG_INFO_oFFs 0x0100
-#define PNG_INFO_tIME 0x0200
-#define PNG_INFO_pCAL 0x0400
-#define PNG_INFO_sRGB 0x0800   /* GR-P, 0.96a */
-#define PNG_INFO_iCCP 0x1000   /* ESR, 1.0.6 */
-#define PNG_INFO_sPLT 0x2000   /* ESR, 1.0.6 */
-#define PNG_INFO_sCAL 0x4000   /* ESR, 1.0.6 */
-#define PNG_INFO_IDAT 0x8000L  /* ESR, 1.0.6 */
-
-/* This is used for the transformation routines, as some of them
- * change these values for the row.  It also should enable using
- * the routines for other purposes.
- */
-typedef struct png_row_info_struct
-{
-   png_uint_32 width;    /* width of row */
-   png_size_t rowbytes;  /* number of bytes in row */
-   png_byte color_type;  /* color type of row */
-   png_byte bit_depth;   /* bit depth of row */
-   png_byte channels;    /* number of channels (1, 2, 3, or 4) */
-   png_byte pixel_depth; /* bits per pixel (depth * channels) */
-} png_row_info;
-
-typedef png_row_info FAR * png_row_infop;
-typedef png_row_info FAR * FAR * png_row_infopp;
-
-/* These are the function types for the I/O functions and for the functions
- * that allow the user to override the default I/O functions with his or her
- * own.  The png_error_ptr type should match that of user-supplied warning
- * and error functions, while the png_rw_ptr type should match that of the
- * user read/write data functions.  Note that the 'write' function must not
- * modify the buffer it is passed. The 'read' function, on the other hand, is
- * expected to return the read data in the buffer.
- */
-typedef struct png_struct_def png_struct;
-typedef PNG_CONST png_struct FAR * png_const_structp;
-typedef png_struct FAR * png_structp;
-
-typedef PNG_CALLBACK(void, *png_error_ptr, (png_structp, png_const_charp), );
-typedef PNG_CALLBACK(void, *png_rw_ptr, (png_structp, png_bytep, png_size_t), );
-typedef PNG_CALLBACK(void, *png_flush_ptr, (png_structp), );
-typedef PNG_CALLBACK(void, *png_read_status_ptr, (png_structp, png_uint_32, 
-    int), );
-typedef PNG_CALLBACK(void, *png_write_status_ptr, (png_structp, png_uint_32, 
-    int), );
-
-#ifdef PNG_PROGRESSIVE_READ_SUPPORTED
-typedef PNG_CALLBACK(void, *png_progressive_info_ptr, 
-    (png_structp, png_infop), );
-typedef PNG_CALLBACK(void, *png_progressive_end_ptr,
-    (png_structp, png_infop), );
-typedef PNG_CALLBACK(void, *png_progressive_row_ptr,
-    (png_structp, png_bytep, png_uint_32, int), );
-#endif
-
-#if defined(PNG_READ_USER_TRANSFORM_SUPPORTED) || \
-    defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED)
-typedef PNG_CALLBACK(void, *png_user_transform_ptr,
-    (png_structp, png_row_infop, png_bytep), );
-#endif
-
-#ifdef PNG_USER_CHUNKS_SUPPORTED
-typedef PNG_CALLBACK(int, *png_user_chunk_ptr, (png_structp, 
-    png_unknown_chunkp), );
-#endif
-#ifdef PNG_UNKNOWN_CHUNKS_SUPPORTED
-typedef PNG_CALLBACK(void, *png_unknown_chunk_ptr, (png_structp), );
-#endif
-
-#ifdef PNG_SETJMP_SUPPORTED
-/* This must match the function definition in <setjmp.h>, and the
- * application must include this before png.h to obtain the definition
- * of jmp_buf.  The function is required to be PNG_NORETURN.  (Note that
- * PNG_PTR_NORETURN is used here because current versions of the Microsoft
- * C compiler do not support the PNG_NORETURN attribute on a pointer.)
- *
- * If you get a type warning from the compiler when linking against this line
- * then your compiler has 'longjmp' that does not match the requirements of the
- * compiler that built libpng.  You will have to write a wrapper function for
- * your compiler's longjmp and call png_set_longjmp_fn directly (not via the
- * png_jmpbuf macro.)
- *
- * If you get a warning here while building the library you will need to make
- * changes to ensure that pnglibconf.h records the calling convention used by
- * your compiler.  This may be very difficult - try using a different compiler
- * to build the library!
- */
-typedef PNG_FUNCTION(void, (PNGCAPI *png_longjmp_ptr), PNGARG((jmp_buf, int)), 
-   PNG_PTR_NORETURN);
-#endif
-
-/* Transform masks for the high-level interface */
-#define PNG_TRANSFORM_IDENTITY       0x0000    /* read and write */
-#define PNG_TRANSFORM_STRIP_16       0x0001    /* read only */
-#define PNG_TRANSFORM_STRIP_ALPHA    0x0002    /* read only */
-#define PNG_TRANSFORM_PACKING        0x0004    /* read and write */
-#define PNG_TRANSFORM_PACKSWAP       0x0008    /* read and write */
-#define PNG_TRANSFORM_EXPAND         0x0010    /* read only */
-#define PNG_TRANSFORM_INVERT_MONO    0x0020    /* read and write */
-#define PNG_TRANSFORM_SHIFT          0x0040    /* read and write */
-#define PNG_TRANSFORM_BGR            0x0080    /* read and write */
-#define PNG_TRANSFORM_SWAP_ALPHA     0x0100    /* read and write */
-#define PNG_TRANSFORM_SWAP_ENDIAN    0x0200    /* read and write */
-#define PNG_TRANSFORM_INVERT_ALPHA   0x0400    /* read and write */
-#define PNG_TRANSFORM_STRIP_FILLER   0x0800    /* write only */
-/* Added to libpng-1.2.34 */
-#define PNG_TRANSFORM_STRIP_FILLER_BEFORE PNG_TRANSFORM_STRIP_FILLER
-#define PNG_TRANSFORM_STRIP_FILLER_AFTER 0x1000 /* write only */
-/* Added to libpng-1.4.0 */
-#define PNG_TRANSFORM_GRAY_TO_RGB   0x2000      /* read only */
-
-/* Flags for MNG supported features */
-#define PNG_FLAG_MNG_EMPTY_PLTE     0x01
-#define PNG_FLAG_MNG_FILTER_64      0x04
-#define PNG_ALL_MNG_FEATURES        0x05
-
-/* NOTE: prior to 1.5 these functions had no 'API' style declaration, 
- * this allowed the zlib default functions to be used on Windows
- * platforms.  In 1.5 the zlib default malloc (which just calls malloc and
- * ignores the first argument) should be completely compatible with the
- * following.
- */
-typedef PNG_CALLBACK(png_voidp, *png_malloc_ptr, (png_structp, 
-    png_alloc_size_t), );
-typedef PNG_CALLBACK(void, *png_free_ptr, (png_structp, png_voidp), );
-
-typedef png_struct FAR * FAR * png_structpp;
-
-/* Section 3: exported functions
- * Here are the function definitions most commonly used.  This is not
- * the place to find out how to use libpng.  See libpng-manual.txt for the
- * full explanation, see example.c for the summary.  This just provides
- * a simple one line description of the use of each function.
- *
- * The PNG_EXPORT() and PNG_EXPORTA() macros used below are defined in
- * pngconf.h and in the *.dfn files in the scripts directory.
- *
- *   PNG_EXPORT(ordinal, type, name, (args));
- *
- *       ordinal:    ordinal that is used while building
- *                   *.def files. The ordinal value is only
- *                   relevant when preprocessing png.h with
- *                   the *.dfn files for building symbol table
- *                   entries, and are removed by pngconf.h.
- *       type:       return type of the function
- *       name:       function name
- *       args:       function arguments, with types
- *
- * When we wish to append attributes to a function prototype we use
- * the PNG_EXPORTA() macro instead.
- *
- *   PNG_EXPORTA(ordinal, type, name, (args), attributes);
- *
- *       ordinal, type, name, and args: same as in PNG_EXPORT().
- *       attributes: function attributes
- */
-
-/* Returns the version number of the library */
-PNG_EXPORT(1, png_uint_32, png_access_version_number, (void));
-
-/* Tell lib we have already handled the first <num_bytes> magic bytes.
- * Handling more than 8 bytes from the beginning of the file is an error.
- */
-PNG_EXPORT(2, void, png_set_sig_bytes, (png_structp png_ptr, int num_bytes));
-
-/* Check sig[start] through sig[start + num_to_check - 1] to see if it's a
- * PNG file.  Returns zero if the supplied bytes match the 8-byte PNG
- * signature, and non-zero otherwise.  Having num_to_check == 0 or
- * start > 7 will always fail (ie return non-zero).
- */
-PNG_EXPORT(3, int, png_sig_cmp, (png_const_bytep sig, png_size_t start, 
-    png_size_t num_to_check));
-
-/* Simple signature checking function.  This is the same as calling
- * png_check_sig(sig, n) := !png_sig_cmp(sig, 0, n).
- */
-#define png_check_sig(sig, n) !png_sig_cmp((sig), 0, (n))
-
-/* Allocate and initialize png_ptr struct for reading, and any other memory. */
-PNG_EXPORTA(4, png_structp, png_create_read_struct,
-    (png_const_charp user_png_ver, png_voidp error_ptr,
-    png_error_ptr error_fn, png_error_ptr warn_fn), 
-    PNG_ALLOCATED);
-
-/* Allocate and initialize png_ptr struct for writing, and any other memory */
-PNG_EXPORTA(5, png_structp, png_create_write_struct,
-    (png_const_charp user_png_ver, png_voidp error_ptr, png_error_ptr error_fn,
-    png_error_ptr warn_fn), 
-    PNG_ALLOCATED);
-
-PNG_EXPORT(6, png_size_t, png_get_compression_buffer_size,
-    (png_const_structp png_ptr));
-
-PNG_EXPORT(7, void, png_set_compression_buffer_size, (png_structp png_ptr, 
-    png_size_t size));
-
-/* Moved from pngconf.h in 1.4.0 and modified to ensure setjmp/longjmp
- * match up.
- */
-#ifdef PNG_SETJMP_SUPPORTED
-/* This function returns the jmp_buf built in to *png_ptr.  It must be
- * supplied with an appropriate 'longjmp' function to use on that jmp_buf
- * unless the default error function is overridden in which case NULL is
- * acceptable.  The size of the jmp_buf is checked against the actual size
- * allocated by the library - the call will return NULL on a mismatch
- * indicating an ABI mismatch.
- */
-PNG_EXPORT(8, jmp_buf*, png_set_longjmp_fn, (png_structp png_ptr, 
-    png_longjmp_ptr longjmp_fn, size_t jmp_buf_size));
-#  define png_jmpbuf(png_ptr) \
-      (*png_set_longjmp_fn((png_ptr), longjmp, sizeof (jmp_buf)))
-#else
-#  define png_jmpbuf(png_ptr) \
-      (LIBPNG_WAS_COMPILED_WITH__PNG_NO_SETJMP)
-#endif
-/* This function should be used by libpng applications in place of
- * longjmp(png_ptr->jmpbuf, val).  If longjmp_fn() has been set, it
- * will use it; otherwise it will call PNG_ABORT().  This function was
- * added in libpng-1.5.0.
- */
-PNG_EXPORTA(9, void, png_longjmp, (png_structp png_ptr, int val),
-    PNG_NORETURN);
-
-#ifdef PNG_READ_SUPPORTED
-/* Reset the compression stream */
-PNG_EXPORT(10, int, png_reset_zstream, (png_structp png_ptr));
-#endif
-
-/* New functions added in libpng-1.0.2 (not enabled by default until 1.2.0) */
-#ifdef PNG_USER_MEM_SUPPORTED
-PNG_EXPORTA(11, png_structp, png_create_read_struct_2,
-    (png_const_charp user_png_ver, png_voidp error_ptr, png_error_ptr error_fn,
-    png_error_ptr warn_fn, 
-    png_voidp mem_ptr, png_malloc_ptr malloc_fn, png_free_ptr free_fn), 
-    PNG_ALLOCATED);
-PNG_EXPORTA(12, png_structp, png_create_write_struct_2,
-    (png_const_charp user_png_ver, png_voidp error_ptr, png_error_ptr error_fn,
-    png_error_ptr warn_fn, 
-    png_voidp mem_ptr, png_malloc_ptr malloc_fn, png_free_ptr free_fn), 
-    PNG_ALLOCATED);
-#endif
-
-/* Write the PNG file signature. */
-PNG_EXPORT(13, void, png_write_sig, (png_structp png_ptr));
-
-/* Write a PNG chunk - size, type, (optional) data, CRC. */
-PNG_EXPORT(14, void, png_write_chunk, (png_structp png_ptr, png_const_bytep
-    chunk_name, png_const_bytep data, png_size_t length));
-
-/* Write the start of a PNG chunk - length and chunk name. */
-PNG_EXPORT(15, void, png_write_chunk_start, (png_structp png_ptr, 
-    png_const_bytep chunk_name, png_uint_32 length));
-
-/* Write the data of a PNG chunk started with png_write_chunk_start(). */
-PNG_EXPORT(16, void, png_write_chunk_data, (png_structp png_ptr,
-    png_const_bytep data, png_size_t length));
-
-/* Finish a chunk started with png_write_chunk_start() (includes CRC). */
-PNG_EXPORT(17, void, png_write_chunk_end, (png_structp png_ptr));
-
-/* Allocate and initialize the info structure */
-PNG_EXPORTA(18, png_infop, png_create_info_struct, (png_structp png_ptr), 
-    PNG_ALLOCATED);
-
-PNG_EXPORT(19, void, png_info_init_3, (png_infopp info_ptr, 
-    png_size_t png_info_struct_size));
-
-/* Writes all the PNG information before the image. */
-PNG_EXPORT(20, void, png_write_info_before_PLTE,
-    (png_structp png_ptr, png_infop info_ptr));
-PNG_EXPORT(21, void, png_write_info,
-    (png_structp png_ptr, png_infop info_ptr));
-
-#ifdef PNG_SEQUENTIAL_READ_SUPPORTED
-/* Read the information before the actual image data. */
-PNG_EXPORT(22, void, png_read_info,
-    (png_structp png_ptr, png_infop info_ptr));
-#endif
-
-#ifdef PNG_TIME_RFC1123_SUPPORTED
-PNG_EXPORT(23, png_const_charp, png_convert_to_rfc1123,
-    (png_structp png_ptr, 
-    png_const_timep ptime));
-#endif
-
-#ifdef PNG_CONVERT_tIME_SUPPORTED
-/* Convert from a struct tm to png_time */
-PNG_EXPORT(24, void, png_convert_from_struct_tm, (png_timep ptime, 
-    PNG_CONST struct tm FAR * ttime));
-
-/* Convert from time_t to png_time.  Uses gmtime() */
-PNG_EXPORT(25, void, png_convert_from_time_t,
-    (png_timep ptime, time_t ttime));
-#endif /* PNG_CONVERT_tIME_SUPPORTED */
-
-#ifdef PNG_READ_EXPAND_SUPPORTED
-/* Expand data to 24-bit RGB, or 8-bit grayscale, with alpha if available. */
-PNG_EXPORT(26, void, png_set_expand, (png_structp png_ptr));
-PNG_EXPORT(27, void, png_set_expand_gray_1_2_4_to_8, (png_structp png_ptr));
-PNG_EXPORT(28, void, png_set_palette_to_rgb, (png_structp png_ptr));
-PNG_EXPORT(29, void, png_set_tRNS_to_alpha, (png_structp png_ptr));
-#endif
-
-#if defined(PNG_READ_BGR_SUPPORTED) || defined(PNG_WRITE_BGR_SUPPORTED)
-/* Use blue, green, red order for pixels. */
-PNG_EXPORT(30, void, png_set_bgr, (png_structp png_ptr));
-#endif
-
-#ifdef PNG_READ_GRAY_TO_RGB_SUPPORTED
-/* Expand the grayscale to 24-bit RGB if necessary. */
-PNG_EXPORT(31, void, png_set_gray_to_rgb, (png_structp png_ptr));
-#endif
-
-#ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED
-/* Reduce RGB to grayscale. */
-PNG_FP_EXPORT(32, void, png_set_rgb_to_gray, (png_structp png_ptr,
-    int error_action, double red, double green));
-PNG_FIXED_EXPORT(33, void, png_set_rgb_to_gray_fixed, (png_structp png_ptr, 
-    int error_action, png_fixed_point red, png_fixed_point green));
-
-PNG_EXPORT(34, png_byte, png_get_rgb_to_gray_status, (png_const_structp
-    png_ptr));
-#endif
-
-PNG_EXPORT(35, void, png_build_grayscale_palette, (int bit_depth, 
-    png_colorp palette));
-
-#ifdef PNG_READ_STRIP_ALPHA_SUPPORTED
-PNG_EXPORT(36, void, png_set_strip_alpha, (png_structp png_ptr));
-#endif
-
-#if defined(PNG_READ_SWAP_ALPHA_SUPPORTED) || \
-    defined(PNG_WRITE_SWAP_ALPHA_SUPPORTED)
-PNG_EXPORT(37, void, png_set_swap_alpha, (png_structp png_ptr));
-#endif
-
-#if defined(PNG_READ_INVERT_ALPHA_SUPPORTED) || \
-    defined(PNG_WRITE_INVERT_ALPHA_SUPPORTED)
-PNG_EXPORT(38, void, png_set_invert_alpha, (png_structp png_ptr));
-#endif
-
-#if defined(PNG_READ_FILLER_SUPPORTED) || defined(PNG_WRITE_FILLER_SUPPORTED)
-/* Add a filler byte to 8-bit Gray or 24-bit RGB images. */
-PNG_EXPORT(39, void, png_set_filler, (png_structp png_ptr, png_uint_32 filler, 
-    int flags));
-/* The values of the PNG_FILLER_ defines should NOT be changed */
-#  define PNG_FILLER_BEFORE 0
-#  define PNG_FILLER_AFTER 1
-/* Add an alpha byte to 8-bit Gray or 24-bit RGB images. */
-PNG_EXPORT(40, void, png_set_add_alpha,
-    (png_structp png_ptr, png_uint_32 filler, 
-    int flags));
-#endif /* PNG_READ_FILLER_SUPPORTED || PNG_WRITE_FILLER_SUPPORTED */
-
-#if defined(PNG_READ_SWAP_SUPPORTED) || defined(PNG_WRITE_SWAP_SUPPORTED)
-/* Swap bytes in 16-bit depth files. */
-PNG_EXPORT(41, void, png_set_swap, (png_structp png_ptr));
-#endif
-
-#if defined(PNG_READ_PACK_SUPPORTED) || defined(PNG_WRITE_PACK_SUPPORTED)
-/* Use 1 byte per pixel in 1, 2, or 4-bit depth files. */
-PNG_EXPORT(42, void, png_set_packing, (png_structp png_ptr));
-#endif
-
-#if defined(PNG_READ_PACKSWAP_SUPPORTED) || \
-    defined(PNG_WRITE_PACKSWAP_SUPPORTED)
-/* Swap packing order of pixels in bytes. */
-PNG_EXPORT(43, void, png_set_packswap, (png_structp png_ptr));
-#endif
-
-#if defined(PNG_READ_SHIFT_SUPPORTED) || defined(PNG_WRITE_SHIFT_SUPPORTED)
-/* Converts files to legal bit depths. */
-PNG_EXPORT(44, void, png_set_shift, (png_structp png_ptr, png_const_color_8p
-    true_bits));
-#endif
-
-#if defined(PNG_READ_INTERLACING_SUPPORTED) || \
-    defined(PNG_WRITE_INTERLACING_SUPPORTED)
-/* Have the code handle the interlacing.  Returns the number of passes.
- * MUST be called before png_read_update_info or png_start_read_image,
- * otherwise it will not have the desired effect.  Note that it is still
- * necessary to call png_read_row or png_read_rows png_get_image_height
- * times for each pass.
-*/
-PNG_EXPORT(45, int, png_set_interlace_handling, (png_structp png_ptr));
-#endif
-
-#if defined(PNG_READ_INVERT_SUPPORTED) || defined(PNG_WRITE_INVERT_SUPPORTED)
-/* Invert monochrome files */
-PNG_EXPORT(46, void, png_set_invert_mono, (png_structp png_ptr));
-#endif
-
-#ifdef PNG_READ_BACKGROUND_SUPPORTED
-/* Handle alpha and tRNS by replacing with a background color. */
-PNG_FP_EXPORT(47, void, png_set_background, (png_structp png_ptr, 
-    png_const_color_16p background_color, int background_gamma_code, 
-    int need_expand, double background_gamma));
-PNG_FIXED_EXPORT(215, void, png_set_background_fixed, (png_structp png_ptr,
-    png_const_color_16p background_color, int background_gamma_code, 
-    int need_expand, png_fixed_point background_gamma));
-#endif
-#ifdef PNG_READ_BACKGROUND_SUPPORTED
-#  define PNG_BACKGROUND_GAMMA_UNKNOWN 0
-#  define PNG_BACKGROUND_GAMMA_SCREEN  1
-#  define PNG_BACKGROUND_GAMMA_FILE    2
-#  define PNG_BACKGROUND_GAMMA_UNIQUE  3
-#endif
-
-#ifdef PNG_READ_16_TO_8_SUPPORTED
-/* Strip the second byte of information from a 16-bit depth file. */
-PNG_EXPORT(48, void, png_set_strip_16, (png_structp png_ptr));
-#endif
-
-#ifdef PNG_READ_QUANTIZE_SUPPORTED
-/* Turn on quantizing, and reduce the palette to the number of colors
- * available.
- */
-PNG_EXPORT(49, void, png_set_quantize,
-    (png_structp png_ptr, png_colorp palette, 
-    int num_palette, int maximum_colors, png_const_uint_16p histogram, 
-    int full_quantize));
-#endif
-
-#ifdef PNG_READ_GAMMA_SUPPORTED
-/* The threshold on gamma processing is configurable but hard-wired into the
- * library.  The following is the floating point variant.
- */
-#define PNG_GAMMA_THRESHOLD (PNG_GAMMA_THRESHOLD_FIXED*.00001)
-
-/* Handle gamma correction. Screen_gamma=(display_exponent) */
-PNG_FP_EXPORT(50, void, png_set_gamma,
-    (png_structp png_ptr, double screen_gamma, 
-    double default_file_gamma));
-PNG_FIXED_EXPORT(208, void, png_set_gamma_fixed, (png_structp png_ptr, 
-    png_fixed_point screen_gamma, png_fixed_point default_file_gamma));
-#endif
-
-#ifdef PNG_WRITE_FLUSH_SUPPORTED
-/* Set how many lines between output flushes - 0 for no flushing */
-PNG_EXPORT(51, void, png_set_flush, (png_structp png_ptr, int nrows));
-/* Flush the current PNG output buffer */
-PNG_EXPORT(52, void, png_write_flush, (png_structp png_ptr));
-#endif
-
-/* Optional update palette with requested transformations */
-PNG_EXPORT(53, void, png_start_read_image, (png_structp png_ptr));
-
-/* Optional call to update the users info structure */
-PNG_EXPORT(54, void, png_read_update_info,
-    (png_structp png_ptr, png_infop info_ptr));
-
-#ifdef PNG_SEQUENTIAL_READ_SUPPORTED
-/* Read one or more rows of image data. */
-PNG_EXPORT(55, void, png_read_rows, (png_structp png_ptr, png_bytepp row, 
-    png_bytepp display_row, png_uint_32 num_rows));
-#endif
-
-#ifdef PNG_SEQUENTIAL_READ_SUPPORTED
-/* Read a row of data. */
-PNG_EXPORT(56, void, png_read_row, (png_structp png_ptr, png_bytep row, 
-    png_bytep display_row));
-#endif
-
-#ifdef PNG_SEQUENTIAL_READ_SUPPORTED
-/* Read the whole image into memory at once. */
-PNG_EXPORT(57, void, png_read_image, (png_structp png_ptr, png_bytepp image));
-#endif
-
-/* Write a row of image data */
-PNG_EXPORT(58, void, png_write_row,
-    (png_structp png_ptr, png_const_bytep row));
-
-/* Write a few rows of image data: (*row) is not written; however, the type
- * is declared as writeable to maintain compatibility with previous versions
- * of libpng and to allow the 'display_row' array from read_rows to be passed
- * unchanged to write_rows.
- */
-PNG_EXPORT(59, void, png_write_rows, (png_structp png_ptr, png_bytepp row, 
-    png_uint_32 num_rows));
-
-/* Write the image data */
-PNG_EXPORT(60, void, png_write_image,
-    (png_structp png_ptr, png_bytepp image));
-
-/* Write the end of the PNG file. */
-PNG_EXPORT(61, void, png_write_end,
-    (png_structp png_ptr, png_infop info_ptr));
-
-#ifdef PNG_SEQUENTIAL_READ_SUPPORTED
-/* Read the end of the PNG file. */
-PNG_EXPORT(62, void, png_read_end, (png_structp png_ptr, png_infop info_ptr));
-#endif
-
-/* Free any memory associated with the png_info_struct */
-PNG_EXPORT(63, void, png_destroy_info_struct, (png_structp png_ptr, 
-    png_infopp info_ptr_ptr));
-
-/* Free any memory associated with the png_struct and the png_info_structs */
-PNG_EXPORT(64, void, png_destroy_read_struct, (png_structpp png_ptr_ptr, 
-    png_infopp info_ptr_ptr, png_infopp end_info_ptr_ptr));
-
-/* Free any memory associated with the png_struct and the png_info_structs */
-PNG_EXPORT(65, void, png_destroy_write_struct, (png_structpp png_ptr_ptr, 
-    png_infopp info_ptr_ptr));
-
-/* Set the libpng method of handling chunk CRC errors */
-PNG_EXPORT(66, void, png_set_crc_action,
-    (png_structp png_ptr, int crit_action, int ancil_action));
-
-/* Values for png_set_crc_action() say how to handle CRC errors in
- * ancillary and critical chunks, and whether to use the data contained
- * therein.  Note that it is impossible to "discard" data in a critical
- * chunk.  For versions prior to 0.90, the action was always error/quit, 
- * whereas in version 0.90 and later, the action for CRC errors in ancillary
- * chunks is warn/discard.  These values should NOT be changed.
- *
- *      value                       action:critical     action:ancillary
- */
-#define PNG_CRC_DEFAULT       0  /* error/quit          warn/discard data */
-#define PNG_CRC_ERROR_QUIT    1  /* error/quit          error/quit        */
-#define PNG_CRC_WARN_DISCARD  2  /* (INVALID)           warn/discard data */
-#define PNG_CRC_WARN_USE      3  /* warn/use data       warn/use data     */
-#define PNG_CRC_QUIET_USE     4  /* quiet/use data      quiet/use data    */
-#define PNG_CRC_NO_CHANGE     5  /* use current value   use current value */
-
-/* These functions give the user control over the scan-line filtering in
- * libpng and the compression methods used by zlib.  These functions are
- * mainly useful for testing, as the defaults should work with most users.
- * Those users who are tight on memory or want faster performance at the
- * expense of compression can modify them.  See the compression library
- * header file (zlib.h) for an explination of the compression functions.
- */
-
-/* Set the filtering method(s) used by libpng.  Currently, the only valid
- * value for "method" is 0.
- */
-PNG_EXPORT(67, void, png_set_filter,
-    (png_structp png_ptr, int method, int filters));
-
-/* Flags for png_set_filter() to say which filters to use.  The flags
- * are chosen so that they don't conflict with real filter types
- * below, in case they are supplied instead of the #defined constants.
- * These values should NOT be changed.
- */
-#define PNG_NO_FILTERS     0x00
-#define PNG_FILTER_NONE    0x08
-#define PNG_FILTER_SUB     0x10
-#define PNG_FILTER_UP      0x20
-#define PNG_FILTER_AVG     0x40
-#define PNG_FILTER_PAETH   0x80
-#define PNG_ALL_FILTERS (PNG_FILTER_NONE | PNG_FILTER_SUB | PNG_FILTER_UP | \
-                         PNG_FILTER_AVG | PNG_FILTER_PAETH)
-
-/* Filter values (not flags) - used in pngwrite.c, pngwutil.c for now.
- * These defines should NOT be changed.
- */
-#define PNG_FILTER_VALUE_NONE  0
-#define PNG_FILTER_VALUE_SUB   1
-#define PNG_FILTER_VALUE_UP    2
-#define PNG_FILTER_VALUE_AVG   3
-#define PNG_FILTER_VALUE_PAETH 4
-#define PNG_FILTER_VALUE_LAST  5
-
-#ifdef PNG_WRITE_WEIGHTED_FILTER_SUPPORTED /* EXPERIMENTAL */
-/* The "heuristic_method" is given by one of the PNG_FILTER_HEURISTIC_
- * defines, either the default (minimum-sum-of-absolute-differences), or
- * the experimental method (weighted-minimum-sum-of-absolute-differences).
- *
- * Weights are factors >= 1.0, indicating how important it is to keep the
- * filter type consistent between rows.  Larger numbers mean the current
- * filter is that many times as likely to be the same as the "num_weights"
- * previous filters.  This is cumulative for each previous row with a weight.
- * There needs to be "num_weights" values in "filter_weights", or it can be
- * NULL if the weights aren't being specified.  Weights have no influence on
- * the selection of the first row filter.  Well chosen weights can (in theory)
- * improve the compression for a given image.
- *
- * Costs are factors >= 1.0 indicating the relative decoding costs of a
- * filter type.  Higher costs indicate more decoding expense, and are
- * therefore less likely to be selected over a filter with lower computational
- * costs.  There needs to be a value in "filter_costs" for each valid filter
- * type (given by PNG_FILTER_VALUE_LAST), or it can be NULL if you aren't
- * setting the costs.  Costs try to improve the speed of decompression without
- * unduly increasing the compressed image size.
- *
- * A negative weight or cost indicates the default value is to be used, and
- * values in the range [0.0, 1.0) indicate the value is to remain unchanged.
- * The default values for both weights and costs are currently 1.0, but may
- * change if good general weighting/cost heuristics can be found.  If both
- * the weights and costs are set to 1.0, this degenerates the WEIGHTED method
- * to the UNWEIGHTED method, but with added encoding time/computation.
- */
-PNG_FP_EXPORT(68, void, png_set_filter_heuristics, (png_structp png_ptr, 
-    int heuristic_method, int num_weights, png_const_doublep filter_weights, 
-    png_const_doublep filter_costs));
-PNG_FIXED_EXPORT(209, void, png_set_filter_heuristics_fixed,
-    (png_structp png_ptr, 
-    int heuristic_method, int num_weights, png_const_fixed_point_p
-    filter_weights, png_const_fixed_point_p filter_costs));
-#endif /*  PNG_WRITE_WEIGHTED_FILTER_SUPPORTED */
-
-/* Heuristic used for row filter selection.  These defines should NOT be
- * changed.
- */
-#define PNG_FILTER_HEURISTIC_DEFAULT    0  /* Currently "UNWEIGHTED" */
-#define PNG_FILTER_HEURISTIC_UNWEIGHTED 1  /* Used by libpng < 0.95 */
-#define PNG_FILTER_HEURISTIC_WEIGHTED   2  /* Experimental feature */
-#define PNG_FILTER_HEURISTIC_LAST       3  /* Not a valid value */
-
-/* Set the library compression level.  Currently, valid values range from
- * 0 - 9, corresponding directly to the zlib compression levels 0 - 9
- * (0 - no compression, 9 - "maximal" compression).  Note that tests have
- * shown that zlib compression levels 3-6 usually perform as well as level 9
- * for PNG images, and do considerably fewer caclulations.  In the future, 
- * these values may not correspond directly to the zlib compression levels.
- */
-PNG_EXPORT(69, void, png_set_compression_level,
-    (png_structp png_ptr, int level));
-
-PNG_EXPORT(70, void, png_set_compression_mem_level, (png_structp png_ptr, 
-    int mem_level));
-
-PNG_EXPORT(71, void, png_set_compression_strategy, (png_structp png_ptr, 
-    int strategy));
-
-PNG_EXPORT(72, void, png_set_compression_window_bits, (png_structp png_ptr, 
-    int window_bits));
-
-PNG_EXPORT(73, void, png_set_compression_method, (png_structp png_ptr,
-    int method));
-
-/* These next functions are called for input/output, memory, and error
- * handling.  They are in the file pngrio.c, pngwio.c, and pngerror.c, 
- * and call standard C I/O routines such as fread(), fwrite(), and
- * fprintf().  These functions can be made to use other I/O routines
- * at run time for those applications that need to handle I/O in a
- * different manner by calling png_set_???_fn().  See libpng-manual.txt for
- * more information.
- */
-
-#ifdef PNG_STDIO_SUPPORTED
-/* Initialize the input/output for the PNG file to the default functions. */
-PNG_EXPORT(74, void, png_init_io, (png_structp png_ptr, png_FILE_p fp));
-#endif
-
-/* Replace the (error and abort), and warning functions with user
- * supplied functions.  If no messages are to be printed you must still
- * write and use replacement functions. The replacement error_fn should
- * still do a longjmp to the last setjmp location if you are using this
- * method of error handling.  If error_fn or warning_fn is NULL, the
- * default function will be used.
- */
-
-PNG_EXPORT(75, void, png_set_error_fn,
-    (png_structp png_ptr, png_voidp error_ptr, 
-    png_error_ptr error_fn, png_error_ptr warning_fn));
-
-/* Return the user pointer associated with the error functions */
-PNG_EXPORT(76, png_voidp, png_get_error_ptr, (png_const_structp png_ptr));
-
-/* Replace the default data output functions with a user supplied one(s).
- * If buffered output is not used, then output_flush_fn can be set to NULL.
- * If PNG_WRITE_FLUSH_SUPPORTED is not defined at libpng compile time
- * output_flush_fn will be ignored (and thus can be NULL).
- * It is probably a mistake to use NULL for output_flush_fn if
- * write_data_fn is not also NULL unless you have built libpng with
- * PNG_WRITE_FLUSH_SUPPORTED undefined, because in this case libpng's
- * default flush function, which uses the standard *FILE structure, will
- * be used.
- */
-PNG_EXPORT(77, void, png_set_write_fn, (png_structp png_ptr, png_voidp io_ptr, 
-    png_rw_ptr write_data_fn, png_flush_ptr output_flush_fn));
-
-/* Replace the default data input function with a user supplied one. */
-PNG_EXPORT(78, void, png_set_read_fn, (png_structp png_ptr, png_voidp io_ptr, 
-    png_rw_ptr read_data_fn));
-
-/* Return the user pointer associated with the I/O functions */
-PNG_EXPORT(79, png_voidp, png_get_io_ptr, (png_structp png_ptr));
-
-PNG_EXPORT(80, void, png_set_read_status_fn, (png_structp png_ptr, 
-    png_read_status_ptr read_row_fn));
-
-PNG_EXPORT(81, void, png_set_write_status_fn, (png_structp png_ptr, 
-    png_write_status_ptr write_row_fn));
-
-#ifdef PNG_USER_MEM_SUPPORTED
-/* Replace the default memory allocation functions with user supplied one(s). */
-PNG_EXPORT(82, void, png_set_mem_fn, (png_structp png_ptr, png_voidp mem_ptr, 
-    png_malloc_ptr malloc_fn, png_free_ptr free_fn));
-/* Return the user pointer associated with the memory functions */
-PNG_EXPORT(83, png_voidp, png_get_mem_ptr, (png_const_structp png_ptr));
-#endif
-
-#ifdef PNG_READ_USER_TRANSFORM_SUPPORTED
-PNG_EXPORT(84, void, png_set_read_user_transform_fn, (png_structp png_ptr, 
-    png_user_transform_ptr read_user_transform_fn));
-#endif
-
-#ifdef PNG_WRITE_USER_TRANSFORM_SUPPORTED
-PNG_EXPORT(85, void, png_set_write_user_transform_fn, (png_structp png_ptr, 
-    png_user_transform_ptr write_user_transform_fn));
-#endif
-
-#ifdef PNG_USER_TRANSFORM_PTR_SUPPORTED
-PNG_EXPORT(86, void, png_set_user_transform_info, (png_structp png_ptr, 
-    png_voidp user_transform_ptr, int user_transform_depth, 
-    int user_transform_channels));
-/* Return the user pointer associated with the user transform functions */
-PNG_EXPORT(87, png_voidp, png_get_user_transform_ptr,
-    (png_const_structp png_ptr));
-#endif
-
-#ifdef PNG_USER_TRANSFORM_INFO_SUPPORTED
-/* Return information about the row currently being processed.  Note that these
- * APIs do not fail but will return unexpected results if called outside a user
- * transform callback.  Also note that when transforming an interlaced image the
- * row number is still the row in the final, de-interlaced, image but the row
- * only contains the data of the current pass - consult png_row_info for the
- * actual width of the row!
- */
-PNG_EXPORT(217, png_uint_32, png_get_current_row_number, (png_const_structp));
-PNG_EXPORT(218, png_byte, png_get_current_pass_number, (png_const_structp));
-#endif
-
-#ifdef PNG_USER_CHUNKS_SUPPORTED
-PNG_EXPORT(88, void, png_set_read_user_chunk_fn, (png_structp png_ptr, 
-    png_voidp user_chunk_ptr, png_user_chunk_ptr read_user_chunk_fn));
-PNG_EXPORT(89, png_voidp, png_get_user_chunk_ptr, (png_const_structp png_ptr));
-#endif
-
-#ifdef PNG_PROGRESSIVE_READ_SUPPORTED
-/* Sets the function callbacks for the push reader, and a pointer to a
- * user-defined structure available to the callback functions.
- */
-PNG_EXPORT(90, void, png_set_progressive_read_fn, (png_structp png_ptr, 
-    png_voidp progressive_ptr, png_progressive_info_ptr info_fn, 
-    png_progressive_row_ptr row_fn, png_progressive_end_ptr end_fn));
-
-/* Returns the user pointer associated with the push read functions */
-PNG_EXPORT(91, png_voidp, png_get_progressive_ptr, (png_const_structp png_ptr));
-
-/* Function to be called when data becomes available */
-PNG_EXPORT(92, void, png_process_data,
-    (png_structp png_ptr, png_infop info_ptr, 
-    png_bytep buffer, png_size_t buffer_size));
-
-/* A function which may be called *only* within png_process_data to stop the
- * processing of any more data.  The function returns the number of bytes
- * remaining, excluding any that libpng has cached internally.  A subsequent
- * call to png_process_data must supply these bytes again.  If the argument
- * 'save' is set to true the routine will first save all the pending data and
- * will always return 0.
- */
-PNG_EXPORT(219, png_size_t, png_process_data_pause, (png_structp, int save));
-
-/* A function which may be called *only* outside (after) a call to
- * png_process_data.  It returns the number of bytes of data to skip in the
- * input.  Normally it will return 0, but if it returns a non-zero value the
- * application must skip than number of bytes of input data and pass the
- * following data to the next call to png_process_data.
- */
-PNG_EXPORT(220, png_uint_32, png_process_data_skip, (png_structp));
-
-/* Function that combines rows.  'new_row' is a flag that should come from
- * the callback and be non-NULL if anything needs to be done; the library
- * stores its own version of the new data internally and ignores the passed
- * in value.
- */
-PNG_EXPORT(93, void, png_progressive_combine_row, (png_structp png_ptr, 
-    png_bytep old_row, png_const_bytep new_row));
-#endif /* PNG_PROGRESSIVE_READ_SUPPORTED */
-
-PNG_EXPORTA(94, png_voidp, png_malloc,
-    (png_structp png_ptr, png_alloc_size_t size), 
-    PNG_ALLOCATED);
-/* Added at libpng version 1.4.0 */
-PNG_EXPORTA(95, png_voidp, png_calloc,
-    (png_structp png_ptr, png_alloc_size_t size), 
-    PNG_ALLOCATED);
-
-/* Added at libpng version 1.2.4 */
-PNG_EXPORTA(96, png_voidp, png_malloc_warn, (png_structp png_ptr, 
-    png_alloc_size_t size), PNG_ALLOCATED);
-
-/* Frees a pointer allocated by png_malloc() */
-PNG_EXPORT(97, void, png_free, (png_structp png_ptr, png_voidp ptr));
-
-/* Free data that was allocated internally */
-PNG_EXPORT(98, void, png_free_data,
-    (png_structp png_ptr, png_infop info_ptr, png_uint_32 free_me, int num));
-
-/* Reassign responsibility for freeing existing data, whether allocated
- * by libpng or by the application */
-PNG_EXPORT(99, void, png_data_freer,
-    (png_structp png_ptr, png_infop info_ptr, int freer, png_uint_32 mask));
-
-/* Assignments for png_data_freer */
-#define PNG_DESTROY_WILL_FREE_DATA 1
-#define PNG_SET_WILL_FREE_DATA 1
-#define PNG_USER_WILL_FREE_DATA 2
-/* Flags for png_ptr->free_me and info_ptr->free_me */
-#define PNG_FREE_HIST 0x0008
-#define PNG_FREE_ICCP 0x0010
-#define PNG_FREE_SPLT 0x0020
-#define PNG_FREE_ROWS 0x0040
-#define PNG_FREE_PCAL 0x0080
-#define PNG_FREE_SCAL 0x0100
-#define PNG_FREE_UNKN 0x0200
-#define PNG_FREE_LIST 0x0400
-#define PNG_FREE_PLTE 0x1000
-#define PNG_FREE_TRNS 0x2000
-#define PNG_FREE_TEXT 0x4000
-#define PNG_FREE_ALL  0x7fff
-#define PNG_FREE_MUL  0x4220 /* PNG_FREE_SPLT|PNG_FREE_TEXT|PNG_FREE_UNKN */
-
-#ifdef PNG_USER_MEM_SUPPORTED
-PNG_EXPORTA(100, png_voidp, png_malloc_default, (png_structp png_ptr, 
-    png_alloc_size_t size), PNG_ALLOCATED);
-PNG_EXPORT(101, void, png_free_default, (png_structp png_ptr, png_voidp ptr));
-#endif
-
-#ifdef PNG_ERROR_TEXT_SUPPORTED
-/* Fatal error in PNG image of libpng - can't continue */
-PNG_EXPORTA(102, void, png_error,
-    (png_structp png_ptr, png_const_charp error_message), 
-    PNG_NORETURN);
-
-/* The same, but the chunk name is prepended to the error string. */
-PNG_EXPORTA(103, void, png_chunk_error, (png_structp png_ptr, 
-    png_const_charp error_message), PNG_NORETURN);
-
-#else
-/* Fatal error in PNG image of libpng - can't continue */
-PNG_EXPORTA(104, void, png_err, (png_structp png_ptr), PNG_NORETURN);
-#endif
-
-/* Non-fatal error in libpng.  Can continue, but may have a problem. */
-PNG_EXPORT(105, void, png_warning, (png_structp png_ptr, 
-    png_const_charp warning_message));
-
-/* Non-fatal error in libpng, chunk name is prepended to message. */
-PNG_EXPORT(106, void, png_chunk_warning, (png_structp png_ptr, 
-    png_const_charp warning_message));
-
-#ifdef PNG_BENIGN_ERRORS_SUPPORTED
-/* Benign error in libpng.  Can continue, but may have a problem.
- * User can choose whether to handle as a fatal error or as a warning. */
-#  undef png_benign_error
-PNG_EXPORT(107, void, png_benign_error, (png_structp png_ptr, 
-    png_const_charp warning_message));
-
-/* Same, chunk name is prepended to message. */
-#  undef png_chunk_benign_error
-PNG_EXPORT(108, void, png_chunk_benign_error, (png_structp png_ptr, 
-    png_const_charp warning_message));
-
-PNG_EXPORT(109, void, png_set_benign_errors,
-    (png_structp png_ptr, int allowed));
-#else
-#  ifdef PNG_ALLOW_BENIGN_ERRORS
-#    define png_benign_error png_warning
-#    define png_chunk_benign_error png_chunk_warning
-#  else
-#    define png_benign_error png_error
-#    define png_chunk_benign_error png_chunk_error
-#  endif
-#endif
-
-/* The png_set_<chunk> functions are for storing values in the png_info_struct.
- * Similarly, the png_get_<chunk> calls are used to read values from the
- * png_info_struct, either storing the parameters in the passed variables, or
- * setting pointers into the png_info_struct where the data is stored.  The
- * png_get_<chunk> functions return a non-zero value if the data was available
- * in info_ptr, or return zero and do not change any of the parameters if the
- * data was not available.
- *
- * These functions should be used instead of directly accessing png_info
- * to avoid problems with future changes in the size and internal layout of
- * png_info_struct.
- */
-/* Returns "flag" if chunk data is valid in info_ptr. */
-PNG_EXPORT(110, png_uint_32, png_get_valid,
-    (png_const_structp png_ptr, png_const_infop info_ptr, 
-    png_uint_32 flag));
-
-/* Returns number of bytes needed to hold a transformed row. */
-PNG_EXPORT(111, png_size_t, png_get_rowbytes, (png_const_structp png_ptr, 
-    png_const_infop info_ptr));
-
-#ifdef PNG_INFO_IMAGE_SUPPORTED
-/* Returns row_pointers, which is an array of pointers to scanlines that was
- * returned from png_read_png().
- */
-PNG_EXPORT(112, png_bytepp, png_get_rows,
-    (png_const_structp png_ptr, png_const_infop info_ptr));
-/* Set row_pointers, which is an array of pointers to scanlines for use
- * by png_write_png().
- */
-PNG_EXPORT(113, void, png_set_rows, (png_structp png_ptr,
-    png_infop info_ptr, png_bytepp row_pointers));
-#endif
-
-/* Returns number of color channels in image. */
-PNG_EXPORT(114, png_byte, png_get_channels,
-    (png_const_structp png_ptr, png_const_infop info_ptr));
-
-#ifdef PNG_EASY_ACCESS_SUPPORTED
-/* Returns image width in pixels. */
-PNG_EXPORT(115, png_uint_32, png_get_image_width, (png_const_structp png_ptr, 
-    png_const_infop info_ptr));
-
-/* Returns image height in pixels. */
-PNG_EXPORT(116, png_uint_32, png_get_image_height, (png_const_structp png_ptr, 
-    png_const_infop info_ptr));
-
-/* Returns image bit_depth. */
-PNG_EXPORT(117, png_byte, png_get_bit_depth,
-    (png_const_structp png_ptr, png_const_infop info_ptr));
-
-/* Returns image color_type. */
-PNG_EXPORT(118, png_byte, png_get_color_type, (png_const_structp png_ptr, 
-    png_const_infop info_ptr));
-
-/* Returns image filter_type. */
-PNG_EXPORT(119, png_byte, png_get_filter_type, (png_const_structp png_ptr, 
-    png_const_infop info_ptr));
-
-/* Returns image interlace_type. */
-PNG_EXPORT(120, png_byte, png_get_interlace_type, (png_const_structp png_ptr, 
-    png_const_infop info_ptr));
-
-/* Returns image compression_type. */
-PNG_EXPORT(121, png_byte, png_get_compression_type, (png_const_structp png_ptr, 
-    png_const_infop info_ptr));
-
-/* Returns image resolution in pixels per meter, from pHYs chunk data. */
-PNG_EXPORT(122, png_uint_32, png_get_pixels_per_meter,
-    (png_const_structp png_ptr, png_const_infop info_ptr));
-PNG_EXPORT(123, png_uint_32, png_get_x_pixels_per_meter,
-    (png_const_structp png_ptr, png_const_infop info_ptr));
-PNG_EXPORT(124, png_uint_32, png_get_y_pixels_per_meter,
-    (png_const_structp png_ptr, png_const_infop info_ptr));
-
-/* Returns pixel aspect ratio, computed from pHYs chunk data.  */
-PNG_FP_EXPORT(125, float, png_get_pixel_aspect_ratio,
-    (png_const_structp png_ptr, png_const_infop info_ptr));
-PNG_FIXED_EXPORT(210, png_fixed_point, png_get_pixel_aspect_ratio_fixed, 
-    (png_const_structp png_ptr, png_const_infop info_ptr));
-
-/* Returns image x, y offset in pixels or microns, from oFFs chunk data. */
-PNG_EXPORT(126, png_int_32, png_get_x_offset_pixels,
-    (png_const_structp png_ptr, png_const_infop info_ptr));
-PNG_EXPORT(127, png_int_32, png_get_y_offset_pixels,
-    (png_const_structp png_ptr, png_const_infop info_ptr));
-PNG_EXPORT(128, png_int_32, png_get_x_offset_microns,
-    (png_const_structp png_ptr, png_const_infop info_ptr));
-PNG_EXPORT(129, png_int_32, png_get_y_offset_microns,
-    (png_const_structp png_ptr, png_const_infop info_ptr));
-
-#endif /* PNG_EASY_ACCESS_SUPPORTED */
-
-/* Returns pointer to signature string read from PNG header */
-PNG_EXPORT(130, png_const_bytep, png_get_signature,
-    (png_const_structp png_ptr, png_infop info_ptr));
-
-#ifdef PNG_bKGD_SUPPORTED
-PNG_EXPORT(131, png_uint_32, png_get_bKGD,
-    (png_const_structp png_ptr, png_infop info_ptr, 
-    png_color_16p *background));
-#endif
-
-#ifdef PNG_bKGD_SUPPORTED
-PNG_EXPORT(132, void, png_set_bKGD, (png_structp png_ptr, png_infop info_ptr, 
-    png_const_color_16p background));
-#endif
-
-#ifdef PNG_cHRM_SUPPORTED
-PNG_FP_EXPORT(133, png_uint_32, png_get_cHRM, (png_const_structp png_ptr, 
-   png_const_infop info_ptr, double *white_x, double *white_y, double *red_x, 
-    double *red_y, double *green_x, double *green_y, double *blue_x, 
-    double *blue_y));
-#ifdef PNG_FIXED_POINT_SUPPORTED /* Otherwise not implemented */
-PNG_FIXED_EXPORT(134, png_uint_32, png_get_cHRM_fixed,
-    (png_const_structp png_ptr, 
-    png_const_infop info_ptr, png_fixed_point *int_white_x, 
-    png_fixed_point *int_white_y, png_fixed_point *int_red_x, 
-    png_fixed_point *int_red_y, png_fixed_point *int_green_x, 
-    png_fixed_point *int_green_y, png_fixed_point *int_blue_x, 
-    png_fixed_point *int_blue_y));
-#endif
-#endif
-
-#ifdef PNG_cHRM_SUPPORTED
-PNG_FP_EXPORT(135, void, png_set_cHRM,
-    (png_structp png_ptr, png_infop info_ptr, 
-    double white_x, double white_y, double red_x, double red_y, double green_x, 
-    double green_y, double blue_x, double blue_y));
-PNG_FIXED_EXPORT(136, void, png_set_cHRM_fixed, (png_structp png_ptr, 
-    png_infop info_ptr, png_fixed_point int_white_x, 
-    png_fixed_point int_white_y, png_fixed_point int_red_x, 
-    png_fixed_point int_red_y, png_fixed_point int_green_x, 
-    png_fixed_point int_green_y, png_fixed_point int_blue_x, 
-    png_fixed_point int_blue_y));
-#endif
-
-#ifdef PNG_gAMA_SUPPORTED
-PNG_FP_EXPORT(137, png_uint_32, png_get_gAMA,
-    (png_const_structp png_ptr, png_const_infop info_ptr, 
-    double *file_gamma));
-PNG_FIXED_EXPORT(138, png_uint_32, png_get_gAMA_fixed,
-    (png_const_structp png_ptr, png_const_infop info_ptr,
-    png_fixed_point *int_file_gamma));
-#endif
-
-#ifdef PNG_gAMA_SUPPORTED
-PNG_FP_EXPORT(139, void, png_set_gAMA, (png_structp png_ptr,
-    png_infop info_ptr, double file_gamma));
-PNG_FIXED_EXPORT(140, void, png_set_gAMA_fixed, (png_structp png_ptr, 
-    png_infop info_ptr, png_fixed_point int_file_gamma));
-#endif
-
-#ifdef PNG_hIST_SUPPORTED
-PNG_EXPORT(141, png_uint_32, png_get_hIST,
-    (png_const_structp png_ptr, png_const_infop info_ptr, 
-    png_uint_16p *hist));
-#endif
-
-#ifdef PNG_hIST_SUPPORTED
-PNG_EXPORT(142, void, png_set_hIST, (png_structp png_ptr,
-    png_infop info_ptr, png_const_uint_16p hist));
-#endif
-
-PNG_EXPORT(143, png_uint_32, png_get_IHDR,
-    (png_structp png_ptr, png_infop info_ptr, 
-    png_uint_32 *width, png_uint_32 *height, int *bit_depth, int *color_type, 
-    int *interlace_method, int *compression_method, int *filter_method));
-
-PNG_EXPORT(144, void, png_set_IHDR,
-    (png_structp png_ptr, png_infop info_ptr, 
-    png_uint_32 width, png_uint_32 height, int bit_depth, int color_type, 
-    int interlace_method, int compression_method, int filter_method));
-
-#ifdef PNG_oFFs_SUPPORTED
-PNG_EXPORT(145, png_uint_32, png_get_oFFs,
-    (png_const_structp png_ptr, png_const_infop info_ptr, 
-    png_int_32 *offset_x, png_int_32 *offset_y, int *unit_type));
-#endif
-
-#ifdef PNG_oFFs_SUPPORTED
-PNG_EXPORT(146, void, png_set_oFFs,
-    (png_structp png_ptr, png_infop info_ptr, 
-    png_int_32 offset_x, png_int_32 offset_y, int unit_type));
-#endif
-
-#ifdef PNG_pCAL_SUPPORTED
-PNG_EXPORT(147, png_uint_32, png_get_pCAL,
-    (png_const_structp png_ptr, png_const_infop info_ptr, 
-    png_charp *purpose, png_int_32 *X0, png_int_32 *X1, int *type,
-    int *nparams, 
-    png_charp *units, png_charpp *params));
-#endif
-
-#ifdef PNG_pCAL_SUPPORTED
-PNG_EXPORT(148, void, png_set_pCAL, (png_structp png_ptr,
-    png_infop info_ptr, 
-    png_const_charp purpose, png_int_32 X0, png_int_32 X1, int type, 
-    int nparams, png_const_charp units, png_charpp params));
-#endif
-
-#ifdef PNG_pHYs_SUPPORTED
-PNG_EXPORT(149, png_uint_32, png_get_pHYs,
-    (png_const_structp png_ptr, png_const_infop info_ptr, 
-    png_uint_32 *res_x, png_uint_32 *res_y, int *unit_type));
-#endif
-
-#ifdef PNG_pHYs_SUPPORTED
-PNG_EXPORT(150, void, png_set_pHYs,
-    (png_structp png_ptr, png_infop info_ptr, 
-    png_uint_32 res_x, png_uint_32 res_y, int unit_type));
-#endif
-
-PNG_EXPORT(151, png_uint_32, png_get_PLTE,
-    (png_const_structp png_ptr, png_const_infop info_ptr, 
-    png_colorp *palette, int *num_palette));
-
-PNG_EXPORT(152, void, png_set_PLTE,
-    (png_structp png_ptr, png_infop info_ptr, 
-    png_const_colorp palette, int num_palette));
-
-#ifdef PNG_sBIT_SUPPORTED
-PNG_EXPORT(153, png_uint_32, png_get_sBIT,
-    (png_const_structp png_ptr, png_infop info_ptr, 
-    png_color_8p *sig_bit));
-#endif
-
-#ifdef PNG_sBIT_SUPPORTED
-PNG_EXPORT(154, void, png_set_sBIT,
-    (png_structp png_ptr, png_infop info_ptr, png_const_color_8p sig_bit));
-#endif
-
-#ifdef PNG_sRGB_SUPPORTED
-PNG_EXPORT(155, png_uint_32, png_get_sRGB, (png_const_structp png_ptr,
-    png_const_infop info_ptr, int *file_srgb_intent));
-#endif
-
-#ifdef PNG_sRGB_SUPPORTED
-PNG_EXPORT(156, void, png_set_sRGB,
-    (png_structp png_ptr, png_infop info_ptr, int srgb_intent));
-PNG_EXPORT(157, void, png_set_sRGB_gAMA_and_cHRM, (png_structp png_ptr, 
-    png_infop info_ptr, int srgb_intent));
-#endif
-
-#ifdef PNG_iCCP_SUPPORTED
-PNG_EXPORT(158, png_uint_32, png_get_iCCP,
-    (png_const_structp png_ptr, png_const_infop info_ptr, 
-    png_charpp name, int *compression_type, png_bytepp profile, 
-    png_uint_32 *proflen));
-#endif
-
-#ifdef PNG_iCCP_SUPPORTED
-PNG_EXPORT(159, void, png_set_iCCP,
-    (png_structp png_ptr, png_infop info_ptr, 
-    png_const_charp name, int compression_type, png_const_bytep profile, 
-    png_uint_32 proflen));
-#endif
-
-#ifdef PNG_sPLT_SUPPORTED
-PNG_EXPORT(160, png_uint_32, png_get_sPLT,
-    (png_const_structp png_ptr, png_const_infop info_ptr, 
-    png_sPLT_tpp entries));
-#endif
-
-#ifdef PNG_sPLT_SUPPORTED
-PNG_EXPORT(161, void, png_set_sPLT,
-    (png_structp png_ptr, png_infop info_ptr, 
-    png_const_sPLT_tp entries, int nentries));
-#endif
-
-#ifdef PNG_TEXT_SUPPORTED
-/* png_get_text also returns the number of text chunks in *num_text */
-PNG_EXPORT(162, png_uint_32, png_get_text,
-    (png_const_structp png_ptr, png_const_infop info_ptr, 
-    png_textp *text_ptr, int *num_text));
-#endif
-
-/* Note while png_set_text() will accept a structure whose text, 
- * language, and  translated keywords are NULL pointers, the structure
- * returned by png_get_text will always contain regular
- * zero-terminated C strings.  They might be empty strings but
- * they will never be NULL pointers.
- */
-
-#ifdef PNG_TEXT_SUPPORTED
-PNG_EXPORT(163, void, png_set_text,
-    (png_structp png_ptr, png_infop info_ptr, 
-    png_const_textp text_ptr, int num_text));
-#endif
-
-#ifdef PNG_tIME_SUPPORTED
-PNG_EXPORT(164, png_uint_32, png_get_tIME,
-    (png_const_structp png_ptr, png_infop info_ptr, png_timep *mod_time));
-#endif
-
-#ifdef PNG_tIME_SUPPORTED
-PNG_EXPORT(165, void, png_set_tIME,
-    (png_structp png_ptr, png_infop info_ptr, png_const_timep mod_time));
-#endif
-
-#ifdef PNG_tRNS_SUPPORTED
-PNG_EXPORT(166, png_uint_32, png_get_tRNS,
-    (png_const_structp png_ptr, png_infop info_ptr, 
-    png_bytep *trans_alpha, int *num_trans, png_color_16p *trans_color));
-#endif
-
-#ifdef PNG_tRNS_SUPPORTED
-PNG_EXPORT(167, void, png_set_tRNS,
-    (png_structp png_ptr, png_infop info_ptr, 
-    png_const_bytep trans_alpha, int num_trans, 
-    png_const_color_16p trans_color));
-#endif
-
-#ifdef PNG_sCAL_SUPPORTED
-PNG_FP_EXPORT(168, png_uint_32, png_get_sCAL,
-    (png_const_structp png_ptr, png_const_infop info_ptr, 
-    int *unit, double *width, double *height));
-#ifdef PNG_FLOATING_ARITHMETIC_SUPPORTED
-/* NOTE: this API is currently implemented using floating point arithmetic, 
- * consequently it can only be used on systems with floating point support.
- * In any case the range of values supported by png_fixed_point is small and it
- * is highly recommended that png_get_sCAL_s be used instead.
- */
-PNG_FIXED_EXPORT(214, png_uint_32, png_get_sCAL_fixed,
-    (png_structp png_ptr, png_const_infop info_ptr, int *unit,
-    png_fixed_point *width, 
-    png_fixed_point *height));
-#endif
-PNG_EXPORT(169, png_uint_32, png_get_sCAL_s,
-    (png_const_structp png_ptr, png_const_infop info_ptr,
-    int *unit, png_charpp swidth, png_charpp sheight));
-
-PNG_FP_EXPORT(170, void, png_set_sCAL,
-    (png_structp png_ptr, png_infop info_ptr, 
-    int unit, double width, double height));
-PNG_FIXED_EXPORT(213, void, png_set_sCAL_fixed, (png_structp png_ptr, 
-   png_infop info_ptr, int unit, png_fixed_point width, 
-   png_fixed_point height));
-PNG_EXPORT(171, void, png_set_sCAL_s,
-    (png_structp png_ptr, png_infop info_ptr, 
-    int unit, png_const_charp swidth, png_const_charp sheight));
-#endif /* PNG_sCAL_SUPPORTED */
-
-#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
-/* Provide a list of chunks and how they are to be handled, if the built-in
-   handling or default unknown chunk handling is not desired.  Any chunks not
-   listed will be handled in the default manner.  The IHDR and IEND chunks
-   must not be listed.
-      keep = 0: follow default behaviour
-           = 1: do not keep
-           = 2: keep only if safe-to-copy
-           = 3: keep even if unsafe-to-copy
-*/
-PNG_EXPORT(172, void, png_set_keep_unknown_chunks,
-    (png_structp png_ptr, int keep, 
-    png_const_bytep chunk_list, int num_chunks));
-PNG_EXPORT(173, int, png_handle_as_unknown, (png_structp png_ptr, 
-    png_const_bytep chunk_name));
-#endif
-#ifdef PNG_UNKNOWN_CHUNKS_SUPPORTED
-PNG_EXPORT(174, void, png_set_unknown_chunks, (png_structp png_ptr, 
-    png_infop info_ptr, png_const_unknown_chunkp unknowns,
-    int num_unknowns));
-PNG_EXPORT(175, void, png_set_unknown_chunk_location,
-    (png_structp png_ptr, png_infop info_ptr, int chunk, int location));
-PNG_EXPORT(176, int, png_get_unknown_chunks, (png_const_structp png_ptr, 
-    png_const_infop info_ptr, png_unknown_chunkpp entries));
-#endif
-
-/* Png_free_data() will turn off the "valid" flag for anything it frees.
- * If you need to turn it off for a chunk that your application has freed, 
- * you can use png_set_invalid(png_ptr, info_ptr, PNG_INFO_CHNK);
- */
-PNG_EXPORT(177, void, png_set_invalid,
-    (png_structp png_ptr, png_infop info_ptr, int mask));
-
-#ifdef PNG_INFO_IMAGE_SUPPORTED
-/* The "params" pointer is currently not used and is for future expansion. */
-PNG_EXPORT(178, void, png_read_png, (png_structp png_ptr, png_infop info_ptr, 
-    int transforms, png_voidp params));
-PNG_EXPORT(179, void, png_write_png, (png_structp png_ptr, png_infop info_ptr, 
-    int transforms, png_voidp params));
-#endif
-
-PNG_EXPORT(180, png_const_charp, png_get_copyright,
-    (png_const_structp png_ptr));
-PNG_EXPORT(181, png_const_charp, png_get_header_ver,
-    (png_const_structp png_ptr));
-PNG_EXPORT(182, png_const_charp, png_get_header_version,
-    (png_const_structp png_ptr));
-PNG_EXPORT(183, png_const_charp, png_get_libpng_ver,
-    (png_const_structp png_ptr));
-
-#ifdef PNG_MNG_FEATURES_SUPPORTED
-PNG_EXPORT(184, png_uint_32, png_permit_mng_features, (png_structp png_ptr, 
-    png_uint_32 mng_features_permitted));
-#endif
-
-/* For use in png_set_keep_unknown, added to version 1.2.6 */
-#define PNG_HANDLE_CHUNK_AS_DEFAULT   0
-#define PNG_HANDLE_CHUNK_NEVER        1
-#define PNG_HANDLE_CHUNK_IF_SAFE      2
-#define PNG_HANDLE_CHUNK_ALWAYS       3
-
-/* Strip the prepended error numbers ("#nnn ") from error and warning
- * messages before passing them to the error or warning handler.
- */
-#ifdef PNG_ERROR_NUMBERS_SUPPORTED
-PNG_EXPORT(185, void, png_set_strip_error_numbers,
-    (png_structp png_ptr, 
-    png_uint_32 strip_mode));
-#endif
-
-/* Added in libpng-1.2.6 */
-#ifdef PNG_SET_USER_LIMITS_SUPPORTED
-PNG_EXPORT(186, void, png_set_user_limits, (png_structp png_ptr, 
-    png_uint_32 user_width_max, png_uint_32 user_height_max));
-PNG_EXPORT(187, png_uint_32, png_get_user_width_max,
-    (png_const_structp png_ptr));
-PNG_EXPORT(188, png_uint_32, png_get_user_height_max,
-    (png_const_structp png_ptr));
-/* Added in libpng-1.4.0 */
-PNG_EXPORT(189, void, png_set_chunk_cache_max, (png_structp png_ptr, 
-    png_uint_32 user_chunk_cache_max));
-PNG_EXPORT(190, png_uint_32, png_get_chunk_cache_max,
-    (png_const_structp png_ptr));
-/* Added in libpng-1.4.1 */
-PNG_EXPORT(191, void, png_set_chunk_malloc_max, (png_structp png_ptr, 
-    png_alloc_size_t user_chunk_cache_max));
-PNG_EXPORT(192, png_alloc_size_t, png_get_chunk_malloc_max,
-    (png_const_structp png_ptr));
-#endif
-
-#if defined(PNG_INCH_CONVERSIONS_SUPPORTED)
-PNG_EXPORT(193, png_uint_32, png_get_pixels_per_inch,
-    (png_const_structp png_ptr, png_const_infop info_ptr));
-
-PNG_EXPORT(194, png_uint_32, png_get_x_pixels_per_inch,
-    (png_const_structp png_ptr, png_const_infop info_ptr));
-
-PNG_EXPORT(195, png_uint_32, png_get_y_pixels_per_inch,
-    (png_const_structp png_ptr, png_const_infop info_ptr));
-
-PNG_FP_EXPORT(196, float, png_get_x_offset_inches,
-    (png_const_structp png_ptr, png_const_infop info_ptr));
-#ifdef PNG_FIXED_POINT_SUPPORTED /* otherwise not implemented. */
-PNG_FIXED_EXPORT(211, png_fixed_point, png_get_x_offset_inches_fixed, 
-    (png_structp png_ptr, png_const_infop info_ptr));
-#endif
-
-PNG_FP_EXPORT(197, float, png_get_y_offset_inches, (png_const_structp png_ptr, 
-    png_const_infop info_ptr));
-#ifdef PNG_FIXED_POINT_SUPPORTED /* otherwise not implemented. */
-PNG_FIXED_EXPORT(212, png_fixed_point, png_get_y_offset_inches_fixed, 
-    (png_structp png_ptr, png_const_infop info_ptr));
-#endif
-
-#  ifdef PNG_pHYs_SUPPORTED
-PNG_EXPORT(198, png_uint_32, png_get_pHYs_dpi, (png_const_structp png_ptr, 
-    png_const_infop info_ptr, png_uint_32 *res_x, png_uint_32 *res_y,
-    int *unit_type));
-#  endif /* PNG_pHYs_SUPPORTED */
-#endif  /* PNG_INCH_CONVERSIONS_SUPPORTED */
-
-/* Added in libpng-1.4.0 */
-#ifdef PNG_IO_STATE_SUPPORTED
-PNG_EXPORT(199, png_uint_32, png_get_io_state, (png_structp png_ptr));
-
-PNG_EXPORTA(200, png_const_bytep, png_get_io_chunk_name,
-    (png_structp png_ptr), PNG_DEPRECATED);
-PNG_EXPORT(216, png_uint_32, png_get_io_chunk_type,
-    (png_const_structp png_ptr));
-
-/* The flags returned by png_get_io_state() are the following: */
-#  define PNG_IO_NONE        0x0000   /* no I/O at this moment */
-#  define PNG_IO_READING     0x0001   /* currently reading */
-#  define PNG_IO_WRITING     0x0002   /* currently writing */
-#  define PNG_IO_SIGNATURE   0x0010   /* currently at the file signature */
-#  define PNG_IO_CHUNK_HDR   0x0020   /* currently at the chunk header */
-#  define PNG_IO_CHUNK_DATA  0x0040   /* currently at the chunk data */
-#  define PNG_IO_CHUNK_CRC   0x0080   /* currently at the chunk crc */
-#  define PNG_IO_MASK_OP     0x000f   /* current operation: reading/writing */
-#  define PNG_IO_MASK_LOC    0x00f0   /* current location: sig/hdr/data/crc */
-#endif /* ?PNG_IO_STATE_SUPPORTED */
-
-/* Interlace support.  The following macros are always defined so that if
- * libpng interlace handling is turned off the macros may be used to handle
- * interlaced images within the application.
- */
-#define PNG_INTERLACE_ADAM7_PASSES 7
-
-/* Two macros to return the first row and first column of the original,
- * full, image which appears in a given pass.  'pass' is in the range 0
- * to 6 and the result is in the range 0 to 7.
- */
-#define PNG_PASS_START_ROW(pass) (((1U&~(pass))<<(3-((pass)>>1)))&7)
-#define PNG_PASS_START_COL(pass) (((1U& (pass))<<(3-(((pass)+1)>>1)))&7)
-
-/* Two macros to help evaluate the number of rows or columns in each
- * pass.  This is expressed as a shift - effectively log2 of the number or
- * rows or columns in each 8x8 tile of the original image.
- */
-#define PNG_PASS_ROW_SHIFT(pass) ((pass)>2?(8-(pass))>>1:3)
-#define PNG_PASS_COL_SHIFT(pass) ((pass)>1?(7-(pass))>>1:3)
-
-/* Hence two macros to determine the number of rows or columns in a given
- * pass of an image given its height or width.  In fact these macros may
- * return non-zero even though the sub-image is empty, because the other
- * dimension may be empty for a small image.
- */
-#define PNG_PASS_ROWS(height, pass) (((height)+(((1<<PNG_PASS_ROW_SHIFT(pass))\
-   -1)-PNG_PASS_START_ROW(pass)))>>PNG_PASS_ROW_SHIFT(pass))
-#define PNG_PASS_COLS(width, pass) (((width)+(((1<<PNG_PASS_COL_SHIFT(pass))\
-   -1)-PNG_PASS_START_COL(pass)))>>PNG_PASS_COL_SHIFT(pass))
-
-/* For the progressive reader it is necessary to find the row in the output
- * image given a row in an interlaced image, so two more macros:
- */
-#define PNG_ROW_FROM_PASS_ROW(yIn, pass) \
-   (((yIn)<<PNG_PASS_ROW_SHIFT(pass))+PNG_PASS_START_ROW(pass))
-#define PNG_COL_FROM_PASS_COL(xIn, pass) \
-   (((xIn)<<PNG_PASS_COL_SHIFT(pass))+PNG_PASS_START_COL(pass))
-
-/* Two macros which return a boolean (0 or 1) saying whether the given row
- * or column is in a particular pass.  These use a common utility macro that
- * returns a mask for a given pass - the offset 'off' selects the row or
- * column version.  The mask has the appropriate bit set for each column in
- * the tile.
- */
-#define PNG_PASS_MASK(pass,off) ( \
-   ((0x110145AFU>>(((7-(off))-(pass))<<2)) & 0xFU) | \
-   ((0x01145AF0U>>(((7-(off))-(pass))<<2)) & 0xF0U))
-
-#define PNG_ROW_IN_INTERLACE_PASS(y, pass) \
-   ((PNG_PASS_MASK(pass,0) >> ((y)&7)) & 1)
-#define PNG_COL_IN_INTERLACE_PASS(x, pass) \
-   ((PNG_PASS_MASK(pass,1) >> ((x)&7)) & 1)
-
-#ifdef PNG_READ_COMPOSITE_NODIV_SUPPORTED
-/* With these routines we avoid an integer divide, which will be slower on
- * most machines.  However, it does take more operations than the corresponding
- * divide method, so it may be slower on a few RISC systems.  There are two
- * shifts (by 8 or 16 bits) and an addition, versus a single integer divide.
- *
- * Note that the rounding factors are NOT supposed to be the same!  128 and
- * 32768 are correct for the NODIV code; 127 and 32767 are correct for the
- * standard method.
- *
- * [Optimized code by Greg Roelofs and Mark Adler...blame us for bugs. :-) ]
- */
-
- /* fg and bg should be in `gamma 1.0' space; alpha is the opacity */
-
-#  define png_composite(composite, fg, alpha, bg)         \
-     { png_uint_16 temp = (png_uint_16)((png_uint_16)(fg) \
-           * (png_uint_16)(alpha)                         \
-           + (png_uint_16)(bg)*(png_uint_16)(255          \
-           - (png_uint_16)(alpha)) + (png_uint_16)128);   \
-       (composite) = (png_byte)((temp + (temp >> 8)) >> 8); }
-
-#  define png_composite_16(composite, fg, alpha, bg)       \
-     { png_uint_32 temp = (png_uint_32)((png_uint_32)(fg)  \
-           * (png_uint_32)(alpha)                          \
-           + (png_uint_32)(bg)*(png_uint_32)(65535L        \
-           - (png_uint_32)(alpha)) + (png_uint_32)32768L); \
-       (composite) = (png_uint_16)((temp + (temp >> 16)) >> 16); }
-
-#else  /* Standard method using integer division */
-
-#  define png_composite(composite, fg, alpha, bg)                          \
-     (composite) = (png_byte)(((png_uint_16)(fg) * (png_uint_16)(alpha) +  \
-     (png_uint_16)(bg) * (png_uint_16)(255 - (png_uint_16)(alpha)) +       \
-     (png_uint_16)127) / 255)
-
-#  define png_composite_16(composite, fg, alpha, bg)                         \
-     (composite) = (png_uint_16)(((png_uint_32)(fg) * (png_uint_32)(alpha) + \
-     (png_uint_32)(bg)*(png_uint_32)(65535L - (png_uint_32)(alpha)) +        \
-     (png_uint_32)32767) / (png_uint_32)65535L)
-#endif /* PNG_READ_COMPOSITE_NODIV_SUPPORTED */
-
-#ifdef PNG_READ_INT_FUNCTIONS_SUPPORTED
-PNG_EXPORT(201, png_uint_32, png_get_uint_32, (png_const_bytep buf));
-PNG_EXPORT(202, png_uint_16, png_get_uint_16, (png_const_bytep buf));
-PNG_EXPORT(203, png_int_32, png_get_int_32, (png_const_bytep buf));
-#endif
-
-PNG_EXPORT(204, png_uint_32, png_get_uint_31, (png_structp png_ptr, 
-    png_const_bytep buf));
-/* No png_get_int_16 -- may be added if there's a real need for it. */
-
-/* Place a 32-bit number into a buffer in PNG byte order (big-endian). */
-#ifdef PNG_WRITE_INT_FUNCTIONS_SUPPORTED
-PNG_EXPORT(205, void, png_save_uint_32, (png_bytep buf, png_uint_32 i));
-#endif
-#ifdef PNG_SAVE_INT_32_SUPPORTED
-PNG_EXPORT(206, void, png_save_int_32, (png_bytep buf, png_int_32 i));
-#endif
-
-/* Place a 16-bit number into a buffer in PNG byte order.
- * The parameter is declared unsigned int, not png_uint_16, 
- * just to avoid potential problems on pre-ANSI C compilers.
- */
-#ifdef PNG_WRITE_INT_FUNCTIONS_SUPPORTED
-PNG_EXPORT(207, void, png_save_uint_16, (png_bytep buf, unsigned int i));
-/* No png_save_int_16 -- may be added if there's a real need for it. */
-#endif
-
-#ifdef PNG_USE_READ_MACROS
-/* Inline macros to do direct reads of bytes from the input buffer.
- * The png_get_int_32() routine assumes we are using two's complement
- * format for negative values, which is almost certainly true.
- */
-#  define png_get_uint_32(buf) \
-     (((png_uint_32)(*(buf)) << 24) + \
-      ((png_uint_32)(*((buf) + 1)) << 16) + \
-      ((png_uint_32)(*((buf) + 2)) << 8) + \
-      ((png_uint_32)(*((buf) + 3))))
-
-   /* From libpng-1.4.0 until 1.4.4, the png_get_uint_16 macro (but not the
-    * function) incorrectly returned a value of type png_uint_32.
-    */
-#  define png_get_uint_16(buf) \
-     ((png_uint_16) \
-      (((unsigned int)(*(buf)) << 8) + \
-       ((unsigned int)(*((buf) + 1)))))
-
-#  define png_get_int_32(buf) \
-     ((png_int_32)((*(buf) & 0x80) \
-      ? -((png_int_32)((png_get_uint_32(buf) ^ 0xffffffffL) + 1)) \
-      : (png_int_32)png_get_uint_32(buf)))
-#endif
-
-/* Maintainer: Put new public prototypes here ^, in libpng.3, and project
- * defs
- */
-
-/* The last ordinal number (this is the *last* one already used; the next
- * one to use is one more than this.)  Maintainer, remember to add an entry to
- * scripts/symbols.def as well.
- */
-#ifdef PNG_EXPORT_LAST_ORDINAL
-  PNG_EXPORT_LAST_ORDINAL(220);
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* PNG_VERSION_INFO_ONLY */
-/* Do not put anything past this line */
-#endif /* PNG_H */
+/* png.h - header file for PNG reference library
+ *
+ * libpng version 1.2.50 - July 10, 2012
+ * Copyright (c) 1998-2012 Glenn Randers-Pehrson
+ * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
+ * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
+ *
+ * This code is released under the libpng license (See LICENSE, below)
+ *
+ * Authors and maintainers:
+ *  libpng versions 0.71, May 1995, through 0.88, January 1996: Guy Schalnat
+ *  libpng versions 0.89c, June 1996, through 0.96, May 1997: Andreas Dilger
+ *  libpng versions 0.97, January 1998, through 1.2.50 - July 10, 2012: Glenn
+ *  See also "Contributing Authors", below.
+ *
+ * Note about libpng version numbers:
+ *
+ *    Due to various miscommunications, unforeseen code incompatibilities
+ *    and occasional factors outside the authors' control, version numbering
+ *    on the library has not always been consistent and straightforward.
+ *    The following table summarizes matters since version 0.89c, which was
+ *    the first widely used release:
+ *
+ *    source                 png.h  png.h  shared-lib
+ *    version                string   int  version
+ *    -------                ------ -----  ----------
+ *    0.89c "1.0 beta 3"     0.89      89  1.0.89
+ *    0.90  "1.0 beta 4"     0.90      90  0.90  [should have been 2.0.90]
+ *    0.95  "1.0 beta 5"     0.95      95  0.95  [should have been 2.0.95]
+ *    0.96  "1.0 beta 6"     0.96      96  0.96  [should have been 2.0.96]
+ *    0.97b "1.00.97 beta 7" 1.00.97   97  1.0.1 [should have been 2.0.97]
+ *    0.97c                  0.97      97  2.0.97
+ *    0.98                   0.98      98  2.0.98
+ *    0.99                   0.99      98  2.0.99
+ *    0.99a-m                0.99      99  2.0.99
+ *    1.00                   1.00     100  2.1.0 [100 should be 10000]
+ *    1.0.0      (from here on, the   100  2.1.0 [100 should be 10000]
+ *    1.0.1       png.h string is   10001  2.1.0
+ *    1.0.1a-e    identical to the  10002  from here on, the shared library
+ *    1.0.2       source version)   10002  is 2.V where V is the source code
+ *    1.0.2a-b                      10003  version, except as noted.
+ *    1.0.3                         10003
+ *    1.0.3a-d                      10004
+ *    1.0.4                         10004
+ *    1.0.4a-f                      10005
+ *    1.0.5 (+ 2 patches)           10005
+ *    1.0.5a-d                      10006
+ *    1.0.5e-r                      10100 (not source compatible)
+ *    1.0.5s-v                      10006 (not binary compatible)
+ *    1.0.6 (+ 3 patches)           10006 (still binary incompatible)
+ *    1.0.6d-f                      10007 (still binary incompatible)
+ *    1.0.6g                        10007
+ *    1.0.6h                        10007  10.6h (testing xy.z so-numbering)
+ *    1.0.6i                        10007  10.6i
+ *    1.0.6j                        10007  2.1.0.6j (incompatible with 1.0.0)
+ *    1.0.7beta11-14        DLLNUM  10007  2.1.0.7beta11-14 (binary compatible)
+ *    1.0.7beta15-18           1    10007  2.1.0.7beta15-18 (binary compatible)
+ *    1.0.7rc1-2               1    10007  2.1.0.7rc1-2 (binary compatible)
+ *    1.0.7                    1    10007  (still compatible)
+ *    1.0.8beta1-4             1    10008  2.1.0.8beta1-4
+ *    1.0.8rc1                 1    10008  2.1.0.8rc1
+ *    1.0.8                    1    10008  2.1.0.8
+ *    1.0.9beta1-6             1    10009  2.1.0.9beta1-6
+ *    1.0.9rc1                 1    10009  2.1.0.9rc1
+ *    1.0.9beta7-10            1    10009  2.1.0.9beta7-10
+ *    1.0.9rc2                 1    10009  2.1.0.9rc2
+ *    1.0.9                    1    10009  2.1.0.9
+ *    1.0.10beta1              1    10010  2.1.0.10beta1
+ *    1.0.10rc1                1    10010  2.1.0.10rc1
+ *    1.0.10                   1    10010  2.1.0.10
+ *    1.0.11beta1-3            1    10011  2.1.0.11beta1-3
+ *    1.0.11rc1                1    10011  2.1.0.11rc1
+ *    1.0.11                   1    10011  2.1.0.11
+ *    1.0.12beta1-2            2    10012  2.1.0.12beta1-2
+ *    1.0.12rc1                2    10012  2.1.0.12rc1
+ *    1.0.12                   2    10012  2.1.0.12
+ *    1.1.0a-f                 -    10100  2.1.1.0a-f (branch abandoned)
+ *    1.2.0beta1-2             2    10200  2.1.2.0beta1-2
+ *    1.2.0beta3-5             3    10200  3.1.2.0beta3-5
+ *    1.2.0rc1                 3    10200  3.1.2.0rc1
+ *    1.2.0                    3    10200  3.1.2.0
+ *    1.2.1beta1-4             3    10201  3.1.2.1beta1-4
+ *    1.2.1rc1-2               3    10201  3.1.2.1rc1-2
+ *    1.2.1                    3    10201  3.1.2.1
+ *    1.2.2beta1-6            12    10202  12.so.0.1.2.2beta1-6
+ *    1.0.13beta1             10    10013  10.so.0.1.0.13beta1
+ *    1.0.13rc1               10    10013  10.so.0.1.0.13rc1
+ *    1.2.2rc1                12    10202  12.so.0.1.2.2rc1
+ *    1.0.13                  10    10013  10.so.0.1.0.13
+ *    1.2.2                   12    10202  12.so.0.1.2.2
+ *    1.2.3rc1-6              12    10203  12.so.0.1.2.3rc1-6
+ *    1.2.3                   12    10203  12.so.0.1.2.3
+ *    1.2.4beta1-3            13    10204  12.so.0.1.2.4beta1-3
+ *    1.0.14rc1               13    10014  10.so.0.1.0.14rc1
+ *    1.2.4rc1                13    10204  12.so.0.1.2.4rc1
+ *    1.0.14                  10    10014  10.so.0.1.0.14
+ *    1.2.4                   13    10204  12.so.0.1.2.4
+ *    1.2.5beta1-2            13    10205  12.so.0.1.2.5beta1-2
+ *    1.0.15rc1-3             10    10015  10.so.0.1.0.15rc1-3
+ *    1.2.5rc1-3              13    10205  12.so.0.1.2.5rc1-3
+ *    1.0.15                  10    10015  10.so.0.1.0.15
+ *    1.2.5                   13    10205  12.so.0.1.2.5
+ *    1.2.6beta1-4            13    10206  12.so.0.1.2.6beta1-4
+ *    1.0.16                  10    10016  10.so.0.1.0.16
+ *    1.2.6                   13    10206  12.so.0.1.2.6
+ *    1.2.7beta1-2            13    10207  12.so.0.1.2.7beta1-2
+ *    1.0.17rc1               10    10017  10.so.0.1.0.17rc1
+ *    1.2.7rc1                13    10207  12.so.0.1.2.7rc1
+ *    1.0.17                  10    10017  10.so.0.1.0.17
+ *    1.2.7                   13    10207  12.so.0.1.2.7
+ *    1.2.8beta1-5            13    10208  12.so.0.1.2.8beta1-5
+ *    1.0.18rc1-5             10    10018  10.so.0.1.0.18rc1-5
+ *    1.2.8rc1-5              13    10208  12.so.0.1.2.8rc1-5
+ *    1.0.18                  10    10018  10.so.0.1.0.18
+ *    1.2.8                   13    10208  12.so.0.1.2.8
+ *    1.2.9beta1-3            13    10209  12.so.0.1.2.9beta1-3
+ *    1.2.9beta4-11           13    10209  12.so.0.9[.0]
+ *    1.2.9rc1                13    10209  12.so.0.9[.0]
+ *    1.2.9                   13    10209  12.so.0.9[.0]
+ *    1.2.10beta1-8           13    10210  12.so.0.10[.0]
+ *    1.2.10rc1-3             13    10210  12.so.0.10[.0]
+ *    1.2.10                  13    10210  12.so.0.10[.0]
+ *    1.2.11beta1-4           13    10211  12.so.0.11[.0]
+ *    1.0.19rc1-5             10    10019  10.so.0.19[.0]
+ *    1.2.11rc1-5             13    10211  12.so.0.11[.0]
+ *    1.0.19                  10    10019  10.so.0.19[.0]
+ *    1.2.11                  13    10211  12.so.0.11[.0]
+ *    1.0.20                  10    10020  10.so.0.20[.0]
+ *    1.2.12                  13    10212  12.so.0.12[.0]
+ *    1.2.13beta1             13    10213  12.so.0.13[.0]
+ *    1.0.21                  10    10021  10.so.0.21[.0]
+ *    1.2.13                  13    10213  12.so.0.13[.0]
+ *    1.2.14beta1-2           13    10214  12.so.0.14[.0]
+ *    1.0.22rc1               10    10022  10.so.0.22[.0]
+ *    1.2.14rc1               13    10214  12.so.0.14[.0]
+ *    1.0.22                  10    10022  10.so.0.22[.0]
+ *    1.2.14                  13    10214  12.so.0.14[.0]
+ *    1.2.15beta1-6           13    10215  12.so.0.15[.0]
+ *    1.0.23rc1-5             10    10023  10.so.0.23[.0]
+ *    1.2.15rc1-5             13    10215  12.so.0.15[.0]
+ *    1.0.23                  10    10023  10.so.0.23[.0]
+ *    1.2.15                  13    10215  12.so.0.15[.0]
+ *    1.2.16beta1-2           13    10216  12.so.0.16[.0]
+ *    1.2.16rc1               13    10216  12.so.0.16[.0]
+ *    1.0.24                  10    10024  10.so.0.24[.0]
+ *    1.2.16                  13    10216  12.so.0.16[.0]
+ *    1.2.17beta1-2           13    10217  12.so.0.17[.0]
+ *    1.0.25rc1               10    10025  10.so.0.25[.0]
+ *    1.2.17rc1-3             13    10217  12.so.0.17[.0]
+ *    1.0.25                  10    10025  10.so.0.25[.0]
+ *    1.2.17                  13    10217  12.so.0.17[.0]
+ *    1.0.26                  10    10026  10.so.0.26[.0]
+ *    1.2.18                  13    10218  12.so.0.18[.0]
+ *    1.2.19beta1-31          13    10219  12.so.0.19[.0]
+ *    1.0.27rc1-6             10    10027  10.so.0.27[.0]
+ *    1.2.19rc1-6             13    10219  12.so.0.19[.0]
+ *    1.0.27                  10    10027  10.so.0.27[.0]
+ *    1.2.19                  13    10219  12.so.0.19[.0]
+ *    1.2.20beta01-04         13    10220  12.so.0.20[.0]
+ *    1.0.28rc1-6             10    10028  10.so.0.28[.0]
+ *    1.2.20rc1-6             13    10220  12.so.0.20[.0]
+ *    1.0.28                  10    10028  10.so.0.28[.0]
+ *    1.2.20                  13    10220  12.so.0.20[.0]
+ *    1.2.21beta1-2           13    10221  12.so.0.21[.0]
+ *    1.2.21rc1-3             13    10221  12.so.0.21[.0]
+ *    1.0.29                  10    10029  10.so.0.29[.0]
+ *    1.2.21                  13    10221  12.so.0.21[.0]
+ *    1.2.22beta1-4           13    10222  12.so.0.22[.0]
+ *    1.0.30rc1               10    10030  10.so.0.30[.0]
+ *    1.2.22rc1               13    10222  12.so.0.22[.0]
+ *    1.0.30                  10    10030  10.so.0.30[.0]
+ *    1.2.22                  13    10222  12.so.0.22[.0]
+ *    1.2.23beta01-05         13    10223  12.so.0.23[.0]
+ *    1.2.23rc01              13    10223  12.so.0.23[.0]
+ *    1.2.23                  13    10223  12.so.0.23[.0]
+ *    1.2.24beta01-02         13    10224  12.so.0.24[.0]
+ *    1.2.24rc01              13    10224  12.so.0.24[.0]
+ *    1.2.24                  13    10224  12.so.0.24[.0]
+ *    1.2.25beta01-06         13    10225  12.so.0.25[.0]
+ *    1.2.25rc01-02           13    10225  12.so.0.25[.0]
+ *    1.0.31                  10    10031  10.so.0.31[.0]
+ *    1.2.25                  13    10225  12.so.0.25[.0]
+ *    1.2.26beta01-06         13    10226  12.so.0.26[.0]
+ *    1.2.26rc01              13    10226  12.so.0.26[.0]
+ *    1.2.26                  13    10226  12.so.0.26[.0]
+ *    1.0.32                  10    10032  10.so.0.32[.0]
+ *    1.2.27beta01-06         13    10227  12.so.0.27[.0]
+ *    1.2.27rc01              13    10227  12.so.0.27[.0]
+ *    1.0.33                  10    10033  10.so.0.33[.0]
+ *    1.2.27                  13    10227  12.so.0.27[.0]
+ *    1.0.34                  10    10034  10.so.0.34[.0]
+ *    1.2.28                  13    10228  12.so.0.28[.0]
+ *    1.2.29beta01-03         13    10229  12.so.0.29[.0]
+ *    1.2.29rc01              13    10229  12.so.0.29[.0]
+ *    1.0.35                  10    10035  10.so.0.35[.0]
+ *    1.2.29                  13    10229  12.so.0.29[.0]
+ *    1.0.37                  10    10037  10.so.0.37[.0]
+ *    1.2.30beta01-04         13    10230  12.so.0.30[.0]
+ *    1.0.38rc01-08           10    10038  10.so.0.38[.0]
+ *    1.2.30rc01-08           13    10230  12.so.0.30[.0]
+ *    1.0.38                  10    10038  10.so.0.38[.0]
+ *    1.2.30                  13    10230  12.so.0.30[.0]
+ *    1.0.39rc01-03           10    10039  10.so.0.39[.0]
+ *    1.2.31rc01-03           13    10231  12.so.0.31[.0]
+ *    1.0.39                  10    10039  10.so.0.39[.0]
+ *    1.2.31                  13    10231  12.so.0.31[.0]
+ *    1.2.32beta01-02         13    10232  12.so.0.32[.0]
+ *    1.0.40rc01              10    10040  10.so.0.40[.0]
+ *    1.2.32rc01              13    10232  12.so.0.32[.0]
+ *    1.0.40                  10    10040  10.so.0.40[.0]
+ *    1.2.32                  13    10232  12.so.0.32[.0]
+ *    1.2.33beta01-02         13    10233  12.so.0.33[.0]
+ *    1.2.33rc01-02           13    10233  12.so.0.33[.0]
+ *    1.0.41rc01              10    10041  10.so.0.41[.0]
+ *    1.2.33                  13    10233  12.so.0.33[.0]
+ *    1.0.41                  10    10041  10.so.0.41[.0]
+ *    1.2.34beta01-07         13    10234  12.so.0.34[.0]
+ *    1.0.42rc01              10    10042  10.so.0.42[.0]
+ *    1.2.34rc01              13    10234  12.so.0.34[.0]
+ *    1.0.42                  10    10042  10.so.0.42[.0]
+ *    1.2.34                  13    10234  12.so.0.34[.0]
+ *    1.2.35beta01-03         13    10235  12.so.0.35[.0]
+ *    1.0.43rc01-02           10    10043  10.so.0.43[.0]
+ *    1.2.35rc01-02           13    10235  12.so.0.35[.0]
+ *    1.0.43                  10    10043  10.so.0.43[.0]
+ *    1.2.35                  13    10235  12.so.0.35[.0]
+ *    1.2.36beta01-05         13    10236  12.so.0.36[.0]
+ *    1.2.36rc01              13    10236  12.so.0.36[.0]
+ *    1.0.44                  10    10044  10.so.0.44[.0]
+ *    1.2.36                  13    10236  12.so.0.36[.0]
+ *    1.2.37beta01-03         13    10237  12.so.0.37[.0]
+ *    1.2.37rc01              13    10237  12.so.0.37[.0]
+ *    1.2.37                  13    10237  12.so.0.37[.0]
+ *    1.0.45                  10    10045  12.so.0.45[.0]
+ *    1.0.46                  10    10046  10.so.0.46[.0]
+ *    1.2.38beta01            13    10238  12.so.0.38[.0]
+ *    1.2.38rc01-03           13    10238  12.so.0.38[.0]
+ *    1.0.47                  10    10047  10.so.0.47[.0]
+ *    1.2.38                  13    10238  12.so.0.38[.0]
+ *    1.2.39beta01-05         13    10239  12.so.0.39[.0]
+ *    1.2.39rc01              13    10239  12.so.0.39[.0]
+ *    1.0.48                  10    10048  10.so.0.48[.0]
+ *    1.2.39                  13    10239  12.so.0.39[.0]
+ *    1.2.40beta01            13    10240  12.so.0.40[.0]
+ *    1.2.40rc01              13    10240  12.so.0.40[.0]
+ *    1.0.49                  10    10049  10.so.0.49[.0]
+ *    1.2.40                  13    10240  12.so.0.40[.0]
+ *    1.2.41beta01-18         13    10241  12.so.0.41[.0]
+ *    1.0.51rc01              10    10051  10.so.0.51[.0]
+ *    1.2.41rc01-03           13    10241  12.so.0.41[.0]
+ *    1.0.51                  10    10051  10.so.0.51[.0]
+ *    1.2.41                  13    10241  12.so.0.41[.0]
+ *    1.2.42beta01-02         13    10242  12.so.0.42[.0]
+ *    1.2.42rc01-05           13    10242  12.so.0.42[.0]
+ *    1.0.52                  10    10052  10.so.0.52[.0]
+ *    1.2.42                  13    10242  12.so.0.42[.0]
+ *    1.2.43beta01-05         13    10243  12.so.0.43[.0]
+ *    1.0.53rc01-02           10    10053  10.so.0.53[.0]
+ *    1.2.43rc01-02           13    10243  12.so.0.43[.0]
+ *    1.0.53                  10    10053  10.so.0.53[.0]
+ *    1.2.43                  13    10243  12.so.0.43[.0]
+ *    1.2.44beta01-03         13    10244  12.so.0.44[.0]
+ *    1.2.44rc01-03           13    10244  12.so.0.44[.0]
+ *    1.2.44                  13    10244  12.so.0.44[.0]
+ *    1.2.45beta01-03         13    10245  12.so.0.45[.0]
+ *    1.0.55rc01              10    10055  10.so.0.55[.0]
+ *    1.2.45rc01              13    10245  12.so.0.45[.0]
+ *    1.0.55                  10    10055  10.so.0.55[.0]
+ *    1.2.45                  13    10245  12.so.0.45[.0]
+ *    1.2.46rc01-02           13    10246  12.so.0.46[.0]
+ *    1.0.56                  10    10056  10.so.0.56[.0]
+ *    1.2.46                  13    10246  12.so.0.46[.0]
+ *    1.2.47beta01            13    10247  12.so.0.47[.0]
+ *    1.2.47rc01              13    10247  12.so.0.47[.0]
+ *    1.0.57rc01              10    10057  10.so.0.57[.0]
+ *    1.2.47                  13    10247  12.so.0.47[.0]
+ *    1.0.57                  10    10057  10.so.0.57[.0]
+ *    1.2.48beta01            13    10248  12.so.0.48[.0]
+ *    1.2.48rc01-02           13    10248  12.so.0.48[.0]
+ *    1.0.58                  10    10058  10.so.0.58[.0]
+ *    1.2.48                  13    10248  12.so.0.48[.0]
+ *    1.2.49rc01              13    10249  12.so.0.49[.0]
+ *    1.0.59                  10    10059  10.so.0.59[.0]
+ *    1.2.49                  13    10249  12.so.0.49[.0]
+ *    1.0.60                  10    10060  10.so.0.60[.0]
+ *    1.2.50                  13    10250  12.so.0.50[.0]
+ *
+ *    Henceforth the source version will match the shared-library major
+ *    and minor numbers; the shared-library major version number will be
+ *    used for changes in backward compatibility, as it is intended.  The
+ *    PNG_LIBPNG_VER macro, which is not used within libpng but is available
+ *    for applications, is an unsigned integer of the form xyyzz corresponding
+ *    to the source version x.y.z (leading zeros in y and z).  Beta versions
+ *    were given the previous public release number plus a letter, until
+ *    version 1.0.6j; from then on they were given the upcoming public
+ *    release number plus "betaNN" or "rcNN".
+ *
+ *    Binary incompatibility exists only when applications make direct access
+ *    to the info_ptr or png_ptr members through png.h, and the compiled
+ *    application is loaded with a different version of the library.
+ *
+ *    DLLNUM will change each time there are forward or backward changes
+ *    in binary compatibility (e.g., when a new feature is added).
+ *
+ * See libpng.txt or libpng.3 for more information.  The PNG specification
+ * is available as a W3C Recommendation and as an ISO Specification,
+ * <http://www.w3.org/TR/2003/REC-PNG-20031110/
+ */
+
+/*
+ * COPYRIGHT NOTICE, DISCLAIMER, and LICENSE:
+ *
+ * If you modify libpng you may insert additional notices immediately following
+ * this sentence.
+ *
+ * This code is released under the libpng license.
+ *
+ * libpng versions 1.2.6, August 15, 2004, through 1.2.50, July 10, 2012, are
+ * Copyright (c) 2004, 2006-2011 Glenn Randers-Pehrson, and are
+ * distributed according to the same disclaimer and license as libpng-1.2.5
+ * with the following individual added to the list of Contributing Authors:
+ *
+ *    Cosmin Truta
+ *
+ * libpng versions 1.0.7, July 1, 2000, through 1.2.5, October 3, 2002, are
+ * Copyright (c) 2000-2002 Glenn Randers-Pehrson, and are
+ * distributed according to the same disclaimer and license as libpng-1.0.6
+ * with the following individuals added to the list of Contributing Authors:
+ *
+ *    Simon-Pierre Cadieux
+ *    Eric S. Raymond
+ *    Gilles Vollant
+ *
+ * and with the following additions to the disclaimer:
+ *
+ *    There is no warranty against interference with your enjoyment of the
+ *    library or against infringement.  There is no warranty that our
+ *    efforts or the library will fulfill any of your particular purposes
+ *    or needs.  This library is provided with all faults, and the entire
+ *    risk of satisfactory quality, performance, accuracy, and effort is with
+ *    the user.
+ *
+ * libpng versions 0.97, January 1998, through 1.0.6, March 20, 2000, are
+ * Copyright (c) 1998, 1999, 2000 Glenn Randers-Pehrson, and are
+ * distributed according to the same disclaimer and license as libpng-0.96,
+ * with the following individuals added to the list of Contributing Authors:
+ *
+ *    Tom Lane
+ *    Glenn Randers-Pehrson
+ *    Willem van Schaik
+ *
+ * libpng versions 0.89, June 1996, through 0.96, May 1997, are
+ * Copyright (c) 1996, 1997 Andreas Dilger
+ * Distributed according to the same disclaimer and license as libpng-0.88,
+ * with the following individuals added to the list of Contributing Authors:
+ *
+ *    John Bowler
+ *    Kevin Bracey
+ *    Sam Bushell
+ *    Magnus Holmgren
+ *    Greg Roelofs
+ *    Tom Tanner
+ *
+ * libpng versions 0.5, May 1995, through 0.88, January 1996, are
+ * Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.
+ *
+ * For the purposes of this copyright and license, "Contributing Authors"
+ * is defined as the following set of individuals:
+ *
+ *    Andreas Dilger
+ *    Dave Martindale
+ *    Guy Eric Schalnat
+ *    Paul Schmidt
+ *    Tim Wegner
+ *
+ * The PNG Reference Library is supplied "AS IS".  The Contributing Authors
+ * and Group 42, Inc. disclaim all warranties, expressed or implied,
+ * including, without limitation, the warranties of merchantability and of
+ * fitness for any purpose.  The Contributing Authors and Group 42, Inc.
+ * assume no liability for direct, indirect, incidental, special, exemplary,
+ * or consequential damages, which may result from the use of the PNG
+ * Reference Library, even if advised of the possibility of such damage.
+ *
+ * Permission is hereby granted to use, copy, modify, and distribute this
+ * source code, or portions hereof, for any purpose, without fee, subject
+ * to the following restrictions:
+ *
+ * 1. The origin of this source code must not be misrepresented.
+ *
+ * 2. Altered versions must be plainly marked as such and
+ * must not be misrepresented as being the original source.
+ *
+ * 3. This Copyright notice may not be removed or altered from
+ *    any source or altered source distribution.
+ *
+ * The Contributing Authors and Group 42, Inc. specifically permit, without
+ * fee, and encourage the use of this source code as a component to
+ * supporting the PNG file format in commercial products.  If you use this
+ * source code in a product, acknowledgment is not required but would be
+ * appreciated.
+ */
+
+/*
+ * A "png_get_copyright" function is available, for convenient use in "about"
+ * boxes and the like:
+ *
+ * printf("%s",png_get_copyright(NULL));
+ *
+ * Also, the PNG logo (in PNG format, of course) is supplied in the
+ * files "pngbar.png" and "pngbar.jpg (88x31) and "pngnow.png" (98x31).
+ */
+
+/*
+ * Libpng is OSI Certified Open Source Software.  OSI Certified is a
+ * certification mark of the Open Source Initiative.
+ */
+
+/*
+ * The contributing authors would like to thank all those who helped
+ * with testing, bug fixes, and patience.  This wouldn't have been
+ * possible without all of you.
+ *
+ * Thanks to Frank J. T. Wojcik for helping with the documentation.
+ */
+
+/*
+ * Y2K compliance in libpng:
+ * =========================
+ *
+ *    July 10, 2012
+ *
+ *    Since the PNG Development group is an ad-hoc body, we can't make
+ *    an official declaration.
+ *
+ *    This is your unofficial assurance that libpng from version 0.71 and
+ *    upward through 1.2.50 are Y2K compliant.  It is my belief that earlier
+ *    versions were also Y2K compliant.
+ *
+ *    Libpng only has three year fields.  One is a 2-byte unsigned integer
+ *    that will hold years up to 65535.  The other two hold the date in text
+ *    format, and will hold years up to 9999.
+ *
+ *    The integer is
+ *        "png_uint_16 year" in png_time_struct.
+ *
+ *    The strings are
+ *        "png_charp time_buffer" in png_struct and
+ *        "near_time_buffer", which is a local character string in png.c.
+ *
+ *    There are seven time-related functions:
+ *        png.c: png_convert_to_rfc_1123() in png.c
+ *          (formerly png_convert_to_rfc_1152() in error)
+ *        png_convert_from_struct_tm() in pngwrite.c, called in pngwrite.c
+ *        png_convert_from_time_t() in pngwrite.c
+ *        png_get_tIME() in pngget.c
+ *        png_handle_tIME() in pngrutil.c, called in pngread.c
+ *        png_set_tIME() in pngset.c
+ *        png_write_tIME() in pngwutil.c, called in pngwrite.c
+ *
+ *    All handle dates properly in a Y2K environment.  The
+ *    png_convert_from_time_t() function calls gmtime() to convert from system
+ *    clock time, which returns (year - 1900), which we properly convert to
+ *    the full 4-digit year.  There is a possibility that applications using
+ *    libpng are not passing 4-digit years into the png_convert_to_rfc_1123()
+ *    function, or that they are incorrectly passing only a 2-digit year
+ *    instead of "year - 1900" into the png_convert_from_struct_tm() function,
+ *    but this is not under our control.  The libpng documentation has always
+ *    stated that it works with 4-digit years, and the APIs have been
+ *    documented as such.
+ *
+ *    The tIME chunk itself is also Y2K compliant.  It uses a 2-byte unsigned
+ *    integer to hold the year, and can hold years as large as 65535.
+ *
+ *    zlib, upon which libpng depends, is also Y2K compliant.  It contains
+ *    no date-related code.
+ *
+ *       Glenn Randers-Pehrson
+ *       libpng maintainer
+ *       PNG Development Group
+ */
+
+#ifndef PNG_H
+#define PNG_H
+
+/* This is not the place to learn how to use libpng.  The file libpng.txt
+ * describes how to use libpng, and the file example.c summarizes it
+ * with some code on which to build.  This file is useful for looking
+ * at the actual function definitions and structure components.
+ */
+
+/* Version information for png.h - this should match the version in png.c */
+#define PNG_LIBPNG_VER_STRING "1.2.50"
+#define PNG_HEADER_VERSION_STRING \
+   " libpng version 1.2.50 - July 10, 2012\n"
+
+#define PNG_LIBPNG_VER_SONUM   0
+#define PNG_LIBPNG_VER_DLLNUM  13
+
+/* These should match the first 3 components of PNG_LIBPNG_VER_STRING: */
+#define PNG_LIBPNG_VER_MAJOR   1
+#define PNG_LIBPNG_VER_MINOR   2
+#define PNG_LIBPNG_VER_RELEASE 50
+/* This should match the numeric part of the final component of
+ * PNG_LIBPNG_VER_STRING, omitting any leading zero:
+ */
+
+#define PNG_LIBPNG_VER_BUILD  0
+
+/* Release Status */
+#define PNG_LIBPNG_BUILD_ALPHA    1
+#define PNG_LIBPNG_BUILD_BETA     2
+#define PNG_LIBPNG_BUILD_RC       3
+#define PNG_LIBPNG_BUILD_STABLE   4
+#define PNG_LIBPNG_BUILD_RELEASE_STATUS_MASK 7
+
+/* Release-Specific Flags */
+#define PNG_LIBPNG_BUILD_PATCH    8 /* Can be OR'ed with
+                                       PNG_LIBPNG_BUILD_STABLE only */
+#define PNG_LIBPNG_BUILD_PRIVATE 16 /* Cannot be OR'ed with
+                                       PNG_LIBPNG_BUILD_SPECIAL */
+#define PNG_LIBPNG_BUILD_SPECIAL 32 /* Cannot be OR'ed with
+                                       PNG_LIBPNG_BUILD_PRIVATE */
+
+#define PNG_LIBPNG_BUILD_BASE_TYPE PNG_LIBPNG_BUILD_STABLE
+
+/* Careful here.  At one time, Guy wanted to use 082, but that would be octal.
+ * We must not include leading zeros.
+ * Versions 0.7 through 1.0.0 were in the range 0 to 100 here (only
+ * version 1.0.0 was mis-numbered 100 instead of 10000).  From
+ * version 1.0.1 it's    xxyyzz, where x=major, y=minor, z=release
+ */
+#define PNG_LIBPNG_VER 10250 /* 1.2.50 */
+
+#ifndef PNG_VERSION_INFO_ONLY
+/* Include the compression library's header */
+#include "zlib.h"
+#endif
+
+/* Include all user configurable info, including optional assembler routines */
+#include "pngconf.h"
+
+/*
+ * Added at libpng-1.2.8 */
+/* Ref MSDN: Private as priority over Special
+ * VS_FF_PRIVATEBUILD File *was not* built using standard release
+ * procedures. If this value is given, the StringFileInfo block must
+ * contain a PrivateBuild string.
+ *
+ * VS_FF_SPECIALBUILD File *was* built by the original company using
+ * standard release procedures but is a variation of the standard
+ * file of the same version number. If this value is given, the
+ * StringFileInfo block must contain a SpecialBuild string.
+ */
+
+#ifdef PNG_USER_PRIVATEBUILD
+#  define PNG_LIBPNG_BUILD_TYPE \
+          (PNG_LIBPNG_BUILD_BASE_TYPE | PNG_LIBPNG_BUILD_PRIVATE)
+#else
+#  ifdef PNG_LIBPNG_SPECIALBUILD
+#    define PNG_LIBPNG_BUILD_TYPE \
+            (PNG_LIBPNG_BUILD_BASE_TYPE | PNG_LIBPNG_BUILD_SPECIAL)
+#  else
+#    define PNG_LIBPNG_BUILD_TYPE (PNG_LIBPNG_BUILD_BASE_TYPE)
+#  endif
+#endif
+
+#ifndef PNG_VERSION_INFO_ONLY
+
+/* Inhibit C++ name-mangling for libpng functions but not for system calls. */
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+/* This file is arranged in several sections.  The first section contains
+ * structure and type definitions.  The second section contains the external
+ * library functions, while the third has the internal library functions,
+ * which applications aren't expected to use directly.
+ */
+
+#ifndef PNG_NO_TYPECAST_NULL
+#define int_p_NULL                (int *)NULL
+#define png_bytep_NULL            (png_bytep)NULL
+#define png_bytepp_NULL           (png_bytepp)NULL
+#define png_doublep_NULL          (png_doublep)NULL
+#define png_error_ptr_NULL        (png_error_ptr)NULL
+#define png_flush_ptr_NULL        (png_flush_ptr)NULL
+#define png_free_ptr_NULL         (png_free_ptr)NULL
+#define png_infopp_NULL           (png_infopp)NULL
+#define png_malloc_ptr_NULL       (png_malloc_ptr)NULL
+#define png_read_status_ptr_NULL  (png_read_status_ptr)NULL
+#define png_rw_ptr_NULL           (png_rw_ptr)NULL
+#define png_structp_NULL          (png_structp)NULL
+#define png_uint_16p_NULL         (png_uint_16p)NULL
+#define png_voidp_NULL            (png_voidp)NULL
+#define png_write_status_ptr_NULL (png_write_status_ptr)NULL
+#else
+#define int_p_NULL                NULL
+#define png_bytep_NULL            NULL
+#define png_bytepp_NULL           NULL
+#define png_doublep_NULL          NULL
+#define png_error_ptr_NULL        NULL
+#define png_flush_ptr_NULL        NULL
+#define png_free_ptr_NULL         NULL
+#define png_infopp_NULL           NULL
+#define png_malloc_ptr_NULL       NULL
+#define png_read_status_ptr_NULL  NULL
+#define png_rw_ptr_NULL           NULL
+#define png_structp_NULL          NULL
+#define png_uint_16p_NULL         NULL
+#define png_voidp_NULL            NULL
+#define png_write_status_ptr_NULL NULL
+#endif
+
+/* Variables declared in png.c - only it needs to define PNG_NO_EXTERN */
+#if !defined(PNG_NO_EXTERN) || defined(PNG_ALWAYS_EXTERN)
+/* Version information for C files, stored in png.c.  This had better match
+ * the version above.
+ */
+#ifdef PNG_USE_GLOBAL_ARRAYS
+PNG_EXPORT_VAR (PNG_CONST char) png_libpng_ver[18];
+  /* Need room for 99.99.99beta99z */
+#else
+#define png_libpng_ver png_get_header_ver(NULL)
+#endif
+
+#ifdef PNG_USE_GLOBAL_ARRAYS
+/* This was removed in version 1.0.5c */
+/* Structures to facilitate easy interlacing.  See png.c for more details */
+PNG_EXPORT_VAR (PNG_CONST int FARDATA) png_pass_start[7];
+PNG_EXPORT_VAR (PNG_CONST int FARDATA) png_pass_inc[7];
+PNG_EXPORT_VAR (PNG_CONST int FARDATA) png_pass_ystart[7];
+PNG_EXPORT_VAR (PNG_CONST int FARDATA) png_pass_yinc[7];
+PNG_EXPORT_VAR (PNG_CONST int FARDATA) png_pass_mask[7];
+PNG_EXPORT_VAR (PNG_CONST int FARDATA) png_pass_dsp_mask[7];
+/* This isn't currently used.  If you need it, see png.c for more details.
+PNG_EXPORT_VAR (PNG_CONST int FARDATA) png_pass_height[7];
+*/
+#endif
+
+#endif /* PNG_NO_EXTERN */
+
+/* Three color definitions.  The order of the red, green, and blue, (and the
+ * exact size) is not important, although the size of the fields need to
+ * be png_byte or png_uint_16 (as defined below).
+ */
+typedef struct png_color_struct
+{
+   png_byte red;
+   png_byte green;
+   png_byte blue;
+} png_color;
+typedef png_color FAR * png_colorp;
+typedef png_color FAR * FAR * png_colorpp;
+
+typedef struct png_color_16_struct
+{
+   png_byte index;    /* used for palette files */
+   png_uint_16 red;   /* for use in red green blue files */
+   png_uint_16 green;
+   png_uint_16 blue;
+   png_uint_16 gray;  /* for use in grayscale files */
+} png_color_16;
+typedef png_color_16 FAR * png_color_16p;
+typedef png_color_16 FAR * FAR * png_color_16pp;
+
+typedef struct png_color_8_struct
+{
+   png_byte red;   /* for use in red green blue files */
+   png_byte green;
+   png_byte blue;
+   png_byte gray;  /* for use in grayscale files */
+   png_byte alpha; /* for alpha channel files */
+} png_color_8;
+typedef png_color_8 FAR * png_color_8p;
+typedef png_color_8 FAR * FAR * png_color_8pp;
+
+/*
+ * The following two structures are used for the in-core representation
+ * of sPLT chunks.
+ */
+typedef struct png_sPLT_entry_struct
+{
+   png_uint_16 red;
+   png_uint_16 green;
+   png_uint_16 blue;
+   png_uint_16 alpha;
+   png_uint_16 frequency;
+} png_sPLT_entry;
+typedef png_sPLT_entry FAR * png_sPLT_entryp;
+typedef png_sPLT_entry FAR * FAR * png_sPLT_entrypp;
+
+/*  When the depth of the sPLT palette is 8 bits, the color and alpha samples
+ *  occupy the LSB of their respective members, and the MSB of each member
+ *  is zero-filled.  The frequency member always occupies the full 16 bits.
+ */
+
+typedef struct png_sPLT_struct
+{
+   png_charp name;           /* palette name */
+   png_byte depth;           /* depth of palette samples */
+   png_sPLT_entryp entries;  /* palette entries */
+   png_int_32 nentries;      /* number of palette entries */
+} png_sPLT_t;
+typedef png_sPLT_t FAR * png_sPLT_tp;
+typedef png_sPLT_t FAR * FAR * png_sPLT_tpp;
+
+#ifdef PNG_TEXT_SUPPORTED
+/* png_text holds the contents of a text/ztxt/itxt chunk in a PNG file,
+ * and whether that contents is compressed or not.  The "key" field
+ * points to a regular zero-terminated C string.  The "text", "lang", and
+ * "lang_key" fields can be regular C strings, empty strings, or NULL pointers.
+ * However, the * structure returned by png_get_text() will always contain
+ * regular zero-terminated C strings (possibly empty), never NULL pointers,
+ * so they can be safely used in printf() and other string-handling functions.
+ */
+typedef struct png_text_struct
+{
+   int  compression;       /* compression value:
+                             -1: tEXt, none
+                              0: zTXt, deflate
+                              1: iTXt, none
+                              2: iTXt, deflate  */
+   png_charp key;          /* keyword, 1-79 character description of "text" */
+   png_charp text;         /* comment, may be an empty string (ie "")
+                              or a NULL pointer */
+   png_size_t text_length; /* length of the text string */
+#ifdef PNG_iTXt_SUPPORTED
+   png_size_t itxt_length; /* length of the itxt string */
+   png_charp lang;         /* language code, 0-79 characters
+                              or a NULL pointer */
+   png_charp lang_key;     /* keyword translated UTF-8 string, 0 or more
+                              chars or a NULL pointer */
+#endif
+} png_text;
+typedef png_text FAR * png_textp;
+typedef png_text FAR * FAR * png_textpp;
+#endif
+
+/* Supported compression types for text in PNG files (tEXt, and zTXt).
+ * The values of the PNG_TEXT_COMPRESSION_ defines should NOT be changed.
+ */
+#define PNG_TEXT_COMPRESSION_NONE_WR -3
+#define PNG_TEXT_COMPRESSION_zTXt_WR -2
+#define PNG_TEXT_COMPRESSION_NONE    -1
+#define PNG_TEXT_COMPRESSION_zTXt     0
+#define PNG_ITXT_COMPRESSION_NONE     1
+#define PNG_ITXT_COMPRESSION_zTXt     2
+#define PNG_TEXT_COMPRESSION_LAST     3  /* Not a valid value */
+
+/* png_time is a way to hold the time in an machine independent way.
+ * Two conversions are provided, both from time_t and struct tm.  There
+ * is no portable way to convert to either of these structures, as far
+ * as I know.  If you know of a portable way, send it to me.  As a side
+ * note - PNG has always been Year 2000 compliant!
+ */
+typedef struct png_time_struct
+{
+   png_uint_16 year; /* full year, as in, 1995 */
+   png_byte month;   /* month of year, 1 - 12 */
+   png_byte day;     /* day of month, 1 - 31 */
+   png_byte hour;    /* hour of day, 0 - 23 */
+   png_byte minute;  /* minute of hour, 0 - 59 */
+   png_byte second;  /* second of minute, 0 - 60 (for leap seconds) */
+} png_time;
+typedef png_time FAR * png_timep;
+typedef png_time FAR * FAR * png_timepp;
+
+#if defined(PNG_UNKNOWN_CHUNKS_SUPPORTED) || \
+ defined(PNG_HANDLE_AS_UNKNOWN_SUPPORTED)
+/* png_unknown_chunk is a structure to hold queued chunks for which there is
+ * no specific support.  The idea is that we can use this to queue
+ * up private chunks for output even though the library doesn't actually
+ * know about their semantics.
+ */
+#define PNG_CHUNK_NAME_LENGTH 5
+typedef struct png_unknown_chunk_t
+{
+    png_byte name[PNG_CHUNK_NAME_LENGTH];
+    png_byte *data;
+    png_size_t size;
+
+    /* libpng-using applications should NOT directly modify this byte. */
+    png_byte location; /* mode of operation at read time */
+}
+png_unknown_chunk;
+typedef png_unknown_chunk FAR * png_unknown_chunkp;
+typedef png_unknown_chunk FAR * FAR * png_unknown_chunkpp;
+#endif
+
+/* png_info is a structure that holds the information in a PNG file so
+ * that the application can find out the characteristics of the image.
+ * If you are reading the file, this structure will tell you what is
+ * in the PNG file.  If you are writing the file, fill in the information
+ * you want to put into the PNG file, then call png_write_info().
+ * The names chosen should be very close to the PNG specification, so
+ * consult that document for information about the meaning of each field.
+ *
+ * With libpng < 0.95, it was only possible to directly set and read the
+ * the values in the png_info_struct, which meant that the contents and
+ * order of the values had to remain fixed.  With libpng 0.95 and later,
+ * however, there are now functions that abstract the contents of
+ * png_info_struct from the application, so this makes it easier to use
+ * libpng with dynamic libraries, and even makes it possible to use
+ * libraries that don't have all of the libpng ancillary chunk-handing
+ * functionality.
+ *
+ * In any case, the order of the parameters in png_info_struct should NOT
+ * be changed for as long as possible to keep compatibility with applications
+ * that use the old direct-access method with png_info_struct.
+ *
+ * The following members may have allocated storage attached that should be
+ * cleaned up before the structure is discarded: palette, trans, text,
+ * pcal_purpose, pcal_units, pcal_params, hist, iccp_name, iccp_profile,
+ * splt_palettes, scal_unit, row_pointers, and unknowns.   By default, these
+ * are automatically freed when the info structure is deallocated, if they were
+ * allocated internally by libpng.  This behavior can be changed by means
+ * of the png_data_freer() function.
+ *
+ * More allocation details: all the chunk-reading functions that
+ * change these members go through the corresponding png_set_*
+ * functions.  A function to clear these members is available: see
+ * png_free_data().  The png_set_* functions do not depend on being
+ * able to point info structure members to any of the storage they are
+ * passed (they make their own copies), EXCEPT that the png_set_text
+ * functions use the same storage passed to them in the text_ptr or
+ * itxt_ptr structure argument, and the png_set_rows and png_set_unknowns
+ * functions do not make their own copies.
+ */
+typedef struct png_info_struct
+{
+   /* The following are necessary for every PNG file */
+   png_uint_32 width PNG_DEPSTRUCT;       /* width of image in pixels (from IHDR) */
+   png_uint_32 height PNG_DEPSTRUCT;      /* height of image in pixels (from IHDR) */
+   png_uint_32 valid PNG_DEPSTRUCT;       /* valid chunk data (see PNG_INFO_ below) */
+   png_uint_32 rowbytes PNG_DEPSTRUCT;    /* bytes needed to hold an untransformed row */
+   png_colorp palette PNG_DEPSTRUCT;      /* array of color values (valid & PNG_INFO_PLTE) */
+   png_uint_16 num_palette PNG_DEPSTRUCT; /* number of color entries in "palette" (PLTE) */
+   png_uint_16 num_trans PNG_DEPSTRUCT;   /* number of transparent palette color (tRNS) */
+   png_byte bit_depth PNG_DEPSTRUCT;      /* 1, 2, 4, 8, or 16 bits/channel (from IHDR) */
+   png_byte color_type PNG_DEPSTRUCT;     /* see PNG_COLOR_TYPE_ below (from IHDR) */
+   /* The following three should have been named *_method not *_type */
+   png_byte compression_type PNG_DEPSTRUCT; /* must be PNG_COMPRESSION_TYPE_BASE (IHDR) */
+   png_byte filter_type PNG_DEPSTRUCT;    /* must be PNG_FILTER_TYPE_BASE (from IHDR) */
+   png_byte interlace_type PNG_DEPSTRUCT; /* One of PNG_INTERLACE_NONE, PNG_INTERLACE_ADAM7 */
+
+   /* The following is informational only on read, and not used on writes. */
+   png_byte channels PNG_DEPSTRUCT;       /* number of data channels per pixel (1, 2, 3, 4) */
+   png_byte pixel_depth PNG_DEPSTRUCT;    /* number of bits per pixel */
+   png_byte spare_byte PNG_DEPSTRUCT;     /* to align the data, and for future use */
+   png_byte signature[8] PNG_DEPSTRUCT;   /* magic bytes read by libpng from start of file */
+
+   /* The rest of the data is optional.  If you are reading, check the
+    * valid field to see if the information in these are valid.  If you
+    * are writing, set the valid field to those chunks you want written,
+    * and initialize the appropriate fields below.
+    */
+
+#if defined(PNG_gAMA_SUPPORTED) && defined(PNG_FLOATING_POINT_SUPPORTED)
+   /* The gAMA chunk describes the gamma characteristics of the system
+    * on which the image was created, normally in the range [1.0, 2.5].
+    * Data is valid if (valid & PNG_INFO_gAMA) is non-zero.
+    */
+   float gamma PNG_DEPSTRUCT; /* gamma value of image, if (valid & PNG_INFO_gAMA) */
+#endif
+
+#ifdef PNG_sRGB_SUPPORTED
+    /* GR-P, 0.96a */
+    /* Data valid if (valid & PNG_INFO_sRGB) non-zero. */
+   png_byte srgb_intent PNG_DEPSTRUCT; /* sRGB rendering intent [0, 1, 2, or 3] */
+#endif
+
+#ifdef PNG_TEXT_SUPPORTED
+   /* The tEXt, and zTXt chunks contain human-readable textual data in
+    * uncompressed, compressed, and optionally compressed forms, respectively.
+    * The data in "text" is an array of pointers to uncompressed,
+    * null-terminated C strings. Each chunk has a keyword that describes the
+    * textual data contained in that chunk.  Keywords are not required to be
+    * unique, and the text string may be empty.  Any number of text chunks may
+    * be in an image.
+    */
+   int num_text PNG_DEPSTRUCT; /* number of comments read/to write */
+   int max_text PNG_DEPSTRUCT; /* current size of text array */
+   png_textp text PNG_DEPSTRUCT; /* array of comments read/to write */
+#endif /* PNG_TEXT_SUPPORTED */
+
+#ifdef PNG_tIME_SUPPORTED
+   /* The tIME chunk holds the last time the displayed image data was
+    * modified.  See the png_time struct for the contents of this struct.
+    */
+   png_time mod_time PNG_DEPSTRUCT;
+#endif
+
+#ifdef PNG_sBIT_SUPPORTED
+   /* The sBIT chunk specifies the number of significant high-order bits
+    * in the pixel data.  Values are in the range [1, bit_depth], and are
+    * only specified for the channels in the pixel data.  The contents of
+    * the low-order bits is not specified.  Data is valid if
+    * (valid & PNG_INFO_sBIT) is non-zero.
+    */
+   png_color_8 sig_bit PNG_DEPSTRUCT; /* significant bits in color channels */
+#endif
+
+#if defined(PNG_tRNS_SUPPORTED) || defined(PNG_READ_EXPAND_SUPPORTED) || \
+defined(PNG_READ_BACKGROUND_SUPPORTED)
+   /* The tRNS chunk supplies transparency data for paletted images and
+    * other image types that don't need a full alpha channel.  There are
+    * "num_trans" transparency values for a paletted image, stored in the
+    * same order as the palette colors, starting from index 0.  Values
+    * for the data are in the range [0, 255], ranging from fully transparent
+    * to fully opaque, respectively.  For non-paletted images, there is a
+    * single color specified that should be treated as fully transparent.
+    * Data is valid if (valid & PNG_INFO_tRNS) is non-zero.
+    */
+   png_bytep trans PNG_DEPSTRUCT; /* transparent values for paletted image */
+   png_color_16 trans_values PNG_DEPSTRUCT; /* transparent color for non-palette image */
+#endif
+
+#if defined(PNG_bKGD_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED)
+   /* The bKGD chunk gives the suggested image background color if the
+    * display program does not have its own background color and the image
+    * is needs to composited onto a background before display.  The colors
+    * in "background" are normally in the same color space/depth as the
+    * pixel data.  Data is valid if (valid & PNG_INFO_bKGD) is non-zero.
+    */
+   png_color_16 background PNG_DEPSTRUCT;
+#endif
+
+#ifdef PNG_oFFs_SUPPORTED
+   /* The oFFs chunk gives the offset in "offset_unit_type" units rightwards
+    * and downwards from the top-left corner of the display, page, or other
+    * application-specific co-ordinate space.  See the PNG_OFFSET_ defines
+    * below for the unit types.  Valid if (valid & PNG_INFO_oFFs) non-zero.
+    */
+   png_int_32 x_offset PNG_DEPSTRUCT; /* x offset on page */
+   png_int_32 y_offset PNG_DEPSTRUCT; /* y offset on page */
+   png_byte offset_unit_type PNG_DEPSTRUCT; /* offset units type */
+#endif
+
+#ifdef PNG_pHYs_SUPPORTED
+   /* The pHYs chunk gives the physical pixel density of the image for
+    * display or printing in "phys_unit_type" units (see PNG_RESOLUTION_
+    * defines below).  Data is valid if (valid & PNG_INFO_pHYs) is non-zero.
+    */
+   png_uint_32 x_pixels_per_unit PNG_DEPSTRUCT; /* horizontal pixel density */
+   png_uint_32 y_pixels_per_unit PNG_DEPSTRUCT; /* vertical pixel density */
+   png_byte phys_unit_type PNG_DEPSTRUCT; /* resolution type (see PNG_RESOLUTION_ below) */
+#endif
+
+#ifdef PNG_hIST_SUPPORTED
+   /* The hIST chunk contains the relative frequency or importance of the
+    * various palette entries, so that a viewer can intelligently select a
+    * reduced-color palette, if required.  Data is an array of "num_palette"
+    * values in the range [0,65535]. Data valid if (valid & PNG_INFO_hIST)
+    * is non-zero.
+    */
+   png_uint_16p hist PNG_DEPSTRUCT;
+#endif
+
+#ifdef PNG_cHRM_SUPPORTED
+   /* The cHRM chunk describes the CIE color characteristics of the monitor
+    * on which the PNG was created.  This data allows the viewer to do gamut
+    * mapping of the input image to ensure that the viewer sees the same
+    * colors in the image as the creator.  Values are in the range
+    * [0.0, 0.8].  Data valid if (valid & PNG_INFO_cHRM) non-zero.
+    */
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+   float x_white PNG_DEPSTRUCT;
+   float y_white PNG_DEPSTRUCT;
+   float x_red PNG_DEPSTRUCT;
+   float y_red PNG_DEPSTRUCT;
+   float x_green PNG_DEPSTRUCT;
+   float y_green PNG_DEPSTRUCT;
+   float x_blue PNG_DEPSTRUCT;
+   float y_blue PNG_DEPSTRUCT;
+#endif
+#endif
+
+#ifdef PNG_pCAL_SUPPORTED
+   /* The pCAL chunk describes a transformation between the stored pixel
+    * values and original physical data values used to create the image.
+    * The integer range [0, 2^bit_depth - 1] maps to the floating-point
+    * range given by [pcal_X0, pcal_X1], and are further transformed by a
+    * (possibly non-linear) transformation function given by "pcal_type"
+    * and "pcal_params" into "pcal_units".  Please see the PNG_EQUATION_
+    * defines below, and the PNG-Group's PNG extensions document for a
+    * complete description of the transformations and how they should be
+    * implemented, and for a description of the ASCII parameter strings.
+    * Data values are valid if (valid & PNG_INFO_pCAL) non-zero.
+    */
+   png_charp pcal_purpose PNG_DEPSTRUCT;  /* pCAL chunk description string */
+   png_int_32 pcal_X0 PNG_DEPSTRUCT;      /* minimum value */
+   png_int_32 pcal_X1 PNG_DEPSTRUCT;      /* maximum value */
+   png_charp pcal_units PNG_DEPSTRUCT;    /* Latin-1 string giving physical units */
+   png_charpp pcal_params PNG_DEPSTRUCT;  /* ASCII strings containing parameter values */
+   png_byte pcal_type PNG_DEPSTRUCT;      /* equation type (see PNG_EQUATION_ below) */
+   png_byte pcal_nparams PNG_DEPSTRUCT;   /* number of parameters given in pcal_params */
+#endif
+
+/* New members added in libpng-1.0.6 */
+#ifdef PNG_FREE_ME_SUPPORTED
+   png_uint_32 free_me PNG_DEPSTRUCT;     /* flags items libpng is responsible for freeing */
+#endif
+
+#if defined(PNG_UNKNOWN_CHUNKS_SUPPORTED) || \
+ defined(PNG_HANDLE_AS_UNKNOWN_SUPPORTED)
+   /* Storage for unknown chunks that the library doesn't recognize. */
+   png_unknown_chunkp unknown_chunks PNG_DEPSTRUCT;
+   png_size_t unknown_chunks_num PNG_DEPSTRUCT;
+#endif
+
+#ifdef PNG_iCCP_SUPPORTED
+   /* iCCP chunk data. */
+   png_charp iccp_name PNG_DEPSTRUCT;     /* profile name */
+   png_charp iccp_profile PNG_DEPSTRUCT;  /* International Color Consortium profile data */
+                            /* Note to maintainer: should be png_bytep */
+   png_uint_32 iccp_proflen PNG_DEPSTRUCT;  /* ICC profile data length */
+   png_byte iccp_compression PNG_DEPSTRUCT; /* Always zero */
+#endif
+
+#ifdef PNG_sPLT_SUPPORTED
+   /* Data on sPLT chunks (there may be more than one). */
+   png_sPLT_tp splt_palettes PNG_DEPSTRUCT;
+   png_uint_32 splt_palettes_num PNG_DEPSTRUCT;
+#endif
+
+#ifdef PNG_sCAL_SUPPORTED
+   /* The sCAL chunk describes the actual physical dimensions of the
+    * subject matter of the graphic.  The chunk contains a unit specification
+    * a byte value, and two ASCII strings representing floating-point
+    * values.  The values are width and height corresponsing to one pixel
+    * in the image.  This external representation is converted to double
+    * here.  Data values are valid if (valid & PNG_INFO_sCAL) is non-zero.
+    */
+   png_byte scal_unit PNG_DEPSTRUCT;         /* unit of physical scale */
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+   double scal_pixel_width PNG_DEPSTRUCT;    /* width of one pixel */
+   double scal_pixel_height PNG_DEPSTRUCT;   /* height of one pixel */
+#endif
+#ifdef PNG_FIXED_POINT_SUPPORTED
+   png_charp scal_s_width PNG_DEPSTRUCT;     /* string containing height */
+   png_charp scal_s_height PNG_DEPSTRUCT;    /* string containing width */
+#endif
+#endif
+
+#ifdef PNG_INFO_IMAGE_SUPPORTED
+   /* Memory has been allocated if (valid & PNG_ALLOCATED_INFO_ROWS) non-zero */
+   /* Data valid if (valid & PNG_INFO_IDAT) non-zero */
+   png_bytepp row_pointers PNG_DEPSTRUCT;        /* the image bits */
+#endif
+
+#if defined(PNG_FIXED_POINT_SUPPORTED) && defined(PNG_gAMA_SUPPORTED)
+   png_fixed_point int_gamma PNG_DEPSTRUCT; /* gamma of image, if (valid & PNG_INFO_gAMA) */
+#endif
+
+#if defined(PNG_cHRM_SUPPORTED) && defined(PNG_FIXED_POINT_SUPPORTED)
+   png_fixed_point int_x_white PNG_DEPSTRUCT;
+   png_fixed_point int_y_white PNG_DEPSTRUCT;
+   png_fixed_point int_x_red PNG_DEPSTRUCT;
+   png_fixed_point int_y_red PNG_DEPSTRUCT;
+   png_fixed_point int_x_green PNG_DEPSTRUCT;
+   png_fixed_point int_y_green PNG_DEPSTRUCT;
+   png_fixed_point int_x_blue PNG_DEPSTRUCT;
+   png_fixed_point int_y_blue PNG_DEPSTRUCT;
+#endif
+
+} png_info;
+
+typedef png_info FAR * png_infop;
+typedef png_info FAR * FAR * png_infopp;
+
+/* Maximum positive integer used in PNG is (2^31)-1 */
+#define PNG_UINT_31_MAX ((png_uint_32)0x7fffffffL)
+#define PNG_UINT_32_MAX ((png_uint_32)(-1))
+#define PNG_SIZE_MAX ((png_size_t)(-1))
+#if defined(PNG_1_0_X) || defined (PNG_1_2_X)
+/* PNG_MAX_UINT is deprecated; use PNG_UINT_31_MAX instead. */
+#define PNG_MAX_UINT PNG_UINT_31_MAX
+#endif
+
+/* These describe the color_type field in png_info. */
+/* color type masks */
+#define PNG_COLOR_MASK_PALETTE    1
+#define PNG_COLOR_MASK_COLOR      2
+#define PNG_COLOR_MASK_ALPHA      4
+
+/* color types.  Note that not all combinations are legal */
+#define PNG_COLOR_TYPE_GRAY 0
+#define PNG_COLOR_TYPE_PALETTE  (PNG_COLOR_MASK_COLOR | PNG_COLOR_MASK_PALETTE)
+#define PNG_COLOR_TYPE_RGB        (PNG_COLOR_MASK_COLOR)
+#define PNG_COLOR_TYPE_RGB_ALPHA  (PNG_COLOR_MASK_COLOR | PNG_COLOR_MASK_ALPHA)
+#define PNG_COLOR_TYPE_GRAY_ALPHA (PNG_COLOR_MASK_ALPHA)
+/* aliases */
+#define PNG_COLOR_TYPE_RGBA  PNG_COLOR_TYPE_RGB_ALPHA
+#define PNG_COLOR_TYPE_GA  PNG_COLOR_TYPE_GRAY_ALPHA
+
+/* This is for compression type. PNG 1.0-1.2 only define the single type. */
+#define PNG_COMPRESSION_TYPE_BASE 0 /* Deflate method 8, 32K window */
+#define PNG_COMPRESSION_TYPE_DEFAULT PNG_COMPRESSION_TYPE_BASE
+
+/* This is for filter type. PNG 1.0-1.2 only define the single type. */
+#define PNG_FILTER_TYPE_BASE      0 /* Single row per-byte filtering */
+#define PNG_INTRAPIXEL_DIFFERENCING 64 /* Used only in MNG datastreams */
+#define PNG_FILTER_TYPE_DEFAULT   PNG_FILTER_TYPE_BASE
+
+/* These are for the interlacing type.  These values should NOT be changed. */
+#define PNG_INTERLACE_NONE        0 /* Non-interlaced image */
+#define PNG_INTERLACE_ADAM7       1 /* Adam7 interlacing */
+#define PNG_INTERLACE_LAST        2 /* Not a valid value */
+
+/* These are for the oFFs chunk.  These values should NOT be changed. */
+#define PNG_OFFSET_PIXEL          0 /* Offset in pixels */
+#define PNG_OFFSET_MICROMETER     1 /* Offset in micrometers (1/10^6 meter) */
+#define PNG_OFFSET_LAST           2 /* Not a valid value */
+
+/* These are for the pCAL chunk.  These values should NOT be changed. */
+#define PNG_EQUATION_LINEAR       0 /* Linear transformation */
+#define PNG_EQUATION_BASE_E       1 /* Exponential base e transform */
+#define PNG_EQUATION_ARBITRARY    2 /* Arbitrary base exponential transform */
+#define PNG_EQUATION_HYPERBOLIC   3 /* Hyperbolic sine transformation */
+#define PNG_EQUATION_LAST         4 /* Not a valid value */
+
+/* These are for the sCAL chunk.  These values should NOT be changed. */
+#define PNG_SCALE_UNKNOWN         0 /* unknown unit (image scale) */
+#define PNG_SCALE_METER           1 /* meters per pixel */
+#define PNG_SCALE_RADIAN          2 /* radians per pixel */
+#define PNG_SCALE_LAST            3 /* Not a valid value */
+
+/* These are for the pHYs chunk.  These values should NOT be changed. */
+#define PNG_RESOLUTION_UNKNOWN    0 /* pixels/unknown unit (aspect ratio) */
+#define PNG_RESOLUTION_METER      1 /* pixels/meter */
+#define PNG_RESOLUTION_LAST       2 /* Not a valid value */
+
+/* These are for the sRGB chunk.  These values should NOT be changed. */
+#define PNG_sRGB_INTENT_PERCEPTUAL 0
+#define PNG_sRGB_INTENT_RELATIVE   1
+#define PNG_sRGB_INTENT_SATURATION 2
+#define PNG_sRGB_INTENT_ABSOLUTE   3
+#define PNG_sRGB_INTENT_LAST       4 /* Not a valid value */
+
+/* This is for text chunks */
+#define PNG_KEYWORD_MAX_LENGTH     79
+
+/* Maximum number of entries in PLTE/sPLT/tRNS arrays */
+#define PNG_MAX_PALETTE_LENGTH    256
+
+/* These determine if an ancillary chunk's data has been successfully read
+ * from the PNG header, or if the application has filled in the corresponding
+ * data in the info_struct to be written into the output file.  The values
+ * of the PNG_INFO_<chunk> defines should NOT be changed.
+ */
+#define PNG_INFO_gAMA 0x0001
+#define PNG_INFO_sBIT 0x0002
+#define PNG_INFO_cHRM 0x0004
+#define PNG_INFO_PLTE 0x0008
+#define PNG_INFO_tRNS 0x0010
+#define PNG_INFO_bKGD 0x0020
+#define PNG_INFO_hIST 0x0040
+#define PNG_INFO_pHYs 0x0080
+#define PNG_INFO_oFFs 0x0100
+#define PNG_INFO_tIME 0x0200
+#define PNG_INFO_pCAL 0x0400
+#define PNG_INFO_sRGB 0x0800   /* GR-P, 0.96a */
+#define PNG_INFO_iCCP 0x1000   /* ESR, 1.0.6 */
+#define PNG_INFO_sPLT 0x2000   /* ESR, 1.0.6 */
+#define PNG_INFO_sCAL 0x4000   /* ESR, 1.0.6 */
+#define PNG_INFO_IDAT 0x8000L  /* ESR, 1.0.6 */
+
+/* This is used for the transformation routines, as some of them
+ * change these values for the row.  It also should enable using
+ * the routines for other purposes.
+ */
+typedef struct png_row_info_struct
+{
+   png_uint_32 width; /* width of row */
+   png_uint_32 rowbytes; /* number of bytes in row */
+   png_byte color_type; /* color type of row */
+   png_byte bit_depth; /* bit depth of row */
+   png_byte channels; /* number of channels (1, 2, 3, or 4) */
+   png_byte pixel_depth; /* bits per pixel (depth * channels) */
+} png_row_info;
+
+typedef png_row_info FAR * png_row_infop;
+typedef png_row_info FAR * FAR * png_row_infopp;
+
+/* These are the function types for the I/O functions and for the functions
+ * that allow the user to override the default I/O functions with his or her
+ * own.  The png_error_ptr type should match that of user-supplied warning
+ * and error functions, while the png_rw_ptr type should match that of the
+ * user read/write data functions.
+ */
+typedef struct png_struct_def png_struct;
+typedef png_struct FAR * png_structp;
+
+typedef void (PNGAPI *png_error_ptr) PNGARG((png_structp, png_const_charp));
+typedef void (PNGAPI *png_rw_ptr) PNGARG((png_structp, png_bytep, png_size_t));
+typedef void (PNGAPI *png_flush_ptr) PNGARG((png_structp));
+typedef void (PNGAPI *png_read_status_ptr) PNGARG((png_structp, png_uint_32,
+   int));
+typedef void (PNGAPI *png_write_status_ptr) PNGARG((png_structp, png_uint_32,
+   int));
+
+#ifdef PNG_PROGRESSIVE_READ_SUPPORTED
+typedef void (PNGAPI *png_progressive_info_ptr) PNGARG((png_structp, png_infop));
+typedef void (PNGAPI *png_progressive_end_ptr) PNGARG((png_structp, png_infop));
+typedef void (PNGAPI *png_progressive_row_ptr) PNGARG((png_structp, png_bytep,
+   png_uint_32, int));
+#endif
+
+#if defined(PNG_READ_USER_TRANSFORM_SUPPORTED) || \
+    defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED) || \
+    defined(PNG_LEGACY_SUPPORTED)
+typedef void (PNGAPI *png_user_transform_ptr) PNGARG((png_structp,
+    png_row_infop, png_bytep));
+#endif
+
+#ifdef PNG_USER_CHUNKS_SUPPORTED
+typedef int (PNGAPI *png_user_chunk_ptr) PNGARG((png_structp, png_unknown_chunkp));
+#endif
+#ifdef PNG_UNKNOWN_CHUNKS_SUPPORTED
+typedef void (PNGAPI *png_unknown_chunk_ptr) PNGARG((png_structp));
+#endif
+
+/* Transform masks for the high-level interface */
+#define PNG_TRANSFORM_IDENTITY       0x0000    /* read and write */
+#define PNG_TRANSFORM_STRIP_16       0x0001    /* read only */
+#define PNG_TRANSFORM_STRIP_ALPHA    0x0002    /* read only */
+#define PNG_TRANSFORM_PACKING        0x0004    /* read and write */
+#define PNG_TRANSFORM_PACKSWAP       0x0008    /* read and write */
+#define PNG_TRANSFORM_EXPAND         0x0010    /* read only */
+#define PNG_TRANSFORM_INVERT_MONO    0x0020    /* read and write */
+#define PNG_TRANSFORM_SHIFT          0x0040    /* read and write */
+#define PNG_TRANSFORM_BGR            0x0080    /* read and write */
+#define PNG_TRANSFORM_SWAP_ALPHA     0x0100    /* read and write */
+#define PNG_TRANSFORM_SWAP_ENDIAN    0x0200    /* read and write */
+#define PNG_TRANSFORM_INVERT_ALPHA   0x0400    /* read and write */
+#define PNG_TRANSFORM_STRIP_FILLER   0x0800    /* write only, deprecated */
+/* Added to libpng-1.2.34 */
+#define PNG_TRANSFORM_STRIP_FILLER_BEFORE 0x0800  /* write only */
+#define PNG_TRANSFORM_STRIP_FILLER_AFTER  0x1000  /* write only */
+/* Added to libpng-1.2.41 */
+#define PNG_TRANSFORM_GRAY_TO_RGB   0x2000      /* read only */
+
+/* Flags for MNG supported features */
+#define PNG_FLAG_MNG_EMPTY_PLTE     0x01
+#define PNG_FLAG_MNG_FILTER_64      0x04
+#define PNG_ALL_MNG_FEATURES        0x05
+
+typedef png_voidp (*png_malloc_ptr) PNGARG((png_structp, png_size_t));
+typedef void (*png_free_ptr) PNGARG((png_structp, png_voidp));
+
+/* The structure that holds the information to read and write PNG files.
+ * The only people who need to care about what is inside of this are the
+ * people who will be modifying the library for their own special needs.
+ * It should NOT be accessed directly by an application, except to store
+ * the jmp_buf.
+ */
+
+struct png_struct_def
+{
+#ifdef PNG_SETJMP_SUPPORTED
+   jmp_buf jmpbuf;            /* used in png_error */
+#endif
+   png_error_ptr error_fn PNG_DEPSTRUCT;    /* function for printing errors and aborting */
+   png_error_ptr warning_fn PNG_DEPSTRUCT;  /* function for printing warnings */
+   png_voidp error_ptr PNG_DEPSTRUCT;       /* user supplied struct for error functions */
+   png_rw_ptr write_data_fn PNG_DEPSTRUCT;  /* function for writing output data */
+   png_rw_ptr read_data_fn PNG_DEPSTRUCT;   /* function for reading input data */
+   png_voidp io_ptr PNG_DEPSTRUCT;          /* ptr to application struct for I/O functions */
+
+#ifdef PNG_READ_USER_TRANSFORM_SUPPORTED
+   png_user_transform_ptr read_user_transform_fn PNG_DEPSTRUCT; /* user read transform */
+#endif
+
+#ifdef PNG_WRITE_USER_TRANSFORM_SUPPORTED
+   png_user_transform_ptr write_user_transform_fn PNG_DEPSTRUCT; /* user write transform */
+#endif
+
+/* These were added in libpng-1.0.2 */
+#ifdef PNG_USER_TRANSFORM_PTR_SUPPORTED
+#if defined(PNG_READ_USER_TRANSFORM_SUPPORTED) || \
+    defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED)
+   png_voidp user_transform_ptr PNG_DEPSTRUCT; /* user supplied struct for user transform */
+   png_byte user_transform_depth PNG_DEPSTRUCT;    /* bit depth of user transformed pixels */
+   png_byte user_transform_channels PNG_DEPSTRUCT; /* channels in user transformed pixels */
+#endif
+#endif
+
+   png_uint_32 mode PNG_DEPSTRUCT;          /* tells us where we are in the PNG file */
+   png_uint_32 flags PNG_DEPSTRUCT;         /* flags indicating various things to libpng */
+   png_uint_32 transformations PNG_DEPSTRUCT; /* which transformations to perform */
+
+   z_stream zstream PNG_DEPSTRUCT;          /* pointer to decompression structure (below) */
+   png_bytep zbuf PNG_DEPSTRUCT;            /* buffer for zlib */
+   png_size_t zbuf_size PNG_DEPSTRUCT;      /* size of zbuf */
+   int zlib_level PNG_DEPSTRUCT;            /* holds zlib compression level */
+   int zlib_method PNG_DEPSTRUCT;           /* holds zlib compression method */
+   int zlib_window_bits PNG_DEPSTRUCT;      /* holds zlib compression window bits */
+   int zlib_mem_level PNG_DEPSTRUCT;        /* holds zlib compression memory level */
+   int zlib_strategy PNG_DEPSTRUCT;         /* holds zlib compression strategy */
+
+   png_uint_32 width PNG_DEPSTRUCT;         /* width of image in pixels */
+   png_uint_32 height PNG_DEPSTRUCT;        /* height of image in pixels */
+   png_uint_32 num_rows PNG_DEPSTRUCT;      /* number of rows in current pass */
+   png_uint_32 usr_width PNG_DEPSTRUCT;     /* width of row at start of write */
+   png_uint_32 rowbytes PNG_DEPSTRUCT;      /* size of row in bytes */
+#if 0 /* Replaced with the following in libpng-1.2.43 */
+   png_size_t irowbytes PNG_DEPSTRUCT;
+#endif
+/* Added in libpng-1.2.43 */
+#ifdef PNG_USER_LIMITS_SUPPORTED
+   /* Added in libpng-1.4.0: Total number of sPLT, text, and unknown
+    * chunks that can be stored (0 means unlimited).
+    */
+   png_uint_32 user_chunk_cache_max PNG_DEPSTRUCT;
+#endif
+   png_uint_32 iwidth PNG_DEPSTRUCT;        /* width of current interlaced row in pixels */
+   png_uint_32 row_number PNG_DEPSTRUCT;    /* current row in interlace pass */
+   png_bytep prev_row PNG_DEPSTRUCT;        /* buffer to save previous (unfiltered) row */
+   png_bytep row_buf PNG_DEPSTRUCT;         /* buffer to save current (unfiltered) row */
+#ifndef PNG_NO_WRITE_FILTER
+   png_bytep sub_row PNG_DEPSTRUCT;         /* buffer to save "sub" row when filtering */
+   png_bytep up_row PNG_DEPSTRUCT;          /* buffer to save "up" row when filtering */
+   png_bytep avg_row PNG_DEPSTRUCT;         /* buffer to save "avg" row when filtering */
+   png_bytep paeth_row PNG_DEPSTRUCT;       /* buffer to save "Paeth" row when filtering */
+#endif
+   png_row_info row_info PNG_DEPSTRUCT;     /* used for transformation routines */
+
+   png_uint_32 idat_size PNG_DEPSTRUCT;     /* current IDAT size for read */
+   png_uint_32 crc PNG_DEPSTRUCT;           /* current chunk CRC value */
+   png_colorp palette PNG_DEPSTRUCT;        /* palette from the input file */
+   png_uint_16 num_palette PNG_DEPSTRUCT;   /* number of color entries in palette */
+   png_uint_16 num_trans PNG_DEPSTRUCT;     /* number of transparency values */
+   png_byte chunk_name[5] PNG_DEPSTRUCT;    /* null-terminated name of current chunk */
+   png_byte compression PNG_DEPSTRUCT;      /* file compression type (always 0) */
+   png_byte filter PNG_DEPSTRUCT;           /* file filter type (always 0) */
+   png_byte interlaced PNG_DEPSTRUCT;       /* PNG_INTERLACE_NONE, PNG_INTERLACE_ADAM7 */
+   png_byte pass PNG_DEPSTRUCT;             /* current interlace pass (0 - 6) */
+   png_byte do_filter PNG_DEPSTRUCT;        /* row filter flags (see PNG_FILTER_ below ) */
+   png_byte color_type PNG_DEPSTRUCT;       /* color type of file */
+   png_byte bit_depth PNG_DEPSTRUCT;        /* bit depth of file */
+   png_byte usr_bit_depth PNG_DEPSTRUCT;    /* bit depth of users row */
+   png_byte pixel_depth PNG_DEPSTRUCT;      /* number of bits per pixel */
+   png_byte channels PNG_DEPSTRUCT;         /* number of channels in file */
+   png_byte usr_channels PNG_DEPSTRUCT;     /* channels at start of write */
+   png_byte sig_bytes PNG_DEPSTRUCT;        /* magic bytes read/written from start of file */
+
+#if defined(PNG_READ_FILLER_SUPPORTED) || defined(PNG_WRITE_FILLER_SUPPORTED)
+#ifdef PNG_LEGACY_SUPPORTED
+   png_byte filler PNG_DEPSTRUCT;           /* filler byte for pixel expansion */
+#else
+   png_uint_16 filler PNG_DEPSTRUCT;           /* filler bytes for pixel expansion */
+#endif
+#endif
+
+#ifdef PNG_bKGD_SUPPORTED
+   png_byte background_gamma_type PNG_DEPSTRUCT;
+#  ifdef PNG_FLOATING_POINT_SUPPORTED
+   float background_gamma PNG_DEPSTRUCT;
+#  endif
+   png_color_16 background PNG_DEPSTRUCT;   /* background color in screen gamma space */
+#ifdef PNG_READ_GAMMA_SUPPORTED
+   png_color_16 background_1 PNG_DEPSTRUCT; /* background normalized to gamma 1.0 */
+#endif
+#endif /* PNG_bKGD_SUPPORTED */
+
+#ifdef PNG_WRITE_FLUSH_SUPPORTED
+   png_flush_ptr output_flush_fn PNG_DEPSTRUCT; /* Function for flushing output */
+   png_uint_32 flush_dist PNG_DEPSTRUCT;    /* how many rows apart to flush, 0 - no flush */
+   png_uint_32 flush_rows PNG_DEPSTRUCT;    /* number of rows written since last flush */
+#endif
+
+#if defined(PNG_READ_GAMMA_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED)
+   int gamma_shift PNG_DEPSTRUCT;      /* number of "insignificant" bits 16-bit gamma */
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+   float gamma PNG_DEPSTRUCT;          /* file gamma value */
+   float screen_gamma PNG_DEPSTRUCT;   /* screen gamma value (display_exponent) */
+#endif
+#endif
+
+#if defined(PNG_READ_GAMMA_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED)
+   png_bytep gamma_table PNG_DEPSTRUCT;     /* gamma table for 8-bit depth files */
+   png_bytep gamma_from_1 PNG_DEPSTRUCT;    /* converts from 1.0 to screen */
+   png_bytep gamma_to_1 PNG_DEPSTRUCT;      /* converts from file to 1.0 */
+   png_uint_16pp gamma_16_table PNG_DEPSTRUCT; /* gamma table for 16-bit depth files */
+   png_uint_16pp gamma_16_from_1 PNG_DEPSTRUCT; /* converts from 1.0 to screen */
+   png_uint_16pp gamma_16_to_1 PNG_DEPSTRUCT; /* converts from file to 1.0 */
+#endif
+
+#if defined(PNG_READ_GAMMA_SUPPORTED) || defined(PNG_sBIT_SUPPORTED)
+   png_color_8 sig_bit PNG_DEPSTRUCT;       /* significant bits in each available channel */
+#endif
+
+#if defined(PNG_READ_SHIFT_SUPPORTED) || defined(PNG_WRITE_SHIFT_SUPPORTED)
+   png_color_8 shift PNG_DEPSTRUCT;         /* shift for significant bit tranformation */
+#endif
+
+#if defined(PNG_tRNS_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED) \
+ || defined(PNG_READ_EXPAND_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED)
+   png_bytep trans PNG_DEPSTRUCT;           /* transparency values for paletted files */
+   png_color_16 trans_values PNG_DEPSTRUCT; /* transparency values for non-paletted files */
+#endif
+
+   png_read_status_ptr read_row_fn PNG_DEPSTRUCT;   /* called after each row is decoded */
+   png_write_status_ptr write_row_fn PNG_DEPSTRUCT; /* called after each row is encoded */
+#ifdef PNG_PROGRESSIVE_READ_SUPPORTED
+   png_progressive_info_ptr info_fn PNG_DEPSTRUCT; /* called after header data fully read */
+   png_progressive_row_ptr row_fn PNG_DEPSTRUCT;   /* called after each prog. row is decoded */
+   png_progressive_end_ptr end_fn PNG_DEPSTRUCT;   /* called after image is complete */
+   png_bytep save_buffer_ptr PNG_DEPSTRUCT;        /* current location in save_buffer */
+   png_bytep save_buffer PNG_DEPSTRUCT;            /* buffer for previously read data */
+   png_bytep current_buffer_ptr PNG_DEPSTRUCT;     /* current location in current_buffer */
+   png_bytep current_buffer PNG_DEPSTRUCT;         /* buffer for recently used data */
+   png_uint_32 push_length PNG_DEPSTRUCT;          /* size of current input chunk */
+   png_uint_32 skip_length PNG_DEPSTRUCT;          /* bytes to skip in input data */
+   png_size_t save_buffer_size PNG_DEPSTRUCT;      /* amount of data now in save_buffer */
+   png_size_t save_buffer_max PNG_DEPSTRUCT;       /* total size of save_buffer */
+   png_size_t buffer_size PNG_DEPSTRUCT;           /* total amount of available input data */
+   png_size_t current_buffer_size PNG_DEPSTRUCT;   /* amount of data now in current_buffer */
+   int process_mode PNG_DEPSTRUCT;                 /* what push library is currently doing */
+   int cur_palette PNG_DEPSTRUCT;                  /* current push library palette index */
+
+#  ifdef PNG_TEXT_SUPPORTED
+     png_size_t current_text_size PNG_DEPSTRUCT;   /* current size of text input data */
+     png_size_t current_text_left PNG_DEPSTRUCT;   /* how much text left to read in input */
+     png_charp current_text PNG_DEPSTRUCT;         /* current text chunk buffer */
+     png_charp current_text_ptr PNG_DEPSTRUCT;     /* current location in current_text */
+#  endif /* PNG_TEXT_SUPPORTED */
+#endif /* PNG_PROGRESSIVE_READ_SUPPORTED */
+
+#if defined(__TURBOC__) && !defined(_Windows) && !defined(__FLAT__)
+/* for the Borland special 64K segment handler */
+   png_bytepp offset_table_ptr PNG_DEPSTRUCT;
+   png_bytep offset_table PNG_DEPSTRUCT;
+   png_uint_16 offset_table_number PNG_DEPSTRUCT;
+   png_uint_16 offset_table_count PNG_DEPSTRUCT;
+   png_uint_16 offset_table_count_free PNG_DEPSTRUCT;
+#endif
+
+#ifdef PNG_READ_DITHER_SUPPORTED
+   png_bytep palette_lookup PNG_DEPSTRUCT;         /* lookup table for dithering */
+   png_bytep dither_index PNG_DEPSTRUCT;           /* index translation for palette files */
+#endif
+
+#if defined(PNG_READ_DITHER_SUPPORTED) || defined(PNG_hIST_SUPPORTED)
+   png_uint_16p hist PNG_DEPSTRUCT;                /* histogram */
+#endif
+
+#ifdef PNG_WRITE_WEIGHTED_FILTER_SUPPORTED
+   png_byte heuristic_method PNG_DEPSTRUCT;        /* heuristic for row filter selection */
+   png_byte num_prev_filters PNG_DEPSTRUCT;        /* number of weights for previous rows */
+   png_bytep prev_filters PNG_DEPSTRUCT;           /* filter type(s) of previous row(s) */
+   png_uint_16p filter_weights PNG_DEPSTRUCT;      /* weight(s) for previous line(s) */
+   png_uint_16p inv_filter_weights PNG_DEPSTRUCT;  /* 1/weight(s) for previous line(s) */
+   png_uint_16p filter_costs PNG_DEPSTRUCT;        /* relative filter calculation cost */
+   png_uint_16p inv_filter_costs PNG_DEPSTRUCT;    /* 1/relative filter calculation cost */
+#endif
+
+#ifdef PNG_TIME_RFC1123_SUPPORTED
+   png_charp time_buffer PNG_DEPSTRUCT;            /* String to hold RFC 1123 time text */
+#endif
+
+/* New members added in libpng-1.0.6 */
+
+#ifdef PNG_FREE_ME_SUPPORTED
+   png_uint_32 free_me PNG_DEPSTRUCT;   /* flags items libpng is responsible for freeing */
+#endif
+
+#ifdef PNG_USER_CHUNKS_SUPPORTED
+   png_voidp user_chunk_ptr PNG_DEPSTRUCT;
+   png_user_chunk_ptr read_user_chunk_fn PNG_DEPSTRUCT; /* user read chunk handler */
+#endif
+
+#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
+   int num_chunk_list PNG_DEPSTRUCT;
+   png_bytep chunk_list PNG_DEPSTRUCT;
+#endif
+
+/* New members added in libpng-1.0.3 */
+#ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED
+   png_byte rgb_to_gray_status PNG_DEPSTRUCT;
+   /* These were changed from png_byte in libpng-1.0.6 */
+   png_uint_16 rgb_to_gray_red_coeff PNG_DEPSTRUCT;
+   png_uint_16 rgb_to_gray_green_coeff PNG_DEPSTRUCT;
+   png_uint_16 rgb_to_gray_blue_coeff PNG_DEPSTRUCT;
+#endif
+
+/* New member added in libpng-1.0.4 (renamed in 1.0.9) */
+#if defined(PNG_MNG_FEATURES_SUPPORTED) || \
+    defined(PNG_READ_EMPTY_PLTE_SUPPORTED) || \
+    defined(PNG_WRITE_EMPTY_PLTE_SUPPORTED)
+/* Changed from png_byte to png_uint_32 at version 1.2.0 */
+#ifdef PNG_1_0_X
+   png_byte mng_features_permitted PNG_DEPSTRUCT;
+#else
+   png_uint_32 mng_features_permitted PNG_DEPSTRUCT;
+#endif /* PNG_1_0_X */
+#endif
+
+/* New member added in libpng-1.0.7 */
+#if defined(PNG_READ_GAMMA_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED)
+   png_fixed_point int_gamma PNG_DEPSTRUCT;
+#endif
+
+/* New member added in libpng-1.0.9, ifdef'ed out in 1.0.12, enabled in 1.2.0 */
+#ifdef PNG_MNG_FEATURES_SUPPORTED
+   png_byte filter_type PNG_DEPSTRUCT;
+#endif
+
+#ifdef PNG_1_0_X
+/* New member added in libpng-1.0.10, ifdef'ed out in 1.2.0 */
+   png_uint_32 row_buf_size PNG_DEPSTRUCT;
+#endif
+
+/* New members added in libpng-1.2.0 */
+#ifdef PNG_ASSEMBLER_CODE_SUPPORTED
+#  ifndef PNG_1_0_X
+#    ifdef PNG_MMX_CODE_SUPPORTED
+   png_byte     mmx_bitdepth_threshold PNG_DEPSTRUCT;
+   png_uint_32  mmx_rowbytes_threshold PNG_DEPSTRUCT;
+#    endif
+   png_uint_32  asm_flags PNG_DEPSTRUCT;
+#  endif
+#endif
+
+/* New members added in libpng-1.0.2 but first enabled by default in 1.2.0 */
+#ifdef PNG_USER_MEM_SUPPORTED
+   png_voidp mem_ptr PNG_DEPSTRUCT;            /* user supplied struct for mem functions */
+   png_malloc_ptr malloc_fn PNG_DEPSTRUCT;     /* function for allocating memory */
+   png_free_ptr free_fn PNG_DEPSTRUCT;         /* function for freeing memory */
+#endif
+
+/* New member added in libpng-1.0.13 and 1.2.0 */
+   png_bytep big_row_buf PNG_DEPSTRUCT;        /* buffer to save current (unfiltered) row */
+
+#ifdef PNG_READ_DITHER_SUPPORTED
+/* The following three members were added at version 1.0.14 and 1.2.4 */
+   png_bytep dither_sort PNG_DEPSTRUCT;        /* working sort array */
+   png_bytep index_to_palette PNG_DEPSTRUCT;   /* where the original index currently is */
+                                 /* in the palette */
+   png_bytep palette_to_index PNG_DEPSTRUCT;   /* which original index points to this */
+                                 /* palette color */
+#endif
+
+/* New members added in libpng-1.0.16 and 1.2.6 */
+   png_byte compression_type PNG_DEPSTRUCT;
+
+#ifdef PNG_USER_LIMITS_SUPPORTED
+   png_uint_32 user_width_max PNG_DEPSTRUCT;
+   png_uint_32 user_height_max PNG_DEPSTRUCT;
+#endif
+
+/* New member added in libpng-1.0.25 and 1.2.17 */
+#ifdef PNG_UNKNOWN_CHUNKS_SUPPORTED
+   /* Storage for unknown chunk that the library doesn't recognize. */
+   png_unknown_chunk unknown_chunk PNG_DEPSTRUCT;
+#endif
+
+/* New members added in libpng-1.2.26 */
+  png_uint_32 old_big_row_buf_size PNG_DEPSTRUCT;
+  png_uint_32 old_prev_row_size PNG_DEPSTRUCT;
+
+/* New member added in libpng-1.2.30 */
+  png_charp chunkdata PNG_DEPSTRUCT;  /* buffer for reading chunk data */
+
+
+};
+
+
+/* This triggers a compiler error in png.c, if png.c and png.h
+ * do not agree upon the version number.
+ */
+typedef png_structp version_1_2_50;
+
+typedef png_struct FAR * FAR * png_structpp;
+
+/* Here are the function definitions most commonly used.  This is not
+ * the place to find out how to use libpng.  See libpng.txt for the
+ * full explanation, see example.c for the summary.  This just provides
+ * a simple one line description of the use of each function.
+ */
+
+/* Returns the version number of the library */
+extern PNG_EXPORT(png_uint_32,png_access_version_number) PNGARG((void));
+
+/* Tell lib we have already handled the first <num_bytes> magic bytes.
+ * Handling more than 8 bytes from the beginning of the file is an error.
+ */
+extern PNG_EXPORT(void,png_set_sig_bytes) PNGARG((png_structp png_ptr,
+   int num_bytes));
+
+/* Check sig[start] through sig[start + num_to_check - 1] to see if it's a
+ * PNG file.  Returns zero if the supplied bytes match the 8-byte PNG
+ * signature, and non-zero otherwise.  Having num_to_check == 0 or
+ * start > 7 will always fail (ie return non-zero).
+ */
+extern PNG_EXPORT(int,png_sig_cmp) PNGARG((png_bytep sig, png_size_t start,
+   png_size_t num_to_check));
+
+/* Simple signature checking function.  This is the same as calling
+ * png_check_sig(sig, n) := !png_sig_cmp(sig, 0, n).
+ */
+extern PNG_EXPORT(int,png_check_sig) PNGARG((png_bytep sig, int num)) PNG_DEPRECATED;
+
+/* Allocate and initialize png_ptr struct for reading, and any other memory. */
+extern PNG_EXPORT(png_structp,png_create_read_struct)
+   PNGARG((png_const_charp user_png_ver, png_voidp error_ptr,
+   png_error_ptr error_fn, png_error_ptr warn_fn)) PNG_ALLOCATED;
+
+/* Allocate and initialize png_ptr struct for writing, and any other memory */
+extern PNG_EXPORT(png_structp,png_create_write_struct)
+   PNGARG((png_const_charp user_png_ver, png_voidp error_ptr,
+   png_error_ptr error_fn, png_error_ptr warn_fn)) PNG_ALLOCATED;
+
+#ifdef PNG_WRITE_SUPPORTED
+extern PNG_EXPORT(png_uint_32,png_get_compression_buffer_size)
+   PNGARG((png_structp png_ptr));
+#endif
+
+#ifdef PNG_WRITE_SUPPORTED
+extern PNG_EXPORT(void,png_set_compression_buffer_size)
+   PNGARG((png_structp png_ptr, png_uint_32 size));
+#endif
+
+/* Reset the compression stream */
+extern PNG_EXPORT(int,png_reset_zstream) PNGARG((png_structp png_ptr));
+
+/* New functions added in libpng-1.0.2 (not enabled by default until 1.2.0) */
+#ifdef PNG_USER_MEM_SUPPORTED
+extern PNG_EXPORT(png_structp,png_create_read_struct_2)
+   PNGARG((png_const_charp user_png_ver, png_voidp error_ptr,
+   png_error_ptr error_fn, png_error_ptr warn_fn, png_voidp mem_ptr,
+   png_malloc_ptr malloc_fn, png_free_ptr free_fn)) PNG_ALLOCATED;
+extern PNG_EXPORT(png_structp,png_create_write_struct_2)
+   PNGARG((png_const_charp user_png_ver, png_voidp error_ptr,
+   png_error_ptr error_fn, png_error_ptr warn_fn, png_voidp mem_ptr,
+   png_malloc_ptr malloc_fn, png_free_ptr free_fn)) PNG_ALLOCATED;
+#endif
+
+/* Write a PNG chunk - size, type, (optional) data, CRC. */
+extern PNG_EXPORT(void,png_write_chunk) PNGARG((png_structp png_ptr,
+   png_bytep chunk_name, png_bytep data, png_size_t length));
+
+/* Write the start of a PNG chunk - length and chunk name. */
+extern PNG_EXPORT(void,png_write_chunk_start) PNGARG((png_structp png_ptr,
+   png_bytep chunk_name, png_uint_32 length));
+
+/* Write the data of a PNG chunk started with png_write_chunk_start(). */
+extern PNG_EXPORT(void,png_write_chunk_data) PNGARG((png_structp png_ptr,
+   png_bytep data, png_size_t length));
+
+/* Finish a chunk started with png_write_chunk_start() (includes CRC). */
+extern PNG_EXPORT(void,png_write_chunk_end) PNGARG((png_structp png_ptr));
+
+/* Allocate and initialize the info structure */
+extern PNG_EXPORT(png_infop,png_create_info_struct)
+   PNGARG((png_structp png_ptr)) PNG_ALLOCATED;
+
+#if defined(PNG_1_0_X) || defined (PNG_1_2_X)
+/* Initialize the info structure (old interface - DEPRECATED) */
+extern PNG_EXPORT(void,png_info_init) PNGARG((png_infop info_ptr))
+    PNG_DEPRECATED;
+#undef png_info_init
+#define png_info_init(info_ptr) png_info_init_3(&info_ptr,\
+    png_sizeof(png_info));
+#endif
+
+extern PNG_EXPORT(void,png_info_init_3) PNGARG((png_infopp info_ptr,
+    png_size_t png_info_struct_size));
+
+/* Writes all the PNG information before the image. */
+extern PNG_EXPORT(void,png_write_info_before_PLTE) PNGARG((png_structp png_ptr,
+   png_infop info_ptr));
+extern PNG_EXPORT(void,png_write_info) PNGARG((png_structp png_ptr,
+   png_infop info_ptr));
+
+#ifdef PNG_SEQUENTIAL_READ_SUPPORTED
+/* Read the information before the actual image data. */
+extern PNG_EXPORT(void,png_read_info) PNGARG((png_structp png_ptr,
+   png_infop info_ptr));
+#endif
+
+#ifdef PNG_TIME_RFC1123_SUPPORTED
+extern PNG_EXPORT(png_charp,png_convert_to_rfc1123)
+   PNGARG((png_structp png_ptr, png_timep ptime));
+#endif
+
+#ifdef PNG_CONVERT_tIME_SUPPORTED
+/* Convert from a struct tm to png_time */
+extern PNG_EXPORT(void,png_convert_from_struct_tm) PNGARG((png_timep ptime,
+   struct tm FAR * ttime));
+
+/* Convert from time_t to png_time.  Uses gmtime() */
+extern PNG_EXPORT(void,png_convert_from_time_t) PNGARG((png_timep ptime,
+   time_t ttime));
+#endif /* PNG_CONVERT_tIME_SUPPORTED */
+
+#ifdef PNG_READ_EXPAND_SUPPORTED
+/* Expand data to 24-bit RGB, or 8-bit grayscale, with alpha if available. */
+extern PNG_EXPORT(void,png_set_expand) PNGARG((png_structp png_ptr));
+#ifndef PNG_1_0_X
+extern PNG_EXPORT(void,png_set_expand_gray_1_2_4_to_8) PNGARG((png_structp
+  png_ptr));
+#endif
+extern PNG_EXPORT(void,png_set_palette_to_rgb) PNGARG((png_structp png_ptr));
+extern PNG_EXPORT(void,png_set_tRNS_to_alpha) PNGARG((png_structp png_ptr));
+#if defined(PNG_1_0_X) || defined (PNG_1_2_X)
+/* Deprecated */
+extern PNG_EXPORT(void,png_set_gray_1_2_4_to_8) PNGARG((png_structp
+    png_ptr)) PNG_DEPRECATED;
+#endif
+#endif
+
+#if defined(PNG_READ_BGR_SUPPORTED) || defined(PNG_WRITE_BGR_SUPPORTED)
+/* Use blue, green, red order for pixels. */
+extern PNG_EXPORT(void,png_set_bgr) PNGARG((png_structp png_ptr));
+#endif
+
+#ifdef PNG_READ_GRAY_TO_RGB_SUPPORTED
+/* Expand the grayscale to 24-bit RGB if necessary. */
+extern PNG_EXPORT(void,png_set_gray_to_rgb) PNGARG((png_structp png_ptr));
+#endif
+
+#ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED
+/* Reduce RGB to grayscale. */
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+extern PNG_EXPORT(void,png_set_rgb_to_gray) PNGARG((png_structp png_ptr,
+   int error_action, double red, double green ));
+#endif
+extern PNG_EXPORT(void,png_set_rgb_to_gray_fixed) PNGARG((png_structp png_ptr,
+   int error_action, png_fixed_point red, png_fixed_point green ));
+extern PNG_EXPORT(png_byte,png_get_rgb_to_gray_status) PNGARG((png_structp
+   png_ptr));
+#endif
+
+extern PNG_EXPORT(void,png_build_grayscale_palette) PNGARG((int bit_depth,
+   png_colorp palette));
+
+#ifdef PNG_READ_STRIP_ALPHA_SUPPORTED
+extern PNG_EXPORT(void,png_set_strip_alpha) PNGARG((png_structp png_ptr));
+#endif
+
+#if defined(PNG_READ_SWAP_ALPHA_SUPPORTED) || \
+    defined(PNG_WRITE_SWAP_ALPHA_SUPPORTED)
+extern PNG_EXPORT(void,png_set_swap_alpha) PNGARG((png_structp png_ptr));
+#endif
+
+#if defined(PNG_READ_INVERT_ALPHA_SUPPORTED) || \
+    defined(PNG_WRITE_INVERT_ALPHA_SUPPORTED)
+extern PNG_EXPORT(void,png_set_invert_alpha) PNGARG((png_structp png_ptr));
+#endif
+
+#if defined(PNG_READ_FILLER_SUPPORTED) || defined(PNG_WRITE_FILLER_SUPPORTED)
+/* Add a filler byte to 8-bit Gray or 24-bit RGB images. */
+extern PNG_EXPORT(void,png_set_filler) PNGARG((png_structp png_ptr,
+   png_uint_32 filler, int flags));
+/* The values of the PNG_FILLER_ defines should NOT be changed */
+#define PNG_FILLER_BEFORE 0
+#define PNG_FILLER_AFTER 1
+/* Add an alpha byte to 8-bit Gray or 24-bit RGB images. */
+#ifndef PNG_1_0_X
+extern PNG_EXPORT(void,png_set_add_alpha) PNGARG((png_structp png_ptr,
+   png_uint_32 filler, int flags));
+#endif
+#endif /* PNG_READ_FILLER_SUPPORTED || PNG_WRITE_FILLER_SUPPORTED */
+
+#if defined(PNG_READ_SWAP_SUPPORTED) || defined(PNG_WRITE_SWAP_SUPPORTED)
+/* Swap bytes in 16-bit depth files. */
+extern PNG_EXPORT(void,png_set_swap) PNGARG((png_structp png_ptr));
+#endif
+
+#if defined(PNG_READ_PACK_SUPPORTED) || defined(PNG_WRITE_PACK_SUPPORTED)
+/* Use 1 byte per pixel in 1, 2, or 4-bit depth files. */
+extern PNG_EXPORT(void,png_set_packing) PNGARG((png_structp png_ptr));
+#endif
+
+#if defined(PNG_READ_PACKSWAP_SUPPORTED) || defined(PNG_WRITE_PACKSWAP_SUPPORTED)
+/* Swap packing order of pixels in bytes. */
+extern PNG_EXPORT(void,png_set_packswap) PNGARG((png_structp png_ptr));
+#endif
+
+#if defined(PNG_READ_SHIFT_SUPPORTED) || defined(PNG_WRITE_SHIFT_SUPPORTED)
+/* Converts files to legal bit depths. */
+extern PNG_EXPORT(void,png_set_shift) PNGARG((png_structp png_ptr,
+   png_color_8p true_bits));
+#endif
+
+#if defined(PNG_READ_INTERLACING_SUPPORTED) || \
+    defined(PNG_WRITE_INTERLACING_SUPPORTED)
+/* Have the code handle the interlacing.  Returns the number of passes. */
+extern PNG_EXPORT(int,png_set_interlace_handling) PNGARG((png_structp png_ptr));
+#endif
+
+#if defined(PNG_READ_INVERT_SUPPORTED) || defined(PNG_WRITE_INVERT_SUPPORTED)
+/* Invert monochrome files */
+extern PNG_EXPORT(void,png_set_invert_mono) PNGARG((png_structp png_ptr));
+#endif
+
+#ifdef PNG_READ_BACKGROUND_SUPPORTED
+/* Handle alpha and tRNS by replacing with a background color. */
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+extern PNG_EXPORT(void,png_set_background) PNGARG((png_structp png_ptr,
+   png_color_16p background_color, int background_gamma_code,
+   int need_expand, double background_gamma));
+#endif
+#define PNG_BACKGROUND_GAMMA_UNKNOWN 0
+#define PNG_BACKGROUND_GAMMA_SCREEN  1
+#define PNG_BACKGROUND_GAMMA_FILE    2
+#define PNG_BACKGROUND_GAMMA_UNIQUE  3
+#endif
+
+#ifdef PNG_READ_16_TO_8_SUPPORTED
+/* Strip the second byte of information from a 16-bit depth file. */
+extern PNG_EXPORT(void,png_set_strip_16) PNGARG((png_structp png_ptr));
+#endif
+
+#ifdef PNG_READ_DITHER_SUPPORTED
+/* Turn on dithering, and reduce the palette to the number of colors available. */
+extern PNG_EXPORT(void,png_set_dither) PNGARG((png_structp png_ptr,
+   png_colorp palette, int num_palette, int maximum_colors,
+   png_uint_16p histogram, int full_dither));
+#endif
+
+#ifdef PNG_READ_GAMMA_SUPPORTED
+/* Handle gamma correction. Screen_gamma=(display_exponent) */
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+extern PNG_EXPORT(void,png_set_gamma) PNGARG((png_structp png_ptr,
+   double screen_gamma, double default_file_gamma));
+#endif
+#endif
+
+#if defined(PNG_1_0_X) || defined (PNG_1_2_X)
+#if defined(PNG_READ_EMPTY_PLTE_SUPPORTED) || \
+    defined(PNG_WRITE_EMPTY_PLTE_SUPPORTED)
+/* Permit or disallow empty PLTE (0: not permitted, 1: permitted) */
+/* Deprecated and will be removed.  Use png_permit_mng_features() instead. */
+extern PNG_EXPORT(void,png_permit_empty_plte) PNGARG((png_structp png_ptr,
+   int empty_plte_permitted)) PNG_DEPRECATED;
+#endif
+#endif
+
+#ifdef PNG_WRITE_FLUSH_SUPPORTED
+/* Set how many lines between output flushes - 0 for no flushing */
+extern PNG_EXPORT(void,png_set_flush) PNGARG((png_structp png_ptr, int nrows));
+/* Flush the current PNG output buffer */
+extern PNG_EXPORT(void,png_write_flush) PNGARG((png_structp png_ptr));
+#endif
+
+/* Optional update palette with requested transformations */
+extern PNG_EXPORT(void,png_start_read_image) PNGARG((png_structp png_ptr));
+
+/* Optional call to update the users info structure */
+extern PNG_EXPORT(void,png_read_update_info) PNGARG((png_structp png_ptr,
+   png_infop info_ptr));
+
+#ifndef PNG_NO_SEQUENTIAL_READ_SUPPORTED
+/* Read one or more rows of image data. */
+extern PNG_EXPORT(void,png_read_rows) PNGARG((png_structp png_ptr,
+   png_bytepp row, png_bytepp display_row, png_uint_32 num_rows));
+#endif
+
+#ifndef PNG_NO_SEQUENTIAL_READ_SUPPORTED
+/* Read a row of data. */
+extern PNG_EXPORT(void,png_read_row) PNGARG((png_structp png_ptr,
+   png_bytep row,
+   png_bytep display_row));
+#endif
+
+#ifndef PNG_NO_SEQUENTIAL_READ_SUPPORTED
+/* Read the whole image into memory at once. */
+extern PNG_EXPORT(void,png_read_image) PNGARG((png_structp png_ptr,
+   png_bytepp image));
+#endif
+
+/* Write a row of image data */
+extern PNG_EXPORT(void,png_write_row) PNGARG((png_structp png_ptr,
+   png_bytep row));
+
+/* Write a few rows of image data */
+extern PNG_EXPORT(void,png_write_rows) PNGARG((png_structp png_ptr,
+   png_bytepp row, png_uint_32 num_rows));
+
+/* Write the image data */
+extern PNG_EXPORT(void,png_write_image) PNGARG((png_structp png_ptr,
+   png_bytepp image));
+
+/* Writes the end of the PNG file. */
+extern PNG_EXPORT(void,png_write_end) PNGARG((png_structp png_ptr,
+   png_infop info_ptr));
+
+#ifndef PNG_NO_SEQUENTIAL_READ_SUPPORTED
+/* Read the end of the PNG file. */
+extern PNG_EXPORT(void,png_read_end) PNGARG((png_structp png_ptr,
+   png_infop info_ptr));
+#endif
+
+/* Free any memory associated with the png_info_struct */
+extern PNG_EXPORT(void,png_destroy_info_struct) PNGARG((png_structp png_ptr,
+   png_infopp info_ptr_ptr));
+
+/* Free any memory associated with the png_struct and the png_info_structs */
+extern PNG_EXPORT(void,png_destroy_read_struct) PNGARG((png_structpp
+   png_ptr_ptr, png_infopp info_ptr_ptr, png_infopp end_info_ptr_ptr));
+
+/* Free all memory used by the read (old method - NOT DLL EXPORTED) */
+extern void png_read_destroy PNGARG((png_structp png_ptr, png_infop info_ptr,
+   png_infop end_info_ptr)) PNG_DEPRECATED;
+
+/* Free any memory associated with the png_struct and the png_info_structs */
+extern PNG_EXPORT(void,png_destroy_write_struct)
+   PNGARG((png_structpp png_ptr_ptr, png_infopp info_ptr_ptr));
+
+/* Free any memory used in png_ptr struct (old method - NOT DLL EXPORTED) */
+extern void png_write_destroy PNGARG((png_structp png_ptr)) PNG_DEPRECATED;
+
+/* Set the libpng method of handling chunk CRC errors */
+extern PNG_EXPORT(void,png_set_crc_action) PNGARG((png_structp png_ptr,
+   int crit_action, int ancil_action));
+
+/* Values for png_set_crc_action() to say how to handle CRC errors in
+ * ancillary and critical chunks, and whether to use the data contained
+ * therein.  Note that it is impossible to "discard" data in a critical
+ * chunk.  For versions prior to 0.90, the action was always error/quit,
+ * whereas in version 0.90 and later, the action for CRC errors in ancillary
+ * chunks is warn/discard.  These values should NOT be changed.
+ *
+ *      value                       action:critical     action:ancillary
+ */
+#define PNG_CRC_DEFAULT       0  /* error/quit          warn/discard data */
+#define PNG_CRC_ERROR_QUIT    1  /* error/quit          error/quit        */
+#define PNG_CRC_WARN_DISCARD  2  /* (INVALID)           warn/discard data */
+#define PNG_CRC_WARN_USE      3  /* warn/use data       warn/use data     */
+#define PNG_CRC_QUIET_USE     4  /* quiet/use data      quiet/use data    */
+#define PNG_CRC_NO_CHANGE     5  /* use current value   use current value */
+
+/* These functions give the user control over the scan-line filtering in
+ * libpng and the compression methods used by zlib.  These functions are
+ * mainly useful for testing, as the defaults should work with most users.
+ * Those users who are tight on memory or want faster performance at the
+ * expense of compression can modify them.  See the compression library
+ * header file (zlib.h) for an explination of the compression functions.
+ */
+
+/* Set the filtering method(s) used by libpng.  Currently, the only valid
+ * value for "method" is 0.
+ */
+extern PNG_EXPORT(void,png_set_filter) PNGARG((png_structp png_ptr, int method,
+   int filters));
+
+/* Flags for png_set_filter() to say which filters to use.  The flags
+ * are chosen so that they don't conflict with real filter types
+ * below, in case they are supplied instead of the #defined constants.
+ * These values should NOT be changed.
+ */
+#define PNG_NO_FILTERS     0x00
+#define PNG_FILTER_NONE    0x08
+#define PNG_FILTER_SUB     0x10
+#define PNG_FILTER_UP      0x20
+#define PNG_FILTER_AVG     0x40
+#define PNG_FILTER_PAETH   0x80
+#define PNG_ALL_FILTERS (PNG_FILTER_NONE | PNG_FILTER_SUB | PNG_FILTER_UP | \
+                         PNG_FILTER_AVG | PNG_FILTER_PAETH)
+
+/* Filter values (not flags) - used in pngwrite.c, pngwutil.c for now.
+ * These defines should NOT be changed.
+ */
+#define PNG_FILTER_VALUE_NONE  0
+#define PNG_FILTER_VALUE_SUB   1
+#define PNG_FILTER_VALUE_UP    2
+#define PNG_FILTER_VALUE_AVG   3
+#define PNG_FILTER_VALUE_PAETH 4
+#define PNG_FILTER_VALUE_LAST  5
+
+#if defined(PNG_WRITE_WEIGHTED_FILTER_SUPPORTED) /* EXPERIMENTAL */
+/* The "heuristic_method" is given by one of the PNG_FILTER_HEURISTIC_
+ * defines, either the default (minimum-sum-of-absolute-differences), or
+ * the experimental method (weighted-minimum-sum-of-absolute-differences).
+ *
+ * Weights are factors >= 1.0, indicating how important it is to keep the
+ * filter type consistent between rows.  Larger numbers mean the current
+ * filter is that many times as likely to be the same as the "num_weights"
+ * previous filters.  This is cumulative for each previous row with a weight.
+ * There needs to be "num_weights" values in "filter_weights", or it can be
+ * NULL if the weights aren't being specified.  Weights have no influence on
+ * the selection of the first row filter.  Well chosen weights can (in theory)
+ * improve the compression for a given image.
+ *
+ * Costs are factors >= 1.0 indicating the relative decoding costs of a
+ * filter type.  Higher costs indicate more decoding expense, and are
+ * therefore less likely to be selected over a filter with lower computational
+ * costs.  There needs to be a value in "filter_costs" for each valid filter
+ * type (given by PNG_FILTER_VALUE_LAST), or it can be NULL if you aren't
+ * setting the costs.  Costs try to improve the speed of decompression without
+ * unduly increasing the compressed image size.
+ *
+ * A negative weight or cost indicates the default value is to be used, and
+ * values in the range [0.0, 1.0) indicate the value is to remain unchanged.
+ * The default values for both weights and costs are currently 1.0, but may
+ * change if good general weighting/cost heuristics can be found.  If both
+ * the weights and costs are set to 1.0, this degenerates the WEIGHTED method
+ * to the UNWEIGHTED method, but with added encoding time/computation.
+ */
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+extern PNG_EXPORT(void,png_set_filter_heuristics) PNGARG((png_structp png_ptr,
+   int heuristic_method, int num_weights, png_doublep filter_weights,
+   png_doublep filter_costs));
+#endif
+#endif /*  PNG_WRITE_WEIGHTED_FILTER_SUPPORTED */
+
+/* Heuristic used for row filter selection.  These defines should NOT be
+ * changed.
+ */
+#define PNG_FILTER_HEURISTIC_DEFAULT    0  /* Currently "UNWEIGHTED" */
+#define PNG_FILTER_HEURISTIC_UNWEIGHTED 1  /* Used by libpng < 0.95 */
+#define PNG_FILTER_HEURISTIC_WEIGHTED   2  /* Experimental feature */
+#define PNG_FILTER_HEURISTIC_LAST       3  /* Not a valid value */
+
+/* Set the library compression level.  Currently, valid values range from
+ * 0 - 9, corresponding directly to the zlib compression levels 0 - 9
+ * (0 - no compression, 9 - "maximal" compression).  Note that tests have
+ * shown that zlib compression levels 3-6 usually perform as well as level 9
+ * for PNG images, and do considerably fewer caclulations.  In the future,
+ * these values may not correspond directly to the zlib compression levels.
+ */
+extern PNG_EXPORT(void,png_set_compression_level) PNGARG((png_structp png_ptr,
+   int level));
+
+extern PNG_EXPORT(void,png_set_compression_mem_level)
+   PNGARG((png_structp png_ptr, int mem_level));
+
+extern PNG_EXPORT(void,png_set_compression_strategy)
+   PNGARG((png_structp png_ptr, int strategy));
+
+extern PNG_EXPORT(void,png_set_compression_window_bits)
+   PNGARG((png_structp png_ptr, int window_bits));
+
+extern PNG_EXPORT(void,png_set_compression_method) PNGARG((png_structp png_ptr,
+   int method));
+
+/* These next functions are called for input/output, memory, and error
+ * handling.  They are in the file pngrio.c, pngwio.c, and pngerror.c,
+ * and call standard C I/O routines such as fread(), fwrite(), and
+ * fprintf().  These functions can be made to use other I/O routines
+ * at run time for those applications that need to handle I/O in a
+ * different manner by calling png_set_???_fn().  See libpng.txt for
+ * more information.
+ */
+
+#ifdef PNG_STDIO_SUPPORTED
+/* Initialize the input/output for the PNG file to the default functions. */
+extern PNG_EXPORT(void,png_init_io) PNGARG((png_structp png_ptr, png_FILE_p fp));
+#endif
+
+/* Replace the (error and abort), and warning functions with user
+ * supplied functions.  If no messages are to be printed you must still
+ * write and use replacement functions. The replacement error_fn should
+ * still do a longjmp to the last setjmp location if you are using this
+ * method of error handling.  If error_fn or warning_fn is NULL, the
+ * default function will be used.
+ */
+
+extern PNG_EXPORT(void,png_set_error_fn) PNGARG((png_structp png_ptr,
+   png_voidp error_ptr, png_error_ptr error_fn, png_error_ptr warning_fn));
+
+/* Return the user pointer associated with the error functions */
+extern PNG_EXPORT(png_voidp,png_get_error_ptr) PNGARG((png_structp png_ptr));
+
+/* Replace the default data output functions with a user supplied one(s).
+ * If buffered output is not used, then output_flush_fn can be set to NULL.
+ * If PNG_WRITE_FLUSH_SUPPORTED is not defined at libpng compile time
+ * output_flush_fn will be ignored (and thus can be NULL).
+ * It is probably a mistake to use NULL for output_flush_fn if
+ * write_data_fn is not also NULL unless you have built libpng with
+ * PNG_WRITE_FLUSH_SUPPORTED undefined, because in this case libpng's
+ * default flush function, which uses the standard *FILE structure, will
+ * be used.
+ */
+extern PNG_EXPORT(void,png_set_write_fn) PNGARG((png_structp png_ptr,
+   png_voidp io_ptr, png_rw_ptr write_data_fn, png_flush_ptr output_flush_fn));
+
+/* Replace the default data input function with a user supplied one. */
+extern PNG_EXPORT(void,png_set_read_fn) PNGARG((png_structp png_ptr,
+   png_voidp io_ptr, png_rw_ptr read_data_fn));
+
+/* Return the user pointer associated with the I/O functions */
+extern PNG_EXPORT(png_voidp,png_get_io_ptr) PNGARG((png_structp png_ptr));
+
+extern PNG_EXPORT(void,png_set_read_status_fn) PNGARG((png_structp png_ptr,
+   png_read_status_ptr read_row_fn));
+
+extern PNG_EXPORT(void,png_set_write_status_fn) PNGARG((png_structp png_ptr,
+   png_write_status_ptr write_row_fn));
+
+#ifdef PNG_USER_MEM_SUPPORTED
+/* Replace the default memory allocation functions with user supplied one(s). */
+extern PNG_EXPORT(void,png_set_mem_fn) PNGARG((png_structp png_ptr,
+   png_voidp mem_ptr, png_malloc_ptr malloc_fn, png_free_ptr free_fn));
+/* Return the user pointer associated with the memory functions */
+extern PNG_EXPORT(png_voidp,png_get_mem_ptr) PNGARG((png_structp png_ptr));
+#endif
+
+#if defined(PNG_READ_USER_TRANSFORM_SUPPORTED) || \
+    defined(PNG_LEGACY_SUPPORTED)
+extern PNG_EXPORT(void,png_set_read_user_transform_fn) PNGARG((png_structp
+   png_ptr, png_user_transform_ptr read_user_transform_fn));
+#endif
+
+#if defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED) || \
+    defined(PNG_LEGACY_SUPPORTED)
+extern PNG_EXPORT(void,png_set_write_user_transform_fn) PNGARG((png_structp
+   png_ptr, png_user_transform_ptr write_user_transform_fn));
+#endif
+
+#if defined(PNG_READ_USER_TRANSFORM_SUPPORTED) || \
+    defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED) || \
+    defined(PNG_LEGACY_SUPPORTED)
+extern PNG_EXPORT(void,png_set_user_transform_info) PNGARG((png_structp
+   png_ptr, png_voidp user_transform_ptr, int user_transform_depth,
+   int user_transform_channels));
+/* Return the user pointer associated with the user transform functions */
+extern PNG_EXPORT(png_voidp,png_get_user_transform_ptr)
+   PNGARG((png_structp png_ptr));
+#endif
+
+#ifdef PNG_USER_CHUNKS_SUPPORTED
+extern PNG_EXPORT(void,png_set_read_user_chunk_fn) PNGARG((png_structp png_ptr,
+   png_voidp user_chunk_ptr, png_user_chunk_ptr read_user_chunk_fn));
+extern PNG_EXPORT(png_voidp,png_get_user_chunk_ptr) PNGARG((png_structp
+   png_ptr));
+#endif
+
+#ifdef PNG_PROGRESSIVE_READ_SUPPORTED
+/* Sets the function callbacks for the push reader, and a pointer to a
+ * user-defined structure available to the callback functions.
+ */
+extern PNG_EXPORT(void,png_set_progressive_read_fn) PNGARG((png_structp png_ptr,
+   png_voidp progressive_ptr,
+   png_progressive_info_ptr info_fn, png_progressive_row_ptr row_fn,
+   png_progressive_end_ptr end_fn));
+
+/* Returns the user pointer associated with the push read functions */
+extern PNG_EXPORT(png_voidp,png_get_progressive_ptr)
+   PNGARG((png_structp png_ptr));
+
+/* Function to be called when data becomes available */
+extern PNG_EXPORT(void,png_process_data) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_bytep buffer, png_size_t buffer_size));
+
+/* Function that combines rows.  Not very much different than the
+ * png_combine_row() call.  Is this even used?????
+ */
+extern PNG_EXPORT(void,png_progressive_combine_row) PNGARG((png_structp png_ptr,
+   png_bytep old_row, png_bytep new_row));
+#endif /* PNG_PROGRESSIVE_READ_SUPPORTED */
+
+extern PNG_EXPORT(png_voidp,png_malloc) PNGARG((png_structp png_ptr,
+   png_uint_32 size)) PNG_ALLOCATED;
+
+#ifdef PNG_1_0_X
+#  define png_malloc_warn png_malloc
+#else
+/* Added at libpng version 1.2.4 */
+extern PNG_EXPORT(png_voidp,png_malloc_warn) PNGARG((png_structp png_ptr,
+   png_uint_32 size)) PNG_ALLOCATED;
+#endif
+
+/* Frees a pointer allocated by png_malloc() */
+extern PNG_EXPORT(void,png_free) PNGARG((png_structp png_ptr, png_voidp ptr));
+
+#ifdef PNG_1_0_X
+/* Function to allocate memory for zlib. */
+extern PNG_EXPORT(voidpf,png_zalloc) PNGARG((voidpf png_ptr, uInt items,
+   uInt size));
+
+/* Function to free memory for zlib */
+extern PNG_EXPORT(void,png_zfree) PNGARG((voidpf png_ptr, voidpf ptr));
+#endif
+
+/* Free data that was allocated internally */
+extern PNG_EXPORT(void,png_free_data) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_uint_32 free_me, int num));
+#ifdef PNG_FREE_ME_SUPPORTED
+/* Reassign responsibility for freeing existing data, whether allocated
+ * by libpng or by the application
+ */
+extern PNG_EXPORT(void,png_data_freer) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, int freer, png_uint_32 mask));
+#endif
+/* Assignments for png_data_freer */
+#define PNG_DESTROY_WILL_FREE_DATA 1
+#define PNG_SET_WILL_FREE_DATA 1
+#define PNG_USER_WILL_FREE_DATA 2
+/* Flags for png_ptr->free_me and info_ptr->free_me */
+#define PNG_FREE_HIST 0x0008
+#define PNG_FREE_ICCP 0x0010
+#define PNG_FREE_SPLT 0x0020
+#define PNG_FREE_ROWS 0x0040
+#define PNG_FREE_PCAL 0x0080
+#define PNG_FREE_SCAL 0x0100
+#define PNG_FREE_UNKN 0x0200
+#define PNG_FREE_LIST 0x0400
+#define PNG_FREE_PLTE 0x1000
+#define PNG_FREE_TRNS 0x2000
+#define PNG_FREE_TEXT 0x4000
+#define PNG_FREE_ALL  0x7fff
+#define PNG_FREE_MUL  0x4220 /* PNG_FREE_SPLT|PNG_FREE_TEXT|PNG_FREE_UNKN */
+
+#ifdef PNG_USER_MEM_SUPPORTED
+extern PNG_EXPORT(png_voidp,png_malloc_default) PNGARG((png_structp png_ptr,
+   png_uint_32 size)) PNG_ALLOCATED;
+extern PNG_EXPORT(void,png_free_default) PNGARG((png_structp png_ptr,
+   png_voidp ptr));
+#endif
+
+extern PNG_EXPORT(png_voidp,png_memcpy_check) PNGARG((png_structp png_ptr,
+   png_voidp s1, png_voidp s2, png_uint_32 size)) PNG_DEPRECATED;
+
+extern PNG_EXPORT(png_voidp,png_memset_check) PNGARG((png_structp png_ptr,
+   png_voidp s1, int value, png_uint_32 size)) PNG_DEPRECATED;
+
+#if defined(USE_FAR_KEYWORD)  /* memory model conversion function */
+extern void *png_far_to_near PNGARG((png_structp png_ptr,png_voidp ptr,
+   int check));
+#endif /* USE_FAR_KEYWORD */
+
+#ifndef PNG_NO_ERROR_TEXT
+/* Fatal error in PNG image of libpng - can't continue */
+extern PNG_EXPORT(void,png_error) PNGARG((png_structp png_ptr,
+   png_const_charp error_message)) PNG_NORETURN;
+
+/* The same, but the chunk name is prepended to the error string. */
+extern PNG_EXPORT(void,png_chunk_error) PNGARG((png_structp png_ptr,
+   png_const_charp error_message)) PNG_NORETURN;
+#else
+/* Fatal error in PNG image of libpng - can't continue */
+extern PNG_EXPORT(void,png_err) PNGARG((png_structp png_ptr)) PNG_NORETURN;
+#endif
+
+#ifndef PNG_NO_WARNINGS
+/* Non-fatal error in libpng.  Can continue, but may have a problem. */
+extern PNG_EXPORT(void,png_warning) PNGARG((png_structp png_ptr,
+   png_const_charp warning_message));
+
+#ifdef PNG_READ_SUPPORTED
+/* Non-fatal error in libpng, chunk name is prepended to message. */
+extern PNG_EXPORT(void,png_chunk_warning) PNGARG((png_structp png_ptr,
+   png_const_charp warning_message));
+#endif /* PNG_READ_SUPPORTED */
+#endif /* PNG_NO_WARNINGS */
+
+/* The png_set_<chunk> functions are for storing values in the png_info_struct.
+ * Similarly, the png_get_<chunk> calls are used to read values from the
+ * png_info_struct, either storing the parameters in the passed variables, or
+ * setting pointers into the png_info_struct where the data is stored.  The
+ * png_get_<chunk> functions return a non-zero value if the data was available
+ * in info_ptr, or return zero and do not change any of the parameters if the
+ * data was not available.
+ *
+ * These functions should be used instead of directly accessing png_info
+ * to avoid problems with future changes in the size and internal layout of
+ * png_info_struct.
+ */
+/* Returns "flag" if chunk data is valid in info_ptr. */
+extern PNG_EXPORT(png_uint_32,png_get_valid) PNGARG((png_structp png_ptr,
+png_infop info_ptr, png_uint_32 flag));
+
+/* Returns number of bytes needed to hold a transformed row. */
+extern PNG_EXPORT(png_uint_32,png_get_rowbytes) PNGARG((png_structp png_ptr,
+png_infop info_ptr));
+
+#ifdef PNG_INFO_IMAGE_SUPPORTED
+/* Returns row_pointers, which is an array of pointers to scanlines that was
+ * returned from png_read_png().
+ */
+extern PNG_EXPORT(png_bytepp,png_get_rows) PNGARG((png_structp png_ptr,
+png_infop info_ptr));
+/* Set row_pointers, which is an array of pointers to scanlines for use
+ * by png_write_png().
+ */
+extern PNG_EXPORT(void,png_set_rows) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_bytepp row_pointers));
+#endif
+
+/* Returns number of color channels in image. */
+extern PNG_EXPORT(png_byte,png_get_channels) PNGARG((png_structp png_ptr,
+png_infop info_ptr));
+
+#ifdef PNG_EASY_ACCESS_SUPPORTED
+/* Returns image width in pixels. */
+extern PNG_EXPORT(png_uint_32, png_get_image_width) PNGARG((png_structp
+png_ptr, png_infop info_ptr));
+
+/* Returns image height in pixels. */
+extern PNG_EXPORT(png_uint_32, png_get_image_height) PNGARG((png_structp
+png_ptr, png_infop info_ptr));
+
+/* Returns image bit_depth. */
+extern PNG_EXPORT(png_byte, png_get_bit_depth) PNGARG((png_structp
+png_ptr, png_infop info_ptr));
+
+/* Returns image color_type. */
+extern PNG_EXPORT(png_byte, png_get_color_type) PNGARG((png_structp
+png_ptr, png_infop info_ptr));
+
+/* Returns image filter_type. */
+extern PNG_EXPORT(png_byte, png_get_filter_type) PNGARG((png_structp
+png_ptr, png_infop info_ptr));
+
+/* Returns image interlace_type. */
+extern PNG_EXPORT(png_byte, png_get_interlace_type) PNGARG((png_structp
+png_ptr, png_infop info_ptr));
+
+/* Returns image compression_type. */
+extern PNG_EXPORT(png_byte, png_get_compression_type) PNGARG((png_structp
+png_ptr, png_infop info_ptr));
+
+/* Returns image resolution in pixels per meter, from pHYs chunk data. */
+extern PNG_EXPORT(png_uint_32, png_get_pixels_per_meter) PNGARG((png_structp
+png_ptr, png_infop info_ptr));
+extern PNG_EXPORT(png_uint_32, png_get_x_pixels_per_meter) PNGARG((png_structp
+png_ptr, png_infop info_ptr));
+extern PNG_EXPORT(png_uint_32, png_get_y_pixels_per_meter) PNGARG((png_structp
+png_ptr, png_infop info_ptr));
+
+/* Returns pixel aspect ratio, computed from pHYs chunk data.  */
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+extern PNG_EXPORT(float, png_get_pixel_aspect_ratio) PNGARG((png_structp
+png_ptr, png_infop info_ptr));
+#endif
+
+/* Returns image x, y offset in pixels or microns, from oFFs chunk data. */
+extern PNG_EXPORT(png_int_32, png_get_x_offset_pixels) PNGARG((png_structp
+png_ptr, png_infop info_ptr));
+extern PNG_EXPORT(png_int_32, png_get_y_offset_pixels) PNGARG((png_structp
+png_ptr, png_infop info_ptr));
+extern PNG_EXPORT(png_int_32, png_get_x_offset_microns) PNGARG((png_structp
+png_ptr, png_infop info_ptr));
+extern PNG_EXPORT(png_int_32, png_get_y_offset_microns) PNGARG((png_structp
+png_ptr, png_infop info_ptr));
+
+#endif /* PNG_EASY_ACCESS_SUPPORTED */
+
+/* Returns pointer to signature string read from PNG header */
+extern PNG_EXPORT(png_bytep,png_get_signature) PNGARG((png_structp png_ptr,
+png_infop info_ptr));
+
+#ifdef PNG_bKGD_SUPPORTED
+extern PNG_EXPORT(png_uint_32,png_get_bKGD) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_color_16p *background));
+#endif
+
+#ifdef PNG_bKGD_SUPPORTED
+extern PNG_EXPORT(void,png_set_bKGD) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_color_16p background));
+#endif
+
+#ifdef PNG_cHRM_SUPPORTED
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+extern PNG_EXPORT(png_uint_32,png_get_cHRM) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, double *white_x, double *white_y, double *red_x,
+   double *red_y, double *green_x, double *green_y, double *blue_x,
+   double *blue_y));
+#endif
+#ifdef PNG_FIXED_POINT_SUPPORTED
+extern PNG_EXPORT(png_uint_32,png_get_cHRM_fixed) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_fixed_point *int_white_x, png_fixed_point
+   *int_white_y, png_fixed_point *int_red_x, png_fixed_point *int_red_y,
+   png_fixed_point *int_green_x, png_fixed_point *int_green_y, png_fixed_point
+   *int_blue_x, png_fixed_point *int_blue_y));
+#endif
+#endif
+
+#ifdef PNG_cHRM_SUPPORTED
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+extern PNG_EXPORT(void,png_set_cHRM) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, double white_x, double white_y, double red_x,
+   double red_y, double green_x, double green_y, double blue_x, double blue_y));
+#endif
+#ifdef PNG_FIXED_POINT_SUPPORTED
+extern PNG_EXPORT(void,png_set_cHRM_fixed) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_fixed_point int_white_x, png_fixed_point int_white_y,
+   png_fixed_point int_red_x, png_fixed_point int_red_y, png_fixed_point
+   int_green_x, png_fixed_point int_green_y, png_fixed_point int_blue_x,
+   png_fixed_point int_blue_y));
+#endif
+#endif
+
+#ifdef PNG_gAMA_SUPPORTED
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+extern PNG_EXPORT(png_uint_32,png_get_gAMA) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, double *file_gamma));
+#endif
+extern PNG_EXPORT(png_uint_32,png_get_gAMA_fixed) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_fixed_point *int_file_gamma));
+#endif
+
+#ifdef PNG_gAMA_SUPPORTED
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+extern PNG_EXPORT(void,png_set_gAMA) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, double file_gamma));
+#endif
+extern PNG_EXPORT(void,png_set_gAMA_fixed) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_fixed_point int_file_gamma));
+#endif
+
+#ifdef PNG_hIST_SUPPORTED
+extern PNG_EXPORT(png_uint_32,png_get_hIST) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_uint_16p *hist));
+#endif
+
+#ifdef PNG_hIST_SUPPORTED
+extern PNG_EXPORT(void,png_set_hIST) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_uint_16p hist));
+#endif
+
+extern PNG_EXPORT(png_uint_32,png_get_IHDR) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_uint_32 *width, png_uint_32 *height,
+   int *bit_depth, int *color_type, int *interlace_method,
+   int *compression_method, int *filter_method));
+
+extern PNG_EXPORT(void,png_set_IHDR) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_uint_32 width, png_uint_32 height, int bit_depth,
+   int color_type, int interlace_method, int compression_method,
+   int filter_method));
+
+#ifdef PNG_oFFs_SUPPORTED
+extern PNG_EXPORT(png_uint_32,png_get_oFFs) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_int_32 *offset_x, png_int_32 *offset_y,
+   int *unit_type));
+#endif
+
+#ifdef PNG_oFFs_SUPPORTED
+extern PNG_EXPORT(void,png_set_oFFs) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_int_32 offset_x, png_int_32 offset_y,
+   int unit_type));
+#endif
+
+#ifdef PNG_pCAL_SUPPORTED
+extern PNG_EXPORT(png_uint_32,png_get_pCAL) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_charp *purpose, png_int_32 *X0, png_int_32 *X1,
+   int *type, int *nparams, png_charp *units, png_charpp *params));
+#endif
+
+#ifdef PNG_pCAL_SUPPORTED
+extern PNG_EXPORT(void,png_set_pCAL) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_charp purpose, png_int_32 X0, png_int_32 X1,
+   int type, int nparams, png_charp units, png_charpp params));
+#endif
+
+#ifdef PNG_pHYs_SUPPORTED
+extern PNG_EXPORT(png_uint_32,png_get_pHYs) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_uint_32 *res_x, png_uint_32 *res_y, int *unit_type));
+#endif
+
+#ifdef PNG_pHYs_SUPPORTED
+extern PNG_EXPORT(void,png_set_pHYs) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_uint_32 res_x, png_uint_32 res_y, int unit_type));
+#endif
+
+extern PNG_EXPORT(png_uint_32,png_get_PLTE) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_colorp *palette, int *num_palette));
+
+extern PNG_EXPORT(void,png_set_PLTE) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_colorp palette, int num_palette));
+
+#ifdef PNG_sBIT_SUPPORTED
+extern PNG_EXPORT(png_uint_32,png_get_sBIT) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_color_8p *sig_bit));
+#endif
+
+#ifdef PNG_sBIT_SUPPORTED
+extern PNG_EXPORT(void,png_set_sBIT) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_color_8p sig_bit));
+#endif
+
+#ifdef PNG_sRGB_SUPPORTED
+extern PNG_EXPORT(png_uint_32,png_get_sRGB) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, int *intent));
+#endif
+
+#ifdef PNG_sRGB_SUPPORTED
+extern PNG_EXPORT(void,png_set_sRGB) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, int intent));
+extern PNG_EXPORT(void,png_set_sRGB_gAMA_and_cHRM) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, int intent));
+#endif
+
+#ifdef PNG_iCCP_SUPPORTED
+extern PNG_EXPORT(png_uint_32,png_get_iCCP) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_charpp name, int *compression_type,
+   png_charpp profile, png_uint_32 *proflen));
+   /* Note to maintainer: profile should be png_bytepp */
+#endif
+
+#ifdef PNG_iCCP_SUPPORTED
+extern PNG_EXPORT(void,png_set_iCCP) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_charp name, int compression_type,
+   png_charp profile, png_uint_32 proflen));
+   /* Note to maintainer: profile should be png_bytep */
+#endif
+
+#ifdef PNG_sPLT_SUPPORTED
+extern PNG_EXPORT(png_uint_32,png_get_sPLT) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_sPLT_tpp entries));
+#endif
+
+#ifdef PNG_sPLT_SUPPORTED
+extern PNG_EXPORT(void,png_set_sPLT) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_sPLT_tp entries, int nentries));
+#endif
+
+#ifdef PNG_TEXT_SUPPORTED
+/* png_get_text also returns the number of text chunks in *num_text */
+extern PNG_EXPORT(png_uint_32,png_get_text) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_textp *text_ptr, int *num_text));
+#endif
+
+/*
+ *  Note while png_set_text() will accept a structure whose text,
+ *  language, and  translated keywords are NULL pointers, the structure
+ *  returned by png_get_text will always contain regular
+ *  zero-terminated C strings.  They might be empty strings but
+ *  they will never be NULL pointers.
+ */
+
+#ifdef PNG_TEXT_SUPPORTED
+extern PNG_EXPORT(void,png_set_text) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_textp text_ptr, int num_text));
+#endif
+
+#ifdef PNG_tIME_SUPPORTED
+extern PNG_EXPORT(png_uint_32,png_get_tIME) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_timep *mod_time));
+#endif
+
+#ifdef PNG_tIME_SUPPORTED
+extern PNG_EXPORT(void,png_set_tIME) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_timep mod_time));
+#endif
+
+#ifdef PNG_tRNS_SUPPORTED
+extern PNG_EXPORT(png_uint_32,png_get_tRNS) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_bytep *trans, int *num_trans,
+   png_color_16p *trans_values));
+#endif
+
+#ifdef PNG_tRNS_SUPPORTED
+extern PNG_EXPORT(void,png_set_tRNS) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_bytep trans, int num_trans,
+   png_color_16p trans_values));
+#endif
+
+#ifdef PNG_tRNS_SUPPORTED
+#endif
+
+#ifdef PNG_sCAL_SUPPORTED
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+extern PNG_EXPORT(png_uint_32,png_get_sCAL) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, int *unit, double *width, double *height));
+#else
+#ifdef PNG_FIXED_POINT_SUPPORTED
+extern PNG_EXPORT(png_uint_32,png_get_sCAL_s) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, int *unit, png_charpp swidth, png_charpp sheight));
+#endif
+#endif
+#endif /* PNG_sCAL_SUPPORTED */
+
+#ifdef PNG_sCAL_SUPPORTED
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+extern PNG_EXPORT(void,png_set_sCAL) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, int unit, double width, double height));
+#else
+#ifdef PNG_FIXED_POINT_SUPPORTED
+extern PNG_EXPORT(void,png_set_sCAL_s) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, int unit, png_charp swidth, png_charp sheight));
+#endif
+#endif
+#endif /* PNG_sCAL_SUPPORTED || PNG_WRITE_sCAL_SUPPORTED */
+
+#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
+/* Provide a list of chunks and how they are to be handled, if the built-in
+   handling or default unknown chunk handling is not desired.  Any chunks not
+   listed will be handled in the default manner.  The IHDR and IEND chunks
+   must not be listed.
+      keep = 0: follow default behaviour
+           = 1: do not keep
+           = 2: keep only if safe-to-copy
+           = 3: keep even if unsafe-to-copy
+*/
+extern PNG_EXPORT(void, png_set_keep_unknown_chunks) PNGARG((png_structp
+   png_ptr, int keep, png_bytep chunk_list, int num_chunks));
+PNG_EXPORT(int,png_handle_as_unknown) PNGARG((png_structp png_ptr, png_bytep
+   chunk_name));
+#endif
+#ifdef PNG_UNKNOWN_CHUNKS_SUPPORTED
+extern PNG_EXPORT(void, png_set_unknown_chunks) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_unknown_chunkp unknowns, int num_unknowns));
+extern PNG_EXPORT(void, png_set_unknown_chunk_location)
+   PNGARG((png_structp png_ptr, png_infop info_ptr, int chunk, int location));
+extern PNG_EXPORT(png_uint_32,png_get_unknown_chunks) PNGARG((png_structp
+   png_ptr, png_infop info_ptr, png_unknown_chunkpp entries));
+#endif
+
+/* Png_free_data() will turn off the "valid" flag for anything it frees.
+ * If you need to turn it off for a chunk that your application has freed,
+ * you can use png_set_invalid(png_ptr, info_ptr, PNG_INFO_CHNK);
+ */
+extern PNG_EXPORT(void, png_set_invalid) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, int mask));
+
+#ifdef PNG_INFO_IMAGE_SUPPORTED
+/* The "params" pointer is currently not used and is for future expansion. */
+extern PNG_EXPORT(void, png_read_png) PNGARG((png_structp png_ptr,
+                        png_infop info_ptr,
+                        int transforms,
+                        png_voidp params));
+extern PNG_EXPORT(void, png_write_png) PNGARG((png_structp png_ptr,
+                        png_infop info_ptr,
+                        int transforms,
+                        png_voidp params));
+#endif
+
+/* Define PNG_DEBUG at compile time for debugging information.  Higher
+ * numbers for PNG_DEBUG mean more debugging information.  This has
+ * only been added since version 0.95 so it is not implemented throughout
+ * libpng yet, but more support will be added as needed.
+ */
+#ifdef PNG_DEBUG
+#if (PNG_DEBUG > 0)
+#if !defined(PNG_DEBUG_FILE) && defined(_MSC_VER)
+#include <crtdbg.h>
+#if (PNG_DEBUG > 1)
+#ifndef _DEBUG
+#  define _DEBUG
+#endif
+#ifndef png_debug
+#define png_debug(l,m)  _RPT0(_CRT_WARN,m PNG_STRING_NEWLINE)
+#endif
+#ifndef png_debug1
+#define png_debug1(l,m,p1)  _RPT1(_CRT_WARN,m PNG_STRING_NEWLINE,p1)
+#endif
+#ifndef png_debug2
+#define png_debug2(l,m,p1,p2) _RPT2(_CRT_WARN,m PNG_STRING_NEWLINE,p1,p2)
+#endif
+#endif
+#else /* PNG_DEBUG_FILE || !_MSC_VER */
+#ifndef PNG_DEBUG_FILE
+#define PNG_DEBUG_FILE stderr
+#endif /* PNG_DEBUG_FILE */
+
+#if (PNG_DEBUG > 1)
+/* Note: ["%s"m PNG_STRING_NEWLINE] probably does not work on non-ISO
+ * compilers.
+ */
+#  ifdef __STDC__
+#    ifndef png_debug
+#      define png_debug(l,m) \
+       { \
+       int num_tabs=l; \
+       fprintf(PNG_DEBUG_FILE,"%s"m PNG_STRING_NEWLINE,(num_tabs==1 ? "\t" : \
+         (num_tabs==2 ? "\t\t":(num_tabs>2 ? "\t\t\t":"")))); \
+       }
+#    endif
+#    ifndef png_debug1
+#      define png_debug1(l,m,p1) \
+       { \
+       int num_tabs=l; \
+       fprintf(PNG_DEBUG_FILE,"%s"m PNG_STRING_NEWLINE,(num_tabs==1 ? "\t" : \
+         (num_tabs==2 ? "\t\t":(num_tabs>2 ? "\t\t\t":""))),p1); \
+       }
+#    endif
+#    ifndef png_debug2
+#      define png_debug2(l,m,p1,p2) \
+       { \
+       int num_tabs=l; \
+       fprintf(PNG_DEBUG_FILE,"%s"m PNG_STRING_NEWLINE,(num_tabs==1 ? "\t" : \
+         (num_tabs==2 ? "\t\t":(num_tabs>2 ? "\t\t\t":""))),p1,p2); \
+       }
+#    endif
+#  else /* __STDC __ */
+#    ifndef png_debug
+#      define png_debug(l,m) \
+       { \
+       int num_tabs=l; \
+       char format[256]; \
+       snprintf(format,256,"%s%s%s",(num_tabs==1 ? "\t" : \
+         (num_tabs==2 ? "\t\t":(num_tabs>2 ? "\t\t\t":""))), \
+         m,PNG_STRING_NEWLINE); \
+       fprintf(PNG_DEBUG_FILE,format); \
+       }
+#    endif
+#    ifndef png_debug1
+#      define png_debug1(l,m,p1) \
+       { \
+       int num_tabs=l; \
+       char format[256]; \
+       snprintf(format,256,"%s%s%s",(num_tabs==1 ? "\t" : \
+         (num_tabs==2 ? "\t\t":(num_tabs>2 ? "\t\t\t":""))), \
+         m,PNG_STRING_NEWLINE); \
+       fprintf(PNG_DEBUG_FILE,format,p1); \
+       }
+#    endif
+#    ifndef png_debug2
+#      define png_debug2(l,m,p1,p2) \
+       { \
+       int num_tabs=l; \
+       char format[256]; \
+       snprintf(format,256,"%s%s%s",(num_tabs==1 ? "\t" : \
+         (num_tabs==2 ? "\t\t":(num_tabs>2 ? "\t\t\t":""))), \
+         m,PNG_STRING_NEWLINE); \
+       fprintf(PNG_DEBUG_FILE,format,p1,p2); \
+       }
+#    endif
+#  endif /* __STDC __ */
+#endif /* (PNG_DEBUG > 1) */
+
+#endif /* _MSC_VER */
+#endif /* (PNG_DEBUG > 0) */
+#endif /* PNG_DEBUG */
+#ifndef png_debug
+#define png_debug(l, m)
+#endif
+#ifndef png_debug1
+#define png_debug1(l, m, p1)
+#endif
+#ifndef png_debug2
+#define png_debug2(l, m, p1, p2)
+#endif
+
+extern PNG_EXPORT(png_charp,png_get_copyright) PNGARG((png_structp png_ptr));
+extern PNG_EXPORT(png_charp,png_get_header_ver) PNGARG((png_structp png_ptr));
+extern PNG_EXPORT(png_charp,png_get_header_version) PNGARG((png_structp png_ptr));
+extern PNG_EXPORT(png_charp,png_get_libpng_ver) PNGARG((png_structp png_ptr));
+
+#ifdef PNG_MNG_FEATURES_SUPPORTED
+extern PNG_EXPORT(png_uint_32,png_permit_mng_features) PNGARG((png_structp
+   png_ptr, png_uint_32 mng_features_permitted));
+#endif
+
+/* For use in png_set_keep_unknown, added to version 1.2.6 */
+#define PNG_HANDLE_CHUNK_AS_DEFAULT   0
+#define PNG_HANDLE_CHUNK_NEVER        1
+#define PNG_HANDLE_CHUNK_IF_SAFE      2
+#define PNG_HANDLE_CHUNK_ALWAYS       3
+
+/* Added to version 1.2.0 */
+#ifdef PNG_ASSEMBLER_CODE_SUPPORTED
+#ifdef PNG_MMX_CODE_SUPPORTED
+#define PNG_ASM_FLAG_MMX_SUPPORT_COMPILED  0x01  /* not user-settable */
+#define PNG_ASM_FLAG_MMX_SUPPORT_IN_CPU    0x02  /* not user-settable */
+#define PNG_ASM_FLAG_MMX_READ_COMBINE_ROW  0x04
+#define PNG_ASM_FLAG_MMX_READ_INTERLACE    0x08
+#define PNG_ASM_FLAG_MMX_READ_FILTER_SUB   0x10
+#define PNG_ASM_FLAG_MMX_READ_FILTER_UP    0x20
+#define PNG_ASM_FLAG_MMX_READ_FILTER_AVG   0x40
+#define PNG_ASM_FLAG_MMX_READ_FILTER_PAETH 0x80
+#define PNG_ASM_FLAGS_INITIALIZED          0x80000000  /* not user-settable */
+
+#define PNG_MMX_READ_FLAGS ( PNG_ASM_FLAG_MMX_READ_COMBINE_ROW  \
+                           | PNG_ASM_FLAG_MMX_READ_INTERLACE    \
+                           | PNG_ASM_FLAG_MMX_READ_FILTER_SUB   \
+                           | PNG_ASM_FLAG_MMX_READ_FILTER_UP    \
+                           | PNG_ASM_FLAG_MMX_READ_FILTER_AVG   \
+                           | PNG_ASM_FLAG_MMX_READ_FILTER_PAETH )
+#define PNG_MMX_WRITE_FLAGS ( 0 )
+
+#define PNG_MMX_FLAGS ( PNG_ASM_FLAG_MMX_SUPPORT_COMPILED \
+                      | PNG_ASM_FLAG_MMX_SUPPORT_IN_CPU   \
+                      | PNG_MMX_READ_FLAGS                \
+                      | PNG_MMX_WRITE_FLAGS )
+
+#define PNG_SELECT_READ   1
+#define PNG_SELECT_WRITE  2
+#endif /* PNG_MMX_CODE_SUPPORTED */
+
+#ifndef PNG_1_0_X
+/* pngget.c */
+extern PNG_EXPORT(png_uint_32,png_get_mmx_flagmask)
+   PNGARG((int flag_select, int *compilerID));
+
+/* pngget.c */
+extern PNG_EXPORT(png_uint_32,png_get_asm_flagmask)
+   PNGARG((int flag_select));
+
+/* pngget.c */
+extern PNG_EXPORT(png_uint_32,png_get_asm_flags)
+   PNGARG((png_structp png_ptr));
+
+/* pngget.c */
+extern PNG_EXPORT(png_byte,png_get_mmx_bitdepth_threshold)
+   PNGARG((png_structp png_ptr));
+
+/* pngget.c */
+extern PNG_EXPORT(png_uint_32,png_get_mmx_rowbytes_threshold)
+   PNGARG((png_structp png_ptr));
+
+/* pngset.c */
+extern PNG_EXPORT(void,png_set_asm_flags)
+   PNGARG((png_structp png_ptr, png_uint_32 asm_flags));
+
+/* pngset.c */
+extern PNG_EXPORT(void,png_set_mmx_thresholds)
+   PNGARG((png_structp png_ptr, png_byte mmx_bitdepth_threshold,
+   png_uint_32 mmx_rowbytes_threshold));
+
+#endif /* PNG_1_0_X */
+
+#ifndef PNG_1_0_X
+/* png.c, pnggccrd.c, or pngvcrd.c */
+extern PNG_EXPORT(int,png_mmx_support) PNGARG((void));
+#endif /* PNG_1_0_X */
+#endif /* PNG_ASSEMBLER_CODE_SUPPORTED */
+
+/* Strip the prepended error numbers ("#nnn ") from error and warning
+ * messages before passing them to the error or warning handler.
+ */
+#ifdef PNG_ERROR_NUMBERS_SUPPORTED
+extern PNG_EXPORT(void,png_set_strip_error_numbers) PNGARG((png_structp
+   png_ptr, png_uint_32 strip_mode));
+#endif
+
+/* Added at libpng-1.2.6 */
+#ifdef PNG_SET_USER_LIMITS_SUPPORTED
+extern PNG_EXPORT(void,png_set_user_limits) PNGARG((png_structp
+   png_ptr, png_uint_32 user_width_max, png_uint_32 user_height_max));
+extern PNG_EXPORT(png_uint_32,png_get_user_width_max) PNGARG((png_structp
+   png_ptr));
+extern PNG_EXPORT(png_uint_32,png_get_user_height_max) PNGARG((png_structp
+   png_ptr));
+#endif
+/* Maintainer: Put new public prototypes here ^, in libpng.3, and in
+ * project defs
+ */
+
+#ifdef PNG_READ_COMPOSITE_NODIV_SUPPORTED
+/* With these routines we avoid an integer divide, which will be slower on
+ * most machines.  However, it does take more operations than the corresponding
+ * divide method, so it may be slower on a few RISC systems.  There are two
+ * shifts (by 8 or 16 bits) and an addition, versus a single integer divide.
+ *
+ * Note that the rounding factors are NOT supposed to be the same!  128 and
+ * 32768 are correct for the NODIV code; 127 and 32767 are correct for the
+ * standard method.
+ *
+ * [Optimized code by Greg Roelofs and Mark Adler...blame us for bugs. :-) ]
+ */
+
+ /* fg and bg should be in `gamma 1.0' space; alpha is the opacity          */
+
+#  define png_composite(composite, fg, alpha, bg)                            \
+     { png_uint_16 temp = (png_uint_16)((png_uint_16)(fg) * (png_uint_16)(alpha) \
+                        +        (png_uint_16)(bg)*(png_uint_16)(255 -       \
+                        (png_uint_16)(alpha)) + (png_uint_16)128);           \
+       (composite) = (png_byte)((temp + (temp >> 8)) >> 8); }
+
+#  define png_composite_16(composite, fg, alpha, bg)                         \
+     { png_uint_32 temp = (png_uint_32)((png_uint_32)(fg) * (png_uint_32)(alpha) \
+                        + (png_uint_32)(bg)*(png_uint_32)(65535L -           \
+                        (png_uint_32)(alpha)) + (png_uint_32)32768L);        \
+       (composite) = (png_uint_16)((temp + (temp >> 16)) >> 16); }
+
+#else  /* Standard method using integer division */
+
+#  define png_composite(composite, fg, alpha, bg)                            \
+     (composite) = (png_byte)(((png_uint_16)(fg) * (png_uint_16)(alpha) +    \
+       (png_uint_16)(bg) * (png_uint_16)(255 - (png_uint_16)(alpha)) +       \
+       (png_uint_16)127) / 255)
+
+#  define png_composite_16(composite, fg, alpha, bg)                         \
+     (composite) = (png_uint_16)(((png_uint_32)(fg) * (png_uint_32)(alpha) + \
+       (png_uint_32)(bg)*(png_uint_32)(65535L - (png_uint_32)(alpha)) +      \
+       (png_uint_32)32767) / (png_uint_32)65535L)
+
+#endif /* PNG_READ_COMPOSITE_NODIV_SUPPORTED */
+
+/* Inline macros to do direct reads of bytes from the input buffer.  These
+ * require that you are using an architecture that uses PNG byte ordering
+ * (MSB first) and supports unaligned data storage.  I think that PowerPC
+ * in big-endian mode and 680x0 are the only ones that will support this.
+ * The x86 line of processors definitely do not.  The png_get_int_32()
+ * routine also assumes we are using two's complement format for negative
+ * values, which is almost certainly true.
+ */
+#ifdef PNG_READ_BIG_ENDIAN_SUPPORTED
+#  define png_get_uint_32(buf) ( *((png_uint_32p) (buf)))
+#  define png_get_uint_16(buf) ( *((png_uint_16p) (buf)))
+#  define png_get_int_32(buf)  ( *((png_int_32p)  (buf)))
+#else
+extern PNG_EXPORT(png_uint_32,png_get_uint_32) PNGARG((png_bytep buf));
+extern PNG_EXPORT(png_uint_16,png_get_uint_16) PNGARG((png_bytep buf));
+extern PNG_EXPORT(png_int_32,png_get_int_32) PNGARG((png_bytep buf));
+#endif /* !PNG_READ_BIG_ENDIAN_SUPPORTED */
+extern PNG_EXPORT(png_uint_32,png_get_uint_31)
+  PNGARG((png_structp png_ptr, png_bytep buf));
+/* No png_get_int_16 -- may be added if there's a real need for it. */
+
+/* Place a 32-bit number into a buffer in PNG byte order (big-endian).
+ */
+extern PNG_EXPORT(void,png_save_uint_32)
+   PNGARG((png_bytep buf, png_uint_32 i));
+extern PNG_EXPORT(void,png_save_int_32)
+   PNGARG((png_bytep buf, png_int_32 i));
+
+/* Place a 16-bit number into a buffer in PNG byte order.
+ * The parameter is declared unsigned int, not png_uint_16,
+ * just to avoid potential problems on pre-ANSI C compilers.
+ */
+extern PNG_EXPORT(void,png_save_uint_16)
+   PNGARG((png_bytep buf, unsigned int i));
+/* No png_save_int_16 -- may be added if there's a real need for it. */
+
+/* ************************************************************************* */
+
+/* These next functions are used internally in the code.  They generally
+ * shouldn't be used unless you are writing code to add or replace some
+ * functionality in libpng.  More information about most functions can
+ * be found in the files where the functions are located.
+ */
+
+
+/* Various modes of operation, that are visible to applications because
+ * they are used for unknown chunk location.
+ */
+#define PNG_HAVE_IHDR               0x01
+#define PNG_HAVE_PLTE               0x02
+#define PNG_HAVE_IDAT               0x04
+#define PNG_AFTER_IDAT              0x08 /* Have complete zlib datastream */
+#define PNG_HAVE_IEND               0x10
+
+#ifdef PNG_INTERNAL
+
+/* More modes of operation.  Note that after an init, mode is set to
+ * zero automatically when the structure is created.
+ */
+#define PNG_HAVE_gAMA               0x20
+#define PNG_HAVE_cHRM               0x40
+#define PNG_HAVE_sRGB               0x80
+#define PNG_HAVE_CHUNK_HEADER      0x100
+#define PNG_WROTE_tIME             0x200
+#define PNG_WROTE_INFO_BEFORE_PLTE 0x400
+#define PNG_BACKGROUND_IS_GRAY     0x800
+#define PNG_HAVE_PNG_SIGNATURE    0x1000
+#define PNG_HAVE_CHUNK_AFTER_IDAT 0x2000 /* Have another chunk after IDAT */
+
+/* Flags for the transformations the PNG library does on the image data */
+#define PNG_BGR                0x0001
+#define PNG_INTERLACE          0x0002
+#define PNG_PACK               0x0004
+#define PNG_SHIFT              0x0008
+#define PNG_SWAP_BYTES         0x0010
+#define PNG_INVERT_MONO        0x0020
+#define PNG_DITHER             0x0040
+#define PNG_BACKGROUND         0x0080
+#define PNG_BACKGROUND_EXPAND  0x0100
+                          /*   0x0200 unused */
+#define PNG_16_TO_8            0x0400
+#define PNG_RGBA               0x0800
+#define PNG_EXPAND             0x1000
+#define PNG_GAMMA              0x2000
+#define PNG_GRAY_TO_RGB        0x4000
+#define PNG_FILLER             0x8000L
+#define PNG_PACKSWAP          0x10000L
+#define PNG_SWAP_ALPHA        0x20000L
+#define PNG_STRIP_ALPHA       0x40000L
+#define PNG_INVERT_ALPHA      0x80000L
+#define PNG_USER_TRANSFORM   0x100000L
+#define PNG_RGB_TO_GRAY_ERR  0x200000L
+#define PNG_RGB_TO_GRAY_WARN 0x400000L
+#define PNG_RGB_TO_GRAY      0x600000L  /* two bits, RGB_TO_GRAY_ERR|WARN */
+                       /*    0x800000L     Unused */
+#define PNG_ADD_ALPHA       0x1000000L  /* Added to libpng-1.2.7 */
+#define PNG_EXPAND_tRNS     0x2000000L  /* Added to libpng-1.2.9 */
+#define PNG_PREMULTIPLY_ALPHA 0x4000000L  /* Added to libpng-1.2.41 */
+                                          /* by volker */
+                       /*   0x8000000L  unused */
+                       /*  0x10000000L  unused */
+                       /*  0x20000000L  unused */
+                       /*  0x40000000L  unused */
+
+/* Flags for png_create_struct */
+#define PNG_STRUCT_PNG   0x0001
+#define PNG_STRUCT_INFO  0x0002
+
+/* Scaling factor for filter heuristic weighting calculations */
+#define PNG_WEIGHT_SHIFT 8
+#define PNG_WEIGHT_FACTOR (1<<(PNG_WEIGHT_SHIFT))
+#define PNG_COST_SHIFT 3
+#define PNG_COST_FACTOR (1<<(PNG_COST_SHIFT))
+
+/* Flags for the png_ptr->flags rather than declaring a byte for each one */
+#define PNG_FLAG_ZLIB_CUSTOM_STRATEGY     0x0001
+#define PNG_FLAG_ZLIB_CUSTOM_LEVEL        0x0002
+#define PNG_FLAG_ZLIB_CUSTOM_MEM_LEVEL    0x0004
+#define PNG_FLAG_ZLIB_CUSTOM_WINDOW_BITS  0x0008
+#define PNG_FLAG_ZLIB_CUSTOM_METHOD       0x0010
+#define PNG_FLAG_ZLIB_FINISHED            0x0020
+#define PNG_FLAG_ROW_INIT                 0x0040
+#define PNG_FLAG_FILLER_AFTER             0x0080
+#define PNG_FLAG_CRC_ANCILLARY_USE        0x0100
+#define PNG_FLAG_CRC_ANCILLARY_NOWARN     0x0200
+#define PNG_FLAG_CRC_CRITICAL_USE         0x0400
+#define PNG_FLAG_CRC_CRITICAL_IGNORE      0x0800
+#define PNG_FLAG_FREE_PLTE                0x1000
+#define PNG_FLAG_FREE_TRNS                0x2000
+#define PNG_FLAG_FREE_HIST                0x4000
+#define PNG_FLAG_KEEP_UNKNOWN_CHUNKS      0x8000L
+#define PNG_FLAG_KEEP_UNSAFE_CHUNKS       0x10000L
+#define PNG_FLAG_LIBRARY_MISMATCH         0x20000L
+#define PNG_FLAG_STRIP_ERROR_NUMBERS      0x40000L
+#define PNG_FLAG_STRIP_ERROR_TEXT         0x80000L
+#define PNG_FLAG_MALLOC_NULL_MEM_OK       0x100000L
+#define PNG_FLAG_ADD_ALPHA                0x200000L  /* Added to libpng-1.2.8 */
+#define PNG_FLAG_STRIP_ALPHA              0x400000L  /* Added to libpng-1.2.8 */
+                                  /*      0x800000L  unused */
+                                  /*     0x1000000L  unused */
+                                  /*     0x2000000L  unused */
+                                  /*     0x4000000L  unused */
+                                  /*     0x8000000L  unused */
+                                  /*    0x10000000L  unused */
+                                  /*    0x20000000L  unused */
+                                  /*    0x40000000L  unused */
+
+#define PNG_FLAG_CRC_ANCILLARY_MASK (PNG_FLAG_CRC_ANCILLARY_USE | \
+                                     PNG_FLAG_CRC_ANCILLARY_NOWARN)
+
+#define PNG_FLAG_CRC_CRITICAL_MASK  (PNG_FLAG_CRC_CRITICAL_USE | \
+                                     PNG_FLAG_CRC_CRITICAL_IGNORE)
+
+#define PNG_FLAG_CRC_MASK           (PNG_FLAG_CRC_ANCILLARY_MASK | \
+                                     PNG_FLAG_CRC_CRITICAL_MASK)
+
+/* Save typing and make code easier to understand */
+
+#define PNG_COLOR_DIST(c1, c2) (abs((int)((c1).red) - (int)((c2).red)) + \
+   abs((int)((c1).green) - (int)((c2).green)) + \
+   abs((int)((c1).blue) - (int)((c2).blue)))
+
+/* Added to libpng-1.2.6 JB */
+#define PNG_ROWBYTES(pixel_bits, width) \
+    ((pixel_bits) >= 8 ? \
+    ((width) * (((png_uint_32)(pixel_bits)) >> 3)) : \
+    (( ((width) * ((png_uint_32)(pixel_bits))) + 7) >> 3) )
+
+/* PNG_OUT_OF_RANGE returns true if value is outside the range
+ * ideal-delta..ideal+delta.  Each argument is evaluated twice.
+ * "ideal" and "delta" should be constants, normally simple
+ * integers, "value" a variable. Added to libpng-1.2.6 JB
+ */
+#define PNG_OUT_OF_RANGE(value, ideal, delta) \
+        ( (value) < (ideal)-(delta) || (value) > (ideal)+(delta) )
+
+/* Variables declared in png.c - only it needs to define PNG_NO_EXTERN */
+#if !defined(PNG_NO_EXTERN) || defined(PNG_ALWAYS_EXTERN)
+/* Place to hold the signature string for a PNG file. */
+#ifdef PNG_USE_GLOBAL_ARRAYS
+   PNG_EXPORT_VAR (PNG_CONST png_byte FARDATA) png_sig[8];
+#else
+#endif
+#endif /* PNG_NO_EXTERN */
+
+/* Constant strings for known chunk types.  If you need to add a chunk,
+ * define the name here, and add an invocation of the macro in png.c and
+ * wherever it's needed.
+ */
+#define PNG_IHDR png_byte png_IHDR[5] = { 73,  72,  68,  82, '\0'}
+#define PNG_IDAT png_byte png_IDAT[5] = { 73,  68,  65,  84, '\0'}
+#define PNG_IEND png_byte png_IEND[5] = { 73,  69,  78,  68, '\0'}
+#define PNG_PLTE png_byte png_PLTE[5] = { 80,  76,  84,  69, '\0'}
+#define PNG_bKGD png_byte png_bKGD[5] = { 98,  75,  71,  68, '\0'}
+#define PNG_cHRM png_byte png_cHRM[5] = { 99,  72,  82,  77, '\0'}
+#define PNG_gAMA png_byte png_gAMA[5] = {103,  65,  77,  65, '\0'}
+#define PNG_hIST png_byte png_hIST[5] = {104,  73,  83,  84, '\0'}
+#define PNG_iCCP png_byte png_iCCP[5] = {105,  67,  67,  80, '\0'}
+#define PNG_iTXt png_byte png_iTXt[5] = {105,  84,  88, 116, '\0'}
+#define PNG_oFFs png_byte png_oFFs[5] = {111,  70,  70, 115, '\0'}
+#define PNG_pCAL png_byte png_pCAL[5] = {112,  67,  65,  76, '\0'}
+#define PNG_sCAL png_byte png_sCAL[5] = {115,  67,  65,  76, '\0'}
+#define PNG_pHYs png_byte png_pHYs[5] = {112,  72,  89, 115, '\0'}
+#define PNG_sBIT png_byte png_sBIT[5] = {115,  66,  73,  84, '\0'}
+#define PNG_sPLT png_byte png_sPLT[5] = {115,  80,  76,  84, '\0'}
+#define PNG_sRGB png_byte png_sRGB[5] = {115,  82,  71,  66, '\0'}
+#define PNG_tEXt png_byte png_tEXt[5] = {116,  69,  88, 116, '\0'}
+#define PNG_tIME png_byte png_tIME[5] = {116,  73,  77,  69, '\0'}
+#define PNG_tRNS png_byte png_tRNS[5] = {116,  82,  78,  83, '\0'}
+#define PNG_zTXt png_byte png_zTXt[5] = {122,  84,  88, 116, '\0'}
+
+#ifdef PNG_USE_GLOBAL_ARRAYS
+PNG_EXPORT_VAR (png_byte FARDATA) png_IHDR[5];
+PNG_EXPORT_VAR (png_byte FARDATA) png_IDAT[5];
+PNG_EXPORT_VAR (png_byte FARDATA) png_IEND[5];
+PNG_EXPORT_VAR (png_byte FARDATA) png_PLTE[5];
+PNG_EXPORT_VAR (png_byte FARDATA) png_bKGD[5];
+PNG_EXPORT_VAR (png_byte FARDATA) png_cHRM[5];
+PNG_EXPORT_VAR (png_byte FARDATA) png_gAMA[5];
+PNG_EXPORT_VAR (png_byte FARDATA) png_hIST[5];
+PNG_EXPORT_VAR (png_byte FARDATA) png_iCCP[5];
+PNG_EXPORT_VAR (png_byte FARDATA) png_iTXt[5];
+PNG_EXPORT_VAR (png_byte FARDATA) png_oFFs[5];
+PNG_EXPORT_VAR (png_byte FARDATA) png_pCAL[5];
+PNG_EXPORT_VAR (png_byte FARDATA) png_sCAL[5];
+PNG_EXPORT_VAR (png_byte FARDATA) png_pHYs[5];
+PNG_EXPORT_VAR (png_byte FARDATA) png_sBIT[5];
+PNG_EXPORT_VAR (png_byte FARDATA) png_sPLT[5];
+PNG_EXPORT_VAR (png_byte FARDATA) png_sRGB[5];
+PNG_EXPORT_VAR (png_byte FARDATA) png_tEXt[5];
+PNG_EXPORT_VAR (png_byte FARDATA) png_tIME[5];
+PNG_EXPORT_VAR (png_byte FARDATA) png_tRNS[5];
+PNG_EXPORT_VAR (png_byte FARDATA) png_zTXt[5];
+#endif /* PNG_USE_GLOBAL_ARRAYS */
+
+#if defined(PNG_1_0_X) || defined (PNG_1_2_X)
+/* Initialize png_ptr struct for reading, and allocate any other memory.
+ * (old interface - DEPRECATED - use png_create_read_struct instead).
+ */
+extern PNG_EXPORT(void,png_read_init) PNGARG((png_structp png_ptr))
+    PNG_DEPRECATED;
+#undef png_read_init
+#define png_read_init(png_ptr) png_read_init_3(&png_ptr, \
+    PNG_LIBPNG_VER_STRING,  png_sizeof(png_struct));
+#endif
+
+extern PNG_EXPORT(void,png_read_init_3) PNGARG((png_structpp ptr_ptr,
+    png_const_charp user_png_ver, png_size_t png_struct_size));
+#if defined(PNG_1_0_X) || defined (PNG_1_2_X)
+extern PNG_EXPORT(void,png_read_init_2) PNGARG((png_structp png_ptr,
+    png_const_charp user_png_ver, png_size_t png_struct_size, png_size_t
+    png_info_size));
+#endif
+
+#if defined(PNG_1_0_X) || defined (PNG_1_2_X)
+/* Initialize png_ptr struct for writing, and allocate any other memory.
+ * (old interface - DEPRECATED - use png_create_write_struct instead).
+ */
+extern PNG_EXPORT(void,png_write_init) PNGARG((png_structp png_ptr))
+    PNG_DEPRECATED;
+#undef png_write_init
+#define png_write_init(png_ptr) png_write_init_3(&png_ptr, \
+    PNG_LIBPNG_VER_STRING, png_sizeof(png_struct));
+#endif
+
+extern PNG_EXPORT(void,png_write_init_3) PNGARG((png_structpp ptr_ptr,
+    png_const_charp user_png_ver, png_size_t png_struct_size));
+extern PNG_EXPORT(void,png_write_init_2) PNGARG((png_structp png_ptr,
+    png_const_charp user_png_ver, png_size_t png_struct_size, png_size_t
+    png_info_size));
+
+/* Allocate memory for an internal libpng struct */
+PNG_EXTERN png_voidp png_create_struct PNGARG((int type)) PNG_PRIVATE;
+
+/* Free memory from internal libpng struct */
+PNG_EXTERN void png_destroy_struct PNGARG((png_voidp struct_ptr)) PNG_PRIVATE;
+
+PNG_EXTERN png_voidp png_create_struct_2 PNGARG((int type, png_malloc_ptr
+  malloc_fn, png_voidp mem_ptr)) PNG_PRIVATE;
+PNG_EXTERN void png_destroy_struct_2 PNGARG((png_voidp struct_ptr,
+   png_free_ptr free_fn, png_voidp mem_ptr)) PNG_PRIVATE;
+
+/* Free any memory that info_ptr points to and reset struct. */
+PNG_EXTERN void png_info_destroy PNGARG((png_structp png_ptr,
+   png_infop info_ptr)) PNG_PRIVATE;
+
+#ifndef PNG_1_0_X
+/* Function to allocate memory for zlib. */
+PNG_EXTERN voidpf png_zalloc PNGARG((voidpf png_ptr, uInt items,
+   uInt size)) PNG_PRIVATE;
+
+/* Function to free memory for zlib */
+PNG_EXTERN void png_zfree PNGARG((voidpf png_ptr, voidpf ptr)) PNG_PRIVATE;
+
+#ifdef PNG_SIZE_T
+/* Function to convert a sizeof an item to png_sizeof item */
+   PNG_EXTERN png_size_t PNGAPI png_convert_size PNGARG((size_t size))
+      PNG_PRIVATE;
+#endif
+
+/* Next four functions are used internally as callbacks.  PNGAPI is required
+ * but not PNG_EXPORT.  PNGAPI added at libpng version 1.2.3.
+ */
+
+PNG_EXTERN void PNGAPI png_default_read_data PNGARG((png_structp png_ptr,
+   png_bytep data, png_size_t length)) PNG_PRIVATE;
+
+#ifdef PNG_PROGRESSIVE_READ_SUPPORTED
+PNG_EXTERN void PNGAPI png_push_fill_buffer PNGARG((png_structp png_ptr,
+   png_bytep buffer, png_size_t length)) PNG_PRIVATE;
+#endif
+
+PNG_EXTERN void PNGAPI png_default_write_data PNGARG((png_structp png_ptr,
+   png_bytep data, png_size_t length)) PNG_PRIVATE;
+
+#ifdef PNG_WRITE_FLUSH_SUPPORTED
+#ifdef PNG_STDIO_SUPPORTED
+PNG_EXTERN void PNGAPI png_default_flush PNGARG((png_structp png_ptr))
+   PNG_PRIVATE;
+#endif
+#endif
+#else /* PNG_1_0_X */
+#ifdef PNG_PROGRESSIVE_READ_SUPPORTED
+PNG_EXTERN void png_push_fill_buffer PNGARG((png_structp png_ptr,
+   png_bytep buffer, png_size_t length)) PNG_PRIVATE;
+#endif
+#endif /* PNG_1_0_X */
+
+/* Reset the CRC variable */
+PNG_EXTERN void png_reset_crc PNGARG((png_structp png_ptr)) PNG_PRIVATE;
+
+/* Write the "data" buffer to whatever output you are using. */
+PNG_EXTERN void png_write_data PNGARG((png_structp png_ptr, png_bytep data,
+   png_size_t length)) PNG_PRIVATE;
+
+/* Read data from whatever input you are using into the "data" buffer */
+PNG_EXTERN void png_read_data PNGARG((png_structp png_ptr, png_bytep data,
+   png_size_t length)) PNG_PRIVATE;
+
+/* Read bytes into buf, and update png_ptr->crc */
+PNG_EXTERN void png_crc_read PNGARG((png_structp png_ptr, png_bytep buf,
+   png_size_t length)) PNG_PRIVATE;
+
+/* Decompress data in a chunk that uses compression */
+#if defined(PNG_zTXt_SUPPORTED) || defined(PNG_iTXt_SUPPORTED) || \
+    defined(PNG_iCCP_SUPPORTED) || defined(PNG_sPLT_SUPPORTED)
+PNG_EXTERN void png_decompress_chunk PNGARG((png_structp png_ptr,
+   int comp_type, png_size_t chunklength,
+   png_size_t prefix_length, png_size_t *data_length)) PNG_PRIVATE;
+#endif
+
+/* Read "skip" bytes, read the file crc, and (optionally) verify png_ptr->crc */
+PNG_EXTERN int png_crc_finish PNGARG((png_structp png_ptr, png_uint_32 skip)
+   PNG_PRIVATE);
+
+/* Read the CRC from the file and compare it to the libpng calculated CRC */
+PNG_EXTERN int png_crc_error PNGARG((png_structp png_ptr)) PNG_PRIVATE;
+
+/* Calculate the CRC over a section of data.  Note that we are only
+ * passing a maximum of 64K on systems that have this as a memory limit,
+ * since this is the maximum buffer size we can specify.
+ */
+PNG_EXTERN void png_calculate_crc PNGARG((png_structp png_ptr, png_bytep ptr,
+   png_size_t length)) PNG_PRIVATE;
+
+#ifdef PNG_WRITE_FLUSH_SUPPORTED
+PNG_EXTERN void png_flush PNGARG((png_structp png_ptr)) PNG_PRIVATE;
+#endif
+
+/* Simple function to write the signature */
+PNG_EXTERN void png_write_sig PNGARG((png_structp png_ptr)) PNG_PRIVATE;
+
+/* Write various chunks */
+
+/* Write the IHDR chunk, and update the png_struct with the necessary
+ * information.
+ */
+PNG_EXTERN void png_write_IHDR PNGARG((png_structp png_ptr, png_uint_32 width,
+   png_uint_32 height,
+   int bit_depth, int color_type, int compression_method, int filter_method,
+   int interlace_method)) PNG_PRIVATE;
+
+PNG_EXTERN void png_write_PLTE PNGARG((png_structp png_ptr, png_colorp palette,
+   png_uint_32 num_pal)) PNG_PRIVATE;
+
+PNG_EXTERN void png_write_IDAT PNGARG((png_structp png_ptr, png_bytep data,
+   png_size_t length)) PNG_PRIVATE;
+
+PNG_EXTERN void png_write_IEND PNGARG((png_structp png_ptr)) PNG_PRIVATE;
+
+#ifdef PNG_WRITE_gAMA_SUPPORTED
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+PNG_EXTERN void png_write_gAMA PNGARG((png_structp png_ptr, double file_gamma))
+    PNG_PRIVATE;
+#endif
+#ifdef PNG_FIXED_POINT_SUPPORTED
+PNG_EXTERN void png_write_gAMA_fixed PNGARG((png_structp png_ptr,
+    png_fixed_point file_gamma)) PNG_PRIVATE;
+#endif
+#endif
+
+#ifdef PNG_WRITE_sBIT_SUPPORTED
+PNG_EXTERN void png_write_sBIT PNGARG((png_structp png_ptr, png_color_8p sbit,
+   int color_type)) PNG_PRIVATE;
+#endif
+
+#ifdef PNG_WRITE_cHRM_SUPPORTED
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+PNG_EXTERN void png_write_cHRM PNGARG((png_structp png_ptr,
+   double white_x, double white_y,
+   double red_x, double red_y, double green_x, double green_y,
+   double blue_x, double blue_y)) PNG_PRIVATE;
+#endif
+#ifdef PNG_FIXED_POINT_SUPPORTED
+PNG_EXTERN void png_write_cHRM_fixed PNGARG((png_structp png_ptr,
+   png_fixed_point int_white_x, png_fixed_point int_white_y,
+   png_fixed_point int_red_x, png_fixed_point int_red_y, png_fixed_point
+   int_green_x, png_fixed_point int_green_y, png_fixed_point int_blue_x,
+   png_fixed_point int_blue_y)) PNG_PRIVATE;
+#endif
+#endif
+
+#ifdef PNG_WRITE_sRGB_SUPPORTED
+PNG_EXTERN void png_write_sRGB PNGARG((png_structp png_ptr,
+   int intent)) PNG_PRIVATE;
+#endif
+
+#ifdef PNG_WRITE_iCCP_SUPPORTED
+PNG_EXTERN void png_write_iCCP PNGARG((png_structp png_ptr,
+   png_charp name, int compression_type,
+   png_charp profile, int proflen)) PNG_PRIVATE;
+   /* Note to maintainer: profile should be png_bytep */
+#endif
+
+#ifdef PNG_WRITE_sPLT_SUPPORTED
+PNG_EXTERN void png_write_sPLT PNGARG((png_structp png_ptr,
+   png_sPLT_tp palette)) PNG_PRIVATE;
+#endif
+
+#ifdef PNG_WRITE_tRNS_SUPPORTED
+PNG_EXTERN void png_write_tRNS PNGARG((png_structp png_ptr, png_bytep trans,
+   png_color_16p values, int number, int color_type)) PNG_PRIVATE;
+#endif
+
+#ifdef PNG_WRITE_bKGD_SUPPORTED
+PNG_EXTERN void png_write_bKGD PNGARG((png_structp png_ptr,
+   png_color_16p values, int color_type)) PNG_PRIVATE;
+#endif
+
+#ifdef PNG_WRITE_hIST_SUPPORTED
+PNG_EXTERN void png_write_hIST PNGARG((png_structp png_ptr, png_uint_16p hist,
+   int num_hist)) PNG_PRIVATE;
+#endif
+
+#if defined(PNG_WRITE_TEXT_SUPPORTED) || defined(PNG_WRITE_pCAL_SUPPORTED) || \
+    defined(PNG_WRITE_iCCP_SUPPORTED) || defined(PNG_WRITE_sPLT_SUPPORTED)
+PNG_EXTERN png_size_t png_check_keyword PNGARG((png_structp png_ptr,
+   png_charp key, png_charpp new_key)) PNG_PRIVATE;
+#endif
+
+#ifdef PNG_WRITE_tEXt_SUPPORTED
+PNG_EXTERN void png_write_tEXt PNGARG((png_structp png_ptr, png_charp key,
+   png_charp text, png_size_t text_len)) PNG_PRIVATE;
+#endif
+
+#ifdef PNG_WRITE_zTXt_SUPPORTED
+PNG_EXTERN void png_write_zTXt PNGARG((png_structp png_ptr, png_charp key,
+   png_charp text, png_size_t text_len, int compression)) PNG_PRIVATE;
+#endif
+
+#ifdef PNG_WRITE_iTXt_SUPPORTED
+PNG_EXTERN void png_write_iTXt PNGARG((png_structp png_ptr,
+   int compression, png_charp key, png_charp lang, png_charp lang_key,
+   png_charp text)) PNG_PRIVATE;
+#endif
+
+#ifdef PNG_TEXT_SUPPORTED  /* Added at version 1.0.14 and 1.2.4 */
+PNG_EXTERN int png_set_text_2 PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_textp text_ptr, int num_text)) PNG_PRIVATE;
+#endif
+
+#ifdef PNG_WRITE_oFFs_SUPPORTED
+PNG_EXTERN void png_write_oFFs PNGARG((png_structp png_ptr,
+   png_int_32 x_offset, png_int_32 y_offset, int unit_type)) PNG_PRIVATE;
+#endif
+
+#ifdef PNG_WRITE_pCAL_SUPPORTED
+PNG_EXTERN void png_write_pCAL PNGARG((png_structp png_ptr, png_charp purpose,
+   png_int_32 X0, png_int_32 X1, int type, int nparams,
+   png_charp units, png_charpp params)) PNG_PRIVATE;
+#endif
+
+#ifdef PNG_WRITE_pHYs_SUPPORTED
+PNG_EXTERN void png_write_pHYs PNGARG((png_structp png_ptr,
+   png_uint_32 x_pixels_per_unit, png_uint_32 y_pixels_per_unit,
+   int unit_type)) PNG_PRIVATE;
+#endif
+
+#ifdef PNG_WRITE_tIME_SUPPORTED
+PNG_EXTERN void png_write_tIME PNGARG((png_structp png_ptr,
+   png_timep mod_time)) PNG_PRIVATE;
+#endif
+
+#ifdef PNG_WRITE_sCAL_SUPPORTED
+#if defined(PNG_FLOATING_POINT_SUPPORTED) && !defined(PNG_NO_STDIO)
+PNG_EXTERN void png_write_sCAL PNGARG((png_structp png_ptr,
+   int unit, double width, double height)) PNG_PRIVATE;
+#else
+#ifdef PNG_FIXED_POINT_SUPPORTED
+PNG_EXTERN void png_write_sCAL_s PNGARG((png_structp png_ptr,
+   int unit, png_charp width, png_charp height)) PNG_PRIVATE;
+#endif
+#endif
+#endif
+
+/* Called when finished processing a row of data */
+PNG_EXTERN void png_write_finish_row PNGARG((png_structp png_ptr)) PNG_PRIVATE;
+
+/* Internal use only.   Called before first row of data */
+PNG_EXTERN void png_write_start_row PNGARG((png_structp png_ptr)) PNG_PRIVATE;
+
+#ifdef PNG_READ_GAMMA_SUPPORTED
+PNG_EXTERN void png_build_gamma_table PNGARG((png_structp png_ptr)) PNG_PRIVATE;
+#endif
+
+/* Combine a row of data, dealing with alpha, etc. if requested */
+PNG_EXTERN void png_combine_row PNGARG((png_structp png_ptr, png_bytep row,
+   int mask)) PNG_PRIVATE;
+
+#ifdef PNG_READ_INTERLACING_SUPPORTED
+/* Expand an interlaced row */
+/* OLD pre-1.0.9 interface:
+PNG_EXTERN void png_do_read_interlace PNGARG((png_row_infop row_info,
+   png_bytep row, int pass, png_uint_32 transformations)) PNG_PRIVATE;
+ */
+PNG_EXTERN void png_do_read_interlace PNGARG((png_structp png_ptr)) PNG_PRIVATE;
+#endif
+
+/* GRR TO DO (2.0 or whenever):  simplify other internal calling interfaces */
+
+#ifdef PNG_WRITE_INTERLACING_SUPPORTED
+/* Grab pixels out of a row for an interlaced pass */
+PNG_EXTERN void png_do_write_interlace PNGARG((png_row_infop row_info,
+   png_bytep row, int pass)) PNG_PRIVATE;
+#endif
+
+/* Unfilter a row */
+PNG_EXTERN void png_read_filter_row PNGARG((png_structp png_ptr,
+   png_row_infop row_info, png_bytep row, png_bytep prev_row,
+   int filter)) PNG_PRIVATE;
+
+/* Choose the best filter to use and filter the row data */
+PNG_EXTERN void png_write_find_filter PNGARG((png_structp png_ptr,
+   png_row_infop row_info)) PNG_PRIVATE;
+
+/* Write out the filtered row. */
+PNG_EXTERN void png_write_filtered_row PNGARG((png_structp png_ptr,
+   png_bytep filtered_row)) PNG_PRIVATE;
+/* Finish a row while reading, dealing with interlacing passes, etc. */
+PNG_EXTERN void png_read_finish_row PNGARG((png_structp png_ptr));
+
+/* Initialize the row buffers, etc. */
+PNG_EXTERN void png_read_start_row PNGARG((png_structp png_ptr)) PNG_PRIVATE;
+/* Optional call to update the users info structure */
+PNG_EXTERN void png_read_transform_info PNGARG((png_structp png_ptr,
+   png_infop info_ptr)) PNG_PRIVATE;
+
+/* These are the functions that do the transformations */
+#ifdef PNG_READ_FILLER_SUPPORTED
+PNG_EXTERN void png_do_read_filler PNGARG((png_row_infop row_info,
+   png_bytep row, png_uint_32 filler, png_uint_32 flags)) PNG_PRIVATE;
+#endif
+
+#ifdef PNG_READ_SWAP_ALPHA_SUPPORTED
+PNG_EXTERN void png_do_read_swap_alpha PNGARG((png_row_infop row_info,
+   png_bytep row)) PNG_PRIVATE;
+#endif
+
+#ifdef PNG_WRITE_SWAP_ALPHA_SUPPORTED
+PNG_EXTERN void png_do_write_swap_alpha PNGARG((png_row_infop row_info,
+   png_bytep row)) PNG_PRIVATE;
+#endif
+
+#ifdef PNG_READ_INVERT_ALPHA_SUPPORTED
+PNG_EXTERN void png_do_read_invert_alpha PNGARG((png_row_infop row_info,
+   png_bytep row)) PNG_PRIVATE;
+#endif
+
+#ifdef PNG_WRITE_INVERT_ALPHA_SUPPORTED
+PNG_EXTERN void png_do_write_invert_alpha PNGARG((png_row_infop row_info,
+   png_bytep row)) PNG_PRIVATE;
+#endif
+
+#if defined(PNG_WRITE_FILLER_SUPPORTED) || \
+    defined(PNG_READ_STRIP_ALPHA_SUPPORTED)
+PNG_EXTERN void png_do_strip_filler PNGARG((png_row_infop row_info,
+   png_bytep row, png_uint_32 flags)) PNG_PRIVATE;
+#endif
+
+#if defined(PNG_READ_SWAP_SUPPORTED) || defined(PNG_WRITE_SWAP_SUPPORTED)
+PNG_EXTERN void png_do_swap PNGARG((png_row_infop row_info,
+    png_bytep row)) PNG_PRIVATE;
+#endif
+
+#if defined(PNG_READ_PACKSWAP_SUPPORTED) || defined(PNG_WRITE_PACKSWAP_SUPPORTED)
+PNG_EXTERN void png_do_packswap PNGARG((png_row_infop row_info,
+    png_bytep row)) PNG_PRIVATE;
+#endif
+
+#ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED
+PNG_EXTERN int png_do_rgb_to_gray PNGARG((png_structp png_ptr, png_row_infop
+   row_info, png_bytep row)) PNG_PRIVATE;
+#endif
+
+#ifdef PNG_READ_GRAY_TO_RGB_SUPPORTED
+PNG_EXTERN void png_do_gray_to_rgb PNGARG((png_row_infop row_info,
+   png_bytep row)) PNG_PRIVATE;
+#endif
+
+#ifdef PNG_READ_PACK_SUPPORTED
+PNG_EXTERN void png_do_unpack PNGARG((png_row_infop row_info,
+    png_bytep row)) PNG_PRIVATE;
+#endif
+
+#ifdef PNG_READ_SHIFT_SUPPORTED
+PNG_EXTERN void png_do_unshift PNGARG((png_row_infop row_info, png_bytep row,
+   png_color_8p sig_bits)) PNG_PRIVATE;
+#endif
+
+#if defined(PNG_READ_INVERT_SUPPORTED) || defined(PNG_WRITE_INVERT_SUPPORTED)
+PNG_EXTERN void png_do_invert PNGARG((png_row_infop row_info,
+    png_bytep row)) PNG_PRIVATE;
+#endif
+
+#ifdef PNG_READ_16_TO_8_SUPPORTED
+PNG_EXTERN void png_do_chop PNGARG((png_row_infop row_info,
+    png_bytep row)) PNG_PRIVATE;
+#endif
+
+#ifdef PNG_READ_DITHER_SUPPORTED
+PNG_EXTERN void png_do_dither PNGARG((png_row_infop row_info,
+   png_bytep row, png_bytep palette_lookup,
+    png_bytep dither_lookup)) PNG_PRIVATE;
+
+#  ifdef PNG_CORRECT_PALETTE_SUPPORTED
+PNG_EXTERN void png_correct_palette PNGARG((png_structp png_ptr,
+   png_colorp palette, int num_palette)) PNG_PRIVATE;
+#  endif
+#endif
+
+#if defined(PNG_READ_BGR_SUPPORTED) || defined(PNG_WRITE_BGR_SUPPORTED)
+PNG_EXTERN void png_do_bgr PNGARG((png_row_infop row_info,
+    png_bytep row)) PNG_PRIVATE;
+#endif
+
+#ifdef PNG_WRITE_PACK_SUPPORTED
+PNG_EXTERN void png_do_pack PNGARG((png_row_infop row_info,
+   png_bytep row, png_uint_32 bit_depth)) PNG_PRIVATE;
+#endif
+
+#ifdef PNG_WRITE_SHIFT_SUPPORTED
+PNG_EXTERN void png_do_shift PNGARG((png_row_infop row_info, png_bytep row,
+   png_color_8p bit_depth)) PNG_PRIVATE;
+#endif
+
+#ifdef PNG_READ_BACKGROUND_SUPPORTED
+#ifdef PNG_READ_GAMMA_SUPPORTED
+PNG_EXTERN void png_do_background PNGARG((png_row_infop row_info, png_bytep row,
+   png_color_16p trans_values, png_color_16p background,
+   png_color_16p background_1,
+   png_bytep gamma_table, png_bytep gamma_from_1, png_bytep gamma_to_1,
+   png_uint_16pp gamma_16, png_uint_16pp gamma_16_from_1,
+   png_uint_16pp gamma_16_to_1, int gamma_shift)) PNG_PRIVATE;
+#else
+PNG_EXTERN void png_do_background PNGARG((png_row_infop row_info, png_bytep row,
+   png_color_16p trans_values, png_color_16p background)) PNG_PRIVATE;
+#endif
+#endif
+
+#ifdef PNG_READ_GAMMA_SUPPORTED
+PNG_EXTERN void png_do_gamma PNGARG((png_row_infop row_info, png_bytep row,
+   png_bytep gamma_table, png_uint_16pp gamma_16_table,
+   int gamma_shift)) PNG_PRIVATE;
+#endif
+
+#ifdef PNG_READ_EXPAND_SUPPORTED
+PNG_EXTERN void png_do_expand_palette PNGARG((png_row_infop row_info,
+   png_bytep row, png_colorp palette, png_bytep trans,
+   int num_trans)) PNG_PRIVATE;
+PNG_EXTERN void png_do_expand PNGARG((png_row_infop row_info,
+   png_bytep row, png_color_16p trans_value)) PNG_PRIVATE;
+#endif
+
+/* The following decodes the appropriate chunks, and does error correction,
+ * then calls the appropriate callback for the chunk if it is valid.
+ */
+
+/* Decode the IHDR chunk */
+PNG_EXTERN void png_handle_IHDR PNGARG((png_structp png_ptr, png_infop info_ptr,
+   png_uint_32 length)) PNG_PRIVATE;
+PNG_EXTERN void png_handle_PLTE PNGARG((png_structp png_ptr, png_infop info_ptr,
+   png_uint_32 length));
+PNG_EXTERN void png_handle_IEND PNGARG((png_structp png_ptr, png_infop info_ptr,
+   png_uint_32 length));
+
+#ifdef PNG_READ_bKGD_SUPPORTED
+PNG_EXTERN void png_handle_bKGD PNGARG((png_structp png_ptr, png_infop info_ptr,
+   png_uint_32 length)) PNG_PRIVATE;
+#endif
+
+#ifdef PNG_READ_cHRM_SUPPORTED
+PNG_EXTERN void png_handle_cHRM PNGARG((png_structp png_ptr, png_infop info_ptr,
+   png_uint_32 length)) PNG_PRIVATE;
+#endif
+
+#ifdef PNG_READ_gAMA_SUPPORTED
+PNG_EXTERN void png_handle_gAMA PNGARG((png_structp png_ptr, png_infop info_ptr,
+   png_uint_32 length)) PNG_PRIVATE;
+#endif
+
+#ifdef PNG_READ_hIST_SUPPORTED
+PNG_EXTERN void png_handle_hIST PNGARG((png_structp png_ptr, png_infop info_ptr,
+   png_uint_32 length)) PNG_PRIVATE;
+#endif
+
+#ifdef PNG_READ_iCCP_SUPPORTED
+extern void png_handle_iCCP PNGARG((png_structp png_ptr, png_infop info_ptr,
+   png_uint_32 length));
+#endif /* PNG_READ_iCCP_SUPPORTED */
+
+#ifdef PNG_READ_iTXt_SUPPORTED
+PNG_EXTERN void png_handle_iTXt PNGARG((png_structp png_ptr, png_infop info_ptr,
+   png_uint_32 length)) PNG_PRIVATE;
+#endif
+
+#ifdef PNG_READ_oFFs_SUPPORTED
+PNG_EXTERN void png_handle_oFFs PNGARG((png_structp png_ptr, png_infop info_ptr,
+   png_uint_32 length)) PNG_PRIVATE;
+#endif
+
+#ifdef PNG_READ_pCAL_SUPPORTED
+PNG_EXTERN void png_handle_pCAL PNGARG((png_structp png_ptr, png_infop info_ptr,
+   png_uint_32 length)) PNG_PRIVATE;
+#endif
+
+#ifdef PNG_READ_pHYs_SUPPORTED
+PNG_EXTERN void png_handle_pHYs PNGARG((png_structp png_ptr, png_infop info_ptr,
+   png_uint_32 length)) PNG_PRIVATE;
+#endif
+
+#ifdef PNG_READ_sBIT_SUPPORTED
+PNG_EXTERN void png_handle_sBIT PNGARG((png_structp png_ptr, png_infop info_ptr,
+   png_uint_32 length)) PNG_PRIVATE;
+#endif
+
+#ifdef PNG_READ_sCAL_SUPPORTED
+PNG_EXTERN void png_handle_sCAL PNGARG((png_structp png_ptr, png_infop info_ptr,
+   png_uint_32 length)) PNG_PRIVATE;
+#endif
+
+#ifdef PNG_READ_sPLT_SUPPORTED
+extern void png_handle_sPLT PNGARG((png_structp png_ptr, png_infop info_ptr,
+   png_uint_32 length)) PNG_PRIVATE;
+#endif /* PNG_READ_sPLT_SUPPORTED */
+
+#ifdef PNG_READ_sRGB_SUPPORTED
+PNG_EXTERN void png_handle_sRGB PNGARG((png_structp png_ptr, png_infop info_ptr,
+   png_uint_32 length)) PNG_PRIVATE;
+#endif
+
+#ifdef PNG_READ_tEXt_SUPPORTED
+PNG_EXTERN void png_handle_tEXt PNGARG((png_structp png_ptr, png_infop info_ptr,
+   png_uint_32 length)) PNG_PRIVATE;
+#endif
+
+#ifdef PNG_READ_tIME_SUPPORTED
+PNG_EXTERN void png_handle_tIME PNGARG((png_structp png_ptr, png_infop info_ptr,
+   png_uint_32 length)) PNG_PRIVATE;
+#endif
+
+#ifdef PNG_READ_tRNS_SUPPORTED
+PNG_EXTERN void png_handle_tRNS PNGARG((png_structp png_ptr, png_infop info_ptr,
+   png_uint_32 length)) PNG_PRIVATE;
+#endif
+
+#ifdef PNG_READ_zTXt_SUPPORTED
+PNG_EXTERN void png_handle_zTXt PNGARG((png_structp png_ptr, png_infop info_ptr,
+   png_uint_32 length)) PNG_PRIVATE;
+#endif
+
+PNG_EXTERN void png_handle_unknown PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_uint_32 length)) PNG_PRIVATE;
+
+PNG_EXTERN void png_check_chunk_name PNGARG((png_structp png_ptr,
+   png_bytep chunk_name)) PNG_PRIVATE;
+
+/* Handle the transformations for reading and writing */
+PNG_EXTERN void png_do_read_transformations
+   PNGARG((png_structp png_ptr)) PNG_PRIVATE;
+PNG_EXTERN void png_do_write_transformations
+   PNGARG((png_structp png_ptr)) PNG_PRIVATE;
+
+PNG_EXTERN void png_init_read_transformations
+   PNGARG((png_structp png_ptr)) PNG_PRIVATE;
+
+#ifdef PNG_PROGRESSIVE_READ_SUPPORTED
+PNG_EXTERN void png_push_read_chunk PNGARG((png_structp png_ptr,
+   png_infop info_ptr)) PNG_PRIVATE;
+PNG_EXTERN void png_push_read_sig PNGARG((png_structp png_ptr,
+   png_infop info_ptr)) PNG_PRIVATE;
+PNG_EXTERN void png_push_check_crc PNGARG((png_structp png_ptr)) PNG_PRIVATE;
+PNG_EXTERN void png_push_crc_skip PNGARG((png_structp png_ptr,
+   png_uint_32 length)) PNG_PRIVATE;
+PNG_EXTERN void png_push_crc_finish PNGARG((png_structp png_ptr)) PNG_PRIVATE;
+PNG_EXTERN void png_push_save_buffer PNGARG((png_structp png_ptr)) PNG_PRIVATE;
+PNG_EXTERN void png_push_restore_buffer PNGARG((png_structp png_ptr,
+   png_bytep buffer, png_size_t buffer_length)) PNG_PRIVATE;
+PNG_EXTERN void png_push_read_IDAT PNGARG((png_structp png_ptr)) PNG_PRIVATE;
+PNG_EXTERN void png_process_IDAT_data PNGARG((png_structp png_ptr,
+   png_bytep buffer, png_size_t buffer_length)) PNG_PRIVATE;
+PNG_EXTERN void png_push_process_row PNGARG((png_structp png_ptr)) PNG_PRIVATE;
+PNG_EXTERN void png_push_handle_unknown PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_uint_32 length)) PNG_PRIVATE;
+PNG_EXTERN void png_push_have_info PNGARG((png_structp png_ptr,
+   png_infop info_ptr)) PNG_PRIVATE;
+PNG_EXTERN void png_push_have_end PNGARG((png_structp png_ptr,
+   png_infop info_ptr)) PNG_PRIVATE;
+PNG_EXTERN void png_push_have_row PNGARG((png_structp png_ptr,
+   png_bytep row)) PNG_PRIVATE;
+PNG_EXTERN void png_push_read_end PNGARG((png_structp png_ptr,
+   png_infop info_ptr)) PNG_PRIVATE;
+PNG_EXTERN void png_process_some_data PNGARG((png_structp png_ptr,
+   png_infop info_ptr)) PNG_PRIVATE;
+PNG_EXTERN void png_read_push_finish_row
+   PNGARG((png_structp png_ptr)) PNG_PRIVATE;
+#ifdef PNG_READ_tEXt_SUPPORTED
+PNG_EXTERN void png_push_handle_tEXt PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_uint_32 length)) PNG_PRIVATE;
+PNG_EXTERN void png_push_read_tEXt PNGARG((png_structp png_ptr,
+   png_infop info_ptr)) PNG_PRIVATE;
+#endif
+#ifdef PNG_READ_zTXt_SUPPORTED
+PNG_EXTERN void png_push_handle_zTXt PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_uint_32 length)) PNG_PRIVATE;
+PNG_EXTERN void png_push_read_zTXt PNGARG((png_structp png_ptr,
+   png_infop info_ptr)) PNG_PRIVATE;
+#endif
+#ifdef PNG_READ_iTXt_SUPPORTED
+PNG_EXTERN void png_push_handle_iTXt PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_uint_32 length)) PNG_PRIVATE;
+PNG_EXTERN void png_push_read_iTXt PNGARG((png_structp png_ptr,
+   png_infop info_ptr)) PNG_PRIVATE;
+#endif
+
+#endif /* PNG_PROGRESSIVE_READ_SUPPORTED */
+
+#ifdef PNG_MNG_FEATURES_SUPPORTED
+PNG_EXTERN void png_do_read_intrapixel PNGARG((png_row_infop row_info,
+   png_bytep row)) PNG_PRIVATE;
+PNG_EXTERN void png_do_write_intrapixel PNGARG((png_row_infop row_info,
+   png_bytep row)) PNG_PRIVATE;
+#endif
+
+#ifdef PNG_ASSEMBLER_CODE_SUPPORTED
+#ifdef PNG_MMX_CODE_SUPPORTED
+/* png.c */ /* PRIVATE */
+PNG_EXTERN void png_init_mmx_flags PNGARG((png_structp png_ptr)) PNG_PRIVATE;
+#endif
+#endif
+
+
+/* The following six functions will be exported in libpng-1.4.0. */
+#if defined(PNG_INCH_CONVERSIONS) && defined(PNG_FLOATING_POINT_SUPPORTED)
+PNG_EXTERN png_uint_32 png_get_pixels_per_inch PNGARG((png_structp png_ptr,
+png_infop info_ptr));
+
+PNG_EXTERN png_uint_32 png_get_x_pixels_per_inch PNGARG((png_structp png_ptr,
+png_infop info_ptr));
+
+PNG_EXTERN png_uint_32 png_get_y_pixels_per_inch PNGARG((png_structp png_ptr,
+png_infop info_ptr));
+
+PNG_EXTERN float png_get_x_offset_inches PNGARG((png_structp png_ptr,
+png_infop info_ptr));
+
+PNG_EXTERN float png_get_y_offset_inches PNGARG((png_structp png_ptr,
+png_infop info_ptr));
+
+#ifdef PNG_pHYs_SUPPORTED
+PNG_EXTERN png_uint_32 png_get_pHYs_dpi PNGARG((png_structp png_ptr,
+png_infop info_ptr, png_uint_32 *res_x, png_uint_32 *res_y, int *unit_type));
+#endif /* PNG_pHYs_SUPPORTED */
+#endif  /* PNG_INCH_CONVERSIONS && PNG_FLOATING_POINT_SUPPORTED */
+
+/* Read the chunk header (length + type name) */
+PNG_EXTERN png_uint_32 png_read_chunk_header
+   PNGARG((png_structp png_ptr)) PNG_PRIVATE;
+
+/* Added at libpng version 1.2.34 */
+#ifdef PNG_cHRM_SUPPORTED
+PNG_EXTERN int png_check_cHRM_fixed PNGARG((png_structp png_ptr,
+   png_fixed_point int_white_x, png_fixed_point int_white_y,
+   png_fixed_point int_red_x, png_fixed_point int_red_y, png_fixed_point
+   int_green_x, png_fixed_point int_green_y, png_fixed_point int_blue_x,
+   png_fixed_point int_blue_y)) PNG_PRIVATE;
+#endif
+
+#ifdef PNG_cHRM_SUPPORTED
+#ifdef PNG_CHECK_cHRM_SUPPORTED
+/* Added at libpng version 1.2.34 */
+PNG_EXTERN void png_64bit_product PNGARG((long v1, long v2,
+   unsigned long *hi_product, unsigned long *lo_product)) PNG_PRIVATE;
+#endif
+#endif
+
+/* Added at libpng version 1.2.41 */
+PNG_EXTERN void png_check_IHDR PNGARG((png_structp png_ptr,
+   png_uint_32 width, png_uint_32 height, int bit_depth,
+   int color_type, int interlace_type, int compression_type,
+   int filter_type)) PNG_PRIVATE;
+
+/* Added at libpng version 1.2.41 */
+PNG_EXTERN png_voidp png_calloc PNGARG((png_structp png_ptr,
+   png_uint_32 size));
+
+/* Maintainer: Put new private prototypes here ^ and in libpngpf.3 */
+
+#endif /* PNG_INTERNAL */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* PNG_VERSION_INFO_ONLY */
+/* Do not put anything past this line */
+#endif /* PNG_H */
diff --git a/Externals/libpng/pngconf.h b/Externals/libpng/pngconf.h
index 2633bf890c..bb78fa7d98 100644
--- a/Externals/libpng/pngconf.h
+++ b/Externals/libpng/pngconf.h
@@ -1,632 +1,1665 @@
-
-/* pngconf.h - machine configurable file for libpng
- *
- * libpng version 1.5.1 - February 3, 2011
- *
- * Copyright (c) 1998-2011 Glenn Randers-Pehrson
- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
- *
- * This code is released under the libpng license.
- * For conditions of distribution and use, see the disclaimer
- * and license in png.h
- *
- */
-
-/* Any machine specific code is near the front of this file, so if you
- * are configuring libpng for a machine, you may want to read the section
- * starting here down to where it starts to typedef png_color, png_text,
- * and png_info.
- */
-
-#ifndef PNGCONF_H
-#define PNGCONF_H
-
-/* PNG_NO_LIMITS_H may be used to turn off the use of the standard C
- * definition file for  machine specific limits, this may impact the
- * correctness of the definitons below (see uses of INT_MAX).
- */
-#ifndef PNG_NO_LIMITS_H
-#  include <limits.h>
-#endif
-
-/* For the memory copy APIs (i.e. the standard definitions of these),
- * because this file defines png_memcpy and so on the base APIs must
- * be defined here.
- */
-#ifdef BSD
-#  include <strings.h>
-#else
-#  include <string.h>
-#endif
-
-/* For png_FILE_p - this provides the standard definition of a
- * FILE
- */
-#ifdef PNG_STDIO_SUPPORTED
-#  include <stdio.h>
-#endif
-
-/* This controls optimization of the reading of 16 and 32 bit values
- * from PNG files.  It can be set on a per-app-file basis - it
- * just changes whether a macro is used to the function is called.
- * The library builder sets the default, if read functions are not
- * built into the library the macro implementation is forced on.
- */
-#ifndef PNG_READ_INT_FUNCTIONS_SUPPORTED
-#  define PNG_USE_READ_MACROS
-#endif
-#if !defined(PNG_NO_USE_READ_MACROS) && !defined(PNG_USE_READ_MACROS)
-#  if PNG_DEFAULT_READ_MACROS
-#    define PNG_USE_READ_MACROS
-#  endif
-#endif
-
-/* COMPILER SPECIFIC OPTIONS.
- *
- * These options are provided so that a variety of difficult compilers
- * can be used.  Some are fixed at build time (e.g. PNG_API_RULE
- * below) but still have compiler specific implementations, others
- * may be changed on a per-file basis when compiling against libpng.
- */
-
-/* The PNGARG macro protects us against machines that don't have function
- * prototypes (ie K&R style headers).  If your compiler does not handle
- * function prototypes, define this macro and use the included ansi2knr.
- * I've always been able to use _NO_PROTO as the indicator, but you may
- * need to drag the empty declaration out in front of here, or change the
- * ifdef to suit your own needs.
- */
-#ifndef PNGARG
-
-#  ifdef OF /* zlib prototype munger */
-#    define PNGARG(arglist) OF(arglist)
-#  else
-
-#    ifdef _NO_PROTO
-#      define PNGARG(arglist) ()
-#    else
-#      define PNGARG(arglist) arglist
-#    endif /* _NO_PROTO */
-
-#  endif /* OF */
-
-#endif /* PNGARG */
-
-/* Function calling conventions.
- * =============================
- * Normally it is not necessary to specify to the compiler how to call
- * a function - it just does it - however on x86 systems derived from
- * Microsoft and Borland C compilers ('IBM PC', 'DOS', 'Windows' systems
- * and some others) there are multiple ways to call a function and the
- * default can be changed on the compiler command line.  For this reason
- * libpng specifies the calling convention of every exported function and
- * every function called via a user supplied function pointer.  This is
- * done in this file by defining the following macros:
- *
- * PNGAPI    Calling convention for exported functions.
- * PNGCBAPI  Calling convention for user provided (callback) functions.
- * PNGCAPI   Calling convention used by the ANSI-C library (required
- *           for longjmp callbacks and sometimes used internally to
- *           specify the calling convention for zlib).
- *
- * These macros should never be overridden.  If it is necessary to
- * change calling convention in a private build this can be done
- * by setting PNG_API_RULE (which defaults to 0) to one of the values
- * below to select the correct 'API' variants.
- *
- * PNG_API_RULE=0 Use PNGCAPI - the 'C' calling convention - throughout.
- *                This is correct in every known environment.
- * PNG_API_RULE=1 Use the operating system convention for PNGAPI and
- *                the 'C' calling convention (from PNGCAPI) for
- *                callbacks (PNGCBAPI).  This is no longer required
- *                in any known environment - if it has to be used
- *                please post an explanation of the problem to the
- *                libpng mailing list.
- *
- * These cases only differ if the operating system does not use the C
- * calling convention, at present this just means the above cases
- * (x86 DOS/Windows sytems) and, even then, this does not apply to
- * Cygwin running on those systems.
- *
- * Note that the value must be defined in pnglibconf.h so that what
- * the application uses to call the library matches the conventions
- * set when building the library.
- */
-
-/* Symbol export
- * =============
- * When building a shared library it is almost always necessary to tell
- * the compiler which symbols to export.  The png.h macro 'PNG_EXPORT'
- * is used to mark the symbols.  On some systems these symbols can be
- * extracted at link time and need no special processing by the compiler,
- * on other systems the symbols are flagged by the compiler and just
- * the declaration requires a special tag applied (unfortunately) in a
- * compiler dependent way.  Some systems can do either.
- *
- * A small number of older systems also require a symbol from a DLL to
- * be flagged to the program that calls it.  This is a problem because
- * we do not know in the header file included by application code that
- * the symbol will come from a shared library, as opposed to a statically
- * linked one.  For this reason the application must tell us by setting
- * the magic flag PNG_USE_DLL to turn on the special processing before
- * it includes png.h.
- *
- * Four additional macros are used to make this happen:
- *
- * PNG_IMPEXP The magic (if any) to cause a symbol to be exported from
- *            the build or imported if PNG_USE_DLL is set - compiler
- *            and system specific.
- *
- * PNG_EXPORT_TYPE(type) A macro that pre or appends PNG_IMPEXP to
- *                       'type', compiler specific.
- *
- * PNG_DLL_EXPORT Set to the magic to use during a libpng build to
- *                make a symbol exported from the DLL.
- *
- * PNG_DLL_IMPORT Set to the magic to force the libpng symbols to come
- *                from a DLL - used to define PNG_IMPEXP when
- *                PNG_USE_DLL is set.
- */
-
-/* System specific discovery.
- * ==========================
- * This code is used at build time to find PNG_IMPEXP, the API settings
- * and PNG_EXPORT_TYPE(), it may also set a macro to indicate the DLL
- * import processing is possible.  On Windows/x86 systems it also sets
- * compiler-specific macros to the values required to change the calling
- * conventions of the various functions.
- */
-#if ( defined(_Windows) || defined(_WINDOWS) || defined(WIN32) ||\
-      defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__) ) &&\
-    ( defined(_X86_) || defined(_X64_) || defined(_M_IX86) ||\
-      defined(_M_X64) || defined(_M_IA64) )
-  /* Windows system (DOS doesn't support DLLs) running on x86/x64.  Includes
-   * builds under Cygwin or MinGW.  Also includes Watcom builds but these need
-   * special treatment because they are not compatible with GCC or Visual C
-   * because of different calling conventions.
-   */
-#  if PNG_API_RULE == 2
-    /* If this line results in an error, either because __watcall is not
-     * understood or because of a redefine just below you cannot use *this*
-     * build of the library with the compiler you are using.  *This* build was
-     * build using Watcom and applications must also be built using Watcom!
-     */
-#    define PNGCAPI __watcall
-#  endif
-
-#  if defined(__GNUC__) || (defined (_MSC_VER) && (_MSC_VER >= 800))
-#    define PNGCAPI __cdecl
-#    if PNG_API_RULE == 1
-#      define PNGAPI __stdcall
-#    endif
-#  else
-    /* An older compiler, or one not detected (erroneously) above,
-     * if necessary override on the command line to get the correct
-     * variants for the compiler.
-     */
-#    ifndef PNGCAPI
-#      define PNGCAPI _cdecl
-#    endif
-#    if PNG_API_RULE == 1 && !defined(PNGAPI)
-#      define PNGAPI _stdcall
-#    endif
-#  endif /* compiler/api */
-  /* NOTE: PNGCBAPI always defaults to PNGCAPI. */
-
-#  if defined(PNGAPI) && !defined(PNG_USER_PRIVATEBUILD)
-   ERROR: PNG_USER_PRIVATEBUILD must be defined if PNGAPI is changed
-#  endif
-
-#  if (defined(_MSC_VER) && _MSC_VER < 800) ||\
-      (defined(__BORLANDC__) && __BORLANDC__ < 0x500)
-    /* older Borland and MSC
-     * compilers used '__export' and required this to be after
-     * the type.
-     */
-#    ifndef PNG_EXPORT_TYPE
-#      define PNG_EXPORT_TYPE(type) type PNG_IMPEXP
-#    endif
-#    define PNG_DLL_EXPORT __export
-#  else /* newer compiler */
-#    define PNG_DLL_EXPORT __declspec(dllexport)
-#    ifndef PNG_DLL_IMPORT
-#      define PNG_DLL_IMPORT __declspec(dllimport)
-#    endif
-#  endif /* compiler */
-
-#else /* !Windows/x86 */
-#  if (defined(__IBMC__) || defined(__IBMCPP__)) && defined(__OS2__)
-#    define PNGAPI _System
-#  else /* !Windows/x86 && !OS/2 */
-    /* Use the defaults, or define PNG*API on the command line (but
-     * this will have to be done for every compile!)
-     */
-#  endif /* other system, !OS/2 */
-#endif /* !Windows/x86 */
-
-/* Now do all the defaulting . */
-#ifndef PNGCAPI
-#  define PNGCAPI
-#endif
-#ifndef PNGCBAPI
-#  define PNGCBAPI PNGCAPI
-#endif
-#ifndef PNGAPI
-#  define PNGAPI PNGCAPI
-#endif
-
-/* The default for PNG_IMPEXP depends on whether the library is
- * being built or used.
- */
-#ifndef PNG_IMPEXP
-#  ifdef PNGLIB_BUILD
-    /* Building the library */
-#    if (defined(DLL_EXPORT)/*from libtool*/ ||\
-        defined(_WINDLL) || defined(_DLL) || defined(__DLL__) ||\
-        defined(_USRDLL) ||\
-        defined(PNG_BUILD_DLL)) && defined(PNG_DLL_EXPORT)
-      /* Building a DLL. */
-#      define PNG_IMPEXP PNG_DLL_EXPORT
-#    endif /* DLL */
-#  else
-    /* Using the library */
-#    if defined(PNG_USE_DLL) && defined(PNG_DLL_IMPORT)
-      /* This forces use of a DLL, disallowing static linking */
-#      define PNG_IMPEXP PNG_DLL_IMPORT
-#    endif
-#  endif
-
-#  ifndef PNG_IMPEXP
-#    define PNG_IMPEXP
-#  endif
-#endif
-
-/* THe following complexity is concerned with getting the 'attributes' of the
- * declared function in the correct place.  This potentially requires a separate
- * PNG_EXPORT function for every compiler.
- */
-#ifndef PNG_FUNCTION
-#  ifdef __GNUC__
-#     define PNG_FUNCTION(type, name, args, attributes)\
-         attributes type name args
-#  else /* !GNUC */
-#     ifdef _MSC_VER
-#        define PNG_FUNCTION(type, name, args, attributes)\
-         attributes type name args
-#     else /* !MSC */
-#        define PNG_FUNCTION(type, name, args, attributes)\
-            type name args
-#     endif
-#  endif
-#endif
-
-#ifndef PNG_EXPORT_TYPE
-#  define PNG_EXPORT_TYPE(type) PNG_IMPEXP type
-#endif
-
-   /* The ordinal value is only relevant when preprocessing png.h for symbol
-    * table entries, so we discard it here.  See the .dfn files in the
-    * scripts directory.
-    */
-#ifndef PNG_EXPORTA
-#  define PNG_EXPORTA(ordinal, type, name, args, attributes)\
-      extern PNG_FUNCTION(PNG_EXPORT_TYPE(type),(PNGAPI name),PNGARG(args),\
-         attributes)
-#endif
-
-#define PNG_EXPORT(ordinal, type, name, args)\
-   PNG_EXPORTA(ordinal, type, name, args, )
-
-/* Use PNG_REMOVED to comment out a removed interface. */
-#ifndef PNG_REMOVED
-#  define PNG_REMOVED(ordinal, type, name, args, attributes)
-#endif
-
-#ifndef PNG_CALLBACK
-#  define PNG_CALLBACK(type, name, args, attributes)\
-   type (PNGCBAPI name) PNGARG(args) attributes
-#endif
-
-/* Support for compiler specific function attributes.  These are used
- * so that where compiler support is available incorrect use of API
- * functions in png.h will generate compiler warnings.
- *
- * Added at libpng-1.2.41.
- */
-
-#ifndef PNG_NO_PEDANTIC_WARNINGS
-#  ifndef PNG_PEDANTIC_WARNINGS_SUPPORTED
-#    define PNG_PEDANTIC_WARNINGS_SUPPORTED
-#  endif
-#endif
-
-#ifdef PNG_PEDANTIC_WARNINGS_SUPPORTED
-  /* Support for compiler specific function attributes.  These are used
-   * so that where compiler support is available incorrect use of API
-   * functions in png.h will generate compiler warnings.  Added at libpng
-   * version 1.2.41.
-   */
-#  ifdef __GNUC__
-#    ifndef PNG_USE_RESULT
-#      define PNG_USE_RESULT __attribute__((__warn_unused_result__))
-#    endif
-#    ifndef PNG_NORETURN
-#      define PNG_NORETURN   __attribute__((__noreturn__))
-#    endif
-#    ifndef PNG_PTR_NORETURN
-#      define PNG_PTR_NORETURN   __attribute__((__noreturn__))
-#    endif
-#    ifndef PNG_ALLOCATED
-#      define PNG_ALLOCATED  __attribute__((__malloc__))
-#    endif
-
-    /* This specifically protects structure members that should only be
-     * accessed from within the library, therefore should be empty during
-     * a library build.
-     */
-#    ifndef PNGLIB_BUILD
-#      ifndef PNG_DEPRECATED
-#        define PNG_DEPRECATED __attribute__((__deprecated__))
-#      endif
-#      ifndef PNG_DEPSTRUCT
-#        define PNG_DEPSTRUCT  __attribute__((__deprecated__))
-#      endif
-#      ifndef PNG_PRIVATE
-#        if 0 /* Doesn't work so we use deprecated instead*/
-#          define PNG_PRIVATE \
-            __attribute__((warning("This function is not exported by libpng.")))
-#        else
-#          define PNG_PRIVATE \
-            __attribute__((__deprecated__))
-#        endif
-#      endif /* PNG_PRIVATE */
-#    endif /* PNGLIB_BUILD */
-#  endif /* __GNUC__ */
-#  ifdef _MSC_VER /* may need to check value */
-#    ifndef PNG_USE_RESULT
-#      define PNG_USE_RESULT /*not supported*/
-#    endif
-#    ifndef PNG_NORETURN
-#      define PNG_NORETURN   __declspec(noreturn)
-#    endif
-#    ifndef PNG_PTR_NORETURN
-#      define PNG_PTR_NORETURN /*not supported*/
-#    endif
-#    ifndef PNG_ALLOCATED
-#      define PNG_ALLOCATED __declspec(restrict)
-#    endif
-
-    /* This specifically protects structure members that should only be
-     * accessed from within the library, therefore should be empty during
-     * a library build.
-     */
-#    ifndef PNGLIB_BUILD
-#      ifndef PNG_DEPRECATED
-#        define PNG_DEPRECATED __declspec(deprecated)
-#      endif
-#      ifndef PNG_DEPSTRUCT
-#        define PNG_DEPSTRUCT  __declspec(deprecated)
-#      endif
-#      ifndef PNG_PRIVATE
-#        define PNG_PRIVATE __declspec(deprecated)
-#      endif /* PNG_PRIVATE */
-#    endif /* PNGLIB_BUILD */
-#  endif /* __GNUC__ */
-#endif /* PNG_PEDANTIC_WARNINGS */
-
-#ifndef PNG_DEPRECATED
-#  define PNG_DEPRECATED  /* Use of this function is deprecated */
-#endif
-#ifndef PNG_USE_RESULT
-#  define PNG_USE_RESULT  /* The result of this function must be checked */
-#endif
-#ifndef PNG_NORETURN
-#  define PNG_NORETURN    /* This function does not return */
-#endif
-#ifndef PNG_ALLOCATED
-#  define PNG_ALLOCATED   /* The result of the function is new memory */
-#endif
-#ifndef PNG_DEPSTRUCT
-#  define PNG_DEPSTRUCT   /* Access to this struct member is deprecated */
-#endif
-#ifndef PNG_PRIVATE
-#  define PNG_PRIVATE     /* This is a private libpng function */
-#endif
-#ifndef PNG_FP_EXPORT     /* A floating point API. */
-#  ifdef PNG_FLOATING_POINT_SUPPORTED
-#     define PNG_FP_EXPORT(ordinal, type, name, args)\
-         PNG_EXPORT(ordinal, type, name, args)
-#  else                   /* No floating point APIs */
-#     define PNG_FP_EXPORT(ordinal, type, name, args)
-#  endif
-#endif
-#ifndef PNG_FIXED_EXPORT  /* A fixed point API. */
-#  ifdef PNG_FIXED_POINT_SUPPORTED
-#     define PNG_FIXED_EXPORT(ordinal, type, name, args)\
-         PNG_EXPORT(ordinal, type, name, args)
-#  else                   /* No fixed point APIs */
-#     define PNG_FIXED_EXPORT(ordinal, type, name, args)
-#  endif
-#endif
-
-/* The following uses const char * instead of char * for error
- * and warning message functions, so some compilers won't complain.
- * If you do not want to use const, define PNG_NO_CONST here.
- *
- * This should not change how the APIs are called, so it can be done
- * on a per-file basis in the application.
- */
-#ifndef PNG_CONST
-#  ifndef PNG_NO_CONST
-#    define PNG_CONST const
-#  else
-#    define PNG_CONST
-#  endif
-#endif
-
-/* Some typedefs to get us started.  These should be safe on most of the
- * common platforms.  The typedefs should be at least as large as the
- * numbers suggest (a png_uint_32 must be at least 32 bits long), but they
- * don't have to be exactly that size.  Some compilers dislike passing
- * unsigned shorts as function parameters, so you may be better off using
- * unsigned int for png_uint_16.
- */
-
-#if defined(INT_MAX) && (INT_MAX > 0x7ffffffeL)
-typedef unsigned int png_uint_32;
-typedef int png_int_32;
-#else
-typedef unsigned long png_uint_32;
-typedef long png_int_32;
-#endif
-typedef unsigned short png_uint_16;
-typedef short png_int_16;
-typedef unsigned char png_byte;
-
-#ifdef PNG_NO_SIZE_T
-typedef unsigned int png_size_t;
-#else
-typedef size_t png_size_t;
-#endif
-#define png_sizeof(x) (sizeof (x))
-
-/* The following is needed for medium model support.  It cannot be in the
- * pngpriv.h header.  Needs modification for other compilers besides
- * MSC.  Model independent support declares all arrays and pointers to be
- * large using the far keyword.  The zlib version used must also support
- * model independent data.  As of version zlib 1.0.4, the necessary changes
- * have been made in zlib.  The USE_FAR_KEYWORD define triggers other
- * changes that are needed. (Tim Wegner)
- */
-
-/* Separate compiler dependencies (problem here is that zlib.h always
- * defines FAR. (SJT)
- */
-#ifdef __BORLANDC__
-#  if defined(__LARGE__) || defined(__HUGE__) || defined(__COMPACT__)
-#    define LDATA 1
-#  else
-#    define LDATA 0
-#  endif
-  /* GRR:  why is Cygwin in here?  Cygwin is not Borland C... */
-#  if !defined(__WIN32__) && !defined(__FLAT__) && !defined(__CYGWIN__)
-#    define PNG_MAX_MALLOC_64K /* only used in build */
-#    if (LDATA != 1)
-#      ifndef FAR
-#        define FAR __far
-#      endif
-#      define USE_FAR_KEYWORD
-#    endif   /* LDATA != 1 */
-         /* Possibly useful for moving data out of default segment.
-          * Uncomment it if you want. Could also define FARDATA as
-          * const if your compiler supports it. (SJT)
-#        define FARDATA FAR
-          */
-#  endif  /* __WIN32__, __FLAT__, __CYGWIN__ */
-#endif   /* __BORLANDC__ */
-
-
-/* Suggest testing for specific compiler first before testing for
- * FAR.  The Watcom compiler defines both __MEDIUM__ and M_I86MM,
- * making reliance oncertain keywords suspect. (SJT)
- */
-
-/* MSC Medium model */
-#ifdef FAR
-#  ifdef M_I86MM
-#    define USE_FAR_KEYWORD
-#    define FARDATA FAR
-#    include <dos.h>
-#  endif
-#endif
-
-/* SJT: default case */
-#ifndef FAR
-#  define FAR
-#endif
-
-/* At this point FAR is always defined */
-#ifndef FARDATA
-#  define FARDATA
-#endif
-
-/* Typedef for floating-point numbers that are converted
- * to fixed-point with a multiple of 100,000, e.g., gamma
- */
-typedef png_int_32 png_fixed_point;
-
-/* Add typedefs for pointers */
-typedef void                      FAR * png_voidp;
-typedef PNG_CONST void            FAR * png_const_voidp;
-typedef png_byte                  FAR * png_bytep;
-typedef PNG_CONST png_byte        FAR * png_const_bytep;
-typedef png_uint_32               FAR * png_uint_32p;
-typedef PNG_CONST png_uint_32     FAR * png_const_uint_32p;
-typedef png_int_32                FAR * png_int_32p;
-typedef PNG_CONST png_int_32      FAR * png_const_int_32p;
-typedef png_uint_16               FAR * png_uint_16p;
-typedef PNG_CONST png_uint_16     FAR * png_const_uint_16p;
-typedef png_int_16                FAR * png_int_16p;
-typedef PNG_CONST png_int_16      FAR * png_const_int_16p;
-typedef char                      FAR * png_charp;
-typedef PNG_CONST char            FAR * png_const_charp;
-typedef png_fixed_point           FAR * png_fixed_point_p;
-typedef PNG_CONST png_fixed_point FAR * png_const_fixed_point_p;
-typedef png_size_t                FAR * png_size_tp;
-typedef PNG_CONST png_size_t      FAR * png_const_size_tp;
-
-#ifdef PNG_STDIO_SUPPORTED
-typedef FILE            * png_FILE_p;
-#endif
-
-#ifdef PNG_FLOATING_POINT_SUPPORTED
-typedef double           FAR * png_doublep;
-typedef PNG_CONST double FAR * png_const_doublep;
-#endif
-
-/* Pointers to pointers; i.e. arrays */
-typedef png_byte        FAR * FAR * png_bytepp;
-typedef png_uint_32     FAR * FAR * png_uint_32pp;
-typedef png_int_32      FAR * FAR * png_int_32pp;
-typedef png_uint_16     FAR * FAR * png_uint_16pp;
-typedef png_int_16      FAR * FAR * png_int_16pp;
-typedef PNG_CONST char  FAR * FAR * png_const_charpp;
-typedef char            FAR * FAR * png_charpp;
-typedef png_fixed_point FAR * FAR * png_fixed_point_pp;
-#ifdef PNG_FLOATING_POINT_SUPPORTED
-typedef double          FAR * FAR * png_doublepp;
-#endif
-
-/* Pointers to pointers to pointers; i.e., pointer to array */
-typedef char            FAR * FAR * FAR * png_charppp;
-
-/* png_alloc_size_t is guaranteed to be no smaller than png_size_t,
- * and no smaller than png_uint_32.  Casts from png_size_t or png_uint_32
- * to png_alloc_size_t are not necessary; in fact, it is recommended
- * not to use them at all so that the compiler can complain when something
- * turns out to be problematic.
- * Casts in the other direction (from png_alloc_size_t to png_size_t or
- * png_uint_32) should be explicitly applied; however, we do not expect
- * to encounter practical situations that require such conversions.
- */
-#if defined(__TURBOC__) && !defined(__FLAT__)
-   typedef unsigned long png_alloc_size_t;
-#else
-#  if defined(_MSC_VER) && defined(MAXSEG_64K)
-     typedef unsigned long    png_alloc_size_t;
-#  else
-     /* This is an attempt to detect an old Windows system where (int) is
-      * actually 16 bits, in that case png_malloc must have an argument with a
-      * bigger size to accomodate the requirements of the library.
-      */
-#    if (defined(_Windows) || defined(_WINDOWS) || defined(_WINDOWS_)) && \
-        (!defined(INT_MAX) || INT_MAX <= 0x7ffffffeL)
-       typedef DWORD         png_alloc_size_t;
-#    else
-       typedef png_size_t    png_alloc_size_t;
-#    endif
-#  endif
-#endif
-
-#endif /* PNGCONF_H */
+
+/* pngconf.h - machine configurable file for libpng
+ *
+ * libpng version 1.2.50 - July 10, 2012
+ * Copyright (c) 1998-2012 Glenn Randers-Pehrson
+ * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
+ * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
+ *
+ * This code is released under the libpng license.
+ * For conditions of distribution and use, see the disclaimer
+ * and license in png.h
+ */
+
+/* Any machine specific code is near the front of this file, so if you
+ * are configuring libpng for a machine, you may want to read the section
+ * starting here down to where it starts to typedef png_color, png_text,
+ * and png_info.
+ */
+
+#ifndef PNGCONF_H
+#define PNGCONF_H
+
+#define PNG_1_2_X
+
+/*
+ * PNG_USER_CONFIG has to be defined on the compiler command line. This
+ * includes the resource compiler for Windows DLL configurations.
+ */
+#ifdef PNG_USER_CONFIG
+#  ifndef PNG_USER_PRIVATEBUILD
+#    define PNG_USER_PRIVATEBUILD
+#  endif
+#include "pngusr.h"
+#endif
+
+/* PNG_CONFIGURE_LIBPNG is set by the "configure" script. */
+#ifdef PNG_CONFIGURE_LIBPNG
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+#endif
+
+/*
+ * Added at libpng-1.2.8
+ *
+ * If you create a private DLL you need to define in "pngusr.h" the followings:
+ * #define PNG_USER_PRIVATEBUILD <Describes by whom and why this version of
+ *        the DLL was built>
+ *  e.g. #define PNG_USER_PRIVATEBUILD "Build by MyCompany for xyz reasons."
+ * #define PNG_USER_DLLFNAME_POSTFIX <two-letter postfix that serve to
+ *        distinguish your DLL from those of the official release. These
+ *        correspond to the trailing letters that come after the version
+ *        number and must match your private DLL name>
+ *  e.g. // private DLL "libpng13gx.dll"
+ *       #define PNG_USER_DLLFNAME_POSTFIX "gx"
+ *
+ * The following macros are also at your disposal if you want to complete the
+ * DLL VERSIONINFO structure.
+ * - PNG_USER_VERSIONINFO_COMMENTS
+ * - PNG_USER_VERSIONINFO_COMPANYNAME
+ * - PNG_USER_VERSIONINFO_LEGALTRADEMARKS
+ */
+
+#ifdef __STDC__
+#ifdef SPECIALBUILD
+#  pragma message("PNG_LIBPNG_SPECIALBUILD (and deprecated SPECIALBUILD)\
+ are now LIBPNG reserved macros. Use PNG_USER_PRIVATEBUILD instead.")
+#endif
+
+#ifdef PRIVATEBUILD
+# pragma message("PRIVATEBUILD is deprecated.\
+ Use PNG_USER_PRIVATEBUILD instead.")
+# define PNG_USER_PRIVATEBUILD PRIVATEBUILD
+#endif
+#endif /* __STDC__ */
+
+#ifndef PNG_VERSION_INFO_ONLY
+
+/* End of material added to libpng-1.2.8 */
+
+/* Added at libpng-1.2.19, removed at libpng-1.2.20 because it caused trouble
+   Restored at libpng-1.2.21 */
+#if !defined(PNG_NO_WARN_UNINITIALIZED_ROW) && \
+    !defined(PNG_WARN_UNINITIALIZED_ROW)
+#  define PNG_WARN_UNINITIALIZED_ROW 1
+#endif
+/* End of material added at libpng-1.2.19/1.2.21 */
+
+/* This is the size of the compression buffer, and thus the size of
+ * an IDAT chunk.  Make this whatever size you feel is best for your
+ * machine.  One of these will be allocated per png_struct.  When this
+ * is full, it writes the data to the disk, and does some other
+ * calculations.  Making this an extremely small size will slow
+ * the library down, but you may want to experiment to determine
+ * where it becomes significant, if you are concerned with memory
+ * usage.  Note that zlib allocates at least 32Kb also.  For readers,
+ * this describes the size of the buffer available to read the data in.
+ * Unless this gets smaller than the size of a row (compressed),
+ * it should not make much difference how big this is.
+ */
+
+#ifndef PNG_ZBUF_SIZE
+#  define PNG_ZBUF_SIZE 8192
+#endif
+
+/* Enable if you want a write-only libpng */
+
+#ifndef PNG_NO_READ_SUPPORTED
+#  define PNG_READ_SUPPORTED
+#endif
+
+/* Enable if you want a read-only libpng */
+
+#ifndef PNG_NO_WRITE_SUPPORTED
+#  define PNG_WRITE_SUPPORTED
+#endif
+
+/* Enabled in 1.2.41. */
+#ifdef PNG_ALLOW_BENIGN_ERRORS
+#  define png_benign_error png_warning
+#  define png_chunk_benign_error png_chunk_warning
+#else
+#  ifndef PNG_BENIGN_ERRORS_SUPPORTED
+#    define png_benign_error png_error
+#    define png_chunk_benign_error png_chunk_error
+#  endif
+#endif
+
+/* Added in libpng-1.2.41 */
+#if !defined(PNG_NO_WARNINGS) && !defined(PNG_WARNINGS_SUPPORTED)
+#  define PNG_WARNINGS_SUPPORTED
+#endif
+
+#if !defined(PNG_NO_ERROR_TEXT) && !defined(PNG_ERROR_TEXT_SUPPORTED)
+#  define PNG_ERROR_TEXT_SUPPORTED
+#endif
+
+#if !defined(PNG_NO_CHECK_cHRM) && !defined(PNG_CHECK_cHRM_SUPPORTED)
+#  define PNG_CHECK_cHRM_SUPPORTED
+#endif
+
+/* Enabled by default in 1.2.0.  You can disable this if you don't need to
+ * support PNGs that are embedded in MNG datastreams
+ */
+#if !defined(PNG_1_0_X) && !defined(PNG_NO_MNG_FEATURES)
+#  ifndef PNG_MNG_FEATURES_SUPPORTED
+#    define PNG_MNG_FEATURES_SUPPORTED
+#  endif
+#endif
+
+#ifndef PNG_NO_FLOATING_POINT_SUPPORTED
+#  ifndef PNG_FLOATING_POINT_SUPPORTED
+#    define PNG_FLOATING_POINT_SUPPORTED
+#  endif
+#endif
+
+/* If you are running on a machine where you cannot allocate more
+ * than 64K of memory at once, uncomment this.  While libpng will not
+ * normally need that much memory in a chunk (unless you load up a very
+ * large file), zlib needs to know how big of a chunk it can use, and
+ * libpng thus makes sure to check any memory allocation to verify it
+ * will fit into memory.
+#define PNG_MAX_MALLOC_64K
+ */
+#if defined(MAXSEG_64K) && !defined(PNG_MAX_MALLOC_64K)
+#  define PNG_MAX_MALLOC_64K
+#endif
+
+/* Special munging to support doing things the 'cygwin' way:
+ * 'Normal' png-on-win32 defines/defaults:
+ *   PNG_BUILD_DLL -- building dll
+ *   PNG_USE_DLL   -- building an application, linking to dll
+ *   (no define)   -- building static library, or building an
+ *                    application and linking to the static lib
+ * 'Cygwin' defines/defaults:
+ *   PNG_BUILD_DLL -- (ignored) building the dll
+ *   (no define)   -- (ignored) building an application, linking to the dll
+ *   PNG_STATIC    -- (ignored) building the static lib, or building an
+ *                    application that links to the static lib.
+ *   ALL_STATIC    -- (ignored) building various static libs, or building an
+ *                    application that links to the static libs.
+ * Thus,
+ * a cygwin user should define either PNG_BUILD_DLL or PNG_STATIC, and
+ * this bit of #ifdefs will define the 'correct' config variables based on
+ * that. If a cygwin user *wants* to define 'PNG_USE_DLL' that's okay, but
+ * unnecessary.
+ *
+ * Also, the precedence order is:
+ *   ALL_STATIC (since we can't #undef something outside our namespace)
+ *   PNG_BUILD_DLL
+ *   PNG_STATIC
+ *   (nothing) == PNG_USE_DLL
+ *
+ * CYGWIN (2002-01-20): The preceding is now obsolete. With the advent
+ *   of auto-import in binutils, we no longer need to worry about
+ *   __declspec(dllexport) / __declspec(dllimport) and friends.  Therefore,
+ *   we don't need to worry about PNG_STATIC or ALL_STATIC when it comes
+ *   to __declspec() stuff.  However, we DO need to worry about
+ *   PNG_BUILD_DLL and PNG_STATIC because those change some defaults
+ *   such as CONSOLE_IO and whether GLOBAL_ARRAYS are allowed.
+ */
+#ifdef __CYGWIN__
+#  ifdef ALL_STATIC
+#    ifdef PNG_BUILD_DLL
+#      undef PNG_BUILD_DLL
+#    endif
+#    ifdef PNG_USE_DLL
+#      undef PNG_USE_DLL
+#    endif
+#    ifdef PNG_DLL
+#      undef PNG_DLL
+#    endif
+#    ifndef PNG_STATIC
+#      define PNG_STATIC
+#    endif
+#  else
+#    ifdef PNG_BUILD_DLL
+#      ifdef PNG_STATIC
+#        undef PNG_STATIC
+#      endif
+#      ifdef PNG_USE_DLL
+#        undef PNG_USE_DLL
+#      endif
+#      ifndef PNG_DLL
+#        define PNG_DLL
+#      endif
+#    else
+#      ifdef PNG_STATIC
+#        ifdef PNG_USE_DLL
+#          undef PNG_USE_DLL
+#        endif
+#        ifdef PNG_DLL
+#          undef PNG_DLL
+#        endif
+#      else
+#        ifndef PNG_USE_DLL
+#          define PNG_USE_DLL
+#        endif
+#        ifndef PNG_DLL
+#          define PNG_DLL
+#        endif
+#      endif
+#    endif
+#  endif
+#endif
+
+/* This protects us against compilers that run on a windowing system
+ * and thus don't have or would rather us not use the stdio types:
+ * stdin, stdout, and stderr.  The only one currently used is stderr
+ * in png_error() and png_warning().  #defining PNG_NO_CONSOLE_IO will
+ * prevent these from being compiled and used. #defining PNG_NO_STDIO
+ * will also prevent these, plus will prevent the entire set of stdio
+ * macros and functions (FILE *, printf, etc.) from being compiled and used,
+ * unless (PNG_DEBUG > 0) has been #defined.
+ *
+ * #define PNG_NO_CONSOLE_IO
+ * #define PNG_NO_STDIO
+ */
+
+#if !defined(PNG_NO_STDIO) && !defined(PNG_STDIO_SUPPORTED)
+#  define PNG_STDIO_SUPPORTED
+#endif
+
+#ifdef _WIN32_WCE
+#  include <windows.h>
+   /* Console I/O functions are not supported on WindowsCE */
+#  define PNG_NO_CONSOLE_IO
+   /* abort() may not be supported on some/all Windows CE platforms */
+#  define PNG_ABORT() exit(-1)
+#  ifdef PNG_DEBUG
+#    undef PNG_DEBUG
+#  endif
+#endif
+
+#ifdef PNG_BUILD_DLL
+#  ifndef PNG_CONSOLE_IO_SUPPORTED
+#    ifndef PNG_NO_CONSOLE_IO
+#      define PNG_NO_CONSOLE_IO
+#    endif
+#  endif
+#endif
+
+#  ifdef PNG_NO_STDIO
+#    ifndef PNG_NO_CONSOLE_IO
+#      define PNG_NO_CONSOLE_IO
+#    endif
+#    ifdef PNG_DEBUG
+#      if (PNG_DEBUG > 0)
+#        include <stdio.h>
+#      endif
+#    endif
+#  else
+#    ifndef _WIN32_WCE
+/* "stdio.h" functions are not supported on WindowsCE */
+#      include <stdio.h>
+#    endif
+#  endif
+
+#if !(defined PNG_NO_CONSOLE_IO) && !defined(PNG_CONSOLE_IO_SUPPORTED)
+#  define PNG_CONSOLE_IO_SUPPORTED
+#endif
+
+/* This macro protects us against machines that don't have function
+ * prototypes (ie K&R style headers).  If your compiler does not handle
+ * function prototypes, define this macro and use the included ansi2knr.
+ * I've always been able to use _NO_PROTO as the indicator, but you may
+ * need to drag the empty declaration out in front of here, or change the
+ * ifdef to suit your own needs.
+ */
+#ifndef PNGARG
+
+#ifdef OF /* zlib prototype munger */
+#  define PNGARG(arglist) OF(arglist)
+#else
+
+#ifdef _NO_PROTO
+#  define PNGARG(arglist) ()
+#  ifndef PNG_TYPECAST_NULL
+#     define PNG_TYPECAST_NULL
+#  endif
+#else
+#  define PNGARG(arglist) arglist
+#endif /* _NO_PROTO */
+
+
+#endif /* OF */
+
+#endif /* PNGARG */
+
+/* Try to determine if we are compiling on a Mac.  Note that testing for
+ * just __MWERKS__ is not good enough, because the Codewarrior is now used
+ * on non-Mac platforms.
+ */
+#ifndef MACOS
+#  if (defined(__MWERKS__) && defined(macintosh)) || defined(applec) || \
+      defined(THINK_C) || defined(__SC__) || defined(TARGET_OS_MAC)
+#    define MACOS
+#  endif
+#endif
+
+/* enough people need this for various reasons to include it here */
+#if !defined(MACOS) && !defined(RISCOS) && !defined(_WIN32_WCE)
+#  include <sys/types.h>
+#endif
+
+#if !defined(PNG_SETJMP_NOT_SUPPORTED) && !defined(PNG_NO_SETJMP_SUPPORTED)
+#  define PNG_SETJMP_SUPPORTED
+#endif
+
+#ifdef PNG_SETJMP_SUPPORTED
+/* This is an attempt to force a single setjmp behaviour on Linux.  If
+ * the X config stuff didn't define _BSD_SOURCE we wouldn't need this.
+ *
+ * You can bypass this test if you know that your application uses exactly
+ * the same setjmp.h that was included when libpng was built.  Only define
+ * PNG_SKIP_SETJMP_CHECK while building your application, prior to the
+ * application's '#include "png.h"'. Don't define PNG_SKIP_SETJMP_CHECK
+ * while building a separate libpng library for general use.
+ */
+
+#  ifndef PNG_SKIP_SETJMP_CHECK
+#    ifdef __linux__
+#      ifdef _BSD_SOURCE
+#        define PNG_SAVE_BSD_SOURCE
+#        undef _BSD_SOURCE
+#      endif
+#      ifdef _SETJMP_H
+       /* If you encounter a compiler error here, see the explanation
+        * near the end of INSTALL.
+        */
+           __pngconf.h__ in libpng already includes setjmp.h;
+           __dont__ include it again.;
+#      endif
+#    endif /* __linux__ */
+#  endif /* PNG_SKIP_SETJMP_CHECK */
+
+   /* include setjmp.h for error handling */
+#  include <setjmp.h>
+
+#  ifdef __linux__
+#    ifdef PNG_SAVE_BSD_SOURCE
+#      ifndef _BSD_SOURCE
+#        define _BSD_SOURCE
+#      endif
+#      undef PNG_SAVE_BSD_SOURCE
+#    endif
+#  endif /* __linux__ */
+#endif /* PNG_SETJMP_SUPPORTED */
+
+#ifdef BSD
+#  include <strings.h>
+#else
+#  include <string.h>
+#endif
+
+/* Other defines for things like memory and the like can go here.  */
+#ifdef PNG_INTERNAL
+
+#include <stdlib.h>
+
+/* The functions exported by PNG_EXTERN are PNG_INTERNAL functions, which
+ * aren't usually used outside the library (as far as I know), so it is
+ * debatable if they should be exported at all.  In the future, when it is
+ * possible to have run-time registry of chunk-handling functions, some of
+ * these will be made available again.
+#define PNG_EXTERN extern
+ */
+#define PNG_EXTERN
+
+/* Other defines specific to compilers can go here.  Try to keep
+ * them inside an appropriate ifdef/endif pair for portability.
+ */
+
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+#  ifdef MACOS
+     /* We need to check that <math.h> hasn't already been included earlier
+      * as it seems it doesn't agree with <fp.h>, yet we should really use
+      * <fp.h> if possible.
+      */
+#    if !defined(__MATH_H__) && !defined(__MATH_H) && !defined(__cmath__)
+#      include <fp.h>
+#    endif
+#  else
+#    include <math.h>
+#  endif
+#  if defined(_AMIGA) && defined(__SASC) && defined(_M68881)
+     /* Amiga SAS/C: We must include builtin FPU functions when compiling using
+      * MATH=68881
+      */
+#    include <m68881.h>
+#  endif
+#endif
+
+/* Codewarrior on NT has linking problems without this. */
+#if (defined(__MWERKS__) && defined(WIN32)) || defined(__STDC__)
+#  define PNG_ALWAYS_EXTERN
+#endif
+
+/* This provides the non-ANSI (far) memory allocation routines. */
+#if defined(__TURBOC__) && defined(__MSDOS__)
+#  include <mem.h>
+#  include <alloc.h>
+#endif
+
+/* I have no idea why is this necessary... */
+#if defined(_MSC_VER) && (defined(WIN32) || defined(_Windows) || \
+    defined(_WINDOWS) || defined(_WIN32) || defined(__WIN32__))
+#  include <malloc.h>
+#endif
+
+/* This controls how fine the dithering gets.  As this allocates
+ * a largish chunk of memory (32K), those who are not as concerned
+ * with dithering quality can decrease some or all of these.
+ */
+#ifndef PNG_DITHER_RED_BITS
+#  define PNG_DITHER_RED_BITS 5
+#endif
+#ifndef PNG_DITHER_GREEN_BITS
+#  define PNG_DITHER_GREEN_BITS 5
+#endif
+#ifndef PNG_DITHER_BLUE_BITS
+#  define PNG_DITHER_BLUE_BITS 5
+#endif
+
+/* This controls how fine the gamma correction becomes when you
+ * are only interested in 8 bits anyway.  Increasing this value
+ * results in more memory being used, and more pow() functions
+ * being called to fill in the gamma tables.  Don't set this value
+ * less then 8, and even that may not work (I haven't tested it).
+ */
+
+#ifndef PNG_MAX_GAMMA_8
+#  define PNG_MAX_GAMMA_8 11
+#endif
+
+/* This controls how much a difference in gamma we can tolerate before
+ * we actually start doing gamma conversion.
+ */
+#ifndef PNG_GAMMA_THRESHOLD
+#  define PNG_GAMMA_THRESHOLD 0.05
+#endif
+
+#endif /* PNG_INTERNAL */
+
+/* The following uses const char * instead of char * for error
+ * and warning message functions, so some compilers won't complain.
+ * If you do not want to use const, define PNG_NO_CONST here.
+ */
+
+#ifndef PNG_NO_CONST
+#  define PNG_CONST const
+#else
+#  define PNG_CONST
+#endif
+
+/* The following defines give you the ability to remove code from the
+ * library that you will not be using.  I wish I could figure out how to
+ * automate this, but I can't do that without making it seriously hard
+ * on the users.  So if you are not using an ability, change the #define
+ * to and #undef, and that part of the library will not be compiled.  If
+ * your linker can't find a function, you may want to make sure the
+ * ability is defined here.  Some of these depend upon some others being
+ * defined.  I haven't figured out all the interactions here, so you may
+ * have to experiment awhile to get everything to compile.  If you are
+ * creating or using a shared library, you probably shouldn't touch this,
+ * as it will affect the size of the structures, and this will cause bad
+ * things to happen if the library and/or application ever change.
+ */
+
+/* Any features you will not be using can be undef'ed here */
+
+/* GR-P, 0.96a: Set "*TRANSFORMS_SUPPORTED as default but allow user
+ * to turn it off with "*TRANSFORMS_NOT_SUPPORTED" or *PNG_NO_*_TRANSFORMS
+ * on the compile line, then pick and choose which ones to define without
+ * having to edit this file. It is safe to use the *TRANSFORMS_NOT_SUPPORTED
+ * if you only want to have a png-compliant reader/writer but don't need
+ * any of the extra transformations.  This saves about 80 kbytes in a
+ * typical installation of the library. (PNG_NO_* form added in version
+ * 1.0.1c, for consistency)
+ */
+
+/* The size of the png_text structure changed in libpng-1.0.6 when
+ * iTXt support was added.  iTXt support was turned off by default through
+ * libpng-1.2.x, to support old apps that malloc the png_text structure
+ * instead of calling png_set_text() and letting libpng malloc it.  It
+ * will be turned on by default in libpng-1.4.0.
+ */
+
+#if defined(PNG_1_0_X) || defined (PNG_1_2_X)
+#  ifndef PNG_NO_iTXt_SUPPORTED
+#    define PNG_NO_iTXt_SUPPORTED
+#  endif
+#  ifndef PNG_NO_READ_iTXt
+#    define PNG_NO_READ_iTXt
+#  endif
+#  ifndef PNG_NO_WRITE_iTXt
+#    define PNG_NO_WRITE_iTXt
+#  endif
+#endif
+
+#if !defined(PNG_NO_iTXt_SUPPORTED)
+#  if !defined(PNG_READ_iTXt_SUPPORTED) && !defined(PNG_NO_READ_iTXt)
+#    define PNG_READ_iTXt
+#  endif
+#  if !defined(PNG_WRITE_iTXt_SUPPORTED) && !defined(PNG_NO_WRITE_iTXt)
+#    define PNG_WRITE_iTXt
+#  endif
+#endif
+
+/* The following support, added after version 1.0.0, can be turned off here en
+ * masse by defining PNG_LEGACY_SUPPORTED in case you need binary compatibility
+ * with old applications that require the length of png_struct and png_info
+ * to remain unchanged.
+ */
+
+#ifdef PNG_LEGACY_SUPPORTED
+#  define PNG_NO_FREE_ME
+#  define PNG_NO_READ_UNKNOWN_CHUNKS
+#  define PNG_NO_WRITE_UNKNOWN_CHUNKS
+#  define PNG_NO_HANDLE_AS_UNKNOWN
+#  define PNG_NO_READ_USER_CHUNKS
+#  define PNG_NO_READ_iCCP
+#  define PNG_NO_WRITE_iCCP
+#  define PNG_NO_READ_iTXt
+#  define PNG_NO_WRITE_iTXt
+#  define PNG_NO_READ_sCAL
+#  define PNG_NO_WRITE_sCAL
+#  define PNG_NO_READ_sPLT
+#  define PNG_NO_WRITE_sPLT
+#  define PNG_NO_INFO_IMAGE
+#  define PNG_NO_READ_RGB_TO_GRAY
+#  define PNG_NO_READ_USER_TRANSFORM
+#  define PNG_NO_WRITE_USER_TRANSFORM
+#  define PNG_NO_USER_MEM
+#  define PNG_NO_READ_EMPTY_PLTE
+#  define PNG_NO_MNG_FEATURES
+#  define PNG_NO_FIXED_POINT_SUPPORTED
+#endif
+
+/* Ignore attempt to turn off both floating and fixed point support */
+#if !defined(PNG_FLOATING_POINT_SUPPORTED) || \
+    !defined(PNG_NO_FIXED_POINT_SUPPORTED)
+#  define PNG_FIXED_POINT_SUPPORTED
+#endif
+
+#ifndef PNG_NO_FREE_ME
+#  define PNG_FREE_ME_SUPPORTED
+#endif
+
+#ifdef PNG_READ_SUPPORTED
+
+#if !defined(PNG_READ_TRANSFORMS_NOT_SUPPORTED) && \
+      !defined(PNG_NO_READ_TRANSFORMS)
+#  define PNG_READ_TRANSFORMS_SUPPORTED
+#endif
+
+#ifdef PNG_READ_TRANSFORMS_SUPPORTED
+#  ifndef PNG_NO_READ_EXPAND
+#    define PNG_READ_EXPAND_SUPPORTED
+#  endif
+#  ifndef PNG_NO_READ_SHIFT
+#    define PNG_READ_SHIFT_SUPPORTED
+#  endif
+#  ifndef PNG_NO_READ_PACK
+#    define PNG_READ_PACK_SUPPORTED
+#  endif
+#  ifndef PNG_NO_READ_BGR
+#    define PNG_READ_BGR_SUPPORTED
+#  endif
+#  ifndef PNG_NO_READ_SWAP
+#    define PNG_READ_SWAP_SUPPORTED
+#  endif
+#  ifndef PNG_NO_READ_PACKSWAP
+#    define PNG_READ_PACKSWAP_SUPPORTED
+#  endif
+#  ifndef PNG_NO_READ_INVERT
+#    define PNG_READ_INVERT_SUPPORTED
+#  endif
+#  ifndef PNG_NO_READ_DITHER
+#    define PNG_READ_DITHER_SUPPORTED
+#  endif
+#  ifndef PNG_NO_READ_BACKGROUND
+#    define PNG_READ_BACKGROUND_SUPPORTED
+#  endif
+#  ifndef PNG_NO_READ_16_TO_8
+#    define PNG_READ_16_TO_8_SUPPORTED
+#  endif
+#  ifndef PNG_NO_READ_FILLER
+#    define PNG_READ_FILLER_SUPPORTED
+#  endif
+#  ifndef PNG_NO_READ_GAMMA
+#    define PNG_READ_GAMMA_SUPPORTED
+#  endif
+#  ifndef PNG_NO_READ_GRAY_TO_RGB
+#    define PNG_READ_GRAY_TO_RGB_SUPPORTED
+#  endif
+#  ifndef PNG_NO_READ_SWAP_ALPHA
+#    define PNG_READ_SWAP_ALPHA_SUPPORTED
+#  endif
+#  ifndef PNG_NO_READ_INVERT_ALPHA
+#    define PNG_READ_INVERT_ALPHA_SUPPORTED
+#  endif
+#  ifndef PNG_NO_READ_STRIP_ALPHA
+#    define PNG_READ_STRIP_ALPHA_SUPPORTED
+#  endif
+#  ifndef PNG_NO_READ_USER_TRANSFORM
+#    define PNG_READ_USER_TRANSFORM_SUPPORTED
+#  endif
+#  ifndef PNG_NO_READ_RGB_TO_GRAY
+#    define PNG_READ_RGB_TO_GRAY_SUPPORTED
+#  endif
+#endif /* PNG_READ_TRANSFORMS_SUPPORTED */
+
+/* PNG_PROGRESSIVE_READ_NOT_SUPPORTED is deprecated. */
+#if !defined(PNG_NO_PROGRESSIVE_READ) && \
+ !defined(PNG_PROGRESSIVE_READ_NOT_SUPPORTED)  /* if you don't do progressive */
+#  define PNG_PROGRESSIVE_READ_SUPPORTED     /* reading.  This is not talking */
+#endif                               /* about interlacing capability!  You'll */
+            /* still have interlacing unless you change the following define: */
+#define PNG_READ_INTERLACING_SUPPORTED /* required for PNG-compliant decoders */
+
+/* PNG_NO_SEQUENTIAL_READ_SUPPORTED is deprecated. */
+#if !defined(PNG_NO_SEQUENTIAL_READ) && \
+    !defined(PNG_SEQUENTIAL_READ_SUPPORTED) && \
+    !defined(PNG_NO_SEQUENTIAL_READ_SUPPORTED)
+#  define PNG_SEQUENTIAL_READ_SUPPORTED
+#endif
+
+#define PNG_READ_INTERLACING_SUPPORTED /* required in PNG-compliant decoders */
+
+#ifndef PNG_NO_READ_COMPOSITE_NODIV
+#  ifndef PNG_NO_READ_COMPOSITED_NODIV  /* libpng-1.0.x misspelling */
+#    define PNG_READ_COMPOSITE_NODIV_SUPPORTED  /* well tested on Intel, SGI */
+#  endif
+#endif
+
+#if defined(PNG_1_0_X) || defined (PNG_1_2_X)
+/* Deprecated, will be removed from version 2.0.0.
+   Use PNG_MNG_FEATURES_SUPPORTED instead. */
+#ifndef PNG_NO_READ_EMPTY_PLTE
+#  define PNG_READ_EMPTY_PLTE_SUPPORTED
+#endif
+#endif
+
+#endif /* PNG_READ_SUPPORTED */
+
+#ifdef PNG_WRITE_SUPPORTED
+
+# if !defined(PNG_WRITE_TRANSFORMS_NOT_SUPPORTED) && \
+    !defined(PNG_NO_WRITE_TRANSFORMS)
+#  define PNG_WRITE_TRANSFORMS_SUPPORTED
+#endif
+
+#ifdef PNG_WRITE_TRANSFORMS_SUPPORTED
+#  ifndef PNG_NO_WRITE_SHIFT
+#    define PNG_WRITE_SHIFT_SUPPORTED
+#  endif
+#  ifndef PNG_NO_WRITE_PACK
+#    define PNG_WRITE_PACK_SUPPORTED
+#  endif
+#  ifndef PNG_NO_WRITE_BGR
+#    define PNG_WRITE_BGR_SUPPORTED
+#  endif
+#  ifndef PNG_NO_WRITE_SWAP
+#    define PNG_WRITE_SWAP_SUPPORTED
+#  endif
+#  ifndef PNG_NO_WRITE_PACKSWAP
+#    define PNG_WRITE_PACKSWAP_SUPPORTED
+#  endif
+#  ifndef PNG_NO_WRITE_INVERT
+#    define PNG_WRITE_INVERT_SUPPORTED
+#  endif
+#  ifndef PNG_NO_WRITE_FILLER
+#    define PNG_WRITE_FILLER_SUPPORTED   /* same as WRITE_STRIP_ALPHA */
+#  endif
+#  ifndef PNG_NO_WRITE_SWAP_ALPHA
+#    define PNG_WRITE_SWAP_ALPHA_SUPPORTED
+#  endif
+#ifndef PNG_1_0_X
+#  ifndef PNG_NO_WRITE_INVERT_ALPHA
+#    define PNG_WRITE_INVERT_ALPHA_SUPPORTED
+#  endif
+#endif
+#  ifndef PNG_NO_WRITE_USER_TRANSFORM
+#    define PNG_WRITE_USER_TRANSFORM_SUPPORTED
+#  endif
+#endif /* PNG_WRITE_TRANSFORMS_SUPPORTED */
+
+#if !defined(PNG_NO_WRITE_INTERLACING_SUPPORTED) && \
+    !defined(PNG_WRITE_INTERLACING_SUPPORTED)
+#define PNG_WRITE_INTERLACING_SUPPORTED  /* not required for PNG-compliant
+                                            encoders, but can cause trouble
+                                            if left undefined */
+#endif
+
+#if !defined(PNG_NO_WRITE_WEIGHTED_FILTER) && \
+    !defined(PNG_WRITE_WEIGHTED_FILTER) && \
+     defined(PNG_FLOATING_POINT_SUPPORTED)
+#  define PNG_WRITE_WEIGHTED_FILTER_SUPPORTED
+#endif
+
+#ifndef PNG_NO_WRITE_FLUSH
+#  define PNG_WRITE_FLUSH_SUPPORTED
+#endif
+
+#if defined(PNG_1_0_X) || defined (PNG_1_2_X)
+/* Deprecated, see PNG_MNG_FEATURES_SUPPORTED, above */
+#ifndef PNG_NO_WRITE_EMPTY_PLTE
+#  define PNG_WRITE_EMPTY_PLTE_SUPPORTED
+#endif
+#endif
+
+#endif /* PNG_WRITE_SUPPORTED */
+
+#ifndef PNG_1_0_X
+#  ifndef PNG_NO_ERROR_NUMBERS
+#    define PNG_ERROR_NUMBERS_SUPPORTED
+#  endif
+#endif /* PNG_1_0_X */
+
+#if defined(PNG_READ_USER_TRANSFORM_SUPPORTED) || \
+    defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED)
+#  ifndef PNG_NO_USER_TRANSFORM_PTR
+#    define PNG_USER_TRANSFORM_PTR_SUPPORTED
+#  endif
+#endif
+
+#ifndef PNG_NO_STDIO
+#  define PNG_TIME_RFC1123_SUPPORTED
+#endif
+
+/* This adds extra functions in pngget.c for accessing data from the
+ * info pointer (added in version 0.99)
+ * png_get_image_width()
+ * png_get_image_height()
+ * png_get_bit_depth()
+ * png_get_color_type()
+ * png_get_compression_type()
+ * png_get_filter_type()
+ * png_get_interlace_type()
+ * png_get_pixel_aspect_ratio()
+ * png_get_pixels_per_meter()
+ * png_get_x_offset_pixels()
+ * png_get_y_offset_pixels()
+ * png_get_x_offset_microns()
+ * png_get_y_offset_microns()
+ */
+#if !defined(PNG_NO_EASY_ACCESS) && !defined(PNG_EASY_ACCESS_SUPPORTED)
+#  define PNG_EASY_ACCESS_SUPPORTED
+#endif
+
+/* PNG_ASSEMBLER_CODE was enabled by default in version 1.2.0
+ * and removed from version 1.2.20.  The following will be removed
+ * from libpng-1.4.0
+*/
+
+#if defined(PNG_READ_SUPPORTED) && !defined(PNG_NO_OPTIMIZED_CODE)
+#  ifndef PNG_OPTIMIZED_CODE_SUPPORTED
+#    define PNG_OPTIMIZED_CODE_SUPPORTED
+#  endif
+#endif
+
+#if defined(PNG_READ_SUPPORTED) && !defined(PNG_NO_ASSEMBLER_CODE)
+#  ifndef PNG_ASSEMBLER_CODE_SUPPORTED
+#    define PNG_ASSEMBLER_CODE_SUPPORTED
+#  endif
+
+#  if defined(__GNUC__) && defined(__x86_64__) && (__GNUC__ < 4)
+     /* work around 64-bit gcc compiler bugs in gcc-3.x */
+#    if !defined(PNG_MMX_CODE_SUPPORTED) && !defined(PNG_NO_MMX_CODE)
+#      define PNG_NO_MMX_CODE
+#    endif
+#  endif
+
+#  ifdef __APPLE__
+#    if !defined(PNG_MMX_CODE_SUPPORTED) && !defined(PNG_NO_MMX_CODE)
+#      define PNG_NO_MMX_CODE
+#    endif
+#  endif
+
+#  if (defined(__MWERKS__) && ((__MWERKS__ < 0x0900) || macintosh))
+#    if !defined(PNG_MMX_CODE_SUPPORTED) && !defined(PNG_NO_MMX_CODE)
+#      define PNG_NO_MMX_CODE
+#    endif
+#  endif
+
+#  if !defined(PNG_MMX_CODE_SUPPORTED) && !defined(PNG_NO_MMX_CODE)
+#    define PNG_MMX_CODE_SUPPORTED
+#  endif
+
+#endif
+/* end of obsolete code to be removed from libpng-1.4.0 */
+
+/* Added at libpng-1.2.0 */
+#ifndef PNG_1_0_X
+#if !defined(PNG_NO_USER_MEM) && !defined(PNG_USER_MEM_SUPPORTED)
+#  define PNG_USER_MEM_SUPPORTED
+#endif
+#endif /* PNG_1_0_X */
+
+/* Added at libpng-1.2.6 */
+#ifndef PNG_1_0_X
+#  ifndef PNG_SET_USER_LIMITS_SUPPORTED
+#    ifndef PNG_NO_SET_USER_LIMITS
+#      define PNG_SET_USER_LIMITS_SUPPORTED
+#    endif
+#  endif
+#endif /* PNG_1_0_X */
+
+/* Added at libpng-1.0.53 and 1.2.43 */
+#ifndef PNG_USER_LIMITS_SUPPORTED
+#  ifndef PNG_NO_USER_LIMITS
+#    define PNG_USER_LIMITS_SUPPORTED
+#  endif
+#endif
+
+/* Added at libpng-1.0.16 and 1.2.6.  To accept all valid PNGS no matter
+ * how large, set these limits to 0x7fffffffL
+ */
+#ifndef PNG_USER_WIDTH_MAX
+#  define PNG_USER_WIDTH_MAX 1000000L
+#endif
+#ifndef PNG_USER_HEIGHT_MAX
+#  define PNG_USER_HEIGHT_MAX 1000000L
+#endif
+
+/* Added at libpng-1.2.43.  To accept all valid PNGs no matter
+ * how large, set these two limits to 0.
+ */
+#ifndef PNG_USER_CHUNK_CACHE_MAX
+#  define PNG_USER_CHUNK_CACHE_MAX 0
+#endif
+
+/* Added at libpng-1.2.43 */
+#ifndef PNG_USER_CHUNK_MALLOC_MAX
+#  define PNG_USER_CHUNK_MALLOC_MAX 0
+#endif
+
+#ifndef PNG_LITERAL_SHARP
+#  define PNG_LITERAL_SHARP 0x23
+#endif
+#ifndef PNG_LITERAL_LEFT_SQUARE_BRACKET
+#  define PNG_LITERAL_LEFT_SQUARE_BRACKET 0x5b
+#endif
+#ifndef PNG_LITERAL_RIGHT_SQUARE_BRACKET
+#  define PNG_LITERAL_RIGHT_SQUARE_BRACKET 0x5d
+#endif
+
+/* Added at libpng-1.2.34 */
+#ifndef PNG_STRING_NEWLINE
+#define PNG_STRING_NEWLINE "\n"
+#endif
+
+/* These are currently experimental features, define them if you want */
+
+/* very little testing */
+/*
+#ifdef PNG_READ_SUPPORTED
+#  ifndef PNG_READ_16_TO_8_ACCURATE_SCALE_SUPPORTED
+#    define PNG_READ_16_TO_8_ACCURATE_SCALE_SUPPORTED
+#  endif
+#endif
+*/
+
+/* This is only for PowerPC big-endian and 680x0 systems */
+/* some testing */
+/*
+#ifndef PNG_READ_BIG_ENDIAN_SUPPORTED
+#  define PNG_READ_BIG_ENDIAN_SUPPORTED
+#endif
+*/
+
+/* Buggy compilers (e.g., gcc 2.7.2.2) need this */
+/*
+#define PNG_NO_POINTER_INDEXING
+*/
+
+#if !defined(PNG_NO_POINTER_INDEXING) && \
+    !defined(PNG_POINTER_INDEXING_SUPPORTED)
+#  define PNG_POINTER_INDEXING_SUPPORTED
+#endif
+
+/* These functions are turned off by default, as they will be phased out. */
+/*
+#define  PNG_USELESS_TESTS_SUPPORTED
+#define  PNG_CORRECT_PALETTE_SUPPORTED
+*/
+
+/* Any chunks you are not interested in, you can undef here.  The
+ * ones that allocate memory may be expecially important (hIST,
+ * tEXt, zTXt, tRNS, pCAL).  Others will just save time and make png_info
+ * a bit smaller.
+ */
+
+#if defined(PNG_READ_SUPPORTED) && \
+    !defined(PNG_READ_ANCILLARY_CHUNKS_NOT_SUPPORTED) && \
+    !defined(PNG_NO_READ_ANCILLARY_CHUNKS)
+#  define PNG_READ_ANCILLARY_CHUNKS_SUPPORTED
+#endif
+
+#if defined(PNG_WRITE_SUPPORTED) && \
+    !defined(PNG_WRITE_ANCILLARY_CHUNKS_NOT_SUPPORTED) && \
+    !defined(PNG_NO_WRITE_ANCILLARY_CHUNKS)
+#  define PNG_WRITE_ANCILLARY_CHUNKS_SUPPORTED
+#endif
+
+#ifdef PNG_READ_ANCILLARY_CHUNKS_SUPPORTED
+
+#ifdef PNG_NO_READ_TEXT
+#  define PNG_NO_READ_iTXt
+#  define PNG_NO_READ_tEXt
+#  define PNG_NO_READ_zTXt
+#endif
+#ifndef PNG_NO_READ_bKGD
+#  define PNG_READ_bKGD_SUPPORTED
+#  define PNG_bKGD_SUPPORTED
+#endif
+#ifndef PNG_NO_READ_cHRM
+#  define PNG_READ_cHRM_SUPPORTED
+#  define PNG_cHRM_SUPPORTED
+#endif
+#ifndef PNG_NO_READ_gAMA
+#  define PNG_READ_gAMA_SUPPORTED
+#  define PNG_gAMA_SUPPORTED
+#endif
+#ifndef PNG_NO_READ_hIST
+#  define PNG_READ_hIST_SUPPORTED
+#  define PNG_hIST_SUPPORTED
+#endif
+#ifndef PNG_NO_READ_iCCP
+#  define PNG_READ_iCCP_SUPPORTED
+#  define PNG_iCCP_SUPPORTED
+#endif
+#ifndef PNG_NO_READ_iTXt
+#  ifndef PNG_READ_iTXt_SUPPORTED
+#    define PNG_READ_iTXt_SUPPORTED
+#  endif
+#  ifndef PNG_iTXt_SUPPORTED
+#    define PNG_iTXt_SUPPORTED
+#  endif
+#endif
+#ifndef PNG_NO_READ_oFFs
+#  define PNG_READ_oFFs_SUPPORTED
+#  define PNG_oFFs_SUPPORTED
+#endif
+#ifndef PNG_NO_READ_pCAL
+#  define PNG_READ_pCAL_SUPPORTED
+#  define PNG_pCAL_SUPPORTED
+#endif
+#ifndef PNG_NO_READ_sCAL
+#  define PNG_READ_sCAL_SUPPORTED
+#  define PNG_sCAL_SUPPORTED
+#endif
+#ifndef PNG_NO_READ_pHYs
+#  define PNG_READ_pHYs_SUPPORTED
+#  define PNG_pHYs_SUPPORTED
+#endif
+#ifndef PNG_NO_READ_sBIT
+#  define PNG_READ_sBIT_SUPPORTED
+#  define PNG_sBIT_SUPPORTED
+#endif
+#ifndef PNG_NO_READ_sPLT
+#  define PNG_READ_sPLT_SUPPORTED
+#  define PNG_sPLT_SUPPORTED
+#endif
+#ifndef PNG_NO_READ_sRGB
+#  define PNG_READ_sRGB_SUPPORTED
+#  define PNG_sRGB_SUPPORTED
+#endif
+#ifndef PNG_NO_READ_tEXt
+#  define PNG_READ_tEXt_SUPPORTED
+#  define PNG_tEXt_SUPPORTED
+#endif
+#ifndef PNG_NO_READ_tIME
+#  define PNG_READ_tIME_SUPPORTED
+#  define PNG_tIME_SUPPORTED
+#endif
+#ifndef PNG_NO_READ_tRNS
+#  define PNG_READ_tRNS_SUPPORTED
+#  define PNG_tRNS_SUPPORTED
+#endif
+#ifndef PNG_NO_READ_zTXt
+#  define PNG_READ_zTXt_SUPPORTED
+#  define PNG_zTXt_SUPPORTED
+#endif
+#ifndef PNG_NO_READ_OPT_PLTE
+#  define PNG_READ_OPT_PLTE_SUPPORTED /* only affects support of the */
+#endif                      /* optional PLTE chunk in RGB and RGBA images */
+#if defined(PNG_READ_iTXt_SUPPORTED) || defined(PNG_READ_tEXt_SUPPORTED) || \
+    defined(PNG_READ_zTXt_SUPPORTED)
+#  define PNG_READ_TEXT_SUPPORTED
+#  define PNG_TEXT_SUPPORTED
+#endif
+
+#endif /* PNG_READ_ANCILLARY_CHUNKS_SUPPORTED */
+
+#ifndef PNG_NO_READ_UNKNOWN_CHUNKS
+#  define PNG_READ_UNKNOWN_CHUNKS_SUPPORTED
+#  ifndef PNG_UNKNOWN_CHUNKS_SUPPORTED
+#    define PNG_UNKNOWN_CHUNKS_SUPPORTED
+#  endif
+#endif
+#if !defined(PNG_NO_READ_USER_CHUNKS) && \
+     defined(PNG_READ_UNKNOWN_CHUNKS_SUPPORTED)
+#  define PNG_READ_USER_CHUNKS_SUPPORTED
+#  define PNG_USER_CHUNKS_SUPPORTED
+#  ifdef PNG_NO_READ_UNKNOWN_CHUNKS
+#    undef PNG_NO_READ_UNKNOWN_CHUNKS
+#  endif
+#  ifdef PNG_NO_HANDLE_AS_UNKNOWN
+#    undef PNG_NO_HANDLE_AS_UNKNOWN
+#  endif
+#endif
+
+#ifndef PNG_NO_HANDLE_AS_UNKNOWN
+#  ifndef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
+#    define PNG_HANDLE_AS_UNKNOWN_SUPPORTED
+#  endif
+#endif
+
+#ifdef PNG_WRITE_SUPPORTED
+#ifdef PNG_WRITE_ANCILLARY_CHUNKS_SUPPORTED
+
+#ifdef PNG_NO_WRITE_TEXT
+#  define PNG_NO_WRITE_iTXt
+#  define PNG_NO_WRITE_tEXt
+#  define PNG_NO_WRITE_zTXt
+#endif
+#ifndef PNG_NO_WRITE_bKGD
+#  define PNG_WRITE_bKGD_SUPPORTED
+#  ifndef PNG_bKGD_SUPPORTED
+#    define PNG_bKGD_SUPPORTED
+#  endif
+#endif
+#ifndef PNG_NO_WRITE_cHRM
+#  define PNG_WRITE_cHRM_SUPPORTED
+#  ifndef PNG_cHRM_SUPPORTED
+#    define PNG_cHRM_SUPPORTED
+#  endif
+#endif
+#ifndef PNG_NO_WRITE_gAMA
+#  define PNG_WRITE_gAMA_SUPPORTED
+#  ifndef PNG_gAMA_SUPPORTED
+#    define PNG_gAMA_SUPPORTED
+#  endif
+#endif
+#ifndef PNG_NO_WRITE_hIST
+#  define PNG_WRITE_hIST_SUPPORTED
+#  ifndef PNG_hIST_SUPPORTED
+#    define PNG_hIST_SUPPORTED
+#  endif
+#endif
+#ifndef PNG_NO_WRITE_iCCP
+#  define PNG_WRITE_iCCP_SUPPORTED
+#  ifndef PNG_iCCP_SUPPORTED
+#    define PNG_iCCP_SUPPORTED
+#  endif
+#endif
+#ifndef PNG_NO_WRITE_iTXt
+#  ifndef PNG_WRITE_iTXt_SUPPORTED
+#    define PNG_WRITE_iTXt_SUPPORTED
+#  endif
+#  ifndef PNG_iTXt_SUPPORTED
+#    define PNG_iTXt_SUPPORTED
+#  endif
+#endif
+#ifndef PNG_NO_WRITE_oFFs
+#  define PNG_WRITE_oFFs_SUPPORTED
+#  ifndef PNG_oFFs_SUPPORTED
+#    define PNG_oFFs_SUPPORTED
+#  endif
+#endif
+#ifndef PNG_NO_WRITE_pCAL
+#  define PNG_WRITE_pCAL_SUPPORTED
+#  ifndef PNG_pCAL_SUPPORTED
+#    define PNG_pCAL_SUPPORTED
+#  endif
+#endif
+#ifndef PNG_NO_WRITE_sCAL
+#  define PNG_WRITE_sCAL_SUPPORTED
+#  ifndef PNG_sCAL_SUPPORTED
+#    define PNG_sCAL_SUPPORTED
+#  endif
+#endif
+#ifndef PNG_NO_WRITE_pHYs
+#  define PNG_WRITE_pHYs_SUPPORTED
+#  ifndef PNG_pHYs_SUPPORTED
+#    define PNG_pHYs_SUPPORTED
+#  endif
+#endif
+#ifndef PNG_NO_WRITE_sBIT
+#  define PNG_WRITE_sBIT_SUPPORTED
+#  ifndef PNG_sBIT_SUPPORTED
+#    define PNG_sBIT_SUPPORTED
+#  endif
+#endif
+#ifndef PNG_NO_WRITE_sPLT
+#  define PNG_WRITE_sPLT_SUPPORTED
+#  ifndef PNG_sPLT_SUPPORTED
+#    define PNG_sPLT_SUPPORTED
+#  endif
+#endif
+#ifndef PNG_NO_WRITE_sRGB
+#  define PNG_WRITE_sRGB_SUPPORTED
+#  ifndef PNG_sRGB_SUPPORTED
+#    define PNG_sRGB_SUPPORTED
+#  endif
+#endif
+#ifndef PNG_NO_WRITE_tEXt
+#  define PNG_WRITE_tEXt_SUPPORTED
+#  ifndef PNG_tEXt_SUPPORTED
+#    define PNG_tEXt_SUPPORTED
+#  endif
+#endif
+#ifndef PNG_NO_WRITE_tIME
+#  define PNG_WRITE_tIME_SUPPORTED
+#  ifndef PNG_tIME_SUPPORTED
+#    define PNG_tIME_SUPPORTED
+#  endif
+#endif
+#ifndef PNG_NO_WRITE_tRNS
+#  define PNG_WRITE_tRNS_SUPPORTED
+#  ifndef PNG_tRNS_SUPPORTED
+#    define PNG_tRNS_SUPPORTED
+#  endif
+#endif
+#ifndef PNG_NO_WRITE_zTXt
+#  define PNG_WRITE_zTXt_SUPPORTED
+#  ifndef PNG_zTXt_SUPPORTED
+#    define PNG_zTXt_SUPPORTED
+#  endif
+#endif
+#if defined(PNG_WRITE_iTXt_SUPPORTED) || defined(PNG_WRITE_tEXt_SUPPORTED) || \
+    defined(PNG_WRITE_zTXt_SUPPORTED)
+#  define PNG_WRITE_TEXT_SUPPORTED
+#  ifndef PNG_TEXT_SUPPORTED
+#    define PNG_TEXT_SUPPORTED
+#  endif
+#endif
+
+#ifdef PNG_WRITE_tIME_SUPPORTED
+#  ifndef PNG_NO_CONVERT_tIME
+#    ifndef _WIN32_WCE
+/*   The "tm" structure is not supported on WindowsCE */
+#      ifndef PNG_CONVERT_tIME_SUPPORTED
+#        define PNG_CONVERT_tIME_SUPPORTED
+#      endif
+#   endif
+#  endif
+#endif
+
+#endif /* PNG_WRITE_ANCILLARY_CHUNKS_SUPPORTED */
+
+#if !defined(PNG_NO_WRITE_FILTER) && !defined(PNG_WRITE_FILTER_SUPPORTED)
+#  define PNG_WRITE_FILTER_SUPPORTED
+#endif
+
+#ifndef PNG_NO_WRITE_UNKNOWN_CHUNKS
+#  define PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED
+#  ifndef PNG_UNKNOWN_CHUNKS_SUPPORTED
+#    define PNG_UNKNOWN_CHUNKS_SUPPORTED
+#  endif
+#endif
+
+#ifndef PNG_NO_HANDLE_AS_UNKNOWN
+#  ifndef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
+#    define PNG_HANDLE_AS_UNKNOWN_SUPPORTED
+#  endif
+#endif
+#endif /* PNG_WRITE_SUPPORTED */
+
+/* Turn this off to disable png_read_png() and
+ * png_write_png() and leave the row_pointers member
+ * out of the info structure.
+ */
+#ifndef PNG_NO_INFO_IMAGE
+#  define PNG_INFO_IMAGE_SUPPORTED
+#endif
+
+/* Need the time information for converting tIME chunks */
+#ifdef PNG_CONVERT_tIME_SUPPORTED
+     /* "time.h" functions are not supported on WindowsCE */
+#    include <time.h>
+#endif
+
+/* Some typedefs to get us started.  These should be safe on most of the
+ * common platforms.  The typedefs should be at least as large as the
+ * numbers suggest (a png_uint_32 must be at least 32 bits long), but they
+ * don't have to be exactly that size.  Some compilers dislike passing
+ * unsigned shorts as function parameters, so you may be better off using
+ * unsigned int for png_uint_16.  Likewise, for 64-bit systems, you may
+ * want to have unsigned int for png_uint_32 instead of unsigned long.
+ */
+
+typedef unsigned long png_uint_32;
+typedef long png_int_32;
+typedef unsigned short png_uint_16;
+typedef short png_int_16;
+typedef unsigned char png_byte;
+
+/* This is usually size_t.  It is typedef'ed just in case you need it to
+   change (I'm not sure if you will or not, so I thought I'd be safe) */
+#ifdef PNG_SIZE_T
+   typedef PNG_SIZE_T png_size_t;
+#  define png_sizeof(x) png_convert_size(sizeof(x))
+#else
+   typedef size_t png_size_t;
+#  define png_sizeof(x) sizeof(x)
+#endif
+
+/* The following is needed for medium model support.  It cannot be in the
+ * PNG_INTERNAL section.  Needs modification for other compilers besides
+ * MSC.  Model independent support declares all arrays and pointers to be
+ * large using the far keyword.  The zlib version used must also support
+ * model independent data.  As of version zlib 1.0.4, the necessary changes
+ * have been made in zlib.  The USE_FAR_KEYWORD define triggers other
+ * changes that are needed. (Tim Wegner)
+ */
+
+/* Separate compiler dependencies (problem here is that zlib.h always
+   defines FAR. (SJT) */
+#ifdef __BORLANDC__
+#  if defined(__LARGE__) || defined(__HUGE__) || defined(__COMPACT__)
+#    define LDATA 1
+#  else
+#    define LDATA 0
+#  endif
+   /* GRR:  why is Cygwin in here?  Cygwin is not Borland C... */
+#  if !defined(__WIN32__) && !defined(__FLAT__) && !defined(__CYGWIN__)
+#    define PNG_MAX_MALLOC_64K
+#    if (LDATA != 1)
+#      ifndef FAR
+#        define FAR __far
+#      endif
+#      define USE_FAR_KEYWORD
+#    endif   /* LDATA != 1 */
+     /* Possibly useful for moving data out of default segment.
+      * Uncomment it if you want. Could also define FARDATA as
+      * const if your compiler supports it. (SJT)
+#    define FARDATA FAR
+      */
+#  endif  /* __WIN32__, __FLAT__, __CYGWIN__ */
+#endif   /* __BORLANDC__ */
+
+
+/* Suggest testing for specific compiler first before testing for
+ * FAR.  The Watcom compiler defines both __MEDIUM__ and M_I86MM,
+ * making reliance oncertain keywords suspect. (SJT)
+ */
+
+/* MSC Medium model */
+#ifdef FAR
+#  ifdef M_I86MM
+#    define USE_FAR_KEYWORD
+#    define FARDATA FAR
+#    include <dos.h>
+#  endif
+#endif
+
+/* SJT: default case */
+#ifndef FAR
+#  define FAR
+#endif
+
+/* At this point FAR is always defined */
+#ifndef FARDATA
+#  define FARDATA
+#endif
+
+/* Typedef for floating-point numbers that are converted
+   to fixed-point with a multiple of 100,000, e.g., int_gamma */
+typedef png_int_32 png_fixed_point;
+
+/* Add typedefs for pointers */
+typedef void            FAR * png_voidp;
+typedef png_byte        FAR * png_bytep;
+typedef png_uint_32     FAR * png_uint_32p;
+typedef png_int_32      FAR * png_int_32p;
+typedef png_uint_16     FAR * png_uint_16p;
+typedef png_int_16      FAR * png_int_16p;
+typedef PNG_CONST char  FAR * png_const_charp;
+typedef char            FAR * png_charp;
+typedef png_fixed_point FAR * png_fixed_point_p;
+
+#ifndef PNG_NO_STDIO
+#ifdef _WIN32_WCE
+typedef HANDLE                png_FILE_p;
+#else
+typedef FILE                * png_FILE_p;
+#endif
+#endif
+
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+typedef double          FAR * png_doublep;
+#endif
+
+/* Pointers to pointers; i.e. arrays */
+typedef png_byte        FAR * FAR * png_bytepp;
+typedef png_uint_32     FAR * FAR * png_uint_32pp;
+typedef png_int_32      FAR * FAR * png_int_32pp;
+typedef png_uint_16     FAR * FAR * png_uint_16pp;
+typedef png_int_16      FAR * FAR * png_int_16pp;
+typedef PNG_CONST char  FAR * FAR * png_const_charpp;
+typedef char            FAR * FAR * png_charpp;
+typedef png_fixed_point FAR * FAR * png_fixed_point_pp;
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+typedef double          FAR * FAR * png_doublepp;
+#endif
+
+/* Pointers to pointers to pointers; i.e., pointer to array */
+typedef char            FAR * FAR * FAR * png_charppp;
+
+#if defined(PNG_1_0_X) || defined(PNG_1_2_X)
+/* SPC -  Is this stuff deprecated? */
+/* It'll be removed as of libpng-1.4.0 - GR-P */
+/* libpng typedefs for types in zlib. If zlib changes
+ * or another compression library is used, then change these.
+ * Eliminates need to change all the source files.
+ */
+typedef charf *         png_zcharp;
+typedef charf * FAR *   png_zcharpp;
+typedef z_stream FAR *  png_zstreamp;
+#endif /* (PNG_1_0_X) || defined(PNG_1_2_X) */
+
+/*
+ * Define PNG_BUILD_DLL if the module being built is a Windows
+ * LIBPNG DLL.
+ *
+ * Define PNG_USE_DLL if you want to *link* to the Windows LIBPNG DLL.
+ * It is equivalent to Microsoft predefined macro _DLL that is
+ * automatically defined when you compile using the share
+ * version of the CRT (C Run-Time library)
+ *
+ * The cygwin mods make this behavior a little different:
+ * Define PNG_BUILD_DLL if you are building a dll for use with cygwin
+ * Define PNG_STATIC if you are building a static library for use with cygwin,
+ *   -or- if you are building an application that you want to link to the
+ *   static library.
+ * PNG_USE_DLL is defined by default (no user action needed) unless one of
+ *   the other flags is defined.
+ */
+
+#if !defined(PNG_DLL) && (defined(PNG_BUILD_DLL) || defined(PNG_USE_DLL))
+#  define PNG_DLL
+#endif
+/* If CYGWIN, then disallow GLOBAL ARRAYS unless building a static lib.
+ * When building a static lib, default to no GLOBAL ARRAYS, but allow
+ * command-line override
+ */
+#ifdef __CYGWIN__
+#  ifndef PNG_STATIC
+#    ifdef PNG_USE_GLOBAL_ARRAYS
+#      undef PNG_USE_GLOBAL_ARRAYS
+#    endif
+#    ifndef PNG_USE_LOCAL_ARRAYS
+#      define PNG_USE_LOCAL_ARRAYS
+#    endif
+#  else
+#    if defined(PNG_USE_LOCAL_ARRAYS) || defined(PNG_NO_GLOBAL_ARRAYS)
+#      ifdef PNG_USE_GLOBAL_ARRAYS
+#        undef PNG_USE_GLOBAL_ARRAYS
+#      endif
+#    endif
+#  endif
+#  if !defined(PNG_USE_LOCAL_ARRAYS) && !defined(PNG_USE_GLOBAL_ARRAYS)
+#    define PNG_USE_LOCAL_ARRAYS
+#  endif
+#endif
+
+/* Do not use global arrays (helps with building DLL's)
+ * They are no longer used in libpng itself, since version 1.0.5c,
+ * but might be required for some pre-1.0.5c applications.
+ */
+#if !defined(PNG_USE_LOCAL_ARRAYS) && !defined(PNG_USE_GLOBAL_ARRAYS)
+#  if defined(PNG_NO_GLOBAL_ARRAYS) || \
+      (defined(__GNUC__) && defined(PNG_DLL)) || defined(_MSC_VER)
+#    define PNG_USE_LOCAL_ARRAYS
+#  else
+#    define PNG_USE_GLOBAL_ARRAYS
+#  endif
+#endif
+
+#ifdef __CYGWIN__
+#  undef PNGAPI
+#  define PNGAPI __cdecl
+#  undef PNG_IMPEXP
+#  define PNG_IMPEXP
+#endif
+
+/* If you define PNGAPI, e.g., with compiler option "-DPNGAPI=__stdcall",
+ * you may get warnings regarding the linkage of png_zalloc and png_zfree.
+ * Don't ignore those warnings; you must also reset the default calling
+ * convention in your compiler to match your PNGAPI, and you must build
+ * zlib and your applications the same way you build libpng.
+ */
+
+#if defined(__MINGW32__) && !defined(PNG_MODULEDEF)
+#  ifndef PNG_NO_MODULEDEF
+#    define PNG_NO_MODULEDEF
+#  endif
+#endif
+
+#if !defined(PNG_IMPEXP) && defined(PNG_BUILD_DLL) && !defined(PNG_NO_MODULEDEF)
+#  define PNG_IMPEXP
+#endif
+
+#if defined(PNG_DLL) || defined(_DLL) || defined(__DLL__ ) || \
+    (( defined(_Windows) || defined(_WINDOWS) || \
+       defined(WIN32) || defined(_WIN32) || defined(__WIN32__) ))
+
+#  ifndef PNGAPI
+#     if defined(__GNUC__) || (defined (_MSC_VER) && (_MSC_VER >= 800))
+#        define PNGAPI __cdecl
+#     else
+#        define PNGAPI _cdecl
+#     endif
+#  endif
+
+#  if !defined(PNG_IMPEXP) && (!defined(PNG_DLL) || \
+       0 /* WINCOMPILER_WITH_NO_SUPPORT_FOR_DECLIMPEXP */)
+#     define PNG_IMPEXP
+#  endif
+
+#  ifndef PNG_IMPEXP
+
+#     define PNG_EXPORT_TYPE1(type,symbol)  PNG_IMPEXP type PNGAPI symbol
+#     define PNG_EXPORT_TYPE2(type,symbol)  type PNG_IMPEXP PNGAPI symbol
+
+      /* Borland/Microsoft */
+#     if defined(_MSC_VER) || defined(__BORLANDC__)
+#        if (_MSC_VER >= 800) || (__BORLANDC__ >= 0x500)
+#           define PNG_EXPORT PNG_EXPORT_TYPE1
+#        else
+#           define PNG_EXPORT PNG_EXPORT_TYPE2
+#           ifdef PNG_BUILD_DLL
+#              define PNG_IMPEXP __export
+#           else
+#              define PNG_IMPEXP /*__import */ /* doesn't exist AFAIK in
+                                                 VC++ */
+#           endif                             /* Exists in Borland C++ for
+                                                 C++ classes (== huge) */
+#        endif
+#     endif
+
+#     ifndef PNG_IMPEXP
+#        ifdef PNG_BUILD_DLL
+#           define PNG_IMPEXP __declspec(dllexport)
+#        else
+#           define PNG_IMPEXP __declspec(dllimport)
+#        endif
+#     endif
+#  endif  /* PNG_IMPEXP */
+#else /* !(DLL || non-cygwin WINDOWS) */
+#   if (defined(__IBMC__) || defined(__IBMCPP__)) && defined(__OS2__)
+#      ifndef PNGAPI
+#         define PNGAPI _System
+#      endif
+#   else
+#      if 0 /* ... other platforms, with other meanings */
+#      endif
+#   endif
+#endif
+
+#ifndef PNGAPI
+#  define PNGAPI
+#endif
+#ifndef PNG_IMPEXP
+#  define PNG_IMPEXP
+#endif
+
+#ifdef PNG_BUILDSYMS
+#  ifndef PNG_EXPORT
+#    define PNG_EXPORT(type,symbol) PNG_FUNCTION_EXPORT symbol END
+#  endif
+#  ifdef PNG_USE_GLOBAL_ARRAYS
+#    ifndef PNG_EXPORT_VAR
+#      define PNG_EXPORT_VAR(type) PNG_DATA_EXPORT
+#    endif
+#  endif
+#endif
+
+#ifndef PNG_EXPORT
+#  define PNG_EXPORT(type,symbol) PNG_IMPEXP type PNGAPI symbol
+#endif
+
+#ifdef PNG_USE_GLOBAL_ARRAYS
+#  ifndef PNG_EXPORT_VAR
+#    define PNG_EXPORT_VAR(type) extern PNG_IMPEXP type
+#  endif
+#endif
+
+#ifdef PNG_PEDANTIC_WARNINGS
+#  ifndef PNG_PEDANTIC_WARNINGS_SUPPORTED
+#    define PNG_PEDANTIC_WARNINGS_SUPPORTED
+#  endif
+#endif
+
+#ifdef PNG_PEDANTIC_WARNINGS_SUPPORTED
+/* Support for compiler specific function attributes.  These are used
+ * so that where compiler support is available incorrect use of API
+ * functions in png.h will generate compiler warnings.  Added at libpng
+ * version 1.2.41.
+ */
+#  ifdef __GNUC__
+#    ifndef PNG_USE_RESULT
+#      define PNG_USE_RESULT __attribute__((__warn_unused_result__))
+#    endif
+#    ifndef PNG_NORETURN
+#      define PNG_NORETURN   __attribute__((__noreturn__))
+#    endif
+#    ifndef PNG_ALLOCATED
+#      define PNG_ALLOCATED  __attribute__((__malloc__))
+#    endif
+
+    /* This specifically protects structure members that should only be
+     * accessed from within the library, therefore should be empty during
+     * a library build.
+     */
+#    ifndef PNG_DEPRECATED
+#      define PNG_DEPRECATED __attribute__((__deprecated__))
+#    endif
+#    ifndef PNG_DEPSTRUCT
+#      define PNG_DEPSTRUCT  __attribute__((__deprecated__))
+#    endif
+#    ifndef PNG_PRIVATE
+#      if 0 /* Doesn't work so we use deprecated instead*/
+#        define PNG_PRIVATE \
+          __attribute__((warning("This function is not exported by libpng.")))
+#      else
+#        define PNG_PRIVATE \
+          __attribute__((__deprecated__))
+#      endif
+#    endif /* PNG_PRIVATE */
+#  endif /* __GNUC__ */
+#endif /* PNG_PEDANTIC_WARNINGS */
+
+#ifndef PNG_DEPRECATED
+#  define PNG_DEPRECATED  /* Use of this function is deprecated */
+#endif
+#ifndef PNG_USE_RESULT
+#  define PNG_USE_RESULT  /* The result of this function must be checked */
+#endif
+#ifndef PNG_NORETURN
+#  define PNG_NORETURN    /* This function does not return */
+#endif
+#ifndef PNG_ALLOCATED
+#  define PNG_ALLOCATED   /* The result of the function is new memory */
+#endif
+#ifndef PNG_DEPSTRUCT
+#  define PNG_DEPSTRUCT   /* Access to this struct member is deprecated */
+#endif
+#ifndef PNG_PRIVATE
+#  define PNG_PRIVATE     /* This is a private libpng function */
+#endif
+
+/* User may want to use these so they are not in PNG_INTERNAL. Any library
+ * functions that are passed far data must be model independent.
+ */
+
+#ifndef PNG_ABORT
+#  define PNG_ABORT() abort()
+#endif
+
+#ifdef PNG_SETJMP_SUPPORTED
+#  define png_jmpbuf(png_ptr) ((png_ptr)->jmpbuf)
+#else
+#  define png_jmpbuf(png_ptr) \
+   (LIBPNG_WAS_COMPILED_WITH__PNG_SETJMP_NOT_SUPPORTED)
+#endif
+
+#ifdef USE_FAR_KEYWORD  /* memory model independent fns */
+/* Use this to make far-to-near assignments */
+#  define CHECK   1
+#  define NOCHECK 0
+#  define CVT_PTR(ptr) (png_far_to_near(png_ptr,ptr,CHECK))
+#  define CVT_PTR_NOCHECK(ptr) (png_far_to_near(png_ptr,ptr,NOCHECK))
+#  define png_snprintf _fsnprintf   /* Added to v 1.2.19 */
+#  define png_strlen  _fstrlen
+#  define png_memcmp  _fmemcmp    /* SJT: added */
+#  define png_memcpy  _fmemcpy
+#  define png_memset  _fmemset
+#else /* Use the usual functions */
+#  define CVT_PTR(ptr)         (ptr)
+#  define CVT_PTR_NOCHECK(ptr) (ptr)
+#  ifndef PNG_NO_SNPRINTF
+#    ifdef _MSC_VER
+#      define png_snprintf _snprintf   /* Added to v 1.2.19 */
+#      define png_snprintf2 _snprintf
+#      define png_snprintf6 _snprintf
+#    else
+#      define png_snprintf snprintf   /* Added to v 1.2.19 */
+#      define png_snprintf2 snprintf
+#      define png_snprintf6 snprintf
+#    endif
+#  else
+     /* You don't have or don't want to use snprintf().  Caution: Using
+      * sprintf instead of snprintf exposes your application to accidental
+      * or malevolent buffer overflows.  If you don't have snprintf()
+      * as a general rule you should provide one (you can get one from
+      * Portable OpenSSH).
+      */
+#    define png_snprintf(s1,n,fmt,x1) sprintf(s1,fmt,x1)
+#    define png_snprintf2(s1,n,fmt,x1,x2) sprintf(s1,fmt,x1,x2)
+#    define png_snprintf6(s1,n,fmt,x1,x2,x3,x4,x5,x6) \
+        sprintf(s1,fmt,x1,x2,x3,x4,x5,x6)
+#  endif
+#  define png_strlen  strlen
+#  define png_memcmp  memcmp      /* SJT: added */
+#  define png_memcpy  memcpy
+#  define png_memset  memset
+#endif
+/* End of memory model independent support */
+
+/* Just a little check that someone hasn't tried to define something
+ * contradictory.
+ */
+#if (PNG_ZBUF_SIZE > 65536L) && defined(PNG_MAX_MALLOC_64K)
+#  undef PNG_ZBUF_SIZE
+#  define PNG_ZBUF_SIZE 65536L
+#endif
+
+/* Added at libpng-1.2.8 */
+#endif /* PNG_VERSION_INFO_ONLY */
+
+#endif /* PNGCONF_H */
diff --git a/Externals/libpng/pngerror.c b/Externals/libpng/pngerror.c
index 8290bb4106..fd91a7fc54 100644
--- a/Externals/libpng/pngerror.c
+++ b/Externals/libpng/pngerror.c
@@ -1,447 +1,396 @@
-
-/* pngerror.c - stub functions for i/o and memory allocation
- *
- * Last changed in libpng 1.5.1 [February 3, 2011]
- * Copyright (c) 1998-2011 Glenn Randers-Pehrson
- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
- *
- * This code is released under the libpng license.
- * For conditions of distribution and use, see the disclaimer
- * and license in png.h
- *
- * This file provides a location for all error handling.  Users who
- * need special error handling are expected to write replacement functions
- * and use png_set_error_fn() to use those functions.  See the instructions
- * at each function.
- */
-
-#include "pngpriv.h"
-
-#if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED)
-
-static PNG_FUNCTION(void, png_default_error,PNGARG((png_structp png_ptr,
-    png_const_charp error_message)),PNG_NORETURN);
-
-#ifdef PNG_WARNINGS_SUPPORTED
-static void /* PRIVATE */
-png_default_warning PNGARG((png_structp png_ptr,
-   png_const_charp warning_message));
-#endif /* PNG_WARNINGS_SUPPORTED */
-
-/* This function is called whenever there is a fatal error.  This function
- * should not be changed.  If there is a need to handle errors differently,
- * you should supply a replacement error function and use png_set_error_fn()
- * to replace the error function at run-time.
- */
-#ifdef PNG_ERROR_TEXT_SUPPORTED
-PNG_FUNCTION(void,PNGAPI
-png_error,(png_structp png_ptr, png_const_charp error_message),PNG_NORETURN)
-{
-#ifdef PNG_ERROR_NUMBERS_SUPPORTED
-   char msg[16];
-   if (png_ptr != NULL)
-   {
-      if (png_ptr->flags&
-         (PNG_FLAG_STRIP_ERROR_NUMBERS|PNG_FLAG_STRIP_ERROR_TEXT))
-      {
-         if (*error_message == PNG_LITERAL_SHARP)
-         {
-            /* Strip "#nnnn " from beginning of error message. */
-            int offset;
-            for (offset = 1; offset<15; offset++)
-               if (error_message[offset] == ' ')
-                  break;
-
-            if (png_ptr->flags&PNG_FLAG_STRIP_ERROR_TEXT)
-            {
-               int i;
-               for (i = 0; i < offset - 1; i++)
-                  msg[i] = error_message[i + 1];
-               msg[i - 1] = '\0';
-               error_message = msg;
-            }
-
-            else
-               error_message += offset;
-      }
-
-      else
-      {
-         if (png_ptr->flags&PNG_FLAG_STRIP_ERROR_TEXT)
-         {
-            msg[0] = '0';
-            msg[1] = '\0';
-            error_message = msg;
-         }
-       }
-     }
-   }
-#endif
-   if (png_ptr != NULL && png_ptr->error_fn != NULL)
-      (*(png_ptr->error_fn))(png_ptr, error_message);
-
-   /* If the custom handler doesn't exist, or if it returns,
-      use the default handler, which will not return. */
-   png_default_error(png_ptr, error_message);
-}
-#else
-PNG_FUNCTION(void,PNGAPI
-png_err,(png_structp png_ptr),PNG_NORETURN)
-{
-   if (png_ptr != NULL && png_ptr->error_fn != NULL)
-      (*(png_ptr->error_fn))(png_ptr, '\0');
-
-   /* If the custom handler doesn't exist, or if it returns,
-      use the default handler, which will not return. */
-   png_default_error(png_ptr, '\0');
-}
-#endif /* PNG_ERROR_TEXT_SUPPORTED */
-
-#ifdef PNG_WARNINGS_SUPPORTED
-/* This function is called whenever there is a non-fatal error.  This function
- * should not be changed.  If there is a need to handle warnings differently,
- * you should supply a replacement warning function and use
- * png_set_error_fn() to replace the warning function at run-time.
- */
-void PNGAPI
-png_warning(png_structp png_ptr, png_const_charp warning_message)
-{
-   int offset = 0;
-   if (png_ptr != NULL)
-   {
-#ifdef PNG_ERROR_NUMBERS_SUPPORTED
-   if (png_ptr->flags&
-       (PNG_FLAG_STRIP_ERROR_NUMBERS|PNG_FLAG_STRIP_ERROR_TEXT))
-#endif
-      {
-         if (*warning_message == PNG_LITERAL_SHARP)
-         {
-            for (offset = 1; offset < 15; offset++)
-               if (warning_message[offset] == ' ')
-                  break;
-         }
-      }
-   }
-   if (png_ptr != NULL && png_ptr->warning_fn != NULL)
-      (*(png_ptr->warning_fn))(png_ptr, warning_message + offset);
-   else
-      png_default_warning(png_ptr, warning_message + offset);
-}
-#endif /* PNG_WARNINGS_SUPPORTED */
-
-#ifdef PNG_BENIGN_ERRORS_SUPPORTED
-void PNGAPI
-png_benign_error(png_structp png_ptr, png_const_charp error_message)
-{
-  if (png_ptr->flags & PNG_FLAG_BENIGN_ERRORS_WARN)
-     png_warning(png_ptr, error_message);
-  else
-     png_error(png_ptr, error_message);
-}
-#endif
-
-/* These utilities are used internally to build an error message that relates
- * to the current chunk.  The chunk name comes from png_ptr->chunk_name,
- * this is used to prefix the message.  The message is limited in length
- * to 63 bytes, the name characters are output as hex digits wrapped in []
- * if the character is invalid.
- */
-#define isnonalpha(c) ((c) < 65 || (c) > 122 || ((c) > 90 && (c) < 97))
-static PNG_CONST char png_digit[16] = {
-   '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
-   'A', 'B', 'C', 'D', 'E', 'F'
-};
-
-#define PNG_MAX_ERROR_TEXT 64
-#if defined(PNG_WARNINGS_SUPPORTED) || defined(PNG_ERROR_TEXT_SUPPORTED)
-static void /* PRIVATE */
-png_format_buffer(png_structp png_ptr, png_charp buffer, png_const_charp
-    error_message)
-{
-   int iout = 0, iin = 0;
-
-   while (iin < 4)
-   {
-      int c = png_ptr->chunk_name[iin++];
-      if (isnonalpha(c))
-      {
-         buffer[iout++] = PNG_LITERAL_LEFT_SQUARE_BRACKET;
-         buffer[iout++] = png_digit[(c & 0xf0) >> 4];
-         buffer[iout++] = png_digit[c & 0x0f];
-         buffer[iout++] = PNG_LITERAL_RIGHT_SQUARE_BRACKET;
-      }
-
-      else
-      {
-         buffer[iout++] = (png_byte)c;
-      }
-   }
-
-   if (error_message == NULL)
-      buffer[iout] = '\0';
-
-   else
-   {
-      buffer[iout++] = ':';
-      buffer[iout++] = ' ';
-      png_memcpy(buffer + iout, error_message, PNG_MAX_ERROR_TEXT);
-      buffer[iout + PNG_MAX_ERROR_TEXT - 1] = '\0';
-   }
-}
-#endif /* PNG_WARNINGS_SUPPORTED || PNG_ERROR_TEXT_SUPPORTED */
-
-#if defined(PNG_READ_SUPPORTED) && defined(PNG_ERROR_TEXT_SUPPORTED)
-PNG_FUNCTION(void,PNGAPI
-png_chunk_error,(png_structp png_ptr, png_const_charp error_message),
-   PNG_NORETURN)
-{
-   char msg[18+PNG_MAX_ERROR_TEXT];
-   if (png_ptr == NULL)
-      png_error(png_ptr, error_message);
-
-   else
-   {
-      png_format_buffer(png_ptr, msg, error_message);
-      png_error(png_ptr, msg);
-   }
-}
-#endif /* PNG_READ_SUPPORTED && PNG_ERROR_TEXT_SUPPORTED */
-
-#ifdef PNG_WARNINGS_SUPPORTED
-void PNGAPI
-png_chunk_warning(png_structp png_ptr, png_const_charp warning_message)
-{
-   char msg[18+PNG_MAX_ERROR_TEXT];
-   if (png_ptr == NULL)
-      png_warning(png_ptr, warning_message);
-
-   else
-   {
-      png_format_buffer(png_ptr, msg, warning_message);
-      png_warning(png_ptr, msg);
-   }
-}
-#endif /* PNG_WARNINGS_SUPPORTED */
-
-#ifdef PNG_READ_SUPPORTED
-#ifdef PNG_BENIGN_ERRORS_SUPPORTED
-void PNGAPI
-png_chunk_benign_error(png_structp png_ptr, png_const_charp error_message)
-{
-   if (png_ptr->flags & PNG_FLAG_BENIGN_ERRORS_WARN)
-      png_chunk_warning(png_ptr, error_message);
-
-   else
-      png_chunk_error(png_ptr, error_message);
-}
-#endif
-#endif /* PNG_READ_SUPPORTED */
-
-#ifdef PNG_ERROR_TEXT_SUPPORTED
-#ifdef PNG_FLOATING_POINT_SUPPORTED
-PNG_FUNCTION(void,
-png_fixed_error,(png_structp png_ptr, png_const_charp name),PNG_NORETURN)
-{
-#  define fixed_message "fixed point overflow in "
-#  define fixed_message_ln ((sizeof fixed_message)-1)
-   int  iin;
-   char msg[fixed_message_ln+PNG_MAX_ERROR_TEXT];
-   png_memcpy(msg, fixed_message, fixed_message_ln);
-   iin = 0;
-   if (name != NULL) while (iin < (PNG_MAX_ERROR_TEXT-1) && name[iin] != 0)
-   {
-      msg[fixed_message_ln + iin] = name[iin];
-      ++iin;
-   }
-   msg[fixed_message_ln + iin] = 0;
-   png_error(png_ptr, msg);
-}
-#endif
-#endif
-
-#ifdef PNG_SETJMP_SUPPORTED
-/* This API only exists if ANSI-C style error handling is used,
- * otherwise it is necessary for png_default_error to be overridden.
- */
-jmp_buf* PNGAPI
-png_set_longjmp_fn(png_structp png_ptr, png_longjmp_ptr longjmp_fn,
-    size_t jmp_buf_size)
-{
-   if (png_ptr == NULL || jmp_buf_size != png_sizeof(jmp_buf))
-      return NULL;
-
-   png_ptr->longjmp_fn = longjmp_fn;
-   return &png_ptr->png_jmpbuf;
-}
-#endif
-
-/* This is the default error handling function.  Note that replacements for
- * this function MUST NOT RETURN, or the program will likely crash.  This
- * function is used by default, or if the program supplies NULL for the
- * error function pointer in png_set_error_fn().
- */
-static PNG_FUNCTION(void /* PRIVATE */,
-png_default_error,(png_structp png_ptr, png_const_charp error_message),
-   PNG_NORETURN)
-{
-#ifdef PNG_CONSOLE_IO_SUPPORTED
-#ifdef PNG_ERROR_NUMBERS_SUPPORTED
-   if (*error_message == PNG_LITERAL_SHARP)
-   {
-      /* Strip "#nnnn " from beginning of error message. */
-      int offset;
-      char error_number[16];
-      for (offset = 0; offset<15; offset++)
-      {
-         error_number[offset] = error_message[offset + 1];
-         if (error_message[offset] == ' ')
-            break;
-      }
-
-      if ((offset > 1) && (offset < 15))
-      {
-         error_number[offset - 1] = '\0';
-         fprintf(stderr, "libpng error no. %s: %s",
-             error_number, error_message + offset + 1);
-         fprintf(stderr, PNG_STRING_NEWLINE);
-      }
-
-      else
-      {
-         fprintf(stderr, "libpng error: %s, offset=%d",
-             error_message, offset);
-         fprintf(stderr, PNG_STRING_NEWLINE);
-      }
-   }
-   else
-#endif
-   {
-      fprintf(stderr, "libpng error: %s", error_message);
-      fprintf(stderr, PNG_STRING_NEWLINE);
-   }
-#endif
-#ifndef PNG_CONSOLE_IO_SUPPORTED
-   PNG_UNUSED(error_message) /* Make compiler happy */
-#endif
-   png_longjmp(png_ptr, 1);
-}
-
-PNG_FUNCTION(void,PNGAPI
-png_longjmp,(png_structp png_ptr, int val),PNG_NORETURN)
-{
-#ifdef PNG_SETJMP_SUPPORTED
-   if (png_ptr && png_ptr->longjmp_fn)
-   {
-#  ifdef USE_FAR_KEYWORD
-      {
-         jmp_buf png_jmpbuf;
-         png_memcpy(png_jmpbuf, png_ptr->png_jmpbuf, png_sizeof(jmp_buf));
-         png_ptr->longjmp_fn(png_jmpbuf, val);
-      }
-
-#  else
-   png_ptr->longjmp_fn(png_ptr->png_jmpbuf, val);
-#  endif
-   }
-#endif
-   /* Here if not setjmp support or if png_ptr is null. */
-   PNG_ABORT();
-}
-
-#ifdef PNG_WARNINGS_SUPPORTED
-/* This function is called when there is a warning, but the library thinks
- * it can continue anyway.  Replacement functions don't have to do anything
- * here if you don't want them to.  In the default configuration, png_ptr is
- * not used, but it is passed in case it may be useful.
- */
-static void /* PRIVATE */
-png_default_warning(png_structp png_ptr, png_const_charp warning_message)
-{
-#ifdef PNG_CONSOLE_IO_SUPPORTED
-#  ifdef PNG_ERROR_NUMBERS_SUPPORTED
-   if (*warning_message == PNG_LITERAL_SHARP)
-   {
-      int offset;
-      char warning_number[16];
-      for (offset = 0; offset < 15; offset++)
-      {
-         warning_number[offset] = warning_message[offset + 1];
-         if (warning_message[offset] == ' ')
-            break;
-      }
-
-      if ((offset > 1) && (offset < 15))
-      {
-         warning_number[offset + 1] = '\0';
-         fprintf(stderr, "libpng warning no. %s: %s",
-             warning_number, warning_message + offset);
-         fprintf(stderr, PNG_STRING_NEWLINE);
-      }
-
-      else
-      {
-         fprintf(stderr, "libpng warning: %s",
-             warning_message);
-         fprintf(stderr, PNG_STRING_NEWLINE);
-      }
-   }
-   else
-#  endif
-
-   {
-      fprintf(stderr, "libpng warning: %s", warning_message);
-      fprintf(stderr, PNG_STRING_NEWLINE);
-   }
-#else
-   PNG_UNUSED(warning_message) /* Make compiler happy */
-#endif
-   PNG_UNUSED(png_ptr) /* Make compiler happy */
-}
-#endif /* PNG_WARNINGS_SUPPORTED */
-
-/* This function is called when the application wants to use another method
- * of handling errors and warnings.  Note that the error function MUST NOT
- * return to the calling routine or serious problems will occur.  The return
- * method used in the default routine calls longjmp(png_ptr->png_jmpbuf, 1)
- */
-void PNGAPI
-png_set_error_fn(png_structp png_ptr, png_voidp error_ptr,
-    png_error_ptr error_fn, png_error_ptr warning_fn)
-{
-   if (png_ptr == NULL)
-      return;
-
-   png_ptr->error_ptr = error_ptr;
-   png_ptr->error_fn = error_fn;
-   png_ptr->warning_fn = warning_fn;
-}
-
-
-/* This function returns a pointer to the error_ptr associated with the user
- * functions.  The application should free any memory associated with this
- * pointer before png_write_destroy and png_read_destroy are called.
- */
-png_voidp PNGAPI
-png_get_error_ptr(png_const_structp png_ptr)
-{
-   if (png_ptr == NULL)
-      return NULL;
-
-   return ((png_voidp)png_ptr->error_ptr);
-}
-
-
-#ifdef PNG_ERROR_NUMBERS_SUPPORTED
-void PNGAPI
-png_set_strip_error_numbers(png_structp png_ptr, png_uint_32 strip_mode)
-{
-   if (png_ptr != NULL)
-   {
-      png_ptr->flags &=
-         ((~(PNG_FLAG_STRIP_ERROR_NUMBERS |
-         PNG_FLAG_STRIP_ERROR_TEXT))&strip_mode);
-   }
-}
-#endif
-#endif /* PNG_READ_SUPPORTED || PNG_WRITE_SUPPORTED */
+
+/* pngerror.c - stub functions for i/o and memory allocation
+ *
+ * Last changed in libpng 1.2.45 [July 7, 2011]
+ * Copyright (c) 1998-2011 Glenn Randers-Pehrson
+ * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
+ * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
+ *
+ * This code is released under the libpng license.
+ * For conditions of distribution and use, see the disclaimer
+ * and license in png.h
+ *
+ * This file provides a location for all error handling.  Users who
+ * need special error handling are expected to write replacement functions
+ * and use png_set_error_fn() to use those functions.  See the instructions
+ * at each function.
+ */
+
+#define PNG_INTERNAL
+#define PNG_NO_PEDANTIC_WARNINGS
+#include "png.h"
+#if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED)
+
+static void /* PRIVATE */
+png_default_error PNGARG((png_structp png_ptr,
+  png_const_charp error_message)) PNG_NORETURN;
+#ifdef PNG_WARNINGS_SUPPORTED
+static void /* PRIVATE */
+png_default_warning PNGARG((png_structp png_ptr,
+  png_const_charp warning_message));
+#endif /* PNG_WARNINGS_SUPPORTED */
+
+/* This function is called whenever there is a fatal error.  This function
+ * should not be changed.  If there is a need to handle errors differently,
+ * you should supply a replacement error function and use png_set_error_fn()
+ * to replace the error function at run-time.
+ */
+#ifdef PNG_ERROR_TEXT_SUPPORTED
+void PNGAPI
+png_error(png_structp png_ptr, png_const_charp error_message)
+{
+#ifdef PNG_ERROR_NUMBERS_SUPPORTED
+   char msg[16];
+   if (png_ptr != NULL)
+   {
+     if (png_ptr->flags&
+       (PNG_FLAG_STRIP_ERROR_NUMBERS|PNG_FLAG_STRIP_ERROR_TEXT))
+     {
+       if (*error_message == PNG_LITERAL_SHARP)
+       {
+           /* Strip "#nnnn " from beginning of error message. */
+           int offset;
+           for (offset = 1; offset<15; offset++)
+              if (error_message[offset] == ' ')
+                  break;
+           if (png_ptr->flags&PNG_FLAG_STRIP_ERROR_TEXT)
+           {
+              int i;
+              for (i = 0; i < offset - 1; i++)
+                 msg[i] = error_message[i + 1];
+              msg[i - 1] = '\0';
+              error_message = msg;
+           }
+           else
+              error_message += offset;
+       }
+       else
+       {
+           if (png_ptr->flags&PNG_FLAG_STRIP_ERROR_TEXT)
+           {
+              msg[0] = '0';
+              msg[1] = '\0';
+              error_message = msg;
+           }
+       }
+     }
+   }
+#endif
+   if (png_ptr != NULL && png_ptr->error_fn != NULL)
+      (*(png_ptr->error_fn))(png_ptr, error_message);
+
+   /* If the custom handler doesn't exist, or if it returns,
+      use the default handler, which will not return. */
+   png_default_error(png_ptr, error_message);
+}
+#else
+void PNGAPI
+png_err(png_structp png_ptr)
+{
+   /* Prior to 1.2.45 the error_fn received a NULL pointer, expressed
+    * erroneously as '\0', instead of the empty string "".  This was
+    * apparently an error, introduced in libpng-1.2.20, and png_default_error
+    * will crash in this case.
+    */
+   if (png_ptr != NULL && png_ptr->error_fn != NULL)
+      (*(png_ptr->error_fn))(png_ptr, "");
+
+   /* If the custom handler doesn't exist, or if it returns,
+      use the default handler, which will not return. */
+   png_default_error(png_ptr, "");
+}
+#endif /* PNG_ERROR_TEXT_SUPPORTED */
+
+#ifdef PNG_WARNINGS_SUPPORTED
+/* This function is called whenever there is a non-fatal error.  This function
+ * should not be changed.  If there is a need to handle warnings differently,
+ * you should supply a replacement warning function and use
+ * png_set_error_fn() to replace the warning function at run-time.
+ */
+void PNGAPI
+png_warning(png_structp png_ptr, png_const_charp warning_message)
+{
+   int offset = 0;
+   if (png_ptr != NULL)
+   {
+#ifdef PNG_ERROR_NUMBERS_SUPPORTED
+   if (png_ptr->flags&
+     (PNG_FLAG_STRIP_ERROR_NUMBERS|PNG_FLAG_STRIP_ERROR_TEXT))
+#endif
+     {
+       if (*warning_message == PNG_LITERAL_SHARP)
+       {
+           for (offset = 1; offset < 15; offset++)
+              if (warning_message[offset] == ' ')
+                  break;
+       }
+     }
+   }
+   if (png_ptr != NULL && png_ptr->warning_fn != NULL)
+      (*(png_ptr->warning_fn))(png_ptr, warning_message + offset);
+   else
+      png_default_warning(png_ptr, warning_message + offset);
+}
+#endif /* PNG_WARNINGS_SUPPORTED */
+
+#ifdef PNG_BENIGN_ERRORS_SUPPORTED
+void PNGAPI
+png_benign_error(png_structp png_ptr, png_const_charp error_message)
+{
+  if (png_ptr->flags & PNG_FLAG_BENIGN_ERRORS_WARN)
+    png_warning(png_ptr, error_message);
+  else
+    png_error(png_ptr, error_message);
+}
+#endif
+
+/* These utilities are used internally to build an error message that relates
+ * to the current chunk.  The chunk name comes from png_ptr->chunk_name,
+ * this is used to prefix the message.  The message is limited in length
+ * to 63 bytes, the name characters are output as hex digits wrapped in []
+ * if the character is invalid.
+ */
+#define isnonalpha(c) ((c) < 65 || (c) > 122 || ((c) > 90 && (c) < 97))
+static PNG_CONST char png_digit[16] = {
+   '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
+   'A', 'B', 'C', 'D', 'E', 'F'
+};
+
+#define PNG_MAX_ERROR_TEXT 64
+#if defined(PNG_WARNINGS_SUPPORTED) || defined(PNG_ERROR_TEXT_SUPPORTED)
+static void /* PRIVATE */
+png_format_buffer(png_structp png_ptr, png_charp buffer, png_const_charp
+   error_message)
+{
+   int iout = 0, iin = 0;
+
+   while (iin < 4)
+   {
+      int c = png_ptr->chunk_name[iin++];
+      if (isnonalpha(c))
+      {
+         buffer[iout++] = PNG_LITERAL_LEFT_SQUARE_BRACKET;
+         buffer[iout++] = png_digit[(c & 0xf0) >> 4];
+         buffer[iout++] = png_digit[c & 0x0f];
+         buffer[iout++] = PNG_LITERAL_RIGHT_SQUARE_BRACKET;
+      }
+      else
+      {
+         buffer[iout++] = (png_byte)c;
+      }
+   }
+
+   if (error_message == NULL)
+      buffer[iout] = '\0';
+   else
+   {
+      buffer[iout++] = ':';
+      buffer[iout++] = ' ';
+
+      iin = 0;
+      while (iin < PNG_MAX_ERROR_TEXT-1 && error_message[iin] != '\0')
+         buffer[iout++] = error_message[iin++];
+
+      /* iin < PNG_MAX_ERROR_TEXT, so the following is safe: */
+      buffer[iout] = '\0';
+   }
+}
+
+#ifdef PNG_READ_SUPPORTED
+void PNGAPI
+png_chunk_error(png_structp png_ptr, png_const_charp error_message)
+{
+   char msg[18+PNG_MAX_ERROR_TEXT];
+   if (png_ptr == NULL)
+     png_error(png_ptr, error_message);
+   else
+   {
+     png_format_buffer(png_ptr, msg, error_message);
+     png_error(png_ptr, msg);
+   }
+}
+#endif /* PNG_READ_SUPPORTED */
+#endif /* PNG_WARNINGS_SUPPORTED || PNG_ERROR_TEXT_SUPPORTED */
+
+#ifdef PNG_WARNINGS_SUPPORTED
+void PNGAPI
+png_chunk_warning(png_structp png_ptr, png_const_charp warning_message)
+{
+   char msg[18+PNG_MAX_ERROR_TEXT];
+   if (png_ptr == NULL)
+     png_warning(png_ptr, warning_message);
+   else
+   {
+     png_format_buffer(png_ptr, msg, warning_message);
+     png_warning(png_ptr, msg);
+   }
+}
+#endif /* PNG_WARNINGS_SUPPORTED */
+
+#ifdef PNG_READ_SUPPORTED
+#ifdef PNG_BENIGN_ERRORS_SUPPORTED
+void PNGAPI
+png_chunk_benign_error(png_structp png_ptr, png_const_charp error_message)
+{
+  if (png_ptr->flags & PNG_FLAG_BENIGN_ERRORS_WARN)
+    png_chunk_warning(png_ptr, error_message);
+  else
+    png_chunk_error(png_ptr, error_message);
+}
+#endif
+#endif /* PNG_READ_SUPPORTED */
+
+/* This is the default error handling function.  Note that replacements for
+ * this function MUST NOT RETURN, or the program will likely crash.  This
+ * function is used by default, or if the program supplies NULL for the
+ * error function pointer in png_set_error_fn().
+ */
+static void /* PRIVATE */
+png_default_error(png_structp png_ptr, png_const_charp error_message)
+{
+#ifdef PNG_CONSOLE_IO_SUPPORTED
+#ifdef PNG_ERROR_NUMBERS_SUPPORTED
+   if (*error_message == PNG_LITERAL_SHARP)
+   {
+     /* Strip "#nnnn " from beginning of error message. */
+     int offset;
+     char error_number[16];
+     for (offset = 0; offset<15; offset++)
+     {
+         error_number[offset] = error_message[offset + 1];
+         if (error_message[offset] == ' ')
+             break;
+     }
+     if ((offset > 1) && (offset < 15))
+     {
+       error_number[offset - 1] = '\0';
+       fprintf(stderr, "libpng error no. %s: %s",
+          error_number, error_message + offset + 1);
+       fprintf(stderr, PNG_STRING_NEWLINE);
+     }
+     else
+     {
+       fprintf(stderr, "libpng error: %s, offset=%d",
+          error_message, offset);
+       fprintf(stderr, PNG_STRING_NEWLINE);
+     }
+   }
+   else
+#endif
+   {
+      fprintf(stderr, "libpng error: %s", error_message);
+      fprintf(stderr, PNG_STRING_NEWLINE);
+   }
+#endif
+
+#ifdef PNG_SETJMP_SUPPORTED
+   if (png_ptr)
+   {
+#  ifdef USE_FAR_KEYWORD
+   {
+      jmp_buf jmpbuf;
+      png_memcpy(jmpbuf, png_ptr->jmpbuf, png_sizeof(jmp_buf));
+     longjmp(jmpbuf,1);
+   }
+#  else
+   longjmp(png_ptr->jmpbuf, 1);
+#  endif
+   }
+#endif
+   /* Here if not setjmp support or if png_ptr is null. */
+   PNG_ABORT();
+#ifndef PNG_CONSOLE_IO_SUPPORTED
+   error_message = error_message; /* Make compiler happy */
+#endif
+}
+
+#ifdef PNG_WARNINGS_SUPPORTED
+/* This function is called when there is a warning, but the library thinks
+ * it can continue anyway.  Replacement functions don't have to do anything
+ * here if you don't want them to.  In the default configuration, png_ptr is
+ * not used, but it is passed in case it may be useful.
+ */
+static void /* PRIVATE */
+png_default_warning(png_structp png_ptr, png_const_charp warning_message)
+{
+#ifdef PNG_CONSOLE_IO_SUPPORTED
+#  ifdef PNG_ERROR_NUMBERS_SUPPORTED
+   if (*warning_message == PNG_LITERAL_SHARP)
+   {
+     int offset;
+     char warning_number[16];
+     for (offset = 0; offset < 15; offset++)
+     {
+        warning_number[offset] = warning_message[offset + 1];
+        if (warning_message[offset] == ' ')
+            break;
+     }
+     if ((offset > 1) && (offset < 15))
+     {
+       warning_number[offset + 1] = '\0';
+       fprintf(stderr, "libpng warning no. %s: %s",
+          warning_number, warning_message + offset);
+       fprintf(stderr, PNG_STRING_NEWLINE);
+     }
+     else
+     {
+       fprintf(stderr, "libpng warning: %s",
+          warning_message);
+       fprintf(stderr, PNG_STRING_NEWLINE);
+     }
+   }
+   else
+#  endif
+   {
+     fprintf(stderr, "libpng warning: %s", warning_message);
+     fprintf(stderr, PNG_STRING_NEWLINE);
+   }
+#else
+   warning_message = warning_message; /* Make compiler happy */
+#endif
+   png_ptr = png_ptr; /* Make compiler happy */
+}
+#endif /* PNG_WARNINGS_SUPPORTED */
+
+/* This function is called when the application wants to use another method
+ * of handling errors and warnings.  Note that the error function MUST NOT
+ * return to the calling routine or serious problems will occur.  The return
+ * method used in the default routine calls longjmp(png_ptr->jmpbuf, 1)
+ */
+void PNGAPI
+png_set_error_fn(png_structp png_ptr, png_voidp error_ptr,
+   png_error_ptr error_fn, png_error_ptr warning_fn)
+{
+   if (png_ptr == NULL)
+      return;
+   png_ptr->error_ptr = error_ptr;
+   png_ptr->error_fn = error_fn;
+   png_ptr->warning_fn = warning_fn;
+}
+
+
+/* This function returns a pointer to the error_ptr associated with the user
+ * functions.  The application should free any memory associated with this
+ * pointer before png_write_destroy and png_read_destroy are called.
+ */
+png_voidp PNGAPI
+png_get_error_ptr(png_structp png_ptr)
+{
+   if (png_ptr == NULL)
+      return NULL;
+   return ((png_voidp)png_ptr->error_ptr);
+}
+
+
+#ifdef PNG_ERROR_NUMBERS_SUPPORTED
+void PNGAPI
+png_set_strip_error_numbers(png_structp png_ptr, png_uint_32 strip_mode)
+{
+   if (png_ptr != NULL)
+   {
+     png_ptr->flags &=
+       ((~(PNG_FLAG_STRIP_ERROR_NUMBERS|PNG_FLAG_STRIP_ERROR_TEXT))&strip_mode);
+   }
+}
+#endif
+#endif /* PNG_READ_SUPPORTED || PNG_WRITE_SUPPORTED */
diff --git a/Externals/libpng/pnggccrd.c b/Externals/libpng/pnggccrd.c
new file mode 100644
index 0000000000..074df593fe
--- /dev/null
+++ b/Externals/libpng/pnggccrd.c
@@ -0,0 +1,26 @@
+/* pnggccrd.c
+ *
+ * Last changed in libpng 1.2.48 [March 8, 2012]
+ * Copyright (c) 1998-2012 Glenn Randers-Pehrson
+ *
+ * This code is released under the libpng license.
+ * For conditions of distribution and use, see the disclaimer
+ * and license in png.h
+ *
+ * This code snippet is for use by configure's compilation test. Most of the
+ * remainder of the file was removed from libpng-1.2.20, and all of the
+ * assembler code was removed from libpng-1.2.48.
+ */
+
+#if (!defined _MSC_VER) && \
+    defined(PNG_ASSEMBLER_CODE_SUPPORTED) && \
+    defined(PNG_MMX_CODE_SUPPORTED)
+
+int PNGAPI png_dummy_mmx_support(void);
+
+int PNGAPI png_dummy_mmx_support(void)
+{
+     /* 0: no MMX; 1: MMX supported; 2: not tested */
+     return 2;
+}
+#endif
diff --git a/Externals/libpng/pngget.c b/Externals/libpng/pngget.c
index b5e5798c02..e46495f205 100644
--- a/Externals/libpng/pngget.c
+++ b/Externals/libpng/pngget.c
@@ -1,1032 +1,944 @@
-
-/* pngget.c - retrieval of values from info struct
- *
- * Last changed in libpng 1.5.1 [February 3, 2011]
- * Copyright (c) 1998-2011 Glenn Randers-Pehrson
- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
- *
- * This code is released under the libpng license.
- * For conditions of distribution and use, see the disclaimer
- * and license in png.h
- *
- */
-
-#include "pngpriv.h"
-
-#if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED)
-
-png_uint_32 PNGAPI
-png_get_valid(png_const_structp png_ptr, png_const_infop info_ptr,
-    png_uint_32 flag)
-{
-   if (png_ptr != NULL && info_ptr != NULL)
-      return(info_ptr->valid & flag);
-
-   return(0);
-}
-
-png_size_t PNGAPI
-png_get_rowbytes(png_const_structp png_ptr, png_const_infop info_ptr)
-{
-   if (png_ptr != NULL && info_ptr != NULL)
-      return(info_ptr->rowbytes);
-
-   return(0);
-}
-
-#ifdef PNG_INFO_IMAGE_SUPPORTED
-png_bytepp PNGAPI
-png_get_rows(png_const_structp png_ptr, png_const_infop info_ptr)
-{
-   if (png_ptr != NULL && info_ptr != NULL)
-      return(info_ptr->row_pointers);
-
-   return(0);
-}
-#endif
-
-#ifdef PNG_EASY_ACCESS_SUPPORTED
-/* Easy access to info, added in libpng-0.99 */
-png_uint_32 PNGAPI
-png_get_image_width(png_const_structp png_ptr, png_const_infop info_ptr)
-{
-   if (png_ptr != NULL && info_ptr != NULL)
-      return info_ptr->width;
-
-   return (0);
-}
-
-png_uint_32 PNGAPI
-png_get_image_height(png_const_structp png_ptr, png_const_infop info_ptr)
-{
-   if (png_ptr != NULL && info_ptr != NULL)
-      return info_ptr->height;
-
-   return (0);
-}
-
-png_byte PNGAPI
-png_get_bit_depth(png_const_structp png_ptr, png_const_infop info_ptr)
-{
-   if (png_ptr != NULL && info_ptr != NULL)
-      return info_ptr->bit_depth;
-
-   return (0);
-}
-
-png_byte PNGAPI
-png_get_color_type(png_const_structp png_ptr, png_const_infop info_ptr)
-{
-   if (png_ptr != NULL && info_ptr != NULL)
-      return info_ptr->color_type;
-
-   return (0);
-}
-
-png_byte PNGAPI
-png_get_filter_type(png_const_structp png_ptr, png_const_infop info_ptr)
-{
-   if (png_ptr != NULL && info_ptr != NULL)
-      return info_ptr->filter_type;
-
-   return (0);
-}
-
-png_byte PNGAPI
-png_get_interlace_type(png_const_structp png_ptr, png_const_infop info_ptr)
-{
-   if (png_ptr != NULL && info_ptr != NULL)
-      return info_ptr->interlace_type;
-
-   return (0);
-}
-
-png_byte PNGAPI
-png_get_compression_type(png_const_structp png_ptr, png_const_infop info_ptr)
-{
-   if (png_ptr != NULL && info_ptr != NULL)
-      return info_ptr->compression_type;
-
-   return (0);
-}
-
-png_uint_32 PNGAPI
-png_get_x_pixels_per_meter(png_const_structp png_ptr, png_const_infop info_ptr)
-{
-#ifdef PNG_pHYs_SUPPORTED
-   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_pHYs))
-      {
-         png_debug1(1, "in %s retrieval function",
-             "png_get_x_pixels_per_meter");
-
-         if (info_ptr->phys_unit_type == PNG_RESOLUTION_METER)
-            return (info_ptr->x_pixels_per_unit);
-      }
-#endif
-
-   return (0);
-}
-
-png_uint_32 PNGAPI
-png_get_y_pixels_per_meter(png_const_structp png_ptr, png_const_infop info_ptr)
-{
-#ifdef PNG_pHYs_SUPPORTED
-   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_pHYs))
-   {
-      png_debug1(1, "in %s retrieval function",
-          "png_get_y_pixels_per_meter");
-
-      if (info_ptr->phys_unit_type == PNG_RESOLUTION_METER)
-         return (info_ptr->y_pixels_per_unit);
-   }
-#endif
-
-   return (0);
-}
-
-png_uint_32 PNGAPI
-png_get_pixels_per_meter(png_const_structp png_ptr, png_const_infop info_ptr)
-{
-#ifdef PNG_pHYs_SUPPORTED
-   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_pHYs))
-   {
-      png_debug1(1, "in %s retrieval function", "png_get_pixels_per_meter");
-
-      if (info_ptr->phys_unit_type == PNG_RESOLUTION_METER &&
-          info_ptr->x_pixels_per_unit == info_ptr->y_pixels_per_unit)
-         return (info_ptr->x_pixels_per_unit);
-   }
-#endif
-
-   return (0);
-}
-
-#ifdef PNG_FLOATING_POINT_SUPPORTED
-float PNGAPI
-png_get_pixel_aspect_ratio(png_const_structp png_ptr, png_const_infop info_ptr)
-{
-#ifdef PNG_READ_pHYs_SUPPORTED
-   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_pHYs))
-   {
-      png_debug1(1, "in %s retrieval function", "png_get_aspect_ratio");
-
-      if (info_ptr->x_pixels_per_unit != 0)
-         return ((float)((float)info_ptr->y_pixels_per_unit
-             /(float)info_ptr->x_pixels_per_unit));
-   }
-#endif
-
-   return ((float)0.0);
-}
-#endif
-
-#ifdef PNG_FIXED_POINT_SUPPORTED
-png_fixed_point PNGAPI
-png_get_pixel_aspect_ratio_fixed(png_const_structp png_ptr,
-    png_const_infop info_ptr)
-{
-#ifdef PNG_READ_pHYs_SUPPORTED
-   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_pHYs)
-       && info_ptr->x_pixels_per_unit > 0 && info_ptr->y_pixels_per_unit > 0
-       && info_ptr->x_pixels_per_unit <= PNG_UINT_31_MAX
-       && info_ptr->y_pixels_per_unit <= PNG_UINT_31_MAX)
-   {
-      png_fixed_point res;
-
-      png_debug1(1, "in %s retrieval function", "png_get_aspect_ratio_fixed");
-
-      /* The following casts work because a PNG 4 byte integer only has a valid
-       * range of 0..2^31-1; otherwise the cast might overflow.
-       */
-      if (png_muldiv(&res, (png_int_32)info_ptr->y_pixels_per_unit, PNG_FP_1,
-          (png_int_32)info_ptr->x_pixels_per_unit))
-         return res;
-   }
-#endif
-
-   return 0;
-}
-#endif
-
-png_int_32 PNGAPI
-png_get_x_offset_microns(png_const_structp png_ptr, png_const_infop info_ptr)
-{
-#ifdef PNG_oFFs_SUPPORTED
-   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_oFFs))
-   {
-      png_debug1(1, "in %s retrieval function", "png_get_x_offset_microns");
-
-      if (info_ptr->offset_unit_type == PNG_OFFSET_MICROMETER)
-         return (info_ptr->x_offset);
-   }
-#endif
-
-   return (0);
-}
-
-png_int_32 PNGAPI
-png_get_y_offset_microns(png_const_structp png_ptr, png_const_infop info_ptr)
-{
-#ifdef PNG_oFFs_SUPPORTED
-   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_oFFs))
-   {
-      png_debug1(1, "in %s retrieval function", "png_get_y_offset_microns");
-
-      if (info_ptr->offset_unit_type == PNG_OFFSET_MICROMETER)
-         return (info_ptr->y_offset);
-   }
-#endif
-
-   return (0);
-}
-
-png_int_32 PNGAPI
-png_get_x_offset_pixels(png_const_structp png_ptr, png_const_infop info_ptr)
-{
-#ifdef PNG_oFFs_SUPPORTED
-   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_oFFs))
-   {
-      png_debug1(1, "in %s retrieval function", "png_get_x_offset_pixels");
-
-      if (info_ptr->offset_unit_type == PNG_OFFSET_PIXEL)
-         return (info_ptr->x_offset);
-   }
-#endif
-
-   return (0);
-}
-
-png_int_32 PNGAPI
-png_get_y_offset_pixels(png_const_structp png_ptr, png_const_infop info_ptr)
-{
-#ifdef PNG_oFFs_SUPPORTED
-   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_oFFs))
-   {
-      png_debug1(1, "in %s retrieval function", "png_get_y_offset_pixels");
-
-      if (info_ptr->offset_unit_type == PNG_OFFSET_PIXEL)
-         return (info_ptr->y_offset);
-   }
-#endif
-
-   return (0);
-}
-
-#ifdef PNG_INCH_CONVERSIONS_SUPPORTED
-static png_uint_32
-ppi_from_ppm(png_uint_32 ppm)
-{
-#if 0
-   /* The conversion is *(2.54/100), in binary (32 digits):
-    * .00000110100000001001110101001001
-    */
-   png_uint_32 t1001, t1101;
-   ppm >>= 1;                  /* .1 */
-   t1001 = ppm + (ppm >> 3);   /* .1001 */
-   t1101 = t1001 + (ppm >> 1); /* .1101 */
-   ppm >>= 20;                 /* .000000000000000000001 */
-   t1101 += t1101 >> 15;       /* .1101000000000001101 */
-   t1001 >>= 11;               /* .000000000001001 */
-   t1001 += t1001 >> 12;       /* .000000000001001000000001001 */
-   ppm += t1001;               /* .000000000001001000001001001 */
-   ppm += t1101;               /* .110100000001001110101001001 */
-   return (ppm + 16) >> 5;/* .00000110100000001001110101001001 */
-#else
-   /* The argument is a PNG unsigned integer, so it is not permitted
-    * to be bigger than 2^31.
-    */
-   png_fixed_point result;
-   if (ppm <= PNG_UINT_31_MAX && png_muldiv(&result, (png_int_32)ppm, 127,
-       5000))
-      return result;
-
-   /* Overflow. */
-   return 0;
-#endif
-}
-
-png_uint_32 PNGAPI
-png_get_pixels_per_inch(png_const_structp png_ptr, png_const_infop info_ptr)
-{
-   return ppi_from_ppm(png_get_pixels_per_meter(png_ptr, info_ptr));
-}
-
-png_uint_32 PNGAPI
-png_get_x_pixels_per_inch(png_const_structp png_ptr, png_const_infop info_ptr)
-{
-   return ppi_from_ppm(png_get_x_pixels_per_meter(png_ptr, info_ptr));
-}
-
-png_uint_32 PNGAPI
-png_get_y_pixels_per_inch(png_const_structp png_ptr, png_const_infop info_ptr)
-{
-   return ppi_from_ppm(png_get_y_pixels_per_meter(png_ptr, info_ptr));
-}
-
-#ifdef PNG_FIXED_POINT_SUPPORTED
-static png_fixed_point
-png_fixed_inches_from_microns(png_structp png_ptr, png_int_32 microns)
-{
-   /* Convert from metres * 1,000,000 to inches * 100,000, meters to
-    * inches is simply *(100/2.54), so we want *(10/2.54) == 500/127.
-    * Notice that this can overflow - a warning is output and 0 is
-    * returned.
-    */
-   return png_muldiv_warn(png_ptr, microns, 500, 127);
-}
-
-png_fixed_point PNGAPI
-png_get_x_offset_inches_fixed(png_structp png_ptr,
-    png_const_infop info_ptr)
-{
-   return png_fixed_inches_from_microns(png_ptr,
-       png_get_x_offset_microns(png_ptr, info_ptr));
-}
-#endif
-
-#ifdef PNG_FIXED_POINT_SUPPORTED
-png_fixed_point PNGAPI
-png_get_y_offset_inches_fixed(png_structp png_ptr,
-    png_const_infop info_ptr)
-{
-   return png_fixed_inches_from_microns(png_ptr,
-       png_get_y_offset_microns(png_ptr, info_ptr));
-}
-#endif
-
-#ifdef PNG_FLOATING_POINT_SUPPORTED
-float PNGAPI
-png_get_x_offset_inches(png_const_structp png_ptr, png_const_infop info_ptr)
-{
-   /* To avoid the overflow do the conversion directly in floating
-    * point.
-    */
-   return (float)(png_get_x_offset_microns(png_ptr, info_ptr) * .00003937);
-}
-#endif
-
-#ifdef PNG_FLOATING_POINT_SUPPORTED
-float PNGAPI
-png_get_y_offset_inches(png_const_structp png_ptr, png_const_infop info_ptr)
-{
-   /* To avoid the overflow do the conversion directly in floating
-    * point.
-    */
-   return (float)(png_get_y_offset_microns(png_ptr, info_ptr) * .00003937);
-}
-#endif
-
-#ifdef PNG_pHYs_SUPPORTED
-png_uint_32 PNGAPI
-png_get_pHYs_dpi(png_const_structp png_ptr, png_const_infop info_ptr,
-    png_uint_32 *res_x, png_uint_32 *res_y, int *unit_type)
-{
-   png_uint_32 retval = 0;
-
-   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_pHYs))
-   {
-      png_debug1(1, "in %s retrieval function", "pHYs");
-
-      if (res_x != NULL)
-      {
-         *res_x = info_ptr->x_pixels_per_unit;
-         retval |= PNG_INFO_pHYs;
-      }
-
-      if (res_y != NULL)
-      {
-         *res_y = info_ptr->y_pixels_per_unit;
-         retval |= PNG_INFO_pHYs;
-      }
-
-      if (unit_type != NULL)
-      {
-         *unit_type = (int)info_ptr->phys_unit_type;
-         retval |= PNG_INFO_pHYs;
-
-         if (*unit_type == 1)
-         {
-            if (res_x != NULL) *res_x = (png_uint_32)(*res_x * .0254 + .50);
-            if (res_y != NULL) *res_y = (png_uint_32)(*res_y * .0254 + .50);
-         }
-      }
-   }
-
-   return (retval);
-}
-#endif /* PNG_pHYs_SUPPORTED */
-#endif  /* PNG_INCH_CONVERSIONS_SUPPORTED */
-
-/* png_get_channels really belongs in here, too, but it's been around longer */
-
-#endif  /* PNG_EASY_ACCESS_SUPPORTED */
-
-png_byte PNGAPI
-png_get_channels(png_const_structp png_ptr, png_const_infop info_ptr)
-{
-   if (png_ptr != NULL && info_ptr != NULL)
-      return(info_ptr->channels);
-
-   return (0);
-}
-
-png_const_bytep PNGAPI
-png_get_signature(png_const_structp png_ptr, png_infop info_ptr)
-{
-   if (png_ptr != NULL && info_ptr != NULL)
-      return(info_ptr->signature);
-
-   return (NULL);
-}
-
-#ifdef PNG_bKGD_SUPPORTED
-png_uint_32 PNGAPI
-png_get_bKGD(png_const_structp png_ptr, png_infop info_ptr,
-   png_color_16p *background)
-{
-   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_bKGD)
-       && background != NULL)
-   {
-      png_debug1(1, "in %s retrieval function", "bKGD");
-
-      *background = &(info_ptr->background);
-      return (PNG_INFO_bKGD);
-   }
-
-   return (0);
-}
-#endif
-
-#ifdef PNG_cHRM_SUPPORTED
-#  ifdef PNG_FLOATING_POINT_SUPPORTED
-png_uint_32 PNGAPI
-png_get_cHRM(png_const_structp png_ptr, png_const_infop info_ptr,
-    double *white_x, double *white_y, double *red_x, double *red_y,
-    double *green_x, double *green_y, double *blue_x, double *blue_y)
-{
-   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_cHRM))
-   {
-      png_debug1(1, "in %s retrieval function", "cHRM");
-
-      if (white_x != NULL)
-         *white_x = png_float(png_ptr, info_ptr->x_white, "cHRM white X");
-      if (white_y != NULL)
-         *white_y = png_float(png_ptr, info_ptr->y_white, "cHRM white Y");
-      if (red_x != NULL)
-         *red_x = png_float(png_ptr, info_ptr->x_red, "cHRM red X");
-      if (red_y != NULL)
-         *red_y = png_float(png_ptr, info_ptr->y_red, "cHRM red Y");
-      if (green_x != NULL)
-         *green_x = png_float(png_ptr, info_ptr->x_green, "cHRM green X");
-      if (green_y != NULL)
-         *green_y = png_float(png_ptr, info_ptr->y_green, "cHRM green Y");
-      if (blue_x != NULL)
-         *blue_x = png_float(png_ptr, info_ptr->x_blue, "cHRM blue X");
-      if (blue_y != NULL)
-         *blue_y = png_float(png_ptr, info_ptr->y_blue, "cHRM blue Y");
-      return (PNG_INFO_cHRM);
-   }
-
-   return (0);
-}
-#  endif
-
-#  ifdef PNG_FIXED_POINT_SUPPORTED
-png_uint_32 PNGAPI
-png_get_cHRM_fixed(png_const_structp png_ptr, png_const_infop info_ptr,
-    png_fixed_point *white_x, png_fixed_point *white_y, png_fixed_point *red_x,
-    png_fixed_point *red_y, png_fixed_point *green_x, png_fixed_point *green_y,
-    png_fixed_point *blue_x, png_fixed_point *blue_y)
-{
-   png_debug1(1, "in %s retrieval function", "cHRM");
-
-   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_cHRM))
-   {
-      if (white_x != NULL)
-         *white_x = info_ptr->x_white;
-      if (white_y != NULL)
-         *white_y = info_ptr->y_white;
-      if (red_x != NULL)
-         *red_x = info_ptr->x_red;
-      if (red_y != NULL)
-         *red_y = info_ptr->y_red;
-      if (green_x != NULL)
-         *green_x = info_ptr->x_green;
-      if (green_y != NULL)
-         *green_y = info_ptr->y_green;
-      if (blue_x != NULL)
-         *blue_x = info_ptr->x_blue;
-      if (blue_y != NULL)
-         *blue_y = info_ptr->y_blue;
-      return (PNG_INFO_cHRM);
-   }
-
-   return (0);
-}
-#  endif
-#endif
-
-#ifdef PNG_gAMA_SUPPORTED
-png_uint_32 PNGFAPI
-png_get_gAMA_fixed(png_const_structp png_ptr, png_const_infop info_ptr,
-    png_fixed_point *file_gamma)
-{
-   png_debug1(1, "in %s retrieval function", "gAMA");
-
-   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_gAMA)
-       && file_gamma != NULL)
-   {
-      *file_gamma = info_ptr->gamma;
-      return (PNG_INFO_gAMA);
-   }
-
-   return (0);
-}
-#  ifdef PNG_FLOATING_POINT_SUPPORTED
-png_uint_32 PNGAPI
-png_get_gAMA(png_const_structp png_ptr, png_const_infop info_ptr,
-    double *file_gamma)
-{
-   png_fixed_point igamma;
-   png_uint_32 ok = png_get_gAMA_fixed(png_ptr, info_ptr, &igamma);
-
-   if (ok)
-      *file_gamma = png_float(png_ptr, igamma, "png_get_gAMA");
-
-   return ok;
-}
-
-#  endif
-#endif
-
-#ifdef PNG_sRGB_SUPPORTED
-png_uint_32 PNGAPI
-png_get_sRGB(png_const_structp png_ptr, png_const_infop info_ptr,
-    int *file_srgb_intent)
-{
-   png_debug1(1, "in %s retrieval function", "sRGB");
-
-   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_sRGB)
-       && file_srgb_intent != NULL)
-   {
-      *file_srgb_intent = (int)info_ptr->srgb_intent;
-      return (PNG_INFO_sRGB);
-   }
-
-   return (0);
-}
-#endif
-
-#ifdef PNG_iCCP_SUPPORTED
-png_uint_32 PNGAPI
-png_get_iCCP(png_const_structp png_ptr, png_const_infop info_ptr,
-    png_charpp name, int *compression_type,
-    png_bytepp profile, png_uint_32 *proflen)
-{
-   png_debug1(1, "in %s retrieval function", "iCCP");
-
-   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_iCCP)
-       && name != NULL && profile != NULL && proflen != NULL)
-   {
-      *name = info_ptr->iccp_name;
-      *profile = info_ptr->iccp_profile;
-      /* Compression_type is a dummy so the API won't have to change
-       * if we introduce multiple compression types later.
-       */
-      *proflen = (int)info_ptr->iccp_proflen;
-      *compression_type = (int)info_ptr->iccp_compression;
-      return (PNG_INFO_iCCP);
-   }
-
-   return (0);
-}
-#endif
-
-#ifdef PNG_sPLT_SUPPORTED
-png_uint_32 PNGAPI
-png_get_sPLT(png_const_structp png_ptr, png_const_infop info_ptr,
-    png_sPLT_tpp spalettes)
-{
-   if (png_ptr != NULL && info_ptr != NULL && spalettes != NULL)
-   {
-      *spalettes = info_ptr->splt_palettes;
-      return ((png_uint_32)info_ptr->splt_palettes_num);
-   }
-
-   return (0);
-}
-#endif
-
-#ifdef PNG_hIST_SUPPORTED
-png_uint_32 PNGAPI
-png_get_hIST(png_const_structp png_ptr, png_const_infop info_ptr,
-    png_uint_16p *hist)
-{
-   png_debug1(1, "in %s retrieval function", "hIST");
-
-   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_hIST)
-       && hist != NULL)
-   {
-      *hist = info_ptr->hist;
-      return (PNG_INFO_hIST);
-   }
-
-   return (0);
-}
-#endif
-
-png_uint_32 PNGAPI
-png_get_IHDR(png_structp png_ptr, png_infop info_ptr,
-    png_uint_32 *width, png_uint_32 *height, int *bit_depth,
-    int *color_type, int *interlace_type, int *compression_type,
-    int *filter_type)
-
-{
-   png_debug1(1, "in %s retrieval function", "IHDR");
-
-   if (png_ptr == NULL || info_ptr == NULL || width == NULL ||
-       height == NULL || bit_depth == NULL || color_type == NULL)
-      return (0);
-
-   *width = info_ptr->width;
-   *height = info_ptr->height;
-   *bit_depth = info_ptr->bit_depth;
-   *color_type = info_ptr->color_type;
-
-   if (compression_type != NULL)
-      *compression_type = info_ptr->compression_type;
-
-   if (filter_type != NULL)
-      *filter_type = info_ptr->filter_type;
-
-   if (interlace_type != NULL)
-      *interlace_type = info_ptr->interlace_type;
-
-   /* This is redundant if we can be sure that the info_ptr values were all
-    * assigned in png_set_IHDR().  We do the check anyhow in case an
-    * application has ignored our advice not to mess with the members
-    * of info_ptr directly.
-    */
-   png_check_IHDR (png_ptr, info_ptr->width, info_ptr->height,
-       info_ptr->bit_depth, info_ptr->color_type, info_ptr->interlace_type,
-       info_ptr->compression_type, info_ptr->filter_type);
-
-   return (1);
-}
-
-#ifdef PNG_oFFs_SUPPORTED
-png_uint_32 PNGAPI
-png_get_oFFs(png_const_structp png_ptr, png_const_infop info_ptr,
-    png_int_32 *offset_x, png_int_32 *offset_y, int *unit_type)
-{
-   png_debug1(1, "in %s retrieval function", "oFFs");
-
-   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_oFFs)
-       && offset_x != NULL && offset_y != NULL && unit_type != NULL)
-   {
-      *offset_x = info_ptr->x_offset;
-      *offset_y = info_ptr->y_offset;
-      *unit_type = (int)info_ptr->offset_unit_type;
-      return (PNG_INFO_oFFs);
-   }
-
-   return (0);
-}
-#endif
-
-#ifdef PNG_pCAL_SUPPORTED
-png_uint_32 PNGAPI
-png_get_pCAL(png_const_structp png_ptr, png_const_infop info_ptr,
-    png_charp *purpose, png_int_32 *X0, png_int_32 *X1, int *type, int *nparams,
-    png_charp *units, png_charpp *params)
-{
-   png_debug1(1, "in %s retrieval function", "pCAL");
-
-   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_pCAL)
-       && purpose != NULL && X0 != NULL && X1 != NULL && type != NULL &&
-       nparams != NULL && units != NULL && params != NULL)
-   {
-      *purpose = info_ptr->pcal_purpose;
-      *X0 = info_ptr->pcal_X0;
-      *X1 = info_ptr->pcal_X1;
-      *type = (int)info_ptr->pcal_type;
-      *nparams = (int)info_ptr->pcal_nparams;
-      *units = info_ptr->pcal_units;
-      *params = info_ptr->pcal_params;
-      return (PNG_INFO_pCAL);
-   }
-
-   return (0);
-}
-#endif
-
-#ifdef PNG_sCAL_SUPPORTED
-#  ifdef PNG_FIXED_POINT_SUPPORTED
-#    ifdef PNG_FLOATING_ARITHMETIC_SUPPORTED
-png_uint_32 PNGAPI
-png_get_sCAL_fixed(png_structp png_ptr, png_const_infop info_ptr,
-    int *unit, png_fixed_point *width, png_fixed_point *height)
-{
-   if (png_ptr != NULL && info_ptr != NULL &&
-       (info_ptr->valid & PNG_INFO_sCAL))
-   {
-      *unit = info_ptr->scal_unit;
-      /*TODO: make this work without FP support */
-      *width = png_fixed(png_ptr, atof(info_ptr->scal_s_width), "sCAL width");
-      *height = png_fixed(png_ptr, atof(info_ptr->scal_s_height),
-         "sCAL height");
-      return (PNG_INFO_sCAL);
-   }
-
-   return(0);
-}
-#    endif /* FLOATING_ARITHMETIC */
-#  endif /* FIXED_POINT */
-#  ifdef PNG_FLOATING_POINT_SUPPORTED
-png_uint_32 PNGAPI
-png_get_sCAL(png_const_structp png_ptr, png_const_infop info_ptr,
-    int *unit, double *width, double *height)
-{
-   if (png_ptr != NULL && info_ptr != NULL &&
-       (info_ptr->valid & PNG_INFO_sCAL))
-   {
-      *unit = info_ptr->scal_unit;
-      *width = atof(info_ptr->scal_s_width);
-      *height = atof(info_ptr->scal_s_height);
-      return (PNG_INFO_sCAL);
-   }
-
-   return(0);
-}
-#  endif /* FLOATING POINT */
-png_uint_32 PNGAPI
-png_get_sCAL_s(png_const_structp png_ptr, png_const_infop info_ptr,
-    int *unit, png_charpp width, png_charpp height)
-{
-   if (png_ptr != NULL && info_ptr != NULL &&
-       (info_ptr->valid & PNG_INFO_sCAL))
-   {
-      *unit = info_ptr->scal_unit;
-      *width = info_ptr->scal_s_width;
-      *height = info_ptr->scal_s_height;
-      return (PNG_INFO_sCAL);
-   }
-
-   return(0);
-}
-#endif /* sCAL */
-
-#ifdef PNG_pHYs_SUPPORTED
-png_uint_32 PNGAPI
-png_get_pHYs(png_const_structp png_ptr, png_const_infop info_ptr,
-    png_uint_32 *res_x, png_uint_32 *res_y, int *unit_type)
-{
-   png_uint_32 retval = 0;
-
-   png_debug1(1, "in %s retrieval function", "pHYs");
-
-   if (png_ptr != NULL && info_ptr != NULL &&
-       (info_ptr->valid & PNG_INFO_pHYs))
-   {
-      if (res_x != NULL)
-      {
-         *res_x = info_ptr->x_pixels_per_unit;
-         retval |= PNG_INFO_pHYs;
-      }
-
-      if (res_y != NULL)
-      {
-         *res_y = info_ptr->y_pixels_per_unit;
-         retval |= PNG_INFO_pHYs;
-      }
-
-      if (unit_type != NULL)
-      {
-         *unit_type = (int)info_ptr->phys_unit_type;
-         retval |= PNG_INFO_pHYs;
-      }
-   }
-
-   return (retval);
-}
-#endif /* pHYs */
-
-png_uint_32 PNGAPI
-png_get_PLTE(png_const_structp png_ptr, png_const_infop info_ptr,
-    png_colorp *palette, int *num_palette)
-{
-   png_debug1(1, "in %s retrieval function", "PLTE");
-
-   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_PLTE)
-       && palette != NULL)
-   {
-      *palette = info_ptr->palette;
-      *num_palette = info_ptr->num_palette;
-      png_debug1(3, "num_palette = %d", *num_palette);
-      return (PNG_INFO_PLTE);
-   }
-
-   return (0);
-}
-
-#ifdef PNG_sBIT_SUPPORTED
-png_uint_32 PNGAPI
-png_get_sBIT(png_const_structp png_ptr, png_infop info_ptr,
-    png_color_8p *sig_bit)
-{
-   png_debug1(1, "in %s retrieval function", "sBIT");
-
-   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_sBIT)
-       && sig_bit != NULL)
-   {
-      *sig_bit = &(info_ptr->sig_bit);
-      return (PNG_INFO_sBIT);
-   }
-
-   return (0);
-}
-#endif
-
-#ifdef PNG_TEXT_SUPPORTED
-png_uint_32 PNGAPI
-png_get_text(png_const_structp png_ptr, png_const_infop info_ptr,
-    png_textp *text_ptr, int *num_text)
-{
-   if (png_ptr != NULL && info_ptr != NULL && info_ptr->num_text > 0)
-   {
-      png_debug1(1, "in %s retrieval function",
-          (png_ptr->chunk_name[0] == '\0' ? "text" :
-          (png_const_charp)png_ptr->chunk_name));
-
-      if (text_ptr != NULL)
-         *text_ptr = info_ptr->text;
-
-      if (num_text != NULL)
-         *num_text = info_ptr->num_text;
-
-      return ((png_uint_32)info_ptr->num_text);
-   }
-
-   if (num_text != NULL)
-      *num_text = 0;
-
-   return(0);
-}
-#endif
-
-#ifdef PNG_tIME_SUPPORTED
-png_uint_32 PNGAPI
-png_get_tIME(png_const_structp png_ptr, png_infop info_ptr, png_timep *mod_time)
-{
-   png_debug1(1, "in %s retrieval function", "tIME");
-
-   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_tIME)
-       && mod_time != NULL)
-   {
-      *mod_time = &(info_ptr->mod_time);
-      return (PNG_INFO_tIME);
-   }
-
-   return (0);
-}
-#endif
-
-#ifdef PNG_tRNS_SUPPORTED
-png_uint_32 PNGAPI
-png_get_tRNS(png_const_structp png_ptr, png_infop info_ptr,
-    png_bytep *trans_alpha, int *num_trans, png_color_16p *trans_color)
-{
-   png_uint_32 retval = 0;
-   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_tRNS))
-   {
-      png_debug1(1, "in %s retrieval function", "tRNS");
-
-      if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
-      {
-         if (trans_alpha != NULL)
-         {
-            *trans_alpha = info_ptr->trans_alpha;
-            retval |= PNG_INFO_tRNS;
-         }
-
-         if (trans_color != NULL)
-            *trans_color = &(info_ptr->trans_color);
-      }
-
-      else /* if (info_ptr->color_type != PNG_COLOR_TYPE_PALETTE) */
-      {
-         if (trans_color != NULL)
-         {
-            *trans_color = &(info_ptr->trans_color);
-            retval |= PNG_INFO_tRNS;
-         }
-
-         if (trans_alpha != NULL)
-            *trans_alpha = NULL;
-      }
-
-      if (num_trans != NULL)
-      {
-         *num_trans = info_ptr->num_trans;
-         retval |= PNG_INFO_tRNS;
-      }
-   }
-
-   return (retval);
-}
-#endif
-
-#ifdef PNG_UNKNOWN_CHUNKS_SUPPORTED
-int PNGAPI
-png_get_unknown_chunks(png_const_structp png_ptr, png_const_infop info_ptr,
-    png_unknown_chunkpp unknowns)
-{
-   if (png_ptr != NULL && info_ptr != NULL && unknowns != NULL)
-   {
-      *unknowns = info_ptr->unknown_chunks;
-      return info_ptr->unknown_chunks_num;
-   }
-
-   return (0);
-}
-#endif
-
-#ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED
-png_byte PNGAPI
-png_get_rgb_to_gray_status (png_const_structp png_ptr)
-{
-   return (png_byte)(png_ptr ? png_ptr->rgb_to_gray_status : 0);
-}
-#endif
-
-#ifdef PNG_USER_CHUNKS_SUPPORTED
-png_voidp PNGAPI
-png_get_user_chunk_ptr(png_const_structp png_ptr)
-{
-   return (png_ptr ? png_ptr->user_chunk_ptr : NULL);
-}
-#endif
-
-png_size_t PNGAPI
-png_get_compression_buffer_size(png_const_structp png_ptr)
-{
-   return (png_ptr ? png_ptr->zbuf_size : 0L);
-}
-
-
-#ifdef PNG_SET_USER_LIMITS_SUPPORTED
-/* These functions were added to libpng 1.2.6 and were enabled
- * by default in libpng-1.4.0 */
-png_uint_32 PNGAPI
-png_get_user_width_max (png_const_structp png_ptr)
-{
-   return (png_ptr ? png_ptr->user_width_max : 0);
-}
-
-png_uint_32 PNGAPI
-png_get_user_height_max (png_const_structp png_ptr)
-{
-   return (png_ptr ? png_ptr->user_height_max : 0);
-}
-
-/* This function was added to libpng 1.4.0 */
-png_uint_32 PNGAPI
-png_get_chunk_cache_max (png_const_structp png_ptr)
-{
-   return (png_ptr ? png_ptr->user_chunk_cache_max : 0);
-}
-
-/* This function was added to libpng 1.4.1 */
-png_alloc_size_t PNGAPI
-png_get_chunk_malloc_max (png_const_structp png_ptr)
-{
-   return (png_ptr ? png_ptr->user_chunk_malloc_max : 0);
-}
-#endif /* ?PNG_SET_USER_LIMITS_SUPPORTED */
-
-/* These functions were added to libpng 1.4.0 */
-#ifdef PNG_IO_STATE_SUPPORTED
-png_uint_32 PNGAPI
-png_get_io_state (png_structp png_ptr)
-{
-   return png_ptr->io_state;
-}
-
-png_uint_32 PNGAPI
-png_get_io_chunk_type (png_const_structp png_ptr)
-{
-   return ((png_ptr->chunk_name[0] << 24) +
-           (png_ptr->chunk_name[1] << 16) +
-           (png_ptr->chunk_name[2] <<  8) +
-           (png_ptr->chunk_name[3]));
-}
-
-png_const_bytep PNGAPI
-png_get_io_chunk_name (png_structp png_ptr)
-{
-   return png_ptr->chunk_name;
-}
-#endif /* ?PNG_IO_STATE_SUPPORTED */
-
-#endif /* PNG_READ_SUPPORTED || PNG_WRITE_SUPPORTED */
+
+/* pngget.c - retrieval of values from info struct
+ *
+ * Last changed in libpng 1.2.43 [February 25, 2010]
+ * Copyright (c) 1998-2010 Glenn Randers-Pehrson
+ * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
+ * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
+ *
+ * This code is released under the libpng license.
+ * For conditions of distribution and use, see the disclaimer
+ * and license in png.h
+ *
+ */
+
+#define PNG_INTERNAL
+#define PNG_NO_PEDANTIC_WARNINGS
+#include "png.h"
+#if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED)
+
+png_uint_32 PNGAPI
+png_get_valid(png_structp png_ptr, png_infop info_ptr, png_uint_32 flag)
+{
+   if (png_ptr != NULL && info_ptr != NULL)
+      return(info_ptr->valid & flag);
+
+   else
+      return(0);
+}
+
+png_uint_32 PNGAPI
+png_get_rowbytes(png_structp png_ptr, png_infop info_ptr)
+{
+   if (png_ptr != NULL && info_ptr != NULL)
+      return(info_ptr->rowbytes);
+
+   else
+      return(0);
+}
+
+#ifdef PNG_INFO_IMAGE_SUPPORTED
+png_bytepp PNGAPI
+png_get_rows(png_structp png_ptr, png_infop info_ptr)
+{
+   if (png_ptr != NULL && info_ptr != NULL)
+      return(info_ptr->row_pointers);
+
+   else
+      return(0);
+}
+#endif
+
+#ifdef PNG_EASY_ACCESS_SUPPORTED
+/* Easy access to info, added in libpng-0.99 */
+png_uint_32 PNGAPI
+png_get_image_width(png_structp png_ptr, png_infop info_ptr)
+{
+   if (png_ptr != NULL && info_ptr != NULL)
+      return info_ptr->width;
+
+   return (0);
+}
+
+png_uint_32 PNGAPI
+png_get_image_height(png_structp png_ptr, png_infop info_ptr)
+{
+   if (png_ptr != NULL && info_ptr != NULL)
+      return info_ptr->height;
+
+   return (0);
+}
+
+png_byte PNGAPI
+png_get_bit_depth(png_structp png_ptr, png_infop info_ptr)
+{
+   if (png_ptr != NULL && info_ptr != NULL)
+      return info_ptr->bit_depth;
+
+   return (0);
+}
+
+png_byte PNGAPI
+png_get_color_type(png_structp png_ptr, png_infop info_ptr)
+{
+   if (png_ptr != NULL && info_ptr != NULL)
+      return info_ptr->color_type;
+
+   return (0);
+}
+
+png_byte PNGAPI
+png_get_filter_type(png_structp png_ptr, png_infop info_ptr)
+{
+   if (png_ptr != NULL && info_ptr != NULL)
+      return info_ptr->filter_type;
+
+   return (0);
+}
+
+png_byte PNGAPI
+png_get_interlace_type(png_structp png_ptr, png_infop info_ptr)
+{
+   if (png_ptr != NULL && info_ptr != NULL)
+      return info_ptr->interlace_type;
+
+   return (0);
+}
+
+png_byte PNGAPI
+png_get_compression_type(png_structp png_ptr, png_infop info_ptr)
+{
+   if (png_ptr != NULL && info_ptr != NULL)
+      return info_ptr->compression_type;
+
+   return (0);
+}
+
+png_uint_32 PNGAPI
+png_get_x_pixels_per_meter(png_structp png_ptr, png_infop info_ptr)
+{
+   if (png_ptr != NULL && info_ptr != NULL)
+#ifdef PNG_pHYs_SUPPORTED
+   if (info_ptr->valid & PNG_INFO_pHYs)
+   {
+      png_debug1(1, "in %s retrieval function", "png_get_x_pixels_per_meter");
+
+      if (info_ptr->phys_unit_type != PNG_RESOLUTION_METER)
+          return (0);
+
+      else
+          return (info_ptr->x_pixels_per_unit);
+   }
+#else
+   return (0);
+#endif
+   return (0);
+}
+
+png_uint_32 PNGAPI
+png_get_y_pixels_per_meter(png_structp png_ptr, png_infop info_ptr)
+{
+   if (png_ptr != NULL && info_ptr != NULL)
+#ifdef PNG_pHYs_SUPPORTED
+   if (info_ptr->valid & PNG_INFO_pHYs)
+   {
+      png_debug1(1, "in %s retrieval function", "png_get_y_pixels_per_meter");
+
+      if (info_ptr->phys_unit_type != PNG_RESOLUTION_METER)
+          return (0);
+
+      else
+          return (info_ptr->y_pixels_per_unit);
+   }
+#else
+   return (0);
+#endif
+   return (0);
+}
+
+png_uint_32 PNGAPI
+png_get_pixels_per_meter(png_structp png_ptr, png_infop info_ptr)
+{
+   if (png_ptr != NULL && info_ptr != NULL)
+#ifdef PNG_pHYs_SUPPORTED
+   if (info_ptr->valid & PNG_INFO_pHYs)
+   {
+      png_debug1(1, "in %s retrieval function", "png_get_pixels_per_meter");
+
+      if (info_ptr->phys_unit_type != PNG_RESOLUTION_METER ||
+         info_ptr->x_pixels_per_unit != info_ptr->y_pixels_per_unit)
+          return (0);
+
+      else
+          return (info_ptr->x_pixels_per_unit);
+   }
+#else
+   return (0);
+#endif
+   return (0);
+}
+
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+float PNGAPI
+png_get_pixel_aspect_ratio(png_structp png_ptr, png_infop info_ptr)
+   {
+   if (png_ptr != NULL && info_ptr != NULL)
+#ifdef PNG_pHYs_SUPPORTED
+
+   if (info_ptr->valid & PNG_INFO_pHYs)
+   {
+      png_debug1(1, "in %s retrieval function", "png_get_aspect_ratio");
+
+      if (info_ptr->x_pixels_per_unit == 0)
+         return ((float)0.0);
+
+      else
+         return ((float)((float)info_ptr->y_pixels_per_unit
+            /(float)info_ptr->x_pixels_per_unit));
+   }
+#else
+      return (0.0);
+#endif
+   return ((float)0.0);
+}
+#endif
+
+png_int_32 PNGAPI
+png_get_x_offset_microns(png_structp png_ptr, png_infop info_ptr)
+{
+   if (png_ptr != NULL && info_ptr != NULL)
+#ifdef PNG_oFFs_SUPPORTED
+
+   if (info_ptr->valid & PNG_INFO_oFFs)
+   {
+      png_debug1(1, "in %s retrieval function", "png_get_x_offset_microns");
+
+      if (info_ptr->offset_unit_type != PNG_OFFSET_MICROMETER)
+          return (0);
+
+      else
+          return (info_ptr->x_offset);
+   }
+#else
+      return (0);
+#endif
+   return (0);
+}
+
+png_int_32 PNGAPI
+png_get_y_offset_microns(png_structp png_ptr, png_infop info_ptr)
+{
+   if (png_ptr != NULL && info_ptr != NULL)
+
+#ifdef PNG_oFFs_SUPPORTED
+   if (info_ptr->valid & PNG_INFO_oFFs)
+   {
+      png_debug1(1, "in %s retrieval function", "png_get_y_offset_microns");
+
+      if (info_ptr->offset_unit_type != PNG_OFFSET_MICROMETER)
+          return (0);
+
+      else
+          return (info_ptr->y_offset);
+   }
+#else
+   return (0);
+#endif
+   return (0);
+}
+
+png_int_32 PNGAPI
+png_get_x_offset_pixels(png_structp png_ptr, png_infop info_ptr)
+{
+   if (png_ptr != NULL && info_ptr != NULL)
+
+#ifdef PNG_oFFs_SUPPORTED
+   if (info_ptr->valid & PNG_INFO_oFFs)
+   {
+      png_debug1(1, "in %s retrieval function", "png_get_x_offset_microns");
+
+      if (info_ptr->offset_unit_type != PNG_OFFSET_PIXEL)
+          return (0);
+
+      else
+          return (info_ptr->x_offset);
+   }
+#else
+   return (0);
+#endif
+   return (0);
+}
+
+png_int_32 PNGAPI
+png_get_y_offset_pixels(png_structp png_ptr, png_infop info_ptr)
+{
+   if (png_ptr != NULL && info_ptr != NULL)
+
+#ifdef PNG_oFFs_SUPPORTED
+   if (info_ptr->valid & PNG_INFO_oFFs)
+   {
+      png_debug1(1, "in %s retrieval function", "png_get_y_offset_microns");
+
+      if (info_ptr->offset_unit_type != PNG_OFFSET_PIXEL)
+          return (0);
+
+      else
+          return (info_ptr->y_offset);
+   }
+#else
+   return (0);
+#endif
+   return (0);
+}
+
+#if defined(PNG_INCH_CONVERSIONS) && defined(PNG_FLOATING_POINT_SUPPORTED)
+png_uint_32 PNGAPI
+png_get_pixels_per_inch(png_structp png_ptr, png_infop info_ptr)
+{
+   return ((png_uint_32)((float)png_get_pixels_per_meter(png_ptr, info_ptr)
+     *.0254 +.5));
+}
+
+png_uint_32 PNGAPI
+png_get_x_pixels_per_inch(png_structp png_ptr, png_infop info_ptr)
+{
+   return ((png_uint_32)((float)png_get_x_pixels_per_meter(png_ptr, info_ptr)
+     *.0254 +.5));
+}
+
+png_uint_32 PNGAPI
+png_get_y_pixels_per_inch(png_structp png_ptr, png_infop info_ptr)
+{
+   return ((png_uint_32)((float)png_get_y_pixels_per_meter(png_ptr, info_ptr)
+     *.0254 +.5));
+}
+
+float PNGAPI
+png_get_x_offset_inches(png_structp png_ptr, png_infop info_ptr)
+{
+   return ((float)png_get_x_offset_microns(png_ptr, info_ptr)
+     *.00003937);
+}
+
+float PNGAPI
+png_get_y_offset_inches(png_structp png_ptr, png_infop info_ptr)
+{
+   return ((float)png_get_y_offset_microns(png_ptr, info_ptr)
+     *.00003937);
+}
+
+#ifdef PNG_pHYs_SUPPORTED
+png_uint_32 PNGAPI
+png_get_pHYs_dpi(png_structp png_ptr, png_infop info_ptr,
+   png_uint_32 *res_x, png_uint_32 *res_y, int *unit_type)
+{
+   png_uint_32 retval = 0;
+
+   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_pHYs))
+   {
+      png_debug1(1, "in %s retrieval function", "pHYs");
+
+      if (res_x != NULL)
+      {
+         *res_x = info_ptr->x_pixels_per_unit;
+         retval |= PNG_INFO_pHYs;
+      }
+      if (res_y != NULL)
+      {
+         *res_y = info_ptr->y_pixels_per_unit;
+         retval |= PNG_INFO_pHYs;
+      }
+      if (unit_type != NULL)
+      {
+         *unit_type = (int)info_ptr->phys_unit_type;
+         retval |= PNG_INFO_pHYs;
+         if (*unit_type == 1)
+         {
+            if (res_x != NULL) *res_x = (png_uint_32)(*res_x * .0254 + .50);
+            if (res_y != NULL) *res_y = (png_uint_32)(*res_y * .0254 + .50);
+         }
+      }
+   }
+   return (retval);
+}
+#endif /* PNG_pHYs_SUPPORTED */
+#endif  /* PNG_INCH_CONVERSIONS && PNG_FLOATING_POINT_SUPPORTED */
+
+/* png_get_channels really belongs in here, too, but it's been around longer */
+
+#endif  /* PNG_EASY_ACCESS_SUPPORTED */
+
+png_byte PNGAPI
+png_get_channels(png_structp png_ptr, png_infop info_ptr)
+{
+   if (png_ptr != NULL && info_ptr != NULL)
+      return(info_ptr->channels);
+   else
+      return (0);
+}
+
+png_bytep PNGAPI
+png_get_signature(png_structp png_ptr, png_infop info_ptr)
+{
+   if (png_ptr != NULL && info_ptr != NULL)
+      return(info_ptr->signature);
+   else
+      return (NULL);
+}
+
+#ifdef PNG_bKGD_SUPPORTED
+png_uint_32 PNGAPI
+png_get_bKGD(png_structp png_ptr, png_infop info_ptr,
+   png_color_16p *background)
+{
+   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_bKGD)
+      && background != NULL)
+   {
+      png_debug1(1, "in %s retrieval function", "bKGD");
+
+      *background = &(info_ptr->background);
+      return (PNG_INFO_bKGD);
+   }
+   return (0);
+}
+#endif
+
+#ifdef PNG_cHRM_SUPPORTED
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+png_uint_32 PNGAPI
+png_get_cHRM(png_structp png_ptr, png_infop info_ptr,
+   double *white_x, double *white_y, double *red_x, double *red_y,
+   double *green_x, double *green_y, double *blue_x, double *blue_y)
+{
+   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_cHRM))
+   {
+      png_debug1(1, "in %s retrieval function", "cHRM");
+
+      if (white_x != NULL)
+         *white_x = (double)info_ptr->x_white;
+      if (white_y != NULL)
+         *white_y = (double)info_ptr->y_white;
+      if (red_x != NULL)
+         *red_x = (double)info_ptr->x_red;
+      if (red_y != NULL)
+         *red_y = (double)info_ptr->y_red;
+      if (green_x != NULL)
+         *green_x = (double)info_ptr->x_green;
+      if (green_y != NULL)
+         *green_y = (double)info_ptr->y_green;
+      if (blue_x != NULL)
+         *blue_x = (double)info_ptr->x_blue;
+      if (blue_y != NULL)
+         *blue_y = (double)info_ptr->y_blue;
+      return (PNG_INFO_cHRM);
+   }
+   return (0);
+}
+#endif
+#ifdef PNG_FIXED_POINT_SUPPORTED
+png_uint_32 PNGAPI
+png_get_cHRM_fixed(png_structp png_ptr, png_infop info_ptr,
+   png_fixed_point *white_x, png_fixed_point *white_y, png_fixed_point *red_x,
+   png_fixed_point *red_y, png_fixed_point *green_x, png_fixed_point *green_y,
+   png_fixed_point *blue_x, png_fixed_point *blue_y)
+{
+   png_debug1(1, "in %s retrieval function", "cHRM");
+
+   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_cHRM))
+   {
+      if (white_x != NULL)
+         *white_x = info_ptr->int_x_white;
+      if (white_y != NULL)
+         *white_y = info_ptr->int_y_white;
+      if (red_x != NULL)
+         *red_x = info_ptr->int_x_red;
+      if (red_y != NULL)
+         *red_y = info_ptr->int_y_red;
+      if (green_x != NULL)
+         *green_x = info_ptr->int_x_green;
+      if (green_y != NULL)
+         *green_y = info_ptr->int_y_green;
+      if (blue_x != NULL)
+         *blue_x = info_ptr->int_x_blue;
+      if (blue_y != NULL)
+         *blue_y = info_ptr->int_y_blue;
+      return (PNG_INFO_cHRM);
+   }
+   return (0);
+}
+#endif
+#endif
+
+#ifdef PNG_gAMA_SUPPORTED
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+png_uint_32 PNGAPI
+png_get_gAMA(png_structp png_ptr, png_infop info_ptr, double *file_gamma)
+{
+   png_debug1(1, "in %s retrieval function", "gAMA");
+
+   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_gAMA)
+      && file_gamma != NULL)
+   {
+      *file_gamma = (double)info_ptr->gamma;
+      return (PNG_INFO_gAMA);
+   }
+   return (0);
+}
+#endif
+#ifdef PNG_FIXED_POINT_SUPPORTED
+png_uint_32 PNGAPI
+png_get_gAMA_fixed(png_structp png_ptr, png_infop info_ptr,
+    png_fixed_point *int_file_gamma)
+{
+   png_debug1(1, "in %s retrieval function", "gAMA");
+
+   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_gAMA)
+      && int_file_gamma != NULL)
+   {
+      *int_file_gamma = info_ptr->int_gamma;
+      return (PNG_INFO_gAMA);
+   }
+   return (0);
+}
+#endif
+#endif
+
+#ifdef PNG_sRGB_SUPPORTED
+png_uint_32 PNGAPI
+png_get_sRGB(png_structp png_ptr, png_infop info_ptr, int *file_srgb_intent)
+{
+   png_debug1(1, "in %s retrieval function", "sRGB");
+
+   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_sRGB)
+      && file_srgb_intent != NULL)
+   {
+      *file_srgb_intent = (int)info_ptr->srgb_intent;
+      return (PNG_INFO_sRGB);
+   }
+   return (0);
+}
+#endif
+
+#ifdef PNG_iCCP_SUPPORTED
+png_uint_32 PNGAPI
+png_get_iCCP(png_structp png_ptr, png_infop info_ptr,
+             png_charpp name, int *compression_type,
+             png_charpp profile, png_uint_32 *proflen)
+{
+   png_debug1(1, "in %s retrieval function", "iCCP");
+
+   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_iCCP)
+      && name != NULL && profile != NULL && proflen != NULL)
+   {
+      *name = info_ptr->iccp_name;
+      *profile = info_ptr->iccp_profile;
+      /* Compression_type is a dummy so the API won't have to change
+       * if we introduce multiple compression types later.
+       */
+      *proflen = (int)info_ptr->iccp_proflen;
+      *compression_type = (int)info_ptr->iccp_compression;
+      return (PNG_INFO_iCCP);
+   }
+   return (0);
+}
+#endif
+
+#ifdef PNG_sPLT_SUPPORTED
+png_uint_32 PNGAPI
+png_get_sPLT(png_structp png_ptr, png_infop info_ptr,
+             png_sPLT_tpp spalettes)
+{
+   if (png_ptr != NULL && info_ptr != NULL && spalettes != NULL)
+   {
+     *spalettes = info_ptr->splt_palettes;
+     return ((png_uint_32)info_ptr->splt_palettes_num);
+   }
+   return (0);
+}
+#endif
+
+#ifdef PNG_hIST_SUPPORTED
+png_uint_32 PNGAPI
+png_get_hIST(png_structp png_ptr, png_infop info_ptr, png_uint_16p *hist)
+{
+   png_debug1(1, "in %s retrieval function", "hIST");
+
+   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_hIST)
+      && hist != NULL)
+   {
+      *hist = info_ptr->hist;
+      return (PNG_INFO_hIST);
+   }
+   return (0);
+}
+#endif
+
+png_uint_32 PNGAPI
+png_get_IHDR(png_structp png_ptr, png_infop info_ptr,
+   png_uint_32 *width, png_uint_32 *height, int *bit_depth,
+   int *color_type, int *interlace_type, int *compression_type,
+   int *filter_type)
+
+{
+   png_debug1(1, "in %s retrieval function", "IHDR");
+
+   if (png_ptr == NULL || info_ptr == NULL || width == NULL ||
+       height == NULL || bit_depth == NULL || color_type == NULL)
+      return (0);
+
+   *width = info_ptr->width;
+   *height = info_ptr->height;
+   *bit_depth = info_ptr->bit_depth;
+   *color_type = info_ptr->color_type;
+
+   if (compression_type != NULL)
+      *compression_type = info_ptr->compression_type;
+
+   if (filter_type != NULL)
+      *filter_type = info_ptr->filter_type;
+
+   if (interlace_type != NULL)
+      *interlace_type = info_ptr->interlace_type;
+
+   /* This is redundant if we can be sure that the info_ptr values were all
+    * assigned in png_set_IHDR().  We do the check anyhow in case an
+    * application has ignored our advice not to mess with the members
+    * of info_ptr directly.
+    */
+   png_check_IHDR (png_ptr, info_ptr->width, info_ptr->height,
+       info_ptr->bit_depth, info_ptr->color_type, info_ptr->interlace_type,
+       info_ptr->compression_type, info_ptr->filter_type);
+
+   return (1);
+}
+
+#ifdef PNG_oFFs_SUPPORTED
+png_uint_32 PNGAPI
+png_get_oFFs(png_structp png_ptr, png_infop info_ptr,
+   png_int_32 *offset_x, png_int_32 *offset_y, int *unit_type)
+{
+   png_debug1(1, "in %s retrieval function", "oFFs");
+
+   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_oFFs)
+      && offset_x != NULL && offset_y != NULL && unit_type != NULL)
+   {
+      *offset_x = info_ptr->x_offset;
+      *offset_y = info_ptr->y_offset;
+      *unit_type = (int)info_ptr->offset_unit_type;
+      return (PNG_INFO_oFFs);
+   }
+   return (0);
+}
+#endif
+
+#ifdef PNG_pCAL_SUPPORTED
+png_uint_32 PNGAPI
+png_get_pCAL(png_structp png_ptr, png_infop info_ptr,
+   png_charp *purpose, png_int_32 *X0, png_int_32 *X1, int *type, int *nparams,
+   png_charp *units, png_charpp *params)
+{
+   png_debug1(1, "in %s retrieval function", "pCAL");
+
+   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_pCAL)
+       && purpose != NULL && X0 != NULL && X1 != NULL && type != NULL &&
+       nparams != NULL && units != NULL && params != NULL)
+   {
+      *purpose = info_ptr->pcal_purpose;
+      *X0 = info_ptr->pcal_X0;
+      *X1 = info_ptr->pcal_X1;
+      *type = (int)info_ptr->pcal_type;
+      *nparams = (int)info_ptr->pcal_nparams;
+      *units = info_ptr->pcal_units;
+      *params = info_ptr->pcal_params;
+      return (PNG_INFO_pCAL);
+   }
+   return (0);
+}
+#endif
+
+#ifdef PNG_sCAL_SUPPORTED
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+png_uint_32 PNGAPI
+png_get_sCAL(png_structp png_ptr, png_infop info_ptr,
+             int *unit, double *width, double *height)
+{
+    if (png_ptr != NULL && info_ptr != NULL &&
+        (info_ptr->valid & PNG_INFO_sCAL))
+    {
+        *unit = info_ptr->scal_unit;
+        *width = info_ptr->scal_pixel_width;
+        *height = info_ptr->scal_pixel_height;
+        return (PNG_INFO_sCAL);
+    }
+    return(0);
+}
+#else
+#ifdef PNG_FIXED_POINT_SUPPORTED
+png_uint_32 PNGAPI
+png_get_sCAL_s(png_structp png_ptr, png_infop info_ptr,
+             int *unit, png_charpp width, png_charpp height)
+{
+    if (png_ptr != NULL && info_ptr != NULL &&
+        (info_ptr->valid & PNG_INFO_sCAL))
+    {
+        *unit = info_ptr->scal_unit;
+        *width = info_ptr->scal_s_width;
+        *height = info_ptr->scal_s_height;
+        return (PNG_INFO_sCAL);
+    }
+    return(0);
+}
+#endif
+#endif
+#endif
+
+#ifdef PNG_pHYs_SUPPORTED
+png_uint_32 PNGAPI
+png_get_pHYs(png_structp png_ptr, png_infop info_ptr,
+   png_uint_32 *res_x, png_uint_32 *res_y, int *unit_type)
+{
+   png_uint_32 retval = 0;
+
+   png_debug1(1, "in %s retrieval function", "pHYs");
+
+   if (png_ptr != NULL && info_ptr != NULL &&
+      (info_ptr->valid & PNG_INFO_pHYs))
+   {
+      if (res_x != NULL)
+      {
+         *res_x = info_ptr->x_pixels_per_unit;
+         retval |= PNG_INFO_pHYs;
+      }
+
+      if (res_y != NULL)
+      {
+         *res_y = info_ptr->y_pixels_per_unit;
+         retval |= PNG_INFO_pHYs;
+      }
+
+      if (unit_type != NULL)
+      {
+         *unit_type = (int)info_ptr->phys_unit_type;
+         retval |= PNG_INFO_pHYs;
+      }
+   }
+   return (retval);
+}
+#endif
+
+png_uint_32 PNGAPI
+png_get_PLTE(png_structp png_ptr, png_infop info_ptr, png_colorp *palette,
+   int *num_palette)
+{
+   png_debug1(1, "in %s retrieval function", "PLTE");
+
+   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_PLTE)
+       && palette != NULL)
+   {
+      *palette = info_ptr->palette;
+      *num_palette = info_ptr->num_palette;
+      png_debug1(3, "num_palette = %d", *num_palette);
+      return (PNG_INFO_PLTE);
+   }
+   return (0);
+}
+
+#ifdef PNG_sBIT_SUPPORTED
+png_uint_32 PNGAPI
+png_get_sBIT(png_structp png_ptr, png_infop info_ptr, png_color_8p *sig_bit)
+{
+   png_debug1(1, "in %s retrieval function", "sBIT");
+
+   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_sBIT)
+      && sig_bit != NULL)
+   {
+      *sig_bit = &(info_ptr->sig_bit);
+      return (PNG_INFO_sBIT);
+   }
+   return (0);
+}
+#endif
+
+#ifdef PNG_TEXT_SUPPORTED
+png_uint_32 PNGAPI
+png_get_text(png_structp png_ptr, png_infop info_ptr, png_textp *text_ptr,
+   int *num_text)
+{
+   if (png_ptr != NULL && info_ptr != NULL && info_ptr->num_text > 0)
+   {
+      png_debug1(1, "in %s retrieval function",
+         (png_ptr->chunk_name[0] == '\0' ? "text"
+             : (png_const_charp)png_ptr->chunk_name));
+
+      if (text_ptr != NULL)
+         *text_ptr = info_ptr->text;
+
+      if (num_text != NULL)
+         *num_text = info_ptr->num_text;
+
+      return ((png_uint_32)info_ptr->num_text);
+   }
+   if (num_text != NULL)
+     *num_text = 0;
+   return(0);
+}
+#endif
+
+#ifdef PNG_tIME_SUPPORTED
+png_uint_32 PNGAPI
+png_get_tIME(png_structp png_ptr, png_infop info_ptr, png_timep *mod_time)
+{
+   png_debug1(1, "in %s retrieval function", "tIME");
+
+   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_tIME)
+       && mod_time != NULL)
+   {
+      *mod_time = &(info_ptr->mod_time);
+      return (PNG_INFO_tIME);
+   }
+   return (0);
+}
+#endif
+
+#ifdef PNG_tRNS_SUPPORTED
+png_uint_32 PNGAPI
+png_get_tRNS(png_structp png_ptr, png_infop info_ptr,
+   png_bytep *trans, int *num_trans, png_color_16p *trans_values)
+{
+   png_uint_32 retval = 0;
+   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_tRNS))
+   {
+      png_debug1(1, "in %s retrieval function", "tRNS");
+
+      if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
+      {
+          if (trans != NULL)
+          {
+             *trans = info_ptr->trans;
+             retval |= PNG_INFO_tRNS;
+          }
+
+          if (trans_values != NULL)
+             *trans_values = &(info_ptr->trans_values);
+      }
+      else /* if (info_ptr->color_type != PNG_COLOR_TYPE_PALETTE) */
+      {
+          if (trans_values != NULL)
+          {
+             *trans_values = &(info_ptr->trans_values);
+             retval |= PNG_INFO_tRNS;
+          }
+
+          if (trans != NULL)
+             *trans = NULL;
+      }
+      if (num_trans != NULL)
+      {
+         *num_trans = info_ptr->num_trans;
+         retval |= PNG_INFO_tRNS;
+      }
+   }
+   return (retval);
+}
+#endif
+
+#ifdef PNG_UNKNOWN_CHUNKS_SUPPORTED
+png_uint_32 PNGAPI
+png_get_unknown_chunks(png_structp png_ptr, png_infop info_ptr,
+             png_unknown_chunkpp unknowns)
+{
+   if (png_ptr != NULL && info_ptr != NULL && unknowns != NULL)
+   {
+     *unknowns = info_ptr->unknown_chunks;
+     return ((png_uint_32)info_ptr->unknown_chunks_num);
+   }
+   return (0);
+}
+#endif
+
+#ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED
+png_byte PNGAPI
+png_get_rgb_to_gray_status (png_structp png_ptr)
+{
+   return (png_byte)(png_ptr? png_ptr->rgb_to_gray_status : 0);
+}
+#endif
+
+#ifdef PNG_USER_CHUNKS_SUPPORTED
+png_voidp PNGAPI
+png_get_user_chunk_ptr(png_structp png_ptr)
+{
+   return (png_ptr? png_ptr->user_chunk_ptr : NULL);
+}
+#endif
+
+png_uint_32 PNGAPI
+png_get_compression_buffer_size(png_structp png_ptr)
+{
+   return (png_uint_32)(png_ptr? png_ptr->zbuf_size : 0L);
+}
+
+#ifdef PNG_ASSEMBLER_CODE_SUPPORTED
+#ifndef PNG_1_0_X
+/* This function was added to libpng 1.2.0 and should exist by default */
+png_uint_32 PNGAPI
+png_get_asm_flags (png_structp png_ptr)
+{
+    /* Obsolete, to be removed from libpng-1.4.0 */
+    return (png_ptr? 0L: 0L);
+}
+
+/* This function was added to libpng 1.2.0 and should exist by default */
+png_uint_32 PNGAPI
+png_get_asm_flagmask (int flag_select)
+{
+    /* Obsolete, to be removed from libpng-1.4.0 */
+    flag_select=flag_select;
+    return 0L;
+}
+
+    /* GRR:  could add this:   && defined(PNG_MMX_CODE_SUPPORTED) */
+/* This function was added to libpng 1.2.0 */
+png_uint_32 PNGAPI
+png_get_mmx_flagmask (int flag_select, int *compilerID)
+{
+    /* Obsolete, to be removed from libpng-1.4.0 */
+    flag_select=flag_select;
+    *compilerID = -1;   /* unknown (i.e., no asm/MMX code compiled) */
+    return 0L;
+}
+
+/* This function was added to libpng 1.2.0 */
+png_byte PNGAPI
+png_get_mmx_bitdepth_threshold (png_structp png_ptr)
+{
+    /* Obsolete, to be removed from libpng-1.4.0 */
+    return (png_ptr? 0: 0);
+}
+
+/* This function was added to libpng 1.2.0 */
+png_uint_32 PNGAPI
+png_get_mmx_rowbytes_threshold (png_structp png_ptr)
+{
+    /* Obsolete, to be removed from libpng-1.4.0 */
+    return (png_ptr? 0L: 0L);
+}
+#endif /* ?PNG_1_0_X */
+#endif /* ?PNG_ASSEMBLER_CODE_SUPPORTED */
+
+#ifdef PNG_SET_USER_LIMITS_SUPPORTED
+/* These functions were added to libpng 1.2.6 but not enabled
+* by default. They will be enabled in libpng-1.4.0 */
+png_uint_32 PNGAPI
+png_get_user_width_max (png_structp png_ptr)
+{
+    return (png_ptr? png_ptr->user_width_max : 0);
+}
+png_uint_32 PNGAPI
+png_get_user_height_max (png_structp png_ptr)
+{
+    return (png_ptr? png_ptr->user_height_max : 0);
+}
+#endif /* ?PNG_SET_USER_LIMITS_SUPPORTED */
+
+#endif /* PNG_READ_SUPPORTED || PNG_WRITE_SUPPORTED */
diff --git a/Externals/libpng/pngmem.c b/Externals/libpng/pngmem.c
index a15d8b0859..019c7d2509 100644
--- a/Externals/libpng/pngmem.c
+++ b/Externals/libpng/pngmem.c
@@ -1,658 +1,641 @@
-
-/* pngmem.c - stub functions for memory allocation
- *
- * Last changed in libpng 1.5.1 [February 3, 2011]
- * Copyright (c) 1998-2011 Glenn Randers-Pehrson
- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
- *
- * This code is released under the libpng license.
- * For conditions of distribution and use, see the disclaimer
- * and license in png.h
- *
- * This file provides a location for all memory allocation.  Users who
- * need special memory handling are expected to supply replacement
- * functions for png_malloc() and png_free(), and to use
- * png_create_read_struct_2() and png_create_write_struct_2() to
- * identify the replacement functions.
- */
-
-#include "pngpriv.h"
-
-#if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED)
-
-/* Borland DOS special memory handler */
-#if defined(__TURBOC__) && !defined(_Windows) && !defined(__FLAT__)
-/* If you change this, be sure to change the one in png.h also */
-
-/* Allocate memory for a png_struct.  The malloc and memset can be replaced
-   by a single call to calloc() if this is thought to improve performance. */
-PNG_FUNCTION(png_voidp /* PRIVATE */,
-png_create_struct,(int type),PNG_ALLOCATED)
-{
-#  ifdef PNG_USER_MEM_SUPPORTED
-   return (png_create_struct_2(type, NULL, NULL));
-}
-
-/* Alternate version of png_create_struct, for use with user-defined malloc. */
-PNG_FUNCTION(png_voidp /* PRIVATE */,
-png_create_struct_2,(int type, png_malloc_ptr malloc_fn, png_voidp mem_ptr),
-   PNG_ALLOCATED)
-{
-#  endif /* PNG_USER_MEM_SUPPORTED */
-   png_size_t size;
-   png_voidp struct_ptr;
-
-   if (type == PNG_STRUCT_INFO)
-      size = png_sizeof(png_info);
-
-   else if (type == PNG_STRUCT_PNG)
-      size = png_sizeof(png_struct);
-
-   else
-      return (png_get_copyright(NULL));
-
-#  ifdef PNG_USER_MEM_SUPPORTED
-   if (malloc_fn != NULL)
-   {
-      png_struct dummy_struct;
-      png_structp png_ptr = &dummy_struct;
-      png_ptr->mem_ptr=mem_ptr;
-      struct_ptr = (*(malloc_fn))(png_ptr, (png_uint_32)size);
-   }
-
-   else
-#  endif /* PNG_USER_MEM_SUPPORTED */
-   struct_ptr = (png_voidp)farmalloc(size);
-   if (struct_ptr != NULL)
-      png_memset(struct_ptr, 0, size);
-
-   return (struct_ptr);
-}
-
-/* Free memory allocated by a png_create_struct() call */
-void /* PRIVATE */
-png_destroy_struct(png_voidp struct_ptr)
-{
-#  ifdef PNG_USER_MEM_SUPPORTED
-   png_destroy_struct_2(struct_ptr, NULL, NULL);
-}
-
-/* Free memory allocated by a png_create_struct() call */
-void /* PRIVATE */
-png_destroy_struct_2(png_voidp struct_ptr, png_free_ptr free_fn,
-    png_voidp mem_ptr)
-{
-#  endif
-   if (struct_ptr != NULL)
-   {
-#  ifdef PNG_USER_MEM_SUPPORTED
-      if (free_fn != NULL)
-      {
-         png_struct dummy_struct;
-         png_structp png_ptr = &dummy_struct;
-         png_ptr->mem_ptr=mem_ptr;
-         (*(free_fn))(png_ptr, struct_ptr);
-         return;
-      }
-
-#  endif /* PNG_USER_MEM_SUPPORTED */
-      farfree (struct_ptr);
-   }
-}
-
-/* Allocate memory.  For reasonable files, size should never exceed
- * 64K.  However, zlib may allocate more then 64K if you don't tell
- * it not to.  See zconf.h and png.h for more information. zlib does
- * need to allocate exactly 64K, so whatever you call here must
- * have the ability to do that.
- *
- * Borland seems to have a problem in DOS mode for exactly 64K.
- * It gives you a segment with an offset of 8 (perhaps to store its
- * memory stuff).  zlib doesn't like this at all, so we have to
- * detect and deal with it.  This code should not be needed in
- * Windows or OS/2 modes, and only in 16 bit mode.  This code has
- * been updated by Alexander Lehmann for version 0.89 to waste less
- * memory.
- *
- * Note that we can't use png_size_t for the "size" declaration,
- * since on some systems a png_size_t is a 16-bit quantity, and as a
- * result, we would be truncating potentially larger memory requests
- * (which should cause a fatal error) and introducing major problems.
- */
-PNG_FUNCTION(png_voidp,PNGAPI
-png_calloc,(png_structp png_ptr, png_alloc_size_t size),PNG_ALLOCATED)
-{
-   png_voidp ret;
-
-   ret = (png_malloc(png_ptr, size));
-
-   if (ret != NULL)
-      png_memset(ret,0,(png_size_t)size);
-
-   return (ret);
-}
-
-PNG_FUNCTION(png_voidp,PNGAPI
-png_malloc,(png_structp png_ptr, png_alloc_size_t size),PNG_ALLOCATED)
-{
-   png_voidp ret;
-
-   if (png_ptr == NULL || size == 0)
-      return (NULL);
-
-#  ifdef PNG_USER_MEM_SUPPORTED
-   if (png_ptr->malloc_fn != NULL)
-      ret = ((png_voidp)(*(png_ptr->malloc_fn))(png_ptr, (png_size_t)size));
-
-   else
-      ret = (png_malloc_default(png_ptr, size));
-
-   if (ret == NULL && (png_ptr->flags&PNG_FLAG_MALLOC_NULL_MEM_OK) == 0)
-       png_error(png_ptr, "Out of memory");
-
-   return (ret);
-}
-
-PNG_FUNCTION(png_voidp,PNGAPI
-png_malloc_default,(png_structp png_ptr, png_alloc_size_t size),PNG_ALLOCATED)
-{
-   png_voidp ret;
-#  endif /* PNG_USER_MEM_SUPPORTED */
-
-   if (png_ptr == NULL || size == 0)
-      return (NULL);
-
-#  ifdef PNG_MAX_MALLOC_64K
-   if (size > (png_uint_32)65536L)
-   {
-      png_warning(png_ptr, "Cannot Allocate > 64K");
-      ret = NULL;
-   }
-
-   else
-#  endif
-
-   if (size != (size_t)size)
-      ret = NULL;
-
-   else if (size == (png_uint_32)65536L)
-   {
-      if (png_ptr->offset_table == NULL)
-      {
-         /* Try to see if we need to do any of this fancy stuff */
-         ret = farmalloc(size);
-         if (ret == NULL || ((png_size_t)ret & 0xffff))
-         {
-            int num_blocks;
-            png_uint_32 total_size;
-            png_bytep table;
-            int i;
-            png_byte huge * hptr;
-
-            if (ret != NULL)
-            {
-               farfree(ret);
-               ret = NULL;
-            }
-
-            if (png_ptr->zlib_window_bits > 14)
-               num_blocks = (int)(1 << (png_ptr->zlib_window_bits - 14));
-
-            else
-               num_blocks = 1;
-
-            if (png_ptr->zlib_mem_level >= 7)
-               num_blocks += (int)(1 << (png_ptr->zlib_mem_level - 7));
-
-            else
-               num_blocks++;
-
-            total_size = ((png_uint_32)65536L) * (png_uint_32)num_blocks+16;
-
-            table = farmalloc(total_size);
-
-            if (table == NULL)
-            {
-#  ifndef PNG_USER_MEM_SUPPORTED
-               if ((png_ptr->flags&PNG_FLAG_MALLOC_NULL_MEM_OK) == 0)
-                  png_error(png_ptr, "Out Of Memory"); /* Note "O", "M" */
-
-               else
-                  png_warning(png_ptr, "Out Of Memory");
-#  endif
-               return (NULL);
-            }
-
-            if ((png_size_t)table & 0xfff0)
-            {
-#  ifndef PNG_USER_MEM_SUPPORTED
-               if ((png_ptr->flags&PNG_FLAG_MALLOC_NULL_MEM_OK) == 0)
-                  png_error(png_ptr,
-                    "Farmalloc didn't return normalized pointer");
-
-               else
-                  png_warning(png_ptr,
-                    "Farmalloc didn't return normalized pointer");
-#  endif
-               return (NULL);
-            }
-
-            png_ptr->offset_table = table;
-            png_ptr->offset_table_ptr = farmalloc(num_blocks *
-               png_sizeof(png_bytep));
-
-            if (png_ptr->offset_table_ptr == NULL)
-            {
-#  ifndef PNG_USER_MEM_SUPPORTED
-               if ((png_ptr->flags&PNG_FLAG_MALLOC_NULL_MEM_OK) == 0)
-                  png_error(png_ptr, "Out Of memory"); /* Note "O", "m" */
-
-               else
-                  png_warning(png_ptr, "Out Of memory");
-#  endif
-               return (NULL);
-            }
-
-            hptr = (png_byte huge *)table;
-            if ((png_size_t)hptr & 0xf)
-            {
-               hptr = (png_byte huge *)((long)(hptr) & 0xfffffff0L);
-               hptr = hptr + 16L;  /* "hptr += 16L" fails on Turbo C++ 3.0 */
-            }
-
-            for (i = 0; i < num_blocks; i++)
-            {
-               png_ptr->offset_table_ptr[i] = (png_bytep)hptr;
-               hptr = hptr + (png_uint_32)65536L;  /* "+=" fails on TC++3.0 */
-            }
-
-            png_ptr->offset_table_number = num_blocks;
-            png_ptr->offset_table_count = 0;
-            png_ptr->offset_table_count_free = 0;
-         }
-      }
-
-      if (png_ptr->offset_table_count >= png_ptr->offset_table_number)
-      {
-#  ifndef PNG_USER_MEM_SUPPORTED
-         if ((png_ptr->flags&PNG_FLAG_MALLOC_NULL_MEM_OK) == 0)
-            png_error(png_ptr, "Out of Memory"); /* Note "o" and "M" */
-
-         else
-            png_warning(png_ptr, "Out of Memory");
-#  endif
-         return (NULL);
-      }
-
-      ret = png_ptr->offset_table_ptr[png_ptr->offset_table_count++];
-   }
-
-   else
-      ret = farmalloc(size);
-
-#  ifndef PNG_USER_MEM_SUPPORTED
-   if (ret == NULL)
-   {
-      if ((png_ptr->flags&PNG_FLAG_MALLOC_NULL_MEM_OK) == 0)
-         png_error(png_ptr, "Out of memory"); /* Note "o" and "m" */
-
-      else
-         png_warning(png_ptr, "Out of memory"); /* Note "o" and "m" */
-   }
-#  endif
-
-   return (ret);
-}
-
-/* Free a pointer allocated by png_malloc().  In the default
- * configuration, png_ptr is not used, but is passed in case it
- * is needed.  If ptr is NULL, return without taking any action.
- */
-void PNGAPI
-png_free(png_structp png_ptr, png_voidp ptr)
-{
-   if (png_ptr == NULL || ptr == NULL)
-      return;
-
-#  ifdef PNG_USER_MEM_SUPPORTED
-   if (png_ptr->free_fn != NULL)
-   {
-      (*(png_ptr->free_fn))(png_ptr, ptr);
-      return;
-   }
-
-   else
-      png_free_default(png_ptr, ptr);
-}
-
-void PNGAPI
-png_free_default(png_structp png_ptr, png_voidp ptr)
-{
-#  endif /* PNG_USER_MEM_SUPPORTED */
-
-   if (png_ptr == NULL || ptr == NULL)
-      return;
-
-   if (png_ptr->offset_table != NULL)
-   {
-      int i;
-
-      for (i = 0; i < png_ptr->offset_table_count; i++)
-      {
-         if (ptr == png_ptr->offset_table_ptr[i])
-         {
-            ptr = NULL;
-            png_ptr->offset_table_count_free++;
-            break;
-         }
-      }
-      if (png_ptr->offset_table_count_free == png_ptr->offset_table_count)
-      {
-         farfree(png_ptr->offset_table);
-         farfree(png_ptr->offset_table_ptr);
-         png_ptr->offset_table = NULL;
-         png_ptr->offset_table_ptr = NULL;
-      }
-   }
-
-   if (ptr != NULL)
-      farfree(ptr);
-}
-
-#else /* Not the Borland DOS special memory handler */
-
-/* Allocate memory for a png_struct or a png_info.  The malloc and
-   memset can be replaced by a single call to calloc() if this is thought
-   to improve performance noticably. */
-PNG_FUNCTION(png_voidp /* PRIVATE */,
-png_create_struct,(int type),PNG_ALLOCATED)
-{
-#  ifdef PNG_USER_MEM_SUPPORTED
-   return (png_create_struct_2(type, NULL, NULL));
-}
-
-/* Allocate memory for a png_struct or a png_info.  The malloc and
-   memset can be replaced by a single call to calloc() if this is thought
-   to improve performance noticably. */
-PNG_FUNCTION(png_voidp /* PRIVATE */,
-png_create_struct_2,(int type, png_malloc_ptr malloc_fn, png_voidp mem_ptr),
-   PNG_ALLOCATED)
-{
-#  endif /* PNG_USER_MEM_SUPPORTED */
-   png_size_t size;
-   png_voidp struct_ptr;
-
-   if (type == PNG_STRUCT_INFO)
-      size = png_sizeof(png_info);
-
-   else if (type == PNG_STRUCT_PNG)
-      size = png_sizeof(png_struct);
-
-   else
-      return (NULL);
-
-#  ifdef PNG_USER_MEM_SUPPORTED
-   if (malloc_fn != NULL)
-   {
-      png_struct dummy_struct;
-      png_structp png_ptr = &dummy_struct;
-      png_ptr->mem_ptr=mem_ptr;
-      struct_ptr = (*(malloc_fn))(png_ptr, size);
-
-      if (struct_ptr != NULL)
-         png_memset(struct_ptr, 0, size);
-
-      return (struct_ptr);
-   }
-#  endif /* PNG_USER_MEM_SUPPORTED */
-
-#  if defined(__TURBOC__) && !defined(__FLAT__)
-   struct_ptr = (png_voidp)farmalloc(size);
-#  else
-#    if defined(_MSC_VER) && defined(MAXSEG_64K)
-   struct_ptr = (png_voidp)halloc(size, 1);
-#    else
-   struct_ptr = (png_voidp)malloc(size);
-#    endif
-#  endif
-
-   if (struct_ptr != NULL)
-      png_memset(struct_ptr, 0, size);
-
-   return (struct_ptr);
-}
-
-
-/* Free memory allocated by a png_create_struct() call */
-void /* PRIVATE */
-png_destroy_struct(png_voidp struct_ptr)
-{
-#  ifdef PNG_USER_MEM_SUPPORTED
-   png_destroy_struct_2(struct_ptr, NULL, NULL);
-}
-
-/* Free memory allocated by a png_create_struct() call */
-void /* PRIVATE */
-png_destroy_struct_2(png_voidp struct_ptr, png_free_ptr free_fn,
-    png_voidp mem_ptr)
-{
-#  endif /* PNG_USER_MEM_SUPPORTED */
-   if (struct_ptr != NULL)
-   {
-#  ifdef PNG_USER_MEM_SUPPORTED
-      if (free_fn != NULL)
-      {
-         png_struct dummy_struct;
-         png_structp png_ptr = &dummy_struct;
-         png_ptr->mem_ptr=mem_ptr;
-         (*(free_fn))(png_ptr, struct_ptr);
-         return;
-      }
-#  endif /* PNG_USER_MEM_SUPPORTED */
-#  if defined(__TURBOC__) && !defined(__FLAT__)
-      farfree(struct_ptr);
-
-#  else
-#    if defined(_MSC_VER) && defined(MAXSEG_64K)
-      hfree(struct_ptr);
-
-#    else
-      free(struct_ptr);
-
-#    endif
-#  endif
-   }
-}
-
-/* Allocate memory.  For reasonable files, size should never exceed
- * 64K.  However, zlib may allocate more then 64K if you don't tell
- * it not to.  See zconf.h and png.h for more information.  zlib does
- * need to allocate exactly 64K, so whatever you call here must
- * have the ability to do that.
- */
-
-PNG_FUNCTION(png_voidp,PNGAPI
-png_calloc,(png_structp png_ptr, png_alloc_size_t size),PNG_ALLOCATED)
-{
-   png_voidp ret;
-
-   ret = (png_malloc(png_ptr, size));
-
-   if (ret != NULL)
-      png_memset(ret,0,(png_size_t)size);
-
-   return (ret);
-}
-
-PNG_FUNCTION(png_voidp,PNGAPI
-png_malloc,(png_structp png_ptr, png_alloc_size_t size),PNG_ALLOCATED)
-{
-   png_voidp ret;
-
-#  ifdef PNG_USER_MEM_SUPPORTED
-   if (png_ptr == NULL || size == 0)
-      return (NULL);
-
-   if (png_ptr->malloc_fn != NULL)
-      ret = ((png_voidp)(*(png_ptr->malloc_fn))(png_ptr, (png_size_t)size));
-
-   else
-      ret = (png_malloc_default(png_ptr, size));
-
-   if (ret == NULL && (png_ptr->flags&PNG_FLAG_MALLOC_NULL_MEM_OK) == 0)
-       png_error(png_ptr, "Out of Memory");
-
-   return (ret);
-}
-
-PNG_FUNCTION(png_voidp,PNGAPI
-png_malloc_default,(png_structp png_ptr, png_alloc_size_t size),PNG_ALLOCATED)
-{
-   png_voidp ret;
-#  endif /* PNG_USER_MEM_SUPPORTED */
-
-   if (png_ptr == NULL || size == 0)
-      return (NULL);
-
-#  ifdef PNG_MAX_MALLOC_64K
-   if (size > (png_uint_32)65536L)
-   {
-#    ifndef PNG_USER_MEM_SUPPORTED
-      if ((png_ptr->flags&PNG_FLAG_MALLOC_NULL_MEM_OK) == 0)
-         png_error(png_ptr, "Cannot Allocate > 64K");
-
-      else
-#    endif
-         return NULL;
-   }
-#  endif
-
-   /* Check for overflow */
-#  if defined(__TURBOC__) && !defined(__FLAT__)
-
-   if (size != (unsigned long)size)
-      ret = NULL;
-
-   else
-      ret = farmalloc(size);
-
-#  else
-#    if defined(_MSC_VER) && defined(MAXSEG_64K)
-   if (size != (unsigned long)size)
-      ret = NULL;
-
-   else
-      ret = halloc(size, 1);
-
-#    else
-   if (size != (size_t)size)
-      ret = NULL;
-
-   else
-      ret = malloc((size_t)size);
-#    endif
-#  endif
-
-#  ifndef PNG_USER_MEM_SUPPORTED
-   if (ret == NULL && (png_ptr->flags&PNG_FLAG_MALLOC_NULL_MEM_OK) == 0)
-      png_error(png_ptr, "Out of Memory");
-#  endif
-
-   return (ret);
-}
-
-/* Free a pointer allocated by png_malloc().  If ptr is NULL, return
- * without taking any action.
- */
-void PNGAPI
-png_free(png_structp png_ptr, png_voidp ptr)
-{
-   if (png_ptr == NULL || ptr == NULL)
-      return;
-
-#  ifdef PNG_USER_MEM_SUPPORTED
-   if (png_ptr->free_fn != NULL)
-   {
-      (*(png_ptr->free_fn))(png_ptr, ptr);
-      return;
-   }
-
-   else
-      png_free_default(png_ptr, ptr);
-}
-
-void PNGAPI
-png_free_default(png_structp png_ptr, png_voidp ptr)
-{
-   if (png_ptr == NULL || ptr == NULL)
-      return;
-
-#  endif /* PNG_USER_MEM_SUPPORTED */
-
-#  if defined(__TURBOC__) && !defined(__FLAT__)
-   farfree(ptr);
-
-#  else
-#    if defined(_MSC_VER) && defined(MAXSEG_64K)
-   hfree(ptr);
-
-#    else
-   free(ptr);
-
-#    endif
-#  endif
-}
-#endif /* Not Borland DOS special memory handler */
-
-/* This function was added at libpng version 1.2.3.  The png_malloc_warn()
- * function will set up png_malloc() to issue a png_warning and return NULL
- * instead of issuing a png_error, if it fails to allocate the requested
- * memory.
- */
-PNG_FUNCTION(png_voidp,PNGAPI
-png_malloc_warn,(png_structp png_ptr, png_alloc_size_t size),PNG_ALLOCATED)
-{
-   png_voidp ptr;
-   png_uint_32 save_flags;
-   if (png_ptr == NULL)
-      return (NULL);
-
-   save_flags = png_ptr->flags;
-   png_ptr->flags|=PNG_FLAG_MALLOC_NULL_MEM_OK;
-   ptr = (png_voidp)png_malloc((png_structp)png_ptr, size);
-   png_ptr->flags=save_flags;
-   return(ptr);
-}
-
-
-#ifdef PNG_USER_MEM_SUPPORTED
-/* This function is called when the application wants to use another method
- * of allocating and freeing memory.
- */
-void PNGAPI
-png_set_mem_fn(png_structp png_ptr, png_voidp mem_ptr, png_malloc_ptr
-  malloc_fn, png_free_ptr free_fn)
-{
-   if (png_ptr != NULL)
-   {
-      png_ptr->mem_ptr = mem_ptr;
-      png_ptr->malloc_fn = malloc_fn;
-      png_ptr->free_fn = free_fn;
-   }
-}
-
-/* This function returns a pointer to the mem_ptr associated with the user
- * functions.  The application should free any memory associated with this
- * pointer before png_write_destroy and png_read_destroy are called.
- */
-png_voidp PNGAPI
-png_get_mem_ptr(png_const_structp png_ptr)
-{
-   if (png_ptr == NULL)
-      return (NULL);
-
-   return ((png_voidp)png_ptr->mem_ptr);
-}
-#endif /* PNG_USER_MEM_SUPPORTED */
-#endif /* PNG_READ_SUPPORTED || PNG_WRITE_SUPPORTED */
+
+/* pngmem.c - stub functions for memory allocation
+ *
+ * Last changed in libpng 1.2.41 [February 25, 2010]
+ * Copyright (c) 1998-2010 Glenn Randers-Pehrson
+ * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
+ * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
+ *
+ * This code is released under the libpng license.
+ * For conditions of distribution and use, see the disclaimer
+ * and license in png.h
+ *
+ * This file provides a location for all memory allocation.  Users who
+ * need special memory handling are expected to supply replacement
+ * functions for png_malloc() and png_free(), and to use
+ * png_create_read_struct_2() and png_create_write_struct_2() to
+ * identify the replacement functions.
+ */
+
+#define PNG_INTERNAL
+#define PNG_NO_PEDANTIC_WARNINGS
+#include "png.h"
+#if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED)
+
+/* Borland DOS special memory handler */
+#if defined(__TURBOC__) && !defined(_Windows) && !defined(__FLAT__)
+/* If you change this, be sure to change the one in png.h also */
+
+/* Allocate memory for a png_struct.  The malloc and memset can be replaced
+   by a single call to calloc() if this is thought to improve performance. */
+png_voidp /* PRIVATE */
+png_create_struct(int type)
+{
+#ifdef PNG_USER_MEM_SUPPORTED
+   return (png_create_struct_2(type, png_malloc_ptr_NULL, png_voidp_NULL));
+}
+
+/* Alternate version of png_create_struct, for use with user-defined malloc. */
+png_voidp /* PRIVATE */
+png_create_struct_2(int type, png_malloc_ptr malloc_fn, png_voidp mem_ptr)
+{
+#endif /* PNG_USER_MEM_SUPPORTED */
+   png_size_t size;
+   png_voidp struct_ptr;
+
+   if (type == PNG_STRUCT_INFO)
+      size = png_sizeof(png_info);
+   else if (type == PNG_STRUCT_PNG)
+      size = png_sizeof(png_struct);
+   else
+      return (png_get_copyright(NULL));
+
+#ifdef PNG_USER_MEM_SUPPORTED
+   if (malloc_fn != NULL)
+   {
+      png_struct dummy_struct;
+      png_structp png_ptr = &dummy_struct;
+      png_ptr->mem_ptr=mem_ptr;
+      struct_ptr = (*(malloc_fn))(png_ptr, (png_uint_32)size);
+   }
+   else
+#endif /* PNG_USER_MEM_SUPPORTED */
+   struct_ptr = (png_voidp)farmalloc(size);
+   if (struct_ptr != NULL)
+      png_memset(struct_ptr, 0, size);
+   return (struct_ptr);
+}
+
+/* Free memory allocated by a png_create_struct() call */
+void /* PRIVATE */
+png_destroy_struct(png_voidp struct_ptr)
+{
+#ifdef PNG_USER_MEM_SUPPORTED
+   png_destroy_struct_2(struct_ptr, png_free_ptr_NULL, png_voidp_NULL);
+}
+
+/* Free memory allocated by a png_create_struct() call */
+void /* PRIVATE */
+png_destroy_struct_2(png_voidp struct_ptr, png_free_ptr free_fn,
+    png_voidp mem_ptr)
+{
+#endif
+   if (struct_ptr != NULL)
+   {
+#ifdef PNG_USER_MEM_SUPPORTED
+      if (free_fn != NULL)
+      {
+         png_struct dummy_struct;
+         png_structp png_ptr = &dummy_struct;
+         png_ptr->mem_ptr=mem_ptr;
+         (*(free_fn))(png_ptr, struct_ptr);
+         return;
+      }
+#endif /* PNG_USER_MEM_SUPPORTED */
+      farfree (struct_ptr);
+   }
+}
+
+/* Allocate memory.  For reasonable files, size should never exceed
+ * 64K.  However, zlib may allocate more then 64K if you don't tell
+ * it not to.  See zconf.h and png.h for more information. zlib does
+ * need to allocate exactly 64K, so whatever you call here must
+ * have the ability to do that.
+ *
+ * Borland seems to have a problem in DOS mode for exactly 64K.
+ * It gives you a segment with an offset of 8 (perhaps to store its
+ * memory stuff).  zlib doesn't like this at all, so we have to
+ * detect and deal with it.  This code should not be needed in
+ * Windows or OS/2 modes, and only in 16 bit mode.  This code has
+ * been updated by Alexander Lehmann for version 0.89 to waste less
+ * memory.
+ *
+ * Note that we can't use png_size_t for the "size" declaration,
+ * since on some systems a png_size_t is a 16-bit quantity, and as a
+ * result, we would be truncating potentially larger memory requests
+ * (which should cause a fatal error) and introducing major problems.
+ */
+png_voidp /* PRIVATE */
+png_calloc(png_structp png_ptr, png_uint_32 size)
+{
+   png_voidp ret;
+
+   ret = (png_malloc(png_ptr, size));
+   if (ret != NULL)
+      png_memset(ret,0,(png_size_t)size);
+   return (ret);
+}
+
+png_voidp PNGAPI
+png_malloc(png_structp png_ptr, png_uint_32 size)
+{
+   png_voidp ret;
+
+   if (png_ptr == NULL || size == 0)
+      return (NULL);
+
+#ifdef PNG_USER_MEM_SUPPORTED
+   if (png_ptr->malloc_fn != NULL)
+      ret = ((png_voidp)(*(png_ptr->malloc_fn))(png_ptr, (png_size_t)size));
+   else
+      ret = (png_malloc_default(png_ptr, size));
+   if (ret == NULL && (png_ptr->flags&PNG_FLAG_MALLOC_NULL_MEM_OK) == 0)
+       png_error(png_ptr, "Out of memory!");
+   return (ret);
+}
+
+png_voidp PNGAPI
+png_malloc_default(png_structp png_ptr, png_uint_32 size)
+{
+   png_voidp ret;
+#endif /* PNG_USER_MEM_SUPPORTED */
+
+   if (png_ptr == NULL || size == 0)
+      return (NULL);
+
+#ifdef PNG_MAX_MALLOC_64K
+   if (size > (png_uint_32)65536L)
+   {
+      png_warning(png_ptr, "Cannot Allocate > 64K");
+      ret = NULL;
+   }
+   else
+#endif
+
+   if (size != (size_t)size)
+      ret = NULL;
+   else if (size == (png_uint_32)65536L)
+   {
+      if (png_ptr->offset_table == NULL)
+      {
+         /* Try to see if we need to do any of this fancy stuff */
+         ret = farmalloc(size);
+         if (ret == NULL || ((png_size_t)ret & 0xffff))
+         {
+            int num_blocks;
+            png_uint_32 total_size;
+            png_bytep table;
+            int i;
+            png_byte huge * hptr;
+
+            if (ret != NULL)
+            {
+               farfree(ret);
+               ret = NULL;
+            }
+
+            if (png_ptr->zlib_window_bits > 14)
+               num_blocks = (int)(1 << (png_ptr->zlib_window_bits - 14));
+            else
+               num_blocks = 1;
+            if (png_ptr->zlib_mem_level >= 7)
+               num_blocks += (int)(1 << (png_ptr->zlib_mem_level - 7));
+            else
+               num_blocks++;
+
+            total_size = ((png_uint_32)65536L) * (png_uint_32)num_blocks+16;
+
+            table = farmalloc(total_size);
+
+            if (table == NULL)
+            {
+#ifndef PNG_USER_MEM_SUPPORTED
+               if ((png_ptr->flags&PNG_FLAG_MALLOC_NULL_MEM_OK) == 0)
+                  png_error(png_ptr, "Out Of Memory."); /* Note "O", "M" */
+               else
+                  png_warning(png_ptr, "Out Of Memory.");
+#endif
+               return (NULL);
+            }
+
+            if ((png_size_t)table & 0xfff0)
+            {
+#ifndef PNG_USER_MEM_SUPPORTED
+               if ((png_ptr->flags&PNG_FLAG_MALLOC_NULL_MEM_OK) == 0)
+                  png_error(png_ptr,
+                    "Farmalloc didn't return normalized pointer");
+               else
+                  png_warning(png_ptr,
+                    "Farmalloc didn't return normalized pointer");
+#endif
+               return (NULL);
+            }
+
+            png_ptr->offset_table = table;
+            png_ptr->offset_table_ptr = farmalloc(num_blocks *
+               png_sizeof(png_bytep));
+
+            if (png_ptr->offset_table_ptr == NULL)
+            {
+#ifndef PNG_USER_MEM_SUPPORTED
+               if ((png_ptr->flags&PNG_FLAG_MALLOC_NULL_MEM_OK) == 0)
+                  png_error(png_ptr, "Out Of memory."); /* Note "O", "m" */
+               else
+                  png_warning(png_ptr, "Out Of memory.");
+#endif
+               return (NULL);
+            }
+
+            hptr = (png_byte huge *)table;
+            if ((png_size_t)hptr & 0xf)
+            {
+               hptr = (png_byte huge *)((long)(hptr) & 0xfffffff0L);
+               hptr = hptr + 16L;  /* "hptr += 16L" fails on Turbo C++ 3.0 */
+            }
+            for (i = 0; i < num_blocks; i++)
+            {
+               png_ptr->offset_table_ptr[i] = (png_bytep)hptr;
+               hptr = hptr + (png_uint_32)65536L;  /* "+=" fails on TC++3.0 */
+            }
+
+            png_ptr->offset_table_number = num_blocks;
+            png_ptr->offset_table_count = 0;
+            png_ptr->offset_table_count_free = 0;
+         }
+      }
+
+      if (png_ptr->offset_table_count >= png_ptr->offset_table_number)
+      {
+#ifndef PNG_USER_MEM_SUPPORTED
+         if ((png_ptr->flags&PNG_FLAG_MALLOC_NULL_MEM_OK) == 0)
+            png_error(png_ptr, "Out of Memory."); /* Note "o" and "M" */
+         else
+            png_warning(png_ptr, "Out of Memory.");
+#endif
+         return (NULL);
+      }
+
+      ret = png_ptr->offset_table_ptr[png_ptr->offset_table_count++];
+   }
+   else
+      ret = farmalloc(size);
+
+#ifndef PNG_USER_MEM_SUPPORTED
+   if (ret == NULL)
+   {
+      if ((png_ptr->flags&PNG_FLAG_MALLOC_NULL_MEM_OK) == 0)
+         png_error(png_ptr, "Out of memory."); /* Note "o" and "m" */
+      else
+         png_warning(png_ptr, "Out of memory."); /* Note "o" and "m" */
+   }
+#endif
+
+   return (ret);
+}
+
+/* Free a pointer allocated by png_malloc().  In the default
+ * configuration, png_ptr is not used, but is passed in case it
+ * is needed.  If ptr is NULL, return without taking any action.
+ */
+void PNGAPI
+png_free(png_structp png_ptr, png_voidp ptr)
+{
+   if (png_ptr == NULL || ptr == NULL)
+      return;
+
+#ifdef PNG_USER_MEM_SUPPORTED
+   if (png_ptr->free_fn != NULL)
+   {
+      (*(png_ptr->free_fn))(png_ptr, ptr);
+      return;
+   }
+   else
+      png_free_default(png_ptr, ptr);
+}
+
+void PNGAPI
+png_free_default(png_structp png_ptr, png_voidp ptr)
+{
+#endif /* PNG_USER_MEM_SUPPORTED */
+
+   if (png_ptr == NULL || ptr == NULL)
+      return;
+
+   if (png_ptr->offset_table != NULL)
+   {
+      int i;
+
+      for (i = 0; i < png_ptr->offset_table_count; i++)
+      {
+         if (ptr == png_ptr->offset_table_ptr[i])
+         {
+            ptr = NULL;
+            png_ptr->offset_table_count_free++;
+            break;
+         }
+      }
+      if (png_ptr->offset_table_count_free == png_ptr->offset_table_count)
+      {
+         farfree(png_ptr->offset_table);
+         farfree(png_ptr->offset_table_ptr);
+         png_ptr->offset_table = NULL;
+         png_ptr->offset_table_ptr = NULL;
+      }
+   }
+
+   if (ptr != NULL)
+   {
+      farfree(ptr);
+   }
+}
+
+#else /* Not the Borland DOS special memory handler */
+
+/* Allocate memory for a png_struct or a png_info.  The malloc and
+   memset can be replaced by a single call to calloc() if this is thought
+   to improve performance noticably. */
+png_voidp /* PRIVATE */
+png_create_struct(int type)
+{
+#ifdef PNG_USER_MEM_SUPPORTED
+   return (png_create_struct_2(type, png_malloc_ptr_NULL, png_voidp_NULL));
+}
+
+/* Allocate memory for a png_struct or a png_info.  The malloc and
+   memset can be replaced by a single call to calloc() if this is thought
+   to improve performance noticably. */
+png_voidp /* PRIVATE */
+png_create_struct_2(int type, png_malloc_ptr malloc_fn, png_voidp mem_ptr)
+{
+#endif /* PNG_USER_MEM_SUPPORTED */
+   png_size_t size;
+   png_voidp struct_ptr;
+
+   if (type == PNG_STRUCT_INFO)
+      size = png_sizeof(png_info);
+   else if (type == PNG_STRUCT_PNG)
+      size = png_sizeof(png_struct);
+   else
+      return (NULL);
+
+#ifdef PNG_USER_MEM_SUPPORTED
+   if (malloc_fn != NULL)
+   {
+      png_struct dummy_struct;
+      png_structp png_ptr = &dummy_struct;
+      png_ptr->mem_ptr=mem_ptr;
+      struct_ptr = (*(malloc_fn))(png_ptr, size);
+      if (struct_ptr != NULL)
+         png_memset(struct_ptr, 0, size);
+      return (struct_ptr);
+   }
+#endif /* PNG_USER_MEM_SUPPORTED */
+
+#if defined(__TURBOC__) && !defined(__FLAT__)
+   struct_ptr = (png_voidp)farmalloc(size);
+#else
+# if defined(_MSC_VER) && defined(MAXSEG_64K)
+   struct_ptr = (png_voidp)halloc(size, 1);
+# else
+   struct_ptr = (png_voidp)malloc(size);
+# endif
+#endif
+   if (struct_ptr != NULL)
+      png_memset(struct_ptr, 0, size);
+
+   return (struct_ptr);
+}
+
+
+/* Free memory allocated by a png_create_struct() call */
+void /* PRIVATE */
+png_destroy_struct(png_voidp struct_ptr)
+{
+#ifdef PNG_USER_MEM_SUPPORTED
+   png_destroy_struct_2(struct_ptr, png_free_ptr_NULL, png_voidp_NULL);
+}
+
+/* Free memory allocated by a png_create_struct() call */
+void /* PRIVATE */
+png_destroy_struct_2(png_voidp struct_ptr, png_free_ptr free_fn,
+    png_voidp mem_ptr)
+{
+#endif /* PNG_USER_MEM_SUPPORTED */
+   if (struct_ptr != NULL)
+   {
+#ifdef PNG_USER_MEM_SUPPORTED
+      if (free_fn != NULL)
+      {
+         png_struct dummy_struct;
+         png_structp png_ptr = &dummy_struct;
+         png_ptr->mem_ptr=mem_ptr;
+         (*(free_fn))(png_ptr, struct_ptr);
+         return;
+      }
+#endif /* PNG_USER_MEM_SUPPORTED */
+#if defined(__TURBOC__) && !defined(__FLAT__)
+      farfree(struct_ptr);
+#else
+# if defined(_MSC_VER) && defined(MAXSEG_64K)
+      hfree(struct_ptr);
+# else
+      free(struct_ptr);
+# endif
+#endif
+   }
+}
+
+/* Allocate memory.  For reasonable files, size should never exceed
+ * 64K.  However, zlib may allocate more then 64K if you don't tell
+ * it not to.  See zconf.h and png.h for more information.  zlib does
+ * need to allocate exactly 64K, so whatever you call here must
+ * have the ability to do that.
+ */
+
+png_voidp /* PRIVATE */
+png_calloc(png_structp png_ptr, png_uint_32 size)
+{
+   png_voidp ret;
+
+   ret = (png_malloc(png_ptr, size));
+   if (ret != NULL)
+      png_memset(ret,0,(png_size_t)size);
+   return (ret);
+}
+
+png_voidp PNGAPI
+png_malloc(png_structp png_ptr, png_uint_32 size)
+{
+   png_voidp ret;
+
+#ifdef PNG_USER_MEM_SUPPORTED
+   if (png_ptr == NULL || size == 0)
+      return (NULL);
+
+   if (png_ptr->malloc_fn != NULL)
+      ret = ((png_voidp)(*(png_ptr->malloc_fn))(png_ptr, (png_size_t)size));
+   else
+      ret = (png_malloc_default(png_ptr, size));
+   if (ret == NULL && (png_ptr->flags&PNG_FLAG_MALLOC_NULL_MEM_OK) == 0)
+       png_error(png_ptr, "Out of Memory!");
+   return (ret);
+}
+
+png_voidp PNGAPI
+png_malloc_default(png_structp png_ptr, png_uint_32 size)
+{
+   png_voidp ret;
+#endif /* PNG_USER_MEM_SUPPORTED */
+
+   if (png_ptr == NULL || size == 0)
+      return (NULL);
+
+#ifdef PNG_MAX_MALLOC_64K
+   if (size > (png_uint_32)65536L)
+   {
+#ifndef PNG_USER_MEM_SUPPORTED
+      if ((png_ptr->flags&PNG_FLAG_MALLOC_NULL_MEM_OK) == 0)
+         png_error(png_ptr, "Cannot Allocate > 64K");
+      else
+#endif
+         return NULL;
+   }
+#endif
+
+   /* Check for overflow */
+#if defined(__TURBOC__) && !defined(__FLAT__)
+   if (size != (unsigned long)size)
+      ret = NULL;
+   else
+      ret = farmalloc(size);
+#else
+# if defined(_MSC_VER) && defined(MAXSEG_64K)
+   if (size != (unsigned long)size)
+      ret = NULL;
+   else
+      ret = halloc(size, 1);
+# else
+   if (size != (size_t)size)
+      ret = NULL;
+   else
+      ret = malloc((size_t)size);
+# endif
+#endif
+
+#ifndef PNG_USER_MEM_SUPPORTED
+   if (ret == NULL && (png_ptr->flags&PNG_FLAG_MALLOC_NULL_MEM_OK) == 0)
+      png_error(png_ptr, "Out of Memory");
+#endif
+
+   return (ret);
+}
+
+/* Free a pointer allocated by png_malloc().  If ptr is NULL, return
+ * without taking any action.
+ */
+void PNGAPI
+png_free(png_structp png_ptr, png_voidp ptr)
+{
+   if (png_ptr == NULL || ptr == NULL)
+      return;
+
+#ifdef PNG_USER_MEM_SUPPORTED
+   if (png_ptr->free_fn != NULL)
+   {
+      (*(png_ptr->free_fn))(png_ptr, ptr);
+      return;
+   }
+   else
+      png_free_default(png_ptr, ptr);
+}
+void PNGAPI
+png_free_default(png_structp png_ptr, png_voidp ptr)
+{
+   if (png_ptr == NULL || ptr == NULL)
+      return;
+
+#endif /* PNG_USER_MEM_SUPPORTED */
+
+#if defined(__TURBOC__) && !defined(__FLAT__)
+   farfree(ptr);
+#else
+# if defined(_MSC_VER) && defined(MAXSEG_64K)
+   hfree(ptr);
+# else
+   free(ptr);
+# endif
+#endif
+}
+
+#endif /* Not Borland DOS special memory handler */
+
+#ifdef PNG_1_0_X
+#  define png_malloc_warn png_malloc
+#else
+/* This function was added at libpng version 1.2.3.  The png_malloc_warn()
+ * function will set up png_malloc() to issue a png_warning and return NULL
+ * instead of issuing a png_error, if it fails to allocate the requested
+ * memory.
+ */
+png_voidp PNGAPI
+png_malloc_warn(png_structp png_ptr, png_uint_32 size)
+{
+   png_voidp ptr;
+   png_uint_32 save_flags;
+   if (png_ptr == NULL)
+      return (NULL);
+
+   save_flags = png_ptr->flags;
+   png_ptr->flags|=PNG_FLAG_MALLOC_NULL_MEM_OK;
+   ptr = (png_voidp)png_malloc((png_structp)png_ptr, size);
+   png_ptr->flags=save_flags;
+   return(ptr);
+}
+#endif
+
+png_voidp PNGAPI
+png_memcpy_check (png_structp png_ptr, png_voidp s1, png_voidp s2,
+   png_uint_32 length)
+{
+   png_size_t size;
+
+   size = (png_size_t)length;
+   if ((png_uint_32)size != length)
+      png_error(png_ptr, "Overflow in png_memcpy_check.");
+
+   return(png_memcpy (s1, s2, size));
+}
+
+png_voidp PNGAPI
+png_memset_check (png_structp png_ptr, png_voidp s1, int value,
+   png_uint_32 length)
+{
+   png_size_t size;
+
+   size = (png_size_t)length;
+   if ((png_uint_32)size != length)
+      png_error(png_ptr, "Overflow in png_memset_check.");
+
+   return (png_memset (s1, value, size));
+
+}
+
+#ifdef PNG_USER_MEM_SUPPORTED
+/* This function is called when the application wants to use another method
+ * of allocating and freeing memory.
+ */
+void PNGAPI
+png_set_mem_fn(png_structp png_ptr, png_voidp mem_ptr, png_malloc_ptr
+  malloc_fn, png_free_ptr free_fn)
+{
+   if (png_ptr != NULL)
+   {
+      png_ptr->mem_ptr = mem_ptr;
+      png_ptr->malloc_fn = malloc_fn;
+      png_ptr->free_fn = free_fn;
+   }
+}
+
+/* This function returns a pointer to the mem_ptr associated with the user
+ * functions.  The application should free any memory associated with this
+ * pointer before png_write_destroy and png_read_destroy are called.
+ */
+png_voidp PNGAPI
+png_get_mem_ptr(png_structp png_ptr)
+{
+   if (png_ptr == NULL)
+      return (NULL);
+   return ((png_voidp)png_ptr->mem_ptr);
+}
+#endif /* PNG_USER_MEM_SUPPORTED */
+#endif /* PNG_READ_SUPPORTED || PNG_WRITE_SUPPORTED */
diff --git a/Externals/libpng/pngpread.c b/Externals/libpng/pngpread.c
index 7b1149bab1..9d40c31366 100644
--- a/Externals/libpng/pngpread.c
+++ b/Externals/libpng/pngpread.c
@@ -1,1854 +1,1241 @@
-
-/* pngpread.c - read a png file in push mode
- *
- * Last changed in libpng 1.5.1 [February 3, 2011]
- * Copyright (c) 1998-2011 Glenn Randers-Pehrson
- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
- *
- * This code is released under the libpng license.
- * For conditions of distribution and use, see the disclaimer
- * and license in png.h
- */
-
-#include "pngpriv.h"
-
-#ifdef PNG_PROGRESSIVE_READ_SUPPORTED
-
-/* Push model modes */
-#define PNG_READ_SIG_MODE   0
-#define PNG_READ_CHUNK_MODE 1
-#define PNG_READ_IDAT_MODE  2
-#define PNG_SKIP_MODE       3
-#define PNG_READ_tEXt_MODE  4
-#define PNG_READ_zTXt_MODE  5
-#define PNG_READ_DONE_MODE  6
-#define PNG_READ_iTXt_MODE  7
-#define PNG_ERROR_MODE      8
-
-void PNGAPI
-png_process_data(png_structp png_ptr, png_infop info_ptr,
-    png_bytep buffer, png_size_t buffer_size)
-{
-   if (png_ptr == NULL || info_ptr == NULL)
-      return;
-
-   png_push_restore_buffer(png_ptr, buffer, buffer_size);
-
-   while (png_ptr->buffer_size)
-   {
-      png_process_some_data(png_ptr, info_ptr);
-   }
-}
-
-png_size_t PNGAPI
-png_process_data_pause(png_structp png_ptr, int save)
-{
-   if (png_ptr != NULL)
-   {
-      /* It's easiest for the caller if we do the save, then the caller doesn't
-       * have to supply the same data again:
-       */
-      if (save)
-         png_push_save_buffer(png_ptr);
-      else
-      {
-         /* This includes any pending saved bytes: */
-         png_size_t remaining = png_ptr->buffer_size;
-         png_ptr->buffer_size = 0;
-
-         /* So subtract the saved buffer size, unless all the data
-          * is actually 'saved', in which case we just return 0
-          */
-         if (png_ptr->save_buffer_size < remaining)
-            return remaining - png_ptr->save_buffer_size;
-      }
-   }
-
-   return 0;
-}
-
-png_uint_32 PNGAPI
-png_process_data_skip(png_structp png_ptr)
-{
-   png_uint_32 remaining = 0;
-
-   if (png_ptr != NULL && png_ptr->process_mode == PNG_SKIP_MODE &&
-      png_ptr->skip_length > 0)
-   {
-      /* At the end of png_process_data the buffer size must be 0 (see the loop
-       * above) so we can detect a broken call here:
-       */
-      if (png_ptr->buffer_size != 0)
-         png_error(png_ptr,
-            "png_process_data_skip called inside png_process_data");
-
-      /* If is impossible for there to be a saved buffer at this point -
-       * otherwise we could not be in SKIP mode.  This will also happen if
-       * png_process_skip is called inside png_process_data (but only very
-       * rarely.)
-       */
-      if (png_ptr->save_buffer_size != 0)
-         png_error(png_ptr, "png_process_data_skip called with saved data");
-
-      remaining = png_ptr->skip_length;
-      png_ptr->skip_length = 0;
-      png_ptr->process_mode = PNG_READ_CHUNK_MODE;
-   }
-
-   return remaining;
-}
-
-/* What we do with the incoming data depends on what we were previously
- * doing before we ran out of data...
- */
-void /* PRIVATE */
-png_process_some_data(png_structp png_ptr, png_infop info_ptr)
-{
-   if (png_ptr == NULL)
-      return;
-
-   switch (png_ptr->process_mode)
-   {
-      case PNG_READ_SIG_MODE:
-      {
-         png_push_read_sig(png_ptr, info_ptr);
-         break;
-      }
-
-      case PNG_READ_CHUNK_MODE:
-      {
-         png_push_read_chunk(png_ptr, info_ptr);
-         break;
-      }
-
-      case PNG_READ_IDAT_MODE:
-      {
-         png_push_read_IDAT(png_ptr);
-         break;
-      }
-
-#ifdef PNG_READ_tEXt_SUPPORTED
-      case PNG_READ_tEXt_MODE:
-      {
-         png_push_read_tEXt(png_ptr, info_ptr);
-         break;
-      }
-
-#endif
-#ifdef PNG_READ_zTXt_SUPPORTED
-      case PNG_READ_zTXt_MODE:
-      {
-         png_push_read_zTXt(png_ptr, info_ptr);
-         break;
-      }
-
-#endif
-#ifdef PNG_READ_iTXt_SUPPORTED
-      case PNG_READ_iTXt_MODE:
-      {
-         png_push_read_iTXt(png_ptr, info_ptr);
-         break;
-      }
-
-#endif
-      case PNG_SKIP_MODE:
-      {
-         png_push_crc_finish(png_ptr);
-         break;
-      }
-
-      default:
-      {
-         png_ptr->buffer_size = 0;
-         break;
-      }
-   }
-}
-
-/* Read any remaining signature bytes from the stream and compare them with
- * the correct PNG signature.  It is possible that this routine is called
- * with bytes already read from the signature, either because they have been
- * checked by the calling application, or because of multiple calls to this
- * routine.
- */
-void /* PRIVATE */
-png_push_read_sig(png_structp png_ptr, png_infop info_ptr)
-{
-   png_size_t num_checked = png_ptr->sig_bytes,
-             num_to_check = 8 - num_checked;
-
-   if (png_ptr->buffer_size < num_to_check)
-   {
-      num_to_check = png_ptr->buffer_size;
-   }
-
-   png_push_fill_buffer(png_ptr, &(info_ptr->signature[num_checked]),
-       num_to_check);
-   png_ptr->sig_bytes = (png_byte)(png_ptr->sig_bytes + num_to_check);
-
-   if (png_sig_cmp(info_ptr->signature, num_checked, num_to_check))
-   {
-      if (num_checked < 4 &&
-          png_sig_cmp(info_ptr->signature, num_checked, num_to_check - 4))
-         png_error(png_ptr, "Not a PNG file");
-
-      else
-         png_error(png_ptr, "PNG file corrupted by ASCII conversion");
-   }
-   else
-   {
-      if (png_ptr->sig_bytes >= 8)
-      {
-         png_ptr->process_mode = PNG_READ_CHUNK_MODE;
-      }
-   }
-}
-
-void /* PRIVATE */
-png_push_read_chunk(png_structp png_ptr, png_infop info_ptr)
-{
-      PNG_IHDR;
-      PNG_IDAT;
-      PNG_IEND;
-      PNG_PLTE;
-#ifdef PNG_READ_bKGD_SUPPORTED
-      PNG_bKGD;
-#endif
-#ifdef PNG_READ_cHRM_SUPPORTED
-      PNG_cHRM;
-#endif
-#ifdef PNG_READ_gAMA_SUPPORTED
-      PNG_gAMA;
-#endif
-#ifdef PNG_READ_hIST_SUPPORTED
-      PNG_hIST;
-#endif
-#ifdef PNG_READ_iCCP_SUPPORTED
-      PNG_iCCP;
-#endif
-#ifdef PNG_READ_iTXt_SUPPORTED
-      PNG_iTXt;
-#endif
-#ifdef PNG_READ_oFFs_SUPPORTED
-      PNG_oFFs;
-#endif
-#ifdef PNG_READ_pCAL_SUPPORTED
-      PNG_pCAL;
-#endif
-#ifdef PNG_READ_pHYs_SUPPORTED
-      PNG_pHYs;
-#endif
-#ifdef PNG_READ_sBIT_SUPPORTED
-      PNG_sBIT;
-#endif
-#ifdef PNG_READ_sCAL_SUPPORTED
-      PNG_sCAL;
-#endif
-#ifdef PNG_READ_sRGB_SUPPORTED
-      PNG_sRGB;
-#endif
-#ifdef PNG_READ_sPLT_SUPPORTED
-      PNG_sPLT;
-#endif
-#ifdef PNG_READ_tEXt_SUPPORTED
-      PNG_tEXt;
-#endif
-#ifdef PNG_READ_tIME_SUPPORTED
-      PNG_tIME;
-#endif
-#ifdef PNG_READ_tRNS_SUPPORTED
-      PNG_tRNS;
-#endif
-#ifdef PNG_READ_zTXt_SUPPORTED
-      PNG_zTXt;
-#endif
-
-   /* First we make sure we have enough data for the 4 byte chunk name
-    * and the 4 byte chunk length before proceeding with decoding the
-    * chunk data.  To fully decode each of these chunks, we also make
-    * sure we have enough data in the buffer for the 4 byte CRC at the
-    * end of every chunk (except IDAT, which is handled separately).
-    */
-   if (!(png_ptr->mode & PNG_HAVE_CHUNK_HEADER))
-   {
-      png_byte chunk_length[4];
-
-      if (png_ptr->buffer_size < 8)
-      {
-         png_push_save_buffer(png_ptr);
-         return;
-      }
-
-      png_push_fill_buffer(png_ptr, chunk_length, 4);
-      png_ptr->push_length = png_get_uint_31(png_ptr, chunk_length);
-      png_reset_crc(png_ptr);
-      png_crc_read(png_ptr, png_ptr->chunk_name, 4);
-      png_check_chunk_name(png_ptr, png_ptr->chunk_name);
-      png_ptr->mode |= PNG_HAVE_CHUNK_HEADER;
-   }
-
-   if (!png_memcmp(png_ptr->chunk_name, png_IDAT, 4))
-      if (png_ptr->mode & PNG_AFTER_IDAT)
-         png_ptr->mode |= PNG_HAVE_CHUNK_AFTER_IDAT;
-
-   if (!png_memcmp(png_ptr->chunk_name, png_IHDR, 4))
-   {
-      if (png_ptr->push_length != 13)
-         png_error(png_ptr, "Invalid IHDR length");
-
-      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
-      {
-         png_push_save_buffer(png_ptr);
-         return;
-      }
-
-      png_handle_IHDR(png_ptr, info_ptr, png_ptr->push_length);
-   }
-
-   else if (!png_memcmp(png_ptr->chunk_name, png_IEND, 4))
-   {
-      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
-      {
-         png_push_save_buffer(png_ptr);
-         return;
-      }
-
-      png_handle_IEND(png_ptr, info_ptr, png_ptr->push_length);
-
-      png_ptr->process_mode = PNG_READ_DONE_MODE;
-      png_push_have_end(png_ptr, info_ptr);
-   }
-
-#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
-   else if (png_handle_as_unknown(png_ptr, png_ptr->chunk_name))
-   {
-      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
-      {
-         png_push_save_buffer(png_ptr);
-         return;
-      }
-
-      if (!png_memcmp(png_ptr->chunk_name, png_IDAT, 4))
-         png_ptr->mode |= PNG_HAVE_IDAT;
-
-      png_handle_unknown(png_ptr, info_ptr, png_ptr->push_length);
-
-      if (!png_memcmp(png_ptr->chunk_name, png_PLTE, 4))
-         png_ptr->mode |= PNG_HAVE_PLTE;
-
-      else if (!png_memcmp(png_ptr->chunk_name, png_IDAT, 4))
-      {
-         if (!(png_ptr->mode & PNG_HAVE_IHDR))
-            png_error(png_ptr, "Missing IHDR before IDAT");
-
-         else if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE &&
-             !(png_ptr->mode & PNG_HAVE_PLTE))
-            png_error(png_ptr, "Missing PLTE before IDAT");
-      }
-   }
-
-#endif
-   else if (!png_memcmp(png_ptr->chunk_name, png_PLTE, 4))
-   {
-      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
-      {
-         png_push_save_buffer(png_ptr);
-         return;
-      }
-      png_handle_PLTE(png_ptr, info_ptr, png_ptr->push_length);
-   }
-
-   else if (!png_memcmp(png_ptr->chunk_name, png_IDAT, 4))
-   {
-      /* If we reach an IDAT chunk, this means we have read all of the
-       * header chunks, and we can start reading the image (or if this
-       * is called after the image has been read - we have an error).
-       */
-
-      if (!(png_ptr->mode & PNG_HAVE_IHDR))
-         png_error(png_ptr, "Missing IHDR before IDAT");
-
-      else if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE &&
-          !(png_ptr->mode & PNG_HAVE_PLTE))
-         png_error(png_ptr, "Missing PLTE before IDAT");
-
-      if (png_ptr->mode & PNG_HAVE_IDAT)
-      {
-         if (!(png_ptr->mode & PNG_HAVE_CHUNK_AFTER_IDAT))
-            if (png_ptr->push_length == 0)
-               return;
-
-         if (png_ptr->mode & PNG_AFTER_IDAT)
-            png_benign_error(png_ptr, "Too many IDATs found");
-      }
-
-      png_ptr->idat_size = png_ptr->push_length;
-      png_ptr->mode |= PNG_HAVE_IDAT;
-      png_ptr->process_mode = PNG_READ_IDAT_MODE;
-      png_push_have_info(png_ptr, info_ptr);
-      png_ptr->zstream.avail_out =
-          (uInt) PNG_ROWBYTES(png_ptr->pixel_depth,
-          png_ptr->iwidth) + 1;
-      png_ptr->zstream.next_out = png_ptr->row_buf;
-      return;
-   }
-
-#ifdef PNG_READ_gAMA_SUPPORTED
-   else if (!png_memcmp(png_ptr->chunk_name, png_gAMA, 4))
-   {
-      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
-      {
-         png_push_save_buffer(png_ptr);
-         return;
-      }
-
-      png_handle_gAMA(png_ptr, info_ptr, png_ptr->push_length);
-   }
-
-#endif
-#ifdef PNG_READ_sBIT_SUPPORTED
-   else if (!png_memcmp(png_ptr->chunk_name, png_sBIT, 4))
-   {
-      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
-      {
-         png_push_save_buffer(png_ptr);
-         return;
-      }
-
-      png_handle_sBIT(png_ptr, info_ptr, png_ptr->push_length);
-   }
-
-#endif
-#ifdef PNG_READ_cHRM_SUPPORTED
-   else if (!png_memcmp(png_ptr->chunk_name, png_cHRM, 4))
-   {
-      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
-      {
-         png_push_save_buffer(png_ptr);
-         return;
-      }
-
-      png_handle_cHRM(png_ptr, info_ptr, png_ptr->push_length);
-   }
-
-#endif
-#ifdef PNG_READ_sRGB_SUPPORTED
-   else if (!png_memcmp(png_ptr->chunk_name, png_sRGB, 4))
-   {
-      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
-      {
-         png_push_save_buffer(png_ptr);
-         return;
-      }
-
-      png_handle_sRGB(png_ptr, info_ptr, png_ptr->push_length);
-   }
-
-#endif
-#ifdef PNG_READ_iCCP_SUPPORTED
-   else if (!png_memcmp(png_ptr->chunk_name, png_iCCP, 4))
-   {
-      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
-      {
-         png_push_save_buffer(png_ptr);
-         return;
-      }
-
-      png_handle_iCCP(png_ptr, info_ptr, png_ptr->push_length);
-   }
-
-#endif
-#ifdef PNG_READ_sPLT_SUPPORTED
-   else if (!png_memcmp(png_ptr->chunk_name, png_sPLT, 4))
-   {
-      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
-      {
-         png_push_save_buffer(png_ptr);
-         return;
-      }
-
-      png_handle_sPLT(png_ptr, info_ptr, png_ptr->push_length);
-   }
-
-#endif
-#ifdef PNG_READ_tRNS_SUPPORTED
-   else if (!png_memcmp(png_ptr->chunk_name, png_tRNS, 4))
-   {
-      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
-      {
-         png_push_save_buffer(png_ptr);
-         return;
-      }
-
-      png_handle_tRNS(png_ptr, info_ptr, png_ptr->push_length);
-   }
-
-#endif
-#ifdef PNG_READ_bKGD_SUPPORTED
-   else if (!png_memcmp(png_ptr->chunk_name, png_bKGD, 4))
-   {
-      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
-      {
-         png_push_save_buffer(png_ptr);
-         return;
-      }
-
-      png_handle_bKGD(png_ptr, info_ptr, png_ptr->push_length);
-   }
-
-#endif
-#ifdef PNG_READ_hIST_SUPPORTED
-   else if (!png_memcmp(png_ptr->chunk_name, png_hIST, 4))
-   {
-      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
-      {
-         png_push_save_buffer(png_ptr);
-         return;
-      }
-
-      png_handle_hIST(png_ptr, info_ptr, png_ptr->push_length);
-   }
-
-#endif
-#ifdef PNG_READ_pHYs_SUPPORTED
-   else if (!png_memcmp(png_ptr->chunk_name, png_pHYs, 4))
-   {
-      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
-      {
-         png_push_save_buffer(png_ptr);
-         return;
-      }
-
-      png_handle_pHYs(png_ptr, info_ptr, png_ptr->push_length);
-   }
-
-#endif
-#ifdef PNG_READ_oFFs_SUPPORTED
-   else if (!png_memcmp(png_ptr->chunk_name, png_oFFs, 4))
-   {
-      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
-      {
-         png_push_save_buffer(png_ptr);
-         return;
-      }
-
-      png_handle_oFFs(png_ptr, info_ptr, png_ptr->push_length);
-   }
-#endif
-
-#ifdef PNG_READ_pCAL_SUPPORTED
-   else if (!png_memcmp(png_ptr->chunk_name, png_pCAL, 4))
-   {
-      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
-      {
-         png_push_save_buffer(png_ptr);
-         return;
-      }
-
-      png_handle_pCAL(png_ptr, info_ptr, png_ptr->push_length);
-   }
-
-#endif
-#ifdef PNG_READ_sCAL_SUPPORTED
-   else if (!png_memcmp(png_ptr->chunk_name, png_sCAL, 4))
-   {
-      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
-      {
-         png_push_save_buffer(png_ptr);
-         return;
-      }
-
-      png_handle_sCAL(png_ptr, info_ptr, png_ptr->push_length);
-   }
-
-#endif
-#ifdef PNG_READ_tIME_SUPPORTED
-   else if (!png_memcmp(png_ptr->chunk_name, png_tIME, 4))
-   {
-      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
-      {
-         png_push_save_buffer(png_ptr);
-         return;
-      }
-
-      png_handle_tIME(png_ptr, info_ptr, png_ptr->push_length);
-   }
-
-#endif
-#ifdef PNG_READ_tEXt_SUPPORTED
-   else if (!png_memcmp(png_ptr->chunk_name, png_tEXt, 4))
-   {
-      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
-      {
-         png_push_save_buffer(png_ptr);
-         return;
-      }
-
-      png_push_handle_tEXt(png_ptr, info_ptr, png_ptr->push_length);
-   }
-
-#endif
-#ifdef PNG_READ_zTXt_SUPPORTED
-   else if (!png_memcmp(png_ptr->chunk_name, png_zTXt, 4))
-   {
-      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
-      {
-         png_push_save_buffer(png_ptr);
-         return;
-      }
-
-      png_push_handle_zTXt(png_ptr, info_ptr, png_ptr->push_length);
-   }
-
-#endif
-#ifdef PNG_READ_iTXt_SUPPORTED
-   else if (!png_memcmp(png_ptr->chunk_name, png_iTXt, 4))
-   {
-      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
-      {
-         png_push_save_buffer(png_ptr);
-         return;
-      }
-
-      png_push_handle_iTXt(png_ptr, info_ptr, png_ptr->push_length);
-   }
-
-#endif
-   else
-   {
-      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
-      {
-         png_push_save_buffer(png_ptr);
-         return;
-      }
-      png_push_handle_unknown(png_ptr, info_ptr, png_ptr->push_length);
-   }
-
-   png_ptr->mode &= ~PNG_HAVE_CHUNK_HEADER;
-}
-
-void /* PRIVATE */
-png_push_crc_skip(png_structp png_ptr, png_uint_32 skip)
-{
-   png_ptr->process_mode = PNG_SKIP_MODE;
-   png_ptr->skip_length = skip;
-}
-
-void /* PRIVATE */
-png_push_crc_finish(png_structp png_ptr)
-{
-   if (png_ptr->skip_length && png_ptr->save_buffer_size)
-   {
-      png_size_t save_size = png_ptr->save_buffer_size;
-      png_uint_32 skip_length = png_ptr->skip_length;
-
-      /* We want the smaller of 'skip_length' and 'save_buffer_size', but
-       * they are of different types and we don't know which variable has the
-       * fewest bits.  Carefully select the smaller and cast it to the type of
-       * the larger - this cannot overflow.  Do not cast in the following test
-       * - it will break on either 16 or 64 bit platforms.
-       */
-      if (skip_length < save_size)
-         save_size = (png_size_t)skip_length;
-
-      else
-         skip_length = (png_uint_32)save_size;
-
-      png_calculate_crc(png_ptr, png_ptr->save_buffer_ptr, save_size);
-
-      png_ptr->skip_length -= skip_length;
-      png_ptr->buffer_size -= save_size;
-      png_ptr->save_buffer_size -= save_size;
-      png_ptr->save_buffer_ptr += save_size;
-   }
-   if (png_ptr->skip_length && png_ptr->current_buffer_size)
-   {
-      png_size_t save_size = png_ptr->current_buffer_size;
-      png_uint_32 skip_length = png_ptr->skip_length;
-
-      /* We want the smaller of 'skip_length' and 'current_buffer_size', here,
-       * the same problem exists as above and the same solution.
-       */
-      if (skip_length < save_size)
-         save_size = (png_size_t)skip_length;
-
-      else
-         skip_length = (png_uint_32)save_size;
-
-      png_calculate_crc(png_ptr, png_ptr->current_buffer_ptr, save_size);
-
-      png_ptr->skip_length -= skip_length;
-      png_ptr->buffer_size -= save_size;
-      png_ptr->current_buffer_size -= save_size;
-      png_ptr->current_buffer_ptr += save_size;
-   }
-   if (!png_ptr->skip_length)
-   {
-      if (png_ptr->buffer_size < 4)
-      {
-         png_push_save_buffer(png_ptr);
-         return;
-      }
-
-      png_crc_finish(png_ptr, 0);
-      png_ptr->process_mode = PNG_READ_CHUNK_MODE;
-   }
-}
-
-void PNGCBAPI
-png_push_fill_buffer(png_structp png_ptr, png_bytep buffer, png_size_t length)
-{
-   png_bytep ptr;
-
-   if (png_ptr == NULL)
-      return;
-
-   ptr = buffer;
-   if (png_ptr->save_buffer_size)
-   {
-      png_size_t save_size;
-
-      if (length < png_ptr->save_buffer_size)
-         save_size = length;
-
-      else
-         save_size = png_ptr->save_buffer_size;
-
-      png_memcpy(ptr, png_ptr->save_buffer_ptr, save_size);
-      length -= save_size;
-      ptr += save_size;
-      png_ptr->buffer_size -= save_size;
-      png_ptr->save_buffer_size -= save_size;
-      png_ptr->save_buffer_ptr += save_size;
-   }
-   if (length && png_ptr->current_buffer_size)
-   {
-      png_size_t save_size;
-
-      if (length < png_ptr->current_buffer_size)
-         save_size = length;
-
-      else
-         save_size = png_ptr->current_buffer_size;
-
-      png_memcpy(ptr, png_ptr->current_buffer_ptr, save_size);
-      png_ptr->buffer_size -= save_size;
-      png_ptr->current_buffer_size -= save_size;
-      png_ptr->current_buffer_ptr += save_size;
-   }
-}
-
-void /* PRIVATE */
-png_push_save_buffer(png_structp png_ptr)
-{
-   if (png_ptr->save_buffer_size)
-   {
-      if (png_ptr->save_buffer_ptr != png_ptr->save_buffer)
-      {
-         png_size_t i, istop;
-         png_bytep sp;
-         png_bytep dp;
-
-         istop = png_ptr->save_buffer_size;
-         for (i = 0, sp = png_ptr->save_buffer_ptr, dp = png_ptr->save_buffer;
-             i < istop; i++, sp++, dp++)
-         {
-            *dp = *sp;
-         }
-      }
-   }
-   if (png_ptr->save_buffer_size + png_ptr->current_buffer_size >
-       png_ptr->save_buffer_max)
-   {
-      png_size_t new_max;
-      png_bytep old_buffer;
-
-      if (png_ptr->save_buffer_size > PNG_SIZE_MAX -
-          (png_ptr->current_buffer_size + 256))
-      {
-         png_error(png_ptr, "Potential overflow of save_buffer");
-      }
-
-      new_max = png_ptr->save_buffer_size + png_ptr->current_buffer_size + 256;
-      old_buffer = png_ptr->save_buffer;
-      png_ptr->save_buffer = (png_bytep)png_malloc_warn(png_ptr,
-          (png_size_t)new_max);
-
-      if (png_ptr->save_buffer == NULL)
-      {
-         png_free(png_ptr, old_buffer);
-         png_error(png_ptr, "Insufficient memory for save_buffer");
-      }
-
-      png_memcpy(png_ptr->save_buffer, old_buffer, png_ptr->save_buffer_size);
-      png_free(png_ptr, old_buffer);
-      png_ptr->save_buffer_max = new_max;
-   }
-   if (png_ptr->current_buffer_size)
-   {
-      png_memcpy(png_ptr->save_buffer + png_ptr->save_buffer_size,
-         png_ptr->current_buffer_ptr, png_ptr->current_buffer_size);
-      png_ptr->save_buffer_size += png_ptr->current_buffer_size;
-      png_ptr->current_buffer_size = 0;
-   }
-   png_ptr->save_buffer_ptr = png_ptr->save_buffer;
-   png_ptr->buffer_size = 0;
-}
-
-void /* PRIVATE */
-png_push_restore_buffer(png_structp png_ptr, png_bytep buffer,
-   png_size_t buffer_length)
-{
-   png_ptr->current_buffer = buffer;
-   png_ptr->current_buffer_size = buffer_length;
-   png_ptr->buffer_size = buffer_length + png_ptr->save_buffer_size;
-   png_ptr->current_buffer_ptr = png_ptr->current_buffer;
-}
-
-void /* PRIVATE */
-png_push_read_IDAT(png_structp png_ptr)
-{
-   PNG_IDAT;
-   if (!(png_ptr->mode & PNG_HAVE_CHUNK_HEADER))
-   {
-      png_byte chunk_length[4];
-
-      if (png_ptr->buffer_size < 8)
-      {
-         png_push_save_buffer(png_ptr);
-         return;
-      }
-
-      png_push_fill_buffer(png_ptr, chunk_length, 4);
-      png_ptr->push_length = png_get_uint_31(png_ptr, chunk_length);
-      png_reset_crc(png_ptr);
-      png_crc_read(png_ptr, png_ptr->chunk_name, 4);
-      png_ptr->mode |= PNG_HAVE_CHUNK_HEADER;
-
-      if (png_memcmp(png_ptr->chunk_name, png_IDAT, 4))
-      {
-         png_ptr->process_mode = PNG_READ_CHUNK_MODE;
-
-         if (!(png_ptr->flags & PNG_FLAG_ZLIB_FINISHED))
-            png_error(png_ptr, "Not enough compressed data");
-
-         return;
-      }
-
-      png_ptr->idat_size = png_ptr->push_length;
-   }
-   if (png_ptr->idat_size && png_ptr->save_buffer_size)
-   {
-      png_size_t save_size = png_ptr->save_buffer_size;
-      png_uint_32 idat_size = png_ptr->idat_size;
-
-      /* We want the smaller of 'idat_size' and 'current_buffer_size', but they
-       * are of different types and we don't know which variable has the fewest
-       * bits.  Carefully select the smaller and cast it to the type of the
-       * larger - this cannot overflow.  Do not cast in the following test - it
-       * will break on either 16 or 64 bit platforms.
-       */
-      if (idat_size < save_size)
-         save_size = (png_size_t)idat_size;
-
-      else
-         idat_size = (png_uint_32)save_size;
-
-      png_calculate_crc(png_ptr, png_ptr->save_buffer_ptr, save_size);
-
-      png_process_IDAT_data(png_ptr, png_ptr->save_buffer_ptr, save_size);
-
-      png_ptr->idat_size -= idat_size;
-      png_ptr->buffer_size -= save_size;
-      png_ptr->save_buffer_size -= save_size;
-      png_ptr->save_buffer_ptr += save_size;
-   }
-
-   if (png_ptr->idat_size && png_ptr->current_buffer_size)
-   {
-      png_size_t save_size = png_ptr->current_buffer_size;
-      png_uint_32 idat_size = png_ptr->idat_size;
-
-      /* We want the smaller of 'idat_size' and 'current_buffer_size', but they
-       * are of different types and we don't know which variable has the fewest
-       * bits.  Carefully select the smaller and cast it to the type of the
-       * larger - this cannot overflow.
-       */
-      if (idat_size < save_size)
-         save_size = (png_size_t)idat_size;
-
-      else
-         idat_size = (png_uint_32)save_size;
-
-      png_calculate_crc(png_ptr, png_ptr->current_buffer_ptr, save_size);
-
-      png_process_IDAT_data(png_ptr, png_ptr->current_buffer_ptr, save_size);
-
-      png_ptr->idat_size -= idat_size;
-      png_ptr->buffer_size -= save_size;
-      png_ptr->current_buffer_size -= save_size;
-      png_ptr->current_buffer_ptr += save_size;
-   }
-   if (!png_ptr->idat_size)
-   {
-      if (png_ptr->buffer_size < 4)
-      {
-         png_push_save_buffer(png_ptr);
-         return;
-      }
-
-      png_crc_finish(png_ptr, 0);
-      png_ptr->mode &= ~PNG_HAVE_CHUNK_HEADER;
-      png_ptr->mode |= PNG_AFTER_IDAT;
-   }
-}
-
-void /* PRIVATE */
-png_process_IDAT_data(png_structp png_ptr, png_bytep buffer,
-   png_size_t buffer_length)
-{
-   /* The caller checks for a non-zero buffer length. */
-   if (!(buffer_length > 0) || buffer == NULL)
-      png_error(png_ptr, "No IDAT data (internal error)");
-
-   /* This routine must process all the data it has been given
-    * before returning, calling the row callback as required to
-    * handle the uncompressed results.
-    */
-   png_ptr->zstream.next_in = buffer;
-   png_ptr->zstream.avail_in = (uInt)buffer_length;
-
-   /* Keep going until the decompressed data is all processed
-    * or the stream marked as finished.
-    */
-   while (png_ptr->zstream.avail_in > 0 &&
-          !(png_ptr->flags & PNG_FLAG_ZLIB_FINISHED))
-   {
-      int ret;
-
-      /* We have data for zlib, but we must check that zlib
-       * has someplace to put the results.  It doesn't matter
-       * if we don't expect any results -- it may be the input
-       * data is just the LZ end code.
-       */
-      if (!(png_ptr->zstream.avail_out > 0))
-      {
-         png_ptr->zstream.avail_out =
-             (uInt) PNG_ROWBYTES(png_ptr->pixel_depth,
-             png_ptr->iwidth) + 1;
-
-         png_ptr->zstream.next_out = png_ptr->row_buf;
-      }
-
-      /* Using Z_SYNC_FLUSH here means that an unterminated
-       * LZ stream (a stream with a missing end code) can still
-       * be handled, otherwise (Z_NO_FLUSH) a future zlib
-       * implementation might defer output and therefore
-       * change the current behavior (see comments in inflate.c
-       * for why this doesn't happen at present with zlib 1.2.5).
-       */
-      ret = inflate(&png_ptr->zstream, Z_SYNC_FLUSH);
-
-      /* Check for any failure before proceeding. */
-      if (ret != Z_OK && ret != Z_STREAM_END)
-      {
-         /* Terminate the decompression. */
-         png_ptr->flags |= PNG_FLAG_ZLIB_FINISHED;
-
-         /* This may be a truncated stream (missing or
-          * damaged end code).  Treat that as a warning.
-          */
-         if (png_ptr->row_number >= png_ptr->num_rows ||
-             png_ptr->pass > 6)
-            png_warning(png_ptr, "Truncated compressed data in IDAT");
-
-         else
-            png_error(png_ptr, "Decompression error in IDAT");
-
-         /* Skip the check on unprocessed input */
-         return;
-      }
-
-      /* Did inflate output any data? */
-      if (png_ptr->zstream.next_out != png_ptr->row_buf)
-      {
-         /* Is this unexpected data after the last row?
-          * If it is, artificially terminate the LZ output
-          * here.
-          */
-         if (png_ptr->row_number >= png_ptr->num_rows ||
-             png_ptr->pass > 6)
-         {
-            /* Extra data. */
-            png_warning(png_ptr, "Extra compressed data in IDAT");
-            png_ptr->flags |= PNG_FLAG_ZLIB_FINISHED;
-
-            /* Do no more processing; skip the unprocessed
-             * input check below.
-             */
-            return;
-         }
-
-         /* Do we have a complete row? */
-         if (png_ptr->zstream.avail_out == 0)
-            png_push_process_row(png_ptr);
-      }
-
-      /* And check for the end of the stream. */
-      if (ret == Z_STREAM_END)
-         png_ptr->flags |= PNG_FLAG_ZLIB_FINISHED;
-   }
-
-   /* All the data should have been processed, if anything
-    * is left at this point we have bytes of IDAT data
-    * after the zlib end code.
-    */
-   if (png_ptr->zstream.avail_in > 0)
-      png_warning(png_ptr, "Extra compression data in IDAT");
-}
-
-void /* PRIVATE */
-png_push_process_row(png_structp png_ptr)
-{
-   png_ptr->row_info.color_type = png_ptr->color_type;
-   png_ptr->row_info.width = png_ptr->iwidth;
-   png_ptr->row_info.channels = png_ptr->channels;
-   png_ptr->row_info.bit_depth = png_ptr->bit_depth;
-   png_ptr->row_info.pixel_depth = png_ptr->pixel_depth;
-
-   png_ptr->row_info.rowbytes = PNG_ROWBYTES(png_ptr->row_info.pixel_depth,
-       png_ptr->row_info.width);
-
-   png_read_filter_row(png_ptr, &(png_ptr->row_info),
-       png_ptr->row_buf + 1, png_ptr->prev_row + 1,
-       (int)(png_ptr->row_buf[0]));
-
-   png_memcpy(png_ptr->prev_row, png_ptr->row_buf, png_ptr->rowbytes + 1);
-
-   if (png_ptr->transformations || (png_ptr->flags&PNG_FLAG_STRIP_ALPHA))
-      png_do_read_transformations(png_ptr);
-
-#ifdef PNG_READ_INTERLACING_SUPPORTED
-   /* Blow up interlaced rows to full size */
-   if (png_ptr->interlaced && (png_ptr->transformations & PNG_INTERLACE))
-   {
-      if (png_ptr->pass < 6)
-/*       old interface (pre-1.0.9):
-         png_do_read_interlace(&(png_ptr->row_info),
-             png_ptr->row_buf + 1, png_ptr->pass, png_ptr->transformations);
- */
-         png_do_read_interlace(png_ptr);
-
-    switch (png_ptr->pass)
-    {
-         case 0:
-         {
-            int i;
-            for (i = 0; i < 8 && png_ptr->pass == 0; i++)
-            {
-               png_push_have_row(png_ptr, png_ptr->row_buf + 1);
-               png_read_push_finish_row(png_ptr); /* Updates png_ptr->pass */
-            }
-
-            if (png_ptr->pass == 2) /* Pass 1 might be empty */
-            {
-               for (i = 0; i < 4 && png_ptr->pass == 2; i++)
-               {
-                  png_push_have_row(png_ptr, NULL);
-                  png_read_push_finish_row(png_ptr);
-               }
-            }
-
-            if (png_ptr->pass == 4 && png_ptr->height <= 4)
-            {
-               for (i = 0; i < 2 && png_ptr->pass == 4; i++)
-               {
-                  png_push_have_row(png_ptr, NULL);
-                  png_read_push_finish_row(png_ptr);
-               }
-            }
-
-            if (png_ptr->pass == 6 && png_ptr->height <= 4)
-            {
-                png_push_have_row(png_ptr, NULL);
-                png_read_push_finish_row(png_ptr);
-            }
-
-            break;
-         }
-
-         case 1:
-         {
-            int i;
-            for (i = 0; i < 8 && png_ptr->pass == 1; i++)
-            {
-               png_push_have_row(png_ptr, png_ptr->row_buf + 1);
-               png_read_push_finish_row(png_ptr);
-            }
-
-            if (png_ptr->pass == 2) /* Skip top 4 generated rows */
-            {
-               for (i = 0; i < 4 && png_ptr->pass == 2; i++)
-               {
-                  png_push_have_row(png_ptr, NULL);
-                  png_read_push_finish_row(png_ptr);
-               }
-            }
-
-            break;
-         }
-
-         case 2:
-         {
-            int i;
-
-            for (i = 0; i < 4 && png_ptr->pass == 2; i++)
-            {
-               png_push_have_row(png_ptr, png_ptr->row_buf + 1);
-               png_read_push_finish_row(png_ptr);
-            }
-
-            for (i = 0; i < 4 && png_ptr->pass == 2; i++)
-            {
-               png_push_have_row(png_ptr, NULL);
-               png_read_push_finish_row(png_ptr);
-            }
-
-            if (png_ptr->pass == 4) /* Pass 3 might be empty */
-            {
-               for (i = 0; i < 2 && png_ptr->pass == 4; i++)
-               {
-                  png_push_have_row(png_ptr, NULL);
-                  png_read_push_finish_row(png_ptr);
-               }
-            }
-
-            break;
-         }
-
-         case 3:
-         {
-            int i;
-
-            for (i = 0; i < 4 && png_ptr->pass == 3; i++)
-            {
-               png_push_have_row(png_ptr, png_ptr->row_buf + 1);
-               png_read_push_finish_row(png_ptr);
-            }
-
-            if (png_ptr->pass == 4) /* Skip top two generated rows */
-            {
-               for (i = 0; i < 2 && png_ptr->pass == 4; i++)
-               {
-                  png_push_have_row(png_ptr, NULL);
-                  png_read_push_finish_row(png_ptr);
-               }
-            }
-
-            break;
-         }
-
-         case 4:
-         {
-            int i;
-
-            for (i = 0; i < 2 && png_ptr->pass == 4; i++)
-            {
-               png_push_have_row(png_ptr, png_ptr->row_buf + 1);
-               png_read_push_finish_row(png_ptr);
-            }
-
-            for (i = 0; i < 2 && png_ptr->pass == 4; i++)
-            {
-               png_push_have_row(png_ptr, NULL);
-               png_read_push_finish_row(png_ptr);
-            }
-
-            if (png_ptr->pass == 6) /* Pass 5 might be empty */
-            {
-               png_push_have_row(png_ptr, NULL);
-               png_read_push_finish_row(png_ptr);
-            }
-
-            break;
-         }
-
-         case 5:
-         {
-            int i;
-
-            for (i = 0; i < 2 && png_ptr->pass == 5; i++)
-            {
-               png_push_have_row(png_ptr, png_ptr->row_buf + 1);
-               png_read_push_finish_row(png_ptr);
-            }
-
-            if (png_ptr->pass == 6) /* Skip top generated row */
-            {
-               png_push_have_row(png_ptr, NULL);
-               png_read_push_finish_row(png_ptr);
-            }
-
-            break;
-         }
-
-         default:
-         case 6:
-         {
-            png_push_have_row(png_ptr, png_ptr->row_buf + 1);
-            png_read_push_finish_row(png_ptr);
-
-            if (png_ptr->pass != 6)
-               break;
-
-            png_push_have_row(png_ptr, NULL);
-            png_read_push_finish_row(png_ptr);
-         }
-      }
-   }
-   else
-#endif
-   {
-      png_push_have_row(png_ptr, png_ptr->row_buf + 1);
-      png_read_push_finish_row(png_ptr);
-   }
-}
-
-void /* PRIVATE */
-png_read_push_finish_row(png_structp png_ptr)
-{
-   /* Arrays to facilitate easy interlacing - use pass (0 - 6) as index */
-
-   /* Start of interlace block */
-   PNG_CONST int FARDATA png_pass_start[] = {0, 4, 0, 2, 0, 1, 0};
-
-   /* Offset to next interlace block */
-   PNG_CONST int FARDATA png_pass_inc[] = {8, 8, 4, 4, 2, 2, 1};
-
-   /* Start of interlace block in the y direction */
-   PNG_CONST int FARDATA png_pass_ystart[] = {0, 0, 4, 0, 2, 0, 1};
-
-   /* Offset to next interlace block in the y direction */
-   PNG_CONST int FARDATA png_pass_yinc[] = {8, 8, 8, 4, 4, 2, 2};
-
-   /* Height of interlace block.  This is not currently used - if you need
-    * it, uncomment it here and in png.h
-   PNG_CONST int FARDATA png_pass_height[] = {8, 8, 4, 4, 2, 2, 1};
-   */
-
-   png_ptr->row_number++;
-   if (png_ptr->row_number < png_ptr->num_rows)
-      return;
-
-#ifdef PNG_READ_INTERLACING_SUPPORTED
-   if (png_ptr->interlaced)
-   {
-      png_ptr->row_number = 0;
-      png_memset(png_ptr->prev_row, 0, png_ptr->rowbytes + 1);
-
-      do
-      {
-         png_ptr->pass++;
-         if ((png_ptr->pass == 1 && png_ptr->width < 5) ||
-             (png_ptr->pass == 3 && png_ptr->width < 3) ||
-             (png_ptr->pass == 5 && png_ptr->width < 2))
-            png_ptr->pass++;
-
-         if (png_ptr->pass > 7)
-            png_ptr->pass--;
-
-         if (png_ptr->pass >= 7)
-            break;
-
-         png_ptr->iwidth = (png_ptr->width +
-             png_pass_inc[png_ptr->pass] - 1 -
-             png_pass_start[png_ptr->pass]) /
-             png_pass_inc[png_ptr->pass];
-
-         if (png_ptr->transformations & PNG_INTERLACE)
-            break;
-
-         png_ptr->num_rows = (png_ptr->height +
-             png_pass_yinc[png_ptr->pass] - 1 -
-             png_pass_ystart[png_ptr->pass]) /
-             png_pass_yinc[png_ptr->pass];
-
-      } while (png_ptr->iwidth == 0 || png_ptr->num_rows == 0);
-   }
-#endif /* PNG_READ_INTERLACING_SUPPORTED */
-}
-
-#ifdef PNG_READ_tEXt_SUPPORTED
-void /* PRIVATE */
-png_push_handle_tEXt(png_structp png_ptr, png_infop info_ptr, png_uint_32
-    length)
-{
-   if (!(png_ptr->mode & PNG_HAVE_IHDR) || (png_ptr->mode & PNG_HAVE_IEND))
-      {
-         PNG_UNUSED(info_ptr) /* To quiet some compiler warnings */
-         png_error(png_ptr, "Out of place tEXt");
-         /*NOT REACHED*/
-      }
-
-#ifdef PNG_MAX_MALLOC_64K
-   png_ptr->skip_length = 0;  /* This may not be necessary */
-
-   if (length > (png_uint_32)65535L) /* Can't hold entire string in memory */
-   {
-      png_warning(png_ptr, "tEXt chunk too large to fit in memory");
-      png_ptr->skip_length = length - (png_uint_32)65535L;
-      length = (png_uint_32)65535L;
-   }
-#endif
-
-   png_ptr->current_text = (png_charp)png_malloc(png_ptr,
-       (png_size_t)(length + 1));
-   png_ptr->current_text[length] = '\0';
-   png_ptr->current_text_ptr = png_ptr->current_text;
-   png_ptr->current_text_size = (png_size_t)length;
-   png_ptr->current_text_left = (png_size_t)length;
-   png_ptr->process_mode = PNG_READ_tEXt_MODE;
-}
-
-void /* PRIVATE */
-png_push_read_tEXt(png_structp png_ptr, png_infop info_ptr)
-{
-   if (png_ptr->buffer_size && png_ptr->current_text_left)
-   {
-      png_size_t text_size;
-
-      if (png_ptr->buffer_size < png_ptr->current_text_left)
-         text_size = png_ptr->buffer_size;
-
-      else
-         text_size = png_ptr->current_text_left;
-
-      png_crc_read(png_ptr, (png_bytep)png_ptr->current_text_ptr, text_size);
-      png_ptr->current_text_left -= text_size;
-      png_ptr->current_text_ptr += text_size;
-   }
-   if (!(png_ptr->current_text_left))
-   {
-      png_textp text_ptr;
-      png_charp text;
-      png_charp key;
-      int ret;
-
-      if (png_ptr->buffer_size < 4)
-      {
-         png_push_save_buffer(png_ptr);
-         return;
-      }
-
-      png_push_crc_finish(png_ptr);
-
-#ifdef PNG_MAX_MALLOC_64K
-      if (png_ptr->skip_length)
-         return;
-#endif
-
-      key = png_ptr->current_text;
-
-      for (text = key; *text; text++)
-         /* Empty loop */ ;
-
-      if (text < key + png_ptr->current_text_size)
-         text++;
-
-      text_ptr = (png_textp)png_malloc(png_ptr, png_sizeof(png_text));
-      text_ptr->compression = PNG_TEXT_COMPRESSION_NONE;
-      text_ptr->key = key;
-      text_ptr->itxt_length = 0;
-      text_ptr->lang = NULL;
-      text_ptr->lang_key = NULL;
-      text_ptr->text = text;
-
-      ret = png_set_text_2(png_ptr, info_ptr, text_ptr, 1);
-
-      png_free(png_ptr, key);
-      png_free(png_ptr, text_ptr);
-      png_ptr->current_text = NULL;
-
-      if (ret)
-         png_warning(png_ptr, "Insufficient memory to store text chunk");
-   }
-}
-#endif
-
-#ifdef PNG_READ_zTXt_SUPPORTED
-void /* PRIVATE */
-png_push_handle_zTXt(png_structp png_ptr, png_infop info_ptr, png_uint_32
-   length)
-{
-   if (!(png_ptr->mode & PNG_HAVE_IHDR) || (png_ptr->mode & PNG_HAVE_IEND))
-   {
-      PNG_UNUSED(info_ptr) /* To quiet some compiler warnings */
-      png_error(png_ptr, "Out of place zTXt");
-      /*NOT REACHED*/
-   }
-
-#ifdef PNG_MAX_MALLOC_64K
-   /* We can't handle zTXt chunks > 64K, since we don't have enough space
-    * to be able to store the uncompressed data.  Actually, the threshold
-    * is probably around 32K, but it isn't as definite as 64K is.
-    */
-   if (length > (png_uint_32)65535L)
-   {
-      png_warning(png_ptr, "zTXt chunk too large to fit in memory");
-      png_push_crc_skip(png_ptr, length);
-      return;
-   }
-#endif
-
-   png_ptr->current_text = (png_charp)png_malloc(png_ptr,
-       (png_size_t)(length + 1));
-   png_ptr->current_text[length] = '\0';
-   png_ptr->current_text_ptr = png_ptr->current_text;
-   png_ptr->current_text_size = (png_size_t)length;
-   png_ptr->current_text_left = (png_size_t)length;
-   png_ptr->process_mode = PNG_READ_zTXt_MODE;
-}
-
-void /* PRIVATE */
-png_push_read_zTXt(png_structp png_ptr, png_infop info_ptr)
-{
-   if (png_ptr->buffer_size && png_ptr->current_text_left)
-   {
-      png_size_t text_size;
-
-      if (png_ptr->buffer_size < (png_uint_32)png_ptr->current_text_left)
-         text_size = png_ptr->buffer_size;
-
-      else
-         text_size = png_ptr->current_text_left;
-
-      png_crc_read(png_ptr, (png_bytep)png_ptr->current_text_ptr, text_size);
-      png_ptr->current_text_left -= text_size;
-      png_ptr->current_text_ptr += text_size;
-   }
-   if (!(png_ptr->current_text_left))
-   {
-      png_textp text_ptr;
-      png_charp text;
-      png_charp key;
-      int ret;
-      png_size_t text_size, key_size;
-
-      if (png_ptr->buffer_size < 4)
-      {
-         png_push_save_buffer(png_ptr);
-         return;
-      }
-
-      png_push_crc_finish(png_ptr);
-
-      key = png_ptr->current_text;
-
-      for (text = key; *text; text++)
-         /* Empty loop */ ;
-
-      /* zTXt can't have zero text */
-      if (text >= key + png_ptr->current_text_size)
-      {
-         png_ptr->current_text = NULL;
-         png_free(png_ptr, key);
-         return;
-      }
-
-      text++;
-
-      if (*text != PNG_TEXT_COMPRESSION_zTXt) /* Check compression byte */
-      {
-         png_ptr->current_text = NULL;
-         png_free(png_ptr, key);
-         return;
-      }
-
-      text++;
-
-      png_ptr->zstream.next_in = (png_bytep)text;
-      png_ptr->zstream.avail_in = (uInt)(png_ptr->current_text_size -
-          (text - key));
-      png_ptr->zstream.next_out = png_ptr->zbuf;
-      png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;
-
-      key_size = text - key;
-      text_size = 0;
-      text = NULL;
-      ret = Z_STREAM_END;
-
-      while (png_ptr->zstream.avail_in)
-      {
-         ret = inflate(&png_ptr->zstream, Z_PARTIAL_FLUSH);
-         if (ret != Z_OK && ret != Z_STREAM_END)
-         {
-            inflateReset(&png_ptr->zstream);
-            png_ptr->zstream.avail_in = 0;
-            png_ptr->current_text = NULL;
-            png_free(png_ptr, key);
-            png_free(png_ptr, text);
-            return;
-         }
-
-         if (!(png_ptr->zstream.avail_out) || ret == Z_STREAM_END)
-         {
-            if (text == NULL)
-            {
-               text = (png_charp)png_malloc(png_ptr,
-                   (png_ptr->zbuf_size
-                   - png_ptr->zstream.avail_out + key_size + 1));
-
-               png_memcpy(text + key_size, png_ptr->zbuf,
-                   png_ptr->zbuf_size - png_ptr->zstream.avail_out);
-
-               png_memcpy(text, key, key_size);
-
-               text_size = key_size + png_ptr->zbuf_size -
-                   png_ptr->zstream.avail_out;
-
-               *(text + text_size) = '\0';
-            }
-
-            else
-            {
-               png_charp tmp;
-
-               tmp = text;
-               text = (png_charp)png_malloc(png_ptr, text_size +
-                   (png_ptr->zbuf_size
-                   - png_ptr->zstream.avail_out + 1));
-
-               png_memcpy(text, tmp, text_size);
-               png_free(png_ptr, tmp);
-
-               png_memcpy(text + text_size, png_ptr->zbuf,
-                   png_ptr->zbuf_size - png_ptr->zstream.avail_out);
-
-               text_size += png_ptr->zbuf_size - png_ptr->zstream.avail_out;
-               *(text + text_size) = '\0';
-            }
-
-            if (ret != Z_STREAM_END)
-            {
-               png_ptr->zstream.next_out = png_ptr->zbuf;
-               png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;
-            }
-         }
-         else
-         {
-            break;
-         }
-
-         if (ret == Z_STREAM_END)
-            break;
-      }
-
-      inflateReset(&png_ptr->zstream);
-      png_ptr->zstream.avail_in = 0;
-
-      if (ret != Z_STREAM_END)
-      {
-         png_ptr->current_text = NULL;
-         png_free(png_ptr, key);
-         png_free(png_ptr, text);
-         return;
-      }
-
-      png_ptr->current_text = NULL;
-      png_free(png_ptr, key);
-      key = text;
-      text += key_size;
-
-      text_ptr = (png_textp)png_malloc(png_ptr,
-          png_sizeof(png_text));
-      text_ptr->compression = PNG_TEXT_COMPRESSION_zTXt;
-      text_ptr->key = key;
-      text_ptr->itxt_length = 0;
-      text_ptr->lang = NULL;
-      text_ptr->lang_key = NULL;
-      text_ptr->text = text;
-
-      ret = png_set_text_2(png_ptr, info_ptr, text_ptr, 1);
-
-      png_free(png_ptr, key);
-      png_free(png_ptr, text_ptr);
-
-      if (ret)
-         png_warning(png_ptr, "Insufficient memory to store text chunk");
-   }
-}
-#endif
-
-#ifdef PNG_READ_iTXt_SUPPORTED
-void /* PRIVATE */
-png_push_handle_iTXt(png_structp png_ptr, png_infop info_ptr, png_uint_32
-    length)
-{
-   if (!(png_ptr->mode & PNG_HAVE_IHDR) || (png_ptr->mode & PNG_HAVE_IEND))
-   {
-      PNG_UNUSED(info_ptr) /* To quiet some compiler warnings */
-      png_error(png_ptr, "Out of place iTXt");
-      /*NOT REACHED*/
-   }
-
-#ifdef PNG_MAX_MALLOC_64K
-   png_ptr->skip_length = 0;  /* This may not be necessary */
-
-   if (length > (png_uint_32)65535L) /* Can't hold entire string in memory */
-   {
-      png_warning(png_ptr, "iTXt chunk too large to fit in memory");
-      png_ptr->skip_length = length - (png_uint_32)65535L;
-      length = (png_uint_32)65535L;
-   }
-#endif
-
-   png_ptr->current_text = (png_charp)png_malloc(png_ptr,
-       (png_size_t)(length + 1));
-   png_ptr->current_text[length] = '\0';
-   png_ptr->current_text_ptr = png_ptr->current_text;
-   png_ptr->current_text_size = (png_size_t)length;
-   png_ptr->current_text_left = (png_size_t)length;
-   png_ptr->process_mode = PNG_READ_iTXt_MODE;
-}
-
-void /* PRIVATE */
-png_push_read_iTXt(png_structp png_ptr, png_infop info_ptr)
-{
-
-   if (png_ptr->buffer_size && png_ptr->current_text_left)
-   {
-      png_size_t text_size;
-
-      if (png_ptr->buffer_size < png_ptr->current_text_left)
-         text_size = png_ptr->buffer_size;
-
-      else
-         text_size = png_ptr->current_text_left;
-
-      png_crc_read(png_ptr, (png_bytep)png_ptr->current_text_ptr, text_size);
-      png_ptr->current_text_left -= text_size;
-      png_ptr->current_text_ptr += text_size;
-   }
-
-   if (!(png_ptr->current_text_left))
-   {
-      png_textp text_ptr;
-      png_charp key;
-      int comp_flag;
-      png_charp lang;
-      png_charp lang_key;
-      png_charp text;
-      int ret;
-
-      if (png_ptr->buffer_size < 4)
-      {
-         png_push_save_buffer(png_ptr);
-         return;
-      }
-
-      png_push_crc_finish(png_ptr);
-
-#ifdef PNG_MAX_MALLOC_64K
-      if (png_ptr->skip_length)
-         return;
-#endif
-
-      key = png_ptr->current_text;
-
-      for (lang = key; *lang; lang++)
-         /* Empty loop */ ;
-
-      if (lang < key + png_ptr->current_text_size - 3)
-         lang++;
-
-      comp_flag = *lang++;
-      lang++;     /* Skip comp_type, always zero */
-
-      for (lang_key = lang; *lang_key; lang_key++)
-         /* Empty loop */ ;
-
-      lang_key++;        /* Skip NUL separator */
-
-      text=lang_key;
-
-      if (lang_key < key + png_ptr->current_text_size - 1)
-      {
-         for (; *text; text++)
-            /* Empty loop */ ;
-      }
-
-      if (text < key + png_ptr->current_text_size)
-         text++;
-
-      text_ptr = (png_textp)png_malloc(png_ptr,
-          png_sizeof(png_text));
-
-      text_ptr->compression = comp_flag + 2;
-      text_ptr->key = key;
-      text_ptr->lang = lang;
-      text_ptr->lang_key = lang_key;
-      text_ptr->text = text;
-      text_ptr->text_length = 0;
-      text_ptr->itxt_length = png_strlen(text);
-
-      ret = png_set_text_2(png_ptr, info_ptr, text_ptr, 1);
-
-      png_ptr->current_text = NULL;
-
-      png_free(png_ptr, text_ptr);
-      if (ret)
-         png_warning(png_ptr, "Insufficient memory to store iTXt chunk");
-   }
-}
-#endif
-
-/* This function is called when we haven't found a handler for this
- * chunk.  If there isn't a problem with the chunk itself (ie a bad chunk
- * name or a critical chunk), the chunk is (currently) silently ignored.
- */
-void /* PRIVATE */
-png_push_handle_unknown(png_structp png_ptr, png_infop info_ptr, png_uint_32
-    length)
-{
-   png_uint_32 skip = 0;
-
-   if (!(png_ptr->chunk_name[0] & 0x20))
-   {
-#ifdef PNG_READ_UNKNOWN_CHUNKS_SUPPORTED
-      if (png_handle_as_unknown(png_ptr, png_ptr->chunk_name) !=
-          PNG_HANDLE_CHUNK_ALWAYS
-#ifdef PNG_READ_USER_CHUNKS_SUPPORTED
-          && png_ptr->read_user_chunk_fn == NULL
-#endif
-          )
-#endif
-         png_chunk_error(png_ptr, "unknown critical chunk");
-
-      PNG_UNUSED(info_ptr) /* To quiet some compiler warnings */
-   }
-
-#ifdef PNG_READ_UNKNOWN_CHUNKS_SUPPORTED
-   if (png_ptr->flags & PNG_FLAG_KEEP_UNKNOWN_CHUNKS)
-   {
-#ifdef PNG_MAX_MALLOC_64K
-      if (length > (png_uint_32)65535L)
-      {
-         png_warning(png_ptr, "unknown chunk too large to fit in memory");
-         skip = length - (png_uint_32)65535L;
-         length = (png_uint_32)65535L;
-      }
-#endif
-      png_memcpy((png_charp)png_ptr->unknown_chunk.name,
-          (png_charp)png_ptr->chunk_name,
-          png_sizeof(png_ptr->unknown_chunk.name));
-      png_ptr->unknown_chunk.name[png_sizeof(png_ptr->unknown_chunk.name) - 1]
-          = '\0';
-
-      png_ptr->unknown_chunk.size = (png_size_t)length;
-
-      if (length == 0)
-         png_ptr->unknown_chunk.data = NULL;
-
-      else
-      {
-         png_ptr->unknown_chunk.data = (png_bytep)png_malloc(png_ptr,
-             (png_size_t)length);
-         png_crc_read(png_ptr, (png_bytep)png_ptr->unknown_chunk.data, length);
-      }
-
-#ifdef PNG_READ_USER_CHUNKS_SUPPORTED
-      if (png_ptr->read_user_chunk_fn != NULL)
-      {
-         /* Callback to user unknown chunk handler */
-         int ret;
-         ret = (*(png_ptr->read_user_chunk_fn))
-             (png_ptr, &png_ptr->unknown_chunk);
-
-         if (ret < 0)
-            png_chunk_error(png_ptr, "error in user chunk");
-
-         if (ret == 0)
-         {
-            if (!(png_ptr->chunk_name[0] & 0x20))
-               if (png_handle_as_unknown(png_ptr, png_ptr->chunk_name) !=
-                   PNG_HANDLE_CHUNK_ALWAYS)
-                  png_chunk_error(png_ptr, "unknown critical chunk");
-            png_set_unknown_chunks(png_ptr, info_ptr,
-                &png_ptr->unknown_chunk, 1);
-         }
-      }
-
-      else
-#endif
-         png_set_unknown_chunks(png_ptr, info_ptr, &png_ptr->unknown_chunk, 1);
-      png_free(png_ptr, png_ptr->unknown_chunk.data);
-      png_ptr->unknown_chunk.data = NULL;
-   }
-
-   else
-#endif
-      skip=length;
-   png_push_crc_skip(png_ptr, skip);
-}
-
-void /* PRIVATE */
-png_push_have_info(png_structp png_ptr, png_infop info_ptr)
-{
-   if (png_ptr->info_fn != NULL)
-      (*(png_ptr->info_fn))(png_ptr, info_ptr);
-}
-
-void /* PRIVATE */
-png_push_have_end(png_structp png_ptr, png_infop info_ptr)
-{
-   if (png_ptr->end_fn != NULL)
-      (*(png_ptr->end_fn))(png_ptr, info_ptr);
-}
-
-void /* PRIVATE */
-png_push_have_row(png_structp png_ptr, png_bytep row)
-{
-   if (png_ptr->row_fn != NULL)
-      (*(png_ptr->row_fn))(png_ptr, row, png_ptr->row_number,
-         (int)png_ptr->pass);
-}
-
-void PNGAPI
-png_progressive_combine_row (png_structp png_ptr, png_bytep old_row,
-    png_const_bytep new_row)
-{
-   PNG_CONST int FARDATA png_pass_dsp_mask[7] =
-      {0xff, 0x0f, 0xff, 0x33, 0xff, 0x55, 0xff};
-
-   if (png_ptr == NULL)
-      return;
-
-   if (new_row != NULL)    /* new_row must == png_ptr->row_buf here. */
-      png_combine_row(png_ptr, old_row, png_pass_dsp_mask[png_ptr->pass]);
-}
-
-void PNGAPI
-png_set_progressive_read_fn(png_structp png_ptr, png_voidp progressive_ptr,
-    png_progressive_info_ptr info_fn, png_progressive_row_ptr row_fn,
-    png_progressive_end_ptr end_fn)
-{
-   if (png_ptr == NULL)
-      return;
-
-   png_ptr->info_fn = info_fn;
-   png_ptr->row_fn = row_fn;
-   png_ptr->end_fn = end_fn;
-
-   png_set_read_fn(png_ptr, progressive_ptr, png_push_fill_buffer);
-}
-
-png_voidp PNGAPI
-png_get_progressive_ptr(png_const_structp png_ptr)
-{
-   if (png_ptr == NULL)
-      return (NULL);
-
-   return png_ptr->io_ptr;
-}
-#endif /* PNG_PROGRESSIVE_READ_SUPPORTED */
+
+/* pngpread.c - read a png file in push mode
+ *
+ * Last changed in libpng 1.2.44 [June 26, 2010]
+ * Copyright (c) 1998-2010 Glenn Randers-Pehrson
+ * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
+ * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
+ *
+ * This code is released under the libpng license.
+ * For conditions of distribution and use, see the disclaimer
+ * and license in png.h
+ */
+
+#define PNG_INTERNAL
+#define PNG_NO_PEDANTIC_WARNINGS
+#include "png.h"
+#ifdef PNG_PROGRESSIVE_READ_SUPPORTED
+
+/* Push model modes */
+#define PNG_READ_SIG_MODE   0
+#define PNG_READ_CHUNK_MODE 1
+#define PNG_READ_IDAT_MODE  2
+#define PNG_SKIP_MODE       3
+#define PNG_READ_tEXt_MODE  4
+#define PNG_READ_zTXt_MODE  5
+#define PNG_READ_DONE_MODE  6
+#define PNG_READ_iTXt_MODE  7
+#define PNG_ERROR_MODE      8
+
+void PNGAPI
+png_process_data(png_structp png_ptr, png_infop info_ptr,
+   png_bytep buffer, png_size_t buffer_size)
+{
+   if (png_ptr == NULL || info_ptr == NULL)
+      return;
+
+   png_push_restore_buffer(png_ptr, buffer, buffer_size);
+
+   while (png_ptr->buffer_size)
+   {
+      png_process_some_data(png_ptr, info_ptr);
+   }
+}
+
+/* What we do with the incoming data depends on what we were previously
+ * doing before we ran out of data...
+ */
+void /* PRIVATE */
+png_process_some_data(png_structp png_ptr, png_infop info_ptr)
+{
+   if (png_ptr == NULL)
+      return;
+
+   switch (png_ptr->process_mode)
+   {
+      case PNG_READ_SIG_MODE:
+      {
+         png_push_read_sig(png_ptr, info_ptr);
+         break;
+      }
+
+      case PNG_READ_CHUNK_MODE:
+      {
+         png_push_read_chunk(png_ptr, info_ptr);
+         break;
+      }
+
+      case PNG_READ_IDAT_MODE:
+      {
+         png_push_read_IDAT(png_ptr);
+         break;
+      }
+
+      case PNG_SKIP_MODE:
+      {
+         png_push_crc_finish(png_ptr);
+         break;
+      }
+
+      default:
+      {
+         png_ptr->buffer_size = 0;
+         break;
+      }
+   }
+}
+
+/* Read any remaining signature bytes from the stream and compare them with
+ * the correct PNG signature.  It is possible that this routine is called
+ * with bytes already read from the signature, either because they have been
+ * checked by the calling application, or because of multiple calls to this
+ * routine.
+ */
+void /* PRIVATE */
+png_push_read_sig(png_structp png_ptr, png_infop info_ptr)
+{
+   png_size_t num_checked = png_ptr->sig_bytes,
+             num_to_check = 8 - num_checked;
+
+   if (png_ptr->buffer_size < num_to_check)
+   {
+      num_to_check = png_ptr->buffer_size;
+   }
+
+   png_push_fill_buffer(png_ptr, &(info_ptr->signature[num_checked]),
+      num_to_check);
+   png_ptr->sig_bytes = (png_byte)(png_ptr->sig_bytes + num_to_check);
+
+   if (png_sig_cmp(info_ptr->signature, num_checked, num_to_check))
+   {
+      if (num_checked < 4 &&
+          png_sig_cmp(info_ptr->signature, num_checked, num_to_check - 4))
+         png_error(png_ptr, "Not a PNG file");
+      else
+         png_error(png_ptr, "PNG file corrupted by ASCII conversion");
+   }
+   else
+   {
+      if (png_ptr->sig_bytes >= 8)
+      {
+         png_ptr->process_mode = PNG_READ_CHUNK_MODE;
+      }
+   }
+}
+
+void /* PRIVATE */
+png_push_read_chunk(png_structp png_ptr, png_infop info_ptr)
+{
+#ifdef PNG_USE_LOCAL_ARRAYS
+      PNG_CONST PNG_IHDR;
+      PNG_CONST PNG_IDAT;
+      PNG_CONST PNG_IEND;
+      PNG_CONST PNG_PLTE;
+#ifdef PNG_READ_bKGD_SUPPORTED
+      PNG_CONST PNG_bKGD;
+#endif
+#ifdef PNG_READ_cHRM_SUPPORTED
+      PNG_CONST PNG_cHRM;
+#endif
+#ifdef PNG_READ_gAMA_SUPPORTED
+      PNG_CONST PNG_gAMA;
+#endif
+#ifdef PNG_READ_hIST_SUPPORTED
+      PNG_CONST PNG_hIST;
+#endif
+#ifdef PNG_READ_iCCP_SUPPORTED
+      PNG_CONST PNG_iCCP;
+#endif
+#ifdef PNG_READ_iTXt_SUPPORTED
+      PNG_CONST PNG_iTXt;
+#endif
+#ifdef PNG_READ_oFFs_SUPPORTED
+      PNG_CONST PNG_oFFs;
+#endif
+#ifdef PNG_READ_pCAL_SUPPORTED
+      PNG_CONST PNG_pCAL;
+#endif
+#ifdef PNG_READ_pHYs_SUPPORTED
+      PNG_CONST PNG_pHYs;
+#endif
+#ifdef PNG_READ_sBIT_SUPPORTED
+      PNG_CONST PNG_sBIT;
+#endif
+#ifdef PNG_READ_sCAL_SUPPORTED
+      PNG_CONST PNG_sCAL;
+#endif
+#ifdef PNG_READ_sRGB_SUPPORTED
+      PNG_CONST PNG_sRGB;
+#endif
+#ifdef PNG_READ_sPLT_SUPPORTED
+      PNG_CONST PNG_sPLT;
+#endif
+#ifdef PNG_READ_tEXt_SUPPORTED
+      PNG_CONST PNG_tEXt;
+#endif
+#ifdef PNG_READ_tIME_SUPPORTED
+      PNG_CONST PNG_tIME;
+#endif
+#ifdef PNG_READ_tRNS_SUPPORTED
+      PNG_CONST PNG_tRNS;
+#endif
+#ifdef PNG_READ_zTXt_SUPPORTED
+      PNG_CONST PNG_zTXt;
+#endif
+#endif /* PNG_USE_LOCAL_ARRAYS */
+
+   /* First we make sure we have enough data for the 4 byte chunk name
+    * and the 4 byte chunk length before proceeding with decoding the
+    * chunk data.  To fully decode each of these chunks, we also make
+    * sure we have enough data in the buffer for the 4 byte CRC at the
+    * end of every chunk (except IDAT, which is handled separately).
+    */
+   if (!(png_ptr->mode & PNG_HAVE_CHUNK_HEADER))
+   {
+      png_byte chunk_length[4];
+
+      if (png_ptr->buffer_size < 8)
+      {
+         png_push_save_buffer(png_ptr);
+         return;
+      }
+
+      png_push_fill_buffer(png_ptr, chunk_length, 4);
+      png_ptr->push_length = png_get_uint_31(png_ptr, chunk_length);
+      png_reset_crc(png_ptr);
+      png_crc_read(png_ptr, png_ptr->chunk_name, 4);
+      png_check_chunk_name(png_ptr, png_ptr->chunk_name);
+      png_ptr->mode |= PNG_HAVE_CHUNK_HEADER;
+   }
+
+   if (!png_memcmp(png_ptr->chunk_name, png_IDAT, 4))
+     if (png_ptr->mode & PNG_AFTER_IDAT)
+        png_ptr->mode |= PNG_HAVE_CHUNK_AFTER_IDAT;
+
+   if (!png_memcmp(png_ptr->chunk_name, png_IHDR, 4))
+   {
+      if (png_ptr->push_length != 13)
+         png_error(png_ptr, "Invalid IHDR length");
+
+      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
+      {
+         png_push_save_buffer(png_ptr);
+         return;
+      }
+
+      png_handle_IHDR(png_ptr, info_ptr, png_ptr->push_length);
+   }
+
+   else if (!png_memcmp(png_ptr->chunk_name, png_IEND, 4))
+   {
+      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
+      {
+         png_push_save_buffer(png_ptr);
+         return;
+      }
+
+      png_handle_IEND(png_ptr, info_ptr, png_ptr->push_length);
+
+      png_ptr->process_mode = PNG_READ_DONE_MODE;
+      png_push_have_end(png_ptr, info_ptr);
+   }
+
+#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
+   else if (png_handle_as_unknown(png_ptr, png_ptr->chunk_name))
+   {
+      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
+      {
+         png_push_save_buffer(png_ptr);
+         return;
+      }
+
+      if (!png_memcmp(png_ptr->chunk_name, png_IDAT, 4))
+         png_ptr->mode |= PNG_HAVE_IDAT;
+
+      png_handle_unknown(png_ptr, info_ptr, png_ptr->push_length);
+
+      if (!png_memcmp(png_ptr->chunk_name, png_PLTE, 4))
+         png_ptr->mode |= PNG_HAVE_PLTE;
+
+      else if (!png_memcmp(png_ptr->chunk_name, png_IDAT, 4))
+      {
+         if (!(png_ptr->mode & PNG_HAVE_IHDR))
+            png_error(png_ptr, "Missing IHDR before IDAT");
+
+         else if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE &&
+                  !(png_ptr->mode & PNG_HAVE_PLTE))
+            png_error(png_ptr, "Missing PLTE before IDAT");
+      }
+   }
+
+#endif
+   else if (!png_memcmp(png_ptr->chunk_name, png_PLTE, 4))
+   {
+      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
+      {
+         png_push_save_buffer(png_ptr);
+         return;
+      }
+      png_handle_PLTE(png_ptr, info_ptr, png_ptr->push_length);
+   }
+
+   else if (!png_memcmp(png_ptr->chunk_name, png_IDAT, 4))
+   {
+      /* If we reach an IDAT chunk, this means we have read all of the
+       * header chunks, and we can start reading the image (or if this
+       * is called after the image has been read - we have an error).
+       */
+
+      if (!(png_ptr->mode & PNG_HAVE_IHDR))
+         png_error(png_ptr, "Missing IHDR before IDAT");
+
+      else if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE &&
+          !(png_ptr->mode & PNG_HAVE_PLTE))
+         png_error(png_ptr, "Missing PLTE before IDAT");
+
+      if (png_ptr->mode & PNG_HAVE_IDAT)
+      {
+         if (!(png_ptr->mode & PNG_HAVE_CHUNK_AFTER_IDAT))
+            if (png_ptr->push_length == 0)
+               return;
+
+         if (png_ptr->mode & PNG_AFTER_IDAT)
+            png_error(png_ptr, "Too many IDAT's found");
+      }
+
+      png_ptr->idat_size = png_ptr->push_length;
+      png_ptr->mode |= PNG_HAVE_IDAT;
+      png_ptr->process_mode = PNG_READ_IDAT_MODE;
+      png_push_have_info(png_ptr, info_ptr);
+      png_ptr->zstream.avail_out =
+          (uInt) PNG_ROWBYTES(png_ptr->pixel_depth,
+          png_ptr->iwidth) + 1;
+      png_ptr->zstream.next_out = png_ptr->row_buf;
+      return;
+   }
+
+#ifdef PNG_READ_gAMA_SUPPORTED
+   else if (!png_memcmp(png_ptr->chunk_name, png_gAMA, 4))
+   {
+      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
+      {
+         png_push_save_buffer(png_ptr);
+         return;
+      }
+
+      png_handle_gAMA(png_ptr, info_ptr, png_ptr->push_length);
+   }
+
+#endif
+#ifdef PNG_READ_sBIT_SUPPORTED
+   else if (!png_memcmp(png_ptr->chunk_name, png_sBIT, 4))
+   {
+      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
+      {
+         png_push_save_buffer(png_ptr);
+         return;
+      }
+
+      png_handle_sBIT(png_ptr, info_ptr, png_ptr->push_length);
+   }
+
+#endif
+#ifdef PNG_READ_cHRM_SUPPORTED
+   else if (!png_memcmp(png_ptr->chunk_name, png_cHRM, 4))
+   {
+      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
+      {
+         png_push_save_buffer(png_ptr);
+         return;
+      }
+
+      png_handle_cHRM(png_ptr, info_ptr, png_ptr->push_length);
+   }
+
+#endif
+#ifdef PNG_READ_sRGB_SUPPORTED
+   else if (!png_memcmp(png_ptr->chunk_name, png_sRGB, 4))
+   {
+      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
+      {
+         png_push_save_buffer(png_ptr);
+         return;
+      }
+
+      png_handle_sRGB(png_ptr, info_ptr, png_ptr->push_length);
+   }
+
+#endif
+#ifdef PNG_READ_iCCP_SUPPORTED
+   else if (!png_memcmp(png_ptr->chunk_name, png_iCCP, 4))
+   {
+      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
+      {
+         png_push_save_buffer(png_ptr);
+         return;
+      }
+
+      png_handle_iCCP(png_ptr, info_ptr, png_ptr->push_length);
+   }
+
+#endif
+#ifdef PNG_READ_sPLT_SUPPORTED
+   else if (!png_memcmp(png_ptr->chunk_name, png_sPLT, 4))
+   {
+      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
+      {
+         png_push_save_buffer(png_ptr);
+         return;
+      }
+
+      png_handle_sPLT(png_ptr, info_ptr, png_ptr->push_length);
+   }
+
+#endif
+#ifdef PNG_READ_tRNS_SUPPORTED
+   else if (!png_memcmp(png_ptr->chunk_name, png_tRNS, 4))
+   {
+      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
+      {
+         png_push_save_buffer(png_ptr);
+         return;
+      }
+
+      png_handle_tRNS(png_ptr, info_ptr, png_ptr->push_length);
+   }
+
+#endif
+#ifdef PNG_READ_bKGD_SUPPORTED
+   else if (!png_memcmp(png_ptr->chunk_name, png_bKGD, 4))
+   {
+      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
+      {
+         png_push_save_buffer(png_ptr);
+         return;
+      }
+
+      png_handle_bKGD(png_ptr, info_ptr, png_ptr->push_length);
+   }
+
+#endif
+#ifdef PNG_READ_hIST_SUPPORTED
+   else if (!png_memcmp(png_ptr->chunk_name, png_hIST, 4))
+   {
+      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
+      {
+         png_push_save_buffer(png_ptr);
+         return;
+      }
+
+      png_handle_hIST(png_ptr, info_ptr, png_ptr->push_length);
+   }
+
+#endif
+#ifdef PNG_READ_pHYs_SUPPORTED
+   else if (!png_memcmp(png_ptr->chunk_name, png_pHYs, 4))
+   {
+      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
+      {
+         png_push_save_buffer(png_ptr);
+         return;
+      }
+
+      png_handle_pHYs(png_ptr, info_ptr, png_ptr->push_length);
+   }
+
+#endif
+#ifdef PNG_READ_oFFs_SUPPORTED
+   else if (!png_memcmp(png_ptr->chunk_name, png_oFFs, 4))
+   {
+      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
+      {
+         png_push_save_buffer(png_ptr);
+         return;
+      }
+
+      png_handle_oFFs(png_ptr, info_ptr, png_ptr->push_length);
+   }
+#endif
+
+#ifdef PNG_READ_pCAL_SUPPORTED
+   else if (!png_memcmp(png_ptr->chunk_name, png_pCAL, 4))
+   {
+      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
+      {
+         png_push_save_buffer(png_ptr);
+         return;
+      }
+
+      png_handle_pCAL(png_ptr, info_ptr, png_ptr->push_length);
+   }
+
+#endif
+#ifdef PNG_READ_sCAL_SUPPORTED
+   else if (!png_memcmp(png_ptr->chunk_name, png_sCAL, 4))
+   {
+      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
+      {
+         png_push_save_buffer(png_ptr);
+         return;
+      }
+
+      png_handle_sCAL(png_ptr, info_ptr, png_ptr->push_length);
+   }
+
+#endif
+#ifdef PNG_READ_tIME_SUPPORTED
+   else if (!png_memcmp(png_ptr->chunk_name, png_tIME, 4))
+   {
+      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
+      {
+         png_push_save_buffer(png_ptr);
+         return;
+      }
+
+      png_handle_tIME(png_ptr, info_ptr, png_ptr->push_length);
+   }
+
+#endif
+#ifdef PNG_READ_tEXt_SUPPORTED
+   else if (!png_memcmp(png_ptr->chunk_name, png_tEXt, 4))
+   {
+      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
+      {
+         png_push_save_buffer(png_ptr);
+         return;
+      }
+
+      png_handle_tEXt(png_ptr, info_ptr, png_ptr->push_length);
+   }
+
+#endif
+#ifdef PNG_READ_zTXt_SUPPORTED
+   else if (!png_memcmp(png_ptr->chunk_name, png_zTXt, 4))
+   {
+      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
+      {
+         png_push_save_buffer(png_ptr);
+         return;
+      }
+
+      png_handle_zTXt(png_ptr, info_ptr, png_ptr->push_length);
+   }
+
+#endif
+#ifdef PNG_READ_iTXt_SUPPORTED
+   else if (!png_memcmp(png_ptr->chunk_name, png_iTXt, 4))
+   {
+      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
+      {
+         png_push_save_buffer(png_ptr);
+         return;
+      }
+
+      png_handle_iTXt(png_ptr, info_ptr, png_ptr->push_length);
+   }
+
+#endif
+   else
+   {
+      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
+      {
+         png_push_save_buffer(png_ptr);
+         return;
+      }
+      png_handle_unknown(png_ptr, info_ptr, png_ptr->push_length);
+   }
+
+   png_ptr->mode &= ~PNG_HAVE_CHUNK_HEADER;
+}
+
+void /* PRIVATE */
+png_push_crc_skip(png_structp png_ptr, png_uint_32 skip)
+{
+   png_ptr->process_mode = PNG_SKIP_MODE;
+   png_ptr->skip_length = skip;
+}
+
+void /* PRIVATE */
+png_push_crc_finish(png_structp png_ptr)
+{
+   if (png_ptr->skip_length && png_ptr->save_buffer_size)
+   {
+      png_size_t save_size;
+
+      if (png_ptr->skip_length < (png_uint_32)png_ptr->save_buffer_size)
+         save_size = (png_size_t)png_ptr->skip_length;
+      else
+         save_size = png_ptr->save_buffer_size;
+
+      png_calculate_crc(png_ptr, png_ptr->save_buffer_ptr, save_size);
+
+      png_ptr->skip_length -= save_size;
+      png_ptr->buffer_size -= save_size;
+      png_ptr->save_buffer_size -= save_size;
+      png_ptr->save_buffer_ptr += save_size;
+   }
+   if (png_ptr->skip_length && png_ptr->current_buffer_size)
+   {
+      png_size_t save_size;
+
+      if (png_ptr->skip_length < (png_uint_32)png_ptr->current_buffer_size)
+         save_size = (png_size_t)png_ptr->skip_length;
+      else
+         save_size = png_ptr->current_buffer_size;
+
+      png_calculate_crc(png_ptr, png_ptr->current_buffer_ptr, save_size);
+
+      png_ptr->skip_length -= save_size;
+      png_ptr->buffer_size -= save_size;
+      png_ptr->current_buffer_size -= save_size;
+      png_ptr->current_buffer_ptr += save_size;
+   }
+   if (!png_ptr->skip_length)
+   {
+      if (png_ptr->buffer_size < 4)
+      {
+         png_push_save_buffer(png_ptr);
+         return;
+      }
+
+      png_crc_finish(png_ptr, 0);
+      png_ptr->process_mode = PNG_READ_CHUNK_MODE;
+   }
+}
+
+void PNGAPI
+png_push_fill_buffer(png_structp png_ptr, png_bytep buffer, png_size_t length)
+{
+   png_bytep ptr;
+
+   if (png_ptr == NULL)
+      return;
+
+   ptr = buffer;
+   if (png_ptr->save_buffer_size)
+   {
+      png_size_t save_size;
+
+      if (length < png_ptr->save_buffer_size)
+         save_size = length;
+      else
+         save_size = png_ptr->save_buffer_size;
+
+      png_memcpy(ptr, png_ptr->save_buffer_ptr, save_size);
+      length -= save_size;
+      ptr += save_size;
+      png_ptr->buffer_size -= save_size;
+      png_ptr->save_buffer_size -= save_size;
+      png_ptr->save_buffer_ptr += save_size;
+   }
+   if (length && png_ptr->current_buffer_size)
+   {
+      png_size_t save_size;
+
+      if (length < png_ptr->current_buffer_size)
+         save_size = length;
+
+      else
+         save_size = png_ptr->current_buffer_size;
+
+      png_memcpy(ptr, png_ptr->current_buffer_ptr, save_size);
+      png_ptr->buffer_size -= save_size;
+      png_ptr->current_buffer_size -= save_size;
+      png_ptr->current_buffer_ptr += save_size;
+   }
+}
+
+void /* PRIVATE */
+png_push_save_buffer(png_structp png_ptr)
+{
+   if (png_ptr->save_buffer_size)
+   {
+      if (png_ptr->save_buffer_ptr != png_ptr->save_buffer)
+      {
+         png_size_t i, istop;
+         png_bytep sp;
+         png_bytep dp;
+
+         istop = png_ptr->save_buffer_size;
+         for (i = 0, sp = png_ptr->save_buffer_ptr, dp = png_ptr->save_buffer;
+            i < istop; i++, sp++, dp++)
+         {
+            *dp = *sp;
+         }
+      }
+   }
+   if (png_ptr->save_buffer_size + png_ptr->current_buffer_size >
+      png_ptr->save_buffer_max)
+   {
+      png_size_t new_max;
+      png_bytep old_buffer;
+
+      if (png_ptr->save_buffer_size > PNG_SIZE_MAX -
+         (png_ptr->current_buffer_size + 256))
+      {
+        png_error(png_ptr, "Potential overflow of save_buffer");
+      }
+
+      new_max = png_ptr->save_buffer_size + png_ptr->current_buffer_size + 256;
+      old_buffer = png_ptr->save_buffer;
+      png_ptr->save_buffer = (png_bytep)png_malloc_warn(png_ptr,
+         (png_uint_32)new_max);
+      if (png_ptr->save_buffer == NULL)
+      {
+        png_free(png_ptr, old_buffer);
+        png_error(png_ptr, "Insufficient memory for save_buffer");
+      }
+      png_memcpy(png_ptr->save_buffer, old_buffer, png_ptr->save_buffer_size);
+      png_free(png_ptr, old_buffer);
+      png_ptr->save_buffer_max = new_max;
+   }
+   if (png_ptr->current_buffer_size)
+   {
+      png_memcpy(png_ptr->save_buffer + png_ptr->save_buffer_size,
+         png_ptr->current_buffer_ptr, png_ptr->current_buffer_size);
+      png_ptr->save_buffer_size += png_ptr->current_buffer_size;
+      png_ptr->current_buffer_size = 0;
+   }
+   png_ptr->save_buffer_ptr = png_ptr->save_buffer;
+   png_ptr->buffer_size = 0;
+}
+
+void /* PRIVATE */
+png_push_restore_buffer(png_structp png_ptr, png_bytep buffer,
+   png_size_t buffer_length)
+{
+   png_ptr->current_buffer = buffer;
+   png_ptr->current_buffer_size = buffer_length;
+   png_ptr->buffer_size = buffer_length + png_ptr->save_buffer_size;
+   png_ptr->current_buffer_ptr = png_ptr->current_buffer;
+}
+
+void /* PRIVATE */
+png_push_read_IDAT(png_structp png_ptr)
+{
+#ifdef PNG_USE_LOCAL_ARRAYS
+   PNG_CONST PNG_IDAT;
+#endif
+   if (!(png_ptr->mode & PNG_HAVE_CHUNK_HEADER))
+   {
+      png_byte chunk_length[4];
+
+      if (png_ptr->buffer_size < 8)
+      {
+         png_push_save_buffer(png_ptr);
+         return;
+      }
+
+      png_push_fill_buffer(png_ptr, chunk_length, 4);
+      png_ptr->push_length = png_get_uint_31(png_ptr, chunk_length);
+      png_reset_crc(png_ptr);
+      png_crc_read(png_ptr, png_ptr->chunk_name, 4);
+      png_ptr->mode |= PNG_HAVE_CHUNK_HEADER;
+
+      if (png_memcmp(png_ptr->chunk_name, png_IDAT, 4))
+      {
+         png_ptr->process_mode = PNG_READ_CHUNK_MODE;
+         if (!(png_ptr->flags & PNG_FLAG_ZLIB_FINISHED))
+            png_error(png_ptr, "Not enough compressed data");
+         return;
+      }
+
+      png_ptr->idat_size = png_ptr->push_length;
+   }
+   if (png_ptr->idat_size && png_ptr->save_buffer_size)
+   {
+      png_size_t save_size;
+
+      if (png_ptr->idat_size < (png_uint_32)png_ptr->save_buffer_size)
+      {
+         save_size = (png_size_t)png_ptr->idat_size;
+
+         /* Check for overflow */
+         if ((png_uint_32)save_size != png_ptr->idat_size)
+            png_error(png_ptr, "save_size overflowed in pngpread");
+      }
+      else
+         save_size = png_ptr->save_buffer_size;
+
+      png_calculate_crc(png_ptr, png_ptr->save_buffer_ptr, save_size);
+
+      png_process_IDAT_data(png_ptr, png_ptr->save_buffer_ptr, save_size);
+
+      png_ptr->idat_size -= save_size;
+      png_ptr->buffer_size -= save_size;
+      png_ptr->save_buffer_size -= save_size;
+      png_ptr->save_buffer_ptr += save_size;
+   }
+   if (png_ptr->idat_size && png_ptr->current_buffer_size)
+   {
+      png_size_t save_size;
+
+      if (png_ptr->idat_size < (png_uint_32)png_ptr->current_buffer_size)
+      {
+         save_size = (png_size_t)png_ptr->idat_size;
+
+         /* Check for overflow */
+         if ((png_uint_32)save_size != png_ptr->idat_size)
+            png_error(png_ptr, "save_size overflowed in pngpread");
+      }
+      else
+         save_size = png_ptr->current_buffer_size;
+
+      png_calculate_crc(png_ptr, png_ptr->current_buffer_ptr, save_size);
+
+      png_process_IDAT_data(png_ptr, png_ptr->current_buffer_ptr, save_size);
+
+      png_ptr->idat_size -= save_size;
+      png_ptr->buffer_size -= save_size;
+      png_ptr->current_buffer_size -= save_size;
+      png_ptr->current_buffer_ptr += save_size;
+   }
+   if (!png_ptr->idat_size)
+   {
+      if (png_ptr->buffer_size < 4)
+      {
+         png_push_save_buffer(png_ptr);
+         return;
+      }
+
+      png_crc_finish(png_ptr, 0);
+      png_ptr->mode &= ~PNG_HAVE_CHUNK_HEADER;
+      png_ptr->mode |= PNG_AFTER_IDAT;
+   }
+}
+
+void /* PRIVATE */
+png_process_IDAT_data(png_structp png_ptr, png_bytep buffer,
+   png_size_t buffer_length)
+{
+   /* The caller checks for a non-zero buffer length. */
+   if (!(buffer_length > 0) || buffer == NULL)
+      png_error(png_ptr, "No IDAT data (internal error)");
+
+   /* This routine must process all the data it has been given
+    * before returning, calling the row callback as required to
+    * handle the uncompressed results.
+    */
+   png_ptr->zstream.next_in = buffer;
+   png_ptr->zstream.avail_in = (uInt)buffer_length;
+
+   /* Keep going until the decompressed data is all processed
+    * or the stream marked as finished.
+    */
+   while (png_ptr->zstream.avail_in > 0 &&
+	  !(png_ptr->flags & PNG_FLAG_ZLIB_FINISHED))
+   {
+      int ret;
+
+      /* We have data for zlib, but we must check that zlib
+       * has somewhere to put the results.  It doesn't matter
+       * if we don't expect any results -- it may be the input
+       * data is just the LZ end code.
+       */
+      if (!(png_ptr->zstream.avail_out > 0))
+      {
+         png_ptr->zstream.avail_out =
+             (uInt) PNG_ROWBYTES(png_ptr->pixel_depth,
+             png_ptr->iwidth) + 1;
+         png_ptr->zstream.next_out = png_ptr->row_buf;
+      }
+
+      /* Using Z_SYNC_FLUSH here means that an unterminated
+       * LZ stream can still be handled (a stream with a missing
+       * end code), otherwise (Z_NO_FLUSH) a future zlib
+       * implementation might defer output and, therefore,
+       * change the current behavior.  (See comments in inflate.c
+       * for why this doesn't happen at present with zlib 1.2.5.)
+       */
+      ret = inflate(&png_ptr->zstream, Z_SYNC_FLUSH);
+
+      /* Check for any failure before proceeding. */
+      if (ret != Z_OK && ret != Z_STREAM_END)
+      {
+	 /* Terminate the decompression. */
+	 png_ptr->flags |= PNG_FLAG_ZLIB_FINISHED;
+
+         /* This may be a truncated stream (missing or
+	  * damaged end code).  Treat that as a warning.
+	  */
+         if (png_ptr->row_number >= png_ptr->num_rows ||
+	     png_ptr->pass > 6)
+	    png_warning(png_ptr, "Truncated compressed data in IDAT");
+	 else
+	    png_error(png_ptr, "Decompression error in IDAT");
+
+	 /* Skip the check on unprocessed input */
+         return;
+      }
+
+      /* Did inflate output any data? */
+      if (png_ptr->zstream.next_out != png_ptr->row_buf)
+      {
+	 /* Is this unexpected data after the last row?
+	  * If it is, artificially terminate the LZ output
+	  * here.
+	  */
+         if (png_ptr->row_number >= png_ptr->num_rows ||
+	     png_ptr->pass > 6)
+         {
+	    /* Extra data. */
+	    png_warning(png_ptr, "Extra compressed data in IDAT");
+            png_ptr->flags |= PNG_FLAG_ZLIB_FINISHED;
+	    /* Do no more processing; skip the unprocessed
+	     * input check below.
+	     */
+            return;
+	 }
+
+	 /* Do we have a complete row? */
+	 if (png_ptr->zstream.avail_out == 0)
+	    png_push_process_row(png_ptr);
+      }
+
+      /* And check for the end of the stream. */
+      if (ret == Z_STREAM_END)
+	 png_ptr->flags |= PNG_FLAG_ZLIB_FINISHED;
+   }
+
+   /* All the data should have been processed, if anything
+    * is left at this point we have bytes of IDAT data
+    * after the zlib end code.
+    */
+   if (png_ptr->zstream.avail_in > 0)
+      png_warning(png_ptr, "Extra compression data");
+}
+
+void /* PRIVATE */
+png_push_process_row(png_structp png_ptr)
+{
+   png_ptr->row_info.color_type = png_ptr->color_type;
+   png_ptr->row_info.width = png_ptr->iwidth;
+   png_ptr->row_info.channels = png_ptr->channels;
+   png_ptr->row_info.bit_depth = png_ptr->bit_depth;
+   png_ptr->row_info.pixel_depth = png_ptr->pixel_depth;
+
+   png_ptr->row_info.rowbytes = PNG_ROWBYTES(png_ptr->row_info.pixel_depth,
+       png_ptr->row_info.width);
+
+   png_read_filter_row(png_ptr, &(png_ptr->row_info),
+       png_ptr->row_buf + 1, png_ptr->prev_row + 1,
+       (int)(png_ptr->row_buf[0]));
+
+   png_memcpy_check(png_ptr, png_ptr->prev_row, png_ptr->row_buf,
+      png_ptr->rowbytes + 1);
+
+   if (png_ptr->transformations || (png_ptr->flags&PNG_FLAG_STRIP_ALPHA))
+      png_do_read_transformations(png_ptr);
+
+#ifdef PNG_READ_INTERLACING_SUPPORTED
+   /* Blow up interlaced rows to full size */
+   if (png_ptr->interlaced && (png_ptr->transformations & PNG_INTERLACE))
+   {
+      if (png_ptr->pass < 6)
+/*       old interface (pre-1.0.9):
+         png_do_read_interlace(&(png_ptr->row_info),
+             png_ptr->row_buf + 1, png_ptr->pass, png_ptr->transformations);
+ */
+         png_do_read_interlace(png_ptr);
+
+    switch (png_ptr->pass)
+    {
+         case 0:
+         {
+            int i;
+            for (i = 0; i < 8 && png_ptr->pass == 0; i++)
+            {
+               png_push_have_row(png_ptr, png_ptr->row_buf + 1);
+               png_read_push_finish_row(png_ptr); /* Updates png_ptr->pass */
+            }
+
+            if (png_ptr->pass == 2) /* Pass 1 might be empty */
+            {
+               for (i = 0; i < 4 && png_ptr->pass == 2; i++)
+               {
+                  png_push_have_row(png_ptr, png_bytep_NULL);
+                  png_read_push_finish_row(png_ptr);
+               }
+            }
+
+            if (png_ptr->pass == 4 && png_ptr->height <= 4)
+            {
+               for (i = 0; i < 2 && png_ptr->pass == 4; i++)
+               {
+                  png_push_have_row(png_ptr, png_bytep_NULL);
+                  png_read_push_finish_row(png_ptr);
+               }
+            }
+
+            if (png_ptr->pass == 6 && png_ptr->height <= 4)
+            {
+                  png_push_have_row(png_ptr, png_bytep_NULL);
+                png_read_push_finish_row(png_ptr);
+            }
+
+            break;
+         }
+
+         case 1:
+         {
+            int i;
+            for (i = 0; i < 8 && png_ptr->pass == 1; i++)
+            {
+               png_push_have_row(png_ptr, png_ptr->row_buf + 1);
+               png_read_push_finish_row(png_ptr);
+            }
+
+            if (png_ptr->pass == 2) /* Skip top 4 generated rows */
+            {
+               for (i = 0; i < 4 && png_ptr->pass == 2; i++)
+               {
+                  png_push_have_row(png_ptr, png_bytep_NULL);
+                  png_read_push_finish_row(png_ptr);
+               }
+            }
+
+            break;
+         }
+
+         case 2:
+         {
+            int i;
+
+            for (i = 0; i < 4 && png_ptr->pass == 2; i++)
+            {
+               png_push_have_row(png_ptr, png_ptr->row_buf + 1);
+               png_read_push_finish_row(png_ptr);
+            }
+
+            for (i = 0; i < 4 && png_ptr->pass == 2; i++)
+            {
+                  png_push_have_row(png_ptr, png_bytep_NULL);
+               png_read_push_finish_row(png_ptr);
+            }
+
+            if (png_ptr->pass == 4) /* Pass 3 might be empty */
+            {
+               for (i = 0; i < 2 && png_ptr->pass == 4; i++)
+               {
+                  png_push_have_row(png_ptr, png_bytep_NULL);
+                  png_read_push_finish_row(png_ptr);
+               }
+            }
+
+            break;
+         }
+
+         case 3:
+         {
+            int i;
+
+            for (i = 0; i < 4 && png_ptr->pass == 3; i++)
+            {
+               png_push_have_row(png_ptr, png_ptr->row_buf + 1);
+               png_read_push_finish_row(png_ptr);
+            }
+
+            if (png_ptr->pass == 4) /* Skip top two generated rows */
+            {
+               for (i = 0; i < 2 && png_ptr->pass == 4; i++)
+               {
+                  png_push_have_row(png_ptr, png_bytep_NULL);
+                  png_read_push_finish_row(png_ptr);
+               }
+            }
+
+            break;
+         }
+
+         case 4:
+         {
+            int i;
+
+            for (i = 0; i < 2 && png_ptr->pass == 4; i++)
+            {
+               png_push_have_row(png_ptr, png_ptr->row_buf + 1);
+               png_read_push_finish_row(png_ptr);
+            }
+
+            for (i = 0; i < 2 && png_ptr->pass == 4; i++)
+            {
+                  png_push_have_row(png_ptr, png_bytep_NULL);
+               png_read_push_finish_row(png_ptr);
+            }
+
+            if (png_ptr->pass == 6) /* Pass 5 might be empty */
+            {
+                  png_push_have_row(png_ptr, png_bytep_NULL);
+               png_read_push_finish_row(png_ptr);
+            }
+
+            break;
+         }
+
+         case 5:
+         {
+            int i;
+
+            for (i = 0; i < 2 && png_ptr->pass == 5; i++)
+            {
+               png_push_have_row(png_ptr, png_ptr->row_buf + 1);
+               png_read_push_finish_row(png_ptr);
+            }
+
+            if (png_ptr->pass == 6) /* Skip top generated row */
+            {
+                  png_push_have_row(png_ptr, png_bytep_NULL);
+               png_read_push_finish_row(png_ptr);
+            }
+
+            break;
+         }
+         case 6:
+         {
+            png_push_have_row(png_ptr, png_ptr->row_buf + 1);
+            png_read_push_finish_row(png_ptr);
+
+            if (png_ptr->pass != 6)
+               break;
+
+                  png_push_have_row(png_ptr, png_bytep_NULL);
+            png_read_push_finish_row(png_ptr);
+         }
+      }
+   }
+   else
+#endif
+   {
+      png_push_have_row(png_ptr, png_ptr->row_buf + 1);
+      png_read_push_finish_row(png_ptr);
+   }
+}
+
+void /* PRIVATE */
+png_read_push_finish_row(png_structp png_ptr)
+{
+#ifdef PNG_USE_LOCAL_ARRAYS
+   /* Arrays to facilitate easy interlacing - use pass (0 - 6) as index */
+
+   /* Start of interlace block */
+   PNG_CONST int FARDATA png_pass_start[] = {0, 4, 0, 2, 0, 1, 0};
+
+   /* Offset to next interlace block */
+   PNG_CONST int FARDATA png_pass_inc[] = {8, 8, 4, 4, 2, 2, 1};
+
+   /* Start of interlace block in the y direction */
+   PNG_CONST int FARDATA png_pass_ystart[] = {0, 0, 4, 0, 2, 0, 1};
+
+   /* Offset to next interlace block in the y direction */
+   PNG_CONST int FARDATA png_pass_yinc[] = {8, 8, 8, 4, 4, 2, 2};
+
+   /* Height of interlace block.  This is not currently used - if you need
+    * it, uncomment it here and in png.h
+   PNG_CONST int FARDATA png_pass_height[] = {8, 8, 4, 4, 2, 2, 1};
+   */
+#endif
+
+   png_ptr->row_number++;
+   if (png_ptr->row_number < png_ptr->num_rows)
+      return;
+
+#ifdef PNG_READ_INTERLACING_SUPPORTED
+   if (png_ptr->interlaced)
+   {
+      png_ptr->row_number = 0;
+      png_memset_check(png_ptr, png_ptr->prev_row, 0,
+         png_ptr->rowbytes + 1);
+      do
+      {
+         png_ptr->pass++;
+         if ((png_ptr->pass == 1 && png_ptr->width < 5) ||
+             (png_ptr->pass == 3 && png_ptr->width < 3) ||
+             (png_ptr->pass == 5 && png_ptr->width < 2))
+           png_ptr->pass++;
+
+         if (png_ptr->pass > 7)
+            png_ptr->pass--;
+
+         if (png_ptr->pass >= 7)
+            break;
+
+         png_ptr->iwidth = (png_ptr->width +
+            png_pass_inc[png_ptr->pass] - 1 -
+            png_pass_start[png_ptr->pass]) /
+            png_pass_inc[png_ptr->pass];
+
+         if (png_ptr->transformations & PNG_INTERLACE)
+            break;
+
+         png_ptr->num_rows = (png_ptr->height +
+            png_pass_yinc[png_ptr->pass] - 1 -
+            png_pass_ystart[png_ptr->pass]) /
+            png_pass_yinc[png_ptr->pass];
+
+      } while (png_ptr->iwidth == 0 || png_ptr->num_rows == 0);
+   }
+#endif /* PNG_READ_INTERLACING_SUPPORTED */
+}
+
+void /* PRIVATE */
+png_push_have_info(png_structp png_ptr, png_infop info_ptr)
+{
+   if (png_ptr->info_fn != NULL)
+      (*(png_ptr->info_fn))(png_ptr, info_ptr);
+}
+
+void /* PRIVATE */
+png_push_have_end(png_structp png_ptr, png_infop info_ptr)
+{
+   if (png_ptr->end_fn != NULL)
+      (*(png_ptr->end_fn))(png_ptr, info_ptr);
+}
+
+void /* PRIVATE */
+png_push_have_row(png_structp png_ptr, png_bytep row)
+{
+   if (png_ptr->row_fn != NULL)
+      (*(png_ptr->row_fn))(png_ptr, row, png_ptr->row_number,
+         (int)png_ptr->pass);
+}
+
+void PNGAPI
+png_progressive_combine_row (png_structp png_ptr,
+   png_bytep old_row, png_bytep new_row)
+{
+#ifdef PNG_USE_LOCAL_ARRAYS
+   PNG_CONST int FARDATA png_pass_dsp_mask[7] =
+      {0xff, 0x0f, 0xff, 0x33, 0xff, 0x55, 0xff};
+#endif
+
+   if (png_ptr == NULL)
+      return;
+
+   if (new_row != NULL)    /* new_row must == png_ptr->row_buf here. */
+      png_combine_row(png_ptr, old_row, png_pass_dsp_mask[png_ptr->pass]);
+}
+
+void PNGAPI
+png_set_progressive_read_fn(png_structp png_ptr, png_voidp progressive_ptr,
+   png_progressive_info_ptr info_fn, png_progressive_row_ptr row_fn,
+   png_progressive_end_ptr end_fn)
+{
+   if (png_ptr == NULL)
+      return;
+
+   png_ptr->info_fn = info_fn;
+   png_ptr->row_fn = row_fn;
+   png_ptr->end_fn = end_fn;
+
+   png_set_read_fn(png_ptr, progressive_ptr, png_push_fill_buffer);
+}
+
+png_voidp PNGAPI
+png_get_progressive_ptr(png_structp png_ptr)
+{
+   if (png_ptr == NULL)
+      return (NULL);
+
+   return png_ptr->io_ptr;
+}
+#endif /* PNG_PROGRESSIVE_READ_SUPPORTED */
diff --git a/Externals/libpng/pngread.c b/Externals/libpng/pngread.c
index 2c8f2cd687..10b997694d 100644
--- a/Externals/libpng/pngread.c
+++ b/Externals/libpng/pngread.c
@@ -1,1466 +1,1515 @@
-
-/* pngread.c - read a PNG file
- *
- * Last changed in libpng 1.5.1 [$RDATE%]
- * Copyright (c) 1998-2011 Glenn Randers-Pehrson
- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
- *
- * This code is released under the libpng license.
- * For conditions of distribution and use, see the disclaimer
- * and license in png.h
- *
- * This file contains routines that an application calls directly to
- * read a PNG file or stream.
- */
-
-#include "pngpriv.h"
-
-#ifdef PNG_READ_SUPPORTED
-
-/* Create a PNG structure for reading, and allocate any memory needed. */
-PNG_FUNCTION(png_structp,PNGAPI
-png_create_read_struct,(png_const_charp user_png_ver, png_voidp error_ptr,
-    png_error_ptr error_fn, png_error_ptr warn_fn),PNG_ALLOCATED)
-{
-
-#ifdef PNG_USER_MEM_SUPPORTED
-   return (png_create_read_struct_2(user_png_ver, error_ptr, error_fn,
-       warn_fn, NULL, NULL, NULL));
-}
-
-/* Alternate create PNG structure for reading, and allocate any memory
- * needed.
- */
-PNG_FUNCTION(png_structp,PNGAPI
-png_create_read_struct_2,(png_const_charp user_png_ver, png_voidp error_ptr,
-    png_error_ptr error_fn, png_error_ptr warn_fn, png_voidp mem_ptr,
-    png_malloc_ptr malloc_fn, png_free_ptr free_fn),PNG_ALLOCATED)
-{
-#endif /* PNG_USER_MEM_SUPPORTED */
-
-#ifdef PNG_SETJMP_SUPPORTED
-   volatile
-#endif
-   png_structp png_ptr;
-   volatile int png_cleanup_needed = 0;
-
-#ifdef PNG_SETJMP_SUPPORTED
-#ifdef USE_FAR_KEYWORD
-   jmp_buf png_jmpbuf;
-#endif
-#endif
-
-   int i;
-
-   png_debug(1, "in png_create_read_struct");
-
-#ifdef PNG_USER_MEM_SUPPORTED
-   png_ptr = (png_structp)png_create_struct_2(PNG_STRUCT_PNG,
-       malloc_fn, mem_ptr);
-#else
-   png_ptr = (png_structp)png_create_struct(PNG_STRUCT_PNG);
-#endif
-   if (png_ptr == NULL)
-      return (NULL);
-
-   /* Added at libpng-1.2.6 */
-#ifdef PNG_USER_LIMITS_SUPPORTED
-   png_ptr->user_width_max = PNG_USER_WIDTH_MAX;
-   png_ptr->user_height_max = PNG_USER_HEIGHT_MAX;
-
-#  ifdef PNG_USER_CHUNK_CACHE_MAX
-   /* Added at libpng-1.2.43 and 1.4.0 */
-   png_ptr->user_chunk_cache_max = PNG_USER_CHUNK_CACHE_MAX;
-#  endif
-
-#  ifdef PNG_SET_USER_CHUNK_MALLOC_MAX
-   /* Added at libpng-1.2.43 and 1.4.1 */
-   png_ptr->user_chunk_malloc_max = PNG_USER_CHUNK_MALLOC_MAX;
-#  endif
-#endif
-
-#ifdef PNG_SETJMP_SUPPORTED
-/* Applications that neglect to set up their own setjmp() and then
-   encounter a png_error() will longjmp here.  Since the jmpbuf is
-   then meaningless we abort instead of returning. */
-#ifdef USE_FAR_KEYWORD
-   if (setjmp(png_jmpbuf))
-#else
-   if (setjmp(png_jmpbuf(png_ptr))) /* Sets longjmp to match setjmp */
-#endif
-      PNG_ABORT();
-#ifdef USE_FAR_KEYWORD
-   png_memcpy(png_jmpbuf(png_ptr), png_jmpbuf, png_sizeof(jmp_buf));
-#endif
-#endif /* PNG_SETJMP_SUPPORTED */
-
-#ifdef PNG_USER_MEM_SUPPORTED
-   png_set_mem_fn(png_ptr, mem_ptr, malloc_fn, free_fn);
-#endif
-
-   png_set_error_fn(png_ptr, error_ptr, error_fn, warn_fn);
-
-   if (user_png_ver)
-   {
-      i = 0;
-
-      do
-      {
-         if (user_png_ver[i] != png_libpng_ver[i])
-            png_ptr->flags |= PNG_FLAG_LIBRARY_MISMATCH;
-      } while (png_libpng_ver[i++]);
-   }
-
-   else
-      png_ptr->flags |= PNG_FLAG_LIBRARY_MISMATCH;
-
-
-   if (png_ptr->flags & PNG_FLAG_LIBRARY_MISMATCH)
-   {
-     /* Libpng 0.90 and later are binary incompatible with libpng 0.89, so
-      * we must recompile any applications that use any older library version.
-      * For versions after libpng 1.0, we will be compatible, so we need
-      * only check the first digit.
-      */
-      if (user_png_ver == NULL || user_png_ver[0] != png_libpng_ver[0] ||
-          (user_png_ver[0] == '1' && user_png_ver[2] != png_libpng_ver[2]) ||
-          (user_png_ver[0] == '0' && user_png_ver[2] < '9'))
-      {
-#ifdef PNG_CONSOLE_IO_SUPPORTED
-         char msg[80];
-         if (user_png_ver)
-         {
-            png_snprintf2(msg, 80,
-                "Application built with libpng-%.20s"
-                " but running with %.20s",
-                user_png_ver,
-                png_libpng_ver);
-            png_warning(png_ptr, msg);
-         }
-#else
-         png_warning(png_ptr,
-             "Incompatible libpng version in application and library");
-#endif
-#ifdef PNG_ERROR_NUMBERS_SUPPORTED
-         png_ptr->flags = 0;
-#endif
-
-         png_cleanup_needed = 1;
-      }
-   }
-
-   if (!png_cleanup_needed)
-   {
-   /* Initialize zbuf - compression buffer */
-   png_ptr->zbuf_size = PNG_ZBUF_SIZE;
-   png_ptr->zbuf = (png_bytep)png_malloc_warn(png_ptr, png_ptr->zbuf_size);
-
-   if (png_ptr->zbuf == NULL)
-      png_cleanup_needed = 1;
-   }
-
-   png_ptr->zstream.zalloc = png_zalloc;
-   png_ptr->zstream.zfree = png_zfree;
-   png_ptr->zstream.opaque = (voidpf)png_ptr;
-
-   if (!png_cleanup_needed)
-   {
-      switch (inflateInit(&png_ptr->zstream))
-      {
-         case Z_OK:
-            break; /* Do nothing */
-
-         case Z_MEM_ERROR:
-            png_warning(png_ptr, "zlib memory error");
-            png_cleanup_needed = 1;
-            break;
-
-         case Z_STREAM_ERROR:
-            png_warning(png_ptr, "zlib stream error");
-            png_cleanup_needed = 1;
-            break;
-
-         case Z_VERSION_ERROR:
-            png_warning(png_ptr, "zlib version error");
-            png_cleanup_needed = 1;
-            break;
-
-         default: png_warning(png_ptr, "Unknown zlib error");
-            png_cleanup_needed = 1;
-      }
-   }
-
-   if (png_cleanup_needed)
-   {
-      /* Clean up PNG structure and deallocate any memory. */
-      png_free(png_ptr, png_ptr->zbuf);
-      png_ptr->zbuf = NULL;
-#ifdef PNG_USER_MEM_SUPPORTED
-      png_destroy_struct_2((png_voidp)png_ptr,
-          (png_free_ptr)free_fn, (png_voidp)mem_ptr);
-#else
-      png_destroy_struct((png_voidp)png_ptr);
-#endif
-      return (NULL);
-   }
-
-   png_ptr->zstream.next_out = png_ptr->zbuf;
-   png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;
-
-   png_set_read_fn(png_ptr, NULL, NULL);
-
-
-   return (png_ptr);
-}
-
-
-#ifdef PNG_SEQUENTIAL_READ_SUPPORTED
-/* Read the information before the actual image data.  This has been
- * changed in v0.90 to allow reading a file that already has the magic
- * bytes read from the stream.  You can tell libpng how many bytes have
- * been read from the beginning of the stream (up to the maximum of 8)
- * via png_set_sig_bytes(), and we will only check the remaining bytes
- * here.  The application can then have access to the signature bytes we
- * read if it is determined that this isn't a valid PNG file.
- */
-void PNGAPI
-png_read_info(png_structp png_ptr, png_infop info_ptr)
-{
-   png_debug(1, "in png_read_info");
-
-   if (png_ptr == NULL || info_ptr == NULL)
-      return;
-
-   /* Read and check the PNG file signature. */
-   png_read_sig(png_ptr, info_ptr);
-
-   for (;;)
-   {
-      PNG_IHDR;
-      PNG_IDAT;
-      PNG_IEND;
-      PNG_PLTE;
-#ifdef PNG_READ_bKGD_SUPPORTED
-      PNG_bKGD;
-#endif
-#ifdef PNG_READ_cHRM_SUPPORTED
-      PNG_cHRM;
-#endif
-#ifdef PNG_READ_gAMA_SUPPORTED
-      PNG_gAMA;
-#endif
-#ifdef PNG_READ_hIST_SUPPORTED
-      PNG_hIST;
-#endif
-#ifdef PNG_READ_iCCP_SUPPORTED
-      PNG_iCCP;
-#endif
-#ifdef PNG_READ_iTXt_SUPPORTED
-      PNG_iTXt;
-#endif
-#ifdef PNG_READ_oFFs_SUPPORTED
-      PNG_oFFs;
-#endif
-#ifdef PNG_READ_pCAL_SUPPORTED
-      PNG_pCAL;
-#endif
-#ifdef PNG_READ_pHYs_SUPPORTED
-      PNG_pHYs;
-#endif
-#ifdef PNG_READ_sBIT_SUPPORTED
-      PNG_sBIT;
-#endif
-#ifdef PNG_READ_sCAL_SUPPORTED
-      PNG_sCAL;
-#endif
-#ifdef PNG_READ_sPLT_SUPPORTED
-      PNG_sPLT;
-#endif
-#ifdef PNG_READ_sRGB_SUPPORTED
-      PNG_sRGB;
-#endif
-#ifdef PNG_READ_tEXt_SUPPORTED
-      PNG_tEXt;
-#endif
-#ifdef PNG_READ_tIME_SUPPORTED
-      PNG_tIME;
-#endif
-#ifdef PNG_READ_tRNS_SUPPORTED
-      PNG_tRNS;
-#endif
-#ifdef PNG_READ_zTXt_SUPPORTED
-      PNG_zTXt;
-#endif
-      png_uint_32 length = png_read_chunk_header(png_ptr);
-      PNG_CONST png_bytep chunk_name = png_ptr->chunk_name;
-
-      /* This should be a binary subdivision search or a hash for
-       * matching the chunk name rather than a linear search.
-       */
-      if (!png_memcmp(chunk_name, png_IDAT, 4))
-         if (png_ptr->mode & PNG_AFTER_IDAT)
-            png_ptr->mode |= PNG_HAVE_CHUNK_AFTER_IDAT;
-
-      if (!png_memcmp(chunk_name, png_IHDR, 4))
-         png_handle_IHDR(png_ptr, info_ptr, length);
-
-      else if (!png_memcmp(chunk_name, png_IEND, 4))
-         png_handle_IEND(png_ptr, info_ptr, length);
-
-#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
-      else if (png_handle_as_unknown(png_ptr, chunk_name))
-      {
-         if (!png_memcmp(chunk_name, png_IDAT, 4))
-            png_ptr->mode |= PNG_HAVE_IDAT;
-
-         png_handle_unknown(png_ptr, info_ptr, length);
-
-         if (!png_memcmp(chunk_name, png_PLTE, 4))
-            png_ptr->mode |= PNG_HAVE_PLTE;
-
-         else if (!png_memcmp(chunk_name, png_IDAT, 4))
-         {
-            if (!(png_ptr->mode & PNG_HAVE_IHDR))
-               png_error(png_ptr, "Missing IHDR before IDAT");
-
-            else if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE &&
-                !(png_ptr->mode & PNG_HAVE_PLTE))
-               png_error(png_ptr, "Missing PLTE before IDAT");
-
-            break;
-         }
-      }
-#endif
-      else if (!png_memcmp(chunk_name, png_PLTE, 4))
-         png_handle_PLTE(png_ptr, info_ptr, length);
-
-      else if (!png_memcmp(chunk_name, png_IDAT, 4))
-      {
-         if (!(png_ptr->mode & PNG_HAVE_IHDR))
-            png_error(png_ptr, "Missing IHDR before IDAT");
-
-         else if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE &&
-             !(png_ptr->mode & PNG_HAVE_PLTE))
-            png_error(png_ptr, "Missing PLTE before IDAT");
-
-         png_ptr->idat_size = length;
-         png_ptr->mode |= PNG_HAVE_IDAT;
-         break;
-      }
-
-#ifdef PNG_READ_bKGD_SUPPORTED
-      else if (!png_memcmp(chunk_name, png_bKGD, 4))
-         png_handle_bKGD(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_cHRM_SUPPORTED
-      else if (!png_memcmp(chunk_name, png_cHRM, 4))
-         png_handle_cHRM(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_gAMA_SUPPORTED
-      else if (!png_memcmp(chunk_name, png_gAMA, 4))
-         png_handle_gAMA(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_hIST_SUPPORTED
-      else if (!png_memcmp(chunk_name, png_hIST, 4))
-         png_handle_hIST(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_oFFs_SUPPORTED
-      else if (!png_memcmp(chunk_name, png_oFFs, 4))
-         png_handle_oFFs(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_pCAL_SUPPORTED
-      else if (!png_memcmp(chunk_name, png_pCAL, 4))
-         png_handle_pCAL(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_sCAL_SUPPORTED
-      else if (!png_memcmp(chunk_name, png_sCAL, 4))
-         png_handle_sCAL(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_pHYs_SUPPORTED
-      else if (!png_memcmp(chunk_name, png_pHYs, 4))
-         png_handle_pHYs(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_sBIT_SUPPORTED
-      else if (!png_memcmp(chunk_name, png_sBIT, 4))
-         png_handle_sBIT(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_sRGB_SUPPORTED
-      else if (!png_memcmp(chunk_name, png_sRGB, 4))
-         png_handle_sRGB(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_iCCP_SUPPORTED
-      else if (!png_memcmp(chunk_name, png_iCCP, 4))
-         png_handle_iCCP(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_sPLT_SUPPORTED
-      else if (!png_memcmp(chunk_name, png_sPLT, 4))
-         png_handle_sPLT(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_tEXt_SUPPORTED
-      else if (!png_memcmp(chunk_name, png_tEXt, 4))
-         png_handle_tEXt(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_tIME_SUPPORTED
-      else if (!png_memcmp(chunk_name, png_tIME, 4))
-         png_handle_tIME(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_tRNS_SUPPORTED
-      else if (!png_memcmp(chunk_name, png_tRNS, 4))
-         png_handle_tRNS(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_zTXt_SUPPORTED
-      else if (!png_memcmp(chunk_name, png_zTXt, 4))
-         png_handle_zTXt(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_iTXt_SUPPORTED
-      else if (!png_memcmp(chunk_name, png_iTXt, 4))
-         png_handle_iTXt(png_ptr, info_ptr, length);
-#endif
-
-      else
-         png_handle_unknown(png_ptr, info_ptr, length);
-   }
-}
-#endif /* PNG_SEQUENTIAL_READ_SUPPORTED */
-
-/* Optional call to update the users info_ptr structure */
-void PNGAPI
-png_read_update_info(png_structp png_ptr, png_infop info_ptr)
-{
-   png_debug(1, "in png_read_update_info");
-
-   if (png_ptr == NULL)
-      return;
-
-   if (!(png_ptr->flags & PNG_FLAG_ROW_INIT))
-      png_read_start_row(png_ptr);
-
-   else
-      png_warning(png_ptr,
-          "Ignoring extra png_read_update_info() call;"
-          " row buffer not reallocated");
-
-   png_read_transform_info(png_ptr, info_ptr);
-}
-
-#ifdef PNG_SEQUENTIAL_READ_SUPPORTED
-/* Initialize palette, background, etc, after transformations
- * are set, but before any reading takes place.  This allows
- * the user to obtain a gamma-corrected palette, for example.
- * If the user doesn't call this, we will do it ourselves.
- */
-void PNGAPI
-png_start_read_image(png_structp png_ptr)
-{
-   png_debug(1, "in png_start_read_image");
-
-   if (png_ptr == NULL)
-      return;
-
-   if (!(png_ptr->flags & PNG_FLAG_ROW_INIT))
-      png_read_start_row(png_ptr);
-   else
-      png_warning(png_ptr,
-          "Ignoring extra png_start_read_image() call;"
-          " row buffer not reallocated");
-}
-#endif /* PNG_SEQUENTIAL_READ_SUPPORTED */
-
-#ifdef PNG_SEQUENTIAL_READ_SUPPORTED
-void PNGAPI
-png_read_row(png_structp png_ptr, png_bytep row, png_bytep dsp_row)
-{
-   PNG_IDAT;
-   PNG_CONST int png_pass_dsp_mask[7] = {0xff, 0x0f, 0xff, 0x33, 0xff, 0x55,
-       0xff};
-   PNG_CONST int png_pass_mask[7] = {0x80, 0x08, 0x88, 0x22, 0xaa, 0x55, 0xff};
-   int ret;
-
-   if (png_ptr == NULL)
-      return;
-
-   png_debug2(1, "in png_read_row (row %lu, pass %d)",
-       (unsigned long)png_ptr->row_number, png_ptr->pass);
-
-   if (!(png_ptr->flags & PNG_FLAG_ROW_INIT))
-      png_read_start_row(png_ptr);
-
-   if (png_ptr->row_number == 0 && png_ptr->pass == 0)
-   {
-   /* Check for transforms that have been set but were defined out */
-#if defined(PNG_WRITE_INVERT_SUPPORTED) && !defined(PNG_READ_INVERT_SUPPORTED)
-   if (png_ptr->transformations & PNG_INVERT_MONO)
-      png_warning(png_ptr, "PNG_READ_INVERT_SUPPORTED is not defined");
-#endif
-
-#if defined(PNG_WRITE_FILLER_SUPPORTED) && !defined(PNG_READ_FILLER_SUPPORTED)
-   if (png_ptr->transformations & PNG_FILLER)
-      png_warning(png_ptr, "PNG_READ_FILLER_SUPPORTED is not defined");
-#endif
-
-#if defined(PNG_WRITE_PACKSWAP_SUPPORTED) && \
-    !defined(PNG_READ_PACKSWAP_SUPPORTED)
-   if (png_ptr->transformations & PNG_PACKSWAP)
-      png_warning(png_ptr, "PNG_READ_PACKSWAP_SUPPORTED is not defined");
-#endif
-
-#if defined(PNG_WRITE_PACK_SUPPORTED) && !defined(PNG_READ_PACK_SUPPORTED)
-   if (png_ptr->transformations & PNG_PACK)
-      png_warning(png_ptr, "PNG_READ_PACK_SUPPORTED is not defined");
-#endif
-
-#if defined(PNG_WRITE_SHIFT_SUPPORTED) && !defined(PNG_READ_SHIFT_SUPPORTED)
-   if (png_ptr->transformations & PNG_SHIFT)
-      png_warning(png_ptr, "PNG_READ_SHIFT_SUPPORTED is not defined");
-#endif
-
-#if defined(PNG_WRITE_BGR_SUPPORTED) && !defined(PNG_READ_BGR_SUPPORTED)
-   if (png_ptr->transformations & PNG_BGR)
-      png_warning(png_ptr, "PNG_READ_BGR_SUPPORTED is not defined");
-#endif
-
-#if defined(PNG_WRITE_SWAP_SUPPORTED) && !defined(PNG_READ_SWAP_SUPPORTED)
-   if (png_ptr->transformations & PNG_SWAP_BYTES)
-      png_warning(png_ptr, "PNG_READ_SWAP_SUPPORTED is not defined");
-#endif
-   }
-
-#ifdef PNG_READ_INTERLACING_SUPPORTED
-   /* If interlaced and we do not need a new row, combine row and return */
-   if (png_ptr->interlaced && (png_ptr->transformations & PNG_INTERLACE))
-   {
-      switch (png_ptr->pass)
-      {
-         case 0:
-            if (png_ptr->row_number & 0x07)
-            {
-               if (dsp_row != NULL)
-                  png_combine_row(png_ptr, dsp_row,
-                     png_pass_dsp_mask[png_ptr->pass]);
-               png_read_finish_row(png_ptr);
-               return;
-            }
-            break;
-
-         case 1:
-            if ((png_ptr->row_number & 0x07) || png_ptr->width < 5)
-            {
-               if (dsp_row != NULL)
-                  png_combine_row(png_ptr, dsp_row,
-                      png_pass_dsp_mask[png_ptr->pass]);
-
-               png_read_finish_row(png_ptr);
-               return;
-            }
-            break;
-
-         case 2:
-            if ((png_ptr->row_number & 0x07) != 4)
-            {
-               if (dsp_row != NULL && (png_ptr->row_number & 4))
-                  png_combine_row(png_ptr, dsp_row,
-                      png_pass_dsp_mask[png_ptr->pass]);
-
-               png_read_finish_row(png_ptr);
-               return;
-            }
-            break;
-
-         case 3:
-            if ((png_ptr->row_number & 3) || png_ptr->width < 3)
-            {
-               if (dsp_row != NULL)
-                  png_combine_row(png_ptr, dsp_row,
-                      png_pass_dsp_mask[png_ptr->pass]);
-
-               png_read_finish_row(png_ptr);
-               return;
-            }
-            break;
-
-         case 4:
-            if ((png_ptr->row_number & 3) != 2)
-            {
-               if (dsp_row != NULL && (png_ptr->row_number & 2))
-                  png_combine_row(png_ptr, dsp_row,
-                      png_pass_dsp_mask[png_ptr->pass]);
-
-               png_read_finish_row(png_ptr);
-               return;
-            }
-            break;
-         case 5:
-            if ((png_ptr->row_number & 1) || png_ptr->width < 2)
-            {
-               if (dsp_row != NULL)
-                  png_combine_row(png_ptr, dsp_row,
-                      png_pass_dsp_mask[png_ptr->pass]);
-
-               png_read_finish_row(png_ptr);
-               return;
-            }
-            break;
-
-         default:
-         case 6:
-            if (!(png_ptr->row_number & 1))
-            {
-               png_read_finish_row(png_ptr);
-               return;
-            }
-            break;
-      }
-   }
-#endif
-
-   if (!(png_ptr->mode & PNG_HAVE_IDAT))
-      png_error(png_ptr, "Invalid attempt to read row data");
-
-   png_ptr->zstream.next_out = png_ptr->row_buf;
-   png_ptr->zstream.avail_out =
-       (uInt)(PNG_ROWBYTES(png_ptr->pixel_depth,
-       png_ptr->iwidth) + 1);
-
-   do
-   {
-      if (!(png_ptr->zstream.avail_in))
-      {
-         while (!png_ptr->idat_size)
-         {
-            png_crc_finish(png_ptr, 0);
-
-            png_ptr->idat_size = png_read_chunk_header(png_ptr);
-            if (png_memcmp(png_ptr->chunk_name, png_IDAT, 4))
-               png_error(png_ptr, "Not enough image data");
-         }
-         png_ptr->zstream.avail_in = (uInt)png_ptr->zbuf_size;
-         png_ptr->zstream.next_in = png_ptr->zbuf;
-         if (png_ptr->zbuf_size > png_ptr->idat_size)
-            png_ptr->zstream.avail_in = (uInt)png_ptr->idat_size;
-         png_crc_read(png_ptr, png_ptr->zbuf,
-             (png_size_t)png_ptr->zstream.avail_in);
-         png_ptr->idat_size -= png_ptr->zstream.avail_in;
-      }
-
-      ret = inflate(&png_ptr->zstream, Z_PARTIAL_FLUSH);
-
-      if (ret == Z_STREAM_END)
-      {
-         if (png_ptr->zstream.avail_out || png_ptr->zstream.avail_in ||
-            png_ptr->idat_size)
-            png_benign_error(png_ptr, "Extra compressed data");
-         png_ptr->mode |= PNG_AFTER_IDAT;
-         png_ptr->flags |= PNG_FLAG_ZLIB_FINISHED;
-         break;
-      }
-
-      if (ret != Z_OK)
-         png_error(png_ptr, png_ptr->zstream.msg ? png_ptr->zstream.msg :
-             "Decompression error");
-
-   } while (png_ptr->zstream.avail_out);
-
-   png_ptr->row_info.color_type = png_ptr->color_type;
-   png_ptr->row_info.width = png_ptr->iwidth;
-   png_ptr->row_info.channels = png_ptr->channels;
-   png_ptr->row_info.bit_depth = png_ptr->bit_depth;
-   png_ptr->row_info.pixel_depth = png_ptr->pixel_depth;
-   png_ptr->row_info.rowbytes = PNG_ROWBYTES(png_ptr->row_info.pixel_depth,
-       png_ptr->row_info.width);
-
-   if (png_ptr->row_buf[0])
-   png_read_filter_row(png_ptr, &(png_ptr->row_info),
-       png_ptr->row_buf + 1, png_ptr->prev_row + 1,
-       (int)(png_ptr->row_buf[0]));
-
-   png_memcpy(png_ptr->prev_row, png_ptr->row_buf, png_ptr->rowbytes + 1);
-
-#ifdef PNG_MNG_FEATURES_SUPPORTED
-   if ((png_ptr->mng_features_permitted & PNG_FLAG_MNG_FILTER_64) &&
-       (png_ptr->filter_type == PNG_INTRAPIXEL_DIFFERENCING))
-   {
-      /* Intrapixel differencing */
-      png_do_read_intrapixel(&(png_ptr->row_info), png_ptr->row_buf + 1);
-   }
-#endif
-
-
-   if (png_ptr->transformations || (png_ptr->flags&PNG_FLAG_STRIP_ALPHA))
-      png_do_read_transformations(png_ptr);
-
-#ifdef PNG_READ_INTERLACING_SUPPORTED
-   /* Blow up interlaced rows to full size */
-   if (png_ptr->interlaced &&
-      (png_ptr->transformations & PNG_INTERLACE))
-   {
-      if (png_ptr->pass < 6)
-         /* Old interface (pre-1.0.9):
-          * png_do_read_interlace(&(png_ptr->row_info),
-          *    png_ptr->row_buf + 1, png_ptr->pass, png_ptr->transformations);
-          */
-         png_do_read_interlace(png_ptr);
-
-      if (dsp_row != NULL)
-         png_combine_row(png_ptr, dsp_row, png_pass_dsp_mask[png_ptr->pass]);
-
-      if (row != NULL)
-         png_combine_row(png_ptr, row, png_pass_mask[png_ptr->pass]);
-   }
-
-   else
-#endif
-   {
-      if (row != NULL)
-         png_combine_row(png_ptr, row, 0xff);
-
-      if (dsp_row != NULL)
-         png_combine_row(png_ptr, dsp_row, 0xff);
-   }
-   png_read_finish_row(png_ptr);
-
-   if (png_ptr->read_row_fn != NULL)
-      (*(png_ptr->read_row_fn))(png_ptr, png_ptr->row_number, png_ptr->pass);
-}
-#endif /* PNG_SEQUENTIAL_READ_SUPPORTED */
-
-#ifdef PNG_SEQUENTIAL_READ_SUPPORTED
-/* Read one or more rows of image data.  If the image is interlaced,
- * and png_set_interlace_handling() has been called, the rows need to
- * contain the contents of the rows from the previous pass.  If the
- * image has alpha or transparency, and png_handle_alpha()[*] has been
- * called, the rows contents must be initialized to the contents of the
- * screen.
- *
- * "row" holds the actual image, and pixels are placed in it
- * as they arrive.  If the image is displayed after each pass, it will
- * appear to "sparkle" in.  "display_row" can be used to display a
- * "chunky" progressive image, with finer detail added as it becomes
- * available.  If you do not want this "chunky" display, you may pass
- * NULL for display_row.  If you do not want the sparkle display, and
- * you have not called png_handle_alpha(), you may pass NULL for rows.
- * If you have called png_handle_alpha(), and the image has either an
- * alpha channel or a transparency chunk, you must provide a buffer for
- * rows.  In this case, you do not have to provide a display_row buffer
- * also, but you may.  If the image is not interlaced, or if you have
- * not called png_set_interlace_handling(), the display_row buffer will
- * be ignored, so pass NULL to it.
- *
- * [*] png_handle_alpha() does not exist yet, as of this version of libpng
- */
-
-void PNGAPI
-png_read_rows(png_structp png_ptr, png_bytepp row,
-    png_bytepp display_row, png_uint_32 num_rows)
-{
-   png_uint_32 i;
-   png_bytepp rp;
-   png_bytepp dp;
-
-   png_debug(1, "in png_read_rows");
-
-   if (png_ptr == NULL)
-      return;
-
-   rp = row;
-   dp = display_row;
-   if (rp != NULL && dp != NULL)
-      for (i = 0; i < num_rows; i++)
-      {
-         png_bytep rptr = *rp++;
-         png_bytep dptr = *dp++;
-
-         png_read_row(png_ptr, rptr, dptr);
-      }
-
-   else if (rp != NULL)
-      for (i = 0; i < num_rows; i++)
-      {
-         png_bytep rptr = *rp;
-         png_read_row(png_ptr, rptr, NULL);
-         rp++;
-      }
-
-   else if (dp != NULL)
-      for (i = 0; i < num_rows; i++)
-      {
-         png_bytep dptr = *dp;
-         png_read_row(png_ptr, NULL, dptr);
-         dp++;
-      }
-}
-#endif /* PNG_SEQUENTIAL_READ_SUPPORTED */
-
-#ifdef PNG_SEQUENTIAL_READ_SUPPORTED
-/* Read the entire image.  If the image has an alpha channel or a tRNS
- * chunk, and you have called png_handle_alpha()[*], you will need to
- * initialize the image to the current image that PNG will be overlaying.
- * We set the num_rows again here, in case it was incorrectly set in
- * png_read_start_row() by a call to png_read_update_info() or
- * png_start_read_image() if png_set_interlace_handling() wasn't called
- * prior to either of these functions like it should have been.  You can
- * only call this function once.  If you desire to have an image for
- * each pass of a interlaced image, use png_read_rows() instead.
- *
- * [*] png_handle_alpha() does not exist yet, as of this version of libpng
- */
-void PNGAPI
-png_read_image(png_structp png_ptr, png_bytepp image)
-{
-   png_uint_32 i, image_height;
-   int pass, j;
-   png_bytepp rp;
-
-   png_debug(1, "in png_read_image");
-
-   if (png_ptr == NULL)
-      return;
-
-#ifdef PNG_READ_INTERLACING_SUPPORTED
-   if (!(png_ptr->flags & PNG_FLAG_ROW_INIT))
-   {
-      pass = png_set_interlace_handling(png_ptr);
-      /* And make sure transforms are initialized. */
-      png_start_read_image(png_ptr);
-   }
-   else
-   {
-      if (png_ptr->interlaced && !(png_ptr->transformations & PNG_INTERLACE))
-      {
-         /* Caller called png_start_read_image or png_read_update_info without
-          * first turning on the PNG_INTERLACE transform.  We can fix this here,
-          * but the caller should do it!
-          */
-         png_warning(png_ptr, "Interlace handling should be turned on when "
-            "using png_read_image");
-         /* Make sure this is set correctly */
-         png_ptr->num_rows = png_ptr->height;
-      }
-
-      /* Obtain the pass number, which also turns on the PNG_INTERLACE flag in
-       * the above error case.
-       */
-      pass = png_set_interlace_handling(png_ptr);
-   }
-#else
-   if (png_ptr->interlaced)
-      png_error(png_ptr,
-          "Cannot read interlaced image -- interlace handler disabled");
-
-   pass = 1;
-#endif
-
-   image_height=png_ptr->height;
-
-   for (j = 0; j < pass; j++)
-   {
-      rp = image;
-      for (i = 0; i < image_height; i++)
-      {
-         png_read_row(png_ptr, *rp, NULL);
-         rp++;
-      }
-   }
-}
-#endif /* PNG_SEQUENTIAL_READ_SUPPORTED */
-
-#ifdef PNG_SEQUENTIAL_READ_SUPPORTED
-/* Read the end of the PNG file.  Will not read past the end of the
- * file, will verify the end is accurate, and will read any comments
- * or time information at the end of the file, if info is not NULL.
- */
-void PNGAPI
-png_read_end(png_structp png_ptr, png_infop info_ptr)
-{
-   png_debug(1, "in png_read_end");
-
-   if (png_ptr == NULL)
-      return;
-
-   png_crc_finish(png_ptr, 0); /* Finish off CRC from last IDAT chunk */
-
-   do
-   {
-      PNG_IHDR;
-      PNG_IDAT;
-      PNG_IEND;
-      PNG_PLTE;
-#ifdef PNG_READ_bKGD_SUPPORTED
-      PNG_bKGD;
-#endif
-#ifdef PNG_READ_cHRM_SUPPORTED
-      PNG_cHRM;
-#endif
-#ifdef PNG_READ_gAMA_SUPPORTED
-      PNG_gAMA;
-#endif
-#ifdef PNG_READ_hIST_SUPPORTED
-      PNG_hIST;
-#endif
-#ifdef PNG_READ_iCCP_SUPPORTED
-      PNG_iCCP;
-#endif
-#ifdef PNG_READ_iTXt_SUPPORTED
-      PNG_iTXt;
-#endif
-#ifdef PNG_READ_oFFs_SUPPORTED
-      PNG_oFFs;
-#endif
-#ifdef PNG_READ_pCAL_SUPPORTED
-      PNG_pCAL;
-#endif
-#ifdef PNG_READ_pHYs_SUPPORTED
-      PNG_pHYs;
-#endif
-#ifdef PNG_READ_sBIT_SUPPORTED
-      PNG_sBIT;
-#endif
-#ifdef PNG_READ_sCAL_SUPPORTED
-      PNG_sCAL;
-#endif
-#ifdef PNG_READ_sPLT_SUPPORTED
-      PNG_sPLT;
-#endif
-#ifdef PNG_READ_sRGB_SUPPORTED
-      PNG_sRGB;
-#endif
-#ifdef PNG_READ_tEXt_SUPPORTED
-      PNG_tEXt;
-#endif
-#ifdef PNG_READ_tIME_SUPPORTED
-      PNG_tIME;
-#endif
-#ifdef PNG_READ_tRNS_SUPPORTED
-      PNG_tRNS;
-#endif
-#ifdef PNG_READ_zTXt_SUPPORTED
-      PNG_zTXt;
-#endif
-      png_uint_32 length = png_read_chunk_header(png_ptr);
-      PNG_CONST png_bytep chunk_name = png_ptr->chunk_name;
-
-      if (!png_memcmp(chunk_name, png_IHDR, 4))
-         png_handle_IHDR(png_ptr, info_ptr, length);
-
-      else if (!png_memcmp(chunk_name, png_IEND, 4))
-         png_handle_IEND(png_ptr, info_ptr, length);
-
-#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
-      else if (png_handle_as_unknown(png_ptr, chunk_name))
-      {
-         if (!png_memcmp(chunk_name, png_IDAT, 4))
-         {
-            if ((length > 0) || (png_ptr->mode & PNG_HAVE_CHUNK_AFTER_IDAT))
-               png_benign_error(png_ptr, "Too many IDATs found");
-         }
-         png_handle_unknown(png_ptr, info_ptr, length);
-         if (!png_memcmp(chunk_name, png_PLTE, 4))
-            png_ptr->mode |= PNG_HAVE_PLTE;
-      }
-#endif
-
-      else if (!png_memcmp(chunk_name, png_IDAT, 4))
-      {
-         /* Zero length IDATs are legal after the last IDAT has been
-          * read, but not after other chunks have been read.
-          */
-         if ((length > 0) || (png_ptr->mode & PNG_HAVE_CHUNK_AFTER_IDAT))
-            png_benign_error(png_ptr, "Too many IDATs found");
-
-         png_crc_finish(png_ptr, length);
-      }
-      else if (!png_memcmp(chunk_name, png_PLTE, 4))
-         png_handle_PLTE(png_ptr, info_ptr, length);
-
-#ifdef PNG_READ_bKGD_SUPPORTED
-      else if (!png_memcmp(chunk_name, png_bKGD, 4))
-         png_handle_bKGD(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_cHRM_SUPPORTED
-      else if (!png_memcmp(chunk_name, png_cHRM, 4))
-         png_handle_cHRM(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_gAMA_SUPPORTED
-      else if (!png_memcmp(chunk_name, png_gAMA, 4))
-         png_handle_gAMA(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_hIST_SUPPORTED
-      else if (!png_memcmp(chunk_name, png_hIST, 4))
-         png_handle_hIST(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_oFFs_SUPPORTED
-      else if (!png_memcmp(chunk_name, png_oFFs, 4))
-         png_handle_oFFs(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_pCAL_SUPPORTED
-      else if (!png_memcmp(chunk_name, png_pCAL, 4))
-         png_handle_pCAL(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_sCAL_SUPPORTED
-      else if (!png_memcmp(chunk_name, png_sCAL, 4))
-         png_handle_sCAL(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_pHYs_SUPPORTED
-      else if (!png_memcmp(chunk_name, png_pHYs, 4))
-         png_handle_pHYs(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_sBIT_SUPPORTED
-      else if (!png_memcmp(chunk_name, png_sBIT, 4))
-         png_handle_sBIT(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_sRGB_SUPPORTED
-      else if (!png_memcmp(chunk_name, png_sRGB, 4))
-         png_handle_sRGB(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_iCCP_SUPPORTED
-      else if (!png_memcmp(chunk_name, png_iCCP, 4))
-         png_handle_iCCP(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_sPLT_SUPPORTED
-      else if (!png_memcmp(chunk_name, png_sPLT, 4))
-         png_handle_sPLT(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_tEXt_SUPPORTED
-      else if (!png_memcmp(chunk_name, png_tEXt, 4))
-         png_handle_tEXt(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_tIME_SUPPORTED
-      else if (!png_memcmp(chunk_name, png_tIME, 4))
-         png_handle_tIME(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_tRNS_SUPPORTED
-      else if (!png_memcmp(chunk_name, png_tRNS, 4))
-         png_handle_tRNS(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_zTXt_SUPPORTED
-      else if (!png_memcmp(chunk_name, png_zTXt, 4))
-         png_handle_zTXt(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_iTXt_SUPPORTED
-      else if (!png_memcmp(chunk_name, png_iTXt, 4))
-         png_handle_iTXt(png_ptr, info_ptr, length);
-#endif
-
-      else
-         png_handle_unknown(png_ptr, info_ptr, length);
-   } while (!(png_ptr->mode & PNG_HAVE_IEND));
-}
-#endif /* PNG_SEQUENTIAL_READ_SUPPORTED */
-
-/* Free all memory used by the read */
-void PNGAPI
-png_destroy_read_struct(png_structpp png_ptr_ptr, png_infopp info_ptr_ptr,
-    png_infopp end_info_ptr_ptr)
-{
-   png_structp png_ptr = NULL;
-   png_infop info_ptr = NULL, end_info_ptr = NULL;
-#ifdef PNG_USER_MEM_SUPPORTED
-   png_free_ptr free_fn = NULL;
-   png_voidp mem_ptr = NULL;
-#endif
-
-   png_debug(1, "in png_destroy_read_struct");
-
-   if (png_ptr_ptr != NULL)
-      png_ptr = *png_ptr_ptr;
-   if (png_ptr == NULL)
-      return;
-
-#ifdef PNG_USER_MEM_SUPPORTED
-   free_fn = png_ptr->free_fn;
-   mem_ptr = png_ptr->mem_ptr;
-#endif
-
-   if (info_ptr_ptr != NULL)
-      info_ptr = *info_ptr_ptr;
-
-   if (end_info_ptr_ptr != NULL)
-      end_info_ptr = *end_info_ptr_ptr;
-
-   png_read_destroy(png_ptr, info_ptr, end_info_ptr);
-
-   if (info_ptr != NULL)
-   {
-#ifdef PNG_TEXT_SUPPORTED
-      png_free_data(png_ptr, info_ptr, PNG_FREE_TEXT, -1);
-#endif
-
-#ifdef PNG_USER_MEM_SUPPORTED
-      png_destroy_struct_2((png_voidp)info_ptr, (png_free_ptr)free_fn,
-          (png_voidp)mem_ptr);
-#else
-      png_destroy_struct((png_voidp)info_ptr);
-#endif
-      *info_ptr_ptr = NULL;
-   }
-
-   if (end_info_ptr != NULL)
-   {
-#ifdef PNG_READ_TEXT_SUPPORTED
-      png_free_data(png_ptr, end_info_ptr, PNG_FREE_TEXT, -1);
-#endif
-#ifdef PNG_USER_MEM_SUPPORTED
-      png_destroy_struct_2((png_voidp)end_info_ptr, (png_free_ptr)free_fn,
-          (png_voidp)mem_ptr);
-#else
-      png_destroy_struct((png_voidp)end_info_ptr);
-#endif
-      *end_info_ptr_ptr = NULL;
-   }
-
-   if (png_ptr != NULL)
-   {
-#ifdef PNG_USER_MEM_SUPPORTED
-      png_destroy_struct_2((png_voidp)png_ptr, (png_free_ptr)free_fn,
-          (png_voidp)mem_ptr);
-#else
-      png_destroy_struct((png_voidp)png_ptr);
-#endif
-      *png_ptr_ptr = NULL;
-   }
-}
-
-/* Free all memory used by the read (old method) */
-void /* PRIVATE */
-png_read_destroy(png_structp png_ptr, png_infop info_ptr,
-    png_infop end_info_ptr)
-{
-#ifdef PNG_SETJMP_SUPPORTED
-   jmp_buf tmp_jmp;
-#endif
-   png_error_ptr error_fn;
-   png_error_ptr warning_fn;
-   png_voidp error_ptr;
-#ifdef PNG_USER_MEM_SUPPORTED
-   png_free_ptr free_fn;
-#endif
-
-   png_debug(1, "in png_read_destroy");
-
-   if (info_ptr != NULL)
-      png_info_destroy(png_ptr, info_ptr);
-
-   if (end_info_ptr != NULL)
-      png_info_destroy(png_ptr, end_info_ptr);
-
-   png_free(png_ptr, png_ptr->zbuf);
-   png_free(png_ptr, png_ptr->big_row_buf);
-   png_free(png_ptr, png_ptr->prev_row);
-   png_free(png_ptr, png_ptr->chunkdata);
-
-#ifdef PNG_READ_QUANTIZE_SUPPORTED
-   png_free(png_ptr, png_ptr->palette_lookup);
-   png_free(png_ptr, png_ptr->quantize_index);
-#endif
-
-#ifdef PNG_READ_GAMMA_SUPPORTED
-   png_free(png_ptr, png_ptr->gamma_table);
-#endif
-
-#ifdef PNG_READ_BACKGROUND_SUPPORTED
-   png_free(png_ptr, png_ptr->gamma_from_1);
-   png_free(png_ptr, png_ptr->gamma_to_1);
-#endif
-
-   if (png_ptr->free_me & PNG_FREE_PLTE)
-      png_zfree(png_ptr, png_ptr->palette);
-   png_ptr->free_me &= ~PNG_FREE_PLTE;
-
-#if defined(PNG_tRNS_SUPPORTED) || \
-    defined(PNG_READ_EXPAND_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED)
-   if (png_ptr->free_me & PNG_FREE_TRNS)
-      png_free(png_ptr, png_ptr->trans_alpha);
-   png_ptr->free_me &= ~PNG_FREE_TRNS;
-#endif
-
-#ifdef PNG_READ_hIST_SUPPORTED
-   if (png_ptr->free_me & PNG_FREE_HIST)
-      png_free(png_ptr, png_ptr->hist);
-   png_ptr->free_me &= ~PNG_FREE_HIST;
-#endif
-
-#ifdef PNG_READ_GAMMA_SUPPORTED
-   if (png_ptr->gamma_16_table != NULL)
-   {
-      int i;
-      int istop = (1 << (8 - png_ptr->gamma_shift));
-      for (i = 0; i < istop; i++)
-      {
-         png_free(png_ptr, png_ptr->gamma_16_table[i]);
-      }
-   png_free(png_ptr, png_ptr->gamma_16_table);
-   }
-
-#ifdef PNG_READ_BACKGROUND_SUPPORTED
-   if (png_ptr->gamma_16_from_1 != NULL)
-   {
-      int i;
-      int istop = (1 << (8 - png_ptr->gamma_shift));
-      for (i = 0; i < istop; i++)
-      {
-         png_free(png_ptr, png_ptr->gamma_16_from_1[i]);
-      }
-   png_free(png_ptr, png_ptr->gamma_16_from_1);
-   }
-   if (png_ptr->gamma_16_to_1 != NULL)
-   {
-      int i;
-      int istop = (1 << (8 - png_ptr->gamma_shift));
-      for (i = 0; i < istop; i++)
-      {
-         png_free(png_ptr, png_ptr->gamma_16_to_1[i]);
-      }
-   png_free(png_ptr, png_ptr->gamma_16_to_1);
-   }
-#endif
-#endif
-
-#ifdef PNG_TIME_RFC1123_SUPPORTED
-   png_free(png_ptr, png_ptr->time_buffer);
-#endif
-
-   inflateEnd(&png_ptr->zstream);
-
-#ifdef PNG_PROGRESSIVE_READ_SUPPORTED
-   png_free(png_ptr, png_ptr->save_buffer);
-#endif
-
-#ifdef PNG_PROGRESSIVE_READ_SUPPORTED
-#ifdef PNG_TEXT_SUPPORTED
-   png_free(png_ptr, png_ptr->current_text);
-#endif /* PNG_TEXT_SUPPORTED */
-#endif /* PNG_PROGRESSIVE_READ_SUPPORTED */
-
-   /* Save the important info out of the png_struct, in case it is
-    * being used again.
-    */
-#ifdef PNG_SETJMP_SUPPORTED
-   png_memcpy(tmp_jmp, png_ptr->png_jmpbuf, png_sizeof(jmp_buf));
-#endif
-
-   error_fn = png_ptr->error_fn;
-   warning_fn = png_ptr->warning_fn;
-   error_ptr = png_ptr->error_ptr;
-#ifdef PNG_USER_MEM_SUPPORTED
-   free_fn = png_ptr->free_fn;
-#endif
-
-   png_memset(png_ptr, 0, png_sizeof(png_struct));
-
-   png_ptr->error_fn = error_fn;
-   png_ptr->warning_fn = warning_fn;
-   png_ptr->error_ptr = error_ptr;
-#ifdef PNG_USER_MEM_SUPPORTED
-   png_ptr->free_fn = free_fn;
-#endif
-
-#ifdef PNG_SETJMP_SUPPORTED
-   png_memcpy(png_ptr->png_jmpbuf, tmp_jmp, png_sizeof(jmp_buf));
-#endif
-
-}
-
-void PNGAPI
-png_set_read_status_fn(png_structp png_ptr, png_read_status_ptr read_row_fn)
-{
-   if (png_ptr == NULL)
-      return;
-
-   png_ptr->read_row_fn = read_row_fn;
-}
-
-
-#ifdef PNG_SEQUENTIAL_READ_SUPPORTED
-#ifdef PNG_INFO_IMAGE_SUPPORTED
-void PNGAPI
-png_read_png(png_structp png_ptr, png_infop info_ptr,
-                           int transforms,
-                           voidp params)
-{
-   int row;
-
-   if (png_ptr == NULL)
-      return;
-
-   /* png_read_info() gives us all of the information from the
-    * PNG file before the first IDAT (image data chunk).
-    */
-   png_read_info(png_ptr, info_ptr);
-   if (info_ptr->height > PNG_UINT_32_MAX/png_sizeof(png_bytep))
-      png_error(png_ptr, "Image is too high to process with png_read_png()");
-
-   /* -------------- image transformations start here ------------------- */
-
-#ifdef PNG_READ_16_TO_8_SUPPORTED
-   /* Tell libpng to strip 16 bit/color files down to 8 bits per color.
-    */
-   if (transforms & PNG_TRANSFORM_STRIP_16)
-      png_set_strip_16(png_ptr);
-#endif
-
-#ifdef PNG_READ_STRIP_ALPHA_SUPPORTED
-   /* Strip alpha bytes from the input data without combining with
-    * the background (not recommended).
-    */
-   if (transforms & PNG_TRANSFORM_STRIP_ALPHA)
-      png_set_strip_alpha(png_ptr);
-#endif
-
-#if defined(PNG_READ_PACK_SUPPORTED) && !defined(PNG_READ_EXPAND_SUPPORTED)
-   /* Extract multiple pixels with bit depths of 1, 2, or 4 from a single
-    * byte into separate bytes (useful for paletted and grayscale images).
-    */
-   if (transforms & PNG_TRANSFORM_PACKING)
-      png_set_packing(png_ptr);
-#endif
-
-#ifdef PNG_READ_PACKSWAP_SUPPORTED
-   /* Change the order of packed pixels to least significant bit first
-    * (not useful if you are using png_set_packing).
-    */
-   if (transforms & PNG_TRANSFORM_PACKSWAP)
-      png_set_packswap(png_ptr);
-#endif
-
-#ifdef PNG_READ_EXPAND_SUPPORTED
-   /* Expand paletted colors into true RGB triplets
-    * Expand grayscale images to full 8 bits from 1, 2, or 4 bits/pixel
-    * Expand paletted or RGB images with transparency to full alpha
-    * channels so the data will be available as RGBA quartets.
-    */
-   if (transforms & PNG_TRANSFORM_EXPAND)
-      if ((png_ptr->bit_depth < 8) ||
-          (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE) ||
-          (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)))
-         png_set_expand(png_ptr);
-#endif
-
-   /* We don't handle background color or gamma transformation or quantizing.
-    */
-
-#ifdef PNG_READ_INVERT_SUPPORTED
-   /* Invert monochrome files to have 0 as white and 1 as black
-    */
-   if (transforms & PNG_TRANSFORM_INVERT_MONO)
-      png_set_invert_mono(png_ptr);
-#endif
-
-#ifdef PNG_READ_SHIFT_SUPPORTED
-   /* If you want to shift the pixel values from the range [0,255] or
-    * [0,65535] to the original [0,7] or [0,31], or whatever range the
-    * colors were originally in:
-    */
-   if ((transforms & PNG_TRANSFORM_SHIFT)
-       && png_get_valid(png_ptr, info_ptr, PNG_INFO_sBIT))
-   {
-      png_color_8p sig_bit;
-
-      png_get_sBIT(png_ptr, info_ptr, &sig_bit);
-      png_set_shift(png_ptr, sig_bit);
-   }
-#endif
-
-#ifdef PNG_READ_BGR_SUPPORTED
-   /* Flip the RGB pixels to BGR (or RGBA to BGRA) */
-   if (transforms & PNG_TRANSFORM_BGR)
-      png_set_bgr(png_ptr);
-#endif
-
-#ifdef PNG_READ_SWAP_ALPHA_SUPPORTED
-   /* Swap the RGBA or GA data to ARGB or AG (or BGRA to ABGR) */
-   if (transforms & PNG_TRANSFORM_SWAP_ALPHA)
-      png_set_swap_alpha(png_ptr);
-#endif
-
-#ifdef PNG_READ_SWAP_SUPPORTED
-   /* Swap bytes of 16 bit files to least significant byte first */
-   if (transforms & PNG_TRANSFORM_SWAP_ENDIAN)
-      png_set_swap(png_ptr);
-#endif
-
-/* Added at libpng-1.2.41 */
-#ifdef PNG_READ_INVERT_ALPHA_SUPPORTED
-   /* Invert the alpha channel from opacity to transparency */
-   if (transforms & PNG_TRANSFORM_INVERT_ALPHA)
-      png_set_invert_alpha(png_ptr);
-#endif
-
-/* Added at libpng-1.2.41 */
-#ifdef PNG_READ_GRAY_TO_RGB_SUPPORTED
-   /* Expand grayscale image to RGB */
-   if (transforms & PNG_TRANSFORM_GRAY_TO_RGB)
-      png_set_gray_to_rgb(png_ptr);
-#endif
-
-   /* We don't handle adding filler bytes */
-
-   /* Optional call to gamma correct and add the background to the palette
-    * and update info structure.  REQUIRED if you are expecting libpng to
-    * update the palette for you (i.e., you selected such a transform above).
-    */
-   png_read_update_info(png_ptr, info_ptr);
-
-   /* -------------- image transformations end here ------------------- */
-
-   png_free_data(png_ptr, info_ptr, PNG_FREE_ROWS, 0);
-   if (info_ptr->row_pointers == NULL)
-   {
-      png_uint_32 iptr;
-
-      info_ptr->row_pointers = (png_bytepp)png_malloc(png_ptr,
-          info_ptr->height * png_sizeof(png_bytep));
-      for (iptr=0; iptr<info_ptr->height; iptr++)
-         info_ptr->row_pointers[iptr] = NULL;
-
-      info_ptr->free_me |= PNG_FREE_ROWS;
-
-      for (row = 0; row < (int)info_ptr->height; row++)
-         info_ptr->row_pointers[row] = (png_bytep)png_malloc(png_ptr,
-            png_get_rowbytes(png_ptr, info_ptr));
-   }
-
-   png_read_image(png_ptr, info_ptr->row_pointers);
-   info_ptr->valid |= PNG_INFO_IDAT;
-
-   /* Read rest of file, and get additional chunks in info_ptr - REQUIRED */
-   png_read_end(png_ptr, info_ptr);
-
-   PNG_UNUSED(transforms)   /* Quiet compiler warnings */
-   PNG_UNUSED(params)
-
-}
-#endif /* PNG_INFO_IMAGE_SUPPORTED */
-#endif /* PNG_SEQUENTIAL_READ_SUPPORTED */
-#endif /* PNG_READ_SUPPORTED */
+
+/* pngread.c - read a PNG file
+ *
+ * Last changed in libpng 1.2.48 [March 8, 2012]
+ * Copyright (c) 1998-2012 Glenn Randers-Pehrson
+ * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
+ * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
+ *
+ * This code is released under the libpng license.
+ * For conditions of distribution and use, see the disclaimer
+ * and license in png.h
+ *
+ * This file contains routines that an application calls directly to
+ * read a PNG file or stream.
+ */
+
+#define PNG_INTERNAL
+#define PNG_NO_PEDANTIC_WARNINGS
+#include "png.h"
+#ifdef PNG_READ_SUPPORTED
+
+/* Create a PNG structure for reading, and allocate any memory needed. */
+png_structp PNGAPI
+png_create_read_struct(png_const_charp user_png_ver, png_voidp error_ptr,
+   png_error_ptr error_fn, png_error_ptr warn_fn)
+{
+
+#ifdef PNG_USER_MEM_SUPPORTED
+   return (png_create_read_struct_2(user_png_ver, error_ptr, error_fn,
+      warn_fn, png_voidp_NULL, png_malloc_ptr_NULL, png_free_ptr_NULL));
+}
+
+/* Alternate create PNG structure for reading, and allocate any memory
+ * needed.
+ */
+png_structp PNGAPI
+png_create_read_struct_2(png_const_charp user_png_ver, png_voidp error_ptr,
+   png_error_ptr error_fn, png_error_ptr warn_fn, png_voidp mem_ptr,
+   png_malloc_ptr malloc_fn, png_free_ptr free_fn)
+{
+#endif /* PNG_USER_MEM_SUPPORTED */
+
+#ifdef PNG_SETJMP_SUPPORTED
+   volatile
+#endif
+   png_structp png_ptr;
+
+#ifdef PNG_SETJMP_SUPPORTED
+#ifdef USE_FAR_KEYWORD
+   jmp_buf jmpbuf;
+#endif
+#endif
+
+   int i;
+
+   png_debug(1, "in png_create_read_struct");
+
+#ifdef PNG_USER_MEM_SUPPORTED
+   png_ptr = (png_structp)png_create_struct_2(PNG_STRUCT_PNG,
+      (png_malloc_ptr)malloc_fn, (png_voidp)mem_ptr);
+#else
+   png_ptr = (png_structp)png_create_struct(PNG_STRUCT_PNG);
+#endif
+   if (png_ptr == NULL)
+      return (NULL);
+
+   /* Added at libpng-1.2.6 */
+#ifdef PNG_USER_LIMITS_SUPPORTED
+   png_ptr->user_width_max = PNG_USER_WIDTH_MAX;
+   png_ptr->user_height_max = PNG_USER_HEIGHT_MAX;
+   /* Added at libpng-1.2.43 and 1.4.0 */
+   png_ptr->user_chunk_cache_max = PNG_USER_CHUNK_CACHE_MAX;
+#endif
+
+#ifdef PNG_SETJMP_SUPPORTED
+#ifdef USE_FAR_KEYWORD
+   if (setjmp(jmpbuf))
+#else
+   if (setjmp(png_ptr->jmpbuf))
+#endif
+   {
+      png_free(png_ptr, png_ptr->zbuf);
+      png_ptr->zbuf = NULL;
+#ifdef PNG_USER_MEM_SUPPORTED
+      png_destroy_struct_2((png_voidp)png_ptr,
+         (png_free_ptr)free_fn, (png_voidp)mem_ptr);
+#else
+      png_destroy_struct((png_voidp)png_ptr);
+#endif
+      return (NULL);
+   }
+#ifdef USE_FAR_KEYWORD
+   png_memcpy(png_ptr->jmpbuf, jmpbuf, png_sizeof(jmp_buf));
+#endif
+#endif /* PNG_SETJMP_SUPPORTED */
+
+#ifdef PNG_USER_MEM_SUPPORTED
+   png_set_mem_fn(png_ptr, mem_ptr, malloc_fn, free_fn);
+#endif
+
+   png_set_error_fn(png_ptr, error_ptr, error_fn, warn_fn);
+
+   if (user_png_ver)
+   {
+      i = 0;
+      do
+      {
+         if (user_png_ver[i] != png_libpng_ver[i])
+            png_ptr->flags |= PNG_FLAG_LIBRARY_MISMATCH;
+      } while (png_libpng_ver[i++]);
+    }
+    else
+         png_ptr->flags |= PNG_FLAG_LIBRARY_MISMATCH;
+
+
+    if (png_ptr->flags & PNG_FLAG_LIBRARY_MISMATCH)
+    {
+       /* Libpng 0.90 and later are binary incompatible with libpng 0.89, so
+       * we must recompile any applications that use any older library version.
+       * For versions after libpng 1.0, we will be compatible, so we need
+       * only check the first digit.
+       */
+      if (user_png_ver == NULL || user_png_ver[0] != png_libpng_ver[0] ||
+          (user_png_ver[0] == '1' && user_png_ver[2] != png_libpng_ver[2]) ||
+          (user_png_ver[0] == '0' && user_png_ver[2] < '9'))
+      {
+#if defined(PNG_STDIO_SUPPORTED) && !defined(_WIN32_WCE)
+         char msg[80];
+         if (user_png_ver)
+         {
+           png_snprintf(msg, 80,
+              "Application was compiled with png.h from libpng-%.20s",
+              user_png_ver);
+           png_warning(png_ptr, msg);
+         }
+         png_snprintf(msg, 80,
+             "Application  is  running with png.c from libpng-%.20s",
+             png_libpng_ver);
+         png_warning(png_ptr, msg);
+#endif
+#ifdef PNG_ERROR_NUMBERS_SUPPORTED
+         png_ptr->flags = 0;
+#endif
+         png_error(png_ptr,
+            "Incompatible libpng version in application and library");
+      }
+   }
+
+   /* Initialize zbuf - compression buffer */
+   png_ptr->zbuf_size = PNG_ZBUF_SIZE;
+   png_ptr->zbuf = (png_bytep)png_malloc(png_ptr,
+     (png_uint_32)png_ptr->zbuf_size);
+   png_ptr->zstream.zalloc = png_zalloc;
+   png_ptr->zstream.zfree = png_zfree;
+   png_ptr->zstream.opaque = (voidpf)png_ptr;
+
+      switch (inflateInit(&png_ptr->zstream))
+      {
+         case Z_OK: /* Do nothing */ break;
+         case Z_MEM_ERROR:
+         case Z_STREAM_ERROR: png_error(png_ptr, "zlib memory error");
+            break;
+         case Z_VERSION_ERROR: png_error(png_ptr, "zlib version error");
+            break;
+         default: png_error(png_ptr, "Unknown zlib error");
+      }
+
+
+   png_ptr->zstream.next_out = png_ptr->zbuf;
+   png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;
+
+   png_set_read_fn(png_ptr, png_voidp_NULL, png_rw_ptr_NULL);
+
+#ifdef PNG_SETJMP_SUPPORTED
+/* Applications that neglect to set up their own setjmp() and then
+   encounter a png_error() will longjmp here.  Since the jmpbuf is
+   then meaningless we abort instead of returning. */
+#ifdef USE_FAR_KEYWORD
+   if (setjmp(jmpbuf))
+       PNG_ABORT();
+   png_memcpy(png_ptr->jmpbuf, jmpbuf, png_sizeof(jmp_buf));
+#else
+   if (setjmp(png_ptr->jmpbuf))
+       PNG_ABORT();
+#endif
+#endif /* PNG_SETJMP_SUPPORTED */
+
+   return (png_ptr);
+}
+
+#if defined(PNG_1_0_X) || defined(PNG_1_2_X)
+/* Initialize PNG structure for reading, and allocate any memory needed.
+ * This interface is deprecated in favour of the png_create_read_struct(),
+ * and it will disappear as of libpng-1.3.0.
+ */
+#undef png_read_init
+void PNGAPI
+png_read_init(png_structp png_ptr)
+{
+   /* We only come here via pre-1.0.7-compiled applications */
+   png_read_init_2(png_ptr, "1.0.6 or earlier", 0, 0);
+}
+
+void PNGAPI
+png_read_init_2(png_structp png_ptr, png_const_charp user_png_ver,
+   png_size_t png_struct_size, png_size_t png_info_size)
+{
+   /* We only come here via pre-1.0.12-compiled applications */
+   if (png_ptr == NULL)
+      return;
+#if defined(PNG_STDIO_SUPPORTED) && !defined(_WIN32_WCE)
+   if (png_sizeof(png_struct) > png_struct_size ||
+      png_sizeof(png_info) > png_info_size)
+   {
+      char msg[80];
+      png_ptr->warning_fn = NULL;
+      if (user_png_ver)
+      {
+        png_snprintf(msg, 80,
+           "Application was compiled with png.h from libpng-%.20s",
+           user_png_ver);
+        png_warning(png_ptr, msg);
+      }
+      png_snprintf(msg, 80,
+         "Application  is  running with png.c from libpng-%.20s",
+         png_libpng_ver);
+      png_warning(png_ptr, msg);
+   }
+#endif
+   if (png_sizeof(png_struct) > png_struct_size)
+   {
+      png_ptr->error_fn = NULL;
+#ifdef PNG_ERROR_NUMBERS_SUPPORTED
+      png_ptr->flags = 0;
+#endif
+      png_error(png_ptr,
+      "The png struct allocated by the application for reading is"
+      " too small.");
+   }
+   if (png_sizeof(png_info) > png_info_size)
+   {
+      png_ptr->error_fn = NULL;
+#ifdef PNG_ERROR_NUMBERS_SUPPORTED
+      png_ptr->flags = 0;
+#endif
+      png_error(png_ptr,
+        "The info struct allocated by application for reading is"
+        " too small.");
+   }
+   png_read_init_3(&png_ptr, user_png_ver, png_struct_size);
+}
+#endif /* PNG_1_0_X || PNG_1_2_X */
+
+void PNGAPI
+png_read_init_3(png_structpp ptr_ptr, png_const_charp user_png_ver,
+   png_size_t png_struct_size)
+{
+#ifdef PNG_SETJMP_SUPPORTED
+   jmp_buf tmp_jmp;  /* to save current jump buffer */
+#endif
+
+   int i = 0;
+
+   png_structp png_ptr=*ptr_ptr;
+
+   if (png_ptr == NULL)
+      return;
+
+   do
+   {
+      if (user_png_ver[i] != png_libpng_ver[i])
+      {
+#ifdef PNG_LEGACY_SUPPORTED
+        png_ptr->flags |= PNG_FLAG_LIBRARY_MISMATCH;
+#else
+        png_ptr->warning_fn = NULL;
+        png_warning(png_ptr,
+         "Application uses deprecated png_read_init() and should be"
+         " recompiled.");
+        break;
+#endif
+      }
+   } while (png_libpng_ver[i++]);
+
+   png_debug(1, "in png_read_init_3");
+
+#ifdef PNG_SETJMP_SUPPORTED
+   /* Save jump buffer and error functions */
+   png_memcpy(tmp_jmp, png_ptr->jmpbuf, png_sizeof(jmp_buf));
+#endif
+
+   if (png_sizeof(png_struct) > png_struct_size)
+   {
+      png_destroy_struct(png_ptr);
+      *ptr_ptr = (png_structp)png_create_struct(PNG_STRUCT_PNG);
+      png_ptr = *ptr_ptr;
+   }
+
+   /* Reset all variables to 0 */
+   png_memset(png_ptr, 0, png_sizeof(png_struct));
+
+#ifdef PNG_SETJMP_SUPPORTED
+   /* Restore jump buffer */
+   png_memcpy(png_ptr->jmpbuf, tmp_jmp, png_sizeof(jmp_buf));
+#endif
+
+   /* Added at libpng-1.2.6 */
+#ifdef PNG_SET_USER_LIMITS_SUPPORTED
+   png_ptr->user_width_max = PNG_USER_WIDTH_MAX;
+   png_ptr->user_height_max = PNG_USER_HEIGHT_MAX;
+#endif
+
+   /* Initialize zbuf - compression buffer */
+   png_ptr->zbuf_size = PNG_ZBUF_SIZE;
+   png_ptr->zstream.zalloc = png_zalloc;
+   png_ptr->zbuf = (png_bytep)png_malloc(png_ptr,
+     (png_uint_32)png_ptr->zbuf_size);
+   png_ptr->zstream.zalloc = png_zalloc;
+   png_ptr->zstream.zfree = png_zfree;
+   png_ptr->zstream.opaque = (voidpf)png_ptr;
+
+   switch (inflateInit(&png_ptr->zstream))
+   {
+      case Z_OK: /* Do nothing */ break;
+      case Z_STREAM_ERROR: png_error(png_ptr, "zlib memory error"); break;
+      case Z_VERSION_ERROR: png_error(png_ptr, "zlib version error");
+          break;
+      default: png_error(png_ptr, "Unknown zlib error");
+   }
+
+   png_ptr->zstream.next_out = png_ptr->zbuf;
+   png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;
+
+   png_set_read_fn(png_ptr, png_voidp_NULL, png_rw_ptr_NULL);
+}
+
+#ifdef PNG_SEQUENTIAL_READ_SUPPORTED
+/* Read the information before the actual image data.  This has been
+ * changed in v0.90 to allow reading a file that already has the magic
+ * bytes read from the stream.  You can tell libpng how many bytes have
+ * been read from the beginning of the stream (up to the maximum of 8)
+ * via png_set_sig_bytes(), and we will only check the remaining bytes
+ * here.  The application can then have access to the signature bytes we
+ * read if it is determined that this isn't a valid PNG file.
+ */
+void PNGAPI
+png_read_info(png_structp png_ptr, png_infop info_ptr)
+{
+   png_debug(1, "in png_read_info");
+ 
+   if (png_ptr == NULL || info_ptr == NULL)
+      return;
+ 
+   /* If we haven't checked all of the PNG signature bytes, do so now. */
+   if (png_ptr->sig_bytes < 8)
+   {
+      png_size_t num_checked = png_ptr->sig_bytes,
+                 num_to_check = 8 - num_checked;
+
+      png_read_data(png_ptr, &(info_ptr->signature[num_checked]), num_to_check);
+      png_ptr->sig_bytes = 8;
+
+      if (png_sig_cmp(info_ptr->signature, num_checked, num_to_check))
+      {
+         if (num_checked < 4 &&
+             png_sig_cmp(info_ptr->signature, num_checked, num_to_check - 4))
+            png_error(png_ptr, "Not a PNG file");
+         else
+            png_error(png_ptr, "PNG file corrupted by ASCII conversion");
+      }
+      if (num_checked < 3)
+         png_ptr->mode |= PNG_HAVE_PNG_SIGNATURE;
+   }
+
+   for (;;)
+   {
+#ifdef PNG_USE_LOCAL_ARRAYS
+      PNG_CONST PNG_IHDR;
+      PNG_CONST PNG_IDAT;
+      PNG_CONST PNG_IEND;
+      PNG_CONST PNG_PLTE;
+#ifdef PNG_READ_bKGD_SUPPORTED
+      PNG_CONST PNG_bKGD;
+#endif
+#ifdef PNG_READ_cHRM_SUPPORTED
+      PNG_CONST PNG_cHRM;
+#endif
+#ifdef PNG_READ_gAMA_SUPPORTED
+      PNG_CONST PNG_gAMA;
+#endif
+#ifdef PNG_READ_hIST_SUPPORTED
+      PNG_CONST PNG_hIST;
+#endif
+#ifdef PNG_READ_iCCP_SUPPORTED
+      PNG_CONST PNG_iCCP;
+#endif
+#ifdef PNG_READ_iTXt_SUPPORTED
+      PNG_CONST PNG_iTXt;
+#endif
+#ifdef PNG_READ_oFFs_SUPPORTED
+      PNG_CONST PNG_oFFs;
+#endif
+#ifdef PNG_READ_pCAL_SUPPORTED
+      PNG_CONST PNG_pCAL;
+#endif
+#ifdef PNG_READ_pHYs_SUPPORTED
+      PNG_CONST PNG_pHYs;
+#endif
+#ifdef PNG_READ_sBIT_SUPPORTED
+      PNG_CONST PNG_sBIT;
+#endif
+#ifdef PNG_READ_sCAL_SUPPORTED
+      PNG_CONST PNG_sCAL;
+#endif
+#ifdef PNG_READ_sPLT_SUPPORTED
+      PNG_CONST PNG_sPLT;
+#endif
+#ifdef PNG_READ_sRGB_SUPPORTED
+      PNG_CONST PNG_sRGB;
+#endif
+#ifdef PNG_READ_tEXt_SUPPORTED
+      PNG_CONST PNG_tEXt;
+#endif
+#ifdef PNG_READ_tIME_SUPPORTED
+      PNG_CONST PNG_tIME;
+#endif
+#ifdef PNG_READ_tRNS_SUPPORTED
+      PNG_CONST PNG_tRNS;
+#endif
+#ifdef PNG_READ_zTXt_SUPPORTED
+      PNG_CONST PNG_zTXt;
+#endif
+#endif /* PNG_USE_LOCAL_ARRAYS */
+      png_uint_32 length = png_read_chunk_header(png_ptr);
+      PNG_CONST png_bytep chunk_name = png_ptr->chunk_name;
+
+      /* This should be a binary subdivision search or a hash for
+       * matching the chunk name rather than a linear search.
+       */
+      if (!png_memcmp(chunk_name, png_IDAT, 4))
+        if (png_ptr->mode & PNG_AFTER_IDAT)
+          png_ptr->mode |= PNG_HAVE_CHUNK_AFTER_IDAT;
+
+      if (!png_memcmp(chunk_name, png_IHDR, 4))
+         png_handle_IHDR(png_ptr, info_ptr, length);
+      else if (!png_memcmp(chunk_name, png_IEND, 4))
+         png_handle_IEND(png_ptr, info_ptr, length);
+#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
+      else if (png_handle_as_unknown(png_ptr, chunk_name))
+      {
+         if (!png_memcmp(chunk_name, png_IDAT, 4))
+            png_ptr->mode |= PNG_HAVE_IDAT;
+         png_handle_unknown(png_ptr, info_ptr, length);
+         if (!png_memcmp(chunk_name, png_PLTE, 4))
+            png_ptr->mode |= PNG_HAVE_PLTE;
+         else if (!png_memcmp(chunk_name, png_IDAT, 4))
+         {
+            if (!(png_ptr->mode & PNG_HAVE_IHDR))
+               png_error(png_ptr, "Missing IHDR before IDAT");
+            else if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE &&
+                     !(png_ptr->mode & PNG_HAVE_PLTE))
+               png_error(png_ptr, "Missing PLTE before IDAT");
+            break;
+         }
+      }
+#endif
+      else if (!png_memcmp(chunk_name, png_PLTE, 4))
+         png_handle_PLTE(png_ptr, info_ptr, length);
+      else if (!png_memcmp(chunk_name, png_IDAT, 4))
+      {
+         if (!(png_ptr->mode & PNG_HAVE_IHDR))
+            png_error(png_ptr, "Missing IHDR before IDAT");
+         else if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE &&
+                  !(png_ptr->mode & PNG_HAVE_PLTE))
+            png_error(png_ptr, "Missing PLTE before IDAT");
+
+         png_ptr->idat_size = length;
+         png_ptr->mode |= PNG_HAVE_IDAT;
+         break;
+      }
+#ifdef PNG_READ_bKGD_SUPPORTED
+      else if (!png_memcmp(chunk_name, png_bKGD, 4))
+         png_handle_bKGD(png_ptr, info_ptr, length);
+#endif
+#ifdef PNG_READ_cHRM_SUPPORTED
+      else if (!png_memcmp(chunk_name, png_cHRM, 4))
+         png_handle_cHRM(png_ptr, info_ptr, length);
+#endif
+#ifdef PNG_READ_gAMA_SUPPORTED
+      else if (!png_memcmp(chunk_name, png_gAMA, 4))
+         png_handle_gAMA(png_ptr, info_ptr, length);
+#endif
+#ifdef PNG_READ_hIST_SUPPORTED
+      else if (!png_memcmp(chunk_name, png_hIST, 4))
+         png_handle_hIST(png_ptr, info_ptr, length);
+#endif
+#ifdef PNG_READ_oFFs_SUPPORTED
+      else if (!png_memcmp(chunk_name, png_oFFs, 4))
+         png_handle_oFFs(png_ptr, info_ptr, length);
+#endif
+#ifdef PNG_READ_pCAL_SUPPORTED
+      else if (!png_memcmp(chunk_name, png_pCAL, 4))
+         png_handle_pCAL(png_ptr, info_ptr, length);
+#endif
+#ifdef PNG_READ_sCAL_SUPPORTED
+      else if (!png_memcmp(chunk_name, png_sCAL, 4))
+         png_handle_sCAL(png_ptr, info_ptr, length);
+#endif
+#ifdef PNG_READ_pHYs_SUPPORTED
+      else if (!png_memcmp(chunk_name, png_pHYs, 4))
+         png_handle_pHYs(png_ptr, info_ptr, length);
+#endif
+#ifdef PNG_READ_sBIT_SUPPORTED
+      else if (!png_memcmp(chunk_name, png_sBIT, 4))
+         png_handle_sBIT(png_ptr, info_ptr, length);
+#endif
+#ifdef PNG_READ_sRGB_SUPPORTED
+      else if (!png_memcmp(chunk_name, png_sRGB, 4))
+         png_handle_sRGB(png_ptr, info_ptr, length);
+#endif
+#ifdef PNG_READ_iCCP_SUPPORTED
+      else if (!png_memcmp(chunk_name, png_iCCP, 4))
+         png_handle_iCCP(png_ptr, info_ptr, length);
+#endif
+#ifdef PNG_READ_sPLT_SUPPORTED
+      else if (!png_memcmp(chunk_name, png_sPLT, 4))
+         png_handle_sPLT(png_ptr, info_ptr, length);
+#endif
+#ifdef PNG_READ_tEXt_SUPPORTED
+      else if (!png_memcmp(chunk_name, png_tEXt, 4))
+         png_handle_tEXt(png_ptr, info_ptr, length);
+#endif
+#ifdef PNG_READ_tIME_SUPPORTED
+      else if (!png_memcmp(chunk_name, png_tIME, 4))
+         png_handle_tIME(png_ptr, info_ptr, length);
+#endif
+#ifdef PNG_READ_tRNS_SUPPORTED
+      else if (!png_memcmp(chunk_name, png_tRNS, 4))
+         png_handle_tRNS(png_ptr, info_ptr, length);
+#endif
+#ifdef PNG_READ_zTXt_SUPPORTED
+      else if (!png_memcmp(chunk_name, png_zTXt, 4))
+         png_handle_zTXt(png_ptr, info_ptr, length);
+#endif
+#ifdef PNG_READ_iTXt_SUPPORTED
+      else if (!png_memcmp(chunk_name, png_iTXt, 4))
+         png_handle_iTXt(png_ptr, info_ptr, length);
+#endif
+      else
+         png_handle_unknown(png_ptr, info_ptr, length);
+   }
+}
+#endif /* PNG_SEQUENTIAL_READ_SUPPORTED */
+
+/* Optional call to update the users info_ptr structure */
+void PNGAPI
+png_read_update_info(png_structp png_ptr, png_infop info_ptr)
+{
+   png_debug(1, "in png_read_update_info");
+ 
+   if (png_ptr == NULL)
+      return;
+   if (!(png_ptr->flags & PNG_FLAG_ROW_INIT))
+      png_read_start_row(png_ptr);
+   else
+      png_warning(png_ptr,
+      "Ignoring extra png_read_update_info() call; row buffer not reallocated");
+
+   png_read_transform_info(png_ptr, info_ptr);
+}
+
+#ifdef PNG_SEQUENTIAL_READ_SUPPORTED
+/* Initialize palette, background, etc, after transformations
+ * are set, but before any reading takes place.  This allows
+ * the user to obtain a gamma-corrected palette, for example.
+ * If the user doesn't call this, we will do it ourselves.
+ */
+void PNGAPI
+png_start_read_image(png_structp png_ptr)
+{
+   png_debug(1, "in png_start_read_image");
+ 
+   if (png_ptr == NULL)
+      return;
+   if (!(png_ptr->flags & PNG_FLAG_ROW_INIT))
+      png_read_start_row(png_ptr);
+}
+#endif /* PNG_SEQUENTIAL_READ_SUPPORTED */
+
+#ifdef PNG_SEQUENTIAL_READ_SUPPORTED
+void PNGAPI
+png_read_row(png_structp png_ptr, png_bytep row, png_bytep dsp_row)
+{
+   PNG_CONST PNG_IDAT;
+   PNG_CONST int png_pass_dsp_mask[7] = {0xff, 0x0f, 0xff, 0x33, 0xff, 0x55,
+      0xff};
+   PNG_CONST int png_pass_mask[7] = {0x80, 0x08, 0x88, 0x22, 0xaa, 0x55, 0xff};
+   int ret;
+ 
+   if (png_ptr == NULL)
+      return;
+ 
+   png_debug2(1, "in png_read_row (row %lu, pass %d)",
+      png_ptr->row_number, png_ptr->pass);
+
+   if (!(png_ptr->flags & PNG_FLAG_ROW_INIT))
+      png_read_start_row(png_ptr);
+   if (png_ptr->row_number == 0 && png_ptr->pass == 0)
+   {
+   /* Check for transforms that have been set but were defined out */
+#if defined(PNG_WRITE_INVERT_SUPPORTED) && !defined(PNG_READ_INVERT_SUPPORTED)
+   if (png_ptr->transformations & PNG_INVERT_MONO)
+      png_warning(png_ptr, "PNG_READ_INVERT_SUPPORTED is not defined.");
+#endif
+#if defined(PNG_WRITE_FILLER_SUPPORTED) && !defined(PNG_READ_FILLER_SUPPORTED)
+   if (png_ptr->transformations & PNG_FILLER)
+      png_warning(png_ptr, "PNG_READ_FILLER_SUPPORTED is not defined.");
+#endif
+#if defined(PNG_WRITE_PACKSWAP_SUPPORTED) && \
+    !defined(PNG_READ_PACKSWAP_SUPPORTED)
+   if (png_ptr->transformations & PNG_PACKSWAP)
+      png_warning(png_ptr, "PNG_READ_PACKSWAP_SUPPORTED is not defined.");
+#endif
+#if defined(PNG_WRITE_PACK_SUPPORTED) && !defined(PNG_READ_PACK_SUPPORTED)
+   if (png_ptr->transformations & PNG_PACK)
+      png_warning(png_ptr, "PNG_READ_PACK_SUPPORTED is not defined.");
+#endif
+#if defined(PNG_WRITE_SHIFT_SUPPORTED) && !defined(PNG_READ_SHIFT_SUPPORTED)
+   if (png_ptr->transformations & PNG_SHIFT)
+      png_warning(png_ptr, "PNG_READ_SHIFT_SUPPORTED is not defined.");
+#endif
+#if defined(PNG_WRITE_BGR_SUPPORTED) && !defined(PNG_READ_BGR_SUPPORTED)
+   if (png_ptr->transformations & PNG_BGR)
+      png_warning(png_ptr, "PNG_READ_BGR_SUPPORTED is not defined.");
+#endif
+#if defined(PNG_WRITE_SWAP_SUPPORTED) && !defined(PNG_READ_SWAP_SUPPORTED)
+   if (png_ptr->transformations & PNG_SWAP_BYTES)
+      png_warning(png_ptr, "PNG_READ_SWAP_SUPPORTED is not defined.");
+#endif
+   }
+
+#ifdef PNG_READ_INTERLACING_SUPPORTED
+   /* If interlaced and we do not need a new row, combine row and return */
+   if (png_ptr->interlaced && (png_ptr->transformations & PNG_INTERLACE))
+   {
+      switch (png_ptr->pass)
+      {
+         case 0:
+            if (png_ptr->row_number & 0x07)
+            {
+               if (dsp_row != NULL)
+                  png_combine_row(png_ptr, dsp_row,
+                     png_pass_dsp_mask[png_ptr->pass]);
+               png_read_finish_row(png_ptr);
+               return;
+            }
+            break;
+         case 1:
+            if ((png_ptr->row_number & 0x07) || png_ptr->width < 5)
+            {
+               if (dsp_row != NULL)
+                  png_combine_row(png_ptr, dsp_row,
+                     png_pass_dsp_mask[png_ptr->pass]);
+               png_read_finish_row(png_ptr);
+               return;
+            }
+            break;
+         case 2:
+            if ((png_ptr->row_number & 0x07) != 4)
+            {
+               if (dsp_row != NULL && (png_ptr->row_number & 4))
+                  png_combine_row(png_ptr, dsp_row,
+                     png_pass_dsp_mask[png_ptr->pass]);
+               png_read_finish_row(png_ptr);
+               return;
+            }
+            break;
+         case 3:
+            if ((png_ptr->row_number & 3) || png_ptr->width < 3)
+            {
+               if (dsp_row != NULL)
+                  png_combine_row(png_ptr, dsp_row,
+                     png_pass_dsp_mask[png_ptr->pass]);
+               png_read_finish_row(png_ptr);
+               return;
+            }
+            break;
+         case 4:
+            if ((png_ptr->row_number & 3) != 2)
+            {
+               if (dsp_row != NULL && (png_ptr->row_number & 2))
+                  png_combine_row(png_ptr, dsp_row,
+                     png_pass_dsp_mask[png_ptr->pass]);
+               png_read_finish_row(png_ptr);
+               return;
+            }
+            break;
+         case 5:
+            if ((png_ptr->row_number & 1) || png_ptr->width < 2)
+            {
+               if (dsp_row != NULL)
+                  png_combine_row(png_ptr, dsp_row,
+                     png_pass_dsp_mask[png_ptr->pass]);
+               png_read_finish_row(png_ptr);
+               return;
+            }
+            break;
+         case 6:
+            if (!(png_ptr->row_number & 1))
+            {
+               png_read_finish_row(png_ptr);
+               return;
+            }
+            break;
+      }
+   }
+#endif
+
+   if (!(png_ptr->mode & PNG_HAVE_IDAT))
+      png_error(png_ptr, "Invalid attempt to read row data");
+
+   png_ptr->zstream.next_out = png_ptr->row_buf;
+   png_ptr->zstream.avail_out =
+       (uInt)(PNG_ROWBYTES(png_ptr->pixel_depth,
+       png_ptr->iwidth) + 1);
+   do
+   {
+      if (!(png_ptr->zstream.avail_in))
+      {
+         while (!png_ptr->idat_size)
+         {
+            png_crc_finish(png_ptr, 0);
+
+            png_ptr->idat_size = png_read_chunk_header(png_ptr);
+            if (png_memcmp(png_ptr->chunk_name, png_IDAT, 4))
+               png_error(png_ptr, "Not enough image data");
+         }
+         png_ptr->zstream.avail_in = (uInt)png_ptr->zbuf_size;
+         png_ptr->zstream.next_in = png_ptr->zbuf;
+         if (png_ptr->zbuf_size > png_ptr->idat_size)
+            png_ptr->zstream.avail_in = (uInt)png_ptr->idat_size;
+         png_crc_read(png_ptr, png_ptr->zbuf,
+            (png_size_t)png_ptr->zstream.avail_in);
+         png_ptr->idat_size -= png_ptr->zstream.avail_in;
+      }
+      ret = inflate(&png_ptr->zstream, Z_PARTIAL_FLUSH);
+      if (ret == Z_STREAM_END)
+      {
+         if (png_ptr->zstream.avail_out || png_ptr->zstream.avail_in ||
+            png_ptr->idat_size)
+            png_error(png_ptr, "Extra compressed data");
+         png_ptr->mode |= PNG_AFTER_IDAT;
+         png_ptr->flags |= PNG_FLAG_ZLIB_FINISHED;
+         break;
+      }
+      if (ret != Z_OK)
+         png_error(png_ptr, png_ptr->zstream.msg ? png_ptr->zstream.msg :
+                   "Decompression error");
+
+   } while (png_ptr->zstream.avail_out);
+
+   png_ptr->row_info.color_type = png_ptr->color_type;
+   png_ptr->row_info.width = png_ptr->iwidth;
+   png_ptr->row_info.channels = png_ptr->channels;
+   png_ptr->row_info.bit_depth = png_ptr->bit_depth;
+   png_ptr->row_info.pixel_depth = png_ptr->pixel_depth;
+   png_ptr->row_info.rowbytes = PNG_ROWBYTES(png_ptr->row_info.pixel_depth,
+       png_ptr->row_info.width);
+
+   if (png_ptr->row_buf[0])
+   png_read_filter_row(png_ptr, &(png_ptr->row_info),
+      png_ptr->row_buf + 1, png_ptr->prev_row + 1,
+      (int)(png_ptr->row_buf[0]));
+
+   png_memcpy_check(png_ptr, png_ptr->prev_row, png_ptr->row_buf,
+      png_ptr->rowbytes + 1);
+
+#ifdef PNG_MNG_FEATURES_SUPPORTED
+   if ((png_ptr->mng_features_permitted & PNG_FLAG_MNG_FILTER_64) &&
+      (png_ptr->filter_type == PNG_INTRAPIXEL_DIFFERENCING))
+   {
+      /* Intrapixel differencing */
+      png_do_read_intrapixel(&(png_ptr->row_info), png_ptr->row_buf + 1);
+   }
+#endif
+
+
+   if (png_ptr->transformations || (png_ptr->flags&PNG_FLAG_STRIP_ALPHA))
+      png_do_read_transformations(png_ptr);
+
+#ifdef PNG_READ_INTERLACING_SUPPORTED
+   /* Blow up interlaced rows to full size */
+   if (png_ptr->interlaced &&
+      (png_ptr->transformations & PNG_INTERLACE))
+   {
+      if (png_ptr->pass < 6)
+         /* Old interface (pre-1.0.9):
+          * png_do_read_interlace(&(png_ptr->row_info),
+          *    png_ptr->row_buf + 1, png_ptr->pass, png_ptr->transformations);
+          */
+         png_do_read_interlace(png_ptr);
+
+      if (dsp_row != NULL)
+         png_combine_row(png_ptr, dsp_row,
+            png_pass_dsp_mask[png_ptr->pass]);
+      if (row != NULL)
+         png_combine_row(png_ptr, row,
+            png_pass_mask[png_ptr->pass]);
+   }
+   else
+#endif
+   {
+      if (row != NULL)
+         png_combine_row(png_ptr, row, 0xff);
+      if (dsp_row != NULL)
+         png_combine_row(png_ptr, dsp_row, 0xff);
+   }
+   png_read_finish_row(png_ptr);
+
+   if (png_ptr->read_row_fn != NULL)
+      (*(png_ptr->read_row_fn))(png_ptr, png_ptr->row_number, png_ptr->pass);
+}
+#endif /* PNG_SEQUENTIAL_READ_SUPPORTED */
+
+#ifdef PNG_SEQUENTIAL_READ_SUPPORTED
+/* Read one or more rows of image data.  If the image is interlaced,
+ * and png_set_interlace_handling() has been called, the rows need to
+ * contain the contents of the rows from the previous pass.  If the
+ * image has alpha or transparency, and png_handle_alpha()[*] has been
+ * called, the rows contents must be initialized to the contents of the
+ * screen.
+ *
+ * "row" holds the actual image, and pixels are placed in it
+ * as they arrive.  If the image is displayed after each pass, it will
+ * appear to "sparkle" in.  "display_row" can be used to display a
+ * "chunky" progressive image, with finer detail added as it becomes
+ * available.  If you do not want this "chunky" display, you may pass
+ * NULL for display_row.  If you do not want the sparkle display, and
+ * you have not called png_handle_alpha(), you may pass NULL for rows.
+ * If you have called png_handle_alpha(), and the image has either an
+ * alpha channel or a transparency chunk, you must provide a buffer for
+ * rows.  In this case, you do not have to provide a display_row buffer
+ * also, but you may.  If the image is not interlaced, or if you have
+ * not called png_set_interlace_handling(), the display_row buffer will
+ * be ignored, so pass NULL to it.
+ *
+ * [*] png_handle_alpha() does not exist yet, as of this version of libpng
+ */
+
+void PNGAPI
+png_read_rows(png_structp png_ptr, png_bytepp row,
+   png_bytepp display_row, png_uint_32 num_rows)
+{
+   png_uint_32 i;
+   png_bytepp rp;
+   png_bytepp dp;
+
+   png_debug(1, "in png_read_rows");
+ 
+   if (png_ptr == NULL)
+      return;
+   rp = row;
+   dp = display_row;
+   if (rp != NULL && dp != NULL)
+      for (i = 0; i < num_rows; i++)
+      {
+         png_bytep rptr = *rp++;
+         png_bytep dptr = *dp++;
+
+         png_read_row(png_ptr, rptr, dptr);
+      }
+   else if (rp != NULL)
+      for (i = 0; i < num_rows; i++)
+      {
+         png_bytep rptr = *rp;
+         png_read_row(png_ptr, rptr, png_bytep_NULL);
+         rp++;
+      }
+   else if (dp != NULL)
+      for (i = 0; i < num_rows; i++)
+      {
+         png_bytep dptr = *dp;
+         png_read_row(png_ptr, png_bytep_NULL, dptr);
+         dp++;
+      }
+}
+#endif /* PNG_SEQUENTIAL_READ_SUPPORTED */
+
+#ifdef PNG_SEQUENTIAL_READ_SUPPORTED
+/* Read the entire image.  If the image has an alpha channel or a tRNS
+ * chunk, and you have called png_handle_alpha()[*], you will need to
+ * initialize the image to the current image that PNG will be overlaying.
+ * We set the num_rows again here, in case it was incorrectly set in
+ * png_read_start_row() by a call to png_read_update_info() or
+ * png_start_read_image() if png_set_interlace_handling() wasn't called
+ * prior to either of these functions like it should have been.  You can
+ * only call this function once.  If you desire to have an image for
+ * each pass of a interlaced image, use png_read_rows() instead.
+ *
+ * [*] png_handle_alpha() does not exist yet, as of this version of libpng
+ */
+void PNGAPI
+png_read_image(png_structp png_ptr, png_bytepp image)
+{
+   png_uint_32 i, image_height;
+   int pass, j;
+   png_bytepp rp;
+
+   png_debug(1, "in png_read_image");
+ 
+   if (png_ptr == NULL)
+      return;
+
+#ifdef PNG_READ_INTERLACING_SUPPORTED
+   pass = png_set_interlace_handling(png_ptr);
+#else
+   if (png_ptr->interlaced)
+      png_error(png_ptr,
+        "Cannot read interlaced image -- interlace handler disabled.");
+   pass = 1;
+#endif
+
+
+   image_height=png_ptr->height;
+   png_ptr->num_rows = image_height; /* Make sure this is set correctly */
+
+   for (j = 0; j < pass; j++)
+   {
+      rp = image;
+      for (i = 0; i < image_height; i++)
+      {
+         png_read_row(png_ptr, *rp, png_bytep_NULL);
+         rp++;
+      }
+   }
+}
+#endif /* PNG_SEQUENTIAL_READ_SUPPORTED */
+
+#ifdef PNG_SEQUENTIAL_READ_SUPPORTED
+/* Read the end of the PNG file.  Will not read past the end of the
+ * file, will verify the end is accurate, and will read any comments
+ * or time information at the end of the file, if info is not NULL.
+ */
+void PNGAPI
+png_read_end(png_structp png_ptr, png_infop info_ptr)
+{
+   png_debug(1, "in png_read_end");
+ 
+   if (png_ptr == NULL)
+      return;
+   png_crc_finish(png_ptr, 0); /* Finish off CRC from last IDAT chunk */
+
+   do
+   {
+#ifdef PNG_USE_LOCAL_ARRAYS
+      PNG_CONST PNG_IHDR;
+      PNG_CONST PNG_IDAT;
+      PNG_CONST PNG_IEND;
+      PNG_CONST PNG_PLTE;
+#ifdef PNG_READ_bKGD_SUPPORTED
+      PNG_CONST PNG_bKGD;
+#endif
+#ifdef PNG_READ_cHRM_SUPPORTED
+      PNG_CONST PNG_cHRM;
+#endif
+#ifdef PNG_READ_gAMA_SUPPORTED
+      PNG_CONST PNG_gAMA;
+#endif
+#ifdef PNG_READ_hIST_SUPPORTED
+      PNG_CONST PNG_hIST;
+#endif
+#ifdef PNG_READ_iCCP_SUPPORTED
+      PNG_CONST PNG_iCCP;
+#endif
+#ifdef PNG_READ_iTXt_SUPPORTED
+      PNG_CONST PNG_iTXt;
+#endif
+#ifdef PNG_READ_oFFs_SUPPORTED
+      PNG_CONST PNG_oFFs;
+#endif
+#ifdef PNG_READ_pCAL_SUPPORTED
+      PNG_CONST PNG_pCAL;
+#endif
+#ifdef PNG_READ_pHYs_SUPPORTED
+      PNG_CONST PNG_pHYs;
+#endif
+#ifdef PNG_READ_sBIT_SUPPORTED
+      PNG_CONST PNG_sBIT;
+#endif
+#ifdef PNG_READ_sCAL_SUPPORTED
+      PNG_CONST PNG_sCAL;
+#endif
+#ifdef PNG_READ_sPLT_SUPPORTED
+      PNG_CONST PNG_sPLT;
+#endif
+#ifdef PNG_READ_sRGB_SUPPORTED
+      PNG_CONST PNG_sRGB;
+#endif
+#ifdef PNG_READ_tEXt_SUPPORTED
+      PNG_CONST PNG_tEXt;
+#endif
+#ifdef PNG_READ_tIME_SUPPORTED
+      PNG_CONST PNG_tIME;
+#endif
+#ifdef PNG_READ_tRNS_SUPPORTED
+      PNG_CONST PNG_tRNS;
+#endif
+#ifdef PNG_READ_zTXt_SUPPORTED
+      PNG_CONST PNG_zTXt;
+#endif
+#endif /* PNG_USE_LOCAL_ARRAYS */
+      png_uint_32 length = png_read_chunk_header(png_ptr);
+      PNG_CONST png_bytep chunk_name = png_ptr->chunk_name;
+
+      if (!png_memcmp(chunk_name, png_IHDR, 4))
+         png_handle_IHDR(png_ptr, info_ptr, length);
+      else if (!png_memcmp(chunk_name, png_IEND, 4))
+         png_handle_IEND(png_ptr, info_ptr, length);
+#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
+      else if (png_handle_as_unknown(png_ptr, chunk_name))
+      {
+         if (!png_memcmp(chunk_name, png_IDAT, 4))
+         {
+            if ((length > 0) || (png_ptr->mode & PNG_HAVE_CHUNK_AFTER_IDAT))
+               png_error(png_ptr, "Too many IDAT's found");
+         }
+         png_handle_unknown(png_ptr, info_ptr, length);
+         if (!png_memcmp(chunk_name, png_PLTE, 4))
+            png_ptr->mode |= PNG_HAVE_PLTE;
+      }
+#endif
+      else if (!png_memcmp(chunk_name, png_IDAT, 4))
+      {
+         /* Zero length IDATs are legal after the last IDAT has been
+          * read, but not after other chunks have been read.
+          */
+         if ((length > 0) || (png_ptr->mode & PNG_HAVE_CHUNK_AFTER_IDAT))
+            png_error(png_ptr, "Too many IDAT's found");
+         png_crc_finish(png_ptr, length);
+      }
+      else if (!png_memcmp(chunk_name, png_PLTE, 4))
+         png_handle_PLTE(png_ptr, info_ptr, length);
+#ifdef PNG_READ_bKGD_SUPPORTED
+      else if (!png_memcmp(chunk_name, png_bKGD, 4))
+         png_handle_bKGD(png_ptr, info_ptr, length);
+#endif
+#ifdef PNG_READ_cHRM_SUPPORTED
+      else if (!png_memcmp(chunk_name, png_cHRM, 4))
+         png_handle_cHRM(png_ptr, info_ptr, length);
+#endif
+#ifdef PNG_READ_gAMA_SUPPORTED
+      else if (!png_memcmp(chunk_name, png_gAMA, 4))
+         png_handle_gAMA(png_ptr, info_ptr, length);
+#endif
+#ifdef PNG_READ_hIST_SUPPORTED
+      else if (!png_memcmp(chunk_name, png_hIST, 4))
+         png_handle_hIST(png_ptr, info_ptr, length);
+#endif
+#ifdef PNG_READ_oFFs_SUPPORTED
+      else if (!png_memcmp(chunk_name, png_oFFs, 4))
+         png_handle_oFFs(png_ptr, info_ptr, length);
+#endif
+#ifdef PNG_READ_pCAL_SUPPORTED
+      else if (!png_memcmp(chunk_name, png_pCAL, 4))
+         png_handle_pCAL(png_ptr, info_ptr, length);
+#endif
+#ifdef PNG_READ_sCAL_SUPPORTED
+      else if (!png_memcmp(chunk_name, png_sCAL, 4))
+         png_handle_sCAL(png_ptr, info_ptr, length);
+#endif
+#ifdef PNG_READ_pHYs_SUPPORTED
+      else if (!png_memcmp(chunk_name, png_pHYs, 4))
+         png_handle_pHYs(png_ptr, info_ptr, length);
+#endif
+#ifdef PNG_READ_sBIT_SUPPORTED
+      else if (!png_memcmp(chunk_name, png_sBIT, 4))
+         png_handle_sBIT(png_ptr, info_ptr, length);
+#endif
+#ifdef PNG_READ_sRGB_SUPPORTED
+      else if (!png_memcmp(chunk_name, png_sRGB, 4))
+         png_handle_sRGB(png_ptr, info_ptr, length);
+#endif
+#ifdef PNG_READ_iCCP_SUPPORTED
+      else if (!png_memcmp(chunk_name, png_iCCP, 4))
+         png_handle_iCCP(png_ptr, info_ptr, length);
+#endif
+#ifdef PNG_READ_sPLT_SUPPORTED
+      else if (!png_memcmp(chunk_name, png_sPLT, 4))
+         png_handle_sPLT(png_ptr, info_ptr, length);
+#endif
+#ifdef PNG_READ_tEXt_SUPPORTED
+      else if (!png_memcmp(chunk_name, png_tEXt, 4))
+         png_handle_tEXt(png_ptr, info_ptr, length);
+#endif
+#ifdef PNG_READ_tIME_SUPPORTED
+      else if (!png_memcmp(chunk_name, png_tIME, 4))
+         png_handle_tIME(png_ptr, info_ptr, length);
+#endif
+#ifdef PNG_READ_tRNS_SUPPORTED
+      else if (!png_memcmp(chunk_name, png_tRNS, 4))
+         png_handle_tRNS(png_ptr, info_ptr, length);
+#endif
+#ifdef PNG_READ_zTXt_SUPPORTED
+      else if (!png_memcmp(chunk_name, png_zTXt, 4))
+         png_handle_zTXt(png_ptr, info_ptr, length);
+#endif
+#ifdef PNG_READ_iTXt_SUPPORTED
+      else if (!png_memcmp(chunk_name, png_iTXt, 4))
+         png_handle_iTXt(png_ptr, info_ptr, length);
+#endif
+      else
+         png_handle_unknown(png_ptr, info_ptr, length);
+   } while (!(png_ptr->mode & PNG_HAVE_IEND));
+}
+#endif /* PNG_SEQUENTIAL_READ_SUPPORTED */
+
+/* Free all memory used by the read */
+void PNGAPI
+png_destroy_read_struct(png_structpp png_ptr_ptr, png_infopp info_ptr_ptr,
+   png_infopp end_info_ptr_ptr)
+{
+   png_structp png_ptr = NULL;
+   png_infop info_ptr = NULL, end_info_ptr = NULL;
+#ifdef PNG_USER_MEM_SUPPORTED
+   png_free_ptr free_fn = NULL;
+   png_voidp mem_ptr = NULL;
+#endif
+
+   png_debug(1, "in png_destroy_read_struct");
+ 
+   if (png_ptr_ptr != NULL)
+      png_ptr = *png_ptr_ptr;
+   if (png_ptr == NULL)
+      return;
+
+#ifdef PNG_USER_MEM_SUPPORTED
+   free_fn = png_ptr->free_fn;
+   mem_ptr = png_ptr->mem_ptr;
+#endif
+
+   if (info_ptr_ptr != NULL)
+      info_ptr = *info_ptr_ptr;
+
+   if (end_info_ptr_ptr != NULL)
+      end_info_ptr = *end_info_ptr_ptr;
+
+   png_read_destroy(png_ptr, info_ptr, end_info_ptr);
+
+   if (info_ptr != NULL)
+   {
+#ifdef PNG_TEXT_SUPPORTED
+      png_free_data(png_ptr, info_ptr, PNG_FREE_TEXT, -1);
+#endif
+
+#ifdef PNG_USER_MEM_SUPPORTED
+      png_destroy_struct_2((png_voidp)info_ptr, (png_free_ptr)free_fn,
+          (png_voidp)mem_ptr);
+#else
+      png_destroy_struct((png_voidp)info_ptr);
+#endif
+      *info_ptr_ptr = NULL;
+   }
+
+   if (end_info_ptr != NULL)
+   {
+#ifdef PNG_READ_TEXT_SUPPORTED
+      png_free_data(png_ptr, end_info_ptr, PNG_FREE_TEXT, -1);
+#endif
+#ifdef PNG_USER_MEM_SUPPORTED
+      png_destroy_struct_2((png_voidp)end_info_ptr, (png_free_ptr)free_fn,
+         (png_voidp)mem_ptr);
+#else
+      png_destroy_struct((png_voidp)end_info_ptr);
+#endif
+      *end_info_ptr_ptr = NULL;
+   }
+
+   if (png_ptr != NULL)
+   {
+#ifdef PNG_USER_MEM_SUPPORTED
+      png_destroy_struct_2((png_voidp)png_ptr, (png_free_ptr)free_fn,
+          (png_voidp)mem_ptr);
+#else
+      png_destroy_struct((png_voidp)png_ptr);
+#endif
+      *png_ptr_ptr = NULL;
+   }
+}
+
+/* Free all memory used by the read (old method) */
+void /* PRIVATE */
+png_read_destroy(png_structp png_ptr, png_infop info_ptr,
+    png_infop end_info_ptr)
+{
+#ifdef PNG_SETJMP_SUPPORTED
+   jmp_buf tmp_jmp;
+#endif
+   png_error_ptr error_fn;
+   png_error_ptr warning_fn;
+   png_voidp error_ptr;
+#ifdef PNG_USER_MEM_SUPPORTED
+   png_free_ptr free_fn;
+#endif
+
+   png_debug(1, "in png_read_destroy");
+ 
+   if (info_ptr != NULL)
+      png_info_destroy(png_ptr, info_ptr);
+
+   if (end_info_ptr != NULL)
+      png_info_destroy(png_ptr, end_info_ptr);
+
+   png_free(png_ptr, png_ptr->zbuf);
+   png_free(png_ptr, png_ptr->big_row_buf);
+   png_free(png_ptr, png_ptr->prev_row);
+   png_free(png_ptr, png_ptr->chunkdata);
+#ifdef PNG_READ_DITHER_SUPPORTED
+   png_free(png_ptr, png_ptr->palette_lookup);
+   png_free(png_ptr, png_ptr->dither_index);
+#endif
+#ifdef PNG_READ_GAMMA_SUPPORTED
+   png_free(png_ptr, png_ptr->gamma_table);
+#endif
+#ifdef PNG_READ_BACKGROUND_SUPPORTED
+   png_free(png_ptr, png_ptr->gamma_from_1);
+   png_free(png_ptr, png_ptr->gamma_to_1);
+#endif
+#ifdef PNG_FREE_ME_SUPPORTED
+   if (png_ptr->free_me & PNG_FREE_PLTE)
+      png_zfree(png_ptr, png_ptr->palette);
+   png_ptr->free_me &= ~PNG_FREE_PLTE;
+#else
+   if (png_ptr->flags & PNG_FLAG_FREE_PLTE)
+      png_zfree(png_ptr, png_ptr->palette);
+   png_ptr->flags &= ~PNG_FLAG_FREE_PLTE;
+#endif
+#if defined(PNG_tRNS_SUPPORTED) || \
+    defined(PNG_READ_EXPAND_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED)
+#ifdef PNG_FREE_ME_SUPPORTED
+   if (png_ptr->free_me & PNG_FREE_TRNS)
+      png_free(png_ptr, png_ptr->trans);
+   png_ptr->free_me &= ~PNG_FREE_TRNS;
+#else
+   if (png_ptr->flags & PNG_FLAG_FREE_TRNS)
+      png_free(png_ptr, png_ptr->trans);
+   png_ptr->flags &= ~PNG_FLAG_FREE_TRNS;
+#endif
+#endif
+#ifdef PNG_READ_hIST_SUPPORTED
+#ifdef PNG_FREE_ME_SUPPORTED
+   if (png_ptr->free_me & PNG_FREE_HIST)
+      png_free(png_ptr, png_ptr->hist);
+   png_ptr->free_me &= ~PNG_FREE_HIST;
+#else
+   if (png_ptr->flags & PNG_FLAG_FREE_HIST)
+      png_free(png_ptr, png_ptr->hist);
+   png_ptr->flags &= ~PNG_FLAG_FREE_HIST;
+#endif
+#endif
+#ifdef PNG_READ_GAMMA_SUPPORTED
+   if (png_ptr->gamma_16_table != NULL)
+   {
+      int i;
+      int istop = (1 << (8 - png_ptr->gamma_shift));
+      for (i = 0; i < istop; i++)
+      {
+         png_free(png_ptr, png_ptr->gamma_16_table[i]);
+      }
+   png_free(png_ptr, png_ptr->gamma_16_table);
+   }
+#ifdef PNG_READ_BACKGROUND_SUPPORTED
+   if (png_ptr->gamma_16_from_1 != NULL)
+   {
+      int i;
+      int istop = (1 << (8 - png_ptr->gamma_shift));
+      for (i = 0; i < istop; i++)
+      {
+         png_free(png_ptr, png_ptr->gamma_16_from_1[i]);
+      }
+   png_free(png_ptr, png_ptr->gamma_16_from_1);
+   }
+   if (png_ptr->gamma_16_to_1 != NULL)
+   {
+      int i;
+      int istop = (1 << (8 - png_ptr->gamma_shift));
+      for (i = 0; i < istop; i++)
+      {
+         png_free(png_ptr, png_ptr->gamma_16_to_1[i]);
+      }
+   png_free(png_ptr, png_ptr->gamma_16_to_1);
+   }
+#endif
+#endif
+#ifdef PNG_TIME_RFC1123_SUPPORTED
+   png_free(png_ptr, png_ptr->time_buffer);
+#endif
+
+   inflateEnd(&png_ptr->zstream);
+#ifdef PNG_PROGRESSIVE_READ_SUPPORTED
+   png_free(png_ptr, png_ptr->save_buffer);
+#endif
+
+   /* Save the important info out of the png_struct, in case it is
+    * being used again.
+    */
+#ifdef PNG_SETJMP_SUPPORTED
+   png_memcpy(tmp_jmp, png_ptr->jmpbuf, png_sizeof(jmp_buf));
+#endif
+
+   error_fn = png_ptr->error_fn;
+   warning_fn = png_ptr->warning_fn;
+   error_ptr = png_ptr->error_ptr;
+#ifdef PNG_USER_MEM_SUPPORTED
+   free_fn = png_ptr->free_fn;
+#endif
+
+   png_memset(png_ptr, 0, png_sizeof(png_struct));
+
+   png_ptr->error_fn = error_fn;
+   png_ptr->warning_fn = warning_fn;
+   png_ptr->error_ptr = error_ptr;
+#ifdef PNG_USER_MEM_SUPPORTED
+   png_ptr->free_fn = free_fn;
+#endif
+
+#ifdef PNG_SETJMP_SUPPORTED
+   png_memcpy(png_ptr->jmpbuf, tmp_jmp, png_sizeof(jmp_buf));
+#endif
+
+}
+
+void PNGAPI
+png_set_read_status_fn(png_structp png_ptr, png_read_status_ptr read_row_fn)
+{
+   if (png_ptr == NULL)
+      return;
+   png_ptr->read_row_fn = read_row_fn;
+}
+
+
+#ifdef PNG_SEQUENTIAL_READ_SUPPORTED
+#ifdef PNG_INFO_IMAGE_SUPPORTED
+void PNGAPI
+png_read_png(png_structp png_ptr, png_infop info_ptr,
+                           int transforms,
+                           voidp params)
+{
+   int row;
+
+   if (png_ptr == NULL)
+      return;
+#ifdef PNG_READ_INVERT_ALPHA_SUPPORTED
+   /* Invert the alpha channel from opacity to transparency
+    */
+   if (transforms & PNG_TRANSFORM_INVERT_ALPHA)
+       png_set_invert_alpha(png_ptr);
+#endif
+
+   /* png_read_info() gives us all of the information from the
+    * PNG file before the first IDAT (image data chunk).
+    */
+   png_read_info(png_ptr, info_ptr);
+   if (info_ptr->height > PNG_UINT_32_MAX/png_sizeof(png_bytep))
+      png_error(png_ptr, "Image is too high to process with png_read_png()");
+
+   /* -------------- image transformations start here ------------------- */
+
+#ifdef PNG_READ_16_TO_8_SUPPORTED
+   /* Tell libpng to strip 16 bit/color files down to 8 bits per color.
+    */
+   if (transforms & PNG_TRANSFORM_STRIP_16)
+      png_set_strip_16(png_ptr);
+#endif
+
+#ifdef PNG_READ_STRIP_ALPHA_SUPPORTED
+   /* Strip alpha bytes from the input data without combining with
+    * the background (not recommended).
+    */
+   if (transforms & PNG_TRANSFORM_STRIP_ALPHA)
+      png_set_strip_alpha(png_ptr);
+#endif
+
+#if defined(PNG_READ_PACK_SUPPORTED) && !defined(PNG_READ_EXPAND_SUPPORTED)
+   /* Extract multiple pixels with bit depths of 1, 2, or 4 from a single
+    * byte into separate bytes (useful for paletted and grayscale images).
+    */
+   if (transforms & PNG_TRANSFORM_PACKING)
+      png_set_packing(png_ptr);
+#endif
+
+#ifdef PNG_READ_PACKSWAP_SUPPORTED
+   /* Change the order of packed pixels to least significant bit first
+    * (not useful if you are using png_set_packing).
+    */
+   if (transforms & PNG_TRANSFORM_PACKSWAP)
+      png_set_packswap(png_ptr);
+#endif
+
+#ifdef PNG_READ_EXPAND_SUPPORTED
+   /* Expand paletted colors into true RGB triplets
+    * Expand grayscale images to full 8 bits from 1, 2, or 4 bits/pixel
+    * Expand paletted or RGB images with transparency to full alpha
+    * channels so the data will be available as RGBA quartets.
+    */
+   if (transforms & PNG_TRANSFORM_EXPAND)
+      if ((png_ptr->bit_depth < 8) ||
+          (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE) ||
+          (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)))
+         png_set_expand(png_ptr);
+#endif
+
+   /* We don't handle background color or gamma transformation or dithering.
+    */
+
+#ifdef PNG_READ_INVERT_SUPPORTED
+   /* Invert monochrome files to have 0 as white and 1 as black
+    */
+   if (transforms & PNG_TRANSFORM_INVERT_MONO)
+      png_set_invert_mono(png_ptr);
+#endif
+
+#ifdef PNG_READ_SHIFT_SUPPORTED
+   /* If you want to shift the pixel values from the range [0,255] or
+    * [0,65535] to the original [0,7] or [0,31], or whatever range the
+    * colors were originally in:
+    */
+   if ((transforms & PNG_TRANSFORM_SHIFT)
+       && png_get_valid(png_ptr, info_ptr, PNG_INFO_sBIT))
+   {
+      png_color_8p sig_bit;
+
+      png_get_sBIT(png_ptr, info_ptr, &sig_bit);
+      png_set_shift(png_ptr, sig_bit);
+   }
+#endif
+
+#ifdef PNG_READ_BGR_SUPPORTED
+   /* Flip the RGB pixels to BGR (or RGBA to BGRA)
+    */
+   if (transforms & PNG_TRANSFORM_BGR)
+      png_set_bgr(png_ptr);
+#endif
+
+#ifdef PNG_READ_SWAP_ALPHA_SUPPORTED
+   /* Swap the RGBA or GA data to ARGB or AG (or BGRA to ABGR)
+    */
+   if (transforms & PNG_TRANSFORM_SWAP_ALPHA)
+       png_set_swap_alpha(png_ptr);
+#endif
+
+#ifdef PNG_READ_SWAP_SUPPORTED
+   /* Swap bytes of 16 bit files to least significant byte first
+    */
+   if (transforms & PNG_TRANSFORM_SWAP_ENDIAN)
+      png_set_swap(png_ptr);
+#endif
+
+/* Added at libpng-1.2.41 */
+#ifdef PNG_READ_INVERT_ALPHA_SUPPORTED
+   /* Invert the alpha channel from opacity to transparency
+    */
+   if (transforms & PNG_TRANSFORM_INVERT_ALPHA)
+       png_set_invert_alpha(png_ptr);
+#endif
+
+/* Added at libpng-1.2.41 */
+#ifdef PNG_READ_GRAY_TO_RGB_SUPPORTED
+   /* Expand grayscale image to RGB
+    */
+   if (transforms & PNG_TRANSFORM_GRAY_TO_RGB)
+       png_set_gray_to_rgb(png_ptr);
+#endif
+
+   /* We don't handle adding filler bytes */
+
+   /* Optional call to gamma correct and add the background to the palette
+    * and update info structure.  REQUIRED if you are expecting libpng to
+    * update the palette for you (i.e., you selected such a transform above).
+    */
+   png_read_update_info(png_ptr, info_ptr);
+
+   /* -------------- image transformations end here ------------------- */
+
+#ifdef PNG_FREE_ME_SUPPORTED
+   png_free_data(png_ptr, info_ptr, PNG_FREE_ROWS, 0);
+#endif
+   if (info_ptr->row_pointers == NULL)
+   {
+      info_ptr->row_pointers = (png_bytepp)png_malloc(png_ptr,
+         info_ptr->height * png_sizeof(png_bytep));
+      png_memset(info_ptr->row_pointers, 0, info_ptr->height
+         * png_sizeof(png_bytep));
+
+#ifdef PNG_FREE_ME_SUPPORTED
+      info_ptr->free_me |= PNG_FREE_ROWS;
+#endif
+
+      for (row = 0; row < (int)info_ptr->height; row++)
+         info_ptr->row_pointers[row] = (png_bytep)png_malloc(png_ptr,
+            png_get_rowbytes(png_ptr, info_ptr));
+   }
+
+   png_read_image(png_ptr, info_ptr->row_pointers);
+   info_ptr->valid |= PNG_INFO_IDAT;
+
+   /* Read rest of file, and get additional chunks in info_ptr - REQUIRED */
+   png_read_end(png_ptr, info_ptr);
+
+   transforms = transforms; /* Quiet compiler warnings */
+   params = params;
+
+}
+#endif /* PNG_INFO_IMAGE_SUPPORTED */
+#endif /* PNG_SEQUENTIAL_READ_SUPPORTED */
+#endif /* PNG_READ_SUPPORTED */
diff --git a/Externals/libpng/pngrio.c b/Externals/libpng/pngrio.c
index e9c381c5ba..e84380e200 100644
--- a/Externals/libpng/pngrio.c
+++ b/Externals/libpng/pngrio.c
@@ -1,176 +1,180 @@
-
-/* pngrio.c - functions for data input
- *
- * Last changed in libpng 1.5.0 [January 6, 2011]
- * Copyright (c) 1998-2011 Glenn Randers-Pehrson
- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
- *
- * This code is released under the libpng license.
- * For conditions of distribution and use, see the disclaimer
- * and license in png.h
- *
- * This file provides a location for all input.  Users who need
- * special handling are expected to write a function that has the same
- * arguments as this and performs a similar function, but that possibly
- * has a different input method.  Note that you shouldn't change this
- * function, but rather write a replacement function and then make
- * libpng use it at run time with png_set_read_fn(...).
- */
-
-#include "pngpriv.h"
-
-#ifdef PNG_READ_SUPPORTED
-
-/* Read the data from whatever input you are using.  The default routine
- * reads from a file pointer.  Note that this routine sometimes gets called
- * with very small lengths, so you should implement some kind of simple
- * buffering if you are using unbuffered reads.  This should never be asked
- * to read more then 64K on a 16 bit machine.
- */
-void /* PRIVATE */
-png_read_data(png_structp png_ptr, png_bytep data, png_size_t length)
-{
-   png_debug1(4, "reading %d bytes", (int)length);
-
-   if (png_ptr->read_data_fn != NULL)
-      (*(png_ptr->read_data_fn))(png_ptr, data, length);
-
-   else
-      png_error(png_ptr, "Call to NULL read function");
-}
-
-#ifdef PNG_STDIO_SUPPORTED
-/* This is the function that does the actual reading of data.  If you are
- * not reading from a standard C stream, you should create a replacement
- * read_data function and use it at run time with png_set_read_fn(), rather
- * than changing the library.
- */
-#  ifndef USE_FAR_KEYWORD
-void PNGCBAPI
-png_default_read_data(png_structp png_ptr, png_bytep data, png_size_t length)
-{
-   png_size_t check;
-
-   if (png_ptr == NULL)
-      return;
-
-   /* fread() returns 0 on error, so it is OK to store this in a png_size_t
-    * instead of an int, which is what fread() actually returns.
-    */
-   check = fread(data, 1, length, (png_FILE_p)png_ptr->io_ptr);
-
-   if (check != length)
-      png_error(png_ptr, "Read Error");
-}
-#  else
-/* This is the model-independent version. Since the standard I/O library
-   can't handle far buffers in the medium and small models, we have to copy
-   the data.
-*/
-
-#define NEAR_BUF_SIZE 1024
-#define MIN(a,b) (a <= b ? a : b)
-
-static void PNGCBAPI
-png_default_read_data(png_structp png_ptr, png_bytep data, png_size_t length)
-{
-   png_size_t check;
-   png_byte *n_data;
-   png_FILE_p io_ptr;
-
-   if (png_ptr == NULL)
-      return;
-
-   /* Check if data really is near. If so, use usual code. */
-   n_data = (png_byte *)CVT_PTR_NOCHECK(data);
-   io_ptr = (png_FILE_p)CVT_PTR(png_ptr->io_ptr);
-
-   if ((png_bytep)n_data == data)
-   {
-      check = fread(n_data, 1, length, io_ptr);
-   }
-
-   else
-   {
-      png_byte buf[NEAR_BUF_SIZE];
-      png_size_t read, remaining, err;
-      check = 0;
-      remaining = length;
-
-      do
-      {
-         read = MIN(NEAR_BUF_SIZE, remaining);
-         err = fread(buf, 1, read, io_ptr);
-         png_memcpy(data, buf, read); /* copy far buffer to near buffer */
-
-         if (err != read)
-            break;
-
-         else
-            check += err;
-
-         data += read;
-         remaining -= read;
-      }
-      while (remaining != 0);
-   }
-
-   if ((png_uint_32)check != (png_uint_32)length)
-      png_error(png_ptr, "read Error");
-}
-#  endif
-#endif
-
-/* This function allows the application to supply a new input function
- * for libpng if standard C streams aren't being used.
- *
- * This function takes as its arguments:
- *
- * png_ptr      - pointer to a png input data structure
- *
- * io_ptr       - pointer to user supplied structure containing info about
- *                the input functions.  May be NULL.
- *
- * read_data_fn - pointer to a new input function that takes as its
- *                arguments a pointer to a png_struct, a pointer to
- *                a location where input data can be stored, and a 32-bit
- *                unsigned int that is the number of bytes to be read.
- *                To exit and output any fatal error messages the new write
- *                function should call png_error(png_ptr, "Error msg").
- *                May be NULL, in which case libpng's default function will
- *                be used.
- */
-void PNGAPI
-png_set_read_fn(png_structp png_ptr, png_voidp io_ptr,
-   png_rw_ptr read_data_fn)
-{
-   if (png_ptr == NULL)
-      return;
-
-   png_ptr->io_ptr = io_ptr;
-
-#ifdef PNG_STDIO_SUPPORTED
-   if (read_data_fn != NULL)
-      png_ptr->read_data_fn = read_data_fn;
-
-   else
-      png_ptr->read_data_fn = png_default_read_data;
-#else
-   png_ptr->read_data_fn = read_data_fn;
-#endif
-
-   /* It is an error to write to a read device */
-   if (png_ptr->write_data_fn != NULL)
-   {
-      png_ptr->write_data_fn = NULL;
-      png_warning(png_ptr,
-          "Can't set both read_data_fn and write_data_fn in the"
-          " same structure");
-   }
-
-#ifdef PNG_WRITE_FLUSH_SUPPORTED
-   png_ptr->output_flush_fn = NULL;
-#endif
-}
-#endif /* PNG_READ_SUPPORTED */
+
+/* pngrio.c - functions for data input
+ *
+ * Last changed in libpng 1.2.43 [February 25, 2010]
+ * Copyright (c) 1998-2010 Glenn Randers-Pehrson
+ * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
+ * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
+ *
+ * This code is released under the libpng license.
+ * For conditions of distribution and use, see the disclaimer
+ * and license in png.h
+ *
+ * This file provides a location for all input.  Users who need
+ * special handling are expected to write a function that has the same
+ * arguments as this and performs a similar function, but that possibly
+ * has a different input method.  Note that you shouldn't change this
+ * function, but rather write a replacement function and then make
+ * libpng use it at run time with png_set_read_fn(...).
+ */
+
+#define PNG_INTERNAL
+#define PNG_NO_PEDANTIC_WARNINGS
+#include "png.h"
+#ifdef PNG_READ_SUPPORTED
+
+/* Read the data from whatever input you are using.  The default routine
+ * reads from a file pointer.  Note that this routine sometimes gets called
+ * with very small lengths, so you should implement some kind of simple
+ * buffering if you are using unbuffered reads.  This should never be asked
+ * to read more then 64K on a 16 bit machine.
+ */
+void /* PRIVATE */
+png_read_data(png_structp png_ptr, png_bytep data, png_size_t length)
+{
+   png_debug1(4, "reading %d bytes", (int)length);
+ 
+   if (png_ptr->read_data_fn != NULL)
+      (*(png_ptr->read_data_fn))(png_ptr, data, length);
+   else
+      png_error(png_ptr, "Call to NULL read function");
+}
+
+#ifdef PNG_STDIO_SUPPORTED
+/* This is the function that does the actual reading of data.  If you are
+ * not reading from a standard C stream, you should create a replacement
+ * read_data function and use it at run time with png_set_read_fn(), rather
+ * than changing the library.
+ */
+#ifndef USE_FAR_KEYWORD
+void PNGAPI
+png_default_read_data(png_structp png_ptr, png_bytep data, png_size_t length)
+{
+   png_size_t check;
+
+   if (png_ptr == NULL)
+      return;
+   /* fread() returns 0 on error, so it is OK to store this in a png_size_t
+    * instead of an int, which is what fread() actually returns.
+    */
+#ifdef _WIN32_WCE
+   if ( !ReadFile((HANDLE)(png_ptr->io_ptr), data, length, &check, NULL) )
+      check = 0;
+#else
+   check = (png_size_t)fread(data, (png_size_t)1, length,
+      (png_FILE_p)png_ptr->io_ptr);
+#endif
+
+   if (check != length)
+      png_error(png_ptr, "Read Error");
+}
+#else
+/* This is the model-independent version. Since the standard I/O library
+   can't handle far buffers in the medium and small models, we have to copy
+   the data.
+*/
+
+#define NEAR_BUF_SIZE 1024
+#define MIN(a,b) (a <= b ? a : b)
+
+static void PNGAPI
+png_default_read_data(png_structp png_ptr, png_bytep data, png_size_t length)
+{
+   int check;
+   png_byte *n_data;
+   png_FILE_p io_ptr;
+
+   if (png_ptr == NULL)
+      return;
+   /* Check if data really is near. If so, use usual code. */
+   n_data = (png_byte *)CVT_PTR_NOCHECK(data);
+   io_ptr = (png_FILE_p)CVT_PTR(png_ptr->io_ptr);
+   if ((png_bytep)n_data == data)
+   {
+#ifdef _WIN32_WCE
+      if ( !ReadFile((HANDLE)(png_ptr->io_ptr), data, length, &check,
+          NULL) )
+         check = 0;
+#else
+      check = fread(n_data, 1, length, io_ptr);
+#endif
+   }
+   else
+   {
+      png_byte buf[NEAR_BUF_SIZE];
+      png_size_t read, remaining, err;
+      check = 0;
+      remaining = length;
+      do
+      {
+         read = MIN(NEAR_BUF_SIZE, remaining);
+#ifdef _WIN32_WCE
+         if ( !ReadFile((HANDLE)(io_ptr), buf, read, &err, NULL) )
+            err = 0;
+#else
+         err = fread(buf, (png_size_t)1, read, io_ptr);
+#endif
+         png_memcpy(data, buf, read); /* copy far buffer to near buffer */
+         if (err != read)
+            break;
+         else
+            check += err;
+         data += read;
+         remaining -= read;
+      }
+      while (remaining != 0);
+   }
+   if ((png_uint_32)check != (png_uint_32)length)
+      png_error(png_ptr, "read Error");
+}
+#endif
+#endif
+
+/* This function allows the application to supply a new input function
+ * for libpng if standard C streams aren't being used.
+ *
+ * This function takes as its arguments:
+ * png_ptr      - pointer to a png input data structure
+ * io_ptr       - pointer to user supplied structure containing info about
+ *                the input functions.  May be NULL.
+ * read_data_fn - pointer to a new input function that takes as its
+ *                arguments a pointer to a png_struct, a pointer to
+ *                a location where input data can be stored, and a 32-bit
+ *                unsigned int that is the number of bytes to be read.
+ *                To exit and output any fatal error messages the new write
+ *                function should call png_error(png_ptr, "Error msg").
+ *                May be NULL, in which case libpng's default function will
+ *                be used.
+ */
+void PNGAPI
+png_set_read_fn(png_structp png_ptr, png_voidp io_ptr,
+   png_rw_ptr read_data_fn)
+{
+   if (png_ptr == NULL)
+      return;
+   png_ptr->io_ptr = io_ptr;
+
+#ifdef PNG_STDIO_SUPPORTED
+   if (read_data_fn != NULL)
+      png_ptr->read_data_fn = read_data_fn;
+   else
+      png_ptr->read_data_fn = png_default_read_data;
+#else
+   png_ptr->read_data_fn = read_data_fn;
+#endif
+
+   /* It is an error to write to a read device */
+   if (png_ptr->write_data_fn != NULL)
+   {
+      png_ptr->write_data_fn = NULL;
+      png_warning(png_ptr,
+         "It's an error to set both read_data_fn and write_data_fn in the ");
+      png_warning(png_ptr,
+         "same structure.  Resetting write_data_fn to NULL.");
+   }
+
+#ifdef PNG_WRITE_FLUSH_SUPPORTED
+   png_ptr->output_flush_fn = NULL;
+#endif
+}
+#endif /* PNG_READ_SUPPORTED */
diff --git a/Externals/libpng/pngrtran.c b/Externals/libpng/pngrtran.c
index e6e0c46b4d..baaa395255 100644
--- a/Externals/libpng/pngrtran.c
+++ b/Externals/libpng/pngrtran.c
@@ -1,4224 +1,4470 @@
-
-/* pngrtran.c - transforms the data in a row for PNG readers
- *
- * Last changed in libpng 1.5.1 [February 3, 2011]
- * Copyright (c) 1998-2011 Glenn Randers-Pehrson
- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
- *
- * This code is released under the libpng license.
- * For conditions of distribution and use, see the disclaimer
- * and license in png.h
- *
- * This file contains functions optionally called by an application
- * in order to tell libpng how to handle data when reading a PNG.
- * Transformations that are used in both reading and writing are
- * in pngtrans.c.
- */
-
-#include "pngpriv.h"
-
-#ifdef PNG_READ_SUPPORTED
-
-/* Set the action on getting a CRC error for an ancillary or critical chunk. */
-void PNGAPI
-png_set_crc_action(png_structp png_ptr, int crit_action, int ancil_action)
-{
-   png_debug(1, "in png_set_crc_action");
-
-   if (png_ptr == NULL)
-      return;
-
-   /* Tell libpng how we react to CRC errors in critical chunks */
-   switch (crit_action)
-   {
-      case PNG_CRC_NO_CHANGE:                        /* Leave setting as is */
-         break;
-
-      case PNG_CRC_WARN_USE:                               /* Warn/use data */
-         png_ptr->flags &= ~PNG_FLAG_CRC_CRITICAL_MASK;
-         png_ptr->flags |= PNG_FLAG_CRC_CRITICAL_USE;
-         break;
-
-      case PNG_CRC_QUIET_USE:                             /* Quiet/use data */
-         png_ptr->flags &= ~PNG_FLAG_CRC_CRITICAL_MASK;
-         png_ptr->flags |= PNG_FLAG_CRC_CRITICAL_USE |
-                           PNG_FLAG_CRC_CRITICAL_IGNORE;
-         break;
-
-      case PNG_CRC_WARN_DISCARD:    /* Not a valid action for critical data */
-         png_warning(png_ptr,
-            "Can't discard critical data on CRC error");
-      case PNG_CRC_ERROR_QUIT:                                /* Error/quit */
-
-      case PNG_CRC_DEFAULT:
-      default:
-         png_ptr->flags &= ~PNG_FLAG_CRC_CRITICAL_MASK;
-         break;
-   }
-
-   /* Tell libpng how we react to CRC errors in ancillary chunks */
-   switch (ancil_action)
-   {
-      case PNG_CRC_NO_CHANGE:                       /* Leave setting as is */
-         break;
-
-      case PNG_CRC_WARN_USE:                              /* Warn/use data */
-         png_ptr->flags &= ~PNG_FLAG_CRC_ANCILLARY_MASK;
-         png_ptr->flags |= PNG_FLAG_CRC_ANCILLARY_USE;
-         break;
-
-      case PNG_CRC_QUIET_USE:                            /* Quiet/use data */
-         png_ptr->flags &= ~PNG_FLAG_CRC_ANCILLARY_MASK;
-         png_ptr->flags |= PNG_FLAG_CRC_ANCILLARY_USE |
-                           PNG_FLAG_CRC_ANCILLARY_NOWARN;
-         break;
-
-      case PNG_CRC_ERROR_QUIT:                               /* Error/quit */
-         png_ptr->flags &= ~PNG_FLAG_CRC_ANCILLARY_MASK;
-         png_ptr->flags |= PNG_FLAG_CRC_ANCILLARY_NOWARN;
-         break;
-
-      case PNG_CRC_WARN_DISCARD:                      /* Warn/discard data */
-
-      case PNG_CRC_DEFAULT:
-      default:
-         png_ptr->flags &= ~PNG_FLAG_CRC_ANCILLARY_MASK;
-         break;
-   }
-}
-
-#ifdef PNG_READ_BACKGROUND_SUPPORTED
-/* Handle alpha and tRNS via a background color */
-void PNGFAPI
-png_set_background_fixed(png_structp png_ptr,
-    png_const_color_16p background_color, int background_gamma_code,
-    int need_expand, png_fixed_point background_gamma)
-{
-   png_debug(1, "in png_set_background_fixed");
-
-   if (png_ptr == NULL)
-      return;
-
-   if (background_gamma_code == PNG_BACKGROUND_GAMMA_UNKNOWN)
-   {
-      png_warning(png_ptr, "Application must supply a known background gamma");
-      return;
-   }
-
-   png_ptr->transformations |= PNG_BACKGROUND;
-   png_memcpy(&(png_ptr->background), background_color,
-      png_sizeof(png_color_16));
-   png_ptr->background_gamma = background_gamma;
-   png_ptr->background_gamma_type = (png_byte)(background_gamma_code);
-   png_ptr->transformations |= (need_expand ? PNG_BACKGROUND_EXPAND : 0);
-}
-
-#  ifdef PNG_FLOATING_POINT_SUPPORTED
-void PNGAPI
-png_set_background(png_structp png_ptr,
-    png_const_color_16p background_color, int background_gamma_code,
-    int need_expand, double background_gamma)
-{
-   png_set_background_fixed(png_ptr, background_color, background_gamma_code,
-      need_expand, png_fixed(png_ptr, background_gamma, "png_set_background"));
-}
-#  endif  /* FLOATING_POINT */
-#endif /* READ_BACKGROUND */
-
-#ifdef PNG_READ_16_TO_8_SUPPORTED
-/* Strip 16 bit depth files to 8 bit depth */
-void PNGAPI
-png_set_strip_16(png_structp png_ptr)
-{
-   png_debug(1, "in png_set_strip_16");
-
-   if (png_ptr == NULL)
-      return;
-
-   png_ptr->transformations |= PNG_16_TO_8;
-}
-#endif
-
-#ifdef PNG_READ_STRIP_ALPHA_SUPPORTED
-void PNGAPI
-png_set_strip_alpha(png_structp png_ptr)
-{
-   png_debug(1, "in png_set_strip_alpha");
-
-   if (png_ptr == NULL)
-      return;
-
-   png_ptr->flags |= PNG_FLAG_STRIP_ALPHA;
-}
-#endif
-
-#ifdef PNG_READ_QUANTIZE_SUPPORTED
-/* Dither file to 8 bit.  Supply a palette, the current number
- * of elements in the palette, the maximum number of elements
- * allowed, and a histogram if possible.  If the current number
- * of colors is greater then the maximum number, the palette will be
- * modified to fit in the maximum number.  "full_quantize" indicates
- * whether we need a quantizing cube set up for RGB images, or if we
- * simply are reducing the number of colors in a paletted image.
- */
-
-typedef struct png_dsort_struct
-{
-   struct png_dsort_struct FAR * next;
-   png_byte left;
-   png_byte right;
-} png_dsort;
-typedef png_dsort FAR *       png_dsortp;
-typedef png_dsort FAR * FAR * png_dsortpp;
-
-void PNGAPI
-png_set_quantize(png_structp png_ptr, png_colorp palette,
-    int num_palette, int maximum_colors, png_const_uint_16p histogram,
-    int full_quantize)
-{
-   png_debug(1, "in png_set_quantize");
-
-   if (png_ptr == NULL)
-      return;
-
-   png_ptr->transformations |= PNG_QUANTIZE;
-
-   if (!full_quantize)
-   {
-      int i;
-
-      png_ptr->quantize_index = (png_bytep)png_malloc(png_ptr,
-          (png_uint_32)(num_palette * png_sizeof(png_byte)));
-      for (i = 0; i < num_palette; i++)
-         png_ptr->quantize_index[i] = (png_byte)i;
-   }
-
-   if (num_palette > maximum_colors)
-   {
-      if (histogram != NULL)
-      {
-         /* This is easy enough, just throw out the least used colors.
-          * Perhaps not the best solution, but good enough.
-          */
-
-         int i;
-
-         /* Initialize an array to sort colors */
-         png_ptr->quantize_sort = (png_bytep)png_malloc(png_ptr,
-             (png_uint_32)(num_palette * png_sizeof(png_byte)));
-
-         /* Initialize the quantize_sort array */
-         for (i = 0; i < num_palette; i++)
-            png_ptr->quantize_sort[i] = (png_byte)i;
-
-         /* Find the least used palette entries by starting a
-          * bubble sort, and running it until we have sorted
-          * out enough colors.  Note that we don't care about
-          * sorting all the colors, just finding which are
-          * least used.
-          */
-
-         for (i = num_palette - 1; i >= maximum_colors; i--)
-         {
-            int done; /* To stop early if the list is pre-sorted */
-            int j;
-
-            done = 1;
-            for (j = 0; j < i; j++)
-            {
-               if (histogram[png_ptr->quantize_sort[j]]
-                   < histogram[png_ptr->quantize_sort[j + 1]])
-               {
-                  png_byte t;
-
-                  t = png_ptr->quantize_sort[j];
-                  png_ptr->quantize_sort[j] = png_ptr->quantize_sort[j + 1];
-                  png_ptr->quantize_sort[j + 1] = t;
-                  done = 0;
-               }
-            }
-
-            if (done)
-               break;
-         }
-
-         /* Swap the palette around, and set up a table, if necessary */
-         if (full_quantize)
-         {
-            int j = num_palette;
-
-            /* Put all the useful colors within the max, but don't
-             * move the others.
-             */
-            for (i = 0; i < maximum_colors; i++)
-            {
-               if ((int)png_ptr->quantize_sort[i] >= maximum_colors)
-               {
-                  do
-                     j--;
-                  while ((int)png_ptr->quantize_sort[j] >= maximum_colors);
-
-                  palette[i] = palette[j];
-               }
-            }
-         }
-         else
-         {
-            int j = num_palette;
-
-            /* Move all the used colors inside the max limit, and
-             * develop a translation table.
-             */
-            for (i = 0; i < maximum_colors; i++)
-            {
-               /* Only move the colors we need to */
-               if ((int)png_ptr->quantize_sort[i] >= maximum_colors)
-               {
-                  png_color tmp_color;
-
-                  do
-                     j--;
-                  while ((int)png_ptr->quantize_sort[j] >= maximum_colors);
-
-                  tmp_color = palette[j];
-                  palette[j] = palette[i];
-                  palette[i] = tmp_color;
-                  /* Indicate where the color went */
-                  png_ptr->quantize_index[j] = (png_byte)i;
-                  png_ptr->quantize_index[i] = (png_byte)j;
-               }
-            }
-
-            /* Find closest color for those colors we are not using */
-            for (i = 0; i < num_palette; i++)
-            {
-               if ((int)png_ptr->quantize_index[i] >= maximum_colors)
-               {
-                  int min_d, k, min_k, d_index;
-
-                  /* Find the closest color to one we threw out */
-                  d_index = png_ptr->quantize_index[i];
-                  min_d = PNG_COLOR_DIST(palette[d_index], palette[0]);
-                  for (k = 1, min_k = 0; k < maximum_colors; k++)
-                  {
-                     int d;
-
-                     d = PNG_COLOR_DIST(palette[d_index], palette[k]);
-
-                     if (d < min_d)
-                     {
-                        min_d = d;
-                        min_k = k;
-                     }
-                  }
-                  /* Point to closest color */
-                  png_ptr->quantize_index[i] = (png_byte)min_k;
-               }
-            }
-         }
-         png_free(png_ptr, png_ptr->quantize_sort);
-         png_ptr->quantize_sort = NULL;
-      }
-      else
-      {
-         /* This is much harder to do simply (and quickly).  Perhaps
-          * we need to go through a median cut routine, but those
-          * don't always behave themselves with only a few colors
-          * as input.  So we will just find the closest two colors,
-          * and throw out one of them (chosen somewhat randomly).
-          * [We don't understand this at all, so if someone wants to
-          *  work on improving it, be our guest - AED, GRP]
-          */
-         int i;
-         int max_d;
-         int num_new_palette;
-         png_dsortp t;
-         png_dsortpp hash;
-
-         t = NULL;
-
-         /* Initialize palette index arrays */
-         png_ptr->index_to_palette = (png_bytep)png_malloc(png_ptr,
-             (png_uint_32)(num_palette * png_sizeof(png_byte)));
-         png_ptr->palette_to_index = (png_bytep)png_malloc(png_ptr,
-             (png_uint_32)(num_palette * png_sizeof(png_byte)));
-
-         /* Initialize the sort array */
-         for (i = 0; i < num_palette; i++)
-         {
-            png_ptr->index_to_palette[i] = (png_byte)i;
-            png_ptr->palette_to_index[i] = (png_byte)i;
-         }
-
-         hash = (png_dsortpp)png_calloc(png_ptr, (png_uint_32)(769 *
-             png_sizeof(png_dsortp)));
-
-         num_new_palette = num_palette;
-
-         /* Initial wild guess at how far apart the farthest pixel
-          * pair we will be eliminating will be.  Larger
-          * numbers mean more areas will be allocated, Smaller
-          * numbers run the risk of not saving enough data, and
-          * having to do this all over again.
-          *
-          * I have not done extensive checking on this number.
-          */
-         max_d = 96;
-
-         while (num_new_palette > maximum_colors)
-         {
-            for (i = 0; i < num_new_palette - 1; i++)
-            {
-               int j;
-
-               for (j = i + 1; j < num_new_palette; j++)
-               {
-                  int d;
-
-                  d = PNG_COLOR_DIST(palette[i], palette[j]);
-
-                  if (d <= max_d)
-                  {
-
-                     t = (png_dsortp)png_malloc_warn(png_ptr,
-                         (png_uint_32)(png_sizeof(png_dsort)));
-
-                     if (t == NULL)
-                         break;
-
-                     t->next = hash[d];
-                     t->left = (png_byte)i;
-                     t->right = (png_byte)j;
-                     hash[d] = t;
-                  }
-               }
-               if (t == NULL)
-                  break;
-            }
-
-            if (t != NULL)
-            for (i = 0; i <= max_d; i++)
-            {
-               if (hash[i] != NULL)
-               {
-                  png_dsortp p;
-
-                  for (p = hash[i]; p; p = p->next)
-                  {
-                     if ((int)png_ptr->index_to_palette[p->left]
-                         < num_new_palette &&
-                         (int)png_ptr->index_to_palette[p->right]
-                         < num_new_palette)
-                     {
-                        int j, next_j;
-
-                        if (num_new_palette & 0x01)
-                        {
-                           j = p->left;
-                           next_j = p->right;
-                        }
-                        else
-                        {
-                           j = p->right;
-                           next_j = p->left;
-                        }
-
-                        num_new_palette--;
-                        palette[png_ptr->index_to_palette[j]]
-                            = palette[num_new_palette];
-                        if (!full_quantize)
-                        {
-                           int k;
-
-                           for (k = 0; k < num_palette; k++)
-                           {
-                              if (png_ptr->quantize_index[k] ==
-                                  png_ptr->index_to_palette[j])
-                                 png_ptr->quantize_index[k] =
-                                     png_ptr->index_to_palette[next_j];
-
-                              if ((int)png_ptr->quantize_index[k] ==
-                                  num_new_palette)
-                                 png_ptr->quantize_index[k] =
-                                     png_ptr->index_to_palette[j];
-                           }
-                        }
-
-                        png_ptr->index_to_palette[png_ptr->palette_to_index
-                            [num_new_palette]] = png_ptr->index_to_palette[j];
-
-                        png_ptr->palette_to_index[png_ptr->index_to_palette[j]]
-                            = png_ptr->palette_to_index[num_new_palette];
-
-                        png_ptr->index_to_palette[j] =
-                            (png_byte)num_new_palette;
-
-                        png_ptr->palette_to_index[num_new_palette] =
-                            (png_byte)j;
-                     }
-                     if (num_new_palette <= maximum_colors)
-                        break;
-                  }
-                  if (num_new_palette <= maximum_colors)
-                     break;
-               }
-            }
-
-            for (i = 0; i < 769; i++)
-            {
-               if (hash[i] != NULL)
-               {
-                  png_dsortp p = hash[i];
-                  while (p)
-                  {
-                     t = p->next;
-                     png_free(png_ptr, p);
-                     p = t;
-                  }
-               }
-               hash[i] = 0;
-            }
-            max_d += 96;
-         }
-         png_free(png_ptr, hash);
-         png_free(png_ptr, png_ptr->palette_to_index);
-         png_free(png_ptr, png_ptr->index_to_palette);
-         png_ptr->palette_to_index = NULL;
-         png_ptr->index_to_palette = NULL;
-      }
-      num_palette = maximum_colors;
-   }
-   if (png_ptr->palette == NULL)
-   {
-      png_ptr->palette = palette;
-   }
-   png_ptr->num_palette = (png_uint_16)num_palette;
-
-   if (full_quantize)
-   {
-      int i;
-      png_bytep distance;
-      int total_bits = PNG_QUANTIZE_RED_BITS + PNG_QUANTIZE_GREEN_BITS +
-          PNG_QUANTIZE_BLUE_BITS;
-      int num_red = (1 << PNG_QUANTIZE_RED_BITS);
-      int num_green = (1 << PNG_QUANTIZE_GREEN_BITS);
-      int num_blue = (1 << PNG_QUANTIZE_BLUE_BITS);
-      png_size_t num_entries = ((png_size_t)1 << total_bits);
-
-      png_ptr->palette_lookup = (png_bytep)png_calloc(png_ptr,
-          (png_uint_32)(num_entries * png_sizeof(png_byte)));
-
-      distance = (png_bytep)png_malloc(png_ptr, (png_uint_32)(num_entries *
-          png_sizeof(png_byte)));
-
-      png_memset(distance, 0xff, num_entries * png_sizeof(png_byte));
-
-      for (i = 0; i < num_palette; i++)
-      {
-         int ir, ig, ib;
-         int r = (palette[i].red >> (8 - PNG_QUANTIZE_RED_BITS));
-         int g = (palette[i].green >> (8 - PNG_QUANTIZE_GREEN_BITS));
-         int b = (palette[i].blue >> (8 - PNG_QUANTIZE_BLUE_BITS));
-
-         for (ir = 0; ir < num_red; ir++)
-         {
-            /* int dr = abs(ir - r); */
-            int dr = ((ir > r) ? ir - r : r - ir);
-            int index_r = (ir << (PNG_QUANTIZE_BLUE_BITS +
-                PNG_QUANTIZE_GREEN_BITS));
-
-            for (ig = 0; ig < num_green; ig++)
-            {
-               /* int dg = abs(ig - g); */
-               int dg = ((ig > g) ? ig - g : g - ig);
-               int dt = dr + dg;
-               int dm = ((dr > dg) ? dr : dg);
-               int index_g = index_r | (ig << PNG_QUANTIZE_BLUE_BITS);
-
-               for (ib = 0; ib < num_blue; ib++)
-               {
-                  int d_index = index_g | ib;
-                  /* int db = abs(ib - b); */
-                  int db = ((ib > b) ? ib - b : b - ib);
-                  int dmax = ((dm > db) ? dm : db);
-                  int d = dmax + dt + db;
-
-                  if (d < (int)distance[d_index])
-                  {
-                     distance[d_index] = (png_byte)d;
-                     png_ptr->palette_lookup[d_index] = (png_byte)i;
-                  }
-               }
-            }
-         }
-      }
-
-      png_free(png_ptr, distance);
-   }
-}
-#endif /* PNG_READ_QUANTIZE_SUPPORTED */
-
-#ifdef PNG_READ_GAMMA_SUPPORTED
-/* Transform the image from the file_gamma to the screen_gamma.  We
- * only do transformations on images where the file_gamma and screen_gamma
- * are not close reciprocals, otherwise it slows things down slightly, and
- * also needlessly introduces small errors.
- *
- * We will turn off gamma transformation later if no semitransparent entries
- * are present in the tRNS array for palette images.  We can't do it here
- * because we don't necessarily have the tRNS chunk yet.
- */
-static int /* PRIVATE */
-png_gamma_threshold(png_fixed_point scrn_gamma, png_fixed_point file_gamma)
-{
-   /* PNG_GAMMA_THRESHOLD is the threshold for performing gamma
-    * correction as a difference of the overall transform from 1.0
-    *
-    * We want to compare the threshold with s*f - 1, if we get
-    * overflow here it is because of wacky gamma values so we
-    * turn on processing anyway.
-    */
-   png_fixed_point gtest;
-   return !png_muldiv(&gtest, scrn_gamma, file_gamma, PNG_FP_1) ||
-       png_gamma_significant(gtest);
-}
-
-void PNGFAPI
-png_set_gamma_fixed(png_structp png_ptr, png_fixed_point scrn_gamma,
-   png_fixed_point file_gamma)
-{
-   png_debug(1, "in png_set_gamma_fixed");
-
-   if (png_ptr == NULL)
-      return;
-
-   if ((png_ptr->color_type & PNG_COLOR_MASK_ALPHA) ||
-       (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE) ||
-       png_gamma_threshold(scrn_gamma, file_gamma))
-      png_ptr->transformations |= PNG_GAMMA;
-   png_ptr->gamma = file_gamma;
-   png_ptr->screen_gamma = scrn_gamma;
-}
-
-#  ifdef PNG_FLOATING_POINT_SUPPORTED
-void PNGAPI
-png_set_gamma(png_structp png_ptr, double scrn_gamma, double file_gamma)
-{
-   png_set_gamma_fixed(png_ptr,
-      png_fixed(png_ptr, scrn_gamma, "png_set_gamma screen gamma"),
-      png_fixed(png_ptr, file_gamma, "png_set_gamma file gamma"));
-}
-#  endif /* FLOATING_POINT_SUPPORTED */
-#endif /* READ_GAMMA */
-
-#ifdef PNG_READ_EXPAND_SUPPORTED
-/* Expand paletted images to RGB, expand grayscale images of
- * less than 8-bit depth to 8-bit depth, and expand tRNS chunks
- * to alpha channels.
- */
-void PNGAPI
-png_set_expand(png_structp png_ptr)
-{
-   png_debug(1, "in png_set_expand");
-
-   if (png_ptr == NULL)
-      return;
-
-   png_ptr->transformations |= (PNG_EXPAND | PNG_EXPAND_tRNS);
-   png_ptr->flags &= ~PNG_FLAG_ROW_INIT;
-}
-
-/* GRR 19990627:  the following three functions currently are identical
- *  to png_set_expand().  However, it is entirely reasonable that someone
- *  might wish to expand an indexed image to RGB but *not* expand a single,
- *  fully transparent palette entry to a full alpha channel--perhaps instead
- *  convert tRNS to the grayscale/RGB format (16-bit RGB value), or replace
- *  the transparent color with a particular RGB value, or drop tRNS entirely.
- *  IOW, a future version of the library may make the transformations flag
- *  a bit more fine-grained, with separate bits for each of these three
- *  functions.
- *
- *  More to the point, these functions make it obvious what libpng will be
- *  doing, whereas "expand" can (and does) mean any number of things.
- *
- *  GRP 20060307: In libpng-1.2.9, png_set_gray_1_2_4_to_8() was modified
- *  to expand only the sample depth but not to expand the tRNS to alpha
- *  and its name was changed to png_set_expand_gray_1_2_4_to_8().
- */
-
-/* Expand paletted images to RGB. */
-void PNGAPI
-png_set_palette_to_rgb(png_structp png_ptr)
-{
-   png_debug(1, "in png_set_palette_to_rgb");
-
-   if (png_ptr == NULL)
-      return;
-
-   png_ptr->transformations |= (PNG_EXPAND | PNG_EXPAND_tRNS);
-   png_ptr->flags &= ~PNG_FLAG_ROW_INIT;
-}
-
-/* Expand grayscale images of less than 8-bit depth to 8 bits. */
-void PNGAPI
-png_set_expand_gray_1_2_4_to_8(png_structp png_ptr)
-{
-   png_debug(1, "in png_set_expand_gray_1_2_4_to_8");
-
-   if (png_ptr == NULL)
-      return;
-
-   png_ptr->transformations |= PNG_EXPAND;
-   png_ptr->flags &= ~PNG_FLAG_ROW_INIT;
-}
-
-
-
-/* Expand tRNS chunks to alpha channels. */
-void PNGAPI
-png_set_tRNS_to_alpha(png_structp png_ptr)
-{
-   png_debug(1, "in png_set_tRNS_to_alpha");
-
-   png_ptr->transformations |= (PNG_EXPAND | PNG_EXPAND_tRNS);
-   png_ptr->flags &= ~PNG_FLAG_ROW_INIT;
-}
-#endif /* defined(PNG_READ_EXPAND_SUPPORTED) */
-
-#ifdef PNG_READ_GRAY_TO_RGB_SUPPORTED
-void PNGAPI
-png_set_gray_to_rgb(png_structp png_ptr)
-{
-   png_debug(1, "in png_set_gray_to_rgb");
-
-   if (png_ptr != NULL)
-   {
-      /* Because rgb must be 8 bits or more: */
-      png_set_expand_gray_1_2_4_to_8(png_ptr);
-      png_ptr->transformations |= PNG_GRAY_TO_RGB;
-      png_ptr->flags &= ~PNG_FLAG_ROW_INIT;
-   }
-}
-#endif
-
-#ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED
-void PNGFAPI
-png_set_rgb_to_gray_fixed(png_structp png_ptr, int error_action,
-    png_fixed_point red, png_fixed_point green)
-{
-   png_debug(1, "in png_set_rgb_to_gray");
-
-   if (png_ptr == NULL)
-      return;
-
-   switch(error_action)
-   {
-      case 1:
-         png_ptr->transformations |= PNG_RGB_TO_GRAY;
-         break;
-
-      case 2:
-         png_ptr->transformations |= PNG_RGB_TO_GRAY_WARN;
-         break;
-
-      case 3:
-         png_ptr->transformations |= PNG_RGB_TO_GRAY_ERR;
-         break;
-
-      default:
-         png_error(png_ptr, "invalid error action to rgb_to_gray");
-         break;
-   }
-   if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
-#ifdef PNG_READ_EXPAND_SUPPORTED
-      png_ptr->transformations |= PNG_EXPAND;
-#else
-   {
-      png_warning(png_ptr,
-        "Cannot do RGB_TO_GRAY without EXPAND_SUPPORTED");
-
-      png_ptr->transformations &= ~PNG_RGB_TO_GRAY;
-   }
-#endif
-   {
-      png_uint_16 red_int, green_int;
-      if (red < 0 || green < 0)
-      {
-         red_int   =  6968; /* .212671 * 32768 + .5 */
-         green_int = 23434; /* .715160 * 32768 + .5 */
-      }
-
-      else if (red + green < 100000L)
-      {
-         red_int = (png_uint_16)(((png_uint_32)red*32768L)/100000L);
-         green_int = (png_uint_16)(((png_uint_32)green*32768L)/100000L);
-      }
-
-      else
-      {
-         png_warning(png_ptr, "ignoring out of range rgb_to_gray coefficients");
-         red_int   =  6968;
-         green_int = 23434;
-      }
-
-      png_ptr->rgb_to_gray_red_coeff   = red_int;
-      png_ptr->rgb_to_gray_green_coeff = green_int;
-      png_ptr->rgb_to_gray_blue_coeff  =
-          (png_uint_16)(32768 - red_int - green_int);
-   }
-}
-
-#ifdef PNG_FLOATING_POINT_SUPPORTED
-/* Convert a RGB image to a grayscale of the same width.  This allows us,
- * for example, to convert a 24 bpp RGB image into an 8 bpp grayscale image.
- */
-
-void PNGAPI
-png_set_rgb_to_gray(png_structp png_ptr, int error_action, double red,
-   double green)
-{
-   if (png_ptr == NULL)
-      return;
-
-   png_set_rgb_to_gray_fixed(png_ptr, error_action,
-      png_fixed(png_ptr, red, "rgb to gray red coefficient"),
-      png_fixed(png_ptr, green, "rgb to gray green coefficient"));
-}
-#endif /* FLOATING POINT */
-
-#endif
-
-#if defined(PNG_READ_USER_TRANSFORM_SUPPORTED) || \
-    defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED)
-void PNGAPI
-png_set_read_user_transform_fn(png_structp png_ptr, png_user_transform_ptr
-    read_user_transform_fn)
-{
-   png_debug(1, "in png_set_read_user_transform_fn");
-
-   if (png_ptr == NULL)
-      return;
-
-#ifdef PNG_READ_USER_TRANSFORM_SUPPORTED
-   png_ptr->transformations |= PNG_USER_TRANSFORM;
-   png_ptr->read_user_transform_fn = read_user_transform_fn;
-#endif
-}
-#endif
-
-/* Initialize everything needed for the read.  This includes modifying
- * the palette.
- */
-void /* PRIVATE */
-png_init_read_transformations(png_structp png_ptr)
-{
-   png_debug(1, "in png_init_read_transformations");
-
-  {
-#if defined(PNG_READ_BACKGROUND_SUPPORTED) || \
-    defined(PNG_READ_SHIFT_SUPPORTED) || \
-    defined(PNG_READ_GAMMA_SUPPORTED)
-   int color_type = png_ptr->color_type;
-#endif
-
-#if defined(PNG_READ_EXPAND_SUPPORTED) && defined(PNG_READ_BACKGROUND_SUPPORTED)
-
-#ifdef PNG_READ_GRAY_TO_RGB_SUPPORTED
-   /* Detect gray background and attempt to enable optimization
-    * for gray --> RGB case
-    *
-    * Note:  if PNG_BACKGROUND_EXPAND is set and color_type is either RGB or
-    * RGB_ALPHA (in which case need_expand is superfluous anyway), the
-    * background color might actually be gray yet not be flagged as such.
-    * This is not a problem for the current code, which uses
-    * PNG_BACKGROUND_IS_GRAY only to decide when to do the
-    * png_do_gray_to_rgb() transformation.
-    */
-   if ((png_ptr->transformations & PNG_BACKGROUND_EXPAND) &&
-       !(color_type & PNG_COLOR_MASK_COLOR))
-   {
-      png_ptr->mode |= PNG_BACKGROUND_IS_GRAY;
-   }
-
-   else if ((png_ptr->transformations & PNG_BACKGROUND) &&
-       !(png_ptr->transformations & PNG_BACKGROUND_EXPAND) &&
-       (png_ptr->transformations & PNG_GRAY_TO_RGB) &&
-       png_ptr->background.red == png_ptr->background.green &&
-       png_ptr->background.red == png_ptr->background.blue)
-   {
-      png_ptr->mode |= PNG_BACKGROUND_IS_GRAY;
-      png_ptr->background.gray = png_ptr->background.red;
-   }
-#endif
-
-   if ((png_ptr->transformations & PNG_BACKGROUND_EXPAND) &&
-       (png_ptr->transformations & PNG_EXPAND))
-   {
-      if (!(color_type & PNG_COLOR_MASK_COLOR))  /* i.e., GRAY or GRAY_ALPHA */
-      {
-         /* Expand background and tRNS chunks */
-         switch (png_ptr->bit_depth)
-         {
-            case 1:
-               png_ptr->background.gray *= (png_uint_16)0xff;
-               png_ptr->background.red = png_ptr->background.green
-                   =  png_ptr->background.blue = png_ptr->background.gray;
-               if (!(png_ptr->transformations & PNG_EXPAND_tRNS))
-               {
-                 png_ptr->trans_color.gray *= (png_uint_16)0xff;
-                 png_ptr->trans_color.red = png_ptr->trans_color.green
-                     = png_ptr->trans_color.blue = png_ptr->trans_color.gray;
-               }
-               break;
-
-            case 2:
-               png_ptr->background.gray *= (png_uint_16)0x55;
-               png_ptr->background.red = png_ptr->background.green
-                   = png_ptr->background.blue = png_ptr->background.gray;
-               if (!(png_ptr->transformations & PNG_EXPAND_tRNS))
-               {
-                  png_ptr->trans_color.gray *= (png_uint_16)0x55;
-                  png_ptr->trans_color.red = png_ptr->trans_color.green
-                      = png_ptr->trans_color.blue = png_ptr->trans_color.gray;
-               }
-               break;
-
-            case 4:
-               png_ptr->background.gray *= (png_uint_16)0x11;
-               png_ptr->background.red = png_ptr->background.green
-                   = png_ptr->background.blue = png_ptr->background.gray;
-               if (!(png_ptr->transformations & PNG_EXPAND_tRNS))
-               {
-                  png_ptr->trans_color.gray *= (png_uint_16)0x11;
-                  png_ptr->trans_color.red = png_ptr->trans_color.green
-                      = png_ptr->trans_color.blue = png_ptr->trans_color.gray;
-               }
-               break;
-
-            default:
-
-            case 8:
-
-            case 16:
-               png_ptr->background.red = png_ptr->background.green
-                   = png_ptr->background.blue = png_ptr->background.gray;
-               break;
-         }
-      }
-      else if (color_type == PNG_COLOR_TYPE_PALETTE)
-      {
-         png_ptr->background.red   =
-             png_ptr->palette[png_ptr->background.index].red;
-         png_ptr->background.green =
-             png_ptr->palette[png_ptr->background.index].green;
-         png_ptr->background.blue  =
-             png_ptr->palette[png_ptr->background.index].blue;
-
-#ifdef PNG_READ_INVERT_ALPHA_SUPPORTED
-        if (png_ptr->transformations & PNG_INVERT_ALPHA)
-        {
-#ifdef PNG_READ_EXPAND_SUPPORTED
-           if (!(png_ptr->transformations & PNG_EXPAND_tRNS))
-#endif
-           {
-              /* Invert the alpha channel (in tRNS) unless the pixels are
-               * going to be expanded, in which case leave it for later
-               */
-              int i, istop;
-              istop=(int)png_ptr->num_trans;
-              for (i=0; i<istop; i++)
-                 png_ptr->trans_alpha[i] = (png_byte)(255 -
-                    png_ptr->trans_alpha[i]);
-           }
-        }
-#endif
-
-      }
-   }
-#endif
-
-#if defined(PNG_READ_BACKGROUND_SUPPORTED) && defined(PNG_READ_GAMMA_SUPPORTED)
-   png_ptr->background_1 = png_ptr->background;
-#endif
-#ifdef PNG_READ_GAMMA_SUPPORTED
-
-   if ((color_type == PNG_COLOR_TYPE_PALETTE && png_ptr->num_trans != 0)
-       && png_gamma_threshold(png_ptr->screen_gamma, png_ptr->gamma))
-   {
-      int i, k;
-      k=0;
-      for (i=0; i<png_ptr->num_trans; i++)
-      {
-        if (png_ptr->trans_alpha[i] != 0 && png_ptr->trans_alpha[i] != 0xff)
-           k=1; /* Partial transparency is present */
-      }
-      if (k == 0)
-         png_ptr->transformations &= ~PNG_GAMMA;
-   }
-
-   if ((png_ptr->transformations & (PNG_GAMMA | PNG_RGB_TO_GRAY)) &&
-       png_ptr->gamma != 0)
-   {
-      png_build_gamma_table(png_ptr, png_ptr->bit_depth);
-
-#ifdef PNG_READ_BACKGROUND_SUPPORTED
-      if (png_ptr->transformations & PNG_BACKGROUND)
-      {
-         if (color_type == PNG_COLOR_TYPE_PALETTE)
-         {
-            /* Could skip if no transparency */
-            png_color back, back_1;
-            png_colorp palette = png_ptr->palette;
-            int num_palette = png_ptr->num_palette;
-            int i;
-            if (png_ptr->background_gamma_type == PNG_BACKGROUND_GAMMA_FILE)
-            {
-
-               back.red = png_ptr->gamma_table[png_ptr->background.red];
-               back.green = png_ptr->gamma_table[png_ptr->background.green];
-               back.blue = png_ptr->gamma_table[png_ptr->background.blue];
-
-               back_1.red = png_ptr->gamma_to_1[png_ptr->background.red];
-               back_1.green = png_ptr->gamma_to_1[png_ptr->background.green];
-               back_1.blue = png_ptr->gamma_to_1[png_ptr->background.blue];
-            }
-            else
-            {
-               png_fixed_point g, gs;
-
-               switch (png_ptr->background_gamma_type)
-               {
-                  case PNG_BACKGROUND_GAMMA_SCREEN:
-                     g = (png_ptr->screen_gamma);
-                     gs = PNG_FP_1;
-                     break;
-
-                  case PNG_BACKGROUND_GAMMA_FILE:
-                     g = png_reciprocal(png_ptr->gamma);
-                     gs = png_reciprocal2(png_ptr->gamma,
-                        png_ptr->screen_gamma);
-                     break;
-
-                  case PNG_BACKGROUND_GAMMA_UNIQUE:
-                     g = png_reciprocal(png_ptr->background_gamma);
-                     gs = png_reciprocal2(png_ptr->background_gamma,
-                        png_ptr->screen_gamma);
-                     break;
-                  default:
-                     g = PNG_FP_1;    /* back_1 */
-                     gs = PNG_FP_1;   /* back */
-                     break;
-               }
-
-               if (png_gamma_significant(gs))
-               {
-                  back.red   = (png_byte)png_ptr->background.red;
-                  back.green = (png_byte)png_ptr->background.green;
-                  back.blue  = (png_byte)png_ptr->background.blue;
-               }
-
-               else
-               {
-                  back.red = png_gamma_8bit_correct(png_ptr->background.red,
-                      gs);
-                  back.green = png_gamma_8bit_correct(png_ptr->background.green,
-                      gs);
-                  back.blue = png_gamma_8bit_correct(png_ptr->background.blue,
-                      gs);
-               }
-               back_1.red = png_gamma_8bit_correct(png_ptr->background.red, g);
-               back_1.green = png_gamma_8bit_correct(png_ptr->background.green,
-                   g);
-               back_1.blue = png_gamma_8bit_correct(png_ptr->background.blue,
-                   g);
-            }
-            for (i = 0; i < num_palette; i++)
-            {
-               if (i < (int)png_ptr->num_trans &&
-                   png_ptr->trans_alpha[i] != 0xff)
-               {
-                  if (png_ptr->trans_alpha[i] == 0)
-                  {
-                     palette[i] = back;
-                  }
-                  else /* if (png_ptr->trans_alpha[i] != 0xff) */
-                  {
-                     png_byte v, w;
-
-                     v = png_ptr->gamma_to_1[palette[i].red];
-                     png_composite(w, v, png_ptr->trans_alpha[i], back_1.red);
-                     palette[i].red = png_ptr->gamma_from_1[w];
-
-                     v = png_ptr->gamma_to_1[palette[i].green];
-                     png_composite(w, v, png_ptr->trans_alpha[i], back_1.green);
-                     palette[i].green = png_ptr->gamma_from_1[w];
-
-                     v = png_ptr->gamma_to_1[palette[i].blue];
-                     png_composite(w, v, png_ptr->trans_alpha[i], back_1.blue);
-                     palette[i].blue = png_ptr->gamma_from_1[w];
-                  }
-               }
-               else
-               {
-                  palette[i].red = png_ptr->gamma_table[palette[i].red];
-                  palette[i].green = png_ptr->gamma_table[palette[i].green];
-                  palette[i].blue = png_ptr->gamma_table[palette[i].blue];
-               }
-            }
-            /* Prevent the transformations being done again, and make sure
-             * that the now spurious alpha channel is stripped - the code
-             * has just reduced background composition and gamma correction
-             * to a simple alpha channel strip.
-             */
-            png_ptr->transformations &= ~PNG_BACKGROUND;
-            png_ptr->transformations &= ~PNG_GAMMA;
-            png_ptr->flags |= PNG_FLAG_STRIP_ALPHA;
-         }
-
-         /* if (png_ptr->background_gamma_type!=PNG_BACKGROUND_GAMMA_UNKNOWN) */
-         else
-         /* color_type != PNG_COLOR_TYPE_PALETTE */
-         {
-            png_fixed_point g = PNG_FP_1;
-            png_fixed_point gs = PNG_FP_1;
-
-            switch (png_ptr->background_gamma_type)
-            {
-               case PNG_BACKGROUND_GAMMA_SCREEN:
-                  g = png_ptr->screen_gamma;
-                  /* gs = PNG_FP_1; */
-                  break;
-
-               case PNG_BACKGROUND_GAMMA_FILE:
-                  g = png_reciprocal(png_ptr->gamma);
-                  gs = png_reciprocal2(png_ptr->gamma, png_ptr->screen_gamma);
-                  break;
-
-               case PNG_BACKGROUND_GAMMA_UNIQUE:
-                  g = png_reciprocal(png_ptr->background_gamma);
-                  gs = png_reciprocal2(png_ptr->background_gamma,
-                      png_ptr->screen_gamma);
-                  break;
-
-               default:
-                  png_error(png_ptr, "invalid background gamma type");
-            }
-
-            png_ptr->background_1.gray = png_gamma_correct(png_ptr,
-                png_ptr->background.gray, g);
-
-            png_ptr->background.gray = png_gamma_correct(png_ptr,
-                png_ptr->background.gray, gs);
-
-            if ((png_ptr->background.red != png_ptr->background.green) ||
-                (png_ptr->background.red != png_ptr->background.blue) ||
-                (png_ptr->background.red != png_ptr->background.gray))
-            {
-               /* RGB or RGBA with color background */
-               png_ptr->background_1.red = png_gamma_correct(png_ptr,
-                   png_ptr->background.red, g);
-
-               png_ptr->background_1.green = png_gamma_correct(png_ptr,
-                   png_ptr->background.green, g);
-
-               png_ptr->background_1.blue = png_gamma_correct(png_ptr,
-                   png_ptr->background.blue, g);
-
-               png_ptr->background.red = png_gamma_correct(png_ptr,
-                   png_ptr->background.red, gs);
-
-               png_ptr->background.green = png_gamma_correct(png_ptr,
-                   png_ptr->background.green, gs);
-
-               png_ptr->background.blue = png_gamma_correct(png_ptr,
-                   png_ptr->background.blue, gs);
-            }
-
-            else
-            {
-               /* GRAY, GRAY ALPHA, RGB, or RGBA with gray background */
-               png_ptr->background_1.red = png_ptr->background_1.green
-                   = png_ptr->background_1.blue = png_ptr->background_1.gray;
-
-               png_ptr->background.red = png_ptr->background.green
-                   = png_ptr->background.blue = png_ptr->background.gray;
-            }
-         }
-      }
-      else
-      /* Transformation does not include PNG_BACKGROUND */
-#endif /* PNG_READ_BACKGROUND_SUPPORTED */
-      if (color_type == PNG_COLOR_TYPE_PALETTE)
-      {
-         png_colorp palette = png_ptr->palette;
-         int num_palette = png_ptr->num_palette;
-         int i;
-
-         for (i = 0; i < num_palette; i++)
-         {
-            palette[i].red = png_ptr->gamma_table[palette[i].red];
-            palette[i].green = png_ptr->gamma_table[palette[i].green];
-            palette[i].blue = png_ptr->gamma_table[palette[i].blue];
-         }
-
-         /* Done the gamma correction. */
-         png_ptr->transformations &= ~PNG_GAMMA;
-      }
-   }
-#ifdef PNG_READ_BACKGROUND_SUPPORTED
-   else
-#endif
-#endif /* PNG_READ_GAMMA_SUPPORTED */
-#ifdef PNG_READ_BACKGROUND_SUPPORTED
-   /* No GAMMA transformation */
-   if ((png_ptr->transformations & PNG_BACKGROUND) &&
-       (color_type == PNG_COLOR_TYPE_PALETTE))
-   {
-      int i;
-      int istop = (int)png_ptr->num_trans;
-      png_color back;
-      png_colorp palette = png_ptr->palette;
-
-      back.red   = (png_byte)png_ptr->background.red;
-      back.green = (png_byte)png_ptr->background.green;
-      back.blue  = (png_byte)png_ptr->background.blue;
-
-      for (i = 0; i < istop; i++)
-      {
-         if (png_ptr->trans_alpha[i] == 0)
-         {
-            palette[i] = back;
-         }
-
-         else if (png_ptr->trans_alpha[i] != 0xff)
-         {
-            /* The png_composite() macro is defined in png.h */
-            png_composite(palette[i].red, palette[i].red,
-                png_ptr->trans_alpha[i], back.red);
-
-            png_composite(palette[i].green, palette[i].green,
-                png_ptr->trans_alpha[i], back.green);
-
-            png_composite(palette[i].blue, palette[i].blue,
-                png_ptr->trans_alpha[i], back.blue);
-         }
-      }
-
-      /* Handled alpha, still need to strip the channel. */
-      png_ptr->transformations &= ~PNG_BACKGROUND;
-      png_ptr->flags |= PNG_FLAG_STRIP_ALPHA;
-   }
-#endif /* PNG_READ_BACKGROUND_SUPPORTED */
-
-#ifdef PNG_READ_SHIFT_SUPPORTED
-   if ((png_ptr->transformations & PNG_SHIFT) &&
-       (color_type == PNG_COLOR_TYPE_PALETTE))
-   {
-      png_uint_16 i;
-      png_uint_16 istop = png_ptr->num_palette;
-      int sr = 8 - png_ptr->sig_bit.red;
-      int sg = 8 - png_ptr->sig_bit.green;
-      int sb = 8 - png_ptr->sig_bit.blue;
-
-      if (sr < 0 || sr > 8)
-         sr = 0;
-
-      if (sg < 0 || sg > 8)
-         sg = 0;
-
-      if (sb < 0 || sb > 8)
-         sb = 0;
-
-      for (i = 0; i < istop; i++)
-      {
-         png_ptr->palette[i].red >>= sr;
-         png_ptr->palette[i].green >>= sg;
-         png_ptr->palette[i].blue >>= sb;
-      }
-   }
-#endif  /* PNG_READ_SHIFT_SUPPORTED */
- }
-#if !defined(PNG_READ_GAMMA_SUPPORTED) && !defined(PNG_READ_SHIFT_SUPPORTED) \
- && !defined(PNG_READ_BACKGROUND_SUPPORTED)
-   if (png_ptr)
-      return;
-#endif
-}
-
-/* Modify the info structure to reflect the transformations.  The
- * info should be updated so a PNG file could be written with it,
- * assuming the transformations result in valid PNG data.
- */
-void /* PRIVATE */
-png_read_transform_info(png_structp png_ptr, png_infop info_ptr)
-{
-   png_debug(1, "in png_read_transform_info");
-
-#ifdef PNG_READ_EXPAND_SUPPORTED
-   if (png_ptr->transformations & PNG_EXPAND)
-   {
-      if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
-      {
-         if (png_ptr->num_trans &&
-             (png_ptr->transformations & PNG_EXPAND_tRNS))
-            info_ptr->color_type = PNG_COLOR_TYPE_RGB_ALPHA;
-
-         else
-            info_ptr->color_type = PNG_COLOR_TYPE_RGB;
-
-         info_ptr->bit_depth = 8;
-         info_ptr->num_trans = 0;
-      }
-      else
-      {
-         if (png_ptr->num_trans)
-         {
-            if (png_ptr->transformations & PNG_EXPAND_tRNS)
-               info_ptr->color_type |= PNG_COLOR_MASK_ALPHA;
-         }
-         if (info_ptr->bit_depth < 8)
-            info_ptr->bit_depth = 8;
-
-         info_ptr->num_trans = 0;
-      }
-   }
-#endif
-
-#ifdef PNG_READ_BACKGROUND_SUPPORTED
-   if (png_ptr->transformations & PNG_BACKGROUND)
-   {
-      info_ptr->color_type = (png_byte)(info_ptr->color_type &
-          ~PNG_COLOR_MASK_ALPHA);
-      info_ptr->num_trans = 0;
-      info_ptr->background = png_ptr->background;
-   }
-#endif
-
-#ifdef PNG_READ_GAMMA_SUPPORTED
-   if (png_ptr->transformations & PNG_GAMMA)
-   {
-      info_ptr->gamma = png_ptr->gamma;
-   }
-#endif
-
-#ifdef PNG_READ_16_TO_8_SUPPORTED
-#ifdef PNG_READ_16BIT_SUPPORTED
-   if ((png_ptr->transformations & PNG_16_TO_8) && (info_ptr->bit_depth == 16))
-      info_ptr->bit_depth = 8;
-#else
-   /* Force chopping 16-bit input down to 8 */
-   if (info_ptr->bit_depth == 16)
-   {
-      png_ptr->transformations |=PNG_16_TO_8;
-      info_ptr->bit_depth = 8;
-   }
-#endif
-#endif
-
-#ifdef PNG_READ_GRAY_TO_RGB_SUPPORTED
-   if (png_ptr->transformations & PNG_GRAY_TO_RGB)
-      info_ptr->color_type |= PNG_COLOR_MASK_COLOR;
-#endif
-
-#ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED
-   if (png_ptr->transformations & PNG_RGB_TO_GRAY)
-      info_ptr->color_type &= ~PNG_COLOR_MASK_COLOR;
-#endif
-
-#ifdef PNG_READ_QUANTIZE_SUPPORTED
-   if (png_ptr->transformations & PNG_QUANTIZE)
-   {
-      if (((info_ptr->color_type == PNG_COLOR_TYPE_RGB) ||
-          (info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA)) &&
-          png_ptr->palette_lookup && info_ptr->bit_depth == 8)
-      {
-         info_ptr->color_type = PNG_COLOR_TYPE_PALETTE;
-      }
-   }
-#endif
-
-#ifdef PNG_READ_PACK_SUPPORTED
-   if ((png_ptr->transformations & PNG_PACK) && (info_ptr->bit_depth < 8))
-      info_ptr->bit_depth = 8;
-#endif
-
-   if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
-      info_ptr->channels = 1;
-
-   else if (info_ptr->color_type & PNG_COLOR_MASK_COLOR)
-      info_ptr->channels = 3;
-
-   else
-      info_ptr->channels = 1;
-
-#ifdef PNG_READ_STRIP_ALPHA_SUPPORTED
-   if (png_ptr->flags & PNG_FLAG_STRIP_ALPHA)
-      info_ptr->color_type &= ~PNG_COLOR_MASK_ALPHA;
-#endif
-
-   if (info_ptr->color_type & PNG_COLOR_MASK_ALPHA)
-      info_ptr->channels++;
-
-#ifdef PNG_READ_FILLER_SUPPORTED
-   /* STRIP_ALPHA and FILLER allowed:  MASK_ALPHA bit stripped above */
-   if ((png_ptr->transformations & PNG_FILLER) &&
-       ((info_ptr->color_type == PNG_COLOR_TYPE_RGB) ||
-       (info_ptr->color_type == PNG_COLOR_TYPE_GRAY)))
-   {
-      info_ptr->channels++;
-      /* If adding a true alpha channel not just filler */
-      if (png_ptr->transformations & PNG_ADD_ALPHA)
-         info_ptr->color_type |= PNG_COLOR_MASK_ALPHA;
-   }
-#endif
-
-#if defined(PNG_USER_TRANSFORM_PTR_SUPPORTED) && \
-defined(PNG_READ_USER_TRANSFORM_SUPPORTED)
-   if (png_ptr->transformations & PNG_USER_TRANSFORM)
-   {
-      if (info_ptr->bit_depth < png_ptr->user_transform_depth)
-         info_ptr->bit_depth = png_ptr->user_transform_depth;
-
-      if (info_ptr->channels < png_ptr->user_transform_channels)
-         info_ptr->channels = png_ptr->user_transform_channels;
-   }
-#endif
-
-   info_ptr->pixel_depth = (png_byte)(info_ptr->channels *
-       info_ptr->bit_depth);
-
-   info_ptr->rowbytes = PNG_ROWBYTES(info_ptr->pixel_depth, info_ptr->width);
-
-#ifndef PNG_READ_EXPAND_SUPPORTED
-   if (png_ptr)
-      return;
-#endif
-}
-
-/* Transform the row.  The order of transformations is significant,
- * and is very touchy.  If you add a transformation, take care to
- * decide how it fits in with the other transformations here.
- */
-void /* PRIVATE */
-png_do_read_transformations(png_structp png_ptr)
-{
-   png_debug(1, "in png_do_read_transformations");
-
-   if (png_ptr->row_buf == NULL)
-   {
-#ifdef PNG_CONSOLE_IO_SUPPORTED
-      char msg[50];
-
-      png_snprintf2(msg, 50,
-          "NULL row buffer for row %ld, pass %d", (long)png_ptr->row_number,
-          png_ptr->pass);
-      png_error(png_ptr, msg);
-#else
-      png_error(png_ptr, "NULL row buffer");
-#endif
-   }
-#ifdef PNG_WARN_UNINITIALIZED_ROW
-   if (!(png_ptr->flags & PNG_FLAG_ROW_INIT))
-      /* Application has failed to call either png_read_start_image()
-       * or png_read_update_info() after setting transforms that expand
-       * pixels.  This check added to libpng-1.2.19
-       */
-#if (PNG_WARN_UNINITIALIZED_ROW==1)
-      png_error(png_ptr, "Uninitialized row");
-#else
-      png_warning(png_ptr, "Uninitialized row");
-#endif
-#endif
-
-#ifdef PNG_READ_EXPAND_SUPPORTED
-   if (png_ptr->transformations & PNG_EXPAND)
-   {
-      if (png_ptr->row_info.color_type == PNG_COLOR_TYPE_PALETTE)
-      {
-         png_do_expand_palette(&(png_ptr->row_info), png_ptr->row_buf + 1,
-             png_ptr->palette, png_ptr->trans_alpha, png_ptr->num_trans);
-      }
-      else
-      {
-         if (png_ptr->num_trans &&
-             (png_ptr->transformations & PNG_EXPAND_tRNS))
-            png_do_expand(&(png_ptr->row_info), png_ptr->row_buf + 1,
-                &(png_ptr->trans_color));
-         else
-
-            png_do_expand(&(png_ptr->row_info), png_ptr->row_buf + 1,
-                NULL);
-      }
-   }
-#endif
-
-#ifdef PNG_READ_STRIP_ALPHA_SUPPORTED
-   if (png_ptr->flags & PNG_FLAG_STRIP_ALPHA)
-      png_do_strip_filler(&(png_ptr->row_info), png_ptr->row_buf + 1,
-          PNG_FLAG_FILLER_AFTER | (png_ptr->flags & PNG_FLAG_STRIP_ALPHA));
-#endif
-
-#ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED
-   if (png_ptr->transformations & PNG_RGB_TO_GRAY)
-   {
-      int rgb_error =
-          png_do_rgb_to_gray(png_ptr, &(png_ptr->row_info),
-              png_ptr->row_buf + 1);
-
-      if (rgb_error)
-      {
-         png_ptr->rgb_to_gray_status=1;
-         if ((png_ptr->transformations & PNG_RGB_TO_GRAY) ==
-             PNG_RGB_TO_GRAY_WARN)
-            png_warning(png_ptr, "png_do_rgb_to_gray found nongray pixel");
-
-         if ((png_ptr->transformations & PNG_RGB_TO_GRAY) ==
-             PNG_RGB_TO_GRAY_ERR)
-            png_error(png_ptr, "png_do_rgb_to_gray found nongray pixel");
-      }
-   }
-#endif
-
-/* From Andreas Dilger e-mail to png-implement, 26 March 1998:
- *
- *   In most cases, the "simple transparency" should be done prior to doing
- *   gray-to-RGB, or you will have to test 3x as many bytes to check if a
- *   pixel is transparent.  You would also need to make sure that the
- *   transparency information is upgraded to RGB.
- *
- *   To summarize, the current flow is:
- *   - Gray + simple transparency -> compare 1 or 2 gray bytes and composite
- *                                   with background "in place" if transparent,
- *                                   convert to RGB if necessary
- *   - Gray + alpha -> composite with gray background and remove alpha bytes,
- *                                   convert to RGB if necessary
- *
- *   To support RGB backgrounds for gray images we need:
- *   - Gray + simple transparency -> convert to RGB + simple transparency,
- *                                   compare 3 or 6 bytes and composite with
- *                                   background "in place" if transparent
- *                                   (3x compare/pixel compared to doing
- *                                   composite with gray bkgrnd)
- *   - Gray + alpha -> convert to RGB + alpha, composite with background and
- *                                   remove alpha bytes (3x float
- *                                   operations/pixel compared with composite
- *                                   on gray background)
- *
- *  Greg's change will do this.  The reason it wasn't done before is for
- *  performance, as this increases the per-pixel operations.  If we would check
- *  in advance if the background was gray or RGB, and position the gray-to-RGB
- *  transform appropriately, then it would save a lot of work/time.
- */
-
-#ifdef PNG_READ_GRAY_TO_RGB_SUPPORTED
-   /* If gray -> RGB, do so now only if background is non-gray; else do later
-    * for performance reasons
-    */
-   if ((png_ptr->transformations & PNG_GRAY_TO_RGB) &&
-       !(png_ptr->mode & PNG_BACKGROUND_IS_GRAY))
-      png_do_gray_to_rgb(&(png_ptr->row_info), png_ptr->row_buf + 1);
-#endif
-
-#ifdef PNG_READ_BACKGROUND_SUPPORTED
-   if ((png_ptr->transformations & PNG_BACKGROUND) &&
-       ((png_ptr->num_trans != 0) ||
-       (png_ptr->color_type & PNG_COLOR_MASK_ALPHA)))
-      png_do_background(&(png_ptr->row_info), png_ptr->row_buf + 1,
-          &(png_ptr->trans_color), &(png_ptr->background)
-#ifdef PNG_READ_GAMMA_SUPPORTED
-          , &(png_ptr->background_1),
-          png_ptr->gamma_table, png_ptr->gamma_from_1,
-          png_ptr->gamma_to_1, png_ptr->gamma_16_table,
-          png_ptr->gamma_16_from_1, png_ptr->gamma_16_to_1,
-          png_ptr->gamma_shift
-#endif
-          );
-#endif
-
-#ifdef PNG_READ_GAMMA_SUPPORTED
-   if ((png_ptr->transformations & PNG_GAMMA) &&
-#ifdef PNG_READ_BACKGROUND_SUPPORTED
-       !((png_ptr->transformations & PNG_BACKGROUND) &&
-       ((png_ptr->num_trans != 0) ||
-       (png_ptr->color_type & PNG_COLOR_MASK_ALPHA))) &&
-#endif
-       (png_ptr->color_type != PNG_COLOR_TYPE_PALETTE))
-      png_do_gamma(&(png_ptr->row_info), png_ptr->row_buf + 1,
-          png_ptr->gamma_table, png_ptr->gamma_16_table,
-          png_ptr->gamma_shift);
-#endif
-
-#ifdef PNG_READ_16_TO_8_SUPPORTED
-   if (png_ptr->transformations & PNG_16_TO_8)
-      png_do_chop(&(png_ptr->row_info), png_ptr->row_buf + 1);
-#endif
-
-#ifdef PNG_READ_QUANTIZE_SUPPORTED
-   if (png_ptr->transformations & PNG_QUANTIZE)
-   {
-      png_do_quantize(&(png_ptr->row_info), png_ptr->row_buf + 1,
-          png_ptr->palette_lookup, png_ptr->quantize_index);
-
-      if (png_ptr->row_info.rowbytes == 0)
-         png_error(png_ptr, "png_do_quantize returned rowbytes=0");
-   }
-#endif /* PNG_READ_QUANTIZE_SUPPORTED */
-
-#ifdef PNG_READ_INVERT_SUPPORTED
-   if (png_ptr->transformations & PNG_INVERT_MONO)
-      png_do_invert(&(png_ptr->row_info), png_ptr->row_buf + 1);
-#endif
-
-#ifdef PNG_READ_SHIFT_SUPPORTED
-   if (png_ptr->transformations & PNG_SHIFT)
-      png_do_unshift(&(png_ptr->row_info), png_ptr->row_buf + 1,
-          &(png_ptr->shift));
-#endif
-
-#ifdef PNG_READ_PACK_SUPPORTED
-   if (png_ptr->transformations & PNG_PACK)
-      png_do_unpack(&(png_ptr->row_info), png_ptr->row_buf + 1);
-#endif
-
-#ifdef PNG_READ_BGR_SUPPORTED
-   if (png_ptr->transformations & PNG_BGR)
-      png_do_bgr(&(png_ptr->row_info), png_ptr->row_buf + 1);
-#endif
-
-#ifdef PNG_READ_PACKSWAP_SUPPORTED
-   if (png_ptr->transformations & PNG_PACKSWAP)
-      png_do_packswap(&(png_ptr->row_info), png_ptr->row_buf + 1);
-#endif
-
-#ifdef PNG_READ_GRAY_TO_RGB_SUPPORTED
-   /* If gray -> RGB, do so now only if we did not do so above */
-   if ((png_ptr->transformations & PNG_GRAY_TO_RGB) &&
-       (png_ptr->mode & PNG_BACKGROUND_IS_GRAY))
-      png_do_gray_to_rgb(&(png_ptr->row_info), png_ptr->row_buf + 1);
-#endif
-
-#ifdef PNG_READ_FILLER_SUPPORTED
-   if (png_ptr->transformations & PNG_FILLER)
-      png_do_read_filler(&(png_ptr->row_info), png_ptr->row_buf + 1,
-          (png_uint_32)png_ptr->filler, png_ptr->flags);
-#endif
-
-#ifdef PNG_READ_INVERT_ALPHA_SUPPORTED
-   if (png_ptr->transformations & PNG_INVERT_ALPHA)
-      png_do_read_invert_alpha(&(png_ptr->row_info), png_ptr->row_buf + 1);
-#endif
-
-#ifdef PNG_READ_SWAP_ALPHA_SUPPORTED
-   if (png_ptr->transformations & PNG_SWAP_ALPHA)
-      png_do_read_swap_alpha(&(png_ptr->row_info), png_ptr->row_buf + 1);
-#endif
-
-#ifdef PNG_READ_16BIT_SUPPORTED
-#ifdef PNG_READ_SWAP_SUPPORTED
-   if (png_ptr->transformations & PNG_SWAP_BYTES)
-      png_do_swap(&(png_ptr->row_info), png_ptr->row_buf + 1);
-#endif
-#endif
-
-#ifdef PNG_READ_USER_TRANSFORM_SUPPORTED
-   if (png_ptr->transformations & PNG_USER_TRANSFORM)
-    {
-      if (png_ptr->read_user_transform_fn != NULL)
-         (*(png_ptr->read_user_transform_fn)) /* User read transform function */
-             (png_ptr,                    /* png_ptr */
-             &(png_ptr->row_info),     /* row_info: */
-                /*  png_uint_32 width;       width of row */
-                /*  png_size_t rowbytes;     number of bytes in row */
-                /*  png_byte color_type;     color type of pixels */
-                /*  png_byte bit_depth;      bit depth of samples */
-                /*  png_byte channels;       number of channels (1-4) */
-                /*  png_byte pixel_depth;    bits per pixel (depth*channels) */
-             png_ptr->row_buf + 1);    /* start of pixel data for row */
-#ifdef PNG_USER_TRANSFORM_PTR_SUPPORTED
-      if (png_ptr->user_transform_depth)
-         png_ptr->row_info.bit_depth = png_ptr->user_transform_depth;
-
-      if (png_ptr->user_transform_channels)
-         png_ptr->row_info.channels = png_ptr->user_transform_channels;
-#endif
-      png_ptr->row_info.pixel_depth = (png_byte)(png_ptr->row_info.bit_depth *
-          png_ptr->row_info.channels);
-
-      png_ptr->row_info.rowbytes = PNG_ROWBYTES(png_ptr->row_info.pixel_depth,
-          png_ptr->row_info.width);
-   }
-#endif
-
-}
-
-#ifdef PNG_READ_PACK_SUPPORTED
-/* Unpack pixels of 1, 2, or 4 bits per pixel into 1 byte per pixel,
- * without changing the actual values.  Thus, if you had a row with
- * a bit depth of 1, you would end up with bytes that only contained
- * the numbers 0 or 1.  If you would rather they contain 0 and 255, use
- * png_do_shift() after this.
- */
-void /* PRIVATE */
-png_do_unpack(png_row_infop row_info, png_bytep row)
-{
-   png_debug(1, "in png_do_unpack");
-
-   if (row_info->bit_depth < 8)
-   {
-      png_uint_32 i;
-      png_uint_32 row_width=row_info->width;
-
-      switch (row_info->bit_depth)
-      {
-         case 1:
-         {
-            png_bytep sp = row + (png_size_t)((row_width - 1) >> 3);
-            png_bytep dp = row + (png_size_t)row_width - 1;
-            png_uint_32 shift = 7 - (int)((row_width + 7) & 0x07);
-            for (i = 0; i < row_width; i++)
-            {
-               *dp = (png_byte)((*sp >> shift) & 0x01);
-
-               if (shift == 7)
-               {
-                  shift = 0;
-                  sp--;
-               }
-
-               else
-                  shift++;
-
-               dp--;
-            }
-            break;
-         }
-
-         case 2:
-         {
-
-            png_bytep sp = row + (png_size_t)((row_width - 1) >> 2);
-            png_bytep dp = row + (png_size_t)row_width - 1;
-            png_uint_32 shift = (int)((3 - ((row_width + 3) & 0x03)) << 1);
-            for (i = 0; i < row_width; i++)
-            {
-               *dp = (png_byte)((*sp >> shift) & 0x03);
-
-               if (shift == 6)
-               {
-                  shift = 0;
-                  sp--;
-               }
-
-               else
-                  shift += 2;
-
-               dp--;
-            }
-            break;
-         }
-
-         case 4:
-         {
-            png_bytep sp = row + (png_size_t)((row_width - 1) >> 1);
-            png_bytep dp = row + (png_size_t)row_width - 1;
-            png_uint_32 shift = (int)((1 - ((row_width + 1) & 0x01)) << 2);
-            for (i = 0; i < row_width; i++)
-            {
-               *dp = (png_byte)((*sp >> shift) & 0x0f);
-
-               if (shift == 4)
-               {
-                  shift = 0;
-                  sp--;
-               }
-
-               else
-                  shift = 4;
-
-               dp--;
-            }
-            break;
-         }
-
-         default:
-            break;
-      }
-      row_info->bit_depth = 8;
-      row_info->pixel_depth = (png_byte)(8 * row_info->channels);
-      row_info->rowbytes = row_width * row_info->channels;
-   }
-}
-#endif
-
-#ifdef PNG_READ_SHIFT_SUPPORTED
-/* Reverse the effects of png_do_shift.  This routine merely shifts the
- * pixels back to their significant bits values.  Thus, if you have
- * a row of bit depth 8, but only 5 are significant, this will shift
- * the values back to 0 through 31.
- */
-void /* PRIVATE */
-png_do_unshift(png_row_infop row_info, png_bytep row,
-    png_const_color_8p sig_bits)
-{
-   png_debug(1, "in png_do_unshift");
-
-   if (
-       row_info->color_type != PNG_COLOR_TYPE_PALETTE)
-   {
-      int shift[4];
-      int channels = 0;
-      int c;
-      png_uint_16 value = 0;
-      png_uint_32 row_width = row_info->width;
-
-      if (row_info->color_type & PNG_COLOR_MASK_COLOR)
-      {
-         shift[channels++] = row_info->bit_depth - sig_bits->red;
-         shift[channels++] = row_info->bit_depth - sig_bits->green;
-         shift[channels++] = row_info->bit_depth - sig_bits->blue;
-      }
-
-      else
-      {
-         shift[channels++] = row_info->bit_depth - sig_bits->gray;
-      }
-
-      if (row_info->color_type & PNG_COLOR_MASK_ALPHA)
-      {
-         shift[channels++] = row_info->bit_depth - sig_bits->alpha;
-      }
-
-      for (c = 0; c < channels; c++)
-      {
-         if (shift[c] <= 0)
-            shift[c] = 0;
-
-         else
-            value = 1;
-      }
-
-      if (!value)
-         return;
-
-      switch (row_info->bit_depth)
-      {
-         default:
-            break; 
-
-         case 2:
-         {
-            png_bytep bp;
-            png_size_t i;
-            png_size_t istop = row_info->rowbytes;
-
-            for (bp = row, i = 0; i < istop; i++)
-            {
-               *bp >>= 1;
-               *bp++ &= 0x55;
-            }
-            break;
-         }
-
-         case 4:
-         {
-            png_bytep bp = row;
-            png_size_t i;
-            png_size_t istop = row_info->rowbytes;
-            png_byte mask = (png_byte)((((int)0xf0 >> shift[0]) & (int)0xf0) |
-                (png_byte)((int)0xf >> shift[0]));
-
-            for (i = 0; i < istop; i++)
-            {
-               *bp >>= shift[0];
-               *bp++ &= mask;
-            }
-            break;
-         }
-
-         case 8:
-         {
-            png_bytep bp = row;
-            png_uint_32 i;
-            png_uint_32 istop = row_width * channels;
-
-            for (i = 0; i < istop; i++)
-            {
-               *bp++ >>= shift[i%channels];
-            }
-            break;
-         }
-
-#ifdef PNG_READ_16BIT_SUPPORTED
-         case 16:
-         {
-            png_bytep bp = row;
-            png_uint_32 i;
-            png_uint_32 istop = channels * row_width;
-
-            for (i = 0; i < istop; i++)
-            {
-               value = (png_uint_16)((*bp << 8) + *(bp + 1));
-               value >>= shift[i%channels];
-               *bp++ = (png_byte)(value >> 8);
-               *bp++ = (png_byte)(value & 0xff);
-            }
-            break;
-         }
-#endif
-      }
-   }
-}
-#endif
-
-#ifdef PNG_READ_16_TO_8_SUPPORTED
-/* Chop rows of bit depth 16 down to 8 */
-void /* PRIVATE */
-png_do_chop(png_row_infop row_info, png_bytep row)
-{
-   png_debug(1, "in png_do_chop");
-
-   if (row_info->bit_depth == 16)
-   {
-      png_bytep sp = row;
-      png_bytep dp = row;
-      png_uint_32 i;
-      png_uint_32 istop = row_info->width * row_info->channels;
-
-      for (i = 0; i<istop; i++, sp += 2, dp++)
-      {
-#ifdef PNG_READ_16_TO_8_ACCURATE_SCALE_SUPPORTED
-      /* This does a more accurate scaling of the 16-bit color
-       * value, rather than a simple low-byte truncation.
-       *
-       * What the ideal calculation should be:
-       *   *dp = (((((png_uint_32)(*sp) << 8) |
-       *          (png_uint_32)(*(sp + 1))) * 255 + 127)
-       *          / (png_uint_32)65535L;
-       *
-       * GRR: no, I think this is what it really should be:
-       *   *dp = (((((png_uint_32)(*sp) << 8) |
-       *           (png_uint_32)(*(sp + 1))) + 128L)
-       *           / (png_uint_32)257L;
-       *
-       * GRR: here's the exact calculation with shifts:
-       *   temp = (((png_uint_32)(*sp) << 8) |
-       *           (png_uint_32)(*(sp + 1))) + 128L;
-       *   *dp = (temp - (temp >> 8)) >> 8;
-       *
-       * Approximate calculation with shift/add instead of multiply/divide:
-       *   *dp = ((((png_uint_32)(*sp) << 8) |
-       *          (png_uint_32)((int)(*(sp + 1)) - *sp)) + 128) >> 8;
-       *
-       * What we actually do to avoid extra shifting and conversion:
-       */
-
-         *dp = *sp + ((((int)(*(sp + 1)) - *sp) > 128) ? 1 : 0);
-#else
-       /* Simply discard the low order byte */
-         *dp = *sp;
-#endif
-      }
-      row_info->bit_depth = 8;
-      row_info->pixel_depth = (png_byte)(8 * row_info->channels);
-      row_info->rowbytes = row_info->width * row_info->channels;
-   }
-}
-#endif
-
-#ifdef PNG_READ_SWAP_ALPHA_SUPPORTED
-void /* PRIVATE */
-png_do_read_swap_alpha(png_row_infop row_info, png_bytep row)
-{
-   png_debug(1, "in png_do_read_swap_alpha");
-
-   {
-      png_uint_32 row_width = row_info->width;
-      if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
-      {
-         /* This converts from RGBA to ARGB */
-         if (row_info->bit_depth == 8)
-         {
-            png_bytep sp = row + row_info->rowbytes;
-            png_bytep dp = sp;
-            png_byte save;
-            png_uint_32 i;
-
-            for (i = 0; i < row_width; i++)
-            {
-               save = *(--sp);
-               *(--dp) = *(--sp);
-               *(--dp) = *(--sp);
-               *(--dp) = *(--sp);
-               *(--dp) = save;
-            }
-         }
-
-#ifdef PNG_READ_16BIT_SUPPORTED
-         /* This converts from RRGGBBAA to AARRGGBB */
-         else
-         {
-            png_bytep sp = row + row_info->rowbytes;
-            png_bytep dp = sp;
-            png_byte save[2];
-            png_uint_32 i;
-
-            for (i = 0; i < row_width; i++)
-            {
-               save[0] = *(--sp);
-               save[1] = *(--sp);
-               *(--dp) = *(--sp);
-               *(--dp) = *(--sp);
-               *(--dp) = *(--sp);
-               *(--dp) = *(--sp);
-               *(--dp) = *(--sp);
-               *(--dp) = *(--sp);
-               *(--dp) = save[0];
-               *(--dp) = save[1];
-            }
-         }
-#endif
-      }
-
-      else if (row_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
-      {
-         /* This converts from GA to AG */
-         if (row_info->bit_depth == 8)
-         {
-            png_bytep sp = row + row_info->rowbytes;
-            png_bytep dp = sp;
-            png_byte save;
-            png_uint_32 i;
-
-            for (i = 0; i < row_width; i++)
-            {
-               save = *(--sp);
-               *(--dp) = *(--sp);
-               *(--dp) = save;
-            }
-         }
-
-#ifdef PNG_READ_16BIT_SUPPORTED
-         /* This converts from GGAA to AAGG */
-         else
-         {
-            png_bytep sp = row + row_info->rowbytes;
-            png_bytep dp = sp;
-            png_byte save[2];
-            png_uint_32 i;
-
-            for (i = 0; i < row_width; i++)
-            {
-               save[0] = *(--sp);
-               save[1] = *(--sp);
-               *(--dp) = *(--sp);
-               *(--dp) = *(--sp);
-               *(--dp) = save[0];
-               *(--dp) = save[1];
-            }
-         }
-#endif
-      }
-   }
-}
-#endif
-
-#ifdef PNG_READ_INVERT_ALPHA_SUPPORTED
-void /* PRIVATE */
-png_do_read_invert_alpha(png_row_infop row_info, png_bytep row)
-{
-   png_uint_32 row_width;
-   png_debug(1, "in png_do_read_invert_alpha");
-
-   row_width = row_info->width;
-   if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
-   {
-      if (row_info->bit_depth == 8)
-      {
-         /* This inverts the alpha channel in RGBA */
-         png_bytep sp = row + row_info->rowbytes;
-         png_bytep dp = sp;
-         png_uint_32 i;
-
-         for (i = 0; i < row_width; i++)
-         {
-            *(--dp) = (png_byte)(255 - *(--sp));
-
-/*          This does nothing:
-            *(--dp) = *(--sp);
-            *(--dp) = *(--sp);
-            *(--dp) = *(--sp);
-            We can replace it with:
-*/
-            sp-=3;
-            dp=sp;
-         }
-      }
-
-#ifdef PNG_READ_16BIT_SUPPORTED
-      /* This inverts the alpha channel in RRGGBBAA */
-      else
-      {
-         png_bytep sp = row + row_info->rowbytes;
-         png_bytep dp = sp;
-         png_uint_32 i;
-
-         for (i = 0; i < row_width; i++)
-         {
-            *(--dp) = (png_byte)(255 - *(--sp));
-            *(--dp) = (png_byte)(255 - *(--sp));
-
-/*          This does nothing:
-            *(--dp) = *(--sp);
-            *(--dp) = *(--sp);
-            *(--dp) = *(--sp);
-            *(--dp) = *(--sp);
-            *(--dp) = *(--sp);
-            *(--dp) = *(--sp);
-            We can replace it with:
-*/
-            sp-=6;
-            dp=sp;
-         }
-      }
-#endif
-   }
-   else if (row_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
-   {
-      if (row_info->bit_depth == 8)
-      {
-         /* This inverts the alpha channel in GA */
-         png_bytep sp = row + row_info->rowbytes;
-         png_bytep dp = sp;
-         png_uint_32 i;
-
-         for (i = 0; i < row_width; i++)
-         {
-            *(--dp) = (png_byte)(255 - *(--sp));
-            *(--dp) = *(--sp);
-         }
-      }
-
-#ifdef PNG_READ_16BIT_SUPPORTED
-      else
-      {
-         /* This inverts the alpha channel in GGAA */
-         png_bytep sp  = row + row_info->rowbytes;
-         png_bytep dp = sp;
-         png_uint_32 i;
-
-         for (i = 0; i < row_width; i++)
-         {
-            *(--dp) = (png_byte)(255 - *(--sp));
-            *(--dp) = (png_byte)(255 - *(--sp));
-/*
-            *(--dp) = *(--sp);
-            *(--dp) = *(--sp);
-*/
-            sp-=2;
-            dp=sp;
-         }
-      }
-#endif
-   }
-}
-#endif
-
-#ifdef PNG_READ_FILLER_SUPPORTED
-/* Add filler channel if we have RGB color */
-void /* PRIVATE */
-png_do_read_filler(png_row_infop row_info, png_bytep row,
-    png_uint_32 filler, png_uint_32 flags)
-{
-   png_uint_32 i;
-   png_uint_32 row_width = row_info->width;
-
-#ifdef PNG_READ_16BIT_SUPPORTED
-   png_byte hi_filler = (png_byte)((filler>>8) & 0xff);
-#endif
-   png_byte lo_filler = (png_byte)(filler & 0xff);
-
-   png_debug(1, "in png_do_read_filler");
-
-   if (
-       row_info->color_type == PNG_COLOR_TYPE_GRAY)
-   {
-      if (row_info->bit_depth == 8)
-      {
-         if (flags & PNG_FLAG_FILLER_AFTER)
-         {
-            /* This changes the data from G to GX */
-            png_bytep sp = row + (png_size_t)row_width;
-            png_bytep dp =  sp + (png_size_t)row_width;
-            for (i = 1; i < row_width; i++)
-            {
-               *(--dp) = lo_filler;
-               *(--dp) = *(--sp);
-            }
-            *(--dp) = lo_filler;
-            row_info->channels = 2;
-            row_info->pixel_depth = 16;
-            row_info->rowbytes = row_width * 2;
-         }
-
-         else
-         {
-            /* This changes the data from G to XG */
-            png_bytep sp = row + (png_size_t)row_width;
-            png_bytep dp = sp  + (png_size_t)row_width;
-            for (i = 0; i < row_width; i++)
-            {
-               *(--dp) = *(--sp);
-               *(--dp) = lo_filler;
-            }
-            row_info->channels = 2;
-            row_info->pixel_depth = 16;
-            row_info->rowbytes = row_width * 2;
-         }
-      }
-
-#ifdef PNG_READ_16BIT_SUPPORTED
-      else if (row_info->bit_depth == 16)
-      {
-         if (flags & PNG_FLAG_FILLER_AFTER)
-         {
-            /* This changes the data from GG to GGXX */
-            png_bytep sp = row + (png_size_t)row_width * 2;
-            png_bytep dp = sp  + (png_size_t)row_width * 2;
-            for (i = 1; i < row_width; i++)
-            {
-               *(--dp) = hi_filler;
-               *(--dp) = lo_filler;
-               *(--dp) = *(--sp);
-               *(--dp) = *(--sp);
-            }
-            *(--dp) = hi_filler;
-            *(--dp) = lo_filler;
-            row_info->channels = 2;
-            row_info->pixel_depth = 32;
-            row_info->rowbytes = row_width * 4;
-         }
-
-         else
-         {
-            /* This changes the data from GG to XXGG */
-            png_bytep sp = row + (png_size_t)row_width * 2;
-            png_bytep dp = sp  + (png_size_t)row_width * 2;
-            for (i = 0; i < row_width; i++)
-            {
-               *(--dp) = *(--sp);
-               *(--dp) = *(--sp);
-               *(--dp) = hi_filler;
-               *(--dp) = lo_filler;
-            }
-            row_info->channels = 2;
-            row_info->pixel_depth = 32;
-            row_info->rowbytes = row_width * 4;
-         }
-      }
-#endif
-   } /* COLOR_TYPE == GRAY */
-   else if (row_info->color_type == PNG_COLOR_TYPE_RGB)
-   {
-      if (row_info->bit_depth == 8)
-      {
-         if (flags & PNG_FLAG_FILLER_AFTER)
-         {
-            /* This changes the data from RGB to RGBX */
-            png_bytep sp = row + (png_size_t)row_width * 3;
-            png_bytep dp = sp  + (png_size_t)row_width;
-            for (i = 1; i < row_width; i++)
-            {
-               *(--dp) = lo_filler;
-               *(--dp) = *(--sp);
-               *(--dp) = *(--sp);
-               *(--dp) = *(--sp);
-            }
-            *(--dp) = lo_filler;
-            row_info->channels = 4;
-            row_info->pixel_depth = 32;
-            row_info->rowbytes = row_width * 4;
-         }
-
-         else
-         {
-            /* This changes the data from RGB to XRGB */
-            png_bytep sp = row + (png_size_t)row_width * 3;
-            png_bytep dp = sp + (png_size_t)row_width;
-            for (i = 0; i < row_width; i++)
-            {
-               *(--dp) = *(--sp);
-               *(--dp) = *(--sp);
-               *(--dp) = *(--sp);
-               *(--dp) = lo_filler;
-            }
-            row_info->channels = 4;
-            row_info->pixel_depth = 32;
-            row_info->rowbytes = row_width * 4;
-         }
-      }
-
-#ifdef PNG_READ_16BIT_SUPPORTED
-      else if (row_info->bit_depth == 16)
-      {
-         if (flags & PNG_FLAG_FILLER_AFTER)
-         {
-            /* This changes the data from RRGGBB to RRGGBBXX */
-            png_bytep sp = row + (png_size_t)row_width * 6;
-            png_bytep dp = sp  + (png_size_t)row_width * 2;
-            for (i = 1; i < row_width; i++)
-            {
-               *(--dp) = hi_filler;
-               *(--dp) = lo_filler;
-               *(--dp) = *(--sp);
-               *(--dp) = *(--sp);
-               *(--dp) = *(--sp);
-               *(--dp) = *(--sp);
-               *(--dp) = *(--sp);
-               *(--dp) = *(--sp);
-            }
-            *(--dp) = hi_filler;
-            *(--dp) = lo_filler;
-            row_info->channels = 4;
-            row_info->pixel_depth = 64;
-            row_info->rowbytes = row_width * 8;
-         }
-
-         else
-         {
-            /* This changes the data from RRGGBB to XXRRGGBB */
-            png_bytep sp = row + (png_size_t)row_width * 6;
-            png_bytep dp = sp  + (png_size_t)row_width * 2;
-            for (i = 0; i < row_width; i++)
-            {
-               *(--dp) = *(--sp);
-               *(--dp) = *(--sp);
-               *(--dp) = *(--sp);
-               *(--dp) = *(--sp);
-               *(--dp) = *(--sp);
-               *(--dp) = *(--sp);
-               *(--dp) = hi_filler;
-               *(--dp) = lo_filler;
-            }
-
-            row_info->channels = 4;
-            row_info->pixel_depth = 64;
-            row_info->rowbytes = row_width * 8;
-         }
-      }
-#endif
-   } /* COLOR_TYPE == RGB */
-}
-#endif
-
-#ifdef PNG_READ_GRAY_TO_RGB_SUPPORTED
-/* Expand grayscale files to RGB, with or without alpha */
-void /* PRIVATE */
-png_do_gray_to_rgb(png_row_infop row_info, png_bytep row)
-{
-   png_uint_32 i;
-   png_uint_32 row_width = row_info->width;
-
-   png_debug(1, "in png_do_gray_to_rgb");
-
-   if (row_info->bit_depth >= 8 &&
-       !(row_info->color_type & PNG_COLOR_MASK_COLOR))
-   {
-      if (row_info->color_type == PNG_COLOR_TYPE_GRAY)
-      {
-         if (row_info->bit_depth == 8)
-         {
-            /* This changes G to RGB */
-            png_bytep sp = row + (png_size_t)row_width - 1;
-            png_bytep dp = sp  + (png_size_t)row_width * 2;
-            for (i = 0; i < row_width; i++)
-            {
-               *(dp--) = *sp;
-               *(dp--) = *sp;
-               *(dp--) = *(sp--);
-            }
-         }
-
-         else
-         {
-            /* This changes GG to RRGGBB */
-            png_bytep sp = row + (png_size_t)row_width * 2 - 1;
-            png_bytep dp = sp  + (png_size_t)row_width * 4;
-            for (i = 0; i < row_width; i++)
-            {
-               *(dp--) = *sp;
-               *(dp--) = *(sp - 1);
-               *(dp--) = *sp;
-               *(dp--) = *(sp - 1);
-               *(dp--) = *(sp--);
-               *(dp--) = *(sp--);
-            }
-         }
-      }
-
-      else if (row_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
-      {
-         if (row_info->bit_depth == 8)
-         {
-            /* This changes GA to RGBA */
-            png_bytep sp = row + (png_size_t)row_width * 2 - 1;
-            png_bytep dp = sp  + (png_size_t)row_width * 2;
-            for (i = 0; i < row_width; i++)
-            {
-               *(dp--) = *(sp--);
-               *(dp--) = *sp;
-               *(dp--) = *sp;
-               *(dp--) = *(sp--);
-            }
-         }
-
-         else
-         {
-            /* This changes GGAA to RRGGBBAA */
-            png_bytep sp = row + (png_size_t)row_width * 4 - 1;
-            png_bytep dp = sp  + (png_size_t)row_width * 4;
-            for (i = 0; i < row_width; i++)
-            {
-               *(dp--) = *(sp--);
-               *(dp--) = *(sp--);
-               *(dp--) = *sp;
-               *(dp--) = *(sp - 1);
-               *(dp--) = *sp;
-               *(dp--) = *(sp - 1);
-               *(dp--) = *(sp--);
-               *(dp--) = *(sp--);
-            }
-         }
-      }
-      row_info->channels += (png_byte)2;
-      row_info->color_type |= PNG_COLOR_MASK_COLOR;
-      row_info->pixel_depth = (png_byte)(row_info->channels *
-          row_info->bit_depth);
-      row_info->rowbytes = PNG_ROWBYTES(row_info->pixel_depth, row_width);
-   }
-}
-#endif
-
-#ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED
-/* Reduce RGB files to grayscale, with or without alpha
- * using the equation given in Poynton's ColorFAQ at
- * <http://www.inforamp.net/~poynton/>  (THIS LINK IS DEAD June 2008)
- * New link:
- * <http://www.poynton.com/notes/colour_and_gamma/>
- * Charles Poynton poynton at poynton.com
- *
- *     Y = 0.212671 * R + 0.715160 * G + 0.072169 * B
- *
- *  We approximate this with
- *
- *     Y = 0.21268 * R    + 0.7151 * G    + 0.07217 * B
- *
- *  which can be expressed with integers as
- *
- *     Y = (6969 * R + 23434 * G + 2365 * B)/32768
- *
- *  The calculation is to be done in a linear colorspace.
- *
- *  Other integer coefficents can be used via png_set_rgb_to_gray().
- */
-int /* PRIVATE */
-png_do_rgb_to_gray(png_structp png_ptr, png_row_infop row_info, png_bytep row)
-
-{
-   png_uint_32 i;
-
-   png_uint_32 row_width = row_info->width;
-   int rgb_error = 0;
-
-   png_debug(1, "in png_do_rgb_to_gray");
-
-   if (!(row_info->color_type & PNG_COLOR_MASK_PALETTE) &&
-       (row_info->color_type & PNG_COLOR_MASK_COLOR))
-   {
-      png_uint_32 rc = png_ptr->rgb_to_gray_red_coeff;
-      png_uint_32 gc = png_ptr->rgb_to_gray_green_coeff;
-      png_uint_32 bc = png_ptr->rgb_to_gray_blue_coeff;
-
-      if (row_info->color_type == PNG_COLOR_TYPE_RGB)
-      {
-         if (row_info->bit_depth == 8)
-         {
-#if defined(PNG_READ_GAMMA_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED)
-            if (png_ptr->gamma_from_1 != NULL && png_ptr->gamma_to_1 != NULL)
-            {
-               png_bytep sp = row;
-               png_bytep dp = row;
-
-               for (i = 0; i < row_width; i++)
-               {
-                  png_byte red   = png_ptr->gamma_to_1[*(sp++)];
-                  png_byte green = png_ptr->gamma_to_1[*(sp++)];
-                  png_byte blue  = png_ptr->gamma_to_1[*(sp++)];
-
-                  if (red != green || red != blue)
-                  {
-                     rgb_error |= 1;
-                     *(dp++) = png_ptr->gamma_from_1[
-                         (rc*red + gc*green + bc*blue)>>15];
-                  }
-
-                  else
-                     *(dp++) = *(sp - 1);
-               }
-            }
-            else
-#endif
-            {
-               png_bytep sp = row;
-               png_bytep dp = row;
-               for (i = 0; i < row_width; i++)
-               {
-                  png_byte red   = *(sp++);
-                  png_byte green = *(sp++);
-                  png_byte blue  = *(sp++);
-
-                  if (red != green || red != blue)
-                  {
-                     rgb_error |= 1;
-                     *(dp++) = (png_byte)((rc*red + gc*green + bc*blue)>>15);
-                  }
-
-                  else
-                     *(dp++) = *(sp - 1);
-               }
-            }
-         }
-
-         else /* RGB bit_depth == 16 */
-         {
-#if defined(PNG_READ_GAMMA_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED)
-            if (png_ptr->gamma_16_to_1 != NULL &&
-                png_ptr->gamma_16_from_1 != NULL)
-            {
-               png_bytep sp = row;
-               png_bytep dp = row;
-               for (i = 0; i < row_width; i++)
-               {
-                  png_uint_16 red, green, blue, w;
-
-                  red   = (png_uint_16)(((*(sp))<<8) | *(sp + 1)); sp += 2;
-                  green = (png_uint_16)(((*(sp))<<8) | *(sp + 1)); sp += 2;
-                  blue  = (png_uint_16)(((*(sp))<<8) | *(sp + 1)); sp += 2;
-
-                  if (red == green && red == blue)
-                     w = red;
-
-                  else
-                  {
-                     png_uint_16 red_1   = png_ptr->gamma_16_to_1[(red&0xff)
-                         >> png_ptr->gamma_shift][red>>8];
-                     png_uint_16 green_1 =
-                         png_ptr->gamma_16_to_1[(green&0xff) >>
-                         png_ptr->gamma_shift][green>>8];
-                     png_uint_16 blue_1  = png_ptr->gamma_16_to_1[(blue&0xff)
-                         >> png_ptr->gamma_shift][blue>>8];
-                     png_uint_16 gray16  = (png_uint_16)((rc*red_1 + gc*green_1
-                         + bc*blue_1)>>15);
-                     w = png_ptr->gamma_16_from_1[(gray16&0xff) >>
-                         png_ptr->gamma_shift][gray16 >> 8];
-                     rgb_error |= 1;
-                  }
-
-                  *(dp++) = (png_byte)((w>>8) & 0xff);
-                  *(dp++) = (png_byte)(w & 0xff);
-               }
-            }
-            else
-#endif
-            {
-               png_bytep sp = row;
-               png_bytep dp = row;
-               for (i = 0; i < row_width; i++)
-               {
-                  png_uint_16 red, green, blue, gray16;
-
-                  red   = (png_uint_16)(((*(sp))<<8) | *(sp + 1)); sp += 2;
-                  green = (png_uint_16)(((*(sp))<<8) | *(sp + 1)); sp += 2;
-                  blue  = (png_uint_16)(((*(sp))<<8) | *(sp + 1)); sp += 2;
-
-                  if (red != green || red != blue)
-                     rgb_error |= 1;
-
-                  gray16  = (png_uint_16)((rc*red + gc*green + bc*blue)>>15);
-                  *(dp++) = (png_byte)((gray16>>8) & 0xff);
-                  *(dp++) = (png_byte)(gray16 & 0xff);
-               }
-            }
-         }
-      }
-      if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
-      {
-         if (row_info->bit_depth == 8)
-         {
-#if defined(PNG_READ_GAMMA_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED)
-            if (png_ptr->gamma_from_1 != NULL && png_ptr->gamma_to_1 != NULL)
-            {
-               png_bytep sp = row;
-               png_bytep dp = row;
-               for (i = 0; i < row_width; i++)
-               {
-                  png_byte red   = png_ptr->gamma_to_1[*(sp++)];
-                  png_byte green = png_ptr->gamma_to_1[*(sp++)];
-                  png_byte blue  = png_ptr->gamma_to_1[*(sp++)];
-
-                  if (red != green || red != blue)
-                     rgb_error |= 1;
-
-                  *(dp++) =  png_ptr->gamma_from_1
-                      [(rc*red + gc*green + bc*blue)>>15];
-
-                  *(dp++) = *(sp++);  /* alpha */
-               }
-            }
-            else
-#endif
-            {
-               png_bytep sp = row;
-               png_bytep dp = row;
-               for (i = 0; i < row_width; i++)
-               {
-                  png_byte red   = *(sp++);
-                  png_byte green = *(sp++);
-                  png_byte blue  = *(sp++);
-                  if (red != green || red != blue)
-                     rgb_error |= 1;
-
-                  *(dp++) =  (png_byte)((rc*red + gc*green + bc*blue)>>15);
-                  *(dp++) = *(sp++);  /* alpha */
-               }
-            }
-         }
-         else /* RGBA bit_depth == 16 */
-         {
-#if defined(PNG_READ_GAMMA_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED)
-            if (png_ptr->gamma_16_to_1 != NULL &&
-                png_ptr->gamma_16_from_1 != NULL)
-            {
-               png_bytep sp = row;
-               png_bytep dp = row;
-               for (i = 0; i < row_width; i++)
-               {
-                  png_uint_16 red, green, blue, w;
-
-                  red   = (png_uint_16)(((*(sp))<<8) | *(sp + 1)); sp += 2;
-                  green = (png_uint_16)(((*(sp))<<8) | *(sp + 1)); sp += 2;
-                  blue  = (png_uint_16)(((*(sp))<<8) | *(sp + 1)); sp += 2;
-
-                  if (red == green && red == blue)
-                     w = red;
-
-                  else
-                  {
-                     png_uint_16 red_1   = png_ptr->gamma_16_to_1[(red&0xff) >>
-                         png_ptr->gamma_shift][red>>8];
-
-                     png_uint_16 green_1 =
-                         png_ptr->gamma_16_to_1[(green&0xff) >>
-                         png_ptr->gamma_shift][green>>8];
-
-                     png_uint_16 blue_1  = png_ptr->gamma_16_to_1[(blue&0xff) >>
-                         png_ptr->gamma_shift][blue>>8];
-
-                     png_uint_16 gray16  = (png_uint_16)((rc * red_1
-                         + gc * green_1 + bc * blue_1)>>15);
-
-                     w = png_ptr->gamma_16_from_1[(gray16&0xff) >>
-                         png_ptr->gamma_shift][gray16 >> 8];
-
-                     rgb_error |= 1;
-                  }
-
-                  *(dp++) = (png_byte)((w>>8) & 0xff);
-                  *(dp++) = (png_byte)(w & 0xff);
-                  *(dp++) = *(sp++);  /* alpha */
-                  *(dp++) = *(sp++);
-               }
-            }
-            else
-#endif
-            {
-               png_bytep sp = row;
-               png_bytep dp = row;
-               for (i = 0; i < row_width; i++)
-               {
-                  png_uint_16 red, green, blue, gray16;
-                  red   = (png_uint_16)((*(sp)<<8) | *(sp + 1)); sp += 2;
-                  green = (png_uint_16)((*(sp)<<8) | *(sp + 1)); sp += 2;
-                  blue  = (png_uint_16)((*(sp)<<8) | *(sp + 1)); sp += 2;
-
-                  if (red != green || red != blue)
-                     rgb_error |= 1;
-
-                  gray16  = (png_uint_16)((rc*red + gc*green + bc*blue)>>15);
-                  *(dp++) = (png_byte)((gray16>>8) & 0xff);
-                  *(dp++) = (png_byte)(gray16 & 0xff);
-                  *(dp++) = *(sp++);  /* alpha */
-                  *(dp++) = *(sp++);
-               }
-            }
-         }
-      }
-      row_info->channels -= 2;
-      row_info->color_type = (png_byte)(row_info->color_type &
-          ~PNG_COLOR_MASK_COLOR);
-      row_info->pixel_depth = (png_byte)(row_info->channels *
-          row_info->bit_depth);
-      row_info->rowbytes = PNG_ROWBYTES(row_info->pixel_depth, row_width);
-   }
-   return rgb_error;
-}
-#endif
-
-/* Build a grayscale palette.  Palette is assumed to be 1 << bit_depth
- * large of png_color.  This lets grayscale images be treated as
- * paletted.  Most useful for gamma correction and simplification
- * of code.
- */
-void PNGAPI
-png_build_grayscale_palette(int bit_depth, png_colorp palette)
-{
-   int num_palette;
-   int color_inc;
-   int i;
-   int v;
-
-   png_debug(1, "in png_do_build_grayscale_palette");
-
-   if (palette == NULL)
-      return;
-
-   switch (bit_depth)
-   {
-      case 1:
-         num_palette = 2;
-         color_inc = 0xff;
-         break;
-
-      case 2:
-         num_palette = 4;
-         color_inc = 0x55;
-         break;
-
-      case 4:
-         num_palette = 16;
-         color_inc = 0x11;
-         break;
-
-      case 8:
-         num_palette = 256;
-         color_inc = 1;
-         break;
-
-      default:
-         num_palette = 0;
-         color_inc = 0;
-         break;
-   }
-
-   for (i = 0, v = 0; i < num_palette; i++, v += color_inc)
-   {
-      palette[i].red = (png_byte)v;
-      palette[i].green = (png_byte)v;
-      palette[i].blue = (png_byte)v;
-   }
-}
-
-
-#ifdef PNG_READ_BACKGROUND_SUPPORTED
-/* Replace any alpha or transparency with the supplied background color.
- * "background" is already in the screen gamma, while "background_1" is
- * at a gamma of 1.0.  Paletted files have already been taken care of.
- */
-void /* PRIVATE */
-png_do_background(png_row_infop row_info, png_bytep row,
-    png_const_color_16p trans_color, png_const_color_16p background
-#ifdef PNG_READ_GAMMA_SUPPORTED
-    , png_const_color_16p background_1, png_const_bytep gamma_table,
-    png_const_bytep gamma_from_1, png_const_bytep gamma_to_1,
-    png_const_uint_16pp gamma_16, png_const_uint_16pp gamma_16_from_1,
-    png_const_uint_16pp gamma_16_to_1, int gamma_shift
-#endif
-    )
-{
-   png_bytep sp, dp;
-   png_uint_32 i;
-   png_uint_32 row_width = row_info->width;
-   int shift;
-
-   png_debug(1, "in png_do_background");
-
-   if (background != NULL &&
-      (!(row_info->color_type & PNG_COLOR_MASK_ALPHA) ||
-      (row_info->color_type != PNG_COLOR_TYPE_PALETTE && trans_color)))
-   {
-      switch (row_info->color_type)
-      {
-         case PNG_COLOR_TYPE_GRAY:
-         {
-            switch (row_info->bit_depth)
-            {
-               case 1:
-               {
-                  sp = row;
-                  shift = 7;
-                  for (i = 0; i < row_width; i++)
-                  {
-                     if ((png_uint_16)((*sp >> shift) & 0x01)
-                        == trans_color->gray)
-                     {
-                        *sp &= (png_byte)((0x7f7f >> (7 - shift)) & 0xff);
-                        *sp |= (png_byte)(background->gray << shift);
-                     }
-
-                     if (!shift)
-                     {
-                        shift = 7;
-                        sp++;
-                     }
-
-                     else
-                        shift--;
-                  }
-                  break;
-               }
-
-               case 2:
-               {
-#ifdef PNG_READ_GAMMA_SUPPORTED
-                  if (gamma_table != NULL)
-                  {
-                     sp = row;
-                     shift = 6;
-                     for (i = 0; i < row_width; i++)
-                     {
-                        if ((png_uint_16)((*sp >> shift) & 0x03)
-                            == trans_color->gray)
-                        {
-                           *sp &= (png_byte)((0x3f3f >> (6 - shift)) & 0xff);
-                           *sp |= (png_byte)(background->gray << shift);
-                        }
-
-                        else
-                        {
-                           png_byte p = (png_byte)((*sp >> shift) & 0x03);
-                           png_byte g = (png_byte)((gamma_table [p | (p << 2) |
-                               (p << 4) | (p << 6)] >> 6) & 0x03);
-                           *sp &= (png_byte)((0x3f3f >> (6 - shift)) & 0xff);
-                           *sp |= (png_byte)(g << shift);
-                        }
-
-                        if (!shift)
-                        {
-                           shift = 6;
-                           sp++;
-                        }
-
-                        else
-                           shift -= 2;
-                     }
-                  }
-
-                  else
-#endif
-                  {
-                     sp = row;
-                     shift = 6;
-                     for (i = 0; i < row_width; i++)
-                     {
-                        if ((png_uint_16)((*sp >> shift) & 0x03)
-                            == trans_color->gray)
-                        {
-                           *sp &= (png_byte)((0x3f3f >> (6 - shift)) & 0xff);
-                           *sp |= (png_byte)(background->gray << shift);
-                        }
-
-                        if (!shift)
-                        {
-                           shift = 6;
-                           sp++;
-                        }
-
-                        else
-                           shift -= 2;
-                     }
-                  }
-                  break;
-               }
-
-               case 4:
-               {
-#ifdef PNG_READ_GAMMA_SUPPORTED
-                  if (gamma_table != NULL)
-                  {
-                     sp = row;
-                     shift = 4;
-                     for (i = 0; i < row_width; i++)
-                     {
-                        if ((png_uint_16)((*sp >> shift) & 0x0f)
-                            == trans_color->gray)
-                        {
-                           *sp &= (png_byte)((0xf0f >> (4 - shift)) & 0xff);
-                           *sp |= (png_byte)(background->gray << shift);
-                        }
-
-                        else
-                        {
-                           png_byte p = (png_byte)((*sp >> shift) & 0x0f);
-                           png_byte g = (png_byte)((gamma_table[p |
-                               (p << 4)] >> 4) & 0x0f);
-                           *sp &= (png_byte)((0xf0f >> (4 - shift)) & 0xff);
-                           *sp |= (png_byte)(g << shift);
-                        }
-
-                        if (!shift)
-                        {
-                           shift = 4;
-                           sp++;
-                        }
-
-                        else
-                           shift -= 4;
-                     }
-                  }
-
-                  else
-#endif
-                  {
-                     sp = row;
-                     shift = 4;
-                     for (i = 0; i < row_width; i++)
-                     {
-                        if ((png_uint_16)((*sp >> shift) & 0x0f)
-                            == trans_color->gray)
-                        {
-                           *sp &= (png_byte)((0xf0f >> (4 - shift)) & 0xff);
-                           *sp |= (png_byte)(background->gray << shift);
-                        }
-
-                        if (!shift)
-                        {
-                           shift = 4;
-                           sp++;
-                        }
-
-                        else
-                           shift -= 4;
-                     }
-                  }
-                  break;
-               }
-
-               case 8:
-               {
-#ifdef PNG_READ_GAMMA_SUPPORTED
-                  if (gamma_table != NULL)
-                  {
-                     sp = row;
-                     for (i = 0; i < row_width; i++, sp++)
-                     {
-                        if (*sp == trans_color->gray)
-                           *sp = (png_byte)background->gray;
-
-                        else
-                           *sp = gamma_table[*sp];
-                     }
-                  }
-                  else
-#endif
-                  {
-                     sp = row;
-                     for (i = 0; i < row_width; i++, sp++)
-                     {
-                        if (*sp == trans_color->gray)
-                           *sp = (png_byte)background->gray;
-                     }
-                  }
-                  break;
-               }
-
-               case 16:
-               {
-#ifdef PNG_READ_GAMMA_SUPPORTED
-                  if (gamma_16 != NULL)
-                  {
-                     sp = row;
-                     for (i = 0; i < row_width; i++, sp += 2)
-                     {
-                        png_uint_16 v;
-
-                        v = (png_uint_16)(((*sp) << 8) + *(sp + 1));
-
-                        if (v == trans_color->gray)
-                        {
-                           /* Background is already in screen gamma */
-                           *sp = (png_byte)((background->gray >> 8) & 0xff);
-                           *(sp + 1) = (png_byte)(background->gray & 0xff);
-                        }
-
-                        else
-                        {
-                           v = gamma_16[*(sp + 1) >> gamma_shift][*sp];
-                           *sp = (png_byte)((v >> 8) & 0xff);
-                           *(sp + 1) = (png_byte)(v & 0xff);
-                        }
-                     }
-                  }
-                  else
-#endif
-                  {
-                     sp = row;
-                     for (i = 0; i < row_width; i++, sp += 2)
-                     {
-                        png_uint_16 v;
-
-                        v = (png_uint_16)(((*sp) << 8) + *(sp + 1));
-
-                        if (v == trans_color->gray)
-                        {
-                           *sp = (png_byte)((background->gray >> 8) & 0xff);
-                           *(sp + 1) = (png_byte)(background->gray & 0xff);
-                        }
-                     }
-                  }
-                  break;
-               }
-
-               default:
-                  break;
-            }
-            break;
-         }
-
-         case PNG_COLOR_TYPE_RGB:
-         {
-            if (row_info->bit_depth == 8)
-            {
-#ifdef PNG_READ_GAMMA_SUPPORTED
-               if (gamma_table != NULL)
-               {
-                  sp = row;
-                  for (i = 0; i < row_width; i++, sp += 3)
-                  {
-                     if (*sp == trans_color->red &&
-                         *(sp + 1) == trans_color->green &&
-                         *(sp + 2) == trans_color->blue)
-                     {
-                        *sp = (png_byte)background->red;
-                        *(sp + 1) = (png_byte)background->green;
-                        *(sp + 2) = (png_byte)background->blue;
-                     }
-
-                     else
-                     {
-                        *sp = gamma_table[*sp];
-                        *(sp + 1) = gamma_table[*(sp + 1)];
-                        *(sp + 2) = gamma_table[*(sp + 2)];
-                     }
-                  }
-               }
-               else
-#endif
-               {
-                  sp = row;
-                  for (i = 0; i < row_width; i++, sp += 3)
-                  {
-                     if (*sp == trans_color->red &&
-                         *(sp + 1) == trans_color->green &&
-                         *(sp + 2) == trans_color->blue)
-                     {
-                        *sp = (png_byte)background->red;
-                        *(sp + 1) = (png_byte)background->green;
-                        *(sp + 2) = (png_byte)background->blue;
-                     }
-                  }
-               }
-            }
-            else /* if (row_info->bit_depth == 16) */
-            {
-#ifdef PNG_READ_GAMMA_SUPPORTED
-               if (gamma_16 != NULL)
-               {
-                  sp = row;
-                  for (i = 0; i < row_width; i++, sp += 6)
-                  {
-                     png_uint_16 r = (png_uint_16)(((*sp) << 8) + *(sp + 1));
-
-                     png_uint_16 g = (png_uint_16)(((*(sp + 2)) << 8)
-                         + *(sp + 3));
-
-                     png_uint_16 b = (png_uint_16)(((*(sp + 4)) << 8)
-                         + *(sp + 5));
-
-                     if (r == trans_color->red && g == trans_color->green &&
-                         b == trans_color->blue)
-                     {
-                        /* Background is already in screen gamma */
-                        *sp = (png_byte)((background->red >> 8) & 0xff);
-                        *(sp + 1) = (png_byte)(background->red & 0xff);
-                        *(sp + 2) = (png_byte)((background->green >> 8) & 0xff);
-                        *(sp + 3) = (png_byte)(background->green & 0xff);
-                        *(sp + 4) = (png_byte)((background->blue >> 8) & 0xff);
-                        *(sp + 5) = (png_byte)(background->blue & 0xff);
-                     }
-
-                     else
-                     {
-                        png_uint_16 v = gamma_16[*(sp + 1) >> gamma_shift][*sp];
-                        *sp = (png_byte)((v >> 8) & 0xff);
-                        *(sp + 1) = (png_byte)(v & 0xff);
-
-                        v = gamma_16[*(sp + 3) >> gamma_shift][*(sp + 2)];
-                        *(sp + 2) = (png_byte)((v >> 8) & 0xff);
-                        *(sp + 3) = (png_byte)(v & 0xff);
-
-                        v = gamma_16[*(sp + 5) >> gamma_shift][*(sp + 4)];
-                        *(sp + 4) = (png_byte)((v >> 8) & 0xff);
-                        *(sp + 5) = (png_byte)(v & 0xff);
-                     }
-                  }
-               }
-
-               else
-#endif
-               {
-                  sp = row;
-                  for (i = 0; i < row_width; i++, sp += 6)
-                  {
-                     png_uint_16 r = (png_uint_16)(((*sp) << 8) + *(sp + 1));
-
-                     png_uint_16 g = (png_uint_16)(((*(sp + 2)) << 8)
-                         + *(sp + 3));
-
-                     png_uint_16 b = (png_uint_16)(((*(sp + 4)) << 8)
-                         + *(sp + 5));
-
-                     if (r == trans_color->red && g == trans_color->green &&
-                         b == trans_color->blue)
-                     {
-                        *sp = (png_byte)((background->red >> 8) & 0xff);
-                        *(sp + 1) = (png_byte)(background->red & 0xff);
-                        *(sp + 2) = (png_byte)((background->green >> 8) & 0xff);
-                        *(sp + 3) = (png_byte)(background->green & 0xff);
-                        *(sp + 4) = (png_byte)((background->blue >> 8) & 0xff);
-                        *(sp + 5) = (png_byte)(background->blue & 0xff);
-                     }
-                  }
-               }
-            }
-            break;
-         }
-
-         case PNG_COLOR_TYPE_GRAY_ALPHA:
-         {
-            if (row_info->bit_depth == 8)
-            {
-#ifdef PNG_READ_GAMMA_SUPPORTED
-               if (gamma_to_1 != NULL && gamma_from_1 != NULL &&
-                   gamma_table != NULL)
-               {
-                  sp = row;
-                  dp = row;
-                  for (i = 0; i < row_width; i++, sp += 2, dp++)
-                  {
-                     png_uint_16 a = *(sp + 1);
-
-                     if (a == 0xff)
-                        *dp = gamma_table[*sp];
-
-                     else if (a == 0)
-                     {
-                        /* Background is already in screen gamma */
-                        *dp = (png_byte)background->gray;
-                     }
-
-                     else
-                     {
-                        png_byte v, w;
-
-                        v = gamma_to_1[*sp];
-                        png_composite(w, v, a, background_1->gray);
-                        *dp = gamma_from_1[w];
-                     }
-                  }
-               }
-               else
-#endif
-               {
-                  sp = row;
-                  dp = row;
-                  for (i = 0; i < row_width; i++, sp += 2, dp++)
-                  {
-                     png_byte a = *(sp + 1);
-
-                     if (a == 0xff)
-                        *dp = *sp;
-
-#ifdef PNG_READ_GAMMA_SUPPORTED
-                     else if (a == 0)
-                        *dp = (png_byte)background->gray;
-
-                     else
-                        png_composite(*dp, *sp, a, background_1->gray);
-
-#else
-                     *dp = (png_byte)background->gray;
-#endif
-                  }
-               }
-            }
-            else /* if (png_ptr->bit_depth == 16) */
-            {
-#ifdef PNG_READ_GAMMA_SUPPORTED
-               if (gamma_16 != NULL && gamma_16_from_1 != NULL &&
-                   gamma_16_to_1 != NULL)
-               {
-                  sp = row;
-                  dp = row;
-                  for (i = 0; i < row_width; i++, sp += 4, dp += 2)
-                  {
-                     png_uint_16 a = (png_uint_16)(((*(sp + 2)) << 8)
-                         + *(sp + 3));
-
-                     if (a == (png_uint_16)0xffff)
-                     {
-                        png_uint_16 v;
-
-                        v = gamma_16[*(sp + 1) >> gamma_shift][*sp];
-                        *dp = (png_byte)((v >> 8) & 0xff);
-                        *(dp + 1) = (png_byte)(v & 0xff);
-                     }
-
-#ifdef PNG_READ_GAMMA_SUPPORTED
-                     else if (a == 0)
-#else
-                     else
-#endif
-                     {
-                        /* Background is already in screen gamma */
-                        *dp = (png_byte)((background->gray >> 8) & 0xff);
-                        *(dp + 1) = (png_byte)(background->gray & 0xff);
-                     }
-
-#ifdef PNG_READ_GAMMA_SUPPORTED
-                     else
-                     {
-                        png_uint_16 g, v, w;
-
-                        g = gamma_16_to_1[*(sp + 1) >> gamma_shift][*sp];
-                        png_composite_16(v, g, a, background_1->gray);
-                        w = gamma_16_from_1[(v&0xff) >> gamma_shift][v >> 8];
-                        *dp = (png_byte)((w >> 8) & 0xff);
-                        *(dp + 1) = (png_byte)(w & 0xff);
-                     }
-#endif
-                  }
-               }
-               else
-#endif
-               {
-                  sp = row;
-                  dp = row;
-                  for (i = 0; i < row_width; i++, sp += 4, dp += 2)
-                  {
-                     png_uint_16 a = (png_uint_16)(((*(sp + 2)) << 8)
-                         + *(sp + 3));
-
-                     if (a == (png_uint_16)0xffff)
-                        png_memcpy(dp, sp, 2);
-
-#ifdef PNG_READ_GAMMA_SUPPORTED
-                     else if (a == 0)
-#else
-                     else
-#endif
-                     {
-                        *dp = (png_byte)((background->gray >> 8) & 0xff);
-                        *(dp + 1) = (png_byte)(background->gray & 0xff);
-                     }
-
-#ifdef PNG_READ_GAMMA_SUPPORTED
-                     else
-                     {
-                        png_uint_16 g, v;
-
-                        g = (png_uint_16)(((*sp) << 8) + *(sp + 1));
-                        png_composite_16(v, g, a, background_1->gray);
-                        *dp = (png_byte)((v >> 8) & 0xff);
-                        *(dp + 1) = (png_byte)(v & 0xff);
-                     }
-#endif
-                  }
-               }
-            }
-            break;
-         }
-
-         case PNG_COLOR_TYPE_RGB_ALPHA:
-         {
-            if (row_info->bit_depth == 8)
-            {
-#ifdef PNG_READ_GAMMA_SUPPORTED
-               if (gamma_to_1 != NULL && gamma_from_1 != NULL &&
-                   gamma_table != NULL)
-               {
-                  sp = row;
-                  dp = row;
-                  for (i = 0; i < row_width; i++, sp += 4, dp += 3)
-                  {
-                     png_byte a = *(sp + 3);
-
-                     if (a == 0xff)
-                     {
-                        *dp = gamma_table[*sp];
-                        *(dp + 1) = gamma_table[*(sp + 1)];
-                        *(dp + 2) = gamma_table[*(sp + 2)];
-                     }
-
-                     else if (a == 0)
-                     {
-                        /* Background is already in screen gamma */
-                        *dp = (png_byte)background->red;
-                        *(dp + 1) = (png_byte)background->green;
-                        *(dp + 2) = (png_byte)background->blue;
-                     }
-
-                     else
-                     {
-                        png_byte v, w;
-
-                        v = gamma_to_1[*sp];
-                        png_composite(w, v, a, background_1->red);
-                        *dp = gamma_from_1[w];
-
-                        v = gamma_to_1[*(sp + 1)];
-                        png_composite(w, v, a, background_1->green);
-                        *(dp + 1) = gamma_from_1[w];
-
-                        v = gamma_to_1[*(sp + 2)];
-                        png_composite(w, v, a, background_1->blue);
-                        *(dp + 2) = gamma_from_1[w];
-                     }
-                  }
-               }
-               else
-#endif
-               {
-                  sp = row;
-                  dp = row;
-                  for (i = 0; i < row_width; i++, sp += 4, dp += 3)
-                  {
-                     png_byte a = *(sp + 3);
-
-                     if (a == 0xff)
-                     {
-                        *dp = *sp;
-                        *(dp + 1) = *(sp + 1);
-                        *(dp + 2) = *(sp + 2);
-                     }
-
-                     else if (a == 0)
-                     {
-                        *dp = (png_byte)background->red;
-                        *(dp + 1) = (png_byte)background->green;
-                        *(dp + 2) = (png_byte)background->blue;
-                     }
-
-                     else
-                     {
-                        png_composite(*dp, *sp, a, background->red);
-
-                        png_composite(*(dp + 1), *(sp + 1), a,
-                            background->green);
-
-                        png_composite(*(dp + 2), *(sp + 2), a,
-                            background->blue);
-                     }
-                  }
-               }
-            }
-            else /* if (row_info->bit_depth == 16) */
-            {
-#ifdef PNG_READ_GAMMA_SUPPORTED
-               if (gamma_16 != NULL && gamma_16_from_1 != NULL &&
-                   gamma_16_to_1 != NULL)
-               {
-                  sp = row;
-                  dp = row;
-                  for (i = 0; i < row_width; i++, sp += 8, dp += 6)
-                  {
-                     png_uint_16 a = (png_uint_16)(((png_uint_16)(*(sp + 6))
-                         << 8) + (png_uint_16)(*(sp + 7)));
-
-                     if (a == (png_uint_16)0xffff)
-                     {
-                        png_uint_16 v;
-
-                        v = gamma_16[*(sp + 1) >> gamma_shift][*sp];
-                        *dp = (png_byte)((v >> 8) & 0xff);
-                        *(dp + 1) = (png_byte)(v & 0xff);
-
-                        v = gamma_16[*(sp + 3) >> gamma_shift][*(sp + 2)];
-                        *(dp + 2) = (png_byte)((v >> 8) & 0xff);
-                        *(dp + 3) = (png_byte)(v & 0xff);
-
-                        v = gamma_16[*(sp + 5) >> gamma_shift][*(sp + 4)];
-                        *(dp + 4) = (png_byte)((v >> 8) & 0xff);
-                        *(dp + 5) = (png_byte)(v & 0xff);
-                     }
-
-                     else if (a == 0)
-                     {
-                        /* Background is already in screen gamma */
-                        *dp = (png_byte)((background->red >> 8) & 0xff);
-                        *(dp + 1) = (png_byte)(background->red & 0xff);
-                        *(dp + 2) = (png_byte)((background->green >> 8) & 0xff);
-                        *(dp + 3) = (png_byte)(background->green & 0xff);
-                        *(dp + 4) = (png_byte)((background->blue >> 8) & 0xff);
-                        *(dp + 5) = (png_byte)(background->blue & 0xff);
-                     }
-
-                     else
-                     {
-                        png_uint_16 v, w, x;
-
-                        v = gamma_16_to_1[*(sp + 1) >> gamma_shift][*sp];
-                        png_composite_16(w, v, a, background_1->red);
-
-                        x = gamma_16_from_1[((w&0xff) >> gamma_shift)][w >> 8];
-                        *dp = (png_byte)((x >> 8) & 0xff);
-                        *(dp + 1) = (png_byte)(x & 0xff);
-
-                        v = gamma_16_to_1[*(sp + 3) >> gamma_shift][*(sp + 2)];
-                        png_composite_16(w, v, a, background_1->green);
-
-                        x = gamma_16_from_1[((w&0xff) >> gamma_shift)][w >> 8];
-                        *(dp + 2) = (png_byte)((x >> 8) & 0xff);
-                        *(dp + 3) = (png_byte)(x & 0xff);
-
-                        v = gamma_16_to_1[*(sp + 5) >> gamma_shift][*(sp + 4)];
-                        png_composite_16(w, v, a, background_1->blue);
-
-                        x = gamma_16_from_1[(w & 0xff) >> gamma_shift][w >> 8];
-                        *(dp + 4) = (png_byte)((x >> 8) & 0xff);
-                        *(dp + 5) = (png_byte)(x & 0xff);
-                     }
-                  }
-               }
-
-               else
-#endif
-               {
-                  sp = row;
-                  dp = row;
-                  for (i = 0; i < row_width; i++, sp += 8, dp += 6)
-                  {
-                     png_uint_16 a = (png_uint_16)(((png_uint_16)(*(sp + 6))
-                         << 8) + (png_uint_16)(*(sp + 7)));
-
-                     if (a == (png_uint_16)0xffff)
-                     {
-                        png_memcpy(dp, sp, 6);
-                     }
-
-                     else if (a == 0)
-                     {
-                        *dp = (png_byte)((background->red >> 8) & 0xff);
-                        *(dp + 1) = (png_byte)(background->red & 0xff);
-                        *(dp + 2) = (png_byte)((background->green >> 8) & 0xff);
-                        *(dp + 3) = (png_byte)(background->green & 0xff);
-                        *(dp + 4) = (png_byte)((background->blue >> 8) & 0xff);
-                        *(dp + 5) = (png_byte)(background->blue & 0xff);
-                     }
-
-                     else
-                     {
-                        png_uint_16 v;
-
-                        png_uint_16 r = (png_uint_16)(((*sp) << 8) + *(sp + 1));
-                        png_uint_16 g = (png_uint_16)(((*(sp + 2)) << 8)
-                            + *(sp + 3));
-                        png_uint_16 b = (png_uint_16)(((*(sp + 4)) << 8)
-                            + *(sp + 5));
-
-                        png_composite_16(v, r, a, background->red);
-                        *dp = (png_byte)((v >> 8) & 0xff);
-                        *(dp + 1) = (png_byte)(v & 0xff);
-
-                        png_composite_16(v, g, a, background->green);
-                        *(dp + 2) = (png_byte)((v >> 8) & 0xff);
-                        *(dp + 3) = (png_byte)(v & 0xff);
-
-                        png_composite_16(v, b, a, background->blue);
-                        *(dp + 4) = (png_byte)((v >> 8) & 0xff);
-                        *(dp + 5) = (png_byte)(v & 0xff);
-                     }
-                  }
-               }
-            }
-            break;
-         }
-
-         default:
-            break;
-      }
-
-      if (row_info->color_type & PNG_COLOR_MASK_ALPHA)
-      {
-         row_info->color_type = (png_byte)(row_info->color_type &
-             ~PNG_COLOR_MASK_ALPHA);
-         row_info->channels--;
-         row_info->pixel_depth = (png_byte)(row_info->channels *
-             row_info->bit_depth);
-         row_info->rowbytes = PNG_ROWBYTES(row_info->pixel_depth, row_width);
-      }
-   }
-}
-#endif
-
-#ifdef PNG_READ_GAMMA_SUPPORTED
-/* Gamma correct the image, avoiding the alpha channel.  Make sure
- * you do this after you deal with the transparency issue on grayscale
- * or RGB images. If your bit depth is 8, use gamma_table, if it
- * is 16, use gamma_16_table and gamma_shift.  Build these with
- * build_gamma_table().
- */
-void /* PRIVATE */
-png_do_gamma(png_row_infop row_info, png_bytep row,
-    png_const_bytep gamma_table, png_const_uint_16pp gamma_16_table,
-    int gamma_shift)
-{
-   png_bytep sp;
-   png_uint_32 i;
-   png_uint_32 row_width=row_info->width;
-
-   png_debug(1, "in png_do_gamma");
-
-   if (((row_info->bit_depth <= 8 && gamma_table != NULL) ||
-       (row_info->bit_depth == 16 && gamma_16_table != NULL)))
-   {
-      switch (row_info->color_type)
-      {
-         case PNG_COLOR_TYPE_RGB:
-         {
-            if (row_info->bit_depth == 8)
-            {
-               sp = row;
-               for (i = 0; i < row_width; i++)
-               {
-                  *sp = gamma_table[*sp];
-                  sp++;
-                  *sp = gamma_table[*sp];
-                  sp++;
-                  *sp = gamma_table[*sp];
-                  sp++;
-               }
-            }
-
-            else /* if (row_info->bit_depth == 16) */
-            {
-               sp = row;
-               for (i = 0; i < row_width; i++)
-               {
-                  png_uint_16 v;
-
-                  v = gamma_16_table[*(sp + 1) >> gamma_shift][*sp];
-                  *sp = (png_byte)((v >> 8) & 0xff);
-                  *(sp + 1) = (png_byte)(v & 0xff);
-                  sp += 2;
-
-                  v = gamma_16_table[*(sp + 1) >> gamma_shift][*sp];
-                  *sp = (png_byte)((v >> 8) & 0xff);
-                  *(sp + 1) = (png_byte)(v & 0xff);
-                  sp += 2;
-
-                  v = gamma_16_table[*(sp + 1) >> gamma_shift][*sp];
-                  *sp = (png_byte)((v >> 8) & 0xff);
-                  *(sp + 1) = (png_byte)(v & 0xff);
-                  sp += 2;
-               }
-            }
-            break;
-         }
-
-         case PNG_COLOR_TYPE_RGB_ALPHA:
-         {
-            if (row_info->bit_depth == 8)
-            {
-               sp = row;
-               for (i = 0; i < row_width; i++)
-               {
-                  *sp = gamma_table[*sp];
-                  sp++;
-
-                  *sp = gamma_table[*sp];
-                  sp++;
-
-                  *sp = gamma_table[*sp];
-                  sp++;
-
-                  sp++;
-               }
-            }
-
-            else /* if (row_info->bit_depth == 16) */
-            {
-               sp = row;
-               for (i = 0; i < row_width; i++)
-               {
-                  png_uint_16 v = gamma_16_table[*(sp + 1) >> gamma_shift][*sp];
-                  *sp = (png_byte)((v >> 8) & 0xff);
-                  *(sp + 1) = (png_byte)(v & 0xff);
-                  sp += 2;
-
-                  v = gamma_16_table[*(sp + 1) >> gamma_shift][*sp];
-                  *sp = (png_byte)((v >> 8) & 0xff);
-                  *(sp + 1) = (png_byte)(v & 0xff);
-                  sp += 2;
-
-                  v = gamma_16_table[*(sp + 1) >> gamma_shift][*sp];
-                  *sp = (png_byte)((v >> 8) & 0xff);
-                  *(sp + 1) = (png_byte)(v & 0xff);
-                  sp += 4;
-               }
-            }
-            break;
-         }
-
-         case PNG_COLOR_TYPE_GRAY_ALPHA:
-         {
-            if (row_info->bit_depth == 8)
-            {
-               sp = row;
-               for (i = 0; i < row_width; i++)
-               {
-                  *sp = gamma_table[*sp];
-                  sp += 2;
-               }
-            }
-
-            else /* if (row_info->bit_depth == 16) */
-            {
-               sp = row;
-               for (i = 0; i < row_width; i++)
-               {
-                  png_uint_16 v = gamma_16_table[*(sp + 1) >> gamma_shift][*sp];
-                  *sp = (png_byte)((v >> 8) & 0xff);
-                  *(sp + 1) = (png_byte)(v & 0xff);
-                  sp += 4;
-               }
-            }
-            break;
-         }
-
-         case PNG_COLOR_TYPE_GRAY:
-         {
-            if (row_info->bit_depth == 2)
-            {
-               sp = row;
-               for (i = 0; i < row_width; i += 4)
-               {
-                  int a = *sp & 0xc0;
-                  int b = *sp & 0x30;
-                  int c = *sp & 0x0c;
-                  int d = *sp & 0x03;
-
-                  *sp = (png_byte)(
-                      ((((int)gamma_table[a|(a>>2)|(a>>4)|(a>>6)])   ) & 0xc0)|
-                      ((((int)gamma_table[(b<<2)|b|(b>>2)|(b>>4)])>>2) & 0x30)|
-                      ((((int)gamma_table[(c<<4)|(c<<2)|c|(c>>2)])>>4) & 0x0c)|
-                      ((((int)gamma_table[(d<<6)|(d<<4)|(d<<2)|d])>>6) ));
-                  sp++;
-               }
-            }
-
-            if (row_info->bit_depth == 4)
-            {
-               sp = row;
-               for (i = 0; i < row_width; i += 2)
-               {
-                  int msb = *sp & 0xf0;
-                  int lsb = *sp & 0x0f;
-
-                  *sp = (png_byte)((((int)gamma_table[msb | (msb >> 4)]) & 0xf0)
-                      | (((int)gamma_table[(lsb << 4) | lsb]) >> 4));
-                  sp++;
-               }
-            }
-
-            else if (row_info->bit_depth == 8)
-            {
-               sp = row;
-               for (i = 0; i < row_width; i++)
-               {
-                  *sp = gamma_table[*sp];
-                  sp++;
-               }
-            }
-
-            else if (row_info->bit_depth == 16)
-            {
-               sp = row;
-               for (i = 0; i < row_width; i++)
-               {
-                  png_uint_16 v = gamma_16_table[*(sp + 1) >> gamma_shift][*sp];
-                  *sp = (png_byte)((v >> 8) & 0xff);
-                  *(sp + 1) = (png_byte)(v & 0xff);
-                  sp += 2;
-               }
-            }
-            break;
-         }
-
-         default:
-            break;
-      }
-   }
-}
-#endif
-
-#ifdef PNG_READ_EXPAND_SUPPORTED
-/* Expands a palette row to an RGB or RGBA row depending
- * upon whether you supply trans and num_trans.
- */
-void /* PRIVATE */
-png_do_expand_palette(png_row_infop row_info, png_bytep row,
-   png_const_colorp palette, png_const_bytep trans_alpha, int num_trans)
-{
-   int shift, value;
-   png_bytep sp, dp;
-   png_uint_32 i;
-   png_uint_32 row_width=row_info->width;
-
-   png_debug(1, "in png_do_expand_palette");
-
-   if (row_info->color_type == PNG_COLOR_TYPE_PALETTE)
-   {
-      if (row_info->bit_depth < 8)
-      {
-         switch (row_info->bit_depth)
-         {
-            case 1:
-            {
-               sp = row + (png_size_t)((row_width - 1) >> 3);
-               dp = row + (png_size_t)row_width - 1;
-               shift = 7 - (int)((row_width + 7) & 0x07);
-               for (i = 0; i < row_width; i++)
-               {
-                  if ((*sp >> shift) & 0x01)
-                     *dp = 1;
-
-                  else
-                     *dp = 0;
-
-                  if (shift == 7)
-                  {
-                     shift = 0;
-                     sp--;
-                  }
-
-                  else
-                     shift++;
-
-                  dp--;
-               }
-               break;
-            }
-
-            case 2:
-            {
-               sp = row + (png_size_t)((row_width - 1) >> 2);
-               dp = row + (png_size_t)row_width - 1;
-               shift = (int)((3 - ((row_width + 3) & 0x03)) << 1);
-               for (i = 0; i < row_width; i++)
-               {
-                  value = (*sp >> shift) & 0x03;
-                  *dp = (png_byte)value;
-                  if (shift == 6)
-                  {
-                     shift = 0;
-                     sp--;
-                  }
-
-                  else
-                     shift += 2;
-
-                  dp--;
-               }
-               break;
-            }
-
-            case 4:
-            {
-               sp = row + (png_size_t)((row_width - 1) >> 1);
-               dp = row + (png_size_t)row_width - 1;
-               shift = (int)((row_width & 0x01) << 2);
-               for (i = 0; i < row_width; i++)
-               {
-                  value = (*sp >> shift) & 0x0f;
-                  *dp = (png_byte)value;
-                  if (shift == 4)
-                  {
-                     shift = 0;
-                     sp--;
-                  }
-
-                  else
-                     shift += 4;
-
-                  dp--;
-               }
-               break;
-            }
-
-            default:
-               break;
-         }
-         row_info->bit_depth = 8;
-         row_info->pixel_depth = 8;
-         row_info->rowbytes = row_width;
-      }
-
-      if (row_info->bit_depth == 8)
-      {
-         {
-            if (trans_alpha != NULL)
-            {
-               sp = row + (png_size_t)row_width - 1;
-               dp = row + (png_size_t)(row_width << 2) - 1;
-
-               for (i = 0; i < row_width; i++)
-               {
-                  if ((int)(*sp) >= num_trans)
-                     *dp-- = 0xff;
-
-                  else
-                     *dp-- = trans_alpha[*sp];
-
-                  *dp-- = palette[*sp].blue;
-                  *dp-- = palette[*sp].green;
-                  *dp-- = palette[*sp].red;
-                  sp--;
-               }
-               row_info->bit_depth = 8;
-               row_info->pixel_depth = 32;
-               row_info->rowbytes = row_width * 4;
-               row_info->color_type = 6;
-               row_info->channels = 4;
-            }
-
-            else
-            {
-               sp = row + (png_size_t)row_width - 1;
-               dp = row + (png_size_t)(row_width * 3) - 1;
-
-               for (i = 0; i < row_width; i++)
-               {
-                  *dp-- = palette[*sp].blue;
-                  *dp-- = palette[*sp].green;
-                  *dp-- = palette[*sp].red;
-                  sp--;
-               }
-
-               row_info->bit_depth = 8;
-               row_info->pixel_depth = 24;
-               row_info->rowbytes = row_width * 3;
-               row_info->color_type = 2;
-               row_info->channels = 3;
-            }
-         }
-      }
-   }
-}
-
-/* If the bit depth < 8, it is expanded to 8.  Also, if the already
- * expanded transparency value is supplied, an alpha channel is built.
- */
-void /* PRIVATE */
-png_do_expand(png_row_infop row_info, png_bytep row,
-    png_const_color_16p trans_value)
-{
-   int shift, value;
-   png_bytep sp, dp;
-   png_uint_32 i;
-   png_uint_32 row_width=row_info->width;
-
-   png_debug(1, "in png_do_expand");
-
-   {
-      if (row_info->color_type == PNG_COLOR_TYPE_GRAY)
-      {
-         png_uint_16 gray = (png_uint_16)(trans_value ? trans_value->gray : 0);
-
-         if (row_info->bit_depth < 8)
-         {
-            switch (row_info->bit_depth)
-            {
-               case 1:
-               {
-                  gray = (png_uint_16)((gray & 0x01) * 0xff);
-                  sp = row + (png_size_t)((row_width - 1) >> 3);
-                  dp = row + (png_size_t)row_width - 1;
-                  shift = 7 - (int)((row_width + 7) & 0x07);
-                  for (i = 0; i < row_width; i++)
-                  {
-                     if ((*sp >> shift) & 0x01)
-                        *dp = 0xff;
-
-                     else
-                        *dp = 0;
-
-                     if (shift == 7)
-                     {
-                        shift = 0;
-                        sp--;
-                     }
-
-                     else
-                        shift++;
-
-                     dp--;
-                  }
-                  break;
-               }
-
-               case 2:
-               {
-                  gray = (png_uint_16)((gray & 0x03) * 0x55);
-                  sp = row + (png_size_t)((row_width - 1) >> 2);
-                  dp = row + (png_size_t)row_width - 1;
-                  shift = (int)((3 - ((row_width + 3) & 0x03)) << 1);
-                  for (i = 0; i < row_width; i++)
-                  {
-                     value = (*sp >> shift) & 0x03;
-                     *dp = (png_byte)(value | (value << 2) | (value << 4) |
-                        (value << 6));
-                     if (shift == 6)
-                     {
-                        shift = 0;
-                        sp--;
-                     }
-
-                     else
-                        shift += 2;
-
-                     dp--;
-                  }
-                  break;
-               }
-
-               case 4:
-               {
-                  gray = (png_uint_16)((gray & 0x0f) * 0x11);
-                  sp = row + (png_size_t)((row_width - 1) >> 1);
-                  dp = row + (png_size_t)row_width - 1;
-                  shift = (int)((1 - ((row_width + 1) & 0x01)) << 2);
-                  for (i = 0; i < row_width; i++)
-                  {
-                     value = (*sp >> shift) & 0x0f;
-                     *dp = (png_byte)(value | (value << 4));
-                     if (shift == 4)
-                     {
-                        shift = 0;
-                        sp--;
-                     }
-
-                     else
-                        shift = 4;
-
-                     dp--;
-                  }
-                  break;
-               }
-
-               default:
-                  break;
-            }
-
-            row_info->bit_depth = 8;
-            row_info->pixel_depth = 8;
-            row_info->rowbytes = row_width;
-         }
-
-         if (trans_value != NULL)
-         {
-            if (row_info->bit_depth == 8)
-            {
-               gray = gray & 0xff;
-               sp = row + (png_size_t)row_width - 1;
-               dp = row + (png_size_t)(row_width << 1) - 1;
-
-               for (i = 0; i < row_width; i++)
-               {
-                  if (*sp == gray)
-                     *dp-- = 0;
-
-                  else
-                     *dp-- = 0xff;
-
-                  *dp-- = *sp--;
-               }
-            }
-
-            else if (row_info->bit_depth == 16)
-            {
-               png_byte gray_high = (png_byte)((gray >> 8) & 0xff);
-               png_byte gray_low = (png_byte)(gray & 0xff);
-               sp = row + row_info->rowbytes - 1;
-               dp = row + (row_info->rowbytes << 1) - 1;
-               for (i = 0; i < row_width; i++)
-               {
-                  if (*(sp - 1) == gray_high && *(sp) == gray_low)
-                  {
-                     *dp-- = 0;
-                     *dp-- = 0;
-                  }
-
-                  else
-                  {
-                     *dp-- = 0xff;
-                     *dp-- = 0xff;
-                  }
-
-                  *dp-- = *sp--;
-                  *dp-- = *sp--;
-               }
-            }
-
-            row_info->color_type = PNG_COLOR_TYPE_GRAY_ALPHA;
-            row_info->channels = 2;
-            row_info->pixel_depth = (png_byte)(row_info->bit_depth << 1);
-            row_info->rowbytes = PNG_ROWBYTES(row_info->pixel_depth,
-               row_width);
-         }
-      }
-      else if (row_info->color_type == PNG_COLOR_TYPE_RGB && trans_value)
-      {
-         if (row_info->bit_depth == 8)
-         {
-            png_byte red = (png_byte)(trans_value->red & 0xff);
-            png_byte green = (png_byte)(trans_value->green & 0xff);
-            png_byte blue = (png_byte)(trans_value->blue & 0xff);
-            sp = row + (png_size_t)row_info->rowbytes - 1;
-            dp = row + (png_size_t)(row_width << 2) - 1;
-            for (i = 0; i < row_width; i++)
-            {
-               if (*(sp - 2) == red && *(sp - 1) == green && *(sp) == blue)
-                  *dp-- = 0;
-
-               else
-                  *dp-- = 0xff;
-
-               *dp-- = *sp--;
-               *dp-- = *sp--;
-               *dp-- = *sp--;
-            }
-         }
-         else if (row_info->bit_depth == 16)
-         {
-            png_byte red_high = (png_byte)((trans_value->red >> 8) & 0xff);
-            png_byte green_high = (png_byte)((trans_value->green >> 8) & 0xff);
-            png_byte blue_high = (png_byte)((trans_value->blue >> 8) & 0xff);
-            png_byte red_low = (png_byte)(trans_value->red & 0xff);
-            png_byte green_low = (png_byte)(trans_value->green & 0xff);
-            png_byte blue_low = (png_byte)(trans_value->blue & 0xff);
-            sp = row + row_info->rowbytes - 1;
-            dp = row + (png_size_t)(row_width << 3) - 1;
-            for (i = 0; i < row_width; i++)
-            {
-               if (*(sp - 5) == red_high &&
-                   *(sp - 4) == red_low &&
-                   *(sp - 3) == green_high &&
-                   *(sp - 2) == green_low &&
-                   *(sp - 1) == blue_high &&
-                   *(sp    ) == blue_low)
-               {
-                  *dp-- = 0;
-                  *dp-- = 0;
-               }
-
-               else
-               {
-                  *dp-- = 0xff;
-                  *dp-- = 0xff;
-               }
-
-               *dp-- = *sp--;
-               *dp-- = *sp--;
-               *dp-- = *sp--;
-               *dp-- = *sp--;
-               *dp-- = *sp--;
-               *dp-- = *sp--;
-            }
-         }
-         row_info->color_type = PNG_COLOR_TYPE_RGB_ALPHA;
-         row_info->channels = 4;
-         row_info->pixel_depth = (png_byte)(row_info->bit_depth << 2);
-         row_info->rowbytes = PNG_ROWBYTES(row_info->pixel_depth, row_width);
-      }
-   }
-}
-#endif
-
-#ifdef PNG_READ_QUANTIZE_SUPPORTED
-void /* PRIVATE */
-png_do_quantize(png_row_infop row_info, png_bytep row,
-    png_const_bytep palette_lookup, png_const_bytep quantize_lookup)
-{
-   png_bytep sp, dp;
-   png_uint_32 i;
-   png_uint_32 row_width=row_info->width;
-
-   png_debug(1, "in png_do_quantize");
-
-   if (row_info->bit_depth == 8)
-   {
-      if (row_info->color_type == PNG_COLOR_TYPE_RGB && palette_lookup)
-      {
-         int r, g, b, p;
-         sp = row;
-         dp = row;
-         for (i = 0; i < row_width; i++)
-         {
-            r = *sp++;
-            g = *sp++;
-            b = *sp++;
-
-            /* This looks real messy, but the compiler will reduce
-             * it down to a reasonable formula.  For example, with
-             * 5 bits per color, we get:
-             * p = (((r >> 3) & 0x1f) << 10) |
-             *    (((g >> 3) & 0x1f) << 5) |
-             *    ((b >> 3) & 0x1f);
-             */
-            p = (((r >> (8 - PNG_QUANTIZE_RED_BITS)) &
-                ((1 << PNG_QUANTIZE_RED_BITS) - 1)) <<
-                (PNG_QUANTIZE_GREEN_BITS + PNG_QUANTIZE_BLUE_BITS)) |
-                (((g >> (8 - PNG_QUANTIZE_GREEN_BITS)) &
-                ((1 << PNG_QUANTIZE_GREEN_BITS) - 1)) <<
-                (PNG_QUANTIZE_BLUE_BITS)) |
-                ((b >> (8 - PNG_QUANTIZE_BLUE_BITS)) &
-                ((1 << PNG_QUANTIZE_BLUE_BITS) - 1));
-
-            *dp++ = palette_lookup[p];
-         }
-
-         row_info->color_type = PNG_COLOR_TYPE_PALETTE;
-         row_info->channels = 1;
-         row_info->pixel_depth = row_info->bit_depth;
-         row_info->rowbytes = PNG_ROWBYTES(row_info->pixel_depth, row_width);
-      }
-
-      else if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA &&
-         palette_lookup != NULL)
-      {
-         int r, g, b, p;
-         sp = row;
-         dp = row;
-         for (i = 0; i < row_width; i++)
-         {
-            r = *sp++;
-            g = *sp++;
-            b = *sp++;
-            sp++;
-
-            p = (((r >> (8 - PNG_QUANTIZE_RED_BITS)) &
-                ((1 << PNG_QUANTIZE_RED_BITS) - 1)) <<
-                (PNG_QUANTIZE_GREEN_BITS + PNG_QUANTIZE_BLUE_BITS)) |
-                (((g >> (8 - PNG_QUANTIZE_GREEN_BITS)) &
-                ((1 << PNG_QUANTIZE_GREEN_BITS) - 1)) <<
-                (PNG_QUANTIZE_BLUE_BITS)) |
-                ((b >> (8 - PNG_QUANTIZE_BLUE_BITS)) &
-                ((1 << PNG_QUANTIZE_BLUE_BITS) - 1));
-
-            *dp++ = palette_lookup[p];
-         }
-
-         row_info->color_type = PNG_COLOR_TYPE_PALETTE;
-         row_info->channels = 1;
-         row_info->pixel_depth = row_info->bit_depth;
-         row_info->rowbytes = PNG_ROWBYTES(row_info->pixel_depth, row_width);
-      }
-
-      else if (row_info->color_type == PNG_COLOR_TYPE_PALETTE &&
-         quantize_lookup)
-      {
-         sp = row;
-
-         for (i = 0; i < row_width; i++, sp++)
-         {
-            *sp = quantize_lookup[*sp];
-         }
-      }
-   }
-}
-#endif /* PNG_READ_QUANTIZE_SUPPORTED */
-
-#ifdef PNG_MNG_FEATURES_SUPPORTED
-/* Undoes intrapixel differencing  */
-void /* PRIVATE */
-png_do_read_intrapixel(png_row_infop row_info, png_bytep row)
-{
-   png_debug(1, "in png_do_read_intrapixel");
-
-   if (
-       (row_info->color_type & PNG_COLOR_MASK_COLOR))
-   {
-      int bytes_per_pixel;
-      png_uint_32 row_width = row_info->width;
-
-      if (row_info->bit_depth == 8)
-      {
-         png_bytep rp;
-         png_uint_32 i;
-
-         if (row_info->color_type == PNG_COLOR_TYPE_RGB)
-            bytes_per_pixel = 3;
-
-         else if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
-            bytes_per_pixel = 4;
-
-         else
-            return;
-
-         for (i = 0, rp = row; i < row_width; i++, rp += bytes_per_pixel)
-         {
-            *(rp) = (png_byte)((256 + *rp + *(rp + 1)) & 0xff);
-            *(rp+2) = (png_byte)((256 + *(rp + 2) + *(rp + 1)) & 0xff);
-         }
-      }
-      else if (row_info->bit_depth == 16)
-      {
-         png_bytep rp;
-         png_uint_32 i;
-
-         if (row_info->color_type == PNG_COLOR_TYPE_RGB)
-            bytes_per_pixel = 6;
-
-         else if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
-            bytes_per_pixel = 8;
-
-         else
-            return;
-
-         for (i = 0, rp = row; i < row_width; i++, rp += bytes_per_pixel)
-         {
-            png_uint_32 s0   = (*(rp    ) << 8) | *(rp + 1);
-            png_uint_32 s1   = (*(rp + 2) << 8) | *(rp + 3);
-            png_uint_32 s2   = (*(rp + 4) << 8) | *(rp + 5);
-            png_uint_32 red  = (png_uint_32)((s0 + s1 + 65536L) & 0xffffL);
-            png_uint_32 blue = (png_uint_32)((s2 + s1 + 65536L) & 0xffffL);
-            *(rp    ) = (png_byte)((red >> 8) & 0xff);
-            *(rp + 1) = (png_byte)(red & 0xff);
-            *(rp + 4) = (png_byte)((blue >> 8) & 0xff);
-            *(rp + 5) = (png_byte)(blue & 0xff);
-         }
-      }
-   }
-}
-#endif /* PNG_MNG_FEATURES_SUPPORTED */
-#endif /* PNG_READ_SUPPORTED */
+
+/* pngrtran.c - transforms the data in a row for PNG readers
+ *
+ * Last changed in libpng 1.2.49 [March 29, 2012]
+ * Copyright (c) 1998-2012 Glenn Randers-Pehrson
+ * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
+ * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
+ *
+ * This code is released under the libpng license.
+ * For conditions of distribution and use, see the disclaimer
+ * and license in png.h
+ *
+ * This file contains functions optionally called by an application
+ * in order to tell libpng how to handle data when reading a PNG.
+ * Transformations that are used in both reading and writing are
+ * in pngtrans.c.
+ */
+
+#define PNG_INTERNAL
+#define PNG_NO_PEDANTIC_WARNINGS
+#include "png.h"
+#ifdef PNG_READ_SUPPORTED
+
+/* Set the action on getting a CRC error for an ancillary or critical chunk. */
+void PNGAPI
+png_set_crc_action(png_structp png_ptr, int crit_action, int ancil_action)
+{
+   png_debug(1, "in png_set_crc_action");
+ 
+   if (png_ptr == NULL)
+      return;
+
+   /* Tell libpng how we react to CRC errors in critical chunks */
+   switch (crit_action)
+   {
+      case PNG_CRC_NO_CHANGE:                        /* Leave setting as is */
+         break;
+
+      case PNG_CRC_WARN_USE:                               /* Warn/use data */
+         png_ptr->flags &= ~PNG_FLAG_CRC_CRITICAL_MASK;
+         png_ptr->flags |= PNG_FLAG_CRC_CRITICAL_USE;
+         break;
+
+      case PNG_CRC_QUIET_USE:                             /* Quiet/use data */
+         png_ptr->flags &= ~PNG_FLAG_CRC_CRITICAL_MASK;
+         png_ptr->flags |= PNG_FLAG_CRC_CRITICAL_USE |
+                           PNG_FLAG_CRC_CRITICAL_IGNORE;
+         break;
+
+      case PNG_CRC_WARN_DISCARD:    /* Not a valid action for critical data */
+         png_warning(png_ptr,
+            "Can't discard critical data on CRC error.");
+      case PNG_CRC_ERROR_QUIT:                                /* Error/quit */
+
+      case PNG_CRC_DEFAULT:
+      default:
+         png_ptr->flags &= ~PNG_FLAG_CRC_CRITICAL_MASK;
+         break;
+   }
+
+   /* Tell libpng how we react to CRC errors in ancillary chunks */
+   switch (ancil_action)
+   {
+      case PNG_CRC_NO_CHANGE:                       /* Leave setting as is */
+         break;
+
+      case PNG_CRC_WARN_USE:                              /* Warn/use data */
+         png_ptr->flags &= ~PNG_FLAG_CRC_ANCILLARY_MASK;
+         png_ptr->flags |= PNG_FLAG_CRC_ANCILLARY_USE;
+         break;
+
+      case PNG_CRC_QUIET_USE:                            /* Quiet/use data */
+         png_ptr->flags &= ~PNG_FLAG_CRC_ANCILLARY_MASK;
+         png_ptr->flags |= PNG_FLAG_CRC_ANCILLARY_USE |
+                           PNG_FLAG_CRC_ANCILLARY_NOWARN;
+         break;
+
+      case PNG_CRC_ERROR_QUIT:                               /* Error/quit */
+         png_ptr->flags &= ~PNG_FLAG_CRC_ANCILLARY_MASK;
+         png_ptr->flags |= PNG_FLAG_CRC_ANCILLARY_NOWARN;
+         break;
+
+      case PNG_CRC_WARN_DISCARD:                      /* Warn/discard data */
+
+      case PNG_CRC_DEFAULT:
+      default:
+         png_ptr->flags &= ~PNG_FLAG_CRC_ANCILLARY_MASK;
+         break;
+   }
+}
+
+#if defined(PNG_READ_BACKGROUND_SUPPORTED) && \
+    defined(PNG_FLOATING_POINT_SUPPORTED)
+/* Handle alpha and tRNS via a background color */
+void PNGAPI
+png_set_background(png_structp png_ptr,
+   png_color_16p background_color, int background_gamma_code,
+   int need_expand, double background_gamma)
+{
+   png_debug(1, "in png_set_background");
+ 
+   if (png_ptr == NULL)
+      return;
+   if (background_gamma_code == PNG_BACKGROUND_GAMMA_UNKNOWN)
+   {
+      png_warning(png_ptr, "Application must supply a known background gamma");
+      return;
+   }
+
+   png_ptr->transformations |= PNG_BACKGROUND;
+   png_memcpy(&(png_ptr->background), background_color,
+      png_sizeof(png_color_16));
+   png_ptr->background_gamma = (float)background_gamma;
+   png_ptr->background_gamma_type = (png_byte)(background_gamma_code);
+   png_ptr->transformations |= (need_expand ? PNG_BACKGROUND_EXPAND : 0);
+}
+#endif
+
+#ifdef PNG_READ_16_TO_8_SUPPORTED
+/* Strip 16 bit depth files to 8 bit depth */
+void PNGAPI
+png_set_strip_16(png_structp png_ptr)
+{
+   png_debug(1, "in png_set_strip_16");
+
+   if (png_ptr == NULL)
+      return;
+   png_ptr->transformations |= PNG_16_TO_8;
+}
+#endif
+
+#ifdef PNG_READ_STRIP_ALPHA_SUPPORTED
+void PNGAPI
+png_set_strip_alpha(png_structp png_ptr)
+{
+   png_debug(1, "in png_set_strip_alpha");
+
+   if (png_ptr == NULL)
+      return;
+   png_ptr->flags |= PNG_FLAG_STRIP_ALPHA;
+}
+#endif
+
+#ifdef PNG_READ_DITHER_SUPPORTED
+/* Dither file to 8 bit.  Supply a palette, the current number
+ * of elements in the palette, the maximum number of elements
+ * allowed, and a histogram if possible.  If the current number
+ * of colors is greater then the maximum number, the palette will be
+ * modified to fit in the maximum number.  "full_dither" indicates
+ * whether we need a dithering cube set up for RGB images, or if we
+ * simply are reducing the number of colors in a paletted image.
+ */
+
+typedef struct png_dsort_struct
+{
+   struct png_dsort_struct FAR * next;
+   png_byte left;
+   png_byte right;
+} png_dsort;
+typedef png_dsort FAR *       png_dsortp;
+typedef png_dsort FAR * FAR * png_dsortpp;
+
+void PNGAPI
+png_set_dither(png_structp png_ptr, png_colorp palette,
+   int num_palette, int maximum_colors, png_uint_16p histogram,
+   int full_dither)
+{
+   png_debug(1, "in png_set_dither");
+
+   if (png_ptr == NULL)
+      return;
+   png_ptr->transformations |= PNG_DITHER;
+
+   if (!full_dither)
+   {
+      int i;
+
+      png_ptr->dither_index = (png_bytep)png_malloc(png_ptr,
+         (png_uint_32)(num_palette * png_sizeof(png_byte)));
+      for (i = 0; i < num_palette; i++)
+         png_ptr->dither_index[i] = (png_byte)i;
+   }
+
+   if (num_palette > maximum_colors)
+   {
+      if (histogram != NULL)
+      {
+         /* This is easy enough, just throw out the least used colors.
+          * Perhaps not the best solution, but good enough.
+          */
+
+         int i;
+
+         /* Initialize an array to sort colors */
+         png_ptr->dither_sort = (png_bytep)png_malloc(png_ptr,
+            (png_uint_32)(num_palette * png_sizeof(png_byte)));
+
+         /* Initialize the dither_sort array */
+         for (i = 0; i < num_palette; i++)
+            png_ptr->dither_sort[i] = (png_byte)i;
+
+         /* Find the least used palette entries by starting a
+          * bubble sort, and running it until we have sorted
+          * out enough colors.  Note that we don't care about
+          * sorting all the colors, just finding which are
+          * least used.
+          */
+
+         for (i = num_palette - 1; i >= maximum_colors; i--)
+         {
+            int done; /* To stop early if the list is pre-sorted */
+            int j;
+
+            done = 1;
+            for (j = 0; j < i; j++)
+            {
+               if (histogram[png_ptr->dither_sort[j]]
+                   < histogram[png_ptr->dither_sort[j + 1]])
+               {
+                  png_byte t;
+
+                  t = png_ptr->dither_sort[j];
+                  png_ptr->dither_sort[j] = png_ptr->dither_sort[j + 1];
+                  png_ptr->dither_sort[j + 1] = t;
+                  done = 0;
+               }
+            }
+            if (done)
+               break;
+         }
+
+         /* Swap the palette around, and set up a table, if necessary */
+         if (full_dither)
+         {
+            int j = num_palette;
+
+            /* Put all the useful colors within the max, but don't
+             * move the others.
+             */
+            for (i = 0; i < maximum_colors; i++)
+            {
+               if ((int)png_ptr->dither_sort[i] >= maximum_colors)
+               {
+                  do
+                     j--;
+                  while ((int)png_ptr->dither_sort[j] >= maximum_colors);
+                  palette[i] = palette[j];
+               }
+            }
+         }
+         else
+         {
+            int j = num_palette;
+
+            /* Move all the used colors inside the max limit, and
+             * develop a translation table.
+             */
+            for (i = 0; i < maximum_colors; i++)
+            {
+               /* Only move the colors we need to */
+               if ((int)png_ptr->dither_sort[i] >= maximum_colors)
+               {
+                  png_color tmp_color;
+
+                  do
+                     j--;
+                  while ((int)png_ptr->dither_sort[j] >= maximum_colors);
+
+                  tmp_color = palette[j];
+                  palette[j] = palette[i];
+                  palette[i] = tmp_color;
+                  /* Indicate where the color went */
+                  png_ptr->dither_index[j] = (png_byte)i;
+                  png_ptr->dither_index[i] = (png_byte)j;
+               }
+            }
+
+            /* Find closest color for those colors we are not using */
+            for (i = 0; i < num_palette; i++)
+            {
+               if ((int)png_ptr->dither_index[i] >= maximum_colors)
+               {
+                  int min_d, k, min_k, d_index;
+
+                  /* Find the closest color to one we threw out */
+                  d_index = png_ptr->dither_index[i];
+                  min_d = PNG_COLOR_DIST(palette[d_index], palette[0]);
+                  for (k = 1, min_k = 0; k < maximum_colors; k++)
+                  {
+                     int d;
+
+                     d = PNG_COLOR_DIST(palette[d_index], palette[k]);
+
+                     if (d < min_d)
+                     {
+                        min_d = d;
+                        min_k = k;
+                     }
+                  }
+                  /* Point to closest color */
+                  png_ptr->dither_index[i] = (png_byte)min_k;
+               }
+            }
+         }
+         png_free(png_ptr, png_ptr->dither_sort);
+         png_ptr->dither_sort = NULL;
+      }
+      else
+      {
+         /* This is much harder to do simply (and quickly).  Perhaps
+          * we need to go through a median cut routine, but those
+          * don't always behave themselves with only a few colors
+          * as input.  So we will just find the closest two colors,
+          * and throw out one of them (chosen somewhat randomly).
+          * [We don't understand this at all, so if someone wants to
+          *  work on improving it, be our guest - AED, GRP]
+          */
+         int i;
+         int max_d;
+         int num_new_palette;
+         png_dsortp t;
+         png_dsortpp hash;
+
+         t = NULL;
+
+         /* Initialize palette index arrays */
+         png_ptr->index_to_palette = (png_bytep)png_malloc(png_ptr,
+            (png_uint_32)(num_palette * png_sizeof(png_byte)));
+         png_ptr->palette_to_index = (png_bytep)png_malloc(png_ptr,
+            (png_uint_32)(num_palette * png_sizeof(png_byte)));
+
+         /* Initialize the sort array */
+         for (i = 0; i < num_palette; i++)
+         {
+            png_ptr->index_to_palette[i] = (png_byte)i;
+            png_ptr->palette_to_index[i] = (png_byte)i;
+         }
+
+         hash = (png_dsortpp)png_calloc(png_ptr, (png_uint_32)(769 *
+            png_sizeof(png_dsortp)));
+
+         num_new_palette = num_palette;
+
+         /* Initial wild guess at how far apart the farthest pixel
+          * pair we will be eliminating will be.  Larger
+          * numbers mean more areas will be allocated, Smaller
+          * numbers run the risk of not saving enough data, and
+          * having to do this all over again.
+          *
+          * I have not done extensive checking on this number.
+          */
+         max_d = 96;
+
+         while (num_new_palette > maximum_colors)
+         {
+            for (i = 0; i < num_new_palette - 1; i++)
+            {
+               int j;
+
+               for (j = i + 1; j < num_new_palette; j++)
+               {
+                  int d;
+
+                  d = PNG_COLOR_DIST(palette[i], palette[j]);
+
+                  if (d <= max_d)
+                  {
+
+                     t = (png_dsortp)png_malloc_warn(png_ptr,
+                         (png_uint_32)(png_sizeof(png_dsort)));
+                     if (t == NULL)
+                         break;
+                     t->next = hash[d];
+                     t->left = (png_byte)i;
+                     t->right = (png_byte)j;
+                     hash[d] = t;
+                  }
+               }
+               if (t == NULL)
+                  break;
+            }
+
+            if (t != NULL)
+            for (i = 0; i <= max_d; i++)
+            {
+               if (hash[i] != NULL)
+               {
+                  png_dsortp p;
+
+                  for (p = hash[i]; p; p = p->next)
+                  {
+                     if ((int)png_ptr->index_to_palette[p->left]
+                        < num_new_palette &&
+                        (int)png_ptr->index_to_palette[p->right]
+                        < num_new_palette)
+                     {
+                        int j, next_j;
+
+                        if (num_new_palette & 0x01)
+                        {
+                           j = p->left;
+                           next_j = p->right;
+                        }
+                        else
+                        {
+                           j = p->right;
+                           next_j = p->left;
+                        }
+
+                        num_new_palette--;
+                        palette[png_ptr->index_to_palette[j]]
+                          = palette[num_new_palette];
+                        if (!full_dither)
+                        {
+                           int k;
+
+                           for (k = 0; k < num_palette; k++)
+                           {
+                              if (png_ptr->dither_index[k] ==
+                                 png_ptr->index_to_palette[j])
+                                 png_ptr->dither_index[k] =
+                                    png_ptr->index_to_palette[next_j];
+                              if ((int)png_ptr->dither_index[k] ==
+                                 num_new_palette)
+                                 png_ptr->dither_index[k] =
+                                    png_ptr->index_to_palette[j];
+                           }
+                        }
+
+                        png_ptr->index_to_palette[png_ptr->palette_to_index
+                           [num_new_palette]] = png_ptr->index_to_palette[j];
+                        png_ptr->palette_to_index[png_ptr->index_to_palette[j]]
+                           = png_ptr->palette_to_index[num_new_palette];
+
+                        png_ptr->index_to_palette[j] =
+                            (png_byte)num_new_palette;
+                        png_ptr->palette_to_index[num_new_palette] =
+                            (png_byte)j;
+                     }
+                     if (num_new_palette <= maximum_colors)
+                        break;
+                  }
+                  if (num_new_palette <= maximum_colors)
+                     break;
+               }
+            }
+
+            for (i = 0; i < 769; i++)
+            {
+               if (hash[i] != NULL)
+               {
+                  png_dsortp p = hash[i];
+                  while (p)
+                  {
+                     t = p->next;
+                     png_free(png_ptr, p);
+                     p = t;
+                  }
+               }
+               hash[i] = 0;
+            }
+            max_d += 96;
+         }
+         png_free(png_ptr, hash);
+         png_free(png_ptr, png_ptr->palette_to_index);
+         png_free(png_ptr, png_ptr->index_to_palette);
+         png_ptr->palette_to_index = NULL;
+         png_ptr->index_to_palette = NULL;
+      }
+      num_palette = maximum_colors;
+   }
+   if (png_ptr->palette == NULL)
+   {
+      png_ptr->palette = palette;
+   }
+   png_ptr->num_palette = (png_uint_16)num_palette;
+
+   if (full_dither)
+   {
+      int i;
+      png_bytep distance;
+      int total_bits = PNG_DITHER_RED_BITS + PNG_DITHER_GREEN_BITS +
+         PNG_DITHER_BLUE_BITS;
+      int num_red = (1 << PNG_DITHER_RED_BITS);
+      int num_green = (1 << PNG_DITHER_GREEN_BITS);
+      int num_blue = (1 << PNG_DITHER_BLUE_BITS);
+      png_size_t num_entries = ((png_size_t)1 << total_bits);
+
+      png_ptr->palette_lookup = (png_bytep )png_calloc(png_ptr,
+         (png_uint_32)(num_entries * png_sizeof(png_byte)));
+
+      distance = (png_bytep)png_malloc(png_ptr, (png_uint_32)(num_entries *
+         png_sizeof(png_byte)));
+      png_memset(distance, 0xff, num_entries * png_sizeof(png_byte));
+
+      for (i = 0; i < num_palette; i++)
+      {
+         int ir, ig, ib;
+         int r = (palette[i].red >> (8 - PNG_DITHER_RED_BITS));
+         int g = (palette[i].green >> (8 - PNG_DITHER_GREEN_BITS));
+         int b = (palette[i].blue >> (8 - PNG_DITHER_BLUE_BITS));
+
+         for (ir = 0; ir < num_red; ir++)
+         {
+            /* int dr = abs(ir - r); */
+            int dr = ((ir > r) ? ir - r : r - ir);
+            int index_r = (ir << (PNG_DITHER_BLUE_BITS +
+                PNG_DITHER_GREEN_BITS));
+
+            for (ig = 0; ig < num_green; ig++)
+            {
+               /* int dg = abs(ig - g); */
+               int dg = ((ig > g) ? ig - g : g - ig);
+               int dt = dr + dg;
+               int dm = ((dr > dg) ? dr : dg);
+               int index_g = index_r | (ig << PNG_DITHER_BLUE_BITS);
+
+               for (ib = 0; ib < num_blue; ib++)
+               {
+                  int d_index = index_g | ib;
+                  /* int db = abs(ib - b); */
+                  int db = ((ib > b) ? ib - b : b - ib);
+                  int dmax = ((dm > db) ? dm : db);
+                  int d = dmax + dt + db;
+
+                  if (d < (int)distance[d_index])
+                  {
+                     distance[d_index] = (png_byte)d;
+                     png_ptr->palette_lookup[d_index] = (png_byte)i;
+                  }
+               }
+            }
+         }
+      }
+
+      png_free(png_ptr, distance);
+   }
+}
+#endif
+
+#if defined(PNG_READ_GAMMA_SUPPORTED) && defined(PNG_FLOATING_POINT_SUPPORTED)
+/* Transform the image from the file_gamma to the screen_gamma.  We
+ * only do transformations on images where the file_gamma and screen_gamma
+ * are not close reciprocals, otherwise it slows things down slightly, and
+ * also needlessly introduces small errors.
+ *
+ * We will turn off gamma transformation later if no semitransparent entries
+ * are present in the tRNS array for palette images.  We can't do it here
+ * because we don't necessarily have the tRNS chunk yet.
+ */
+void PNGAPI
+png_set_gamma(png_structp png_ptr, double scrn_gamma, double file_gamma)
+{
+   png_debug(1, "in png_set_gamma");
+
+   if (png_ptr == NULL)
+      return;
+
+   if ((fabs(scrn_gamma * file_gamma - 1.0) > PNG_GAMMA_THRESHOLD) ||
+       (png_ptr->color_type & PNG_COLOR_MASK_ALPHA) ||
+       (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE))
+     png_ptr->transformations |= PNG_GAMMA;
+   png_ptr->gamma = (float)file_gamma;
+   png_ptr->screen_gamma = (float)scrn_gamma;
+}
+#endif
+
+#ifdef PNG_READ_EXPAND_SUPPORTED
+/* Expand paletted images to RGB, expand grayscale images of
+ * less than 8-bit depth to 8-bit depth, and expand tRNS chunks
+ * to alpha channels.
+ */
+void PNGAPI
+png_set_expand(png_structp png_ptr)
+{
+   png_debug(1, "in png_set_expand");
+
+   if (png_ptr == NULL)
+      return;
+
+   png_ptr->transformations |= (PNG_EXPAND | PNG_EXPAND_tRNS);
+   png_ptr->flags &= ~PNG_FLAG_ROW_INIT;
+}
+
+/* GRR 19990627:  the following three functions currently are identical
+ *  to png_set_expand().  However, it is entirely reasonable that someone
+ *  might wish to expand an indexed image to RGB but *not* expand a single,
+ *  fully transparent palette entry to a full alpha channel--perhaps instead
+ *  convert tRNS to the grayscale/RGB format (16-bit RGB value), or replace
+ *  the transparent color with a particular RGB value, or drop tRNS entirely.
+ *  IOW, a future version of the library may make the transformations flag
+ *  a bit more fine-grained, with separate bits for each of these three
+ *  functions.
+ *
+ *  More to the point, these functions make it obvious what libpng will be
+ *  doing, whereas "expand" can (and does) mean any number of things.
+ *
+ *  GRP 20060307: In libpng-1.2.9, png_set_gray_1_2_4_to_8() was modified
+ *  to expand only the sample depth but not to expand the tRNS to alpha
+ *  and its name was changed to png_set_expand_gray_1_2_4_to_8().
+ */
+
+/* Expand paletted images to RGB. */
+void PNGAPI
+png_set_palette_to_rgb(png_structp png_ptr)
+{
+   png_debug(1, "in png_set_palette_to_rgb");
+
+   if (png_ptr == NULL)
+      return;
+
+   png_ptr->transformations |= (PNG_EXPAND | PNG_EXPAND_tRNS);
+   png_ptr->flags &= ~PNG_FLAG_ROW_INIT;
+}
+
+#ifndef PNG_1_0_X
+/* Expand grayscale images of less than 8-bit depth to 8 bits. */
+void PNGAPI
+png_set_expand_gray_1_2_4_to_8(png_structp png_ptr)
+{
+   png_debug(1, "in png_set_expand_gray_1_2_4_to_8");
+
+   if (png_ptr == NULL)
+      return;
+
+   png_ptr->transformations |= PNG_EXPAND;
+   png_ptr->flags &= ~PNG_FLAG_ROW_INIT;
+}
+#endif
+
+#if defined(PNG_1_0_X) || defined(PNG_1_2_X)
+/* Expand grayscale images of less than 8-bit depth to 8 bits. */
+/* Deprecated as of libpng-1.2.9 */
+void PNGAPI
+png_set_gray_1_2_4_to_8(png_structp png_ptr)
+{
+   png_debug(1, "in png_set_gray_1_2_4_to_8");
+
+   if (png_ptr == NULL)
+      return;
+
+   png_ptr->transformations |= (PNG_EXPAND | PNG_EXPAND_tRNS);
+}
+#endif
+
+
+/* Expand tRNS chunks to alpha channels. */
+void PNGAPI
+png_set_tRNS_to_alpha(png_structp png_ptr)
+{
+   png_debug(1, "in png_set_tRNS_to_alpha");
+
+   png_ptr->transformations |= (PNG_EXPAND | PNG_EXPAND_tRNS);
+   png_ptr->flags &= ~PNG_FLAG_ROW_INIT;
+}
+#endif /* defined(PNG_READ_EXPAND_SUPPORTED) */
+
+#ifdef PNG_READ_GRAY_TO_RGB_SUPPORTED
+void PNGAPI
+png_set_gray_to_rgb(png_structp png_ptr)
+{
+   png_debug(1, "in png_set_gray_to_rgb");
+
+   png_ptr->transformations |= PNG_GRAY_TO_RGB;
+   png_ptr->flags &= ~PNG_FLAG_ROW_INIT;
+}
+#endif
+
+#ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+/* Convert a RGB image to a grayscale of the same width.  This allows us,
+ * for example, to convert a 24 bpp RGB image into an 8 bpp grayscale image.
+ */
+
+void PNGAPI
+png_set_rgb_to_gray(png_structp png_ptr, int error_action, double red,
+   double green)
+{
+   int red_fixed, green_fixed;
+   if (png_ptr == NULL)
+      return;
+   if (red > 21474.83647 || red < -21474.83648 ||
+       green > 21474.83647 || green < -21474.83648)
+   {
+      png_warning(png_ptr, "ignoring out of range rgb_to_gray coefficients");
+      red_fixed = -1;
+      green_fixed = -1;
+   }
+   else
+   {
+      red_fixed = (int)((float)red*100000.0 + 0.5);
+      green_fixed = (int)((float)green*100000.0 + 0.5);
+   }
+   png_set_rgb_to_gray_fixed(png_ptr, error_action, red_fixed, green_fixed);
+}
+#endif
+
+void PNGAPI
+png_set_rgb_to_gray_fixed(png_structp png_ptr, int error_action,
+   png_fixed_point red, png_fixed_point green)
+{
+   png_debug(1, "in png_set_rgb_to_gray");
+
+   if (png_ptr == NULL)
+      return;
+
+   switch(error_action)
+   {
+      case 1: png_ptr->transformations |= PNG_RGB_TO_GRAY;
+              break;
+
+      case 2: png_ptr->transformations |= PNG_RGB_TO_GRAY_WARN;
+              break;
+
+      case 3: png_ptr->transformations |= PNG_RGB_TO_GRAY_ERR;
+   }
+   if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
+#ifdef PNG_READ_EXPAND_SUPPORTED
+      png_ptr->transformations |= PNG_EXPAND;
+#else
+   {
+      png_warning(png_ptr,
+        "Cannot do RGB_TO_GRAY without EXPAND_SUPPORTED.");
+      png_ptr->transformations &= ~PNG_RGB_TO_GRAY;
+   }
+#endif
+   {
+      png_uint_16 red_int, green_int;
+      if (red < 0 || green < 0)
+      {
+         red_int   =  6968; /* .212671 * 32768 + .5 */
+         green_int = 23434; /* .715160 * 32768 + .5 */
+      }
+      else if (red + green < 100000L)
+      {
+         red_int = (png_uint_16)(((png_uint_32)red*32768L)/100000L);
+         green_int = (png_uint_16)(((png_uint_32)green*32768L)/100000L);
+      }
+      else
+      {
+         png_warning(png_ptr, "ignoring out of range rgb_to_gray coefficients");
+         red_int   =  6968;
+         green_int = 23434;
+      }
+      png_ptr->rgb_to_gray_red_coeff   = red_int;
+      png_ptr->rgb_to_gray_green_coeff = green_int;
+      png_ptr->rgb_to_gray_blue_coeff  =
+         (png_uint_16)(32768 - red_int - green_int);
+   }
+}
+#endif
+
+#if defined(PNG_READ_USER_TRANSFORM_SUPPORTED) || \
+    defined(PNG_LEGACY_SUPPORTED) || \
+    defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED)
+void PNGAPI
+png_set_read_user_transform_fn(png_structp png_ptr, png_user_transform_ptr
+   read_user_transform_fn)
+{
+   png_debug(1, "in png_set_read_user_transform_fn");
+
+   if (png_ptr == NULL)
+      return;
+
+#ifdef PNG_READ_USER_TRANSFORM_SUPPORTED
+   png_ptr->transformations |= PNG_USER_TRANSFORM;
+   png_ptr->read_user_transform_fn = read_user_transform_fn;
+#endif
+#ifdef PNG_LEGACY_SUPPORTED
+   if (read_user_transform_fn)
+      png_warning(png_ptr,
+        "This version of libpng does not support user transforms");
+#endif
+}
+#endif
+
+/* Initialize everything needed for the read.  This includes modifying
+ * the palette.
+ */
+void /* PRIVATE */
+png_init_read_transformations(png_structp png_ptr)
+{
+   png_debug(1, "in png_init_read_transformations");
+
+#ifdef PNG_USELESS_TESTS_SUPPORTED
+  if (png_ptr != NULL)
+#endif
+  {
+#if defined(PNG_READ_BACKGROUND_SUPPORTED) || \
+    defined(PNG_READ_SHIFT_SUPPORTED) || \
+    defined(PNG_READ_GAMMA_SUPPORTED)
+   int color_type = png_ptr->color_type;
+#endif
+
+#if defined(PNG_READ_EXPAND_SUPPORTED) && defined(PNG_READ_BACKGROUND_SUPPORTED)
+
+#ifdef PNG_READ_GRAY_TO_RGB_SUPPORTED
+   /* Detect gray background and attempt to enable optimization
+    * for gray --> RGB case
+    *
+    * Note:  if PNG_BACKGROUND_EXPAND is set and color_type is either RGB or
+    * RGB_ALPHA (in which case need_expand is superfluous anyway), the
+    * background color might actually be gray yet not be flagged as such.
+    * This is not a problem for the current code, which uses
+    * PNG_BACKGROUND_IS_GRAY only to decide when to do the
+    * png_do_gray_to_rgb() transformation.
+    */
+   if ((png_ptr->transformations & PNG_BACKGROUND_EXPAND) &&
+       !(color_type & PNG_COLOR_MASK_COLOR))
+   {
+          png_ptr->mode |= PNG_BACKGROUND_IS_GRAY;
+   } else if ((png_ptr->transformations & PNG_BACKGROUND) &&
+              !(png_ptr->transformations & PNG_BACKGROUND_EXPAND) &&
+              (png_ptr->transformations & PNG_GRAY_TO_RGB) &&
+              png_ptr->background.red == png_ptr->background.green &&
+              png_ptr->background.red == png_ptr->background.blue)
+   {
+          png_ptr->mode |= PNG_BACKGROUND_IS_GRAY;
+          png_ptr->background.gray = png_ptr->background.red;
+   }
+#endif
+
+   if ((png_ptr->transformations & PNG_BACKGROUND_EXPAND) &&
+       (png_ptr->transformations & PNG_EXPAND))
+   {
+      if (!(color_type & PNG_COLOR_MASK_COLOR))  /* i.e., GRAY or GRAY_ALPHA */
+      {
+         /* Expand background and tRNS chunks */
+         switch (png_ptr->bit_depth)
+         {
+            case 1:
+               png_ptr->background.gray *= (png_uint_16)0xff;
+               png_ptr->background.red = png_ptr->background.green
+                 =  png_ptr->background.blue = png_ptr->background.gray;
+               if (!(png_ptr->transformations & PNG_EXPAND_tRNS))
+               {
+                 png_ptr->trans_values.gray *= (png_uint_16)0xff;
+                 png_ptr->trans_values.red = png_ptr->trans_values.green
+                   = png_ptr->trans_values.blue = png_ptr->trans_values.gray;
+               }
+               break;
+
+            case 2:
+               png_ptr->background.gray *= (png_uint_16)0x55;
+               png_ptr->background.red = png_ptr->background.green
+                 = png_ptr->background.blue = png_ptr->background.gray;
+               if (!(png_ptr->transformations & PNG_EXPAND_tRNS))
+               {
+                 png_ptr->trans_values.gray *= (png_uint_16)0x55;
+                 png_ptr->trans_values.red = png_ptr->trans_values.green
+                   = png_ptr->trans_values.blue = png_ptr->trans_values.gray;
+               }
+               break;
+
+            case 4:
+               png_ptr->background.gray *= (png_uint_16)0x11;
+               png_ptr->background.red = png_ptr->background.green
+                 = png_ptr->background.blue = png_ptr->background.gray;
+               if (!(png_ptr->transformations & PNG_EXPAND_tRNS))
+               {
+                 png_ptr->trans_values.gray *= (png_uint_16)0x11;
+                 png_ptr->trans_values.red = png_ptr->trans_values.green
+                   = png_ptr->trans_values.blue = png_ptr->trans_values.gray;
+               }
+               break;
+
+            case 8:
+
+            case 16:
+               png_ptr->background.red = png_ptr->background.green
+                 = png_ptr->background.blue = png_ptr->background.gray;
+               break;
+         }
+      }
+      else if (color_type == PNG_COLOR_TYPE_PALETTE)
+      {
+         png_ptr->background.red   =
+            png_ptr->palette[png_ptr->background.index].red;
+         png_ptr->background.green =
+            png_ptr->palette[png_ptr->background.index].green;
+         png_ptr->background.blue  =
+            png_ptr->palette[png_ptr->background.index].blue;
+
+#ifdef PNG_READ_INVERT_ALPHA_SUPPORTED
+        if (png_ptr->transformations & PNG_INVERT_ALPHA)
+        {
+#ifdef PNG_READ_EXPAND_SUPPORTED
+           if (!(png_ptr->transformations & PNG_EXPAND_tRNS))
+#endif
+           {
+           /* Invert the alpha channel (in tRNS) unless the pixels are
+            * going to be expanded, in which case leave it for later
+            */
+              int i, istop;
+              istop=(int)png_ptr->num_trans;
+              for (i=0; i<istop; i++)
+                 png_ptr->trans[i] = (png_byte)(255 - png_ptr->trans[i]);
+           }
+        }
+#endif
+
+      }
+   }
+#endif
+
+#if defined(PNG_READ_BACKGROUND_SUPPORTED) && defined(PNG_READ_GAMMA_SUPPORTED)
+   png_ptr->background_1 = png_ptr->background;
+#endif
+#if defined(PNG_READ_GAMMA_SUPPORTED) && defined(PNG_FLOATING_POINT_SUPPORTED)
+
+   if ((color_type == PNG_COLOR_TYPE_PALETTE && png_ptr->num_trans != 0)
+       && (fabs(png_ptr->screen_gamma * png_ptr->gamma - 1.0)
+         < PNG_GAMMA_THRESHOLD))
+   {
+    int i, k;
+    k=0;
+    for (i=0; i<png_ptr->num_trans; i++)
+    {
+      if (png_ptr->trans[i] != 0 && png_ptr->trans[i] != 0xff)
+        k=1; /* Partial transparency is present */
+    }
+    if (k == 0)
+      png_ptr->transformations &= ~PNG_GAMMA;
+   }
+
+   if ((png_ptr->transformations & (PNG_GAMMA | PNG_RGB_TO_GRAY)) &&
+        png_ptr->gamma != 0.0)
+   {
+      png_build_gamma_table(png_ptr);
+
+#ifdef PNG_READ_BACKGROUND_SUPPORTED
+      if (png_ptr->transformations & PNG_BACKGROUND)
+      {
+         if (color_type == PNG_COLOR_TYPE_PALETTE)
+         {
+           /* Could skip if no transparency */
+            png_color back, back_1;
+            png_colorp palette = png_ptr->palette;
+            int num_palette = png_ptr->num_palette;
+            int i;
+            if (png_ptr->background_gamma_type == PNG_BACKGROUND_GAMMA_FILE)
+            {
+               back.red = png_ptr->gamma_table[png_ptr->background.red];
+               back.green = png_ptr->gamma_table[png_ptr->background.green];
+               back.blue = png_ptr->gamma_table[png_ptr->background.blue];
+
+               back_1.red = png_ptr->gamma_to_1[png_ptr->background.red];
+               back_1.green = png_ptr->gamma_to_1[png_ptr->background.green];
+               back_1.blue = png_ptr->gamma_to_1[png_ptr->background.blue];
+            }
+            else
+            {
+               double g, gs;
+
+               switch (png_ptr->background_gamma_type)
+               {
+                  case PNG_BACKGROUND_GAMMA_SCREEN:
+                     g = (png_ptr->screen_gamma);
+                     gs = 1.0;
+                     break;
+
+                  case PNG_BACKGROUND_GAMMA_FILE:
+                     g = 1.0 / (png_ptr->gamma);
+                     gs = 1.0 / (png_ptr->gamma * png_ptr->screen_gamma);
+                     break;
+
+                  case PNG_BACKGROUND_GAMMA_UNIQUE:
+                     g = 1.0 / (png_ptr->background_gamma);
+                     gs = 1.0 / (png_ptr->background_gamma *
+                                 png_ptr->screen_gamma);
+                     break;
+                  default:
+                     g = 1.0;    /* back_1 */
+                     gs = 1.0;   /* back */
+               }
+
+               if ( fabs(gs - 1.0) < PNG_GAMMA_THRESHOLD)
+               {
+                  back.red   = (png_byte)png_ptr->background.red;
+                  back.green = (png_byte)png_ptr->background.green;
+                  back.blue  = (png_byte)png_ptr->background.blue;
+               }
+               else
+               {
+                  back.red = (png_byte)(pow(
+                     (double)png_ptr->background.red/255, gs) * 255.0 + .5);
+                  back.green = (png_byte)(pow(
+                     (double)png_ptr->background.green/255, gs) * 255.0
+                         + .5);
+                  back.blue = (png_byte)(pow(
+                     (double)png_ptr->background.blue/255, gs) * 255.0 + .5);
+               }
+
+               back_1.red = (png_byte)(pow(
+                  (double)png_ptr->background.red/255, g) * 255.0 + .5);
+               back_1.green = (png_byte)(pow(
+                  (double)png_ptr->background.green/255, g) * 255.0 + .5);
+               back_1.blue = (png_byte)(pow(
+                  (double)png_ptr->background.blue/255, g) * 255.0 + .5);
+            }
+            for (i = 0; i < num_palette; i++)
+            {
+               if (i < (int)png_ptr->num_trans && png_ptr->trans[i] != 0xff)
+               {
+                  if (png_ptr->trans[i] == 0)
+                  {
+                     palette[i] = back;
+                  }
+                  else /* if (png_ptr->trans[i] != 0xff) */
+                  {
+                     png_byte v, w;
+
+                     v = png_ptr->gamma_to_1[palette[i].red];
+                     png_composite(w, v, png_ptr->trans[i], back_1.red);
+                     palette[i].red = png_ptr->gamma_from_1[w];
+
+                     v = png_ptr->gamma_to_1[palette[i].green];
+                     png_composite(w, v, png_ptr->trans[i], back_1.green);
+                     palette[i].green = png_ptr->gamma_from_1[w];
+
+                     v = png_ptr->gamma_to_1[palette[i].blue];
+                     png_composite(w, v, png_ptr->trans[i], back_1.blue);
+                     palette[i].blue = png_ptr->gamma_from_1[w];
+                  }
+               }
+               else
+               {
+                  palette[i].red = png_ptr->gamma_table[palette[i].red];
+                  palette[i].green = png_ptr->gamma_table[palette[i].green];
+                  palette[i].blue = png_ptr->gamma_table[palette[i].blue];
+               }
+            }
+            /* Prevent the transformations being done again, and make sure
+             * that the now spurious alpha channel is stripped - the code
+             * has just reduced background composition and gamma correction
+             * to a simple alpha channel strip.
+             */
+            png_ptr->transformations &= ~PNG_BACKGROUND;
+            png_ptr->transformations &= ~PNG_GAMMA;
+            png_ptr->transformations |= PNG_STRIP_ALPHA;
+         }
+         /* if (png_ptr->background_gamma_type!=PNG_BACKGROUND_GAMMA_UNKNOWN) */
+         else
+         /* color_type != PNG_COLOR_TYPE_PALETTE */
+         {
+            double m = (double)(((png_uint_32)1 << png_ptr->bit_depth) - 1);
+            double g = 1.0;
+            double gs = 1.0;
+
+            switch (png_ptr->background_gamma_type)
+            {
+               case PNG_BACKGROUND_GAMMA_SCREEN:
+                  g = (png_ptr->screen_gamma);
+                  gs = 1.0;
+                  break;
+
+               case PNG_BACKGROUND_GAMMA_FILE:
+                  g = 1.0 / (png_ptr->gamma);
+                  gs = 1.0 / (png_ptr->gamma * png_ptr->screen_gamma);
+                  break;
+
+               case PNG_BACKGROUND_GAMMA_UNIQUE:
+                  g = 1.0 / (png_ptr->background_gamma);
+                  gs = 1.0 / (png_ptr->background_gamma *
+                     png_ptr->screen_gamma);
+                  break;
+            }
+
+            png_ptr->background_1.gray = (png_uint_16)(pow(
+               (double)png_ptr->background.gray / m, g) * m + .5);
+            png_ptr->background.gray = (png_uint_16)(pow(
+               (double)png_ptr->background.gray / m, gs) * m + .5);
+
+            if ((png_ptr->background.red != png_ptr->background.green) ||
+                (png_ptr->background.red != png_ptr->background.blue) ||
+                (png_ptr->background.red != png_ptr->background.gray))
+            {
+               /* RGB or RGBA with color background */
+               png_ptr->background_1.red = (png_uint_16)(pow(
+                  (double)png_ptr->background.red / m, g) * m + .5);
+               png_ptr->background_1.green = (png_uint_16)(pow(
+                  (double)png_ptr->background.green / m, g) * m + .5);
+               png_ptr->background_1.blue = (png_uint_16)(pow(
+                  (double)png_ptr->background.blue / m, g) * m + .5);
+               png_ptr->background.red = (png_uint_16)(pow(
+                  (double)png_ptr->background.red / m, gs) * m + .5);
+               png_ptr->background.green = (png_uint_16)(pow(
+                  (double)png_ptr->background.green / m, gs) * m + .5);
+               png_ptr->background.blue = (png_uint_16)(pow(
+                  (double)png_ptr->background.blue / m, gs) * m + .5);
+            }
+            else
+            {
+               /* GRAY, GRAY ALPHA, RGB, or RGBA with gray background */
+               png_ptr->background_1.red = png_ptr->background_1.green
+                 = png_ptr->background_1.blue = png_ptr->background_1.gray;
+               png_ptr->background.red = png_ptr->background.green
+                 = png_ptr->background.blue = png_ptr->background.gray;
+            }
+         }
+      }
+      else
+      /* Transformation does not include PNG_BACKGROUND */
+#endif /* PNG_READ_BACKGROUND_SUPPORTED */
+      if (color_type == PNG_COLOR_TYPE_PALETTE)
+      {
+         png_colorp palette = png_ptr->palette;
+         int num_palette = png_ptr->num_palette;
+         int i;
+
+         for (i = 0; i < num_palette; i++)
+         {
+            palette[i].red = png_ptr->gamma_table[palette[i].red];
+            palette[i].green = png_ptr->gamma_table[palette[i].green];
+            palette[i].blue = png_ptr->gamma_table[palette[i].blue];
+         }
+
+         /* Done the gamma correction. */
+         png_ptr->transformations &= ~PNG_GAMMA;
+      }
+   }
+#ifdef PNG_READ_BACKGROUND_SUPPORTED
+   else
+#endif
+#endif /* PNG_READ_GAMMA_SUPPORTED && PNG_FLOATING_POINT_SUPPORTED */
+#ifdef PNG_READ_BACKGROUND_SUPPORTED
+   /* No GAMMA transformation */
+   if ((png_ptr->transformations & PNG_BACKGROUND) &&
+       (color_type == PNG_COLOR_TYPE_PALETTE))
+   {
+      int i;
+      int istop = (int)png_ptr->num_trans;
+      png_color back;
+      png_colorp palette = png_ptr->palette;
+
+      back.red   = (png_byte)png_ptr->background.red;
+      back.green = (png_byte)png_ptr->background.green;
+      back.blue  = (png_byte)png_ptr->background.blue;
+
+      for (i = 0; i < istop; i++)
+      {
+         if (png_ptr->trans[i] == 0)
+         {
+            palette[i] = back;
+         }
+         else if (png_ptr->trans[i] != 0xff)
+         {
+            /* The png_composite() macro is defined in png.h */
+            png_composite(palette[i].red, palette[i].red,
+               png_ptr->trans[i], back.red);
+            png_composite(palette[i].green, palette[i].green,
+               png_ptr->trans[i], back.green);
+            png_composite(palette[i].blue, palette[i].blue,
+               png_ptr->trans[i], back.blue);
+         }
+      }
+
+      /* Handled alpha, still need to strip the channel. */
+      png_ptr->transformations &= ~PNG_BACKGROUND;
+      png_ptr->transformations |= PNG_STRIP_ALPHA;
+   }
+#endif /* PNG_READ_BACKGROUND_SUPPORTED */
+
+#ifdef PNG_READ_SHIFT_SUPPORTED
+   if ((png_ptr->transformations & PNG_SHIFT) &&
+      !(png_ptr->transformations & PNG_EXPAND) &&
+      (color_type == PNG_COLOR_TYPE_PALETTE))
+   {
+      png_uint_16 i;
+      png_uint_16 istop = png_ptr->num_palette;
+      int sr = 8 - png_ptr->sig_bit.red;
+      int sg = 8 - png_ptr->sig_bit.green;
+      int sb = 8 - png_ptr->sig_bit.blue;
+
+      if (sr < 0 || sr > 8)
+         sr = 0;
+      if (sg < 0 || sg > 8)
+         sg = 0;
+      if (sb < 0 || sb > 8)
+         sb = 0;
+      for (i = 0; i < istop; i++)
+      {
+         png_ptr->palette[i].red >>= sr;
+         png_ptr->palette[i].green >>= sg;
+         png_ptr->palette[i].blue >>= sb;
+      }
+
+      png_ptr->transformations &= ~PNG_SHIFT;
+   }
+#endif  /* PNG_READ_SHIFT_SUPPORTED */
+ }
+#if !defined(PNG_READ_GAMMA_SUPPORTED) && !defined(PNG_READ_SHIFT_SUPPORTED) \
+ && !defined(PNG_READ_BACKGROUND_SUPPORTED)
+   if (png_ptr)
+      return;
+#endif
+}
+
+/* Modify the info structure to reflect the transformations.  The
+ * info should be updated so a PNG file could be written with it,
+ * assuming the transformations result in valid PNG data.
+ */
+void /* PRIVATE */
+png_read_transform_info(png_structp png_ptr, png_infop info_ptr)
+{
+   png_debug(1, "in png_read_transform_info");
+
+#ifdef PNG_READ_EXPAND_SUPPORTED
+   if (png_ptr->transformations & PNG_EXPAND)
+   {
+      if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
+      {
+         if (png_ptr->num_trans)
+            info_ptr->color_type = PNG_COLOR_TYPE_RGB_ALPHA;
+         else
+            info_ptr->color_type = PNG_COLOR_TYPE_RGB;
+         info_ptr->bit_depth = 8;
+         info_ptr->num_trans = 0;
+      }
+      else
+      {
+         if (png_ptr->num_trans)
+         {
+            if (png_ptr->transformations & PNG_EXPAND_tRNS)
+              info_ptr->color_type |= PNG_COLOR_MASK_ALPHA;
+         }
+         if (info_ptr->bit_depth < 8)
+            info_ptr->bit_depth = 8;
+         info_ptr->num_trans = 0;
+      }
+   }
+#endif
+
+#ifdef PNG_READ_BACKGROUND_SUPPORTED
+   if (png_ptr->transformations & PNG_BACKGROUND)
+   {
+      info_ptr->color_type &= ~PNG_COLOR_MASK_ALPHA;
+      info_ptr->num_trans = 0;
+      info_ptr->background = png_ptr->background;
+   }
+#endif
+
+#ifdef PNG_READ_GAMMA_SUPPORTED
+   if (png_ptr->transformations & PNG_GAMMA)
+   {
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+      info_ptr->gamma = png_ptr->gamma;
+#endif
+#ifdef PNG_FIXED_POINT_SUPPORTED
+      info_ptr->int_gamma = png_ptr->int_gamma;
+#endif
+   }
+#endif
+
+#ifdef PNG_READ_16_TO_8_SUPPORTED
+   if ((png_ptr->transformations & PNG_16_TO_8) && (info_ptr->bit_depth == 16))
+      info_ptr->bit_depth = 8;
+#endif
+
+#ifdef PNG_READ_GRAY_TO_RGB_SUPPORTED
+   if (png_ptr->transformations & PNG_GRAY_TO_RGB)
+      info_ptr->color_type |= PNG_COLOR_MASK_COLOR;
+#endif
+
+#ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED
+   if (png_ptr->transformations & PNG_RGB_TO_GRAY)
+      info_ptr->color_type &= ~PNG_COLOR_MASK_COLOR;
+#endif
+
+#ifdef PNG_READ_DITHER_SUPPORTED
+   if (png_ptr->transformations & PNG_DITHER)
+   {
+      if (((info_ptr->color_type == PNG_COLOR_TYPE_RGB) ||
+          (info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA)) &&
+          png_ptr->palette_lookup && info_ptr->bit_depth == 8)
+      {
+         info_ptr->color_type = PNG_COLOR_TYPE_PALETTE;
+      }
+   }
+#endif
+
+#ifdef PNG_READ_PACK_SUPPORTED
+   if ((png_ptr->transformations & PNG_PACK) && (info_ptr->bit_depth < 8))
+      info_ptr->bit_depth = 8;
+#endif
+
+   if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
+      info_ptr->channels = 1;
+   else if (info_ptr->color_type & PNG_COLOR_MASK_COLOR)
+      info_ptr->channels = 3;
+   else
+      info_ptr->channels = 1;
+
+#ifdef PNG_READ_STRIP_ALPHA_SUPPORTED
+   if (png_ptr->flags & PNG_FLAG_STRIP_ALPHA)
+      info_ptr->color_type &= ~PNG_COLOR_MASK_ALPHA;
+#endif
+
+   if (info_ptr->color_type & PNG_COLOR_MASK_ALPHA)
+      info_ptr->channels++;
+
+#ifdef PNG_READ_FILLER_SUPPORTED
+   /* STRIP_ALPHA and FILLER allowed:  MASK_ALPHA bit stripped above */
+   if ((png_ptr->transformations & PNG_FILLER) &&
+       ((info_ptr->color_type == PNG_COLOR_TYPE_RGB) ||
+       (info_ptr->color_type == PNG_COLOR_TYPE_GRAY)))
+   {
+      info_ptr->channels++;
+      /* If adding a true alpha channel not just filler */
+#ifndef PNG_1_0_X
+      if (png_ptr->transformations & PNG_ADD_ALPHA)
+        info_ptr->color_type |= PNG_COLOR_MASK_ALPHA;
+#endif
+   }
+#endif
+
+#if defined(PNG_USER_TRANSFORM_PTR_SUPPORTED) && \
+defined(PNG_READ_USER_TRANSFORM_SUPPORTED)
+   if (png_ptr->transformations & PNG_USER_TRANSFORM)
+     {
+       if (info_ptr->bit_depth < png_ptr->user_transform_depth)
+         info_ptr->bit_depth = png_ptr->user_transform_depth;
+       if (info_ptr->channels < png_ptr->user_transform_channels)
+         info_ptr->channels = png_ptr->user_transform_channels;
+     }
+#endif
+
+   info_ptr->pixel_depth = (png_byte)(info_ptr->channels *
+      info_ptr->bit_depth);
+
+   info_ptr->rowbytes = PNG_ROWBYTES(info_ptr->pixel_depth, info_ptr->width);
+
+#ifndef PNG_READ_EXPAND_SUPPORTED
+   if (png_ptr)
+      return;
+#endif
+}
+
+/* Transform the row.  The order of transformations is significant,
+ * and is very touchy.  If you add a transformation, take care to
+ * decide how it fits in with the other transformations here.
+ */
+void /* PRIVATE */
+png_do_read_transformations(png_structp png_ptr)
+{
+   png_debug(1, "in png_do_read_transformations");
+
+   if (png_ptr->row_buf == NULL)
+   {
+#if defined(PNG_STDIO_SUPPORTED) && !defined(_WIN32_WCE)
+      char msg[50];
+
+      png_snprintf2(msg, 50,
+         "NULL row buffer for row %ld, pass %d", (long)png_ptr->row_number,
+         png_ptr->pass);
+      png_error(png_ptr, msg);
+#else
+      png_error(png_ptr, "NULL row buffer");
+#endif
+   }
+#ifdef PNG_WARN_UNINITIALIZED_ROW
+   if (!(png_ptr->flags & PNG_FLAG_ROW_INIT))
+      /* Application has failed to call either png_read_start_image()
+       * or png_read_update_info() after setting transforms that expand
+       * pixels.  This check added to libpng-1.2.19
+       */
+#if (PNG_WARN_UNINITIALIZED_ROW==1)
+      png_error(png_ptr, "Uninitialized row");
+#else
+      png_warning(png_ptr, "Uninitialized row");
+#endif
+#endif
+
+#ifdef PNG_READ_EXPAND_SUPPORTED
+   if (png_ptr->transformations & PNG_EXPAND)
+   {
+      if (png_ptr->row_info.color_type == PNG_COLOR_TYPE_PALETTE)
+      {
+         png_do_expand_palette(&(png_ptr->row_info), png_ptr->row_buf + 1,
+            png_ptr->palette, png_ptr->trans, png_ptr->num_trans);
+      }
+      else
+      {
+         if (png_ptr->num_trans &&
+             (png_ptr->transformations & PNG_EXPAND_tRNS))
+            png_do_expand(&(png_ptr->row_info), png_ptr->row_buf + 1,
+               &(png_ptr->trans_values));
+         else
+            png_do_expand(&(png_ptr->row_info), png_ptr->row_buf + 1,
+               NULL);
+      }
+   }
+#endif
+
+#ifdef PNG_READ_STRIP_ALPHA_SUPPORTED
+   if (png_ptr->flags & PNG_FLAG_STRIP_ALPHA)
+      png_do_strip_filler(&(png_ptr->row_info), png_ptr->row_buf + 1,
+         PNG_FLAG_FILLER_AFTER | (png_ptr->flags & PNG_FLAG_STRIP_ALPHA));
+#endif
+
+#ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED
+   if (png_ptr->transformations & PNG_RGB_TO_GRAY)
+   {
+      int rgb_error =
+         png_do_rgb_to_gray(png_ptr, &(png_ptr->row_info),
+             png_ptr->row_buf + 1);
+      if (rgb_error)
+      {
+         png_ptr->rgb_to_gray_status=1;
+         if ((png_ptr->transformations & PNG_RGB_TO_GRAY) ==
+             PNG_RGB_TO_GRAY_WARN)
+            png_warning(png_ptr, "png_do_rgb_to_gray found nongray pixel");
+         if ((png_ptr->transformations & PNG_RGB_TO_GRAY) ==
+             PNG_RGB_TO_GRAY_ERR)
+            png_error(png_ptr, "png_do_rgb_to_gray found nongray pixel");
+      }
+   }
+#endif
+
+/* From Andreas Dilger e-mail to png-implement, 26 March 1998:
+ *
+ *   In most cases, the "simple transparency" should be done prior to doing
+ *   gray-to-RGB, or you will have to test 3x as many bytes to check if a
+ *   pixel is transparent.  You would also need to make sure that the
+ *   transparency information is upgraded to RGB.
+ *
+ *   To summarize, the current flow is:
+ *   - Gray + simple transparency -> compare 1 or 2 gray bytes and composite
+ *                                   with background "in place" if transparent,
+ *                                   convert to RGB if necessary
+ *   - Gray + alpha -> composite with gray background and remove alpha bytes,
+ *                                   convert to RGB if necessary
+ *
+ *   To support RGB backgrounds for gray images we need:
+ *   - Gray + simple transparency -> convert to RGB + simple transparency,
+ *                                   compare 3 or 6 bytes and composite with
+ *                                   background "in place" if transparent
+ *                                   (3x compare/pixel compared to doing
+ *                                   composite with gray bkgrnd)
+ *   - Gray + alpha -> convert to RGB + alpha, composite with background and
+ *                                   remove alpha bytes (3x float
+ *                                   operations/pixel compared with composite
+ *                                   on gray background)
+ *
+ *  Greg's change will do this.  The reason it wasn't done before is for
+ *  performance, as this increases the per-pixel operations.  If we would check
+ *  in advance if the background was gray or RGB, and position the gray-to-RGB
+ *  transform appropriately, then it would save a lot of work/time.
+ */
+
+#ifdef PNG_READ_GRAY_TO_RGB_SUPPORTED
+   /* If gray -> RGB, do so now only if background is non-gray; else do later
+    * for performance reasons
+    */
+   if ((png_ptr->transformations & PNG_GRAY_TO_RGB) &&
+       !(png_ptr->mode & PNG_BACKGROUND_IS_GRAY))
+      png_do_gray_to_rgb(&(png_ptr->row_info), png_ptr->row_buf + 1);
+#endif
+
+#ifdef PNG_READ_BACKGROUND_SUPPORTED
+   if ((png_ptr->transformations & PNG_BACKGROUND) &&
+      ((png_ptr->num_trans != 0 ) ||
+      (png_ptr->color_type & PNG_COLOR_MASK_ALPHA)))
+      png_do_background(&(png_ptr->row_info), png_ptr->row_buf + 1,
+         &(png_ptr->trans_values), &(png_ptr->background)
+#ifdef PNG_READ_GAMMA_SUPPORTED
+         , &(png_ptr->background_1),
+         png_ptr->gamma_table, png_ptr->gamma_from_1,
+         png_ptr->gamma_to_1, png_ptr->gamma_16_table,
+         png_ptr->gamma_16_from_1, png_ptr->gamma_16_to_1,
+         png_ptr->gamma_shift
+#endif
+);
+#endif
+
+#ifdef PNG_READ_GAMMA_SUPPORTED
+   if ((png_ptr->transformations & PNG_GAMMA) &&
+#ifdef PNG_READ_BACKGROUND_SUPPORTED
+       !((png_ptr->transformations & PNG_BACKGROUND) &&
+       ((png_ptr->num_trans != 0) ||
+       (png_ptr->color_type & PNG_COLOR_MASK_ALPHA))) &&
+#endif
+       (png_ptr->color_type != PNG_COLOR_TYPE_PALETTE))
+      png_do_gamma(&(png_ptr->row_info), png_ptr->row_buf + 1,
+          png_ptr->gamma_table, png_ptr->gamma_16_table,
+          png_ptr->gamma_shift);
+#endif
+
+#ifdef PNG_READ_16_TO_8_SUPPORTED
+   if (png_ptr->transformations & PNG_16_TO_8)
+      png_do_chop(&(png_ptr->row_info), png_ptr->row_buf + 1);
+#endif
+
+#ifdef PNG_READ_DITHER_SUPPORTED
+   if (png_ptr->transformations & PNG_DITHER)
+   {
+      png_do_dither((png_row_infop)&(png_ptr->row_info), png_ptr->row_buf + 1,
+         png_ptr->palette_lookup, png_ptr->dither_index);
+      if (png_ptr->row_info.rowbytes == (png_uint_32)0)
+         png_error(png_ptr, "png_do_dither returned rowbytes=0");
+   }
+#endif
+
+#ifdef PNG_READ_INVERT_SUPPORTED
+   if (png_ptr->transformations & PNG_INVERT_MONO)
+      png_do_invert(&(png_ptr->row_info), png_ptr->row_buf + 1);
+#endif
+
+#ifdef PNG_READ_SHIFT_SUPPORTED
+   if (png_ptr->transformations & PNG_SHIFT)
+      png_do_unshift(&(png_ptr->row_info), png_ptr->row_buf + 1,
+         &(png_ptr->shift));
+#endif
+
+#ifdef PNG_READ_PACK_SUPPORTED
+   if (png_ptr->transformations & PNG_PACK)
+      png_do_unpack(&(png_ptr->row_info), png_ptr->row_buf + 1);
+#endif
+
+#ifdef PNG_READ_BGR_SUPPORTED
+   if (png_ptr->transformations & PNG_BGR)
+      png_do_bgr(&(png_ptr->row_info), png_ptr->row_buf + 1);
+#endif
+
+#ifdef PNG_READ_PACKSWAP_SUPPORTED
+   if (png_ptr->transformations & PNG_PACKSWAP)
+      png_do_packswap(&(png_ptr->row_info), png_ptr->row_buf + 1);
+#endif
+
+#ifdef PNG_READ_GRAY_TO_RGB_SUPPORTED
+   /* If gray -> RGB, do so now only if we did not do so above */
+   if ((png_ptr->transformations & PNG_GRAY_TO_RGB) &&
+       (png_ptr->mode & PNG_BACKGROUND_IS_GRAY))
+      png_do_gray_to_rgb(&(png_ptr->row_info), png_ptr->row_buf + 1);
+#endif
+
+#ifdef PNG_READ_FILLER_SUPPORTED
+   if (png_ptr->transformations & PNG_FILLER)
+      png_do_read_filler(&(png_ptr->row_info), png_ptr->row_buf + 1,
+         (png_uint_32)png_ptr->filler, png_ptr->flags);
+#endif
+
+#ifdef PNG_READ_INVERT_ALPHA_SUPPORTED
+   if (png_ptr->transformations & PNG_INVERT_ALPHA)
+      png_do_read_invert_alpha(&(png_ptr->row_info), png_ptr->row_buf + 1);
+#endif
+
+#ifdef PNG_READ_SWAP_ALPHA_SUPPORTED
+   if (png_ptr->transformations & PNG_SWAP_ALPHA)
+      png_do_read_swap_alpha(&(png_ptr->row_info), png_ptr->row_buf + 1);
+#endif
+
+#ifdef PNG_READ_SWAP_SUPPORTED
+   if (png_ptr->transformations & PNG_SWAP_BYTES)
+      png_do_swap(&(png_ptr->row_info), png_ptr->row_buf + 1);
+#endif
+
+#ifdef PNG_READ_USER_TRANSFORM_SUPPORTED
+   if (png_ptr->transformations & PNG_USER_TRANSFORM)
+    {
+      if (png_ptr->read_user_transform_fn != NULL)
+         (*(png_ptr->read_user_transform_fn)) /* User read transform function */
+            (png_ptr,                    /* png_ptr */
+               &(png_ptr->row_info),     /* row_info: */
+               /*  png_uint_32 width;       width of row */
+               /*  png_uint_32 rowbytes;    number of bytes in row */
+               /*  png_byte color_type;     color type of pixels */
+               /*  png_byte bit_depth;      bit depth of samples */
+               /*  png_byte channels;       number of channels (1-4) */
+               /*  png_byte pixel_depth;    bits per pixel (depth*channels) */
+               png_ptr->row_buf + 1);    /* start of pixel data for row */
+#ifdef PNG_USER_TRANSFORM_PTR_SUPPORTED
+      if (png_ptr->user_transform_depth)
+         png_ptr->row_info.bit_depth = png_ptr->user_transform_depth;
+      if (png_ptr->user_transform_channels)
+         png_ptr->row_info.channels = png_ptr->user_transform_channels;
+#endif
+      png_ptr->row_info.pixel_depth = (png_byte)(png_ptr->row_info.bit_depth *
+         png_ptr->row_info.channels);
+      png_ptr->row_info.rowbytes = PNG_ROWBYTES(png_ptr->row_info.pixel_depth,
+         png_ptr->row_info.width);
+   }
+#endif
+
+}
+
+#ifdef PNG_READ_PACK_SUPPORTED
+/* Unpack pixels of 1, 2, or 4 bits per pixel into 1 byte per pixel,
+ * without changing the actual values.  Thus, if you had a row with
+ * a bit depth of 1, you would end up with bytes that only contained
+ * the numbers 0 or 1.  If you would rather they contain 0 and 255, use
+ * png_do_shift() after this.
+ */
+void /* PRIVATE */
+png_do_unpack(png_row_infop row_info, png_bytep row)
+{
+   png_debug(1, "in png_do_unpack");
+
+#ifdef PNG_USELESS_TESTS_SUPPORTED
+   if (row != NULL && row_info != NULL && row_info->bit_depth < 8)
+#else
+   if (row_info->bit_depth < 8)
+#endif
+   {
+      png_uint_32 i;
+      png_uint_32 row_width=row_info->width;
+
+      switch (row_info->bit_depth)
+      {
+         case 1:
+         {
+            png_bytep sp = row + (png_size_t)((row_width - 1) >> 3);
+            png_bytep dp = row + (png_size_t)row_width - 1;
+            png_uint_32 shift = 7 - (int)((row_width + 7) & 0x07);
+            for (i = 0; i < row_width; i++)
+            {
+               *dp = (png_byte)((*sp >> shift) & 0x01);
+               if (shift == 7)
+               {
+                  shift = 0;
+                  sp--;
+               }
+               else
+                  shift++;
+
+               dp--;
+            }
+            break;
+         }
+
+         case 2:
+         {
+
+            png_bytep sp = row + (png_size_t)((row_width - 1) >> 2);
+            png_bytep dp = row + (png_size_t)row_width - 1;
+            png_uint_32 shift = (int)((3 - ((row_width + 3) & 0x03)) << 1);
+            for (i = 0; i < row_width; i++)
+            {
+               *dp = (png_byte)((*sp >> shift) & 0x03);
+               if (shift == 6)
+               {
+                  shift = 0;
+                  sp--;
+               }
+               else
+                  shift += 2;
+
+               dp--;
+            }
+            break;
+         }
+
+         case 4:
+         {
+            png_bytep sp = row + (png_size_t)((row_width - 1) >> 1);
+            png_bytep dp = row + (png_size_t)row_width - 1;
+            png_uint_32 shift = (int)((1 - ((row_width + 1) & 0x01)) << 2);
+            for (i = 0; i < row_width; i++)
+            {
+               *dp = (png_byte)((*sp >> shift) & 0x0f);
+               if (shift == 4)
+               {
+                  shift = 0;
+                  sp--;
+               }
+               else
+                  shift = 4;
+
+               dp--;
+            }
+            break;
+         }
+      }
+      row_info->bit_depth = 8;
+      row_info->pixel_depth = (png_byte)(8 * row_info->channels);
+      row_info->rowbytes = row_width * row_info->channels;
+   }
+}
+#endif
+
+#ifdef PNG_READ_SHIFT_SUPPORTED
+/* Reverse the effects of png_do_shift.  This routine merely shifts the
+ * pixels back to their significant bits values.  Thus, if you have
+ * a row of bit depth 8, but only 5 are significant, this will shift
+ * the values back to 0 through 31.
+ */
+void /* PRIVATE */
+png_do_unshift(png_row_infop row_info, png_bytep row, png_color_8p sig_bits)
+{
+   png_debug(1, "in png_do_unshift");
+
+   if (
+#ifdef PNG_USELESS_TESTS_SUPPORTED
+       row != NULL && row_info != NULL && sig_bits != NULL &&
+#endif
+       row_info->color_type != PNG_COLOR_TYPE_PALETTE)
+   {
+      int shift[4];
+      int channels = 0;
+      int c;
+      png_uint_16 value = 0;
+      png_uint_32 row_width = row_info->width;
+
+      if (row_info->color_type & PNG_COLOR_MASK_COLOR)
+      {
+         shift[channels++] = row_info->bit_depth - sig_bits->red;
+         shift[channels++] = row_info->bit_depth - sig_bits->green;
+         shift[channels++] = row_info->bit_depth - sig_bits->blue;
+      }
+      else
+      {
+         shift[channels++] = row_info->bit_depth - sig_bits->gray;
+      }
+      if (row_info->color_type & PNG_COLOR_MASK_ALPHA)
+      {
+         shift[channels++] = row_info->bit_depth - sig_bits->alpha;
+      }
+
+      for (c = 0; c < channels; c++)
+      {
+         if (shift[c] <= 0)
+            shift[c] = 0;
+         else
+            value = 1;
+      }
+
+      if (!value)
+         return;
+
+      switch (row_info->bit_depth)
+      {
+         case 2:
+         {
+            png_bytep bp;
+            png_uint_32 i;
+            png_uint_32 istop = row_info->rowbytes;
+
+            for (bp = row, i = 0; i < istop; i++)
+            {
+               *bp >>= 1;
+               *bp++ &= 0x55;
+            }
+            break;
+         }
+
+         case 4:
+         {
+            png_bytep bp = row;
+            png_uint_32 i;
+            png_uint_32 istop = row_info->rowbytes;
+            png_byte mask = (png_byte)((((int)0xf0 >> shift[0]) & (int)0xf0) |
+               (png_byte)((int)0xf >> shift[0]));
+
+            for (i = 0; i < istop; i++)
+            {
+               *bp >>= shift[0];
+               *bp++ &= mask;
+            }
+            break;
+         }
+
+         case 8:
+         {
+            png_bytep bp = row;
+            png_uint_32 i;
+            png_uint_32 istop = row_width * channels;
+
+            for (i = 0; i < istop; i++)
+            {
+               *bp++ >>= shift[i%channels];
+            }
+            break;
+         }
+
+         case 16:
+         {
+            png_bytep bp = row;
+            png_uint_32 i;
+            png_uint_32 istop = channels * row_width;
+
+            for (i = 0; i < istop; i++)
+            {
+               value = (png_uint_16)((*bp << 8) + *(bp + 1));
+               value >>= shift[i%channels];
+               *bp++ = (png_byte)(value >> 8);
+               *bp++ = (png_byte)(value & 0xff);
+            }
+            break;
+         }
+      }
+   }
+}
+#endif
+
+#ifdef PNG_READ_16_TO_8_SUPPORTED
+/* Chop rows of bit depth 16 down to 8 */
+void /* PRIVATE */
+png_do_chop(png_row_infop row_info, png_bytep row)
+{
+   png_debug(1, "in png_do_chop");
+
+#ifdef PNG_USELESS_TESTS_SUPPORTED
+   if (row != NULL && row_info != NULL && row_info->bit_depth == 16)
+#else
+   if (row_info->bit_depth == 16)
+#endif
+   {
+      png_bytep sp = row;
+      png_bytep dp = row;
+      png_uint_32 i;
+      png_uint_32 istop = row_info->width * row_info->channels;
+
+      for (i = 0; i<istop; i++, sp += 2, dp++)
+      {
+#ifdef PNG_READ_16_TO_8_ACCURATE_SCALE_SUPPORTED
+      /* This does a more accurate scaling of the 16-bit color
+       * value, rather than a simple low-byte truncation.
+       *
+       * What the ideal calculation should be:
+       *   *dp = (((((png_uint_32)(*sp) << 8) |
+       *          (png_uint_32)(*(sp + 1))) * 255 + 127)
+       *          / (png_uint_32)65535L;
+       *
+       * GRR: no, I think this is what it really should be:
+       *   *dp = (((((png_uint_32)(*sp) << 8) |
+       *           (png_uint_32)(*(sp + 1))) + 128L)
+       *           / (png_uint_32)257L;
+       *
+       * GRR: here's the exact calculation with shifts:
+       *   temp = (((png_uint_32)(*sp) << 8) |
+       *           (png_uint_32)(*(sp + 1))) + 128L;
+       *   *dp = (temp - (temp >> 8)) >> 8;
+       *
+       * Approximate calculation with shift/add instead of multiply/divide:
+       *   *dp = ((((png_uint_32)(*sp) << 8) |
+       *          (png_uint_32)((int)(*(sp + 1)) - *sp)) + 128) >> 8;
+       *
+       * What we actually do to avoid extra shifting and conversion:
+       */
+
+         *dp = *sp + ((((int)(*(sp + 1)) - *sp) > 128) ? 1 : 0);
+#else
+       /* Simply discard the low order byte */
+         *dp = *sp;
+#endif
+      }
+      row_info->bit_depth = 8;
+      row_info->pixel_depth = (png_byte)(8 * row_info->channels);
+      row_info->rowbytes = row_info->width * row_info->channels;
+   }
+}
+#endif
+
+#ifdef PNG_READ_SWAP_ALPHA_SUPPORTED
+void /* PRIVATE */
+png_do_read_swap_alpha(png_row_infop row_info, png_bytep row)
+{
+   png_debug(1, "in png_do_read_swap_alpha");
+
+#ifdef PNG_USELESS_TESTS_SUPPORTED
+   if (row != NULL && row_info != NULL)
+#endif
+   {
+      png_uint_32 row_width = row_info->width;
+      if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
+      {
+         /* This converts from RGBA to ARGB */
+         if (row_info->bit_depth == 8)
+         {
+            png_bytep sp = row + row_info->rowbytes;
+            png_bytep dp = sp;
+            png_byte save;
+            png_uint_32 i;
+
+            for (i = 0; i < row_width; i++)
+            {
+               save = *(--sp);
+               *(--dp) = *(--sp);
+               *(--dp) = *(--sp);
+               *(--dp) = *(--sp);
+               *(--dp) = save;
+            }
+         }
+         /* This converts from RRGGBBAA to AARRGGBB */
+         else
+         {
+            png_bytep sp = row + row_info->rowbytes;
+            png_bytep dp = sp;
+            png_byte save[2];
+            png_uint_32 i;
+
+            for (i = 0; i < row_width; i++)
+            {
+               save[0] = *(--sp);
+               save[1] = *(--sp);
+               *(--dp) = *(--sp);
+               *(--dp) = *(--sp);
+               *(--dp) = *(--sp);
+               *(--dp) = *(--sp);
+               *(--dp) = *(--sp);
+               *(--dp) = *(--sp);
+               *(--dp) = save[0];
+               *(--dp) = save[1];
+            }
+         }
+      }
+      else if (row_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
+      {
+         /* This converts from GA to AG */
+         if (row_info->bit_depth == 8)
+         {
+            png_bytep sp = row + row_info->rowbytes;
+            png_bytep dp = sp;
+            png_byte save;
+            png_uint_32 i;
+
+            for (i = 0; i < row_width; i++)
+            {
+               save = *(--sp);
+               *(--dp) = *(--sp);
+               *(--dp) = save;
+            }
+         }
+         /* This converts from GGAA to AAGG */
+         else
+         {
+            png_bytep sp = row + row_info->rowbytes;
+            png_bytep dp = sp;
+            png_byte save[2];
+            png_uint_32 i;
+
+            for (i = 0; i < row_width; i++)
+            {
+               save[0] = *(--sp);
+               save[1] = *(--sp);
+               *(--dp) = *(--sp);
+               *(--dp) = *(--sp);
+               *(--dp) = save[0];
+               *(--dp) = save[1];
+            }
+         }
+      }
+   }
+}
+#endif
+
+#ifdef PNG_READ_INVERT_ALPHA_SUPPORTED
+void /* PRIVATE */
+png_do_read_invert_alpha(png_row_infop row_info, png_bytep row)
+{
+   png_debug(1, "in png_do_read_invert_alpha");
+
+#ifdef PNG_USELESS_TESTS_SUPPORTED
+   if (row != NULL && row_info != NULL)
+#endif
+   {
+      png_uint_32 row_width = row_info->width;
+      if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
+      {
+         /* This inverts the alpha channel in RGBA */
+         if (row_info->bit_depth == 8)
+         {
+            png_bytep sp = row + row_info->rowbytes;
+            png_bytep dp = sp;
+            png_uint_32 i;
+
+            for (i = 0; i < row_width; i++)
+            {
+               *(--dp) = (png_byte)(255 - *(--sp));
+
+/*             This does nothing:
+               *(--dp) = *(--sp);
+               *(--dp) = *(--sp);
+               *(--dp) = *(--sp);
+               We can replace it with:
+*/
+               sp-=3;
+               dp=sp;
+            }
+         }
+         /* This inverts the alpha channel in RRGGBBAA */
+         else
+         {
+            png_bytep sp = row + row_info->rowbytes;
+            png_bytep dp = sp;
+            png_uint_32 i;
+
+            for (i = 0; i < row_width; i++)
+            {
+               *(--dp) = (png_byte)(255 - *(--sp));
+               *(--dp) = (png_byte)(255 - *(--sp));
+
+/*             This does nothing:
+               *(--dp) = *(--sp);
+               *(--dp) = *(--sp);
+               *(--dp) = *(--sp);
+               *(--dp) = *(--sp);
+               *(--dp) = *(--sp);
+               *(--dp) = *(--sp);
+               We can replace it with:
+*/
+               sp-=6;
+               dp=sp;
+            }
+         }
+      }
+      else if (row_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
+      {
+         /* This inverts the alpha channel in GA */
+         if (row_info->bit_depth == 8)
+         {
+            png_bytep sp = row + row_info->rowbytes;
+            png_bytep dp = sp;
+            png_uint_32 i;
+
+            for (i = 0; i < row_width; i++)
+            {
+               *(--dp) = (png_byte)(255 - *(--sp));
+               *(--dp) = *(--sp);
+            }
+         }
+         /* This inverts the alpha channel in GGAA */
+         else
+         {
+            png_bytep sp  = row + row_info->rowbytes;
+            png_bytep dp = sp;
+            png_uint_32 i;
+
+            for (i = 0; i < row_width; i++)
+            {
+               *(--dp) = (png_byte)(255 - *(--sp));
+               *(--dp) = (png_byte)(255 - *(--sp));
+/*
+               *(--dp) = *(--sp);
+               *(--dp) = *(--sp);
+*/
+               sp-=2;
+               dp=sp;
+            }
+         }
+      }
+   }
+}
+#endif
+
+#ifdef PNG_READ_FILLER_SUPPORTED
+/* Add filler channel if we have RGB color */
+void /* PRIVATE */
+png_do_read_filler(png_row_infop row_info, png_bytep row,
+   png_uint_32 filler, png_uint_32 flags)
+{
+   png_uint_32 i;
+   png_uint_32 row_width = row_info->width;
+
+   png_byte hi_filler = (png_byte)((filler>>8) & 0xff);
+   png_byte lo_filler = (png_byte)(filler & 0xff);
+
+   png_debug(1, "in png_do_read_filler");
+
+   if (
+#ifdef PNG_USELESS_TESTS_SUPPORTED
+       row != NULL  && row_info != NULL &&
+#endif
+       row_info->color_type == PNG_COLOR_TYPE_GRAY)
+   {
+      if (row_info->bit_depth == 8)
+      {
+         /* This changes the data from G to GX */
+         if (flags & PNG_FLAG_FILLER_AFTER)
+         {
+            png_bytep sp = row + (png_size_t)row_width;
+            png_bytep dp =  sp + (png_size_t)row_width;
+            for (i = 1; i < row_width; i++)
+            {
+               *(--dp) = lo_filler;
+               *(--dp) = *(--sp);
+            }
+            *(--dp) = lo_filler;
+            row_info->channels = 2;
+            row_info->pixel_depth = 16;
+            row_info->rowbytes = row_width * 2;
+         }
+      /* This changes the data from G to XG */
+         else
+         {
+            png_bytep sp = row + (png_size_t)row_width;
+            png_bytep dp = sp  + (png_size_t)row_width;
+            for (i = 0; i < row_width; i++)
+            {
+               *(--dp) = *(--sp);
+               *(--dp) = lo_filler;
+            }
+            row_info->channels = 2;
+            row_info->pixel_depth = 16;
+            row_info->rowbytes = row_width * 2;
+         }
+      }
+      else if (row_info->bit_depth == 16)
+      {
+         /* This changes the data from GG to GGXX */
+         if (flags & PNG_FLAG_FILLER_AFTER)
+         {
+            png_bytep sp = row + (png_size_t)row_width * 2;
+            png_bytep dp = sp  + (png_size_t)row_width * 2;
+            for (i = 1; i < row_width; i++)
+            {
+               *(--dp) = hi_filler;
+               *(--dp) = lo_filler;
+               *(--dp) = *(--sp);
+               *(--dp) = *(--sp);
+            }
+            *(--dp) = hi_filler;
+            *(--dp) = lo_filler;
+            row_info->channels = 2;
+            row_info->pixel_depth = 32;
+            row_info->rowbytes = row_width * 4;
+         }
+         /* This changes the data from GG to XXGG */
+         else
+         {
+            png_bytep sp = row + (png_size_t)row_width * 2;
+            png_bytep dp = sp  + (png_size_t)row_width * 2;
+            for (i = 0; i < row_width; i++)
+            {
+               *(--dp) = *(--sp);
+               *(--dp) = *(--sp);
+               *(--dp) = hi_filler;
+               *(--dp) = lo_filler;
+            }
+            row_info->channels = 2;
+            row_info->pixel_depth = 32;
+            row_info->rowbytes = row_width * 4;
+         }
+      }
+   } /* COLOR_TYPE == GRAY */
+   else if (row_info->color_type == PNG_COLOR_TYPE_RGB)
+   {
+      if (row_info->bit_depth == 8)
+      {
+         /* This changes the data from RGB to RGBX */
+         if (flags & PNG_FLAG_FILLER_AFTER)
+         {
+            png_bytep sp = row + (png_size_t)row_width * 3;
+            png_bytep dp = sp  + (png_size_t)row_width;
+            for (i = 1; i < row_width; i++)
+            {
+               *(--dp) = lo_filler;
+               *(--dp) = *(--sp);
+               *(--dp) = *(--sp);
+               *(--dp) = *(--sp);
+            }
+            *(--dp) = lo_filler;
+            row_info->channels = 4;
+            row_info->pixel_depth = 32;
+            row_info->rowbytes = row_width * 4;
+         }
+      /* This changes the data from RGB to XRGB */
+         else
+         {
+            png_bytep sp = row + (png_size_t)row_width * 3;
+            png_bytep dp = sp + (png_size_t)row_width;
+            for (i = 0; i < row_width; i++)
+            {
+               *(--dp) = *(--sp);
+               *(--dp) = *(--sp);
+               *(--dp) = *(--sp);
+               *(--dp) = lo_filler;
+            }
+            row_info->channels = 4;
+            row_info->pixel_depth = 32;
+            row_info->rowbytes = row_width * 4;
+         }
+      }
+      else if (row_info->bit_depth == 16)
+      {
+         /* This changes the data from RRGGBB to RRGGBBXX */
+         if (flags & PNG_FLAG_FILLER_AFTER)
+         {
+            png_bytep sp = row + (png_size_t)row_width * 6;
+            png_bytep dp = sp  + (png_size_t)row_width * 2;
+            for (i = 1; i < row_width; i++)
+            {
+               *(--dp) = hi_filler;
+               *(--dp) = lo_filler;
+               *(--dp) = *(--sp);
+               *(--dp) = *(--sp);
+               *(--dp) = *(--sp);
+               *(--dp) = *(--sp);
+               *(--dp) = *(--sp);
+               *(--dp) = *(--sp);
+            }
+            *(--dp) = hi_filler;
+            *(--dp) = lo_filler;
+            row_info->channels = 4;
+            row_info->pixel_depth = 64;
+            row_info->rowbytes = row_width * 8;
+         }
+         /* This changes the data from RRGGBB to XXRRGGBB */
+         else
+         {
+            png_bytep sp = row + (png_size_t)row_width * 6;
+            png_bytep dp = sp  + (png_size_t)row_width * 2;
+            for (i = 0; i < row_width; i++)
+            {
+               *(--dp) = *(--sp);
+               *(--dp) = *(--sp);
+               *(--dp) = *(--sp);
+               *(--dp) = *(--sp);
+               *(--dp) = *(--sp);
+               *(--dp) = *(--sp);
+               *(--dp) = hi_filler;
+               *(--dp) = lo_filler;
+            }
+            row_info->channels = 4;
+            row_info->pixel_depth = 64;
+            row_info->rowbytes = row_width * 8;
+         }
+      }
+   } /* COLOR_TYPE == RGB */
+}
+#endif
+
+#ifdef PNG_READ_GRAY_TO_RGB_SUPPORTED
+/* Expand grayscale files to RGB, with or without alpha */
+void /* PRIVATE */
+png_do_gray_to_rgb(png_row_infop row_info, png_bytep row)
+{
+   png_uint_32 i;
+   png_uint_32 row_width = row_info->width;
+
+   png_debug(1, "in png_do_gray_to_rgb");
+
+   if (row_info->bit_depth >= 8 &&
+#ifdef PNG_USELESS_TESTS_SUPPORTED
+       row != NULL && row_info != NULL &&
+#endif
+      !(row_info->color_type & PNG_COLOR_MASK_COLOR))
+   {
+      if (row_info->color_type == PNG_COLOR_TYPE_GRAY)
+      {
+         if (row_info->bit_depth == 8)
+         {
+            png_bytep sp = row + (png_size_t)row_width - 1;
+            png_bytep dp = sp  + (png_size_t)row_width * 2;
+            for (i = 0; i < row_width; i++)
+            {
+               *(dp--) = *sp;
+               *(dp--) = *sp;
+               *(dp--) = *(sp--);
+            }
+         }
+         else
+         {
+            png_bytep sp = row + (png_size_t)row_width * 2 - 1;
+            png_bytep dp = sp  + (png_size_t)row_width * 4;
+            for (i = 0; i < row_width; i++)
+            {
+               *(dp--) = *sp;
+               *(dp--) = *(sp - 1);
+               *(dp--) = *sp;
+               *(dp--) = *(sp - 1);
+               *(dp--) = *(sp--);
+               *(dp--) = *(sp--);
+            }
+         }
+      }
+      else if (row_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
+      {
+         if (row_info->bit_depth == 8)
+         {
+            png_bytep sp = row + (png_size_t)row_width * 2 - 1;
+            png_bytep dp = sp  + (png_size_t)row_width * 2;
+            for (i = 0; i < row_width; i++)
+            {
+               *(dp--) = *(sp--);
+               *(dp--) = *sp;
+               *(dp--) = *sp;
+               *(dp--) = *(sp--);
+            }
+         }
+         else
+         {
+            png_bytep sp = row + (png_size_t)row_width * 4 - 1;
+            png_bytep dp = sp  + (png_size_t)row_width * 4;
+            for (i = 0; i < row_width; i++)
+            {
+               *(dp--) = *(sp--);
+               *(dp--) = *(sp--);
+               *(dp--) = *sp;
+               *(dp--) = *(sp - 1);
+               *(dp--) = *sp;
+               *(dp--) = *(sp - 1);
+               *(dp--) = *(sp--);
+               *(dp--) = *(sp--);
+            }
+         }
+      }
+      row_info->channels += (png_byte)2;
+      row_info->color_type |= PNG_COLOR_MASK_COLOR;
+      row_info->pixel_depth = (png_byte)(row_info->channels *
+         row_info->bit_depth);
+      row_info->rowbytes = PNG_ROWBYTES(row_info->pixel_depth, row_width);
+   }
+}
+#endif
+
+#ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED
+/* Reduce RGB files to grayscale, with or without alpha
+ * using the equation given in Poynton's ColorFAQ at
+ * <http://www.inforamp.net/~poynton/>  (THIS LINK IS DEAD June 2008)
+ * New link:
+ * <http://www.poynton.com/notes/colour_and_gamma/>
+ * Charles Poynton poynton at poynton.com
+ *
+ *     Y = 0.212671 * R + 0.715160 * G + 0.072169 * B
+ *
+ *  We approximate this with
+ *
+ *     Y = 0.21268 * R    + 0.7151 * G    + 0.07217 * B
+ *
+ *  which can be expressed with integers as
+ *
+ *     Y = (6969 * R + 23434 * G + 2365 * B)/32768
+ *
+ *  The calculation is to be done in a linear colorspace.
+ *
+ *  Other integer coefficents can be used via png_set_rgb_to_gray().
+ */
+int /* PRIVATE */
+png_do_rgb_to_gray(png_structp png_ptr, png_row_infop row_info, png_bytep row)
+
+{
+   png_uint_32 i;
+
+   png_uint_32 row_width = row_info->width;
+   int rgb_error = 0;
+
+   png_debug(1, "in png_do_rgb_to_gray");
+
+   if (
+#ifdef PNG_USELESS_TESTS_SUPPORTED
+       row != NULL && row_info != NULL &&
+#endif
+      (row_info->color_type & PNG_COLOR_MASK_COLOR))
+   {
+      png_uint_32 rc = png_ptr->rgb_to_gray_red_coeff;
+      png_uint_32 gc = png_ptr->rgb_to_gray_green_coeff;
+      png_uint_32 bc = png_ptr->rgb_to_gray_blue_coeff;
+
+      if (row_info->color_type == PNG_COLOR_TYPE_RGB)
+      {
+         if (row_info->bit_depth == 8)
+         {
+#if defined(PNG_READ_GAMMA_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED)
+            if (png_ptr->gamma_from_1 != NULL && png_ptr->gamma_to_1 != NULL)
+            {
+               png_bytep sp = row;
+               png_bytep dp = row;
+
+               for (i = 0; i < row_width; i++)
+               {
+                  png_byte red   = png_ptr->gamma_to_1[*(sp++)];
+                  png_byte green = png_ptr->gamma_to_1[*(sp++)];
+                  png_byte blue  = png_ptr->gamma_to_1[*(sp++)];
+                  if (red != green || red != blue)
+                  {
+                     rgb_error |= 1;
+                     *(dp++) = png_ptr->gamma_from_1[
+                       (rc*red + gc*green + bc*blue)>>15];
+                  }
+                  else
+                     *(dp++) = *(sp - 1);
+               }
+            }
+            else
+#endif
+            {
+               png_bytep sp = row;
+               png_bytep dp = row;
+               for (i = 0; i < row_width; i++)
+               {
+                  png_byte red   = *(sp++);
+                  png_byte green = *(sp++);
+                  png_byte blue  = *(sp++);
+                  if (red != green || red != blue)
+                  {
+                     rgb_error |= 1;
+                     *(dp++) = (png_byte)((rc*red + gc*green + bc*blue)>>15);
+                  }
+                  else
+                     *(dp++) = *(sp - 1);
+               }
+            }
+         }
+
+         else /* RGB bit_depth == 16 */
+         {
+#if defined(PNG_READ_GAMMA_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED)
+            if (png_ptr->gamma_16_to_1 != NULL &&
+                png_ptr->gamma_16_from_1 != NULL)
+            {
+               png_bytep sp = row;
+               png_bytep dp = row;
+               for (i = 0; i < row_width; i++)
+               {
+                  png_uint_16 red, green, blue, w;
+
+                  red   = (png_uint_16)(((*(sp))<<8) | *(sp+1)); sp+=2;
+                  green = (png_uint_16)(((*(sp))<<8) | *(sp+1)); sp+=2;
+                  blue  = (png_uint_16)(((*(sp))<<8) | *(sp+1)); sp+=2;
+
+                  if (red == green && red == blue)
+                     w = red;
+                  else
+                  {
+                     png_uint_16 red_1   = png_ptr->gamma_16_to_1[(red&0xff) >>
+                                  png_ptr->gamma_shift][red>>8];
+                     png_uint_16 green_1 =
+                         png_ptr->gamma_16_to_1[(green&0xff) >>
+                                  png_ptr->gamma_shift][green>>8];
+                     png_uint_16 blue_1  = png_ptr->gamma_16_to_1[(blue&0xff) >>
+                                  png_ptr->gamma_shift][blue>>8];
+                     png_uint_16 gray16  = (png_uint_16)((rc*red_1 + gc*green_1
+                                  + bc*blue_1)>>15);
+                     w = png_ptr->gamma_16_from_1[(gray16&0xff) >>
+                         png_ptr->gamma_shift][gray16 >> 8];
+                     rgb_error |= 1;
+                  }
+
+                  *(dp++) = (png_byte)((w>>8) & 0xff);
+                  *(dp++) = (png_byte)(w & 0xff);
+               }
+            }
+            else
+#endif
+            {
+               png_bytep sp = row;
+               png_bytep dp = row;
+               for (i = 0; i < row_width; i++)
+               {
+                  png_uint_16 red, green, blue, gray16;
+
+                  red   = (png_uint_16)(((*(sp))<<8) | *(sp+1)); sp+=2;
+                  green = (png_uint_16)(((*(sp))<<8) | *(sp+1)); sp+=2;
+                  blue  = (png_uint_16)(((*(sp))<<8) | *(sp+1)); sp+=2;
+
+                  if (red != green || red != blue)
+                     rgb_error |= 1;
+                  gray16  = (png_uint_16)((rc*red + gc*green + bc*blue)>>15);
+                  *(dp++) = (png_byte)((gray16>>8) & 0xff);
+                  *(dp++) = (png_byte)(gray16 & 0xff);
+               }
+            }
+         }
+      }
+      if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
+      {
+         if (row_info->bit_depth == 8)
+         {
+#if defined(PNG_READ_GAMMA_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED)
+            if (png_ptr->gamma_from_1 != NULL && png_ptr->gamma_to_1 != NULL)
+            {
+               png_bytep sp = row;
+               png_bytep dp = row;
+               for (i = 0; i < row_width; i++)
+               {
+                  png_byte red   = png_ptr->gamma_to_1[*(sp++)];
+                  png_byte green = png_ptr->gamma_to_1[*(sp++)];
+                  png_byte blue  = png_ptr->gamma_to_1[*(sp++)];
+                  if (red != green || red != blue)
+                     rgb_error |= 1;
+                  *(dp++) =  png_ptr->gamma_from_1
+                             [(rc*red + gc*green + bc*blue)>>15];
+                  *(dp++) = *(sp++);  /* alpha */
+               }
+            }
+            else
+#endif
+            {
+               png_bytep sp = row;
+               png_bytep dp = row;
+               for (i = 0; i < row_width; i++)
+               {
+                  png_byte red   = *(sp++);
+                  png_byte green = *(sp++);
+                  png_byte blue  = *(sp++);
+                  if (red != green || red != blue)
+                     rgb_error |= 1;
+                  *(dp++) =  (png_byte)((rc*red + gc*green + bc*blue)>>15);
+                  *(dp++) = *(sp++);  /* alpha */
+               }
+            }
+         }
+         else /* RGBA bit_depth == 16 */
+         {
+#if defined(PNG_READ_GAMMA_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED)
+            if (png_ptr->gamma_16_to_1 != NULL &&
+                png_ptr->gamma_16_from_1 != NULL)
+            {
+               png_bytep sp = row;
+               png_bytep dp = row;
+               for (i = 0; i < row_width; i++)
+               {
+                  png_uint_16 red, green, blue, w;
+
+                  red   = (png_uint_16)(((*(sp))<<8) | *(sp+1)); sp+=2;
+                  green = (png_uint_16)(((*(sp))<<8) | *(sp+1)); sp+=2;
+                  blue  = (png_uint_16)(((*(sp))<<8) | *(sp+1)); sp+=2;
+
+                  if (red == green && red == blue)
+                     w = red;
+                  else
+                  {
+                     png_uint_16 red_1   = png_ptr->gamma_16_to_1[(red&0xff) >>
+                         png_ptr->gamma_shift][red>>8];
+                     png_uint_16 green_1 =
+                         png_ptr->gamma_16_to_1[(green&0xff) >>
+                         png_ptr->gamma_shift][green>>8];
+                     png_uint_16 blue_1  = png_ptr->gamma_16_to_1[(blue&0xff) >>
+                         png_ptr->gamma_shift][blue>>8];
+                     png_uint_16 gray16  = (png_uint_16)((rc * red_1
+                         + gc * green_1 + bc * blue_1)>>15);
+                     w = png_ptr->gamma_16_from_1[(gray16&0xff) >>
+                         png_ptr->gamma_shift][gray16 >> 8];
+                     rgb_error |= 1;
+                  }
+
+                  *(dp++) = (png_byte)((w>>8) & 0xff);
+                  *(dp++) = (png_byte)(w & 0xff);
+                  *(dp++) = *(sp++);  /* alpha */
+                  *(dp++) = *(sp++);
+               }
+            }
+            else
+#endif
+            {
+               png_bytep sp = row;
+               png_bytep dp = row;
+               for (i = 0; i < row_width; i++)
+               {
+                  png_uint_16 red, green, blue, gray16;
+                  red   = (png_uint_16)((*(sp)<<8) | *(sp+1)); sp+=2;
+                  green = (png_uint_16)((*(sp)<<8) | *(sp+1)); sp+=2;
+                  blue  = (png_uint_16)((*(sp)<<8) | *(sp+1)); sp+=2;
+                  if (red != green || red != blue)
+                     rgb_error |= 1;
+                  gray16  = (png_uint_16)((rc*red + gc*green + bc*blue)>>15);
+                  *(dp++) = (png_byte)((gray16>>8) & 0xff);
+                  *(dp++) = (png_byte)(gray16 & 0xff);
+                  *(dp++) = *(sp++);  /* alpha */
+                  *(dp++) = *(sp++);
+               }
+            }
+         }
+      }
+   row_info->channels -= (png_byte)2;
+      row_info->color_type &= ~PNG_COLOR_MASK_COLOR;
+      row_info->pixel_depth = (png_byte)(row_info->channels *
+         row_info->bit_depth);
+      row_info->rowbytes = PNG_ROWBYTES(row_info->pixel_depth, row_width);
+   }
+   return rgb_error;
+}
+#endif
+
+/* Build a grayscale palette.  Palette is assumed to be 1 << bit_depth
+ * large of png_color.  This lets grayscale images be treated as
+ * paletted.  Most useful for gamma correction and simplification
+ * of code.
+ */
+void PNGAPI
+png_build_grayscale_palette(int bit_depth, png_colorp palette)
+{
+   int num_palette;
+   int color_inc;
+   int i;
+   int v;
+
+   png_debug(1, "in png_do_build_grayscale_palette");
+
+   if (palette == NULL)
+      return;
+
+   switch (bit_depth)
+   {
+      case 1:
+         num_palette = 2;
+         color_inc = 0xff;
+         break;
+
+      case 2:
+         num_palette = 4;
+         color_inc = 0x55;
+         break;
+
+      case 4:
+         num_palette = 16;
+         color_inc = 0x11;
+         break;
+
+      case 8:
+         num_palette = 256;
+         color_inc = 1;
+         break;
+
+      default:
+         num_palette = 0;
+         color_inc = 0;
+         break;
+   }
+
+   for (i = 0, v = 0; i < num_palette; i++, v += color_inc)
+   {
+      palette[i].red = (png_byte)v;
+      palette[i].green = (png_byte)v;
+      palette[i].blue = (png_byte)v;
+   }
+}
+
+/* This function is currently unused.  Do we really need it? */
+#if defined(PNG_READ_DITHER_SUPPORTED) && \
+  defined(PNG_CORRECT_PALETTE_SUPPORTED)
+void /* PRIVATE */
+png_correct_palette(png_structp png_ptr, png_colorp palette,
+   int num_palette)
+{
+   png_debug(1, "in png_correct_palette");
+
+#if defined(PNG_READ_BACKGROUND_SUPPORTED) && \
+    defined(PNG_READ_GAMMA_SUPPORTED) && \
+  defined(PNG_FLOATING_POINT_SUPPORTED)
+   if (png_ptr->transformations & (PNG_GAMMA | PNG_BACKGROUND))
+   {
+      png_color back, back_1;
+
+      if (png_ptr->background_gamma_type == PNG_BACKGROUND_GAMMA_FILE)
+      {
+         back.red = png_ptr->gamma_table[png_ptr->background.red];
+         back.green = png_ptr->gamma_table[png_ptr->background.green];
+         back.blue = png_ptr->gamma_table[png_ptr->background.blue];
+
+         back_1.red = png_ptr->gamma_to_1[png_ptr->background.red];
+         back_1.green = png_ptr->gamma_to_1[png_ptr->background.green];
+         back_1.blue = png_ptr->gamma_to_1[png_ptr->background.blue];
+      }
+      else
+      {
+         double g;
+
+         g = 1.0 / (png_ptr->background_gamma * png_ptr->screen_gamma);
+
+         if (png_ptr->background_gamma_type == PNG_BACKGROUND_GAMMA_SCREEN
+             || fabs(g - 1.0) < PNG_GAMMA_THRESHOLD)
+         {
+            back.red = png_ptr->background.red;
+            back.green = png_ptr->background.green;
+            back.blue = png_ptr->background.blue;
+         }
+         else
+         {
+            back.red =
+               (png_byte)(pow((double)png_ptr->background.red/255, g) *
+                255.0 + 0.5);
+            back.green =
+               (png_byte)(pow((double)png_ptr->background.green/255, g) *
+                255.0 + 0.5);
+            back.blue =
+               (png_byte)(pow((double)png_ptr->background.blue/255, g) *
+                255.0 + 0.5);
+         }
+
+         g = 1.0 / png_ptr->background_gamma;
+
+         back_1.red =
+            (png_byte)(pow((double)png_ptr->background.red/255, g) *
+             255.0 + 0.5);
+         back_1.green =
+            (png_byte)(pow((double)png_ptr->background.green/255, g) *
+             255.0 + 0.5);
+         back_1.blue =
+            (png_byte)(pow((double)png_ptr->background.blue/255, g) *
+             255.0 + 0.5);
+      }
+
+      if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
+      {
+         png_uint_32 i;
+
+         for (i = 0; i < (png_uint_32)num_palette; i++)
+         {
+            if (i < png_ptr->num_trans && png_ptr->trans[i] == 0)
+            {
+               palette[i] = back;
+            }
+            else if (i < png_ptr->num_trans && png_ptr->trans[i] != 0xff)
+            {
+               png_byte v, w;
+
+               v = png_ptr->gamma_to_1[png_ptr->palette[i].red];
+               png_composite(w, v, png_ptr->trans[i], back_1.red);
+               palette[i].red = png_ptr->gamma_from_1[w];
+
+               v = png_ptr->gamma_to_1[png_ptr->palette[i].green];
+               png_composite(w, v, png_ptr->trans[i], back_1.green);
+               palette[i].green = png_ptr->gamma_from_1[w];
+
+               v = png_ptr->gamma_to_1[png_ptr->palette[i].blue];
+               png_composite(w, v, png_ptr->trans[i], back_1.blue);
+               palette[i].blue = png_ptr->gamma_from_1[w];
+            }
+            else
+            {
+               palette[i].red = png_ptr->gamma_table[palette[i].red];
+               palette[i].green = png_ptr->gamma_table[palette[i].green];
+               palette[i].blue = png_ptr->gamma_table[palette[i].blue];
+            }
+         }
+      }
+      else
+      {
+         int i;
+
+         for (i = 0; i < num_palette; i++)
+         {
+            if (palette[i].red == (png_byte)png_ptr->trans_values.gray)
+            {
+               palette[i] = back;
+            }
+            else
+            {
+               palette[i].red = png_ptr->gamma_table[palette[i].red];
+               palette[i].green = png_ptr->gamma_table[palette[i].green];
+               palette[i].blue = png_ptr->gamma_table[palette[i].blue];
+            }
+         }
+      }
+   }
+   else
+#endif
+#ifdef PNG_READ_GAMMA_SUPPORTED
+   if (png_ptr->transformations & PNG_GAMMA)
+   {
+      int i;
+
+      for (i = 0; i < num_palette; i++)
+      {
+         palette[i].red = png_ptr->gamma_table[palette[i].red];
+         palette[i].green = png_ptr->gamma_table[palette[i].green];
+         palette[i].blue = png_ptr->gamma_table[palette[i].blue];
+      }
+   }
+#ifdef PNG_READ_BACKGROUND_SUPPORTED
+   else
+#endif
+#endif
+#ifdef PNG_READ_BACKGROUND_SUPPORTED
+   if (png_ptr->transformations & PNG_BACKGROUND)
+   {
+      if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
+      {
+         png_color back;
+
+         back.red   = (png_byte)png_ptr->background.red;
+         back.green = (png_byte)png_ptr->background.green;
+         back.blue  = (png_byte)png_ptr->background.blue;
+
+         for (i = 0; i < (int)png_ptr->num_trans; i++)
+         {
+            if (png_ptr->trans[i] == 0)
+            {
+               palette[i].red = back.red;
+               palette[i].green = back.green;
+               palette[i].blue = back.blue;
+            }
+            else if (png_ptr->trans[i] != 0xff)
+            {
+               png_composite(palette[i].red, png_ptr->palette[i].red,
+                  png_ptr->trans[i], back.red);
+               png_composite(palette[i].green, png_ptr->palette[i].green,
+                  png_ptr->trans[i], back.green);
+               png_composite(palette[i].blue, png_ptr->palette[i].blue,
+                  png_ptr->trans[i], back.blue);
+            }
+         }
+      }
+      else /* Assume grayscale palette (what else could it be?) */
+      {
+         int i;
+
+         for (i = 0; i < num_palette; i++)
+         {
+            if (i == (png_byte)png_ptr->trans_values.gray)
+            {
+               palette[i].red = (png_byte)png_ptr->background.red;
+               palette[i].green = (png_byte)png_ptr->background.green;
+               palette[i].blue = (png_byte)png_ptr->background.blue;
+            }
+         }
+      }
+   }
+#endif
+}
+#endif
+
+#ifdef PNG_READ_BACKGROUND_SUPPORTED
+/* Replace any alpha or transparency with the supplied background color.
+ * "background" is already in the screen gamma, while "background_1" is
+ * at a gamma of 1.0.  Paletted files have already been taken care of.
+ */
+void /* PRIVATE */
+png_do_background(png_row_infop row_info, png_bytep row,
+   png_color_16p trans_values, png_color_16p background
+#ifdef PNG_READ_GAMMA_SUPPORTED
+   , png_color_16p background_1,
+   png_bytep gamma_table, png_bytep gamma_from_1, png_bytep gamma_to_1,
+   png_uint_16pp gamma_16, png_uint_16pp gamma_16_from_1,
+   png_uint_16pp gamma_16_to_1, int gamma_shift
+#endif
+   )
+{
+   png_bytep sp, dp;
+   png_uint_32 i;
+   png_uint_32 row_width=row_info->width;
+   int shift;
+
+   png_debug(1, "in png_do_background");
+
+   if (background != NULL &&
+#ifdef PNG_USELESS_TESTS_SUPPORTED
+       row != NULL && row_info != NULL &&
+#endif
+      (!(row_info->color_type & PNG_COLOR_MASK_ALPHA) ||
+      (row_info->color_type != PNG_COLOR_TYPE_PALETTE && trans_values)))
+   {
+      switch (row_info->color_type)
+      {
+         case PNG_COLOR_TYPE_GRAY:
+         {
+            switch (row_info->bit_depth)
+            {
+               case 1:
+               {
+                  sp = row;
+                  shift = 7;
+                  for (i = 0; i < row_width; i++)
+                  {
+                     if ((png_uint_16)((*sp >> shift) & 0x01)
+                        == trans_values->gray)
+                     {
+                        *sp &= (png_byte)((0x7f7f >> (7 - shift)) & 0xff);
+                        *sp |= (png_byte)(background->gray << shift);
+                     }
+                     if (!shift)
+                     {
+                        shift = 7;
+                        sp++;
+                     }
+                     else
+                        shift--;
+                  }
+                  break;
+               }
+
+               case 2:
+               {
+#ifdef PNG_READ_GAMMA_SUPPORTED
+                  if (gamma_table != NULL)
+                  {
+                     sp = row;
+                     shift = 6;
+                     for (i = 0; i < row_width; i++)
+                     {
+                        if ((png_uint_16)((*sp >> shift) & 0x03)
+                            == trans_values->gray)
+                        {
+                           *sp &= (png_byte)((0x3f3f >> (6 - shift)) & 0xff);
+                           *sp |= (png_byte)(background->gray << shift);
+                        }
+                        else
+                        {
+                           png_byte p = (png_byte)((*sp >> shift) & 0x03);
+                           png_byte g = (png_byte)((gamma_table [p | (p << 2) |
+                               (p << 4) | (p << 6)] >> 6) & 0x03);
+                           *sp &= (png_byte)((0x3f3f >> (6 - shift)) & 0xff);
+                           *sp |= (png_byte)(g << shift);
+                        }
+                        if (!shift)
+                        {
+                           shift = 6;
+                           sp++;
+                        }
+                        else
+                           shift -= 2;
+                     }
+                  }
+                  else
+#endif
+                  {
+                     sp = row;
+                     shift = 6;
+                     for (i = 0; i < row_width; i++)
+                     {
+                        if ((png_uint_16)((*sp >> shift) & 0x03)
+                            == trans_values->gray)
+                        {
+                           *sp &= (png_byte)((0x3f3f >> (6 - shift)) & 0xff);
+                           *sp |= (png_byte)(background->gray << shift);
+                        }
+                        if (!shift)
+                        {
+                           shift = 6;
+                           sp++;
+                        }
+                        else
+                           shift -= 2;
+                     }
+                  }
+                  break;
+               }
+
+               case 4:
+               {
+#ifdef PNG_READ_GAMMA_SUPPORTED
+                  if (gamma_table != NULL)
+                  {
+                     sp = row;
+                     shift = 4;
+                     for (i = 0; i < row_width; i++)
+                     {
+                        if ((png_uint_16)((*sp >> shift) & 0x0f)
+                            == trans_values->gray)
+                        {
+                           *sp &= (png_byte)((0xf0f >> (4 - shift)) & 0xff);
+                           *sp |= (png_byte)(background->gray << shift);
+                        }
+                        else
+                        {
+                           png_byte p = (png_byte)((*sp >> shift) & 0x0f);
+                           png_byte g = (png_byte)((gamma_table[p |
+                             (p << 4)] >> 4) & 0x0f);
+                           *sp &= (png_byte)((0xf0f >> (4 - shift)) & 0xff);
+                           *sp |= (png_byte)(g << shift);
+                        }
+                        if (!shift)
+                        {
+                           shift = 4;
+                           sp++;
+                        }
+                        else
+                           shift -= 4;
+                     }
+                  }
+                  else
+#endif
+                  {
+                     sp = row;
+                     shift = 4;
+                     for (i = 0; i < row_width; i++)
+                     {
+                        if ((png_uint_16)((*sp >> shift) & 0x0f)
+                            == trans_values->gray)
+                        {
+                           *sp &= (png_byte)((0xf0f >> (4 - shift)) & 0xff);
+                           *sp |= (png_byte)(background->gray << shift);
+                        }
+                        if (!shift)
+                        {
+                           shift = 4;
+                           sp++;
+                        }
+                        else
+                           shift -= 4;
+                     }
+                  }
+                  break;
+               }
+
+               case 8:
+               {
+#ifdef PNG_READ_GAMMA_SUPPORTED
+                  if (gamma_table != NULL)
+                  {
+                     sp = row;
+                     for (i = 0; i < row_width; i++, sp++)
+                     {
+                        if (*sp == trans_values->gray)
+                        {
+                           *sp = (png_byte)background->gray;
+                        }
+                        else
+                        {
+                           *sp = gamma_table[*sp];
+                        }
+                     }
+                  }
+                  else
+#endif
+                  {
+                     sp = row;
+                     for (i = 0; i < row_width; i++, sp++)
+                     {
+                        if (*sp == trans_values->gray)
+                        {
+                           *sp = (png_byte)background->gray;
+                        }
+                     }
+                  }
+                  break;
+               }
+
+               case 16:
+               {
+#ifdef PNG_READ_GAMMA_SUPPORTED
+                  if (gamma_16 != NULL)
+                  {
+                     sp = row;
+                     for (i = 0; i < row_width; i++, sp += 2)
+                     {
+                        png_uint_16 v;
+
+                        v = (png_uint_16)(((*sp) << 8) + *(sp + 1));
+                        if (v == trans_values->gray)
+                        {
+                           /* Background is already in screen gamma */
+                           *sp = (png_byte)((background->gray >> 8) & 0xff);
+                           *(sp + 1) = (png_byte)(background->gray & 0xff);
+                        }
+                        else
+                        {
+                           v = gamma_16[*(sp + 1) >> gamma_shift][*sp];
+                           *sp = (png_byte)((v >> 8) & 0xff);
+                           *(sp + 1) = (png_byte)(v & 0xff);
+                        }
+                     }
+                  }
+                  else
+#endif
+                  {
+                     sp = row;
+                     for (i = 0; i < row_width; i++, sp += 2)
+                     {
+                        png_uint_16 v;
+
+                        v = (png_uint_16)(((*sp) << 8) + *(sp + 1));
+                        if (v == trans_values->gray)
+                        {
+                           *sp = (png_byte)((background->gray >> 8) & 0xff);
+                           *(sp + 1) = (png_byte)(background->gray & 0xff);
+                        }
+                     }
+                  }
+                  break;
+               }
+            }
+            break;
+         }
+
+         case PNG_COLOR_TYPE_RGB:
+         {
+            if (row_info->bit_depth == 8)
+            {
+#ifdef PNG_READ_GAMMA_SUPPORTED
+               if (gamma_table != NULL)
+               {
+                  sp = row;
+                  for (i = 0; i < row_width; i++, sp += 3)
+                  {
+                     if (*sp == trans_values->red &&
+                        *(sp + 1) == trans_values->green &&
+                        *(sp + 2) == trans_values->blue)
+                     {
+                        *sp = (png_byte)background->red;
+                        *(sp + 1) = (png_byte)background->green;
+                        *(sp + 2) = (png_byte)background->blue;
+                     }
+                     else
+                     {
+                        *sp = gamma_table[*sp];
+                        *(sp + 1) = gamma_table[*(sp + 1)];
+                        *(sp + 2) = gamma_table[*(sp + 2)];
+                     }
+                  }
+               }
+               else
+#endif
+               {
+                  sp = row;
+                  for (i = 0; i < row_width; i++, sp += 3)
+                  {
+                     if (*sp == trans_values->red &&
+                        *(sp + 1) == trans_values->green &&
+                        *(sp + 2) == trans_values->blue)
+                     {
+                        *sp = (png_byte)background->red;
+                        *(sp + 1) = (png_byte)background->green;
+                        *(sp + 2) = (png_byte)background->blue;
+                     }
+                  }
+               }
+            }
+            else /* if (row_info->bit_depth == 16) */
+            {
+#ifdef PNG_READ_GAMMA_SUPPORTED
+               if (gamma_16 != NULL)
+               {
+                  sp = row;
+                  for (i = 0; i < row_width; i++, sp += 6)
+                  {
+                     png_uint_16 r = (png_uint_16)(((*sp) << 8) + *(sp + 1));
+                     png_uint_16 g = (png_uint_16)(((*(sp+2)) << 8) + *(sp+3));
+                     png_uint_16 b = (png_uint_16)(((*(sp+4)) << 8) + *(sp+5));
+                     if (r == trans_values->red && g == trans_values->green &&
+                        b == trans_values->blue)
+                     {
+                        /* Background is already in screen gamma */
+                        *sp = (png_byte)((background->red >> 8) & 0xff);
+                        *(sp + 1) = (png_byte)(background->red & 0xff);
+                        *(sp + 2) = (png_byte)((background->green >> 8) & 0xff);
+                        *(sp + 3) = (png_byte)(background->green & 0xff);
+                        *(sp + 4) = (png_byte)((background->blue >> 8) & 0xff);
+                        *(sp + 5) = (png_byte)(background->blue & 0xff);
+                     }
+                     else
+                     {
+                        png_uint_16 v = gamma_16[*(sp + 1) >> gamma_shift][*sp];
+                        *sp = (png_byte)((v >> 8) & 0xff);
+                        *(sp + 1) = (png_byte)(v & 0xff);
+                        v = gamma_16[*(sp + 3) >> gamma_shift][*(sp + 2)];
+                        *(sp + 2) = (png_byte)((v >> 8) & 0xff);
+                        *(sp + 3) = (png_byte)(v & 0xff);
+                        v = gamma_16[*(sp + 5) >> gamma_shift][*(sp + 4)];
+                        *(sp + 4) = (png_byte)((v >> 8) & 0xff);
+                        *(sp + 5) = (png_byte)(v & 0xff);
+                     }
+                  }
+               }
+               else
+#endif
+               {
+                  sp = row;
+                  for (i = 0; i < row_width; i++, sp += 6)
+                  {
+                     png_uint_16 r = (png_uint_16)(((*sp) << 8) + *(sp+1));
+                     png_uint_16 g = (png_uint_16)(((*(sp+2)) << 8) + *(sp+3));
+                     png_uint_16 b = (png_uint_16)(((*(sp+4)) << 8) + *(sp+5));
+
+                     if (r == trans_values->red && g == trans_values->green &&
+                        b == trans_values->blue)
+                     {
+                        *sp = (png_byte)((background->red >> 8) & 0xff);
+                        *(sp + 1) = (png_byte)(background->red & 0xff);
+                        *(sp + 2) = (png_byte)((background->green >> 8) & 0xff);
+                        *(sp + 3) = (png_byte)(background->green & 0xff);
+                        *(sp + 4) = (png_byte)((background->blue >> 8) & 0xff);
+                        *(sp + 5) = (png_byte)(background->blue & 0xff);
+                     }
+                  }
+               }
+            }
+            break;
+         }
+
+         case PNG_COLOR_TYPE_GRAY_ALPHA:
+         {
+            if (row_info->bit_depth == 8)
+            {
+#ifdef PNG_READ_GAMMA_SUPPORTED
+               if (gamma_to_1 != NULL && gamma_from_1 != NULL &&
+                   gamma_table != NULL)
+               {
+                  sp = row;
+                  dp = row;
+                  for (i = 0; i < row_width; i++, sp += 2, dp++)
+                  {
+                     png_uint_16 a = *(sp + 1);
+
+                     if (a == 0xff)
+                     {
+                        *dp = gamma_table[*sp];
+                     }
+                     else if (a == 0)
+                     {
+                        /* Background is already in screen gamma */
+                        *dp = (png_byte)background->gray;
+                     }
+                     else
+                     {
+                        png_byte v, w;
+
+                        v = gamma_to_1[*sp];
+                        png_composite(w, v, a, background_1->gray);
+                        *dp = gamma_from_1[w];
+                     }
+                  }
+               }
+               else
+#endif
+               {
+                  sp = row;
+                  dp = row;
+                  for (i = 0; i < row_width; i++, sp += 2, dp++)
+                  {
+                     png_byte a = *(sp + 1);
+
+                     if (a == 0xff)
+                     {
+                        *dp = *sp;
+                     }
+#ifdef PNG_READ_GAMMA_SUPPORTED
+                     else if (a == 0)
+                     {
+                        *dp = (png_byte)background->gray;
+                     }
+                     else
+                     {
+                        png_composite(*dp, *sp, a, background_1->gray);
+                     }
+#else
+                     *dp = (png_byte)background->gray;
+#endif
+                  }
+               }
+            }
+            else /* if (png_ptr->bit_depth == 16) */
+            {
+#ifdef PNG_READ_GAMMA_SUPPORTED
+               if (gamma_16 != NULL && gamma_16_from_1 != NULL &&
+                   gamma_16_to_1 != NULL)
+               {
+                  sp = row;
+                  dp = row;
+                  for (i = 0; i < row_width; i++, sp += 4, dp += 2)
+                  {
+                     png_uint_16 a = (png_uint_16)(((*(sp+2)) << 8) + *(sp+3));
+
+                     if (a == (png_uint_16)0xffff)
+                     {
+                        png_uint_16 v;
+
+                        v = gamma_16[*(sp + 1) >> gamma_shift][*sp];
+                        *dp = (png_byte)((v >> 8) & 0xff);
+                        *(dp + 1) = (png_byte)(v & 0xff);
+                     }
+#ifdef PNG_READ_GAMMA_SUPPORTED
+                     else if (a == 0)
+#else
+                     else
+#endif
+                     {
+                        /* Background is already in screen gamma */
+                        *dp = (png_byte)((background->gray >> 8) & 0xff);
+                        *(dp + 1) = (png_byte)(background->gray & 0xff);
+                     }
+#ifdef PNG_READ_GAMMA_SUPPORTED
+                     else
+                     {
+                        png_uint_16 g, v, w;
+
+                        g = gamma_16_to_1[*(sp + 1) >> gamma_shift][*sp];
+                        png_composite_16(v, g, a, background_1->gray);
+                        w = gamma_16_from_1[(v&0xff) >> gamma_shift][v >> 8];
+                        *dp = (png_byte)((w >> 8) & 0xff);
+                        *(dp + 1) = (png_byte)(w & 0xff);
+                     }
+#endif
+                  }
+               }
+               else
+#endif
+               {
+                  sp = row;
+                  dp = row;
+                  for (i = 0; i < row_width; i++, sp += 4, dp += 2)
+                  {
+                     png_uint_16 a = (png_uint_16)(((*(sp+2)) << 8) + *(sp+3));
+                     if (a == (png_uint_16)0xffff)
+                     {
+                        png_memcpy(dp, sp, 2);
+                     }
+#ifdef PNG_READ_GAMMA_SUPPORTED
+                     else if (a == 0)
+#else
+                     else
+#endif
+                     {
+                        *dp = (png_byte)((background->gray >> 8) & 0xff);
+                        *(dp + 1) = (png_byte)(background->gray & 0xff);
+                     }
+#ifdef PNG_READ_GAMMA_SUPPORTED
+                     else
+                     {
+                        png_uint_16 g, v;
+
+                        g = (png_uint_16)(((*sp) << 8) + *(sp + 1));
+                        png_composite_16(v, g, a, background_1->gray);
+                        *dp = (png_byte)((v >> 8) & 0xff);
+                        *(dp + 1) = (png_byte)(v & 0xff);
+                     }
+#endif
+                  }
+               }
+            }
+            break;
+         }
+
+         case PNG_COLOR_TYPE_RGB_ALPHA:
+         {
+            if (row_info->bit_depth == 8)
+            {
+#ifdef PNG_READ_GAMMA_SUPPORTED
+               if (gamma_to_1 != NULL && gamma_from_1 != NULL &&
+                   gamma_table != NULL)
+               {
+                  sp = row;
+                  dp = row;
+                  for (i = 0; i < row_width; i++, sp += 4, dp += 3)
+                  {
+                     png_byte a = *(sp + 3);
+
+                     if (a == 0xff)
+                     {
+                        *dp = gamma_table[*sp];
+                        *(dp + 1) = gamma_table[*(sp + 1)];
+                        *(dp + 2) = gamma_table[*(sp + 2)];
+                     }
+                     else if (a == 0)
+                     {
+                        /* Background is already in screen gamma */
+                        *dp = (png_byte)background->red;
+                        *(dp + 1) = (png_byte)background->green;
+                        *(dp + 2) = (png_byte)background->blue;
+                     }
+                     else
+                     {
+                        png_byte v, w;
+
+                        v = gamma_to_1[*sp];
+                        png_composite(w, v, a, background_1->red);
+                        *dp = gamma_from_1[w];
+                        v = gamma_to_1[*(sp + 1)];
+                        png_composite(w, v, a, background_1->green);
+                        *(dp + 1) = gamma_from_1[w];
+                        v = gamma_to_1[*(sp + 2)];
+                        png_composite(w, v, a, background_1->blue);
+                        *(dp + 2) = gamma_from_1[w];
+                     }
+                  }
+               }
+               else
+#endif
+               {
+                  sp = row;
+                  dp = row;
+                  for (i = 0; i < row_width; i++, sp += 4, dp += 3)
+                  {
+                     png_byte a = *(sp + 3);
+
+                     if (a == 0xff)
+                     {
+                        *dp = *sp;
+                        *(dp + 1) = *(sp + 1);
+                        *(dp + 2) = *(sp + 2);
+                     }
+                     else if (a == 0)
+                     {
+                        *dp = (png_byte)background->red;
+                        *(dp + 1) = (png_byte)background->green;
+                        *(dp + 2) = (png_byte)background->blue;
+                     }
+                     else
+                     {
+                        png_composite(*dp, *sp, a, background->red);
+                        png_composite(*(dp + 1), *(sp + 1), a,
+                           background->green);
+                        png_composite(*(dp + 2), *(sp + 2), a,
+                           background->blue);
+                     }
+                  }
+               }
+            }
+            else /* if (row_info->bit_depth == 16) */
+            {
+#ifdef PNG_READ_GAMMA_SUPPORTED
+               if (gamma_16 != NULL && gamma_16_from_1 != NULL &&
+                   gamma_16_to_1 != NULL)
+               {
+                  sp = row;
+                  dp = row;
+                  for (i = 0; i < row_width; i++, sp += 8, dp += 6)
+                  {
+                     png_uint_16 a = (png_uint_16)(((png_uint_16)(*(sp + 6))
+                         << 8) + (png_uint_16)(*(sp + 7)));
+                     if (a == (png_uint_16)0xffff)
+                     {
+                        png_uint_16 v;
+
+                        v = gamma_16[*(sp + 1) >> gamma_shift][*sp];
+                        *dp = (png_byte)((v >> 8) & 0xff);
+                        *(dp + 1) = (png_byte)(v & 0xff);
+                        v = gamma_16[*(sp + 3) >> gamma_shift][*(sp + 2)];
+                        *(dp + 2) = (png_byte)((v >> 8) & 0xff);
+                        *(dp + 3) = (png_byte)(v & 0xff);
+                        v = gamma_16[*(sp + 5) >> gamma_shift][*(sp + 4)];
+                        *(dp + 4) = (png_byte)((v >> 8) & 0xff);
+                        *(dp + 5) = (png_byte)(v & 0xff);
+                     }
+                     else if (a == 0)
+                     {
+                        /* Background is already in screen gamma */
+                        *dp = (png_byte)((background->red >> 8) & 0xff);
+                        *(dp + 1) = (png_byte)(background->red & 0xff);
+                        *(dp + 2) = (png_byte)((background->green >> 8) & 0xff);
+                        *(dp + 3) = (png_byte)(background->green & 0xff);
+                        *(dp + 4) = (png_byte)((background->blue >> 8) & 0xff);
+                        *(dp + 5) = (png_byte)(background->blue & 0xff);
+                     }
+                     else
+                     {
+                        png_uint_16 v, w, x;
+
+                        v = gamma_16_to_1[*(sp + 1) >> gamma_shift][*sp];
+                        png_composite_16(w, v, a, background_1->red);
+                        x = gamma_16_from_1[((w&0xff) >> gamma_shift)][w >> 8];
+                        *dp = (png_byte)((x >> 8) & 0xff);
+                        *(dp + 1) = (png_byte)(x & 0xff);
+                        v = gamma_16_to_1[*(sp + 3) >> gamma_shift][*(sp + 2)];
+                        png_composite_16(w, v, a, background_1->green);
+                        x = gamma_16_from_1[((w&0xff) >> gamma_shift)][w >> 8];
+                        *(dp + 2) = (png_byte)((x >> 8) & 0xff);
+                        *(dp + 3) = (png_byte)(x & 0xff);
+                        v = gamma_16_to_1[*(sp + 5) >> gamma_shift][*(sp + 4)];
+                        png_composite_16(w, v, a, background_1->blue);
+                        x = gamma_16_from_1[(w & 0xff) >> gamma_shift][w >> 8];
+                        *(dp + 4) = (png_byte)((x >> 8) & 0xff);
+                        *(dp + 5) = (png_byte)(x & 0xff);
+                     }
+                  }
+               }
+               else
+#endif
+               {
+                  sp = row;
+                  dp = row;
+                  for (i = 0; i < row_width; i++, sp += 8, dp += 6)
+                  {
+                     png_uint_16 a = (png_uint_16)(((png_uint_16)(*(sp + 6))
+                        << 8) + (png_uint_16)(*(sp + 7)));
+                     if (a == (png_uint_16)0xffff)
+                     {
+                        png_memcpy(dp, sp, 6);
+                     }
+                     else if (a == 0)
+                     {
+                        *dp = (png_byte)((background->red >> 8) & 0xff);
+                        *(dp + 1) = (png_byte)(background->red & 0xff);
+                        *(dp + 2) = (png_byte)((background->green >> 8) & 0xff);
+                        *(dp + 3) = (png_byte)(background->green & 0xff);
+                        *(dp + 4) = (png_byte)((background->blue >> 8) & 0xff);
+                        *(dp + 5) = (png_byte)(background->blue & 0xff);
+                     }
+                     else
+                     {
+                        png_uint_16 v;
+
+                        png_uint_16 r = (png_uint_16)(((*sp) << 8) + *(sp + 1));
+                        png_uint_16 g = (png_uint_16)(((*(sp + 2)) << 8)
+                            + *(sp + 3));
+                        png_uint_16 b = (png_uint_16)(((*(sp + 4)) << 8)
+                            + *(sp + 5));
+
+                        png_composite_16(v, r, a, background->red);
+                        *dp = (png_byte)((v >> 8) & 0xff);
+                        *(dp + 1) = (png_byte)(v & 0xff);
+                        png_composite_16(v, g, a, background->green);
+                        *(dp + 2) = (png_byte)((v >> 8) & 0xff);
+                        *(dp + 3) = (png_byte)(v & 0xff);
+                        png_composite_16(v, b, a, background->blue);
+                        *(dp + 4) = (png_byte)((v >> 8) & 0xff);
+                        *(dp + 5) = (png_byte)(v & 0xff);
+                     }
+                  }
+               }
+            }
+            break;
+         }
+      }
+
+      if (row_info->color_type & PNG_COLOR_MASK_ALPHA)
+      {
+         row_info->color_type &= ~PNG_COLOR_MASK_ALPHA;
+         row_info->channels--;
+         row_info->pixel_depth = (png_byte)(row_info->channels *
+            row_info->bit_depth);
+         row_info->rowbytes = PNG_ROWBYTES(row_info->pixel_depth, row_width);
+      }
+   }
+}
+#endif
+
+#ifdef PNG_READ_GAMMA_SUPPORTED
+/* Gamma correct the image, avoiding the alpha channel.  Make sure
+ * you do this after you deal with the transparency issue on grayscale
+ * or RGB images. If your bit depth is 8, use gamma_table, if it
+ * is 16, use gamma_16_table and gamma_shift.  Build these with
+ * build_gamma_table().
+ */
+void /* PRIVATE */
+png_do_gamma(png_row_infop row_info, png_bytep row,
+   png_bytep gamma_table, png_uint_16pp gamma_16_table,
+   int gamma_shift)
+{
+   png_bytep sp;
+   png_uint_32 i;
+   png_uint_32 row_width=row_info->width;
+
+   png_debug(1, "in png_do_gamma");
+
+   if (
+#ifdef PNG_USELESS_TESTS_SUPPORTED
+       row != NULL && row_info != NULL &&
+#endif
+       ((row_info->bit_depth <= 8 && gamma_table != NULL) ||
+        (row_info->bit_depth == 16 && gamma_16_table != NULL)))
+   {
+      switch (row_info->color_type)
+      {
+         case PNG_COLOR_TYPE_RGB:
+         {
+            if (row_info->bit_depth == 8)
+            {
+               sp = row;
+               for (i = 0; i < row_width; i++)
+               {
+                  *sp = gamma_table[*sp];
+                  sp++;
+                  *sp = gamma_table[*sp];
+                  sp++;
+                  *sp = gamma_table[*sp];
+                  sp++;
+               }
+            }
+            else /* if (row_info->bit_depth == 16) */
+            {
+               sp = row;
+               for (i = 0; i < row_width; i++)
+               {
+                  png_uint_16 v;
+
+                  v = gamma_16_table[*(sp + 1) >> gamma_shift][*sp];
+                  *sp = (png_byte)((v >> 8) & 0xff);
+                  *(sp + 1) = (png_byte)(v & 0xff);
+                  sp += 2;
+                  v = gamma_16_table[*(sp + 1) >> gamma_shift][*sp];
+                  *sp = (png_byte)((v >> 8) & 0xff);
+                  *(sp + 1) = (png_byte)(v & 0xff);
+                  sp += 2;
+                  v = gamma_16_table[*(sp + 1) >> gamma_shift][*sp];
+                  *sp = (png_byte)((v >> 8) & 0xff);
+                  *(sp + 1) = (png_byte)(v & 0xff);
+                  sp += 2;
+               }
+            }
+            break;
+         }
+
+         case PNG_COLOR_TYPE_RGB_ALPHA:
+         {
+            if (row_info->bit_depth == 8)
+            {
+               sp = row;
+               for (i = 0; i < row_width; i++)
+               {
+                  *sp = gamma_table[*sp];
+                  sp++;
+                  *sp = gamma_table[*sp];
+                  sp++;
+                  *sp = gamma_table[*sp];
+                  sp++;
+                  sp++;
+               }
+            }
+            else /* if (row_info->bit_depth == 16) */
+            {
+               sp = row;
+               for (i = 0; i < row_width; i++)
+               {
+                  png_uint_16 v = gamma_16_table[*(sp + 1) >> gamma_shift][*sp];
+                  *sp = (png_byte)((v >> 8) & 0xff);
+                  *(sp + 1) = (png_byte)(v & 0xff);
+                  sp += 2;
+                  v = gamma_16_table[*(sp + 1) >> gamma_shift][*sp];
+                  *sp = (png_byte)((v >> 8) & 0xff);
+                  *(sp + 1) = (png_byte)(v & 0xff);
+                  sp += 2;
+                  v = gamma_16_table[*(sp + 1) >> gamma_shift][*sp];
+                  *sp = (png_byte)((v >> 8) & 0xff);
+                  *(sp + 1) = (png_byte)(v & 0xff);
+                  sp += 4;
+               }
+            }
+            break;
+         }
+
+         case PNG_COLOR_TYPE_GRAY_ALPHA:
+         {
+            if (row_info->bit_depth == 8)
+            {
+               sp = row;
+               for (i = 0; i < row_width; i++)
+               {
+                  *sp = gamma_table[*sp];
+                  sp += 2;
+               }
+            }
+            else /* if (row_info->bit_depth == 16) */
+            {
+               sp = row;
+               for (i = 0; i < row_width; i++)
+               {
+                  png_uint_16 v = gamma_16_table[*(sp + 1) >> gamma_shift][*sp];
+                  *sp = (png_byte)((v >> 8) & 0xff);
+                  *(sp + 1) = (png_byte)(v & 0xff);
+                  sp += 4;
+               }
+            }
+            break;
+         }
+
+         case PNG_COLOR_TYPE_GRAY:
+         {
+            if (row_info->bit_depth == 2)
+            {
+               sp = row;
+               for (i = 0; i < row_width; i += 4)
+               {
+                  int a = *sp & 0xc0;
+                  int b = *sp & 0x30;
+                  int c = *sp & 0x0c;
+                  int d = *sp & 0x03;
+
+                  *sp = (png_byte)(
+                      ((((int)gamma_table[a|(a>>2)|(a>>4)|(a>>6)])   ) & 0xc0)|
+                      ((((int)gamma_table[(b<<2)|b|(b>>2)|(b>>4)])>>2) & 0x30)|
+                      ((((int)gamma_table[(c<<4)|(c<<2)|c|(c>>2)])>>4) & 0x0c)|
+                      ((((int)gamma_table[(d<<6)|(d<<4)|(d<<2)|d])>>6) ));
+                  sp++;
+               }
+            }
+
+            if (row_info->bit_depth == 4)
+            {
+               sp = row;
+               for (i = 0; i < row_width; i += 2)
+               {
+                  int msb = *sp & 0xf0;
+                  int lsb = *sp & 0x0f;
+
+                  *sp = (png_byte)((((int)gamma_table[msb | (msb >> 4)]) & 0xf0)
+                      | (((int)gamma_table[(lsb << 4) | lsb]) >> 4));
+                  sp++;
+               }
+            }
+
+            else if (row_info->bit_depth == 8)
+            {
+               sp = row;
+               for (i = 0; i < row_width; i++)
+               {
+                  *sp = gamma_table[*sp];
+                  sp++;
+               }
+            }
+
+            else if (row_info->bit_depth == 16)
+            {
+               sp = row;
+               for (i = 0; i < row_width; i++)
+               {
+                  png_uint_16 v = gamma_16_table[*(sp + 1) >> gamma_shift][*sp];
+                  *sp = (png_byte)((v >> 8) & 0xff);
+                  *(sp + 1) = (png_byte)(v & 0xff);
+                  sp += 2;
+               }
+            }
+            break;
+         }
+      }
+   }
+}
+#endif
+
+#ifdef PNG_READ_EXPAND_SUPPORTED
+/* Expands a palette row to an RGB or RGBA row depending
+ * upon whether you supply trans and num_trans.
+ */
+void /* PRIVATE */
+png_do_expand_palette(png_row_infop row_info, png_bytep row,
+   png_colorp palette, png_bytep trans, int num_trans)
+{
+   int shift, value;
+   png_bytep sp, dp;
+   png_uint_32 i;
+   png_uint_32 row_width=row_info->width;
+
+   png_debug(1, "in png_do_expand_palette");
+
+   if (
+#ifdef PNG_USELESS_TESTS_SUPPORTED
+       row != NULL && row_info != NULL &&
+#endif
+       row_info->color_type == PNG_COLOR_TYPE_PALETTE)
+   {
+      if (row_info->bit_depth < 8)
+      {
+         switch (row_info->bit_depth)
+         {
+            case 1:
+            {
+               sp = row + (png_size_t)((row_width - 1) >> 3);
+               dp = row + (png_size_t)row_width - 1;
+               shift = 7 - (int)((row_width + 7) & 0x07);
+               for (i = 0; i < row_width; i++)
+               {
+                  if ((*sp >> shift) & 0x01)
+                     *dp = 1;
+                  else
+                     *dp = 0;
+                  if (shift == 7)
+                  {
+                     shift = 0;
+                     sp--;
+                  }
+                  else
+                     shift++;
+
+                  dp--;
+               }
+               break;
+            }
+
+            case 2:
+            {
+               sp = row + (png_size_t)((row_width - 1) >> 2);
+               dp = row + (png_size_t)row_width - 1;
+               shift = (int)((3 - ((row_width + 3) & 0x03)) << 1);
+               for (i = 0; i < row_width; i++)
+               {
+                  value = (*sp >> shift) & 0x03;
+                  *dp = (png_byte)value;
+                  if (shift == 6)
+                  {
+                     shift = 0;
+                     sp--;
+                  }
+                  else
+                     shift += 2;
+
+                  dp--;
+               }
+               break;
+            }
+
+            case 4:
+            {
+               sp = row + (png_size_t)((row_width - 1) >> 1);
+               dp = row + (png_size_t)row_width - 1;
+               shift = (int)((row_width & 0x01) << 2);
+               for (i = 0; i < row_width; i++)
+               {
+                  value = (*sp >> shift) & 0x0f;
+                  *dp = (png_byte)value;
+                  if (shift == 4)
+                  {
+                     shift = 0;
+                     sp--;
+                  }
+                  else
+                     shift += 4;
+
+                  dp--;
+               }
+               break;
+            }
+         }
+         row_info->bit_depth = 8;
+         row_info->pixel_depth = 8;
+         row_info->rowbytes = row_width;
+      }
+      switch (row_info->bit_depth)
+      {
+         case 8:
+         {
+            if (trans != NULL)
+            {
+               sp = row + (png_size_t)row_width - 1;
+               dp = row + (png_size_t)(row_width << 2) - 1;
+
+               for (i = 0; i < row_width; i++)
+               {
+                  if ((int)(*sp) >= num_trans)
+                     *dp-- = 0xff;
+                  else
+                     *dp-- = trans[*sp];
+                  *dp-- = palette[*sp].blue;
+                  *dp-- = palette[*sp].green;
+                  *dp-- = palette[*sp].red;
+                  sp--;
+               }
+               row_info->bit_depth = 8;
+               row_info->pixel_depth = 32;
+               row_info->rowbytes = row_width * 4;
+               row_info->color_type = 6;
+               row_info->channels = 4;
+            }
+            else
+            {
+               sp = row + (png_size_t)row_width - 1;
+               dp = row + (png_size_t)(row_width * 3) - 1;
+
+               for (i = 0; i < row_width; i++)
+               {
+                  *dp-- = palette[*sp].blue;
+                  *dp-- = palette[*sp].green;
+                  *dp-- = palette[*sp].red;
+                  sp--;
+               }
+
+               row_info->bit_depth = 8;
+               row_info->pixel_depth = 24;
+               row_info->rowbytes = row_width * 3;
+               row_info->color_type = 2;
+               row_info->channels = 3;
+            }
+            break;
+         }
+      }
+   }
+}
+
+/* If the bit depth < 8, it is expanded to 8.  Also, if the already
+ * expanded transparency value is supplied, an alpha channel is built.
+ */
+void /* PRIVATE */
+png_do_expand(png_row_infop row_info, png_bytep row,
+   png_color_16p trans_value)
+{
+   int shift, value;
+   png_bytep sp, dp;
+   png_uint_32 i;
+   png_uint_32 row_width=row_info->width;
+
+   png_debug(1, "in png_do_expand");
+
+#ifdef PNG_USELESS_TESTS_SUPPORTED
+   if (row != NULL && row_info != NULL)
+#endif
+   {
+      if (row_info->color_type == PNG_COLOR_TYPE_GRAY)
+      {
+         png_uint_16 gray = (png_uint_16)(trans_value ? trans_value->gray : 0);
+
+         if (row_info->bit_depth < 8)
+         {
+            switch (row_info->bit_depth)
+            {
+               case 1:
+               {
+                  gray = (png_uint_16)((gray&0x01)*0xff);
+                  sp = row + (png_size_t)((row_width - 1) >> 3);
+                  dp = row + (png_size_t)row_width - 1;
+                  shift = 7 - (int)((row_width + 7) & 0x07);
+                  for (i = 0; i < row_width; i++)
+                  {
+                     if ((*sp >> shift) & 0x01)
+                        *dp = 0xff;
+                     else
+                        *dp = 0;
+                     if (shift == 7)
+                     {
+                        shift = 0;
+                        sp--;
+                     }
+                     else
+                        shift++;
+
+                     dp--;
+                  }
+                  break;
+               }
+
+               case 2:
+               {
+                  gray = (png_uint_16)((gray&0x03)*0x55);
+                  sp = row + (png_size_t)((row_width - 1) >> 2);
+                  dp = row + (png_size_t)row_width - 1;
+                  shift = (int)((3 - ((row_width + 3) & 0x03)) << 1);
+                  for (i = 0; i < row_width; i++)
+                  {
+                     value = (*sp >> shift) & 0x03;
+                     *dp = (png_byte)(value | (value << 2) | (value << 4) |
+                        (value << 6));
+                     if (shift == 6)
+                     {
+                        shift = 0;
+                        sp--;
+                     }
+                     else
+                        shift += 2;
+
+                     dp--;
+                  }
+                  break;
+               }
+
+               case 4:
+               {
+                  gray = (png_uint_16)((gray&0x0f)*0x11);
+                  sp = row + (png_size_t)((row_width - 1) >> 1);
+                  dp = row + (png_size_t)row_width - 1;
+                  shift = (int)((1 - ((row_width + 1) & 0x01)) << 2);
+                  for (i = 0; i < row_width; i++)
+                  {
+                     value = (*sp >> shift) & 0x0f;
+                     *dp = (png_byte)(value | (value << 4));
+                     if (shift == 4)
+                     {
+                        shift = 0;
+                        sp--;
+                     }
+                     else
+                        shift = 4;
+
+                     dp--;
+                  }
+                  break;
+               }
+            }
+
+            row_info->bit_depth = 8;
+            row_info->pixel_depth = 8;
+            row_info->rowbytes = row_width;
+         }
+
+         if (trans_value != NULL)
+         {
+            if (row_info->bit_depth == 8)
+            {
+               gray = gray & 0xff;
+               sp = row + (png_size_t)row_width - 1;
+               dp = row + (png_size_t)(row_width << 1) - 1;
+               for (i = 0; i < row_width; i++)
+               {
+                  if (*sp == gray)
+                     *dp-- = 0;
+                  else
+                     *dp-- = 0xff;
+                  *dp-- = *sp--;
+               }
+            }
+
+            else if (row_info->bit_depth == 16)
+            {
+               png_byte gray_high = (gray >> 8) & 0xff;
+               png_byte gray_low = gray & 0xff;
+               sp = row + row_info->rowbytes - 1;
+               dp = row + (row_info->rowbytes << 1) - 1;
+               for (i = 0; i < row_width; i++)
+               {
+                  if (*(sp - 1) == gray_high && *(sp) == gray_low)
+                  {
+                     *dp-- = 0;
+                     *dp-- = 0;
+                  }
+                  else
+                  {
+                     *dp-- = 0xff;
+                     *dp-- = 0xff;
+                  }
+                  *dp-- = *sp--;
+                  *dp-- = *sp--;
+               }
+            }
+
+            row_info->color_type = PNG_COLOR_TYPE_GRAY_ALPHA;
+            row_info->channels = 2;
+            row_info->pixel_depth = (png_byte)(row_info->bit_depth << 1);
+            row_info->rowbytes = PNG_ROWBYTES(row_info->pixel_depth,
+               row_width);
+         }
+      }
+      else if (row_info->color_type == PNG_COLOR_TYPE_RGB && trans_value)
+      {
+         if (row_info->bit_depth == 8)
+         {
+            png_byte red = trans_value->red & 0xff;
+            png_byte green = trans_value->green & 0xff;
+            png_byte blue = trans_value->blue & 0xff;
+            sp = row + (png_size_t)row_info->rowbytes - 1;
+            dp = row + (png_size_t)(row_width << 2) - 1;
+            for (i = 0; i < row_width; i++)
+            {
+               if (*(sp - 2) == red && *(sp - 1) == green && *(sp) == blue)
+                  *dp-- = 0;
+               else
+                  *dp-- = 0xff;
+               *dp-- = *sp--;
+               *dp-- = *sp--;
+               *dp-- = *sp--;
+            }
+         }
+         else if (row_info->bit_depth == 16)
+         {
+            png_byte red_high = (trans_value->red >> 8) & 0xff;
+            png_byte green_high = (trans_value->green >> 8) & 0xff;
+            png_byte blue_high = (trans_value->blue >> 8) & 0xff;
+            png_byte red_low = trans_value->red & 0xff;
+            png_byte green_low = trans_value->green & 0xff;
+            png_byte blue_low = trans_value->blue & 0xff;
+            sp = row + row_info->rowbytes - 1;
+            dp = row + (png_size_t)(row_width << 3) - 1;
+            for (i = 0; i < row_width; i++)
+            {
+               if (*(sp - 5) == red_high &&
+                  *(sp - 4) == red_low &&
+                  *(sp - 3) == green_high &&
+                  *(sp - 2) == green_low &&
+                  *(sp - 1) == blue_high &&
+                  *(sp    ) == blue_low)
+               {
+                  *dp-- = 0;
+                  *dp-- = 0;
+               }
+               else
+               {
+                  *dp-- = 0xff;
+                  *dp-- = 0xff;
+               }
+               *dp-- = *sp--;
+               *dp-- = *sp--;
+               *dp-- = *sp--;
+               *dp-- = *sp--;
+               *dp-- = *sp--;
+               *dp-- = *sp--;
+            }
+         }
+         row_info->color_type = PNG_COLOR_TYPE_RGB_ALPHA;
+         row_info->channels = 4;
+         row_info->pixel_depth = (png_byte)(row_info->bit_depth << 2);
+         row_info->rowbytes = PNG_ROWBYTES(row_info->pixel_depth, row_width);
+      }
+   }
+}
+#endif
+
+#ifdef PNG_READ_DITHER_SUPPORTED
+void /* PRIVATE */
+png_do_dither(png_row_infop row_info, png_bytep row,
+    png_bytep palette_lookup, png_bytep dither_lookup)
+{
+   png_bytep sp, dp;
+   png_uint_32 i;
+   png_uint_32 row_width=row_info->width;
+
+   png_debug(1, "in png_do_dither");
+
+#ifdef PNG_USELESS_TESTS_SUPPORTED
+   if (row != NULL && row_info != NULL)
+#endif
+   {
+      if (row_info->color_type == PNG_COLOR_TYPE_RGB &&
+         palette_lookup && row_info->bit_depth == 8)
+      {
+         int r, g, b, p;
+         sp = row;
+         dp = row;
+         for (i = 0; i < row_width; i++)
+         {
+            r = *sp++;
+            g = *sp++;
+            b = *sp++;
+
+            /* This looks real messy, but the compiler will reduce
+             * it down to a reasonable formula.  For example, with
+             * 5 bits per color, we get:
+             * p = (((r >> 3) & 0x1f) << 10) |
+             *    (((g >> 3) & 0x1f) << 5) |
+             *    ((b >> 3) & 0x1f);
+             */
+            p = (((r >> (8 - PNG_DITHER_RED_BITS)) &
+               ((1 << PNG_DITHER_RED_BITS) - 1)) <<
+               (PNG_DITHER_GREEN_BITS + PNG_DITHER_BLUE_BITS)) |
+               (((g >> (8 - PNG_DITHER_GREEN_BITS)) &
+               ((1 << PNG_DITHER_GREEN_BITS) - 1)) <<
+               (PNG_DITHER_BLUE_BITS)) |
+               ((b >> (8 - PNG_DITHER_BLUE_BITS)) &
+               ((1 << PNG_DITHER_BLUE_BITS) - 1));
+
+            *dp++ = palette_lookup[p];
+         }
+         row_info->color_type = PNG_COLOR_TYPE_PALETTE;
+         row_info->channels = 1;
+         row_info->pixel_depth = row_info->bit_depth;
+         row_info->rowbytes = PNG_ROWBYTES(row_info->pixel_depth, row_width);
+      }
+      else if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA &&
+         palette_lookup != NULL && row_info->bit_depth == 8)
+      {
+         int r, g, b, p;
+         sp = row;
+         dp = row;
+         for (i = 0; i < row_width; i++)
+         {
+            r = *sp++;
+            g = *sp++;
+            b = *sp++;
+            sp++;
+
+            p = (((r >> (8 - PNG_DITHER_RED_BITS)) &
+               ((1 << PNG_DITHER_RED_BITS) - 1)) <<
+               (PNG_DITHER_GREEN_BITS + PNG_DITHER_BLUE_BITS)) |
+               (((g >> (8 - PNG_DITHER_GREEN_BITS)) &
+               ((1 << PNG_DITHER_GREEN_BITS) - 1)) <<
+               (PNG_DITHER_BLUE_BITS)) |
+               ((b >> (8 - PNG_DITHER_BLUE_BITS)) &
+               ((1 << PNG_DITHER_BLUE_BITS) - 1));
+
+            *dp++ = palette_lookup[p];
+         }
+         row_info->color_type = PNG_COLOR_TYPE_PALETTE;
+         row_info->channels = 1;
+         row_info->pixel_depth = row_info->bit_depth;
+         row_info->rowbytes = PNG_ROWBYTES(row_info->pixel_depth, row_width);
+      }
+      else if (row_info->color_type == PNG_COLOR_TYPE_PALETTE &&
+         dither_lookup && row_info->bit_depth == 8)
+      {
+         sp = row;
+         for (i = 0; i < row_width; i++, sp++)
+         {
+            *sp = dither_lookup[*sp];
+         }
+      }
+   }
+}
+#endif
+
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+#ifdef PNG_READ_GAMMA_SUPPORTED
+static PNG_CONST int png_gamma_shift[] =
+   {0x10, 0x21, 0x42, 0x84, 0x110, 0x248, 0x550, 0xff0, 0x00};
+
+/* We build the 8- or 16-bit gamma tables here.  Note that for 16-bit
+ * tables, we don't make a full table if we are reducing to 8-bit in
+ * the future.  Note also how the gamma_16 tables are segmented so that
+ * we don't need to allocate > 64K chunks for a full 16-bit table.
+ *
+ * See the PNG extensions document for an integer algorithm for creating
+ * the gamma tables.  Maybe we will implement that here someday.
+ *
+ * We should only reach this point if
+ *
+ *      the file_gamma is known (i.e., the gAMA or sRGB chunk is present,
+ *      or the application has provided a file_gamma)
+ *
+ *   AND
+ *      {
+ *         the screen_gamma is known
+ *      OR
+ *
+ *         RGB_to_gray transformation is being performed
+ *      }
+ *
+ *   AND
+ *      {
+ *         the screen_gamma is different from the reciprocal of the
+ *         file_gamma by more than the specified threshold
+ *
+ *      OR
+ *
+ *         a background color has been specified and the file_gamma
+ *         and screen_gamma are not 1.0, within the specified threshold.
+ *      }
+ */
+
+void /* PRIVATE */
+png_build_gamma_table(png_structp png_ptr)
+{
+  png_debug(1, "in png_build_gamma_table");
+
+  if (png_ptr->bit_depth <= 8)
+  {
+     int i;
+     double g;
+
+     if (png_ptr->screen_gamma > .000001)
+        g = 1.0 / (png_ptr->gamma * png_ptr->screen_gamma);
+
+     else
+        g = 1.0;
+
+     png_ptr->gamma_table = (png_bytep)png_malloc(png_ptr,
+        (png_uint_32)256);
+
+     for (i = 0; i < 256; i++)
+     {
+        png_ptr->gamma_table[i] = (png_byte)(pow((double)i / 255.0,
+           g) * 255.0 + .5);
+     }
+
+#if defined(PNG_READ_BACKGROUND_SUPPORTED) || \
+   defined(PNG_READ_RGB_TO_GRAY_SUPPORTED)
+     if (png_ptr->transformations & ((PNG_BACKGROUND) | PNG_RGB_TO_GRAY))
+     {
+
+        g = 1.0 / (png_ptr->gamma);
+
+        png_ptr->gamma_to_1 = (png_bytep)png_malloc(png_ptr,
+           (png_uint_32)256);
+
+        for (i = 0; i < 256; i++)
+        {
+           png_ptr->gamma_to_1[i] = (png_byte)(pow((double)i / 255.0,
+              g) * 255.0 + .5);
+        }
+
+
+        png_ptr->gamma_from_1 = (png_bytep)png_malloc(png_ptr,
+           (png_uint_32)256);
+
+        if (png_ptr->screen_gamma > 0.000001)
+           g = 1.0 / png_ptr->screen_gamma;
+
+        else
+           g = png_ptr->gamma;   /* Probably doing rgb_to_gray */
+
+        for (i = 0; i < 256; i++)
+        {
+           png_ptr->gamma_from_1[i] = (png_byte)(pow((double)i / 255.0,
+              g) * 255.0 + .5);
+
+        }
+     }
+#endif /* PNG_READ_BACKGROUND_SUPPORTED || PNG_RGB_TO_GRAY_SUPPORTED */
+  }
+  else
+  {
+     double g;
+     int i, j, shift, num;
+     int sig_bit;
+     png_uint_32 ig;
+
+     if (png_ptr->color_type & PNG_COLOR_MASK_COLOR)
+     {
+        sig_bit = (int)png_ptr->sig_bit.red;
+
+        if ((int)png_ptr->sig_bit.green > sig_bit)
+           sig_bit = png_ptr->sig_bit.green;
+
+        if ((int)png_ptr->sig_bit.blue > sig_bit)
+           sig_bit = png_ptr->sig_bit.blue;
+     }
+     else
+     {
+        sig_bit = (int)png_ptr->sig_bit.gray;
+     }
+
+     if (sig_bit > 0)
+        shift = 16 - sig_bit;
+
+     else
+        shift = 0;
+
+     if (png_ptr->transformations & PNG_16_TO_8)
+     {
+        if (shift < (16 - PNG_MAX_GAMMA_8))
+           shift = (16 - PNG_MAX_GAMMA_8);
+     }
+
+     if (shift > 8)
+        shift = 8;
+
+     if (shift < 0)
+        shift = 0;
+
+     png_ptr->gamma_shift = (png_byte)shift;
+
+     num = (1 << (8 - shift));
+
+     if (png_ptr->screen_gamma > .000001)
+        g = 1.0 / (png_ptr->gamma * png_ptr->screen_gamma);
+     else
+        g = 1.0;
+
+     png_ptr->gamma_16_table = (png_uint_16pp)png_calloc(png_ptr,
+        (png_uint_32)(num * png_sizeof(png_uint_16p)));
+
+     if (png_ptr->transformations & (PNG_16_TO_8 | PNG_BACKGROUND))
+     {
+        double fin, fout;
+        png_uint_32 last, max;
+
+        for (i = 0; i < num; i++)
+        {
+           png_ptr->gamma_16_table[i] = (png_uint_16p)png_malloc(png_ptr,
+              (png_uint_32)(256 * png_sizeof(png_uint_16)));
+        }
+
+        g = 1.0 / g;
+        last = 0;
+        for (i = 0; i < 256; i++)
+        {
+           fout = ((double)i + 0.5) / 256.0;
+           fin = pow(fout, g);
+           max = (png_uint_32)(fin * (double)((png_uint_32)num << 8));
+           while (last <= max)
+           {
+              png_ptr->gamma_16_table[(int)(last & (0xff >> shift))]
+                 [(int)(last >> (8 - shift))] = (png_uint_16)(
+                 (png_uint_16)i | ((png_uint_16)i << 8));
+              last++;
+           }
+        }
+        while (last < ((png_uint_32)num << 8))
+        {
+           png_ptr->gamma_16_table[(int)(last & (0xff >> shift))]
+              [(int)(last >> (8 - shift))] = (png_uint_16)65535L;
+           last++;
+        }
+     }
+     else
+     {
+        for (i = 0; i < num; i++)
+        {
+           png_ptr->gamma_16_table[i] = (png_uint_16p)png_malloc(png_ptr,
+              (png_uint_32)(256 * png_sizeof(png_uint_16)));
+
+           ig = (((png_uint_32)i * (png_uint_32)png_gamma_shift[shift]) >> 4);
+
+           for (j = 0; j < 256; j++)
+           {
+              png_ptr->gamma_16_table[i][j] =
+                 (png_uint_16)(pow((double)(ig + ((png_uint_32)j << 8)) /
+                    65535.0, g) * 65535.0 + .5);
+           }
+        }
+     }
+
+#if defined(PNG_READ_BACKGROUND_SUPPORTED) || \
+   defined(PNG_READ_RGB_TO_GRAY_SUPPORTED)
+     if (png_ptr->transformations & (PNG_BACKGROUND | PNG_RGB_TO_GRAY))
+     {
+
+        g = 1.0 / (png_ptr->gamma);
+
+        png_ptr->gamma_16_to_1 = (png_uint_16pp)png_calloc(png_ptr,
+           (png_uint_32)(num * png_sizeof(png_uint_16p )));
+
+        for (i = 0; i < num; i++)
+        {
+           png_ptr->gamma_16_to_1[i] = (png_uint_16p)png_malloc(png_ptr,
+              (png_uint_32)(256 * png_sizeof(png_uint_16)));
+
+           ig = (((png_uint_32)i *
+              (png_uint_32)png_gamma_shift[shift]) >> 4);
+           for (j = 0; j < 256; j++)
+           {
+              png_ptr->gamma_16_to_1[i][j] =
+                 (png_uint_16)(pow((double)(ig + ((png_uint_32)j << 8)) /
+                    65535.0, g) * 65535.0 + .5);
+           }
+        }
+
+        if (png_ptr->screen_gamma > 0.000001)
+           g = 1.0 / png_ptr->screen_gamma;
+
+        else
+           g = png_ptr->gamma;   /* Probably doing rgb_to_gray */
+
+        png_ptr->gamma_16_from_1 = (png_uint_16pp)png_calloc(png_ptr,
+           (png_uint_32)(num * png_sizeof(png_uint_16p)));
+
+        for (i = 0; i < num; i++)
+        {
+           png_ptr->gamma_16_from_1[i] = (png_uint_16p)png_malloc(png_ptr,
+              (png_uint_32)(256 * png_sizeof(png_uint_16)));
+
+           ig = (((png_uint_32)i *
+              (png_uint_32)png_gamma_shift[shift]) >> 4);
+
+           for (j = 0; j < 256; j++)
+           {
+              png_ptr->gamma_16_from_1[i][j] =
+                 (png_uint_16)(pow((double)(ig + ((png_uint_32)j << 8)) /
+                    65535.0, g) * 65535.0 + .5);
+           }
+        }
+     }
+#endif /* PNG_READ_BACKGROUND_SUPPORTED || PNG_RGB_TO_GRAY_SUPPORTED */
+  }
+}
+#endif
+/* To do: install integer version of png_build_gamma_table here */
+#endif
+
+#ifdef PNG_MNG_FEATURES_SUPPORTED
+/* Undoes intrapixel differencing  */
+void /* PRIVATE */
+png_do_read_intrapixel(png_row_infop row_info, png_bytep row)
+{
+   png_debug(1, "in png_do_read_intrapixel");
+
+   if (
+#ifdef PNG_USELESS_TESTS_SUPPORTED
+       row != NULL && row_info != NULL &&
+#endif
+       (row_info->color_type & PNG_COLOR_MASK_COLOR))
+   {
+      int bytes_per_pixel;
+      png_uint_32 row_width = row_info->width;
+      if (row_info->bit_depth == 8)
+      {
+         png_bytep rp;
+         png_uint_32 i;
+
+         if (row_info->color_type == PNG_COLOR_TYPE_RGB)
+            bytes_per_pixel = 3;
+
+         else if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
+            bytes_per_pixel = 4;
+
+         else
+            return;
+
+         for (i = 0, rp = row; i < row_width; i++, rp += bytes_per_pixel)
+         {
+            *(rp) = (png_byte)((256 + *rp + *(rp+1))&0xff);
+            *(rp+2) = (png_byte)((256 + *(rp+2) + *(rp+1))&0xff);
+         }
+      }
+      else if (row_info->bit_depth == 16)
+      {
+         png_bytep rp;
+         png_uint_32 i;
+
+         if (row_info->color_type == PNG_COLOR_TYPE_RGB)
+            bytes_per_pixel = 6;
+
+         else if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
+            bytes_per_pixel = 8;
+
+         else
+            return;
+
+         for (i = 0, rp = row; i < row_width; i++, rp += bytes_per_pixel)
+         {
+            png_uint_32 s0   = (*(rp    ) << 8) | *(rp + 1);
+            png_uint_32 s1   = (*(rp + 2) << 8) | *(rp + 3);
+            png_uint_32 s2   = (*(rp + 4) << 8) | *(rp + 5);
+            png_uint_32 red  = (png_uint_32)((s0 + s1 + 65536L) & 0xffffL);
+            png_uint_32 blue = (png_uint_32)((s2 + s1 + 65536L) & 0xffffL);
+            *(rp  ) = (png_byte)((red >> 8) & 0xff);
+            *(rp+1) = (png_byte)(red & 0xff);
+            *(rp+4) = (png_byte)((blue >> 8) & 0xff);
+            *(rp+5) = (png_byte)(blue & 0xff);
+         }
+      }
+   }
+}
+#endif /* PNG_MNG_FEATURES_SUPPORTED */
+#endif /* PNG_READ_SUPPORTED */
diff --git a/Externals/libpng/pngrutil.c b/Externals/libpng/pngrutil.c
index 4c3cd53813..77a01e5660 100644
--- a/Externals/libpng/pngrutil.c
+++ b/Externals/libpng/pngrutil.c
@@ -1,3616 +1,3386 @@
-
-/* pngrutil.c - utilities to read a PNG file
- *
- * Last changed in libpng 1.5.1 [February 3, 2011]
- * Copyright (c) 1998-2011 Glenn Randers-Pehrson
- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
- *
- * This code is released under the libpng license.
- * For conditions of distribution and use, see the disclaimer
- * and license in png.h
- *
- * This file contains routines that are only called from within
- * libpng itself during the course of reading an image.
- */
-
-#include "pngpriv.h"
-
-#ifdef PNG_READ_SUPPORTED
-
-#define png_strtod(p,a,b) strtod(a,b)
-
-png_uint_32 PNGAPI
-png_get_uint_31(png_structp png_ptr, png_const_bytep buf)
-{
-   png_uint_32 uval = png_get_uint_32(buf);
-
-   if (uval > PNG_UINT_31_MAX)
-      png_error(png_ptr, "PNG unsigned integer out of range");
-
-   return (uval);
-}
-
-#if defined(PNG_READ_gAMA_SUPPORTED) || defined(PNG_READ_cHRM_SUPPORTED)
-/* The following is a variation on the above for use with the fixed
- * point values used for gAMA and cHRM.  Instead of png_error it
- * issues a warning and returns (-1) - an invalid value because both
- * gAMA and cHRM use *unsigned* integers for fixed point values.
- */
-#define PNG_FIXED_ERROR (-1)
-
-static png_fixed_point /* PRIVATE */
-png_get_fixed_point(png_structp png_ptr, png_const_bytep buf)
-{
-   png_uint_32 uval = png_get_uint_32(buf);
-
-   if (uval <= PNG_UINT_31_MAX)
-      return (png_fixed_point)uval; /* known to be in range */
-
-   /* The caller can turn off the warning by passing NULL. */
-   if (png_ptr != NULL)
-      png_warning(png_ptr, "PNG fixed point integer out of range");
-
-   return PNG_FIXED_ERROR;
-}
-#endif
-
-#ifdef PNG_READ_INT_FUNCTIONS_SUPPORTED
-/* NOTE: the read macros will obscure these definitions, so that if
- * PNG_USE_READ_MACROS is set the library will not use them internally,
- * but the APIs will still be available externally.
- *
- * The parentheses around "PNGAPI function_name" in the following three
- * functions are necessary because they allow the macros to co-exist with
- * these (unused but exported) functions.
- */
-
-/* Grab an unsigned 32-bit integer from a buffer in big-endian format. */
-png_uint_32 (PNGAPI
-png_get_uint_32)(png_const_bytep buf)
-{
-   png_uint_32 uval =
-       ((png_uint_32)(*(buf    )) << 24) +
-       ((png_uint_32)(*(buf + 1)) << 16) +
-       ((png_uint_32)(*(buf + 2)) <<  8) +
-       ((png_uint_32)(*(buf + 3))      ) ;
-
-   return uval;
-}
-
-/* Grab a signed 32-bit integer from a buffer in big-endian format.  The
- * data is stored in the PNG file in two's complement format and there
- * is no guarantee that a 'png_int_32' is exactly 32 bits, therefore
- * the following code does a two's complement to native conversion.
- */
-png_int_32 (PNGAPI
-png_get_int_32)(png_const_bytep buf)
-{
-   png_uint_32 uval = png_get_uint_32(buf);
-   if ((uval & 0x80000000L) == 0) /* non-negative */
-      return uval;
-
-   uval = (uval ^ 0xffffffffL) + 1;  /* 2's complement: -x = ~x+1 */
-   return -(png_int_32)uval;
-}
-
-/* Grab an unsigned 16-bit integer from a buffer in big-endian format. */
-png_uint_16 (PNGAPI
-png_get_uint_16)(png_const_bytep buf)
-{
-   /* ANSI-C requires an int value to accomodate at least 16 bits so this
-    * works and allows the compiler not to worry about possible narrowing
-    * on 32 bit systems.  (Pre-ANSI systems did not make integers smaller
-    * than 16 bits either.)
-    */
-   unsigned int val =
-       ((unsigned int)(*buf) << 8) +
-       ((unsigned int)(*(buf + 1)));
-
-   return (png_uint_16)val;
-}
-
-#endif /* PNG_READ_INT_FUNCTIONS_SUPPORTED */
-
-/* Read and check the PNG file signature */
-void /* PRIVATE */
-png_read_sig(png_structp png_ptr, png_infop info_ptr)
-{
-   png_size_t num_checked, num_to_check;
-
-   /* Exit if the user application does not expect a signature. */
-   if (png_ptr->sig_bytes >= 8)
-      return;
-
-   num_checked = png_ptr->sig_bytes;
-   num_to_check = 8 - num_checked;
-
-#ifdef PNG_IO_STATE_SUPPORTED
-   png_ptr->io_state = PNG_IO_READING | PNG_IO_SIGNATURE;
-#endif
-
-   /* The signature must be serialized in a single I/O call. */
-   png_read_data(png_ptr, &(info_ptr->signature[num_checked]), num_to_check);
-   png_ptr->sig_bytes = 8;
-
-   if (png_sig_cmp(info_ptr->signature, num_checked, num_to_check))
-   {
-      if (num_checked < 4 &&
-          png_sig_cmp(info_ptr->signature, num_checked, num_to_check - 4))
-         png_error(png_ptr, "Not a PNG file");
-      else
-         png_error(png_ptr, "PNG file corrupted by ASCII conversion");
-   }
-   if (num_checked < 3)
-      png_ptr->mode |= PNG_HAVE_PNG_SIGNATURE;
-}
-
-/* Read the chunk header (length + type name).
- * Put the type name into png_ptr->chunk_name, and return the length.
- */
-png_uint_32 /* PRIVATE */
-png_read_chunk_header(png_structp png_ptr)
-{
-   png_byte buf[8];
-   png_uint_32 length;
-
-#ifdef PNG_IO_STATE_SUPPORTED
-   png_ptr->io_state = PNG_IO_READING | PNG_IO_CHUNK_HDR;
-#endif
-
-   /* Read the length and the chunk name.
-    * This must be performed in a single I/O call.
-    */
-   png_read_data(png_ptr, buf, 8);
-   length = png_get_uint_31(png_ptr, buf);
-
-   /* Put the chunk name into png_ptr->chunk_name. */
-   png_memcpy(png_ptr->chunk_name, buf + 4, 4);
-
-   png_debug2(0, "Reading %s chunk, length = %u",
-       png_ptr->chunk_name, length);
-
-   /* Reset the crc and run it over the chunk name. */
-   png_reset_crc(png_ptr);
-   png_calculate_crc(png_ptr, png_ptr->chunk_name, 4);
-
-   /* Check to see if chunk name is valid. */
-   png_check_chunk_name(png_ptr, png_ptr->chunk_name);
-
-#ifdef PNG_IO_STATE_SUPPORTED
-   png_ptr->io_state = PNG_IO_READING | PNG_IO_CHUNK_DATA;
-#endif
-
-   return length;
-}
-
-/* Read data, and (optionally) run it through the CRC. */
-void /* PRIVATE */
-png_crc_read(png_structp png_ptr, png_bytep buf, png_size_t length)
-{
-   if (png_ptr == NULL)
-      return;
-
-   png_read_data(png_ptr, buf, length);
-   png_calculate_crc(png_ptr, buf, length);
-}
-
-/* Optionally skip data and then check the CRC.  Depending on whether we
- * are reading a ancillary or critical chunk, and how the program has set
- * things up, we may calculate the CRC on the data and print a message.
- * Returns '1' if there was a CRC error, '0' otherwise.
- */
-int /* PRIVATE */
-png_crc_finish(png_structp png_ptr, png_uint_32 skip)
-{
-   png_size_t i;
-   png_size_t istop = png_ptr->zbuf_size;
-
-   for (i = (png_size_t)skip; i > istop; i -= istop)
-   {
-      png_crc_read(png_ptr, png_ptr->zbuf, png_ptr->zbuf_size);
-   }
-
-   if (i)
-   {
-      png_crc_read(png_ptr, png_ptr->zbuf, i);
-   }
-
-   if (png_crc_error(png_ptr))
-   {
-      if (((png_ptr->chunk_name[0] & 0x20) &&                /* Ancillary */
-          !(png_ptr->flags & PNG_FLAG_CRC_ANCILLARY_NOWARN)) ||
-          (!(png_ptr->chunk_name[0] & 0x20) &&             /* Critical  */
-          (png_ptr->flags & PNG_FLAG_CRC_CRITICAL_USE)))
-      {
-         png_chunk_warning(png_ptr, "CRC error");
-      }
-
-      else
-      {
-         png_chunk_benign_error(png_ptr, "CRC error");
-         return (0);
-      }
-
-      return (1);
-   }
-
-   return (0);
-}
-
-/* Compare the CRC stored in the PNG file with that calculated by libpng from
- * the data it has read thus far.
- */
-int /* PRIVATE */
-png_crc_error(png_structp png_ptr)
-{
-   png_byte crc_bytes[4];
-   png_uint_32 crc;
-   int need_crc = 1;
-
-   if (png_ptr->chunk_name[0] & 0x20)                     /* ancillary */
-   {
-      if ((png_ptr->flags & PNG_FLAG_CRC_ANCILLARY_MASK) ==
-          (PNG_FLAG_CRC_ANCILLARY_USE | PNG_FLAG_CRC_ANCILLARY_NOWARN))
-         need_crc = 0;
-   }
-
-   else                                                    /* critical */
-   {
-      if (png_ptr->flags & PNG_FLAG_CRC_CRITICAL_IGNORE)
-         need_crc = 0;
-   }
-
-#ifdef PNG_IO_STATE_SUPPORTED
-   png_ptr->io_state = PNG_IO_READING | PNG_IO_CHUNK_CRC;
-#endif
-
-   /* The chunk CRC must be serialized in a single I/O call. */
-   png_read_data(png_ptr, crc_bytes, 4);
-
-   if (need_crc)
-   {
-      crc = png_get_uint_32(crc_bytes);
-      return ((int)(crc != png_ptr->crc));
-   }
-
-   else
-      return (0);
-}
-
-#if defined(PNG_READ_zTXt_SUPPORTED) || defined(PNG_READ_iTXt_SUPPORTED) || \
-    defined(PNG_READ_iCCP_SUPPORTED)
-static png_size_t
-png_inflate(png_structp png_ptr, png_bytep data, png_size_t size,
-    png_bytep output, png_size_t output_size)
-{
-   png_size_t count = 0;
-
-   /* zlib can't necessarily handle more than 65535 bytes at once (i.e. it can't
-    * even necessarily handle 65536 bytes) because the type uInt is "16 bits or
-    * more".  Consequently it is necessary to chunk the input to zlib.  This
-    * code uses ZLIB_IO_MAX, from pngpriv.h, as the maximum (the maximum value
-    * that can be stored in a uInt.)  It is possible to set ZLIB_IO_MAX to a
-    * lower value in pngpriv.h and this may sometimes have a performance
-    * advantage, because it forces access of the input data to be separated from
-    * at least some of the use by some period of time.
-    */
-   png_ptr->zstream.next_in = data;
-   /* avail_in is set below from 'size' */
-   png_ptr->zstream.avail_in = 0;
-
-   while (1)
-   {
-      int ret, avail;
-
-      /* The setting of 'avail_in' used to be outside the loop, by setting it
-       * inside it is possible to chunk the input to zlib and simply rely on
-       * zlib to advance the 'next_in' pointer.  This allows arbitrary amounts o
-       * data to be passed through zlib at the unavoidable cost of requiring a
-       * window save (memcpy of up to 32768 output bytes) every ZLIB_IO_MAX
-       * input bytes.
-       */
-      if (png_ptr->zstream.avail_in == 0 && size > 0)
-      {
-         if (size <= ZLIB_IO_MAX)
-         {
-            /* The value is less than ZLIB_IO_MAX so the cast is safe: */
-            png_ptr->zstream.avail_in = (uInt)size;
-            size = 0;
-         }
-
-         else
-         {
-            png_ptr->zstream.avail_in = ZLIB_IO_MAX;
-            size -= ZLIB_IO_MAX;
-         }
-      }
-
-      /* Reset the output buffer each time round - we empty it
-       * after every inflate call.
-       */
-      png_ptr->zstream.next_out = png_ptr->zbuf;
-      png_ptr->zstream.avail_out = png_ptr->zbuf_size;
-
-      ret = inflate(&png_ptr->zstream, Z_NO_FLUSH);
-      avail = png_ptr->zbuf_size - png_ptr->zstream.avail_out;
-
-      /* First copy/count any new output - but only if we didn't
-       * get an error code.
-       */
-      if ((ret == Z_OK || ret == Z_STREAM_END) && avail > 0)
-      {
-         png_size_t space = avail; /* > 0, see above */
-
-         if (output != 0 && output_size > count)
-         {
-            png_size_t copy = output_size - count;
-
-            if (space < copy)
-               copy = space;
-
-            png_memcpy(output + count, png_ptr->zbuf, copy);
-         }
-         count += space;
-      }
-
-      if (ret == Z_OK)
-         continue;
-
-      /* Termination conditions - always reset the zstream, it
-       * must be left in inflateInit state.
-       */
-      png_ptr->zstream.avail_in = 0;
-      inflateReset(&png_ptr->zstream);
-
-      if (ret == Z_STREAM_END)
-         return count; /* NOTE: may be zero. */
-
-      /* Now handle the error codes - the API always returns 0
-       * and the error message is dumped into the uncompressed
-       * buffer if available.
-       */
-      {
-         PNG_CONST char *msg;
-#ifdef PNG_CONSOLE_IO_SUPPORTED
-         char umsg[52];
-#endif
-         if (png_ptr->zstream.msg != 0)
-            msg = png_ptr->zstream.msg;
-
-         else
-         {
-#ifdef PNG_CONSOLE_IO_SUPPORTED
-            switch (ret)
-            {
-               case Z_BUF_ERROR:
-                  msg = "Buffer error in compressed datastream in %s chunk";
-                  break;
-
-               case Z_DATA_ERROR:
-                  msg = "Data error in compressed datastream in %s chunk";
-                  break;
-
-               default:
-                  msg = "Incomplete compressed datastream in %s chunk";
-                  break;
-            }
-
-            png_snprintf(umsg, sizeof umsg, msg, png_ptr->chunk_name);
-            msg = umsg;
-#else
-            msg = "Damaged compressed datastream in chunk other than IDAT";
-#endif
-         }
-
-         png_warning(png_ptr, msg);
-      }
-
-      /* 0 means an error - notice that this code simply ignores
-       * zero length compressed chunks as a result.
-       */
-      return 0;
-   }
-}
-
-/*
- * Decompress trailing data in a chunk.  The assumption is that chunkdata
- * points at an allocated area holding the contents of a chunk with a
- * trailing compressed part.  What we get back is an allocated area
- * holding the original prefix part and an uncompressed version of the
- * trailing part (the malloc area passed in is freed).
- */
-void /* PRIVATE */
-png_decompress_chunk(png_structp png_ptr, int comp_type,
-    png_size_t chunklength,
-    png_size_t prefix_size, png_size_t *newlength)
-{
-   /* The caller should guarantee this */
-   if (prefix_size > chunklength)
-   {
-      /* The recovery is to delete the chunk. */
-      png_warning(png_ptr, "invalid chunklength");
-      prefix_size = 0; /* To delete everything */
-   }
-
-   else if (comp_type == PNG_COMPRESSION_TYPE_BASE)
-   {
-      png_size_t expanded_size = png_inflate(png_ptr,
-          (png_bytep)(png_ptr->chunkdata + prefix_size),
-          chunklength - prefix_size,
-          0,            /*output*/
-          0);           /*output size*/
-
-      /* Now check the limits on this chunk - if the limit fails the
-       * compressed data will be removed, the prefix will remain.
-       */
-#ifdef PNG_SET_CHUNK_MALLOC_LIMIT_SUPPORTED
-      if (png_ptr->user_chunk_malloc_max &&
-          (prefix_size + expanded_size >= png_ptr->user_chunk_malloc_max - 1))
-#else
-#  ifdef PNG_USER_CHUNK_MALLOC_MAX
-      if ((PNG_USER_CHUNK_MALLOC_MAX > 0) &&
-          prefix_size + expanded_size >= PNG_USER_CHUNK_MALLOC_MAX - 1)
-#  endif
-#endif
-         png_warning(png_ptr, "Exceeded size limit while expanding chunk");
-
-      /* If the size is zero either there was an error and a message
-       * has already been output (warning) or the size really is zero
-       * and we have nothing to do - the code will exit through the
-       * error case below.
-       */
-#if defined(PNG_SET_CHUNK_MALLOC_LIMIT_SUPPORTED) || \
-    defined(PNG_USER_CHUNK_MALLOC_MAX)
-      else if (expanded_size > 0)
-#else
-      if (expanded_size > 0)
-#endif
-      {
-         /* Success (maybe) - really uncompress the chunk. */
-         png_size_t new_size = 0;
-         png_charp text = png_malloc_warn(png_ptr,
-             prefix_size + expanded_size + 1);
-
-         if (text != NULL)
-         {
-            png_memcpy(text, png_ptr->chunkdata, prefix_size);
-            new_size = png_inflate(png_ptr,
-                (png_bytep)(png_ptr->chunkdata + prefix_size),
-                chunklength - prefix_size,
-                (png_bytep)(text + prefix_size), expanded_size);
-            text[prefix_size + expanded_size] = 0; /* just in case */
-
-            if (new_size == expanded_size)
-            {
-               png_free(png_ptr, png_ptr->chunkdata);
-               png_ptr->chunkdata = text;
-               *newlength = prefix_size + expanded_size;
-               return; /* The success return! */
-            }
-
-            png_warning(png_ptr, "png_inflate logic error");
-            png_free(png_ptr, text);
-         }
-
-         else
-            png_warning(png_ptr, "Not enough memory to decompress chunk");
-      }
-   }
-
-   else /* if (comp_type != PNG_COMPRESSION_TYPE_BASE) */
-   {
-#ifdef PNG_STDIO_SUPPORTED
-      char umsg[50];
-
-      png_snprintf(umsg, sizeof umsg,
-          "Unknown zTXt compression type %d", comp_type);
-      png_warning(png_ptr, umsg);
-#else
-      png_warning(png_ptr, "Unknown zTXt compression type");
-#endif
-
-      /* The recovery is to simply drop the data. */
-   }
-
-   /* Generic error return - leave the prefix, delete the compressed
-    * data, reallocate the chunkdata to remove the potentially large
-    * amount of compressed data.
-    */
-   {
-      png_charp text = png_malloc_warn(png_ptr, prefix_size + 1);
-
-      if (text != NULL)
-      {
-         if (prefix_size > 0)
-            png_memcpy(text, png_ptr->chunkdata, prefix_size);
-
-         png_free(png_ptr, png_ptr->chunkdata);
-         png_ptr->chunkdata = text;
-
-         /* This is an extra zero in the 'uncompressed' part. */
-         *(png_ptr->chunkdata + prefix_size) = 0x00;
-      }
-      /* Ignore a malloc error here - it is safe. */
-   }
-
-   *newlength = prefix_size;
-}
-#endif
-
-/* Read and check the IDHR chunk */
-void /* PRIVATE */
-png_handle_IHDR(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
-{
-   png_byte buf[13];
-   png_uint_32 width, height;
-   int bit_depth, color_type, compression_type, filter_type;
-   int interlace_type;
-
-   png_debug(1, "in png_handle_IHDR");
-
-   if (png_ptr->mode & PNG_HAVE_IHDR)
-      png_error(png_ptr, "Out of place IHDR");
-
-   /* Check the length */
-   if (length != 13)
-      png_error(png_ptr, "Invalid IHDR chunk");
-
-   png_ptr->mode |= PNG_HAVE_IHDR;
-
-   png_crc_read(png_ptr, buf, 13);
-   png_crc_finish(png_ptr, 0);
-
-   width = png_get_uint_31(png_ptr, buf);
-   height = png_get_uint_31(png_ptr, buf + 4);
-   bit_depth = buf[8];
-   color_type = buf[9];
-   compression_type = buf[10];
-   filter_type = buf[11];
-   interlace_type = buf[12];
-
-   /* Set internal variables */
-   png_ptr->width = width;
-   png_ptr->height = height;
-   png_ptr->bit_depth = (png_byte)bit_depth;
-   png_ptr->interlaced = (png_byte)interlace_type;
-   png_ptr->color_type = (png_byte)color_type;
-#ifdef PNG_MNG_FEATURES_SUPPORTED
-   png_ptr->filter_type = (png_byte)filter_type;
-#endif
-   png_ptr->compression_type = (png_byte)compression_type;
-
-   /* Find number of channels */
-   switch (png_ptr->color_type)
-   {
-      default: /* invalid, png_set_IHDR calls png_error */
-      case PNG_COLOR_TYPE_GRAY:
-      case PNG_COLOR_TYPE_PALETTE:
-         png_ptr->channels = 1;
-         break;
-
-      case PNG_COLOR_TYPE_RGB:
-         png_ptr->channels = 3;
-         break;
-
-      case PNG_COLOR_TYPE_GRAY_ALPHA:
-         png_ptr->channels = 2;
-         break;
-
-      case PNG_COLOR_TYPE_RGB_ALPHA:
-         png_ptr->channels = 4;
-         break;
-   }
-
-   /* Set up other useful info */
-   png_ptr->pixel_depth = (png_byte)(png_ptr->bit_depth *
-   png_ptr->channels);
-   png_ptr->rowbytes = PNG_ROWBYTES(png_ptr->pixel_depth, png_ptr->width);
-   png_debug1(3, "bit_depth = %d", png_ptr->bit_depth);
-   png_debug1(3, "channels = %d", png_ptr->channels);
-   png_debug1(3, "rowbytes = %lu", (unsigned long)png_ptr->rowbytes);
-   png_set_IHDR(png_ptr, info_ptr, width, height, bit_depth,
-       color_type, interlace_type, compression_type, filter_type);
-}
-
-/* Read and check the palette */
-void /* PRIVATE */
-png_handle_PLTE(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
-{
-   png_color palette[PNG_MAX_PALETTE_LENGTH];
-   int num, i;
-#ifdef PNG_POINTER_INDEXING_SUPPORTED
-   png_colorp pal_ptr;
-#endif
-
-   png_debug(1, "in png_handle_PLTE");
-
-   if (!(png_ptr->mode & PNG_HAVE_IHDR))
-      png_error(png_ptr, "Missing IHDR before PLTE");
-
-   else if (png_ptr->mode & PNG_HAVE_IDAT)
-   {
-      png_warning(png_ptr, "Invalid PLTE after IDAT");
-      png_crc_finish(png_ptr, length);
-      return;
-   }
-
-   else if (png_ptr->mode & PNG_HAVE_PLTE)
-      png_error(png_ptr, "Duplicate PLTE chunk");
-
-   png_ptr->mode |= PNG_HAVE_PLTE;
-
-   if (!(png_ptr->color_type&PNG_COLOR_MASK_COLOR))
-   {
-      png_warning(png_ptr,
-          "Ignoring PLTE chunk in grayscale PNG");
-      png_crc_finish(png_ptr, length);
-      return;
-   }
-
-#ifndef PNG_READ_OPT_PLTE_SUPPORTED
-   if (png_ptr->color_type != PNG_COLOR_TYPE_PALETTE)
-   {
-      png_crc_finish(png_ptr, length);
-      return;
-   }
-#endif
-
-   if (length > 3*PNG_MAX_PALETTE_LENGTH || length % 3)
-   {
-      if (png_ptr->color_type != PNG_COLOR_TYPE_PALETTE)
-      {
-         png_warning(png_ptr, "Invalid palette chunk");
-         png_crc_finish(png_ptr, length);
-         return;
-      }
-
-      else
-      {
-         png_error(png_ptr, "Invalid palette chunk");
-      }
-   }
-
-   num = (int)length / 3;
-
-#ifdef PNG_POINTER_INDEXING_SUPPORTED
-   for (i = 0, pal_ptr = palette; i < num; i++, pal_ptr++)
-   {
-      png_byte buf[3];
-
-      png_crc_read(png_ptr, buf, 3);
-      pal_ptr->red = buf[0];
-      pal_ptr->green = buf[1];
-      pal_ptr->blue = buf[2];
-   }
-#else
-   for (i = 0; i < num; i++)
-   {
-      png_byte buf[3];
-
-      png_crc_read(png_ptr, buf, 3);
-      /* Don't depend upon png_color being any order */
-      palette[i].red = buf[0];
-      palette[i].green = buf[1];
-      palette[i].blue = buf[2];
-   }
-#endif
-
-   /* If we actually need the PLTE chunk (ie for a paletted image), we do
-    * whatever the normal CRC configuration tells us.  However, if we
-    * have an RGB image, the PLTE can be considered ancillary, so
-    * we will act as though it is.
-    */
-#ifndef PNG_READ_OPT_PLTE_SUPPORTED
-   if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
-#endif
-   {
-      png_crc_finish(png_ptr, 0);
-   }
-
-#ifndef PNG_READ_OPT_PLTE_SUPPORTED
-   else if (png_crc_error(png_ptr))  /* Only if we have a CRC error */
-   {
-      /* If we don't want to use the data from an ancillary chunk,
-       * we have two options: an error abort, or a warning and we
-       * ignore the data in this chunk (which should be OK, since
-       * it's considered ancillary for a RGB or RGBA image).
-       */
-      if (!(png_ptr->flags & PNG_FLAG_CRC_ANCILLARY_USE))
-      {
-         if (png_ptr->flags & PNG_FLAG_CRC_ANCILLARY_NOWARN)
-         {
-            png_chunk_benign_error(png_ptr, "CRC error");
-         }
-
-         else
-         {
-            png_chunk_warning(png_ptr, "CRC error");
-            return;
-         }
-      }
-
-      /* Otherwise, we (optionally) emit a warning and use the chunk. */
-      else if (!(png_ptr->flags & PNG_FLAG_CRC_ANCILLARY_NOWARN))
-      {
-         png_chunk_warning(png_ptr, "CRC error");
-      }
-   }
-#endif
-
-   png_set_PLTE(png_ptr, info_ptr, palette, num);
-
-#ifdef PNG_READ_tRNS_SUPPORTED
-   if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
-   {
-      if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_tRNS))
-      {
-         if (png_ptr->num_trans > (png_uint_16)num)
-         {
-            png_warning(png_ptr, "Truncating incorrect tRNS chunk length");
-            png_ptr->num_trans = (png_uint_16)num;
-         }
-
-         if (info_ptr->num_trans > (png_uint_16)num)
-         {
-            png_warning(png_ptr, "Truncating incorrect info tRNS chunk length");
-            info_ptr->num_trans = (png_uint_16)num;
-         }
-      }
-   }
-#endif
-
-}
-
-void /* PRIVATE */
-png_handle_IEND(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
-{
-   png_debug(1, "in png_handle_IEND");
-
-   if (!(png_ptr->mode & PNG_HAVE_IHDR) || !(png_ptr->mode & PNG_HAVE_IDAT))
-   {
-      png_error(png_ptr, "No image in file");
-   }
-
-   png_ptr->mode |= (PNG_AFTER_IDAT | PNG_HAVE_IEND);
-
-   if (length != 0)
-   {
-      png_warning(png_ptr, "Incorrect IEND chunk length");
-   }
-
-   png_crc_finish(png_ptr, length);
-
-   PNG_UNUSED(info_ptr) /* Quiet compiler warnings about unused info_ptr */
-}
-
-#ifdef PNG_READ_gAMA_SUPPORTED
-void /* PRIVATE */
-png_handle_gAMA(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
-{
-   png_fixed_point igamma;
-   png_byte buf[4];
-
-   png_debug(1, "in png_handle_gAMA");
-
-   if (!(png_ptr->mode & PNG_HAVE_IHDR))
-      png_error(png_ptr, "Missing IHDR before gAMA");
-
-   else if (png_ptr->mode & PNG_HAVE_IDAT)
-   {
-      png_warning(png_ptr, "Invalid gAMA after IDAT");
-      png_crc_finish(png_ptr, length);
-      return;
-   }
-
-   else if (png_ptr->mode & PNG_HAVE_PLTE)
-      /* Should be an error, but we can cope with it */
-      png_warning(png_ptr, "Out of place gAMA chunk");
-
-   if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_gAMA)
-#ifdef PNG_READ_sRGB_SUPPORTED
-       && !(info_ptr->valid & PNG_INFO_sRGB)
-#endif
-       )
-   {
-      png_warning(png_ptr, "Duplicate gAMA chunk");
-      png_crc_finish(png_ptr, length);
-      return;
-   }
-
-   if (length != 4)
-   {
-      png_warning(png_ptr, "Incorrect gAMA chunk length");
-      png_crc_finish(png_ptr, length);
-      return;
-   }
-
-   png_crc_read(png_ptr, buf, 4);
-
-   if (png_crc_finish(png_ptr, 0))
-      return;
-
-   igamma = png_get_fixed_point(NULL, buf);
-
-   /* Check for zero gamma or an error. */
-   if (igamma <= 0)
-   {
-      png_warning(png_ptr,
-          "Ignoring gAMA chunk with out of range gamma");
-
-      return;
-   }
-
-#  ifdef PNG_READ_sRGB_SUPPORTED
-   if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_sRGB))
-   {
-      if (PNG_OUT_OF_RANGE(igamma, 45500L, 500))
-      {
-         png_warning(png_ptr,
-             "Ignoring incorrect gAMA value when sRGB is also present");
-
-#    ifdef PNG_CONSOLE_IO_SUPPORTED
-         fprintf(stderr, "gamma = (%d/100000)", (int)igamma);
-#    endif
-         return;
-      }
-   }
-#  endif /* PNG_READ_sRGB_SUPPORTED */
-
-#  ifdef PNG_READ_GAMMA_SUPPORTED
-   /* Gamma correction on read is supported. */
-   png_ptr->gamma = igamma;
-#  endif
-   /* And set the 'info' structure members. */
-   png_set_gAMA_fixed(png_ptr, info_ptr, igamma);
-}
-#endif
-
-#ifdef PNG_READ_sBIT_SUPPORTED
-void /* PRIVATE */
-png_handle_sBIT(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
-{
-   png_size_t truelen;
-   png_byte buf[4];
-
-   png_debug(1, "in png_handle_sBIT");
-
-   buf[0] = buf[1] = buf[2] = buf[3] = 0;
-
-   if (!(png_ptr->mode & PNG_HAVE_IHDR))
-      png_error(png_ptr, "Missing IHDR before sBIT");
-
-   else if (png_ptr->mode & PNG_HAVE_IDAT)
-   {
-      png_warning(png_ptr, "Invalid sBIT after IDAT");
-      png_crc_finish(png_ptr, length);
-      return;
-   }
-
-   else if (png_ptr->mode & PNG_HAVE_PLTE)
-   {
-      /* Should be an error, but we can cope with it */
-      png_warning(png_ptr, "Out of place sBIT chunk");
-   }
-
-   if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_sBIT))
-   {
-      png_warning(png_ptr, "Duplicate sBIT chunk");
-      png_crc_finish(png_ptr, length);
-      return;
-   }
-
-   if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
-      truelen = 3;
-
-   else
-      truelen = (png_size_t)png_ptr->channels;
-
-   if (length != truelen || length > 4)
-   {
-      png_warning(png_ptr, "Incorrect sBIT chunk length");
-      png_crc_finish(png_ptr, length);
-      return;
-   }
-
-   png_crc_read(png_ptr, buf, truelen);
-
-   if (png_crc_finish(png_ptr, 0))
-      return;
-
-   if (png_ptr->color_type & PNG_COLOR_MASK_COLOR)
-   {
-      png_ptr->sig_bit.red = buf[0];
-      png_ptr->sig_bit.green = buf[1];
-      png_ptr->sig_bit.blue = buf[2];
-      png_ptr->sig_bit.alpha = buf[3];
-   }
-
-   else
-   {
-      png_ptr->sig_bit.gray = buf[0];
-      png_ptr->sig_bit.red = buf[0];
-      png_ptr->sig_bit.green = buf[0];
-      png_ptr->sig_bit.blue = buf[0];
-      png_ptr->sig_bit.alpha = buf[1];
-   }
-
-   png_set_sBIT(png_ptr, info_ptr, &(png_ptr->sig_bit));
-}
-#endif
-
-#ifdef PNG_READ_cHRM_SUPPORTED
-void /* PRIVATE */
-png_handle_cHRM(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
-{
-   png_byte buf[32];
-   png_fixed_point x_white, y_white, x_red, y_red, x_green, y_green, x_blue,
-      y_blue;
-
-   png_debug(1, "in png_handle_cHRM");
-
-   if (!(png_ptr->mode & PNG_HAVE_IHDR))
-      png_error(png_ptr, "Missing IHDR before cHRM");
-
-   else if (png_ptr->mode & PNG_HAVE_IDAT)
-   {
-      png_warning(png_ptr, "Invalid cHRM after IDAT");
-      png_crc_finish(png_ptr, length);
-      return;
-   }
-
-   else if (png_ptr->mode & PNG_HAVE_PLTE)
-      /* Should be an error, but we can cope with it */
-      png_warning(png_ptr, "Missing PLTE before cHRM");
-
-   if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_cHRM)
-#  ifdef PNG_READ_sRGB_SUPPORTED
-       && !(info_ptr->valid & PNG_INFO_sRGB)
-#  endif
-      )
-   {
-      png_warning(png_ptr, "Duplicate cHRM chunk");
-      png_crc_finish(png_ptr, length);
-      return;
-   }
-
-   if (length != 32)
-   {
-      png_warning(png_ptr, "Incorrect cHRM chunk length");
-      png_crc_finish(png_ptr, length);
-      return;
-   }
-
-   png_crc_read(png_ptr, buf, 32);
-
-   if (png_crc_finish(png_ptr, 0))
-      return;
-
-   x_white = png_get_fixed_point(NULL, buf);
-   y_white = png_get_fixed_point(NULL, buf + 4);
-   x_red   = png_get_fixed_point(NULL, buf + 8);
-   y_red   = png_get_fixed_point(NULL, buf + 12);
-   x_green = png_get_fixed_point(NULL, buf + 16);
-   y_green = png_get_fixed_point(NULL, buf + 20);
-   x_blue  = png_get_fixed_point(NULL, buf + 24);
-   y_blue  = png_get_fixed_point(NULL, buf + 28);
-
-   if (x_white == PNG_FIXED_ERROR ||
-       y_white == PNG_FIXED_ERROR ||
-       x_red   == PNG_FIXED_ERROR ||
-       y_red   == PNG_FIXED_ERROR ||
-       x_green == PNG_FIXED_ERROR ||
-       y_green == PNG_FIXED_ERROR ||
-       x_blue  == PNG_FIXED_ERROR ||
-       y_blue  == PNG_FIXED_ERROR)
-   {
-      png_warning(png_ptr, "Ignoring cHRM chunk with negative chromaticities");
-      return;
-   }
-
-#ifdef PNG_READ_sRGB_SUPPORTED
-   if ((info_ptr != NULL) && (info_ptr->valid & PNG_INFO_sRGB))
-   {
-      if (PNG_OUT_OF_RANGE(x_white, 31270,  1000) ||
-          PNG_OUT_OF_RANGE(y_white, 32900,  1000) ||
-          PNG_OUT_OF_RANGE(x_red,   64000L, 1000) ||
-          PNG_OUT_OF_RANGE(y_red,   33000,  1000) ||
-          PNG_OUT_OF_RANGE(x_green, 30000,  1000) ||
-          PNG_OUT_OF_RANGE(y_green, 60000L, 1000) ||
-          PNG_OUT_OF_RANGE(x_blue,  15000,  1000) ||
-          PNG_OUT_OF_RANGE(y_blue,   6000,  1000))
-      {
-         png_warning(png_ptr,
-             "Ignoring incorrect cHRM value when sRGB is also present");
-
-#ifdef PNG_CONSOLE_IO_SUPPORTED
-         fprintf(stderr, "wx=%d, wy=%d, rx=%d, ry=%d\n",
-             x_white, y_white, x_red, y_red);
-
-         fprintf(stderr, "gx=%d, gy=%d, bx=%d, by=%d\n",
-             x_green, y_green, x_blue, y_blue);
-#endif /* PNG_CONSOLE_IO_SUPPORTED */
-      }
-      return;
-   }
-#endif /* PNG_READ_sRGB_SUPPORTED */
-
-   png_set_cHRM_fixed(png_ptr, info_ptr, x_white, y_white, x_red, y_red,
-      x_green, y_green, x_blue, y_blue);
-}
-#endif
-
-#ifdef PNG_READ_sRGB_SUPPORTED
-void /* PRIVATE */
-png_handle_sRGB(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
-{
-   int intent;
-   png_byte buf[1];
-
-   png_debug(1, "in png_handle_sRGB");
-
-   if (!(png_ptr->mode & PNG_HAVE_IHDR))
-      png_error(png_ptr, "Missing IHDR before sRGB");
-
-   else if (png_ptr->mode & PNG_HAVE_IDAT)
-   {
-      png_warning(png_ptr, "Invalid sRGB after IDAT");
-      png_crc_finish(png_ptr, length);
-      return;
-   }
-
-   else if (png_ptr->mode & PNG_HAVE_PLTE)
-      /* Should be an error, but we can cope with it */
-      png_warning(png_ptr, "Out of place sRGB chunk");
-
-   if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_sRGB))
-   {
-      png_warning(png_ptr, "Duplicate sRGB chunk");
-      png_crc_finish(png_ptr, length);
-      return;
-   }
-
-   if (length != 1)
-   {
-      png_warning(png_ptr, "Incorrect sRGB chunk length");
-      png_crc_finish(png_ptr, length);
-      return;
-   }
-
-   png_crc_read(png_ptr, buf, 1);
-
-   if (png_crc_finish(png_ptr, 0))
-      return;
-
-   intent = buf[0];
-
-   /* Check for bad intent */
-   if (intent >= PNG_sRGB_INTENT_LAST)
-   {
-      png_warning(png_ptr, "Unknown sRGB intent");
-      return;
-   }
-
-#if defined(PNG_READ_gAMA_SUPPORTED) && defined(PNG_READ_GAMMA_SUPPORTED)
-   if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_gAMA))
-   {
-      if (PNG_OUT_OF_RANGE(info_ptr->gamma, 45500L, 500))
-      {
-         png_warning(png_ptr,
-             "Ignoring incorrect gAMA value when sRGB is also present");
-#ifdef PNG_CONSOLE_IO_SUPPORTED
-         fprintf(stderr, "incorrect gamma=(%d/100000)\n", info_ptr->gamma);
-#endif
-      }
-   }
-#endif /* PNG_READ_gAMA_SUPPORTED */
-
-#ifdef PNG_READ_cHRM_SUPPORTED
-   if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_cHRM))
-      if (PNG_OUT_OF_RANGE(info_ptr->x_white, 31270,  1000) ||
-          PNG_OUT_OF_RANGE(info_ptr->y_white, 32900,  1000) ||
-          PNG_OUT_OF_RANGE(info_ptr->x_red,   64000L, 1000) ||
-          PNG_OUT_OF_RANGE(info_ptr->y_red,   33000,  1000) ||
-          PNG_OUT_OF_RANGE(info_ptr->x_green, 30000,  1000) ||
-          PNG_OUT_OF_RANGE(info_ptr->y_green, 60000L, 1000) ||
-          PNG_OUT_OF_RANGE(info_ptr->x_blue,  15000,  1000) ||
-          PNG_OUT_OF_RANGE(info_ptr->y_blue,   6000,  1000))
-      {
-         png_warning(png_ptr,
-             "Ignoring incorrect cHRM value when sRGB is also present");
-      }
-#endif /* PNG_READ_cHRM_SUPPORTED */
-
-   png_set_sRGB_gAMA_and_cHRM(png_ptr, info_ptr, intent);
-}
-#endif /* PNG_READ_sRGB_SUPPORTED */
-
-#ifdef PNG_READ_iCCP_SUPPORTED
-void /* PRIVATE */
-png_handle_iCCP(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
-/* Note: this does not properly handle chunks that are > 64K under DOS */
-{
-   png_byte compression_type;
-   png_bytep pC;
-   png_charp profile;
-   png_uint_32 skip = 0;
-   png_uint_32 profile_size;
-   png_alloc_size_t profile_length;
-   png_size_t slength, prefix_length, data_length;
-
-   png_debug(1, "in png_handle_iCCP");
-
-   if (!(png_ptr->mode & PNG_HAVE_IHDR))
-      png_error(png_ptr, "Missing IHDR before iCCP");
-
-   else if (png_ptr->mode & PNG_HAVE_IDAT)
-   {
-      png_warning(png_ptr, "Invalid iCCP after IDAT");
-      png_crc_finish(png_ptr, length);
-      return;
-   }
-
-   else if (png_ptr->mode & PNG_HAVE_PLTE)
-      /* Should be an error, but we can cope with it */
-      png_warning(png_ptr, "Out of place iCCP chunk");
-
-   if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_iCCP))
-   {
-      png_warning(png_ptr, "Duplicate iCCP chunk");
-      png_crc_finish(png_ptr, length);
-      return;
-   }
-
-#ifdef PNG_MAX_MALLOC_64K
-   if (length > (png_uint_32)65535L)
-   {
-      png_warning(png_ptr, "iCCP chunk too large to fit in memory");
-      skip = length - (png_uint_32)65535L;
-      length = (png_uint_32)65535L;
-   }
-#endif
-
-   png_free(png_ptr, png_ptr->chunkdata);
-   png_ptr->chunkdata = (png_charp)png_malloc(png_ptr, length + 1);
-   slength = (png_size_t)length;
-   png_crc_read(png_ptr, (png_bytep)png_ptr->chunkdata, slength);
-
-   if (png_crc_finish(png_ptr, skip))
-   {
-      png_free(png_ptr, png_ptr->chunkdata);
-      png_ptr->chunkdata = NULL;
-      return;
-   }
-
-   png_ptr->chunkdata[slength] = 0x00;
-
-   for (profile = png_ptr->chunkdata; *profile; profile++)
-      /* Empty loop to find end of name */ ;
-
-   ++profile;
-
-   /* There should be at least one zero (the compression type byte)
-    * following the separator, and we should be on it
-    */
-   if (profile >= png_ptr->chunkdata + slength - 1)
-   {
-      png_free(png_ptr, png_ptr->chunkdata);
-      png_ptr->chunkdata = NULL;
-      png_warning(png_ptr, "Malformed iCCP chunk");
-      return;
-   }
-
-   /* Compression_type should always be zero */
-   compression_type = *profile++;
-
-   if (compression_type)
-   {
-      png_warning(png_ptr, "Ignoring nonzero compression type in iCCP chunk");
-      compression_type = 0x00;  /* Reset it to zero (libpng-1.0.6 through 1.0.8
-                                 wrote nonzero) */
-   }
-
-   prefix_length = profile - png_ptr->chunkdata;
-   png_decompress_chunk(png_ptr, compression_type,
-       slength, prefix_length, &data_length);
-
-   profile_length = data_length - prefix_length;
-
-   if (prefix_length > data_length || profile_length < 4)
-   {
-      png_free(png_ptr, png_ptr->chunkdata);
-      png_ptr->chunkdata = NULL;
-      png_warning(png_ptr, "Profile size field missing from iCCP chunk");
-      return;
-   }
-
-   /* Check the profile_size recorded in the first 32 bits of the ICC profile */
-   pC = (png_bytep)(png_ptr->chunkdata + prefix_length);
-   profile_size = ((*(pC    )) << 24) |
-                  ((*(pC + 1)) << 16) |
-                  ((*(pC + 2)) <<  8) |
-                  ((*(pC + 3))      );
-
-   /* NOTE: the following guarantees that 'profile_length' fits into 32 bits,
-    * because profile_size is a 32 bit value.
-    */
-   if (profile_size < profile_length)
-      profile_length = profile_size;
-
-   /* And the following guarantees that profile_size == profile_length. */
-   if (profile_size > profile_length)
-   {
-      png_free(png_ptr, png_ptr->chunkdata);
-      png_ptr->chunkdata = NULL;
-#ifdef PNG_STDIO_SUPPORTED
-      {
-         char umsg[80];
-
-         png_snprintf2(umsg, 80,
-             "Ignoring iCCP chunk with declared size = %u "
-              "and actual length = %u",
-              (unsigned int) profile_size,
-              (unsigned int) profile_length);
-         png_warning(png_ptr, umsg);
-      }
-#else
-      png_warning(png_ptr,
-         "Ignoring iCCP chunk with uncompressed size mismatch");
-#endif
-      return;
-   }
-
-   png_set_iCCP(png_ptr, info_ptr, png_ptr->chunkdata,
-       compression_type, (png_bytep)png_ptr->chunkdata + prefix_length,
-       profile_size);
-   png_free(png_ptr, png_ptr->chunkdata);
-   png_ptr->chunkdata = NULL;
-}
-#endif /* PNG_READ_iCCP_SUPPORTED */
-
-#ifdef PNG_READ_sPLT_SUPPORTED
-void /* PRIVATE */
-png_handle_sPLT(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
-/* Note: this does not properly handle chunks that are > 64K under DOS */
-{
-   png_bytep entry_start;
-   png_sPLT_t new_palette;
-#ifdef PNG_POINTER_INDEXING_SUPPORTED
-   png_sPLT_entryp pp;
-#endif
-   png_uint_32 data_length;
-   int entry_size, i;
-   png_uint_32 skip = 0;
-   png_size_t slength;
-   png_uint_32 dl;
-   png_size_t max_dl;
-
-   png_debug(1, "in png_handle_sPLT");
-
-#ifdef PNG_USER_LIMITS_SUPPORTED
-
-   if (png_ptr->user_chunk_cache_max != 0)
-   {
-      if (png_ptr->user_chunk_cache_max == 1)
-      {
-         png_crc_finish(png_ptr, length);
-         return;
-      }
-
-      if (--png_ptr->user_chunk_cache_max == 1)
-      {
-         png_warning(png_ptr, "No space in chunk cache for sPLT");
-         png_crc_finish(png_ptr, length);
-         return;
-      }
-   }
-#endif
-
-   if (!(png_ptr->mode & PNG_HAVE_IHDR))
-      png_error(png_ptr, "Missing IHDR before sPLT");
-
-   else if (png_ptr->mode & PNG_HAVE_IDAT)
-   {
-      png_warning(png_ptr, "Invalid sPLT after IDAT");
-      png_crc_finish(png_ptr, length);
-      return;
-   }
-
-#ifdef PNG_MAX_MALLOC_64K
-   if (length > (png_uint_32)65535L)
-   {
-      png_warning(png_ptr, "sPLT chunk too large to fit in memory");
-      skip = length - (png_uint_32)65535L;
-      length = (png_uint_32)65535L;
-   }
-#endif
-
-   png_free(png_ptr, png_ptr->chunkdata);
-   png_ptr->chunkdata = (png_charp)png_malloc(png_ptr, length + 1);
-
-   /* WARNING: this may break if size_t is less than 32 bits; it is assumed
-    * that the PNG_MAX_MALLOC_64K test is enabled in this case, but this is a
-    * potential breakage point if the types in pngconf.h aren't exactly right.
-    */
-   slength = (png_size_t)length;
-   png_crc_read(png_ptr, (png_bytep)png_ptr->chunkdata, slength);
-
-   if (png_crc_finish(png_ptr, skip))
-   {
-      png_free(png_ptr, png_ptr->chunkdata);
-      png_ptr->chunkdata = NULL;
-      return;
-   }
-
-   png_ptr->chunkdata[slength] = 0x00;
-
-   for (entry_start = (png_bytep)png_ptr->chunkdata; *entry_start;
-       entry_start++)
-      /* Empty loop to find end of name */ ;
-
-   ++entry_start;
-
-   /* A sample depth should follow the separator, and we should be on it  */
-   if (entry_start > (png_bytep)png_ptr->chunkdata + slength - 2)
-   {
-      png_free(png_ptr, png_ptr->chunkdata);
-      png_ptr->chunkdata = NULL;
-      png_warning(png_ptr, "malformed sPLT chunk");
-      return;
-   }
-
-   new_palette.depth = *entry_start++;
-   entry_size = (new_palette.depth == 8 ? 6 : 10);
-   /* This must fit in a png_uint_32 because it is derived from the original
-    * chunk data length (and use 'length', not 'slength' here for clarity -
-    * they are guaranteed to be the same, see the tests above.)
-    */
-   data_length = length - (png_uint_32)(entry_start -
-      (png_bytep)png_ptr->chunkdata);
-
-   /* Integrity-check the data length */
-   if (data_length % entry_size)
-   {
-      png_free(png_ptr, png_ptr->chunkdata);
-      png_ptr->chunkdata = NULL;
-      png_warning(png_ptr, "sPLT chunk has bad length");
-      return;
-   }
-
-   dl = (png_int_32)(data_length / entry_size);
-   max_dl = PNG_SIZE_MAX / png_sizeof(png_sPLT_entry);
-
-   if (dl > max_dl)
-   {
-       png_warning(png_ptr, "sPLT chunk too long");
-       return;
-   }
-
-   new_palette.nentries = (png_int_32)(data_length / entry_size);
-
-   new_palette.entries = (png_sPLT_entryp)png_malloc_warn(
-       png_ptr, new_palette.nentries * png_sizeof(png_sPLT_entry));
-
-   if (new_palette.entries == NULL)
-   {
-       png_warning(png_ptr, "sPLT chunk requires too much memory");
-       return;
-   }
-
-#ifdef PNG_POINTER_INDEXING_SUPPORTED
-   for (i = 0; i < new_palette.nentries; i++)
-   {
-      pp = new_palette.entries + i;
-
-      if (new_palette.depth == 8)
-      {
-         pp->red = *entry_start++;
-         pp->green = *entry_start++;
-         pp->blue = *entry_start++;
-         pp->alpha = *entry_start++;
-      }
-
-      else
-      {
-         pp->red   = png_get_uint_16(entry_start); entry_start += 2;
-         pp->green = png_get_uint_16(entry_start); entry_start += 2;
-         pp->blue  = png_get_uint_16(entry_start); entry_start += 2;
-         pp->alpha = png_get_uint_16(entry_start); entry_start += 2;
-      }
-
-      pp->frequency = png_get_uint_16(entry_start); entry_start += 2;
-   }
-#else
-   pp = new_palette.entries;
-
-   for (i = 0; i < new_palette.nentries; i++)
-   {
-
-      if (new_palette.depth == 8)
-      {
-         pp[i].red   = *entry_start++;
-         pp[i].green = *entry_start++;
-         pp[i].blue  = *entry_start++;
-         pp[i].alpha = *entry_start++;
-      }
-
-      else
-      {
-         pp[i].red   = png_get_uint_16(entry_start); entry_start += 2;
-         pp[i].green = png_get_uint_16(entry_start); entry_start += 2;
-         pp[i].blue  = png_get_uint_16(entry_start); entry_start += 2;
-         pp[i].alpha = png_get_uint_16(entry_start); entry_start += 2;
-      }
-
-      pp->frequency = png_get_uint_16(entry_start); entry_start += 2;
-   }
-#endif
-
-   /* Discard all chunk data except the name and stash that */
-   new_palette.name = png_ptr->chunkdata;
-
-   png_set_sPLT(png_ptr, info_ptr, &new_palette, 1);
-
-   png_free(png_ptr, png_ptr->chunkdata);
-   png_ptr->chunkdata = NULL;
-   png_free(png_ptr, new_palette.entries);
-}
-#endif /* PNG_READ_sPLT_SUPPORTED */
-
-#ifdef PNG_READ_tRNS_SUPPORTED
-void /* PRIVATE */
-png_handle_tRNS(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
-{
-   png_byte readbuf[PNG_MAX_PALETTE_LENGTH];
-
-   png_debug(1, "in png_handle_tRNS");
-
-   if (!(png_ptr->mode & PNG_HAVE_IHDR))
-      png_error(png_ptr, "Missing IHDR before tRNS");
-
-   else if (png_ptr->mode & PNG_HAVE_IDAT)
-   {
-      png_warning(png_ptr, "Invalid tRNS after IDAT");
-      png_crc_finish(png_ptr, length);
-      return;
-   }
-
-   else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_tRNS))
-   {
-      png_warning(png_ptr, "Duplicate tRNS chunk");
-      png_crc_finish(png_ptr, length);
-      return;
-   }
-
-   if (png_ptr->color_type == PNG_COLOR_TYPE_GRAY)
-   {
-      png_byte buf[2];
-
-      if (length != 2)
-      {
-         png_warning(png_ptr, "Incorrect tRNS chunk length");
-         png_crc_finish(png_ptr, length);
-         return;
-      }
-
-      png_crc_read(png_ptr, buf, 2);
-      png_ptr->num_trans = 1;
-      png_ptr->trans_color.gray = png_get_uint_16(buf);
-   }
-
-   else if (png_ptr->color_type == PNG_COLOR_TYPE_RGB)
-   {
-      png_byte buf[6];
-
-      if (length != 6)
-      {
-         png_warning(png_ptr, "Incorrect tRNS chunk length");
-         png_crc_finish(png_ptr, length);
-         return;
-      }
-
-      png_crc_read(png_ptr, buf, (png_size_t)length);
-      png_ptr->num_trans = 1;
-      png_ptr->trans_color.red = png_get_uint_16(buf);
-      png_ptr->trans_color.green = png_get_uint_16(buf + 2);
-      png_ptr->trans_color.blue = png_get_uint_16(buf + 4);
-   }
-
-   else if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
-   {
-      if (!(png_ptr->mode & PNG_HAVE_PLTE))
-      {
-         /* Should be an error, but we can cope with it. */
-         png_warning(png_ptr, "Missing PLTE before tRNS");
-      }
-
-      if (length > (png_uint_32)png_ptr->num_palette ||
-          length > PNG_MAX_PALETTE_LENGTH)
-      {
-         png_warning(png_ptr, "Incorrect tRNS chunk length");
-         png_crc_finish(png_ptr, length);
-         return;
-      }
-
-      if (length == 0)
-      {
-         png_warning(png_ptr, "Zero length tRNS chunk");
-         png_crc_finish(png_ptr, length);
-         return;
-      }
-
-      png_crc_read(png_ptr, readbuf, (png_size_t)length);
-      png_ptr->num_trans = (png_uint_16)length;
-   }
-
-   else
-   {
-      png_warning(png_ptr, "tRNS chunk not allowed with alpha channel");
-      png_crc_finish(png_ptr, length);
-      return;
-   }
-
-   if (png_crc_finish(png_ptr, 0))
-   {
-      png_ptr->num_trans = 0;
-      return;
-   }
-
-   png_set_tRNS(png_ptr, info_ptr, readbuf, png_ptr->num_trans,
-       &(png_ptr->trans_color));
-}
-#endif
-
-#ifdef PNG_READ_bKGD_SUPPORTED
-void /* PRIVATE */
-png_handle_bKGD(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
-{
-   png_size_t truelen;
-   png_byte buf[6];
-
-   png_debug(1, "in png_handle_bKGD");
-
-   if (!(png_ptr->mode & PNG_HAVE_IHDR))
-      png_error(png_ptr, "Missing IHDR before bKGD");
-
-   else if (png_ptr->mode & PNG_HAVE_IDAT)
-   {
-      png_warning(png_ptr, "Invalid bKGD after IDAT");
-      png_crc_finish(png_ptr, length);
-      return;
-   }
-
-   else if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE &&
-       !(png_ptr->mode & PNG_HAVE_PLTE))
-   {
-      png_warning(png_ptr, "Missing PLTE before bKGD");
-      png_crc_finish(png_ptr, length);
-      return;
-   }
-
-   else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_bKGD))
-   {
-      png_warning(png_ptr, "Duplicate bKGD chunk");
-      png_crc_finish(png_ptr, length);
-      return;
-   }
-
-   if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
-      truelen = 1;
-
-   else if (png_ptr->color_type & PNG_COLOR_MASK_COLOR)
-      truelen = 6;
-
-   else
-      truelen = 2;
-
-   if (length != truelen)
-   {
-      png_warning(png_ptr, "Incorrect bKGD chunk length");
-      png_crc_finish(png_ptr, length);
-      return;
-   }
-
-   png_crc_read(png_ptr, buf, truelen);
-
-   if (png_crc_finish(png_ptr, 0))
-      return;
-
-   /* We convert the index value into RGB components so that we can allow
-    * arbitrary RGB values for background when we have transparency, and
-    * so it is easy to determine the RGB values of the background color
-    * from the info_ptr struct.
-    */
-   if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
-   {
-      png_ptr->background.index = buf[0];
-
-      if (info_ptr && info_ptr->num_palette)
-      {
-         if (buf[0] >= info_ptr->num_palette)
-         {
-            png_warning(png_ptr, "Incorrect bKGD chunk index value");
-            return;
-         }
-
-         png_ptr->background.red =
-             (png_uint_16)png_ptr->palette[buf[0]].red;
-
-         png_ptr->background.green =
-             (png_uint_16)png_ptr->palette[buf[0]].green;
-
-         png_ptr->background.blue =
-             (png_uint_16)png_ptr->palette[buf[0]].blue;
-      }
-   }
-
-   else if (!(png_ptr->color_type & PNG_COLOR_MASK_COLOR)) /* GRAY */
-   {
-      png_ptr->background.red =
-      png_ptr->background.green =
-      png_ptr->background.blue =
-      png_ptr->background.gray = png_get_uint_16(buf);
-   }
-
-   else
-   {
-      png_ptr->background.red = png_get_uint_16(buf);
-      png_ptr->background.green = png_get_uint_16(buf + 2);
-      png_ptr->background.blue = png_get_uint_16(buf + 4);
-   }
-
-   png_set_bKGD(png_ptr, info_ptr, &(png_ptr->background));
-}
-#endif
-
-#ifdef PNG_READ_hIST_SUPPORTED
-void /* PRIVATE */
-png_handle_hIST(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
-{
-   unsigned int num, i;
-   png_uint_16 readbuf[PNG_MAX_PALETTE_LENGTH];
-
-   png_debug(1, "in png_handle_hIST");
-
-   if (!(png_ptr->mode & PNG_HAVE_IHDR))
-      png_error(png_ptr, "Missing IHDR before hIST");
-
-   else if (png_ptr->mode & PNG_HAVE_IDAT)
-   {
-      png_warning(png_ptr, "Invalid hIST after IDAT");
-      png_crc_finish(png_ptr, length);
-      return;
-   }
-
-   else if (!(png_ptr->mode & PNG_HAVE_PLTE))
-   {
-      png_warning(png_ptr, "Missing PLTE before hIST");
-      png_crc_finish(png_ptr, length);
-      return;
-   }
-
-   else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_hIST))
-   {
-      png_warning(png_ptr, "Duplicate hIST chunk");
-      png_crc_finish(png_ptr, length);
-      return;
-   }
-
-   num = length / 2 ;
-
-   if (num != (unsigned int)png_ptr->num_palette || num >
-       (unsigned int)PNG_MAX_PALETTE_LENGTH)
-   {
-      png_warning(png_ptr, "Incorrect hIST chunk length");
-      png_crc_finish(png_ptr, length);
-      return;
-   }
-
-   for (i = 0; i < num; i++)
-   {
-      png_byte buf[2];
-
-      png_crc_read(png_ptr, buf, 2);
-      readbuf[i] = png_get_uint_16(buf);
-   }
-
-   if (png_crc_finish(png_ptr, 0))
-      return;
-
-   png_set_hIST(png_ptr, info_ptr, readbuf);
-}
-#endif
-
-#ifdef PNG_READ_pHYs_SUPPORTED
-void /* PRIVATE */
-png_handle_pHYs(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
-{
-   png_byte buf[9];
-   png_uint_32 res_x, res_y;
-   int unit_type;
-
-   png_debug(1, "in png_handle_pHYs");
-
-   if (!(png_ptr->mode & PNG_HAVE_IHDR))
-      png_error(png_ptr, "Missing IHDR before pHYs");
-
-   else if (png_ptr->mode & PNG_HAVE_IDAT)
-   {
-      png_warning(png_ptr, "Invalid pHYs after IDAT");
-      png_crc_finish(png_ptr, length);
-      return;
-   }
-
-   else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_pHYs))
-   {
-      png_warning(png_ptr, "Duplicate pHYs chunk");
-      png_crc_finish(png_ptr, length);
-      return;
-   }
-
-   if (length != 9)
-   {
-      png_warning(png_ptr, "Incorrect pHYs chunk length");
-      png_crc_finish(png_ptr, length);
-      return;
-   }
-
-   png_crc_read(png_ptr, buf, 9);
-
-   if (png_crc_finish(png_ptr, 0))
-      return;
-
-   res_x = png_get_uint_32(buf);
-   res_y = png_get_uint_32(buf + 4);
-   unit_type = buf[8];
-   png_set_pHYs(png_ptr, info_ptr, res_x, res_y, unit_type);
-}
-#endif
-
-#ifdef PNG_READ_oFFs_SUPPORTED
-void /* PRIVATE */
-png_handle_oFFs(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
-{
-   png_byte buf[9];
-   png_int_32 offset_x, offset_y;
-   int unit_type;
-
-   png_debug(1, "in png_handle_oFFs");
-
-   if (!(png_ptr->mode & PNG_HAVE_IHDR))
-      png_error(png_ptr, "Missing IHDR before oFFs");
-
-   else if (png_ptr->mode & PNG_HAVE_IDAT)
-   {
-      png_warning(png_ptr, "Invalid oFFs after IDAT");
-      png_crc_finish(png_ptr, length);
-      return;
-   }
-
-   else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_oFFs))
-   {
-      png_warning(png_ptr, "Duplicate oFFs chunk");
-      png_crc_finish(png_ptr, length);
-      return;
-   }
-
-   if (length != 9)
-   {
-      png_warning(png_ptr, "Incorrect oFFs chunk length");
-      png_crc_finish(png_ptr, length);
-      return;
-   }
-
-   png_crc_read(png_ptr, buf, 9);
-
-   if (png_crc_finish(png_ptr, 0))
-      return;
-
-   offset_x = png_get_int_32(buf);
-   offset_y = png_get_int_32(buf + 4);
-   unit_type = buf[8];
-   png_set_oFFs(png_ptr, info_ptr, offset_x, offset_y, unit_type);
-}
-#endif
-
-#ifdef PNG_READ_pCAL_SUPPORTED
-/* Read the pCAL chunk (described in the PNG Extensions document) */
-void /* PRIVATE */
-png_handle_pCAL(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
-{
-   png_int_32 X0, X1;
-   png_byte type, nparams;
-   png_charp buf, units, endptr;
-   png_charpp params;
-   png_size_t slength;
-   int i;
-
-   png_debug(1, "in png_handle_pCAL");
-
-   if (!(png_ptr->mode & PNG_HAVE_IHDR))
-      png_error(png_ptr, "Missing IHDR before pCAL");
-
-   else if (png_ptr->mode & PNG_HAVE_IDAT)
-   {
-      png_warning(png_ptr, "Invalid pCAL after IDAT");
-      png_crc_finish(png_ptr, length);
-      return;
-   }
-
-   else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_pCAL))
-   {
-      png_warning(png_ptr, "Duplicate pCAL chunk");
-      png_crc_finish(png_ptr, length);
-      return;
-   }
-
-   png_debug1(2, "Allocating and reading pCAL chunk data (%u bytes)",
-       length + 1);
-   png_free(png_ptr, png_ptr->chunkdata);
-   png_ptr->chunkdata = (png_charp)png_malloc_warn(png_ptr, length + 1);
-
-   if (png_ptr->chunkdata == NULL)
-   {
-      png_warning(png_ptr, "No memory for pCAL purpose");
-      return;
-   }
-
-   slength = (png_size_t)length;
-   png_crc_read(png_ptr, (png_bytep)png_ptr->chunkdata, slength);
-
-   if (png_crc_finish(png_ptr, 0))
-   {
-      png_free(png_ptr, png_ptr->chunkdata);
-      png_ptr->chunkdata = NULL;
-      return;
-   }
-
-   png_ptr->chunkdata[slength] = 0x00; /* Null terminate the last string */
-
-   png_debug(3, "Finding end of pCAL purpose string");
-   for (buf = png_ptr->chunkdata; *buf; buf++)
-      /* Empty loop */ ;
-
-   endptr = png_ptr->chunkdata + slength;
-
-   /* We need to have at least 12 bytes after the purpose string
-    * in order to get the parameter information.
-    */
-   if (endptr <= buf + 12)
-   {
-      png_warning(png_ptr, "Invalid pCAL data");
-      png_free(png_ptr, png_ptr->chunkdata);
-      png_ptr->chunkdata = NULL;
-      return;
-   }
-
-   png_debug(3, "Reading pCAL X0, X1, type, nparams, and units");
-   X0 = png_get_int_32((png_bytep)buf+1);
-   X1 = png_get_int_32((png_bytep)buf+5);
-   type = buf[9];
-   nparams = buf[10];
-   units = buf + 11;
-
-   png_debug(3, "Checking pCAL equation type and number of parameters");
-   /* Check that we have the right number of parameters for known
-    * equation types.
-    */
-   if ((type == PNG_EQUATION_LINEAR && nparams != 2) ||
-       (type == PNG_EQUATION_BASE_E && nparams != 3) ||
-       (type == PNG_EQUATION_ARBITRARY && nparams != 3) ||
-       (type == PNG_EQUATION_HYPERBOLIC && nparams != 4))
-   {
-      png_warning(png_ptr, "Invalid pCAL parameters for equation type");
-      png_free(png_ptr, png_ptr->chunkdata);
-      png_ptr->chunkdata = NULL;
-      return;
-   }
-
-   else if (type >= PNG_EQUATION_LAST)
-   {
-      png_warning(png_ptr, "Unrecognized equation type for pCAL chunk");
-   }
-
-   for (buf = units; *buf; buf++)
-      /* Empty loop to move past the units string. */ ;
-
-   png_debug(3, "Allocating pCAL parameters array");
-
-   params = (png_charpp)png_malloc_warn(png_ptr,
-       (png_size_t)(nparams * png_sizeof(png_charp)));
-
-   if (params == NULL)
-   {
-      png_free(png_ptr, png_ptr->chunkdata);
-      png_ptr->chunkdata = NULL;
-      png_warning(png_ptr, "No memory for pCAL params");
-      return;
-   }
-
-   /* Get pointers to the start of each parameter string. */
-   for (i = 0; i < (int)nparams; i++)
-   {
-      buf++; /* Skip the null string terminator from previous parameter. */
-
-      png_debug1(3, "Reading pCAL parameter %d", i);
-
-      for (params[i] = buf; buf <= endptr && *buf != 0x00; buf++)
-         /* Empty loop to move past each parameter string */ ;
-
-      /* Make sure we haven't run out of data yet */
-      if (buf > endptr)
-      {
-         png_warning(png_ptr, "Invalid pCAL data");
-         png_free(png_ptr, png_ptr->chunkdata);
-         png_ptr->chunkdata = NULL;
-         png_free(png_ptr, params);
-         return;
-      }
-   }
-
-   png_set_pCAL(png_ptr, info_ptr, png_ptr->chunkdata, X0, X1, type, nparams,
-      units, params);
-
-   png_free(png_ptr, png_ptr->chunkdata);
-   png_ptr->chunkdata = NULL;
-   png_free(png_ptr, params);
-}
-#endif
-
-#ifdef PNG_READ_sCAL_SUPPORTED
-/* Read the sCAL chunk */
-void /* PRIVATE */
-png_handle_sCAL(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
-{
-   png_size_t slength, i;
-   int state;
-
-   png_debug(1, "in png_handle_sCAL");
-
-   if (!(png_ptr->mode & PNG_HAVE_IHDR))
-      png_error(png_ptr, "Missing IHDR before sCAL");
-
-   else if (png_ptr->mode & PNG_HAVE_IDAT)
-   {
-      png_warning(png_ptr, "Invalid sCAL after IDAT");
-      png_crc_finish(png_ptr, length);
-      return;
-   }
-
-   else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_sCAL))
-   {
-      png_warning(png_ptr, "Duplicate sCAL chunk");
-      png_crc_finish(png_ptr, length);
-      return;
-   }
-
-   png_debug1(2, "Allocating and reading sCAL chunk data (%u bytes)",
-      length + 1);
-
-   png_ptr->chunkdata = (png_charp)png_malloc_warn(png_ptr, length + 1);
-
-   if (png_ptr->chunkdata == NULL)
-   {
-      png_warning(png_ptr, "Out of memory while processing sCAL chunk");
-      png_crc_finish(png_ptr, length);
-      return;
-   }
-
-   slength = (png_size_t)length;
-   png_crc_read(png_ptr, (png_bytep)png_ptr->chunkdata, slength);
-   png_ptr->chunkdata[slength] = 0x00; /* Null terminate the last string */
-
-   if (png_crc_finish(png_ptr, 0))
-   {
-      png_free(png_ptr, png_ptr->chunkdata);
-      png_ptr->chunkdata = NULL;
-      return;
-   }
-
-   /* Validate the unit. */
-   if (png_ptr->chunkdata[0] != 1 && png_ptr->chunkdata[0] != 2)
-   {
-      png_warning(png_ptr, "Invalid sCAL ignored: invalid unit");
-      png_free(png_ptr, png_ptr->chunkdata);
-      png_ptr->chunkdata = NULL;
-      return;
-   }
-
-   /* Validate the ASCII numbers, need two ASCII numbers separated by
-    * a '\0' and they need to fit exactly in the chunk data.
-    */
-   i = 0;
-   state = 0;
-
-   if (png_ptr->chunkdata[1] == 45 /* negative width */ ||
-       !png_check_fp_number(png_ptr->chunkdata, slength, &state, &i) ||
-       i >= slength || png_ptr->chunkdata[i++] != 0)
-      png_warning(png_ptr, "Invalid sCAL chunk ignored: bad width format");
-
-   else
-   {
-      png_size_t heighti = i;
-
-      if (png_ptr->chunkdata[i] == 45 /* negative height */ ||
-          !png_check_fp_number(png_ptr->chunkdata, slength, &state, &i) ||
-          i != slength)
-         png_warning(png_ptr, "Invalid sCAL chunk ignored: bad height format");
-
-      else
-         /* This is the (only) success case. */
-         png_set_sCAL_s(png_ptr, info_ptr, png_ptr->chunkdata[0],
-            png_ptr->chunkdata+1, png_ptr->chunkdata+heighti);
-   }
-
-   /* Clean up - just free the temporarily allocated buffer. */
-   png_free(png_ptr, png_ptr->chunkdata);
-   png_ptr->chunkdata = NULL;
-}
-#endif
-
-#ifdef PNG_READ_tIME_SUPPORTED
-void /* PRIVATE */
-png_handle_tIME(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
-{
-   png_byte buf[7];
-   png_time mod_time;
-
-   png_debug(1, "in png_handle_tIME");
-
-   if (!(png_ptr->mode & PNG_HAVE_IHDR))
-      png_error(png_ptr, "Out of place tIME chunk");
-
-   else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_tIME))
-   {
-      png_warning(png_ptr, "Duplicate tIME chunk");
-      png_crc_finish(png_ptr, length);
-      return;
-   }
-
-   if (png_ptr->mode & PNG_HAVE_IDAT)
-      png_ptr->mode |= PNG_AFTER_IDAT;
-
-   if (length != 7)
-   {
-      png_warning(png_ptr, "Incorrect tIME chunk length");
-      png_crc_finish(png_ptr, length);
-      return;
-   }
-
-   png_crc_read(png_ptr, buf, 7);
-
-   if (png_crc_finish(png_ptr, 0))
-      return;
-
-   mod_time.second = buf[6];
-   mod_time.minute = buf[5];
-   mod_time.hour = buf[4];
-   mod_time.day = buf[3];
-   mod_time.month = buf[2];
-   mod_time.year = png_get_uint_16(buf);
-
-   png_set_tIME(png_ptr, info_ptr, &mod_time);
-}
-#endif
-
-#ifdef PNG_READ_tEXt_SUPPORTED
-/* Note: this does not properly handle chunks that are > 64K under DOS */
-void /* PRIVATE */
-png_handle_tEXt(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
-{
-   png_textp text_ptr;
-   png_charp key;
-   png_charp text;
-   png_uint_32 skip = 0;
-   png_size_t slength;
-   int ret;
-
-   png_debug(1, "in png_handle_tEXt");
-
-#ifdef PNG_USER_LIMITS_SUPPORTED
-   if (png_ptr->user_chunk_cache_max != 0)
-   {
-      if (png_ptr->user_chunk_cache_max == 1)
-      {
-         png_crc_finish(png_ptr, length);
-         return;
-      }
-
-      if (--png_ptr->user_chunk_cache_max == 1)
-      {
-         png_warning(png_ptr, "No space in chunk cache for tEXt");
-         png_crc_finish(png_ptr, length);
-         return;
-      }
-   }
-#endif
-
-   if (!(png_ptr->mode & PNG_HAVE_IHDR))
-      png_error(png_ptr, "Missing IHDR before tEXt");
-
-   if (png_ptr->mode & PNG_HAVE_IDAT)
-      png_ptr->mode |= PNG_AFTER_IDAT;
-
-#ifdef PNG_MAX_MALLOC_64K
-   if (length > (png_uint_32)65535L)
-   {
-      png_warning(png_ptr, "tEXt chunk too large to fit in memory");
-      skip = length - (png_uint_32)65535L;
-      length = (png_uint_32)65535L;
-   }
-#endif
-
-   png_free(png_ptr, png_ptr->chunkdata);
-
-   png_ptr->chunkdata = (png_charp)png_malloc_warn(png_ptr, length + 1);
-
-   if (png_ptr->chunkdata == NULL)
-   {
-     png_warning(png_ptr, "No memory to process text chunk");
-     return;
-   }
-
-   slength = (png_size_t)length;
-   png_crc_read(png_ptr, (png_bytep)png_ptr->chunkdata, slength);
-
-   if (png_crc_finish(png_ptr, skip))
-   {
-      png_free(png_ptr, png_ptr->chunkdata);
-      png_ptr->chunkdata = NULL;
-      return;
-   }
-
-   key = png_ptr->chunkdata;
-
-   key[slength] = 0x00;
-
-   for (text = key; *text; text++)
-      /* Empty loop to find end of key */ ;
-
-   if (text != key + slength)
-      text++;
-
-   text_ptr = (png_textp)png_malloc_warn(png_ptr,
-       png_sizeof(png_text));
-
-   if (text_ptr == NULL)
-   {
-      png_warning(png_ptr, "Not enough memory to process text chunk");
-      png_free(png_ptr, png_ptr->chunkdata);
-      png_ptr->chunkdata = NULL;
-      return;
-   }
-
-   text_ptr->compression = PNG_TEXT_COMPRESSION_NONE;
-   text_ptr->key = key;
-   text_ptr->lang = NULL;
-   text_ptr->lang_key = NULL;
-   text_ptr->itxt_length = 0;
-   text_ptr->text = text;
-   text_ptr->text_length = png_strlen(text);
-
-   ret = png_set_text_2(png_ptr, info_ptr, text_ptr, 1);
-
-   png_free(png_ptr, png_ptr->chunkdata);
-   png_ptr->chunkdata = NULL;
-   png_free(png_ptr, text_ptr);
-
-   if (ret)
-      png_warning(png_ptr, "Insufficient memory to process text chunk");
-}
-#endif
-
-#ifdef PNG_READ_zTXt_SUPPORTED
-/* Note: this does not correctly handle chunks that are > 64K under DOS */
-void /* PRIVATE */
-png_handle_zTXt(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
-{
-   png_textp text_ptr;
-   png_charp text;
-   int comp_type;
-   int ret;
-   png_size_t slength, prefix_len, data_len;
-
-   png_debug(1, "in png_handle_zTXt");
-
-#ifdef PNG_USER_LIMITS_SUPPORTED
-   if (png_ptr->user_chunk_cache_max != 0)
-   {
-      if (png_ptr->user_chunk_cache_max == 1)
-      {
-         png_crc_finish(png_ptr, length);
-         return;
-      }
-
-      if (--png_ptr->user_chunk_cache_max == 1)
-      {
-         png_warning(png_ptr, "No space in chunk cache for zTXt");
-         png_crc_finish(png_ptr, length);
-         return;
-      }
-   }
-#endif
-
-   if (!(png_ptr->mode & PNG_HAVE_IHDR))
-      png_error(png_ptr, "Missing IHDR before zTXt");
-
-   if (png_ptr->mode & PNG_HAVE_IDAT)
-      png_ptr->mode |= PNG_AFTER_IDAT;
-
-#ifdef PNG_MAX_MALLOC_64K
-   /* We will no doubt have problems with chunks even half this size, but
-    * there is no hard and fast rule to tell us where to stop.
-    */
-   if (length > (png_uint_32)65535L)
-   {
-      png_warning(png_ptr, "zTXt chunk too large to fit in memory");
-      png_crc_finish(png_ptr, length);
-      return;
-   }
-#endif
-
-   png_free(png_ptr, png_ptr->chunkdata);
-   png_ptr->chunkdata = (png_charp)png_malloc_warn(png_ptr, length + 1);
-
-   if (png_ptr->chunkdata == NULL)
-   {
-      png_warning(png_ptr, "Out of memory processing zTXt chunk");
-      return;
-   }
-
-   slength = (png_size_t)length;
-   png_crc_read(png_ptr, (png_bytep)png_ptr->chunkdata, slength);
-
-   if (png_crc_finish(png_ptr, 0))
-   {
-      png_free(png_ptr, png_ptr->chunkdata);
-      png_ptr->chunkdata = NULL;
-      return;
-   }
-
-   png_ptr->chunkdata[slength] = 0x00;
-
-   for (text = png_ptr->chunkdata; *text; text++)
-      /* Empty loop */ ;
-
-   /* zTXt must have some text after the chunkdataword */
-   if (text >= png_ptr->chunkdata + slength - 2)
-   {
-      png_warning(png_ptr, "Truncated zTXt chunk");
-      png_free(png_ptr, png_ptr->chunkdata);
-      png_ptr->chunkdata = NULL;
-      return;
-   }
-
-   else
-   {
-       comp_type = *(++text);
-
-       if (comp_type != PNG_TEXT_COMPRESSION_zTXt)
-       {
-          png_warning(png_ptr, "Unknown compression type in zTXt chunk");
-          comp_type = PNG_TEXT_COMPRESSION_zTXt;
-       }
-
-       text++;        /* Skip the compression_method byte */
-   }
-
-   prefix_len = text - png_ptr->chunkdata;
-
-   png_decompress_chunk(png_ptr, comp_type,
-       (png_size_t)length, prefix_len, &data_len);
-
-   text_ptr = (png_textp)png_malloc_warn(png_ptr,
-       png_sizeof(png_text));
-
-   if (text_ptr == NULL)
-   {
-      png_warning(png_ptr, "Not enough memory to process zTXt chunk");
-      png_free(png_ptr, png_ptr->chunkdata);
-      png_ptr->chunkdata = NULL;
-      return;
-   }
-
-   text_ptr->compression = comp_type;
-   text_ptr->key = png_ptr->chunkdata;
-   text_ptr->lang = NULL;
-   text_ptr->lang_key = NULL;
-   text_ptr->itxt_length = 0;
-   text_ptr->text = png_ptr->chunkdata + prefix_len;
-   text_ptr->text_length = data_len;
-
-   ret = png_set_text_2(png_ptr, info_ptr, text_ptr, 1);
-
-   png_free(png_ptr, text_ptr);
-   png_free(png_ptr, png_ptr->chunkdata);
-   png_ptr->chunkdata = NULL;
-
-   if (ret)
-      png_error(png_ptr, "Insufficient memory to store zTXt chunk");
-}
-#endif
-
-#ifdef PNG_READ_iTXt_SUPPORTED
-/* Note: this does not correctly handle chunks that are > 64K under DOS */
-void /* PRIVATE */
-png_handle_iTXt(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
-{
-   png_textp text_ptr;
-   png_charp key, lang, text, lang_key;
-   int comp_flag;
-   int comp_type = 0;
-   int ret;
-   png_size_t slength, prefix_len, data_len;
-
-   png_debug(1, "in png_handle_iTXt");
-
-#ifdef PNG_USER_LIMITS_SUPPORTED
-   if (png_ptr->user_chunk_cache_max != 0)
-   {
-      if (png_ptr->user_chunk_cache_max == 1)
-      {
-         png_crc_finish(png_ptr, length);
-         return;
-      }
-
-      if (--png_ptr->user_chunk_cache_max == 1)
-      {
-         png_warning(png_ptr, "No space in chunk cache for iTXt");
-         png_crc_finish(png_ptr, length);
-         return;
-      }
-   }
-#endif
-
-   if (!(png_ptr->mode & PNG_HAVE_IHDR))
-      png_error(png_ptr, "Missing IHDR before iTXt");
-
-   if (png_ptr->mode & PNG_HAVE_IDAT)
-      png_ptr->mode |= PNG_AFTER_IDAT;
-
-#ifdef PNG_MAX_MALLOC_64K
-   /* We will no doubt have problems with chunks even half this size, but
-    * there is no hard and fast rule to tell us where to stop.
-    */
-   if (length > (png_uint_32)65535L)
-   {
-      png_warning(png_ptr, "iTXt chunk too large to fit in memory");
-      png_crc_finish(png_ptr, length);
-      return;
-   }
-#endif
-
-   png_free(png_ptr, png_ptr->chunkdata);
-   png_ptr->chunkdata = (png_charp)png_malloc_warn(png_ptr, length + 1);
-
-   if (png_ptr->chunkdata == NULL)
-   {
-      png_warning(png_ptr, "No memory to process iTXt chunk");
-      return;
-   }
-
-   slength = (png_size_t)length;
-   png_crc_read(png_ptr, (png_bytep)png_ptr->chunkdata, slength);
-
-   if (png_crc_finish(png_ptr, 0))
-   {
-      png_free(png_ptr, png_ptr->chunkdata);
-      png_ptr->chunkdata = NULL;
-      return;
-   }
-
-   png_ptr->chunkdata[slength] = 0x00;
-
-   for (lang = png_ptr->chunkdata; *lang; lang++)
-      /* Empty loop */ ;
-
-   lang++;        /* Skip NUL separator */
-
-   /* iTXt must have a language tag (possibly empty), two compression bytes,
-    * translated keyword (possibly empty), and possibly some text after the
-    * keyword
-    */
-
-   if (lang >= png_ptr->chunkdata + slength - 3)
-   {
-      png_warning(png_ptr, "Truncated iTXt chunk");
-      png_free(png_ptr, png_ptr->chunkdata);
-      png_ptr->chunkdata = NULL;
-      return;
-   }
-
-   else
-   {
-      comp_flag = *lang++;
-      comp_type = *lang++;
-   }
-
-   for (lang_key = lang; *lang_key; lang_key++)
-      /* Empty loop */ ;
-
-   lang_key++;        /* Skip NUL separator */
-
-   if (lang_key >= png_ptr->chunkdata + slength)
-   {
-      png_warning(png_ptr, "Truncated iTXt chunk");
-      png_free(png_ptr, png_ptr->chunkdata);
-      png_ptr->chunkdata = NULL;
-      return;
-   }
-
-   for (text = lang_key; *text; text++)
-      /* Empty loop */ ;
-
-   text++;        /* Skip NUL separator */
-
-   if (text >= png_ptr->chunkdata + slength)
-   {
-      png_warning(png_ptr, "Malformed iTXt chunk");
-      png_free(png_ptr, png_ptr->chunkdata);
-      png_ptr->chunkdata = NULL;
-      return;
-   }
-
-   prefix_len = text - png_ptr->chunkdata;
-
-   key=png_ptr->chunkdata;
-
-   if (comp_flag)
-      png_decompress_chunk(png_ptr, comp_type,
-          (size_t)length, prefix_len, &data_len);
-
-   else
-      data_len = png_strlen(png_ptr->chunkdata + prefix_len);
-
-   text_ptr = (png_textp)png_malloc_warn(png_ptr,
-       png_sizeof(png_text));
-
-   if (text_ptr == NULL)
-   {
-      png_warning(png_ptr, "Not enough memory to process iTXt chunk");
-      png_free(png_ptr, png_ptr->chunkdata);
-      png_ptr->chunkdata = NULL;
-      return;
-   }
-
-   text_ptr->compression = (int)comp_flag + 1;
-   text_ptr->lang_key = png_ptr->chunkdata + (lang_key - key);
-   text_ptr->lang = png_ptr->chunkdata + (lang - key);
-   text_ptr->itxt_length = data_len;
-   text_ptr->text_length = 0;
-   text_ptr->key = png_ptr->chunkdata;
-   text_ptr->text = png_ptr->chunkdata + prefix_len;
-
-   ret = png_set_text_2(png_ptr, info_ptr, text_ptr, 1);
-
-   png_free(png_ptr, text_ptr);
-   png_free(png_ptr, png_ptr->chunkdata);
-   png_ptr->chunkdata = NULL;
-
-   if (ret)
-      png_error(png_ptr, "Insufficient memory to store iTXt chunk");
-}
-#endif
-
-/* This function is called when we haven't found a handler for a
- * chunk.  If there isn't a problem with the chunk itself (ie bad
- * chunk name, CRC, or a critical chunk), the chunk is silently ignored
- * -- unless the PNG_FLAG_UNKNOWN_CHUNKS_SUPPORTED flag is on in which
- * case it will be saved away to be written out later.
- */
-void /* PRIVATE */
-png_handle_unknown(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
-{
-   png_uint_32 skip = 0;
-
-   png_debug(1, "in png_handle_unknown");
-
-#ifdef PNG_USER_LIMITS_SUPPORTED
-   if (png_ptr->user_chunk_cache_max != 0)
-   {
-      if (png_ptr->user_chunk_cache_max == 1)
-      {
-         png_crc_finish(png_ptr, length);
-         return;
-      }
-
-      if (--png_ptr->user_chunk_cache_max == 1)
-      {
-         png_warning(png_ptr, "No space in chunk cache for unknown chunk");
-         png_crc_finish(png_ptr, length);
-         return;
-      }
-   }
-#endif
-
-   if (png_ptr->mode & PNG_HAVE_IDAT)
-   {
-      PNG_IDAT;
-
-      if (png_memcmp(png_ptr->chunk_name, png_IDAT, 4))  /* Not an IDAT */
-         png_ptr->mode |= PNG_AFTER_IDAT;
-   }
-
-   if (!(png_ptr->chunk_name[0] & 0x20))
-   {
-#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
-      if (png_handle_as_unknown(png_ptr, png_ptr->chunk_name) !=
-          PNG_HANDLE_CHUNK_ALWAYS
-#ifdef PNG_READ_USER_CHUNKS_SUPPORTED
-          && png_ptr->read_user_chunk_fn == NULL
-#endif
-          )
-#endif
-         png_chunk_error(png_ptr, "unknown critical chunk");
-   }
-
-#ifdef PNG_READ_UNKNOWN_CHUNKS_SUPPORTED
-   if ((png_ptr->flags & PNG_FLAG_KEEP_UNKNOWN_CHUNKS)
-#ifdef PNG_READ_USER_CHUNKS_SUPPORTED
-       || (png_ptr->read_user_chunk_fn != NULL)
-#endif
-       )
-   {
-#ifdef PNG_MAX_MALLOC_64K
-      if (length > (png_uint_32)65535L)
-      {
-         png_warning(png_ptr, "unknown chunk too large to fit in memory");
-         skip = length - (png_uint_32)65535L;
-         length = (png_uint_32)65535L;
-      }
-#endif
-
-      png_memcpy((png_charp)png_ptr->unknown_chunk.name,
-          (png_charp)png_ptr->chunk_name,
-          png_sizeof(png_ptr->unknown_chunk.name));
-
-      png_ptr->unknown_chunk.name[png_sizeof(png_ptr->unknown_chunk.name)-1]
-          = '\0';
-
-      png_ptr->unknown_chunk.size = (png_size_t)length;
-
-      if (length == 0)
-         png_ptr->unknown_chunk.data = NULL;
-
-      else
-      {
-         png_ptr->unknown_chunk.data = (png_bytep)png_malloc(png_ptr, length);
-         png_crc_read(png_ptr, (png_bytep)png_ptr->unknown_chunk.data, length);
-      }
-
-#ifdef PNG_READ_USER_CHUNKS_SUPPORTED
-      if (png_ptr->read_user_chunk_fn != NULL)
-      {
-         /* Callback to user unknown chunk handler */
-         int ret;
-
-         ret = (*(png_ptr->read_user_chunk_fn))
-             (png_ptr, &png_ptr->unknown_chunk);
-
-         if (ret < 0)
-            png_chunk_error(png_ptr, "error in user chunk");
-
-         if (ret == 0)
-         {
-            if (!(png_ptr->chunk_name[0] & 0x20))
-            {
-#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
-               if (png_handle_as_unknown(png_ptr, png_ptr->chunk_name) !=
-                   PNG_HANDLE_CHUNK_ALWAYS)
-#endif
-                  png_chunk_error(png_ptr, "unknown critical chunk");
-            }
-
-            png_set_unknown_chunks(png_ptr, info_ptr,
-                &png_ptr->unknown_chunk, 1);
-         }
-      }
-
-      else
-#endif
-         png_set_unknown_chunks(png_ptr, info_ptr, &png_ptr->unknown_chunk, 1);
-
-      png_free(png_ptr, png_ptr->unknown_chunk.data);
-      png_ptr->unknown_chunk.data = NULL;
-   }
-
-   else
-#endif
-      skip = length;
-
-   png_crc_finish(png_ptr, skip);
-
-#ifndef PNG_READ_USER_CHUNKS_SUPPORTED
-   PNG_UNUSED(info_ptr) /* Quiet compiler warnings about unused info_ptr */
-#endif
-}
-
-/* This function is called to verify that a chunk name is valid.
- * This function can't have the "critical chunk check" incorporated
- * into it, since in the future we will need to be able to call user
- * functions to handle unknown critical chunks after we check that
- * the chunk name itself is valid.
- */
-
-#define isnonalpha(c) ((c) < 65 || (c) > 122 || ((c) > 90 && (c) < 97))
-
-void /* PRIVATE */
-png_check_chunk_name(png_structp png_ptr, png_const_bytep chunk_name)
-{
-   png_debug(1, "in png_check_chunk_name");
-   if (isnonalpha(chunk_name[0]) || isnonalpha(chunk_name[1]) ||
-       isnonalpha(chunk_name[2]) || isnonalpha(chunk_name[3]))
-   {
-      png_chunk_error(png_ptr, "invalid chunk type");
-   }
-}
-
-/* Combines the row recently read in with the existing pixels in the
- * row.  This routine takes care of alpha and transparency if requested.
- * This routine also handles the two methods of progressive display
- * of interlaced images, depending on the mask value.
- * The mask value describes which pixels are to be combined with
- * the row.  The pattern always repeats every 8 pixels, so just 8
- * bits are needed.  A one indicates the pixel is to be combined,
- * a zero indicates the pixel is to be skipped.  This is in addition
- * to any alpha or transparency value associated with the pixel.  If
- * you want all pixels to be combined, pass 0xff (255) in mask.
- */
-
-void /* PRIVATE */
-png_combine_row(png_structp png_ptr, png_bytep row, int mask)
-{
-   png_debug(1, "in png_combine_row");
-
-   if (mask == 0xff)
-   {
-      png_memcpy(row, png_ptr->row_buf + 1,
-          PNG_ROWBYTES(png_ptr->row_info.pixel_depth, png_ptr->width));
-   }
-
-   else
-   {
-      switch (png_ptr->row_info.pixel_depth)
-      {
-         case 1:
-         {
-            png_bytep sp = png_ptr->row_buf + 1;
-            png_bytep dp = row;
-            int s_inc, s_start, s_end;
-            int m = 0x80;
-            int shift;
-            png_uint_32 i;
-            png_uint_32 row_width = png_ptr->width;
-
-#ifdef PNG_READ_PACKSWAP_SUPPORTED
-            if (png_ptr->transformations & PNG_PACKSWAP)
-            {
-                s_start = 0;
-                s_end = 7;
-                s_inc = 1;
-            }
-
-            else
-#endif
-            {
-                s_start = 7;
-                s_end = 0;
-                s_inc = -1;
-            }
-
-            shift = s_start;
-
-            for (i = 0; i < row_width; i++)
-            {
-               if (m & mask)
-               {
-                  int value;
-
-                  value = (*sp >> shift) & 0x01;
-                  *dp &= (png_byte)((0x7f7f >> (7 - shift)) & 0xff);
-                  *dp |= (png_byte)(value << shift);
-               }
-
-               if (shift == s_end)
-               {
-                  shift = s_start;
-                  sp++;
-                  dp++;
-               }
-
-               else
-                  shift += s_inc;
-
-               if (m == 1)
-                  m = 0x80;
-
-               else
-                  m >>= 1;
-            }
-            break;
-         }
-
-         case 2:
-         {
-            png_bytep sp = png_ptr->row_buf + 1;
-            png_bytep dp = row;
-            int s_start, s_end, s_inc;
-            int m = 0x80;
-            int shift;
-            png_uint_32 i;
-            png_uint_32 row_width = png_ptr->width;
-            int value;
-
-#ifdef PNG_READ_PACKSWAP_SUPPORTED
-            if (png_ptr->transformations & PNG_PACKSWAP)
-            {
-               s_start = 0;
-               s_end = 6;
-               s_inc = 2;
-            }
-
-            else
-#endif
-            {
-               s_start = 6;
-               s_end = 0;
-               s_inc = -2;
-            }
-
-            shift = s_start;
-
-            for (i = 0; i < row_width; i++)
-            {
-               if (m & mask)
-               {
-                  value = (*sp >> shift) & 0x03;
-                  *dp &= (png_byte)((0x3f3f >> (6 - shift)) & 0xff);
-                  *dp |= (png_byte)(value << shift);
-               }
-
-               if (shift == s_end)
-               {
-                  shift = s_start;
-                  sp++;
-                  dp++;
-               }
-
-               else
-                  shift += s_inc;
-
-               if (m == 1)
-                  m = 0x80;
-
-               else
-                  m >>= 1;
-            }
-            break;
-         }
-
-         case 4:
-         {
-            png_bytep sp = png_ptr->row_buf + 1;
-            png_bytep dp = row;
-            int s_start, s_end, s_inc;
-            int m = 0x80;
-            int shift;
-            png_uint_32 i;
-            png_uint_32 row_width = png_ptr->width;
-            int value;
-
-#ifdef PNG_READ_PACKSWAP_SUPPORTED
-            if (png_ptr->transformations & PNG_PACKSWAP)
-            {
-               s_start = 0;
-               s_end = 4;
-               s_inc = 4;
-            }
-
-            else
-#endif
-            {
-               s_start = 4;
-               s_end = 0;
-               s_inc = -4;
-            }
-            shift = s_start;
-
-            for (i = 0; i < row_width; i++)
-            {
-               if (m & mask)
-               {
-                  value = (*sp >> shift) & 0xf;
-                  *dp &= (png_byte)((0xf0f >> (4 - shift)) & 0xff);
-                  *dp |= (png_byte)(value << shift);
-               }
-
-               if (shift == s_end)
-               {
-                  shift = s_start;
-                  sp++;
-                  dp++;
-               }
-
-               else
-                  shift += s_inc;
-
-               if (m == 1)
-                  m = 0x80;
-
-               else
-                  m >>= 1;
-            }
-            break;
-         }
-
-         default:
-         {
-            png_bytep sp = png_ptr->row_buf + 1;
-            png_bytep dp = row;
-            png_size_t pixel_bytes = (png_ptr->row_info.pixel_depth >> 3);
-            png_uint_32 i;
-            png_uint_32 row_width = png_ptr->width;
-            png_byte m = 0x80;
-
-            for (i = 0; i < row_width; i++)
-            {
-               if (m & mask)
-               {
-                  png_memcpy(dp, sp, pixel_bytes);
-               }
-
-               sp += pixel_bytes;
-               dp += pixel_bytes;
-
-               if (m == 1)
-                  m = 0x80;
-
-               else
-                  m >>= 1;
-            }
-            break;
-         }
-      }
-   }
-}
-
-#ifdef PNG_READ_INTERLACING_SUPPORTED
-void /* PRIVATE */
-png_do_read_interlace(png_structp png_ptr)
-{
-   png_row_infop row_info = &(png_ptr->row_info);
-   png_bytep row = png_ptr->row_buf + 1;
-   int pass = png_ptr->pass;
-   png_uint_32 transformations = png_ptr->transformations;
-   /* Arrays to facilitate easy interlacing - use pass (0 - 6) as index */
-   /* Offset to next interlace block */
-   PNG_CONST int png_pass_inc[7] = {8, 8, 4, 4, 2, 2, 1};
-
-   png_debug(1, "in png_do_read_interlace");
-   if (row != NULL && row_info != NULL)
-   {
-      png_uint_32 final_width;
-
-      final_width = row_info->width * png_pass_inc[pass];
-
-      switch (row_info->pixel_depth)
-      {
-         case 1:
-         {
-            png_bytep sp = row + (png_size_t)((row_info->width - 1) >> 3);
-            png_bytep dp = row + (png_size_t)((final_width - 1) >> 3);
-            int sshift, dshift;
-            int s_start, s_end, s_inc;
-            int jstop = png_pass_inc[pass];
-            png_byte v;
-            png_uint_32 i;
-            int j;
-
-#ifdef PNG_READ_PACKSWAP_SUPPORTED
-            if (transformations & PNG_PACKSWAP)
-            {
-                sshift = (int)((row_info->width + 7) & 0x07);
-                dshift = (int)((final_width + 7) & 0x07);
-                s_start = 7;
-                s_end = 0;
-                s_inc = -1;
-            }
-
-            else
-#endif
-            {
-                sshift = 7 - (int)((row_info->width + 7) & 0x07);
-                dshift = 7 - (int)((final_width + 7) & 0x07);
-                s_start = 0;
-                s_end = 7;
-                s_inc = 1;
-            }
-
-            for (i = 0; i < row_info->width; i++)
-            {
-               v = (png_byte)((*sp >> sshift) & 0x01);
-               for (j = 0; j < jstop; j++)
-               {
-                  *dp &= (png_byte)((0x7f7f >> (7 - dshift)) & 0xff);
-                  *dp |= (png_byte)(v << dshift);
-
-                  if (dshift == s_end)
-                  {
-                     dshift = s_start;
-                     dp--;
-                  }
-
-                  else
-                     dshift += s_inc;
-               }
-
-               if (sshift == s_end)
-               {
-                  sshift = s_start;
-                  sp--;
-               }
-
-               else
-                  sshift += s_inc;
-            }
-            break;
-         }
-
-         case 2:
-         {
-            png_bytep sp = row + (png_uint_32)((row_info->width - 1) >> 2);
-            png_bytep dp = row + (png_uint_32)((final_width - 1) >> 2);
-            int sshift, dshift;
-            int s_start, s_end, s_inc;
-            int jstop = png_pass_inc[pass];
-            png_uint_32 i;
-
-#ifdef PNG_READ_PACKSWAP_SUPPORTED
-            if (transformations & PNG_PACKSWAP)
-            {
-               sshift = (int)(((row_info->width + 3) & 0x03) << 1);
-               dshift = (int)(((final_width + 3) & 0x03) << 1);
-               s_start = 6;
-               s_end = 0;
-               s_inc = -2;
-            }
-
-            else
-#endif
-            {
-               sshift = (int)((3 - ((row_info->width + 3) & 0x03)) << 1);
-               dshift = (int)((3 - ((final_width + 3) & 0x03)) << 1);
-               s_start = 0;
-               s_end = 6;
-               s_inc = 2;
-            }
-
-            for (i = 0; i < row_info->width; i++)
-            {
-               png_byte v;
-               int j;
-
-               v = (png_byte)((*sp >> sshift) & 0x03);
-               for (j = 0; j < jstop; j++)
-               {
-                  *dp &= (png_byte)((0x3f3f >> (6 - dshift)) & 0xff);
-                  *dp |= (png_byte)(v << dshift);
-
-                  if (dshift == s_end)
-                  {
-                     dshift = s_start;
-                     dp--;
-                  }
-
-                  else
-                     dshift += s_inc;
-               }
-
-               if (sshift == s_end)
-               {
-                  sshift = s_start;
-                  sp--;
-               }
-
-               else
-                  sshift += s_inc;
-            }
-            break;
-         }
-
-         case 4:
-         {
-            png_bytep sp = row + (png_size_t)((row_info->width - 1) >> 1);
-            png_bytep dp = row + (png_size_t)((final_width - 1) >> 1);
-            int sshift, dshift;
-            int s_start, s_end, s_inc;
-            png_uint_32 i;
-            int jstop = png_pass_inc[pass];
-
-#ifdef PNG_READ_PACKSWAP_SUPPORTED
-            if (transformations & PNG_PACKSWAP)
-            {
-               sshift = (int)(((row_info->width + 1) & 0x01) << 2);
-               dshift = (int)(((final_width + 1) & 0x01) << 2);
-               s_start = 4;
-               s_end = 0;
-               s_inc = -4;
-            }
-
-            else
-#endif
-            {
-               sshift = (int)((1 - ((row_info->width + 1) & 0x01)) << 2);
-               dshift = (int)((1 - ((final_width + 1) & 0x01)) << 2);
-               s_start = 0;
-               s_end = 4;
-               s_inc = 4;
-            }
-
-            for (i = 0; i < row_info->width; i++)
-            {
-               png_byte v = (png_byte)((*sp >> sshift) & 0xf);
-               int j;
-
-               for (j = 0; j < jstop; j++)
-               {
-                  *dp &= (png_byte)((0xf0f >> (4 - dshift)) & 0xff);
-                  *dp |= (png_byte)(v << dshift);
-
-                  if (dshift == s_end)
-                  {
-                     dshift = s_start;
-                     dp--;
-                  }
-
-                  else
-                     dshift += s_inc;
-               }
-
-               if (sshift == s_end)
-               {
-                  sshift = s_start;
-                  sp--;
-               }
-
-               else
-                  sshift += s_inc;
-            }
-            break;
-         }
-         default:
-         {
-            png_size_t pixel_bytes = (row_info->pixel_depth >> 3);
-
-            png_bytep sp = row + (png_size_t)(row_info->width - 1)
-                * pixel_bytes;
-
-            png_bytep dp = row + (png_size_t)(final_width - 1) * pixel_bytes;
-
-            int jstop = png_pass_inc[pass];
-            png_uint_32 i;
-
-            for (i = 0; i < row_info->width; i++)
-            {
-               png_byte v[8];
-               int j;
-
-               png_memcpy(v, sp, pixel_bytes);
-
-               for (j = 0; j < jstop; j++)
-               {
-                  png_memcpy(dp, v, pixel_bytes);
-                  dp -= pixel_bytes;
-               }
-
-               sp -= pixel_bytes;
-            }
-            break;
-         }
-      }
-      row_info->width = final_width;
-      row_info->rowbytes = PNG_ROWBYTES(row_info->pixel_depth, final_width);
-   }
-#ifndef PNG_READ_PACKSWAP_SUPPORTED
-   PNG_UNUSED(transformations)  /* Silence compiler warning */
-#endif
-}
-#endif /* PNG_READ_INTERLACING_SUPPORTED */
-
-void /* PRIVATE */
-png_read_filter_row(png_structp png_ptr, png_row_infop row_info, png_bytep row,
-    png_const_bytep prev_row, int filter)
-{
-   png_debug(1, "in png_read_filter_row");
-   png_debug2(2, "row = %u, filter = %d", png_ptr->row_number, filter);
-   switch (filter)
-   {
-      case PNG_FILTER_VALUE_NONE:
-         break;
-
-      case PNG_FILTER_VALUE_SUB:
-      {
-         png_size_t i;
-         png_size_t istop = row_info->rowbytes;
-         unsigned int bpp = (row_info->pixel_depth + 7) >> 3;
-         png_bytep rp = row + bpp;
-         png_bytep lp = row;
-
-         for (i = bpp; i < istop; i++)
-         {
-            *rp = (png_byte)(((int)(*rp) + (int)(*lp++)) & 0xff);
-            rp++;
-         }
-         break;
-      }
-      case PNG_FILTER_VALUE_UP:
-      {
-         png_size_t i;
-         png_size_t istop = row_info->rowbytes;
-         png_bytep rp = row;
-         png_const_bytep pp = prev_row;
-
-         for (i = 0; i < istop; i++)
-         {
-            *rp = (png_byte)(((int)(*rp) + (int)(*pp++)) & 0xff);
-            rp++;
-         }
-         break;
-      }
-      case PNG_FILTER_VALUE_AVG:
-      {
-         png_size_t i;
-         png_bytep rp = row;
-         png_const_bytep pp = prev_row;
-         png_bytep lp = row;
-         unsigned int bpp = (row_info->pixel_depth + 7) >> 3;
-         png_size_t istop = row_info->rowbytes - bpp;
-
-         for (i = 0; i < bpp; i++)
-         {
-            *rp = (png_byte)(((int)(*rp) +
-                ((int)(*pp++) / 2 )) & 0xff);
-
-            rp++;
-         }
-
-         for (i = 0; i < istop; i++)
-         {
-            *rp = (png_byte)(((int)(*rp) +
-                (int)(*pp++ + *lp++) / 2 ) & 0xff);
-
-            rp++;
-         }
-         break;
-      }
-      case PNG_FILTER_VALUE_PAETH:
-      {
-         png_size_t i;
-         png_bytep rp = row;
-         png_const_bytep pp = prev_row;
-         png_bytep lp = row;
-         png_const_bytep cp = prev_row;
-         unsigned int bpp = (row_info->pixel_depth + 7) >> 3;
-         png_size_t istop=row_info->rowbytes - bpp;
-
-         for (i = 0; i < bpp; i++)
-         {
-            *rp = (png_byte)(((int)(*rp) + (int)(*pp++)) & 0xff);
-            rp++;
-         }
-
-         for (i = 0; i < istop; i++)   /* Use leftover rp,pp */
-         {
-            int a, b, c, pa, pb, pc, p;
-
-            a = *lp++;
-            b = *pp++;
-            c = *cp++;
-
-            p = b - c;
-            pc = a - c;
-
-#ifdef PNG_USE_ABS
-            pa = abs(p);
-            pb = abs(pc);
-            pc = abs(p + pc);
-#else
-            pa = p < 0 ? -p : p;
-            pb = pc < 0 ? -pc : pc;
-            pc = (p + pc) < 0 ? -(p + pc) : p + pc;
-#endif
-
-            /*
-               if (pa <= pb && pa <= pc)
-                  p = a;
-
-               else if (pb <= pc)
-                  p = b;
-
-               else
-                  p = c;
-             */
-
-            p = (pa <= pb && pa <= pc) ? a : (pb <= pc) ? b : c;
-
-            *rp = (png_byte)(((int)(*rp) + p) & 0xff);
-            rp++;
-         }
-         break;
-      }
-      default:
-         png_error(png_ptr, "Ignoring bad adaptive filter type");
-         /*NOT REACHED */
-         break;
-   }
-}
-
-#ifdef PNG_SEQUENTIAL_READ_SUPPORTED
-void /* PRIVATE */
-png_read_finish_row(png_structp png_ptr)
-{
-#ifdef PNG_READ_INTERLACING_SUPPORTED
-   /* Arrays to facilitate easy interlacing - use pass (0 - 6) as index */
-
-   /* Start of interlace block */
-   PNG_CONST int png_pass_start[7] = {0, 4, 0, 2, 0, 1, 0};
-
-   /* Offset to next interlace block */
-   PNG_CONST int png_pass_inc[7] = {8, 8, 4, 4, 2, 2, 1};
-
-   /* Start of interlace block in the y direction */
-   PNG_CONST int png_pass_ystart[7] = {0, 0, 4, 0, 2, 0, 1};
-
-   /* Offset to next interlace block in the y direction */
-   PNG_CONST int png_pass_yinc[7] = {8, 8, 8, 4, 4, 2, 2};
-#endif /* PNG_READ_INTERLACING_SUPPORTED */
-
-   png_debug(1, "in png_read_finish_row");
-   png_ptr->row_number++;
-   if (png_ptr->row_number < png_ptr->num_rows)
-      return;
-
-#ifdef PNG_READ_INTERLACING_SUPPORTED
-   if (png_ptr->interlaced)
-   {
-      png_ptr->row_number = 0;
-
-      png_memset(png_ptr->prev_row, 0, png_ptr->rowbytes + 1);
-
-      do
-      {
-         png_ptr->pass++;
-
-         if (png_ptr->pass >= 7)
-            break;
-
-         png_ptr->iwidth = (png_ptr->width +
-            png_pass_inc[png_ptr->pass] - 1 -
-            png_pass_start[png_ptr->pass]) /
-            png_pass_inc[png_ptr->pass];
-
-         if (!(png_ptr->transformations & PNG_INTERLACE))
-         {
-            png_ptr->num_rows = (png_ptr->height +
-                png_pass_yinc[png_ptr->pass] - 1 -
-                png_pass_ystart[png_ptr->pass]) /
-                png_pass_yinc[png_ptr->pass];
-         }
-
-         else  /* if (png_ptr->transformations & PNG_INTERLACE) */
-            break; /* libpng deinterlacing sees every row */
-
-      } while (png_ptr->num_rows == 0 || png_ptr->iwidth == 0);
-
-      if (png_ptr->pass < 7)
-         return;
-   }
-#endif /* PNG_READ_INTERLACING_SUPPORTED */
-
-   if (!(png_ptr->flags & PNG_FLAG_ZLIB_FINISHED))
-   {
-      PNG_IDAT;
-      char extra;
-      int ret;
-
-      png_ptr->zstream.next_out = (Byte *)&extra;
-      png_ptr->zstream.avail_out = (uInt)1;
-
-      for (;;)
-      {
-         if (!(png_ptr->zstream.avail_in))
-         {
-            while (!png_ptr->idat_size)
-            {
-               png_crc_finish(png_ptr, 0);
-               png_ptr->idat_size = png_read_chunk_header(png_ptr);
-               if (png_memcmp(png_ptr->chunk_name, png_IDAT, 4))
-                  png_error(png_ptr, "Not enough image data");
-            }
-
-            png_ptr->zstream.avail_in = (uInt)png_ptr->zbuf_size;
-            png_ptr->zstream.next_in = png_ptr->zbuf;
-
-            if (png_ptr->zbuf_size > png_ptr->idat_size)
-               png_ptr->zstream.avail_in = (uInt)png_ptr->idat_size;
-
-            png_crc_read(png_ptr, png_ptr->zbuf, png_ptr->zstream.avail_in);
-            png_ptr->idat_size -= png_ptr->zstream.avail_in;
-         }
-
-         ret = inflate(&png_ptr->zstream, Z_PARTIAL_FLUSH);
-
-         if (ret == Z_STREAM_END)
-         {
-            if (!(png_ptr->zstream.avail_out) || png_ptr->zstream.avail_in ||
-                png_ptr->idat_size)
-               png_warning(png_ptr, "Extra compressed data");
-
-            png_ptr->mode |= PNG_AFTER_IDAT;
-            png_ptr->flags |= PNG_FLAG_ZLIB_FINISHED;
-            break;
-         }
-
-         if (ret != Z_OK)
-            png_error(png_ptr, png_ptr->zstream.msg ? png_ptr->zstream.msg :
-                "Decompression Error");
-
-         if (!(png_ptr->zstream.avail_out))
-         {
-            png_warning(png_ptr, "Extra compressed data");
-            png_ptr->mode |= PNG_AFTER_IDAT;
-            png_ptr->flags |= PNG_FLAG_ZLIB_FINISHED;
-            break;
-         }
-
-      }
-      png_ptr->zstream.avail_out = 0;
-   }
-
-   if (png_ptr->idat_size || png_ptr->zstream.avail_in)
-      png_warning(png_ptr, "Extra compression data");
-
-   inflateReset(&png_ptr->zstream);
-
-   png_ptr->mode |= PNG_AFTER_IDAT;
-}
-#endif /* PNG_SEQUENTIAL_READ_SUPPORTED */
-
-void /* PRIVATE */
-png_read_start_row(png_structp png_ptr)
-{
-#ifdef PNG_READ_INTERLACING_SUPPORTED
-   /* Arrays to facilitate easy interlacing - use pass (0 - 6) as index */
-
-   /* Start of interlace block */
-   PNG_CONST int png_pass_start[7] = {0, 4, 0, 2, 0, 1, 0};
-
-   /* Offset to next interlace block */
-   PNG_CONST int png_pass_inc[7] = {8, 8, 4, 4, 2, 2, 1};
-
-   /* Start of interlace block in the y direction */
-   PNG_CONST int png_pass_ystart[7] = {0, 0, 4, 0, 2, 0, 1};
-
-   /* Offset to next interlace block in the y direction */
-   PNG_CONST int png_pass_yinc[7] = {8, 8, 8, 4, 4, 2, 2};
-#endif
-
-   int max_pixel_depth;
-   png_size_t row_bytes;
-
-   png_debug(1, "in png_read_start_row");
-   png_ptr->zstream.avail_in = 0;
-   png_init_read_transformations(png_ptr);
-#ifdef PNG_READ_INTERLACING_SUPPORTED
-   if (png_ptr->interlaced)
-   {
-      if (!(png_ptr->transformations & PNG_INTERLACE))
-         png_ptr->num_rows = (png_ptr->height + png_pass_yinc[0] - 1 -
-             png_pass_ystart[0]) / png_pass_yinc[0];
-
-      else
-         png_ptr->num_rows = png_ptr->height;
-
-      png_ptr->iwidth = (png_ptr->width +
-          png_pass_inc[png_ptr->pass] - 1 -
-          png_pass_start[png_ptr->pass]) /
-          png_pass_inc[png_ptr->pass];
-   }
-
-   else
-#endif /* PNG_READ_INTERLACING_SUPPORTED */
-   {
-      png_ptr->num_rows = png_ptr->height;
-      png_ptr->iwidth = png_ptr->width;
-   }
-
-   max_pixel_depth = png_ptr->pixel_depth;
-
-#ifdef PNG_READ_PACK_SUPPORTED
-   if ((png_ptr->transformations & PNG_PACK) && png_ptr->bit_depth < 8)
-      max_pixel_depth = 8;
-#endif
-
-#ifdef PNG_READ_EXPAND_SUPPORTED
-   if (png_ptr->transformations & PNG_EXPAND)
-   {
-      if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
-      {
-         if (png_ptr->num_trans)
-            max_pixel_depth = 32;
-
-         else
-            max_pixel_depth = 24;
-      }
-
-      else if (png_ptr->color_type == PNG_COLOR_TYPE_GRAY)
-      {
-         if (max_pixel_depth < 8)
-            max_pixel_depth = 8;
-
-         if (png_ptr->num_trans)
-            max_pixel_depth *= 2;
-      }
-
-      else if (png_ptr->color_type == PNG_COLOR_TYPE_RGB)
-      {
-         if (png_ptr->num_trans)
-         {
-            max_pixel_depth *= 4;
-            max_pixel_depth /= 3;
-         }
-      }
-   }
-#endif
-
-#ifdef PNG_READ_FILLER_SUPPORTED
-   if (png_ptr->transformations & (PNG_FILLER))
-   {
-      if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
-         max_pixel_depth = 32;
-
-      else if (png_ptr->color_type == PNG_COLOR_TYPE_GRAY)
-      {
-         if (max_pixel_depth <= 8)
-            max_pixel_depth = 16;
-
-         else
-            max_pixel_depth = 32;
-      }
-
-      else if (png_ptr->color_type == PNG_COLOR_TYPE_RGB)
-      {
-         if (max_pixel_depth <= 32)
-            max_pixel_depth = 32;
-
-         else
-            max_pixel_depth = 64;
-      }
-   }
-#endif
-
-#ifdef PNG_READ_GRAY_TO_RGB_SUPPORTED
-   if (png_ptr->transformations & PNG_GRAY_TO_RGB)
-   {
-      if (
-#ifdef PNG_READ_EXPAND_SUPPORTED
-          (png_ptr->num_trans && (png_ptr->transformations & PNG_EXPAND)) ||
-#endif
-#ifdef PNG_READ_FILLER_SUPPORTED
-          (png_ptr->transformations & (PNG_FILLER)) ||
-#endif
-          png_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
-      {
-         if (max_pixel_depth <= 16)
-            max_pixel_depth = 32;
-
-         else
-            max_pixel_depth = 64;
-      }
-
-      else
-      {
-         if (max_pixel_depth <= 8)
-         {
-            if (png_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
-               max_pixel_depth = 32;
-
-            else
-               max_pixel_depth = 24;
-         }
-
-         else if (png_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
-            max_pixel_depth = 64;
-
-         else
-            max_pixel_depth = 48;
-      }
-   }
-#endif
-
-#if defined(PNG_READ_USER_TRANSFORM_SUPPORTED) && \
-defined(PNG_USER_TRANSFORM_PTR_SUPPORTED)
-   if (png_ptr->transformations & PNG_USER_TRANSFORM)
-   {
-      int user_pixel_depth = png_ptr->user_transform_depth*
-         png_ptr->user_transform_channels;
-
-      if (user_pixel_depth > max_pixel_depth)
-         max_pixel_depth=user_pixel_depth;
-   }
-#endif
-
-   /* Align the width on the next larger 8 pixels.  Mainly used
-    * for interlacing
-    */
-   row_bytes = ((png_ptr->width + 7) & ~((png_uint_32)7));
-   /* Calculate the maximum bytes needed, adding a byte and a pixel
-    * for safety's sake
-    */
-   row_bytes = PNG_ROWBYTES(max_pixel_depth, row_bytes) +
-       1 + ((max_pixel_depth + 7) >> 3);
-
-#ifdef PNG_MAX_MALLOC_64K
-   if (row_bytes > (png_uint_32)65536L)
-      png_error(png_ptr, "This image requires a row greater than 64KB");
-#endif
-
-   if (row_bytes + 48 > png_ptr->old_big_row_buf_size)
-   {
-     png_free(png_ptr, png_ptr->big_row_buf);
-
-     if (png_ptr->interlaced)
-        png_ptr->big_row_buf = (png_bytep)png_calloc(png_ptr,
-            row_bytes + 48);
-
-     else
-        png_ptr->big_row_buf = (png_bytep)png_malloc(png_ptr,
-            row_bytes + 48);
-
-     png_ptr->old_big_row_buf_size = row_bytes + 48;
-
-#ifdef PNG_ALIGNED_MEMORY_SUPPORTED
-     /* Use 16-byte aligned memory for row_buf with at least 16 bytes
-      * of padding before and after row_buf.
-      */
-     png_ptr->row_buf = png_ptr->big_row_buf + 32 -
-         (((png_alloc_size_t)png_ptr->big_row_buf + 15) & 0x0F);
-
-     png_ptr->old_big_row_buf_size = row_bytes + 48;
-#else
-     /* Use 32 bytes of padding before and 16 bytes after row_buf. */
-     png_ptr->row_buf = png_ptr->big_row_buf + 32;
-#endif
-     png_ptr->old_big_row_buf_size = row_bytes + 48;
-   }
-
-#ifdef PNG_MAX_MALLOC_64K
-   if (png_ptr->rowbytes > 65535)
-      png_error(png_ptr, "This image requires a row greater than 64KB");
-
-#endif
-   if (png_ptr->rowbytes > (PNG_SIZE_MAX - 1))
-      png_error(png_ptr, "Row has too many bytes to allocate in memory");
-
-   if (png_ptr->rowbytes + 1 > png_ptr->old_prev_row_size)
-   {
-      png_free(png_ptr, png_ptr->prev_row);
-
-      png_ptr->prev_row = (png_bytep)png_malloc(png_ptr, png_ptr->rowbytes + 1);
-
-      png_ptr->old_prev_row_size = png_ptr->rowbytes + 1;
-   }
-
-   png_memset(png_ptr->prev_row, 0, png_ptr->rowbytes + 1);
-
-   png_debug1(3, "width = %u,", png_ptr->width);
-   png_debug1(3, "height = %u,", png_ptr->height);
-   png_debug1(3, "iwidth = %u,", png_ptr->iwidth);
-   png_debug1(3, "num_rows = %u,", png_ptr->num_rows);
-   png_debug1(3, "rowbytes = %lu,", (unsigned long)png_ptr->rowbytes);
-   png_debug1(3, "irowbytes = %lu",
-       (unsigned long)PNG_ROWBYTES(png_ptr->pixel_depth, png_ptr->iwidth) + 1);
-
-   png_ptr->flags |= PNG_FLAG_ROW_INIT;
-}
-#endif /* PNG_READ_SUPPORTED */
+
+/* pngrutil.c - utilities to read a PNG file
+ *
+ * Last changed in libpng 1.2.48 [March 8, 2012]
+ * Copyright (c) 1998-2012 Glenn Randers-Pehrson
+ * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
+ * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
+ *
+ * This code is released under the libpng license.
+ * For conditions of distribution and use, see the disclaimer
+ * and license in png.h
+ *
+ * This file contains routines that are only called from within
+ * libpng itself during the course of reading an image.
+ */
+
+#define PNG_INTERNAL
+#define PNG_NO_PEDANTIC_WARNINGS
+#include "png.h"
+#ifdef PNG_READ_SUPPORTED
+
+#if defined(_WIN32_WCE) && (_WIN32_WCE<0x500)
+#  define WIN32_WCE_OLD
+#endif
+
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+#  ifdef WIN32_WCE_OLD
+/* The strtod() function is not supported on WindowsCE */
+__inline double png_strtod(png_structp png_ptr, PNG_CONST char *nptr,
+    char **endptr)
+{
+   double result = 0;
+   int len;
+   wchar_t *str, *end;
+
+   len = MultiByteToWideChar(CP_ACP, 0, nptr, -1, NULL, 0);
+   str = (wchar_t *)png_malloc(png_ptr, len * png_sizeof(wchar_t));
+   if ( NULL != str )
+   {
+      MultiByteToWideChar(CP_ACP, 0, nptr, -1, str, len);
+      result = wcstod(str, &end);
+      len = WideCharToMultiByte(CP_ACP, 0, end, -1, NULL, 0, NULL, NULL);
+      *endptr = (char *)nptr + (png_strlen(nptr) - len + 1);
+      png_free(png_ptr, str);
+   }
+   return result;
+}
+#  else
+#    define png_strtod(p,a,b) strtod(a,b)
+#  endif
+#endif
+
+png_uint_32 PNGAPI
+png_get_uint_31(png_structp png_ptr, png_bytep buf)
+{
+#ifdef PNG_READ_BIG_ENDIAN_SUPPORTED
+   png_uint_32 i = png_get_uint_32(buf);
+#else
+   /* Avoid an extra function call by inlining the result. */
+   png_uint_32 i = ((png_uint_32)(*buf) << 24) +
+      ((png_uint_32)(*(buf + 1)) << 16) +
+      ((png_uint_32)(*(buf + 2)) << 8) +
+      (png_uint_32)(*(buf + 3));
+#endif
+   if (i > PNG_UINT_31_MAX)
+     png_error(png_ptr, "PNG unsigned integer out of range.");
+   return (i);
+}
+#ifndef PNG_READ_BIG_ENDIAN_SUPPORTED
+/* Grab an unsigned 32-bit integer from a buffer in big-endian format. */
+png_uint_32 PNGAPI
+png_get_uint_32(png_bytep buf)
+{
+   png_uint_32 i = ((png_uint_32)(*buf) << 24) +
+      ((png_uint_32)(*(buf + 1)) << 16) +
+      ((png_uint_32)(*(buf + 2)) << 8) +
+      (png_uint_32)(*(buf + 3));
+
+   return (i);
+}
+
+/* Grab a signed 32-bit integer from a buffer in big-endian format.  The
+ * data is stored in the PNG file in two's complement format, and it is
+ * assumed that the machine format for signed integers is the same.
+ */
+png_int_32 PNGAPI
+png_get_int_32(png_bytep buf)
+{
+   png_int_32 i = ((png_int_32)(*buf) << 24) +
+      ((png_int_32)(*(buf + 1)) << 16) +
+      ((png_int_32)(*(buf + 2)) << 8) +
+      (png_int_32)(*(buf + 3));
+
+   return (i);
+}
+
+/* Grab an unsigned 16-bit integer from a buffer in big-endian format. */
+png_uint_16 PNGAPI
+png_get_uint_16(png_bytep buf)
+{
+   png_uint_16 i = (png_uint_16)(((png_uint_16)(*buf) << 8) +
+      (png_uint_16)(*(buf + 1)));
+
+   return (i);
+}
+#endif /* PNG_READ_BIG_ENDIAN_SUPPORTED */
+
+/* Read the chunk header (length + type name).
+ * Put the type name into png_ptr->chunk_name, and return the length.
+ */
+png_uint_32 /* PRIVATE */
+png_read_chunk_header(png_structp png_ptr)
+{
+   png_byte buf[8];
+   png_uint_32 length;
+
+   /* Read the length and the chunk name */
+   png_read_data(png_ptr, buf, 8);
+   length = png_get_uint_31(png_ptr, buf);
+
+   /* Put the chunk name into png_ptr->chunk_name */
+   png_memcpy(png_ptr->chunk_name, buf + 4, 4);
+
+   png_debug2(0, "Reading %s chunk, length = %lu",
+      png_ptr->chunk_name, length);
+
+   /* Reset the crc and run it over the chunk name */
+   png_reset_crc(png_ptr);
+   png_calculate_crc(png_ptr, png_ptr->chunk_name, 4);
+
+   /* Check to see if chunk name is valid */
+   png_check_chunk_name(png_ptr, png_ptr->chunk_name);
+
+   return length;
+}
+
+/* Read data, and (optionally) run it through the CRC. */
+void /* PRIVATE */
+png_crc_read(png_structp png_ptr, png_bytep buf, png_size_t length)
+{
+   if (png_ptr == NULL)
+      return;
+   png_read_data(png_ptr, buf, length);
+   png_calculate_crc(png_ptr, buf, length);
+}
+
+/* Optionally skip data and then check the CRC.  Depending on whether we
+ * are reading a ancillary or critical chunk, and how the program has set
+ * things up, we may calculate the CRC on the data and print a message.
+ * Returns '1' if there was a CRC error, '0' otherwise.
+ */
+int /* PRIVATE */
+png_crc_finish(png_structp png_ptr, png_uint_32 skip)
+{
+   png_size_t i;
+   png_size_t istop = png_ptr->zbuf_size;
+
+   for (i = (png_size_t)skip; i > istop; i -= istop)
+   {
+      png_crc_read(png_ptr, png_ptr->zbuf, png_ptr->zbuf_size);
+   }
+   if (i)
+   {
+      png_crc_read(png_ptr, png_ptr->zbuf, i);
+   }
+
+   if (png_crc_error(png_ptr))
+   {
+      if (((png_ptr->chunk_name[0] & 0x20) &&                /* Ancillary */
+          !(png_ptr->flags & PNG_FLAG_CRC_ANCILLARY_NOWARN)) ||
+          (!(png_ptr->chunk_name[0] & 0x20) &&             /* Critical  */
+          (png_ptr->flags & PNG_FLAG_CRC_CRITICAL_USE)))
+      {
+         png_chunk_warning(png_ptr, "CRC error");
+      }
+      else
+      {
+         png_chunk_error(png_ptr, "CRC error");
+      }
+      return (1);
+   }
+
+   return (0);
+}
+
+/* Compare the CRC stored in the PNG file with that calculated by libpng from
+ * the data it has read thus far.
+ */
+int /* PRIVATE */
+png_crc_error(png_structp png_ptr)
+{
+   png_byte crc_bytes[4];
+   png_uint_32 crc;
+   int need_crc = 1;
+
+   if (png_ptr->chunk_name[0] & 0x20)                     /* ancillary */
+   {
+      if ((png_ptr->flags & PNG_FLAG_CRC_ANCILLARY_MASK) ==
+          (PNG_FLAG_CRC_ANCILLARY_USE | PNG_FLAG_CRC_ANCILLARY_NOWARN))
+         need_crc = 0;
+   }
+   else                                                    /* critical */
+   {
+      if (png_ptr->flags & PNG_FLAG_CRC_CRITICAL_IGNORE)
+         need_crc = 0;
+   }
+
+   png_read_data(png_ptr, crc_bytes, 4);
+
+   if (need_crc)
+   {
+      crc = png_get_uint_32(crc_bytes);
+      return ((int)(crc != png_ptr->crc));
+   }
+   else
+      return (0);
+}
+
+#if defined(PNG_READ_zTXt_SUPPORTED) || defined(PNG_READ_iTXt_SUPPORTED) || \
+    defined(PNG_READ_iCCP_SUPPORTED)
+static png_size_t
+png_inflate(png_structp png_ptr, const png_byte *data, png_size_t size,
+        png_bytep output, png_size_t output_size)
+{
+   png_size_t count = 0;
+
+   png_ptr->zstream.next_in = (png_bytep)data; /* const_cast: VALID */
+   png_ptr->zstream.avail_in = size;
+
+   while (1)
+   {
+      int ret, avail;
+
+      /* Reset the output buffer each time round - we empty it
+       * after every inflate call.
+       */
+      png_ptr->zstream.next_out = png_ptr->zbuf;
+      png_ptr->zstream.avail_out = png_ptr->zbuf_size;
+
+      ret = inflate(&png_ptr->zstream, Z_NO_FLUSH);
+      avail = png_ptr->zbuf_size - png_ptr->zstream.avail_out;
+
+      /* First copy/count any new output - but only if we didn't
+       * get an error code.
+       */
+      if ((ret == Z_OK || ret == Z_STREAM_END) && avail > 0)
+      {
+         if (output != 0 && output_size > count)
+         {
+            png_size_t copy = output_size - count;
+            if ((png_size_t) avail < copy) copy = (png_size_t) avail;
+            png_memcpy(output + count, png_ptr->zbuf, copy);
+         }
+         count += avail;
+      }
+
+      if (ret == Z_OK)
+         continue;
+
+      /* Termination conditions - always reset the zstream, it
+       * must be left in inflateInit state.
+       */
+      png_ptr->zstream.avail_in = 0;
+      inflateReset(&png_ptr->zstream);
+
+      if (ret == Z_STREAM_END)
+         return count; /* NOTE: may be zero. */
+
+      /* Now handle the error codes - the API always returns 0
+       * and the error message is dumped into the uncompressed
+       * buffer if available.
+       */
+      {
+         PNG_CONST char *msg;
+         if (png_ptr->zstream.msg != 0)
+            msg = png_ptr->zstream.msg;
+         else
+         {
+#if defined(PNG_STDIO_SUPPORTED) && !defined(_WIN32_WCE)
+            char umsg[52];
+
+            switch (ret)
+            {
+               case Z_BUF_ERROR:
+                  msg = "Buffer error in compressed datastream in %s chunk";
+                  break;
+               case Z_DATA_ERROR:
+                  msg = "Data error in compressed datastream in %s chunk";
+                  break;
+               default:
+                  msg = "Incomplete compressed datastream in %s chunk";
+                  break;
+            }
+
+            png_snprintf(umsg, sizeof umsg, msg, png_ptr->chunk_name);
+            msg = umsg;
+#else
+            msg = "Damaged compressed datastream in chunk other than IDAT";
+#endif
+         }
+
+         png_warning(png_ptr, msg);
+      }
+
+      /* 0 means an error - notice that this code simple ignores
+       * zero length compressed chunks as a result.
+       */
+      return 0;
+   }
+}
+
+/*
+ * Decompress trailing data in a chunk.  The assumption is that chunkdata
+ * points at an allocated area holding the contents of a chunk with a
+ * trailing compressed part.  What we get back is an allocated area
+ * holding the original prefix part and an uncompressed version of the
+ * trailing part (the malloc area passed in is freed).
+ */
+void /* PRIVATE */
+png_decompress_chunk(png_structp png_ptr, int comp_type,
+    png_size_t chunklength,
+    png_size_t prefix_size, png_size_t *newlength)
+{
+   /* The caller should guarantee this */
+   if (prefix_size > chunklength)
+   {
+      /* The recovery is to delete the chunk. */
+      png_warning(png_ptr, "invalid chunklength");
+      prefix_size = 0; /* To delete everything */
+   }
+
+   else if (comp_type == PNG_COMPRESSION_TYPE_BASE)
+   {
+      png_size_t expanded_size = png_inflate(png_ptr,
+                (png_bytep)(png_ptr->chunkdata + prefix_size),
+                chunklength - prefix_size,
+                0/*output*/, 0/*output size*/);
+
+      /* Now check the limits on this chunk - if the limit fails the
+       * compressed data will be removed, the prefix will remain.
+       */
+      if (prefix_size >= (~(png_size_t)0) - 1 ||
+         expanded_size >= (~(png_size_t)0) - 1 - prefix_size
+#ifdef PNG_USER_CHUNK_MALLOC_MAX
+         || ((PNG_USER_CHUNK_MALLOC_MAX > 0) &&
+          prefix_size + expanded_size >= PNG_USER_CHUNK_MALLOC_MAX - 1)
+#endif
+          )
+         png_warning(png_ptr, "Exceeded size limit while expanding chunk");
+
+      /* If the size is zero either there was an error and a message
+       * has already been output (warning) or the size really is zero
+       * and we have nothing to do - the code will exit through the
+       * error case below.
+       */
+      else if (expanded_size > 0)
+      {
+         /* Success (maybe) - really uncompress the chunk. */
+         png_size_t new_size = 0;
+
+         png_charp text = png_malloc_warn(png_ptr,
+             prefix_size + expanded_size + 1);
+
+         if (text != NULL)
+         {
+            png_memcpy(text, png_ptr->chunkdata, prefix_size);
+            new_size = png_inflate(png_ptr,
+                (png_bytep)(png_ptr->chunkdata + prefix_size),
+                chunklength - prefix_size,
+                (png_bytep)(text + prefix_size), expanded_size);
+            text[prefix_size + expanded_size] = 0; /* just in case */
+
+            if (new_size == expanded_size)
+            {
+               png_free(png_ptr, png_ptr->chunkdata);
+               png_ptr->chunkdata = text;
+               *newlength = prefix_size + expanded_size;
+               return; /* The success return! */
+            }
+
+            png_warning(png_ptr, "png_inflate logic error");
+            png_free(png_ptr, text);
+         }
+         else
+          png_warning(png_ptr, "Not enough memory to decompress chunk.");
+      }
+   }
+
+   else /* if (comp_type != PNG_COMPRESSION_TYPE_BASE) */
+   {
+#if defined(PNG_STDIO_SUPPORTED) && !defined(_WIN32_WCE)
+      char umsg[50];
+
+      png_snprintf(umsg, sizeof umsg, "Unknown zTXt compression type %d",
+          comp_type);
+      png_warning(png_ptr, umsg);
+#else
+      png_warning(png_ptr, "Unknown zTXt compression type");
+#endif
+
+      /* The recovery is to simply drop the data. */
+   }
+
+   /* Generic error return - leave the prefix, delete the compressed
+    * data, reallocate the chunkdata to remove the potentially large
+    * amount of compressed data.
+    */
+   {
+      png_charp text = png_malloc_warn(png_ptr, prefix_size + 1);
+      if (text != NULL)
+      {
+         if (prefix_size > 0)
+            png_memcpy(text, png_ptr->chunkdata, prefix_size);
+         png_free(png_ptr, png_ptr->chunkdata);
+         png_ptr->chunkdata = text;
+
+         /* This is an extra zero in the 'uncompressed' part. */
+         *(png_ptr->chunkdata + prefix_size) = 0x00;
+      }
+      /* Ignore a malloc error here - it is safe. */
+   }
+
+   *newlength = prefix_size;
+}
+#endif
+
+/* Read and check the IDHR chunk */
+void /* PRIVATE */
+png_handle_IHDR(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
+{
+   png_byte buf[13];
+   png_uint_32 width, height;
+   int bit_depth, color_type, compression_type, filter_type;
+   int interlace_type;
+
+   png_debug(1, "in png_handle_IHDR");
+
+   if (png_ptr->mode & PNG_HAVE_IHDR)
+      png_error(png_ptr, "Out of place IHDR");
+
+   /* Check the length */
+   if (length != 13)
+      png_error(png_ptr, "Invalid IHDR chunk");
+
+   png_ptr->mode |= PNG_HAVE_IHDR;
+
+   png_crc_read(png_ptr, buf, 13);
+   png_crc_finish(png_ptr, 0);
+
+   width = png_get_uint_31(png_ptr, buf);
+   height = png_get_uint_31(png_ptr, buf + 4);
+   bit_depth = buf[8];
+   color_type = buf[9];
+   compression_type = buf[10];
+   filter_type = buf[11];
+   interlace_type = buf[12];
+
+   /* Set internal variables */
+   png_ptr->width = width;
+   png_ptr->height = height;
+   png_ptr->bit_depth = (png_byte)bit_depth;
+   png_ptr->interlaced = (png_byte)interlace_type;
+   png_ptr->color_type = (png_byte)color_type;
+#ifdef PNG_MNG_FEATURES_SUPPORTED
+   png_ptr->filter_type = (png_byte)filter_type;
+#endif
+   png_ptr->compression_type = (png_byte)compression_type;
+
+   /* Find number of channels */
+   switch (png_ptr->color_type)
+   {
+      case PNG_COLOR_TYPE_GRAY:
+      case PNG_COLOR_TYPE_PALETTE:
+         png_ptr->channels = 1;
+         break;
+
+      case PNG_COLOR_TYPE_RGB:
+         png_ptr->channels = 3;
+         break;
+
+      case PNG_COLOR_TYPE_GRAY_ALPHA:
+         png_ptr->channels = 2;
+         break;
+
+      case PNG_COLOR_TYPE_RGB_ALPHA:
+         png_ptr->channels = 4;
+         break;
+   }
+
+   /* Set up other useful info */
+   png_ptr->pixel_depth = (png_byte)(png_ptr->bit_depth *
+   png_ptr->channels);
+   png_ptr->rowbytes = PNG_ROWBYTES(png_ptr->pixel_depth, png_ptr->width);
+   png_debug1(3, "bit_depth = %d", png_ptr->bit_depth);
+   png_debug1(3, "channels = %d", png_ptr->channels);
+   png_debug1(3, "rowbytes = %lu", png_ptr->rowbytes);
+   png_set_IHDR(png_ptr, info_ptr, width, height, bit_depth,
+      color_type, interlace_type, compression_type, filter_type);
+}
+
+/* Read and check the palette */
+void /* PRIVATE */
+png_handle_PLTE(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
+{
+   png_color palette[PNG_MAX_PALETTE_LENGTH];
+   int num, i;
+#ifdef PNG_POINTER_INDEXING_SUPPORTED
+   png_colorp pal_ptr;
+#endif
+
+   png_debug(1, "in png_handle_PLTE");
+
+   if (!(png_ptr->mode & PNG_HAVE_IHDR))
+      png_error(png_ptr, "Missing IHDR before PLTE");
+
+   else if (png_ptr->mode & PNG_HAVE_IDAT)
+   {
+      png_warning(png_ptr, "Invalid PLTE after IDAT");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+
+   else if (png_ptr->mode & PNG_HAVE_PLTE)
+      png_error(png_ptr, "Duplicate PLTE chunk");
+
+   png_ptr->mode |= PNG_HAVE_PLTE;
+
+   if (!(png_ptr->color_type&PNG_COLOR_MASK_COLOR))
+   {
+      png_warning(png_ptr,
+        "Ignoring PLTE chunk in grayscale PNG");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+#ifndef PNG_READ_OPT_PLTE_SUPPORTED
+   if (png_ptr->color_type != PNG_COLOR_TYPE_PALETTE)
+   {
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+#endif
+
+   if (length > 3*PNG_MAX_PALETTE_LENGTH || length % 3)
+   {
+      if (png_ptr->color_type != PNG_COLOR_TYPE_PALETTE)
+      {
+         png_warning(png_ptr, "Invalid palette chunk");
+         png_crc_finish(png_ptr, length);
+         return;
+      }
+
+      else
+      {
+         png_error(png_ptr, "Invalid palette chunk");
+      }
+   }
+
+   num = (int)length / 3;
+
+#ifdef PNG_POINTER_INDEXING_SUPPORTED
+   for (i = 0, pal_ptr = palette; i < num; i++, pal_ptr++)
+   {
+      png_byte buf[3];
+
+      png_crc_read(png_ptr, buf, 3);
+      pal_ptr->red = buf[0];
+      pal_ptr->green = buf[1];
+      pal_ptr->blue = buf[2];
+   }
+#else
+   for (i = 0; i < num; i++)
+   {
+      png_byte buf[3];
+
+      png_crc_read(png_ptr, buf, 3);
+      /* Don't depend upon png_color being any order */
+      palette[i].red = buf[0];
+      palette[i].green = buf[1];
+      palette[i].blue = buf[2];
+   }
+#endif
+
+   /* If we actually NEED the PLTE chunk (ie for a paletted image), we do
+    * whatever the normal CRC configuration tells us.  However, if we
+    * have an RGB image, the PLTE can be considered ancillary, so
+    * we will act as though it is.
+    */
+#ifndef PNG_READ_OPT_PLTE_SUPPORTED
+   if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
+#endif
+   {
+      png_crc_finish(png_ptr, 0);
+   }
+#ifndef PNG_READ_OPT_PLTE_SUPPORTED
+   else if (png_crc_error(png_ptr))  /* Only if we have a CRC error */
+   {
+      /* If we don't want to use the data from an ancillary chunk,
+         we have two options: an error abort, or a warning and we
+         ignore the data in this chunk (which should be OK, since
+         it's considered ancillary for a RGB or RGBA image). */
+      if (!(png_ptr->flags & PNG_FLAG_CRC_ANCILLARY_USE))
+      {
+         if (png_ptr->flags & PNG_FLAG_CRC_ANCILLARY_NOWARN)
+         {
+            png_chunk_error(png_ptr, "CRC error");
+         }
+         else
+         {
+            png_chunk_warning(png_ptr, "CRC error");
+            return;
+         }
+      }
+      /* Otherwise, we (optionally) emit a warning and use the chunk. */
+      else if (!(png_ptr->flags & PNG_FLAG_CRC_ANCILLARY_NOWARN))
+      {
+         png_chunk_warning(png_ptr, "CRC error");
+      }
+   }
+#endif
+
+   png_set_PLTE(png_ptr, info_ptr, palette, num);
+
+#ifdef PNG_READ_tRNS_SUPPORTED
+   if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
+   {
+      if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_tRNS))
+      {
+         if (png_ptr->num_trans > (png_uint_16)num)
+         {
+            png_warning(png_ptr, "Truncating incorrect tRNS chunk length");
+            png_ptr->num_trans = (png_uint_16)num;
+         }
+         if (info_ptr->num_trans > (png_uint_16)num)
+         {
+            png_warning(png_ptr, "Truncating incorrect info tRNS chunk length");
+            info_ptr->num_trans = (png_uint_16)num;
+         }
+      }
+   }
+#endif
+
+}
+
+void /* PRIVATE */
+png_handle_IEND(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
+{
+   png_debug(1, "in png_handle_IEND");
+
+   if (!(png_ptr->mode & PNG_HAVE_IHDR) || !(png_ptr->mode & PNG_HAVE_IDAT))
+   {
+      png_error(png_ptr, "No image in file");
+   }
+
+   png_ptr->mode |= (PNG_AFTER_IDAT | PNG_HAVE_IEND);
+
+   if (length != 0)
+   {
+      png_warning(png_ptr, "Incorrect IEND chunk length");
+   }
+   png_crc_finish(png_ptr, length);
+
+   info_ptr = info_ptr; /* Quiet compiler warnings about unused info_ptr */
+}
+
+#ifdef PNG_READ_gAMA_SUPPORTED
+void /* PRIVATE */
+png_handle_gAMA(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
+{
+   png_fixed_point igamma;
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+   float file_gamma;
+#endif
+   png_byte buf[4];
+
+   png_debug(1, "in png_handle_gAMA");
+
+   if (!(png_ptr->mode & PNG_HAVE_IHDR))
+      png_error(png_ptr, "Missing IHDR before gAMA");
+   else if (png_ptr->mode & PNG_HAVE_IDAT)
+   {
+      png_warning(png_ptr, "Invalid gAMA after IDAT");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+   else if (png_ptr->mode & PNG_HAVE_PLTE)
+      /* Should be an error, but we can cope with it */
+      png_warning(png_ptr, "Out of place gAMA chunk");
+
+   if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_gAMA)
+#ifdef PNG_READ_sRGB_SUPPORTED
+      && !(info_ptr->valid & PNG_INFO_sRGB)
+#endif
+      )
+   {
+      png_warning(png_ptr, "Duplicate gAMA chunk");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+
+   if (length != 4)
+   {
+      png_warning(png_ptr, "Incorrect gAMA chunk length");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+
+   png_crc_read(png_ptr, buf, 4);
+   if (png_crc_finish(png_ptr, 0))
+      return;
+
+   igamma = (png_fixed_point)png_get_uint_32(buf);
+   /* Check for zero gamma */
+   if (igamma == 0)
+      {
+         png_warning(png_ptr,
+           "Ignoring gAMA chunk with gamma=0");
+         return;
+      }
+
+#ifdef PNG_READ_sRGB_SUPPORTED
+   if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_sRGB))
+      if (PNG_OUT_OF_RANGE(igamma, 45500L, 500))
+      {
+         png_warning(png_ptr,
+           "Ignoring incorrect gAMA value when sRGB is also present");
+#ifdef PNG_CONSOLE_IO_SUPPORTED
+         fprintf(stderr, "gamma = (%d/100000)", (int)igamma);
+#endif
+         return;
+      }
+#endif /* PNG_READ_sRGB_SUPPORTED */
+
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+   file_gamma = (float)igamma / (float)100000.0;
+#  ifdef PNG_READ_GAMMA_SUPPORTED
+     png_ptr->gamma = file_gamma;
+#  endif
+     png_set_gAMA(png_ptr, info_ptr, file_gamma);
+#endif
+#ifdef PNG_FIXED_POINT_SUPPORTED
+   png_set_gAMA_fixed(png_ptr, info_ptr, igamma);
+#endif
+}
+#endif
+
+#ifdef PNG_READ_sBIT_SUPPORTED
+void /* PRIVATE */
+png_handle_sBIT(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
+{
+   png_size_t truelen;
+   png_byte buf[4];
+
+   png_debug(1, "in png_handle_sBIT");
+
+   buf[0] = buf[1] = buf[2] = buf[3] = 0;
+
+   if (!(png_ptr->mode & PNG_HAVE_IHDR))
+      png_error(png_ptr, "Missing IHDR before sBIT");
+   else if (png_ptr->mode & PNG_HAVE_IDAT)
+   {
+      png_warning(png_ptr, "Invalid sBIT after IDAT");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+   else if (png_ptr->mode & PNG_HAVE_PLTE)
+   {
+      /* Should be an error, but we can cope with it */
+      png_warning(png_ptr, "Out of place sBIT chunk");
+   }
+   if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_sBIT))
+   {
+      png_warning(png_ptr, "Duplicate sBIT chunk");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+
+   if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
+      truelen = 3;
+   else
+      truelen = (png_size_t)png_ptr->channels;
+
+   if (length != truelen || length > 4)
+   {
+      png_warning(png_ptr, "Incorrect sBIT chunk length");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+
+   png_crc_read(png_ptr, buf, truelen);
+   if (png_crc_finish(png_ptr, 0))
+      return;
+
+   if (png_ptr->color_type & PNG_COLOR_MASK_COLOR)
+   {
+      png_ptr->sig_bit.red = buf[0];
+      png_ptr->sig_bit.green = buf[1];
+      png_ptr->sig_bit.blue = buf[2];
+      png_ptr->sig_bit.alpha = buf[3];
+   }
+   else
+   {
+      png_ptr->sig_bit.gray = buf[0];
+      png_ptr->sig_bit.red = buf[0];
+      png_ptr->sig_bit.green = buf[0];
+      png_ptr->sig_bit.blue = buf[0];
+      png_ptr->sig_bit.alpha = buf[1];
+   }
+   png_set_sBIT(png_ptr, info_ptr, &(png_ptr->sig_bit));
+}
+#endif
+
+#ifdef PNG_READ_cHRM_SUPPORTED
+void /* PRIVATE */
+png_handle_cHRM(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
+{
+   png_byte buf[32];
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+   float white_x, white_y, red_x, red_y, green_x, green_y, blue_x, blue_y;
+#endif
+   png_fixed_point int_x_white, int_y_white, int_x_red, int_y_red, int_x_green,
+      int_y_green, int_x_blue, int_y_blue;
+
+   png_uint_32 uint_x, uint_y;
+
+   png_debug(1, "in png_handle_cHRM");
+
+   if (!(png_ptr->mode & PNG_HAVE_IHDR))
+      png_error(png_ptr, "Missing IHDR before cHRM");
+   else if (png_ptr->mode & PNG_HAVE_IDAT)
+   {
+      png_warning(png_ptr, "Invalid cHRM after IDAT");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+   else if (png_ptr->mode & PNG_HAVE_PLTE)
+      /* Should be an error, but we can cope with it */
+      png_warning(png_ptr, "Missing PLTE before cHRM");
+
+   if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_cHRM)
+#ifdef PNG_READ_sRGB_SUPPORTED
+      && !(info_ptr->valid & PNG_INFO_sRGB)
+#endif
+      )
+   {
+      png_warning(png_ptr, "Duplicate cHRM chunk");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+
+   if (length != 32)
+   {
+      png_warning(png_ptr, "Incorrect cHRM chunk length");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+
+   png_crc_read(png_ptr, buf, 32);
+   if (png_crc_finish(png_ptr, 0))
+      return;
+
+   uint_x = png_get_uint_32(buf);
+   uint_y = png_get_uint_32(buf + 4);
+   int_x_white = (png_fixed_point)uint_x;
+   int_y_white = (png_fixed_point)uint_y;
+
+   uint_x = png_get_uint_32(buf + 8);
+   uint_y = png_get_uint_32(buf + 12);
+   int_x_red = (png_fixed_point)uint_x;
+   int_y_red = (png_fixed_point)uint_y;
+
+   uint_x = png_get_uint_32(buf + 16);
+   uint_y = png_get_uint_32(buf + 20);
+   int_x_green = (png_fixed_point)uint_x;
+   int_y_green = (png_fixed_point)uint_y;
+
+   uint_x = png_get_uint_32(buf + 24);
+   uint_y = png_get_uint_32(buf + 28);
+   int_x_blue = (png_fixed_point)uint_x;
+   int_y_blue = (png_fixed_point)uint_y;
+
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+   white_x = (float)int_x_white / (float)100000.0;
+   white_y = (float)int_y_white / (float)100000.0;
+   red_x   = (float)int_x_red   / (float)100000.0;
+   red_y   = (float)int_y_red   / (float)100000.0;
+   green_x = (float)int_x_green / (float)100000.0;
+   green_y = (float)int_y_green / (float)100000.0;
+   blue_x  = (float)int_x_blue  / (float)100000.0;
+   blue_y  = (float)int_y_blue  / (float)100000.0;
+#endif
+
+#ifdef PNG_READ_sRGB_SUPPORTED
+   if ((info_ptr != NULL) && (info_ptr->valid & PNG_INFO_sRGB))
+      {
+      if (PNG_OUT_OF_RANGE(int_x_white, 31270,  1000) ||
+          PNG_OUT_OF_RANGE(int_y_white, 32900,  1000) ||
+          PNG_OUT_OF_RANGE(int_x_red,   64000L, 1000) ||
+          PNG_OUT_OF_RANGE(int_y_red,   33000,  1000) ||
+          PNG_OUT_OF_RANGE(int_x_green, 30000,  1000) ||
+          PNG_OUT_OF_RANGE(int_y_green, 60000L, 1000) ||
+          PNG_OUT_OF_RANGE(int_x_blue,  15000,  1000) ||
+          PNG_OUT_OF_RANGE(int_y_blue,   6000,  1000))
+         {
+            png_warning(png_ptr,
+              "Ignoring incorrect cHRM value when sRGB is also present");
+#ifdef PNG_CONSOLE_IO_SUPPORTED
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+            fprintf(stderr, "wx=%f, wy=%f, rx=%f, ry=%f\n",
+               white_x, white_y, red_x, red_y);
+            fprintf(stderr, "gx=%f, gy=%f, bx=%f, by=%f\n",
+               green_x, green_y, blue_x, blue_y);
+#else
+            fprintf(stderr, "wx=%ld, wy=%ld, rx=%ld, ry=%ld\n",
+               (long)int_x_white, (long)int_y_white,
+               (long)int_x_red, (long)int_y_red);
+            fprintf(stderr, "gx=%ld, gy=%ld, bx=%ld, by=%ld\n",
+               (long)int_x_green, (long)int_y_green,
+               (long)int_x_blue, (long)int_y_blue);
+#endif
+#endif /* PNG_CONSOLE_IO_SUPPORTED */
+         }
+         return;
+      }
+#endif /* PNG_READ_sRGB_SUPPORTED */
+
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+   png_set_cHRM(png_ptr, info_ptr,
+      white_x, white_y, red_x, red_y, green_x, green_y, blue_x, blue_y);
+#endif
+#ifdef PNG_FIXED_POINT_SUPPORTED
+   png_set_cHRM_fixed(png_ptr, info_ptr,
+      int_x_white, int_y_white, int_x_red, int_y_red, int_x_green,
+      int_y_green, int_x_blue, int_y_blue);
+#endif
+}
+#endif
+
+#ifdef PNG_READ_sRGB_SUPPORTED
+void /* PRIVATE */
+png_handle_sRGB(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
+{
+   int intent;
+   png_byte buf[1];
+
+   png_debug(1, "in png_handle_sRGB");
+
+   if (!(png_ptr->mode & PNG_HAVE_IHDR))
+      png_error(png_ptr, "Missing IHDR before sRGB");
+   else if (png_ptr->mode & PNG_HAVE_IDAT)
+   {
+      png_warning(png_ptr, "Invalid sRGB after IDAT");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+   else if (png_ptr->mode & PNG_HAVE_PLTE)
+      /* Should be an error, but we can cope with it */
+      png_warning(png_ptr, "Out of place sRGB chunk");
+
+   if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_sRGB))
+   {
+      png_warning(png_ptr, "Duplicate sRGB chunk");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+
+   if (length != 1)
+   {
+      png_warning(png_ptr, "Incorrect sRGB chunk length");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+
+   png_crc_read(png_ptr, buf, 1);
+   if (png_crc_finish(png_ptr, 0))
+      return;
+
+   intent = buf[0];
+   /* Check for bad intent */
+   if (intent >= PNG_sRGB_INTENT_LAST)
+   {
+      png_warning(png_ptr, "Unknown sRGB intent");
+      return;
+   }
+
+#if defined(PNG_READ_gAMA_SUPPORTED) && defined(PNG_READ_GAMMA_SUPPORTED)
+   if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_gAMA))
+   {
+   png_fixed_point igamma;
+#ifdef PNG_FIXED_POINT_SUPPORTED
+      igamma=info_ptr->int_gamma;
+#else
+#  ifdef PNG_FLOATING_POINT_SUPPORTED
+      igamma=(png_fixed_point)(info_ptr->gamma * 100000.);
+#  endif
+#endif
+      if (PNG_OUT_OF_RANGE(igamma, 45500L, 500))
+      {
+         png_warning(png_ptr,
+           "Ignoring incorrect gAMA value when sRGB is also present");
+#ifdef PNG_CONSOLE_IO_SUPPORTED
+#  ifdef PNG_FIXED_POINT_SUPPORTED
+         fprintf(stderr, "incorrect gamma=(%d/100000)\n",
+            (int)png_ptr->int_gamma);
+#  else
+#    ifdef PNG_FLOATING_POINT_SUPPORTED
+         fprintf(stderr, "incorrect gamma=%f\n", png_ptr->gamma);
+#    endif
+#  endif
+#endif
+      }
+   }
+#endif /* PNG_READ_gAMA_SUPPORTED */
+
+#ifdef PNG_READ_cHRM_SUPPORTED
+#ifdef PNG_FIXED_POINT_SUPPORTED
+   if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_cHRM))
+      if (PNG_OUT_OF_RANGE(info_ptr->int_x_white, 31270,  1000) ||
+          PNG_OUT_OF_RANGE(info_ptr->int_y_white, 32900,  1000) ||
+          PNG_OUT_OF_RANGE(info_ptr->int_x_red,   64000L, 1000) ||
+          PNG_OUT_OF_RANGE(info_ptr->int_y_red,   33000,  1000) ||
+          PNG_OUT_OF_RANGE(info_ptr->int_x_green, 30000,  1000) ||
+          PNG_OUT_OF_RANGE(info_ptr->int_y_green, 60000L, 1000) ||
+          PNG_OUT_OF_RANGE(info_ptr->int_x_blue,  15000,  1000) ||
+          PNG_OUT_OF_RANGE(info_ptr->int_y_blue,   6000,  1000))
+         {
+            png_warning(png_ptr,
+              "Ignoring incorrect cHRM value when sRGB is also present");
+         }
+#endif /* PNG_FIXED_POINT_SUPPORTED */
+#endif /* PNG_READ_cHRM_SUPPORTED */
+
+   png_set_sRGB_gAMA_and_cHRM(png_ptr, info_ptr, intent);
+}
+#endif /* PNG_READ_sRGB_SUPPORTED */
+
+#ifdef PNG_READ_iCCP_SUPPORTED
+void /* PRIVATE */
+png_handle_iCCP(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
+/* Note: this does not properly handle chunks that are > 64K under DOS */
+{
+   png_byte compression_type;
+   png_bytep pC;
+   png_charp profile;
+   png_uint_32 skip = 0;
+   png_uint_32 profile_size, profile_length;
+   png_size_t slength, prefix_length, data_length;
+
+   png_debug(1, "in png_handle_iCCP");
+
+   if (!(png_ptr->mode & PNG_HAVE_IHDR))
+      png_error(png_ptr, "Missing IHDR before iCCP");
+   else if (png_ptr->mode & PNG_HAVE_IDAT)
+   {
+      png_warning(png_ptr, "Invalid iCCP after IDAT");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+   else if (png_ptr->mode & PNG_HAVE_PLTE)
+      /* Should be an error, but we can cope with it */
+      png_warning(png_ptr, "Out of place iCCP chunk");
+
+   if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_iCCP))
+   {
+      png_warning(png_ptr, "Duplicate iCCP chunk");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+
+#ifdef PNG_MAX_MALLOC_64K
+   if (length > (png_uint_32)65535L)
+   {
+      png_warning(png_ptr, "iCCP chunk too large to fit in memory");
+      skip = length - (png_uint_32)65535L;
+      length = (png_uint_32)65535L;
+   }
+#endif
+
+   png_free(png_ptr, png_ptr->chunkdata);
+   png_ptr->chunkdata = (png_charp)png_malloc(png_ptr, length + 1);
+   slength = (png_size_t)length;
+   png_crc_read(png_ptr, (png_bytep)png_ptr->chunkdata, slength);
+
+   if (png_crc_finish(png_ptr, skip))
+   {
+      png_free(png_ptr, png_ptr->chunkdata);
+      png_ptr->chunkdata = NULL;
+      return;
+   }
+
+   png_ptr->chunkdata[slength] = 0x00;
+
+   for (profile = png_ptr->chunkdata; *profile; profile++)
+      /* Empty loop to find end of name */ ;
+
+   ++profile;
+
+   /* There should be at least one zero (the compression type byte)
+    * following the separator, and we should be on it
+    */
+   if ( profile >= png_ptr->chunkdata + slength - 1)
+   {
+      png_free(png_ptr, png_ptr->chunkdata);
+      png_ptr->chunkdata = NULL;
+      png_warning(png_ptr, "Malformed iCCP chunk");
+      return;
+   }
+
+   /* Compression_type should always be zero */
+   compression_type = *profile++;
+   if (compression_type)
+   {
+      png_warning(png_ptr, "Ignoring nonzero compression type in iCCP chunk");
+      compression_type = 0x00;  /* Reset it to zero (libpng-1.0.6 through 1.0.8
+                                 wrote nonzero) */
+   }
+
+   prefix_length = profile - png_ptr->chunkdata;
+   png_decompress_chunk(png_ptr, compression_type,
+     slength, prefix_length, &data_length);
+
+   profile_length = data_length - prefix_length;
+
+   if ( prefix_length > data_length || profile_length < 4)
+   {
+      png_free(png_ptr, png_ptr->chunkdata);
+      png_ptr->chunkdata = NULL;
+      png_warning(png_ptr, "Profile size field missing from iCCP chunk");
+      return;
+   }
+
+   /* Check the profile_size recorded in the first 32 bits of the ICC profile */
+   pC = (png_bytep)(png_ptr->chunkdata + prefix_length);
+   profile_size = ((*(pC    ))<<24) |
+                  ((*(pC + 1))<<16) |
+                  ((*(pC + 2))<< 8) |
+                  ((*(pC + 3))    );
+
+   if (profile_size < profile_length)
+      profile_length = profile_size;
+
+   if (profile_size > profile_length)
+   {
+      png_free(png_ptr, png_ptr->chunkdata);
+      png_ptr->chunkdata = NULL;
+      png_warning(png_ptr, "Ignoring truncated iCCP profile.");
+      return;
+   }
+
+   png_set_iCCP(png_ptr, info_ptr, png_ptr->chunkdata,
+     compression_type, png_ptr->chunkdata + prefix_length, profile_length);
+   png_free(png_ptr, png_ptr->chunkdata);
+   png_ptr->chunkdata = NULL;
+}
+#endif /* PNG_READ_iCCP_SUPPORTED */
+
+#ifdef PNG_READ_sPLT_SUPPORTED
+void /* PRIVATE */
+png_handle_sPLT(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
+/* Note: this does not properly handle chunks that are > 64K under DOS */
+{
+   png_bytep entry_start;
+   png_sPLT_t new_palette;
+#ifdef PNG_POINTER_INDEXING_SUPPORTED
+   png_sPLT_entryp pp;
+#endif
+   int data_length, entry_size, i;
+   png_uint_32 skip = 0;
+   png_size_t slength;
+
+   png_debug(1, "in png_handle_sPLT");
+
+#ifdef PNG_USER_LIMITS_SUPPORTED
+
+   if (png_ptr->user_chunk_cache_max != 0)
+   {
+      if (png_ptr->user_chunk_cache_max == 1)
+      {
+         png_crc_finish(png_ptr, length);
+         return;
+      }
+      if (--png_ptr->user_chunk_cache_max == 1)
+      {
+         png_warning(png_ptr, "No space in chunk cache for sPLT");
+         png_crc_finish(png_ptr, length);
+         return;
+      }
+   }
+#endif
+
+   if (!(png_ptr->mode & PNG_HAVE_IHDR))
+      png_error(png_ptr, "Missing IHDR before sPLT");
+   else if (png_ptr->mode & PNG_HAVE_IDAT)
+   {
+      png_warning(png_ptr, "Invalid sPLT after IDAT");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+
+#ifdef PNG_MAX_MALLOC_64K
+   if (length > (png_uint_32)65535L)
+   {
+      png_warning(png_ptr, "sPLT chunk too large to fit in memory");
+      skip = length - (png_uint_32)65535L;
+      length = (png_uint_32)65535L;
+   }
+#endif
+
+   png_free(png_ptr, png_ptr->chunkdata);
+   png_ptr->chunkdata = (png_charp)png_malloc(png_ptr, length + 1);
+   slength = (png_size_t)length;
+   png_crc_read(png_ptr, (png_bytep)png_ptr->chunkdata, slength);
+
+   if (png_crc_finish(png_ptr, skip))
+   {
+      png_free(png_ptr, png_ptr->chunkdata);
+      png_ptr->chunkdata = NULL;
+      return;
+   }
+
+   png_ptr->chunkdata[slength] = 0x00;
+
+   for (entry_start = (png_bytep)png_ptr->chunkdata; *entry_start;
+       entry_start++)
+      /* Empty loop to find end of name */ ;
+   ++entry_start;
+
+   /* A sample depth should follow the separator, and we should be on it  */
+   if (entry_start > (png_bytep)png_ptr->chunkdata + slength - 2)
+   {
+      png_free(png_ptr, png_ptr->chunkdata);
+      png_ptr->chunkdata = NULL;
+      png_warning(png_ptr, "malformed sPLT chunk");
+      return;
+   }
+
+   new_palette.depth = *entry_start++;
+   entry_size = (new_palette.depth == 8 ? 6 : 10);
+   data_length = (slength - (entry_start - (png_bytep)png_ptr->chunkdata));
+
+   /* Integrity-check the data length */
+   if (data_length % entry_size)
+   {
+      png_free(png_ptr, png_ptr->chunkdata);
+      png_ptr->chunkdata = NULL;
+      png_warning(png_ptr, "sPLT chunk has bad length");
+      return;
+   }
+
+   new_palette.nentries = (png_int_32) ( data_length / entry_size);
+   if ((png_uint_32) new_palette.nentries >
+       (png_uint_32) (PNG_SIZE_MAX / png_sizeof(png_sPLT_entry)))
+   {
+       png_warning(png_ptr, "sPLT chunk too long");
+       return;
+   }
+   new_palette.entries = (png_sPLT_entryp)png_malloc_warn(
+       png_ptr, new_palette.nentries * png_sizeof(png_sPLT_entry));
+   if (new_palette.entries == NULL)
+   {
+       png_warning(png_ptr, "sPLT chunk requires too much memory");
+       return;
+   }
+
+#ifdef PNG_POINTER_INDEXING_SUPPORTED
+   for (i = 0; i < new_palette.nentries; i++)
+   {
+      pp = new_palette.entries + i;
+
+      if (new_palette.depth == 8)
+      {
+          pp->red = *entry_start++;
+          pp->green = *entry_start++;
+          pp->blue = *entry_start++;
+          pp->alpha = *entry_start++;
+      }
+      else
+      {
+          pp->red   = png_get_uint_16(entry_start); entry_start += 2;
+          pp->green = png_get_uint_16(entry_start); entry_start += 2;
+          pp->blue  = png_get_uint_16(entry_start); entry_start += 2;
+          pp->alpha = png_get_uint_16(entry_start); entry_start += 2;
+      }
+      pp->frequency = png_get_uint_16(entry_start); entry_start += 2;
+   }
+#else
+   pp = new_palette.entries;
+   for (i = 0; i < new_palette.nentries; i++)
+   {
+
+      if (new_palette.depth == 8)
+      {
+          pp[i].red   = *entry_start++;
+          pp[i].green = *entry_start++;
+          pp[i].blue  = *entry_start++;
+          pp[i].alpha = *entry_start++;
+      }
+      else
+      {
+          pp[i].red   = png_get_uint_16(entry_start); entry_start += 2;
+          pp[i].green = png_get_uint_16(entry_start); entry_start += 2;
+          pp[i].blue  = png_get_uint_16(entry_start); entry_start += 2;
+          pp[i].alpha = png_get_uint_16(entry_start); entry_start += 2;
+      }
+      pp->frequency = png_get_uint_16(entry_start); entry_start += 2;
+   }
+#endif
+
+   /* Discard all chunk data except the name and stash that */
+   new_palette.name = png_ptr->chunkdata;
+
+   png_set_sPLT(png_ptr, info_ptr, &new_palette, 1);
+
+   png_free(png_ptr, png_ptr->chunkdata);
+   png_ptr->chunkdata = NULL;
+   png_free(png_ptr, new_palette.entries);
+}
+#endif /* PNG_READ_sPLT_SUPPORTED */
+
+#ifdef PNG_READ_tRNS_SUPPORTED
+void /* PRIVATE */
+png_handle_tRNS(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
+{
+   png_byte readbuf[PNG_MAX_PALETTE_LENGTH];
+
+   png_debug(1, "in png_handle_tRNS");
+
+   if (!(png_ptr->mode & PNG_HAVE_IHDR))
+      png_error(png_ptr, "Missing IHDR before tRNS");
+   else if (png_ptr->mode & PNG_HAVE_IDAT)
+   {
+      png_warning(png_ptr, "Invalid tRNS after IDAT");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+   else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_tRNS))
+   {
+      png_warning(png_ptr, "Duplicate tRNS chunk");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+
+   if (png_ptr->color_type == PNG_COLOR_TYPE_GRAY)
+   {
+      png_byte buf[2];
+
+      if (length != 2)
+      {
+         png_warning(png_ptr, "Incorrect tRNS chunk length");
+         png_crc_finish(png_ptr, length);
+         return;
+      }
+
+      png_crc_read(png_ptr, buf, 2);
+      png_ptr->num_trans = 1;
+      png_ptr->trans_values.gray = png_get_uint_16(buf);
+   }
+   else if (png_ptr->color_type == PNG_COLOR_TYPE_RGB)
+   {
+      png_byte buf[6];
+
+      if (length != 6)
+      {
+         png_warning(png_ptr, "Incorrect tRNS chunk length");
+         png_crc_finish(png_ptr, length);
+         return;
+      }
+      png_crc_read(png_ptr, buf, (png_size_t)length);
+      png_ptr->num_trans = 1;
+      png_ptr->trans_values.red = png_get_uint_16(buf);
+      png_ptr->trans_values.green = png_get_uint_16(buf + 2);
+      png_ptr->trans_values.blue = png_get_uint_16(buf + 4);
+   }
+   else if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
+   {
+      if (!(png_ptr->mode & PNG_HAVE_PLTE))
+      {
+         /* Should be an error, but we can cope with it. */
+         png_warning(png_ptr, "Missing PLTE before tRNS");
+      }
+      if (length > (png_uint_32)png_ptr->num_palette ||
+          length > PNG_MAX_PALETTE_LENGTH)
+      {
+         png_warning(png_ptr, "Incorrect tRNS chunk length");
+         png_crc_finish(png_ptr, length);
+         return;
+      }
+      if (length == 0)
+      {
+         png_warning(png_ptr, "Zero length tRNS chunk");
+         png_crc_finish(png_ptr, length);
+         return;
+      }
+      png_crc_read(png_ptr, readbuf, (png_size_t)length);
+      png_ptr->num_trans = (png_uint_16)length;
+   }
+   else
+   {
+      png_warning(png_ptr, "tRNS chunk not allowed with alpha channel");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+
+   if (png_crc_finish(png_ptr, 0))
+   {
+      png_ptr->num_trans = 0;
+      return;
+   }
+
+   png_set_tRNS(png_ptr, info_ptr, readbuf, png_ptr->num_trans,
+      &(png_ptr->trans_values));
+}
+#endif
+
+#ifdef PNG_READ_bKGD_SUPPORTED
+void /* PRIVATE */
+png_handle_bKGD(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
+{
+   png_size_t truelen;
+   png_byte buf[6];
+
+   png_debug(1, "in png_handle_bKGD");
+
+   if (!(png_ptr->mode & PNG_HAVE_IHDR))
+      png_error(png_ptr, "Missing IHDR before bKGD");
+   else if (png_ptr->mode & PNG_HAVE_IDAT)
+   {
+      png_warning(png_ptr, "Invalid bKGD after IDAT");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+   else if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE &&
+            !(png_ptr->mode & PNG_HAVE_PLTE))
+   {
+      png_warning(png_ptr, "Missing PLTE before bKGD");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+   else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_bKGD))
+   {
+      png_warning(png_ptr, "Duplicate bKGD chunk");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+
+   if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
+      truelen = 1;
+   else if (png_ptr->color_type & PNG_COLOR_MASK_COLOR)
+      truelen = 6;
+   else
+      truelen = 2;
+
+   if (length != truelen)
+   {
+      png_warning(png_ptr, "Incorrect bKGD chunk length");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+
+   png_crc_read(png_ptr, buf, truelen);
+   if (png_crc_finish(png_ptr, 0))
+      return;
+
+   /* We convert the index value into RGB components so that we can allow
+    * arbitrary RGB values for background when we have transparency, and
+    * so it is easy to determine the RGB values of the background color
+    * from the info_ptr struct. */
+   if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
+   {
+      png_ptr->background.index = buf[0];
+      if (info_ptr && info_ptr->num_palette)
+      {
+          if (buf[0] >= info_ptr->num_palette)
+          {
+             png_warning(png_ptr, "Incorrect bKGD chunk index value");
+             return;
+          }
+          png_ptr->background.red =
+             (png_uint_16)png_ptr->palette[buf[0]].red;
+          png_ptr->background.green =
+             (png_uint_16)png_ptr->palette[buf[0]].green;
+          png_ptr->background.blue =
+             (png_uint_16)png_ptr->palette[buf[0]].blue;
+      }
+   }
+   else if (!(png_ptr->color_type & PNG_COLOR_MASK_COLOR)) /* GRAY */
+   {
+      png_ptr->background.red =
+      png_ptr->background.green =
+      png_ptr->background.blue =
+      png_ptr->background.gray = png_get_uint_16(buf);
+   }
+   else
+   {
+      png_ptr->background.red = png_get_uint_16(buf);
+      png_ptr->background.green = png_get_uint_16(buf + 2);
+      png_ptr->background.blue = png_get_uint_16(buf + 4);
+   }
+
+   png_set_bKGD(png_ptr, info_ptr, &(png_ptr->background));
+}
+#endif
+
+#ifdef PNG_READ_hIST_SUPPORTED
+void /* PRIVATE */
+png_handle_hIST(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
+{
+   unsigned int num, i;
+   png_uint_16 readbuf[PNG_MAX_PALETTE_LENGTH];
+
+   png_debug(1, "in png_handle_hIST");
+
+   if (!(png_ptr->mode & PNG_HAVE_IHDR))
+      png_error(png_ptr, "Missing IHDR before hIST");
+   else if (png_ptr->mode & PNG_HAVE_IDAT)
+   {
+      png_warning(png_ptr, "Invalid hIST after IDAT");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+   else if (!(png_ptr->mode & PNG_HAVE_PLTE))
+   {
+      png_warning(png_ptr, "Missing PLTE before hIST");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+   else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_hIST))
+   {
+      png_warning(png_ptr, "Duplicate hIST chunk");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+
+   if (length > 2*PNG_MAX_PALETTE_LENGTH ||
+       length != (unsigned int) (2*png_ptr->num_palette))
+   {
+      png_warning(png_ptr, "Incorrect hIST chunk length");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+
+   num = length / 2 ;
+
+   for (i = 0; i < num; i++)
+   {
+      png_byte buf[2];
+
+      png_crc_read(png_ptr, buf, 2);
+      readbuf[i] = png_get_uint_16(buf);
+   }
+
+   if (png_crc_finish(png_ptr, 0))
+      return;
+
+   png_set_hIST(png_ptr, info_ptr, readbuf);
+}
+#endif
+
+#ifdef PNG_READ_pHYs_SUPPORTED
+void /* PRIVATE */
+png_handle_pHYs(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
+{
+   png_byte buf[9];
+   png_uint_32 res_x, res_y;
+   int unit_type;
+
+   png_debug(1, "in png_handle_pHYs");
+
+   if (!(png_ptr->mode & PNG_HAVE_IHDR))
+      png_error(png_ptr, "Missing IHDR before pHYs");
+   else if (png_ptr->mode & PNG_HAVE_IDAT)
+   {
+      png_warning(png_ptr, "Invalid pHYs after IDAT");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+   else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_pHYs))
+   {
+      png_warning(png_ptr, "Duplicate pHYs chunk");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+
+   if (length != 9)
+   {
+      png_warning(png_ptr, "Incorrect pHYs chunk length");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+
+   png_crc_read(png_ptr, buf, 9);
+   if (png_crc_finish(png_ptr, 0))
+      return;
+
+   res_x = png_get_uint_32(buf);
+   res_y = png_get_uint_32(buf + 4);
+   unit_type = buf[8];
+   png_set_pHYs(png_ptr, info_ptr, res_x, res_y, unit_type);
+}
+#endif
+
+#ifdef PNG_READ_oFFs_SUPPORTED
+void /* PRIVATE */
+png_handle_oFFs(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
+{
+   png_byte buf[9];
+   png_int_32 offset_x, offset_y;
+   int unit_type;
+
+   png_debug(1, "in png_handle_oFFs");
+
+   if (!(png_ptr->mode & PNG_HAVE_IHDR))
+      png_error(png_ptr, "Missing IHDR before oFFs");
+   else if (png_ptr->mode & PNG_HAVE_IDAT)
+   {
+      png_warning(png_ptr, "Invalid oFFs after IDAT");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+   else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_oFFs))
+   {
+      png_warning(png_ptr, "Duplicate oFFs chunk");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+
+   if (length != 9)
+   {
+      png_warning(png_ptr, "Incorrect oFFs chunk length");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+
+   png_crc_read(png_ptr, buf, 9);
+   if (png_crc_finish(png_ptr, 0))
+      return;
+
+   offset_x = png_get_int_32(buf);
+   offset_y = png_get_int_32(buf + 4);
+   unit_type = buf[8];
+   png_set_oFFs(png_ptr, info_ptr, offset_x, offset_y, unit_type);
+}
+#endif
+
+#ifdef PNG_READ_pCAL_SUPPORTED
+/* Read the pCAL chunk (described in the PNG Extensions document) */
+void /* PRIVATE */
+png_handle_pCAL(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
+{
+   png_int_32 X0, X1;
+   png_byte type, nparams;
+   png_charp buf, units, endptr;
+   png_charpp params;
+   png_size_t slength;
+   int i;
+
+   png_debug(1, "in png_handle_pCAL");
+
+   if (!(png_ptr->mode & PNG_HAVE_IHDR))
+      png_error(png_ptr, "Missing IHDR before pCAL");
+   else if (png_ptr->mode & PNG_HAVE_IDAT)
+   {
+      png_warning(png_ptr, "Invalid pCAL after IDAT");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+   else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_pCAL))
+   {
+      png_warning(png_ptr, "Duplicate pCAL chunk");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+
+   png_debug1(2, "Allocating and reading pCAL chunk data (%lu bytes)",
+      length + 1);
+   png_free(png_ptr, png_ptr->chunkdata);
+   png_ptr->chunkdata = (png_charp)png_malloc_warn(png_ptr, length + 1);
+   if (png_ptr->chunkdata == NULL)
+     {
+       png_warning(png_ptr, "No memory for pCAL purpose.");
+       return;
+     }
+   slength = (png_size_t)length;
+   png_crc_read(png_ptr, (png_bytep)png_ptr->chunkdata, slength);
+
+   if (png_crc_finish(png_ptr, 0))
+   {
+      png_free(png_ptr, png_ptr->chunkdata);
+      png_ptr->chunkdata = NULL;
+      return;
+   }
+
+   png_ptr->chunkdata[slength] = 0x00; /* Null terminate the last string */
+
+   png_debug(3, "Finding end of pCAL purpose string");
+   for (buf = png_ptr->chunkdata; *buf; buf++)
+      /* Empty loop */ ;
+
+   endptr = png_ptr->chunkdata + slength;
+
+   /* We need to have at least 12 bytes after the purpose string
+      in order to get the parameter information. */
+   if (endptr <= buf + 12)
+   {
+      png_warning(png_ptr, "Invalid pCAL data");
+      png_free(png_ptr, png_ptr->chunkdata);
+      png_ptr->chunkdata = NULL;
+      return;
+   }
+
+   png_debug(3, "Reading pCAL X0, X1, type, nparams, and units");
+   X0 = png_get_int_32((png_bytep)buf+1);
+   X1 = png_get_int_32((png_bytep)buf+5);
+   type = buf[9];
+   nparams = buf[10];
+   units = buf + 11;
+
+   png_debug(3, "Checking pCAL equation type and number of parameters");
+   /* Check that we have the right number of parameters for known
+      equation types. */
+   if ((type == PNG_EQUATION_LINEAR && nparams != 2) ||
+       (type == PNG_EQUATION_BASE_E && nparams != 3) ||
+       (type == PNG_EQUATION_ARBITRARY && nparams != 3) ||
+       (type == PNG_EQUATION_HYPERBOLIC && nparams != 4))
+   {
+      png_warning(png_ptr, "Invalid pCAL parameters for equation type");
+      png_free(png_ptr, png_ptr->chunkdata);
+      png_ptr->chunkdata = NULL;
+      return;
+   }
+   else if (type >= PNG_EQUATION_LAST)
+   {
+      png_warning(png_ptr, "Unrecognized equation type for pCAL chunk");
+   }
+
+   for (buf = units; *buf; buf++)
+      /* Empty loop to move past the units string. */ ;
+
+   png_debug(3, "Allocating pCAL parameters array");
+   params = (png_charpp)png_malloc_warn(png_ptr,
+      (png_uint_32)(nparams * png_sizeof(png_charp))) ;
+   if (params == NULL)
+     {
+       png_free(png_ptr, png_ptr->chunkdata);
+       png_ptr->chunkdata = NULL;
+       png_warning(png_ptr, "No memory for pCAL params.");
+       return;
+     }
+
+   /* Get pointers to the start of each parameter string. */
+   for (i = 0; i < (int)nparams; i++)
+   {
+      buf++; /* Skip the null string terminator from previous parameter. */
+
+      png_debug1(3, "Reading pCAL parameter %d", i);
+      for (params[i] = buf; buf <= endptr && *buf != 0x00; buf++)
+         /* Empty loop to move past each parameter string */ ;
+
+      /* Make sure we haven't run out of data yet */
+      if (buf > endptr)
+      {
+         png_warning(png_ptr, "Invalid pCAL data");
+         png_free(png_ptr, png_ptr->chunkdata);
+         png_ptr->chunkdata = NULL;
+         png_free(png_ptr, params);
+         return;
+      }
+   }
+
+   png_set_pCAL(png_ptr, info_ptr, png_ptr->chunkdata, X0, X1, type, nparams,
+      units, params);
+
+   png_free(png_ptr, png_ptr->chunkdata);
+   png_ptr->chunkdata = NULL;
+   png_free(png_ptr, params);
+}
+#endif
+
+#ifdef PNG_READ_sCAL_SUPPORTED
+/* Read the sCAL chunk */
+void /* PRIVATE */
+png_handle_sCAL(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
+{
+   png_charp ep;
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+   double width, height;
+   png_charp vp;
+#else
+#ifdef PNG_FIXED_POINT_SUPPORTED
+   png_charp swidth, sheight;
+#endif
+#endif
+   png_size_t slength;
+
+   png_debug(1, "in png_handle_sCAL");
+
+   if (!(png_ptr->mode & PNG_HAVE_IHDR))
+      png_error(png_ptr, "Missing IHDR before sCAL");
+   else if (png_ptr->mode & PNG_HAVE_IDAT)
+   {
+      png_warning(png_ptr, "Invalid sCAL after IDAT");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+   else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_sCAL))
+   {
+      png_warning(png_ptr, "Duplicate sCAL chunk");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+
+   /* Need unit type, width, \0, height: minimum 4 bytes */
+   else if (length < 4)
+   {
+      png_warning(png_ptr, "sCAL chunk too short");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+
+   png_debug1(2, "Allocating and reading sCAL chunk data (%lu bytes)",
+      length + 1);
+   png_ptr->chunkdata = (png_charp)png_malloc_warn(png_ptr, length + 1);
+   if (png_ptr->chunkdata == NULL)
+   {
+      png_warning(png_ptr, "Out of memory while processing sCAL chunk");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+   slength = (png_size_t)length;
+   png_crc_read(png_ptr, (png_bytep)png_ptr->chunkdata, slength);
+
+   if (png_crc_finish(png_ptr, 0))
+   {
+      png_free(png_ptr, png_ptr->chunkdata);
+      png_ptr->chunkdata = NULL;
+      return;
+   }
+
+   png_ptr->chunkdata[slength] = 0x00; /* Null terminate the last string */
+
+   ep = png_ptr->chunkdata + 1;        /* Skip unit byte */
+
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+   width = png_strtod(png_ptr, ep, &vp);
+   if (*vp)
+   {
+      png_warning(png_ptr, "malformed width string in sCAL chunk");
+      png_free(png_ptr, png_ptr->chunkdata);
+      png_ptr->chunkdata = NULL;
+      return;
+   }
+#else
+#ifdef PNG_FIXED_POINT_SUPPORTED
+   swidth = (png_charp)png_malloc_warn(png_ptr, png_strlen(ep) + 1);
+   if (swidth == NULL)
+   {
+      png_warning(png_ptr, "Out of memory while processing sCAL chunk width");
+      png_free(png_ptr, png_ptr->chunkdata);
+      png_ptr->chunkdata = NULL;
+      return;
+   }
+   png_memcpy(swidth, ep, (png_size_t)png_strlen(ep) + 1);
+#endif
+#endif
+
+   for (ep = png_ptr->chunkdata + 1; *ep; ep++)
+      /* Empty loop */ ;
+   ep++;
+
+   if (png_ptr->chunkdata + slength < ep)
+   {
+      png_warning(png_ptr, "Truncated sCAL chunk");
+#if defined(PNG_FIXED_POINT_SUPPORTED) && !defined(PNG_FLOATING_POINT_SUPPORTED)
+      png_free(png_ptr, swidth);
+#endif
+      png_free(png_ptr, png_ptr->chunkdata);
+      png_ptr->chunkdata = NULL;
+      return;
+   }
+
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+   height = png_strtod(png_ptr, ep, &vp);
+   if (*vp)
+   {
+      png_warning(png_ptr, "malformed height string in sCAL chunk");
+      png_free(png_ptr, png_ptr->chunkdata);
+      png_ptr->chunkdata = NULL;
+#if defined(PNG_FIXED_POINT_SUPPORTED) && !defined(PNG_FLOATING_POINT_SUPPORTED)
+      png_free(png_ptr, swidth);
+#endif
+      return;
+   }
+#else
+#ifdef PNG_FIXED_POINT_SUPPORTED
+   sheight = (png_charp)png_malloc_warn(png_ptr, png_strlen(ep) + 1);
+   if (sheight == NULL)
+   {
+      png_warning(png_ptr, "Out of memory while processing sCAL chunk height");
+      png_free(png_ptr, png_ptr->chunkdata);
+      png_ptr->chunkdata = NULL;
+#if defined(PNG_FIXED_POINT_SUPPORTED) && !defined(PNG_FLOATING_POINT_SUPPORTED)
+      png_free(png_ptr, swidth);
+#endif
+      return;
+   }
+   png_memcpy(sheight, ep, (png_size_t)png_strlen(ep) + 1);
+#endif
+#endif
+
+   if (png_ptr->chunkdata + slength < ep
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+      || width <= 0. || height <= 0.
+#endif
+      )
+   {
+      png_warning(png_ptr, "Invalid sCAL data");
+      png_free(png_ptr, png_ptr->chunkdata);
+      png_ptr->chunkdata = NULL;
+#if defined(PNG_FIXED_POINT_SUPPORTED) && !defined(PNG_FLOATING_POINT_SUPPORTED)
+      png_free(png_ptr, swidth);
+      png_free(png_ptr, sheight);
+#endif
+      return;
+   }
+
+
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+   png_set_sCAL(png_ptr, info_ptr, png_ptr->chunkdata[0], width, height);
+#else
+#ifdef PNG_FIXED_POINT_SUPPORTED
+   png_set_sCAL_s(png_ptr, info_ptr, png_ptr->chunkdata[0], swidth, sheight);
+#endif
+#endif
+
+   png_free(png_ptr, png_ptr->chunkdata);
+   png_ptr->chunkdata = NULL;
+#if defined(PNG_FIXED_POINT_SUPPORTED) && !defined(PNG_FLOATING_POINT_SUPPORTED)
+   png_free(png_ptr, swidth);
+   png_free(png_ptr, sheight);
+#endif
+}
+#endif
+
+#ifdef PNG_READ_tIME_SUPPORTED
+void /* PRIVATE */
+png_handle_tIME(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
+{
+   png_byte buf[7];
+   png_time mod_time;
+
+   png_debug(1, "in png_handle_tIME");
+
+   if (!(png_ptr->mode & PNG_HAVE_IHDR))
+      png_error(png_ptr, "Out of place tIME chunk");
+   else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_tIME))
+   {
+      png_warning(png_ptr, "Duplicate tIME chunk");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+
+   if (png_ptr->mode & PNG_HAVE_IDAT)
+      png_ptr->mode |= PNG_AFTER_IDAT;
+
+   if (length != 7)
+   {
+      png_warning(png_ptr, "Incorrect tIME chunk length");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+
+   png_crc_read(png_ptr, buf, 7);
+   if (png_crc_finish(png_ptr, 0))
+      return;
+
+   mod_time.second = buf[6];
+   mod_time.minute = buf[5];
+   mod_time.hour = buf[4];
+   mod_time.day = buf[3];
+   mod_time.month = buf[2];
+   mod_time.year = png_get_uint_16(buf);
+
+   png_set_tIME(png_ptr, info_ptr, &mod_time);
+}
+#endif
+
+#ifdef PNG_READ_tEXt_SUPPORTED
+/* Note: this does not properly handle chunks that are > 64K under DOS */
+void /* PRIVATE */
+png_handle_tEXt(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
+{
+   png_textp text_ptr;
+   png_charp key;
+   png_charp text;
+   png_uint_32 skip = 0;
+   png_size_t slength;
+   int ret;
+
+   png_debug(1, "in png_handle_tEXt");
+
+#ifdef PNG_USER_LIMITS_SUPPORTED
+   if (png_ptr->user_chunk_cache_max != 0)
+   {
+      if (png_ptr->user_chunk_cache_max == 1)
+      {
+         png_crc_finish(png_ptr, length);
+         return;
+      }
+      if (--png_ptr->user_chunk_cache_max == 1)
+      {
+         png_warning(png_ptr, "No space in chunk cache for tEXt");
+         png_crc_finish(png_ptr, length);
+         return;
+      }
+   }
+#endif
+
+   if (!(png_ptr->mode & PNG_HAVE_IHDR))
+      png_error(png_ptr, "Missing IHDR before tEXt");
+
+   if (png_ptr->mode & PNG_HAVE_IDAT)
+      png_ptr->mode |= PNG_AFTER_IDAT;
+
+#ifdef PNG_MAX_MALLOC_64K
+   if (length > (png_uint_32)65535L)
+   {
+      png_warning(png_ptr, "tEXt chunk too large to fit in memory");
+      skip = length - (png_uint_32)65535L;
+      length = (png_uint_32)65535L;
+   }
+#endif
+
+   png_free(png_ptr, png_ptr->chunkdata);
+
+   png_ptr->chunkdata = (png_charp)png_malloc_warn(png_ptr, length + 1);
+   if (png_ptr->chunkdata == NULL)
+   {
+     png_warning(png_ptr, "No memory to process text chunk.");
+     return;
+   }
+   slength = (png_size_t)length;
+   png_crc_read(png_ptr, (png_bytep)png_ptr->chunkdata, slength);
+
+   if (png_crc_finish(png_ptr, skip))
+   {
+      png_free(png_ptr, png_ptr->chunkdata);
+      png_ptr->chunkdata = NULL;
+      return;
+   }
+
+   key = png_ptr->chunkdata;
+
+   key[slength] = 0x00;
+
+   for (text = key; *text; text++)
+      /* Empty loop to find end of key */ ;
+
+   if (text != key + slength)
+      text++;
+
+   text_ptr = (png_textp)png_malloc_warn(png_ptr,
+      (png_uint_32)png_sizeof(png_text));
+   if (text_ptr == NULL)
+   {
+     png_warning(png_ptr, "Not enough memory to process text chunk.");
+     png_free(png_ptr, png_ptr->chunkdata);
+     png_ptr->chunkdata = NULL;
+     return;
+   }
+   text_ptr->compression = PNG_TEXT_COMPRESSION_NONE;
+   text_ptr->key = key;
+#ifdef PNG_iTXt_SUPPORTED
+   text_ptr->lang = NULL;
+   text_ptr->lang_key = NULL;
+   text_ptr->itxt_length = 0;
+#endif
+   text_ptr->text = text;
+   text_ptr->text_length = png_strlen(text);
+
+   ret = png_set_text_2(png_ptr, info_ptr, text_ptr, 1);
+
+   png_free(png_ptr, png_ptr->chunkdata);
+   png_ptr->chunkdata = NULL;
+   png_free(png_ptr, text_ptr);
+   if (ret)
+     png_warning(png_ptr, "Insufficient memory to process text chunk.");
+}
+#endif
+
+#ifdef PNG_READ_zTXt_SUPPORTED
+/* Note: this does not correctly handle chunks that are > 64K under DOS */
+void /* PRIVATE */
+png_handle_zTXt(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
+{
+   png_textp text_ptr;
+   png_charp text;
+   int comp_type;
+   int ret;
+   png_size_t slength, prefix_len, data_len;
+
+   png_debug(1, "in png_handle_zTXt");
+
+#ifdef PNG_USER_LIMITS_SUPPORTED
+   if (png_ptr->user_chunk_cache_max != 0)
+   {
+      if (png_ptr->user_chunk_cache_max == 1)
+      {
+         png_crc_finish(png_ptr, length);
+         return;
+      }
+      if (--png_ptr->user_chunk_cache_max == 1)
+      {
+         png_warning(png_ptr, "No space in chunk cache for zTXt");
+         png_crc_finish(png_ptr, length);
+         return;
+      }
+   }
+#endif
+
+   if (!(png_ptr->mode & PNG_HAVE_IHDR))
+      png_error(png_ptr, "Missing IHDR before zTXt");
+
+   if (png_ptr->mode & PNG_HAVE_IDAT)
+      png_ptr->mode |= PNG_AFTER_IDAT;
+
+#ifdef PNG_MAX_MALLOC_64K
+   /* We will no doubt have problems with chunks even half this size, but
+      there is no hard and fast rule to tell us where to stop. */
+   if (length > (png_uint_32)65535L)
+   {
+     png_warning(png_ptr, "zTXt chunk too large to fit in memory");
+     png_crc_finish(png_ptr, length);
+     return;
+   }
+#endif
+
+   png_free(png_ptr, png_ptr->chunkdata);
+   png_ptr->chunkdata = (png_charp)png_malloc_warn(png_ptr, length + 1);
+   if (png_ptr->chunkdata == NULL)
+   {
+     png_warning(png_ptr, "Out of memory processing zTXt chunk.");
+     return;
+   }
+   slength = (png_size_t)length;
+   png_crc_read(png_ptr, (png_bytep)png_ptr->chunkdata, slength);
+   if (png_crc_finish(png_ptr, 0))
+   {
+      png_free(png_ptr, png_ptr->chunkdata);
+      png_ptr->chunkdata = NULL;
+      return;
+   }
+
+   png_ptr->chunkdata[slength] = 0x00;
+
+   for (text = png_ptr->chunkdata; *text; text++)
+      /* Empty loop */ ;
+
+   /* zTXt must have some text after the chunkdataword */
+   if (text >= png_ptr->chunkdata + slength - 2)
+   {
+      png_warning(png_ptr, "Truncated zTXt chunk");
+      png_free(png_ptr, png_ptr->chunkdata);
+      png_ptr->chunkdata = NULL;
+      return;
+   }
+   else
+   {
+       comp_type = *(++text);
+       if (comp_type != PNG_TEXT_COMPRESSION_zTXt)
+       {
+          png_warning(png_ptr, "Unknown compression type in zTXt chunk");
+          comp_type = PNG_TEXT_COMPRESSION_zTXt;
+       }
+       text++;        /* Skip the compression_method byte */
+   }
+   prefix_len = text - png_ptr->chunkdata;
+
+   png_decompress_chunk(png_ptr, comp_type,
+     (png_size_t)length, prefix_len, &data_len);
+
+   text_ptr = (png_textp)png_malloc_warn(png_ptr,
+      (png_uint_32)png_sizeof(png_text));
+   if (text_ptr == NULL)
+   {
+     png_warning(png_ptr, "Not enough memory to process zTXt chunk.");
+     png_free(png_ptr, png_ptr->chunkdata);
+     png_ptr->chunkdata = NULL;
+     return;
+   }
+   text_ptr->compression = comp_type;
+   text_ptr->key = png_ptr->chunkdata;
+#ifdef PNG_iTXt_SUPPORTED
+   text_ptr->lang = NULL;
+   text_ptr->lang_key = NULL;
+   text_ptr->itxt_length = 0;
+#endif
+   text_ptr->text = png_ptr->chunkdata + prefix_len;
+   text_ptr->text_length = data_len;
+
+   ret = png_set_text_2(png_ptr, info_ptr, text_ptr, 1);
+
+   png_free(png_ptr, text_ptr);
+   png_free(png_ptr, png_ptr->chunkdata);
+   png_ptr->chunkdata = NULL;
+   if (ret)
+     png_error(png_ptr, "Insufficient memory to store zTXt chunk.");
+}
+#endif
+
+#ifdef PNG_READ_iTXt_SUPPORTED
+/* Note: this does not correctly handle chunks that are > 64K under DOS */
+void /* PRIVATE */
+png_handle_iTXt(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
+{
+   png_textp text_ptr;
+   png_charp key, lang, text, lang_key;
+   int comp_flag;
+   int comp_type = 0;
+   int ret;
+   png_size_t slength, prefix_len, data_len;
+
+   png_debug(1, "in png_handle_iTXt");
+
+#ifdef PNG_USER_LIMITS_SUPPORTED
+   if (png_ptr->user_chunk_cache_max != 0)
+   {
+      if (png_ptr->user_chunk_cache_max == 1)
+      {
+         png_crc_finish(png_ptr, length);
+         return;
+      }
+      if (--png_ptr->user_chunk_cache_max == 1)
+      {
+         png_warning(png_ptr, "No space in chunk cache for iTXt");
+         png_crc_finish(png_ptr, length);
+         return;
+      }
+   }
+#endif
+
+   if (!(png_ptr->mode & PNG_HAVE_IHDR))
+      png_error(png_ptr, "Missing IHDR before iTXt");
+
+   if (png_ptr->mode & PNG_HAVE_IDAT)
+      png_ptr->mode |= PNG_AFTER_IDAT;
+
+#ifdef PNG_MAX_MALLOC_64K
+   /* We will no doubt have problems with chunks even half this size, but
+      there is no hard and fast rule to tell us where to stop. */
+   if (length > (png_uint_32)65535L)
+   {
+     png_warning(png_ptr, "iTXt chunk too large to fit in memory");
+     png_crc_finish(png_ptr, length);
+     return;
+   }
+#endif
+
+   png_free(png_ptr, png_ptr->chunkdata);
+   png_ptr->chunkdata = (png_charp)png_malloc_warn(png_ptr, length + 1);
+   if (png_ptr->chunkdata == NULL)
+   {
+     png_warning(png_ptr, "No memory to process iTXt chunk.");
+     return;
+   }
+   slength = (png_size_t)length;
+   png_crc_read(png_ptr, (png_bytep)png_ptr->chunkdata, slength);
+   if (png_crc_finish(png_ptr, 0))
+   {
+      png_free(png_ptr, png_ptr->chunkdata);
+      png_ptr->chunkdata = NULL;
+      return;
+   }
+
+   png_ptr->chunkdata[slength] = 0x00;
+
+   for (lang = png_ptr->chunkdata; *lang; lang++)
+      /* Empty loop */ ;
+   lang++;        /* Skip NUL separator */
+
+   /* iTXt must have a language tag (possibly empty), two compression bytes,
+    * translated keyword (possibly empty), and possibly some text after the
+    * keyword
+    */
+
+   if (lang >= png_ptr->chunkdata + slength - 3)
+   {
+      png_warning(png_ptr, "Truncated iTXt chunk");
+      png_free(png_ptr, png_ptr->chunkdata);
+      png_ptr->chunkdata = NULL;
+      return;
+   }
+   else
+   {
+       comp_flag = *lang++;
+       comp_type = *lang++;
+   }
+
+   for (lang_key = lang; *lang_key; lang_key++)
+      /* Empty loop */ ;
+   lang_key++;        /* Skip NUL separator */
+
+   if (lang_key >= png_ptr->chunkdata + slength)
+   {
+      png_warning(png_ptr, "Truncated iTXt chunk");
+      png_free(png_ptr, png_ptr->chunkdata);
+      png_ptr->chunkdata = NULL;
+      return;
+   }
+
+   for (text = lang_key; *text; text++)
+      /* Empty loop */ ;
+   text++;        /* Skip NUL separator */
+   if (text >= png_ptr->chunkdata + slength)
+   {
+      png_warning(png_ptr, "Malformed iTXt chunk");
+      png_free(png_ptr, png_ptr->chunkdata);
+      png_ptr->chunkdata = NULL;
+      return;
+   }
+
+   prefix_len = text - png_ptr->chunkdata;
+
+   key=png_ptr->chunkdata;
+   if (comp_flag)
+       png_decompress_chunk(png_ptr, comp_type,
+         (size_t)length, prefix_len, &data_len);
+   else
+       data_len = png_strlen(png_ptr->chunkdata + prefix_len);
+   text_ptr = (png_textp)png_malloc_warn(png_ptr,
+      (png_uint_32)png_sizeof(png_text));
+   if (text_ptr == NULL)
+   {
+     png_warning(png_ptr, "Not enough memory to process iTXt chunk.");
+     png_free(png_ptr, png_ptr->chunkdata);
+     png_ptr->chunkdata = NULL;
+     return;
+   }
+   text_ptr->compression = (int)comp_flag + 1;
+   text_ptr->lang_key = png_ptr->chunkdata + (lang_key - key);
+   text_ptr->lang = png_ptr->chunkdata + (lang - key);
+   text_ptr->itxt_length = data_len;
+   text_ptr->text_length = 0;
+   text_ptr->key = png_ptr->chunkdata;
+   text_ptr->text = png_ptr->chunkdata + prefix_len;
+
+   ret = png_set_text_2(png_ptr, info_ptr, text_ptr, 1);
+
+   png_free(png_ptr, text_ptr);
+   png_free(png_ptr, png_ptr->chunkdata);
+   png_ptr->chunkdata = NULL;
+   if (ret)
+     png_error(png_ptr, "Insufficient memory to store iTXt chunk.");
+}
+#endif
+
+/* This function is called when we haven't found a handler for a
+   chunk.  If there isn't a problem with the chunk itself (ie bad
+   chunk name, CRC, or a critical chunk), the chunk is silently ignored
+   -- unless the PNG_FLAG_UNKNOWN_CHUNKS_SUPPORTED flag is on in which
+   case it will be saved away to be written out later. */
+void /* PRIVATE */
+png_handle_unknown(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
+{
+   png_uint_32 skip = 0;
+
+   png_debug(1, "in png_handle_unknown");
+
+#ifdef PNG_USER_LIMITS_SUPPORTED
+   if (png_ptr->user_chunk_cache_max != 0)
+   {
+      if (png_ptr->user_chunk_cache_max == 1)
+      {
+         png_crc_finish(png_ptr, length);
+         return;
+      }
+      if (--png_ptr->user_chunk_cache_max == 1)
+      {
+         png_warning(png_ptr, "No space in chunk cache for unknown chunk");
+         png_crc_finish(png_ptr, length);
+         return;
+      }
+   }
+#endif
+
+   if (png_ptr->mode & PNG_HAVE_IDAT)
+   {
+#ifdef PNG_USE_LOCAL_ARRAYS
+      PNG_CONST PNG_IDAT;
+#endif
+      if (png_memcmp(png_ptr->chunk_name, png_IDAT, 4))  /* Not an IDAT */
+         png_ptr->mode |= PNG_AFTER_IDAT;
+   }
+
+   if (!(png_ptr->chunk_name[0] & 0x20))
+   {
+#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
+      if (png_handle_as_unknown(png_ptr, png_ptr->chunk_name) !=
+           PNG_HANDLE_CHUNK_ALWAYS
+#ifdef PNG_READ_USER_CHUNKS_SUPPORTED
+           && png_ptr->read_user_chunk_fn == NULL
+#endif
+        )
+#endif
+          png_chunk_error(png_ptr, "unknown critical chunk");
+   }
+
+#ifdef PNG_READ_UNKNOWN_CHUNKS_SUPPORTED
+   if ((png_ptr->flags & PNG_FLAG_KEEP_UNKNOWN_CHUNKS)
+#ifdef PNG_READ_USER_CHUNKS_SUPPORTED
+       || (png_ptr->read_user_chunk_fn != NULL)
+#endif
+        )
+   {
+#ifdef PNG_MAX_MALLOC_64K
+       if (length > (png_uint_32)65535L)
+       {
+           png_warning(png_ptr, "unknown chunk too large to fit in memory");
+           skip = length - (png_uint_32)65535L;
+           length = (png_uint_32)65535L;
+       }
+#endif
+       png_memcpy((png_charp)png_ptr->unknown_chunk.name,
+                  (png_charp)png_ptr->chunk_name,
+                  png_sizeof(png_ptr->unknown_chunk.name));
+       png_ptr->unknown_chunk.name[png_sizeof(png_ptr->unknown_chunk.name)-1]
+           = '\0';
+       png_ptr->unknown_chunk.size = (png_size_t)length;
+       if (length == 0)
+         png_ptr->unknown_chunk.data = NULL;
+       else
+       {
+         png_ptr->unknown_chunk.data = (png_bytep)png_malloc(png_ptr, length);
+         png_crc_read(png_ptr, (png_bytep)png_ptr->unknown_chunk.data, length);
+       }
+#ifdef PNG_READ_USER_CHUNKS_SUPPORTED
+       if (png_ptr->read_user_chunk_fn != NULL)
+       {
+          /* Callback to user unknown chunk handler */
+          int ret;
+          ret = (*(png_ptr->read_user_chunk_fn))
+            (png_ptr, &png_ptr->unknown_chunk);
+          if (ret < 0)
+             png_chunk_error(png_ptr, "error in user chunk");
+          if (ret == 0)
+          {
+             if (!(png_ptr->chunk_name[0] & 0x20))
+#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
+                if (png_handle_as_unknown(png_ptr, png_ptr->chunk_name) !=
+                     PNG_HANDLE_CHUNK_ALWAYS)
+#endif
+                   png_chunk_error(png_ptr, "unknown critical chunk");
+             png_set_unknown_chunks(png_ptr, info_ptr,
+               &png_ptr->unknown_chunk, 1);
+          }
+       }
+       else
+#endif
+       png_set_unknown_chunks(png_ptr, info_ptr, &png_ptr->unknown_chunk, 1);
+       png_free(png_ptr, png_ptr->unknown_chunk.data);
+       png_ptr->unknown_chunk.data = NULL;
+   }
+   else
+#endif
+      skip = length;
+
+   png_crc_finish(png_ptr, skip);
+
+#ifndef PNG_READ_USER_CHUNKS_SUPPORTED
+   info_ptr = info_ptr; /* Quiet compiler warnings about unused info_ptr */
+#endif
+}
+
+/* This function is called to verify that a chunk name is valid.
+   This function can't have the "critical chunk check" incorporated
+   into it, since in the future we will need to be able to call user
+   functions to handle unknown critical chunks after we check that
+   the chunk name itself is valid. */
+
+#define isnonalpha(c) ((c) < 65 || (c) > 122 || ((c) > 90 && (c) < 97))
+
+void /* PRIVATE */
+png_check_chunk_name(png_structp png_ptr, png_bytep chunk_name)
+{
+   png_debug(1, "in png_check_chunk_name");
+   if (isnonalpha(chunk_name[0]) || isnonalpha(chunk_name[1]) ||
+       isnonalpha(chunk_name[2]) || isnonalpha(chunk_name[3]))
+   {
+      png_chunk_error(png_ptr, "invalid chunk type");
+   }
+}
+
+/* Combines the row recently read in with the existing pixels in the
+   row.  This routine takes care of alpha and transparency if requested.
+   This routine also handles the two methods of progressive display
+   of interlaced images, depending on the mask value.
+   The mask value describes which pixels are to be combined with
+   the row.  The pattern always repeats every 8 pixels, so just 8
+   bits are needed.  A one indicates the pixel is to be combined,
+   a zero indicates the pixel is to be skipped.  This is in addition
+   to any alpha or transparency value associated with the pixel.  If
+   you want all pixels to be combined, pass 0xff (255) in mask.  */
+
+void /* PRIVATE */
+png_combine_row(png_structp png_ptr, png_bytep row, int mask)
+{
+   png_debug(1, "in png_combine_row");
+   if (mask == 0xff)
+   {
+      png_memcpy(row, png_ptr->row_buf + 1,
+         PNG_ROWBYTES(png_ptr->row_info.pixel_depth, png_ptr->width));
+   }
+   else
+   {
+      switch (png_ptr->row_info.pixel_depth)
+      {
+         case 1:
+         {
+            png_bytep sp = png_ptr->row_buf + 1;
+            png_bytep dp = row;
+            int s_inc, s_start, s_end;
+            int m = 0x80;
+            int shift;
+            png_uint_32 i;
+            png_uint_32 row_width = png_ptr->width;
+
+#ifdef PNG_READ_PACKSWAP_SUPPORTED
+            if (png_ptr->transformations & PNG_PACKSWAP)
+            {
+                s_start = 0;
+                s_end = 7;
+                s_inc = 1;
+            }
+            else
+#endif
+            {
+                s_start = 7;
+                s_end = 0;
+                s_inc = -1;
+            }
+
+            shift = s_start;
+
+            for (i = 0; i < row_width; i++)
+            {
+               if (m & mask)
+               {
+                  int value;
+
+                  value = (*sp >> shift) & 0x01;
+                  *dp &= (png_byte)((0x7f7f >> (7 - shift)) & 0xff);
+                  *dp |= (png_byte)(value << shift);
+               }
+
+               if (shift == s_end)
+               {
+                  shift = s_start;
+                  sp++;
+                  dp++;
+               }
+               else
+                  shift += s_inc;
+
+               if (m == 1)
+                  m = 0x80;
+               else
+                  m >>= 1;
+            }
+            break;
+         }
+         case 2:
+         {
+            png_bytep sp = png_ptr->row_buf + 1;
+            png_bytep dp = row;
+            int s_start, s_end, s_inc;
+            int m = 0x80;
+            int shift;
+            png_uint_32 i;
+            png_uint_32 row_width = png_ptr->width;
+            int value;
+
+#ifdef PNG_READ_PACKSWAP_SUPPORTED
+            if (png_ptr->transformations & PNG_PACKSWAP)
+            {
+               s_start = 0;
+               s_end = 6;
+               s_inc = 2;
+            }
+            else
+#endif
+            {
+               s_start = 6;
+               s_end = 0;
+               s_inc = -2;
+            }
+
+            shift = s_start;
+
+            for (i = 0; i < row_width; i++)
+            {
+               if (m & mask)
+               {
+                  value = (*sp >> shift) & 0x03;
+                  *dp &= (png_byte)((0x3f3f >> (6 - shift)) & 0xff);
+                  *dp |= (png_byte)(value << shift);
+               }
+
+               if (shift == s_end)
+               {
+                  shift = s_start;
+                  sp++;
+                  dp++;
+               }
+               else
+                  shift += s_inc;
+               if (m == 1)
+                  m = 0x80;
+               else
+                  m >>= 1;
+            }
+            break;
+         }
+         case 4:
+         {
+            png_bytep sp = png_ptr->row_buf + 1;
+            png_bytep dp = row;
+            int s_start, s_end, s_inc;
+            int m = 0x80;
+            int shift;
+            png_uint_32 i;
+            png_uint_32 row_width = png_ptr->width;
+            int value;
+
+#ifdef PNG_READ_PACKSWAP_SUPPORTED
+            if (png_ptr->transformations & PNG_PACKSWAP)
+            {
+               s_start = 0;
+               s_end = 4;
+               s_inc = 4;
+            }
+            else
+#endif
+            {
+               s_start = 4;
+               s_end = 0;
+               s_inc = -4;
+            }
+            shift = s_start;
+
+            for (i = 0; i < row_width; i++)
+            {
+               if (m & mask)
+               {
+                  value = (*sp >> shift) & 0xf;
+                  *dp &= (png_byte)((0xf0f >> (4 - shift)) & 0xff);
+                  *dp |= (png_byte)(value << shift);
+               }
+
+               if (shift == s_end)
+               {
+                  shift = s_start;
+                  sp++;
+                  dp++;
+               }
+               else
+                  shift += s_inc;
+               if (m == 1)
+                  m = 0x80;
+               else
+                  m >>= 1;
+            }
+            break;
+         }
+         default:
+         {
+            png_bytep sp = png_ptr->row_buf + 1;
+            png_bytep dp = row;
+            png_size_t pixel_bytes = (png_ptr->row_info.pixel_depth >> 3);
+            png_uint_32 i;
+            png_uint_32 row_width = png_ptr->width;
+            png_byte m = 0x80;
+
+
+            for (i = 0; i < row_width; i++)
+            {
+               if (m & mask)
+               {
+                  png_memcpy(dp, sp, pixel_bytes);
+               }
+
+               sp += pixel_bytes;
+               dp += pixel_bytes;
+
+               if (m == 1)
+                  m = 0x80;
+               else
+                  m >>= 1;
+            }
+            break;
+         }
+      }
+   }
+}
+
+#ifdef PNG_READ_INTERLACING_SUPPORTED
+/* OLD pre-1.0.9 interface:
+void png_do_read_interlace(png_row_infop row_info, png_bytep row, int pass,
+   png_uint_32 transformations)
+ */
+void /* PRIVATE */
+png_do_read_interlace(png_structp png_ptr)
+{
+   png_row_infop row_info = &(png_ptr->row_info);
+   png_bytep row = png_ptr->row_buf + 1;
+   int pass = png_ptr->pass;
+   png_uint_32 transformations = png_ptr->transformations;
+   /* Arrays to facilitate easy interlacing - use pass (0 - 6) as index */
+   /* Offset to next interlace block */
+   PNG_CONST int png_pass_inc[7] = {8, 8, 4, 4, 2, 2, 1};
+
+   png_debug(1, "in png_do_read_interlace");
+   if (row != NULL && row_info != NULL)
+   {
+      png_uint_32 final_width;
+
+      final_width = row_info->width * png_pass_inc[pass];
+
+      switch (row_info->pixel_depth)
+      {
+         case 1:
+         {
+            png_bytep sp = row + (png_size_t)((row_info->width - 1) >> 3);
+            png_bytep dp = row + (png_size_t)((final_width - 1) >> 3);
+            int sshift, dshift;
+            int s_start, s_end, s_inc;
+            int jstop = png_pass_inc[pass];
+            png_byte v;
+            png_uint_32 i;
+            int j;
+
+#ifdef PNG_READ_PACKSWAP_SUPPORTED
+            if (transformations & PNG_PACKSWAP)
+            {
+                sshift = (int)((row_info->width + 7) & 0x07);
+                dshift = (int)((final_width + 7) & 0x07);
+                s_start = 7;
+                s_end = 0;
+                s_inc = -1;
+            }
+            else
+#endif
+            {
+                sshift = 7 - (int)((row_info->width + 7) & 0x07);
+                dshift = 7 - (int)((final_width + 7) & 0x07);
+                s_start = 0;
+                s_end = 7;
+                s_inc = 1;
+            }
+
+            for (i = 0; i < row_info->width; i++)
+            {
+               v = (png_byte)((*sp >> sshift) & 0x01);
+               for (j = 0; j < jstop; j++)
+               {
+                  *dp &= (png_byte)((0x7f7f >> (7 - dshift)) & 0xff);
+                  *dp |= (png_byte)(v << dshift);
+                  if (dshift == s_end)
+                  {
+                     dshift = s_start;
+                     dp--;
+                  }
+                  else
+                     dshift += s_inc;
+               }
+               if (sshift == s_end)
+               {
+                  sshift = s_start;
+                  sp--;
+               }
+               else
+                  sshift += s_inc;
+            }
+            break;
+         }
+         case 2:
+         {
+            png_bytep sp = row + (png_uint_32)((row_info->width - 1) >> 2);
+            png_bytep dp = row + (png_uint_32)((final_width - 1) >> 2);
+            int sshift, dshift;
+            int s_start, s_end, s_inc;
+            int jstop = png_pass_inc[pass];
+            png_uint_32 i;
+
+#ifdef PNG_READ_PACKSWAP_SUPPORTED
+            if (transformations & PNG_PACKSWAP)
+            {
+               sshift = (int)(((row_info->width + 3) & 0x03) << 1);
+               dshift = (int)(((final_width + 3) & 0x03) << 1);
+               s_start = 6;
+               s_end = 0;
+               s_inc = -2;
+            }
+            else
+#endif
+            {
+               sshift = (int)((3 - ((row_info->width + 3) & 0x03)) << 1);
+               dshift = (int)((3 - ((final_width + 3) & 0x03)) << 1);
+               s_start = 0;
+               s_end = 6;
+               s_inc = 2;
+            }
+
+            for (i = 0; i < row_info->width; i++)
+            {
+               png_byte v;
+               int j;
+
+               v = (png_byte)((*sp >> sshift) & 0x03);
+               for (j = 0; j < jstop; j++)
+               {
+                  *dp &= (png_byte)((0x3f3f >> (6 - dshift)) & 0xff);
+                  *dp |= (png_byte)(v << dshift);
+                  if (dshift == s_end)
+                  {
+                     dshift = s_start;
+                     dp--;
+                  }
+                  else
+                     dshift += s_inc;
+               }
+               if (sshift == s_end)
+               {
+                  sshift = s_start;
+                  sp--;
+               }
+               else
+                  sshift += s_inc;
+            }
+            break;
+         }
+         case 4:
+         {
+            png_bytep sp = row + (png_size_t)((row_info->width - 1) >> 1);
+            png_bytep dp = row + (png_size_t)((final_width - 1) >> 1);
+            int sshift, dshift;
+            int s_start, s_end, s_inc;
+            png_uint_32 i;
+            int jstop = png_pass_inc[pass];
+
+#ifdef PNG_READ_PACKSWAP_SUPPORTED
+            if (transformations & PNG_PACKSWAP)
+            {
+               sshift = (int)(((row_info->width + 1) & 0x01) << 2);
+               dshift = (int)(((final_width + 1) & 0x01) << 2);
+               s_start = 4;
+               s_end = 0;
+               s_inc = -4;
+            }
+            else
+#endif
+            {
+               sshift = (int)((1 - ((row_info->width + 1) & 0x01)) << 2);
+               dshift = (int)((1 - ((final_width + 1) & 0x01)) << 2);
+               s_start = 0;
+               s_end = 4;
+               s_inc = 4;
+            }
+
+            for (i = 0; i < row_info->width; i++)
+            {
+               png_byte v = (png_byte)((*sp >> sshift) & 0xf);
+               int j;
+
+               for (j = 0; j < jstop; j++)
+               {
+                  *dp &= (png_byte)((0xf0f >> (4 - dshift)) & 0xff);
+                  *dp |= (png_byte)(v << dshift);
+                  if (dshift == s_end)
+                  {
+                     dshift = s_start;
+                     dp--;
+                  }
+                  else
+                     dshift += s_inc;
+               }
+               if (sshift == s_end)
+               {
+                  sshift = s_start;
+                  sp--;
+               }
+               else
+                  sshift += s_inc;
+            }
+            break;
+         }
+         default:
+         {
+            png_size_t pixel_bytes = (row_info->pixel_depth >> 3);
+            png_bytep sp = row + (png_size_t)(row_info->width - 1)
+                * pixel_bytes;
+            png_bytep dp = row + (png_size_t)(final_width - 1) * pixel_bytes;
+
+            int jstop = png_pass_inc[pass];
+            png_uint_32 i;
+
+            for (i = 0; i < row_info->width; i++)
+            {
+               png_byte v[8];
+               int j;
+
+               png_memcpy(v, sp, pixel_bytes);
+               for (j = 0; j < jstop; j++)
+               {
+                  png_memcpy(dp, v, pixel_bytes);
+                  dp -= pixel_bytes;
+               }
+               sp -= pixel_bytes;
+            }
+            break;
+         }
+      }
+      row_info->width = final_width;
+      row_info->rowbytes = PNG_ROWBYTES(row_info->pixel_depth, final_width);
+   }
+#ifndef PNG_READ_PACKSWAP_SUPPORTED
+   transformations = transformations; /* Silence compiler warning */
+#endif
+}
+#endif /* PNG_READ_INTERLACING_SUPPORTED */
+
+void /* PRIVATE */
+png_read_filter_row(png_structp png_ptr, png_row_infop row_info, png_bytep row,
+   png_bytep prev_row, int filter)
+{
+   png_debug(1, "in png_read_filter_row");
+   png_debug2(2, "row = %lu, filter = %d", png_ptr->row_number, filter);
+   switch (filter)
+   {
+      case PNG_FILTER_VALUE_NONE:
+         break;
+      case PNG_FILTER_VALUE_SUB:
+      {
+         png_uint_32 i;
+         png_uint_32 istop = row_info->rowbytes;
+         png_uint_32 bpp = (row_info->pixel_depth + 7) >> 3;
+         png_bytep rp = row + bpp;
+         png_bytep lp = row;
+
+         for (i = bpp; i < istop; i++)
+         {
+            *rp = (png_byte)(((int)(*rp) + (int)(*lp++)) & 0xff);
+            rp++;
+         }
+         break;
+      }
+      case PNG_FILTER_VALUE_UP:
+      {
+         png_uint_32 i;
+         png_uint_32 istop = row_info->rowbytes;
+         png_bytep rp = row;
+         png_bytep pp = prev_row;
+
+         for (i = 0; i < istop; i++)
+         {
+            *rp = (png_byte)(((int)(*rp) + (int)(*pp++)) & 0xff);
+            rp++;
+         }
+         break;
+      }
+      case PNG_FILTER_VALUE_AVG:
+      {
+         png_uint_32 i;
+         png_bytep rp = row;
+         png_bytep pp = prev_row;
+         png_bytep lp = row;
+         png_uint_32 bpp = (row_info->pixel_depth + 7) >> 3;
+         png_uint_32 istop = row_info->rowbytes - bpp;
+
+         for (i = 0; i < bpp; i++)
+         {
+            *rp = (png_byte)(((int)(*rp) +
+               ((int)(*pp++) / 2 )) & 0xff);
+            rp++;
+         }
+
+         for (i = 0; i < istop; i++)
+         {
+            *rp = (png_byte)(((int)(*rp) +
+               (int)(*pp++ + *lp++) / 2 ) & 0xff);
+            rp++;
+         }
+         break;
+      }
+      case PNG_FILTER_VALUE_PAETH:
+      {
+         png_uint_32 i;
+         png_bytep rp = row;
+         png_bytep pp = prev_row;
+         png_bytep lp = row;
+         png_bytep cp = prev_row;
+         png_uint_32 bpp = (row_info->pixel_depth + 7) >> 3;
+         png_uint_32 istop=row_info->rowbytes - bpp;
+
+         for (i = 0; i < bpp; i++)
+         {
+            *rp = (png_byte)(((int)(*rp) + (int)(*pp++)) & 0xff);
+            rp++;
+         }
+
+         for (i = 0; i < istop; i++)   /* Use leftover rp,pp */
+         {
+            int a, b, c, pa, pb, pc, p;
+
+            a = *lp++;
+            b = *pp++;
+            c = *cp++;
+
+            p = b - c;
+            pc = a - c;
+
+#ifdef PNG_USE_ABS
+            pa = abs(p);
+            pb = abs(pc);
+            pc = abs(p + pc);
+#else
+            pa = p < 0 ? -p : p;
+            pb = pc < 0 ? -pc : pc;
+            pc = (p + pc) < 0 ? -(p + pc) : p + pc;
+#endif
+
+            /*
+               if (pa <= pb && pa <= pc)
+                  p = a;
+               else if (pb <= pc)
+                  p = b;
+               else
+                  p = c;
+             */
+
+            p = (pa <= pb && pa <= pc) ? a : (pb <= pc) ? b : c;
+
+            *rp = (png_byte)(((int)(*rp) + p) & 0xff);
+            rp++;
+         }
+         break;
+      }
+      default:
+         png_warning(png_ptr, "Ignoring bad adaptive filter type");
+         *row = 0;
+         break;
+   }
+}
+
+#ifdef PNG_SEQUENTIAL_READ_SUPPORTED
+void /* PRIVATE */
+png_read_finish_row(png_structp png_ptr)
+{
+#ifdef PNG_READ_INTERLACING_SUPPORTED
+   /* Arrays to facilitate easy interlacing - use pass (0 - 6) as index */
+
+   /* Start of interlace block */
+   PNG_CONST int png_pass_start[7] = {0, 4, 0, 2, 0, 1, 0};
+
+   /* Offset to next interlace block */
+   PNG_CONST int png_pass_inc[7] = {8, 8, 4, 4, 2, 2, 1};
+
+   /* Start of interlace block in the y direction */
+   PNG_CONST int png_pass_ystart[7] = {0, 0, 4, 0, 2, 0, 1};
+
+   /* Offset to next interlace block in the y direction */
+   PNG_CONST int png_pass_yinc[7] = {8, 8, 8, 4, 4, 2, 2};
+#endif /* PNG_READ_INTERLACING_SUPPORTED */
+
+   png_debug(1, "in png_read_finish_row");
+   png_ptr->row_number++;
+   if (png_ptr->row_number < png_ptr->num_rows)
+      return;
+
+#ifdef PNG_READ_INTERLACING_SUPPORTED
+   if (png_ptr->interlaced)
+   {
+      png_ptr->row_number = 0;
+      png_memset_check(png_ptr, png_ptr->prev_row, 0,
+         png_ptr->rowbytes + 1);
+      do
+      {
+         png_ptr->pass++;
+         if (png_ptr->pass >= 7)
+            break;
+         png_ptr->iwidth = (png_ptr->width +
+            png_pass_inc[png_ptr->pass] - 1 -
+            png_pass_start[png_ptr->pass]) /
+            png_pass_inc[png_ptr->pass];
+
+         if (!(png_ptr->transformations & PNG_INTERLACE))
+         {
+            png_ptr->num_rows = (png_ptr->height +
+               png_pass_yinc[png_ptr->pass] - 1 -
+               png_pass_ystart[png_ptr->pass]) /
+               png_pass_yinc[png_ptr->pass];
+            if (!(png_ptr->num_rows))
+               continue;
+         }
+         else  /* if (png_ptr->transformations & PNG_INTERLACE) */
+            break;
+      } while (png_ptr->iwidth == 0);
+
+      if (png_ptr->pass < 7)
+         return;
+   }
+#endif /* PNG_READ_INTERLACING_SUPPORTED */
+
+   if (!(png_ptr->flags & PNG_FLAG_ZLIB_FINISHED))
+   {
+#ifdef PNG_USE_LOCAL_ARRAYS
+      PNG_CONST PNG_IDAT;
+#endif
+      char extra;
+      int ret;
+
+      png_ptr->zstream.next_out = (Byte *)&extra;
+      png_ptr->zstream.avail_out = (uInt)1;
+      for (;;)
+      {
+         if (!(png_ptr->zstream.avail_in))
+         {
+            while (!png_ptr->idat_size)
+            {
+               png_byte chunk_length[4];
+
+               png_crc_finish(png_ptr, 0);
+
+               png_read_data(png_ptr, chunk_length, 4);
+               png_ptr->idat_size = png_get_uint_31(png_ptr, chunk_length);
+               png_reset_crc(png_ptr);
+               png_crc_read(png_ptr, png_ptr->chunk_name, 4);
+               if (png_memcmp(png_ptr->chunk_name, png_IDAT, 4))
+                  png_error(png_ptr, "Not enough image data");
+
+            }
+            png_ptr->zstream.avail_in = (uInt)png_ptr->zbuf_size;
+            png_ptr->zstream.next_in = png_ptr->zbuf;
+            if (png_ptr->zbuf_size > png_ptr->idat_size)
+               png_ptr->zstream.avail_in = (uInt)png_ptr->idat_size;
+            png_crc_read(png_ptr, png_ptr->zbuf, png_ptr->zstream.avail_in);
+            png_ptr->idat_size -= png_ptr->zstream.avail_in;
+         }
+         ret = inflate(&png_ptr->zstream, Z_PARTIAL_FLUSH);
+         if (ret == Z_STREAM_END)
+         {
+            if (!(png_ptr->zstream.avail_out) || png_ptr->zstream.avail_in ||
+               png_ptr->idat_size)
+               png_warning(png_ptr, "Extra compressed data.");
+            png_ptr->mode |= PNG_AFTER_IDAT;
+            png_ptr->flags |= PNG_FLAG_ZLIB_FINISHED;
+            break;
+         }
+         if (ret != Z_OK)
+            png_error(png_ptr, png_ptr->zstream.msg ? png_ptr->zstream.msg :
+                      "Decompression Error");
+
+         if (!(png_ptr->zstream.avail_out))
+         {
+            png_warning(png_ptr, "Extra compressed data.");
+            png_ptr->mode |= PNG_AFTER_IDAT;
+            png_ptr->flags |= PNG_FLAG_ZLIB_FINISHED;
+            break;
+         }
+
+      }
+      png_ptr->zstream.avail_out = 0;
+   }
+
+   if (png_ptr->idat_size || png_ptr->zstream.avail_in)
+      png_warning(png_ptr, "Extra compression data.");
+
+   inflateReset(&png_ptr->zstream);
+
+   png_ptr->mode |= PNG_AFTER_IDAT;
+}
+#endif /* PNG_SEQUENTIAL_READ_SUPPORTED */
+
+void /* PRIVATE */
+png_read_start_row(png_structp png_ptr)
+{
+#ifdef PNG_READ_INTERLACING_SUPPORTED
+   /* Arrays to facilitate easy interlacing - use pass (0 - 6) as index */
+
+   /* Start of interlace block */
+   PNG_CONST int png_pass_start[7] = {0, 4, 0, 2, 0, 1, 0};
+
+   /* Offset to next interlace block */
+   PNG_CONST int png_pass_inc[7] = {8, 8, 4, 4, 2, 2, 1};
+
+   /* Start of interlace block in the y direction */
+   PNG_CONST int png_pass_ystart[7] = {0, 0, 4, 0, 2, 0, 1};
+
+   /* Offset to next interlace block in the y direction */
+   PNG_CONST int png_pass_yinc[7] = {8, 8, 8, 4, 4, 2, 2};
+#endif
+
+   int max_pixel_depth;
+   png_size_t row_bytes;
+
+   png_debug(1, "in png_read_start_row");
+   png_ptr->zstream.avail_in = 0;
+   png_init_read_transformations(png_ptr);
+#ifdef PNG_READ_INTERLACING_SUPPORTED
+   if (png_ptr->interlaced)
+   {
+      if (!(png_ptr->transformations & PNG_INTERLACE))
+         png_ptr->num_rows = (png_ptr->height + png_pass_yinc[0] - 1 -
+            png_pass_ystart[0]) / png_pass_yinc[0];
+      else
+         png_ptr->num_rows = png_ptr->height;
+
+      png_ptr->iwidth = (png_ptr->width +
+         png_pass_inc[png_ptr->pass] - 1 -
+         png_pass_start[png_ptr->pass]) /
+         png_pass_inc[png_ptr->pass];
+   }
+   else
+#endif /* PNG_READ_INTERLACING_SUPPORTED */
+   {
+      png_ptr->num_rows = png_ptr->height;
+      png_ptr->iwidth = png_ptr->width;
+   }
+   max_pixel_depth = png_ptr->pixel_depth;
+
+#ifdef PNG_READ_PACK_SUPPORTED
+   if ((png_ptr->transformations & PNG_PACK) && png_ptr->bit_depth < 8)
+      max_pixel_depth = 8;
+#endif
+
+#ifdef PNG_READ_EXPAND_SUPPORTED
+   if (png_ptr->transformations & PNG_EXPAND)
+   {
+      if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
+      {
+         if (png_ptr->num_trans)
+            max_pixel_depth = 32;
+         else
+            max_pixel_depth = 24;
+      }
+      else if (png_ptr->color_type == PNG_COLOR_TYPE_GRAY)
+      {
+         if (max_pixel_depth < 8)
+            max_pixel_depth = 8;
+         if (png_ptr->num_trans)
+            max_pixel_depth *= 2;
+      }
+      else if (png_ptr->color_type == PNG_COLOR_TYPE_RGB)
+      {
+         if (png_ptr->num_trans)
+         {
+            max_pixel_depth *= 4;
+            max_pixel_depth /= 3;
+         }
+      }
+   }
+#endif
+
+#ifdef PNG_READ_FILLER_SUPPORTED
+   if (png_ptr->transformations & (PNG_FILLER))
+   {
+      if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
+         max_pixel_depth = 32;
+      else if (png_ptr->color_type == PNG_COLOR_TYPE_GRAY)
+      {
+         if (max_pixel_depth <= 8)
+            max_pixel_depth = 16;
+         else
+            max_pixel_depth = 32;
+      }
+      else if (png_ptr->color_type == PNG_COLOR_TYPE_RGB)
+      {
+         if (max_pixel_depth <= 32)
+            max_pixel_depth = 32;
+         else
+            max_pixel_depth = 64;
+      }
+   }
+#endif
+
+#ifdef PNG_READ_GRAY_TO_RGB_SUPPORTED
+   if (png_ptr->transformations & PNG_GRAY_TO_RGB)
+   {
+      if (
+#ifdef PNG_READ_EXPAND_SUPPORTED
+        (png_ptr->num_trans && (png_ptr->transformations & PNG_EXPAND)) ||
+#endif
+#ifdef PNG_READ_FILLER_SUPPORTED
+        (png_ptr->transformations & (PNG_FILLER)) ||
+#endif
+        png_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
+      {
+         if (max_pixel_depth <= 16)
+            max_pixel_depth = 32;
+         else
+            max_pixel_depth = 64;
+      }
+      else
+      {
+         if (max_pixel_depth <= 8)
+           {
+             if (png_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
+               max_pixel_depth = 32;
+             else
+               max_pixel_depth = 24;
+           }
+         else if (png_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
+            max_pixel_depth = 64;
+         else
+            max_pixel_depth = 48;
+      }
+   }
+#endif
+
+#if defined(PNG_READ_USER_TRANSFORM_SUPPORTED) && \
+defined(PNG_USER_TRANSFORM_PTR_SUPPORTED)
+   if (png_ptr->transformations & PNG_USER_TRANSFORM)
+     {
+       int user_pixel_depth = png_ptr->user_transform_depth*
+         png_ptr->user_transform_channels;
+       if (user_pixel_depth > max_pixel_depth)
+         max_pixel_depth=user_pixel_depth;
+     }
+#endif
+
+   /* Align the width on the next larger 8 pixels.  Mainly used
+    * for interlacing
+    */
+   row_bytes = ((png_ptr->width + 7) & ~((png_uint_32)7));
+   /* Calculate the maximum bytes needed, adding a byte and a pixel
+    * for safety's sake
+    */
+   row_bytes = PNG_ROWBYTES(max_pixel_depth, row_bytes) +
+      1 + ((max_pixel_depth + 7) >> 3);
+#ifdef PNG_MAX_MALLOC_64K
+   if (row_bytes > (png_uint_32)65536L)
+      png_error(png_ptr, "This image requires a row greater than 64KB");
+#endif
+
+   if (row_bytes + 64 > png_ptr->old_big_row_buf_size)
+   {
+     png_free(png_ptr, png_ptr->big_row_buf);
+     if (png_ptr->interlaced)
+        png_ptr->big_row_buf = (png_bytep)png_calloc(png_ptr,
+            row_bytes + 64);
+     else
+        png_ptr->big_row_buf = (png_bytep)png_malloc(png_ptr,
+            row_bytes + 64);
+     png_ptr->old_big_row_buf_size = row_bytes + 64;
+
+     /* Use 32 bytes of padding before and after row_buf. */
+     png_ptr->row_buf = png_ptr->big_row_buf + 32;
+     png_ptr->old_big_row_buf_size = row_bytes + 64;
+   }
+
+#ifdef PNG_MAX_MALLOC_64K
+   if ((png_uint_32)row_bytes + 1 > (png_uint_32)65536L)
+      png_error(png_ptr, "This image requires a row greater than 64KB");
+#endif
+   if ((png_uint_32)row_bytes > (png_uint_32)(PNG_SIZE_MAX - 1))
+      png_error(png_ptr, "Row has too many bytes to allocate in memory.");
+
+   if (row_bytes + 1 > png_ptr->old_prev_row_size)
+   {
+      png_free(png_ptr, png_ptr->prev_row);
+      png_ptr->prev_row = (png_bytep)png_malloc(png_ptr, (png_uint_32)(
+        row_bytes + 1));
+      png_memset_check(png_ptr, png_ptr->prev_row, 0, row_bytes + 1);
+      png_ptr->old_prev_row_size = row_bytes + 1;
+   }
+
+   png_ptr->rowbytes = row_bytes;
+
+   png_debug1(3, "width = %lu,", png_ptr->width);
+   png_debug1(3, "height = %lu,", png_ptr->height);
+   png_debug1(3, "iwidth = %lu,", png_ptr->iwidth);
+   png_debug1(3, "num_rows = %lu,", png_ptr->num_rows);
+   png_debug1(3, "rowbytes = %lu,", png_ptr->rowbytes);
+   png_debug1(3, "irowbytes = %lu",
+       PNG_ROWBYTES(png_ptr->pixel_depth, png_ptr->iwidth) + 1);
+
+   png_ptr->flags |= PNG_FLAG_ROW_INIT;
+}
+#endif /* PNG_READ_SUPPORTED */
diff --git a/Externals/libpng/pngset.c b/Externals/libpng/pngset.c
index 2cfcf33bdf..b5dbc45e7a 100644
--- a/Externals/libpng/pngset.c
+++ b/Externals/libpng/pngset.c
@@ -1,1225 +1,1236 @@
-
-/* pngset.c - storage of image information into info struct
- *
- * Last changed in libpng 1.5.1 [February 3, 2011]
- * Copyright (c) 1998-2011 Glenn Randers-Pehrson
- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
- *
- * This code is released under the libpng license.
- * For conditions of distribution and use, see the disclaimer
- * and license in png.h
- *
- * The functions here are used during reads to store data from the file
- * into the info struct, and during writes to store application data
- * into the info struct for writing into the file.  This abstracts the
- * info struct and allows us to change the structure in the future.
- */
-
-#include "pngpriv.h"
-
-#if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED)
-
-#ifdef PNG_bKGD_SUPPORTED
-void PNGAPI
-png_set_bKGD(png_structp png_ptr, png_infop info_ptr,
-    png_const_color_16p background)
-{
-   png_debug1(1, "in %s storage function", "bKGD");
-
-   if (png_ptr == NULL || info_ptr == NULL)
-      return;
-
-   png_memcpy(&(info_ptr->background), background, png_sizeof(png_color_16));
-   info_ptr->valid |= PNG_INFO_bKGD;
-}
-#endif
-
-#ifdef PNG_cHRM_SUPPORTED
-void PNGFAPI
-png_set_cHRM_fixed(png_structp png_ptr, png_infop info_ptr,
-    png_fixed_point white_x, png_fixed_point white_y, png_fixed_point red_x,
-    png_fixed_point red_y, png_fixed_point green_x, png_fixed_point green_y,
-    png_fixed_point blue_x, png_fixed_point blue_y)
-{
-   png_debug1(1, "in %s storage function", "cHRM fixed");
-
-   if (png_ptr == NULL || info_ptr == NULL)
-      return;
-
-#  ifdef PNG_CHECK_cHRM_SUPPORTED
-   if (png_check_cHRM_fixed(png_ptr,
-       white_x, white_y, red_x, red_y, green_x, green_y, blue_x, blue_y))
-#  endif
-   {
-      info_ptr->x_white = white_x;
-      info_ptr->y_white = white_y;
-      info_ptr->x_red   = red_x;
-      info_ptr->y_red   = red_y;
-      info_ptr->x_green = green_x;
-      info_ptr->y_green = green_y;
-      info_ptr->x_blue  = blue_x;
-      info_ptr->y_blue  = blue_y;
-      info_ptr->valid |= PNG_INFO_cHRM;
-   }
-}
-
-#  ifdef PNG_FLOATING_POINT_SUPPORTED
-void PNGAPI
-png_set_cHRM(png_structp png_ptr, png_infop info_ptr,
-    double white_x, double white_y, double red_x, double red_y,
-    double green_x, double green_y, double blue_x, double blue_y)
-{
-   png_set_cHRM_fixed(png_ptr, info_ptr,
-      png_fixed(png_ptr, white_x, "cHRM White X"),
-      png_fixed(png_ptr, white_y, "cHRM White Y"),
-      png_fixed(png_ptr, red_x, "cHRM Red X"),
-      png_fixed(png_ptr, red_y, "cHRM Red Y"),
-      png_fixed(png_ptr, green_x, "cHRM Green X"),
-      png_fixed(png_ptr, green_y, "cHRM Green Y"),
-      png_fixed(png_ptr, blue_x, "cHRM Blue X"),
-      png_fixed(png_ptr, blue_y, "cHRM Blue Y"));
-}
-#  endif /* PNG_FLOATING_POINT_SUPPORTED */
-
-#endif /* PNG_cHRM_SUPPORTED */
-
-#ifdef PNG_gAMA_SUPPORTED
-void PNGFAPI
-png_set_gAMA_fixed(png_structp png_ptr, png_infop info_ptr, png_fixed_point
-    file_gamma)
-{
-   png_debug1(1, "in %s storage function", "gAMA");
-
-   if (png_ptr == NULL || info_ptr == NULL)
-      return;
-
-   /* Previously these values were limited, however they must be
-    * wrong, therefore storing them (and setting PNG_INFO_gAMA)
-    * must be wrong too.
-    */
-   if (file_gamma > (png_fixed_point)PNG_UINT_31_MAX)
-      png_warning(png_ptr, "Gamma too large, ignored");
-
-   else if (file_gamma <= 0)
-      png_warning(png_ptr, "Negative or zero gamma ignored");
-
-   else
-   {
-      info_ptr->gamma = file_gamma;
-      info_ptr->valid |= PNG_INFO_gAMA;
-   }
-}
-
-#  ifdef PNG_FLOATING_POINT_SUPPORTED
-void PNGAPI
-png_set_gAMA(png_structp png_ptr, png_infop info_ptr, double file_gamma)
-{
-   png_set_gAMA_fixed(png_ptr, info_ptr, png_fixed(png_ptr, file_gamma,
-       "png_set_gAMA"));
-}
-#  endif
-#endif
-
-#ifdef PNG_hIST_SUPPORTED
-void PNGAPI
-png_set_hIST(png_structp png_ptr, png_infop info_ptr, png_const_uint_16p hist)
-{
-   int i;
-
-   png_debug1(1, "in %s storage function", "hIST");
-
-   if (png_ptr == NULL || info_ptr == NULL)
-      return;
-
-   if (info_ptr->num_palette == 0 || info_ptr->num_palette
-       > PNG_MAX_PALETTE_LENGTH)
-   {
-      png_warning(png_ptr,
-          "Invalid palette size, hIST allocation skipped");
-
-      return;
-   }
-
-   png_free_data(png_ptr, info_ptr, PNG_FREE_HIST, 0);
-
-   /* Changed from info->num_palette to PNG_MAX_PALETTE_LENGTH in
-    * version 1.2.1
-    */
-   png_ptr->hist = (png_uint_16p)png_malloc_warn(png_ptr,
-       PNG_MAX_PALETTE_LENGTH * png_sizeof(png_uint_16));
-
-   if (png_ptr->hist == NULL)
-   {
-      png_warning(png_ptr, "Insufficient memory for hIST chunk data");
-      return;
-   }
-
-   for (i = 0; i < info_ptr->num_palette; i++)
-      png_ptr->hist[i] = hist[i];
-
-   info_ptr->hist = png_ptr->hist;
-   info_ptr->valid |= PNG_INFO_hIST;
-   info_ptr->free_me |= PNG_FREE_HIST;
-}
-#endif
-
-void PNGAPI
-png_set_IHDR(png_structp png_ptr, png_infop info_ptr,
-    png_uint_32 width, png_uint_32 height, int bit_depth,
-    int color_type, int interlace_type, int compression_type,
-    int filter_type)
-{
-   png_debug1(1, "in %s storage function", "IHDR");
-
-   if (png_ptr == NULL || info_ptr == NULL)
-      return;
-
-   info_ptr->width = width;
-   info_ptr->height = height;
-   info_ptr->bit_depth = (png_byte)bit_depth;
-   info_ptr->color_type = (png_byte)color_type;
-   info_ptr->compression_type = (png_byte)compression_type;
-   info_ptr->filter_type = (png_byte)filter_type;
-   info_ptr->interlace_type = (png_byte)interlace_type;
-
-   png_check_IHDR (png_ptr, info_ptr->width, info_ptr->height,
-       info_ptr->bit_depth, info_ptr->color_type, info_ptr->interlace_type,
-       info_ptr->compression_type, info_ptr->filter_type);
-
-   if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
-      info_ptr->channels = 1;
-
-   else if (info_ptr->color_type & PNG_COLOR_MASK_COLOR)
-      info_ptr->channels = 3;
-
-   else
-      info_ptr->channels = 1;
-
-   if (info_ptr->color_type & PNG_COLOR_MASK_ALPHA)
-      info_ptr->channels++;
-
-   info_ptr->pixel_depth = (png_byte)(info_ptr->channels * info_ptr->bit_depth);
-
-   /* Check for potential overflow */
-   if (width >
-       (PNG_UINT_32_MAX >> 3)      /* 8-byte RRGGBBAA pixels */
-       - 48       /* bigrowbuf hack */
-       - 1        /* filter byte */
-       - 7*8      /* rounding of width to multiple of 8 pixels */
-       - 8)       /* extra max_pixel_depth pad */
-      info_ptr->rowbytes = 0;
-   else
-      info_ptr->rowbytes = PNG_ROWBYTES(info_ptr->pixel_depth, width);
-}
-
-#ifdef PNG_oFFs_SUPPORTED
-void PNGAPI
-png_set_oFFs(png_structp png_ptr, png_infop info_ptr,
-    png_int_32 offset_x, png_int_32 offset_y, int unit_type)
-{
-   png_debug1(1, "in %s storage function", "oFFs");
-
-   if (png_ptr == NULL || info_ptr == NULL)
-      return;
-
-   info_ptr->x_offset = offset_x;
-   info_ptr->y_offset = offset_y;
-   info_ptr->offset_unit_type = (png_byte)unit_type;
-   info_ptr->valid |= PNG_INFO_oFFs;
-}
-#endif
-
-#ifdef PNG_pCAL_SUPPORTED
-void PNGAPI
-png_set_pCAL(png_structp png_ptr, png_infop info_ptr,
-    png_const_charp purpose, png_int_32 X0, png_int_32 X1, int type,
-    int nparams, png_const_charp units, png_charpp params)
-{
-   png_size_t length;
-   int i;
-
-   png_debug1(1, "in %s storage function", "pCAL");
-
-   if (png_ptr == NULL || info_ptr == NULL)
-      return;
-
-   length = png_strlen(purpose) + 1;
-   png_debug1(3, "allocating purpose for info (%lu bytes)",
-       (unsigned long)length);
-
-   /* TODO: validate format of calibration name and unit name */
-
-   /* Check that the type matches the specification. */
-   if (type < 0 || type > 3)
-      png_error(png_ptr, "Invalid pCAL equation type");
-
-   /* Validate params[nparams] */
-   for (i=0; i<nparams; ++i)
-      if (!png_check_fp_string(params[i], png_strlen(params[i])))
-         png_error(png_ptr, "Invalid format for pCAL parameter");
-
-   info_ptr->pcal_purpose = (png_charp)png_malloc_warn(png_ptr, length);
-
-   if (info_ptr->pcal_purpose == NULL)
-   {
-      png_warning(png_ptr, "Insufficient memory for pCAL purpose");
-      return;
-   }
-
-   png_memcpy(info_ptr->pcal_purpose, purpose, length);
-
-   png_debug(3, "storing X0, X1, type, and nparams in info");
-   info_ptr->pcal_X0 = X0;
-   info_ptr->pcal_X1 = X1;
-   info_ptr->pcal_type = (png_byte)type;
-   info_ptr->pcal_nparams = (png_byte)nparams;
-
-   length = png_strlen(units) + 1;
-   png_debug1(3, "allocating units for info (%lu bytes)",
-     (unsigned long)length);
-
-   info_ptr->pcal_units = (png_charp)png_malloc_warn(png_ptr, length);
-
-   if (info_ptr->pcal_units == NULL)
-   {
-      png_warning(png_ptr, "Insufficient memory for pCAL units");
-      return;
-   }
-
-   png_memcpy(info_ptr->pcal_units, units, length);
-
-   info_ptr->pcal_params = (png_charpp)png_malloc_warn(png_ptr,
-       (png_size_t)((nparams + 1) * png_sizeof(png_charp)));
-
-   if (info_ptr->pcal_params == NULL)
-   {
-      png_warning(png_ptr, "Insufficient memory for pCAL params");
-      return;
-   }
-
-   png_memset(info_ptr->pcal_params, 0, (nparams + 1) * png_sizeof(png_charp));
-
-   for (i = 0; i < nparams; i++)
-   {
-      length = png_strlen(params[i]) + 1;
-      png_debug2(3, "allocating parameter %d for info (%lu bytes)", i,
-          (unsigned long)length);
-
-      info_ptr->pcal_params[i] = (png_charp)png_malloc_warn(png_ptr, length);
-
-      if (info_ptr->pcal_params[i] == NULL)
-      {
-         png_warning(png_ptr, "Insufficient memory for pCAL parameter");
-         return;
-      }
-
-      png_memcpy(info_ptr->pcal_params[i], params[i], length);
-   }
-
-   info_ptr->valid |= PNG_INFO_pCAL;
-   info_ptr->free_me |= PNG_FREE_PCAL;
-}
-#endif
-
-#ifdef PNG_sCAL_SUPPORTED
-void PNGAPI
-png_set_sCAL_s(png_structp png_ptr, png_infop info_ptr,
-    int unit, png_const_charp swidth, png_const_charp sheight)
-{
-   png_size_t lengthw = 0, lengthh = 0;
-
-   png_debug1(1, "in %s storage function", "sCAL");
-
-   if (png_ptr == NULL || info_ptr == NULL)
-      return;
-
-   /* Double check the unit (should never get here with an invalid
-    * unit unless this is an API call.)
-    */
-   if (unit != 1 && unit != 2)
-      png_error(png_ptr, "Invalid sCAL unit");
-
-   if (swidth == NULL || (lengthw = png_strlen(swidth)) <= 0 ||
-       swidth[0] == 45 /*'-'*/ || !png_check_fp_string(swidth, lengthw))
-      png_error(png_ptr, "Invalid sCAL width");
-
-   if (sheight == NULL || (lengthh = png_strlen(sheight)) <= 0 ||
-       sheight[0] == 45 /*'-'*/ || !png_check_fp_string(sheight, lengthh))
-      png_error(png_ptr, "Invalid sCAL height");
-
-   info_ptr->scal_unit = (png_byte)unit;
-
-   ++lengthw;
-
-   png_debug1(3, "allocating unit for info (%u bytes)", (unsigned int)lengthw);
-
-   info_ptr->scal_s_width = (png_charp)png_malloc_warn(png_ptr, lengthw);
-
-   if (info_ptr->scal_s_width == NULL)
-   {
-      png_warning(png_ptr, "Memory allocation failed while processing sCAL");
-      return;
-   }
-
-   png_memcpy(info_ptr->scal_s_width, swidth, lengthw);
-
-   ++lengthh;
-
-   png_debug1(3, "allocating unit for info (%u bytes)", (unsigned int)lengthh);
-
-   info_ptr->scal_s_height = (png_charp)png_malloc_warn(png_ptr, lengthh);
-
-   if (info_ptr->scal_s_height == NULL)
-   {
-      png_free (png_ptr, info_ptr->scal_s_width);
-      info_ptr->scal_s_width = NULL;
-
-      png_warning(png_ptr, "Memory allocation failed while processing sCAL");
-      return;
-   }
-
-   png_memcpy(info_ptr->scal_s_height, sheight, lengthh);
-
-   info_ptr->valid |= PNG_INFO_sCAL;
-   info_ptr->free_me |= PNG_FREE_SCAL;
-}
-
-#  ifdef PNG_FLOATING_POINT_SUPPORTED
-void PNGAPI
-png_set_sCAL(png_structp png_ptr, png_infop info_ptr, int unit, double width,
-    double height)
-{
-   png_debug1(1, "in %s storage function", "sCAL");
-
-   /* Check the arguments. */
-   if (width <= 0)
-      png_warning(png_ptr, "Invalid sCAL width ignored");
-
-   else if (height <= 0)
-      png_warning(png_ptr, "Invalid sCAL height ignored");
-
-   else
-   {
-      /* Convert 'width' and 'height' to ASCII. */
-      char swidth[PNG_sCAL_MAX_DIGITS+1];
-      char sheight[PNG_sCAL_MAX_DIGITS+1];
-
-      png_ascii_from_fp(png_ptr, swidth, sizeof swidth, width,
-         PNG_sCAL_PRECISION);
-      png_ascii_from_fp(png_ptr, sheight, sizeof sheight, height,
-         PNG_sCAL_PRECISION);
-
-      png_set_sCAL_s(png_ptr, info_ptr, unit, swidth, sheight);
-   }
-}
-#  endif
-
-#  ifdef PNG_FIXED_POINT_SUPPORTED
-void PNGAPI
-png_set_sCAL_fixed(png_structp png_ptr, png_infop info_ptr, int unit,
-    png_fixed_point width, png_fixed_point height)
-{
-   png_debug1(1, "in %s storage function", "sCAL");
-
-   /* Check the arguments. */
-   if (width <= 0)
-      png_warning(png_ptr, "Invalid sCAL width ignored");
-
-   else if (height <= 0)
-      png_warning(png_ptr, "Invalid sCAL height ignored");
-
-   else
-   {
-      /* Convert 'width' and 'height' to ASCII. */
-      char swidth[PNG_sCAL_MAX_DIGITS+1];
-      char sheight[PNG_sCAL_MAX_DIGITS+1];
-
-      png_ascii_from_fixed(png_ptr, swidth, sizeof swidth, width);
-      png_ascii_from_fixed(png_ptr, sheight, sizeof sheight, height);
-
-      png_set_sCAL_s(png_ptr, info_ptr, unit, swidth, sheight);
-   }
-}
-#  endif
-#endif
-
-#ifdef PNG_pHYs_SUPPORTED
-void PNGAPI
-png_set_pHYs(png_structp png_ptr, png_infop info_ptr,
-    png_uint_32 res_x, png_uint_32 res_y, int unit_type)
-{
-   png_debug1(1, "in %s storage function", "pHYs");
-
-   if (png_ptr == NULL || info_ptr == NULL)
-      return;
-
-   info_ptr->x_pixels_per_unit = res_x;
-   info_ptr->y_pixels_per_unit = res_y;
-   info_ptr->phys_unit_type = (png_byte)unit_type;
-   info_ptr->valid |= PNG_INFO_pHYs;
-}
-#endif
-
-void PNGAPI
-png_set_PLTE(png_structp png_ptr, png_infop info_ptr,
-    png_const_colorp palette, int num_palette)
-{
-
-   png_debug1(1, "in %s storage function", "PLTE");
-
-   if (png_ptr == NULL || info_ptr == NULL)
-      return;
-
-   if (num_palette < 0 || num_palette > PNG_MAX_PALETTE_LENGTH)
-   {
-      if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
-         png_error(png_ptr, "Invalid palette length");
-
-      else
-      {
-         png_warning(png_ptr, "Invalid palette length");
-         return;
-      }
-   }
-
-   /* It may not actually be necessary to set png_ptr->palette here;
-    * we do it for backward compatibility with the way the png_handle_tRNS
-    * function used to do the allocation.
-    */
-   png_free_data(png_ptr, info_ptr, PNG_FREE_PLTE, 0);
-
-   /* Changed in libpng-1.2.1 to allocate PNG_MAX_PALETTE_LENGTH instead
-    * of num_palette entries, in case of an invalid PNG file that has
-    * too-large sample values.
-    */
-   png_ptr->palette = (png_colorp)png_calloc(png_ptr,
-       PNG_MAX_PALETTE_LENGTH * png_sizeof(png_color));
-
-   png_memcpy(png_ptr->palette, palette, num_palette * png_sizeof(png_color));
-   info_ptr->palette = png_ptr->palette;
-   info_ptr->num_palette = png_ptr->num_palette = (png_uint_16)num_palette;
-
-   info_ptr->free_me |= PNG_FREE_PLTE;
-
-   info_ptr->valid |= PNG_INFO_PLTE;
-}
-
-#ifdef PNG_sBIT_SUPPORTED
-void PNGAPI
-png_set_sBIT(png_structp png_ptr, png_infop info_ptr,
-    png_const_color_8p sig_bit)
-{
-   png_debug1(1, "in %s storage function", "sBIT");
-
-   if (png_ptr == NULL || info_ptr == NULL)
-      return;
-
-   png_memcpy(&(info_ptr->sig_bit), sig_bit, png_sizeof(png_color_8));
-   info_ptr->valid |= PNG_INFO_sBIT;
-}
-#endif
-
-#ifdef PNG_sRGB_SUPPORTED
-void PNGAPI
-png_set_sRGB(png_structp png_ptr, png_infop info_ptr, int srgb_intent)
-{
-   png_debug1(1, "in %s storage function", "sRGB");
-
-   if (png_ptr == NULL || info_ptr == NULL)
-      return;
-
-   info_ptr->srgb_intent = (png_byte)srgb_intent;
-   info_ptr->valid |= PNG_INFO_sRGB;
-}
-
-void PNGAPI
-png_set_sRGB_gAMA_and_cHRM(png_structp png_ptr, png_infop info_ptr,
-    int srgb_intent)
-{
-   png_debug1(1, "in %s storage function", "sRGB_gAMA_and_cHRM");
-
-   if (png_ptr == NULL || info_ptr == NULL)
-      return;
-
-   png_set_sRGB(png_ptr, info_ptr, srgb_intent);
-
-#  ifdef PNG_gAMA_SUPPORTED
-   png_set_gAMA_fixed(png_ptr, info_ptr, 45455L);
-#  endif
-
-#  ifdef PNG_cHRM_SUPPORTED
-   png_set_cHRM_fixed(png_ptr, info_ptr,
-      /* color      x       y */
-      /* white */ 31270L, 32900L,
-      /* red   */ 64000L, 33000L,
-      /* green */ 30000L, 60000L,
-      /* blue  */ 15000L,  6000L
-   );
-#  endif /* cHRM */
-}
-#endif /* sRGB */
-
-
-#ifdef PNG_iCCP_SUPPORTED
-void PNGAPI
-png_set_iCCP(png_structp png_ptr, png_infop info_ptr,
-    png_const_charp name, int compression_type,
-    png_const_bytep profile, png_uint_32 proflen)
-{
-   png_charp new_iccp_name;
-   png_bytep new_iccp_profile;
-   png_uint_32 length;
-
-   png_debug1(1, "in %s storage function", "iCCP");
-
-   if (png_ptr == NULL || info_ptr == NULL || name == NULL || profile == NULL)
-      return;
-
-   length = png_strlen(name)+1;
-   new_iccp_name = (png_charp)png_malloc_warn(png_ptr, length);
-
-   if (new_iccp_name == NULL)
-   {
-        png_warning(png_ptr, "Insufficient memory to process iCCP chunk");
-      return;
-   }
-
-   png_memcpy(new_iccp_name, name, length);
-   new_iccp_profile = (png_bytep)png_malloc_warn(png_ptr, proflen);
-
-   if (new_iccp_profile == NULL)
-   {
-      png_free (png_ptr, new_iccp_name);
-      png_warning(png_ptr,
-          "Insufficient memory to process iCCP profile");
-      return;
-   }
-
-   png_memcpy(new_iccp_profile, profile, (png_size_t)proflen);
-
-   png_free_data(png_ptr, info_ptr, PNG_FREE_ICCP, 0);
-
-   info_ptr->iccp_proflen = proflen;
-   info_ptr->iccp_name = new_iccp_name;
-   info_ptr->iccp_profile = new_iccp_profile;
-   /* Compression is always zero but is here so the API and info structure
-    * does not have to change if we introduce multiple compression types
-    */
-   info_ptr->iccp_compression = (png_byte)compression_type;
-   info_ptr->free_me |= PNG_FREE_ICCP;
-   info_ptr->valid |= PNG_INFO_iCCP;
-}
-#endif
-
-#ifdef PNG_TEXT_SUPPORTED
-void PNGAPI
-png_set_text(png_structp png_ptr, png_infop info_ptr, png_const_textp text_ptr,
-    int num_text)
-{
-   int ret;
-   ret = png_set_text_2(png_ptr, info_ptr, text_ptr, num_text);
-
-   if (ret)
-      png_error(png_ptr, "Insufficient memory to store text");
-}
-
-int /* PRIVATE */
-png_set_text_2(png_structp png_ptr, png_infop info_ptr,
-    png_const_textp text_ptr, int num_text)
-{
-   int i;
-
-   png_debug1(1, "in %s storage function", ((png_ptr == NULL ||
-       png_ptr->chunk_name[0] == '\0') ?
-       "text" : (png_const_charp)png_ptr->chunk_name));
-
-   if (png_ptr == NULL || info_ptr == NULL || num_text == 0)
-      return(0);
-
-   /* Make sure we have enough space in the "text" array in info_struct
-    * to hold all of the incoming text_ptr objects.
-    */
-   if (info_ptr->num_text + num_text > info_ptr->max_text)
-   {
-      if (info_ptr->text != NULL)
-      {
-         png_textp old_text;
-         int old_max;
-
-         old_max = info_ptr->max_text;
-         info_ptr->max_text = info_ptr->num_text + num_text + 8;
-         old_text = info_ptr->text;
-         info_ptr->text = (png_textp)png_malloc_warn(png_ptr,
-            (png_size_t)(info_ptr->max_text * png_sizeof(png_text)));
-
-         if (info_ptr->text == NULL)
-         {
-            png_free(png_ptr, old_text);
-            return(1);
-         }
-
-         png_memcpy(info_ptr->text, old_text, (png_size_t)(old_max *
-             png_sizeof(png_text)));
-         png_free(png_ptr, old_text);
-      }
-
-      else
-      {
-         info_ptr->max_text = num_text + 8;
-         info_ptr->num_text = 0;
-         info_ptr->text = (png_textp)png_malloc_warn(png_ptr,
-             (png_size_t)(info_ptr->max_text * png_sizeof(png_text)));
-         if (info_ptr->text == NULL)
-            return(1);
-         info_ptr->free_me |= PNG_FREE_TEXT;
-      }
-
-      png_debug1(3, "allocated %d entries for info_ptr->text",
-          info_ptr->max_text);
-   }
-   for (i = 0; i < num_text; i++)
-   {
-      png_size_t text_length, key_len;
-      png_size_t lang_len, lang_key_len;
-      png_textp textp = &(info_ptr->text[info_ptr->num_text]);
-
-      if (text_ptr[i].key == NULL)
-          continue;
-
-      if (text_ptr[i].compression < PNG_TEXT_COMPRESSION_NONE ||
-          text_ptr[i].compression >= PNG_TEXT_COMPRESSION_LAST)
-      {
-         png_warning(png_ptr, "text compression mode is out of range");
-         continue;
-      }
-
-      key_len = png_strlen(text_ptr[i].key);
-
-      if (text_ptr[i].compression <= 0)
-      {
-         lang_len = 0;
-         lang_key_len = 0;
-      }
-
-      else
-#  ifdef PNG_iTXt_SUPPORTED
-      {
-         /* Set iTXt data */
-
-         if (text_ptr[i].lang != NULL)
-            lang_len = png_strlen(text_ptr[i].lang);
-
-         else
-            lang_len = 0;
-
-         if (text_ptr[i].lang_key != NULL)
-            lang_key_len = png_strlen(text_ptr[i].lang_key);
-
-         else
-            lang_key_len = 0;
-      }
-#  else /* PNG_iTXt_SUPPORTED */
-      {
-         png_warning(png_ptr, "iTXt chunk not supported");
-         continue;
-      }
-#  endif
-
-      if (text_ptr[i].text == NULL || text_ptr[i].text[0] == '\0')
-      {
-         text_length = 0;
-#  ifdef PNG_iTXt_SUPPORTED
-         if (text_ptr[i].compression > 0)
-            textp->compression = PNG_ITXT_COMPRESSION_NONE;
-
-         else
-#  endif
-            textp->compression = PNG_TEXT_COMPRESSION_NONE;
-      }
-
-      else
-      {
-         text_length = png_strlen(text_ptr[i].text);
-         textp->compression = text_ptr[i].compression;
-      }
-
-      textp->key = (png_charp)png_malloc_warn(png_ptr,
-          (png_size_t)
-          (key_len + text_length + lang_len + lang_key_len + 4));
-
-      if (textp->key == NULL)
-         return(1);
-
-      png_debug2(2, "Allocated %lu bytes at %p in png_set_text",
-          (unsigned long)(png_uint_32)
-          (key_len + lang_len + lang_key_len + text_length + 4),
-          textp->key);
-
-      png_memcpy(textp->key, text_ptr[i].key,(png_size_t)(key_len));
-      *(textp->key + key_len) = '\0';
-
-      if (text_ptr[i].compression > 0)
-      {
-         textp->lang = textp->key + key_len + 1;
-         png_memcpy(textp->lang, text_ptr[i].lang, lang_len);
-         *(textp->lang + lang_len) = '\0';
-         textp->lang_key = textp->lang + lang_len + 1;
-         png_memcpy(textp->lang_key, text_ptr[i].lang_key, lang_key_len);
-         *(textp->lang_key + lang_key_len) = '\0';
-         textp->text = textp->lang_key + lang_key_len + 1;
-      }
-
-      else
-      {
-         textp->lang=NULL;
-         textp->lang_key=NULL;
-         textp->text = textp->key + key_len + 1;
-      }
-
-      if (text_length)
-         png_memcpy(textp->text, text_ptr[i].text,
-             (png_size_t)(text_length));
-
-      *(textp->text + text_length) = '\0';
-
-#  ifdef PNG_iTXt_SUPPORTED
-      if (textp->compression > 0)
-      {
-         textp->text_length = 0;
-         textp->itxt_length = text_length;
-      }
-
-      else
-#  endif
-      {
-         textp->text_length = text_length;
-         textp->itxt_length = 0;
-      }
-
-      info_ptr->num_text++;
-      png_debug1(3, "transferred text chunk %d", info_ptr->num_text);
-   }
-   return(0);
-}
-#endif
-
-#ifdef PNG_tIME_SUPPORTED
-void PNGAPI
-png_set_tIME(png_structp png_ptr, png_infop info_ptr, png_const_timep mod_time)
-{
-   png_debug1(1, "in %s storage function", "tIME");
-
-   if (png_ptr == NULL || info_ptr == NULL ||
-       (png_ptr->mode & PNG_WROTE_tIME))
-      return;
-
-   png_memcpy(&(info_ptr->mod_time), mod_time, png_sizeof(png_time));
-   info_ptr->valid |= PNG_INFO_tIME;
-}
-#endif
-
-#ifdef PNG_tRNS_SUPPORTED
-void PNGAPI
-png_set_tRNS(png_structp png_ptr, png_infop info_ptr,
-    png_const_bytep trans_alpha, int num_trans, png_const_color_16p trans_color)
-{
-   png_debug1(1, "in %s storage function", "tRNS");
-
-   if (png_ptr == NULL || info_ptr == NULL)
-      return;
-
-   if (trans_alpha != NULL)
-   {
-       /* It may not actually be necessary to set png_ptr->trans_alpha here;
-        * we do it for backward compatibility with the way the png_handle_tRNS
-        * function used to do the allocation.
-        */
-
-       png_free_data(png_ptr, info_ptr, PNG_FREE_TRNS, 0);
-
-       /* Changed from num_trans to PNG_MAX_PALETTE_LENGTH in version 1.2.1 */
-       png_ptr->trans_alpha = info_ptr->trans_alpha =
-           (png_bytep)png_malloc(png_ptr, (png_size_t)PNG_MAX_PALETTE_LENGTH);
-
-       if (num_trans > 0 && num_trans <= PNG_MAX_PALETTE_LENGTH)
-          png_memcpy(info_ptr->trans_alpha, trans_alpha, (png_size_t)num_trans);
-   }
-
-   if (trans_color != NULL)
-   {
-      int sample_max = (1 << info_ptr->bit_depth);
-
-      if ((info_ptr->color_type == PNG_COLOR_TYPE_GRAY &&
-          (int)trans_color->gray > sample_max) ||
-          (info_ptr->color_type == PNG_COLOR_TYPE_RGB &&
-          ((int)trans_color->red > sample_max ||
-          (int)trans_color->green > sample_max ||
-          (int)trans_color->blue > sample_max)))
-         png_warning(png_ptr,
-            "tRNS chunk has out-of-range samples for bit_depth");
-
-      png_memcpy(&(info_ptr->trans_color), trans_color,
-         png_sizeof(png_color_16));
-
-      if (num_trans == 0)
-         num_trans = 1;
-   }
-
-   info_ptr->num_trans = (png_uint_16)num_trans;
-
-   if (num_trans != 0)
-   {
-      info_ptr->valid |= PNG_INFO_tRNS;
-      info_ptr->free_me |= PNG_FREE_TRNS;
-   }
-}
-#endif
-
-#ifdef PNG_sPLT_SUPPORTED
-void PNGAPI
-png_set_sPLT(png_structp png_ptr,
-    png_infop info_ptr, png_const_sPLT_tp entries, int nentries)
-/*
- *  entries        - array of png_sPLT_t structures
- *                   to be added to the list of palettes
- *                   in the info structure.
- *
- *  nentries       - number of palette structures to be
- *                   added.
- */
-{
-   png_sPLT_tp np;
-   int i;
-
-   if (png_ptr == NULL || info_ptr == NULL)
-      return;
-
-   np = (png_sPLT_tp)png_malloc_warn(png_ptr,
-       (info_ptr->splt_palettes_num + nentries) *
-       (png_size_t)png_sizeof(png_sPLT_t));
-
-   if (np == NULL)
-   {
-      png_warning(png_ptr, "No memory for sPLT palettes");
-      return;
-   }
-
-   png_memcpy(np, info_ptr->splt_palettes,
-       info_ptr->splt_palettes_num * png_sizeof(png_sPLT_t));
-
-   png_free(png_ptr, info_ptr->splt_palettes);
-   info_ptr->splt_palettes=NULL;
-
-   for (i = 0; i < nentries; i++)
-   {
-      png_sPLT_tp to = np + info_ptr->splt_palettes_num + i;
-      png_const_sPLT_tp from = entries + i;
-      png_uint_32 length;
-
-      length = png_strlen(from->name) + 1;
-      to->name = (png_charp)png_malloc_warn(png_ptr, (png_size_t)length);
-
-      if (to->name == NULL)
-      {
-         png_warning(png_ptr,
-             "Out of memory while processing sPLT chunk");
-         continue;
-      }
-
-      png_memcpy(to->name, from->name, length);
-      to->entries = (png_sPLT_entryp)png_malloc_warn(png_ptr,
-          (png_size_t)(from->nentries * png_sizeof(png_sPLT_entry)));
-
-      if (to->entries == NULL)
-      {
-         png_warning(png_ptr,
-             "Out of memory while processing sPLT chunk");
-         png_free(png_ptr, to->name);
-         to->name = NULL;
-         continue;
-      }
-
-      png_memcpy(to->entries, from->entries,
-          from->nentries * png_sizeof(png_sPLT_entry));
-
-      to->nentries = from->nentries;
-      to->depth = from->depth;
-   }
-
-   info_ptr->splt_palettes = np;
-   info_ptr->splt_palettes_num += nentries;
-   info_ptr->valid |= PNG_INFO_sPLT;
-   info_ptr->free_me |= PNG_FREE_SPLT;
-}
-#endif /* PNG_sPLT_SUPPORTED */
-
-#ifdef PNG_UNKNOWN_CHUNKS_SUPPORTED
-void PNGAPI
-png_set_unknown_chunks(png_structp png_ptr,
-   png_infop info_ptr, png_const_unknown_chunkp unknowns, int num_unknowns)
-{
-   png_unknown_chunkp np;
-   int i;
-
-   if (png_ptr == NULL || info_ptr == NULL || num_unknowns == 0)
-      return;
-
-   np = (png_unknown_chunkp)png_malloc_warn(png_ptr,
-       (png_size_t)(info_ptr->unknown_chunks_num + num_unknowns) *
-       png_sizeof(png_unknown_chunk));
-
-   if (np == NULL)
-   {
-      png_warning(png_ptr,
-          "Out of memory while processing unknown chunk");
-      return;
-   }
-
-   png_memcpy(np, info_ptr->unknown_chunks,
-       (png_size_t)info_ptr->unknown_chunks_num *
-       png_sizeof(png_unknown_chunk));
-
-   png_free(png_ptr, info_ptr->unknown_chunks);
-   info_ptr->unknown_chunks = NULL;
-
-   for (i = 0; i < num_unknowns; i++)
-   {
-      png_unknown_chunkp to = np + info_ptr->unknown_chunks_num + i;
-      png_const_unknown_chunkp from = unknowns + i;
-
-      png_memcpy(to->name, from->name, png_sizeof(from->name));
-      to->name[png_sizeof(to->name)-1] = '\0';
-      to->size = from->size;
-
-      /* Note our location in the read or write sequence */
-      to->location = (png_byte)(png_ptr->mode & 0xff);
-
-      if (from->size == 0)
-         to->data=NULL;
-
-      else
-      {
-         to->data = (png_bytep)png_malloc_warn(png_ptr,
-             (png_size_t)from->size);
-
-         if (to->data == NULL)
-         {
-            png_warning(png_ptr,
-                "Out of memory while processing unknown chunk");
-            to->size = 0;
-         }
-
-         else
-            png_memcpy(to->data, from->data, from->size);
-      }
-   }
-
-   info_ptr->unknown_chunks = np;
-   info_ptr->unknown_chunks_num += num_unknowns;
-   info_ptr->free_me |= PNG_FREE_UNKN;
-}
-
-void PNGAPI
-png_set_unknown_chunk_location(png_structp png_ptr, png_infop info_ptr,
-    int chunk, int location)
-{
-   if (png_ptr != NULL && info_ptr != NULL && chunk >= 0 && chunk <
-       info_ptr->unknown_chunks_num)
-      info_ptr->unknown_chunks[chunk].location = (png_byte)location;
-}
-#endif
-
-
-#ifdef PNG_MNG_FEATURES_SUPPORTED
-png_uint_32 PNGAPI
-png_permit_mng_features (png_structp png_ptr, png_uint_32 mng_features)
-{
-   png_debug(1, "in png_permit_mng_features");
-
-   if (png_ptr == NULL)
-      return (png_uint_32)0;
-
-   png_ptr->mng_features_permitted =
-       (png_byte)(mng_features & PNG_ALL_MNG_FEATURES);
-
-   return (png_uint_32)png_ptr->mng_features_permitted;
-}
-#endif
-
-#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
-void PNGAPI
-png_set_keep_unknown_chunks(png_structp png_ptr, int keep, png_const_bytep
-    chunk_list, int num_chunks)
-{
-   png_bytep new_list, p;
-   int i, old_num_chunks;
-   if (png_ptr == NULL)
-      return;
-
-   if (num_chunks == 0)
-   {
-      if (keep == PNG_HANDLE_CHUNK_ALWAYS || keep == PNG_HANDLE_CHUNK_IF_SAFE)
-         png_ptr->flags |= PNG_FLAG_KEEP_UNKNOWN_CHUNKS;
-
-      else
-         png_ptr->flags &= ~PNG_FLAG_KEEP_UNKNOWN_CHUNKS;
-
-      if (keep == PNG_HANDLE_CHUNK_ALWAYS)
-         png_ptr->flags |= PNG_FLAG_KEEP_UNSAFE_CHUNKS;
-
-      else
-         png_ptr->flags &= ~PNG_FLAG_KEEP_UNSAFE_CHUNKS;
-
-      return;
-   }
-
-   if (chunk_list == NULL)
-      return;
-
-   old_num_chunks = png_ptr->num_chunk_list;
-   new_list=(png_bytep)png_malloc(png_ptr,
-       (png_size_t)(5*(num_chunks + old_num_chunks)));
-
-   if (png_ptr->chunk_list != NULL)
-   {
-      png_memcpy(new_list, png_ptr->chunk_list,
-          (png_size_t)(5*old_num_chunks));
-      png_free(png_ptr, png_ptr->chunk_list);
-      png_ptr->chunk_list=NULL;
-   }
-
-   png_memcpy(new_list + 5*old_num_chunks, chunk_list,
-       (png_size_t)(5*num_chunks));
-
-   for (p = new_list + 5*old_num_chunks + 4, i = 0; i<num_chunks; i++, p += 5)
-      *p=(png_byte)keep;
-
-   png_ptr->num_chunk_list = old_num_chunks + num_chunks;
-   png_ptr->chunk_list = new_list;
-   png_ptr->free_me |= PNG_FREE_LIST;
-}
-#endif
-
-#ifdef PNG_READ_USER_CHUNKS_SUPPORTED
-void PNGAPI
-png_set_read_user_chunk_fn(png_structp png_ptr, png_voidp user_chunk_ptr,
-    png_user_chunk_ptr read_user_chunk_fn)
-{
-   png_debug(1, "in png_set_read_user_chunk_fn");
-
-   if (png_ptr == NULL)
-      return;
-
-   png_ptr->read_user_chunk_fn = read_user_chunk_fn;
-   png_ptr->user_chunk_ptr = user_chunk_ptr;
-}
-#endif
-
-#ifdef PNG_INFO_IMAGE_SUPPORTED
-void PNGAPI
-png_set_rows(png_structp png_ptr, png_infop info_ptr, png_bytepp row_pointers)
-{
-   png_debug1(1, "in %s storage function", "rows");
-
-   if (png_ptr == NULL || info_ptr == NULL)
-      return;
-
-   if (info_ptr->row_pointers && (info_ptr->row_pointers != row_pointers))
-      png_free_data(png_ptr, info_ptr, PNG_FREE_ROWS, 0);
-
-   info_ptr->row_pointers = row_pointers;
-
-   if (row_pointers)
-      info_ptr->valid |= PNG_INFO_IDAT;
-}
-#endif
-
-void PNGAPI
-png_set_compression_buffer_size(png_structp png_ptr, png_size_t size)
-{
-    if (png_ptr == NULL)
-       return;
-
-    png_free(png_ptr, png_ptr->zbuf);
-
-    if (size > ZLIB_IO_MAX)
-    {
-       png_warning(png_ptr, "Attempt to set buffer size beyond max ignored");
-       png_ptr->zbuf_size = ZLIB_IO_MAX;
-       size = ZLIB_IO_MAX; /* must fit */
-    }
-
-    else
-       png_ptr->zbuf_size = (uInt)size;
-
-    png_ptr->zbuf = (png_bytep)png_malloc(png_ptr, size);
-
-    /* The following ensures a relatively safe failure if this gets called while
-     * the buffer is actually in use.
-     */
-    png_ptr->zstream.next_out = png_ptr->zbuf;
-    png_ptr->zstream.avail_out = 0;
-    png_ptr->zstream.avail_in = 0;
-}
-
-void PNGAPI
-png_set_invalid(png_structp png_ptr, png_infop info_ptr, int mask)
-{
-   if (png_ptr && info_ptr)
-      info_ptr->valid &= ~mask;
-}
-
-
-
-#ifdef PNG_SET_USER_LIMITS_SUPPORTED
-/* This function was added to libpng 1.2.6 */
-void PNGAPI
-png_set_user_limits (png_structp png_ptr, png_uint_32 user_width_max,
-    png_uint_32 user_height_max)
-{
-   /* Images with dimensions larger than these limits will be
-    * rejected by png_set_IHDR().  To accept any PNG datastream
-    * regardless of dimensions, set both limits to 0x7ffffffL.
-    */
-   if (png_ptr == NULL)
-      return;
-
-   png_ptr->user_width_max = user_width_max;
-   png_ptr->user_height_max = user_height_max;
-}
-
-/* This function was added to libpng 1.4.0 */
-void PNGAPI
-png_set_chunk_cache_max (png_structp png_ptr,
-   png_uint_32 user_chunk_cache_max)
-{
-    if (png_ptr)
-       png_ptr->user_chunk_cache_max = user_chunk_cache_max;
-}
-
-/* This function was added to libpng 1.4.1 */
-void PNGAPI
-png_set_chunk_malloc_max (png_structp png_ptr,
-    png_alloc_size_t user_chunk_malloc_max)
-{
-   if (png_ptr)
-      png_ptr->user_chunk_malloc_max = user_chunk_malloc_max;
-}
-#endif /* ?PNG_SET_USER_LIMITS_SUPPORTED */
-
-
-#ifdef PNG_BENIGN_ERRORS_SUPPORTED
-void PNGAPI
-png_set_benign_errors(png_structp png_ptr, int allowed)
-{
-   png_debug(1, "in png_set_benign_errors");
-
-   if (allowed)
-      png_ptr->flags |= PNG_FLAG_BENIGN_ERRORS_WARN;
-
-   else
-      png_ptr->flags &= ~PNG_FLAG_BENIGN_ERRORS_WARN;
-}
-#endif /* PNG_BENIGN_ERRORS_SUPPORTED */
-#endif /* PNG_READ_SUPPORTED || PNG_WRITE_SUPPORTED */
+
+/* pngset.c - storage of image information into info struct
+ *
+ * Last changed in libpng 1.2.49 [March 29, 2012]
+ * Copyright (c) 1998-2012 Glenn Randers-Pehrson
+ * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
+ * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
+ *
+ * This code is released under the libpng license.
+ * For conditions of distribution and use, see the disclaimer
+ * and license in png.h
+ *
+ * The functions here are used during reads to store data from the file
+ * into the info struct, and during writes to store application data
+ * into the info struct for writing into the file.  This abstracts the
+ * info struct and allows us to change the structure in the future.
+ */
+
+#define PNG_INTERNAL
+#define PNG_NO_PEDANTIC_WARNINGS
+#include "png.h"
+#if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED)
+
+#ifdef PNG_bKGD_SUPPORTED
+void PNGAPI
+png_set_bKGD(png_structp png_ptr, png_infop info_ptr, png_color_16p background)
+{
+   png_debug1(1, "in %s storage function", "bKGD");
+
+   if (png_ptr == NULL || info_ptr == NULL)
+      return;
+
+   png_memcpy(&(info_ptr->background), background, png_sizeof(png_color_16));
+   info_ptr->valid |= PNG_INFO_bKGD;
+}
+#endif
+
+#ifdef PNG_cHRM_SUPPORTED
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+void PNGAPI
+png_set_cHRM(png_structp png_ptr, png_infop info_ptr,
+   double white_x, double white_y, double red_x, double red_y,
+   double green_x, double green_y, double blue_x, double blue_y)
+{
+   png_debug1(1, "in %s storage function", "cHRM");
+
+   if (png_ptr == NULL || info_ptr == NULL)
+      return;
+
+   info_ptr->x_white = (float)white_x;
+   info_ptr->y_white = (float)white_y;
+   info_ptr->x_red   = (float)red_x;
+   info_ptr->y_red   = (float)red_y;
+   info_ptr->x_green = (float)green_x;
+   info_ptr->y_green = (float)green_y;
+   info_ptr->x_blue  = (float)blue_x;
+   info_ptr->y_blue  = (float)blue_y;
+#ifdef PNG_FIXED_POINT_SUPPORTED
+   info_ptr->int_x_white = (png_fixed_point)(white_x*100000.+0.5);
+   info_ptr->int_y_white = (png_fixed_point)(white_y*100000.+0.5);
+   info_ptr->int_x_red   = (png_fixed_point)(  red_x*100000.+0.5);
+   info_ptr->int_y_red   = (png_fixed_point)(  red_y*100000.+0.5);
+   info_ptr->int_x_green = (png_fixed_point)(green_x*100000.+0.5);
+   info_ptr->int_y_green = (png_fixed_point)(green_y*100000.+0.5);
+   info_ptr->int_x_blue  = (png_fixed_point)( blue_x*100000.+0.5);
+   info_ptr->int_y_blue  = (png_fixed_point)( blue_y*100000.+0.5);
+#endif
+   info_ptr->valid |= PNG_INFO_cHRM;
+}
+#endif /* PNG_FLOATING_POINT_SUPPORTED */
+
+#ifdef PNG_FIXED_POINT_SUPPORTED
+void PNGAPI
+png_set_cHRM_fixed(png_structp png_ptr, png_infop info_ptr,
+   png_fixed_point white_x, png_fixed_point white_y, png_fixed_point red_x,
+   png_fixed_point red_y, png_fixed_point green_x, png_fixed_point green_y,
+   png_fixed_point blue_x, png_fixed_point blue_y)
+{
+   png_debug1(1, "in %s storage function", "cHRM fixed");
+
+   if (png_ptr == NULL || info_ptr == NULL)
+      return;
+
+#ifdef PNG_CHECK_cHRM_SUPPORTED
+   if (png_check_cHRM_fixed(png_ptr,
+      white_x, white_y, red_x, red_y, green_x, green_y, blue_x, blue_y))
+#endif
+   {
+      info_ptr->int_x_white = white_x;
+      info_ptr->int_y_white = white_y;
+      info_ptr->int_x_red   = red_x;
+      info_ptr->int_y_red   = red_y;
+      info_ptr->int_x_green = green_x;
+      info_ptr->int_y_green = green_y;
+      info_ptr->int_x_blue  = blue_x;
+      info_ptr->int_y_blue  = blue_y;
+#ifdef  PNG_FLOATING_POINT_SUPPORTED
+      info_ptr->x_white = (float)(white_x/100000.);
+      info_ptr->y_white = (float)(white_y/100000.);
+      info_ptr->x_red   = (float)(  red_x/100000.);
+      info_ptr->y_red   = (float)(  red_y/100000.);
+      info_ptr->x_green = (float)(green_x/100000.);
+      info_ptr->y_green = (float)(green_y/100000.);
+      info_ptr->x_blue  = (float)( blue_x/100000.);
+      info_ptr->y_blue  = (float)( blue_y/100000.);
+#endif
+      info_ptr->valid |= PNG_INFO_cHRM;
+   }
+}
+#endif /* PNG_FIXED_POINT_SUPPORTED */
+#endif /* PNG_cHRM_SUPPORTED */
+
+#ifdef PNG_gAMA_SUPPORTED
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+void PNGAPI
+png_set_gAMA(png_structp png_ptr, png_infop info_ptr, double file_gamma)
+{
+   double png_gamma;
+
+   png_debug1(1, "in %s storage function", "gAMA");
+
+   if (png_ptr == NULL || info_ptr == NULL)
+      return;
+
+   /* Check for overflow */
+   if (file_gamma > 21474.83)
+   {
+      png_warning(png_ptr, "Limiting gamma to 21474.83");
+      png_gamma=21474.83;
+   }
+   else
+      png_gamma = file_gamma;
+   info_ptr->gamma = (float)png_gamma;
+#ifdef PNG_FIXED_POINT_SUPPORTED
+   info_ptr->int_gamma = (int)(png_gamma*100000.+.5);
+#endif
+   info_ptr->valid |= PNG_INFO_gAMA;
+   if (png_gamma == 0.0)
+      png_warning(png_ptr, "Setting gamma=0");
+}
+#endif
+void PNGAPI
+png_set_gAMA_fixed(png_structp png_ptr, png_infop info_ptr, png_fixed_point
+   int_gamma)
+{
+   png_fixed_point png_gamma;
+
+   png_debug1(1, "in %s storage function", "gAMA");
+
+   if (png_ptr == NULL || info_ptr == NULL)
+      return;
+
+   if (int_gamma > (png_fixed_point)PNG_UINT_31_MAX)
+   {
+      png_warning(png_ptr, "Limiting gamma to 21474.83");
+      png_gamma=PNG_UINT_31_MAX;
+   }
+   else
+   {
+      if (int_gamma < 0)
+      {
+         png_warning(png_ptr, "Setting negative gamma to zero");
+         png_gamma = 0;
+      }
+      else
+         png_gamma = int_gamma;
+   }
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+   info_ptr->gamma = (float)(png_gamma/100000.);
+#endif
+#ifdef PNG_FIXED_POINT_SUPPORTED
+   info_ptr->int_gamma = png_gamma;
+#endif
+   info_ptr->valid |= PNG_INFO_gAMA;
+   if (png_gamma == 0)
+      png_warning(png_ptr, "Setting gamma=0");
+}
+#endif
+
+#ifdef PNG_hIST_SUPPORTED
+void PNGAPI
+png_set_hIST(png_structp png_ptr, png_infop info_ptr, png_uint_16p hist)
+{
+   int i;
+
+   png_debug1(1, "in %s storage function", "hIST");
+
+   if (png_ptr == NULL || info_ptr == NULL)
+      return;
+
+   if (info_ptr->num_palette == 0 || info_ptr->num_palette
+       > PNG_MAX_PALETTE_LENGTH)
+   {
+      png_warning(png_ptr,
+         "Invalid palette size, hIST allocation skipped.");
+      return;
+   }
+
+#ifdef PNG_FREE_ME_SUPPORTED
+   png_free_data(png_ptr, info_ptr, PNG_FREE_HIST, 0);
+#endif
+   /* Changed from info->num_palette to PNG_MAX_PALETTE_LENGTH in
+    * version 1.2.1
+    */
+   png_ptr->hist = (png_uint_16p)png_malloc_warn(png_ptr,
+      (png_uint_32)(PNG_MAX_PALETTE_LENGTH * png_sizeof(png_uint_16)));
+   if (png_ptr->hist == NULL)
+   {
+      png_warning(png_ptr, "Insufficient memory for hIST chunk data.");
+      return;
+   }
+
+   for (i = 0; i < info_ptr->num_palette; i++)
+      png_ptr->hist[i] = hist[i];
+   info_ptr->hist = png_ptr->hist;
+   info_ptr->valid |= PNG_INFO_hIST;
+
+#ifdef PNG_FREE_ME_SUPPORTED
+   info_ptr->free_me |= PNG_FREE_HIST;
+#else
+   png_ptr->flags |= PNG_FLAG_FREE_HIST;
+#endif
+}
+#endif
+
+void PNGAPI
+png_set_IHDR(png_structp png_ptr, png_infop info_ptr,
+   png_uint_32 width, png_uint_32 height, int bit_depth,
+   int color_type, int interlace_type, int compression_type,
+   int filter_type)
+{
+   png_debug1(1, "in %s storage function", "IHDR");
+
+   if (png_ptr == NULL || info_ptr == NULL)
+      return;
+
+   info_ptr->width = width;
+   info_ptr->height = height;
+   info_ptr->bit_depth = (png_byte)bit_depth;
+   info_ptr->color_type = (png_byte)color_type;
+   info_ptr->compression_type = (png_byte)compression_type;
+   info_ptr->filter_type = (png_byte)filter_type;
+   info_ptr->interlace_type = (png_byte)interlace_type;
+
+   png_check_IHDR (png_ptr, info_ptr->width, info_ptr->height,
+       info_ptr->bit_depth, info_ptr->color_type, info_ptr->interlace_type,
+       info_ptr->compression_type, info_ptr->filter_type);
+
+   if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
+      info_ptr->channels = 1;
+   else if (info_ptr->color_type & PNG_COLOR_MASK_COLOR)
+      info_ptr->channels = 3;
+   else
+      info_ptr->channels = 1;
+   if (info_ptr->color_type & PNG_COLOR_MASK_ALPHA)
+      info_ptr->channels++;
+   info_ptr->pixel_depth = (png_byte)(info_ptr->channels * info_ptr->bit_depth);
+
+   /* Check for potential overflow */
+   if (width > (PNG_UINT_32_MAX
+                 >> 3)      /* 8-byte RGBA pixels */
+                 - 64       /* bigrowbuf hack */
+                 - 1        /* filter byte */
+                 - 7*8      /* rounding of width to multiple of 8 pixels */
+                 - 8)       /* extra max_pixel_depth pad */
+      info_ptr->rowbytes = (png_size_t)0;
+   else
+      info_ptr->rowbytes = PNG_ROWBYTES(info_ptr->pixel_depth, width);
+}
+
+#ifdef PNG_oFFs_SUPPORTED
+void PNGAPI
+png_set_oFFs(png_structp png_ptr, png_infop info_ptr,
+   png_int_32 offset_x, png_int_32 offset_y, int unit_type)
+{
+   png_debug1(1, "in %s storage function", "oFFs");
+
+   if (png_ptr == NULL || info_ptr == NULL)
+      return;
+
+   info_ptr->x_offset = offset_x;
+   info_ptr->y_offset = offset_y;
+   info_ptr->offset_unit_type = (png_byte)unit_type;
+   info_ptr->valid |= PNG_INFO_oFFs;
+}
+#endif
+
+#ifdef PNG_pCAL_SUPPORTED
+void PNGAPI
+png_set_pCAL(png_structp png_ptr, png_infop info_ptr,
+   png_charp purpose, png_int_32 X0, png_int_32 X1, int type, int nparams,
+   png_charp units, png_charpp params)
+{
+   png_uint_32 length;
+   int i;
+
+   png_debug1(1, "in %s storage function", "pCAL");
+
+   if (png_ptr == NULL || info_ptr == NULL)
+      return;
+
+   length = png_strlen(purpose) + 1;
+   png_debug1(3, "allocating purpose for info (%lu bytes)",
+     (unsigned long)length);
+   info_ptr->pcal_purpose = (png_charp)png_malloc_warn(png_ptr, length);
+   if (info_ptr->pcal_purpose == NULL)
+   {
+      png_warning(png_ptr, "Insufficient memory for pCAL purpose.");
+      return;
+   }
+   png_memcpy(info_ptr->pcal_purpose, purpose, (png_size_t)length);
+
+   png_debug(3, "storing X0, X1, type, and nparams in info");
+   info_ptr->pcal_X0 = X0;
+   info_ptr->pcal_X1 = X1;
+   info_ptr->pcal_type = (png_byte)type;
+   info_ptr->pcal_nparams = (png_byte)nparams;
+
+   length = png_strlen(units) + 1;
+   png_debug1(3, "allocating units for info (%lu bytes)",
+     (unsigned long)length);
+   info_ptr->pcal_units = (png_charp)png_malloc_warn(png_ptr, length);
+   if (info_ptr->pcal_units == NULL)
+   {
+      png_warning(png_ptr, "Insufficient memory for pCAL units.");
+      return;
+   }
+   png_memcpy(info_ptr->pcal_units, units, (png_size_t)length);
+
+   info_ptr->pcal_params = (png_charpp)png_malloc_warn(png_ptr,
+      (png_uint_32)((nparams + 1) * png_sizeof(png_charp)));
+   if (info_ptr->pcal_params == NULL)
+   {
+      png_warning(png_ptr, "Insufficient memory for pCAL params.");
+      return;
+   }
+
+   png_memset(info_ptr->pcal_params, 0, (nparams + 1) * png_sizeof(png_charp));
+
+   for (i = 0; i < nparams; i++)
+   {
+      length = png_strlen(params[i]) + 1;
+      png_debug2(3, "allocating parameter %d for info (%lu bytes)", i,
+        (unsigned long)length);
+      info_ptr->pcal_params[i] = (png_charp)png_malloc_warn(png_ptr, length);
+      if (info_ptr->pcal_params[i] == NULL)
+      {
+         png_warning(png_ptr, "Insufficient memory for pCAL parameter.");
+         return;
+      }
+      png_memcpy(info_ptr->pcal_params[i], params[i], (png_size_t)length);
+   }
+
+   info_ptr->valid |= PNG_INFO_pCAL;
+#ifdef PNG_FREE_ME_SUPPORTED
+   info_ptr->free_me |= PNG_FREE_PCAL;
+#endif
+}
+#endif
+
+#if defined(PNG_READ_sCAL_SUPPORTED) || defined(PNG_WRITE_sCAL_SUPPORTED)
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+void PNGAPI
+png_set_sCAL(png_structp png_ptr, png_infop info_ptr,
+             int unit, double width, double height)
+{
+   png_debug1(1, "in %s storage function", "sCAL");
+
+   if (png_ptr == NULL || info_ptr == NULL)
+      return;
+
+   info_ptr->scal_unit = (png_byte)unit;
+   info_ptr->scal_pixel_width = width;
+   info_ptr->scal_pixel_height = height;
+
+   info_ptr->valid |= PNG_INFO_sCAL;
+}
+#else
+#ifdef PNG_FIXED_POINT_SUPPORTED
+void PNGAPI
+png_set_sCAL_s(png_structp png_ptr, png_infop info_ptr,
+             int unit, png_charp swidth, png_charp sheight)
+{
+   png_uint_32 length;
+
+   png_debug1(1, "in %s storage function", "sCAL");
+
+   if (png_ptr == NULL || info_ptr == NULL)
+      return;
+
+   info_ptr->scal_unit = (png_byte)unit;
+
+   length = png_strlen(swidth) + 1;
+   png_debug1(3, "allocating unit for info (%u bytes)",
+      (unsigned int)length);
+   info_ptr->scal_s_width = (png_charp)png_malloc_warn(png_ptr, length);
+   if (info_ptr->scal_s_width == NULL)
+   {
+      png_warning(png_ptr,
+         "Memory allocation failed while processing sCAL.");
+      return;
+   }
+   png_memcpy(info_ptr->scal_s_width, swidth, (png_size_t)length);
+
+   length = png_strlen(sheight) + 1;
+   png_debug1(3, "allocating unit for info (%u bytes)",
+      (unsigned int)length);
+   info_ptr->scal_s_height = (png_charp)png_malloc_warn(png_ptr, length);
+   if (info_ptr->scal_s_height == NULL)
+   {
+      png_free (png_ptr, info_ptr->scal_s_width);
+      info_ptr->scal_s_width = NULL;
+      png_warning(png_ptr,
+         "Memory allocation failed while processing sCAL.");
+      return;
+   }
+   png_memcpy(info_ptr->scal_s_height, sheight, (png_size_t)length);
+   info_ptr->valid |= PNG_INFO_sCAL;
+#ifdef PNG_FREE_ME_SUPPORTED
+   info_ptr->free_me |= PNG_FREE_SCAL;
+#endif
+}
+#endif
+#endif
+#endif
+
+#ifdef PNG_pHYs_SUPPORTED
+void PNGAPI
+png_set_pHYs(png_structp png_ptr, png_infop info_ptr,
+   png_uint_32 res_x, png_uint_32 res_y, int unit_type)
+{
+   png_debug1(1, "in %s storage function", "pHYs");
+
+   if (png_ptr == NULL || info_ptr == NULL)
+      return;
+
+   info_ptr->x_pixels_per_unit = res_x;
+   info_ptr->y_pixels_per_unit = res_y;
+   info_ptr->phys_unit_type = (png_byte)unit_type;
+   info_ptr->valid |= PNG_INFO_pHYs;
+}
+#endif
+
+void PNGAPI
+png_set_PLTE(png_structp png_ptr, png_infop info_ptr,
+   png_colorp palette, int num_palette)
+{
+
+   png_debug1(1, "in %s storage function", "PLTE");
+
+   if (png_ptr == NULL || info_ptr == NULL)
+      return;
+
+   if (num_palette < 0 || num_palette > PNG_MAX_PALETTE_LENGTH)
+   {
+      if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
+         png_error(png_ptr, "Invalid palette length");
+      else
+      {
+         png_warning(png_ptr, "Invalid palette length");
+         return;
+      }
+   }
+
+   /* It may not actually be necessary to set png_ptr->palette here;
+    * we do it for backward compatibility with the way the png_handle_tRNS
+    * function used to do the allocation.
+    */
+#ifdef PNG_FREE_ME_SUPPORTED
+   png_free_data(png_ptr, info_ptr, PNG_FREE_PLTE, 0);
+#endif
+
+   /* Changed in libpng-1.2.1 to allocate PNG_MAX_PALETTE_LENGTH instead
+    * of num_palette entries, in case of an invalid PNG file that has
+    * too-large sample values.
+    */
+   png_ptr->palette = (png_colorp)png_calloc(png_ptr,
+      PNG_MAX_PALETTE_LENGTH * png_sizeof(png_color));
+   png_memcpy(png_ptr->palette, palette, num_palette * png_sizeof(png_color));
+   info_ptr->palette = png_ptr->palette;
+   info_ptr->num_palette = png_ptr->num_palette = (png_uint_16)num_palette;
+
+#ifdef PNG_FREE_ME_SUPPORTED
+   info_ptr->free_me |= PNG_FREE_PLTE;
+#else
+   png_ptr->flags |= PNG_FLAG_FREE_PLTE;
+#endif
+
+   info_ptr->valid |= PNG_INFO_PLTE;
+}
+
+#ifdef PNG_sBIT_SUPPORTED
+void PNGAPI
+png_set_sBIT(png_structp png_ptr, png_infop info_ptr,
+   png_color_8p sig_bit)
+{
+   png_debug1(1, "in %s storage function", "sBIT");
+
+   if (png_ptr == NULL || info_ptr == NULL)
+      return;
+
+   png_memcpy(&(info_ptr->sig_bit), sig_bit, png_sizeof(png_color_8));
+   info_ptr->valid |= PNG_INFO_sBIT;
+}
+#endif
+
+#ifdef PNG_sRGB_SUPPORTED
+void PNGAPI
+png_set_sRGB(png_structp png_ptr, png_infop info_ptr, int intent)
+{
+   png_debug1(1, "in %s storage function", "sRGB");
+
+   if (png_ptr == NULL || info_ptr == NULL)
+      return;
+
+   info_ptr->srgb_intent = (png_byte)intent;
+   info_ptr->valid |= PNG_INFO_sRGB;
+}
+
+void PNGAPI
+png_set_sRGB_gAMA_and_cHRM(png_structp png_ptr, png_infop info_ptr,
+   int intent)
+{
+#ifdef PNG_gAMA_SUPPORTED
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+   float file_gamma;
+#endif
+#ifdef PNG_FIXED_POINT_SUPPORTED
+   png_fixed_point int_file_gamma;
+#endif
+#endif
+#ifdef PNG_cHRM_SUPPORTED
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+   float white_x, white_y, red_x, red_y, green_x, green_y, blue_x, blue_y;
+#endif
+   png_fixed_point int_white_x, int_white_y, int_red_x, int_red_y, int_green_x,
+      int_green_y, int_blue_x, int_blue_y;
+#endif
+   png_debug1(1, "in %s storage function", "sRGB_gAMA_and_cHRM");
+
+   if (png_ptr == NULL || info_ptr == NULL)
+      return;
+
+   png_set_sRGB(png_ptr, info_ptr, intent);
+
+#ifdef PNG_gAMA_SUPPORTED
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+   file_gamma = (float).45455;
+   png_set_gAMA(png_ptr, info_ptr, file_gamma);
+#endif
+#ifdef PNG_FIXED_POINT_SUPPORTED
+   int_file_gamma = 45455L;
+   png_set_gAMA_fixed(png_ptr, info_ptr, int_file_gamma);
+#endif
+#endif
+
+#ifdef PNG_cHRM_SUPPORTED
+   int_white_x = 31270L;
+   int_white_y = 32900L;
+   int_red_x   = 64000L;
+   int_red_y   = 33000L;
+   int_green_x = 30000L;
+   int_green_y = 60000L;
+   int_blue_x  = 15000L;
+   int_blue_y  =  6000L;
+
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+   white_x = (float).3127;
+   white_y = (float).3290;
+   red_x   = (float).64;
+   red_y   = (float).33;
+   green_x = (float).30;
+   green_y = (float).60;
+   blue_x  = (float).15;
+   blue_y  = (float).06;
+#endif
+
+#ifdef PNG_FIXED_POINT_SUPPORTED
+   png_set_cHRM_fixed(png_ptr, info_ptr,
+       int_white_x, int_white_y, int_red_x, int_red_y, int_green_x,
+       int_green_y, int_blue_x, int_blue_y);
+#endif
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+   png_set_cHRM(png_ptr, info_ptr,
+       white_x, white_y, red_x, red_y, green_x, green_y, blue_x, blue_y);
+#endif
+#endif /* cHRM */
+}
+#endif /* sRGB */
+
+
+#ifdef PNG_iCCP_SUPPORTED
+void PNGAPI
+png_set_iCCP(png_structp png_ptr, png_infop info_ptr,
+             png_charp name, int compression_type,
+             png_charp profile, png_uint_32 proflen)
+{
+   png_charp new_iccp_name;
+   png_charp new_iccp_profile;
+   png_uint_32 length;
+
+   png_debug1(1, "in %s storage function", "iCCP");
+
+   if (png_ptr == NULL || info_ptr == NULL || name == NULL || profile == NULL)
+      return;
+
+   length = png_strlen(name)+1;
+   new_iccp_name = (png_charp)png_malloc_warn(png_ptr, length);
+   if (new_iccp_name == NULL)
+   {
+        png_warning(png_ptr, "Insufficient memory to process iCCP chunk.");
+      return;
+   }
+   png_memcpy(new_iccp_name, name, length);
+   new_iccp_profile = (png_charp)png_malloc_warn(png_ptr, proflen);
+   if (new_iccp_profile == NULL)
+   {
+      png_free (png_ptr, new_iccp_name);
+      png_warning(png_ptr,
+          "Insufficient memory to process iCCP profile.");
+      return;
+   }
+   png_memcpy(new_iccp_profile, profile, (png_size_t)proflen);
+
+   png_free_data(png_ptr, info_ptr, PNG_FREE_ICCP, 0);
+
+   info_ptr->iccp_proflen = proflen;
+   info_ptr->iccp_name = new_iccp_name;
+   info_ptr->iccp_profile = new_iccp_profile;
+   /* Compression is always zero but is here so the API and info structure
+    * does not have to change if we introduce multiple compression types
+    */
+   info_ptr->iccp_compression = (png_byte)compression_type;
+#ifdef PNG_FREE_ME_SUPPORTED
+   info_ptr->free_me |= PNG_FREE_ICCP;
+#endif
+   info_ptr->valid |= PNG_INFO_iCCP;
+}
+#endif
+
+#ifdef PNG_TEXT_SUPPORTED
+void PNGAPI
+png_set_text(png_structp png_ptr, png_infop info_ptr, png_textp text_ptr,
+             int num_text)
+{
+   int ret;
+   ret = png_set_text_2(png_ptr, info_ptr, text_ptr, num_text);
+   if (ret)
+      png_error(png_ptr, "Insufficient memory to store text");
+}
+
+int /* PRIVATE */
+png_set_text_2(png_structp png_ptr, png_infop info_ptr, png_textp text_ptr,
+               int num_text)
+{
+   int i;
+
+   png_debug1(1, "in %s storage function", ((png_ptr == NULL ||
+      png_ptr->chunk_name[0] == '\0') ?
+      "text" : (png_const_charp)png_ptr->chunk_name));
+
+   if (png_ptr == NULL || info_ptr == NULL || num_text == 0)
+      return(0);
+
+   /* Make sure we have enough space in the "text" array in info_struct
+    * to hold all of the incoming text_ptr objects.
+    */
+   if (info_ptr->num_text + num_text > info_ptr->max_text)
+   {
+      int old_max_text = info_ptr->max_text;
+      int old_num_text = info_ptr->num_text;
+
+      if (info_ptr->text != NULL)
+      {
+         png_textp old_text;
+
+         info_ptr->max_text = info_ptr->num_text + num_text + 8;
+         old_text = info_ptr->text;
+
+         info_ptr->text = (png_textp)png_malloc_warn(png_ptr,
+            (png_uint_32)(info_ptr->max_text * png_sizeof(png_text)));
+         if (info_ptr->text == NULL)
+         {
+            /* Restore to previous condition */
+            info_ptr->max_text = old_max_text;
+            info_ptr->text = old_text;
+            return(1);
+         }
+         png_memcpy(info_ptr->text, old_text, (png_size_t)(old_max_text *
+            png_sizeof(png_text)));
+         png_free(png_ptr, old_text);
+      }
+      else
+      {
+         info_ptr->max_text = num_text + 8;
+         info_ptr->num_text = 0;
+         info_ptr->text = (png_textp)png_malloc_warn(png_ptr,
+            (png_uint_32)(info_ptr->max_text * png_sizeof(png_text)));
+         if (info_ptr->text == NULL)
+         {
+            /* Restore to previous condition */
+            info_ptr->num_text = old_num_text;
+            info_ptr->max_text = old_max_text;
+            return(1);
+         }
+#ifdef PNG_FREE_ME_SUPPORTED
+         info_ptr->free_me |= PNG_FREE_TEXT;
+#endif
+      }
+      png_debug1(3, "allocated %d entries for info_ptr->text",
+         info_ptr->max_text);
+   }
+
+   for (i = 0; i < num_text; i++)
+   {
+      png_size_t text_length, key_len;
+      png_size_t lang_len, lang_key_len;
+      png_textp textp = &(info_ptr->text[info_ptr->num_text]);
+
+      if (text_ptr[i].key == NULL)
+          continue;
+
+      key_len = png_strlen(text_ptr[i].key);
+
+      if (text_ptr[i].compression <= 0)
+      {
+         lang_len = 0;
+         lang_key_len = 0;
+      }
+
+      else
+#ifdef PNG_iTXt_SUPPORTED
+      {
+         /* Set iTXt data */
+
+         if (text_ptr[i].lang != NULL)
+            lang_len = png_strlen(text_ptr[i].lang);
+         else
+            lang_len = 0;
+         if (text_ptr[i].lang_key != NULL)
+            lang_key_len = png_strlen(text_ptr[i].lang_key);
+         else
+            lang_key_len = 0;
+      }
+#else /* PNG_iTXt_SUPPORTED */
+      {
+         png_warning(png_ptr, "iTXt chunk not supported.");
+         continue;
+      }
+#endif
+
+      if (text_ptr[i].text == NULL || text_ptr[i].text[0] == '\0')
+      {
+         text_length = 0;
+#ifdef PNG_iTXt_SUPPORTED
+         if (text_ptr[i].compression > 0)
+            textp->compression = PNG_ITXT_COMPRESSION_NONE;
+         else
+#endif
+            textp->compression = PNG_TEXT_COMPRESSION_NONE;
+      }
+
+      else
+      {
+         text_length = png_strlen(text_ptr[i].text);
+         textp->compression = text_ptr[i].compression;
+      }
+
+      textp->key = (png_charp)png_malloc_warn(png_ptr,
+         (png_uint_32)
+         (key_len + text_length + lang_len + lang_key_len + 4));
+      if (textp->key == NULL)
+         return(1);
+      png_debug2(2, "Allocated %lu bytes at %x in png_set_text",
+                 (png_uint_32)
+                 (key_len + lang_len + lang_key_len + text_length + 4),
+                 (int)textp->key);
+
+      png_memcpy(textp->key, text_ptr[i].key,(png_size_t)(key_len));
+      *(textp->key + key_len) = '\0';
+#ifdef PNG_iTXt_SUPPORTED
+      if (text_ptr[i].compression > 0)
+      {
+         textp->lang = textp->key + key_len + 1;
+         png_memcpy(textp->lang, text_ptr[i].lang, lang_len);
+         *(textp->lang + lang_len) = '\0';
+         textp->lang_key = textp->lang + lang_len + 1;
+         png_memcpy(textp->lang_key, text_ptr[i].lang_key, lang_key_len);
+         *(textp->lang_key + lang_key_len) = '\0';
+         textp->text = textp->lang_key + lang_key_len + 1;
+      }
+      else
+#endif
+      {
+#ifdef PNG_iTXt_SUPPORTED
+         textp->lang=NULL;
+         textp->lang_key=NULL;
+#endif
+         textp->text = textp->key + key_len + 1;
+      }
+      if (text_length)
+         png_memcpy(textp->text, text_ptr[i].text,
+            (png_size_t)(text_length));
+      *(textp->text + text_length) = '\0';
+
+#ifdef PNG_iTXt_SUPPORTED
+      if (textp->compression > 0)
+      {
+         textp->text_length = 0;
+         textp->itxt_length = text_length;
+      }
+      else
+#endif
+
+      {
+         textp->text_length = text_length;
+#ifdef PNG_iTXt_SUPPORTED
+         textp->itxt_length = 0;
+#endif
+      }
+      info_ptr->num_text++;
+      png_debug1(3, "transferred text chunk %d", info_ptr->num_text);
+   }
+   return(0);
+}
+#endif
+
+#ifdef PNG_tIME_SUPPORTED
+void PNGAPI
+png_set_tIME(png_structp png_ptr, png_infop info_ptr, png_timep mod_time)
+{
+   png_debug1(1, "in %s storage function", "tIME");
+
+   if (png_ptr == NULL || info_ptr == NULL ||
+       (png_ptr->mode & PNG_WROTE_tIME))
+      return;
+
+   png_memcpy(&(info_ptr->mod_time), mod_time, png_sizeof(png_time));
+   info_ptr->valid |= PNG_INFO_tIME;
+}
+#endif
+
+#ifdef PNG_tRNS_SUPPORTED
+void PNGAPI
+png_set_tRNS(png_structp png_ptr, png_infop info_ptr,
+   png_bytep trans, int num_trans, png_color_16p trans_values)
+{
+   png_debug1(1, "in %s storage function", "tRNS");
+
+   if (png_ptr == NULL || info_ptr == NULL)
+      return;
+
+   if (trans != NULL)
+   {
+       /* It may not actually be necessary to set png_ptr->trans here;
+        * we do it for backward compatibility with the way the png_handle_tRNS
+        * function used to do the allocation.
+        */
+
+#ifdef PNG_FREE_ME_SUPPORTED
+       png_free_data(png_ptr, info_ptr, PNG_FREE_TRNS, 0);
+#endif
+
+       /* Changed from num_trans to PNG_MAX_PALETTE_LENGTH in version 1.2.1 */
+       png_ptr->trans = info_ptr->trans = (png_bytep)png_malloc(png_ptr,
+           (png_uint_32)PNG_MAX_PALETTE_LENGTH);
+       if (num_trans > 0 && num_trans <= PNG_MAX_PALETTE_LENGTH)
+          png_memcpy(info_ptr->trans, trans, (png_size_t)num_trans);
+   }
+
+   if (trans_values != NULL)
+   {
+      int sample_max = (1 << info_ptr->bit_depth);
+      if ((info_ptr->color_type == PNG_COLOR_TYPE_GRAY &&
+          (int)trans_values->gray > sample_max) ||
+          (info_ptr->color_type == PNG_COLOR_TYPE_RGB &&
+          ((int)trans_values->red > sample_max ||
+          (int)trans_values->green > sample_max ||
+          (int)trans_values->blue > sample_max)))
+         png_warning(png_ptr,
+            "tRNS chunk has out-of-range samples for bit_depth");
+      png_memcpy(&(info_ptr->trans_values), trans_values,
+         png_sizeof(png_color_16));
+      if (num_trans == 0)
+         num_trans = 1;
+   }
+
+   info_ptr->num_trans = (png_uint_16)num_trans;
+   if (num_trans != 0)
+   {
+      info_ptr->valid |= PNG_INFO_tRNS;
+#ifdef PNG_FREE_ME_SUPPORTED
+      info_ptr->free_me |= PNG_FREE_TRNS;
+#else
+      png_ptr->flags |= PNG_FLAG_FREE_TRNS;
+#endif
+   }
+}
+#endif
+
+#ifdef PNG_sPLT_SUPPORTED
+void PNGAPI
+png_set_sPLT(png_structp png_ptr,
+             png_infop info_ptr, png_sPLT_tp entries, int nentries)
+/*
+ *  entries        - array of png_sPLT_t structures
+ *                   to be added to the list of palettes
+ *                   in the info structure.
+ *  nentries       - number of palette structures to be
+ *                   added.
+ */
+{
+   png_sPLT_tp np;
+   int i;
+
+   if (png_ptr == NULL || info_ptr == NULL)
+      return;
+
+   np = (png_sPLT_tp)png_malloc_warn(png_ptr,
+       (info_ptr->splt_palettes_num + nentries) *
+        (png_uint_32)png_sizeof(png_sPLT_t));
+   if (np == NULL)
+   {
+      png_warning(png_ptr, "No memory for sPLT palettes.");
+      return;
+   }
+
+   png_memcpy(np, info_ptr->splt_palettes,
+       info_ptr->splt_palettes_num * png_sizeof(png_sPLT_t));
+   png_free(png_ptr, info_ptr->splt_palettes);
+   info_ptr->splt_palettes=NULL;
+
+   for (i = 0; i < nentries; i++)
+   {
+      png_sPLT_tp to = np + info_ptr->splt_palettes_num + i;
+      png_sPLT_tp from = entries + i;
+      png_uint_32 length;
+
+      length = png_strlen(from->name) + 1;
+      to->name = (png_charp)png_malloc_warn(png_ptr, length);
+      if (to->name == NULL)
+      {
+         png_warning(png_ptr,
+           "Out of memory while processing sPLT chunk");
+         continue;
+      }
+      png_memcpy(to->name, from->name, length);
+      to->entries = (png_sPLT_entryp)png_malloc_warn(png_ptr,
+          (png_uint_32)(from->nentries * png_sizeof(png_sPLT_entry)));
+      if (to->entries == NULL)
+      {
+         png_warning(png_ptr,
+           "Out of memory while processing sPLT chunk");
+         png_free(png_ptr, to->name);
+         to->name = NULL;
+         continue;
+      }
+      png_memcpy(to->entries, from->entries,
+          from->nentries * png_sizeof(png_sPLT_entry));
+      to->nentries = from->nentries;
+      to->depth = from->depth;
+   }
+
+   info_ptr->splt_palettes = np;
+   info_ptr->splt_palettes_num += nentries;
+   info_ptr->valid |= PNG_INFO_sPLT;
+#ifdef PNG_FREE_ME_SUPPORTED
+   info_ptr->free_me |= PNG_FREE_SPLT;
+#endif
+}
+#endif /* PNG_sPLT_SUPPORTED */
+
+#ifdef PNG_UNKNOWN_CHUNKS_SUPPORTED
+void PNGAPI
+png_set_unknown_chunks(png_structp png_ptr,
+   png_infop info_ptr, png_unknown_chunkp unknowns, int num_unknowns)
+{
+   png_unknown_chunkp np;
+   int i;
+
+   if (png_ptr == NULL || info_ptr == NULL || num_unknowns == 0)
+      return;
+
+   np = (png_unknown_chunkp)png_malloc_warn(png_ptr,
+       (png_uint_32)((info_ptr->unknown_chunks_num + num_unknowns) *
+       png_sizeof(png_unknown_chunk)));
+   if (np == NULL)
+   {
+      png_warning(png_ptr,
+          "Out of memory while processing unknown chunk.");
+      return;
+   }
+
+   png_memcpy(np, info_ptr->unknown_chunks,
+       info_ptr->unknown_chunks_num * png_sizeof(png_unknown_chunk));
+   png_free(png_ptr, info_ptr->unknown_chunks);
+   info_ptr->unknown_chunks = NULL;
+
+   for (i = 0; i < num_unknowns; i++)
+   {
+      png_unknown_chunkp to = np + info_ptr->unknown_chunks_num + i;
+      png_unknown_chunkp from = unknowns + i;
+
+      png_memcpy((png_charp)to->name, (png_charp)from->name,
+          png_sizeof(from->name));
+      to->name[png_sizeof(to->name)-1] = '\0';
+      to->size = from->size;
+      /* Note our location in the read or write sequence */
+      to->location = (png_byte)(png_ptr->mode & 0xff);
+
+      if (from->size == 0)
+         to->data=NULL;
+      else
+      {
+         to->data = (png_bytep)png_malloc_warn(png_ptr,
+           (png_uint_32)from->size);
+         if (to->data == NULL)
+         {
+            png_warning(png_ptr,
+             "Out of memory while processing unknown chunk.");
+            to->size = 0;
+         }
+         else
+            png_memcpy(to->data, from->data, from->size);
+      }
+   }
+
+   info_ptr->unknown_chunks = np;
+   info_ptr->unknown_chunks_num += num_unknowns;
+#ifdef PNG_FREE_ME_SUPPORTED
+   info_ptr->free_me |= PNG_FREE_UNKN;
+#endif
+}
+void PNGAPI
+png_set_unknown_chunk_location(png_structp png_ptr, png_infop info_ptr,
+   int chunk, int location)
+{
+   if (png_ptr != NULL && info_ptr != NULL && chunk >= 0 && chunk <
+       (int)info_ptr->unknown_chunks_num)
+      info_ptr->unknown_chunks[chunk].location = (png_byte)location;
+}
+#endif
+
+#if defined(PNG_1_0_X) || defined(PNG_1_2_X)
+#if defined(PNG_READ_EMPTY_PLTE_SUPPORTED) || \
+    defined(PNG_WRITE_EMPTY_PLTE_SUPPORTED)
+void PNGAPI
+png_permit_empty_plte (png_structp png_ptr, int empty_plte_permitted)
+{
+   /* This function is deprecated in favor of png_permit_mng_features()
+      and will be removed from libpng-1.3.0 */
+
+   png_debug(1, "in png_permit_empty_plte, DEPRECATED.");
+
+   if (png_ptr == NULL)
+      return;
+   png_ptr->mng_features_permitted = (png_byte)
+     ((png_ptr->mng_features_permitted & (~PNG_FLAG_MNG_EMPTY_PLTE)) |
+     ((empty_plte_permitted & PNG_FLAG_MNG_EMPTY_PLTE)));
+}
+#endif
+#endif
+
+#ifdef PNG_MNG_FEATURES_SUPPORTED
+png_uint_32 PNGAPI
+png_permit_mng_features (png_structp png_ptr, png_uint_32 mng_features)
+{
+   png_debug(1, "in png_permit_mng_features");
+
+   if (png_ptr == NULL)
+      return (png_uint_32)0;
+   png_ptr->mng_features_permitted =
+     (png_byte)(mng_features & PNG_ALL_MNG_FEATURES);
+   return (png_uint_32)png_ptr->mng_features_permitted;
+}
+#endif
+
+#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
+void PNGAPI
+png_set_keep_unknown_chunks(png_structp png_ptr, int keep, png_bytep
+   chunk_list, int num_chunks)
+{
+   png_bytep new_list, p;
+   int i, old_num_chunks;
+   if (png_ptr == NULL)
+      return;
+   if (num_chunks == 0)
+   {
+      if (keep == PNG_HANDLE_CHUNK_ALWAYS || keep == PNG_HANDLE_CHUNK_IF_SAFE)
+         png_ptr->flags |= PNG_FLAG_KEEP_UNKNOWN_CHUNKS;
+      else
+         png_ptr->flags &= ~PNG_FLAG_KEEP_UNKNOWN_CHUNKS;
+
+      if (keep == PNG_HANDLE_CHUNK_ALWAYS)
+         png_ptr->flags |= PNG_FLAG_KEEP_UNSAFE_CHUNKS;
+      else
+         png_ptr->flags &= ~PNG_FLAG_KEEP_UNSAFE_CHUNKS;
+      return;
+   }
+   if (chunk_list == NULL)
+      return;
+   old_num_chunks = png_ptr->num_chunk_list;
+   new_list=(png_bytep)png_malloc(png_ptr,
+      (png_uint_32)
+       (5*(num_chunks + old_num_chunks)));
+   if (png_ptr->chunk_list != NULL)
+   {
+      png_memcpy(new_list, png_ptr->chunk_list,
+          (png_size_t)(5*old_num_chunks));
+      png_free(png_ptr, png_ptr->chunk_list);
+      png_ptr->chunk_list=NULL;
+   }
+   png_memcpy(new_list + 5*old_num_chunks, chunk_list,
+       (png_size_t)(5*num_chunks));
+   for (p = new_list + 5*old_num_chunks + 4, i = 0; i<num_chunks; i++, p += 5)
+      *p=(png_byte)keep;
+   png_ptr->num_chunk_list = old_num_chunks + num_chunks;
+   png_ptr->chunk_list = new_list;
+#ifdef PNG_FREE_ME_SUPPORTED
+   png_ptr->free_me |= PNG_FREE_LIST;
+#endif
+}
+#endif
+
+#ifdef PNG_READ_USER_CHUNKS_SUPPORTED
+void PNGAPI
+png_set_read_user_chunk_fn(png_structp png_ptr, png_voidp user_chunk_ptr,
+   png_user_chunk_ptr read_user_chunk_fn)
+{
+   png_debug(1, "in png_set_read_user_chunk_fn");
+
+   if (png_ptr == NULL)
+      return;
+
+   png_ptr->read_user_chunk_fn = read_user_chunk_fn;
+   png_ptr->user_chunk_ptr = user_chunk_ptr;
+}
+#endif
+
+#ifdef PNG_INFO_IMAGE_SUPPORTED
+void PNGAPI
+png_set_rows(png_structp png_ptr, png_infop info_ptr, png_bytepp row_pointers)
+{
+   png_debug1(1, "in %s storage function", "rows");
+
+   if (png_ptr == NULL || info_ptr == NULL)
+      return;
+
+   if (info_ptr->row_pointers && (info_ptr->row_pointers != row_pointers))
+      png_free_data(png_ptr, info_ptr, PNG_FREE_ROWS, 0);
+   info_ptr->row_pointers = row_pointers;
+   if (row_pointers)
+      info_ptr->valid |= PNG_INFO_IDAT;
+}
+#endif
+
+void PNGAPI
+png_set_compression_buffer_size(png_structp png_ptr,
+    png_uint_32 size)
+{
+    if (png_ptr == NULL)
+       return;
+    png_free(png_ptr, png_ptr->zbuf);
+    png_ptr->zbuf_size = (png_size_t)size;
+    png_ptr->zbuf = (png_bytep)png_malloc(png_ptr, size);
+    png_ptr->zstream.next_out = png_ptr->zbuf;
+    png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;
+}
+
+void PNGAPI
+png_set_invalid(png_structp png_ptr, png_infop info_ptr, int mask)
+{
+   if (png_ptr && info_ptr)
+      info_ptr->valid &= ~mask;
+}
+
+
+#ifndef PNG_1_0_X
+#ifdef PNG_ASSEMBLER_CODE_SUPPORTED
+/* Function was added to libpng 1.2.0 and should always exist by default */
+void PNGAPI
+png_set_asm_flags (png_structp png_ptr, png_uint_32 asm_flags)
+{
+/* Obsolete as of libpng-1.2.20 and will be removed from libpng-1.4.0 */
+    if (png_ptr != NULL)
+    png_ptr->asm_flags = 0;
+    asm_flags = asm_flags; /* Quiet the compiler */
+}
+
+/* This function was added to libpng 1.2.0 */
+void PNGAPI
+png_set_mmx_thresholds (png_structp png_ptr,
+                        png_byte mmx_bitdepth_threshold,
+                        png_uint_32 mmx_rowbytes_threshold)
+{
+/* Obsolete as of libpng-1.2.20 and will be removed from libpng-1.4.0 */
+    if (png_ptr == NULL)
+       return;
+    /* Quiet the compiler */
+    mmx_bitdepth_threshold = mmx_bitdepth_threshold;
+    mmx_rowbytes_threshold = mmx_rowbytes_threshold;
+}
+#endif /* ?PNG_ASSEMBLER_CODE_SUPPORTED */
+
+#ifdef PNG_SET_USER_LIMITS_SUPPORTED
+/* This function was added to libpng 1.2.6 */
+void PNGAPI
+png_set_user_limits (png_structp png_ptr, png_uint_32 user_width_max,
+    png_uint_32 user_height_max)
+{
+   /* Images with dimensions larger than these limits will be
+    * rejected by png_set_IHDR().  To accept any PNG datastream
+    * regardless of dimensions, set both limits to 0x7ffffffL.
+    */
+   if (png_ptr == NULL)
+      return;
+   png_ptr->user_width_max = user_width_max;
+   png_ptr->user_height_max = user_height_max;
+}
+#endif /* ?PNG_SET_USER_LIMITS_SUPPORTED */
+
+
+#ifdef PNG_BENIGN_ERRORS_SUPPORTED
+void PNGAPI
+png_set_benign_errors(png_structp png_ptr, int allowed)
+{
+   png_debug(1, "in png_set_benign_errors");
+
+   if (allowed)
+      png_ptr->flags |= PNG_FLAG_BENIGN_ERRORS_WARN;
+   else
+      png_ptr->flags &= ~PNG_FLAG_BENIGN_ERRORS_WARN;
+}
+#endif /* PNG_BENIGN_ERRORS_SUPPORTED */
+#endif /* ?PNG_1_0_X */
+#endif /* PNG_READ_SUPPORTED || PNG_WRITE_SUPPORTED */
diff --git a/Externals/libpng/pngtest.c b/Externals/libpng/pngtest.c
new file mode 100644
index 0000000000..23e1adea2c
--- /dev/null
+++ b/Externals/libpng/pngtest.c
@@ -0,0 +1,1705 @@
+
+/* pngtest.c - a simple test program to test libpng
+ *
+ * Last changed in libpng 1.2.43 [February 25, 2010]
+ * Copyright (c) 1998-2010 Glenn Randers-Pehrson
+ * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
+ * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
+ *
+ * This code is released under the libpng license.
+ * For conditions of distribution and use, see the disclaimer
+ * and license in png.h
+ *
+ * This program reads in a PNG image, writes it out again, and then
+ * compares the two files.  If the files are identical, this shows that
+ * the basic chunk handling, filtering, and (de)compression code is working
+ * properly.  It does not currently test all of the transforms, although
+ * it probably should.
+ *
+ * The program will report "FAIL" in certain legitimate cases:
+ * 1) when the compression level or filter selection method is changed.
+ * 2) when the maximum IDAT size (PNG_ZBUF_SIZE in pngconf.h) is not 8192.
+ * 3) unknown unsafe-to-copy ancillary chunks or unknown critical chunks
+ *    exist in the input file.
+ * 4) others not listed here...
+ * In these cases, it is best to check with another tool such as "pngcheck"
+ * to see what the differences between the two files are.
+ *
+ * If a filename is given on the command-line, then this file is used
+ * for the input, rather than the default "pngtest.png".  This allows
+ * testing a wide variety of files easily.  You can also test a number
+ * of files at once by typing "pngtest -m file1.png file2.png ..."
+ */
+
+#define PNG_PEDANTIC_WARNINGS
+#include "png.h"
+
+#ifdef _WIN32_WCE
+#  if _WIN32_WCE < 211
+     __error__ (f|w)printf functions are not supported on old WindowsCE.;
+#  endif
+#  include <windows.h>
+#  include <stdlib.h>
+#  define READFILE(file, data, length, check) \
+     if (ReadFile(file, data, length, &check, NULL)) check = 0
+#  define WRITEFILE(file, data, length, check)) \
+     if (WriteFile(file, data, length, &check, NULL)) check = 0
+#  define FCLOSE(file) CloseHandle(file)
+#else
+#  include <stdio.h>
+#  include <stdlib.h>
+#  define READFILE(file, data, length, check) \
+     check=(png_size_t)fread(data, (png_size_t)1, length, file)
+#  define WRITEFILE(file, data, length, check) \
+     check=(png_size_t)fwrite(data, (png_size_t)1, length, file)
+#  define FCLOSE(file) fclose(file)
+#endif
+
+#ifndef PNG_STDIO_SUPPORTED
+#  ifdef _WIN32_WCE
+     typedef HANDLE                png_FILE_p;
+#  else
+     typedef FILE                * png_FILE_p;
+#  endif
+#endif
+
+/* Makes pngtest verbose so we can find problems (needs to be before png.h) */
+#ifndef PNG_DEBUG
+#  define PNG_DEBUG 0
+#endif
+
+#if !PNG_DEBUG
+#  define SINGLE_ROWBUF_ALLOC  /* Makes buffer overruns easier to nail */
+#endif
+
+/* Turn on CPU timing
+#define PNGTEST_TIMING
+*/
+
+#ifndef PNG_FLOATING_POINT_SUPPORTED
+#undef PNGTEST_TIMING
+#endif
+
+#ifdef PNGTEST_TIMING
+static float t_start, t_stop, t_decode, t_encode, t_misc;
+#include <time.h>
+#endif
+
+#ifdef PNG_TIME_RFC1123_SUPPORTED
+#define PNG_tIME_STRING_LENGTH 29
+static int tIME_chunk_present = 0;
+static char tIME_string[PNG_tIME_STRING_LENGTH] = "tIME chunk is not present";
+#endif
+
+static int verbose = 0;
+
+int test_one_file PNGARG((PNG_CONST char *inname, PNG_CONST char *outname));
+
+#ifdef __TURBOC__
+#include <mem.h>
+#endif
+
+/* Defined so I can write to a file on gui/windowing platforms */
+/*  #define STDERR stderr  */
+#define STDERR stdout   /* For DOS */
+
+/* In case a system header (e.g., on AIX) defined jmpbuf */
+#ifdef jmpbuf
+#  undef jmpbuf
+#endif
+
+/* Define png_jmpbuf() in case we are using a pre-1.0.6 version of libpng */
+#ifndef png_jmpbuf
+#  define png_jmpbuf(png_ptr) png_ptr->jmpbuf
+#endif
+
+/* Example of using row callbacks to make a simple progress meter */
+static int status_pass = 1;
+static int status_dots_requested = 0;
+static int status_dots = 1;
+
+void
+#ifdef PNG_1_0_X
+PNGAPI
+#endif
+read_row_callback(png_structp png_ptr, png_uint_32 row_number, int pass);
+void
+#ifdef PNG_1_0_X
+PNGAPI
+#endif
+read_row_callback(png_structp png_ptr, png_uint_32 row_number, int pass)
+{
+   if (png_ptr == NULL || row_number > PNG_UINT_31_MAX)
+      return;
+   if (status_pass != pass)
+   {
+      fprintf(stdout, "\n Pass %d: ", pass);
+      status_pass = pass;
+      status_dots = 31;
+   }
+   status_dots--;
+   if (status_dots == 0)
+   {
+      fprintf(stdout, "\n         ");
+      status_dots=30;
+   }
+   fprintf(stdout, "r");
+}
+
+void
+#ifdef PNG_1_0_X
+PNGAPI
+#endif
+write_row_callback(png_structp png_ptr, png_uint_32 row_number, int pass);
+void
+#ifdef PNG_1_0_X
+PNGAPI
+#endif
+write_row_callback(png_structp png_ptr, png_uint_32 row_number, int pass)
+{
+   if (png_ptr == NULL || row_number > PNG_UINT_31_MAX || pass > 7)
+      return;
+   fprintf(stdout, "w");
+}
+
+
+#ifdef PNG_READ_USER_TRANSFORM_SUPPORTED
+/* Example of using user transform callback (we don't transform anything,
+ * but merely examine the row filters.  We set this to 256 rather than
+ * 5 in case illegal filter values are present.)
+ */
+static png_uint_32 filters_used[256];
+void
+#ifdef PNG_1_0_X
+PNGAPI
+#endif
+count_filters(png_structp png_ptr, png_row_infop row_info, png_bytep data);
+void
+#ifdef PNG_1_0_X
+PNGAPI
+#endif
+count_filters(png_structp png_ptr, png_row_infop row_info, png_bytep data)
+{
+   if (png_ptr != NULL && row_info != NULL)
+      ++filters_used[*(data - 1)];
+}
+#endif
+
+#ifdef PNG_WRITE_USER_TRANSFORM_SUPPORTED
+/* Example of using user transform callback (we don't transform anything,
+ * but merely count the zero samples)
+ */
+
+static png_uint_32 zero_samples;
+
+void
+#ifdef PNG_1_0_X
+PNGAPI
+#endif
+count_zero_samples(png_structp png_ptr, png_row_infop row_info, png_bytep data);
+void
+#ifdef PNG_1_0_X
+PNGAPI
+#endif
+count_zero_samples(png_structp png_ptr, png_row_infop row_info, png_bytep data)
+{
+   png_bytep dp = data;
+   if (png_ptr == NULL)return;
+
+   /* Contents of row_info:
+    *  png_uint_32 width      width of row
+    *  png_uint_32 rowbytes   number of bytes in row
+    *  png_byte color_type    color type of pixels
+    *  png_byte bit_depth     bit depth of samples
+    *  png_byte channels      number of channels (1-4)
+    *  png_byte pixel_depth   bits per pixel (depth*channels)
+    */
+
+    /* Counts the number of zero samples (or zero pixels if color_type is 3 */
+
+    if (row_info->color_type == 0 || row_info->color_type == 3)
+    {
+       int pos = 0;
+       png_uint_32 n, nstop;
+       for (n = 0, nstop=row_info->width; n<nstop; n++)
+       {
+          if (row_info->bit_depth == 1)
+          {
+             if (((*dp << pos++ ) & 0x80) == 0)
+                zero_samples++;
+             if (pos == 8)
+             {
+                pos = 0;
+                dp++;
+             }
+          }
+          if (row_info->bit_depth == 2)
+          {
+             if (((*dp << (pos+=2)) & 0xc0) == 0)
+                zero_samples++;
+             if (pos == 8)
+             {
+                pos = 0;
+                dp++;
+             }
+          }
+          if (row_info->bit_depth == 4)
+          {
+             if (((*dp << (pos+=4)) & 0xf0) == 0)
+                zero_samples++;
+             if (pos == 8)
+             {
+                pos = 0;
+                dp++;
+             }
+          }
+          if (row_info->bit_depth == 8)
+             if (*dp++ == 0)
+                zero_samples++;
+          if (row_info->bit_depth == 16)
+          {
+             if ((*dp | *(dp+1)) == 0)
+                zero_samples++;
+             dp+=2;
+          }
+       }
+    }
+    else /* Other color types */
+    {
+       png_uint_32 n, nstop;
+       int channel;
+       int color_channels = row_info->channels;
+       if (row_info->color_type > 3)color_channels--;
+
+       for (n = 0, nstop=row_info->width; n<nstop; n++)
+       {
+          for (channel = 0; channel < color_channels; channel++)
+          {
+             if (row_info->bit_depth == 8)
+                if (*dp++ == 0)
+                   zero_samples++;
+             if (row_info->bit_depth == 16)
+             {
+                if ((*dp | *(dp+1)) == 0)
+                   zero_samples++;
+                dp+=2;
+             }
+          }
+          if (row_info->color_type > 3)
+          {
+             dp++;
+             if (row_info->bit_depth == 16)
+                dp++;
+          }
+       }
+    }
+}
+#endif /* PNG_WRITE_USER_TRANSFORM_SUPPORTED */
+
+static int wrote_question = 0;
+
+#ifndef PNG_STDIO_SUPPORTED
+/* START of code to validate stdio-free compilation */
+/* These copies of the default read/write functions come from pngrio.c and
+ * pngwio.c.  They allow "don't include stdio" testing of the library.
+ * This is the function that does the actual reading of data.  If you are
+ * not reading from a standard C stream, you should create a replacement
+ * read_data function and use it at run time with png_set_read_fn(), rather
+ * than changing the library.
+ */
+
+#ifndef USE_FAR_KEYWORD
+static void
+pngtest_read_data(png_structp png_ptr, png_bytep data, png_size_t length)
+{
+   png_size_t check = 0;
+   png_voidp io_ptr;
+
+   /* fread() returns 0 on error, so it is OK to store this in a png_size_t
+    * instead of an int, which is what fread() actually returns.
+    */
+   io_ptr = png_get_io_ptr(png_ptr);
+   if (io_ptr != NULL)
+   {
+      READFILE((png_FILE_p)io_ptr, data, length, check);
+   }
+
+   if (check != length)
+   {
+      png_error(png_ptr, "Read Error!");
+   }
+}
+#else
+/* This is the model-independent version. Since the standard I/O library
+   can't handle far buffers in the medium and small models, we have to copy
+   the data.
+*/
+
+#define NEAR_BUF_SIZE 1024
+#define MIN(a,b) (a <= b ? a : b)
+
+static void
+pngtest_read_data(png_structp png_ptr, png_bytep data, png_size_t length)
+{
+   int check;
+   png_byte *n_data;
+   png_FILE_p io_ptr;
+
+   /* Check if data really is near. If so, use usual code. */
+   n_data = (png_byte *)CVT_PTR_NOCHECK(data);
+   io_ptr = (png_FILE_p)CVT_PTR(png_ptr->io_ptr);
+   if ((png_bytep)n_data == data)
+   {
+      READFILE(io_ptr, n_data, length, check);
+   }
+   else
+   {
+      png_byte buf[NEAR_BUF_SIZE];
+      png_size_t read, remaining, err;
+      check = 0;
+      remaining = length;
+      do
+      {
+         read = MIN(NEAR_BUF_SIZE, remaining);
+         READFILE(io_ptr, buf, 1, err);
+         png_memcpy(data, buf, read); /* Copy far buffer to near buffer */
+         if (err != read)
+            break;
+         else
+            check += err;
+         data += read;
+         remaining -= read;
+      }
+      while (remaining != 0);
+   }
+   if (check != length)
+      png_error(png_ptr, "read Error");
+}
+#endif /* USE_FAR_KEYWORD */
+
+#ifdef PNG_WRITE_FLUSH_SUPPORTED
+static void
+pngtest_flush(png_structp png_ptr)
+{
+   /* Do nothing; fflush() is said to be just a waste of energy. */
+   png_ptr = png_ptr;  /* Stifle compiler warning */
+}
+#endif
+
+/* This is the function that does the actual writing of data.  If you are
+ * not writing to a standard C stream, you should create a replacement
+ * write_data function and use it at run time with png_set_write_fn(), rather
+ * than changing the library.
+ */
+#ifndef USE_FAR_KEYWORD
+static void
+pngtest_write_data(png_structp png_ptr, png_bytep data, png_size_t length)
+{
+   png_uint_32 check;
+
+   WRITEFILE((png_FILE_p)png_ptr->io_ptr,  data, length, check);
+   if (check != length)
+   {
+      png_error(png_ptr, "Write Error");
+   }
+}
+#else
+/* This is the model-independent version. Since the standard I/O library
+   can't handle far buffers in the medium and small models, we have to copy
+   the data.
+*/
+
+#define NEAR_BUF_SIZE 1024
+#define MIN(a,b) (a <= b ? a : b)
+
+static void
+pngtest_write_data(png_structp png_ptr, png_bytep data, png_size_t length)
+{
+   png_uint_32 check;
+   png_byte *near_data;  /* Needs to be "png_byte *" instead of "png_bytep" */
+   png_FILE_p io_ptr;
+
+   /* Check if data really is near. If so, use usual code. */
+   near_data = (png_byte *)CVT_PTR_NOCHECK(data);
+   io_ptr = (png_FILE_p)CVT_PTR(png_ptr->io_ptr);
+   if ((png_bytep)near_data == data)
+   {
+      WRITEFILE(io_ptr, near_data, length, check);
+   }
+   else
+   {
+      png_byte buf[NEAR_BUF_SIZE];
+      png_size_t written, remaining, err;
+      check = 0;
+      remaining = length;
+      do
+      {
+         written = MIN(NEAR_BUF_SIZE, remaining);
+         png_memcpy(buf, data, written); /* Copy far buffer to near buffer */
+         WRITEFILE(io_ptr, buf, written, err);
+         if (err != written)
+            break;
+         else
+            check += err;
+         data += written;
+         remaining -= written;
+      }
+      while (remaining != 0);
+   }
+   if (check != length)
+   {
+      png_error(png_ptr, "Write Error");
+   }
+}
+#endif /* USE_FAR_KEYWORD */
+
+/* This function is called when there is a warning, but the library thinks
+ * it can continue anyway.  Replacement functions don't have to do anything
+ * here if you don't want to.  In the default configuration, png_ptr is
+ * not used, but it is passed in case it may be useful.
+ */
+static void
+pngtest_warning(png_structp png_ptr, png_const_charp message)
+{
+   PNG_CONST char *name = "UNKNOWN (ERROR!)";
+   char *test;
+   test = png_get_error_ptr(png_ptr);
+   if (test == NULL)
+     fprintf(STDERR, "%s: libpng warning: %s\n", name, message);
+   else
+     fprintf(STDERR, "%s: libpng warning: %s\n", test, message);
+}
+
+/* This is the default error handling function.  Note that replacements for
+ * this function MUST NOT RETURN, or the program will likely crash.  This
+ * function is used by default, or if the program supplies NULL for the
+ * error function pointer in png_set_error_fn().
+ */
+static void
+pngtest_error(png_structp png_ptr, png_const_charp message)
+{
+   pngtest_warning(png_ptr, message);
+   /* We can return because png_error calls the default handler, which is
+    * actually OK in this case.
+    */
+}
+#endif /* !PNG_STDIO_SUPPORTED */
+/* END of code to validate stdio-free compilation */
+
+/* START of code to validate memory allocation and deallocation */
+#if defined(PNG_USER_MEM_SUPPORTED) && PNG_DEBUG
+
+/* Allocate memory.  For reasonable files, size should never exceed
+ * 64K.  However, zlib may allocate more then 64K if you don't tell
+ * it not to.  See zconf.h and png.h for more information.  zlib does
+ * need to allocate exactly 64K, so whatever you call here must
+ * have the ability to do that.
+ *
+ * This piece of code can be compiled to validate max 64K allocations
+ * by setting MAXSEG_64K in zlib zconf.h *or* PNG_MAX_MALLOC_64K.
+ */
+typedef struct memory_information
+{
+   png_uint_32               size;
+   png_voidp                 pointer;
+   struct memory_information FAR *next;
+} memory_information;
+typedef memory_information FAR *memory_infop;
+
+static memory_infop pinformation = NULL;
+static int current_allocation = 0;
+static int maximum_allocation = 0;
+static int total_allocation = 0;
+static int num_allocations = 0;
+
+png_voidp png_debug_malloc PNGARG((png_structp png_ptr, png_uint_32 size));
+void png_debug_free PNGARG((png_structp png_ptr, png_voidp ptr));
+
+png_voidp
+png_debug_malloc(png_structp png_ptr, png_uint_32 size)
+{
+
+   /* png_malloc has already tested for NULL; png_create_struct calls
+    * png_debug_malloc directly, with png_ptr == NULL which is OK
+    */
+
+   if (size == 0)
+      return (NULL);
+
+   /* This calls the library allocator twice, once to get the requested
+      buffer and once to get a new free list entry. */
+   {
+      /* Disable malloc_fn and free_fn */
+      memory_infop pinfo;
+      png_set_mem_fn(png_ptr, NULL, NULL, NULL);
+      pinfo = (memory_infop)png_malloc(png_ptr,
+         (png_uint_32)png_sizeof(*pinfo));
+      pinfo->size = size;
+      current_allocation += size;
+      total_allocation += size;
+      num_allocations ++;
+      if (current_allocation > maximum_allocation)
+         maximum_allocation = current_allocation;
+      pinfo->pointer = (png_voidp)png_malloc(png_ptr, size);
+      /* Restore malloc_fn and free_fn */
+      png_set_mem_fn(png_ptr,
+          png_voidp_NULL, (png_malloc_ptr)png_debug_malloc,
+          (png_free_ptr)png_debug_free);
+      if (size != 0 && pinfo->pointer == NULL)
+      {
+         current_allocation -= size;
+         total_allocation -= size;
+         png_error(png_ptr,
+           "out of memory in pngtest->png_debug_malloc.");
+      }
+      pinfo->next = pinformation;
+      pinformation = pinfo;
+      /* Make sure the caller isn't assuming zeroed memory. */
+      png_memset(pinfo->pointer, 0xdd, pinfo->size);
+      if (verbose)
+         printf("png_malloc %lu bytes at %x\n", (unsigned long)size,
+            pinfo->pointer);
+      return (png_voidp)(pinfo->pointer);
+   }
+}
+
+/* Free a pointer.  It is removed from the list at the same time. */
+void
+png_debug_free(png_structp png_ptr, png_voidp ptr)
+{
+   if (png_ptr == NULL)
+      fprintf(STDERR, "NULL pointer to png_debug_free.\n");
+   if (ptr == 0)
+   {
+#if 0 /* This happens all the time. */
+      fprintf(STDERR, "WARNING: freeing NULL pointer\n");
+#endif
+      return;
+   }
+
+   /* Unlink the element from the list. */
+   {
+      memory_infop FAR *ppinfo = &pinformation;
+      for (;;)
+      {
+         memory_infop pinfo = *ppinfo;
+         if (pinfo->pointer == ptr)
+         {
+            *ppinfo = pinfo->next;
+            current_allocation -= pinfo->size;
+            if (current_allocation < 0)
+               fprintf(STDERR, "Duplicate free of memory\n");
+            /* We must free the list element too, but first kill
+               the memory that is to be freed. */
+            png_memset(ptr, 0x55, pinfo->size);
+            png_free_default(png_ptr, pinfo);
+            pinfo = NULL;
+            break;
+         }
+         if (pinfo->next == NULL)
+         {
+            fprintf(STDERR, "Pointer %x not found\n", (unsigned int)ptr);
+            break;
+         }
+         ppinfo = &pinfo->next;
+      }
+   }
+
+   /* Finally free the data. */
+   if (verbose)
+      printf("Freeing %x\n", ptr);
+   png_free_default(png_ptr, ptr);
+   ptr = NULL;
+}
+#endif /* PNG_USER_MEM_SUPPORTED && PNG_DEBUG */
+/* END of code to test memory allocation/deallocation */
+
+
+/* Demonstration of user chunk support of the sTER and vpAg chunks */
+#ifdef PNG_UNKNOWN_CHUNKS_SUPPORTED
+
+/* (sTER is a public chunk not yet known by libpng.  vpAg is a private
+chunk used in ImageMagick to store "virtual page" size).  */
+
+static png_uint_32 user_chunk_data[4];
+
+    /* 0: sTER mode + 1
+     * 1: vpAg width
+     * 2: vpAg height
+     * 3: vpAg units
+     */
+
+static int read_user_chunk_callback(png_struct *png_ptr,
+   png_unknown_chunkp chunk)
+{
+   png_uint_32
+     *my_user_chunk_data;
+
+   /* Return one of the following:
+    *    return (-n);  chunk had an error
+    *    return (0);  did not recognize
+    *    return (n);  success
+    *
+    * The unknown chunk structure contains the chunk data:
+    * png_byte name[5];
+    * png_byte *data;
+    * png_size_t size;
+    *
+    * Note that libpng has already taken care of the CRC handling.
+    */
+
+   if (chunk->name[0] == 115 && chunk->name[1] ==  84 &&     /* s  T */
+       chunk->name[2] ==  69 && chunk->name[3] ==  82)       /* E  R */
+      {
+         /* Found sTER chunk */
+         if (chunk->size != 1)
+            return (-1); /* Error return */
+         if (chunk->data[0] != 0 && chunk->data[0] != 1)
+            return (-1);  /* Invalid mode */
+         my_user_chunk_data=(png_uint_32 *) png_get_user_chunk_ptr(png_ptr);
+         my_user_chunk_data[0]=chunk->data[0]+1;
+         return (1);
+      }
+
+   if (chunk->name[0] != 118 || chunk->name[1] != 112 ||    /* v  p */
+       chunk->name[2] !=  65 || chunk->name[3] != 103)      /* A  g */
+      return (0); /* Did not recognize */
+
+   /* Found ImageMagick vpAg chunk */
+
+   if (chunk->size != 9)
+      return (-1); /* Error return */
+
+   my_user_chunk_data=(png_uint_32 *) png_get_user_chunk_ptr(png_ptr);
+
+   my_user_chunk_data[1]=png_get_uint_31(png_ptr, chunk->data);
+   my_user_chunk_data[2]=png_get_uint_31(png_ptr, chunk->data + 4);
+   my_user_chunk_data[3]=(png_uint_32)chunk->data[8];
+
+   return (1);
+
+}
+#endif
+/* END of code to demonstrate user chunk support */
+
+/* Test one file */
+int
+test_one_file(PNG_CONST char *inname, PNG_CONST char *outname)
+{
+   static png_FILE_p fpin;
+   static png_FILE_p fpout;  /* "static" prevents setjmp corruption */
+   png_structp read_ptr;
+   png_infop read_info_ptr, end_info_ptr;
+#ifdef PNG_WRITE_SUPPORTED
+   png_structp write_ptr;
+   png_infop write_info_ptr;
+   png_infop write_end_info_ptr;
+#else
+   png_structp write_ptr = NULL;
+   png_infop write_info_ptr = NULL;
+   png_infop write_end_info_ptr = NULL;
+#endif
+   png_bytep row_buf;
+   png_uint_32 y;
+   png_uint_32 width, height;
+   int num_pass, pass;
+   int bit_depth, color_type;
+#ifdef PNG_SETJMP_SUPPORTED
+#ifdef USE_FAR_KEYWORD
+   jmp_buf jmpbuf;
+#endif
+#endif
+
+#ifdef _WIN32_WCE
+   TCHAR path[MAX_PATH];
+#endif
+   char inbuf[256], outbuf[256];
+
+   row_buf = NULL;
+
+#ifdef _WIN32_WCE
+   MultiByteToWideChar(CP_ACP, 0, inname, -1, path, MAX_PATH);
+   if ((fpin = CreateFile(path, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0,
+       NULL)) == INVALID_HANDLE_VALUE)
+#else
+   if ((fpin = fopen(inname, "rb")) == NULL)
+#endif
+   {
+      fprintf(STDERR, "Could not find input file %s\n", inname);
+      return (1);
+   }
+
+#ifdef _WIN32_WCE
+   MultiByteToWideChar(CP_ACP, 0, outname, -1, path, MAX_PATH);
+   if ((fpout = CreateFile(path, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS,
+       0, NULL)) == INVALID_HANDLE_VALUE)
+#else
+   if ((fpout = fopen(outname, "wb")) == NULL)
+#endif
+   {
+      fprintf(STDERR, "Could not open output file %s\n", outname);
+      FCLOSE(fpin);
+      return (1);
+   }
+
+   png_debug(0, "Allocating read and write structures");
+#if defined(PNG_USER_MEM_SUPPORTED) && PNG_DEBUG
+   read_ptr =
+      png_create_read_struct_2(PNG_LIBPNG_VER_STRING, png_voidp_NULL,
+      png_error_ptr_NULL, png_error_ptr_NULL, png_voidp_NULL,
+      (png_malloc_ptr)png_debug_malloc, (png_free_ptr)png_debug_free);
+#else
+   read_ptr =
+      png_create_read_struct(PNG_LIBPNG_VER_STRING, png_voidp_NULL,
+      png_error_ptr_NULL, png_error_ptr_NULL);
+#endif
+#ifndef PNG_STDIO_SUPPORTED
+   png_set_error_fn(read_ptr, (png_voidp)inname, pngtest_error,
+       pngtest_warning);
+#endif
+
+#ifdef PNG_UNKNOWN_CHUNKS_SUPPORTED
+   user_chunk_data[0] = 0;
+   user_chunk_data[1] = 0;
+   user_chunk_data[2] = 0;
+   user_chunk_data[3] = 0;
+   png_set_read_user_chunk_fn(read_ptr, user_chunk_data,
+     read_user_chunk_callback);
+
+#endif
+#ifdef PNG_WRITE_SUPPORTED
+#if defined(PNG_USER_MEM_SUPPORTED) && PNG_DEBUG
+   write_ptr =
+      png_create_write_struct_2(PNG_LIBPNG_VER_STRING, png_voidp_NULL,
+      png_error_ptr_NULL, png_error_ptr_NULL, png_voidp_NULL,
+      (png_malloc_ptr)png_debug_malloc, (png_free_ptr)png_debug_free);
+#else
+   write_ptr =
+      png_create_write_struct(PNG_LIBPNG_VER_STRING, png_voidp_NULL,
+      png_error_ptr_NULL, png_error_ptr_NULL);
+#endif
+#ifndef PNG_STDIO_SUPPORTED
+   png_set_error_fn(write_ptr, (png_voidp)inname, pngtest_error,
+       pngtest_warning);
+#endif
+#endif
+   png_debug(0, "Allocating read_info, write_info and end_info structures");
+   read_info_ptr = png_create_info_struct(read_ptr);
+   end_info_ptr = png_create_info_struct(read_ptr);
+#ifdef PNG_WRITE_SUPPORTED
+   write_info_ptr = png_create_info_struct(write_ptr);
+   write_end_info_ptr = png_create_info_struct(write_ptr);
+#endif
+
+#ifdef PNG_SETJMP_SUPPORTED
+   png_debug(0, "Setting jmpbuf for read struct");
+#ifdef USE_FAR_KEYWORD
+   if (setjmp(jmpbuf))
+#else
+   if (setjmp(png_jmpbuf(read_ptr)))
+#endif
+   {
+      fprintf(STDERR, "%s -> %s: libpng read error\n", inname, outname);
+      png_free(read_ptr, row_buf);
+      row_buf = NULL;
+      png_destroy_read_struct(&read_ptr, &read_info_ptr, &end_info_ptr);
+#ifdef PNG_WRITE_SUPPORTED
+      png_destroy_info_struct(write_ptr, &write_end_info_ptr);
+      png_destroy_write_struct(&write_ptr, &write_info_ptr);
+#endif
+      FCLOSE(fpin);
+      FCLOSE(fpout);
+      return (1);
+   }
+#ifdef USE_FAR_KEYWORD
+   png_memcpy(png_jmpbuf(read_ptr), jmpbuf, png_sizeof(jmp_buf));
+#endif
+
+#ifdef PNG_WRITE_SUPPORTED
+   png_debug(0, "Setting jmpbuf for write struct");
+#ifdef USE_FAR_KEYWORD
+   if (setjmp(jmpbuf))
+#else
+   if (setjmp(png_jmpbuf(write_ptr)))
+#endif
+   {
+      fprintf(STDERR, "%s -> %s: libpng write error\n", inname, outname);
+      png_destroy_read_struct(&read_ptr, &read_info_ptr, &end_info_ptr);
+      png_destroy_info_struct(write_ptr, &write_end_info_ptr);
+#ifdef PNG_WRITE_SUPPORTED
+      png_destroy_write_struct(&write_ptr, &write_info_ptr);
+#endif
+      FCLOSE(fpin);
+      FCLOSE(fpout);
+      return (1);
+   }
+#ifdef USE_FAR_KEYWORD
+   png_memcpy(png_jmpbuf(write_ptr), jmpbuf, png_sizeof(jmp_buf));
+#endif
+#endif
+#endif
+
+   png_debug(0, "Initializing input and output streams");
+#ifdef PNG_STDIO_SUPPORTED
+   png_init_io(read_ptr, fpin);
+#  ifdef PNG_WRITE_SUPPORTED
+   png_init_io(write_ptr, fpout);
+#  endif
+#else
+   png_set_read_fn(read_ptr, (png_voidp)fpin, pngtest_read_data);
+#  ifdef PNG_WRITE_SUPPORTED
+   png_set_write_fn(write_ptr, (png_voidp)fpout,  pngtest_write_data,
+#    ifdef PNG_WRITE_FLUSH_SUPPORTED
+      pngtest_flush);
+#    else
+      NULL);
+#    endif
+#  endif
+#endif
+   if (status_dots_requested == 1)
+   {
+#ifdef PNG_WRITE_SUPPORTED
+      png_set_write_status_fn(write_ptr, write_row_callback);
+#endif
+      png_set_read_status_fn(read_ptr, read_row_callback);
+   }
+   else
+   {
+#ifdef PNG_WRITE_SUPPORTED
+      png_set_write_status_fn(write_ptr, png_write_status_ptr_NULL);
+#endif
+      png_set_read_status_fn(read_ptr, png_read_status_ptr_NULL);
+   }
+
+#ifdef PNG_READ_USER_TRANSFORM_SUPPORTED
+   {
+      int i;
+      for (i = 0; i<256; i++)
+         filters_used[i] = 0;
+      png_set_read_user_transform_fn(read_ptr, count_filters);
+   }
+#endif
+#ifdef PNG_WRITE_USER_TRANSFORM_SUPPORTED
+   zero_samples = 0;
+   png_set_write_user_transform_fn(write_ptr, count_zero_samples);
+#endif
+
+#ifdef PNG_READ_UNKNOWN_CHUNKS_SUPPORTED
+#  ifndef PNG_HANDLE_CHUNK_ALWAYS
+#    define PNG_HANDLE_CHUNK_ALWAYS       3
+#  endif
+   png_set_keep_unknown_chunks(read_ptr, PNG_HANDLE_CHUNK_ALWAYS,
+      png_bytep_NULL, 0);
+#endif
+#ifdef PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED
+#  ifndef PNG_HANDLE_CHUNK_IF_SAFE
+#    define PNG_HANDLE_CHUNK_IF_SAFE      2
+#  endif
+   png_set_keep_unknown_chunks(write_ptr, PNG_HANDLE_CHUNK_IF_SAFE,
+      png_bytep_NULL, 0);
+#endif
+
+   png_debug(0, "Reading info struct");
+   png_read_info(read_ptr, read_info_ptr);
+
+   png_debug(0, "Transferring info struct");
+   {
+      int interlace_type, compression_type, filter_type;
+
+      if (png_get_IHDR(read_ptr, read_info_ptr, &width, &height, &bit_depth,
+          &color_type, &interlace_type, &compression_type, &filter_type))
+      {
+         png_set_IHDR(write_ptr, write_info_ptr, width, height, bit_depth,
+#ifdef PNG_WRITE_INTERLACING_SUPPORTED
+            color_type, interlace_type, compression_type, filter_type);
+#else
+            color_type, PNG_INTERLACE_NONE, compression_type, filter_type);
+#endif
+      }
+   }
+#ifdef PNG_FIXED_POINT_SUPPORTED
+#ifdef PNG_cHRM_SUPPORTED
+   {
+      png_fixed_point white_x, white_y, red_x, red_y, green_x, green_y, blue_x,
+         blue_y;
+      if (png_get_cHRM_fixed(read_ptr, read_info_ptr, &white_x, &white_y,
+         &red_x, &red_y, &green_x, &green_y, &blue_x, &blue_y))
+      {
+         png_set_cHRM_fixed(write_ptr, write_info_ptr, white_x, white_y, red_x,
+            red_y, green_x, green_y, blue_x, blue_y);
+      }
+   }
+#endif
+#ifdef PNG_gAMA_SUPPORTED
+   {
+      png_fixed_point gamma;
+
+      if (png_get_gAMA_fixed(read_ptr, read_info_ptr, &gamma))
+         png_set_gAMA_fixed(write_ptr, write_info_ptr, gamma);
+   }
+#endif
+#else /* Use floating point versions */
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+#ifdef PNG_cHRM_SUPPORTED
+   {
+      double white_x, white_y, red_x, red_y, green_x, green_y, blue_x,
+         blue_y;
+      if (png_get_cHRM(read_ptr, read_info_ptr, &white_x, &white_y, &red_x,
+         &red_y, &green_x, &green_y, &blue_x, &blue_y))
+      {
+         png_set_cHRM(write_ptr, write_info_ptr, white_x, white_y, red_x,
+            red_y, green_x, green_y, blue_x, blue_y);
+      }
+   }
+#endif
+#ifdef PNG_gAMA_SUPPORTED
+   {
+      double gamma;
+
+      if (png_get_gAMA(read_ptr, read_info_ptr, &gamma))
+         png_set_gAMA(write_ptr, write_info_ptr, gamma);
+   }
+#endif
+#endif /* Floating point */
+#endif /* Fixed point */
+#ifdef PNG_iCCP_SUPPORTED
+   {
+      png_charp name;
+      png_charp profile;
+      png_uint_32 proflen;
+      int compression_type;
+
+      if (png_get_iCCP(read_ptr, read_info_ptr, &name, &compression_type,
+                      &profile, &proflen))
+      {
+         png_set_iCCP(write_ptr, write_info_ptr, name, compression_type,
+                      profile, proflen);
+      }
+   }
+#endif
+#ifdef PNG_sRGB_SUPPORTED
+   {
+      int intent;
+
+      if (png_get_sRGB(read_ptr, read_info_ptr, &intent))
+         png_set_sRGB(write_ptr, write_info_ptr, intent);
+   }
+#endif
+   {
+      png_colorp palette;
+      int num_palette;
+
+      if (png_get_PLTE(read_ptr, read_info_ptr, &palette, &num_palette))
+         png_set_PLTE(write_ptr, write_info_ptr, palette, num_palette);
+   }
+#ifdef PNG_bKGD_SUPPORTED
+   {
+      png_color_16p background;
+
+      if (png_get_bKGD(read_ptr, read_info_ptr, &background))
+      {
+         png_set_bKGD(write_ptr, write_info_ptr, background);
+      }
+   }
+#endif
+#ifdef PNG_hIST_SUPPORTED
+   {
+      png_uint_16p hist;
+
+      if (png_get_hIST(read_ptr, read_info_ptr, &hist))
+         png_set_hIST(write_ptr, write_info_ptr, hist);
+   }
+#endif
+#ifdef PNG_oFFs_SUPPORTED
+   {
+      png_int_32 offset_x, offset_y;
+      int unit_type;
+
+      if (png_get_oFFs(read_ptr, read_info_ptr, &offset_x, &offset_y,
+          &unit_type))
+      {
+         png_set_oFFs(write_ptr, write_info_ptr, offset_x, offset_y, unit_type);
+      }
+   }
+#endif
+#ifdef PNG_pCAL_SUPPORTED
+   {
+      png_charp purpose, units;
+      png_charpp params;
+      png_int_32 X0, X1;
+      int type, nparams;
+
+      if (png_get_pCAL(read_ptr, read_info_ptr, &purpose, &X0, &X1, &type,
+         &nparams, &units, &params))
+      {
+         png_set_pCAL(write_ptr, write_info_ptr, purpose, X0, X1, type,
+            nparams, units, params);
+      }
+   }
+#endif
+#ifdef PNG_pHYs_SUPPORTED
+   {
+      png_uint_32 res_x, res_y;
+      int unit_type;
+
+      if (png_get_pHYs(read_ptr, read_info_ptr, &res_x, &res_y, &unit_type))
+         png_set_pHYs(write_ptr, write_info_ptr, res_x, res_y, unit_type);
+   }
+#endif
+#ifdef PNG_sBIT_SUPPORTED
+   {
+      png_color_8p sig_bit;
+
+      if (png_get_sBIT(read_ptr, read_info_ptr, &sig_bit))
+         png_set_sBIT(write_ptr, write_info_ptr, sig_bit);
+   }
+#endif
+#ifdef PNG_sCAL_SUPPORTED
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+   {
+      int unit;
+      double scal_width, scal_height;
+
+      if (png_get_sCAL(read_ptr, read_info_ptr, &unit, &scal_width,
+         &scal_height))
+      {
+         png_set_sCAL(write_ptr, write_info_ptr, unit, scal_width, scal_height);
+      }
+   }
+#else
+#ifdef PNG_FIXED_POINT_SUPPORTED
+   {
+      int unit;
+      png_charp scal_width, scal_height;
+
+      if (png_get_sCAL_s(read_ptr, read_info_ptr, &unit, &scal_width,
+          &scal_height))
+      {
+         png_set_sCAL_s(write_ptr, write_info_ptr, unit, scal_width,
+             scal_height);
+      }
+   }
+#endif
+#endif
+#endif
+#ifdef PNG_TEXT_SUPPORTED
+   {
+      png_textp text_ptr;
+      int num_text;
+
+      if (png_get_text(read_ptr, read_info_ptr, &text_ptr, &num_text) > 0)
+      {
+         png_debug1(0, "Handling %d iTXt/tEXt/zTXt chunks", num_text);
+         png_set_text(write_ptr, write_info_ptr, text_ptr, num_text);
+      }
+   }
+#endif
+#ifdef PNG_tIME_SUPPORTED
+   {
+      png_timep mod_time;
+
+      if (png_get_tIME(read_ptr, read_info_ptr, &mod_time))
+      {
+         png_set_tIME(write_ptr, write_info_ptr, mod_time);
+#ifdef PNG_TIME_RFC1123_SUPPORTED
+         /* We have to use png_memcpy instead of "=" because the string
+          * pointed to by png_convert_to_rfc1123() gets free'ed before
+          * we use it.
+          */
+         png_memcpy(tIME_string,
+                    png_convert_to_rfc1123(read_ptr, mod_time),
+                    png_sizeof(tIME_string));
+         tIME_string[png_sizeof(tIME_string) - 1] = '\0';
+         tIME_chunk_present++;
+#endif /* PNG_TIME_RFC1123_SUPPORTED */
+      }
+   }
+#endif
+#ifdef PNG_tRNS_SUPPORTED
+   {
+      png_bytep trans;
+      int num_trans;
+      png_color_16p trans_values;
+
+      if (png_get_tRNS(read_ptr, read_info_ptr, &trans, &num_trans,
+         &trans_values))
+      {
+         int sample_max = (1 << bit_depth);
+         /* libpng doesn't reject a tRNS chunk with out-of-range samples */
+         if (!((color_type == PNG_COLOR_TYPE_GRAY &&
+             (int)trans_values->gray > sample_max) ||
+             (color_type == PNG_COLOR_TYPE_RGB &&
+             ((int)trans_values->red > sample_max ||
+             (int)trans_values->green > sample_max ||
+             (int)trans_values->blue > sample_max))))
+            png_set_tRNS(write_ptr, write_info_ptr, trans, num_trans,
+               trans_values);
+      }
+   }
+#endif
+#ifdef PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED
+   {
+      png_unknown_chunkp unknowns;
+      int num_unknowns = (int)png_get_unknown_chunks(read_ptr, read_info_ptr,
+         &unknowns);
+      if (num_unknowns)
+      {
+         png_size_t i;
+         png_set_unknown_chunks(write_ptr, write_info_ptr, unknowns,
+           num_unknowns);
+         /* Copy the locations from the read_info_ptr.  The automatically
+          * generated locations in write_info_ptr are wrong because we
+          * haven't written anything yet.
+          */
+         for (i = 0; i < (png_size_t)num_unknowns; i++)
+           png_set_unknown_chunk_location(write_ptr, write_info_ptr, i,
+             unknowns[i].location);
+      }
+   }
+#endif
+
+#ifdef PNG_WRITE_SUPPORTED
+   png_debug(0, "Writing info struct");
+
+/* If we wanted, we could write info in two steps:
+ * png_write_info_before_PLTE(write_ptr, write_info_ptr);
+ */
+   png_write_info(write_ptr, write_info_ptr);
+
+#ifdef PNG_UNKNOWN_CHUNKS_SUPPORTED
+   if (user_chunk_data[0] != 0)
+   {
+      png_byte png_sTER[5] = {115,  84,  69,  82, '\0'};
+
+      unsigned char
+        ster_chunk_data[1];
+
+      if (verbose)
+         fprintf(STDERR, "\n stereo mode = %lu\n",
+           (unsigned long)(user_chunk_data[0] - 1));
+      ster_chunk_data[0]=(unsigned char)(user_chunk_data[0] - 1);
+      png_write_chunk(write_ptr, png_sTER, ster_chunk_data, 1);
+   }
+   if (user_chunk_data[1] != 0 || user_chunk_data[2] != 0)
+   {
+      png_byte png_vpAg[5] = {118, 112,  65, 103, '\0'};
+
+      unsigned char
+        vpag_chunk_data[9];
+
+      if (verbose)
+         fprintf(STDERR, " vpAg = %lu x %lu, units = %lu\n",
+           (unsigned long)user_chunk_data[1],
+           (unsigned long)user_chunk_data[2],
+           (unsigned long)user_chunk_data[3]);
+      png_save_uint_32(vpag_chunk_data, user_chunk_data[1]);
+      png_save_uint_32(vpag_chunk_data + 4, user_chunk_data[2]);
+      vpag_chunk_data[8] = (unsigned char)(user_chunk_data[3] & 0xff);
+      png_write_chunk(write_ptr, png_vpAg, vpag_chunk_data, 9);
+   }
+
+#endif
+#endif
+
+#ifdef SINGLE_ROWBUF_ALLOC
+   png_debug(0, "Allocating row buffer...");
+   row_buf = (png_bytep)png_malloc(read_ptr,
+      png_get_rowbytes(read_ptr, read_info_ptr));
+   png_debug1(0, "0x%08lx", (unsigned long)row_buf);
+#endif /* SINGLE_ROWBUF_ALLOC */
+   png_debug(0, "Writing row data");
+
+#if defined(PNG_READ_INTERLACING_SUPPORTED) || \
+  defined(PNG_WRITE_INTERLACING_SUPPORTED)
+   num_pass = png_set_interlace_handling(read_ptr);
+#  ifdef PNG_WRITE_SUPPORTED
+   png_set_interlace_handling(write_ptr);
+#  endif
+#else
+   num_pass = 1;
+#endif
+
+#ifdef PNGTEST_TIMING
+   t_stop = (float)clock();
+   t_misc += (t_stop - t_start);
+   t_start = t_stop;
+#endif
+   for (pass = 0; pass < num_pass; pass++)
+   {
+      png_debug1(0, "Writing row data for pass %d", pass);
+      for (y = 0; y < height; y++)
+      {
+#ifndef SINGLE_ROWBUF_ALLOC
+         png_debug2(0, "Allocating row buffer (pass %d, y = %ld)...", pass, y);
+         row_buf = (png_bytep)png_malloc(read_ptr,
+            png_get_rowbytes(read_ptr, read_info_ptr));
+         png_debug2(0, "0x%08lx (%ld bytes)", (unsigned long)row_buf,
+            png_get_rowbytes(read_ptr, read_info_ptr));
+#endif /* !SINGLE_ROWBUF_ALLOC */
+         png_read_rows(read_ptr, (png_bytepp)&row_buf, png_bytepp_NULL, 1);
+
+#ifdef PNG_WRITE_SUPPORTED
+#ifdef PNGTEST_TIMING
+         t_stop = (float)clock();
+         t_decode += (t_stop - t_start);
+         t_start = t_stop;
+#endif
+         png_write_rows(write_ptr, (png_bytepp)&row_buf, 1);
+#ifdef PNGTEST_TIMING
+         t_stop = (float)clock();
+         t_encode += (t_stop - t_start);
+         t_start = t_stop;
+#endif
+#endif /* PNG_WRITE_SUPPORTED */
+
+#ifndef SINGLE_ROWBUF_ALLOC
+         png_debug2(0, "Freeing row buffer (pass %d, y = %ld)", pass, y);
+         png_free(read_ptr, row_buf);
+         row_buf = NULL;
+#endif /* !SINGLE_ROWBUF_ALLOC */
+      }
+   }
+
+#ifdef PNG_READ_UNKNOWN_CHUNKS_SUPPORTED
+   png_free_data(read_ptr, read_info_ptr, PNG_FREE_UNKN, -1);
+#endif
+#ifdef PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED
+   png_free_data(write_ptr, write_info_ptr, PNG_FREE_UNKN, -1);
+#endif
+
+   png_debug(0, "Reading and writing end_info data");
+
+   png_read_end(read_ptr, end_info_ptr);
+#ifdef PNG_TEXT_SUPPORTED
+   {
+      png_textp text_ptr;
+      int num_text;
+
+      if (png_get_text(read_ptr, end_info_ptr, &text_ptr, &num_text) > 0)
+      {
+         png_debug1(0, "Handling %d iTXt/tEXt/zTXt chunks", num_text);
+         png_set_text(write_ptr, write_end_info_ptr, text_ptr, num_text);
+      }
+   }
+#endif
+#ifdef PNG_tIME_SUPPORTED
+   {
+      png_timep mod_time;
+
+      if (png_get_tIME(read_ptr, end_info_ptr, &mod_time))
+      {
+         png_set_tIME(write_ptr, write_end_info_ptr, mod_time);
+#ifdef PNG_TIME_RFC1123_SUPPORTED
+         /* We have to use png_memcpy instead of "=" because the string
+            pointed to by png_convert_to_rfc1123() gets free'ed before
+            we use it */
+         png_memcpy(tIME_string,
+                    png_convert_to_rfc1123(read_ptr, mod_time),
+                    png_sizeof(tIME_string));
+         tIME_string[png_sizeof(tIME_string) - 1] = '\0';
+         tIME_chunk_present++;
+#endif /* PNG_TIME_RFC1123_SUPPORTED */
+      }
+   }
+#endif
+#ifdef PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED
+   {
+      png_unknown_chunkp unknowns;
+      int num_unknowns;
+      num_unknowns = (int)png_get_unknown_chunks(read_ptr, end_info_ptr,
+         &unknowns);
+      if (num_unknowns)
+      {
+         png_size_t i;
+         png_set_unknown_chunks(write_ptr, write_end_info_ptr, unknowns,
+           num_unknowns);
+         /* Copy the locations from the read_info_ptr.  The automatically
+          * generated locations in write_end_info_ptr are wrong because we
+          * haven't written the end_info yet.
+          */
+         for (i = 0; i < (png_size_t)num_unknowns; i++)
+           png_set_unknown_chunk_location(write_ptr, write_end_info_ptr, i,
+             unknowns[i].location);
+      }
+   }
+#endif
+#ifdef PNG_WRITE_SUPPORTED
+   png_write_end(write_ptr, write_end_info_ptr);
+#endif
+
+#ifdef PNG_EASY_ACCESS_SUPPORTED
+   if (verbose)
+   {
+      png_uint_32 iwidth, iheight;
+      iwidth = png_get_image_width(write_ptr, write_info_ptr);
+      iheight = png_get_image_height(write_ptr, write_info_ptr);
+      fprintf(STDERR, "\n Image width = %lu, height = %lu\n",
+         (unsigned long)iwidth, (unsigned long)iheight);
+   }
+#endif
+
+   png_debug(0, "Destroying data structs");
+#ifdef SINGLE_ROWBUF_ALLOC
+   png_debug(1, "destroying row_buf for read_ptr");
+   png_free(read_ptr, row_buf);
+   row_buf = NULL;
+#endif /* SINGLE_ROWBUF_ALLOC */
+   png_debug(1, "destroying read_ptr, read_info_ptr, end_info_ptr");
+   png_destroy_read_struct(&read_ptr, &read_info_ptr, &end_info_ptr);
+#ifdef PNG_WRITE_SUPPORTED
+   png_debug(1, "destroying write_end_info_ptr");
+   png_destroy_info_struct(write_ptr, &write_end_info_ptr);
+   png_debug(1, "destroying write_ptr, write_info_ptr");
+   png_destroy_write_struct(&write_ptr, &write_info_ptr);
+#endif
+   png_debug(0, "Destruction complete.");
+
+   FCLOSE(fpin);
+   FCLOSE(fpout);
+
+   png_debug(0, "Opening files for comparison");
+#ifdef _WIN32_WCE
+   MultiByteToWideChar(CP_ACP, 0, inname, -1, path, MAX_PATH);
+   if ((fpin = CreateFile(path, GENERIC_READ, 0, NULL, OPEN_EXISTING,
+       0, NULL)) == INVALID_HANDLE_VALUE)
+#else
+   if ((fpin = fopen(inname, "rb")) == NULL)
+#endif
+   {
+      fprintf(STDERR, "Could not find file %s\n", inname);
+      return (1);
+   }
+
+#ifdef _WIN32_WCE
+   MultiByteToWideChar(CP_ACP, 0, outname, -1, path, MAX_PATH);
+   if ((fpout = CreateFile(path, GENERIC_READ, 0, NULL, OPEN_EXISTING,
+       0, NULL)) == INVALID_HANDLE_VALUE)
+#else
+   if ((fpout = fopen(outname, "rb")) == NULL)
+#endif
+   {
+      fprintf(STDERR, "Could not find file %s\n", outname);
+      FCLOSE(fpin);
+      return (1);
+   }
+
+   for (;;)
+   {
+      png_size_t num_in, num_out;
+
+         READFILE(fpin, inbuf, 1, num_in);
+         READFILE(fpout, outbuf, 1, num_out);
+
+      if (num_in != num_out)
+      {
+         fprintf(STDERR, "\nFiles %s and %s are of a different size\n",
+                 inname, outname);
+         if (wrote_question == 0)
+         {
+            fprintf(STDERR,
+         "   Was %s written with the same maximum IDAT chunk size (%d bytes),",
+              inname, PNG_ZBUF_SIZE);
+            fprintf(STDERR,
+              "\n   filtering heuristic (libpng default), compression");
+            fprintf(STDERR,
+              " level (zlib default),\n   and zlib version (%s)?\n\n",
+              ZLIB_VERSION);
+            wrote_question = 1;
+         }
+         FCLOSE(fpin);
+         FCLOSE(fpout);
+         return (0);
+      }
+
+      if (!num_in)
+         break;
+
+      if (png_memcmp(inbuf, outbuf, num_in))
+      {
+         fprintf(STDERR, "\nFiles %s and %s are different\n", inname, outname);
+         if (wrote_question == 0)
+         {
+            fprintf(STDERR,
+         "   Was %s written with the same maximum IDAT chunk size (%d bytes),",
+                 inname, PNG_ZBUF_SIZE);
+            fprintf(STDERR,
+              "\n   filtering heuristic (libpng default), compression");
+            fprintf(STDERR,
+              " level (zlib default),\n   and zlib version (%s)?\n\n",
+              ZLIB_VERSION);
+            wrote_question = 1;
+         }
+         FCLOSE(fpin);
+         FCLOSE(fpout);
+         return (0);
+      }
+   }
+
+   FCLOSE(fpin);
+   FCLOSE(fpout);
+
+   return (0);
+}
+
+/* Input and output filenames */
+#ifdef RISCOS
+static PNG_CONST char *inname = "pngtest/png";
+static PNG_CONST char *outname = "pngout/png";
+#else
+static PNG_CONST char *inname = "pngtest.png";
+static PNG_CONST char *outname = "pngout.png";
+#endif
+
+int
+main(int argc, char *argv[])
+{
+   int multiple = 0;
+   int ierror = 0;
+
+   fprintf(STDERR, "\n Testing libpng version %s\n", PNG_LIBPNG_VER_STRING);
+   fprintf(STDERR, "   with zlib   version %s\n", ZLIB_VERSION);
+   fprintf(STDERR, "%s", png_get_copyright(NULL));
+   /* Show the version of libpng used in building the library */
+   fprintf(STDERR, " library (%lu):%s",
+      (unsigned long)png_access_version_number(),
+      png_get_header_version(NULL));
+   /* Show the version of libpng used in building the application */
+   fprintf(STDERR, " pngtest (%lu):%s", (unsigned long)PNG_LIBPNG_VER,
+      PNG_HEADER_VERSION_STRING);
+   fprintf(STDERR, " sizeof(png_struct)=%ld, sizeof(png_info)=%ld\n",
+                    (long)png_sizeof(png_struct), (long)png_sizeof(png_info));
+
+   /* Do some consistency checking on the memory allocation settings, I'm
+    * not sure this matters, but it is nice to know, the first of these
+    * tests should be impossible because of the way the macros are set
+    * in pngconf.h
+    */
+#if defined(MAXSEG_64K) && !defined(PNG_MAX_MALLOC_64K)
+      fprintf(STDERR, " NOTE: Zlib compiled for max 64k, libpng not\n");
+#endif
+   /* I think the following can happen. */
+#if !defined(MAXSEG_64K) && defined(PNG_MAX_MALLOC_64K)
+      fprintf(STDERR, " NOTE: libpng compiled for max 64k, zlib not\n");
+#endif
+
+   if (strcmp(png_libpng_ver, PNG_LIBPNG_VER_STRING))
+   {
+      fprintf(STDERR,
+         "Warning: versions are different between png.h and png.c\n");
+      fprintf(STDERR, "  png.h version: %s\n", PNG_LIBPNG_VER_STRING);
+      fprintf(STDERR, "  png.c version: %s\n\n", png_libpng_ver);
+      ++ierror;
+   }
+
+   if (argc > 1)
+   {
+      if (strcmp(argv[1], "-m") == 0)
+      {
+         multiple = 1;
+         status_dots_requested = 0;
+      }
+      else if (strcmp(argv[1], "-mv") == 0 ||
+               strcmp(argv[1], "-vm") == 0 )
+      {
+         multiple = 1;
+         verbose = 1;
+         status_dots_requested = 1;
+      }
+      else if (strcmp(argv[1], "-v") == 0)
+      {
+         verbose = 1;
+         status_dots_requested = 1;
+         inname = argv[2];
+      }
+      else
+      {
+         inname = argv[1];
+         status_dots_requested = 0;
+      }
+   }
+
+   if (!multiple && argc == 3 + verbose)
+     outname = argv[2 + verbose];
+
+   if ((!multiple && argc > 3 + verbose) || (multiple && argc < 2))
+   {
+     fprintf(STDERR,
+       "usage: %s [infile.png] [outfile.png]\n\t%s -m {infile.png}\n",
+        argv[0], argv[0]);
+     fprintf(STDERR,
+       "  reads/writes one PNG file (without -m) or multiple files (-m)\n");
+     fprintf(STDERR,
+       "  with -m %s is used as a temporary file\n", outname);
+     exit(1);
+   }
+
+   if (multiple)
+   {
+      int i;
+#if defined(PNG_USER_MEM_SUPPORTED) && PNG_DEBUG
+      int allocation_now = current_allocation;
+#endif
+      for (i=2; i<argc; ++i)
+      {
+         int kerror;
+         fprintf(STDERR, "\n Testing %s:", argv[i]);
+         kerror = test_one_file(argv[i], outname);
+         if (kerror == 0)
+         {
+#ifdef PNG_READ_USER_TRANSFORM_SUPPORTED
+            int k;
+#endif
+#ifdef PNG_WRITE_USER_TRANSFORM_SUPPORTED
+            fprintf(STDERR, "\n PASS (%lu zero samples)\n",
+               (unsigned long)zero_samples);
+#else
+            fprintf(STDERR, " PASS\n");
+#endif
+#ifdef PNG_READ_USER_TRANSFORM_SUPPORTED
+            for (k = 0; k<256; k++)
+               if (filters_used[k])
+                  fprintf(STDERR, " Filter %d was used %lu times\n",
+                     k, (unsigned long)filters_used[k]);
+#endif
+#ifdef PNG_TIME_RFC1123_SUPPORTED
+         if (tIME_chunk_present != 0)
+            fprintf(STDERR, " tIME = %s\n", tIME_string);
+         tIME_chunk_present = 0;
+#endif /* PNG_TIME_RFC1123_SUPPORTED */
+         }
+         else
+         {
+            fprintf(STDERR, " FAIL\n");
+            ierror += kerror;
+         }
+#if defined(PNG_USER_MEM_SUPPORTED) && PNG_DEBUG
+         if (allocation_now != current_allocation)
+            fprintf(STDERR, "MEMORY ERROR: %d bytes lost\n",
+               current_allocation - allocation_now);
+         if (current_allocation != 0)
+         {
+            memory_infop pinfo = pinformation;
+
+            fprintf(STDERR, "MEMORY ERROR: %d bytes still allocated\n",
+               current_allocation);
+            while (pinfo != NULL)
+            {
+               fprintf(STDERR, " %lu bytes at %x\n",
+                 (unsigned long)pinfo->size,
+                 (unsigned int) pinfo->pointer);
+               pinfo = pinfo->next;
+            }
+         }
+#endif
+      }
+#if defined(PNG_USER_MEM_SUPPORTED) && PNG_DEBUG
+         fprintf(STDERR, " Current memory allocation: %10d bytes\n",
+            current_allocation);
+         fprintf(STDERR, " Maximum memory allocation: %10d bytes\n",
+            maximum_allocation);
+         fprintf(STDERR, " Total   memory allocation: %10d bytes\n",
+            total_allocation);
+         fprintf(STDERR, "     Number of allocations: %10d\n",
+            num_allocations);
+#endif
+   }
+   else
+   {
+      int i;
+      for (i = 0; i<3; ++i)
+      {
+         int kerror;
+#if defined(PNG_USER_MEM_SUPPORTED) && PNG_DEBUG
+         int allocation_now = current_allocation;
+#endif
+         if (i == 1) status_dots_requested = 1;
+         else if (verbose == 0)status_dots_requested = 0;
+         if (i == 0 || verbose == 1 || ierror != 0)
+            fprintf(STDERR, "\n Testing %s:", inname);
+         kerror = test_one_file(inname, outname);
+         if (kerror == 0)
+         {
+            if (verbose == 1 || i == 2)
+            {
+#ifdef PNG_READ_USER_TRANSFORM_SUPPORTED
+                int k;
+#endif
+#ifdef PNG_WRITE_USER_TRANSFORM_SUPPORTED
+                fprintf(STDERR, "\n PASS (%lu zero samples)\n",
+                   (unsigned long)zero_samples);
+#else
+                fprintf(STDERR, " PASS\n");
+#endif
+#ifdef PNG_READ_USER_TRANSFORM_SUPPORTED
+                for (k = 0; k<256; k++)
+                   if (filters_used[k])
+                      fprintf(STDERR, " Filter %d was used %lu times\n",
+                         k, (unsigned long)filters_used[k]);
+#endif
+#ifdef PNG_TIME_RFC1123_SUPPORTED
+             if (tIME_chunk_present != 0)
+                fprintf(STDERR, " tIME = %s\n", tIME_string);
+#endif /* PNG_TIME_RFC1123_SUPPORTED */
+            }
+         }
+         else
+         {
+            if (verbose == 0 && i != 2)
+               fprintf(STDERR, "\n Testing %s:", inname);
+            fprintf(STDERR, " FAIL\n");
+            ierror += kerror;
+         }
+#if defined(PNG_USER_MEM_SUPPORTED) && PNG_DEBUG
+         if (allocation_now != current_allocation)
+             fprintf(STDERR, "MEMORY ERROR: %d bytes lost\n",
+               current_allocation - allocation_now);
+         if (current_allocation != 0)
+         {
+             memory_infop pinfo = pinformation;
+
+             fprintf(STDERR, "MEMORY ERROR: %d bytes still allocated\n",
+                current_allocation);
+             while (pinfo != NULL)
+             {
+                fprintf(STDERR, " %lu bytes at %x\n",
+                   (unsigned long)pinfo->size, (unsigned int)pinfo->pointer);
+                pinfo = pinfo->next;
+             }
+          }
+#endif
+       }
+#if defined(PNG_USER_MEM_SUPPORTED) && PNG_DEBUG
+       fprintf(STDERR, " Current memory allocation: %10d bytes\n",
+          current_allocation);
+       fprintf(STDERR, " Maximum memory allocation: %10d bytes\n",
+          maximum_allocation);
+       fprintf(STDERR, " Total   memory allocation: %10d bytes\n",
+          total_allocation);
+       fprintf(STDERR, "     Number of allocations: %10d\n",
+            num_allocations);
+#endif
+   }
+
+#ifdef PNGTEST_TIMING
+   t_stop = (float)clock();
+   t_misc += (t_stop - t_start);
+   t_start = t_stop;
+   fprintf(STDERR, " CPU time used = %.3f seconds",
+      (t_misc+t_decode+t_encode)/(float)CLOCKS_PER_SEC);
+   fprintf(STDERR, " (decoding %.3f,\n",
+      t_decode/(float)CLOCKS_PER_SEC);
+   fprintf(STDERR, "        encoding %.3f ,",
+      t_encode/(float)CLOCKS_PER_SEC);
+   fprintf(STDERR, " other %.3f seconds)\n\n",
+      t_misc/(float)CLOCKS_PER_SEC);
+#endif
+
+   if (ierror == 0)
+      fprintf(STDERR, " libpng passes test\n");
+   else
+      fprintf(STDERR, " libpng FAILS test\n");
+   return (int)(ierror != 0);
+}
+
+/* Generate a compiler error if there is an old png.h in the search path. */
+typedef version_1_2_50 your_png_h_is_not_version_1_2_50;
diff --git a/Externals/libpng/pngtrans.c b/Externals/libpng/pngtrans.c
index 137f555a62..2122839bc5 100644
--- a/Externals/libpng/pngtrans.c
+++ b/Externals/libpng/pngtrans.c
@@ -1,723 +1,699 @@
-
-/* pngtrans.c - transforms the data in a row (used by both readers and writers)
- *
- * Last changed in libpng 1.5.1 [February 3, 2011]
- * Copyright (c) 1998-2011 Glenn Randers-Pehrson
- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
- *
- * This code is released under the libpng license.
- * For conditions of distribution and use, see the disclaimer
- * and license in png.h
- */
-
-#include "pngpriv.h"
-
-#if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED)
-
-#if defined(PNG_READ_BGR_SUPPORTED) || defined(PNG_WRITE_BGR_SUPPORTED)
-/* Turn on BGR-to-RGB mapping */
-void PNGAPI
-png_set_bgr(png_structp png_ptr)
-{
-   png_debug(1, "in png_set_bgr");
-
-   if (png_ptr == NULL)
-      return;
-
-   png_ptr->transformations |= PNG_BGR;
-}
-#endif
-
-#if defined(PNG_READ_SWAP_SUPPORTED) || defined(PNG_WRITE_SWAP_SUPPORTED)
-/* Turn on 16 bit byte swapping */
-void PNGAPI
-png_set_swap(png_structp png_ptr)
-{
-   png_debug(1, "in png_set_swap");
-
-   if (png_ptr == NULL)
-      return;
-
-   if (png_ptr->bit_depth == 16)
-      png_ptr->transformations |= PNG_SWAP_BYTES;
-}
-#endif
-
-#if defined(PNG_READ_PACK_SUPPORTED) || defined(PNG_WRITE_PACK_SUPPORTED)
-/* Turn on pixel packing */
-void PNGAPI
-png_set_packing(png_structp png_ptr)
-{
-   png_debug(1, "in png_set_packing");
-
-   if (png_ptr == NULL)
-      return;
-
-   if (png_ptr->bit_depth < 8)
-   {
-      png_ptr->transformations |= PNG_PACK;
-      png_ptr->usr_bit_depth = 8;
-   }
-}
-#endif
-
-#if defined(PNG_READ_PACKSWAP_SUPPORTED)||defined(PNG_WRITE_PACKSWAP_SUPPORTED)
-/* Turn on packed pixel swapping */
-void PNGAPI
-png_set_packswap(png_structp png_ptr)
-{
-   png_debug(1, "in png_set_packswap");
-
-   if (png_ptr == NULL)
-      return;
-
-   if (png_ptr->bit_depth < 8)
-      png_ptr->transformations |= PNG_PACKSWAP;
-}
-#endif
-
-#if defined(PNG_READ_SHIFT_SUPPORTED) || defined(PNG_WRITE_SHIFT_SUPPORTED)
-void PNGAPI
-png_set_shift(png_structp png_ptr, png_const_color_8p true_bits)
-{
-   png_debug(1, "in png_set_shift");
-
-   if (png_ptr == NULL)
-      return;
-
-   png_ptr->transformations |= PNG_SHIFT;
-   png_ptr->shift = *true_bits;
-}
-#endif
-
-#if defined(PNG_READ_INTERLACING_SUPPORTED) || \
-    defined(PNG_WRITE_INTERLACING_SUPPORTED)
-int PNGAPI
-png_set_interlace_handling(png_structp png_ptr)
-{
-   png_debug(1, "in png_set_interlace handling");
-
-   if (png_ptr && png_ptr->interlaced)
-   {
-      png_ptr->transformations |= PNG_INTERLACE;
-      return (7);
-   }
-
-   return (1);
-}
-#endif
-
-#if defined(PNG_READ_FILLER_SUPPORTED) || defined(PNG_WRITE_FILLER_SUPPORTED)
-/* Add a filler byte on read, or remove a filler or alpha byte on write.
- * The filler type has changed in v0.95 to allow future 2-byte fillers
- * for 48-bit input data, as well as to avoid problems with some compilers
- * that don't like bytes as parameters.
- */
-void PNGAPI
-png_set_filler(png_structp png_ptr, png_uint_32 filler, int filler_loc)
-{
-   png_debug(1, "in png_set_filler");
-
-   if (png_ptr == NULL)
-      return;
-
-   png_ptr->transformations |= PNG_FILLER;
-   png_ptr->filler = (png_uint_16)filler;
-
-   if (filler_loc == PNG_FILLER_AFTER)
-      png_ptr->flags |= PNG_FLAG_FILLER_AFTER;
-
-   else
-      png_ptr->flags &= ~PNG_FLAG_FILLER_AFTER;
-
-   /* This should probably go in the "do_read_filler" routine.
-    * I attempted to do that in libpng-1.0.1a but that caused problems
-    * so I restored it in libpng-1.0.2a
-   */
-
-   if (png_ptr->color_type == PNG_COLOR_TYPE_RGB)
-   {
-      png_ptr->usr_channels = 4;
-   }
-
-   /* Also I added this in libpng-1.0.2a (what happens when we expand
-    * a less-than-8-bit grayscale to GA?) */
-
-   if (png_ptr->color_type == PNG_COLOR_TYPE_GRAY && png_ptr->bit_depth >= 8)
-   {
-      png_ptr->usr_channels = 2;
-   }
-}
-
-/* Added to libpng-1.2.7 */
-void PNGAPI
-png_set_add_alpha(png_structp png_ptr, png_uint_32 filler, int filler_loc)
-{
-   png_debug(1, "in png_set_add_alpha");
-
-   if (png_ptr == NULL)
-      return;
-
-   png_set_filler(png_ptr, filler, filler_loc);
-   png_ptr->transformations |= PNG_ADD_ALPHA;
-}
-
-#endif
-
-#if defined(PNG_READ_SWAP_ALPHA_SUPPORTED) || \
-    defined(PNG_WRITE_SWAP_ALPHA_SUPPORTED)
-void PNGAPI
-png_set_swap_alpha(png_structp png_ptr)
-{
-   png_debug(1, "in png_set_swap_alpha");
-
-   if (png_ptr == NULL)
-      return;
-
-   png_ptr->transformations |= PNG_SWAP_ALPHA;
-}
-#endif
-
-#if defined(PNG_READ_INVERT_ALPHA_SUPPORTED) || \
-    defined(PNG_WRITE_INVERT_ALPHA_SUPPORTED)
-void PNGAPI
-png_set_invert_alpha(png_structp png_ptr)
-{
-   png_debug(1, "in png_set_invert_alpha");
-
-   if (png_ptr == NULL)
-      return;
-
-   png_ptr->transformations |= PNG_INVERT_ALPHA;
-}
-#endif
-
-#if defined(PNG_READ_INVERT_SUPPORTED) || defined(PNG_WRITE_INVERT_SUPPORTED)
-void PNGAPI
-png_set_invert_mono(png_structp png_ptr)
-{
-   png_debug(1, "in png_set_invert_mono");
-
-   if (png_ptr == NULL)
-      return;
-
-   png_ptr->transformations |= PNG_INVERT_MONO;
-}
-
-/* Invert monochrome grayscale data */
-void /* PRIVATE */
-png_do_invert(png_row_infop row_info, png_bytep row)
-{
-   png_debug(1, "in png_do_invert");
-
-  /* This test removed from libpng version 1.0.13 and 1.2.0:
-   *   if (row_info->bit_depth == 1 &&
-   */
-   if (row_info->color_type == PNG_COLOR_TYPE_GRAY)
-   {
-      png_bytep rp = row;
-      png_size_t i;
-      png_size_t istop = row_info->rowbytes;
-
-      for (i = 0; i < istop; i++)
-      {
-         *rp = (png_byte)(~(*rp));
-         rp++;
-      }
-   }
-
-   else if (row_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA &&
-      row_info->bit_depth == 8)
-   {
-      png_bytep rp = row;
-      png_size_t i;
-      png_size_t istop = row_info->rowbytes;
-
-      for (i = 0; i < istop; i += 2)
-      {
-         *rp = (png_byte)(~(*rp));
-         rp += 2;
-      }
-   }
-
-#ifdef PNG_16BIT_SUPPORTED
-   else if (row_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA &&
-      row_info->bit_depth == 16)
-   {
-      png_bytep rp = row;
-      png_size_t i;
-      png_size_t istop = row_info->rowbytes;
-
-      for (i = 0; i < istop; i += 4)
-      {
-         *rp = (png_byte)(~(*rp));
-         *(rp + 1) = (png_byte)(~(*(rp + 1)));
-         rp += 4;
-      }
-   }
-#endif
-}
-#endif
-
-#ifdef PNG_16BIT_SUPPORTED
-#if defined(PNG_READ_SWAP_SUPPORTED) || defined(PNG_WRITE_SWAP_SUPPORTED)
-/* Swaps byte order on 16 bit depth images */
-void /* PRIVATE */
-png_do_swap(png_row_infop row_info, png_bytep row)
-{
-   png_debug(1, "in png_do_swap");
-
-   if (row_info->bit_depth == 16)
-   {
-      png_bytep rp = row;
-      png_uint_32 i;
-      png_uint_32 istop= row_info->width * row_info->channels;
-
-      for (i = 0; i < istop; i++, rp += 2)
-      {
-         png_byte t = *rp;
-         *rp = *(rp + 1);
-         *(rp + 1) = t;
-      }
-   }
-}
-#endif
-#endif
-
-#if defined(PNG_READ_PACKSWAP_SUPPORTED)||defined(PNG_WRITE_PACKSWAP_SUPPORTED)
-static PNG_CONST png_byte onebppswaptable[256] = {
-   0x00, 0x80, 0x40, 0xC0, 0x20, 0xA0, 0x60, 0xE0,
-   0x10, 0x90, 0x50, 0xD0, 0x30, 0xB0, 0x70, 0xF0,
-   0x08, 0x88, 0x48, 0xC8, 0x28, 0xA8, 0x68, 0xE8,
-   0x18, 0x98, 0x58, 0xD8, 0x38, 0xB8, 0x78, 0xF8,
-   0x04, 0x84, 0x44, 0xC4, 0x24, 0xA4, 0x64, 0xE4,
-   0x14, 0x94, 0x54, 0xD4, 0x34, 0xB4, 0x74, 0xF4,
-   0x0C, 0x8C, 0x4C, 0xCC, 0x2C, 0xAC, 0x6C, 0xEC,
-   0x1C, 0x9C, 0x5C, 0xDC, 0x3C, 0xBC, 0x7C, 0xFC,
-   0x02, 0x82, 0x42, 0xC2, 0x22, 0xA2, 0x62, 0xE2,
-   0x12, 0x92, 0x52, 0xD2, 0x32, 0xB2, 0x72, 0xF2,
-   0x0A, 0x8A, 0x4A, 0xCA, 0x2A, 0xAA, 0x6A, 0xEA,
-   0x1A, 0x9A, 0x5A, 0xDA, 0x3A, 0xBA, 0x7A, 0xFA,
-   0x06, 0x86, 0x46, 0xC6, 0x26, 0xA6, 0x66, 0xE6,
-   0x16, 0x96, 0x56, 0xD6, 0x36, 0xB6, 0x76, 0xF6,
-   0x0E, 0x8E, 0x4E, 0xCE, 0x2E, 0xAE, 0x6E, 0xEE,
-   0x1E, 0x9E, 0x5E, 0xDE, 0x3E, 0xBE, 0x7E, 0xFE,
-   0x01, 0x81, 0x41, 0xC1, 0x21, 0xA1, 0x61, 0xE1,
-   0x11, 0x91, 0x51, 0xD1, 0x31, 0xB1, 0x71, 0xF1,
-   0x09, 0x89, 0x49, 0xC9, 0x29, 0xA9, 0x69, 0xE9,
-   0x19, 0x99, 0x59, 0xD9, 0x39, 0xB9, 0x79, 0xF9,
-   0x05, 0x85, 0x45, 0xC5, 0x25, 0xA5, 0x65, 0xE5,
-   0x15, 0x95, 0x55, 0xD5, 0x35, 0xB5, 0x75, 0xF5,
-   0x0D, 0x8D, 0x4D, 0xCD, 0x2D, 0xAD, 0x6D, 0xED,
-   0x1D, 0x9D, 0x5D, 0xDD, 0x3D, 0xBD, 0x7D, 0xFD,
-   0x03, 0x83, 0x43, 0xC3, 0x23, 0xA3, 0x63, 0xE3,
-   0x13, 0x93, 0x53, 0xD3, 0x33, 0xB3, 0x73, 0xF3,
-   0x0B, 0x8B, 0x4B, 0xCB, 0x2B, 0xAB, 0x6B, 0xEB,
-   0x1B, 0x9B, 0x5B, 0xDB, 0x3B, 0xBB, 0x7B, 0xFB,
-   0x07, 0x87, 0x47, 0xC7, 0x27, 0xA7, 0x67, 0xE7,
-   0x17, 0x97, 0x57, 0xD7, 0x37, 0xB7, 0x77, 0xF7,
-   0x0F, 0x8F, 0x4F, 0xCF, 0x2F, 0xAF, 0x6F, 0xEF,
-   0x1F, 0x9F, 0x5F, 0xDF, 0x3F, 0xBF, 0x7F, 0xFF
-};
-
-static PNG_CONST png_byte twobppswaptable[256] = {
-   0x00, 0x40, 0x80, 0xC0, 0x10, 0x50, 0x90, 0xD0,
-   0x20, 0x60, 0xA0, 0xE0, 0x30, 0x70, 0xB0, 0xF0,
-   0x04, 0x44, 0x84, 0xC4, 0x14, 0x54, 0x94, 0xD4,
-   0x24, 0x64, 0xA4, 0xE4, 0x34, 0x74, 0xB4, 0xF4,
-   0x08, 0x48, 0x88, 0xC8, 0x18, 0x58, 0x98, 0xD8,
-   0x28, 0x68, 0xA8, 0xE8, 0x38, 0x78, 0xB8, 0xF8,
-   0x0C, 0x4C, 0x8C, 0xCC, 0x1C, 0x5C, 0x9C, 0xDC,
-   0x2C, 0x6C, 0xAC, 0xEC, 0x3C, 0x7C, 0xBC, 0xFC,
-   0x01, 0x41, 0x81, 0xC1, 0x11, 0x51, 0x91, 0xD1,
-   0x21, 0x61, 0xA1, 0xE1, 0x31, 0x71, 0xB1, 0xF1,
-   0x05, 0x45, 0x85, 0xC5, 0x15, 0x55, 0x95, 0xD5,
-   0x25, 0x65, 0xA5, 0xE5, 0x35, 0x75, 0xB5, 0xF5,
-   0x09, 0x49, 0x89, 0xC9, 0x19, 0x59, 0x99, 0xD9,
-   0x29, 0x69, 0xA9, 0xE9, 0x39, 0x79, 0xB9, 0xF9,
-   0x0D, 0x4D, 0x8D, 0xCD, 0x1D, 0x5D, 0x9D, 0xDD,
-   0x2D, 0x6D, 0xAD, 0xED, 0x3D, 0x7D, 0xBD, 0xFD,
-   0x02, 0x42, 0x82, 0xC2, 0x12, 0x52, 0x92, 0xD2,
-   0x22, 0x62, 0xA2, 0xE2, 0x32, 0x72, 0xB2, 0xF2,
-   0x06, 0x46, 0x86, 0xC6, 0x16, 0x56, 0x96, 0xD6,
-   0x26, 0x66, 0xA6, 0xE6, 0x36, 0x76, 0xB6, 0xF6,
-   0x0A, 0x4A, 0x8A, 0xCA, 0x1A, 0x5A, 0x9A, 0xDA,
-   0x2A, 0x6A, 0xAA, 0xEA, 0x3A, 0x7A, 0xBA, 0xFA,
-   0x0E, 0x4E, 0x8E, 0xCE, 0x1E, 0x5E, 0x9E, 0xDE,
-   0x2E, 0x6E, 0xAE, 0xEE, 0x3E, 0x7E, 0xBE, 0xFE,
-   0x03, 0x43, 0x83, 0xC3, 0x13, 0x53, 0x93, 0xD3,
-   0x23, 0x63, 0xA3, 0xE3, 0x33, 0x73, 0xB3, 0xF3,
-   0x07, 0x47, 0x87, 0xC7, 0x17, 0x57, 0x97, 0xD7,
-   0x27, 0x67, 0xA7, 0xE7, 0x37, 0x77, 0xB7, 0xF7,
-   0x0B, 0x4B, 0x8B, 0xCB, 0x1B, 0x5B, 0x9B, 0xDB,
-   0x2B, 0x6B, 0xAB, 0xEB, 0x3B, 0x7B, 0xBB, 0xFB,
-   0x0F, 0x4F, 0x8F, 0xCF, 0x1F, 0x5F, 0x9F, 0xDF,
-   0x2F, 0x6F, 0xAF, 0xEF, 0x3F, 0x7F, 0xBF, 0xFF
-};
-
-static PNG_CONST png_byte fourbppswaptable[256] = {
-   0x00, 0x10, 0x20, 0x30, 0x40, 0x50, 0x60, 0x70,
-   0x80, 0x90, 0xA0, 0xB0, 0xC0, 0xD0, 0xE0, 0xF0,
-   0x01, 0x11, 0x21, 0x31, 0x41, 0x51, 0x61, 0x71,
-   0x81, 0x91, 0xA1, 0xB1, 0xC1, 0xD1, 0xE1, 0xF1,
-   0x02, 0x12, 0x22, 0x32, 0x42, 0x52, 0x62, 0x72,
-   0x82, 0x92, 0xA2, 0xB2, 0xC2, 0xD2, 0xE2, 0xF2,
-   0x03, 0x13, 0x23, 0x33, 0x43, 0x53, 0x63, 0x73,
-   0x83, 0x93, 0xA3, 0xB3, 0xC3, 0xD3, 0xE3, 0xF3,
-   0x04, 0x14, 0x24, 0x34, 0x44, 0x54, 0x64, 0x74,
-   0x84, 0x94, 0xA4, 0xB4, 0xC4, 0xD4, 0xE4, 0xF4,
-   0x05, 0x15, 0x25, 0x35, 0x45, 0x55, 0x65, 0x75,
-   0x85, 0x95, 0xA5, 0xB5, 0xC5, 0xD5, 0xE5, 0xF5,
-   0x06, 0x16, 0x26, 0x36, 0x46, 0x56, 0x66, 0x76,
-   0x86, 0x96, 0xA6, 0xB6, 0xC6, 0xD6, 0xE6, 0xF6,
-   0x07, 0x17, 0x27, 0x37, 0x47, 0x57, 0x67, 0x77,
-   0x87, 0x97, 0xA7, 0xB7, 0xC7, 0xD7, 0xE7, 0xF7,
-   0x08, 0x18, 0x28, 0x38, 0x48, 0x58, 0x68, 0x78,
-   0x88, 0x98, 0xA8, 0xB8, 0xC8, 0xD8, 0xE8, 0xF8,
-   0x09, 0x19, 0x29, 0x39, 0x49, 0x59, 0x69, 0x79,
-   0x89, 0x99, 0xA9, 0xB9, 0xC9, 0xD9, 0xE9, 0xF9,
-   0x0A, 0x1A, 0x2A, 0x3A, 0x4A, 0x5A, 0x6A, 0x7A,
-   0x8A, 0x9A, 0xAA, 0xBA, 0xCA, 0xDA, 0xEA, 0xFA,
-   0x0B, 0x1B, 0x2B, 0x3B, 0x4B, 0x5B, 0x6B, 0x7B,
-   0x8B, 0x9B, 0xAB, 0xBB, 0xCB, 0xDB, 0xEB, 0xFB,
-   0x0C, 0x1C, 0x2C, 0x3C, 0x4C, 0x5C, 0x6C, 0x7C,
-   0x8C, 0x9C, 0xAC, 0xBC, 0xCC, 0xDC, 0xEC, 0xFC,
-   0x0D, 0x1D, 0x2D, 0x3D, 0x4D, 0x5D, 0x6D, 0x7D,
-   0x8D, 0x9D, 0xAD, 0xBD, 0xCD, 0xDD, 0xED, 0xFD,
-   0x0E, 0x1E, 0x2E, 0x3E, 0x4E, 0x5E, 0x6E, 0x7E,
-   0x8E, 0x9E, 0xAE, 0xBE, 0xCE, 0xDE, 0xEE, 0xFE,
-   0x0F, 0x1F, 0x2F, 0x3F, 0x4F, 0x5F, 0x6F, 0x7F,
-   0x8F, 0x9F, 0xAF, 0xBF, 0xCF, 0xDF, 0xEF, 0xFF
-};
-
-/* Swaps pixel packing order within bytes */
-void /* PRIVATE */
-png_do_packswap(png_row_infop row_info, png_bytep row)
-{
-   png_debug(1, "in png_do_packswap");
-
-   if (row_info->bit_depth < 8)
-   {
-      png_bytep rp;
-      png_const_bytep end, table;
-
-      end = row + row_info->rowbytes;
-
-      if (row_info->bit_depth == 1)
-         table = onebppswaptable;
-
-      else if (row_info->bit_depth == 2)
-         table = twobppswaptable;
-
-      else if (row_info->bit_depth == 4)
-         table = fourbppswaptable;
-
-      else
-         return;
-
-      for (rp = row; rp < end; rp++)
-         *rp = table[*rp];
-   }
-}
-#endif /* PNG_READ_PACKSWAP_SUPPORTED or PNG_WRITE_PACKSWAP_SUPPORTED */
-
-#if defined(PNG_WRITE_FILLER_SUPPORTED) || \
-    defined(PNG_READ_STRIP_ALPHA_SUPPORTED)
-/* Remove filler or alpha byte(s) */
-void /* PRIVATE */
-png_do_strip_filler(png_row_infop row_info, png_bytep row, png_uint_32 flags)
-{
-   png_debug(1, "in png_do_strip_filler");
-
-   {
-      png_bytep sp = row;
-      png_bytep dp = row;
-      png_uint_32 row_width = row_info->width;
-      png_uint_32 i;
-
-      if ((row_info->color_type == PNG_COLOR_TYPE_RGB ||
-          (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA &&
-          (flags & PNG_FLAG_STRIP_ALPHA))) &&
-          row_info->channels == 4)
-      {
-         if (row_info->bit_depth == 8)
-         {
-            /* This converts from RGBX or RGBA to RGB */
-            if (flags & PNG_FLAG_FILLER_AFTER)
-            {
-               dp += 3; sp += 4;
-               for (i = 1; i < row_width; i++)
-               {
-                  *dp++ = *sp++;
-                  *dp++ = *sp++;
-                  *dp++ = *sp++;
-                  sp++;
-               }
-            }
-
-            /* This converts from XRGB or ARGB to RGB */
-            else
-            {
-               for (i = 0; i < row_width; i++)
-               {
-                  sp++;
-                  *dp++ = *sp++;
-                  *dp++ = *sp++;
-                  *dp++ = *sp++;
-               }
-            }
-            row_info->pixel_depth = 24;
-            row_info->rowbytes = row_width * 3;
-         }
-
-         else /* if (row_info->bit_depth == 16) */
-         {
-            if (flags & PNG_FLAG_FILLER_AFTER)
-            {
-               /* This converts from RRGGBBXX or RRGGBBAA to RRGGBB */
-               sp += 8; dp += 6;
-               for (i = 1; i < row_width; i++)
-               {
-                  /* This could be (although png_memcpy is probably slower):
-                  png_memcpy(dp, sp, 6);
-                  sp += 8;
-                  dp += 6;
-                  */
-
-                  *dp++ = *sp++;
-                  *dp++ = *sp++;
-                  *dp++ = *sp++;
-                  *dp++ = *sp++;
-                  *dp++ = *sp++;
-                  *dp++ = *sp++;
-                  sp += 2;
-               }
-            }
-
-            else
-            {
-               /* This converts from XXRRGGBB or AARRGGBB to RRGGBB */
-               for (i = 0; i < row_width; i++)
-               {
-                  /* This could be (although png_memcpy is probably slower):
-                  png_memcpy(dp, sp, 6);
-                  sp += 8;
-                  dp += 6;
-                  */
-
-                  sp += 2;
-                  *dp++ = *sp++;
-                  *dp++ = *sp++;
-                  *dp++ = *sp++;
-                  *dp++ = *sp++;
-                  *dp++ = *sp++;
-                  *dp++ = *sp++;
-               }
-            }
-
-            row_info->pixel_depth = 48;
-            row_info->rowbytes = row_width * 6;
-         }
-         row_info->channels = 3;
-      }
-
-      else if ((row_info->color_type == PNG_COLOR_TYPE_GRAY ||
-         (row_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA &&
-         (flags & PNG_FLAG_STRIP_ALPHA))) &&
-          row_info->channels == 2)
-      {
-         if (row_info->bit_depth == 8)
-         {
-            if (flags & PNG_FLAG_FILLER_AFTER)
-            {
-               /* This converts from GX or GA to G */
-               for (i = 0; i < row_width; i++)
-               {
-                  *dp++ = *sp++;
-                  sp++;
-               }
-            }
-
-            else
-            {
-               /* This converts from XG or AG to G */
-               for (i = 0; i < row_width; i++)
-               {
-                  sp++;
-                  *dp++ = *sp++;
-               }
-            }
-
-            row_info->pixel_depth = 8;
-            row_info->rowbytes = row_width;
-         }
-
-         else /* if (row_info->bit_depth == 16) */
-         {
-            if (flags & PNG_FLAG_FILLER_AFTER)
-            {
-               /* This converts from GGXX or GGAA to GG */
-               sp += 4; dp += 2;
-               for (i = 1; i < row_width; i++)
-               {
-                  *dp++ = *sp++;
-                  *dp++ = *sp++;
-                  sp += 2;
-               }
-            }
-
-            else
-            {
-               /* This converts from XXGG or AAGG to GG */
-               for (i = 0; i < row_width; i++)
-               {
-                  sp += 2;
-                  *dp++ = *sp++;
-                  *dp++ = *sp++;
-               }
-            }
-
-            row_info->pixel_depth = 16;
-            row_info->rowbytes = row_width * 2;
-         }
-         row_info->channels = 1;
-      }
-
-      if (flags & PNG_FLAG_STRIP_ALPHA)
-        row_info->color_type = (png_byte)(row_info->color_type &
-            ~PNG_COLOR_MASK_ALPHA);
-   }
-}
-#endif
-
-#if defined(PNG_READ_BGR_SUPPORTED) || defined(PNG_WRITE_BGR_SUPPORTED)
-/* Swaps red and blue bytes within a pixel */
-void /* PRIVATE */
-png_do_bgr(png_row_infop row_info, png_bytep row)
-{
-   png_debug(1, "in png_do_bgr");
-
-   if ((row_info->color_type & PNG_COLOR_MASK_COLOR))
-   {
-      png_uint_32 row_width = row_info->width;
-      if (row_info->bit_depth == 8)
-      {
-         if (row_info->color_type == PNG_COLOR_TYPE_RGB)
-         {
-            png_bytep rp;
-            png_uint_32 i;
-
-            for (i = 0, rp = row; i < row_width; i++, rp += 3)
-            {
-               png_byte save = *rp;
-               *rp = *(rp + 2);
-               *(rp + 2) = save;
-            }
-         }
-
-         else if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
-         {
-            png_bytep rp;
-            png_uint_32 i;
-
-            for (i = 0, rp = row; i < row_width; i++, rp += 4)
-            {
-               png_byte save = *rp;
-               *rp = *(rp + 2);
-               *(rp + 2) = save;
-            }
-         }
-      }
-
-#ifdef PNG_16BIT_SUPPORTED
-      else if (row_info->bit_depth == 16)
-      {
-         if (row_info->color_type == PNG_COLOR_TYPE_RGB)
-         {
-            png_bytep rp;
-            png_uint_32 i;
-
-            for (i = 0, rp = row; i < row_width; i++, rp += 6)
-            {
-               png_byte save = *rp;
-               *rp = *(rp + 4);
-               *(rp + 4) = save;
-               save = *(rp + 1);
-               *(rp + 1) = *(rp + 5);
-               *(rp + 5) = save;
-            }
-         }
-
-         else if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
-         {
-            png_bytep rp;
-            png_uint_32 i;
-
-            for (i = 0, rp = row; i < row_width; i++, rp += 8)
-            {
-               png_byte save = *rp;
-               *rp = *(rp + 4);
-               *(rp + 4) = save;
-               save = *(rp + 1);
-               *(rp + 1) = *(rp + 5);
-               *(rp + 5) = save;
-            }
-         }
-      }
-#endif
-   }
-}
-#endif /* PNG_READ_BGR_SUPPORTED or PNG_WRITE_BGR_SUPPORTED */
-
-#if defined(PNG_READ_USER_TRANSFORM_SUPPORTED) || \
-    defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED)
-#ifdef PNG_USER_TRANSFORM_PTR_SUPPORTED
-void PNGAPI
-png_set_user_transform_info(png_structp png_ptr, png_voidp
-   user_transform_ptr, int user_transform_depth, int user_transform_channels)
-{
-   png_debug(1, "in png_set_user_transform_info");
-
-   if (png_ptr == NULL)
-      return;
-   png_ptr->user_transform_ptr = user_transform_ptr;
-   png_ptr->user_transform_depth = (png_byte)user_transform_depth;
-   png_ptr->user_transform_channels = (png_byte)user_transform_channels;
-}
-#endif
-
-/* This function returns a pointer to the user_transform_ptr associated with
- * the user transform functions.  The application should free any memory
- * associated with this pointer before png_write_destroy and png_read_destroy
- * are called.
- */
-#ifdef PNG_USER_TRANSFORM_PTR_SUPPORTED
-png_voidp PNGAPI
-png_get_user_transform_ptr(png_const_structp png_ptr)
-{
-   if (png_ptr == NULL)
-      return (NULL);
-
-   return ((png_voidp)png_ptr->user_transform_ptr);
-}
-#endif
-
-png_uint_32 PNGAPI
-png_get_current_row_number(png_const_structp png_ptr)
-{
-   if (png_ptr != NULL)
-      return png_ptr->row_number;
-   return PNG_UINT_32_MAX; /* help the app not to fail silently */
-}
-
-png_byte PNGAPI
-png_get_current_pass_number(png_const_structp png_ptr)
-{
-   if (png_ptr != NULL)
-      return png_ptr->pass;
-   return 8; /* invalid */
-}
-#endif /* PNG_READ_USER_TRANSFORM_SUPPORTED ||
-          PNG_WRITE_USER_TRANSFORM_SUPPORTED */
-#endif /* PNG_READ_SUPPORTED || PNG_WRITE_SUPPORTED */
+
+/* pngtrans.c - transforms the data in a row (used by both readers and writers)
+ *
+ * Last changed in libpng 1.2.41 [December 3, 2009]
+ * Copyright (c) 1998-2009 Glenn Randers-Pehrson
+ * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
+ * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
+ *
+ * This code is released under the libpng license.
+ * For conditions of distribution and use, see the disclaimer
+ * and license in png.h
+ */
+
+#define PNG_INTERNAL
+#define PNG_NO_PEDANTIC_WARNINGS
+#include "png.h"
+#if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED)
+
+#if defined(PNG_READ_BGR_SUPPORTED) || defined(PNG_WRITE_BGR_SUPPORTED)
+/* Turn on BGR-to-RGB mapping */
+void PNGAPI
+png_set_bgr(png_structp png_ptr)
+{
+   png_debug(1, "in png_set_bgr");
+
+   if (png_ptr == NULL)
+      return;
+   png_ptr->transformations |= PNG_BGR;
+}
+#endif
+
+#if defined(PNG_READ_SWAP_SUPPORTED) || defined(PNG_WRITE_SWAP_SUPPORTED)
+/* Turn on 16 bit byte swapping */
+void PNGAPI
+png_set_swap(png_structp png_ptr)
+{
+   png_debug(1, "in png_set_swap");
+
+   if (png_ptr == NULL)
+      return;
+   if (png_ptr->bit_depth == 16)
+      png_ptr->transformations |= PNG_SWAP_BYTES;
+}
+#endif
+
+#if defined(PNG_READ_PACK_SUPPORTED) || defined(PNG_WRITE_PACK_SUPPORTED)
+/* Turn on pixel packing */
+void PNGAPI
+png_set_packing(png_structp png_ptr)
+{
+   png_debug(1, "in png_set_packing");
+
+   if (png_ptr == NULL)
+      return;
+   if (png_ptr->bit_depth < 8)
+   {
+      png_ptr->transformations |= PNG_PACK;
+      png_ptr->usr_bit_depth = 8;
+   }
+}
+#endif
+
+#if defined(PNG_READ_PACKSWAP_SUPPORTED)||defined(PNG_WRITE_PACKSWAP_SUPPORTED)
+/* Turn on packed pixel swapping */
+void PNGAPI
+png_set_packswap(png_structp png_ptr)
+{
+   png_debug(1, "in png_set_packswap");
+
+   if (png_ptr == NULL)
+      return;
+   if (png_ptr->bit_depth < 8)
+      png_ptr->transformations |= PNG_PACKSWAP;
+}
+#endif
+
+#if defined(PNG_READ_SHIFT_SUPPORTED) || defined(PNG_WRITE_SHIFT_SUPPORTED)
+void PNGAPI
+png_set_shift(png_structp png_ptr, png_color_8p true_bits)
+{
+   png_debug(1, "in png_set_shift");
+
+   if (png_ptr == NULL)
+      return;
+   png_ptr->transformations |= PNG_SHIFT;
+   png_ptr->shift = *true_bits;
+}
+#endif
+
+#if defined(PNG_READ_INTERLACING_SUPPORTED) || \
+    defined(PNG_WRITE_INTERLACING_SUPPORTED)
+int PNGAPI
+png_set_interlace_handling(png_structp png_ptr)
+{
+   png_debug(1, "in png_set_interlace handling");
+
+   if (png_ptr && png_ptr->interlaced)
+   {
+      png_ptr->transformations |= PNG_INTERLACE;
+      return (7);
+   }
+
+   return (1);
+}
+#endif
+
+#if defined(PNG_READ_FILLER_SUPPORTED) || defined(PNG_WRITE_FILLER_SUPPORTED)
+/* Add a filler byte on read, or remove a filler or alpha byte on write.
+ * The filler type has changed in v0.95 to allow future 2-byte fillers
+ * for 48-bit input data, as well as to avoid problems with some compilers
+ * that don't like bytes as parameters.
+ */
+void PNGAPI
+png_set_filler(png_structp png_ptr, png_uint_32 filler, int filler_loc)
+{
+   png_debug(1, "in png_set_filler");
+
+   if (png_ptr == NULL)
+      return;
+   png_ptr->transformations |= PNG_FILLER;
+#ifdef PNG_LEGACY_SUPPORTED
+   png_ptr->filler = (png_byte)filler;
+#else
+   png_ptr->filler = (png_uint_16)filler;
+#endif
+   if (filler_loc == PNG_FILLER_AFTER)
+      png_ptr->flags |= PNG_FLAG_FILLER_AFTER;
+   else
+      png_ptr->flags &= ~PNG_FLAG_FILLER_AFTER;
+
+   /* This should probably go in the "do_read_filler" routine.
+    * I attempted to do that in libpng-1.0.1a but that caused problems
+    * so I restored it in libpng-1.0.2a
+   */
+
+   if (png_ptr->color_type == PNG_COLOR_TYPE_RGB)
+   {
+      png_ptr->usr_channels = 4;
+   }
+
+   /* Also I added this in libpng-1.0.2a (what happens when we expand
+    * a less-than-8-bit grayscale to GA? */
+
+   if (png_ptr->color_type == PNG_COLOR_TYPE_GRAY && png_ptr->bit_depth >= 8)
+   {
+      png_ptr->usr_channels = 2;
+   }
+}
+
+#ifndef PNG_1_0_X
+/* Added to libpng-1.2.7 */
+void PNGAPI
+png_set_add_alpha(png_structp png_ptr, png_uint_32 filler, int filler_loc)
+{
+   png_debug(1, "in png_set_add_alpha");
+
+   if (png_ptr == NULL)
+      return;
+   png_set_filler(png_ptr, filler, filler_loc);
+   png_ptr->transformations |= PNG_ADD_ALPHA;
+}
+#endif
+
+#endif
+
+#if defined(PNG_READ_SWAP_ALPHA_SUPPORTED) || \
+    defined(PNG_WRITE_SWAP_ALPHA_SUPPORTED)
+void PNGAPI
+png_set_swap_alpha(png_structp png_ptr)
+{
+   png_debug(1, "in png_set_swap_alpha");
+
+   if (png_ptr == NULL)
+      return;
+   png_ptr->transformations |= PNG_SWAP_ALPHA;
+}
+#endif
+
+#if defined(PNG_READ_INVERT_ALPHA_SUPPORTED) || \
+    defined(PNG_WRITE_INVERT_ALPHA_SUPPORTED)
+void PNGAPI
+png_set_invert_alpha(png_structp png_ptr)
+{
+   png_debug(1, "in png_set_invert_alpha");
+
+   if (png_ptr == NULL)
+      return;
+   png_ptr->transformations |= PNG_INVERT_ALPHA;
+}
+#endif
+
+#if defined(PNG_READ_INVERT_SUPPORTED) || defined(PNG_WRITE_INVERT_SUPPORTED)
+void PNGAPI
+png_set_invert_mono(png_structp png_ptr)
+{
+   png_debug(1, "in png_set_invert_mono");
+
+   if (png_ptr == NULL)
+      return;
+   png_ptr->transformations |= PNG_INVERT_MONO;
+}
+
+/* Invert monochrome grayscale data */
+void /* PRIVATE */
+png_do_invert(png_row_infop row_info, png_bytep row)
+{
+   png_debug(1, "in png_do_invert");
+
+  /* This test removed from libpng version 1.0.13 and 1.2.0:
+   *   if (row_info->bit_depth == 1 &&
+   */
+#ifdef PNG_USELESS_TESTS_SUPPORTED
+   if (row == NULL || row_info == NULL)
+     return;
+#endif
+   if (row_info->color_type == PNG_COLOR_TYPE_GRAY)
+   {
+      png_bytep rp = row;
+      png_uint_32 i;
+      png_uint_32 istop = row_info->rowbytes;
+
+      for (i = 0; i < istop; i++)
+      {
+         *rp = (png_byte)(~(*rp));
+         rp++;
+      }
+   }
+   else if (row_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA &&
+      row_info->bit_depth == 8)
+   {
+      png_bytep rp = row;
+      png_uint_32 i;
+      png_uint_32 istop = row_info->rowbytes;
+
+      for (i = 0; i < istop; i+=2)
+      {
+         *rp = (png_byte)(~(*rp));
+         rp+=2;
+      }
+   }
+   else if (row_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA &&
+      row_info->bit_depth == 16)
+   {
+      png_bytep rp = row;
+      png_uint_32 i;
+      png_uint_32 istop = row_info->rowbytes;
+
+      for (i = 0; i < istop; i+=4)
+      {
+         *rp = (png_byte)(~(*rp));
+         *(rp+1) = (png_byte)(~(*(rp+1)));
+         rp+=4;
+      }
+   }
+}
+#endif
+
+#if defined(PNG_READ_SWAP_SUPPORTED) || defined(PNG_WRITE_SWAP_SUPPORTED)
+/* Swaps byte order on 16 bit depth images */
+void /* PRIVATE */
+png_do_swap(png_row_infop row_info, png_bytep row)
+{
+   png_debug(1, "in png_do_swap");
+
+   if (
+#ifdef PNG_USELESS_TESTS_SUPPORTED
+       row != NULL && row_info != NULL &&
+#endif
+       row_info->bit_depth == 16)
+   {
+      png_bytep rp = row;
+      png_uint_32 i;
+      png_uint_32 istop= row_info->width * row_info->channels;
+
+      for (i = 0; i < istop; i++, rp += 2)
+      {
+         png_byte t = *rp;
+         *rp = *(rp + 1);
+         *(rp + 1) = t;
+      }
+   }
+}
+#endif
+
+#if defined(PNG_READ_PACKSWAP_SUPPORTED)||defined(PNG_WRITE_PACKSWAP_SUPPORTED)
+static PNG_CONST png_byte onebppswaptable[256] = {
+   0x00, 0x80, 0x40, 0xC0, 0x20, 0xA0, 0x60, 0xE0,
+   0x10, 0x90, 0x50, 0xD0, 0x30, 0xB0, 0x70, 0xF0,
+   0x08, 0x88, 0x48, 0xC8, 0x28, 0xA8, 0x68, 0xE8,
+   0x18, 0x98, 0x58, 0xD8, 0x38, 0xB8, 0x78, 0xF8,
+   0x04, 0x84, 0x44, 0xC4, 0x24, 0xA4, 0x64, 0xE4,
+   0x14, 0x94, 0x54, 0xD4, 0x34, 0xB4, 0x74, 0xF4,
+   0x0C, 0x8C, 0x4C, 0xCC, 0x2C, 0xAC, 0x6C, 0xEC,
+   0x1C, 0x9C, 0x5C, 0xDC, 0x3C, 0xBC, 0x7C, 0xFC,
+   0x02, 0x82, 0x42, 0xC2, 0x22, 0xA2, 0x62, 0xE2,
+   0x12, 0x92, 0x52, 0xD2, 0x32, 0xB2, 0x72, 0xF2,
+   0x0A, 0x8A, 0x4A, 0xCA, 0x2A, 0xAA, 0x6A, 0xEA,
+   0x1A, 0x9A, 0x5A, 0xDA, 0x3A, 0xBA, 0x7A, 0xFA,
+   0x06, 0x86, 0x46, 0xC6, 0x26, 0xA6, 0x66, 0xE6,
+   0x16, 0x96, 0x56, 0xD6, 0x36, 0xB6, 0x76, 0xF6,
+   0x0E, 0x8E, 0x4E, 0xCE, 0x2E, 0xAE, 0x6E, 0xEE,
+   0x1E, 0x9E, 0x5E, 0xDE, 0x3E, 0xBE, 0x7E, 0xFE,
+   0x01, 0x81, 0x41, 0xC1, 0x21, 0xA1, 0x61, 0xE1,
+   0x11, 0x91, 0x51, 0xD1, 0x31, 0xB1, 0x71, 0xF1,
+   0x09, 0x89, 0x49, 0xC9, 0x29, 0xA9, 0x69, 0xE9,
+   0x19, 0x99, 0x59, 0xD9, 0x39, 0xB9, 0x79, 0xF9,
+   0x05, 0x85, 0x45, 0xC5, 0x25, 0xA5, 0x65, 0xE5,
+   0x15, 0x95, 0x55, 0xD5, 0x35, 0xB5, 0x75, 0xF5,
+   0x0D, 0x8D, 0x4D, 0xCD, 0x2D, 0xAD, 0x6D, 0xED,
+   0x1D, 0x9D, 0x5D, 0xDD, 0x3D, 0xBD, 0x7D, 0xFD,
+   0x03, 0x83, 0x43, 0xC3, 0x23, 0xA3, 0x63, 0xE3,
+   0x13, 0x93, 0x53, 0xD3, 0x33, 0xB3, 0x73, 0xF3,
+   0x0B, 0x8B, 0x4B, 0xCB, 0x2B, 0xAB, 0x6B, 0xEB,
+   0x1B, 0x9B, 0x5B, 0xDB, 0x3B, 0xBB, 0x7B, 0xFB,
+   0x07, 0x87, 0x47, 0xC7, 0x27, 0xA7, 0x67, 0xE7,
+   0x17, 0x97, 0x57, 0xD7, 0x37, 0xB7, 0x77, 0xF7,
+   0x0F, 0x8F, 0x4F, 0xCF, 0x2F, 0xAF, 0x6F, 0xEF,
+   0x1F, 0x9F, 0x5F, 0xDF, 0x3F, 0xBF, 0x7F, 0xFF
+};
+
+static PNG_CONST png_byte twobppswaptable[256] = {
+   0x00, 0x40, 0x80, 0xC0, 0x10, 0x50, 0x90, 0xD0,
+   0x20, 0x60, 0xA0, 0xE0, 0x30, 0x70, 0xB0, 0xF0,
+   0x04, 0x44, 0x84, 0xC4, 0x14, 0x54, 0x94, 0xD4,
+   0x24, 0x64, 0xA4, 0xE4, 0x34, 0x74, 0xB4, 0xF4,
+   0x08, 0x48, 0x88, 0xC8, 0x18, 0x58, 0x98, 0xD8,
+   0x28, 0x68, 0xA8, 0xE8, 0x38, 0x78, 0xB8, 0xF8,
+   0x0C, 0x4C, 0x8C, 0xCC, 0x1C, 0x5C, 0x9C, 0xDC,
+   0x2C, 0x6C, 0xAC, 0xEC, 0x3C, 0x7C, 0xBC, 0xFC,
+   0x01, 0x41, 0x81, 0xC1, 0x11, 0x51, 0x91, 0xD1,
+   0x21, 0x61, 0xA1, 0xE1, 0x31, 0x71, 0xB1, 0xF1,
+   0x05, 0x45, 0x85, 0xC5, 0x15, 0x55, 0x95, 0xD5,
+   0x25, 0x65, 0xA5, 0xE5, 0x35, 0x75, 0xB5, 0xF5,
+   0x09, 0x49, 0x89, 0xC9, 0x19, 0x59, 0x99, 0xD9,
+   0x29, 0x69, 0xA9, 0xE9, 0x39, 0x79, 0xB9, 0xF9,
+   0x0D, 0x4D, 0x8D, 0xCD, 0x1D, 0x5D, 0x9D, 0xDD,
+   0x2D, 0x6D, 0xAD, 0xED, 0x3D, 0x7D, 0xBD, 0xFD,
+   0x02, 0x42, 0x82, 0xC2, 0x12, 0x52, 0x92, 0xD2,
+   0x22, 0x62, 0xA2, 0xE2, 0x32, 0x72, 0xB2, 0xF2,
+   0x06, 0x46, 0x86, 0xC6, 0x16, 0x56, 0x96, 0xD6,
+   0x26, 0x66, 0xA6, 0xE6, 0x36, 0x76, 0xB6, 0xF6,
+   0x0A, 0x4A, 0x8A, 0xCA, 0x1A, 0x5A, 0x9A, 0xDA,
+   0x2A, 0x6A, 0xAA, 0xEA, 0x3A, 0x7A, 0xBA, 0xFA,
+   0x0E, 0x4E, 0x8E, 0xCE, 0x1E, 0x5E, 0x9E, 0xDE,
+   0x2E, 0x6E, 0xAE, 0xEE, 0x3E, 0x7E, 0xBE, 0xFE,
+   0x03, 0x43, 0x83, 0xC3, 0x13, 0x53, 0x93, 0xD3,
+   0x23, 0x63, 0xA3, 0xE3, 0x33, 0x73, 0xB3, 0xF3,
+   0x07, 0x47, 0x87, 0xC7, 0x17, 0x57, 0x97, 0xD7,
+   0x27, 0x67, 0xA7, 0xE7, 0x37, 0x77, 0xB7, 0xF7,
+   0x0B, 0x4B, 0x8B, 0xCB, 0x1B, 0x5B, 0x9B, 0xDB,
+   0x2B, 0x6B, 0xAB, 0xEB, 0x3B, 0x7B, 0xBB, 0xFB,
+   0x0F, 0x4F, 0x8F, 0xCF, 0x1F, 0x5F, 0x9F, 0xDF,
+   0x2F, 0x6F, 0xAF, 0xEF, 0x3F, 0x7F, 0xBF, 0xFF
+};
+
+static PNG_CONST png_byte fourbppswaptable[256] = {
+   0x00, 0x10, 0x20, 0x30, 0x40, 0x50, 0x60, 0x70,
+   0x80, 0x90, 0xA0, 0xB0, 0xC0, 0xD0, 0xE0, 0xF0,
+   0x01, 0x11, 0x21, 0x31, 0x41, 0x51, 0x61, 0x71,
+   0x81, 0x91, 0xA1, 0xB1, 0xC1, 0xD1, 0xE1, 0xF1,
+   0x02, 0x12, 0x22, 0x32, 0x42, 0x52, 0x62, 0x72,
+   0x82, 0x92, 0xA2, 0xB2, 0xC2, 0xD2, 0xE2, 0xF2,
+   0x03, 0x13, 0x23, 0x33, 0x43, 0x53, 0x63, 0x73,
+   0x83, 0x93, 0xA3, 0xB3, 0xC3, 0xD3, 0xE3, 0xF3,
+   0x04, 0x14, 0x24, 0x34, 0x44, 0x54, 0x64, 0x74,
+   0x84, 0x94, 0xA4, 0xB4, 0xC4, 0xD4, 0xE4, 0xF4,
+   0x05, 0x15, 0x25, 0x35, 0x45, 0x55, 0x65, 0x75,
+   0x85, 0x95, 0xA5, 0xB5, 0xC5, 0xD5, 0xE5, 0xF5,
+   0x06, 0x16, 0x26, 0x36, 0x46, 0x56, 0x66, 0x76,
+   0x86, 0x96, 0xA6, 0xB6, 0xC6, 0xD6, 0xE6, 0xF6,
+   0x07, 0x17, 0x27, 0x37, 0x47, 0x57, 0x67, 0x77,
+   0x87, 0x97, 0xA7, 0xB7, 0xC7, 0xD7, 0xE7, 0xF7,
+   0x08, 0x18, 0x28, 0x38, 0x48, 0x58, 0x68, 0x78,
+   0x88, 0x98, 0xA8, 0xB8, 0xC8, 0xD8, 0xE8, 0xF8,
+   0x09, 0x19, 0x29, 0x39, 0x49, 0x59, 0x69, 0x79,
+   0x89, 0x99, 0xA9, 0xB9, 0xC9, 0xD9, 0xE9, 0xF9,
+   0x0A, 0x1A, 0x2A, 0x3A, 0x4A, 0x5A, 0x6A, 0x7A,
+   0x8A, 0x9A, 0xAA, 0xBA, 0xCA, 0xDA, 0xEA, 0xFA,
+   0x0B, 0x1B, 0x2B, 0x3B, 0x4B, 0x5B, 0x6B, 0x7B,
+   0x8B, 0x9B, 0xAB, 0xBB, 0xCB, 0xDB, 0xEB, 0xFB,
+   0x0C, 0x1C, 0x2C, 0x3C, 0x4C, 0x5C, 0x6C, 0x7C,
+   0x8C, 0x9C, 0xAC, 0xBC, 0xCC, 0xDC, 0xEC, 0xFC,
+   0x0D, 0x1D, 0x2D, 0x3D, 0x4D, 0x5D, 0x6D, 0x7D,
+   0x8D, 0x9D, 0xAD, 0xBD, 0xCD, 0xDD, 0xED, 0xFD,
+   0x0E, 0x1E, 0x2E, 0x3E, 0x4E, 0x5E, 0x6E, 0x7E,
+   0x8E, 0x9E, 0xAE, 0xBE, 0xCE, 0xDE, 0xEE, 0xFE,
+   0x0F, 0x1F, 0x2F, 0x3F, 0x4F, 0x5F, 0x6F, 0x7F,
+   0x8F, 0x9F, 0xAF, 0xBF, 0xCF, 0xDF, 0xEF, 0xFF
+};
+
+/* Swaps pixel packing order within bytes */
+void /* PRIVATE */
+png_do_packswap(png_row_infop row_info, png_bytep row)
+{
+   png_debug(1, "in png_do_packswap");
+
+   if (
+#ifdef PNG_USELESS_TESTS_SUPPORTED
+       row != NULL && row_info != NULL &&
+#endif
+       row_info->bit_depth < 8)
+   {
+      png_bytep rp, end, table;
+
+      end = row + row_info->rowbytes;
+
+      if (row_info->bit_depth == 1)
+         table = (png_bytep)onebppswaptable;
+      else if (row_info->bit_depth == 2)
+         table = (png_bytep)twobppswaptable;
+      else if (row_info->bit_depth == 4)
+         table = (png_bytep)fourbppswaptable;
+      else
+         return;
+
+      for (rp = row; rp < end; rp++)
+         *rp = table[*rp];
+   }
+}
+#endif /* PNG_READ_PACKSWAP_SUPPORTED or PNG_WRITE_PACKSWAP_SUPPORTED */
+
+#if defined(PNG_WRITE_FILLER_SUPPORTED) || \
+    defined(PNG_READ_STRIP_ALPHA_SUPPORTED)
+/* Remove filler or alpha byte(s) */
+void /* PRIVATE */
+png_do_strip_filler(png_row_infop row_info, png_bytep row, png_uint_32 flags)
+{
+   png_debug(1, "in png_do_strip_filler");
+
+#ifdef PNG_USELESS_TESTS_SUPPORTED
+   if (row != NULL && row_info != NULL)
+#endif
+   {
+      png_bytep sp=row;
+      png_bytep dp=row;
+      png_uint_32 row_width=row_info->width;
+      png_uint_32 i;
+
+      if ((row_info->color_type == PNG_COLOR_TYPE_RGB ||
+          (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA &&
+          (flags & PNG_FLAG_STRIP_ALPHA))) &&
+          row_info->channels == 4)
+      {
+         if (row_info->bit_depth == 8)
+         {
+            /* This converts from RGBX or RGBA to RGB */
+            if (flags & PNG_FLAG_FILLER_AFTER)
+            {
+               dp+=3; sp+=4;
+               for (i = 1; i < row_width; i++)
+               {
+                  *dp++ = *sp++;
+                  *dp++ = *sp++;
+                  *dp++ = *sp++;
+                  sp++;
+               }
+            }
+            /* This converts from XRGB or ARGB to RGB */
+            else
+            {
+               for (i = 0; i < row_width; i++)
+               {
+                  sp++;
+                  *dp++ = *sp++;
+                  *dp++ = *sp++;
+                  *dp++ = *sp++;
+               }
+            }
+            row_info->pixel_depth = 24;
+            row_info->rowbytes = row_width * 3;
+         }
+         else /* if (row_info->bit_depth == 16) */
+         {
+            if (flags & PNG_FLAG_FILLER_AFTER)
+            {
+               /* This converts from RRGGBBXX or RRGGBBAA to RRGGBB */
+               sp += 8; dp += 6;
+               for (i = 1; i < row_width; i++)
+               {
+                  /* This could be (although png_memcpy is probably slower):
+                  png_memcpy(dp, sp, 6);
+                  sp += 8;
+                  dp += 6;
+                  */
+
+                  *dp++ = *sp++;
+                  *dp++ = *sp++;
+                  *dp++ = *sp++;
+                  *dp++ = *sp++;
+                  *dp++ = *sp++;
+                  *dp++ = *sp++;
+                  sp += 2;
+               }
+            }
+            else
+            {
+               /* This converts from XXRRGGBB or AARRGGBB to RRGGBB */
+               for (i = 0; i < row_width; i++)
+               {
+                  /* This could be (although png_memcpy is probably slower):
+                  png_memcpy(dp, sp, 6);
+                  sp += 8;
+                  dp += 6;
+                  */
+
+                  sp+=2;
+                  *dp++ = *sp++;
+                  *dp++ = *sp++;
+                  *dp++ = *sp++;
+                  *dp++ = *sp++;
+                  *dp++ = *sp++;
+                  *dp++ = *sp++;
+               }
+            }
+            row_info->pixel_depth = 48;
+            row_info->rowbytes = row_width * 6;
+         }
+         row_info->channels = 3;
+      }
+      else if ((row_info->color_type == PNG_COLOR_TYPE_GRAY ||
+         (row_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA &&
+         (flags & PNG_FLAG_STRIP_ALPHA))) &&
+          row_info->channels == 2)
+      {
+         if (row_info->bit_depth == 8)
+         {
+            /* This converts from GX or GA to G */
+            if (flags & PNG_FLAG_FILLER_AFTER)
+            {
+               for (i = 0; i < row_width; i++)
+               {
+                  *dp++ = *sp++;
+                  sp++;
+               }
+            }
+            /* This converts from XG or AG to G */
+            else
+            {
+               for (i = 0; i < row_width; i++)
+               {
+                  sp++;
+                  *dp++ = *sp++;
+               }
+            }
+            row_info->pixel_depth = 8;
+            row_info->rowbytes = row_width;
+         }
+         else /* if (row_info->bit_depth == 16) */
+         {
+            if (flags & PNG_FLAG_FILLER_AFTER)
+            {
+               /* This converts from GGXX or GGAA to GG */
+               sp += 4; dp += 2;
+               for (i = 1; i < row_width; i++)
+               {
+                  *dp++ = *sp++;
+                  *dp++ = *sp++;
+                  sp += 2;
+               }
+            }
+            else
+            {
+               /* This converts from XXGG or AAGG to GG */
+               for (i = 0; i < row_width; i++)
+               {
+                  sp += 2;
+                  *dp++ = *sp++;
+                  *dp++ = *sp++;
+               }
+            }
+            row_info->pixel_depth = 16;
+            row_info->rowbytes = row_width * 2;
+         }
+         row_info->channels = 1;
+      }
+      if (flags & PNG_FLAG_STRIP_ALPHA)
+        row_info->color_type &= ~PNG_COLOR_MASK_ALPHA;
+   }
+}
+#endif
+
+#if defined(PNG_READ_BGR_SUPPORTED) || defined(PNG_WRITE_BGR_SUPPORTED)
+/* Swaps red and blue bytes within a pixel */
+void /* PRIVATE */
+png_do_bgr(png_row_infop row_info, png_bytep row)
+{
+   png_debug(1, "in png_do_bgr");
+
+   if (
+#ifdef PNG_USELESS_TESTS_SUPPORTED
+       row != NULL && row_info != NULL &&
+#endif
+       (row_info->color_type & PNG_COLOR_MASK_COLOR))
+   {
+      png_uint_32 row_width = row_info->width;
+      if (row_info->bit_depth == 8)
+      {
+         if (row_info->color_type == PNG_COLOR_TYPE_RGB)
+         {
+            png_bytep rp;
+            png_uint_32 i;
+
+            for (i = 0, rp = row; i < row_width; i++, rp += 3)
+            {
+               png_byte save = *rp;
+               *rp = *(rp + 2);
+               *(rp + 2) = save;
+            }
+         }
+         else if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
+         {
+            png_bytep rp;
+            png_uint_32 i;
+
+            for (i = 0, rp = row; i < row_width; i++, rp += 4)
+            {
+               png_byte save = *rp;
+               *rp = *(rp + 2);
+               *(rp + 2) = save;
+            }
+         }
+      }
+      else if (row_info->bit_depth == 16)
+      {
+         if (row_info->color_type == PNG_COLOR_TYPE_RGB)
+         {
+            png_bytep rp;
+            png_uint_32 i;
+
+            for (i = 0, rp = row; i < row_width; i++, rp += 6)
+            {
+               png_byte save = *rp;
+               *rp = *(rp + 4);
+               *(rp + 4) = save;
+               save = *(rp + 1);
+               *(rp + 1) = *(rp + 5);
+               *(rp + 5) = save;
+            }
+         }
+         else if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
+         {
+            png_bytep rp;
+            png_uint_32 i;
+
+            for (i = 0, rp = row; i < row_width; i++, rp += 8)
+            {
+               png_byte save = *rp;
+               *rp = *(rp + 4);
+               *(rp + 4) = save;
+               save = *(rp + 1);
+               *(rp + 1) = *(rp + 5);
+               *(rp + 5) = save;
+            }
+         }
+      }
+   }
+}
+#endif /* PNG_READ_BGR_SUPPORTED or PNG_WRITE_BGR_SUPPORTED */
+
+#if defined(PNG_READ_USER_TRANSFORM_SUPPORTED) || \
+    defined(PNG_LEGACY_SUPPORTED) || \
+    defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED)
+void PNGAPI
+png_set_user_transform_info(png_structp png_ptr, png_voidp
+   user_transform_ptr, int user_transform_depth, int user_transform_channels)
+{
+   png_debug(1, "in png_set_user_transform_info");
+
+   if (png_ptr == NULL)
+      return;
+#ifdef PNG_USER_TRANSFORM_PTR_SUPPORTED
+   png_ptr->user_transform_ptr = user_transform_ptr;
+   png_ptr->user_transform_depth = (png_byte)user_transform_depth;
+   png_ptr->user_transform_channels = (png_byte)user_transform_channels;
+#else
+   if (user_transform_ptr || user_transform_depth || user_transform_channels)
+      png_warning(png_ptr,
+        "This version of libpng does not support user transform info");
+#endif
+}
+#endif
+
+/* This function returns a pointer to the user_transform_ptr associated with
+ * the user transform functions.  The application should free any memory
+ * associated with this pointer before png_write_destroy and png_read_destroy
+ * are called.
+ */
+png_voidp PNGAPI
+png_get_user_transform_ptr(png_structp png_ptr)
+{
+   if (png_ptr == NULL)
+      return (NULL);
+#ifdef PNG_USER_TRANSFORM_PTR_SUPPORTED
+   return ((png_voidp)png_ptr->user_transform_ptr);
+#else
+   return (NULL);
+#endif
+}
+#endif /* PNG_READ_SUPPORTED || PNG_WRITE_SUPPORTED */
diff --git a/Externals/libpng/pngvcrd.c b/Externals/libpng/pngvcrd.c
new file mode 100644
index 0000000000..5792af3e43
--- /dev/null
+++ b/Externals/libpng/pngvcrd.c
@@ -0,0 +1,12 @@
+/* pngvcrd.c
+ *
+ * Last changed in libpng 1.2.48 [March 8, 2012]
+ * Copyright (c) 1998-2012 Glenn Randers-Pehrson
+ *
+ * This code is released under the libpng license.
+ * For conditions of distribution and use, see the disclaimer
+ * and license in png.h
+ *
+ * This nearly empty file is for use by configure's compilation test. The
+ * remainder of the file  was removed from libpng-1.2.20.
+ */
diff --git a/Externals/libpng/pngwio.c b/Externals/libpng/pngwio.c
index 95ffb3429f..9ca65d6fd6 100644
--- a/Externals/libpng/pngwio.c
+++ b/Externals/libpng/pngwio.c
@@ -1,254 +1,260 @@
-
-/* pngwio.c - functions for data output
- *
- * Last changed in libpng 1.5.0 [January 6, 2011]
- * Copyright (c) 1998-2011 Glenn Randers-Pehrson
- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
- *
- * This code is released under the libpng license.
- * For conditions of distribution and use, see the disclaimer
- * and license in png.h
- *
- * This file provides a location for all output.  Users who need
- * special handling are expected to write functions that have the same
- * arguments as these and perform similar functions, but that possibly
- * use different output methods.  Note that you shouldn't change these
- * functions, but rather write replacement functions and then change
- * them at run time with png_set_write_fn(...).
- */
-
-#include "pngpriv.h"
-
-#ifdef PNG_WRITE_SUPPORTED
-
-/* Write the data to whatever output you are using.  The default routine
- * writes to a file pointer.  Note that this routine sometimes gets called
- * with very small lengths, so you should implement some kind of simple
- * buffering if you are using unbuffered writes.  This should never be asked
- * to write more than 64K on a 16 bit machine.
- */
-
-void /* PRIVATE */
-png_write_data(png_structp png_ptr, png_const_bytep data, png_size_t length)
-{
-   /* NOTE: write_data_fn must not change the buffer! */
-   if (png_ptr->write_data_fn != NULL )
-      (*(png_ptr->write_data_fn))(png_ptr, (png_bytep)data, length);
-
-   else
-      png_error(png_ptr, "Call to NULL write function");
-}
-
-#ifdef PNG_STDIO_SUPPORTED
-/* This is the function that does the actual writing of data.  If you are
- * not writing to a standard C stream, you should create a replacement
- * write_data function and use it at run time with png_set_write_fn(), rather
- * than changing the library.
- */
-#ifndef USE_FAR_KEYWORD
-void PNGCBAPI
-png_default_write_data(png_structp png_ptr, png_bytep data, png_size_t length)
-{
-   png_size_t check;
-
-   if (png_ptr == NULL)
-      return;
-
-   check = fwrite(data, 1, length, (png_FILE_p)(png_ptr->io_ptr));
-
-   if (check != length)
-      png_error(png_ptr, "Write Error");
-}
-#else
-/* This is the model-independent version. Since the standard I/O library
- * can't handle far buffers in the medium and small models, we have to copy
- * the data.
- */
-
-#define NEAR_BUF_SIZE 1024
-#define MIN(a,b) (a <= b ? a : b)
-
-void PNGCBAPI
-png_default_write_data(png_structp png_ptr, png_bytep data, png_size_t length)
-{
-   png_uint_32 check;
-   png_byte *near_data;  /* Needs to be "png_byte *" instead of "png_bytep" */
-   png_FILE_p io_ptr;
-
-   if (png_ptr == NULL)
-      return;
-
-   /* Check if data really is near. If so, use usual code. */
-   near_data = (png_byte *)CVT_PTR_NOCHECK(data);
-   io_ptr = (png_FILE_p)CVT_PTR(png_ptr->io_ptr);
-
-   if ((png_bytep)near_data == data)
-   {
-      check = fwrite(near_data, 1, length, io_ptr);
-   }
-
-   else
-   {
-      png_byte buf[NEAR_BUF_SIZE];
-      png_size_t written, remaining, err;
-      check = 0;
-      remaining = length;
-
-      do
-      {
-         written = MIN(NEAR_BUF_SIZE, remaining);
-         png_memcpy(buf, data, written); /* Copy far buffer to near buffer */
-         err = fwrite(buf, 1, written, io_ptr);
-
-         if (err != written)
-            break;
-
-         else
-            check += err;
-
-         data += written;
-         remaining -= written;
-      }
-      while (remaining != 0);
-   }
-
-   if (check != length)
-      png_error(png_ptr, "Write Error");
-}
-
-#endif
-#endif
-
-/* This function is called to output any data pending writing (normally
- * to disk).  After png_flush is called, there should be no data pending
- * writing in any buffers.
- */
-#ifdef PNG_WRITE_FLUSH_SUPPORTED
-void /* PRIVATE */
-png_flush(png_structp png_ptr)
-{
-   if (png_ptr->output_flush_fn != NULL)
-      (*(png_ptr->output_flush_fn))(png_ptr);
-}
-
-#  ifdef PNG_STDIO_SUPPORTED
-void PNGCBAPI
-png_default_flush(png_structp png_ptr)
-{
-   png_FILE_p io_ptr;
-
-   if (png_ptr == NULL)
-      return;
-
-   io_ptr = (png_FILE_p)CVT_PTR((png_ptr->io_ptr));
-   fflush(io_ptr);
-}
-#  endif
-#endif
-
-/* This function allows the application to supply new output functions for
- * libpng if standard C streams aren't being used.
- *
- * This function takes as its arguments:
- * png_ptr       - pointer to a png output data structure
- * io_ptr        - pointer to user supplied structure containing info about
- *                 the output functions.  May be NULL.
- * write_data_fn - pointer to a new output function that takes as its
- *                 arguments a pointer to a png_struct, a pointer to
- *                 data to be written, and a 32-bit unsigned int that is
- *                 the number of bytes to be written.  The new write
- *                 function should call png_error(png_ptr, "Error msg")
- *                 to exit and output any fatal error messages.  May be
- *                 NULL, in which case libpng's default function will
- *                 be used.
- * flush_data_fn - pointer to a new flush function that takes as its
- *                 arguments a pointer to a png_struct.  After a call to
- *                 the flush function, there should be no data in any buffers
- *                 or pending transmission.  If the output method doesn't do
- *                 any buffering of output, a function prototype must still be
- *                 supplied although it doesn't have to do anything.  If
- *                 PNG_WRITE_FLUSH_SUPPORTED is not defined at libpng compile
- *                 time, output_flush_fn will be ignored, although it must be
- *                 supplied for compatibility.  May be NULL, in which case
- *                 libpng's default function will be used, if
- *                 PNG_WRITE_FLUSH_SUPPORTED is defined.  This is not
- *                 a good idea if io_ptr does not point to a standard
- *                 *FILE structure.
- */
-void PNGAPI
-png_set_write_fn(png_structp png_ptr, png_voidp io_ptr,
-    png_rw_ptr write_data_fn, png_flush_ptr output_flush_fn)
-{
-   if (png_ptr == NULL)
-      return;
-
-   png_ptr->io_ptr = io_ptr;
-
-#ifdef PNG_STDIO_SUPPORTED
-   if (write_data_fn != NULL)
-      png_ptr->write_data_fn = write_data_fn;
-
-   else
-      png_ptr->write_data_fn = png_default_write_data;
-#else
-   png_ptr->write_data_fn = write_data_fn;
-#endif
-
-#ifdef PNG_WRITE_FLUSH_SUPPORTED
-#  ifdef PNG_STDIO_SUPPORTED
-
-   if (output_flush_fn != NULL)
-      png_ptr->output_flush_fn = output_flush_fn;
-
-   else
-      png_ptr->output_flush_fn = png_default_flush;
-
-#  else
-   png_ptr->output_flush_fn = output_flush_fn;
-#  endif
-#endif /* PNG_WRITE_FLUSH_SUPPORTED */
-
-   /* It is an error to read while writing a png file */
-   if (png_ptr->read_data_fn != NULL)
-   {
-      png_ptr->read_data_fn = NULL;
-
-      png_warning(png_ptr,
-          "Can't set both read_data_fn and write_data_fn in the"
-          " same structure");
-   }
-}
-
-#ifdef USE_FAR_KEYWORD
-#  ifdef _MSC_VER
-void *png_far_to_near(png_structp png_ptr, png_voidp ptr, int check)
-{
-   void *near_ptr;
-   void FAR *far_ptr;
-   FP_OFF(near_ptr) = FP_OFF(ptr);
-   far_ptr = (void FAR *)near_ptr;
-
-   if (check != 0)
-      if (FP_SEG(ptr) != FP_SEG(far_ptr))
-         png_error(png_ptr, "segment lost in conversion");
-
-   return(near_ptr);
-}
-#  else
-void *png_far_to_near(png_structp png_ptr, png_voidp ptr, int check)
-{
-   void *near_ptr;
-   void FAR *far_ptr;
-   near_ptr = (void FAR *)ptr;
-   far_ptr = (void FAR *)near_ptr;
-
-   if (check != 0)
-      if (far_ptr != ptr)
-         png_error(png_ptr, "segment lost in conversion");
-
-   return(near_ptr);
-}
-#  endif
-#endif
-#endif /* PNG_WRITE_SUPPORTED */
+
+/* pngwio.c - functions for data output
+ *
+ * Last changed in libpng 1.2.41 [December 3, 2009]
+ * Copyright (c) 1998-2009 Glenn Randers-Pehrson
+ * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
+ * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
+ *
+ * This code is released under the libpng license.
+ * For conditions of distribution and use, see the disclaimer
+ * and license in png.h
+ *
+ * This file provides a location for all output.  Users who need
+ * special handling are expected to write functions that have the same
+ * arguments as these and perform similar functions, but that possibly
+ * use different output methods.  Note that you shouldn't change these
+ * functions, but rather write replacement functions and then change
+ * them at run time with png_set_write_fn(...).
+ */
+
+#define PNG_INTERNAL
+#define PNG_NO_PEDANTIC_WARNINGS
+#include "png.h"
+#ifdef PNG_WRITE_SUPPORTED
+
+/* Write the data to whatever output you are using.  The default routine
+ * writes to a file pointer.  Note that this routine sometimes gets called
+ * with very small lengths, so you should implement some kind of simple
+ * buffering if you are using unbuffered writes.  This should never be asked
+ * to write more than 64K on a 16 bit machine.
+ */
+
+void /* PRIVATE */
+png_write_data(png_structp png_ptr, png_bytep data, png_size_t length)
+{
+   if (png_ptr->write_data_fn != NULL )
+      (*(png_ptr->write_data_fn))(png_ptr, data, length);
+   else
+      png_error(png_ptr, "Call to NULL write function");
+}
+
+#ifdef PNG_STDIO_SUPPORTED
+/* This is the function that does the actual writing of data.  If you are
+ * not writing to a standard C stream, you should create a replacement
+ * write_data function and use it at run time with png_set_write_fn(), rather
+ * than changing the library.
+ */
+#ifndef USE_FAR_KEYWORD
+void PNGAPI
+png_default_write_data(png_structp png_ptr, png_bytep data, png_size_t length)
+{
+   png_uint_32 check;
+
+   if (png_ptr == NULL)
+      return;
+#ifdef _WIN32_WCE
+   if ( !WriteFile((HANDLE)(png_ptr->io_ptr), data, length, &check, NULL) )
+      check = 0;
+#else
+   check = fwrite(data, 1, length, (png_FILE_p)(png_ptr->io_ptr));
+#endif
+   if (check != length)
+      png_error(png_ptr, "Write Error");
+}
+#else
+/* This is the model-independent version. Since the standard I/O library
+ * can't handle far buffers in the medium and small models, we have to copy
+ * the data.
+ */
+
+#define NEAR_BUF_SIZE 1024
+#define MIN(a,b) (a <= b ? a : b)
+
+void PNGAPI
+png_default_write_data(png_structp png_ptr, png_bytep data, png_size_t length)
+{
+   png_uint_32 check;
+   png_byte *near_data;  /* Needs to be "png_byte *" instead of "png_bytep" */
+   png_FILE_p io_ptr;
+
+   if (png_ptr == NULL)
+      return;
+   /* Check if data really is near. If so, use usual code. */
+   near_data = (png_byte *)CVT_PTR_NOCHECK(data);
+   io_ptr = (png_FILE_p)CVT_PTR(png_ptr->io_ptr);
+   if ((png_bytep)near_data == data)
+   {
+#ifdef _WIN32_WCE
+      if ( !WriteFile(io_ptr, near_data, length, &check, NULL) )
+         check = 0;
+#else
+      check = fwrite(near_data, 1, length, io_ptr);
+#endif
+   }
+   else
+   {
+      png_byte buf[NEAR_BUF_SIZE];
+      png_size_t written, remaining, err;
+      check = 0;
+      remaining = length;
+      do
+      {
+         written = MIN(NEAR_BUF_SIZE, remaining);
+         png_memcpy(buf, data, written); /* Copy far buffer to near buffer */
+#ifdef _WIN32_WCE
+         if ( !WriteFile(io_ptr, buf, written, &err, NULL) )
+            err = 0;
+#else
+         err = fwrite(buf, 1, written, io_ptr);
+#endif
+         if (err != written)
+            break;
+
+         else
+            check += err;
+
+         data += written;
+         remaining -= written;
+      }
+      while (remaining != 0);
+   }
+   if (check != length)
+      png_error(png_ptr, "Write Error");
+}
+
+#endif
+#endif
+
+/* This function is called to output any data pending writing (normally
+ * to disk).  After png_flush is called, there should be no data pending
+ * writing in any buffers.
+ */
+#ifdef PNG_WRITE_FLUSH_SUPPORTED
+void /* PRIVATE */
+png_flush(png_structp png_ptr)
+{
+   if (png_ptr->output_flush_fn != NULL)
+      (*(png_ptr->output_flush_fn))(png_ptr);
+}
+
+#ifdef PNG_STDIO_SUPPORTED
+void PNGAPI
+png_default_flush(png_structp png_ptr)
+{
+#ifndef _WIN32_WCE
+   png_FILE_p io_ptr;
+#endif
+   if (png_ptr == NULL)
+      return;
+#ifndef _WIN32_WCE
+   io_ptr = (png_FILE_p)CVT_PTR((png_ptr->io_ptr));
+   fflush(io_ptr);
+#endif
+}
+#endif
+#endif
+
+/* This function allows the application to supply new output functions for
+ * libpng if standard C streams aren't being used.
+ *
+ * This function takes as its arguments:
+ * png_ptr       - pointer to a png output data structure
+ * io_ptr        - pointer to user supplied structure containing info about
+ *                 the output functions.  May be NULL.
+ * write_data_fn - pointer to a new output function that takes as its
+ *                 arguments a pointer to a png_struct, a pointer to
+ *                 data to be written, and a 32-bit unsigned int that is
+ *                 the number of bytes to be written.  The new write
+ *                 function should call png_error(png_ptr, "Error msg")
+ *                 to exit and output any fatal error messages.  May be
+ *                 NULL, in which case libpng's default function will
+ *                 be used.
+ * flush_data_fn - pointer to a new flush function that takes as its
+ *                 arguments a pointer to a png_struct.  After a call to
+ *                 the flush function, there should be no data in any buffers
+ *                 or pending transmission.  If the output method doesn't do
+ *                 any buffering of output, a function prototype must still be
+ *                 supplied although it doesn't have to do anything.  If
+ *                 PNG_WRITE_FLUSH_SUPPORTED is not defined at libpng compile
+ *                 time, output_flush_fn will be ignored, although it must be
+ *                 supplied for compatibility.  May be NULL, in which case
+ *                 libpng's default function will be used, if
+ *                 PNG_WRITE_FLUSH_SUPPORTED is defined.  This is not
+ *                 a good idea if io_ptr does not point to a standard
+ *                 *FILE structure.
+ */
+void PNGAPI
+png_set_write_fn(png_structp png_ptr, png_voidp io_ptr,
+   png_rw_ptr write_data_fn, png_flush_ptr output_flush_fn)
+{
+   if (png_ptr == NULL)
+      return;
+
+   png_ptr->io_ptr = io_ptr;
+
+#ifdef PNG_STDIO_SUPPORTED
+   if (write_data_fn != NULL)
+      png_ptr->write_data_fn = write_data_fn;
+
+   else
+      png_ptr->write_data_fn = png_default_write_data;
+#else
+   png_ptr->write_data_fn = write_data_fn;
+#endif
+
+#ifdef PNG_WRITE_FLUSH_SUPPORTED
+#ifdef PNG_STDIO_SUPPORTED
+   if (output_flush_fn != NULL)
+      png_ptr->output_flush_fn = output_flush_fn;
+
+   else
+      png_ptr->output_flush_fn = png_default_flush;
+#else
+   png_ptr->output_flush_fn = output_flush_fn;
+#endif
+#endif /* PNG_WRITE_FLUSH_SUPPORTED */
+
+   /* It is an error to read while writing a png file */
+   if (png_ptr->read_data_fn != NULL)
+   {
+      png_ptr->read_data_fn = NULL;
+      png_warning(png_ptr,
+         "Attempted to set both read_data_fn and write_data_fn in");
+      png_warning(png_ptr,
+         "the same structure.  Resetting read_data_fn to NULL.");
+   }
+}
+
+#ifdef USE_FAR_KEYWORD
+#ifdef _MSC_VER
+void *png_far_to_near(png_structp png_ptr, png_voidp ptr, int check)
+{
+   void *near_ptr;
+   void FAR *far_ptr;
+   FP_OFF(near_ptr) = FP_OFF(ptr);
+   far_ptr = (void FAR *)near_ptr;
+
+   if (check != 0)
+      if (FP_SEG(ptr) != FP_SEG(far_ptr))
+         png_error(png_ptr, "segment lost in conversion");
+
+   return(near_ptr);
+}
+#  else
+void *png_far_to_near(png_structp png_ptr, png_voidp ptr, int check)
+{
+   void *near_ptr;
+   void FAR *far_ptr;
+   near_ptr = (void FAR *)ptr;
+   far_ptr = (void FAR *)near_ptr;
+
+   if (check != 0)
+      if (far_ptr != ptr)
+         png_error(png_ptr, "segment lost in conversion");
+
+   return(near_ptr);
+}
+#   endif
+#   endif
+#endif /* PNG_WRITE_SUPPORTED */
diff --git a/Externals/libpng/pngwrite.c b/Externals/libpng/pngwrite.c
index d90f449e30..b392aa5439 100644
--- a/Externals/libpng/pngwrite.c
+++ b/Externals/libpng/pngwrite.c
@@ -1,1605 +1,1593 @@
-
-/* pngwrite.c - general routines to write a PNG file
- *
- * Last changed in libpng 1.5.1 [February 3, 2011]
- * Copyright (c) 1998-2011 Glenn Randers-Pehrson
- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
- *
- * This code is released under the libpng license.
- * For conditions of distribution and use, see the disclaimer
- * and license in png.h
- */
-
-#include "pngpriv.h"
-
-#ifdef PNG_WRITE_SUPPORTED
-
-/* Writes all the PNG information.  This is the suggested way to use the
- * library.  If you have a new chunk to add, make a function to write it,
- * and put it in the correct location here.  If you want the chunk written
- * after the image data, put it in png_write_end().  I strongly encourage
- * you to supply a PNG_INFO_ flag, and check info_ptr->valid before writing
- * the chunk, as that will keep the code from breaking if you want to just
- * write a plain PNG file.  If you have long comments, I suggest writing
- * them in png_write_end(), and compressing them.
- */
-void PNGAPI
-png_write_info_before_PLTE(png_structp png_ptr, png_infop info_ptr)
-{
-   png_debug(1, "in png_write_info_before_PLTE");
-
-   if (png_ptr == NULL || info_ptr == NULL)
-      return;
-
-   if (!(png_ptr->mode & PNG_WROTE_INFO_BEFORE_PLTE))
-   {
-   /* Write PNG signature */
-   png_write_sig(png_ptr);
-
-#ifdef PNG_MNG_FEATURES_SUPPORTED
-   if ((png_ptr->mode&PNG_HAVE_PNG_SIGNATURE) && \
-       (png_ptr->mng_features_permitted))
-   {
-      png_warning(png_ptr, "MNG features are not allowed in a PNG datastream");
-      png_ptr->mng_features_permitted = 0;
-   }
-#endif
-
-   /* Write IHDR information. */
-   png_write_IHDR(png_ptr, info_ptr->width, info_ptr->height,
-       info_ptr->bit_depth, info_ptr->color_type, info_ptr->compression_type,
-       info_ptr->filter_type,
-#ifdef PNG_WRITE_INTERLACING_SUPPORTED
-       info_ptr->interlace_type);
-#else
-       0);
-#endif
-   /* The rest of these check to see if the valid field has the appropriate
-    * flag set, and if it does, writes the chunk.
-    */
-#ifdef PNG_WRITE_gAMA_SUPPORTED
-   if (info_ptr->valid & PNG_INFO_gAMA)
-      png_write_gAMA_fixed(png_ptr, info_ptr->gamma);
-#endif
-#ifdef PNG_WRITE_sRGB_SUPPORTED
-   if (info_ptr->valid & PNG_INFO_sRGB)
-      png_write_sRGB(png_ptr, (int)info_ptr->srgb_intent);
-#endif
-
-#ifdef PNG_WRITE_iCCP_SUPPORTED
-   if (info_ptr->valid & PNG_INFO_iCCP)
-      png_write_iCCP(png_ptr, info_ptr->iccp_name, PNG_COMPRESSION_TYPE_BASE,
-          (png_charp)info_ptr->iccp_profile, (int)info_ptr->iccp_proflen);
-#endif
-#ifdef PNG_WRITE_sBIT_SUPPORTED
-   if (info_ptr->valid & PNG_INFO_sBIT)
-      png_write_sBIT(png_ptr, &(info_ptr->sig_bit), info_ptr->color_type);
-#endif
-#ifdef PNG_WRITE_cHRM_SUPPORTED
-   if (info_ptr->valid & PNG_INFO_cHRM)
-      png_write_cHRM_fixed(png_ptr,
-          info_ptr->x_white, info_ptr->y_white,
-          info_ptr->x_red, info_ptr->y_red,
-          info_ptr->x_green, info_ptr->y_green,
-          info_ptr->x_blue, info_ptr->y_blue);
-#endif
-
-#ifdef PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED
-   if (info_ptr->unknown_chunks_num)
-   {
-      png_unknown_chunk *up;
-
-      png_debug(5, "writing extra chunks");
-
-      for (up = info_ptr->unknown_chunks;
-           up < info_ptr->unknown_chunks + info_ptr->unknown_chunks_num;
-           up++)
-      {
-         int keep = png_handle_as_unknown(png_ptr, up->name);
-
-         if (keep != PNG_HANDLE_CHUNK_NEVER &&
-             up->location && !(up->location & PNG_HAVE_PLTE) &&
-             !(up->location & PNG_HAVE_IDAT) &&
-             ((up->name[3] & 0x20) || keep == PNG_HANDLE_CHUNK_ALWAYS ||
-             (png_ptr->flags & PNG_FLAG_KEEP_UNSAFE_CHUNKS)))
-         {
-            if (up->size == 0)
-               png_warning(png_ptr, "Writing zero-length unknown chunk");
-
-            png_write_chunk(png_ptr, up->name, up->data, up->size);
-         }
-      }
-   }
-#endif
-      png_ptr->mode |= PNG_WROTE_INFO_BEFORE_PLTE;
-   }
-}
-
-void PNGAPI
-png_write_info(png_structp png_ptr, png_infop info_ptr)
-{
-#if defined(PNG_WRITE_TEXT_SUPPORTED) || defined(PNG_WRITE_sPLT_SUPPORTED)
-   int i;
-#endif
-
-   png_debug(1, "in png_write_info");
-
-   if (png_ptr == NULL || info_ptr == NULL)
-      return;
-
-   png_write_info_before_PLTE(png_ptr, info_ptr);
-
-   if (info_ptr->valid & PNG_INFO_PLTE)
-      png_write_PLTE(png_ptr, info_ptr->palette,
-          (png_uint_32)info_ptr->num_palette);
-
-   else if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
-      png_error(png_ptr, "Valid palette required for paletted images");
-
-#ifdef PNG_WRITE_tRNS_SUPPORTED
-   if (info_ptr->valid & PNG_INFO_tRNS)
-   {
-#ifdef PNG_WRITE_INVERT_ALPHA_SUPPORTED
-      /* Invert the alpha channel (in tRNS) */
-      if ((png_ptr->transformations & PNG_INVERT_ALPHA) &&
-          info_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
-      {
-         int j;
-         for (j = 0; j<(int)info_ptr->num_trans; j++)
-            info_ptr->trans_alpha[j] =
-               (png_byte)(255 - info_ptr->trans_alpha[j]);
-      }
-#endif
-      png_write_tRNS(png_ptr, info_ptr->trans_alpha, &(info_ptr->trans_color),
-          info_ptr->num_trans, info_ptr->color_type);
-   }
-#endif
-#ifdef PNG_WRITE_bKGD_SUPPORTED
-   if (info_ptr->valid & PNG_INFO_bKGD)
-      png_write_bKGD(png_ptr, &(info_ptr->background), info_ptr->color_type);
-#endif
-
-#ifdef PNG_WRITE_hIST_SUPPORTED
-   if (info_ptr->valid & PNG_INFO_hIST)
-      png_write_hIST(png_ptr, info_ptr->hist, info_ptr->num_palette);
-#endif
-
-#ifdef PNG_WRITE_oFFs_SUPPORTED
-   if (info_ptr->valid & PNG_INFO_oFFs)
-      png_write_oFFs(png_ptr, info_ptr->x_offset, info_ptr->y_offset,
-          info_ptr->offset_unit_type);
-#endif
-
-#ifdef PNG_WRITE_pCAL_SUPPORTED
-   if (info_ptr->valid & PNG_INFO_pCAL)
-      png_write_pCAL(png_ptr, info_ptr->pcal_purpose, info_ptr->pcal_X0,
-          info_ptr->pcal_X1, info_ptr->pcal_type, info_ptr->pcal_nparams,
-          info_ptr->pcal_units, info_ptr->pcal_params);
-#endif
-
-#ifdef PNG_WRITE_sCAL_SUPPORTED
-   if (info_ptr->valid & PNG_INFO_sCAL)
-      png_write_sCAL_s(png_ptr, (int)info_ptr->scal_unit,
-          info_ptr->scal_s_width, info_ptr->scal_s_height);
-#endif /* sCAL */
-
-#ifdef PNG_WRITE_pHYs_SUPPORTED
-   if (info_ptr->valid & PNG_INFO_pHYs)
-      png_write_pHYs(png_ptr, info_ptr->x_pixels_per_unit,
-          info_ptr->y_pixels_per_unit, info_ptr->phys_unit_type);
-#endif /* pHYs */
-
-#ifdef PNG_WRITE_tIME_SUPPORTED
-   if (info_ptr->valid & PNG_INFO_tIME)
-   {
-      png_write_tIME(png_ptr, &(info_ptr->mod_time));
-      png_ptr->mode |= PNG_WROTE_tIME;
-   }
-#endif /* tIME */
-
-#ifdef PNG_WRITE_sPLT_SUPPORTED
-   if (info_ptr->valid & PNG_INFO_sPLT)
-      for (i = 0; i < (int)info_ptr->splt_palettes_num; i++)
-         png_write_sPLT(png_ptr, info_ptr->splt_palettes + i);
-#endif /* sPLT */
-
-#ifdef PNG_WRITE_TEXT_SUPPORTED
-   /* Check to see if we need to write text chunks */
-   for (i = 0; i < info_ptr->num_text; i++)
-   {
-      png_debug2(2, "Writing header text chunk %d, type %d", i,
-          info_ptr->text[i].compression);
-      /* An internationalized chunk? */
-      if (info_ptr->text[i].compression > 0)
-      {
-#ifdef PNG_WRITE_iTXt_SUPPORTED
-         /* Write international chunk */
-         png_write_iTXt(png_ptr,
-             info_ptr->text[i].compression,
-             info_ptr->text[i].key,
-             info_ptr->text[i].lang,
-             info_ptr->text[i].lang_key,
-             info_ptr->text[i].text);
-#else
-          png_warning(png_ptr, "Unable to write international text");
-#endif
-          /* Mark this chunk as written */
-          info_ptr->text[i].compression = PNG_TEXT_COMPRESSION_NONE_WR;
-      }
-
-      /* If we want a compressed text chunk */
-      else if (info_ptr->text[i].compression == PNG_TEXT_COMPRESSION_zTXt)
-      {
-#ifdef PNG_WRITE_zTXt_SUPPORTED
-         /* Write compressed chunk */
-         png_write_zTXt(png_ptr, info_ptr->text[i].key,
-             info_ptr->text[i].text, 0,
-             info_ptr->text[i].compression);
-#else
-         png_warning(png_ptr, "Unable to write compressed text");
-#endif
-         /* Mark this chunk as written */
-         info_ptr->text[i].compression = PNG_TEXT_COMPRESSION_zTXt_WR;
-      }
-
-      else if (info_ptr->text[i].compression == PNG_TEXT_COMPRESSION_NONE)
-      {
-#ifdef PNG_WRITE_tEXt_SUPPORTED
-         /* Write uncompressed chunk */
-         png_write_tEXt(png_ptr, info_ptr->text[i].key,
-             info_ptr->text[i].text,
-             0);
-         /* Mark this chunk as written */
-         info_ptr->text[i].compression = PNG_TEXT_COMPRESSION_NONE_WR;
-#else
-         /* Can't get here */
-         png_warning(png_ptr, "Unable to write uncompressed text");
-#endif
-      }
-   }
-#endif /* tEXt */
-
-#ifdef PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED
-   if (info_ptr->unknown_chunks_num)
-   {
-      png_unknown_chunk *up;
-
-      png_debug(5, "writing extra chunks");
-
-      for (up = info_ptr->unknown_chunks;
-           up < info_ptr->unknown_chunks + info_ptr->unknown_chunks_num;
-           up++)
-      {
-         int keep = png_handle_as_unknown(png_ptr, up->name);
-         if (keep != PNG_HANDLE_CHUNK_NEVER &&
-             up->location && (up->location & PNG_HAVE_PLTE) &&
-             !(up->location & PNG_HAVE_IDAT) &&
-             ((up->name[3] & 0x20) || keep == PNG_HANDLE_CHUNK_ALWAYS ||
-             (png_ptr->flags & PNG_FLAG_KEEP_UNSAFE_CHUNKS)))
-         {
-            png_write_chunk(png_ptr, up->name, up->data, up->size);
-         }
-      }
-   }
-#endif
-}
-
-/* Writes the end of the PNG file.  If you don't want to write comments or
- * time information, you can pass NULL for info.  If you already wrote these
- * in png_write_info(), do not write them again here.  If you have long
- * comments, I suggest writing them here, and compressing them.
- */
-void PNGAPI
-png_write_end(png_structp png_ptr, png_infop info_ptr)
-{
-   png_debug(1, "in png_write_end");
-
-   if (png_ptr == NULL)
-      return;
-
-   if (!(png_ptr->mode & PNG_HAVE_IDAT))
-      png_error(png_ptr, "No IDATs written into file");
-
-   /* See if user wants us to write information chunks */
-   if (info_ptr != NULL)
-   {
-#ifdef PNG_WRITE_TEXT_SUPPORTED
-      int i; /* local index variable */
-#endif
-#ifdef PNG_WRITE_tIME_SUPPORTED
-      /* Check to see if user has supplied a time chunk */
-      if ((info_ptr->valid & PNG_INFO_tIME) &&
-          !(png_ptr->mode & PNG_WROTE_tIME))
-         png_write_tIME(png_ptr, &(info_ptr->mod_time));
-
-#endif
-#ifdef PNG_WRITE_TEXT_SUPPORTED
-      /* Loop through comment chunks */
-      for (i = 0; i < info_ptr->num_text; i++)
-      {
-         png_debug2(2, "Writing trailer text chunk %d, type %d", i,
-            info_ptr->text[i].compression);
-         /* An internationalized chunk? */
-         if (info_ptr->text[i].compression > 0)
-         {
-#ifdef PNG_WRITE_iTXt_SUPPORTED
-            /* Write international chunk */
-            png_write_iTXt(png_ptr,
-                info_ptr->text[i].compression,
-                info_ptr->text[i].key,
-                info_ptr->text[i].lang,
-                info_ptr->text[i].lang_key,
-                info_ptr->text[i].text);
-#else
-            png_warning(png_ptr, "Unable to write international text");
-#endif
-            /* Mark this chunk as written */
-            info_ptr->text[i].compression = PNG_TEXT_COMPRESSION_NONE_WR;
-         }
-
-         else if (info_ptr->text[i].compression >= PNG_TEXT_COMPRESSION_zTXt)
-         {
-#ifdef PNG_WRITE_zTXt_SUPPORTED
-            /* Write compressed chunk */
-            png_write_zTXt(png_ptr, info_ptr->text[i].key,
-                info_ptr->text[i].text, 0,
-                info_ptr->text[i].compression);
-#else
-            png_warning(png_ptr, "Unable to write compressed text");
-#endif
-            /* Mark this chunk as written */
-            info_ptr->text[i].compression = PNG_TEXT_COMPRESSION_zTXt_WR;
-         }
-
-         else if (info_ptr->text[i].compression == PNG_TEXT_COMPRESSION_NONE)
-         {
-#ifdef PNG_WRITE_tEXt_SUPPORTED
-            /* Write uncompressed chunk */
-            png_write_tEXt(png_ptr, info_ptr->text[i].key,
-                info_ptr->text[i].text, 0);
-#else
-            png_warning(png_ptr, "Unable to write uncompressed text");
-#endif
-
-            /* Mark this chunk as written */
-            info_ptr->text[i].compression = PNG_TEXT_COMPRESSION_NONE_WR;
-         }
-      }
-#endif
-#ifdef PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED
-   if (info_ptr->unknown_chunks_num)
-   {
-      png_unknown_chunk *up;
-
-      png_debug(5, "writing extra chunks");
-
-      for (up = info_ptr->unknown_chunks;
-           up < info_ptr->unknown_chunks + info_ptr->unknown_chunks_num;
-           up++)
-      {
-         int keep = png_handle_as_unknown(png_ptr, up->name);
-         if (keep != PNG_HANDLE_CHUNK_NEVER &&
-             up->location && (up->location & PNG_AFTER_IDAT) &&
-             ((up->name[3] & 0x20) || keep == PNG_HANDLE_CHUNK_ALWAYS ||
-             (png_ptr->flags & PNG_FLAG_KEEP_UNSAFE_CHUNKS)))
-         {
-            png_write_chunk(png_ptr, up->name, up->data, up->size);
-         }
-      }
-   }
-#endif
-   }
-
-   png_ptr->mode |= PNG_AFTER_IDAT;
-
-   /* Write end of PNG file */
-   png_write_IEND(png_ptr);
-   /* This flush, added in libpng-1.0.8, removed from libpng-1.0.9beta03,
-    * and restored again in libpng-1.2.30, may cause some applications that
-    * do not set png_ptr->output_flush_fn to crash.  If your application
-    * experiences a problem, please try building libpng with
-    * PNG_WRITE_FLUSH_AFTER_IEND_SUPPORTED defined, and report the event to
-    * png-mng-implement at lists.sf.net .
-    */
-#ifdef PNG_WRITE_FLUSH_SUPPORTED
-#  ifdef PNG_WRITE_FLUSH_AFTER_IEND_SUPPORTED
-   png_flush(png_ptr);
-#  endif
-#endif
-}
-
-#ifdef PNG_CONVERT_tIME_SUPPORTED
-/* "tm" structure is not supported on WindowsCE */
-void PNGAPI
-png_convert_from_struct_tm(png_timep ptime, PNG_CONST struct tm FAR * ttime)
-{
-   png_debug(1, "in png_convert_from_struct_tm");
-
-   ptime->year = (png_uint_16)(1900 + ttime->tm_year);
-   ptime->month = (png_byte)(ttime->tm_mon + 1);
-   ptime->day = (png_byte)ttime->tm_mday;
-   ptime->hour = (png_byte)ttime->tm_hour;
-   ptime->minute = (png_byte)ttime->tm_min;
-   ptime->second = (png_byte)ttime->tm_sec;
-}
-
-void PNGAPI
-png_convert_from_time_t(png_timep ptime, time_t ttime)
-{
-   struct tm *tbuf;
-
-   png_debug(1, "in png_convert_from_time_t");
-
-   tbuf = gmtime(&ttime);
-   png_convert_from_struct_tm(ptime, tbuf);
-}
-#endif
-
-/* Initialize png_ptr structure, and allocate any memory needed */
-PNG_FUNCTION(png_structp,PNGAPI
-png_create_write_struct,(png_const_charp user_png_ver, png_voidp error_ptr,
-    png_error_ptr error_fn, png_error_ptr warn_fn),PNG_ALLOCATED)
-{
-#ifdef PNG_USER_MEM_SUPPORTED
-   return (png_create_write_struct_2(user_png_ver, error_ptr, error_fn,
-       warn_fn, NULL, NULL, NULL));
-}
-
-/* Alternate initialize png_ptr structure, and allocate any memory needed */
-static void png_reset_filter_heuristics(png_structp png_ptr); /* forward decl */
-
-PNG_FUNCTION(png_structp,PNGAPI
-png_create_write_struct_2,(png_const_charp user_png_ver, png_voidp error_ptr,
-    png_error_ptr error_fn, png_error_ptr warn_fn, png_voidp mem_ptr,
-    png_malloc_ptr malloc_fn, png_free_ptr free_fn),PNG_ALLOCATED)
-{
-#endif /* PNG_USER_MEM_SUPPORTED */
-   volatile int png_cleanup_needed = 0;
-#ifdef PNG_SETJMP_SUPPORTED
-   volatile
-#endif
-   png_structp png_ptr;
-#ifdef PNG_SETJMP_SUPPORTED
-#ifdef USE_FAR_KEYWORD
-   jmp_buf png_jmpbuf;
-#endif
-#endif
-   int i;
-
-   png_debug(1, "in png_create_write_struct");
-
-#ifdef PNG_USER_MEM_SUPPORTED
-   png_ptr = (png_structp)png_create_struct_2(PNG_STRUCT_PNG,
-       (png_malloc_ptr)malloc_fn, (png_voidp)mem_ptr);
-#else
-   png_ptr = (png_structp)png_create_struct(PNG_STRUCT_PNG);
-#endif /* PNG_USER_MEM_SUPPORTED */
-   if (png_ptr == NULL)
-      return (NULL);
-
-   /* Added at libpng-1.2.6 */
-#ifdef PNG_SET_USER_LIMITS_SUPPORTED
-   png_ptr->user_width_max = PNG_USER_WIDTH_MAX;
-   png_ptr->user_height_max = PNG_USER_HEIGHT_MAX;
-#endif
-
-#ifdef PNG_SETJMP_SUPPORTED
-/* Applications that neglect to set up their own setjmp() and then
-   encounter a png_error() will longjmp here.  Since the jmpbuf is
-   then meaningless we abort instead of returning. */
-#ifdef USE_FAR_KEYWORD
-   if (setjmp(png_jmpbuf))
-#else
-   if (setjmp(png_jmpbuf(png_ptr))) /* sets longjmp to match setjmp */
-#endif
-#ifdef USE_FAR_KEYWORD
-   png_memcpy(png_jmpbuf(png_ptr), png_jmpbuf, png_sizeof(jmp_buf));
-#endif
-      PNG_ABORT();
-#endif
-
-#ifdef PNG_USER_MEM_SUPPORTED
-   png_set_mem_fn(png_ptr, mem_ptr, malloc_fn, free_fn);
-#endif /* PNG_USER_MEM_SUPPORTED */
-   png_set_error_fn(png_ptr, error_ptr, error_fn, warn_fn);
-
-   if (user_png_ver)
-   {
-      i = 0;
-      do
-      {
-         if (user_png_ver[i] != png_libpng_ver[i])
-            png_ptr->flags |= PNG_FLAG_LIBRARY_MISMATCH;
-      } while (png_libpng_ver[i++]);
-   }
-
-   if (png_ptr->flags & PNG_FLAG_LIBRARY_MISMATCH)
-   {
-     /* Libpng 0.90 and later are binary incompatible with libpng 0.89, so
-      * we must recompile any applications that use any older library version.
-      * For versions after libpng 1.0, we will be compatible, so we need
-      * only check the first digit.
-      */
-     if (user_png_ver == NULL || user_png_ver[0] != png_libpng_ver[0] ||
-         (user_png_ver[0] == '1' && user_png_ver[2] != png_libpng_ver[2]) ||
-         (user_png_ver[0] == '0' && user_png_ver[2] < '9'))
-     {
-#ifdef PNG_CONSOLE_IO_SUPPORTED
-        char msg[80];
-
-        if (user_png_ver)
-        {
-            png_snprintf2(msg, 80,
-                "Application built with libpng-%.20s"
-                " but running with %.20s",
-                user_png_ver,
-                png_libpng_ver);
-            png_warning(png_ptr, msg);
-         }
-#else
-         png_warning(png_ptr,
-             "Incompatible libpng version in application and library");
-#endif
-#ifdef PNG_ERROR_NUMBERS_SUPPORTED
-        png_ptr->flags = 0;
-#endif
-        png_cleanup_needed = 1;
-     }
-   }
-
-   /* Initialize zbuf - compression buffer */
-   png_ptr->zbuf_size = PNG_ZBUF_SIZE;
-
-   if (!png_cleanup_needed)
-   {
-      png_ptr->zbuf = (png_bytep)png_malloc_warn(png_ptr,
-          png_ptr->zbuf_size);
-      if (png_ptr->zbuf == NULL)
-         png_cleanup_needed = 1;
-   }
-
-   if (png_cleanup_needed)
-   {
-       /* Clean up PNG structure and deallocate any memory. */
-       png_free(png_ptr, png_ptr->zbuf);
-       png_ptr->zbuf = NULL;
-#ifdef PNG_USER_MEM_SUPPORTED
-       png_destroy_struct_2((png_voidp)png_ptr,
-           (png_free_ptr)free_fn, (png_voidp)mem_ptr);
-#else
-       png_destroy_struct((png_voidp)png_ptr);
-#endif
-       return (NULL);
-   }
-
-   png_set_write_fn(png_ptr, NULL, NULL, NULL);
-
-#ifdef PNG_WRITE_WEIGHTED_FILTER_SUPPORTED
-   png_reset_filter_heuristics(png_ptr);
-#endif
-
-   return (png_ptr);
-}
-
-
-/* Write a few rows of image data.  If the image is interlaced,
- * either you will have to write the 7 sub images, or, if you
- * have called png_set_interlace_handling(), you will have to
- * "write" the image seven times.
- */
-void PNGAPI
-png_write_rows(png_structp png_ptr, png_bytepp row,
-    png_uint_32 num_rows)
-{
-   png_uint_32 i; /* row counter */
-   png_bytepp rp; /* row pointer */
-
-   png_debug(1, "in png_write_rows");
-
-   if (png_ptr == NULL)
-      return;
-
-   /* Loop through the rows */
-   for (i = 0, rp = row; i < num_rows; i++, rp++)
-   {
-      png_write_row(png_ptr, *rp);
-   }
-}
-
-/* Write the image.  You only need to call this function once, even
- * if you are writing an interlaced image.
- */
-void PNGAPI
-png_write_image(png_structp png_ptr, png_bytepp image)
-{
-   png_uint_32 i; /* row index */
-   int pass, num_pass; /* pass variables */
-   png_bytepp rp; /* points to current row */
-
-   if (png_ptr == NULL)
-      return;
-
-   png_debug(1, "in png_write_image");
-
-#ifdef PNG_WRITE_INTERLACING_SUPPORTED
-   /* Initialize interlace handling.  If image is not interlaced,
-    * this will set pass to 1
-    */
-   num_pass = png_set_interlace_handling(png_ptr);
-#else
-   num_pass = 1;
-#endif
-   /* Loop through passes */
-   for (pass = 0; pass < num_pass; pass++)
-   {
-      /* Loop through image */
-      for (i = 0, rp = image; i < png_ptr->height; i++, rp++)
-      {
-         png_write_row(png_ptr, *rp);
-      }
-   }
-}
-
-/* Called by user to write a row of image data */
-void PNGAPI
-png_write_row(png_structp png_ptr, png_const_bytep row)
-{
-   if (png_ptr == NULL)
-      return;
-
-   png_debug2(1, "in png_write_row (row %u, pass %d)",
-      png_ptr->row_number, png_ptr->pass);
-
-   /* Initialize transformations and other stuff if first time */
-   if (png_ptr->row_number == 0 && png_ptr->pass == 0)
-   {
-      /* Make sure we wrote the header info */
-      if (!(png_ptr->mode & PNG_WROTE_INFO_BEFORE_PLTE))
-         png_error(png_ptr,
-             "png_write_info was never called before png_write_row");
-
-      /* Check for transforms that have been set but were defined out */
-#if !defined(PNG_WRITE_INVERT_SUPPORTED) && defined(PNG_READ_INVERT_SUPPORTED)
-      if (png_ptr->transformations & PNG_INVERT_MONO)
-         png_warning(png_ptr, "PNG_WRITE_INVERT_SUPPORTED is not defined");
-#endif
-
-#if !defined(PNG_WRITE_FILLER_SUPPORTED) && defined(PNG_READ_FILLER_SUPPORTED)
-      if (png_ptr->transformations & PNG_FILLER)
-         png_warning(png_ptr, "PNG_WRITE_FILLER_SUPPORTED is not defined");
-#endif
-#if !defined(PNG_WRITE_PACKSWAP_SUPPORTED) && \
-    defined(PNG_READ_PACKSWAP_SUPPORTED)
-      if (png_ptr->transformations & PNG_PACKSWAP)
-         png_warning(png_ptr,
-             "PNG_WRITE_PACKSWAP_SUPPORTED is not defined");
-#endif
-
-#if !defined(PNG_WRITE_PACK_SUPPORTED) && defined(PNG_READ_PACK_SUPPORTED)
-      if (png_ptr->transformations & PNG_PACK)
-         png_warning(png_ptr, "PNG_WRITE_PACK_SUPPORTED is not defined");
-#endif
-
-#if !defined(PNG_WRITE_SHIFT_SUPPORTED) && defined(PNG_READ_SHIFT_SUPPORTED)
-      if (png_ptr->transformations & PNG_SHIFT)
-         png_warning(png_ptr, "PNG_WRITE_SHIFT_SUPPORTED is not defined");
-#endif
-
-#if !defined(PNG_WRITE_BGR_SUPPORTED) && defined(PNG_READ_BGR_SUPPORTED)
-      if (png_ptr->transformations & PNG_BGR)
-         png_warning(png_ptr, "PNG_WRITE_BGR_SUPPORTED is not defined");
-#endif
-
-#if !defined(PNG_WRITE_SWAP_SUPPORTED) && defined(PNG_READ_SWAP_SUPPORTED)
-      if (png_ptr->transformations & PNG_SWAP_BYTES)
-         png_warning(png_ptr, "PNG_WRITE_SWAP_SUPPORTED is not defined");
-#endif
-
-      png_write_start_row(png_ptr);
-   }
-
-#ifdef PNG_WRITE_INTERLACING_SUPPORTED
-   /* If interlaced and not interested in row, return */
-   if (png_ptr->interlaced && (png_ptr->transformations & PNG_INTERLACE))
-   {
-      switch (png_ptr->pass)
-      {
-         case 0:
-            if (png_ptr->row_number & 0x07)
-            {
-               png_write_finish_row(png_ptr);
-               return;
-            }
-            break;
-
-         case 1:
-            if ((png_ptr->row_number & 0x07) || png_ptr->width < 5)
-            {
-               png_write_finish_row(png_ptr);
-               return;
-            }
-            break;
-
-         case 2:
-            if ((png_ptr->row_number & 0x07) != 4)
-            {
-               png_write_finish_row(png_ptr);
-               return;
-            }
-            break;
-
-         case 3:
-            if ((png_ptr->row_number & 0x03) || png_ptr->width < 3)
-            {
-               png_write_finish_row(png_ptr);
-               return;
-            }
-            break;
-
-         case 4:
-            if ((png_ptr->row_number & 0x03) != 2)
-            {
-               png_write_finish_row(png_ptr);
-               return;
-            }
-            break;
-
-         case 5:
-            if ((png_ptr->row_number & 0x01) || png_ptr->width < 2)
-            {
-               png_write_finish_row(png_ptr);
-               return;
-            }
-            break;
-
-         case 6:
-            if (!(png_ptr->row_number & 0x01))
-            {
-               png_write_finish_row(png_ptr);
-               return;
-            }
-            break;
-
-         default: /* error: ignore it */
-            break;
-      }
-   }
-#endif
-
-   /* Set up row info for transformations */
-   png_ptr->row_info.color_type = png_ptr->color_type;
-   png_ptr->row_info.width = png_ptr->usr_width;
-   png_ptr->row_info.channels = png_ptr->usr_channels;
-   png_ptr->row_info.bit_depth = png_ptr->usr_bit_depth;
-   png_ptr->row_info.pixel_depth = (png_byte)(png_ptr->row_info.bit_depth *
-      png_ptr->row_info.channels);
-
-   png_ptr->row_info.rowbytes = PNG_ROWBYTES(png_ptr->row_info.pixel_depth,
-      png_ptr->row_info.width);
-
-   png_debug1(3, "row_info->color_type = %d", png_ptr->row_info.color_type);
-   png_debug1(3, "row_info->width = %u", png_ptr->row_info.width);
-   png_debug1(3, "row_info->channels = %d", png_ptr->row_info.channels);
-   png_debug1(3, "row_info->bit_depth = %d", png_ptr->row_info.bit_depth);
-   png_debug1(3, "row_info->pixel_depth = %d", png_ptr->row_info.pixel_depth);
-   png_debug1(3, "row_info->rowbytes = %lu",
-       (unsigned long)png_ptr->row_info.rowbytes);
-
-   /* Copy user's row into buffer, leaving room for filter byte. */
-   png_memcpy(png_ptr->row_buf + 1, row, png_ptr->row_info.rowbytes);
-
-#ifdef PNG_WRITE_INTERLACING_SUPPORTED
-   /* Handle interlacing */
-   if (png_ptr->interlaced && png_ptr->pass < 6 &&
-       (png_ptr->transformations & PNG_INTERLACE))
-   {
-      png_do_write_interlace(&(png_ptr->row_info),
-          png_ptr->row_buf + 1, png_ptr->pass);
-      /* This should always get caught above, but still ... */
-      if (!(png_ptr->row_info.width))
-      {
-         png_write_finish_row(png_ptr);
-         return;
-      }
-   }
-#endif
-
-   /* Handle other transformations */
-   if (png_ptr->transformations)
-      png_do_write_transformations(png_ptr);
-
-#ifdef PNG_MNG_FEATURES_SUPPORTED
-   /* Write filter_method 64 (intrapixel differencing) only if
-    * 1. Libpng was compiled with PNG_MNG_FEATURES_SUPPORTED and
-    * 2. Libpng did not write a PNG signature (this filter_method is only
-    *    used in PNG datastreams that are embedded in MNG datastreams) and
-    * 3. The application called png_permit_mng_features with a mask that
-    *    included PNG_FLAG_MNG_FILTER_64 and
-    * 4. The filter_method is 64 and
-    * 5. The color_type is RGB or RGBA
-    */
-   if ((png_ptr->mng_features_permitted & PNG_FLAG_MNG_FILTER_64) &&
-       (png_ptr->filter_type == PNG_INTRAPIXEL_DIFFERENCING))
-   {
-      /* Intrapixel differencing */
-      png_do_write_intrapixel(&(png_ptr->row_info), png_ptr->row_buf + 1);
-   }
-#endif
-
-   /* Find a filter if necessary, filter the row and write it out. */
-   png_write_find_filter(png_ptr, &(png_ptr->row_info));
-
-   if (png_ptr->write_row_fn != NULL)
-      (*(png_ptr->write_row_fn))(png_ptr, png_ptr->row_number, png_ptr->pass);
-}
-
-#ifdef PNG_WRITE_FLUSH_SUPPORTED
-/* Set the automatic flush interval or 0 to turn flushing off */
-void PNGAPI
-png_set_flush(png_structp png_ptr, int nrows)
-{
-   png_debug(1, "in png_set_flush");
-
-   if (png_ptr == NULL)
-      return;
-
-   png_ptr->flush_dist = (nrows < 0 ? 0 : nrows);
-}
-
-/* Flush the current output buffers now */
-void PNGAPI
-png_write_flush(png_structp png_ptr)
-{
-   int wrote_IDAT;
-
-   png_debug(1, "in png_write_flush");
-
-   if (png_ptr == NULL)
-      return;
-
-   /* We have already written out all of the data */
-   if (png_ptr->row_number >= png_ptr->num_rows)
-      return;
-
-   do
-   {
-      int ret;
-
-      /* Compress the data */
-      ret = deflate(&png_ptr->zstream, Z_SYNC_FLUSH);
-      wrote_IDAT = 0;
-
-      /* Check for compression errors */
-      if (ret != Z_OK)
-      {
-         if (png_ptr->zstream.msg != NULL)
-            png_error(png_ptr, png_ptr->zstream.msg);
-
-         else
-            png_error(png_ptr, "zlib error");
-      }
-
-      if (!(png_ptr->zstream.avail_out))
-      {
-         /* Write the IDAT and reset the zlib output buffer */
-         png_write_IDAT(png_ptr, png_ptr->zbuf, png_ptr->zbuf_size);
-         png_ptr->zstream.next_out = png_ptr->zbuf;
-         png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;
-         wrote_IDAT = 1;
-      }
-   } while (wrote_IDAT == 1);
-
-   /* If there is any data left to be output, write it into a new IDAT */
-   if (png_ptr->zbuf_size != png_ptr->zstream.avail_out)
-   {
-      /* Write the IDAT and reset the zlib output buffer */
-      png_write_IDAT(png_ptr, png_ptr->zbuf,
-          png_ptr->zbuf_size - png_ptr->zstream.avail_out);
-      png_ptr->zstream.next_out = png_ptr->zbuf;
-      png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;
-   }
-   png_ptr->flush_rows = 0;
-   png_flush(png_ptr);
-}
-#endif /* PNG_WRITE_FLUSH_SUPPORTED */
-
-/* Free all memory used by the write */
-void PNGAPI
-png_destroy_write_struct(png_structpp png_ptr_ptr, png_infopp info_ptr_ptr)
-{
-   png_structp png_ptr = NULL;
-   png_infop info_ptr = NULL;
-#ifdef PNG_USER_MEM_SUPPORTED
-   png_free_ptr free_fn = NULL;
-   png_voidp mem_ptr = NULL;
-#endif
-
-   png_debug(1, "in png_destroy_write_struct");
-
-   if (png_ptr_ptr != NULL)
-   {
-      png_ptr = *png_ptr_ptr;
-#ifdef PNG_USER_MEM_SUPPORTED
-      free_fn = png_ptr->free_fn;
-      mem_ptr = png_ptr->mem_ptr;
-#endif
-   }
-
-#ifdef PNG_USER_MEM_SUPPORTED
-   if (png_ptr != NULL)
-   {
-      free_fn = png_ptr->free_fn;
-      mem_ptr = png_ptr->mem_ptr;
-   }
-#endif
-
-   if (info_ptr_ptr != NULL)
-      info_ptr = *info_ptr_ptr;
-
-   if (info_ptr != NULL)
-   {
-      if (png_ptr != NULL)
-      {
-         png_free_data(png_ptr, info_ptr, PNG_FREE_ALL, -1);
-
-#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
-         if (png_ptr->num_chunk_list)
-         {
-            png_free(png_ptr, png_ptr->chunk_list);
-            png_ptr->num_chunk_list = 0;
-         }
-#endif
-      }
-
-#ifdef PNG_USER_MEM_SUPPORTED
-      png_destroy_struct_2((png_voidp)info_ptr, (png_free_ptr)free_fn,
-          (png_voidp)mem_ptr);
-#else
-      png_destroy_struct((png_voidp)info_ptr);
-#endif
-      *info_ptr_ptr = NULL;
-   }
-
-   if (png_ptr != NULL)
-   {
-      png_write_destroy(png_ptr);
-#ifdef PNG_USER_MEM_SUPPORTED
-      png_destroy_struct_2((png_voidp)png_ptr, (png_free_ptr)free_fn,
-          (png_voidp)mem_ptr);
-#else
-      png_destroy_struct((png_voidp)png_ptr);
-#endif
-      *png_ptr_ptr = NULL;
-   }
-}
-
-
-/* Free any memory used in png_ptr struct (old method) */
-void /* PRIVATE */
-png_write_destroy(png_structp png_ptr)
-{
-#ifdef PNG_SETJMP_SUPPORTED
-   jmp_buf tmp_jmp; /* Save jump buffer */
-#endif
-   png_error_ptr error_fn;
-   png_error_ptr warning_fn;
-   png_voidp error_ptr;
-#ifdef PNG_USER_MEM_SUPPORTED
-   png_free_ptr free_fn;
-#endif
-
-   png_debug(1, "in png_write_destroy");
-
-   /* Free any memory zlib uses */
-   deflateEnd(&png_ptr->zstream);
-
-   /* Free our memory.  png_free checks NULL for us. */
-   png_free(png_ptr, png_ptr->zbuf);
-   png_free(png_ptr, png_ptr->row_buf);
-#ifdef PNG_WRITE_FILTER_SUPPORTED
-   png_free(png_ptr, png_ptr->prev_row);
-   png_free(png_ptr, png_ptr->sub_row);
-   png_free(png_ptr, png_ptr->up_row);
-   png_free(png_ptr, png_ptr->avg_row);
-   png_free(png_ptr, png_ptr->paeth_row);
-#endif
-
-#ifdef PNG_TIME_RFC1123_SUPPORTED
-   png_free(png_ptr, png_ptr->time_buffer);
-#endif
-
-#ifdef PNG_WRITE_WEIGHTED_FILTER_SUPPORTED
-   /* Use this to save a little code space, it doesn't free the filter_costs */
-   png_reset_filter_heuristics(png_ptr);
-   png_free(png_ptr, png_ptr->filter_costs);
-   png_free(png_ptr, png_ptr->inv_filter_costs);
-#endif
-
-#ifdef PNG_SETJMP_SUPPORTED
-   /* Reset structure */
-   png_memcpy(tmp_jmp, png_ptr->png_jmpbuf, png_sizeof(jmp_buf));
-#endif
-
-   error_fn = png_ptr->error_fn;
-   warning_fn = png_ptr->warning_fn;
-   error_ptr = png_ptr->error_ptr;
-#ifdef PNG_USER_MEM_SUPPORTED
-   free_fn = png_ptr->free_fn;
-#endif
-
-   png_memset(png_ptr, 0, png_sizeof(png_struct));
-
-   png_ptr->error_fn = error_fn;
-   png_ptr->warning_fn = warning_fn;
-   png_ptr->error_ptr = error_ptr;
-#ifdef PNG_USER_MEM_SUPPORTED
-   png_ptr->free_fn = free_fn;
-#endif
-
-#ifdef PNG_SETJMP_SUPPORTED
-   png_memcpy(png_ptr->png_jmpbuf, tmp_jmp, png_sizeof(jmp_buf));
-#endif
-}
-
-/* Allow the application to select one or more row filters to use. */
-void PNGAPI
-png_set_filter(png_structp png_ptr, int method, int filters)
-{
-   png_debug(1, "in png_set_filter");
-
-   if (png_ptr == NULL)
-      return;
-
-#ifdef PNG_MNG_FEATURES_SUPPORTED
-   if ((png_ptr->mng_features_permitted & PNG_FLAG_MNG_FILTER_64) &&
-       (method == PNG_INTRAPIXEL_DIFFERENCING))
-      method = PNG_FILTER_TYPE_BASE;
-
-#endif
-   if (method == PNG_FILTER_TYPE_BASE)
-   {
-      switch (filters & (PNG_ALL_FILTERS | 0x07))
-      {
-#ifdef PNG_WRITE_FILTER_SUPPORTED
-         case 5:
-         case 6:
-         case 7: png_warning(png_ptr, "Unknown row filter for method 0");
-#endif /* PNG_WRITE_FILTER_SUPPORTED */
-         case PNG_FILTER_VALUE_NONE:
-            png_ptr->do_filter = PNG_FILTER_NONE; break;
-
-#ifdef PNG_WRITE_FILTER_SUPPORTED
-         case PNG_FILTER_VALUE_SUB:
-            png_ptr->do_filter = PNG_FILTER_SUB; break;
-
-         case PNG_FILTER_VALUE_UP:
-            png_ptr->do_filter = PNG_FILTER_UP; break;
-
-         case PNG_FILTER_VALUE_AVG:
-            png_ptr->do_filter = PNG_FILTER_AVG; break;
-
-         case PNG_FILTER_VALUE_PAETH:
-            png_ptr->do_filter = PNG_FILTER_PAETH; break;
-
-         default:
-            png_ptr->do_filter = (png_byte)filters; break;
-#else
-         default:
-            png_warning(png_ptr, "Unknown row filter for method 0");
-#endif /* PNG_WRITE_FILTER_SUPPORTED */
-      }
-
-      /* If we have allocated the row_buf, this means we have already started
-       * with the image and we should have allocated all of the filter buffers
-       * that have been selected.  If prev_row isn't already allocated, then
-       * it is too late to start using the filters that need it, since we
-       * will be missing the data in the previous row.  If an application
-       * wants to start and stop using particular filters during compression,
-       * it should start out with all of the filters, and then add and
-       * remove them after the start of compression.
-       */
-      if (png_ptr->row_buf != NULL)
-      {
-#ifdef PNG_WRITE_FILTER_SUPPORTED
-         if ((png_ptr->do_filter & PNG_FILTER_SUB) && png_ptr->sub_row == NULL)
-         {
-            png_ptr->sub_row = (png_bytep)png_malloc(png_ptr,
-                (png_ptr->rowbytes + 1));
-            png_ptr->sub_row[0] = PNG_FILTER_VALUE_SUB;
-         }
-
-         if ((png_ptr->do_filter & PNG_FILTER_UP) && png_ptr->up_row == NULL)
-         {
-            if (png_ptr->prev_row == NULL)
-            {
-               png_warning(png_ptr, "Can't add Up filter after starting");
-               png_ptr->do_filter = (png_byte)(png_ptr->do_filter &
-                   ~PNG_FILTER_UP);
-            }
-
-            else
-            {
-               png_ptr->up_row = (png_bytep)png_malloc(png_ptr,
-                   (png_ptr->rowbytes + 1));
-               png_ptr->up_row[0] = PNG_FILTER_VALUE_UP;
-            }
-         }
-
-         if ((png_ptr->do_filter & PNG_FILTER_AVG) && png_ptr->avg_row == NULL)
-         {
-            if (png_ptr->prev_row == NULL)
-            {
-               png_warning(png_ptr, "Can't add Average filter after starting");
-               png_ptr->do_filter = (png_byte)(png_ptr->do_filter &
-                   ~PNG_FILTER_AVG);
-            }
-
-            else
-            {
-               png_ptr->avg_row = (png_bytep)png_malloc(png_ptr,
-                   (png_ptr->rowbytes + 1));
-               png_ptr->avg_row[0] = PNG_FILTER_VALUE_AVG;
-            }
-         }
-
-         if ((png_ptr->do_filter & PNG_FILTER_PAETH) &&
-             png_ptr->paeth_row == NULL)
-         {
-            if (png_ptr->prev_row == NULL)
-            {
-               png_warning(png_ptr, "Can't add Paeth filter after starting");
-               png_ptr->do_filter &= (png_byte)(~PNG_FILTER_PAETH);
-            }
-
-            else
-            {
-               png_ptr->paeth_row = (png_bytep)png_malloc(png_ptr,
-                   (png_ptr->rowbytes + 1));
-               png_ptr->paeth_row[0] = PNG_FILTER_VALUE_PAETH;
-            }
-         }
-
-         if (png_ptr->do_filter == PNG_NO_FILTERS)
-#endif /* PNG_WRITE_FILTER_SUPPORTED */
-            png_ptr->do_filter = PNG_FILTER_NONE;
-      }
-   }
-   else
-      png_error(png_ptr, "Unknown custom filter method");
-}
-
-/* This allows us to influence the way in which libpng chooses the "best"
- * filter for the current scanline.  While the "minimum-sum-of-absolute-
- * differences metric is relatively fast and effective, there is some
- * question as to whether it can be improved upon by trying to keep the
- * filtered data going to zlib more consistent, hopefully resulting in
- * better compression.
- */
-#ifdef PNG_WRITE_WEIGHTED_FILTER_SUPPORTED      /* GRR 970116 */
-/* Conveneince reset API. */
-static void
-png_reset_filter_heuristics(png_structp png_ptr)
-{
-   /* Clear out any old values in the 'weights' - this must be done because if
-    * the app calls set_filter_heuristics multiple times with different
-    * 'num_weights' values we would otherwise potentially have wrong sized
-    * arrays.
-    */
-   png_ptr->num_prev_filters = 0;
-   png_ptr->heuristic_method = PNG_FILTER_HEURISTIC_UNWEIGHTED;
-   if (png_ptr->prev_filters != NULL)
-   {
-      png_bytep old = png_ptr->prev_filters;
-      png_ptr->prev_filters = NULL;
-      png_free(png_ptr, old);
-   }
-   if (png_ptr->filter_weights != NULL)
-   {
-      png_uint_16p old = png_ptr->filter_weights;
-      png_ptr->filter_weights = NULL;
-      png_free(png_ptr, old);
-   }
-
-   if (png_ptr->inv_filter_weights != NULL)
-   {
-      png_uint_16p old = png_ptr->inv_filter_weights;
-      png_ptr->inv_filter_weights = NULL;
-      png_free(png_ptr, old);
-   }
-
-   /* Leave the filter_costs - this array is fixed size. */
-}
-
-static int
-png_init_filter_heuristics(png_structp png_ptr, int heuristic_method,
-   int num_weights)
-{
-   if (png_ptr == NULL)
-      return 0;
-
-   /* Clear out the arrays */
-   png_reset_filter_heuristics(png_ptr);
-
-   /* Check arguments; the 'reset' function makes the correct settings for the
-    * unweighted case, but we must handle the weight case by initializing the
-    * arrays for the caller.
-    */
-   if (heuristic_method == PNG_FILTER_HEURISTIC_WEIGHTED)
-   {
-      int i;
-
-      if (num_weights > 0)
-      {
-         png_ptr->prev_filters = (png_bytep)png_malloc(png_ptr,
-             (png_uint_32)(png_sizeof(png_byte) * num_weights));
-
-         /* To make sure that the weighting starts out fairly */
-         for (i = 0; i < num_weights; i++)
-         {
-            png_ptr->prev_filters[i] = 255;
-         }
-
-         png_ptr->filter_weights = (png_uint_16p)png_malloc(png_ptr,
-             (png_uint_32)(png_sizeof(png_uint_16) * num_weights));
-
-         png_ptr->inv_filter_weights = (png_uint_16p)png_malloc(png_ptr,
-             (png_uint_32)(png_sizeof(png_uint_16) * num_weights));
-
-         for (i = 0; i < num_weights; i++)
-         {
-            png_ptr->inv_filter_weights[i] =
-            png_ptr->filter_weights[i] = PNG_WEIGHT_FACTOR;
-         }
-
-         /* Safe to set this now */
-         png_ptr->num_prev_filters = (png_byte)num_weights;
-      }
-
-      /* If, in the future, there are other filter methods, this would
-       * need to be based on png_ptr->filter.
-       */
-      if (png_ptr->filter_costs == NULL)
-      {
-         png_ptr->filter_costs = (png_uint_16p)png_malloc(png_ptr,
-             (png_uint_32)(png_sizeof(png_uint_16) * PNG_FILTER_VALUE_LAST));
-
-         png_ptr->inv_filter_costs = (png_uint_16p)png_malloc(png_ptr,
-             (png_uint_32)(png_sizeof(png_uint_16) * PNG_FILTER_VALUE_LAST));
-      }
-
-      for (i = 0; i < PNG_FILTER_VALUE_LAST; i++)
-      {
-         png_ptr->inv_filter_costs[i] =
-         png_ptr->filter_costs[i] = PNG_COST_FACTOR;
-      }
-
-      /* All the arrays are inited, safe to set this: */
-      png_ptr->heuristic_method = PNG_FILTER_HEURISTIC_WEIGHTED;
-
-      /* Return the 'ok' code. */
-      return 1;
-   }
-   else if (heuristic_method == PNG_FILTER_HEURISTIC_DEFAULT ||
-      heuristic_method == PNG_FILTER_HEURISTIC_UNWEIGHTED)
-   {
-      return 1;
-   }
-   else
-   {
-      png_warning(png_ptr, "Unknown filter heuristic method");
-      return 0;
-   }
-}
-
-/* Provide floating and fixed point APIs */
-#ifdef PNG_FLOATING_POINT_SUPPORTED
-void PNGAPI
-png_set_filter_heuristics(png_structp png_ptr, int heuristic_method,
-    int num_weights, png_const_doublep filter_weights,
-    png_const_doublep filter_costs)
-{
-   png_debug(1, "in png_set_filter_heuristics");
-
-   /* The internal API allocates all the arrays and ensures that the elements of
-    * those arrays are set to the default value.
-    */
-   if (!png_init_filter_heuristics(png_ptr, heuristic_method, num_weights))
-      return;
-
-   /* If using the weighted method copy in the weights. */
-   if (heuristic_method == PNG_FILTER_HEURISTIC_WEIGHTED)
-   {
-      int i;
-      for (i = 0; i < num_weights; i++)
-      {
-         if (filter_weights[i] <= 0.0)
-         {
-            png_ptr->inv_filter_weights[i] =
-            png_ptr->filter_weights[i] = PNG_WEIGHT_FACTOR;
-         }
-
-         else
-         {
-            png_ptr->inv_filter_weights[i] =
-                (png_uint_16)(PNG_WEIGHT_FACTOR*filter_weights[i]+.5);
-
-            png_ptr->filter_weights[i] =
-                (png_uint_16)(PNG_WEIGHT_FACTOR/filter_weights[i]+.5);
-         }
-      }
-
-      /* Here is where we set the relative costs of the different filters.  We
-       * should take the desired compression level into account when setting
-       * the costs, so that Paeth, for instance, has a high relative cost at low
-       * compression levels, while it has a lower relative cost at higher
-       * compression settings.  The filter types are in order of increasing
-       * relative cost, so it would be possible to do this with an algorithm.
-       */
-      for (i = 0; i < PNG_FILTER_VALUE_LAST; i++) if (filter_costs[i] >= 1.0)
-      {
-         png_ptr->inv_filter_costs[i] =
-             (png_uint_16)(PNG_COST_FACTOR / filter_costs[i] + .5);
-
-         png_ptr->filter_costs[i] =
-             (png_uint_16)(PNG_COST_FACTOR * filter_costs[i] + .5);
-      }
-   }
-}
-#endif /* FLOATING_POINT */
-
-#ifdef PNG_FIXED_POINT_SUPPORTED
-void PNGAPI
-png_set_filter_heuristics_fixed(png_structp png_ptr, int heuristic_method,
-    int num_weights, png_const_fixed_point_p filter_weights,
-    png_const_fixed_point_p filter_costs)
-{
-   png_debug(1, "in png_set_filter_heuristics_fixed");
-
-   /* The internal API allocates all the arrays and ensures that the elements of
-    * those arrays are set to the default value.
-    */
-   if (!png_init_filter_heuristics(png_ptr, heuristic_method, num_weights))
-      return;
-
-   /* If using the weighted method copy in the weights. */
-   if (heuristic_method == PNG_FILTER_HEURISTIC_WEIGHTED)
-   {
-      int i;
-      for (i = 0; i < num_weights; i++)
-      {
-         if (filter_weights[i] <= 0)
-         {
-            png_ptr->inv_filter_weights[i] =
-            png_ptr->filter_weights[i] = PNG_WEIGHT_FACTOR;
-         }
-
-         else
-         {
-            png_ptr->inv_filter_weights[i] = (png_uint_16)
-               ((PNG_WEIGHT_FACTOR*filter_weights[i]+PNG_FP_HALF)/PNG_FP_1);
-
-            png_ptr->filter_weights[i] = (png_uint_16)((PNG_WEIGHT_FACTOR*
-               PNG_FP_1+(filter_weights[i]/2))/filter_weights[i]);
-         }
-      }
-
-      /* Here is where we set the relative costs of the different filters.  We
-       * should take the desired compression level into account when setting
-       * the costs, so that Paeth, for instance, has a high relative cost at low
-       * compression levels, while it has a lower relative cost at higher
-       * compression settings.  The filter types are in order of increasing
-       * relative cost, so it would be possible to do this with an algorithm.
-       */
-      for (i = 0; i < PNG_FILTER_VALUE_LAST; i++)
-         if (filter_costs[i] >= PNG_FP_1)
-      {
-         png_uint_32 tmp;
-
-         /* Use a 32 bit unsigned temporary here because otherwise the
-          * intermediate value will be a 32 bit *signed* integer (ANSI rules)
-          * and this will get the wrong answer on division.
-          */
-         tmp = PNG_COST_FACTOR*PNG_FP_1 + (filter_costs[i]/2);
-         tmp /= filter_costs[i];
-
-         png_ptr->inv_filter_costs[i] = (png_uint_16)tmp;
-
-         tmp = PNG_COST_FACTOR * filter_costs[i] + PNG_FP_HALF;
-         tmp /= PNG_FP_1;
-
-         png_ptr->filter_costs[i] = (png_uint_16)tmp;
-      }
-   }
-}
-#endif /* FIXED_POINT */
-#endif /* PNG_WRITE_WEIGHTED_FILTER_SUPPORTED */
-
-void PNGAPI
-png_set_compression_level(png_structp png_ptr, int level)
-{
-   png_debug(1, "in png_set_compression_level");
-
-   if (png_ptr == NULL)
-      return;
-
-   png_ptr->flags |= PNG_FLAG_ZLIB_CUSTOM_LEVEL;
-   png_ptr->zlib_level = level;
-}
-
-void PNGAPI
-png_set_compression_mem_level(png_structp png_ptr, int mem_level)
-{
-   png_debug(1, "in png_set_compression_mem_level");
-
-   if (png_ptr == NULL)
-      return;
-
-   png_ptr->flags |= PNG_FLAG_ZLIB_CUSTOM_MEM_LEVEL;
-   png_ptr->zlib_mem_level = mem_level;
-}
-
-void PNGAPI
-png_set_compression_strategy(png_structp png_ptr, int strategy)
-{
-   png_debug(1, "in png_set_compression_strategy");
-
-   if (png_ptr == NULL)
-      return;
-
-   png_ptr->flags |= PNG_FLAG_ZLIB_CUSTOM_STRATEGY;
-   png_ptr->zlib_strategy = strategy;
-}
-
-void PNGAPI
-png_set_compression_window_bits(png_structp png_ptr, int window_bits)
-{
-   if (png_ptr == NULL)
-      return;
-
-   if (window_bits > 15)
-      png_warning(png_ptr, "Only compression windows <= 32k supported by PNG");
-
-   else if (window_bits < 8)
-      png_warning(png_ptr, "Only compression windows >= 256 supported by PNG");
-
-#ifndef WBITS_8_OK
-   /* Avoid libpng bug with 256-byte windows */
-   if (window_bits == 8)
-      {
-        png_warning(png_ptr, "Compression window is being reset to 512");
-        window_bits = 9;
-      }
-
-#endif
-   png_ptr->flags |= PNG_FLAG_ZLIB_CUSTOM_WINDOW_BITS;
-   png_ptr->zlib_window_bits = window_bits;
-}
-
-void PNGAPI
-png_set_compression_method(png_structp png_ptr, int method)
-{
-   png_debug(1, "in png_set_compression_method");
-
-   if (png_ptr == NULL)
-      return;
-
-   if (method != 8)
-      png_warning(png_ptr, "Only compression method 8 is supported by PNG");
-
-   png_ptr->flags |= PNG_FLAG_ZLIB_CUSTOM_METHOD;
-   png_ptr->zlib_method = method;
-}
-
-void PNGAPI
-png_set_write_status_fn(png_structp png_ptr, png_write_status_ptr write_row_fn)
-{
-   if (png_ptr == NULL)
-      return;
-
-   png_ptr->write_row_fn = write_row_fn;
-}
-
-#ifdef PNG_WRITE_USER_TRANSFORM_SUPPORTED
-void PNGAPI
-png_set_write_user_transform_fn(png_structp png_ptr, png_user_transform_ptr
-    write_user_transform_fn)
-{
-   png_debug(1, "in png_set_write_user_transform_fn");
-
-   if (png_ptr == NULL)
-      return;
-
-   png_ptr->transformations |= PNG_USER_TRANSFORM;
-   png_ptr->write_user_transform_fn = write_user_transform_fn;
-}
-#endif
-
-
-#ifdef PNG_INFO_IMAGE_SUPPORTED
-void PNGAPI
-png_write_png(png_structp png_ptr, png_infop info_ptr,
-    int transforms, voidp params)
-{
-   if (png_ptr == NULL || info_ptr == NULL)
-      return;
-
-   /* Write the file header information. */
-   png_write_info(png_ptr, info_ptr);
-
-   /* ------ these transformations don't touch the info structure ------- */
-
-#ifdef PNG_WRITE_INVERT_SUPPORTED
-   /* Invert monochrome pixels */
-   if (transforms & PNG_TRANSFORM_INVERT_MONO)
-      png_set_invert_mono(png_ptr);
-#endif
-
-#ifdef PNG_WRITE_SHIFT_SUPPORTED
-   /* Shift the pixels up to a legal bit depth and fill in
-    * as appropriate to correctly scale the image.
-    */
-   if ((transforms & PNG_TRANSFORM_SHIFT)
-       && (info_ptr->valid & PNG_INFO_sBIT))
-      png_set_shift(png_ptr, &info_ptr->sig_bit);
-#endif
-
-#ifdef PNG_WRITE_PACK_SUPPORTED
-   /* Pack pixels into bytes */
-   if (transforms & PNG_TRANSFORM_PACKING)
-       png_set_packing(png_ptr);
-#endif
-
-#ifdef PNG_WRITE_SWAP_ALPHA_SUPPORTED
-   /* Swap location of alpha bytes from ARGB to RGBA */
-   if (transforms & PNG_TRANSFORM_SWAP_ALPHA)
-      png_set_swap_alpha(png_ptr);
-#endif
-
-#ifdef PNG_WRITE_FILLER_SUPPORTED
-   /* Pack XRGB/RGBX/ARGB/RGBA into * RGB (4 channels -> 3 channels) */
-   if (transforms & PNG_TRANSFORM_STRIP_FILLER_AFTER)
-      png_set_filler(png_ptr, 0, PNG_FILLER_AFTER);
-
-   else if (transforms & PNG_TRANSFORM_STRIP_FILLER_BEFORE)
-      png_set_filler(png_ptr, 0, PNG_FILLER_BEFORE);
-#endif
-
-#ifdef PNG_WRITE_BGR_SUPPORTED
-   /* Flip BGR pixels to RGB */
-   if (transforms & PNG_TRANSFORM_BGR)
-      png_set_bgr(png_ptr);
-#endif
-
-#ifdef PNG_WRITE_SWAP_SUPPORTED
-   /* Swap bytes of 16-bit files to most significant byte first */
-   if (transforms & PNG_TRANSFORM_SWAP_ENDIAN)
-      png_set_swap(png_ptr);
-#endif
-
-#ifdef PNG_WRITE_PACKSWAP_SUPPORTED
-   /* Swap bits of 1, 2, 4 bit packed pixel formats */
-   if (transforms & PNG_TRANSFORM_PACKSWAP)
-      png_set_packswap(png_ptr);
-#endif
-
-#ifdef PNG_WRITE_INVERT_ALPHA_SUPPORTED
-   /* Invert the alpha channel from opacity to transparency */
-   if (transforms & PNG_TRANSFORM_INVERT_ALPHA)
-      png_set_invert_alpha(png_ptr);
-#endif
-
-   /* ----------------------- end of transformations ------------------- */
-
-   /* Write the bits */
-   if (info_ptr->valid & PNG_INFO_IDAT)
-       png_write_image(png_ptr, info_ptr->row_pointers);
-
-   /* It is REQUIRED to call this to finish writing the rest of the file */
-   png_write_end(png_ptr, info_ptr);
-
-   PNG_UNUSED(transforms)   /* Quiet compiler warnings */
-   PNG_UNUSED(params)
-}
-#endif
-#endif /* PNG_WRITE_SUPPORTED */
+
+/* pngwrite.c - general routines to write a PNG file
+ *
+ * Last changed in libpng 1.2.45 [July 7, 2011]
+ * Copyright (c) 1998-2011 Glenn Randers-Pehrson
+ * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
+ * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
+ *
+ * This code is released under the libpng license.
+ * For conditions of distribution and use, see the disclaimer
+ * and license in png.h
+ */
+
+/* Get internal access to png.h */
+#define PNG_INTERNAL
+#define PNG_NO_PEDANTIC_WARNINGS
+#include "png.h"
+#ifdef PNG_WRITE_SUPPORTED
+
+/* Writes all the PNG information.  This is the suggested way to use the
+ * library.  If you have a new chunk to add, make a function to write it,
+ * and put it in the correct location here.  If you want the chunk written
+ * after the image data, put it in png_write_end().  I strongly encourage
+ * you to supply a PNG_INFO_ flag, and check info_ptr->valid before writing
+ * the chunk, as that will keep the code from breaking if you want to just
+ * write a plain PNG file.  If you have long comments, I suggest writing
+ * them in png_write_end(), and compressing them.
+ */
+void PNGAPI
+png_write_info_before_PLTE(png_structp png_ptr, png_infop info_ptr)
+{
+   png_debug(1, "in png_write_info_before_PLTE");
+
+   if (png_ptr == NULL || info_ptr == NULL)
+      return;
+   if (!(png_ptr->mode & PNG_WROTE_INFO_BEFORE_PLTE))
+   {
+   /* Write PNG signature */
+   png_write_sig(png_ptr);
+#ifdef PNG_MNG_FEATURES_SUPPORTED
+   if ((png_ptr->mode&PNG_HAVE_PNG_SIGNATURE) && \
+      (png_ptr->mng_features_permitted))
+   {
+      png_warning(png_ptr, "MNG features are not allowed in a PNG datastream");
+      png_ptr->mng_features_permitted = 0;
+   }
+#endif
+   /* Write IHDR information. */
+   png_write_IHDR(png_ptr, info_ptr->width, info_ptr->height,
+      info_ptr->bit_depth, info_ptr->color_type, info_ptr->compression_type,
+      info_ptr->filter_type,
+#ifdef PNG_WRITE_INTERLACING_SUPPORTED
+      info_ptr->interlace_type);
+#else
+      0);
+#endif
+   /* The rest of these check to see if the valid field has the appropriate
+    * flag set, and if it does, writes the chunk.
+    */
+#ifdef PNG_WRITE_gAMA_SUPPORTED
+   if (info_ptr->valid & PNG_INFO_gAMA)
+   {
+#  ifdef PNG_FLOATING_POINT_SUPPORTED
+      png_write_gAMA(png_ptr, info_ptr->gamma);
+#else
+#ifdef PNG_FIXED_POINT_SUPPORTED
+      png_write_gAMA_fixed(png_ptr, info_ptr->int_gamma);
+#  endif
+#endif
+   }
+#endif
+#ifdef PNG_WRITE_sRGB_SUPPORTED
+   if (info_ptr->valid & PNG_INFO_sRGB)
+      png_write_sRGB(png_ptr, (int)info_ptr->srgb_intent);
+#endif
+#ifdef PNG_WRITE_iCCP_SUPPORTED
+   if (info_ptr->valid & PNG_INFO_iCCP)
+      png_write_iCCP(png_ptr, info_ptr->iccp_name, PNG_COMPRESSION_TYPE_BASE,
+                     info_ptr->iccp_profile, (int)info_ptr->iccp_proflen);
+#endif
+#ifdef PNG_WRITE_sBIT_SUPPORTED
+   if (info_ptr->valid & PNG_INFO_sBIT)
+      png_write_sBIT(png_ptr, &(info_ptr->sig_bit), info_ptr->color_type);
+#endif
+#ifdef PNG_WRITE_cHRM_SUPPORTED
+   if (info_ptr->valid & PNG_INFO_cHRM)
+   {
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+      png_write_cHRM(png_ptr,
+         info_ptr->x_white, info_ptr->y_white,
+         info_ptr->x_red, info_ptr->y_red,
+         info_ptr->x_green, info_ptr->y_green,
+         info_ptr->x_blue, info_ptr->y_blue);
+#else
+#  ifdef PNG_FIXED_POINT_SUPPORTED
+      png_write_cHRM_fixed(png_ptr,
+         info_ptr->int_x_white, info_ptr->int_y_white,
+         info_ptr->int_x_red, info_ptr->int_y_red,
+         info_ptr->int_x_green, info_ptr->int_y_green,
+         info_ptr->int_x_blue, info_ptr->int_y_blue);
+#  endif
+#endif
+   }
+#endif
+#ifdef PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED
+   if (info_ptr->unknown_chunks_num)
+   {
+      png_unknown_chunk *up;
+
+      png_debug(5, "writing extra chunks");
+
+      for (up = info_ptr->unknown_chunks;
+           up < info_ptr->unknown_chunks + info_ptr->unknown_chunks_num;
+           up++)
+      {
+         int keep = png_handle_as_unknown(png_ptr, up->name);
+         if (keep != PNG_HANDLE_CHUNK_NEVER &&
+            up->location && !(up->location & PNG_HAVE_PLTE) &&
+            !(up->location & PNG_HAVE_IDAT) &&
+            ((up->name[3] & 0x20) || keep == PNG_HANDLE_CHUNK_ALWAYS ||
+            (png_ptr->flags & PNG_FLAG_KEEP_UNSAFE_CHUNKS)))
+         {
+            if (up->size == 0)
+               png_warning(png_ptr, "Writing zero-length unknown chunk");
+            png_write_chunk(png_ptr, up->name, up->data, up->size);
+         }
+      }
+   }
+#endif
+      png_ptr->mode |= PNG_WROTE_INFO_BEFORE_PLTE;
+   }
+}
+
+void PNGAPI
+png_write_info(png_structp png_ptr, png_infop info_ptr)
+{
+#if defined(PNG_WRITE_TEXT_SUPPORTED) || defined(PNG_WRITE_sPLT_SUPPORTED)
+   int i;
+#endif
+
+   png_debug(1, "in png_write_info");
+
+   if (png_ptr == NULL || info_ptr == NULL)
+      return;
+
+   png_write_info_before_PLTE(png_ptr, info_ptr);
+
+   if (info_ptr->valid & PNG_INFO_PLTE)
+      png_write_PLTE(png_ptr, info_ptr->palette,
+         (png_uint_32)info_ptr->num_palette);
+   else if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
+      png_error(png_ptr, "Valid palette required for paletted images");
+
+#ifdef PNG_WRITE_tRNS_SUPPORTED
+   if (info_ptr->valid & PNG_INFO_tRNS)
+   {
+#ifdef PNG_WRITE_INVERT_ALPHA_SUPPORTED
+      /* Invert the alpha channel (in tRNS) */
+      if ((png_ptr->transformations & PNG_INVERT_ALPHA) &&
+         info_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
+      {
+         int j;
+         for (j = 0; j<(int)info_ptr->num_trans; j++)
+            info_ptr->trans[j] = (png_byte)(255 - info_ptr->trans[j]);
+      }
+#endif
+      png_write_tRNS(png_ptr, info_ptr->trans, &(info_ptr->trans_values),
+         info_ptr->num_trans, info_ptr->color_type);
+   }
+#endif
+#ifdef PNG_WRITE_bKGD_SUPPORTED
+   if (info_ptr->valid & PNG_INFO_bKGD)
+      png_write_bKGD(png_ptr, &(info_ptr->background), info_ptr->color_type);
+#endif
+#ifdef PNG_WRITE_hIST_SUPPORTED
+   if (info_ptr->valid & PNG_INFO_hIST)
+      png_write_hIST(png_ptr, info_ptr->hist, info_ptr->num_palette);
+#endif
+#ifdef PNG_WRITE_oFFs_SUPPORTED
+   if (info_ptr->valid & PNG_INFO_oFFs)
+      png_write_oFFs(png_ptr, info_ptr->x_offset, info_ptr->y_offset,
+         info_ptr->offset_unit_type);
+#endif
+#ifdef PNG_WRITE_pCAL_SUPPORTED
+   if (info_ptr->valid & PNG_INFO_pCAL)
+      png_write_pCAL(png_ptr, info_ptr->pcal_purpose, info_ptr->pcal_X0,
+         info_ptr->pcal_X1, info_ptr->pcal_type, info_ptr->pcal_nparams,
+         info_ptr->pcal_units, info_ptr->pcal_params);
+#endif
+
+#ifdef PNG_sCAL_SUPPORTED
+   if (info_ptr->valid & PNG_INFO_sCAL)
+#ifdef PNG_WRITE_sCAL_SUPPORTED
+#if defined(PNG_FLOATING_POINT_SUPPORTED) && defined(PNG_STDIO_SUPPORTED)
+      png_write_sCAL(png_ptr, (int)info_ptr->scal_unit,
+          info_ptr->scal_pixel_width, info_ptr->scal_pixel_height);
+#else /* !FLOATING_POINT */
+#ifdef PNG_FIXED_POINT_SUPPORTED
+      png_write_sCAL_s(png_ptr, (int)info_ptr->scal_unit,
+          info_ptr->scal_s_width, info_ptr->scal_s_height);
+#endif /* FIXED_POINT */
+#endif /* FLOATING_POINT */
+#else  /* !WRITE_sCAL */
+      png_warning(png_ptr,
+          "png_write_sCAL not supported; sCAL chunk not written.");
+#endif /* WRITE_sCAL */
+#endif /* sCAL */
+
+#ifdef PNG_WRITE_pHYs_SUPPORTED
+   if (info_ptr->valid & PNG_INFO_pHYs)
+      png_write_pHYs(png_ptr, info_ptr->x_pixels_per_unit,
+         info_ptr->y_pixels_per_unit, info_ptr->phys_unit_type);
+#endif /* pHYs */
+
+#ifdef PNG_WRITE_tIME_SUPPORTED
+   if (info_ptr->valid & PNG_INFO_tIME)
+   {
+      png_write_tIME(png_ptr, &(info_ptr->mod_time));
+      png_ptr->mode |= PNG_WROTE_tIME;
+   }
+#endif /* tIME */
+
+#ifdef PNG_WRITE_sPLT_SUPPORTED
+   if (info_ptr->valid & PNG_INFO_sPLT)
+     for (i = 0; i < (int)info_ptr->splt_palettes_num; i++)
+       png_write_sPLT(png_ptr, info_ptr->splt_palettes + i);
+#endif /* sPLT */
+
+#ifdef PNG_WRITE_TEXT_SUPPORTED
+   /* Check to see if we need to write text chunks */
+   for (i = 0; i < info_ptr->num_text; i++)
+   {
+      png_debug2(2, "Writing header text chunk %d, type %d", i,
+         info_ptr->text[i].compression);
+      /* An internationalized chunk? */
+      if (info_ptr->text[i].compression > 0)
+      {
+#ifdef PNG_WRITE_iTXt_SUPPORTED
+          /* Write international chunk */
+          png_write_iTXt(png_ptr,
+                         info_ptr->text[i].compression,
+                         info_ptr->text[i].key,
+                         info_ptr->text[i].lang,
+                         info_ptr->text[i].lang_key,
+                         info_ptr->text[i].text);
+#else
+          png_warning(png_ptr, "Unable to write international text");
+#endif
+          /* Mark this chunk as written */
+          info_ptr->text[i].compression = PNG_TEXT_COMPRESSION_NONE_WR;
+      }
+      /* If we want a compressed text chunk */
+      else if (info_ptr->text[i].compression == PNG_TEXT_COMPRESSION_zTXt)
+      {
+#ifdef PNG_WRITE_zTXt_SUPPORTED
+         /* Write compressed chunk */
+         png_write_zTXt(png_ptr, info_ptr->text[i].key,
+            info_ptr->text[i].text, 0,
+            info_ptr->text[i].compression);
+#else
+         png_warning(png_ptr, "Unable to write compressed text");
+#endif
+         /* Mark this chunk as written */
+         info_ptr->text[i].compression = PNG_TEXT_COMPRESSION_zTXt_WR;
+      }
+      else if (info_ptr->text[i].compression == PNG_TEXT_COMPRESSION_NONE)
+      {
+#ifdef PNG_WRITE_tEXt_SUPPORTED
+         /* Write uncompressed chunk */
+         png_write_tEXt(png_ptr, info_ptr->text[i].key,
+                         info_ptr->text[i].text,
+                         0);
+         /* Mark this chunk as written */
+         info_ptr->text[i].compression = PNG_TEXT_COMPRESSION_NONE_WR;
+#else
+         /* Can't get here */
+         png_warning(png_ptr, "Unable to write uncompressed text");
+#endif
+      }
+   }
+#endif /* tEXt */
+
+#ifdef PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED
+   if (info_ptr->unknown_chunks_num)
+   {
+      png_unknown_chunk *up;
+
+      png_debug(5, "writing extra chunks");
+
+      for (up = info_ptr->unknown_chunks;
+           up < info_ptr->unknown_chunks + info_ptr->unknown_chunks_num;
+           up++)
+      {
+         int keep = png_handle_as_unknown(png_ptr, up->name);
+         if (keep != PNG_HANDLE_CHUNK_NEVER &&
+            up->location && (up->location & PNG_HAVE_PLTE) &&
+            !(up->location & PNG_HAVE_IDAT) &&
+            !(up->location & PNG_AFTER_IDAT) &&
+            ((up->name[3] & 0x20) || keep == PNG_HANDLE_CHUNK_ALWAYS ||
+            (png_ptr->flags & PNG_FLAG_KEEP_UNSAFE_CHUNKS)))
+         {
+            png_write_chunk(png_ptr, up->name, up->data, up->size);
+         }
+      }
+   }
+#endif
+}
+
+/* Writes the end of the PNG file.  If you don't want to write comments or
+ * time information, you can pass NULL for info.  If you already wrote these
+ * in png_write_info(), do not write them again here.  If you have long
+ * comments, I suggest writing them here, and compressing them.
+ */
+void PNGAPI
+png_write_end(png_structp png_ptr, png_infop info_ptr)
+{
+   png_debug(1, "in png_write_end");
+
+   if (png_ptr == NULL)
+      return;
+   if (!(png_ptr->mode & PNG_HAVE_IDAT))
+      png_error(png_ptr, "No IDATs written into file");
+
+   /* See if user wants us to write information chunks */
+   if (info_ptr != NULL)
+   {
+#ifdef PNG_WRITE_TEXT_SUPPORTED
+      int i; /* local index variable */
+#endif
+#ifdef PNG_WRITE_tIME_SUPPORTED
+      /* Check to see if user has supplied a time chunk */
+      if ((info_ptr->valid & PNG_INFO_tIME) &&
+         !(png_ptr->mode & PNG_WROTE_tIME))
+         png_write_tIME(png_ptr, &(info_ptr->mod_time));
+#endif
+#ifdef PNG_WRITE_TEXT_SUPPORTED
+      /* Loop through comment chunks */
+      for (i = 0; i < info_ptr->num_text; i++)
+      {
+         png_debug2(2, "Writing trailer text chunk %d, type %d", i,
+            info_ptr->text[i].compression);
+         /* An internationalized chunk? */
+         if (info_ptr->text[i].compression > 0)
+         {
+#ifdef PNG_WRITE_iTXt_SUPPORTED
+            /* Write international chunk */
+            png_write_iTXt(png_ptr,
+                        info_ptr->text[i].compression,
+                        info_ptr->text[i].key,
+                        info_ptr->text[i].lang,
+                        info_ptr->text[i].lang_key,
+                        info_ptr->text[i].text);
+#else
+            png_warning(png_ptr, "Unable to write international text");
+#endif
+            /* Mark this chunk as written */
+            info_ptr->text[i].compression = PNG_TEXT_COMPRESSION_NONE_WR;
+         }
+         else if (info_ptr->text[i].compression >= PNG_TEXT_COMPRESSION_zTXt)
+         {
+#ifdef PNG_WRITE_zTXt_SUPPORTED
+            /* Write compressed chunk */
+            png_write_zTXt(png_ptr, info_ptr->text[i].key,
+               info_ptr->text[i].text, 0,
+               info_ptr->text[i].compression);
+#else
+            png_warning(png_ptr, "Unable to write compressed text");
+#endif
+            /* Mark this chunk as written */
+            info_ptr->text[i].compression = PNG_TEXT_COMPRESSION_zTXt_WR;
+         }
+         else if (info_ptr->text[i].compression == PNG_TEXT_COMPRESSION_NONE)
+         {
+#ifdef PNG_WRITE_tEXt_SUPPORTED
+            /* Write uncompressed chunk */
+            png_write_tEXt(png_ptr, info_ptr->text[i].key,
+               info_ptr->text[i].text, 0);
+#else
+            png_warning(png_ptr, "Unable to write uncompressed text");
+#endif
+
+            /* Mark this chunk as written */
+            info_ptr->text[i].compression = PNG_TEXT_COMPRESSION_NONE_WR;
+         }
+      }
+#endif
+#ifdef PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED
+   if (info_ptr->unknown_chunks_num)
+   {
+      png_unknown_chunk *up;
+
+      png_debug(5, "writing extra chunks");
+
+      for (up = info_ptr->unknown_chunks;
+           up < info_ptr->unknown_chunks + info_ptr->unknown_chunks_num;
+           up++)
+      {
+         int keep = png_handle_as_unknown(png_ptr, up->name);
+         if (keep != PNG_HANDLE_CHUNK_NEVER &&
+            up->location && (up->location & PNG_AFTER_IDAT) &&
+            ((up->name[3] & 0x20) || keep == PNG_HANDLE_CHUNK_ALWAYS ||
+            (png_ptr->flags & PNG_FLAG_KEEP_UNSAFE_CHUNKS)))
+         {
+            png_write_chunk(png_ptr, up->name, up->data, up->size);
+         }
+      }
+   }
+#endif
+   }
+
+   png_ptr->mode |= PNG_AFTER_IDAT;
+
+   /* Write end of PNG file */
+   png_write_IEND(png_ptr);
+   /* This flush, added in libpng-1.0.8, removed from libpng-1.0.9beta03,
+    * and restored again in libpng-1.2.30, may cause some applications that
+    * do not set png_ptr->output_flush_fn to crash.  If your application
+    * experiences a problem, please try building libpng with
+    * PNG_WRITE_FLUSH_AFTER_IEND_SUPPORTED defined, and report the event to
+    * png-mng-implement at lists.sf.net .
+    */
+#ifdef PNG_WRITE_FLUSH_SUPPORTED
+#  ifdef PNG_WRITE_FLUSH_AFTER_IEND_SUPPORTED
+   png_flush(png_ptr);
+#  endif
+#endif
+}
+
+#ifdef PNG_CONVERT_tIME_SUPPORTED
+/* "tm" structure is not supported on WindowsCE */
+void PNGAPI
+png_convert_from_struct_tm(png_timep ptime, struct tm FAR * ttime)
+{
+   png_debug(1, "in png_convert_from_struct_tm");
+
+   ptime->year = (png_uint_16)(1900 + ttime->tm_year);
+   ptime->month = (png_byte)(ttime->tm_mon + 1);
+   ptime->day = (png_byte)ttime->tm_mday;
+   ptime->hour = (png_byte)ttime->tm_hour;
+   ptime->minute = (png_byte)ttime->tm_min;
+   ptime->second = (png_byte)ttime->tm_sec;
+}
+
+void PNGAPI
+png_convert_from_time_t(png_timep ptime, time_t ttime)
+{
+   struct tm *tbuf;
+
+   png_debug(1, "in png_convert_from_time_t");
+
+   tbuf = gmtime(&ttime);
+   png_convert_from_struct_tm(ptime, tbuf);
+}
+#endif
+
+/* Initialize png_ptr structure, and allocate any memory needed */
+png_structp PNGAPI
+png_create_write_struct(png_const_charp user_png_ver, png_voidp error_ptr,
+   png_error_ptr error_fn, png_error_ptr warn_fn)
+{
+#ifdef PNG_USER_MEM_SUPPORTED
+   return (png_create_write_struct_2(user_png_ver, error_ptr, error_fn,
+      warn_fn, png_voidp_NULL, png_malloc_ptr_NULL, png_free_ptr_NULL));
+}
+
+/* Alternate initialize png_ptr structure, and allocate any memory needed */
+png_structp PNGAPI
+png_create_write_struct_2(png_const_charp user_png_ver, png_voidp error_ptr,
+   png_error_ptr error_fn, png_error_ptr warn_fn, png_voidp mem_ptr,
+   png_malloc_ptr malloc_fn, png_free_ptr free_fn)
+{
+#endif /* PNG_USER_MEM_SUPPORTED */
+#ifdef PNG_SETJMP_SUPPORTED
+   volatile
+#endif
+   png_structp png_ptr;
+#ifdef PNG_SETJMP_SUPPORTED
+#ifdef USE_FAR_KEYWORD
+   jmp_buf jmpbuf;
+#endif
+#endif
+   int i;
+
+   png_debug(1, "in png_create_write_struct");
+
+#ifdef PNG_USER_MEM_SUPPORTED
+   png_ptr = (png_structp)png_create_struct_2(PNG_STRUCT_PNG,
+      (png_malloc_ptr)malloc_fn, (png_voidp)mem_ptr);
+#else
+   png_ptr = (png_structp)png_create_struct(PNG_STRUCT_PNG);
+#endif /* PNG_USER_MEM_SUPPORTED */
+   if (png_ptr == NULL)
+      return (NULL);
+
+   /* Added at libpng-1.2.6 */
+#ifdef PNG_SET_USER_LIMITS_SUPPORTED
+   png_ptr->user_width_max = PNG_USER_WIDTH_MAX;
+   png_ptr->user_height_max = PNG_USER_HEIGHT_MAX;
+#endif
+
+#ifdef PNG_SETJMP_SUPPORTED
+#ifdef USE_FAR_KEYWORD
+   if (setjmp(jmpbuf))
+#else
+   if (setjmp(png_ptr->jmpbuf))
+#endif
+   {
+      png_free(png_ptr, png_ptr->zbuf);
+      png_ptr->zbuf = NULL;
+#ifdef PNG_USER_MEM_SUPPORTED
+      png_destroy_struct_2((png_voidp)png_ptr,
+         (png_free_ptr)free_fn, (png_voidp)mem_ptr);
+#else
+      png_destroy_struct((png_voidp)png_ptr);
+#endif
+      return (NULL);
+   }
+#ifdef USE_FAR_KEYWORD
+   png_memcpy(png_ptr->jmpbuf, jmpbuf, png_sizeof(jmp_buf));
+#endif
+#endif
+
+#ifdef PNG_USER_MEM_SUPPORTED
+   png_set_mem_fn(png_ptr, mem_ptr, malloc_fn, free_fn);
+#endif /* PNG_USER_MEM_SUPPORTED */
+   png_set_error_fn(png_ptr, error_ptr, error_fn, warn_fn);
+
+   if (user_png_ver)
+   {
+      i = 0;
+      do
+      {
+         if (user_png_ver[i] != png_libpng_ver[i])
+            png_ptr->flags |= PNG_FLAG_LIBRARY_MISMATCH;
+      } while (png_libpng_ver[i++]);
+   }
+
+   if (png_ptr->flags & PNG_FLAG_LIBRARY_MISMATCH)
+   {
+     /* Libpng 0.90 and later are binary incompatible with libpng 0.89, so
+      * we must recompile any applications that use any older library version.
+      * For versions after libpng 1.0, we will be compatible, so we need
+      * only check the first digit.
+      */
+     if (user_png_ver == NULL || user_png_ver[0] != png_libpng_ver[0] ||
+         (user_png_ver[0] == '1' && user_png_ver[2] != png_libpng_ver[2]) ||
+         (user_png_ver[0] == '0' && user_png_ver[2] < '9'))
+     {
+#if defined(PNG_STDIO_SUPPORTED) && !defined(_WIN32_WCE)
+        char msg[80];
+        if (user_png_ver)
+        {
+           png_snprintf(msg, 80,
+              "Application was compiled with png.h from libpng-%.20s",
+              user_png_ver);
+           png_warning(png_ptr, msg);
+        }
+        png_snprintf(msg, 80,
+           "Application  is  running with png.c from libpng-%.20s",
+           png_libpng_ver);
+        png_warning(png_ptr, msg);
+#endif
+#ifdef PNG_ERROR_NUMBERS_SUPPORTED
+        png_ptr->flags = 0;
+#endif
+        png_error(png_ptr,
+           "Incompatible libpng version in application and library");
+     }
+   }
+
+   /* Initialize zbuf - compression buffer */
+   png_ptr->zbuf_size = PNG_ZBUF_SIZE;
+   png_ptr->zbuf = (png_bytep)png_malloc(png_ptr,
+     (png_uint_32)png_ptr->zbuf_size);
+
+   png_set_write_fn(png_ptr, png_voidp_NULL, png_rw_ptr_NULL,
+      png_flush_ptr_NULL);
+
+#ifdef PNG_WRITE_WEIGHTED_FILTER_SUPPORTED
+   png_set_filter_heuristics(png_ptr, PNG_FILTER_HEURISTIC_DEFAULT,
+      1, png_doublep_NULL, png_doublep_NULL);
+#endif
+
+#ifdef PNG_SETJMP_SUPPORTED
+   /* Applications that neglect to set up their own setjmp() and then
+    * encounter a png_error() will longjmp here.  Since the jmpbuf is
+    * then meaningless we abort instead of returning.
+    */
+#ifdef USE_FAR_KEYWORD
+   if (setjmp(jmpbuf))
+      PNG_ABORT();
+   png_memcpy(png_ptr->jmpbuf, jmpbuf, png_sizeof(jmp_buf));
+#else
+   if (setjmp(png_ptr->jmpbuf))
+      PNG_ABORT();
+#endif
+#endif
+   return (png_ptr);
+}
+
+/* Initialize png_ptr structure, and allocate any memory needed */
+#if defined(PNG_1_0_X) || defined(PNG_1_2_X)
+/* Deprecated. */
+#undef png_write_init
+void PNGAPI
+png_write_init(png_structp png_ptr)
+{
+   /* We only come here via pre-1.0.7-compiled applications */
+   png_write_init_2(png_ptr, "1.0.6 or earlier", 0, 0);
+}
+
+void PNGAPI
+png_write_init_2(png_structp png_ptr, png_const_charp user_png_ver,
+   png_size_t png_struct_size, png_size_t png_info_size)
+{
+   /* We only come here via pre-1.0.12-compiled applications */
+   if (png_ptr == NULL) return;
+#if defined(PNG_STDIO_SUPPORTED) && !defined(_WIN32_WCE)
+   if (png_sizeof(png_struct) > png_struct_size ||
+      png_sizeof(png_info) > png_info_size)
+   {
+      char msg[80];
+      png_ptr->warning_fn = NULL;
+      if (user_png_ver)
+      {
+         png_snprintf(msg, 80,
+            "Application was compiled with png.h from libpng-%.20s",
+            user_png_ver);
+         png_warning(png_ptr, msg);
+      }
+      png_snprintf(msg, 80,
+         "Application  is  running with png.c from libpng-%.20s",
+         png_libpng_ver);
+      png_warning(png_ptr, msg);
+   }
+#endif
+   if (png_sizeof(png_struct) > png_struct_size)
+   {
+      png_ptr->error_fn = NULL;
+#ifdef PNG_ERROR_NUMBERS_SUPPORTED
+      png_ptr->flags = 0;
+#endif
+      png_error(png_ptr,
+      "The png struct allocated by the application for writing is"
+      " too small.");
+   }
+   if (png_sizeof(png_info) > png_info_size)
+   {
+      png_ptr->error_fn = NULL;
+#ifdef PNG_ERROR_NUMBERS_SUPPORTED
+      png_ptr->flags = 0;
+#endif
+      png_error(png_ptr,
+      "The info struct allocated by the application for writing is"
+      " too small.");
+   }
+   png_write_init_3(&png_ptr, user_png_ver, png_struct_size);
+}
+#endif /* PNG_1_0_X || PNG_1_2_X */
+
+
+void PNGAPI
+png_write_init_3(png_structpp ptr_ptr, png_const_charp user_png_ver,
+   png_size_t png_struct_size)
+{
+   png_structp png_ptr = *ptr_ptr;
+#ifdef PNG_SETJMP_SUPPORTED
+   jmp_buf tmp_jmp; /* to save current jump buffer */
+#endif
+
+   int i = 0;
+
+   if (png_ptr == NULL)
+      return;
+
+   do
+   {
+      if (user_png_ver[i] != png_libpng_ver[i])
+      {
+#ifdef PNG_LEGACY_SUPPORTED
+         png_ptr->flags |= PNG_FLAG_LIBRARY_MISMATCH;
+#else
+         png_ptr->warning_fn = NULL;
+         png_warning(png_ptr,
+ "Application uses deprecated png_write_init() and should be recompiled.");
+#endif
+      }
+   } while (png_libpng_ver[i++]);
+
+   png_debug(1, "in png_write_init_3");
+
+#ifdef PNG_SETJMP_SUPPORTED
+   /* Save jump buffer and error functions */
+   png_memcpy(tmp_jmp, png_ptr->jmpbuf, png_sizeof(jmp_buf));
+#endif
+
+   if (png_sizeof(png_struct) > png_struct_size)
+   {
+      png_destroy_struct(png_ptr);
+      png_ptr = (png_structp)png_create_struct(PNG_STRUCT_PNG);
+      *ptr_ptr = png_ptr;
+   }
+
+   /* Reset all variables to 0 */
+   png_memset(png_ptr, 0, png_sizeof(png_struct));
+
+   /* Added at libpng-1.2.6 */
+#ifdef PNG_SET_USER_LIMITS_SUPPORTED
+   png_ptr->user_width_max = PNG_USER_WIDTH_MAX;
+   png_ptr->user_height_max = PNG_USER_HEIGHT_MAX;
+#endif
+
+#ifdef PNG_SETJMP_SUPPORTED
+   /* Restore jump buffer */
+   png_memcpy(png_ptr->jmpbuf, tmp_jmp, png_sizeof(jmp_buf));
+#endif
+
+   png_set_write_fn(png_ptr, png_voidp_NULL, png_rw_ptr_NULL,
+      png_flush_ptr_NULL);
+
+   /* Initialize zbuf - compression buffer */
+   png_ptr->zbuf_size = PNG_ZBUF_SIZE;
+   png_ptr->zbuf = (png_bytep)png_malloc(png_ptr,
+     (png_uint_32)png_ptr->zbuf_size);
+#ifdef PNG_WRITE_WEIGHTED_FILTER_SUPPORTED
+   png_set_filter_heuristics(png_ptr, PNG_FILTER_HEURISTIC_DEFAULT,
+      1, png_doublep_NULL, png_doublep_NULL);
+#endif
+}
+
+/* Write a few rows of image data.  If the image is interlaced,
+ * either you will have to write the 7 sub images, or, if you
+ * have called png_set_interlace_handling(), you will have to
+ * "write" the image seven times.
+ */
+void PNGAPI
+png_write_rows(png_structp png_ptr, png_bytepp row,
+   png_uint_32 num_rows)
+{
+   png_uint_32 i; /* row counter */
+   png_bytepp rp; /* row pointer */
+
+   png_debug(1, "in png_write_rows");
+
+   if (png_ptr == NULL)
+      return;
+
+   /* Loop through the rows */
+   for (i = 0, rp = row; i < num_rows; i++, rp++)
+   {
+      png_write_row(png_ptr, *rp);
+   }
+}
+
+/* Write the image.  You only need to call this function once, even
+ * if you are writing an interlaced image.
+ */
+void PNGAPI
+png_write_image(png_structp png_ptr, png_bytepp image)
+{
+   png_uint_32 i; /* row index */
+   int pass, num_pass; /* pass variables */
+   png_bytepp rp; /* points to current row */
+
+   if (png_ptr == NULL)
+      return;
+
+   png_debug(1, "in png_write_image");
+
+#ifdef PNG_WRITE_INTERLACING_SUPPORTED
+   /* Initialize interlace handling.  If image is not interlaced,
+    * this will set pass to 1
+    */
+   num_pass = png_set_interlace_handling(png_ptr);
+#else
+   num_pass = 1;
+#endif
+   /* Loop through passes */
+   for (pass = 0; pass < num_pass; pass++)
+   {
+      /* Loop through image */
+      for (i = 0, rp = image; i < png_ptr->height; i++, rp++)
+      {
+         png_write_row(png_ptr, *rp);
+      }
+   }
+}
+
+/* Called by user to write a row of image data */
+void PNGAPI
+png_write_row(png_structp png_ptr, png_bytep row)
+{
+   if (png_ptr == NULL)
+      return;
+
+   png_debug2(1, "in png_write_row (row %ld, pass %d)",
+      png_ptr->row_number, png_ptr->pass);
+
+   /* Initialize transformations and other stuff if first time */
+   if (png_ptr->row_number == 0 && png_ptr->pass == 0)
+   {
+      /* Make sure we wrote the header info */
+      if (!(png_ptr->mode & PNG_WROTE_INFO_BEFORE_PLTE))
+         png_error(png_ptr,
+            "png_write_info was never called before png_write_row.");
+
+      /* Check for transforms that have been set but were defined out */
+#if !defined(PNG_WRITE_INVERT_SUPPORTED) && defined(PNG_READ_INVERT_SUPPORTED)
+      if (png_ptr->transformations & PNG_INVERT_MONO)
+         png_warning(png_ptr,
+             "PNG_WRITE_INVERT_SUPPORTED is not defined.");
+#endif
+#if !defined(PNG_WRITE_FILLER_SUPPORTED) && defined(PNG_READ_FILLER_SUPPORTED)
+      if (png_ptr->transformations & PNG_FILLER)
+         png_warning(png_ptr,
+             "PNG_WRITE_FILLER_SUPPORTED is not defined.");
+#endif
+#if !defined(PNG_WRITE_PACKSWAP_SUPPORTED) && \
+    defined(PNG_READ_PACKSWAP_SUPPORTED)
+      if (png_ptr->transformations & PNG_PACKSWAP)
+         png_warning(png_ptr,
+             "PNG_WRITE_PACKSWAP_SUPPORTED is not defined.");
+#endif
+#if !defined(PNG_WRITE_PACK_SUPPORTED) && defined(PNG_READ_PACK_SUPPORTED)
+      if (png_ptr->transformations & PNG_PACK)
+         png_warning(png_ptr, "PNG_WRITE_PACK_SUPPORTED is not defined.");
+#endif
+#if !defined(PNG_WRITE_SHIFT_SUPPORTED) && defined(PNG_READ_SHIFT_SUPPORTED)
+      if (png_ptr->transformations & PNG_SHIFT)
+         png_warning(png_ptr, "PNG_WRITE_SHIFT_SUPPORTED is not defined.");
+#endif
+#if !defined(PNG_WRITE_BGR_SUPPORTED) && defined(PNG_READ_BGR_SUPPORTED)
+      if (png_ptr->transformations & PNG_BGR)
+         png_warning(png_ptr, "PNG_WRITE_BGR_SUPPORTED is not defined.");
+#endif
+#if !defined(PNG_WRITE_SWAP_SUPPORTED) && defined(PNG_READ_SWAP_SUPPORTED)
+      if (png_ptr->transformations & PNG_SWAP_BYTES)
+         png_warning(png_ptr, "PNG_WRITE_SWAP_SUPPORTED is not defined.");
+#endif
+
+      png_write_start_row(png_ptr);
+   }
+
+#ifdef PNG_WRITE_INTERLACING_SUPPORTED
+   /* If interlaced and not interested in row, return */
+   if (png_ptr->interlaced && (png_ptr->transformations & PNG_INTERLACE))
+   {
+      switch (png_ptr->pass)
+      {
+         case 0:
+            if (png_ptr->row_number & 0x07)
+            {
+               png_write_finish_row(png_ptr);
+               return;
+            }
+            break;
+         case 1:
+            if ((png_ptr->row_number & 0x07) || png_ptr->width < 5)
+            {
+               png_write_finish_row(png_ptr);
+               return;
+            }
+            break;
+         case 2:
+            if ((png_ptr->row_number & 0x07) != 4)
+            {
+               png_write_finish_row(png_ptr);
+               return;
+            }
+            break;
+         case 3:
+            if ((png_ptr->row_number & 0x03) || png_ptr->width < 3)
+            {
+               png_write_finish_row(png_ptr);
+               return;
+            }
+            break;
+         case 4:
+            if ((png_ptr->row_number & 0x03) != 2)
+            {
+               png_write_finish_row(png_ptr);
+               return;
+            }
+            break;
+         case 5:
+            if ((png_ptr->row_number & 0x01) || png_ptr->width < 2)
+            {
+               png_write_finish_row(png_ptr);
+               return;
+            }
+            break;
+         case 6:
+            if (!(png_ptr->row_number & 0x01))
+            {
+               png_write_finish_row(png_ptr);
+               return;
+            }
+            break;
+      }
+   }
+#endif
+
+   /* Set up row info for transformations */
+   png_ptr->row_info.color_type = png_ptr->color_type;
+   png_ptr->row_info.width = png_ptr->usr_width;
+   png_ptr->row_info.channels = png_ptr->usr_channels;
+   png_ptr->row_info.bit_depth = png_ptr->usr_bit_depth;
+   png_ptr->row_info.pixel_depth = (png_byte)(png_ptr->row_info.bit_depth *
+      png_ptr->row_info.channels);
+
+   png_ptr->row_info.rowbytes = PNG_ROWBYTES(png_ptr->row_info.pixel_depth,
+      png_ptr->row_info.width);
+
+   png_debug1(3, "row_info->color_type = %d", png_ptr->row_info.color_type);
+   png_debug1(3, "row_info->width = %lu", png_ptr->row_info.width);
+   png_debug1(3, "row_info->channels = %d", png_ptr->row_info.channels);
+   png_debug1(3, "row_info->bit_depth = %d", png_ptr->row_info.bit_depth);
+   png_debug1(3, "row_info->pixel_depth = %d", png_ptr->row_info.pixel_depth);
+   png_debug1(3, "row_info->rowbytes = %lu", png_ptr->row_info.rowbytes);
+
+   /* Copy user's row into buffer, leaving room for filter byte. */
+   png_memcpy_check(png_ptr, png_ptr->row_buf + 1, row,
+      png_ptr->row_info.rowbytes);
+
+#ifdef PNG_WRITE_INTERLACING_SUPPORTED
+   /* Handle interlacing */
+   if (png_ptr->interlaced && png_ptr->pass < 6 &&
+      (png_ptr->transformations & PNG_INTERLACE))
+   {
+      png_do_write_interlace(&(png_ptr->row_info),
+         png_ptr->row_buf + 1, png_ptr->pass);
+      /* This should always get caught above, but still ... */
+      if (!(png_ptr->row_info.width))
+      {
+         png_write_finish_row(png_ptr);
+         return;
+      }
+   }
+#endif
+
+   /* Handle other transformations */
+   if (png_ptr->transformations)
+      png_do_write_transformations(png_ptr);
+
+#ifdef PNG_MNG_FEATURES_SUPPORTED
+   /* Write filter_method 64 (intrapixel differencing) only if
+    * 1. Libpng was compiled with PNG_MNG_FEATURES_SUPPORTED and
+    * 2. Libpng did not write a PNG signature (this filter_method is only
+    *    used in PNG datastreams that are embedded in MNG datastreams) and
+    * 3. The application called png_permit_mng_features with a mask that
+    *    included PNG_FLAG_MNG_FILTER_64 and
+    * 4. The filter_method is 64 and
+    * 5. The color_type is RGB or RGBA
+    */
+   if ((png_ptr->mng_features_permitted & PNG_FLAG_MNG_FILTER_64) &&
+      (png_ptr->filter_type == PNG_INTRAPIXEL_DIFFERENCING))
+   {
+      /* Intrapixel differencing */
+      png_do_write_intrapixel(&(png_ptr->row_info), png_ptr->row_buf + 1);
+   }
+#endif
+
+   /* Find a filter if necessary, filter the row and write it out. */
+   png_write_find_filter(png_ptr, &(png_ptr->row_info));
+
+   if (png_ptr->write_row_fn != NULL)
+      (*(png_ptr->write_row_fn))(png_ptr, png_ptr->row_number, png_ptr->pass);
+}
+
+#ifdef PNG_WRITE_FLUSH_SUPPORTED
+/* Set the automatic flush interval or 0 to turn flushing off */
+void PNGAPI
+png_set_flush(png_structp png_ptr, int nrows)
+{
+   png_debug(1, "in png_set_flush");
+
+   if (png_ptr == NULL)
+      return;
+   png_ptr->flush_dist = (nrows < 0 ? 0 : nrows);
+}
+
+/* Flush the current output buffers now */
+void PNGAPI
+png_write_flush(png_structp png_ptr)
+{
+   int wrote_IDAT;
+
+   png_debug(1, "in png_write_flush");
+
+   if (png_ptr == NULL)
+      return;
+   /* We have already written out all of the data */
+   if (png_ptr->row_number >= png_ptr->num_rows)
+      return;
+
+   do
+   {
+      int ret;
+
+      /* Compress the data */
+      ret = deflate(&png_ptr->zstream, Z_SYNC_FLUSH);
+      wrote_IDAT = 0;
+
+      /* Check for compression errors */
+      if (ret != Z_OK)
+      {
+         if (png_ptr->zstream.msg != NULL)
+            png_error(png_ptr, png_ptr->zstream.msg);
+         else
+            png_error(png_ptr, "zlib error");
+      }
+
+      if (!(png_ptr->zstream.avail_out))
+      {
+         /* Write the IDAT and reset the zlib output buffer */
+         png_write_IDAT(png_ptr, png_ptr->zbuf,
+                        png_ptr->zbuf_size);
+         png_ptr->zstream.next_out = png_ptr->zbuf;
+         png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;
+         wrote_IDAT = 1;
+      }
+   } while(wrote_IDAT == 1);
+
+   /* If there is any data left to be output, write it into a new IDAT */
+   if (png_ptr->zbuf_size != png_ptr->zstream.avail_out)
+   {
+      /* Write the IDAT and reset the zlib output buffer */
+      png_write_IDAT(png_ptr, png_ptr->zbuf,
+                     png_ptr->zbuf_size - png_ptr->zstream.avail_out);
+      png_ptr->zstream.next_out = png_ptr->zbuf;
+      png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;
+   }
+   png_ptr->flush_rows = 0;
+   png_flush(png_ptr);
+}
+#endif /* PNG_WRITE_FLUSH_SUPPORTED */
+
+/* Free all memory used by the write */
+void PNGAPI
+png_destroy_write_struct(png_structpp png_ptr_ptr, png_infopp info_ptr_ptr)
+{
+   png_structp png_ptr = NULL;
+   png_infop info_ptr = NULL;
+#ifdef PNG_USER_MEM_SUPPORTED
+   png_free_ptr free_fn = NULL;
+   png_voidp mem_ptr = NULL;
+#endif
+
+   png_debug(1, "in png_destroy_write_struct");
+
+   if (png_ptr_ptr != NULL)
+   {
+      png_ptr = *png_ptr_ptr;
+#ifdef PNG_USER_MEM_SUPPORTED
+      free_fn = png_ptr->free_fn;
+      mem_ptr = png_ptr->mem_ptr;
+#endif
+   }
+
+#ifdef PNG_USER_MEM_SUPPORTED
+   if (png_ptr != NULL)
+   {
+      free_fn = png_ptr->free_fn;
+      mem_ptr = png_ptr->mem_ptr;
+   }
+#endif
+
+   if (info_ptr_ptr != NULL)
+      info_ptr = *info_ptr_ptr;
+
+   if (info_ptr != NULL)
+   {
+      if (png_ptr != NULL)
+      {
+        png_free_data(png_ptr, info_ptr, PNG_FREE_ALL, -1);
+
+#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
+        if (png_ptr->num_chunk_list)
+        {
+           png_free(png_ptr, png_ptr->chunk_list);
+           png_ptr->chunk_list = NULL;
+           png_ptr->num_chunk_list = 0;
+        }
+#endif
+      }
+
+#ifdef PNG_USER_MEM_SUPPORTED
+      png_destroy_struct_2((png_voidp)info_ptr, (png_free_ptr)free_fn,
+         (png_voidp)mem_ptr);
+#else
+      png_destroy_struct((png_voidp)info_ptr);
+#endif
+      *info_ptr_ptr = NULL;
+   }
+
+   if (png_ptr != NULL)
+   {
+      png_write_destroy(png_ptr);
+#ifdef PNG_USER_MEM_SUPPORTED
+      png_destroy_struct_2((png_voidp)png_ptr, (png_free_ptr)free_fn,
+         (png_voidp)mem_ptr);
+#else
+      png_destroy_struct((png_voidp)png_ptr);
+#endif
+      *png_ptr_ptr = NULL;
+   }
+}
+
+
+/* Free any memory used in png_ptr struct (old method) */
+void /* PRIVATE */
+png_write_destroy(png_structp png_ptr)
+{
+#ifdef PNG_SETJMP_SUPPORTED
+   jmp_buf tmp_jmp; /* Save jump buffer */
+#endif
+   png_error_ptr error_fn;
+   png_error_ptr warning_fn;
+   png_voidp error_ptr;
+#ifdef PNG_USER_MEM_SUPPORTED
+   png_free_ptr free_fn;
+#endif
+
+   png_debug(1, "in png_write_destroy");
+
+   /* Free any memory zlib uses */
+   deflateEnd(&png_ptr->zstream);
+
+   /* Free our memory.  png_free checks NULL for us. */
+   png_free(png_ptr, png_ptr->zbuf);
+   png_free(png_ptr, png_ptr->row_buf);
+#ifdef PNG_WRITE_FILTER_SUPPORTED
+   png_free(png_ptr, png_ptr->prev_row);
+   png_free(png_ptr, png_ptr->sub_row);
+   png_free(png_ptr, png_ptr->up_row);
+   png_free(png_ptr, png_ptr->avg_row);
+   png_free(png_ptr, png_ptr->paeth_row);
+#endif
+
+#ifdef PNG_TIME_RFC1123_SUPPORTED
+   png_free(png_ptr, png_ptr->time_buffer);
+#endif
+
+#ifdef PNG_WRITE_WEIGHTED_FILTER_SUPPORTED
+   png_free(png_ptr, png_ptr->prev_filters);
+   png_free(png_ptr, png_ptr->filter_weights);
+   png_free(png_ptr, png_ptr->inv_filter_weights);
+   png_free(png_ptr, png_ptr->filter_costs);
+   png_free(png_ptr, png_ptr->inv_filter_costs);
+#endif
+
+#ifdef PNG_SETJMP_SUPPORTED
+   /* Reset structure */
+   png_memcpy(tmp_jmp, png_ptr->jmpbuf, png_sizeof(jmp_buf));
+#endif
+
+   error_fn = png_ptr->error_fn;
+   warning_fn = png_ptr->warning_fn;
+   error_ptr = png_ptr->error_ptr;
+#ifdef PNG_USER_MEM_SUPPORTED
+   free_fn = png_ptr->free_fn;
+#endif
+
+   png_memset(png_ptr, 0, png_sizeof(png_struct));
+
+   png_ptr->error_fn = error_fn;
+   png_ptr->warning_fn = warning_fn;
+   png_ptr->error_ptr = error_ptr;
+#ifdef PNG_USER_MEM_SUPPORTED
+   png_ptr->free_fn = free_fn;
+#endif
+
+#ifdef PNG_SETJMP_SUPPORTED
+   png_memcpy(png_ptr->jmpbuf, tmp_jmp, png_sizeof(jmp_buf));
+#endif
+}
+
+/* Allow the application to select one or more row filters to use. */
+void PNGAPI
+png_set_filter(png_structp png_ptr, int method, int filters)
+{
+   png_debug(1, "in png_set_filter");
+
+   if (png_ptr == NULL)
+      return;
+#ifdef PNG_MNG_FEATURES_SUPPORTED
+   if ((png_ptr->mng_features_permitted & PNG_FLAG_MNG_FILTER_64) &&
+      (method == PNG_INTRAPIXEL_DIFFERENCING))
+         method = PNG_FILTER_TYPE_BASE;
+#endif
+   if (method == PNG_FILTER_TYPE_BASE)
+   {
+      switch (filters & (PNG_ALL_FILTERS | 0x07))
+      {
+#ifdef PNG_WRITE_FILTER_SUPPORTED
+         case 5:
+         case 6:
+         case 7: png_warning(png_ptr, "Unknown row filter for method 0");
+#endif /* PNG_WRITE_FILTER_SUPPORTED */
+         case PNG_FILTER_VALUE_NONE:
+              png_ptr->do_filter = PNG_FILTER_NONE; break;
+#ifdef PNG_WRITE_FILTER_SUPPORTED
+         case PNG_FILTER_VALUE_SUB:
+              png_ptr->do_filter = PNG_FILTER_SUB; break;
+         case PNG_FILTER_VALUE_UP:
+              png_ptr->do_filter = PNG_FILTER_UP; break;
+         case PNG_FILTER_VALUE_AVG:
+              png_ptr->do_filter = PNG_FILTER_AVG; break;
+         case PNG_FILTER_VALUE_PAETH:
+              png_ptr->do_filter = PNG_FILTER_PAETH; break;
+         default: png_ptr->do_filter = (png_byte)filters; break;
+#else
+         default: png_warning(png_ptr, "Unknown row filter for method 0");
+#endif /* PNG_WRITE_FILTER_SUPPORTED */
+      }
+
+      /* If we have allocated the row_buf, this means we have already started
+       * with the image and we should have allocated all of the filter buffers
+       * that have been selected.  If prev_row isn't already allocated, then
+       * it is too late to start using the filters that need it, since we
+       * will be missing the data in the previous row.  If an application
+       * wants to start and stop using particular filters during compression,
+       * it should start out with all of the filters, and then add and
+       * remove them after the start of compression.
+       */
+      if (png_ptr->row_buf != NULL)
+      {
+#ifdef PNG_WRITE_FILTER_SUPPORTED
+         if ((png_ptr->do_filter & PNG_FILTER_SUB) && png_ptr->sub_row == NULL)
+         {
+            png_ptr->sub_row = (png_bytep)png_malloc(png_ptr,
+              (png_ptr->rowbytes + 1));
+            png_ptr->sub_row[0] = PNG_FILTER_VALUE_SUB;
+         }
+
+         if ((png_ptr->do_filter & PNG_FILTER_UP) && png_ptr->up_row == NULL)
+         {
+            if (png_ptr->prev_row == NULL)
+            {
+               png_warning(png_ptr, "Can't add Up filter after starting");
+               png_ptr->do_filter &= ~PNG_FILTER_UP;
+            }
+            else
+            {
+               png_ptr->up_row = (png_bytep)png_malloc(png_ptr,
+                  (png_ptr->rowbytes + 1));
+               png_ptr->up_row[0] = PNG_FILTER_VALUE_UP;
+            }
+         }
+
+         if ((png_ptr->do_filter & PNG_FILTER_AVG) && png_ptr->avg_row == NULL)
+         {
+            if (png_ptr->prev_row == NULL)
+            {
+               png_warning(png_ptr, "Can't add Average filter after starting");
+               png_ptr->do_filter &= ~PNG_FILTER_AVG;
+            }
+            else
+            {
+               png_ptr->avg_row = (png_bytep)png_malloc(png_ptr,
+                  (png_ptr->rowbytes + 1));
+               png_ptr->avg_row[0] = PNG_FILTER_VALUE_AVG;
+            }
+         }
+
+         if ((png_ptr->do_filter & PNG_FILTER_PAETH) &&
+             png_ptr->paeth_row == NULL)
+         {
+            if (png_ptr->prev_row == NULL)
+            {
+               png_warning(png_ptr, "Can't add Paeth filter after starting");
+               png_ptr->do_filter &= (png_byte)(~PNG_FILTER_PAETH);
+            }
+            else
+            {
+               png_ptr->paeth_row = (png_bytep)png_malloc(png_ptr,
+                  (png_ptr->rowbytes + 1));
+               png_ptr->paeth_row[0] = PNG_FILTER_VALUE_PAETH;
+            }
+         }
+
+         if (png_ptr->do_filter == PNG_NO_FILTERS)
+#endif /* PNG_WRITE_FILTER_SUPPORTED */
+            png_ptr->do_filter = PNG_FILTER_NONE;
+      }
+   }
+   else
+      png_error(png_ptr, "Unknown custom filter method");
+}
+
+/* This allows us to influence the way in which libpng chooses the "best"
+ * filter for the current scanline.  While the "minimum-sum-of-absolute-
+ * differences metric is relatively fast and effective, there is some
+ * question as to whether it can be improved upon by trying to keep the
+ * filtered data going to zlib more consistent, hopefully resulting in
+ * better compression.
+ */
+#ifdef PNG_WRITE_WEIGHTED_FILTER_SUPPORTED      /* GRR 970116 */
+void PNGAPI
+png_set_filter_heuristics(png_structp png_ptr, int heuristic_method,
+   int num_weights, png_doublep filter_weights,
+   png_doublep filter_costs)
+{
+   int i;
+
+   png_debug(1, "in png_set_filter_heuristics");
+
+   if (png_ptr == NULL)
+      return;
+   if (heuristic_method >= PNG_FILTER_HEURISTIC_LAST)
+   {
+      png_warning(png_ptr, "Unknown filter heuristic method");
+      return;
+   }
+
+   if (heuristic_method == PNG_FILTER_HEURISTIC_DEFAULT)
+   {
+      heuristic_method = PNG_FILTER_HEURISTIC_UNWEIGHTED;
+   }
+
+   if (num_weights < 0 || filter_weights == NULL ||
+      heuristic_method == PNG_FILTER_HEURISTIC_UNWEIGHTED)
+   {
+      num_weights = 0;
+   }
+
+   png_ptr->num_prev_filters = (png_byte)num_weights;
+   png_ptr->heuristic_method = (png_byte)heuristic_method;
+
+   if (num_weights > 0)
+   {
+      if (png_ptr->prev_filters == NULL)
+      {
+         png_ptr->prev_filters = (png_bytep)png_malloc(png_ptr,
+            (png_uint_32)(png_sizeof(png_byte) * num_weights));
+
+         /* To make sure that the weighting starts out fairly */
+         for (i = 0; i < num_weights; i++)
+         {
+            png_ptr->prev_filters[i] = 255;
+         }
+      }
+
+      if (png_ptr->filter_weights == NULL)
+      {
+         png_ptr->filter_weights = (png_uint_16p)png_malloc(png_ptr,
+            (png_uint_32)(png_sizeof(png_uint_16) * num_weights));
+
+         png_ptr->inv_filter_weights = (png_uint_16p)png_malloc(png_ptr,
+            (png_uint_32)(png_sizeof(png_uint_16) * num_weights));
+         for (i = 0; i < num_weights; i++)
+         {
+            png_ptr->inv_filter_weights[i] =
+            png_ptr->filter_weights[i] = PNG_WEIGHT_FACTOR;
+         }
+      }
+
+      for (i = 0; i < num_weights; i++)
+      {
+         if (filter_weights[i] < 0.0)
+         {
+            png_ptr->inv_filter_weights[i] =
+            png_ptr->filter_weights[i] = PNG_WEIGHT_FACTOR;
+         }
+         else
+         {
+            png_ptr->inv_filter_weights[i] =
+               (png_uint_16)((double)PNG_WEIGHT_FACTOR*filter_weights[i]+0.5);
+            png_ptr->filter_weights[i] =
+               (png_uint_16)((double)PNG_WEIGHT_FACTOR/filter_weights[i]+0.5);
+         }
+      }
+   }
+
+   /* If, in the future, there are other filter methods, this would
+    * need to be based on png_ptr->filter.
+    */
+   if (png_ptr->filter_costs == NULL)
+   {
+      png_ptr->filter_costs = (png_uint_16p)png_malloc(png_ptr,
+         (png_uint_32)(png_sizeof(png_uint_16) * PNG_FILTER_VALUE_LAST));
+
+      png_ptr->inv_filter_costs = (png_uint_16p)png_malloc(png_ptr,
+         (png_uint_32)(png_sizeof(png_uint_16) * PNG_FILTER_VALUE_LAST));
+
+      for (i = 0; i < PNG_FILTER_VALUE_LAST; i++)
+      {
+         png_ptr->inv_filter_costs[i] =
+         png_ptr->filter_costs[i] = PNG_COST_FACTOR;
+      }
+   }
+
+   /* Here is where we set the relative costs of the different filters.  We
+    * should take the desired compression level into account when setting
+    * the costs, so that Paeth, for instance, has a high relative cost at low
+    * compression levels, while it has a lower relative cost at higher
+    * compression settings.  The filter types are in order of increasing
+    * relative cost, so it would be possible to do this with an algorithm.
+    */
+   for (i = 0; i < PNG_FILTER_VALUE_LAST; i++)
+   {
+      if (filter_costs == NULL || filter_costs[i] < 0.0)
+      {
+         png_ptr->inv_filter_costs[i] =
+         png_ptr->filter_costs[i] = PNG_COST_FACTOR;
+      }
+      else if (filter_costs[i] >= 1.0)
+      {
+         png_ptr->inv_filter_costs[i] =
+            (png_uint_16)((double)PNG_COST_FACTOR / filter_costs[i] + 0.5);
+         png_ptr->filter_costs[i] =
+            (png_uint_16)((double)PNG_COST_FACTOR * filter_costs[i] + 0.5);
+      }
+   }
+}
+#endif /* PNG_WRITE_WEIGHTED_FILTER_SUPPORTED */
+
+void PNGAPI
+png_set_compression_level(png_structp png_ptr, int level)
+{
+   png_debug(1, "in png_set_compression_level");
+
+   if (png_ptr == NULL)
+      return;
+   png_ptr->flags |= PNG_FLAG_ZLIB_CUSTOM_LEVEL;
+   png_ptr->zlib_level = level;
+}
+
+void PNGAPI
+png_set_compression_mem_level(png_structp png_ptr, int mem_level)
+{
+   png_debug(1, "in png_set_compression_mem_level");
+
+   if (png_ptr == NULL)
+      return;
+   png_ptr->flags |= PNG_FLAG_ZLIB_CUSTOM_MEM_LEVEL;
+   png_ptr->zlib_mem_level = mem_level;
+}
+
+void PNGAPI
+png_set_compression_strategy(png_structp png_ptr, int strategy)
+{
+   png_debug(1, "in png_set_compression_strategy");
+
+   if (png_ptr == NULL)
+      return;
+   png_ptr->flags |= PNG_FLAG_ZLIB_CUSTOM_STRATEGY;
+   png_ptr->zlib_strategy = strategy;
+}
+
+void PNGAPI
+png_set_compression_window_bits(png_structp png_ptr, int window_bits)
+{
+   if (png_ptr == NULL)
+      return;
+   if (window_bits > 15)
+      png_warning(png_ptr, "Only compression windows <= 32k supported by PNG");
+   else if (window_bits < 8)
+      png_warning(png_ptr, "Only compression windows >= 256 supported by PNG");
+#ifndef WBITS_8_OK
+   /* Avoid libpng bug with 256-byte windows */
+   if (window_bits == 8)
+     {
+       png_warning(png_ptr, "Compression window is being reset to 512");
+       window_bits = 9;
+     }
+#endif
+   png_ptr->flags |= PNG_FLAG_ZLIB_CUSTOM_WINDOW_BITS;
+   png_ptr->zlib_window_bits = window_bits;
+}
+
+void PNGAPI
+png_set_compression_method(png_structp png_ptr, int method)
+{
+   png_debug(1, "in png_set_compression_method");
+
+   if (png_ptr == NULL)
+      return;
+   if (method != 8)
+      png_warning(png_ptr, "Only compression method 8 is supported by PNG");
+   png_ptr->flags |= PNG_FLAG_ZLIB_CUSTOM_METHOD;
+   png_ptr->zlib_method = method;
+}
+
+void PNGAPI
+png_set_write_status_fn(png_structp png_ptr, png_write_status_ptr write_row_fn)
+{
+   if (png_ptr == NULL)
+      return;
+   png_ptr->write_row_fn = write_row_fn;
+}
+
+#ifdef PNG_WRITE_USER_TRANSFORM_SUPPORTED
+void PNGAPI
+png_set_write_user_transform_fn(png_structp png_ptr, png_user_transform_ptr
+   write_user_transform_fn)
+{
+   png_debug(1, "in png_set_write_user_transform_fn");
+
+   if (png_ptr == NULL)
+      return;
+   png_ptr->transformations |= PNG_USER_TRANSFORM;
+   png_ptr->write_user_transform_fn = write_user_transform_fn;
+}
+#endif
+
+
+#ifdef PNG_INFO_IMAGE_SUPPORTED
+void PNGAPI
+png_write_png(png_structp png_ptr, png_infop info_ptr,
+              int transforms, voidp params)
+{
+   if (png_ptr == NULL || info_ptr == NULL)
+      return;
+
+   /* Write the file header information. */
+   png_write_info(png_ptr, info_ptr);
+
+   /* ------ these transformations don't touch the info structure ------- */
+
+#ifdef PNG_WRITE_INVERT_SUPPORTED
+   /* Invert monochrome pixels */
+   if (transforms & PNG_TRANSFORM_INVERT_MONO)
+      png_set_invert_mono(png_ptr);
+#endif
+
+#ifdef PNG_WRITE_SHIFT_SUPPORTED
+   /* Shift the pixels up to a legal bit depth and fill in
+    * as appropriate to correctly scale the image.
+    */
+   if ((transforms & PNG_TRANSFORM_SHIFT)
+               && (info_ptr->valid & PNG_INFO_sBIT))
+      png_set_shift(png_ptr, &info_ptr->sig_bit);
+#endif
+
+#ifdef PNG_WRITE_PACK_SUPPORTED
+   /* Pack pixels into bytes */
+   if (transforms & PNG_TRANSFORM_PACKING)
+       png_set_packing(png_ptr);
+#endif
+
+#ifdef PNG_WRITE_SWAP_ALPHA_SUPPORTED
+   /* Swap location of alpha bytes from ARGB to RGBA */
+   if (transforms & PNG_TRANSFORM_SWAP_ALPHA)
+      png_set_swap_alpha(png_ptr);
+#endif
+
+#ifdef PNG_WRITE_FILLER_SUPPORTED
+   /* Pack XRGB/RGBX/ARGB/RGBA into * RGB (4 channels -> 3 channels) */
+   if (transforms & PNG_TRANSFORM_STRIP_FILLER_AFTER)
+      png_set_filler(png_ptr, 0, PNG_FILLER_AFTER);
+   else if (transforms & PNG_TRANSFORM_STRIP_FILLER_BEFORE)
+      png_set_filler(png_ptr, 0, PNG_FILLER_BEFORE);
+#endif
+
+#ifdef PNG_WRITE_BGR_SUPPORTED
+   /* Flip BGR pixels to RGB */
+   if (transforms & PNG_TRANSFORM_BGR)
+      png_set_bgr(png_ptr);
+#endif
+
+#ifdef PNG_WRITE_SWAP_SUPPORTED
+   /* Swap bytes of 16-bit files to most significant byte first */
+   if (transforms & PNG_TRANSFORM_SWAP_ENDIAN)
+      png_set_swap(png_ptr);
+#endif
+
+#ifdef PNG_WRITE_PACKSWAP_SUPPORTED
+   /* Swap bits of 1, 2, 4 bit packed pixel formats */
+   if (transforms & PNG_TRANSFORM_PACKSWAP)
+      png_set_packswap(png_ptr);
+#endif
+
+#ifdef PNG_WRITE_INVERT_ALPHA_SUPPORTED
+   /* Invert the alpha channel from opacity to transparency */
+   if (transforms & PNG_TRANSFORM_INVERT_ALPHA)
+      png_set_invert_alpha(png_ptr);
+#endif
+
+   /* ----------------------- end of transformations ------------------- */
+
+   /* Write the bits */
+   if (info_ptr->valid & PNG_INFO_IDAT)
+       png_write_image(png_ptr, info_ptr->row_pointers);
+
+   /* It is REQUIRED to call this to finish writing the rest of the file */
+   png_write_end(png_ptr, info_ptr);
+
+   transforms = transforms; /* Quiet compiler warnings */
+   params = params;
+}
+#endif
+#endif /* PNG_WRITE_SUPPORTED */
diff --git a/Externals/libpng/pngwtran.c b/Externals/libpng/pngwtran.c
index 115ca37212..473099bce9 100644
--- a/Externals/libpng/pngwtran.c
+++ b/Externals/libpng/pngwtran.c
@@ -1,631 +1,582 @@
-
-/* pngwtran.c - transforms the data in a row for PNG writers
- *
- * Last changed in libpng 1.5.0 [January 6, 2011]
- * Copyright (c) 1998-2011 Glenn Randers-Pehrson
- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
- *
- * This code is released under the libpng license.
- * For conditions of distribution and use, see the disclaimer
- * and license in png.h
- */
-
-#include "pngpriv.h"
-
-#ifdef PNG_WRITE_SUPPORTED
-
-/* Transform the data according to the user's wishes.  The order of
- * transformations is significant.
- */
-void /* PRIVATE */
-png_do_write_transformations(png_structp png_ptr)
-{
-   png_debug(1, "in png_do_write_transformations");
-
-   if (png_ptr == NULL)
-      return;
-
-#ifdef PNG_WRITE_USER_TRANSFORM_SUPPORTED
-   if (png_ptr->transformations & PNG_USER_TRANSFORM)
-      if (png_ptr->write_user_transform_fn != NULL)
-         (*(png_ptr->write_user_transform_fn)) /* User write transform
-                                                 function */
-             (png_ptr,                    /* png_ptr */
-             &(png_ptr->row_info),           /* row_info: */
-                /*  png_uint_32 width;       width of row */
-                /*  png_size_t rowbytes;     number of bytes in row */
-                /*  png_byte color_type;     color type of pixels */
-                /*  png_byte bit_depth;      bit depth of samples */
-                /*  png_byte channels;       number of channels (1-4) */
-                /*  png_byte pixel_depth;    bits per pixel (depth*channels) */
-             png_ptr->row_buf + 1);      /* start of pixel data for row */
-#endif
-
-#ifdef PNG_WRITE_FILLER_SUPPORTED
-   if (png_ptr->transformations & PNG_FILLER)
-      png_do_strip_filler(&(png_ptr->row_info), png_ptr->row_buf + 1,
-          png_ptr->flags);
-#endif
-
-#ifdef PNG_WRITE_PACKSWAP_SUPPORTED
-   if (png_ptr->transformations & PNG_PACKSWAP)
-      png_do_packswap(&(png_ptr->row_info), png_ptr->row_buf + 1);
-#endif
-
-#ifdef PNG_WRITE_PACK_SUPPORTED
-   if (png_ptr->transformations & PNG_PACK)
-      png_do_pack(&(png_ptr->row_info), png_ptr->row_buf + 1,
-          (png_uint_32)png_ptr->bit_depth);
-#endif
-
-#ifdef PNG_WRITE_SWAP_SUPPORTED
-   if (png_ptr->transformations & PNG_SWAP_BYTES)
-      png_do_swap(&(png_ptr->row_info), png_ptr->row_buf + 1);
-#endif
-
-#ifdef PNG_WRITE_SHIFT_SUPPORTED
-   if (png_ptr->transformations & PNG_SHIFT)
-      png_do_shift(&(png_ptr->row_info), png_ptr->row_buf + 1,
-          &(png_ptr->shift));
-#endif
-
-#ifdef PNG_WRITE_SWAP_ALPHA_SUPPORTED
-   if (png_ptr->transformations & PNG_SWAP_ALPHA)
-      png_do_write_swap_alpha(&(png_ptr->row_info), png_ptr->row_buf + 1);
-#endif
-
-#ifdef PNG_WRITE_INVERT_ALPHA_SUPPORTED
-   if (png_ptr->transformations & PNG_INVERT_ALPHA)
-      png_do_write_invert_alpha(&(png_ptr->row_info), png_ptr->row_buf + 1);
-#endif
-
-#ifdef PNG_WRITE_BGR_SUPPORTED
-   if (png_ptr->transformations & PNG_BGR)
-      png_do_bgr(&(png_ptr->row_info), png_ptr->row_buf + 1);
-#endif
-
-#ifdef PNG_WRITE_INVERT_SUPPORTED
-   if (png_ptr->transformations & PNG_INVERT_MONO)
-      png_do_invert(&(png_ptr->row_info), png_ptr->row_buf + 1);
-#endif
-}
-
-#ifdef PNG_WRITE_PACK_SUPPORTED
-/* Pack pixels into bytes.  Pass the true bit depth in bit_depth.  The
- * row_info bit depth should be 8 (one pixel per byte).  The channels
- * should be 1 (this only happens on grayscale and paletted images).
- */
-void /* PRIVATE */
-png_do_pack(png_row_infop row_info, png_bytep row, png_uint_32 bit_depth)
-{
-   png_debug(1, "in png_do_pack");
-
-   if (row_info->bit_depth == 8 &&
-      row_info->channels == 1)
-   {
-      switch ((int)bit_depth)
-      {
-         case 1:
-         {
-            png_bytep sp, dp;
-            int mask, v;
-            png_uint_32 i;
-            png_uint_32 row_width = row_info->width;
-
-            sp = row;
-            dp = row;
-            mask = 0x80;
-            v = 0;
-
-            for (i = 0; i < row_width; i++)
-            {
-               if (*sp != 0)
-                  v |= mask;
-
-               sp++;
-
-               if (mask > 1)
-                  mask >>= 1;
-
-               else
-               {
-                  mask = 0x80;
-                  *dp = (png_byte)v;
-                  dp++;
-                  v = 0;
-               }
-            }
-
-            if (mask != 0x80)
-               *dp = (png_byte)v;
-
-            break;
-         }
-
-         case 2:
-         {
-            png_bytep sp, dp;
-            int shift, v;
-            png_uint_32 i;
-            png_uint_32 row_width = row_info->width;
-
-            sp = row;
-            dp = row;
-            shift = 6;
-            v = 0;
-
-            for (i = 0; i < row_width; i++)
-            {
-               png_byte value;
-
-               value = (png_byte)(*sp & 0x03);
-               v |= (value << shift);
-
-               if (shift == 0)
-               {
-                  shift = 6;
-                  *dp = (png_byte)v;
-                  dp++;
-                  v = 0;
-               }
-
-               else
-                  shift -= 2;
-
-               sp++;
-            }
-
-            if (shift != 6)
-               *dp = (png_byte)v;
-
-            break;
-         }
-
-         case 4:
-         {
-            png_bytep sp, dp;
-            int shift, v;
-            png_uint_32 i;
-            png_uint_32 row_width = row_info->width;
-
-            sp = row;
-            dp = row;
-            shift = 4;
-            v = 0;
-
-            for (i = 0; i < row_width; i++)
-            {
-               png_byte value;
-
-               value = (png_byte)(*sp & 0x0f);
-               v |= (value << shift);
-
-               if (shift == 0)
-               {
-                  shift = 4;
-                  *dp = (png_byte)v;
-                  dp++;
-                  v = 0;
-               }
-
-               else
-                  shift -= 4;
-
-               sp++;
-            }
-
-            if (shift != 4)
-               *dp = (png_byte)v;
-
-            break;
-         }
-
-         default:
-            break;
-      }
-
-      row_info->bit_depth = (png_byte)bit_depth;
-      row_info->pixel_depth = (png_byte)(bit_depth * row_info->channels);
-      row_info->rowbytes = PNG_ROWBYTES(row_info->pixel_depth,
-          row_info->width);
-   }
-}
-#endif
-
-#ifdef PNG_WRITE_SHIFT_SUPPORTED
-/* Shift pixel values to take advantage of whole range.  Pass the
- * true number of bits in bit_depth.  The row should be packed
- * according to row_info->bit_depth.  Thus, if you had a row of
- * bit depth 4, but the pixels only had values from 0 to 7, you
- * would pass 3 as bit_depth, and this routine would translate the
- * data to 0 to 15.
- */
-void /* PRIVATE */
-png_do_shift(png_row_infop row_info, png_bytep row,
-    png_const_color_8p bit_depth)
-{
-   png_debug(1, "in png_do_shift");
-
-   if (row_info->color_type != PNG_COLOR_TYPE_PALETTE)
-   {
-      int shift_start[4], shift_dec[4];
-      int channels = 0;
-
-      if (row_info->color_type & PNG_COLOR_MASK_COLOR)
-      {
-         shift_start[channels] = row_info->bit_depth - bit_depth->red;
-         shift_dec[channels] = bit_depth->red;
-         channels++;
-
-         shift_start[channels] = row_info->bit_depth - bit_depth->green;
-         shift_dec[channels] = bit_depth->green;
-         channels++;
-
-         shift_start[channels] = row_info->bit_depth - bit_depth->blue;
-         shift_dec[channels] = bit_depth->blue;
-         channels++;
-      }
-
-      else
-      {
-         shift_start[channels] = row_info->bit_depth - bit_depth->gray;
-         shift_dec[channels] = bit_depth->gray;
-         channels++;
-      }
-
-      if (row_info->color_type & PNG_COLOR_MASK_ALPHA)
-      {
-         shift_start[channels] = row_info->bit_depth - bit_depth->alpha;
-         shift_dec[channels] = bit_depth->alpha;
-         channels++;
-      }
-
-      /* With low row depths, could only be grayscale, so one channel */
-      if (row_info->bit_depth < 8)
-      {
-         png_bytep bp = row;
-         png_size_t i;
-         png_byte mask;
-         png_size_t row_bytes = row_info->rowbytes;
-
-         if (bit_depth->gray == 1 && row_info->bit_depth == 2)
-            mask = 0x55;
-
-         else if (row_info->bit_depth == 4 && bit_depth->gray == 3)
-            mask = 0x11;
-
-         else
-            mask = 0xff;
-
-         for (i = 0; i < row_bytes; i++, bp++)
-         {
-            png_uint_16 v;
-            int j;
-
-            v = *bp;
-            *bp = 0;
-
-            for (j = shift_start[0]; j > -shift_dec[0]; j -= shift_dec[0])
-            {
-               if (j > 0)
-                  *bp |= (png_byte)((v << j) & 0xff);
-
-               else
-                  *bp |= (png_byte)((v >> (-j)) & mask);
-            }
-         }
-      }
-
-      else if (row_info->bit_depth == 8)
-      {
-         png_bytep bp = row;
-         png_uint_32 i;
-         png_uint_32 istop = channels * row_info->width;
-
-         for (i = 0; i < istop; i++, bp++)
-         {
-
-            png_uint_16 v;
-            int j;
-            int c = (int)(i%channels);
-
-            v = *bp;
-            *bp = 0;
-
-            for (j = shift_start[c]; j > -shift_dec[c]; j -= shift_dec[c])
-            {
-               if (j > 0)
-                  *bp |= (png_byte)((v << j) & 0xff);
-
-               else
-                  *bp |= (png_byte)((v >> (-j)) & 0xff);
-            }
-         }
-      }
-
-      else
-      {
-         png_bytep bp;
-         png_uint_32 i;
-         png_uint_32 istop = channels * row_info->width;
-
-         for (bp = row, i = 0; i < istop; i++)
-         {
-            int c = (int)(i%channels);
-            png_uint_16 value, v;
-            int j;
-
-            v = (png_uint_16)(((png_uint_16)(*bp) << 8) + *(bp + 1));
-            value = 0;
-
-            for (j = shift_start[c]; j > -shift_dec[c]; j -= shift_dec[c])
-            {
-               if (j > 0)
-                  value |= (png_uint_16)((v << j) & (png_uint_16)0xffff);
-
-               else
-                  value |= (png_uint_16)((v >> (-j)) & (png_uint_16)0xffff);
-            }
-            *bp++ = (png_byte)(value >> 8);
-            *bp++ = (png_byte)(value & 0xff);
-         }
-      }
-   }
-}
-#endif
-
-#ifdef PNG_WRITE_SWAP_ALPHA_SUPPORTED
-void /* PRIVATE */
-png_do_write_swap_alpha(png_row_infop row_info, png_bytep row)
-{
-   png_debug(1, "in png_do_write_swap_alpha");
-
-   {
-      if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
-      {
-         if (row_info->bit_depth == 8)
-         {
-            /* This converts from ARGB to RGBA */
-            png_bytep sp, dp;
-            png_uint_32 i;
-            png_uint_32 row_width = row_info->width;
-
-            for (i = 0, sp = dp = row; i < row_width; i++)
-            {
-               png_byte save = *(sp++);
-               *(dp++) = *(sp++);
-               *(dp++) = *(sp++);
-               *(dp++) = *(sp++);
-               *(dp++) = save;
-            }
-         }
-
-#ifdef PNG_WRITE_16BIT_SUPPORTED
-         else
-         {
-            /* This converts from AARRGGBB to RRGGBBAA */
-            png_bytep sp, dp;
-            png_uint_32 i;
-            png_uint_32 row_width = row_info->width;
-
-            for (i = 0, sp = dp = row; i < row_width; i++)
-            {
-               png_byte save[2];
-               save[0] = *(sp++);
-               save[1] = *(sp++);
-               *(dp++) = *(sp++);
-               *(dp++) = *(sp++);
-               *(dp++) = *(sp++);
-               *(dp++) = *(sp++);
-               *(dp++) = *(sp++);
-               *(dp++) = *(sp++);
-               *(dp++) = save[0];
-               *(dp++) = save[1];
-            }
-         }
-#endif /* PNG_WRITE_16BIT_SUPPORTED */
-      }
-
-      else if (row_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
-      {
-         if (row_info->bit_depth == 8)
-         {
-            /* This converts from AG to GA */
-            png_bytep sp, dp;
-            png_uint_32 i;
-            png_uint_32 row_width = row_info->width;
-
-            for (i = 0, sp = dp = row; i < row_width; i++)
-            {
-               png_byte save = *(sp++);
-               *(dp++) = *(sp++);
-               *(dp++) = save;
-            }
-         }
-
-#ifdef PNG_WRITE_16BIT_SUPPORTED
-         else
-         {
-            /* This converts from AAGG to GGAA */
-            png_bytep sp, dp;
-            png_uint_32 i;
-            png_uint_32 row_width = row_info->width;
-
-            for (i = 0, sp = dp = row; i < row_width; i++)
-            {
-               png_byte save[2];
-               save[0] = *(sp++);
-               save[1] = *(sp++);
-               *(dp++) = *(sp++);
-               *(dp++) = *(sp++);
-               *(dp++) = save[0];
-               *(dp++) = save[1];
-            }
-         }
-#endif /* PNG_WRITE_16BIT_SUPPORTED */
-      }
-   }
-}
-#endif
-
-#ifdef PNG_WRITE_INVERT_ALPHA_SUPPORTED
-void /* PRIVATE */
-png_do_write_invert_alpha(png_row_infop row_info, png_bytep row)
-{
-   png_debug(1, "in png_do_write_invert_alpha");
-
-   {
-      if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
-      {
-         if (row_info->bit_depth == 8)
-         {
-            /* This inverts the alpha channel in RGBA */
-            png_bytep sp, dp;
-            png_uint_32 i;
-            png_uint_32 row_width = row_info->width;
-
-            for (i = 0, sp = dp = row; i < row_width; i++)
-            {
-               /* Does nothing
-               *(dp++) = *(sp++);
-               *(dp++) = *(sp++);
-               *(dp++) = *(sp++);
-               */
-               sp+=3; dp = sp;
-               *(dp++) = (png_byte)(255 - *(sp++));
-            }
-         }
-
-#ifdef PNG_WRITE_16BIT_SUPPORTED
-         else
-         {
-            /* This inverts the alpha channel in RRGGBBAA */
-            png_bytep sp, dp;
-            png_uint_32 i;
-            png_uint_32 row_width = row_info->width;
-
-            for (i = 0, sp = dp = row; i < row_width; i++)
-            {
-               /* Does nothing
-               *(dp++) = *(sp++);
-               *(dp++) = *(sp++);
-               *(dp++) = *(sp++);
-               *(dp++) = *(sp++);
-               *(dp++) = *(sp++);
-               *(dp++) = *(sp++);
-               */
-               sp+=6; dp = sp;
-               *(dp++) = (png_byte)(255 - *(sp++));
-               *(dp++) = (png_byte)(255 - *(sp++));
-            }
-         }
-#endif /* PNG_WRITE_16BIT_SUPPORTED */
-      }
-
-      else if (row_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
-      {
-         if (row_info->bit_depth == 8)
-         {
-            /* This inverts the alpha channel in GA */
-            png_bytep sp, dp;
-            png_uint_32 i;
-            png_uint_32 row_width = row_info->width;
-
-            for (i = 0, sp = dp = row; i < row_width; i++)
-            {
-               *(dp++) = *(sp++);
-               *(dp++) = (png_byte)(255 - *(sp++));
-            }
-         }
-
-#ifdef PNG_WRITE_16BIT_SUPPORTED
-         else
-         {
-            /* This inverts the alpha channel in GGAA */
-            png_bytep sp, dp;
-            png_uint_32 i;
-            png_uint_32 row_width = row_info->width;
-
-            for (i = 0, sp = dp = row; i < row_width; i++)
-            {
-               /* Does nothing
-               *(dp++) = *(sp++);
-               *(dp++) = *(sp++);
-               */
-               sp+=2; dp = sp;
-               *(dp++) = (png_byte)(255 - *(sp++));
-               *(dp++) = (png_byte)(255 - *(sp++));
-            }
-         }
-#endif /* PNG_WRITE_16BIT_SUPPORTED */
-      }
-   }
-}
-#endif
-
-#ifdef PNG_MNG_FEATURES_SUPPORTED
-/* Undoes intrapixel differencing  */
-void /* PRIVATE */
-png_do_write_intrapixel(png_row_infop row_info, png_bytep row)
-{
-   png_debug(1, "in png_do_write_intrapixel");
-
-   if ((row_info->color_type & PNG_COLOR_MASK_COLOR))
-   {
-      int bytes_per_pixel;
-      png_uint_32 row_width = row_info->width;
-      if (row_info->bit_depth == 8)
-      {
-         png_bytep rp;
-         png_uint_32 i;
-
-         if (row_info->color_type == PNG_COLOR_TYPE_RGB)
-            bytes_per_pixel = 3;
-
-         else if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
-            bytes_per_pixel = 4;
-
-         else
-            return;
-
-         for (i = 0, rp = row; i < row_width; i++, rp += bytes_per_pixel)
-         {
-            *(rp)     = (png_byte)((*rp       - *(rp + 1)) & 0xff);
-            *(rp + 2) = (png_byte)((*(rp + 2) - *(rp + 1)) & 0xff);
-         }
-      }
-
-#ifdef PNG_WRITE_16BIT_SUPPORTED
-      else if (row_info->bit_depth == 16)
-      {
-         png_bytep rp;
-         png_uint_32 i;
-
-         if (row_info->color_type == PNG_COLOR_TYPE_RGB)
-            bytes_per_pixel = 6;
-
-         else if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
-            bytes_per_pixel = 8;
-
-         else
-            return;
-
-         for (i = 0, rp = row; i < row_width; i++, rp += bytes_per_pixel)
-         {
-            png_uint_32 s0   = (*(rp    ) << 8) | *(rp + 1);
-            png_uint_32 s1   = (*(rp + 2) << 8) | *(rp + 3);
-            png_uint_32 s2   = (*(rp + 4) << 8) | *(rp + 5);
-            png_uint_32 red  = (png_uint_32)((s0 - s1) & 0xffffL);
-            png_uint_32 blue = (png_uint_32)((s2 - s1) & 0xffffL);
-            *(rp    ) = (png_byte)((red >> 8) & 0xff);
-            *(rp + 1) = (png_byte)(red & 0xff);
-            *(rp + 4) = (png_byte)((blue >> 8) & 0xff);
-            *(rp + 5) = (png_byte)(blue & 0xff);
-         }
-      }
-#endif /* PNG_WRITE_16BIT_SUPPORTED */
-   }
-}
-#endif /* PNG_MNG_FEATURES_SUPPORTED */
-#endif /* PNG_WRITE_SUPPORTED */
+
+/* pngwtran.c - transforms the data in a row for PNG writers
+ *
+ * Last changed in libpng 1.2.43 [February 25, 2010]
+ * Copyright (c) 1998-2010 Glenn Randers-Pehrson
+ * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
+ * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
+ *
+ * This code is released under the libpng license.
+ * For conditions of distribution and use, see the disclaimer
+ * and license in png.h
+ */
+
+#define PNG_INTERNAL
+#define PNG_NO_PEDANTIC_WARNINGS
+#include "png.h"
+#ifdef PNG_WRITE_SUPPORTED
+
+/* Transform the data according to the user's wishes.  The order of
+ * transformations is significant.
+ */
+void /* PRIVATE */
+png_do_write_transformations(png_structp png_ptr)
+{
+   png_debug(1, "in png_do_write_transformations");
+
+   if (png_ptr == NULL)
+      return;
+
+#ifdef PNG_WRITE_USER_TRANSFORM_SUPPORTED
+   if (png_ptr->transformations & PNG_USER_TRANSFORM)
+      if (png_ptr->write_user_transform_fn != NULL)
+        (*(png_ptr->write_user_transform_fn)) /* User write transform
+                                                 function */
+          (png_ptr,                    /* png_ptr */
+           &(png_ptr->row_info),       /* row_info:     */
+             /*  png_uint_32 width;          width of row */
+             /*  png_uint_32 rowbytes;       number of bytes in row */
+             /*  png_byte color_type;        color type of pixels */
+             /*  png_byte bit_depth;         bit depth of samples */
+             /*  png_byte channels;          number of channels (1-4) */
+             /*  png_byte pixel_depth;       bits per pixel (depth*channels) */
+           png_ptr->row_buf + 1);      /* start of pixel data for row */
+#endif
+#ifdef PNG_WRITE_FILLER_SUPPORTED
+   if (png_ptr->transformations & PNG_FILLER)
+      png_do_strip_filler(&(png_ptr->row_info), png_ptr->row_buf + 1,
+         png_ptr->flags);
+#endif
+#ifdef PNG_WRITE_PACKSWAP_SUPPORTED
+   if (png_ptr->transformations & PNG_PACKSWAP)
+      png_do_packswap(&(png_ptr->row_info), png_ptr->row_buf + 1);
+#endif
+#ifdef PNG_WRITE_PACK_SUPPORTED
+   if (png_ptr->transformations & PNG_PACK)
+      png_do_pack(&(png_ptr->row_info), png_ptr->row_buf + 1,
+         (png_uint_32)png_ptr->bit_depth);
+#endif
+#ifdef PNG_WRITE_SWAP_SUPPORTED
+   if (png_ptr->transformations & PNG_SWAP_BYTES)
+      png_do_swap(&(png_ptr->row_info), png_ptr->row_buf + 1);
+#endif
+#ifdef PNG_WRITE_SHIFT_SUPPORTED
+   if (png_ptr->transformations & PNG_SHIFT)
+      png_do_shift(&(png_ptr->row_info), png_ptr->row_buf + 1,
+         &(png_ptr->shift));
+#endif
+#ifdef PNG_WRITE_SWAP_ALPHA_SUPPORTED
+   if (png_ptr->transformations & PNG_SWAP_ALPHA)
+      png_do_write_swap_alpha(&(png_ptr->row_info), png_ptr->row_buf + 1);
+#endif
+#ifdef PNG_WRITE_INVERT_ALPHA_SUPPORTED
+   if (png_ptr->transformations & PNG_INVERT_ALPHA)
+      png_do_write_invert_alpha(&(png_ptr->row_info), png_ptr->row_buf + 1);
+#endif
+#ifdef PNG_WRITE_BGR_SUPPORTED
+   if (png_ptr->transformations & PNG_BGR)
+      png_do_bgr(&(png_ptr->row_info), png_ptr->row_buf + 1);
+#endif
+#ifdef PNG_WRITE_INVERT_SUPPORTED
+   if (png_ptr->transformations & PNG_INVERT_MONO)
+      png_do_invert(&(png_ptr->row_info), png_ptr->row_buf + 1);
+#endif
+}
+
+#ifdef PNG_WRITE_PACK_SUPPORTED
+/* Pack pixels into bytes.  Pass the true bit depth in bit_depth.  The
+ * row_info bit depth should be 8 (one pixel per byte).  The channels
+ * should be 1 (this only happens on grayscale and paletted images).
+ */
+void /* PRIVATE */
+png_do_pack(png_row_infop row_info, png_bytep row, png_uint_32 bit_depth)
+{
+   png_debug(1, "in png_do_pack");
+
+   if (row_info->bit_depth == 8 &&
+#ifdef PNG_USELESS_TESTS_SUPPORTED
+       row != NULL && row_info != NULL &&
+#endif
+      row_info->channels == 1)
+   {
+      switch ((int)bit_depth)
+      {
+         case 1:
+         {
+            png_bytep sp, dp;
+            int mask, v;
+            png_uint_32 i;
+            png_uint_32 row_width = row_info->width;
+
+            sp = row;
+            dp = row;
+            mask = 0x80;
+            v = 0;
+
+            for (i = 0; i < row_width; i++)
+            {
+               if (*sp != 0)
+                  v |= mask;
+               sp++;
+               if (mask > 1)
+                  mask >>= 1;
+               else
+               {
+                  mask = 0x80;
+                  *dp = (png_byte)v;
+                  dp++;
+                  v = 0;
+               }
+            }
+            if (mask != 0x80)
+               *dp = (png_byte)v;
+            break;
+         }
+         case 2:
+         {
+            png_bytep sp, dp;
+            int shift, v;
+            png_uint_32 i;
+            png_uint_32 row_width = row_info->width;
+
+            sp = row;
+            dp = row;
+            shift = 6;
+            v = 0;
+            for (i = 0; i < row_width; i++)
+            {
+               png_byte value;
+
+               value = (png_byte)(*sp & 0x03);
+               v |= (value << shift);
+               if (shift == 0)
+               {
+                  shift = 6;
+                  *dp = (png_byte)v;
+                  dp++;
+                  v = 0;
+               }
+               else
+                  shift -= 2;
+               sp++;
+            }
+            if (shift != 6)
+               *dp = (png_byte)v;
+            break;
+         }
+         case 4:
+         {
+            png_bytep sp, dp;
+            int shift, v;
+            png_uint_32 i;
+            png_uint_32 row_width = row_info->width;
+
+            sp = row;
+            dp = row;
+            shift = 4;
+            v = 0;
+            for (i = 0; i < row_width; i++)
+            {
+               png_byte value;
+
+               value = (png_byte)(*sp & 0x0f);
+               v |= (value << shift);
+
+               if (shift == 0)
+               {
+                  shift = 4;
+                  *dp = (png_byte)v;
+                  dp++;
+                  v = 0;
+               }
+               else
+                  shift -= 4;
+
+               sp++;
+            }
+            if (shift != 4)
+               *dp = (png_byte)v;
+            break;
+         }
+      }
+      row_info->bit_depth = (png_byte)bit_depth;
+      row_info->pixel_depth = (png_byte)(bit_depth * row_info->channels);
+      row_info->rowbytes = PNG_ROWBYTES(row_info->pixel_depth,
+         row_info->width);
+   }
+}
+#endif
+
+#ifdef PNG_WRITE_SHIFT_SUPPORTED
+/* Shift pixel values to take advantage of whole range.  Pass the
+ * true number of bits in bit_depth.  The row should be packed
+ * according to row_info->bit_depth.  Thus, if you had a row of
+ * bit depth 4, but the pixels only had values from 0 to 7, you
+ * would pass 3 as bit_depth, and this routine would translate the
+ * data to 0 to 15.
+ */
+void /* PRIVATE */
+png_do_shift(png_row_infop row_info, png_bytep row, png_color_8p bit_depth)
+{
+   png_debug(1, "in png_do_shift");
+
+#ifdef PNG_USELESS_TESTS_SUPPORTED
+   if (row != NULL && row_info != NULL &&
+#else
+   if (
+#endif
+      row_info->color_type != PNG_COLOR_TYPE_PALETTE)
+   {
+      int shift_start[4], shift_dec[4];
+      int channels = 0;
+
+      if (row_info->color_type & PNG_COLOR_MASK_COLOR)
+      {
+         shift_start[channels] = row_info->bit_depth - bit_depth->red;
+         shift_dec[channels] = bit_depth->red;
+         channels++;
+         shift_start[channels] = row_info->bit_depth - bit_depth->green;
+         shift_dec[channels] = bit_depth->green;
+         channels++;
+         shift_start[channels] = row_info->bit_depth - bit_depth->blue;
+         shift_dec[channels] = bit_depth->blue;
+         channels++;
+      }
+      else
+      {
+         shift_start[channels] = row_info->bit_depth - bit_depth->gray;
+         shift_dec[channels] = bit_depth->gray;
+         channels++;
+      }
+      if (row_info->color_type & PNG_COLOR_MASK_ALPHA)
+      {
+         shift_start[channels] = row_info->bit_depth - bit_depth->alpha;
+         shift_dec[channels] = bit_depth->alpha;
+         channels++;
+      }
+
+      /* With low row depths, could only be grayscale, so one channel */
+      if (row_info->bit_depth < 8)
+      {
+         png_bytep bp = row;
+         png_uint_32 i;
+         png_byte mask;
+         png_uint_32 row_bytes = row_info->rowbytes;
+
+         if (bit_depth->gray == 1 && row_info->bit_depth == 2)
+            mask = 0x55;
+         else if (row_info->bit_depth == 4 && bit_depth->gray == 3)
+            mask = 0x11;
+         else
+            mask = 0xff;
+
+         for (i = 0; i < row_bytes; i++, bp++)
+         {
+            png_uint_16 v;
+            int j;
+
+            v = *bp;
+            *bp = 0;
+            for (j = shift_start[0]; j > -shift_dec[0]; j -= shift_dec[0])
+            {
+               if (j > 0)
+                  *bp |= (png_byte)((v << j) & 0xff);
+               else
+                  *bp |= (png_byte)((v >> (-j)) & mask);
+            }
+         }
+      }
+      else if (row_info->bit_depth == 8)
+      {
+         png_bytep bp = row;
+         png_uint_32 i;
+         png_uint_32 istop = channels * row_info->width;
+
+         for (i = 0; i < istop; i++, bp++)
+         {
+
+            png_uint_16 v;
+            int j;
+            int c = (int)(i%channels);
+
+            v = *bp;
+            *bp = 0;
+            for (j = shift_start[c]; j > -shift_dec[c]; j -= shift_dec[c])
+            {
+               if (j > 0)
+                  *bp |= (png_byte)((v << j) & 0xff);
+               else
+                  *bp |= (png_byte)((v >> (-j)) & 0xff);
+            }
+         }
+      }
+      else
+      {
+         png_bytep bp;
+         png_uint_32 i;
+         png_uint_32 istop = channels * row_info->width;
+
+         for (bp = row, i = 0; i < istop; i++)
+         {
+            int c = (int)(i%channels);
+            png_uint_16 value, v;
+            int j;
+
+            v = (png_uint_16)(((png_uint_16)(*bp) << 8) + *(bp + 1));
+            value = 0;
+            for (j = shift_start[c]; j > -shift_dec[c]; j -= shift_dec[c])
+            {
+               if (j > 0)
+                  value |= (png_uint_16)((v << j) & (png_uint_16)0xffff);
+               else
+                  value |= (png_uint_16)((v >> (-j)) & (png_uint_16)0xffff);
+            }
+            *bp++ = (png_byte)(value >> 8);
+            *bp++ = (png_byte)(value & 0xff);
+         }
+      }
+   }
+}
+#endif
+
+#ifdef PNG_WRITE_SWAP_ALPHA_SUPPORTED
+void /* PRIVATE */
+png_do_write_swap_alpha(png_row_infop row_info, png_bytep row)
+{
+   png_debug(1, "in png_do_write_swap_alpha");
+
+#ifdef PNG_USELESS_TESTS_SUPPORTED
+   if (row != NULL && row_info != NULL)
+#endif
+   {
+      if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
+      {
+         /* This converts from ARGB to RGBA */
+         if (row_info->bit_depth == 8)
+         {
+            png_bytep sp, dp;
+            png_uint_32 i;
+            png_uint_32 row_width = row_info->width;
+            for (i = 0, sp = dp = row; i < row_width; i++)
+            {
+               png_byte save = *(sp++);
+               *(dp++) = *(sp++);
+               *(dp++) = *(sp++);
+               *(dp++) = *(sp++);
+               *(dp++) = save;
+            }
+         }
+         /* This converts from AARRGGBB to RRGGBBAA */
+         else
+         {
+            png_bytep sp, dp;
+            png_uint_32 i;
+            png_uint_32 row_width = row_info->width;
+
+            for (i = 0, sp = dp = row; i < row_width; i++)
+            {
+               png_byte save[2];
+               save[0] = *(sp++);
+               save[1] = *(sp++);
+               *(dp++) = *(sp++);
+               *(dp++) = *(sp++);
+               *(dp++) = *(sp++);
+               *(dp++) = *(sp++);
+               *(dp++) = *(sp++);
+               *(dp++) = *(sp++);
+               *(dp++) = save[0];
+               *(dp++) = save[1];
+            }
+         }
+      }
+      else if (row_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
+      {
+         /* This converts from AG to GA */
+         if (row_info->bit_depth == 8)
+         {
+            png_bytep sp, dp;
+            png_uint_32 i;
+            png_uint_32 row_width = row_info->width;
+
+            for (i = 0, sp = dp = row; i < row_width; i++)
+            {
+               png_byte save = *(sp++);
+               *(dp++) = *(sp++);
+               *(dp++) = save;
+            }
+         }
+         /* This converts from AAGG to GGAA */
+         else
+         {
+            png_bytep sp, dp;
+            png_uint_32 i;
+            png_uint_32 row_width = row_info->width;
+
+            for (i = 0, sp = dp = row; i < row_width; i++)
+            {
+               png_byte save[2];
+               save[0] = *(sp++);
+               save[1] = *(sp++);
+               *(dp++) = *(sp++);
+               *(dp++) = *(sp++);
+               *(dp++) = save[0];
+               *(dp++) = save[1];
+            }
+         }
+      }
+   }
+}
+#endif
+
+#ifdef PNG_WRITE_INVERT_ALPHA_SUPPORTED
+void /* PRIVATE */
+png_do_write_invert_alpha(png_row_infop row_info, png_bytep row)
+{
+   png_debug(1, "in png_do_write_invert_alpha");
+
+#ifdef PNG_USELESS_TESTS_SUPPORTED
+   if (row != NULL && row_info != NULL)
+#endif
+   {
+      if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
+      {
+         /* This inverts the alpha channel in RGBA */
+         if (row_info->bit_depth == 8)
+         {
+            png_bytep sp, dp;
+            png_uint_32 i;
+            png_uint_32 row_width = row_info->width;
+            for (i = 0, sp = dp = row; i < row_width; i++)
+            {
+               /* Does nothing
+               *(dp++) = *(sp++);
+               *(dp++) = *(sp++);
+               *(dp++) = *(sp++);
+               */
+               sp+=3; dp = sp;
+               *(dp++) = (png_byte)(255 - *(sp++));
+            }
+         }
+         /* This inverts the alpha channel in RRGGBBAA */
+         else
+         {
+            png_bytep sp, dp;
+            png_uint_32 i;
+            png_uint_32 row_width = row_info->width;
+
+            for (i = 0, sp = dp = row; i < row_width; i++)
+            {
+               /* Does nothing
+               *(dp++) = *(sp++);
+               *(dp++) = *(sp++);
+               *(dp++) = *(sp++);
+               *(dp++) = *(sp++);
+               *(dp++) = *(sp++);
+               *(dp++) = *(sp++);
+               */
+               sp+=6; dp = sp;
+               *(dp++) = (png_byte)(255 - *(sp++));
+               *(dp++) = (png_byte)(255 - *(sp++));
+            }
+         }
+      }
+      else if (row_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
+      {
+         /* This inverts the alpha channel in GA */
+         if (row_info->bit_depth == 8)
+         {
+            png_bytep sp, dp;
+            png_uint_32 i;
+            png_uint_32 row_width = row_info->width;
+
+            for (i = 0, sp = dp = row; i < row_width; i++)
+            {
+               *(dp++) = *(sp++);
+               *(dp++) = (png_byte)(255 - *(sp++));
+            }
+         }
+         /* This inverts the alpha channel in GGAA */
+         else
+         {
+            png_bytep sp, dp;
+            png_uint_32 i;
+            png_uint_32 row_width = row_info->width;
+
+            for (i = 0, sp = dp = row; i < row_width; i++)
+            {
+               /* Does nothing
+               *(dp++) = *(sp++);
+               *(dp++) = *(sp++);
+               */
+               sp+=2; dp = sp;
+               *(dp++) = (png_byte)(255 - *(sp++));
+               *(dp++) = (png_byte)(255 - *(sp++));
+            }
+         }
+      }
+   }
+}
+#endif
+
+#ifdef PNG_MNG_FEATURES_SUPPORTED
+/* Undoes intrapixel differencing  */
+void /* PRIVATE */
+png_do_write_intrapixel(png_row_infop row_info, png_bytep row)
+{
+   png_debug(1, "in png_do_write_intrapixel");
+
+   if (
+#ifdef PNG_USELESS_TESTS_SUPPORTED
+       row != NULL && row_info != NULL &&
+#endif
+       (row_info->color_type & PNG_COLOR_MASK_COLOR))
+   {
+      int bytes_per_pixel;
+      png_uint_32 row_width = row_info->width;
+      if (row_info->bit_depth == 8)
+      {
+         png_bytep rp;
+         png_uint_32 i;
+
+         if (row_info->color_type == PNG_COLOR_TYPE_RGB)
+            bytes_per_pixel = 3;
+         else if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
+            bytes_per_pixel = 4;
+         else
+            return;
+
+         for (i = 0, rp = row; i < row_width; i++, rp += bytes_per_pixel)
+         {
+            *(rp)   = (png_byte)((*rp     - *(rp+1))&0xff);
+            *(rp+2) = (png_byte)((*(rp+2) - *(rp+1))&0xff);
+         }
+      }
+      else if (row_info->bit_depth == 16)
+      {
+         png_bytep rp;
+         png_uint_32 i;
+
+         if (row_info->color_type == PNG_COLOR_TYPE_RGB)
+            bytes_per_pixel = 6;
+         else if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
+            bytes_per_pixel = 8;
+         else
+            return;
+
+         for (i = 0, rp = row; i < row_width; i++, rp += bytes_per_pixel)
+         {
+            png_uint_32 s0   = (*(rp  ) << 8) | *(rp+1);
+            png_uint_32 s1   = (*(rp+2) << 8) | *(rp+3);
+            png_uint_32 s2   = (*(rp+4) << 8) | *(rp+5);
+            png_uint_32 red  = (png_uint_32)((s0 - s1) & 0xffffL);
+            png_uint_32 blue = (png_uint_32)((s2 - s1) & 0xffffL);
+            *(rp  ) = (png_byte)((red >> 8) & 0xff);
+            *(rp+1) = (png_byte)(red & 0xff);
+            *(rp+4) = (png_byte)((blue >> 8) & 0xff);
+            *(rp+5) = (png_byte)(blue & 0xff);
+         }
+      }
+   }
+}
+#endif /* PNG_MNG_FEATURES_SUPPORTED */
+#endif /* PNG_WRITE_SUPPORTED */
diff --git a/Externals/libpng/pngwutil.c b/Externals/libpng/pngwutil.c
index 2c35785aa1..50568f5af7 100644
--- a/Externals/libpng/pngwutil.c
+++ b/Externals/libpng/pngwutil.c
@@ -1,2948 +1,2832 @@
-
-/* pngwutil.c - utilities to write a PNG file
- *
- * Last changed in libpng 1.5.0 [January 6, 2011]
- * Copyright (c) 1998-2011 Glenn Randers-Pehrson
- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
- *
- * This code is released under the libpng license.
- * For conditions of distribution and use, see the disclaimer
- * and license in png.h
- */
-
-#include "pngpriv.h"
-
-#ifdef PNG_WRITE_SUPPORTED
-
-#ifdef PNG_WRITE_INT_FUNCTIONS_SUPPORTED
-/* Place a 32-bit number into a buffer in PNG byte order.  We work
- * with unsigned numbers for convenience, although one supported
- * ancillary chunk uses signed (two's complement) numbers.
- */
-void PNGAPI
-png_save_uint_32(png_bytep buf, png_uint_32 i)
-{
-   buf[0] = (png_byte)((i >> 24) & 0xff);
-   buf[1] = (png_byte)((i >> 16) & 0xff);
-   buf[2] = (png_byte)((i >> 8) & 0xff);
-   buf[3] = (png_byte)(i & 0xff);
-}
-
-#ifdef PNG_SAVE_INT_32_SUPPORTED
-/* The png_save_int_32 function assumes integers are stored in two's
- * complement format.  If this isn't the case, then this routine needs to
- * be modified to write data in two's complement format.  Note that,
- * the following works correctly even if png_int_32 has more than 32 bits
- * (compare the more complex code required on read for sign extention.)
- */
-void PNGAPI
-png_save_int_32(png_bytep buf, png_int_32 i)
-{
-   buf[0] = (png_byte)((i >> 24) & 0xff);
-   buf[1] = (png_byte)((i >> 16) & 0xff);
-   buf[2] = (png_byte)((i >> 8) & 0xff);
-   buf[3] = (png_byte)(i & 0xff);
-}
-#endif
-
-/* Place a 16-bit number into a buffer in PNG byte order.
- * The parameter is declared unsigned int, not png_uint_16,
- * just to avoid potential problems on pre-ANSI C compilers.
- */
-void PNGAPI
-png_save_uint_16(png_bytep buf, unsigned int i)
-{
-   buf[0] = (png_byte)((i >> 8) & 0xff);
-   buf[1] = (png_byte)(i & 0xff);
-}
-#endif
-
-/* Simple function to write the signature.  If we have already written
- * the magic bytes of the signature, or more likely, the PNG stream is
- * being embedded into another stream and doesn't need its own signature,
- * we should call png_set_sig_bytes() to tell libpng how many of the
- * bytes have already been written.
- */
-void PNGAPI
-png_write_sig(png_structp png_ptr)
-{
-   png_byte png_signature[8] = {137, 80, 78, 71, 13, 10, 26, 10};
-
-#ifdef PNG_IO_STATE_SUPPORTED
-   /* Inform the I/O callback that the signature is being written */
-   png_ptr->io_state = PNG_IO_WRITING | PNG_IO_SIGNATURE;
-#endif
-
-   /* Write the rest of the 8 byte signature */
-   png_write_data(png_ptr, &png_signature[png_ptr->sig_bytes],
-      (png_size_t)(8 - png_ptr->sig_bytes));
-
-   if (png_ptr->sig_bytes < 3)
-      png_ptr->mode |= PNG_HAVE_PNG_SIGNATURE;
-}
-
-/* Write a PNG chunk all at once.  The type is an array of ASCII characters
- * representing the chunk name.  The array must be at least 4 bytes in
- * length, and does not need to be null terminated.  To be safe, pass the
- * pre-defined chunk names here, and if you need a new one, define it
- * where the others are defined.  The length is the length of the data.
- * All the data must be present.  If that is not possible, use the
- * png_write_chunk_start(), png_write_chunk_data(), and png_write_chunk_end()
- * functions instead.
- */
-void PNGAPI
-png_write_chunk(png_structp png_ptr, png_const_bytep chunk_name,
-   png_const_bytep data, png_size_t length)
-{
-   if (png_ptr == NULL)
-      return;
-
-   png_write_chunk_start(png_ptr, chunk_name, (png_uint_32)length);
-   png_write_chunk_data(png_ptr, data, (png_size_t)length);
-   png_write_chunk_end(png_ptr);
-}
-
-/* Write the start of a PNG chunk.  The type is the chunk type.
- * The total_length is the sum of the lengths of all the data you will be
- * passing in png_write_chunk_data().
- */
-void PNGAPI
-png_write_chunk_start(png_structp png_ptr, png_const_bytep chunk_name,
-    png_uint_32 length)
-{
-   png_byte buf[8];
-
-   png_debug2(0, "Writing %s chunk, length = %lu", chunk_name,
-      (unsigned long)length);
-
-   if (png_ptr == NULL)
-      return;
-
-#ifdef PNG_IO_STATE_SUPPORTED
-   /* Inform the I/O callback that the chunk header is being written.
-    * PNG_IO_CHUNK_HDR requires a single I/O call.
-    */
-   png_ptr->io_state = PNG_IO_WRITING | PNG_IO_CHUNK_HDR;
-#endif
-
-   /* Write the length and the chunk name */
-   png_save_uint_32(buf, length);
-   png_memcpy(buf + 4, chunk_name, 4);
-   png_write_data(png_ptr, buf, (png_size_t)8);
-
-   /* Put the chunk name into png_ptr->chunk_name */
-   png_memcpy(png_ptr->chunk_name, chunk_name, 4);
-
-   /* Reset the crc and run it over the chunk name */
-   png_reset_crc(png_ptr);
-
-   png_calculate_crc(png_ptr, chunk_name, 4);
-
-#ifdef PNG_IO_STATE_SUPPORTED
-   /* Inform the I/O callback that chunk data will (possibly) be written.
-    * PNG_IO_CHUNK_DATA does NOT require a specific number of I/O calls.
-    */
-   png_ptr->io_state = PNG_IO_WRITING | PNG_IO_CHUNK_DATA;
-#endif
-}
-
-/* Write the data of a PNG chunk started with png_write_chunk_start().
- * Note that multiple calls to this function are allowed, and that the
- * sum of the lengths from these calls *must* add up to the total_length
- * given to png_write_chunk_start().
- */
-void PNGAPI
-png_write_chunk_data(png_structp png_ptr, png_const_bytep data,
-    png_size_t length)
-{
-   /* Write the data, and run the CRC over it */
-   if (png_ptr == NULL)
-      return;
-
-   if (data != NULL && length > 0)
-   {
-      png_write_data(png_ptr, data, length);
-
-      /* Update the CRC after writing the data,
-       * in case that the user I/O routine alters it.
-       */
-      png_calculate_crc(png_ptr, data, length);
-   }
-}
-
-/* Finish a chunk started with png_write_chunk_start(). */
-void PNGAPI
-png_write_chunk_end(png_structp png_ptr)
-{
-   png_byte buf[4];
-
-   if (png_ptr == NULL) return;
-
-#ifdef PNG_IO_STATE_SUPPORTED
-   /* Inform the I/O callback that the chunk CRC is being written.
-    * PNG_IO_CHUNK_CRC requires a single I/O function call.
-    */
-   png_ptr->io_state = PNG_IO_WRITING | PNG_IO_CHUNK_CRC;
-#endif
-
-   /* Write the crc in a single operation */
-   png_save_uint_32(buf, png_ptr->crc);
-
-   png_write_data(png_ptr, buf, (png_size_t)4);
-}
-
-#if defined(PNG_WRITE_TEXT_SUPPORTED) || defined(PNG_WRITE_iCCP_SUPPORTED)
-/* This pair of functions encapsulates the operation of (a) compressing a
- * text string, and (b) issuing it later as a series of chunk data writes.
- * The compression_state structure is shared context for these functions
- * set up by the caller in order to make the whole mess thread-safe.
- */
-
-typedef struct
-{
-   png_const_bytep input;   /* The uncompressed input data */
-   png_size_t input_len;    /* Its length */
-   int num_output_ptr;      /* Number of output pointers used */
-   int max_output_ptr;      /* Size of output_ptr */
-   png_bytep *output_ptr;   /* Array of pointers to output */
-} compression_state;
-
-/* Compress given text into storage in the png_ptr structure */
-static int /* PRIVATE */
-png_text_compress(png_structp png_ptr,
-    png_const_charp text, png_size_t text_len, int compression,
-    compression_state *comp)
-{
-   int ret;
-
-   comp->num_output_ptr = 0;
-   comp->max_output_ptr = 0;
-   comp->output_ptr = NULL;
-   comp->input = NULL;
-   comp->input_len = 0;
-
-   /* We may just want to pass the text right through */
-   if (compression == PNG_TEXT_COMPRESSION_NONE)
-   {
-      comp->input = (png_const_bytep)text;
-      comp->input_len = text_len;
-      return((int)text_len);
-   }
-
-   if (compression >= PNG_TEXT_COMPRESSION_LAST)
-   {
-#ifdef PNG_CONSOLE_IO_SUPPORTED
-      char msg[50];
-      png_snprintf(msg, 50, "Unknown compression type %d", compression);
-      png_warning(png_ptr, msg);
-#else
-      png_warning(png_ptr, "Unknown compression type");
-#endif
-   }
-
-   /* We can't write the chunk until we find out how much data we have,
-    * which means we need to run the compressor first and save the
-    * output.  This shouldn't be a problem, as the vast majority of
-    * comments should be reasonable, but we will set up an array of
-    * malloc'd pointers to be sure.
-    *
-    * If we knew the application was well behaved, we could simplify this
-    * greatly by assuming we can always malloc an output buffer large
-    * enough to hold the compressed text ((1001 * text_len / 1000) + 12)
-    * and malloc this directly.  The only time this would be a bad idea is
-    * if we can't malloc more than 64K and we have 64K of random input
-    * data, or if the input string is incredibly large (although this
-    * wouldn't cause a failure, just a slowdown due to swapping).
-    */
-
-   /* Set up the compression buffers */
-   /* TODO: the following cast hides a potential overflow problem. */
-   png_ptr->zstream.avail_in = (uInt)text_len;
-   /* NOTE: assume zlib doesn't overwrite the input */
-   png_ptr->zstream.next_in = (Bytef *)text;
-   png_ptr->zstream.avail_out = png_ptr->zbuf_size;
-   png_ptr->zstream.next_out = png_ptr->zbuf;
-
-   /* This is the same compression loop as in png_write_row() */
-   do
-   {
-      /* Compress the data */
-      ret = deflate(&png_ptr->zstream, Z_NO_FLUSH);
-
-      if (ret != Z_OK)
-      {
-         /* Error */
-         if (png_ptr->zstream.msg != NULL)
-            png_error(png_ptr, png_ptr->zstream.msg);
-
-         else
-            png_error(png_ptr, "zlib error");
-      }
-
-      /* Check to see if we need more room */
-      if (!(png_ptr->zstream.avail_out))
-      {
-         /* Make sure the output array has room */
-         if (comp->num_output_ptr >= comp->max_output_ptr)
-         {
-            int old_max;
-
-            old_max = comp->max_output_ptr;
-            comp->max_output_ptr = comp->num_output_ptr + 4;
-            if (comp->output_ptr != NULL)
-            {
-               png_bytepp old_ptr;
-
-               old_ptr = comp->output_ptr;
-
-               comp->output_ptr = (png_bytepp)png_malloc(png_ptr,
-                   (png_alloc_size_t)
-                   (comp->max_output_ptr * png_sizeof(png_charpp)));
-
-               png_memcpy(comp->output_ptr, old_ptr, old_max
-                   * png_sizeof(png_charp));
-
-               png_free(png_ptr, old_ptr);
-            }
-            else
-               comp->output_ptr = (png_bytepp)png_malloc(png_ptr,
-                   (png_alloc_size_t)
-                   (comp->max_output_ptr * png_sizeof(png_charp)));
-         }
-
-         /* Save the data */
-         comp->output_ptr[comp->num_output_ptr] =
-             (png_bytep)png_malloc(png_ptr,
-             (png_alloc_size_t)png_ptr->zbuf_size);
-
-         png_memcpy(comp->output_ptr[comp->num_output_ptr], png_ptr->zbuf,
-             png_ptr->zbuf_size);
-
-         comp->num_output_ptr++;
-
-         /* and reset the buffer */
-         png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;
-         png_ptr->zstream.next_out = png_ptr->zbuf;
-      }
-   /* Continue until we don't have any more to compress */
-   } while (png_ptr->zstream.avail_in);
-
-   /* Finish the compression */
-   do
-   {
-      /* Tell zlib we are finished */
-      ret = deflate(&png_ptr->zstream, Z_FINISH);
-
-      if (ret == Z_OK)
-      {
-         /* Check to see if we need more room */
-         if (!(png_ptr->zstream.avail_out))
-         {
-            /* Check to make sure our output array has room */
-            if (comp->num_output_ptr >= comp->max_output_ptr)
-            {
-               int old_max;
-
-               old_max = comp->max_output_ptr;
-               comp->max_output_ptr = comp->num_output_ptr + 4;
-               if (comp->output_ptr != NULL)
-               {
-                  png_bytepp old_ptr;
-
-                  old_ptr = comp->output_ptr;
-
-                  /* This could be optimized to realloc() */
-                  comp->output_ptr = (png_bytepp)png_malloc(png_ptr,
-                      (png_alloc_size_t)(comp->max_output_ptr *
-                      png_sizeof(png_charp)));
-
-                  png_memcpy(comp->output_ptr, old_ptr,
-                      old_max * png_sizeof(png_charp));
-
-                  png_free(png_ptr, old_ptr);
-               }
-
-               else
-                  comp->output_ptr = (png_bytepp)png_malloc(png_ptr,
-                      (png_alloc_size_t)(comp->max_output_ptr *
-                      png_sizeof(png_charp)));
-            }
-
-            /* Save the data */
-            comp->output_ptr[comp->num_output_ptr] =
-                (png_bytep)png_malloc(png_ptr,
-                (png_alloc_size_t)png_ptr->zbuf_size);
-
-            png_memcpy(comp->output_ptr[comp->num_output_ptr], png_ptr->zbuf,
-                png_ptr->zbuf_size);
-
-            comp->num_output_ptr++;
-
-            /* and reset the buffer pointers */
-            png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;
-            png_ptr->zstream.next_out = png_ptr->zbuf;
-         }
-      }
-      else if (ret != Z_STREAM_END)
-      {
-         /* We got an error */
-         if (png_ptr->zstream.msg != NULL)
-            png_error(png_ptr, png_ptr->zstream.msg);
-
-         else
-            png_error(png_ptr, "zlib error");
-      }
-   } while (ret != Z_STREAM_END);
-
-   /* Text length is number of buffers plus last buffer */
-   text_len = png_ptr->zbuf_size * comp->num_output_ptr;
-
-   if (png_ptr->zstream.avail_out < png_ptr->zbuf_size)
-      text_len += png_ptr->zbuf_size - (png_size_t)png_ptr->zstream.avail_out;
-
-   return((int)text_len);
-}
-
-/* Ship the compressed text out via chunk writes */
-static void /* PRIVATE */
-png_write_compressed_data_out(png_structp png_ptr, compression_state *comp)
-{
-   int i;
-
-   /* Handle the no-compression case */
-   if (comp->input)
-   {
-      png_write_chunk_data(png_ptr, comp->input, comp->input_len);
-
-      return;
-   }
-
-   /* Write saved output buffers, if any */
-   for (i = 0; i < comp->num_output_ptr; i++)
-   {
-      png_write_chunk_data(png_ptr, comp->output_ptr[i],
-          (png_size_t)png_ptr->zbuf_size);
-
-      png_free(png_ptr, comp->output_ptr[i]);
-   }
-
-   if (comp->max_output_ptr != 0)
-      png_free(png_ptr, comp->output_ptr);
-
-   /* Write anything left in zbuf */
-   if (png_ptr->zstream.avail_out < (png_uint_32)png_ptr->zbuf_size)
-      png_write_chunk_data(png_ptr, png_ptr->zbuf,
-          (png_size_t)(png_ptr->zbuf_size - png_ptr->zstream.avail_out));
-
-   /* Reset zlib for another zTXt/iTXt or image data */
-   deflateReset(&png_ptr->zstream);
-   png_ptr->zstream.data_type = Z_BINARY;
-}
-#endif
-
-/* Write the IHDR chunk, and update the png_struct with the necessary
- * information.  Note that the rest of this code depends upon this
- * information being correct.
- */
-void /* PRIVATE */
-png_write_IHDR(png_structp png_ptr, png_uint_32 width, png_uint_32 height,
-    int bit_depth, int color_type, int compression_type, int filter_type,
-    int interlace_type)
-{
-   PNG_IHDR;
-   int ret;
-
-   png_byte buf[13]; /* Buffer to store the IHDR info */
-
-   png_debug(1, "in png_write_IHDR");
-
-   /* Check that we have valid input data from the application info */
-   switch (color_type)
-   {
-      case PNG_COLOR_TYPE_GRAY:
-         switch (bit_depth)
-         {
-            case 1:
-            case 2:
-            case 4:
-            case 8:
-#ifdef PNG_WRITE_16BIT_SUPPORTED
-            case 16:
-#endif
-               png_ptr->channels = 1; break;
-
-            default:
-               png_error(png_ptr,
-                   "Invalid bit depth for grayscale image");
-         }
-         break;
-
-      case PNG_COLOR_TYPE_RGB:
-#ifdef PNG_WRITE_16BIT_SUPPORTED
-         if (bit_depth != 8 && bit_depth != 16)
-#else
-         if (bit_depth != 8)
-#endif
-            png_error(png_ptr, "Invalid bit depth for RGB image");
-
-         png_ptr->channels = 3;
-         break;
-
-      case PNG_COLOR_TYPE_PALETTE:
-         switch (bit_depth)
-         {
-            case 1:
-            case 2:
-            case 4:
-            case 8:
-               png_ptr->channels = 1;
-               break;
-
-            default:
-               png_error(png_ptr, "Invalid bit depth for paletted image");
-         }
-         break;
-
-      case PNG_COLOR_TYPE_GRAY_ALPHA:
-         if (bit_depth != 8 && bit_depth != 16)
-            png_error(png_ptr, "Invalid bit depth for grayscale+alpha image");
-
-         png_ptr->channels = 2;
-         break;
-
-      case PNG_COLOR_TYPE_RGB_ALPHA:
-#ifdef PNG_WRITE_16BIT_SUPPORTED
-         if (bit_depth != 8 && bit_depth != 16)
-#else
-         if (bit_depth != 8)
-#endif
-            png_error(png_ptr, "Invalid bit depth for RGBA image");
-
-         png_ptr->channels = 4;
-         break;
-
-      default:
-         png_error(png_ptr, "Invalid image color type specified");
-   }
-
-   if (compression_type != PNG_COMPRESSION_TYPE_BASE)
-   {
-      png_warning(png_ptr, "Invalid compression type specified");
-      compression_type = PNG_COMPRESSION_TYPE_BASE;
-   }
-
-   /* Write filter_method 64 (intrapixel differencing) only if
-    * 1. Libpng was compiled with PNG_MNG_FEATURES_SUPPORTED and
-    * 2. Libpng did not write a PNG signature (this filter_method is only
-    *    used in PNG datastreams that are embedded in MNG datastreams) and
-    * 3. The application called png_permit_mng_features with a mask that
-    *    included PNG_FLAG_MNG_FILTER_64 and
-    * 4. The filter_method is 64 and
-    * 5. The color_type is RGB or RGBA
-    */
-   if (
-#ifdef PNG_MNG_FEATURES_SUPPORTED
-       !((png_ptr->mng_features_permitted & PNG_FLAG_MNG_FILTER_64) &&
-       ((png_ptr->mode&PNG_HAVE_PNG_SIGNATURE) == 0) &&
-       (color_type == PNG_COLOR_TYPE_RGB ||
-        color_type == PNG_COLOR_TYPE_RGB_ALPHA) &&
-       (filter_type == PNG_INTRAPIXEL_DIFFERENCING)) &&
-#endif
-       filter_type != PNG_FILTER_TYPE_BASE)
-   {
-      png_warning(png_ptr, "Invalid filter type specified");
-      filter_type = PNG_FILTER_TYPE_BASE;
-   }
-
-#ifdef PNG_WRITE_INTERLACING_SUPPORTED
-   if (interlace_type != PNG_INTERLACE_NONE &&
-       interlace_type != PNG_INTERLACE_ADAM7)
-   {
-      png_warning(png_ptr, "Invalid interlace type specified");
-      interlace_type = PNG_INTERLACE_ADAM7;
-   }
-#else
-   interlace_type=PNG_INTERLACE_NONE;
-#endif
-
-   /* Save the relevent information */
-   png_ptr->bit_depth = (png_byte)bit_depth;
-   png_ptr->color_type = (png_byte)color_type;
-   png_ptr->interlaced = (png_byte)interlace_type;
-#ifdef PNG_MNG_FEATURES_SUPPORTED
-   png_ptr->filter_type = (png_byte)filter_type;
-#endif
-   png_ptr->compression_type = (png_byte)compression_type;
-   png_ptr->width = width;
-   png_ptr->height = height;
-
-   png_ptr->pixel_depth = (png_byte)(bit_depth * png_ptr->channels);
-   png_ptr->rowbytes = PNG_ROWBYTES(png_ptr->pixel_depth, width);
-   /* Set the usr info, so any transformations can modify it */
-   png_ptr->usr_width = png_ptr->width;
-   png_ptr->usr_bit_depth = png_ptr->bit_depth;
-   png_ptr->usr_channels = png_ptr->channels;
-
-   /* Pack the header information into the buffer */
-   png_save_uint_32(buf, width);
-   png_save_uint_32(buf + 4, height);
-   buf[8] = (png_byte)bit_depth;
-   buf[9] = (png_byte)color_type;
-   buf[10] = (png_byte)compression_type;
-   buf[11] = (png_byte)filter_type;
-   buf[12] = (png_byte)interlace_type;
-
-   /* Write the chunk */
-   png_write_chunk(png_ptr, png_IHDR, buf, (png_size_t)13);
-
-   /* Initialize zlib with PNG info */
-   png_ptr->zstream.zalloc = png_zalloc;
-   png_ptr->zstream.zfree = png_zfree;
-   png_ptr->zstream.opaque = (voidpf)png_ptr;
-
-   if (!(png_ptr->do_filter))
-   {
-      if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE ||
-          png_ptr->bit_depth < 8)
-         png_ptr->do_filter = PNG_FILTER_NONE;
-
-      else
-         png_ptr->do_filter = PNG_ALL_FILTERS;
-   }
-
-   if (!(png_ptr->flags & PNG_FLAG_ZLIB_CUSTOM_STRATEGY))
-   {
-      if (png_ptr->do_filter != PNG_FILTER_NONE)
-         png_ptr->zlib_strategy = Z_FILTERED;
-
-      else
-         png_ptr->zlib_strategy = Z_DEFAULT_STRATEGY;
-   }
-
-   if (!(png_ptr->flags & PNG_FLAG_ZLIB_CUSTOM_LEVEL))
-      png_ptr->zlib_level = Z_DEFAULT_COMPRESSION;
-
-   if (!(png_ptr->flags & PNG_FLAG_ZLIB_CUSTOM_MEM_LEVEL))
-      png_ptr->zlib_mem_level = 8;
-
-   if (!(png_ptr->flags & PNG_FLAG_ZLIB_CUSTOM_WINDOW_BITS))
-      png_ptr->zlib_window_bits = 15;
-
-   if (!(png_ptr->flags & PNG_FLAG_ZLIB_CUSTOM_METHOD))
-      png_ptr->zlib_method = 8;
-
-   ret = deflateInit2(&png_ptr->zstream, png_ptr->zlib_level,
-       png_ptr->zlib_method, png_ptr->zlib_window_bits,
-       png_ptr->zlib_mem_level, png_ptr->zlib_strategy);
-
-   if (ret != Z_OK)
-   {
-      if (ret == Z_VERSION_ERROR)
-         png_error(png_ptr,
-            "zlib failed to initialize compressor -- version error");
-
-      if (ret == Z_STREAM_ERROR)
-         png_error(png_ptr,
-             "zlib failed to initialize compressor -- stream error");
-
-      if (ret == Z_MEM_ERROR)
-         png_error(png_ptr,
-             "zlib failed to initialize compressor -- mem error");
-
-      png_error(png_ptr, "zlib failed to initialize compressor");
-   }
-
-   png_ptr->zstream.next_out = png_ptr->zbuf;
-   png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;
-   /* libpng is not interested in zstream.data_type, so set it
-    * to a predefined value, to avoid its evaluation inside zlib
-    */
-   png_ptr->zstream.data_type = Z_BINARY;
-
-   png_ptr->mode = PNG_HAVE_IHDR;
-}
-
-/* Write the palette.  We are careful not to trust png_color to be in the
- * correct order for PNG, so people can redefine it to any convenient
- * structure.
- */
-void /* PRIVATE */
-png_write_PLTE(png_structp png_ptr, png_const_colorp palette,
-    png_uint_32 num_pal)
-{
-   PNG_PLTE;
-   png_uint_32 i;
-   png_const_colorp pal_ptr;
-   png_byte buf[3];
-
-   png_debug(1, "in png_write_PLTE");
-
-   if ((
-#ifdef PNG_MNG_FEATURES_SUPPORTED
-       !(png_ptr->mng_features_permitted & PNG_FLAG_MNG_EMPTY_PLTE) &&
-#endif
-       num_pal == 0) || num_pal > 256)
-   {
-      if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
-      {
-         png_error(png_ptr, "Invalid number of colors in palette");
-      }
-
-      else
-      {
-         png_warning(png_ptr, "Invalid number of colors in palette");
-         return;
-      }
-   }
-
-   if (!(png_ptr->color_type&PNG_COLOR_MASK_COLOR))
-   {
-      png_warning(png_ptr,
-          "Ignoring request to write a PLTE chunk in grayscale PNG");
-
-      return;
-   }
-
-   png_ptr->num_palette = (png_uint_16)num_pal;
-   png_debug1(3, "num_palette = %d", png_ptr->num_palette);
-
-   png_write_chunk_start(png_ptr, png_PLTE, (png_uint_32)(num_pal * 3));
-#ifdef PNG_POINTER_INDEXING_SUPPORTED
-
-   for (i = 0, pal_ptr = palette; i < num_pal; i++, pal_ptr++)
-   {
-      buf[0] = pal_ptr->red;
-      buf[1] = pal_ptr->green;
-      buf[2] = pal_ptr->blue;
-      png_write_chunk_data(png_ptr, buf, (png_size_t)3);
-   }
-
-#else
-   /* This is a little slower but some buggy compilers need to do this
-    * instead
-    */
-   pal_ptr=palette;
-
-   for (i = 0; i < num_pal; i++)
-   {
-      buf[0] = pal_ptr[i].red;
-      buf[1] = pal_ptr[i].green;
-      buf[2] = pal_ptr[i].blue;
-      png_write_chunk_data(png_ptr, buf, (png_size_t)3);
-   }
-
-#endif
-   png_write_chunk_end(png_ptr);
-   png_ptr->mode |= PNG_HAVE_PLTE;
-}
-
-/* Write an IDAT chunk */
-void /* PRIVATE */
-png_write_IDAT(png_structp png_ptr, png_bytep data, png_size_t length)
-{
-   PNG_IDAT;
-
-   png_debug(1, "in png_write_IDAT");
-
-   /* Optimize the CMF field in the zlib stream. */
-   /* This hack of the zlib stream is compliant to the stream specification. */
-   if (!(png_ptr->mode & PNG_HAVE_IDAT) &&
-       png_ptr->compression_type == PNG_COMPRESSION_TYPE_BASE)
-   {
-      unsigned int z_cmf = data[0];  /* zlib compression method and flags */
-      if ((z_cmf & 0x0f) == 8 && (z_cmf & 0xf0) <= 0x70)
-      {
-         /* Avoid memory underflows and multiplication overflows.
-          *
-          * The conditions below are practically always satisfied;
-          * however, they still must be checked.
-          */
-         if (length >= 2 &&
-             png_ptr->height < 16384 && png_ptr->width < 16384)
-         {
-            png_uint_32 uncompressed_idat_size = png_ptr->height *
-                ((png_ptr->width *
-                png_ptr->channels * png_ptr->bit_depth + 15) >> 3);
-            unsigned int z_cinfo = z_cmf >> 4;
-            unsigned int half_z_window_size = 1 << (z_cinfo + 7);
-            while (uncompressed_idat_size <= half_z_window_size &&
-                half_z_window_size >= 256)
-            {
-               z_cinfo--;
-               half_z_window_size >>= 1;
-            }
-
-            z_cmf = (z_cmf & 0x0f) | (z_cinfo << 4);
-
-            if (data[0] != z_cmf)
-            {
-               int tmp;
-               data[0] = (png_byte)z_cmf;
-               tmp = data[1] & 0xe0;
-               tmp += 0x1f - ((z_cmf << 8) + tmp) % 0x1f;
-               data[1] = (png_byte)tmp;
-            }
-         }
-      }
-
-      else
-         png_error(png_ptr,
-             "Invalid zlib compression method or flags in IDAT");
-   }
-
-   png_write_chunk(png_ptr, png_IDAT, data, length);
-   png_ptr->mode |= PNG_HAVE_IDAT;
-}
-
-/* Write an IEND chunk */
-void /* PRIVATE */
-png_write_IEND(png_structp png_ptr)
-{
-   PNG_IEND;
-
-   png_debug(1, "in png_write_IEND");
-
-   png_write_chunk(png_ptr, png_IEND, NULL, (png_size_t)0);
-   png_ptr->mode |= PNG_HAVE_IEND;
-}
-
-#ifdef PNG_WRITE_gAMA_SUPPORTED
-/* Write a gAMA chunk */
-void /* PRIVATE */
-png_write_gAMA_fixed(png_structp png_ptr, png_fixed_point file_gamma)
-{
-   PNG_gAMA;
-   png_byte buf[4];
-
-   png_debug(1, "in png_write_gAMA");
-
-   /* file_gamma is saved in 1/100,000ths */
-   png_save_uint_32(buf, (png_uint_32)file_gamma);
-   png_write_chunk(png_ptr, png_gAMA, buf, (png_size_t)4);
-}
-#endif
-
-#ifdef PNG_WRITE_sRGB_SUPPORTED
-/* Write a sRGB chunk */
-void /* PRIVATE */
-png_write_sRGB(png_structp png_ptr, int srgb_intent)
-{
-   PNG_sRGB;
-   png_byte buf[1];
-
-   png_debug(1, "in png_write_sRGB");
-
-   if (srgb_intent >= PNG_sRGB_INTENT_LAST)
-      png_warning(png_ptr,
-          "Invalid sRGB rendering intent specified");
-
-   buf[0]=(png_byte)srgb_intent;
-   png_write_chunk(png_ptr, png_sRGB, buf, (png_size_t)1);
-}
-#endif
-
-#ifdef PNG_WRITE_iCCP_SUPPORTED
-/* Write an iCCP chunk */
-void /* PRIVATE */
-png_write_iCCP(png_structp png_ptr, png_const_charp name, int compression_type,
-    png_const_charp profile, int profile_len)
-{
-   PNG_iCCP;
-   png_size_t name_len;
-   png_charp new_name;
-   compression_state comp;
-   int embedded_profile_len = 0;
-
-   png_debug(1, "in png_write_iCCP");
-
-   comp.num_output_ptr = 0;
-   comp.max_output_ptr = 0;
-   comp.output_ptr = NULL;
-   comp.input = NULL;
-   comp.input_len = 0;
-
-   if ((name_len = png_check_keyword(png_ptr, name, &new_name)) == 0)
-      return;
-
-   if (compression_type != PNG_COMPRESSION_TYPE_BASE)
-      png_warning(png_ptr, "Unknown compression type in iCCP chunk");
-
-   if (profile == NULL)
-      profile_len = 0;
-
-   if (profile_len > 3)
-      embedded_profile_len =
-          ((*( (png_const_bytep)profile    ))<<24) |
-          ((*( (png_const_bytep)profile + 1))<<16) |
-          ((*( (png_const_bytep)profile + 2))<< 8) |
-          ((*( (png_const_bytep)profile + 3))    );
-
-   if (embedded_profile_len < 0)
-   {
-      png_warning(png_ptr,
-          "Embedded profile length in iCCP chunk is negative");
-
-      png_free(png_ptr, new_name);
-      return;
-   }
-
-   if (profile_len < embedded_profile_len)
-   {
-      png_warning(png_ptr,
-          "Embedded profile length too large in iCCP chunk");
-
-      png_free(png_ptr, new_name);
-      return;
-   }
-
-   if (profile_len > embedded_profile_len)
-   {
-      png_warning(png_ptr,
-          "Truncating profile to actual length in iCCP chunk");
-
-      profile_len = embedded_profile_len;
-   }
-
-   if (profile_len)
-      profile_len = png_text_compress(png_ptr, profile,
-          (png_size_t)profile_len, PNG_COMPRESSION_TYPE_BASE, &comp);
-
-   /* Make sure we include the NULL after the name and the compression type */
-   png_write_chunk_start(png_ptr, png_iCCP,
-       (png_uint_32)(name_len + profile_len + 2));
-
-   new_name[name_len + 1] = 0x00;
-
-   png_write_chunk_data(png_ptr, (png_bytep)new_name,
-       (png_size_t)(name_len + 2));
-
-   if (profile_len)
-      png_write_compressed_data_out(png_ptr, &comp);
-
-   png_write_chunk_end(png_ptr);
-   png_free(png_ptr, new_name);
-}
-#endif
-
-#ifdef PNG_WRITE_sPLT_SUPPORTED
-/* Write a sPLT chunk */
-void /* PRIVATE */
-png_write_sPLT(png_structp png_ptr, png_const_sPLT_tp spalette)
-{
-   PNG_sPLT;
-   png_size_t name_len;
-   png_charp new_name;
-   png_byte entrybuf[10];
-   png_size_t entry_size = (spalette->depth == 8 ? 6 : 10);
-   png_size_t palette_size = entry_size * spalette->nentries;
-   png_sPLT_entryp ep;
-#ifndef PNG_POINTER_INDEXING_SUPPORTED
-   int i;
-#endif
-
-   png_debug(1, "in png_write_sPLT");
-
-   if ((name_len = png_check_keyword(png_ptr,spalette->name, &new_name))==0)
-      return;
-
-   /* Make sure we include the NULL after the name */
-   png_write_chunk_start(png_ptr, png_sPLT,
-       (png_uint_32)(name_len + 2 + palette_size));
-
-   png_write_chunk_data(png_ptr, (png_bytep)new_name,
-       (png_size_t)(name_len + 1));
-
-   png_write_chunk_data(png_ptr, &spalette->depth, (png_size_t)1);
-
-   /* Loop through each palette entry, writing appropriately */
-#ifdef PNG_POINTER_INDEXING_SUPPORTED
-   for (ep = spalette->entries; ep<spalette->entries + spalette->nentries; ep++)
-   {
-      if (spalette->depth == 8)
-      {
-         entrybuf[0] = (png_byte)ep->red;
-         entrybuf[1] = (png_byte)ep->green;
-         entrybuf[2] = (png_byte)ep->blue;
-         entrybuf[3] = (png_byte)ep->alpha;
-         png_save_uint_16(entrybuf + 4, ep->frequency);
-      }
-
-      else
-      {
-         png_save_uint_16(entrybuf + 0, ep->red);
-         png_save_uint_16(entrybuf + 2, ep->green);
-         png_save_uint_16(entrybuf + 4, ep->blue);
-         png_save_uint_16(entrybuf + 6, ep->alpha);
-         png_save_uint_16(entrybuf + 8, ep->frequency);
-      }
-
-      png_write_chunk_data(png_ptr, entrybuf, (png_size_t)entry_size);
-   }
-#else
-   ep=spalette->entries;
-   for (i = 0; i>spalette->nentries; i++)
-   {
-      if (spalette->depth == 8)
-      {
-         entrybuf[0] = (png_byte)ep[i].red;
-         entrybuf[1] = (png_byte)ep[i].green;
-         entrybuf[2] = (png_byte)ep[i].blue;
-         entrybuf[3] = (png_byte)ep[i].alpha;
-         png_save_uint_16(entrybuf + 4, ep[i].frequency);
-      }
-
-      else
-      {
-         png_save_uint_16(entrybuf + 0, ep[i].red);
-         png_save_uint_16(entrybuf + 2, ep[i].green);
-         png_save_uint_16(entrybuf + 4, ep[i].blue);
-         png_save_uint_16(entrybuf + 6, ep[i].alpha);
-         png_save_uint_16(entrybuf + 8, ep[i].frequency);
-      }
-
-      png_write_chunk_data(png_ptr, entrybuf, (png_size_t)entry_size);
-   }
-#endif
-
-   png_write_chunk_end(png_ptr);
-   png_free(png_ptr, new_name);
-}
-#endif
-
-#ifdef PNG_WRITE_sBIT_SUPPORTED
-/* Write the sBIT chunk */
-void /* PRIVATE */
-png_write_sBIT(png_structp png_ptr, png_const_color_8p sbit, int color_type)
-{
-   PNG_sBIT;
-   png_byte buf[4];
-   png_size_t size;
-
-   png_debug(1, "in png_write_sBIT");
-
-   /* Make sure we don't depend upon the order of PNG_COLOR_8 */
-   if (color_type & PNG_COLOR_MASK_COLOR)
-   {
-      png_byte maxbits;
-
-      maxbits = (png_byte)(color_type==PNG_COLOR_TYPE_PALETTE ? 8 :
-          png_ptr->usr_bit_depth);
-
-      if (sbit->red == 0 || sbit->red > maxbits ||
-          sbit->green == 0 || sbit->green > maxbits ||
-          sbit->blue == 0 || sbit->blue > maxbits)
-      {
-         png_warning(png_ptr, "Invalid sBIT depth specified");
-         return;
-      }
-
-      buf[0] = sbit->red;
-      buf[1] = sbit->green;
-      buf[2] = sbit->blue;
-      size = 3;
-   }
-
-   else
-   {
-      if (sbit->gray == 0 || sbit->gray > png_ptr->usr_bit_depth)
-      {
-         png_warning(png_ptr, "Invalid sBIT depth specified");
-         return;
-      }
-
-      buf[0] = sbit->gray;
-      size = 1;
-   }
-
-   if (color_type & PNG_COLOR_MASK_ALPHA)
-   {
-      if (sbit->alpha == 0 || sbit->alpha > png_ptr->usr_bit_depth)
-      {
-         png_warning(png_ptr, "Invalid sBIT depth specified");
-         return;
-      }
-
-      buf[size++] = sbit->alpha;
-   }
-
-   png_write_chunk(png_ptr, png_sBIT, buf, size);
-}
-#endif
-
-#ifdef PNG_WRITE_cHRM_SUPPORTED
-/* Write the cHRM chunk */
-void /* PRIVATE */
-png_write_cHRM_fixed(png_structp png_ptr, png_fixed_point white_x,
-    png_fixed_point white_y, png_fixed_point red_x, png_fixed_point red_y,
-    png_fixed_point green_x, png_fixed_point green_y, png_fixed_point blue_x,
-    png_fixed_point blue_y)
-{
-   PNG_cHRM;
-   png_byte buf[32];
-
-   png_debug(1, "in png_write_cHRM");
-
-   /* Each value is saved in 1/100,000ths */
-#ifdef PNG_CHECK_cHRM_SUPPORTED
-   if (png_check_cHRM_fixed(png_ptr, white_x, white_y, red_x, red_y,
-       green_x, green_y, blue_x, blue_y))
-#endif
-   {
-      png_save_uint_32(buf, (png_uint_32)white_x);
-      png_save_uint_32(buf + 4, (png_uint_32)white_y);
-
-      png_save_uint_32(buf + 8, (png_uint_32)red_x);
-      png_save_uint_32(buf + 12, (png_uint_32)red_y);
-
-      png_save_uint_32(buf + 16, (png_uint_32)green_x);
-      png_save_uint_32(buf + 20, (png_uint_32)green_y);
-
-      png_save_uint_32(buf + 24, (png_uint_32)blue_x);
-      png_save_uint_32(buf + 28, (png_uint_32)blue_y);
-
-      png_write_chunk(png_ptr, png_cHRM, buf, (png_size_t)32);
-   }
-}
-#endif
-
-#ifdef PNG_WRITE_tRNS_SUPPORTED
-/* Write the tRNS chunk */
-void /* PRIVATE */
-png_write_tRNS(png_structp png_ptr, png_const_bytep trans_alpha,
-    png_const_color_16p tran, int num_trans, int color_type)
-{
-   PNG_tRNS;
-   png_byte buf[6];
-
-   png_debug(1, "in png_write_tRNS");
-
-   if (color_type == PNG_COLOR_TYPE_PALETTE)
-   {
-      if (num_trans <= 0 || num_trans > (int)png_ptr->num_palette)
-      {
-         png_warning(png_ptr, "Invalid number of transparent colors specified");
-         return;
-      }
-
-      /* Write the chunk out as it is */
-      png_write_chunk(png_ptr, png_tRNS, trans_alpha, (png_size_t)num_trans);
-   }
-
-   else if (color_type == PNG_COLOR_TYPE_GRAY)
-   {
-      /* One 16 bit value */
-      if (tran->gray >= (1 << png_ptr->bit_depth))
-      {
-         png_warning(png_ptr,
-             "Ignoring attempt to write tRNS chunk out-of-range for bit_depth");
-
-         return;
-      }
-
-      png_save_uint_16(buf, tran->gray);
-      png_write_chunk(png_ptr, png_tRNS, buf, (png_size_t)2);
-   }
-
-   else if (color_type == PNG_COLOR_TYPE_RGB)
-   {
-      /* Three 16 bit values */
-      png_save_uint_16(buf, tran->red);
-      png_save_uint_16(buf + 2, tran->green);
-      png_save_uint_16(buf + 4, tran->blue);
-#ifdef PNG_WRITE_16BIT_SUPPORTED
-      if (png_ptr->bit_depth == 8 && (buf[0] | buf[2] | buf[4]))
-#else
-      if (buf[0] | buf[2] | buf[4])
-#endif
-      {
-         png_warning(png_ptr,
-           "Ignoring attempt to write 16-bit tRNS chunk when bit_depth is 8");
-         return;
-      }
-
-      png_write_chunk(png_ptr, png_tRNS, buf, (png_size_t)6);
-   }
-
-   else
-   {
-      png_warning(png_ptr, "Can't write tRNS with an alpha channel");
-   }
-}
-#endif
-
-#ifdef PNG_WRITE_bKGD_SUPPORTED
-/* Write the background chunk */
-void /* PRIVATE */
-png_write_bKGD(png_structp png_ptr, png_const_color_16p back, int color_type)
-{
-   PNG_bKGD;
-   png_byte buf[6];
-
-   png_debug(1, "in png_write_bKGD");
-
-   if (color_type == PNG_COLOR_TYPE_PALETTE)
-   {
-      if (
-#ifdef PNG_MNG_FEATURES_SUPPORTED
-          (png_ptr->num_palette ||
-          (!(png_ptr->mng_features_permitted & PNG_FLAG_MNG_EMPTY_PLTE))) &&
-#endif
-         back->index >= png_ptr->num_palette)
-      {
-         png_warning(png_ptr, "Invalid background palette index");
-         return;
-      }
-
-      buf[0] = back->index;
-      png_write_chunk(png_ptr, png_bKGD, buf, (png_size_t)1);
-   }
-
-   else if (color_type & PNG_COLOR_MASK_COLOR)
-   {
-      png_save_uint_16(buf, back->red);
-      png_save_uint_16(buf + 2, back->green);
-      png_save_uint_16(buf + 4, back->blue);
-#ifdef PNG_WRITE_16BIT_SUPPORTED
-      if (png_ptr->bit_depth == 8 && (buf[0] | buf[2] | buf[4]))
-#else
-      if (buf[0] | buf[2] | buf[4])
-#endif
-      {
-         png_warning(png_ptr,
-             "Ignoring attempt to write 16-bit bKGD chunk when bit_depth is 8");
-
-         return;
-      }
-
-      png_write_chunk(png_ptr, png_bKGD, buf, (png_size_t)6);
-   }
-
-   else
-   {
-      if (back->gray >= (1 << png_ptr->bit_depth))
-      {
-         png_warning(png_ptr,
-             "Ignoring attempt to write bKGD chunk out-of-range for bit_depth");
-
-         return;
-      }
-
-      png_save_uint_16(buf, back->gray);
-      png_write_chunk(png_ptr, png_bKGD, buf, (png_size_t)2);
-   }
-}
-#endif
-
-#ifdef PNG_WRITE_hIST_SUPPORTED
-/* Write the histogram */
-void /* PRIVATE */
-png_write_hIST(png_structp png_ptr, png_const_uint_16p hist, int num_hist)
-{
-   PNG_hIST;
-   int i;
-   png_byte buf[3];
-
-   png_debug(1, "in png_write_hIST");
-
-   if (num_hist > (int)png_ptr->num_palette)
-   {
-      png_debug2(3, "num_hist = %d, num_palette = %d", num_hist,
-          png_ptr->num_palette);
-
-      png_warning(png_ptr, "Invalid number of histogram entries specified");
-      return;
-   }
-
-   png_write_chunk_start(png_ptr, png_hIST, (png_uint_32)(num_hist * 2));
-
-   for (i = 0; i < num_hist; i++)
-   {
-      png_save_uint_16(buf, hist[i]);
-      png_write_chunk_data(png_ptr, buf, (png_size_t)2);
-   }
-
-   png_write_chunk_end(png_ptr);
-}
-#endif
-
-#if defined(PNG_WRITE_TEXT_SUPPORTED) || defined(PNG_WRITE_pCAL_SUPPORTED) || \
-    defined(PNG_WRITE_iCCP_SUPPORTED) || defined(PNG_WRITE_sPLT_SUPPORTED)
-/* Check that the tEXt or zTXt keyword is valid per PNG 1.0 specification,
- * and if invalid, correct the keyword rather than discarding the entire
- * chunk.  The PNG 1.0 specification requires keywords 1-79 characters in
- * length, forbids leading or trailing whitespace, multiple internal spaces,
- * and the non-break space (0x80) from ISO 8859-1.  Returns keyword length.
- *
- * The new_key is allocated to hold the corrected keyword and must be freed
- * by the calling routine.  This avoids problems with trying to write to
- * static keywords without having to have duplicate copies of the strings.
- */
-png_size_t /* PRIVATE */
-png_check_keyword(png_structp png_ptr, png_const_charp key, png_charpp new_key)
-{
-   png_size_t key_len;
-   png_const_charp ikp;
-   png_charp kp, dp;
-   int kflag;
-   int kwarn=0;
-
-   png_debug(1, "in png_check_keyword");
-
-   *new_key = NULL;
-
-   if (key == NULL || (key_len = png_strlen(key)) == 0)
-   {
-      png_warning(png_ptr, "zero length keyword");
-      return ((png_size_t)0);
-   }
-
-   png_debug1(2, "Keyword to be checked is '%s'", key);
-
-   *new_key = (png_charp)png_malloc_warn(png_ptr, (png_uint_32)(key_len + 2));
-
-   if (*new_key == NULL)
-   {
-      png_warning(png_ptr, "Out of memory while procesing keyword");
-      return ((png_size_t)0);
-   }
-
-   /* Replace non-printing characters with a blank and print a warning */
-   for (ikp = key, dp = *new_key; *ikp != '\0'; ikp++, dp++)
-   {
-      if ((png_byte)*ikp < 0x20 ||
-         ((png_byte)*ikp > 0x7E && (png_byte)*ikp < 0xA1))
-      {
-#ifdef PNG_CONSOLE_IO_SUPPORTED
-         char msg[40];
-
-         png_snprintf(msg, 40,
-             "invalid keyword character 0x%02X", (png_byte)*ikp);
-         png_warning(png_ptr, msg);
-#else
-         png_warning(png_ptr, "invalid character in keyword");
-#endif
-         *dp = ' ';
-      }
-
-      else
-      {
-         *dp = *ikp;
-      }
-   }
-   *dp = '\0';
-
-   /* Remove any trailing white space. */
-   kp = *new_key + key_len - 1;
-   if (*kp == ' ')
-   {
-      png_warning(png_ptr, "trailing spaces removed from keyword");
-
-      while (*kp == ' ')
-      {
-         *(kp--) = '\0';
-         key_len--;
-      }
-   }
-
-   /* Remove any leading white space. */
-   kp = *new_key;
-   if (*kp == ' ')
-   {
-      png_warning(png_ptr, "leading spaces removed from keyword");
-
-      while (*kp == ' ')
-      {
-         kp++;
-         key_len--;
-      }
-   }
-
-   png_debug1(2, "Checking for multiple internal spaces in '%s'", kp);
-
-   /* Remove multiple internal spaces. */
-   for (kflag = 0, dp = *new_key; *kp != '\0'; kp++)
-   {
-      if (*kp == ' ' && kflag == 0)
-      {
-         *(dp++) = *kp;
-         kflag = 1;
-      }
-
-      else if (*kp == ' ')
-      {
-         key_len--;
-         kwarn = 1;
-      }
-
-      else
-      {
-         *(dp++) = *kp;
-         kflag = 0;
-      }
-   }
-   *dp = '\0';
-   if (kwarn)
-      png_warning(png_ptr, "extra interior spaces removed from keyword");
-
-   if (key_len == 0)
-   {
-      png_free(png_ptr, *new_key);
-      png_warning(png_ptr, "Zero length keyword");
-   }
-
-   if (key_len > 79)
-   {
-      png_warning(png_ptr, "keyword length must be 1 - 79 characters");
-      (*new_key)[79] = '\0';
-      key_len = 79;
-   }
-
-   return (key_len);
-}
-#endif
-
-#ifdef PNG_WRITE_tEXt_SUPPORTED
-/* Write a tEXt chunk */
-void /* PRIVATE */
-png_write_tEXt(png_structp png_ptr, png_const_charp key, png_const_charp text,
-    png_size_t text_len)
-{
-   PNG_tEXt;
-   png_size_t key_len;
-   png_charp new_key;
-
-   png_debug(1, "in png_write_tEXt");
-
-   if ((key_len = png_check_keyword(png_ptr, key, &new_key))==0)
-      return;
-
-   if (text == NULL || *text == '\0')
-      text_len = 0;
-
-   else
-      text_len = png_strlen(text);
-
-   /* Make sure we include the 0 after the key */
-   png_write_chunk_start(png_ptr, png_tEXt,
-       (png_uint_32)(key_len + text_len + 1));
-   /*
-    * We leave it to the application to meet PNG-1.0 requirements on the
-    * contents of the text.  PNG-1.0 through PNG-1.2 discourage the use of
-    * any non-Latin-1 characters except for NEWLINE.  ISO PNG will forbid them.
-    * The NUL character is forbidden by PNG-1.0 through PNG-1.2 and ISO PNG.
-    */
-   png_write_chunk_data(png_ptr, (png_bytep)new_key,
-       (png_size_t)(key_len + 1));
-
-   if (text_len)
-      png_write_chunk_data(png_ptr, (png_const_bytep)text,
-          (png_size_t)text_len);
-
-   png_write_chunk_end(png_ptr);
-   png_free(png_ptr, new_key);
-}
-#endif
-
-#ifdef PNG_WRITE_zTXt_SUPPORTED
-/* Write a compressed text chunk */
-void /* PRIVATE */
-png_write_zTXt(png_structp png_ptr, png_const_charp key, png_const_charp text,
-    png_size_t text_len, int compression)
-{
-   PNG_zTXt;
-   png_size_t key_len;
-   png_byte buf;
-   png_charp new_key;
-   compression_state comp;
-
-   png_debug(1, "in png_write_zTXt");
-
-   comp.num_output_ptr = 0;
-   comp.max_output_ptr = 0;
-   comp.output_ptr = NULL;
-   comp.input = NULL;
-   comp.input_len = 0;
-
-   if ((key_len = png_check_keyword(png_ptr, key, &new_key)) == 0)
-   {
-      png_free(png_ptr, new_key);
-      return;
-   }
-
-   if (text == NULL || *text == '\0' || compression==PNG_TEXT_COMPRESSION_NONE)
-   {
-      png_write_tEXt(png_ptr, new_key, text, (png_size_t)0);
-      png_free(png_ptr, new_key);
-      return;
-   }
-
-   text_len = png_strlen(text);
-
-   /* Compute the compressed data; do it now for the length */
-   text_len = png_text_compress(png_ptr, text, text_len, compression,
-       &comp);
-
-   /* Write start of chunk */
-   png_write_chunk_start(png_ptr, png_zTXt,
-       (png_uint_32)(key_len+text_len + 2));
-
-   /* Write key */
-   png_write_chunk_data(png_ptr, (png_bytep)new_key,
-       (png_size_t)(key_len + 1));
-
-   png_free(png_ptr, new_key);
-
-   buf = (png_byte)compression;
-
-   /* Write compression */
-   png_write_chunk_data(png_ptr, &buf, (png_size_t)1);
-
-   /* Write the compressed data */
-   png_write_compressed_data_out(png_ptr, &comp);
-
-   /* Close the chunk */
-   png_write_chunk_end(png_ptr);
-}
-#endif
-
-#ifdef PNG_WRITE_iTXt_SUPPORTED
-/* Write an iTXt chunk */
-void /* PRIVATE */
-png_write_iTXt(png_structp png_ptr, int compression, png_const_charp key,
-    png_const_charp lang, png_const_charp lang_key, png_const_charp text)
-{
-   PNG_iTXt;
-   png_size_t lang_len, key_len, lang_key_len, text_len;
-   png_charp new_lang;
-   png_charp new_key = NULL;
-   png_byte cbuf[2];
-   compression_state comp;
-
-   png_debug(1, "in png_write_iTXt");
-
-   comp.num_output_ptr = 0;
-   comp.max_output_ptr = 0;
-   comp.output_ptr = NULL;
-   comp.input = NULL;
-
-   if ((key_len = png_check_keyword(png_ptr, key, &new_key)) == 0)
-      return;
-
-   if ((lang_len = png_check_keyword(png_ptr, lang, &new_lang)) == 0)
-   {
-      png_warning(png_ptr, "Empty language field in iTXt chunk");
-      new_lang = NULL;
-      lang_len = 0;
-   }
-
-   if (lang_key == NULL)
-      lang_key_len = 0;
-
-   else
-      lang_key_len = png_strlen(lang_key);
-
-   if (text == NULL)
-      text_len = 0;
-
-   else
-      text_len = png_strlen(text);
-
-   /* Compute the compressed data; do it now for the length */
-   text_len = png_text_compress(png_ptr, text, text_len, compression - 2,
-       &comp);
-
-
-   /* Make sure we include the compression flag, the compression byte,
-    * and the NULs after the key, lang, and lang_key parts
-    */
-
-   png_write_chunk_start(png_ptr, png_iTXt, (png_uint_32)(
-        5 /* comp byte, comp flag, terminators for key, lang and lang_key */
-        + key_len
-        + lang_len
-        + lang_key_len
-        + text_len));
-
-   /* We leave it to the application to meet PNG-1.0 requirements on the
-    * contents of the text.  PNG-1.0 through PNG-1.2 discourage the use of
-    * any non-Latin-1 characters except for NEWLINE.  ISO PNG will forbid them.
-    * The NUL character is forbidden by PNG-1.0 through PNG-1.2 and ISO PNG.
-    */
-   png_write_chunk_data(png_ptr, (png_bytep)new_key, (png_size_t)(key_len + 1));
-
-   /* Set the compression flag */
-   if (compression == PNG_ITXT_COMPRESSION_NONE ||
-       compression == PNG_TEXT_COMPRESSION_NONE)
-      cbuf[0] = 0;
-
-   else /* compression == PNG_ITXT_COMPRESSION_zTXt */
-      cbuf[0] = 1;
-
-   /* Set the compression method */
-   cbuf[1] = 0;
-
-   png_write_chunk_data(png_ptr, cbuf, (png_size_t)2);
-
-   cbuf[0] = 0;
-   png_write_chunk_data(png_ptr, (new_lang ? (png_const_bytep)new_lang : cbuf),
-       (png_size_t)(lang_len + 1));
-
-   png_write_chunk_data(png_ptr, (lang_key ? (png_const_bytep)lang_key : cbuf),
-       (png_size_t)(lang_key_len + 1));
-
-   png_write_compressed_data_out(png_ptr, &comp);
-
-   png_write_chunk_end(png_ptr);
-
-   png_free(png_ptr, new_key);
-   png_free(png_ptr, new_lang);
-}
-#endif
-
-#ifdef PNG_WRITE_oFFs_SUPPORTED
-/* Write the oFFs chunk */
-void /* PRIVATE */
-png_write_oFFs(png_structp png_ptr, png_int_32 x_offset, png_int_32 y_offset,
-    int unit_type)
-{
-   PNG_oFFs;
-   png_byte buf[9];
-
-   png_debug(1, "in png_write_oFFs");
-
-   if (unit_type >= PNG_OFFSET_LAST)
-      png_warning(png_ptr, "Unrecognized unit type for oFFs chunk");
-
-   png_save_int_32(buf, x_offset);
-   png_save_int_32(buf + 4, y_offset);
-   buf[8] = (png_byte)unit_type;
-
-   png_write_chunk(png_ptr, png_oFFs, buf, (png_size_t)9);
-}
-#endif
-#ifdef PNG_WRITE_pCAL_SUPPORTED
-/* Write the pCAL chunk (described in the PNG extensions document) */
-void /* PRIVATE */
-png_write_pCAL(png_structp png_ptr, png_charp purpose, png_int_32 X0,
-    png_int_32 X1, int type, int nparams, png_const_charp units,
-    png_charpp params)
-{
-   PNG_pCAL;
-   png_size_t purpose_len, units_len, total_len;
-   png_uint_32p params_len;
-   png_byte buf[10];
-   png_charp new_purpose;
-   int i;
-
-   png_debug1(1, "in png_write_pCAL (%d parameters)", nparams);
-
-   if (type >= PNG_EQUATION_LAST)
-      png_warning(png_ptr, "Unrecognized equation type for pCAL chunk");
-
-   purpose_len = png_check_keyword(png_ptr, purpose, &new_purpose) + 1;
-   png_debug1(3, "pCAL purpose length = %d", (int)purpose_len);
-   units_len = png_strlen(units) + (nparams == 0 ? 0 : 1);
-   png_debug1(3, "pCAL units length = %d", (int)units_len);
-   total_len = purpose_len + units_len + 10;
-
-   params_len = (png_uint_32p)png_malloc(png_ptr,
-       (png_alloc_size_t)(nparams * png_sizeof(png_uint_32)));
-
-   /* Find the length of each parameter, making sure we don't count the
-    * null terminator for the last parameter.
-    */
-   for (i = 0; i < nparams; i++)
-   {
-      params_len[i] = png_strlen(params[i]) + (i == nparams - 1 ? 0 : 1);
-      png_debug2(3, "pCAL parameter %d length = %lu", i,
-          (unsigned long)params_len[i]);
-      total_len += (png_size_t)params_len[i];
-   }
-
-   png_debug1(3, "pCAL total length = %d", (int)total_len);
-   png_write_chunk_start(png_ptr, png_pCAL, (png_uint_32)total_len);
-   png_write_chunk_data(png_ptr, (png_const_bytep)new_purpose,
-       (png_size_t)purpose_len);
-   png_save_int_32(buf, X0);
-   png_save_int_32(buf + 4, X1);
-   buf[8] = (png_byte)type;
-   buf[9] = (png_byte)nparams;
-   png_write_chunk_data(png_ptr, buf, (png_size_t)10);
-   png_write_chunk_data(png_ptr, (png_const_bytep)units, (png_size_t)units_len);
-
-   png_free(png_ptr, new_purpose);
-
-   for (i = 0; i < nparams; i++)
-   {
-      png_write_chunk_data(png_ptr, (png_const_bytep)params[i],
-          (png_size_t)params_len[i]);
-   }
-
-   png_free(png_ptr, params_len);
-   png_write_chunk_end(png_ptr);
-}
-#endif
-
-#ifdef PNG_WRITE_sCAL_SUPPORTED
-/* Write the sCAL chunk */
-void /* PRIVATE */
-png_write_sCAL_s(png_structp png_ptr, int unit, png_const_charp width,
-    png_const_charp height)
-{
-   PNG_sCAL;
-   png_byte buf[64];
-   png_size_t wlen, hlen, total_len;
-
-   png_debug(1, "in png_write_sCAL_s");
-
-   wlen = png_strlen(width);
-   hlen = png_strlen(height);
-   total_len = wlen + hlen + 2;
-
-   if (total_len > 64)
-   {
-      png_warning(png_ptr, "Can't write sCAL (buffer too small)");
-      return;
-   }
-
-   buf[0] = (png_byte)unit;
-   png_memcpy(buf + 1, width, wlen + 1);      /* Append the '\0' here */
-   png_memcpy(buf + wlen + 2, height, hlen);  /* Do NOT append the '\0' here */
-
-   png_debug1(3, "sCAL total length = %u", (unsigned int)total_len);
-   png_write_chunk(png_ptr, png_sCAL, buf, total_len);
-}
-#endif
-
-#ifdef PNG_WRITE_pHYs_SUPPORTED
-/* Write the pHYs chunk */
-void /* PRIVATE */
-png_write_pHYs(png_structp png_ptr, png_uint_32 x_pixels_per_unit,
-    png_uint_32 y_pixels_per_unit,
-    int unit_type)
-{
-   PNG_pHYs;
-   png_byte buf[9];
-
-   png_debug(1, "in png_write_pHYs");
-
-   if (unit_type >= PNG_RESOLUTION_LAST)
-      png_warning(png_ptr, "Unrecognized unit type for pHYs chunk");
-
-   png_save_uint_32(buf, x_pixels_per_unit);
-   png_save_uint_32(buf + 4, y_pixels_per_unit);
-   buf[8] = (png_byte)unit_type;
-
-   png_write_chunk(png_ptr, png_pHYs, buf, (png_size_t)9);
-}
-#endif
-
-#ifdef PNG_WRITE_tIME_SUPPORTED
-/* Write the tIME chunk.  Use either png_convert_from_struct_tm()
- * or png_convert_from_time_t(), or fill in the structure yourself.
- */
-void /* PRIVATE */
-png_write_tIME(png_structp png_ptr, png_const_timep mod_time)
-{
-   PNG_tIME;
-   png_byte buf[7];
-
-   png_debug(1, "in png_write_tIME");
-
-   if (mod_time->month  > 12 || mod_time->month  < 1 ||
-       mod_time->day    > 31 || mod_time->day    < 1 ||
-       mod_time->hour   > 23 || mod_time->second > 60)
-   {
-      png_warning(png_ptr, "Invalid time specified for tIME chunk");
-      return;
-   }
-
-   png_save_uint_16(buf, mod_time->year);
-   buf[2] = mod_time->month;
-   buf[3] = mod_time->day;
-   buf[4] = mod_time->hour;
-   buf[5] = mod_time->minute;
-   buf[6] = mod_time->second;
-
-   png_write_chunk(png_ptr, png_tIME, buf, (png_size_t)7);
-}
-#endif
-
-/* Initializes the row writing capability of libpng */
-void /* PRIVATE */
-png_write_start_row(png_structp png_ptr)
-{
-#ifdef PNG_WRITE_INTERLACING_SUPPORTED
-   /* Arrays to facilitate easy interlacing - use pass (0 - 6) as index */
-
-   /* Start of interlace block */
-   int png_pass_start[7] = {0, 4, 0, 2, 0, 1, 0};
-
-   /* Offset to next interlace block */
-   int png_pass_inc[7] = {8, 8, 4, 4, 2, 2, 1};
-
-   /* Start of interlace block in the y direction */
-   int png_pass_ystart[7] = {0, 0, 4, 0, 2, 0, 1};
-
-   /* Offset to next interlace block in the y direction */
-   int png_pass_yinc[7] = {8, 8, 8, 4, 4, 2, 2};
-#endif
-
-   png_size_t buf_size;
-
-   png_debug(1, "in png_write_start_row");
-
-   buf_size = (png_size_t)(PNG_ROWBYTES(
-       png_ptr->usr_channels*png_ptr->usr_bit_depth, png_ptr->width) + 1);
-
-   /* Set up row buffer */
-   png_ptr->row_buf = (png_bytep)png_malloc(png_ptr,
-       (png_alloc_size_t)buf_size);
-
-   png_ptr->row_buf[0] = PNG_FILTER_VALUE_NONE;
-
-#ifdef PNG_WRITE_FILTER_SUPPORTED
-   /* Set up filtering buffer, if using this filter */
-   if (png_ptr->do_filter & PNG_FILTER_SUB)
-   {
-      png_ptr->sub_row = (png_bytep)png_malloc(png_ptr, png_ptr->rowbytes + 1);
-
-      png_ptr->sub_row[0] = PNG_FILTER_VALUE_SUB;
-   }
-
-   /* We only need to keep the previous row if we are using one of these. */
-   if (png_ptr->do_filter & (PNG_FILTER_AVG | PNG_FILTER_UP | PNG_FILTER_PAETH))
-   {
-      /* Set up previous row buffer */
-      png_ptr->prev_row = (png_bytep)png_calloc(png_ptr,
-          (png_alloc_size_t)buf_size);
-
-      if (png_ptr->do_filter & PNG_FILTER_UP)
-      {
-         png_ptr->up_row = (png_bytep)png_malloc(png_ptr,
-            png_ptr->rowbytes + 1);
-
-         png_ptr->up_row[0] = PNG_FILTER_VALUE_UP;
-      }
-
-      if (png_ptr->do_filter & PNG_FILTER_AVG)
-      {
-         png_ptr->avg_row = (png_bytep)png_malloc(png_ptr,
-             png_ptr->rowbytes + 1);
-
-         png_ptr->avg_row[0] = PNG_FILTER_VALUE_AVG;
-      }
-
-      if (png_ptr->do_filter & PNG_FILTER_PAETH)
-      {
-         png_ptr->paeth_row = (png_bytep)png_malloc(png_ptr,
-             png_ptr->rowbytes + 1);
-
-         png_ptr->paeth_row[0] = PNG_FILTER_VALUE_PAETH;
-      }
-   }
-#endif /* PNG_WRITE_FILTER_SUPPORTED */
-
-#ifdef PNG_WRITE_INTERLACING_SUPPORTED
-   /* If interlaced, we need to set up width and height of pass */
-   if (png_ptr->interlaced)
-   {
-      if (!(png_ptr->transformations & PNG_INTERLACE))
-      {
-         png_ptr->num_rows = (png_ptr->height + png_pass_yinc[0] - 1 -
-             png_pass_ystart[0]) / png_pass_yinc[0];
-
-         png_ptr->usr_width = (png_ptr->width + png_pass_inc[0] - 1 -
-             png_pass_start[0]) / png_pass_inc[0];
-      }
-
-      else
-      {
-         png_ptr->num_rows = png_ptr->height;
-         png_ptr->usr_width = png_ptr->width;
-      }
-   }
-
-   else
-#endif
-   {
-      png_ptr->num_rows = png_ptr->height;
-      png_ptr->usr_width = png_ptr->width;
-   }
-
-   png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;
-   png_ptr->zstream.next_out = png_ptr->zbuf;
-}
-
-/* Internal use only.  Called when finished processing a row of data. */
-void /* PRIVATE */
-png_write_finish_row(png_structp png_ptr)
-{
-#ifdef PNG_WRITE_INTERLACING_SUPPORTED
-   /* Arrays to facilitate easy interlacing - use pass (0 - 6) as index */
-
-   /* Start of interlace block */
-   int png_pass_start[7] = {0, 4, 0, 2, 0, 1, 0};
-
-   /* Offset to next interlace block */
-   int png_pass_inc[7] = {8, 8, 4, 4, 2, 2, 1};
-
-   /* Start of interlace block in the y direction */
-   int png_pass_ystart[7] = {0, 0, 4, 0, 2, 0, 1};
-
-   /* Offset to next interlace block in the y direction */
-   int png_pass_yinc[7] = {8, 8, 8, 4, 4, 2, 2};
-#endif
-
-   int ret;
-
-   png_debug(1, "in png_write_finish_row");
-
-   /* Next row */
-   png_ptr->row_number++;
-
-   /* See if we are done */
-   if (png_ptr->row_number < png_ptr->num_rows)
-      return;
-
-#ifdef PNG_WRITE_INTERLACING_SUPPORTED
-   /* If interlaced, go to next pass */
-   if (png_ptr->interlaced)
-   {
-      png_ptr->row_number = 0;
-      if (png_ptr->transformations & PNG_INTERLACE)
-      {
-         png_ptr->pass++;
-      }
-
-      else
-      {
-         /* Loop until we find a non-zero width or height pass */
-         do
-         {
-            png_ptr->pass++;
-
-            if (png_ptr->pass >= 7)
-               break;
-
-            png_ptr->usr_width = (png_ptr->width +
-                png_pass_inc[png_ptr->pass] - 1 -
-                png_pass_start[png_ptr->pass]) /
-                png_pass_inc[png_ptr->pass];
-
-            png_ptr->num_rows = (png_ptr->height +
-                png_pass_yinc[png_ptr->pass] - 1 -
-                png_pass_ystart[png_ptr->pass]) /
-                png_pass_yinc[png_ptr->pass];
-
-            if (png_ptr->transformations & PNG_INTERLACE)
-               break;
-
-         } while (png_ptr->usr_width == 0 || png_ptr->num_rows == 0);
-
-      }
-
-      /* Reset the row above the image for the next pass */
-      if (png_ptr->pass < 7)
-      {
-         if (png_ptr->prev_row != NULL)
-            png_memset(png_ptr->prev_row, 0,
-                (png_size_t)(PNG_ROWBYTES(png_ptr->usr_channels*
-                png_ptr->usr_bit_depth, png_ptr->width)) + 1);
-
-         return;
-      }
-   }
-#endif
-
-   /* If we get here, we've just written the last row, so we need
-      to flush the compressor */
-   do
-   {
-      /* Tell the compressor we are done */
-      ret = deflate(&png_ptr->zstream, Z_FINISH);
-
-      /* Check for an error */
-      if (ret == Z_OK)
-      {
-         /* Check to see if we need more room */
-         if (!(png_ptr->zstream.avail_out))
-         {
-            png_write_IDAT(png_ptr, png_ptr->zbuf, png_ptr->zbuf_size);
-            png_ptr->zstream.next_out = png_ptr->zbuf;
-            png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;
-         }
-      }
-
-      else if (ret != Z_STREAM_END)
-      {
-         if (png_ptr->zstream.msg != NULL)
-            png_error(png_ptr, png_ptr->zstream.msg);
-
-         else
-            png_error(png_ptr, "zlib error");
-      }
-   } while (ret != Z_STREAM_END);
-
-   /* Write any extra space */
-   if (png_ptr->zstream.avail_out < png_ptr->zbuf_size)
-   {
-      png_write_IDAT(png_ptr, png_ptr->zbuf, png_ptr->zbuf_size -
-          png_ptr->zstream.avail_out);
-   }
-
-   deflateReset(&png_ptr->zstream);
-   png_ptr->zstream.data_type = Z_BINARY;
-}
-
-#ifdef PNG_WRITE_INTERLACING_SUPPORTED
-/* Pick out the correct pixels for the interlace pass.
- * The basic idea here is to go through the row with a source
- * pointer and a destination pointer (sp and dp), and copy the
- * correct pixels for the pass.  As the row gets compacted,
- * sp will always be >= dp, so we should never overwrite anything.
- * See the default: case for the easiest code to understand.
- */
-void /* PRIVATE */
-png_do_write_interlace(png_row_infop row_info, png_bytep row, int pass)
-{
-   /* Arrays to facilitate easy interlacing - use pass (0 - 6) as index */
-
-   /* Start of interlace block */
-   int png_pass_start[7] = {0, 4, 0, 2, 0, 1, 0};
-
-   /* Offset to next interlace block */
-   int png_pass_inc[7] = {8, 8, 4, 4, 2, 2, 1};
-
-   png_debug(1, "in png_do_write_interlace");
-
-   /* We don't have to do anything on the last pass (6) */
-   if (pass < 6)
-   {
-      /* Each pixel depth is handled separately */
-      switch (row_info->pixel_depth)
-      {
-         case 1:
-         {
-            png_bytep sp;
-            png_bytep dp;
-            int shift;
-            int d;
-            int value;
-            png_uint_32 i;
-            png_uint_32 row_width = row_info->width;
-
-            dp = row;
-            d = 0;
-            shift = 7;
-
-            for (i = png_pass_start[pass]; i < row_width;
-               i += png_pass_inc[pass])
-            {
-               sp = row + (png_size_t)(i >> 3);
-               value = (int)(*sp >> (7 - (int)(i & 0x07))) & 0x01;
-               d |= (value << shift);
-
-               if (shift == 0)
-               {
-                  shift = 7;
-                  *dp++ = (png_byte)d;
-                  d = 0;
-               }
-
-               else
-                  shift--;
-
-            }
-            if (shift != 7)
-               *dp = (png_byte)d;
-
-            break;
-         }
-
-         case 2:
-         {
-            png_bytep sp;
-            png_bytep dp;
-            int shift;
-            int d;
-            int value;
-            png_uint_32 i;
-            png_uint_32 row_width = row_info->width;
-
-            dp = row;
-            shift = 6;
-            d = 0;
-
-            for (i = png_pass_start[pass]; i < row_width;
-               i += png_pass_inc[pass])
-            {
-               sp = row + (png_size_t)(i >> 2);
-               value = (*sp >> ((3 - (int)(i & 0x03)) << 1)) & 0x03;
-               d |= (value << shift);
-
-               if (shift == 0)
-               {
-                  shift = 6;
-                  *dp++ = (png_byte)d;
-                  d = 0;
-               }
-
-               else
-                  shift -= 2;
-            }
-            if (shift != 6)
-               *dp = (png_byte)d;
-
-            break;
-         }
-
-         case 4:
-         {
-            png_bytep sp;
-            png_bytep dp;
-            int shift;
-            int d;
-            int value;
-            png_uint_32 i;
-            png_uint_32 row_width = row_info->width;
-
-            dp = row;
-            shift = 4;
-            d = 0;
-            for (i = png_pass_start[pass]; i < row_width;
-                i += png_pass_inc[pass])
-            {
-               sp = row + (png_size_t)(i >> 1);
-               value = (*sp >> ((1 - (int)(i & 0x01)) << 2)) & 0x0f;
-               d |= (value << shift);
-
-               if (shift == 0)
-               {
-                  shift = 4;
-                  *dp++ = (png_byte)d;
-                  d = 0;
-               }
-
-               else
-                  shift -= 4;
-            }
-            if (shift != 4)
-               *dp = (png_byte)d;
-
-            break;
-         }
-
-         default:
-         {
-            png_bytep sp;
-            png_bytep dp;
-            png_uint_32 i;
-            png_uint_32 row_width = row_info->width;
-            png_size_t pixel_bytes;
-
-            /* Start at the beginning */
-            dp = row;
-
-            /* Find out how many bytes each pixel takes up */
-            pixel_bytes = (row_info->pixel_depth >> 3);
-
-            /* Loop through the row, only looking at the pixels that matter */
-            for (i = png_pass_start[pass]; i < row_width;
-               i += png_pass_inc[pass])
-            {
-               /* Find out where the original pixel is */
-               sp = row + (png_size_t)i * pixel_bytes;
-
-               /* Move the pixel */
-               if (dp != sp)
-                  png_memcpy(dp, sp, pixel_bytes);
-
-               /* Next pixel */
-               dp += pixel_bytes;
-            }
-            break;
-         }
-      }
-      /* Set new row width */
-      row_info->width = (row_info->width +
-          png_pass_inc[pass] - 1 -
-          png_pass_start[pass]) /
-          png_pass_inc[pass];
-
-      row_info->rowbytes = PNG_ROWBYTES(row_info->pixel_depth,
-          row_info->width);
-   }
-}
-#endif
-
-/* This filters the row, chooses which filter to use, if it has not already
- * been specified by the application, and then writes the row out with the
- * chosen filter.
- */
-#define PNG_MAXSUM (((png_uint_32)(-1)) >> 1)
-#define PNG_HISHIFT 10
-#define PNG_LOMASK ((png_uint_32)0xffffL)
-#define PNG_HIMASK ((png_uint_32)(~PNG_LOMASK >> PNG_HISHIFT))
-void /* PRIVATE */
-png_write_find_filter(png_structp png_ptr, png_row_infop row_info)
-{
-   png_bytep best_row;
-#ifdef PNG_WRITE_FILTER_SUPPORTED
-   png_bytep prev_row, row_buf;
-   png_uint_32 mins, bpp;
-   png_byte filter_to_do = png_ptr->do_filter;
-   png_size_t row_bytes = row_info->rowbytes;
-#ifdef PNG_WRITE_WEIGHTED_FILTER_SUPPORTED
-   int num_p_filters = (int)png_ptr->num_prev_filters;
-#endif
-
-   png_debug(1, "in png_write_find_filter");
-
-#ifndef PNG_WRITE_WEIGHTED_FILTER_SUPPORTED
-  if (png_ptr->row_number == 0 && filter_to_do == PNG_ALL_FILTERS)
-  {
-     /* These will never be selected so we need not test them. */
-     filter_to_do &= ~(PNG_FILTER_UP | PNG_FILTER_PAETH);
-  }
-#endif
-
-   /* Find out how many bytes offset each pixel is */
-   bpp = (row_info->pixel_depth + 7) >> 3;
-
-   prev_row = png_ptr->prev_row;
-#endif
-   best_row = png_ptr->row_buf;
-#ifdef PNG_WRITE_FILTER_SUPPORTED
-   row_buf = best_row;
-   mins = PNG_MAXSUM;
-
-   /* The prediction method we use is to find which method provides the
-    * smallest value when summing the absolute values of the distances
-    * from zero, using anything >= 128 as negative numbers.  This is known
-    * as the "minimum sum of absolute differences" heuristic.  Other
-    * heuristics are the "weighted minimum sum of absolute differences"
-    * (experimental and can in theory improve compression), and the "zlib
-    * predictive" method (not implemented yet), which does test compressions
-    * of lines using different filter methods, and then chooses the
-    * (series of) filter(s) that give minimum compressed data size (VERY
-    * computationally expensive).
-    *
-    * GRR 980525:  consider also
-    *
-    *   (1) minimum sum of absolute differences from running average (i.e.,
-    *       keep running sum of non-absolute differences & count of bytes)
-    *       [track dispersion, too?  restart average if dispersion too large?]
-    *
-    *  (1b) minimum sum of absolute differences from sliding average, probably
-    *       with window size <= deflate window (usually 32K)
-    *
-    *   (2) minimum sum of squared differences from zero or running average
-    *       (i.e., ~ root-mean-square approach)
-    */
-
-
-   /* We don't need to test the 'no filter' case if this is the only filter
-    * that has been chosen, as it doesn't actually do anything to the data.
-    */
-   if ((filter_to_do & PNG_FILTER_NONE) && filter_to_do != PNG_FILTER_NONE)
-   {
-      png_bytep rp;
-      png_uint_32 sum = 0;
-      png_size_t i;
-      int v;
-
-      for (i = 0, rp = row_buf + 1; i < row_bytes; i++, rp++)
-      {
-         v = *rp;
-         sum += (v < 128) ? v : 256 - v;
-      }
-
-#ifdef PNG_WRITE_WEIGHTED_FILTER_SUPPORTED
-      if (png_ptr->heuristic_method == PNG_FILTER_HEURISTIC_WEIGHTED)
-      {
-         png_uint_32 sumhi, sumlo;
-         int j;
-         sumlo = sum & PNG_LOMASK;
-         sumhi = (sum >> PNG_HISHIFT) & PNG_HIMASK; /* Gives us some footroom */
-
-         /* Reduce the sum if we match any of the previous rows */
-         for (j = 0; j < num_p_filters; j++)
-         {
-            if (png_ptr->prev_filters[j] == PNG_FILTER_VALUE_NONE)
-            {
-               sumlo = (sumlo * png_ptr->filter_weights[j]) >>
-                   PNG_WEIGHT_SHIFT;
-
-               sumhi = (sumhi * png_ptr->filter_weights[j]) >>
-                   PNG_WEIGHT_SHIFT;
-            }
-         }
-
-         /* Factor in the cost of this filter (this is here for completeness,
-          * but it makes no sense to have a "cost" for the NONE filter, as
-          * it has the minimum possible computational cost - none).
-          */
-         sumlo = (sumlo * png_ptr->filter_costs[PNG_FILTER_VALUE_NONE]) >>
-             PNG_COST_SHIFT;
-
-         sumhi = (sumhi * png_ptr->filter_costs[PNG_FILTER_VALUE_NONE]) >>
-             PNG_COST_SHIFT;
-
-         if (sumhi > PNG_HIMASK)
-            sum = PNG_MAXSUM;
-
-         else
-            sum = (sumhi << PNG_HISHIFT) + sumlo;
-      }
-#endif
-      mins = sum;
-   }
-
-   /* Sub filter */
-   if (filter_to_do == PNG_FILTER_SUB)
-   /* It's the only filter so no testing is needed */
-   {
-      png_bytep rp, lp, dp;
-      png_size_t i;
-
-      for (i = 0, rp = row_buf + 1, dp = png_ptr->sub_row + 1; i < bpp;
-           i++, rp++, dp++)
-      {
-         *dp = *rp;
-      }
-
-      for (lp = row_buf + 1; i < row_bytes;
-         i++, rp++, lp++, dp++)
-      {
-         *dp = (png_byte)(((int)*rp - (int)*lp) & 0xff);
-      }
-
-      best_row = png_ptr->sub_row;
-   }
-
-   else if (filter_to_do & PNG_FILTER_SUB)
-   {
-      png_bytep rp, dp, lp;
-      png_uint_32 sum = 0, lmins = mins;
-      png_size_t i;
-      int v;
-
-#ifdef PNG_WRITE_WEIGHTED_FILTER_SUPPORTED
-      /* We temporarily increase the "minimum sum" by the factor we
-       * would reduce the sum of this filter, so that we can do the
-       * early exit comparison without scaling the sum each time.
-       */
-      if (png_ptr->heuristic_method == PNG_FILTER_HEURISTIC_WEIGHTED)
-      {
-         int j;
-         png_uint_32 lmhi, lmlo;
-         lmlo = lmins & PNG_LOMASK;
-         lmhi = (lmins >> PNG_HISHIFT) & PNG_HIMASK;
-
-         for (j = 0; j < num_p_filters; j++)
-         {
-            if (png_ptr->prev_filters[j] == PNG_FILTER_VALUE_SUB)
-            {
-               lmlo = (lmlo * png_ptr->inv_filter_weights[j]) >>
-                   PNG_WEIGHT_SHIFT;
-
-               lmhi = (lmhi * png_ptr->inv_filter_weights[j]) >>
-                   PNG_WEIGHT_SHIFT;
-            }
-         }
-
-         lmlo = (lmlo * png_ptr->inv_filter_costs[PNG_FILTER_VALUE_SUB]) >>
-             PNG_COST_SHIFT;
-
-         lmhi = (lmhi * png_ptr->inv_filter_costs[PNG_FILTER_VALUE_SUB]) >>
-             PNG_COST_SHIFT;
-
-         if (lmhi > PNG_HIMASK)
-            lmins = PNG_MAXSUM;
-
-         else
-            lmins = (lmhi << PNG_HISHIFT) + lmlo;
-      }
-#endif
-
-      for (i = 0, rp = row_buf + 1, dp = png_ptr->sub_row + 1; i < bpp;
-           i++, rp++, dp++)
-      {
-         v = *dp = *rp;
-
-         sum += (v < 128) ? v : 256 - v;
-      }
-
-      for (lp = row_buf + 1; i < row_bytes;
-         i++, rp++, lp++, dp++)
-      {
-         v = *dp = (png_byte)(((int)*rp - (int)*lp) & 0xff);
-
-         sum += (v < 128) ? v : 256 - v;
-
-         if (sum > lmins)  /* We are already worse, don't continue. */
-            break;
-      }
-
-#ifdef PNG_WRITE_WEIGHTED_FILTER_SUPPORTED
-      if (png_ptr->heuristic_method == PNG_FILTER_HEURISTIC_WEIGHTED)
-      {
-         int j;
-         png_uint_32 sumhi, sumlo;
-         sumlo = sum & PNG_LOMASK;
-         sumhi = (sum >> PNG_HISHIFT) & PNG_HIMASK;
-
-         for (j = 0; j < num_p_filters; j++)
-         {
-            if (png_ptr->prev_filters[j] == PNG_FILTER_VALUE_SUB)
-            {
-               sumlo = (sumlo * png_ptr->inv_filter_weights[j]) >>
-                   PNG_WEIGHT_SHIFT;
-
-               sumhi = (sumhi * png_ptr->inv_filter_weights[j]) >>
-                   PNG_WEIGHT_SHIFT;
-            }
-         }
-
-         sumlo = (sumlo * png_ptr->inv_filter_costs[PNG_FILTER_VALUE_SUB]) >>
-             PNG_COST_SHIFT;
-
-         sumhi = (sumhi * png_ptr->inv_filter_costs[PNG_FILTER_VALUE_SUB]) >>
-             PNG_COST_SHIFT;
-
-         if (sumhi > PNG_HIMASK)
-            sum = PNG_MAXSUM;
-
-         else
-            sum = (sumhi << PNG_HISHIFT) + sumlo;
-      }
-#endif
-
-      if (sum < mins)
-      {
-         mins = sum;
-         best_row = png_ptr->sub_row;
-      }
-   }
-
-   /* Up filter */
-   if (filter_to_do == PNG_FILTER_UP)
-   {
-      png_bytep rp, dp, pp;
-      png_size_t i;
-
-      for (i = 0, rp = row_buf + 1, dp = png_ptr->up_row + 1,
-          pp = prev_row + 1; i < row_bytes;
-          i++, rp++, pp++, dp++)
-      {
-         *dp = (png_byte)(((int)*rp - (int)*pp) & 0xff);
-      }
-
-      best_row = png_ptr->up_row;
-   }
-
-   else if (filter_to_do & PNG_FILTER_UP)
-   {
-      png_bytep rp, dp, pp;
-      png_uint_32 sum = 0, lmins = mins;
-      png_size_t i;
-      int v;
-
-
-#ifdef PNG_WRITE_WEIGHTED_FILTER_SUPPORTED
-      if (png_ptr->heuristic_method == PNG_FILTER_HEURISTIC_WEIGHTED)
-      {
-         int j;
-         png_uint_32 lmhi, lmlo;
-         lmlo = lmins & PNG_LOMASK;
-         lmhi = (lmins >> PNG_HISHIFT) & PNG_HIMASK;
-
-         for (j = 0; j < num_p_filters; j++)
-         {
-            if (png_ptr->prev_filters[j] == PNG_FILTER_VALUE_UP)
-            {
-               lmlo = (lmlo * png_ptr->inv_filter_weights[j]) >>
-                   PNG_WEIGHT_SHIFT;
-
-               lmhi = (lmhi * png_ptr->inv_filter_weights[j]) >>
-                   PNG_WEIGHT_SHIFT;
-            }
-         }
-
-         lmlo = (lmlo * png_ptr->inv_filter_costs[PNG_FILTER_VALUE_UP]) >>
-             PNG_COST_SHIFT;
-
-         lmhi = (lmhi * png_ptr->inv_filter_costs[PNG_FILTER_VALUE_UP]) >>
-             PNG_COST_SHIFT;
-
-         if (lmhi > PNG_HIMASK)
-            lmins = PNG_MAXSUM;
-
-         else
-            lmins = (lmhi << PNG_HISHIFT) + lmlo;
-      }
-#endif
-
-      for (i = 0, rp = row_buf + 1, dp = png_ptr->up_row + 1,
-          pp = prev_row + 1; i < row_bytes; i++)
-      {
-         v = *dp++ = (png_byte)(((int)*rp++ - (int)*pp++) & 0xff);
-
-         sum += (v < 128) ? v : 256 - v;
-
-         if (sum > lmins)  /* We are already worse, don't continue. */
-            break;
-      }
-
-#ifdef PNG_WRITE_WEIGHTED_FILTER_SUPPORTED
-      if (png_ptr->heuristic_method == PNG_FILTER_HEURISTIC_WEIGHTED)
-      {
-         int j;
-         png_uint_32 sumhi, sumlo;
-         sumlo = sum & PNG_LOMASK;
-         sumhi = (sum >> PNG_HISHIFT) & PNG_HIMASK;
-
-         for (j = 0; j < num_p_filters; j++)
-         {
-            if (png_ptr->prev_filters[j] == PNG_FILTER_VALUE_UP)
-            {
-               sumlo = (sumlo * png_ptr->filter_weights[j]) >>
-                   PNG_WEIGHT_SHIFT;
-
-               sumhi = (sumhi * png_ptr->filter_weights[j]) >>
-                   PNG_WEIGHT_SHIFT;
-            }
-         }
-
-         sumlo = (sumlo * png_ptr->filter_costs[PNG_FILTER_VALUE_UP]) >>
-             PNG_COST_SHIFT;
-
-         sumhi = (sumhi * png_ptr->filter_costs[PNG_FILTER_VALUE_UP]) >>
-             PNG_COST_SHIFT;
-
-         if (sumhi > PNG_HIMASK)
-            sum = PNG_MAXSUM;
-
-         else
-            sum = (sumhi << PNG_HISHIFT) + sumlo;
-      }
-#endif
-
-      if (sum < mins)
-      {
-         mins = sum;
-         best_row = png_ptr->up_row;
-      }
-   }
-
-   /* Avg filter */
-   if (filter_to_do == PNG_FILTER_AVG)
-   {
-      png_bytep rp, dp, pp, lp;
-      png_uint_32 i;
-
-      for (i = 0, rp = row_buf + 1, dp = png_ptr->avg_row + 1,
-           pp = prev_row + 1; i < bpp; i++)
-      {
-         *dp++ = (png_byte)(((int)*rp++ - ((int)*pp++ / 2)) & 0xff);
-      }
-
-      for (lp = row_buf + 1; i < row_bytes; i++)
-      {
-         *dp++ = (png_byte)(((int)*rp++ - (((int)*pp++ + (int)*lp++) / 2))
-                 & 0xff);
-      }
-      best_row = png_ptr->avg_row;
-   }
-
-   else if (filter_to_do & PNG_FILTER_AVG)
-   {
-      png_bytep rp, dp, pp, lp;
-      png_uint_32 sum = 0, lmins = mins;
-      png_size_t i;
-      int v;
-
-#ifdef PNG_WRITE_WEIGHTED_FILTER_SUPPORTED
-      if (png_ptr->heuristic_method == PNG_FILTER_HEURISTIC_WEIGHTED)
-      {
-         int j;
-         png_uint_32 lmhi, lmlo;
-         lmlo = lmins & PNG_LOMASK;
-         lmhi = (lmins >> PNG_HISHIFT) & PNG_HIMASK;
-
-         for (j = 0; j < num_p_filters; j++)
-         {
-            if (png_ptr->prev_filters[j] == PNG_FILTER_VALUE_AVG)
-            {
-               lmlo = (lmlo * png_ptr->inv_filter_weights[j]) >>
-                   PNG_WEIGHT_SHIFT;
-
-               lmhi = (lmhi * png_ptr->inv_filter_weights[j]) >>
-                   PNG_WEIGHT_SHIFT;
-            }
-         }
-
-         lmlo = (lmlo * png_ptr->inv_filter_costs[PNG_FILTER_VALUE_AVG]) >>
-             PNG_COST_SHIFT;
-
-         lmhi = (lmhi * png_ptr->inv_filter_costs[PNG_FILTER_VALUE_AVG]) >>
-             PNG_COST_SHIFT;
-
-         if (lmhi > PNG_HIMASK)
-            lmins = PNG_MAXSUM;
-
-         else
-            lmins = (lmhi << PNG_HISHIFT) + lmlo;
-      }
-#endif
-
-      for (i = 0, rp = row_buf + 1, dp = png_ptr->avg_row + 1,
-           pp = prev_row + 1; i < bpp; i++)
-      {
-         v = *dp++ = (png_byte)(((int)*rp++ - ((int)*pp++ / 2)) & 0xff);
-
-         sum += (v < 128) ? v : 256 - v;
-      }
-
-      for (lp = row_buf + 1; i < row_bytes; i++)
-      {
-         v = *dp++ =
-             (png_byte)(((int)*rp++ - (((int)*pp++ + (int)*lp++) / 2)) & 0xff);
-
-         sum += (v < 128) ? v : 256 - v;
-
-         if (sum > lmins)  /* We are already worse, don't continue. */
-            break;
-      }
-
-#ifdef PNG_WRITE_WEIGHTED_FILTER_SUPPORTED
-      if (png_ptr->heuristic_method == PNG_FILTER_HEURISTIC_WEIGHTED)
-      {
-         int j;
-         png_uint_32 sumhi, sumlo;
-         sumlo = sum & PNG_LOMASK;
-         sumhi = (sum >> PNG_HISHIFT) & PNG_HIMASK;
-
-         for (j = 0; j < num_p_filters; j++)
-         {
-            if (png_ptr->prev_filters[j] == PNG_FILTER_VALUE_NONE)
-            {
-               sumlo = (sumlo * png_ptr->filter_weights[j]) >>
-                   PNG_WEIGHT_SHIFT;
-
-               sumhi = (sumhi * png_ptr->filter_weights[j]) >>
-                   PNG_WEIGHT_SHIFT;
-            }
-         }
-
-         sumlo = (sumlo * png_ptr->filter_costs[PNG_FILTER_VALUE_AVG]) >>
-             PNG_COST_SHIFT;
-
-         sumhi = (sumhi * png_ptr->filter_costs[PNG_FILTER_VALUE_AVG]) >>
-             PNG_COST_SHIFT;
-
-         if (sumhi > PNG_HIMASK)
-            sum = PNG_MAXSUM;
-
-         else
-            sum = (sumhi << PNG_HISHIFT) + sumlo;
-      }
-#endif
-
-      if (sum < mins)
-      {
-         mins = sum;
-         best_row = png_ptr->avg_row;
-      }
-   }
-
-   /* Paeth filter */
-   if (filter_to_do == PNG_FILTER_PAETH)
-   {
-      png_bytep rp, dp, pp, cp, lp;
-      png_size_t i;
-
-      for (i = 0, rp = row_buf + 1, dp = png_ptr->paeth_row + 1,
-          pp = prev_row + 1; i < bpp; i++)
-      {
-         *dp++ = (png_byte)(((int)*rp++ - (int)*pp++) & 0xff);
-      }
-
-      for (lp = row_buf + 1, cp = prev_row + 1; i < row_bytes; i++)
-      {
-         int a, b, c, pa, pb, pc, p;
-
-         b = *pp++;
-         c = *cp++;
-         a = *lp++;
-
-         p = b - c;
-         pc = a - c;
-
-#ifdef PNG_USE_ABS
-         pa = abs(p);
-         pb = abs(pc);
-         pc = abs(p + pc);
-#else
-         pa = p < 0 ? -p : p;
-         pb = pc < 0 ? -pc : pc;
-         pc = (p + pc) < 0 ? -(p + pc) : p + pc;
-#endif
-
-         p = (pa <= pb && pa <=pc) ? a : (pb <= pc) ? b : c;
-
-         *dp++ = (png_byte)(((int)*rp++ - p) & 0xff);
-      }
-      best_row = png_ptr->paeth_row;
-   }
-
-   else if (filter_to_do & PNG_FILTER_PAETH)
-   {
-      png_bytep rp, dp, pp, cp, lp;
-      png_uint_32 sum = 0, lmins = mins;
-      png_size_t i;
-      int v;
-
-#ifdef PNG_WRITE_WEIGHTED_FILTER_SUPPORTED
-      if (png_ptr->heuristic_method == PNG_FILTER_HEURISTIC_WEIGHTED)
-      {
-         int j;
-         png_uint_32 lmhi, lmlo;
-         lmlo = lmins & PNG_LOMASK;
-         lmhi = (lmins >> PNG_HISHIFT) & PNG_HIMASK;
-
-         for (j = 0; j < num_p_filters; j++)
-         {
-            if (png_ptr->prev_filters[j] == PNG_FILTER_VALUE_PAETH)
-            {
-               lmlo = (lmlo * png_ptr->inv_filter_weights[j]) >>
-                   PNG_WEIGHT_SHIFT;
-
-               lmhi = (lmhi * png_ptr->inv_filter_weights[j]) >>
-                   PNG_WEIGHT_SHIFT;
-            }
-         }
-
-         lmlo = (lmlo * png_ptr->inv_filter_costs[PNG_FILTER_VALUE_PAETH]) >>
-             PNG_COST_SHIFT;
-
-         lmhi = (lmhi * png_ptr->inv_filter_costs[PNG_FILTER_VALUE_PAETH]) >>
-             PNG_COST_SHIFT;
-
-         if (lmhi > PNG_HIMASK)
-            lmins = PNG_MAXSUM;
-
-         else
-            lmins = (lmhi << PNG_HISHIFT) + lmlo;
-      }
-#endif
-
-      for (i = 0, rp = row_buf + 1, dp = png_ptr->paeth_row + 1,
-          pp = prev_row + 1; i < bpp; i++)
-      {
-         v = *dp++ = (png_byte)(((int)*rp++ - (int)*pp++) & 0xff);
-
-         sum += (v < 128) ? v : 256 - v;
-      }
-
-      for (lp = row_buf + 1, cp = prev_row + 1; i < row_bytes; i++)
-      {
-         int a, b, c, pa, pb, pc, p;
-
-         b = *pp++;
-         c = *cp++;
-         a = *lp++;
-
-#ifndef PNG_SLOW_PAETH
-         p = b - c;
-         pc = a - c;
-#ifdef PNG_USE_ABS
-         pa = abs(p);
-         pb = abs(pc);
-         pc = abs(p + pc);
-#else
-         pa = p < 0 ? -p : p;
-         pb = pc < 0 ? -pc : pc;
-         pc = (p + pc) < 0 ? -(p + pc) : p + pc;
-#endif
-         p = (pa <= pb && pa <=pc) ? a : (pb <= pc) ? b : c;
-#else /* PNG_SLOW_PAETH */
-         p = a + b - c;
-         pa = abs(p - a);
-         pb = abs(p - b);
-         pc = abs(p - c);
-
-         if (pa <= pb && pa <= pc)
-            p = a;
-
-         else if (pb <= pc)
-            p = b;
-
-         else
-            p = c;
-#endif /* PNG_SLOW_PAETH */
-
-         v = *dp++ = (png_byte)(((int)*rp++ - p) & 0xff);
-
-         sum += (v < 128) ? v : 256 - v;
-
-         if (sum > lmins)  /* We are already worse, don't continue. */
-            break;
-      }
-
-#ifdef PNG_WRITE_WEIGHTED_FILTER_SUPPORTED
-      if (png_ptr->heuristic_method == PNG_FILTER_HEURISTIC_WEIGHTED)
-      {
-         int j;
-         png_uint_32 sumhi, sumlo;
-         sumlo = sum & PNG_LOMASK;
-         sumhi = (sum >> PNG_HISHIFT) & PNG_HIMASK;
-
-         for (j = 0; j < num_p_filters; j++)
-         {
-            if (png_ptr->prev_filters[j] == PNG_FILTER_VALUE_PAETH)
-            {
-               sumlo = (sumlo * png_ptr->filter_weights[j]) >>
-                   PNG_WEIGHT_SHIFT;
-
-               sumhi = (sumhi * png_ptr->filter_weights[j]) >>
-                   PNG_WEIGHT_SHIFT;
-            }
-         }
-
-         sumlo = (sumlo * png_ptr->filter_costs[PNG_FILTER_VALUE_PAETH]) >>
-             PNG_COST_SHIFT;
-
-         sumhi = (sumhi * png_ptr->filter_costs[PNG_FILTER_VALUE_PAETH]) >>
-             PNG_COST_SHIFT;
-
-         if (sumhi > PNG_HIMASK)
-            sum = PNG_MAXSUM;
-
-         else
-            sum = (sumhi << PNG_HISHIFT) + sumlo;
-      }
-#endif
-
-      if (sum < mins)
-      {
-         best_row = png_ptr->paeth_row;
-      }
-   }
-#endif /* PNG_WRITE_FILTER_SUPPORTED */
-   /* Do the actual writing of the filtered row data from the chosen filter. */
-
-   png_write_filtered_row(png_ptr, best_row);
-
-#ifdef PNG_WRITE_FILTER_SUPPORTED
-#ifdef PNG_WRITE_WEIGHTED_FILTER_SUPPORTED
-   /* Save the type of filter we picked this time for future calculations */
-   if (png_ptr->num_prev_filters > 0)
-   {
-      int j;
-
-      for (j = 1; j < num_p_filters; j++)
-      {
-         png_ptr->prev_filters[j] = png_ptr->prev_filters[j - 1];
-      }
-
-      png_ptr->prev_filters[j] = best_row[0];
-   }
-#endif
-#endif /* PNG_WRITE_FILTER_SUPPORTED */
-}
-
-
-/* Do the actual writing of a previously filtered row. */
-void /* PRIVATE */
-png_write_filtered_row(png_structp png_ptr, png_bytep filtered_row)
-{
-   png_size_t avail;
-
-   png_debug(1, "in png_write_filtered_row");
-
-   png_debug1(2, "filter = %d", filtered_row[0]);
-   /* Set up the zlib input buffer */
-
-   png_ptr->zstream.next_in = filtered_row;
-   png_ptr->zstream.avail_in = 0;
-   avail = png_ptr->row_info.rowbytes + 1;
-   /* Repeat until we have compressed all the data */
-   do
-   {
-      int ret; /* Return of zlib */
-
-      /* Record the number of bytes available - zlib supports at least 65535
-       * bytes at one step, depending on the size of the zlib type 'uInt', the
-       * maximum size zlib can write at once is ZLIB_IO_MAX (from pngpriv.h).
-       * Use this because on 16 bit systems 'rowbytes' can be up to 65536 (i.e.
-       * one more than 16 bits) and, in this case 'rowbytes+1' can overflow a
-       * uInt.  ZLIB_IO_MAX can be safely reduced to cause zlib to be called
-       * with smaller chunks of data.
-       */
-      if (png_ptr->zstream.avail_in == 0)
-      {
-         if (avail > ZLIB_IO_MAX)
-         {
-            png_ptr->zstream.avail_in  = ZLIB_IO_MAX;
-            avail -= ZLIB_IO_MAX;
-         }
-
-         else
-         {
-            /* So this will fit in the available uInt space: */
-            png_ptr->zstream.avail_in = (uInt)avail;
-            avail = 0;
-         }
-      }
-
-      /* Compress the data */
-      ret = deflate(&png_ptr->zstream, Z_NO_FLUSH);
-
-      /* Check for compression errors */
-      if (ret != Z_OK)
-      {
-         if (png_ptr->zstream.msg != NULL)
-            png_error(png_ptr, png_ptr->zstream.msg);
-
-         else
-            png_error(png_ptr, "zlib error");
-      }
-
-      /* See if it is time to write another IDAT */
-      if (!(png_ptr->zstream.avail_out))
-      {
-         /* Write the IDAT and reset the zlib output buffer */
-         png_write_IDAT(png_ptr, png_ptr->zbuf, png_ptr->zbuf_size);
-         png_ptr->zstream.next_out = png_ptr->zbuf;
-         png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;
-      }
-   /* Repeat until all data has been compressed */
-   } while (avail > 0 || png_ptr->zstream.avail_in > 0);
-
-   /* Swap the current and previous rows */
-   if (png_ptr->prev_row != NULL)
-   {
-      png_bytep tptr;
-
-      tptr = png_ptr->prev_row;
-      png_ptr->prev_row = png_ptr->row_buf;
-      png_ptr->row_buf = tptr;
-   }
-
-   /* Finish row - updates counters and flushes zlib if last row */
-   png_write_finish_row(png_ptr);
-
-#ifdef PNG_WRITE_FLUSH_SUPPORTED
-   png_ptr->flush_rows++;
-
-   if (png_ptr->flush_dist > 0 &&
-       png_ptr->flush_rows >= png_ptr->flush_dist)
-   {
-      png_write_flush(png_ptr);
-   }
-#endif
-}
-#endif /* PNG_WRITE_SUPPORTED */
+
+/* pngwutil.c - utilities to write a PNG file
+ *
+ * Last changed in libpng 1.2.43 [February 25, 2010]
+ * Copyright (c) 1998-2010 Glenn Randers-Pehrson
+ * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
+ * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
+ *
+ * This code is released under the libpng license.
+ * For conditions of distribution and use, see the disclaimer
+ * and license in png.h
+ */
+
+#define PNG_INTERNAL
+#define PNG_NO_PEDANTIC_WARNINGS
+#include "png.h"
+#ifdef PNG_WRITE_SUPPORTED
+
+/* Place a 32-bit number into a buffer in PNG byte order.  We work
+ * with unsigned numbers for convenience, although one supported
+ * ancillary chunk uses signed (two's complement) numbers.
+ */
+void PNGAPI
+png_save_uint_32(png_bytep buf, png_uint_32 i)
+{
+   buf[0] = (png_byte)((i >> 24) & 0xff);
+   buf[1] = (png_byte)((i >> 16) & 0xff);
+   buf[2] = (png_byte)((i >> 8) & 0xff);
+   buf[3] = (png_byte)(i & 0xff);
+}
+
+/* The png_save_int_32 function assumes integers are stored in two's
+ * complement format.  If this isn't the case, then this routine needs to
+ * be modified to write data in two's complement format.
+ */
+void PNGAPI
+png_save_int_32(png_bytep buf, png_int_32 i)
+{
+   buf[0] = (png_byte)((i >> 24) & 0xff);
+   buf[1] = (png_byte)((i >> 16) & 0xff);
+   buf[2] = (png_byte)((i >> 8) & 0xff);
+   buf[3] = (png_byte)(i & 0xff);
+}
+
+/* Place a 16-bit number into a buffer in PNG byte order.
+ * The parameter is declared unsigned int, not png_uint_16,
+ * just to avoid potential problems on pre-ANSI C compilers.
+ */
+void PNGAPI
+png_save_uint_16(png_bytep buf, unsigned int i)
+{
+   buf[0] = (png_byte)((i >> 8) & 0xff);
+   buf[1] = (png_byte)(i & 0xff);
+}
+
+/* Simple function to write the signature.  If we have already written
+ * the magic bytes of the signature, or more likely, the PNG stream is
+ * being embedded into another stream and doesn't need its own signature,
+ * we should call png_set_sig_bytes() to tell libpng how many of the
+ * bytes have already been written.
+ */
+void /* PRIVATE */
+png_write_sig(png_structp png_ptr)
+{
+   png_byte png_signature[8] = {137, 80, 78, 71, 13, 10, 26, 10};
+
+   /* Write the rest of the 8 byte signature */
+   png_write_data(png_ptr, &png_signature[png_ptr->sig_bytes],
+      (png_size_t)(8 - png_ptr->sig_bytes));
+   if (png_ptr->sig_bytes < 3)
+      png_ptr->mode |= PNG_HAVE_PNG_SIGNATURE;
+}
+
+/* Write a PNG chunk all at once.  The type is an array of ASCII characters
+ * representing the chunk name.  The array must be at least 4 bytes in
+ * length, and does not need to be null terminated.  To be safe, pass the
+ * pre-defined chunk names here, and if you need a new one, define it
+ * where the others are defined.  The length is the length of the data.
+ * All the data must be present.  If that is not possible, use the
+ * png_write_chunk_start(), png_write_chunk_data(), and png_write_chunk_end()
+ * functions instead.
+ */
+void PNGAPI
+png_write_chunk(png_structp png_ptr, png_bytep chunk_name,
+   png_bytep data, png_size_t length)
+{
+   if (png_ptr == NULL)
+      return;
+   png_write_chunk_start(png_ptr, chunk_name, (png_uint_32)length);
+   png_write_chunk_data(png_ptr, data, (png_size_t)length);
+   png_write_chunk_end(png_ptr);
+}
+
+/* Write the start of a PNG chunk.  The type is the chunk type.
+ * The total_length is the sum of the lengths of all the data you will be
+ * passing in png_write_chunk_data().
+ */
+void PNGAPI
+png_write_chunk_start(png_structp png_ptr, png_bytep chunk_name,
+   png_uint_32 length)
+{
+   png_byte buf[8];
+
+   png_debug2(0, "Writing %s chunk, length = %lu", chunk_name,
+      (unsigned long)length);
+
+   if (png_ptr == NULL)
+      return;
+
+
+   /* Write the length and the chunk name */
+   png_save_uint_32(buf, length);
+   png_memcpy(buf + 4, chunk_name, 4);
+   png_write_data(png_ptr, buf, (png_size_t)8);
+   /* Put the chunk name into png_ptr->chunk_name */
+   png_memcpy(png_ptr->chunk_name, chunk_name, 4);
+   /* Reset the crc and run it over the chunk name */
+   png_reset_crc(png_ptr);
+   png_calculate_crc(png_ptr, chunk_name, (png_size_t)4);
+}
+
+/* Write the data of a PNG chunk started with png_write_chunk_start().
+ * Note that multiple calls to this function are allowed, and that the
+ * sum of the lengths from these calls *must* add up to the total_length
+ * given to png_write_chunk_start().
+ */
+void PNGAPI
+png_write_chunk_data(png_structp png_ptr, png_bytep data, png_size_t length)
+{
+   /* Write the data, and run the CRC over it */
+   if (png_ptr == NULL)
+      return;
+   if (data != NULL && length > 0)
+   {
+      png_write_data(png_ptr, data, length);
+      /* Update the CRC after writing the data,
+       * in case that the user I/O routine alters it.
+       */
+      png_calculate_crc(png_ptr, data, length);
+   }
+}
+
+/* Finish a chunk started with png_write_chunk_start(). */
+void PNGAPI
+png_write_chunk_end(png_structp png_ptr)
+{
+   png_byte buf[4];
+
+   if (png_ptr == NULL) return;
+
+   /* Write the crc in a single operation */
+   png_save_uint_32(buf, png_ptr->crc);
+
+   png_write_data(png_ptr, buf, (png_size_t)4);
+}
+
+#if defined(PNG_WRITE_TEXT_SUPPORTED) || defined(PNG_WRITE_iCCP_SUPPORTED)
+/* This pair of functions encapsulates the operation of (a) compressing a
+ * text string, and (b) issuing it later as a series of chunk data writes.
+ * The compression_state structure is shared context for these functions
+ * set up by the caller in order to make the whole mess thread-safe.
+ */
+
+typedef struct
+{
+   char *input;   /* The uncompressed input data */
+   int input_len;   /* Its length */
+   int num_output_ptr; /* Number of output pointers used */
+   int max_output_ptr; /* Size of output_ptr */
+   png_charpp output_ptr; /* Array of pointers to output */
+} compression_state;
+
+/* Compress given text into storage in the png_ptr structure */
+static int /* PRIVATE */
+png_text_compress(png_structp png_ptr,
+        png_charp text, png_size_t text_len, int compression,
+        compression_state *comp)
+{
+   int ret;
+
+   comp->num_output_ptr = 0;
+   comp->max_output_ptr = 0;
+   comp->output_ptr = NULL;
+   comp->input = NULL;
+   comp->input_len = 0;
+
+   /* We may just want to pass the text right through */
+   if (compression == PNG_TEXT_COMPRESSION_NONE)
+   {
+       comp->input = text;
+       comp->input_len = text_len;
+       return((int)text_len);
+   }
+
+   if (compression >= PNG_TEXT_COMPRESSION_LAST)
+   {
+#if defined(PNG_STDIO_SUPPORTED) && !defined(_WIN32_WCE)
+      char msg[50];
+      png_snprintf(msg, 50, "Unknown compression type %d", compression);
+      png_warning(png_ptr, msg);
+#else
+      png_warning(png_ptr, "Unknown compression type");
+#endif
+   }
+
+   /* We can't write the chunk until we find out how much data we have,
+    * which means we need to run the compressor first and save the
+    * output.  This shouldn't be a problem, as the vast majority of
+    * comments should be reasonable, but we will set up an array of
+    * malloc'd pointers to be sure.
+    *
+    * If we knew the application was well behaved, we could simplify this
+    * greatly by assuming we can always malloc an output buffer large
+    * enough to hold the compressed text ((1001 * text_len / 1000) + 12)
+    * and malloc this directly.  The only time this would be a bad idea is
+    * if we can't malloc more than 64K and we have 64K of random input
+    * data, or if the input string is incredibly large (although this
+    * wouldn't cause a failure, just a slowdown due to swapping).
+    */
+
+   /* Set up the compression buffers */
+   png_ptr->zstream.avail_in = (uInt)text_len;
+   png_ptr->zstream.next_in = (Bytef *)text;
+   png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;
+   png_ptr->zstream.next_out = (Bytef *)png_ptr->zbuf;
+
+   /* This is the same compression loop as in png_write_row() */
+   do
+   {
+      /* Compress the data */
+      ret = deflate(&png_ptr->zstream, Z_NO_FLUSH);
+      if (ret != Z_OK)
+      {
+         /* Error */
+         if (png_ptr->zstream.msg != NULL)
+            png_error(png_ptr, png_ptr->zstream.msg);
+         else
+            png_error(png_ptr, "zlib error");
+      }
+      /* Check to see if we need more room */
+      if (!(png_ptr->zstream.avail_out))
+      {
+         /* Make sure the output array has room */
+         if (comp->num_output_ptr >= comp->max_output_ptr)
+         {
+            int old_max;
+
+            old_max = comp->max_output_ptr;
+            comp->max_output_ptr = comp->num_output_ptr + 4;
+            if (comp->output_ptr != NULL)
+            {
+               png_charpp old_ptr;
+
+               old_ptr = comp->output_ptr;
+               comp->output_ptr = (png_charpp)png_malloc(png_ptr,
+                  (png_uint_32)
+                  (comp->max_output_ptr * png_sizeof(png_charpp)));
+               png_memcpy(comp->output_ptr, old_ptr, old_max
+                  * png_sizeof(png_charp));
+               png_free(png_ptr, old_ptr);
+            }
+            else
+               comp->output_ptr = (png_charpp)png_malloc(png_ptr,
+                  (png_uint_32)
+                  (comp->max_output_ptr * png_sizeof(png_charp)));
+         }
+
+         /* Save the data */
+         comp->output_ptr[comp->num_output_ptr] =
+            (png_charp)png_malloc(png_ptr,
+            (png_uint_32)png_ptr->zbuf_size);
+         png_memcpy(comp->output_ptr[comp->num_output_ptr], png_ptr->zbuf,
+            png_ptr->zbuf_size);
+         comp->num_output_ptr++;
+
+         /* and reset the buffer */
+         png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;
+         png_ptr->zstream.next_out = png_ptr->zbuf;
+      }
+   /* Continue until we don't have any more to compress */
+   } while (png_ptr->zstream.avail_in);
+
+   /* Finish the compression */
+   do
+   {
+      /* Tell zlib we are finished */
+      ret = deflate(&png_ptr->zstream, Z_FINISH);
+
+      if (ret == Z_OK)
+      {
+         /* Check to see if we need more room */
+         if (!(png_ptr->zstream.avail_out))
+         {
+            /* Check to make sure our output array has room */
+            if (comp->num_output_ptr >= comp->max_output_ptr)
+            {
+               int old_max;
+
+               old_max = comp->max_output_ptr;
+               comp->max_output_ptr = comp->num_output_ptr + 4;
+               if (comp->output_ptr != NULL)
+               {
+                  png_charpp old_ptr;
+
+                  old_ptr = comp->output_ptr;
+                  /* This could be optimized to realloc() */
+                  comp->output_ptr = (png_charpp)png_malloc(png_ptr,
+                     (png_uint_32)(comp->max_output_ptr *
+                     png_sizeof(png_charp)));
+                  png_memcpy(comp->output_ptr, old_ptr,
+                     old_max * png_sizeof(png_charp));
+                  png_free(png_ptr, old_ptr);
+               }
+               else
+                  comp->output_ptr = (png_charpp)png_malloc(png_ptr,
+                     (png_uint_32)(comp->max_output_ptr *
+                     png_sizeof(png_charp)));
+            }
+
+            /* Save the data */
+            comp->output_ptr[comp->num_output_ptr] =
+               (png_charp)png_malloc(png_ptr,
+               (png_uint_32)png_ptr->zbuf_size);
+            png_memcpy(comp->output_ptr[comp->num_output_ptr], png_ptr->zbuf,
+               png_ptr->zbuf_size);
+            comp->num_output_ptr++;
+
+            /* and reset the buffer pointers */
+            png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;
+            png_ptr->zstream.next_out = png_ptr->zbuf;
+         }
+      }
+      else if (ret != Z_STREAM_END)
+      {
+         /* We got an error */
+         if (png_ptr->zstream.msg != NULL)
+            png_error(png_ptr, png_ptr->zstream.msg);
+         else
+            png_error(png_ptr, "zlib error");
+      }
+   } while (ret != Z_STREAM_END);
+
+   /* Text length is number of buffers plus last buffer */
+   text_len = png_ptr->zbuf_size * comp->num_output_ptr;
+   if (png_ptr->zstream.avail_out < png_ptr->zbuf_size)
+      text_len += png_ptr->zbuf_size - (png_size_t)png_ptr->zstream.avail_out;
+
+   return((int)text_len);
+}
+
+/* Ship the compressed text out via chunk writes */
+static void /* PRIVATE */
+png_write_compressed_data_out(png_structp png_ptr, compression_state *comp)
+{
+   int i;
+
+   /* Handle the no-compression case */
+   if (comp->input)
+   {
+      png_write_chunk_data(png_ptr, (png_bytep)comp->input,
+                            (png_size_t)comp->input_len);
+      return;
+   }
+
+   /* Write saved output buffers, if any */
+   for (i = 0; i < comp->num_output_ptr; i++)
+   {
+      png_write_chunk_data(png_ptr, (png_bytep)comp->output_ptr[i],
+         (png_size_t)png_ptr->zbuf_size);
+      png_free(png_ptr, comp->output_ptr[i]);
+       comp->output_ptr[i]=NULL;
+   }
+   if (comp->max_output_ptr != 0)
+      png_free(png_ptr, comp->output_ptr);
+       comp->output_ptr=NULL;
+   /* Write anything left in zbuf */
+   if (png_ptr->zstream.avail_out < (png_uint_32)png_ptr->zbuf_size)
+      png_write_chunk_data(png_ptr, png_ptr->zbuf,
+         (png_size_t)(png_ptr->zbuf_size - png_ptr->zstream.avail_out));
+
+   /* Reset zlib for another zTXt/iTXt or image data */
+   deflateReset(&png_ptr->zstream);
+   png_ptr->zstream.data_type = Z_BINARY;
+}
+#endif
+
+/* Write the IHDR chunk, and update the png_struct with the necessary
+ * information.  Note that the rest of this code depends upon this
+ * information being correct.
+ */
+void /* PRIVATE */
+png_write_IHDR(png_structp png_ptr, png_uint_32 width, png_uint_32 height,
+   int bit_depth, int color_type, int compression_type, int filter_type,
+   int interlace_type)
+{
+#ifdef PNG_USE_LOCAL_ARRAYS
+   PNG_IHDR;
+#endif
+   int ret;
+
+   png_byte buf[13]; /* Buffer to store the IHDR info */
+
+   png_debug(1, "in png_write_IHDR");
+
+   /* Check that we have valid input data from the application info */
+   switch (color_type)
+   {
+      case PNG_COLOR_TYPE_GRAY:
+         switch (bit_depth)
+         {
+            case 1:
+            case 2:
+            case 4:
+            case 8:
+            case 16: png_ptr->channels = 1; break;
+            default: png_error(png_ptr,
+                         "Invalid bit depth for grayscale image");
+         }
+         break;
+      case PNG_COLOR_TYPE_RGB:
+         if (bit_depth != 8 && bit_depth != 16)
+            png_error(png_ptr, "Invalid bit depth for RGB image");
+         png_ptr->channels = 3;
+         break;
+      case PNG_COLOR_TYPE_PALETTE:
+         switch (bit_depth)
+         {
+            case 1:
+            case 2:
+            case 4:
+            case 8: png_ptr->channels = 1; break;
+            default: png_error(png_ptr, "Invalid bit depth for paletted image");
+         }
+         break;
+      case PNG_COLOR_TYPE_GRAY_ALPHA:
+         if (bit_depth != 8 && bit_depth != 16)
+            png_error(png_ptr, "Invalid bit depth for grayscale+alpha image");
+         png_ptr->channels = 2;
+         break;
+      case PNG_COLOR_TYPE_RGB_ALPHA:
+         if (bit_depth != 8 && bit_depth != 16)
+            png_error(png_ptr, "Invalid bit depth for RGBA image");
+         png_ptr->channels = 4;
+         break;
+      default:
+         png_error(png_ptr, "Invalid image color type specified");
+   }
+
+   if (compression_type != PNG_COMPRESSION_TYPE_BASE)
+   {
+      png_warning(png_ptr, "Invalid compression type specified");
+      compression_type = PNG_COMPRESSION_TYPE_BASE;
+   }
+
+   /* Write filter_method 64 (intrapixel differencing) only if
+    * 1. Libpng was compiled with PNG_MNG_FEATURES_SUPPORTED and
+    * 2. Libpng did not write a PNG signature (this filter_method is only
+    *    used in PNG datastreams that are embedded in MNG datastreams) and
+    * 3. The application called png_permit_mng_features with a mask that
+    *    included PNG_FLAG_MNG_FILTER_64 and
+    * 4. The filter_method is 64 and
+    * 5. The color_type is RGB or RGBA
+    */
+   if (
+#ifdef PNG_MNG_FEATURES_SUPPORTED
+      !((png_ptr->mng_features_permitted & PNG_FLAG_MNG_FILTER_64) &&
+      ((png_ptr->mode&PNG_HAVE_PNG_SIGNATURE) == 0) &&
+      (color_type == PNG_COLOR_TYPE_RGB ||
+       color_type == PNG_COLOR_TYPE_RGB_ALPHA) &&
+      (filter_type == PNG_INTRAPIXEL_DIFFERENCING)) &&
+#endif
+      filter_type != PNG_FILTER_TYPE_BASE)
+   {
+      png_warning(png_ptr, "Invalid filter type specified");
+      filter_type = PNG_FILTER_TYPE_BASE;
+   }
+
+#ifdef PNG_WRITE_INTERLACING_SUPPORTED
+   if (interlace_type != PNG_INTERLACE_NONE &&
+      interlace_type != PNG_INTERLACE_ADAM7)
+   {
+      png_warning(png_ptr, "Invalid interlace type specified");
+      interlace_type = PNG_INTERLACE_ADAM7;
+   }
+#else
+   interlace_type=PNG_INTERLACE_NONE;
+#endif
+
+   /* Save the relevent information */
+   png_ptr->bit_depth = (png_byte)bit_depth;
+   png_ptr->color_type = (png_byte)color_type;
+   png_ptr->interlaced = (png_byte)interlace_type;
+#ifdef PNG_MNG_FEATURES_SUPPORTED
+   png_ptr->filter_type = (png_byte)filter_type;
+#endif
+   png_ptr->compression_type = (png_byte)compression_type;
+   png_ptr->width = width;
+   png_ptr->height = height;
+
+   png_ptr->pixel_depth = (png_byte)(bit_depth * png_ptr->channels);
+   png_ptr->rowbytes = PNG_ROWBYTES(png_ptr->pixel_depth, width);
+   /* Set the usr info, so any transformations can modify it */
+   png_ptr->usr_width = png_ptr->width;
+   png_ptr->usr_bit_depth = png_ptr->bit_depth;
+   png_ptr->usr_channels = png_ptr->channels;
+
+   /* Pack the header information into the buffer */
+   png_save_uint_32(buf, width);
+   png_save_uint_32(buf + 4, height);
+   buf[8] = (png_byte)bit_depth;
+   buf[9] = (png_byte)color_type;
+   buf[10] = (png_byte)compression_type;
+   buf[11] = (png_byte)filter_type;
+   buf[12] = (png_byte)interlace_type;
+
+   /* Write the chunk */
+   png_write_chunk(png_ptr, (png_bytep)png_IHDR, buf, (png_size_t)13);
+
+   /* Initialize zlib with PNG info */
+   png_ptr->zstream.zalloc = png_zalloc;
+   png_ptr->zstream.zfree = png_zfree;
+   png_ptr->zstream.opaque = (voidpf)png_ptr;
+   if (!(png_ptr->do_filter))
+   {
+      if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE ||
+         png_ptr->bit_depth < 8)
+         png_ptr->do_filter = PNG_FILTER_NONE;
+      else
+         png_ptr->do_filter = PNG_ALL_FILTERS;
+   }
+   if (!(png_ptr->flags & PNG_FLAG_ZLIB_CUSTOM_STRATEGY))
+   {
+      if (png_ptr->do_filter != PNG_FILTER_NONE)
+         png_ptr->zlib_strategy = Z_FILTERED;
+      else
+         png_ptr->zlib_strategy = Z_DEFAULT_STRATEGY;
+   }
+   if (!(png_ptr->flags & PNG_FLAG_ZLIB_CUSTOM_LEVEL))
+      png_ptr->zlib_level = Z_DEFAULT_COMPRESSION;
+   if (!(png_ptr->flags & PNG_FLAG_ZLIB_CUSTOM_MEM_LEVEL))
+      png_ptr->zlib_mem_level = 8;
+   if (!(png_ptr->flags & PNG_FLAG_ZLIB_CUSTOM_WINDOW_BITS))
+      png_ptr->zlib_window_bits = 15;
+   if (!(png_ptr->flags & PNG_FLAG_ZLIB_CUSTOM_METHOD))
+      png_ptr->zlib_method = 8;
+   ret = deflateInit2(&png_ptr->zstream, png_ptr->zlib_level,
+         png_ptr->zlib_method, png_ptr->zlib_window_bits,
+         png_ptr->zlib_mem_level, png_ptr->zlib_strategy);
+   if (ret != Z_OK)
+   {
+      if (ret == Z_VERSION_ERROR) png_error(png_ptr,
+          "zlib failed to initialize compressor -- version error");
+      if (ret == Z_STREAM_ERROR) png_error(png_ptr,
+           "zlib failed to initialize compressor -- stream error");
+      if (ret == Z_MEM_ERROR) png_error(png_ptr,
+           "zlib failed to initialize compressor -- mem error");
+      png_error(png_ptr, "zlib failed to initialize compressor");
+   }
+   png_ptr->zstream.next_out = png_ptr->zbuf;
+   png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;
+   /* libpng is not interested in zstream.data_type */
+   /* Set it to a predefined value, to avoid its evaluation inside zlib */
+   png_ptr->zstream.data_type = Z_BINARY;
+
+   png_ptr->mode = PNG_HAVE_IHDR;
+}
+
+/* Write the palette.  We are careful not to trust png_color to be in the
+ * correct order for PNG, so people can redefine it to any convenient
+ * structure.
+ */
+void /* PRIVATE */
+png_write_PLTE(png_structp png_ptr, png_colorp palette, png_uint_32 num_pal)
+{
+#ifdef PNG_USE_LOCAL_ARRAYS
+   PNG_PLTE;
+#endif
+   png_uint_32 i;
+   png_colorp pal_ptr;
+   png_byte buf[3];
+
+   png_debug(1, "in png_write_PLTE");
+
+   if ((
+#ifdef PNG_MNG_FEATURES_SUPPORTED
+        !(png_ptr->mng_features_permitted & PNG_FLAG_MNG_EMPTY_PLTE) &&
+#endif
+        num_pal == 0) || num_pal > 256)
+   {
+     if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
+     {
+        png_error(png_ptr, "Invalid number of colors in palette");
+     }
+     else
+     {
+        png_warning(png_ptr, "Invalid number of colors in palette");
+        return;
+     }
+   }
+
+   if (!(png_ptr->color_type&PNG_COLOR_MASK_COLOR))
+   {
+      png_warning(png_ptr,
+        "Ignoring request to write a PLTE chunk in grayscale PNG");
+      return;
+   }
+
+   png_ptr->num_palette = (png_uint_16)num_pal;
+   png_debug1(3, "num_palette = %d", png_ptr->num_palette);
+
+   png_write_chunk_start(png_ptr, (png_bytep)png_PLTE,
+     (png_uint_32)(num_pal * 3));
+#ifdef PNG_POINTER_INDEXING_SUPPORTED
+   for (i = 0, pal_ptr = palette; i < num_pal; i++, pal_ptr++)
+   {
+      buf[0] = pal_ptr->red;
+      buf[1] = pal_ptr->green;
+      buf[2] = pal_ptr->blue;
+      png_write_chunk_data(png_ptr, buf, (png_size_t)3);
+   }
+#else
+   /* This is a little slower but some buggy compilers need to do this
+    * instead
+    */
+   pal_ptr=palette;
+   for (i = 0; i < num_pal; i++)
+   {
+      buf[0] = pal_ptr[i].red;
+      buf[1] = pal_ptr[i].green;
+      buf[2] = pal_ptr[i].blue;
+      png_write_chunk_data(png_ptr, buf, (png_size_t)3);
+   }
+#endif
+   png_write_chunk_end(png_ptr);
+   png_ptr->mode |= PNG_HAVE_PLTE;
+}
+
+/* Write an IDAT chunk */
+void /* PRIVATE */
+png_write_IDAT(png_structp png_ptr, png_bytep data, png_size_t length)
+{
+#ifdef PNG_USE_LOCAL_ARRAYS
+   PNG_IDAT;
+#endif
+
+   png_debug(1, "in png_write_IDAT");
+
+   /* Optimize the CMF field in the zlib stream. */
+   /* This hack of the zlib stream is compliant to the stream specification. */
+   if (!(png_ptr->mode & PNG_HAVE_IDAT) &&
+       png_ptr->compression_type == PNG_COMPRESSION_TYPE_BASE)
+   {
+      unsigned int z_cmf = data[0];  /* zlib compression method and flags */
+      if ((z_cmf & 0x0f) == 8 && (z_cmf & 0xf0) <= 0x70)
+      {
+         /* Avoid memory underflows and multiplication overflows.
+          *
+          * The conditions below are practically always satisfied;
+          * however, they still must be checked.
+          */
+         if (length >= 2 &&
+             png_ptr->height < 16384 && png_ptr->width < 16384)
+         {
+            png_uint_32 uncompressed_idat_size = png_ptr->height *
+               ((png_ptr->width *
+               png_ptr->channels * png_ptr->bit_depth + 15) >> 3);
+            unsigned int z_cinfo = z_cmf >> 4;
+            unsigned int half_z_window_size = 1 << (z_cinfo + 7);
+            while (uncompressed_idat_size <= half_z_window_size &&
+                   half_z_window_size >= 256)
+            {
+               z_cinfo--;
+               half_z_window_size >>= 1;
+            }
+            z_cmf = (z_cmf & 0x0f) | (z_cinfo << 4);
+            if (data[0] != (png_byte)z_cmf)
+            {
+               data[0] = (png_byte)z_cmf;
+               data[1] &= 0xe0;
+               data[1] += (png_byte)(0x1f - ((z_cmf << 8) + data[1]) % 0x1f);
+            }
+         }
+      }
+      else
+         png_error(png_ptr,
+            "Invalid zlib compression method or flags in IDAT");
+   }
+
+   png_write_chunk(png_ptr, (png_bytep)png_IDAT, data, length);
+   png_ptr->mode |= PNG_HAVE_IDAT;
+}
+
+/* Write an IEND chunk */
+void /* PRIVATE */
+png_write_IEND(png_structp png_ptr)
+{
+#ifdef PNG_USE_LOCAL_ARRAYS
+   PNG_IEND;
+#endif
+
+   png_debug(1, "in png_write_IEND");
+
+   png_write_chunk(png_ptr, (png_bytep)png_IEND, png_bytep_NULL,
+     (png_size_t)0);
+   png_ptr->mode |= PNG_HAVE_IEND;
+}
+
+#ifdef PNG_WRITE_gAMA_SUPPORTED
+/* Write a gAMA chunk */
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+void /* PRIVATE */
+png_write_gAMA(png_structp png_ptr, double file_gamma)
+{
+#ifdef PNG_USE_LOCAL_ARRAYS
+   PNG_gAMA;
+#endif
+   png_uint_32 igamma;
+   png_byte buf[4];
+
+   png_debug(1, "in png_write_gAMA");
+
+   /* file_gamma is saved in 1/100,000ths */
+   igamma = (png_uint_32)(file_gamma * 100000.0 + 0.5);
+   png_save_uint_32(buf, igamma);
+   png_write_chunk(png_ptr, (png_bytep)png_gAMA, buf, (png_size_t)4);
+}
+#endif
+#ifdef PNG_FIXED_POINT_SUPPORTED
+void /* PRIVATE */
+png_write_gAMA_fixed(png_structp png_ptr, png_fixed_point file_gamma)
+{
+#ifdef PNG_USE_LOCAL_ARRAYS
+   PNG_gAMA;
+#endif
+   png_byte buf[4];
+
+   png_debug(1, "in png_write_gAMA");
+
+   /* file_gamma is saved in 1/100,000ths */
+   png_save_uint_32(buf, (png_uint_32)file_gamma);
+   png_write_chunk(png_ptr, (png_bytep)png_gAMA, buf, (png_size_t)4);
+}
+#endif
+#endif
+
+#ifdef PNG_WRITE_sRGB_SUPPORTED
+/* Write a sRGB chunk */
+void /* PRIVATE */
+png_write_sRGB(png_structp png_ptr, int srgb_intent)
+{
+#ifdef PNG_USE_LOCAL_ARRAYS
+   PNG_sRGB;
+#endif
+   png_byte buf[1];
+
+   png_debug(1, "in png_write_sRGB");
+
+   if (srgb_intent >= PNG_sRGB_INTENT_LAST)
+         png_warning(png_ptr,
+            "Invalid sRGB rendering intent specified");
+   buf[0]=(png_byte)srgb_intent;
+   png_write_chunk(png_ptr, (png_bytep)png_sRGB, buf, (png_size_t)1);
+}
+#endif
+
+#ifdef PNG_WRITE_iCCP_SUPPORTED
+/* Write an iCCP chunk */
+void /* PRIVATE */
+png_write_iCCP(png_structp png_ptr, png_charp name, int compression_type,
+   png_charp profile, int profile_len)
+{
+#ifdef PNG_USE_LOCAL_ARRAYS
+   PNG_iCCP;
+#endif
+   png_size_t name_len;
+   png_charp new_name;
+   compression_state comp;
+   int embedded_profile_len = 0;
+
+   png_debug(1, "in png_write_iCCP");
+
+   comp.num_output_ptr = 0;
+   comp.max_output_ptr = 0;
+   comp.output_ptr = NULL;
+   comp.input = NULL;
+   comp.input_len = 0;
+
+   if ((name_len = png_check_keyword(png_ptr, name,
+      &new_name)) == 0)
+      return;
+
+   if (compression_type != PNG_COMPRESSION_TYPE_BASE)
+      png_warning(png_ptr, "Unknown compression type in iCCP chunk");
+
+   if (profile == NULL)
+      profile_len = 0;
+
+   if (profile_len > 3)
+      embedded_profile_len =
+          ((*( (png_bytep)profile    ))<<24) |
+          ((*( (png_bytep)profile + 1))<<16) |
+          ((*( (png_bytep)profile + 2))<< 8) |
+          ((*( (png_bytep)profile + 3))    );
+
+   if (embedded_profile_len < 0)
+   {
+      png_warning(png_ptr,
+        "Embedded profile length in iCCP chunk is negative");
+      png_free(png_ptr, new_name);
+      return;
+   }
+
+   if (profile_len < embedded_profile_len)
+   {
+      png_warning(png_ptr,
+        "Embedded profile length too large in iCCP chunk");
+      png_free(png_ptr, new_name);
+      return;
+   }
+
+   if (profile_len > embedded_profile_len)
+   {
+      png_warning(png_ptr,
+        "Truncating profile to actual length in iCCP chunk");
+      profile_len = embedded_profile_len;
+   }
+
+   if (profile_len)
+      profile_len = png_text_compress(png_ptr, profile,
+        (png_size_t)profile_len, PNG_COMPRESSION_TYPE_BASE, &comp);
+
+   /* Make sure we include the NULL after the name and the compression type */
+   png_write_chunk_start(png_ptr, (png_bytep)png_iCCP,
+          (png_uint_32)(name_len + profile_len + 2));
+   new_name[name_len + 1] = 0x00;
+   png_write_chunk_data(png_ptr, (png_bytep)new_name,
+     (png_size_t)(name_len + 2));
+
+   if (profile_len)
+      png_write_compressed_data_out(png_ptr, &comp);
+
+   png_write_chunk_end(png_ptr);
+   png_free(png_ptr, new_name);
+}
+#endif
+
+#ifdef PNG_WRITE_sPLT_SUPPORTED
+/* Write a sPLT chunk */
+void /* PRIVATE */
+png_write_sPLT(png_structp png_ptr, png_sPLT_tp spalette)
+{
+#ifdef PNG_USE_LOCAL_ARRAYS
+   PNG_sPLT;
+#endif
+   png_size_t name_len;
+   png_charp new_name;
+   png_byte entrybuf[10];
+   int entry_size = (spalette->depth == 8 ? 6 : 10);
+   int palette_size = entry_size * spalette->nentries;
+   png_sPLT_entryp ep;
+#ifndef PNG_POINTER_INDEXING_SUPPORTED
+   int i;
+#endif
+
+   png_debug(1, "in png_write_sPLT");
+
+   if ((name_len = png_check_keyword(png_ptr,spalette->name, &new_name))==0)
+      return;
+
+   /* Make sure we include the NULL after the name */
+   png_write_chunk_start(png_ptr, (png_bytep)png_sPLT,
+     (png_uint_32)(name_len + 2 + palette_size));
+   png_write_chunk_data(png_ptr, (png_bytep)new_name,
+     (png_size_t)(name_len + 1));
+   png_write_chunk_data(png_ptr, (png_bytep)&spalette->depth, (png_size_t)1);
+
+   /* Loop through each palette entry, writing appropriately */
+#ifdef PNG_POINTER_INDEXING_SUPPORTED
+   for (ep = spalette->entries; ep<spalette->entries + spalette->nentries; ep++)
+   {
+      if (spalette->depth == 8)
+      {
+          entrybuf[0] = (png_byte)ep->red;
+          entrybuf[1] = (png_byte)ep->green;
+          entrybuf[2] = (png_byte)ep->blue;
+          entrybuf[3] = (png_byte)ep->alpha;
+          png_save_uint_16(entrybuf + 4, ep->frequency);
+      }
+      else
+      {
+          png_save_uint_16(entrybuf + 0, ep->red);
+          png_save_uint_16(entrybuf + 2, ep->green);
+          png_save_uint_16(entrybuf + 4, ep->blue);
+          png_save_uint_16(entrybuf + 6, ep->alpha);
+          png_save_uint_16(entrybuf + 8, ep->frequency);
+      }
+      png_write_chunk_data(png_ptr, entrybuf, (png_size_t)entry_size);
+   }
+#else
+   ep=spalette->entries;
+   for (i=0; i>spalette->nentries; i++)
+   {
+      if (spalette->depth == 8)
+      {
+          entrybuf[0] = (png_byte)ep[i].red;
+          entrybuf[1] = (png_byte)ep[i].green;
+          entrybuf[2] = (png_byte)ep[i].blue;
+          entrybuf[3] = (png_byte)ep[i].alpha;
+          png_save_uint_16(entrybuf + 4, ep[i].frequency);
+      }
+      else
+      {
+          png_save_uint_16(entrybuf + 0, ep[i].red);
+          png_save_uint_16(entrybuf + 2, ep[i].green);
+          png_save_uint_16(entrybuf + 4, ep[i].blue);
+          png_save_uint_16(entrybuf + 6, ep[i].alpha);
+          png_save_uint_16(entrybuf + 8, ep[i].frequency);
+      }
+      png_write_chunk_data(png_ptr, entrybuf, (png_size_t)entry_size);
+   }
+#endif
+
+   png_write_chunk_end(png_ptr);
+   png_free(png_ptr, new_name);
+}
+#endif
+
+#ifdef PNG_WRITE_sBIT_SUPPORTED
+/* Write the sBIT chunk */
+void /* PRIVATE */
+png_write_sBIT(png_structp png_ptr, png_color_8p sbit, int color_type)
+{
+#ifdef PNG_USE_LOCAL_ARRAYS
+   PNG_sBIT;
+#endif
+   png_byte buf[4];
+   png_size_t size;
+
+   png_debug(1, "in png_write_sBIT");
+
+   /* Make sure we don't depend upon the order of PNG_COLOR_8 */
+   if (color_type & PNG_COLOR_MASK_COLOR)
+   {
+      png_byte maxbits;
+
+      maxbits = (png_byte)(color_type==PNG_COLOR_TYPE_PALETTE ? 8 :
+                png_ptr->usr_bit_depth);
+      if (sbit->red == 0 || sbit->red > maxbits ||
+          sbit->green == 0 || sbit->green > maxbits ||
+          sbit->blue == 0 || sbit->blue > maxbits)
+      {
+         png_warning(png_ptr, "Invalid sBIT depth specified");
+         return;
+      }
+      buf[0] = sbit->red;
+      buf[1] = sbit->green;
+      buf[2] = sbit->blue;
+      size = 3;
+   }
+   else
+   {
+      if (sbit->gray == 0 || sbit->gray > png_ptr->usr_bit_depth)
+      {
+         png_warning(png_ptr, "Invalid sBIT depth specified");
+         return;
+      }
+      buf[0] = sbit->gray;
+      size = 1;
+   }
+
+   if (color_type & PNG_COLOR_MASK_ALPHA)
+   {
+      if (sbit->alpha == 0 || sbit->alpha > png_ptr->usr_bit_depth)
+      {
+         png_warning(png_ptr, "Invalid sBIT depth specified");
+         return;
+      }
+      buf[size++] = sbit->alpha;
+   }
+
+   png_write_chunk(png_ptr, (png_bytep)png_sBIT, buf, size);
+}
+#endif
+
+#ifdef PNG_WRITE_cHRM_SUPPORTED
+/* Write the cHRM chunk */
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+void /* PRIVATE */
+png_write_cHRM(png_structp png_ptr, double white_x, double white_y,
+   double red_x, double red_y, double green_x, double green_y,
+   double blue_x, double blue_y)
+{
+#ifdef PNG_USE_LOCAL_ARRAYS
+   PNG_cHRM;
+#endif
+   png_byte buf[32];
+
+   png_fixed_point int_white_x, int_white_y, int_red_x, int_red_y,
+      int_green_x, int_green_y, int_blue_x, int_blue_y;
+
+   png_debug(1, "in png_write_cHRM");
+
+   int_white_x = (png_uint_32)(white_x * 100000.0 + 0.5);
+   int_white_y = (png_uint_32)(white_y * 100000.0 + 0.5);
+   int_red_x   = (png_uint_32)(red_x   * 100000.0 + 0.5);
+   int_red_y   = (png_uint_32)(red_y   * 100000.0 + 0.5);
+   int_green_x = (png_uint_32)(green_x * 100000.0 + 0.5);
+   int_green_y = (png_uint_32)(green_y * 100000.0 + 0.5);
+   int_blue_x  = (png_uint_32)(blue_x  * 100000.0 + 0.5);
+   int_blue_y  = (png_uint_32)(blue_y  * 100000.0 + 0.5);
+
+#ifdef PNG_CHECK_cHRM_SUPPORTED
+   if (png_check_cHRM_fixed(png_ptr, int_white_x, int_white_y,
+      int_red_x, int_red_y, int_green_x, int_green_y, int_blue_x, int_blue_y))
+#endif
+   {
+      /* Each value is saved in 1/100,000ths */
+
+      png_save_uint_32(buf, int_white_x);
+      png_save_uint_32(buf + 4, int_white_y);
+
+      png_save_uint_32(buf + 8, int_red_x);
+      png_save_uint_32(buf + 12, int_red_y);
+
+      png_save_uint_32(buf + 16, int_green_x);
+      png_save_uint_32(buf + 20, int_green_y);
+
+      png_save_uint_32(buf + 24, int_blue_x);
+      png_save_uint_32(buf + 28, int_blue_y);
+
+      png_write_chunk(png_ptr, (png_bytep)png_cHRM, buf, (png_size_t)32);
+   }
+}
+#endif
+#ifdef PNG_FIXED_POINT_SUPPORTED
+void /* PRIVATE */
+png_write_cHRM_fixed(png_structp png_ptr, png_fixed_point white_x,
+   png_fixed_point white_y, png_fixed_point red_x, png_fixed_point red_y,
+   png_fixed_point green_x, png_fixed_point green_y, png_fixed_point blue_x,
+   png_fixed_point blue_y)
+{
+#ifdef PNG_USE_LOCAL_ARRAYS
+   PNG_cHRM;
+#endif
+   png_byte buf[32];
+
+   png_debug(1, "in png_write_cHRM");
+
+   /* Each value is saved in 1/100,000ths */
+#ifdef PNG_CHECK_cHRM_SUPPORTED
+   if (png_check_cHRM_fixed(png_ptr, white_x, white_y, red_x, red_y,
+      green_x, green_y, blue_x, blue_y))
+#endif
+   {
+      png_save_uint_32(buf, (png_uint_32)white_x);
+      png_save_uint_32(buf + 4, (png_uint_32)white_y);
+
+      png_save_uint_32(buf + 8, (png_uint_32)red_x);
+      png_save_uint_32(buf + 12, (png_uint_32)red_y);
+
+      png_save_uint_32(buf + 16, (png_uint_32)green_x);
+      png_save_uint_32(buf + 20, (png_uint_32)green_y);
+
+      png_save_uint_32(buf + 24, (png_uint_32)blue_x);
+      png_save_uint_32(buf + 28, (png_uint_32)blue_y);
+
+      png_write_chunk(png_ptr, (png_bytep)png_cHRM, buf, (png_size_t)32);
+   }
+}
+#endif
+#endif
+
+#ifdef PNG_WRITE_tRNS_SUPPORTED
+/* Write the tRNS chunk */
+void /* PRIVATE */
+png_write_tRNS(png_structp png_ptr, png_bytep trans, png_color_16p tran,
+   int num_trans, int color_type)
+{
+#ifdef PNG_USE_LOCAL_ARRAYS
+   PNG_tRNS;
+#endif
+   png_byte buf[6];
+
+   png_debug(1, "in png_write_tRNS");
+
+   if (color_type == PNG_COLOR_TYPE_PALETTE)
+   {
+      if (num_trans <= 0 || num_trans > (int)png_ptr->num_palette)
+      {
+         png_warning(png_ptr, "Invalid number of transparent colors specified");
+         return;
+      }
+      /* Write the chunk out as it is */
+      png_write_chunk(png_ptr, (png_bytep)png_tRNS, trans,
+        (png_size_t)num_trans);
+   }
+   else if (color_type == PNG_COLOR_TYPE_GRAY)
+   {
+      /* One 16 bit value */
+      if (tran->gray >= (1 << png_ptr->bit_depth))
+      {
+         png_warning(png_ptr,
+           "Ignoring attempt to write tRNS chunk out-of-range for bit_depth");
+         return;
+      }
+      png_save_uint_16(buf, tran->gray);
+      png_write_chunk(png_ptr, (png_bytep)png_tRNS, buf, (png_size_t)2);
+   }
+   else if (color_type == PNG_COLOR_TYPE_RGB)
+   {
+      /* Three 16 bit values */
+      png_save_uint_16(buf, tran->red);
+      png_save_uint_16(buf + 2, tran->green);
+      png_save_uint_16(buf + 4, tran->blue);
+      if (png_ptr->bit_depth == 8 && (buf[0] | buf[2] | buf[4]))
+      {
+         png_warning(png_ptr,
+           "Ignoring attempt to write 16-bit tRNS chunk when bit_depth is 8");
+         return;
+      }
+      png_write_chunk(png_ptr, (png_bytep)png_tRNS, buf, (png_size_t)6);
+   }
+   else
+   {
+      png_warning(png_ptr, "Can't write tRNS with an alpha channel");
+   }
+}
+#endif
+
+#ifdef PNG_WRITE_bKGD_SUPPORTED
+/* Write the background chunk */
+void /* PRIVATE */
+png_write_bKGD(png_structp png_ptr, png_color_16p back, int color_type)
+{
+#ifdef PNG_USE_LOCAL_ARRAYS
+   PNG_bKGD;
+#endif
+   png_byte buf[6];
+
+   png_debug(1, "in png_write_bKGD");
+
+   if (color_type == PNG_COLOR_TYPE_PALETTE)
+   {
+      if (
+#ifdef PNG_MNG_FEATURES_SUPPORTED
+          (png_ptr->num_palette ||
+          (!(png_ptr->mng_features_permitted & PNG_FLAG_MNG_EMPTY_PLTE))) &&
+#endif
+         back->index >= png_ptr->num_palette)
+      {
+         png_warning(png_ptr, "Invalid background palette index");
+         return;
+      }
+      buf[0] = back->index;
+      png_write_chunk(png_ptr, (png_bytep)png_bKGD, buf, (png_size_t)1);
+   }
+   else if (color_type & PNG_COLOR_MASK_COLOR)
+   {
+      png_save_uint_16(buf, back->red);
+      png_save_uint_16(buf + 2, back->green);
+      png_save_uint_16(buf + 4, back->blue);
+      if (png_ptr->bit_depth == 8 && (buf[0] | buf[2] | buf[4]))
+      {
+         png_warning(png_ptr,
+           "Ignoring attempt to write 16-bit bKGD chunk when bit_depth is 8");
+         return;
+      }
+      png_write_chunk(png_ptr, (png_bytep)png_bKGD, buf, (png_size_t)6);
+   }
+   else
+   {
+      if (back->gray >= (1 << png_ptr->bit_depth))
+      {
+         png_warning(png_ptr,
+           "Ignoring attempt to write bKGD chunk out-of-range for bit_depth");
+         return;
+      }
+      png_save_uint_16(buf, back->gray);
+      png_write_chunk(png_ptr, (png_bytep)png_bKGD, buf, (png_size_t)2);
+   }
+}
+#endif
+
+#ifdef PNG_WRITE_hIST_SUPPORTED
+/* Write the histogram */
+void /* PRIVATE */
+png_write_hIST(png_structp png_ptr, png_uint_16p hist, int num_hist)
+{
+#ifdef PNG_USE_LOCAL_ARRAYS
+   PNG_hIST;
+#endif
+   int i;
+   png_byte buf[3];
+
+   png_debug(1, "in png_write_hIST");
+
+   if (num_hist > (int)png_ptr->num_palette)
+   {
+      png_debug2(3, "num_hist = %d, num_palette = %d", num_hist,
+         png_ptr->num_palette);
+      png_warning(png_ptr, "Invalid number of histogram entries specified");
+      return;
+   }
+
+   png_write_chunk_start(png_ptr, (png_bytep)png_hIST,
+     (png_uint_32)(num_hist * 2));
+   for (i = 0; i < num_hist; i++)
+   {
+      png_save_uint_16(buf, hist[i]);
+      png_write_chunk_data(png_ptr, buf, (png_size_t)2);
+   }
+   png_write_chunk_end(png_ptr);
+}
+#endif
+
+#if defined(PNG_WRITE_TEXT_SUPPORTED) || defined(PNG_WRITE_pCAL_SUPPORTED) || \
+    defined(PNG_WRITE_iCCP_SUPPORTED) || defined(PNG_WRITE_sPLT_SUPPORTED)
+/* Check that the tEXt or zTXt keyword is valid per PNG 1.0 specification,
+ * and if invalid, correct the keyword rather than discarding the entire
+ * chunk.  The PNG 1.0 specification requires keywords 1-79 characters in
+ * length, forbids leading or trailing whitespace, multiple internal spaces,
+ * and the non-break space (0x80) from ISO 8859-1.  Returns keyword length.
+ *
+ * The new_key is allocated to hold the corrected keyword and must be freed
+ * by the calling routine.  This avoids problems with trying to write to
+ * static keywords without having to have duplicate copies of the strings.
+ */
+png_size_t /* PRIVATE */
+png_check_keyword(png_structp png_ptr, png_charp key, png_charpp new_key)
+{
+   png_size_t key_len;
+   png_charp kp, dp;
+   int kflag;
+   int kwarn=0;
+
+   png_debug(1, "in png_check_keyword");
+
+   *new_key = NULL;
+
+   if (key == NULL || (key_len = png_strlen(key)) == 0)
+   {
+      png_warning(png_ptr, "zero length keyword");
+      return ((png_size_t)0);
+   }
+
+   png_debug1(2, "Keyword to be checked is '%s'", key);
+
+   *new_key = (png_charp)png_malloc_warn(png_ptr, (png_uint_32)(key_len + 2));
+   if (*new_key == NULL)
+   {
+      png_warning(png_ptr, "Out of memory while procesing keyword");
+      return ((png_size_t)0);
+   }
+
+   /* Replace non-printing characters with a blank and print a warning */
+   for (kp = key, dp = *new_key; *kp != '\0'; kp++, dp++)
+   {
+      if ((png_byte)*kp < 0x20 ||
+         ((png_byte)*kp > 0x7E && (png_byte)*kp < 0xA1))
+      {
+#if defined(PNG_STDIO_SUPPORTED) && !defined(_WIN32_WCE)
+         char msg[40];
+
+         png_snprintf(msg, 40,
+           "invalid keyword character 0x%02X", (png_byte)*kp);
+         png_warning(png_ptr, msg);
+#else
+         png_warning(png_ptr, "invalid character in keyword");
+#endif
+         *dp = ' ';
+      }
+      else
+      {
+         *dp = *kp;
+      }
+   }
+   *dp = '\0';
+
+   /* Remove any trailing white space. */
+   kp = *new_key + key_len - 1;
+   if (*kp == ' ')
+   {
+      png_warning(png_ptr, "trailing spaces removed from keyword");
+
+      while (*kp == ' ')
+      {
+         *(kp--) = '\0';
+         key_len--;
+      }
+   }
+
+   /* Remove any leading white space. */
+   kp = *new_key;
+   if (*kp == ' ')
+   {
+      png_warning(png_ptr, "leading spaces removed from keyword");
+
+      while (*kp == ' ')
+      {
+         kp++;
+         key_len--;
+      }
+   }
+
+   png_debug1(2, "Checking for multiple internal spaces in '%s'", kp);
+
+   /* Remove multiple internal spaces. */
+   for (kflag = 0, dp = *new_key; *kp != '\0'; kp++)
+   {
+      if (*kp == ' ' && kflag == 0)
+      {
+         *(dp++) = *kp;
+         kflag = 1;
+      }
+      else if (*kp == ' ')
+      {
+         key_len--;
+         kwarn=1;
+      }
+      else
+      {
+         *(dp++) = *kp;
+         kflag = 0;
+      }
+   }
+   *dp = '\0';
+   if (kwarn)
+      png_warning(png_ptr, "extra interior spaces removed from keyword");
+
+   if (key_len == 0)
+   {
+      png_free(png_ptr, *new_key);
+       *new_key=NULL;
+      png_warning(png_ptr, "Zero length keyword");
+   }
+
+   if (key_len > 79)
+   {
+      png_warning(png_ptr, "keyword length must be 1 - 79 characters");
+      (*new_key)[79] = '\0';
+      key_len = 79;
+   }
+
+   return (key_len);
+}
+#endif
+
+#ifdef PNG_WRITE_tEXt_SUPPORTED
+/* Write a tEXt chunk */
+void /* PRIVATE */
+png_write_tEXt(png_structp png_ptr, png_charp key, png_charp text,
+   png_size_t text_len)
+{
+#ifdef PNG_USE_LOCAL_ARRAYS
+   PNG_tEXt;
+#endif
+   png_size_t key_len;
+   png_charp new_key;
+
+   png_debug(1, "in png_write_tEXt");
+
+   if ((key_len = png_check_keyword(png_ptr, key, &new_key))==0)
+      return;
+
+   if (text == NULL || *text == '\0')
+      text_len = 0;
+   else
+      text_len = png_strlen(text);
+
+   /* Make sure we include the 0 after the key */
+   png_write_chunk_start(png_ptr, (png_bytep)png_tEXt,
+      (png_uint_32)(key_len + text_len + 1));
+   /*
+    * We leave it to the application to meet PNG-1.0 requirements on the
+    * contents of the text.  PNG-1.0 through PNG-1.2 discourage the use of
+    * any non-Latin-1 characters except for NEWLINE.  ISO PNG will forbid them.
+    * The NUL character is forbidden by PNG-1.0 through PNG-1.2 and ISO PNG.
+    */
+   png_write_chunk_data(png_ptr, (png_bytep)new_key,
+     (png_size_t)(key_len + 1));
+   if (text_len)
+      png_write_chunk_data(png_ptr, (png_bytep)text, (png_size_t)text_len);
+
+   png_write_chunk_end(png_ptr);
+   png_free(png_ptr, new_key);
+}
+#endif
+
+#ifdef PNG_WRITE_zTXt_SUPPORTED
+/* Write a compressed text chunk */
+void /* PRIVATE */
+png_write_zTXt(png_structp png_ptr, png_charp key, png_charp text,
+   png_size_t text_len, int compression)
+{
+#ifdef PNG_USE_LOCAL_ARRAYS
+   PNG_zTXt;
+#endif
+   png_size_t key_len;
+   char buf[1];
+   png_charp new_key;
+   compression_state comp;
+
+   png_debug(1, "in png_write_zTXt");
+
+   comp.num_output_ptr = 0;
+   comp.max_output_ptr = 0;
+   comp.output_ptr = NULL;
+   comp.input = NULL;
+   comp.input_len = 0;
+
+   if ((key_len = png_check_keyword(png_ptr, key, &new_key))==0)
+   {
+      png_free(png_ptr, new_key);
+      return;
+   }
+
+   if (text == NULL || *text == '\0' || compression==PNG_TEXT_COMPRESSION_NONE)
+   {
+      png_write_tEXt(png_ptr, new_key, text, (png_size_t)0);
+      png_free(png_ptr, new_key);
+      return;
+   }
+
+   text_len = png_strlen(text);
+
+   /* Compute the compressed data; do it now for the length */
+   text_len = png_text_compress(png_ptr, text, text_len, compression,
+       &comp);
+
+   /* Write start of chunk */
+   png_write_chunk_start(png_ptr, (png_bytep)png_zTXt,
+     (png_uint_32)(key_len+text_len + 2));
+   /* Write key */
+   png_write_chunk_data(png_ptr, (png_bytep)new_key,
+     (png_size_t)(key_len + 1));
+   png_free(png_ptr, new_key);
+
+   buf[0] = (png_byte)compression;
+   /* Write compression */
+   png_write_chunk_data(png_ptr, (png_bytep)buf, (png_size_t)1);
+   /* Write the compressed data */
+   png_write_compressed_data_out(png_ptr, &comp);
+
+   /* Close the chunk */
+   png_write_chunk_end(png_ptr);
+}
+#endif
+
+#ifdef PNG_WRITE_iTXt_SUPPORTED
+/* Write an iTXt chunk */
+void /* PRIVATE */
+png_write_iTXt(png_structp png_ptr, int compression, png_charp key,
+    png_charp lang, png_charp lang_key, png_charp text)
+{
+#ifdef PNG_USE_LOCAL_ARRAYS
+   PNG_iTXt;
+#endif
+   png_size_t lang_len, key_len, lang_key_len, text_len;
+   png_charp new_lang;
+   png_charp new_key = NULL;
+   png_byte cbuf[2];
+   compression_state comp;
+
+   png_debug(1, "in png_write_iTXt");
+
+   comp.num_output_ptr = 0;
+   comp.max_output_ptr = 0;
+   comp.output_ptr = NULL;
+   comp.input = NULL;
+
+   if ((key_len = png_check_keyword(png_ptr, key, &new_key))==0)
+      return;
+
+   if ((lang_len = png_check_keyword(png_ptr, lang, &new_lang))==0)
+   {
+      png_warning(png_ptr, "Empty language field in iTXt chunk");
+      new_lang = NULL;
+      lang_len = 0;
+   }
+
+   if (lang_key == NULL)
+      lang_key_len = 0;
+   else
+      lang_key_len = png_strlen(lang_key);
+
+   if (text == NULL)
+      text_len = 0;
+   else
+      text_len = png_strlen(text);
+
+   /* Compute the compressed data; do it now for the length */
+   text_len = png_text_compress(png_ptr, text, text_len, compression-2,
+      &comp);
+
+
+   /* Make sure we include the compression flag, the compression byte,
+    * and the NULs after the key, lang, and lang_key parts */
+
+   png_write_chunk_start(png_ptr, (png_bytep)png_iTXt,
+          (png_uint_32)(
+        5 /* comp byte, comp flag, terminators for key, lang and lang_key */
+        + key_len
+        + lang_len
+        + lang_key_len
+        + text_len));
+
+   /* We leave it to the application to meet PNG-1.0 requirements on the
+    * contents of the text.  PNG-1.0 through PNG-1.2 discourage the use of
+    * any non-Latin-1 characters except for NEWLINE.  ISO PNG will forbid them.
+    * The NUL character is forbidden by PNG-1.0 through PNG-1.2 and ISO PNG.
+    */
+   png_write_chunk_data(png_ptr, (png_bytep)new_key,
+     (png_size_t)(key_len + 1));
+
+   /* Set the compression flag */
+   if (compression == PNG_ITXT_COMPRESSION_NONE || \
+       compression == PNG_TEXT_COMPRESSION_NONE)
+       cbuf[0] = 0;
+   else /* compression == PNG_ITXT_COMPRESSION_zTXt */
+       cbuf[0] = 1;
+   /* Set the compression method */
+   cbuf[1] = 0;
+   png_write_chunk_data(png_ptr, cbuf, (png_size_t)2);
+
+   cbuf[0] = 0;
+   png_write_chunk_data(png_ptr, (new_lang ? (png_bytep)new_lang : cbuf),
+     (png_size_t)(lang_len + 1));
+   png_write_chunk_data(png_ptr, (lang_key ? (png_bytep)lang_key : cbuf),
+     (png_size_t)(lang_key_len + 1));
+   png_write_compressed_data_out(png_ptr, &comp);
+
+   png_write_chunk_end(png_ptr);
+   png_free(png_ptr, new_key);
+   png_free(png_ptr, new_lang);
+}
+#endif
+
+#ifdef PNG_WRITE_oFFs_SUPPORTED
+/* Write the oFFs chunk */
+void /* PRIVATE */
+png_write_oFFs(png_structp png_ptr, png_int_32 x_offset, png_int_32 y_offset,
+   int unit_type)
+{
+#ifdef PNG_USE_LOCAL_ARRAYS
+   PNG_oFFs;
+#endif
+   png_byte buf[9];
+
+   png_debug(1, "in png_write_oFFs");
+
+   if (unit_type >= PNG_OFFSET_LAST)
+      png_warning(png_ptr, "Unrecognized unit type for oFFs chunk");
+
+   png_save_int_32(buf, x_offset);
+   png_save_int_32(buf + 4, y_offset);
+   buf[8] = (png_byte)unit_type;
+
+   png_write_chunk(png_ptr, (png_bytep)png_oFFs, buf, (png_size_t)9);
+}
+#endif
+#ifdef PNG_WRITE_pCAL_SUPPORTED
+/* Write the pCAL chunk (described in the PNG extensions document) */
+void /* PRIVATE */
+png_write_pCAL(png_structp png_ptr, png_charp purpose, png_int_32 X0,
+   png_int_32 X1, int type, int nparams, png_charp units, png_charpp params)
+{
+#ifdef PNG_USE_LOCAL_ARRAYS
+   PNG_pCAL;
+#endif
+   png_size_t purpose_len, units_len, total_len;
+   png_uint_32p params_len;
+   png_byte buf[10];
+   png_charp new_purpose;
+   int i;
+
+   png_debug1(1, "in png_write_pCAL (%d parameters)", nparams);
+
+   if (type >= PNG_EQUATION_LAST)
+      png_warning(png_ptr, "Unrecognized equation type for pCAL chunk");
+
+   purpose_len = png_check_keyword(png_ptr, purpose, &new_purpose) + 1;
+   png_debug1(3, "pCAL purpose length = %d", (int)purpose_len);
+   units_len = png_strlen(units) + (nparams == 0 ? 0 : 1);
+   png_debug1(3, "pCAL units length = %d", (int)units_len);
+   total_len = purpose_len + units_len + 10;
+
+   params_len = (png_uint_32p)png_malloc(png_ptr,
+      (png_uint_32)(nparams * png_sizeof(png_uint_32)));
+
+   /* Find the length of each parameter, making sure we don't count the
+      null terminator for the last parameter. */
+   for (i = 0; i < nparams; i++)
+   {
+      params_len[i] = png_strlen(params[i]) + (i == nparams - 1 ? 0 : 1);
+      png_debug2(3, "pCAL parameter %d length = %lu", i,
+        (unsigned long) params_len[i]);
+      total_len += (png_size_t)params_len[i];
+   }
+
+   png_debug1(3, "pCAL total length = %d", (int)total_len);
+   png_write_chunk_start(png_ptr, (png_bytep)png_pCAL, (png_uint_32)total_len);
+   png_write_chunk_data(png_ptr, (png_bytep)new_purpose,
+     (png_size_t)purpose_len);
+   png_save_int_32(buf, X0);
+   png_save_int_32(buf + 4, X1);
+   buf[8] = (png_byte)type;
+   buf[9] = (png_byte)nparams;
+   png_write_chunk_data(png_ptr, buf, (png_size_t)10);
+   png_write_chunk_data(png_ptr, (png_bytep)units, (png_size_t)units_len);
+
+   png_free(png_ptr, new_purpose);
+
+   for (i = 0; i < nparams; i++)
+   {
+      png_write_chunk_data(png_ptr, (png_bytep)params[i],
+         (png_size_t)params_len[i]);
+   }
+
+   png_free(png_ptr, params_len);
+   png_write_chunk_end(png_ptr);
+}
+#endif
+
+#ifdef PNG_WRITE_sCAL_SUPPORTED
+/* Write the sCAL chunk */
+#if defined(PNG_FLOATING_POINT_SUPPORTED) && defined(PNG_STDIO_SUPPORTED)
+void /* PRIVATE */
+png_write_sCAL(png_structp png_ptr, int unit, double width, double height)
+{
+#ifdef PNG_USE_LOCAL_ARRAYS
+   PNG_sCAL;
+#endif
+   char buf[64];
+   png_size_t total_len;
+
+   png_debug(1, "in png_write_sCAL");
+
+   buf[0] = (char)unit;
+#ifdef _WIN32_WCE
+/* sprintf() function is not supported on WindowsCE */
+   {
+      wchar_t wc_buf[32];
+      size_t wc_len;
+      swprintf(wc_buf, TEXT("%12.12e"), width);
+      wc_len = wcslen(wc_buf);
+      WideCharToMultiByte(CP_ACP, 0, wc_buf, -1, buf + 1, wc_len, NULL,
+          NULL);
+      total_len = wc_len + 2;
+      swprintf(wc_buf, TEXT("%12.12e"), height);
+      wc_len = wcslen(wc_buf);
+      WideCharToMultiByte(CP_ACP, 0, wc_buf, -1, buf + total_len, wc_len,
+         NULL, NULL);
+      total_len += wc_len;
+   }
+#else
+   png_snprintf(buf + 1, 63, "%12.12e", width);
+   total_len = 1 + png_strlen(buf + 1) + 1;
+   png_snprintf(buf + total_len, 64-total_len, "%12.12e", height);
+   total_len += png_strlen(buf + total_len);
+#endif
+
+   png_debug1(3, "sCAL total length = %u", (unsigned int)total_len);
+   png_write_chunk(png_ptr, (png_bytep)png_sCAL, (png_bytep)buf, total_len);
+}
+#else
+#ifdef PNG_FIXED_POINT_SUPPORTED
+void /* PRIVATE */
+png_write_sCAL_s(png_structp png_ptr, int unit, png_charp width,
+   png_charp height)
+{
+#ifdef PNG_USE_LOCAL_ARRAYS
+   PNG_sCAL;
+#endif
+   png_byte buf[64];
+   png_size_t wlen, hlen, total_len;
+
+   png_debug(1, "in png_write_sCAL_s");
+
+   wlen = png_strlen(width);
+   hlen = png_strlen(height);
+   total_len = wlen + hlen + 2;
+   if (total_len > 64)
+   {
+      png_warning(png_ptr, "Can't write sCAL (buffer too small)");
+      return;
+   }
+
+   buf[0] = (png_byte)unit;
+   png_memcpy(buf + 1, width, wlen + 1);      /* Append the '\0' here */
+   png_memcpy(buf + wlen + 2, height, hlen);  /* Do NOT append the '\0' here */
+
+   png_debug1(3, "sCAL total length = %u", (unsigned int)total_len);
+   png_write_chunk(png_ptr, (png_bytep)png_sCAL, buf, total_len);
+}
+#endif
+#endif
+#endif
+
+#ifdef PNG_WRITE_pHYs_SUPPORTED
+/* Write the pHYs chunk */
+void /* PRIVATE */
+png_write_pHYs(png_structp png_ptr, png_uint_32 x_pixels_per_unit,
+   png_uint_32 y_pixels_per_unit,
+   int unit_type)
+{
+#ifdef PNG_USE_LOCAL_ARRAYS
+   PNG_pHYs;
+#endif
+   png_byte buf[9];
+
+   png_debug(1, "in png_write_pHYs");
+
+   if (unit_type >= PNG_RESOLUTION_LAST)
+      png_warning(png_ptr, "Unrecognized unit type for pHYs chunk");
+
+   png_save_uint_32(buf, x_pixels_per_unit);
+   png_save_uint_32(buf + 4, y_pixels_per_unit);
+   buf[8] = (png_byte)unit_type;
+
+   png_write_chunk(png_ptr, (png_bytep)png_pHYs, buf, (png_size_t)9);
+}
+#endif
+
+#ifdef PNG_WRITE_tIME_SUPPORTED
+/* Write the tIME chunk.  Use either png_convert_from_struct_tm()
+ * or png_convert_from_time_t(), or fill in the structure yourself.
+ */
+void /* PRIVATE */
+png_write_tIME(png_structp png_ptr, png_timep mod_time)
+{
+#ifdef PNG_USE_LOCAL_ARRAYS
+   PNG_tIME;
+#endif
+   png_byte buf[7];
+
+   png_debug(1, "in png_write_tIME");
+
+   if (mod_time->month  > 12 || mod_time->month  < 1 ||
+       mod_time->day    > 31 || mod_time->day    < 1 ||
+       mod_time->hour   > 23 || mod_time->second > 60)
+   {
+      png_warning(png_ptr, "Invalid time specified for tIME chunk");
+      return;
+   }
+
+   png_save_uint_16(buf, mod_time->year);
+   buf[2] = mod_time->month;
+   buf[3] = mod_time->day;
+   buf[4] = mod_time->hour;
+   buf[5] = mod_time->minute;
+   buf[6] = mod_time->second;
+
+   png_write_chunk(png_ptr, (png_bytep)png_tIME, buf, (png_size_t)7);
+}
+#endif
+
+/* Initializes the row writing capability of libpng */
+void /* PRIVATE */
+png_write_start_row(png_structp png_ptr)
+{
+#ifdef PNG_WRITE_INTERLACING_SUPPORTED
+   /* Arrays to facilitate easy interlacing - use pass (0 - 6) as index */
+
+   /* Start of interlace block */
+   int png_pass_start[7] = {0, 4, 0, 2, 0, 1, 0};
+
+   /* Offset to next interlace block */
+   int png_pass_inc[7] = {8, 8, 4, 4, 2, 2, 1};
+
+   /* Start of interlace block in the y direction */
+   int png_pass_ystart[7] = {0, 0, 4, 0, 2, 0, 1};
+
+   /* Offset to next interlace block in the y direction */
+   int png_pass_yinc[7] = {8, 8, 8, 4, 4, 2, 2};
+#endif
+
+   png_size_t buf_size;
+
+   png_debug(1, "in png_write_start_row");
+
+   buf_size = (png_size_t)(PNG_ROWBYTES(
+      png_ptr->usr_channels*png_ptr->usr_bit_depth, png_ptr->width) + 1);
+
+   /* Set up row buffer */
+   png_ptr->row_buf = (png_bytep)png_malloc(png_ptr,
+     (png_uint_32)buf_size);
+   png_ptr->row_buf[0] = PNG_FILTER_VALUE_NONE;
+
+#ifdef PNG_WRITE_FILTER_SUPPORTED
+   /* Set up filtering buffer, if using this filter */
+   if (png_ptr->do_filter & PNG_FILTER_SUB)
+   {
+      png_ptr->sub_row = (png_bytep)png_malloc(png_ptr,
+         (png_uint_32)(png_ptr->rowbytes + 1));
+      png_ptr->sub_row[0] = PNG_FILTER_VALUE_SUB;
+   }
+
+   /* We only need to keep the previous row if we are using one of these. */
+   if (png_ptr->do_filter & (PNG_FILTER_AVG | PNG_FILTER_UP | PNG_FILTER_PAETH))
+   {
+      /* Set up previous row buffer */
+      png_ptr->prev_row = (png_bytep)png_calloc(png_ptr,
+         (png_uint_32)buf_size);
+
+      if (png_ptr->do_filter & PNG_FILTER_UP)
+      {
+         png_ptr->up_row = (png_bytep)png_malloc(png_ptr,
+            (png_uint_32)(png_ptr->rowbytes + 1));
+         png_ptr->up_row[0] = PNG_FILTER_VALUE_UP;
+      }
+
+      if (png_ptr->do_filter & PNG_FILTER_AVG)
+      {
+         png_ptr->avg_row = (png_bytep)png_malloc(png_ptr,
+            (png_uint_32)(png_ptr->rowbytes + 1));
+         png_ptr->avg_row[0] = PNG_FILTER_VALUE_AVG;
+      }
+
+      if (png_ptr->do_filter & PNG_FILTER_PAETH)
+      {
+         png_ptr->paeth_row = (png_bytep)png_malloc(png_ptr,
+            (png_uint_32)(png_ptr->rowbytes + 1));
+         png_ptr->paeth_row[0] = PNG_FILTER_VALUE_PAETH;
+      }
+   }
+#endif /* PNG_WRITE_FILTER_SUPPORTED */
+
+#ifdef PNG_WRITE_INTERLACING_SUPPORTED
+   /* If interlaced, we need to set up width and height of pass */
+   if (png_ptr->interlaced)
+   {
+      if (!(png_ptr->transformations & PNG_INTERLACE))
+      {
+         png_ptr->num_rows = (png_ptr->height + png_pass_yinc[0] - 1 -
+            png_pass_ystart[0]) / png_pass_yinc[0];
+         png_ptr->usr_width = (png_ptr->width + png_pass_inc[0] - 1 -
+            png_pass_start[0]) / png_pass_inc[0];
+      }
+      else
+      {
+         png_ptr->num_rows = png_ptr->height;
+         png_ptr->usr_width = png_ptr->width;
+      }
+   }
+   else
+#endif
+   {
+      png_ptr->num_rows = png_ptr->height;
+      png_ptr->usr_width = png_ptr->width;
+   }
+   png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;
+   png_ptr->zstream.next_out = png_ptr->zbuf;
+}
+
+/* Internal use only.  Called when finished processing a row of data. */
+void /* PRIVATE */
+png_write_finish_row(png_structp png_ptr)
+{
+#ifdef PNG_WRITE_INTERLACING_SUPPORTED
+   /* Arrays to facilitate easy interlacing - use pass (0 - 6) as index */
+
+   /* Start of interlace block */
+   int png_pass_start[7] = {0, 4, 0, 2, 0, 1, 0};
+
+   /* Offset to next interlace block */
+   int png_pass_inc[7] = {8, 8, 4, 4, 2, 2, 1};
+
+   /* Start of interlace block in the y direction */
+   int png_pass_ystart[7] = {0, 0, 4, 0, 2, 0, 1};
+
+   /* Offset to next interlace block in the y direction */
+   int png_pass_yinc[7] = {8, 8, 8, 4, 4, 2, 2};
+#endif
+
+   int ret;
+
+   png_debug(1, "in png_write_finish_row");
+
+   /* Next row */
+   png_ptr->row_number++;
+
+   /* See if we are done */
+   if (png_ptr->row_number < png_ptr->num_rows)
+      return;
+
+#ifdef PNG_WRITE_INTERLACING_SUPPORTED
+   /* If interlaced, go to next pass */
+   if (png_ptr->interlaced)
+   {
+      png_ptr->row_number = 0;
+      if (png_ptr->transformations & PNG_INTERLACE)
+      {
+         png_ptr->pass++;
+      }
+      else
+      {
+         /* Loop until we find a non-zero width or height pass */
+         do
+         {
+            png_ptr->pass++;
+            if (png_ptr->pass >= 7)
+               break;
+            png_ptr->usr_width = (png_ptr->width +
+               png_pass_inc[png_ptr->pass] - 1 -
+               png_pass_start[png_ptr->pass]) /
+               png_pass_inc[png_ptr->pass];
+            png_ptr->num_rows = (png_ptr->height +
+               png_pass_yinc[png_ptr->pass] - 1 -
+               png_pass_ystart[png_ptr->pass]) /
+               png_pass_yinc[png_ptr->pass];
+            if (png_ptr->transformations & PNG_INTERLACE)
+               break;
+         } while (png_ptr->usr_width == 0 || png_ptr->num_rows == 0);
+
+      }
+
+      /* Reset the row above the image for the next pass */
+      if (png_ptr->pass < 7)
+      {
+         if (png_ptr->prev_row != NULL)
+            png_memset(png_ptr->prev_row, 0,
+               (png_size_t)(PNG_ROWBYTES(png_ptr->usr_channels*
+               png_ptr->usr_bit_depth, png_ptr->width)) + 1);
+         return;
+      }
+   }
+#endif
+
+   /* If we get here, we've just written the last row, so we need
+      to flush the compressor */
+   do
+   {
+      /* Tell the compressor we are done */
+      ret = deflate(&png_ptr->zstream, Z_FINISH);
+      /* Check for an error */
+      if (ret == Z_OK)
+      {
+         /* Check to see if we need more room */
+         if (!(png_ptr->zstream.avail_out))
+         {
+            png_write_IDAT(png_ptr, png_ptr->zbuf, png_ptr->zbuf_size);
+            png_ptr->zstream.next_out = png_ptr->zbuf;
+            png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;
+         }
+      }
+      else if (ret != Z_STREAM_END)
+      {
+         if (png_ptr->zstream.msg != NULL)
+            png_error(png_ptr, png_ptr->zstream.msg);
+         else
+            png_error(png_ptr, "zlib error");
+      }
+   } while (ret != Z_STREAM_END);
+
+   /* Write any extra space */
+   if (png_ptr->zstream.avail_out < png_ptr->zbuf_size)
+   {
+      png_write_IDAT(png_ptr, png_ptr->zbuf, png_ptr->zbuf_size -
+         png_ptr->zstream.avail_out);
+   }
+
+   deflateReset(&png_ptr->zstream);
+   png_ptr->zstream.data_type = Z_BINARY;
+}
+
+#ifdef PNG_WRITE_INTERLACING_SUPPORTED
+/* Pick out the correct pixels for the interlace pass.
+ * The basic idea here is to go through the row with a source
+ * pointer and a destination pointer (sp and dp), and copy the
+ * correct pixels for the pass.  As the row gets compacted,
+ * sp will always be >= dp, so we should never overwrite anything.
+ * See the default: case for the easiest code to understand.
+ */
+void /* PRIVATE */
+png_do_write_interlace(png_row_infop row_info, png_bytep row, int pass)
+{
+   /* Arrays to facilitate easy interlacing - use pass (0 - 6) as index */
+
+   /* Start of interlace block */
+   int png_pass_start[7] = {0, 4, 0, 2, 0, 1, 0};
+
+   /* Offset to next interlace block */
+   int png_pass_inc[7] = {8, 8, 4, 4, 2, 2, 1};
+
+   png_debug(1, "in png_do_write_interlace");
+
+   /* We don't have to do anything on the last pass (6) */
+#ifdef PNG_USELESS_TESTS_SUPPORTED
+   if (row != NULL && row_info != NULL && pass < 6)
+#else
+   if (pass < 6)
+#endif
+   {
+      /* Each pixel depth is handled separately */
+      switch (row_info->pixel_depth)
+      {
+         case 1:
+         {
+            png_bytep sp;
+            png_bytep dp;
+            int shift;
+            int d;
+            int value;
+            png_uint_32 i;
+            png_uint_32 row_width = row_info->width;
+
+            dp = row;
+            d = 0;
+            shift = 7;
+            for (i = png_pass_start[pass]; i < row_width;
+               i += png_pass_inc[pass])
+            {
+               sp = row + (png_size_t)(i >> 3);
+               value = (int)(*sp >> (7 - (int)(i & 0x07))) & 0x01;
+               d |= (value << shift);
+
+               if (shift == 0)
+               {
+                  shift = 7;
+                  *dp++ = (png_byte)d;
+                  d = 0;
+               }
+               else
+                  shift--;
+
+            }
+            if (shift != 7)
+               *dp = (png_byte)d;
+            break;
+         }
+         case 2:
+         {
+            png_bytep sp;
+            png_bytep dp;
+            int shift;
+            int d;
+            int value;
+            png_uint_32 i;
+            png_uint_32 row_width = row_info->width;
+
+            dp = row;
+            shift = 6;
+            d = 0;
+            for (i = png_pass_start[pass]; i < row_width;
+               i += png_pass_inc[pass])
+            {
+               sp = row + (png_size_t)(i >> 2);
+               value = (*sp >> ((3 - (int)(i & 0x03)) << 1)) & 0x03;
+               d |= (value << shift);
+
+               if (shift == 0)
+               {
+                  shift = 6;
+                  *dp++ = (png_byte)d;
+                  d = 0;
+               }
+               else
+                  shift -= 2;
+            }
+            if (shift != 6)
+                   *dp = (png_byte)d;
+            break;
+         }
+         case 4:
+         {
+            png_bytep sp;
+            png_bytep dp;
+            int shift;
+            int d;
+            int value;
+            png_uint_32 i;
+            png_uint_32 row_width = row_info->width;
+
+            dp = row;
+            shift = 4;
+            d = 0;
+            for (i = png_pass_start[pass]; i < row_width;
+               i += png_pass_inc[pass])
+            {
+               sp = row + (png_size_t)(i >> 1);
+               value = (*sp >> ((1 - (int)(i & 0x01)) << 2)) & 0x0f;
+               d |= (value << shift);
+
+               if (shift == 0)
+               {
+                  shift = 4;
+                  *dp++ = (png_byte)d;
+                  d = 0;
+               }
+               else
+                  shift -= 4;
+            }
+            if (shift != 4)
+               *dp = (png_byte)d;
+            break;
+         }
+         default:
+         {
+            png_bytep sp;
+            png_bytep dp;
+            png_uint_32 i;
+            png_uint_32 row_width = row_info->width;
+            png_size_t pixel_bytes;
+
+            /* Start at the beginning */
+            dp = row;
+            /* Find out how many bytes each pixel takes up */
+            pixel_bytes = (row_info->pixel_depth >> 3);
+            /* Loop through the row, only looking at the pixels that
+               matter */
+            for (i = png_pass_start[pass]; i < row_width;
+               i += png_pass_inc[pass])
+            {
+               /* Find out where the original pixel is */
+               sp = row + (png_size_t)i * pixel_bytes;
+               /* Move the pixel */
+               if (dp != sp)
+                  png_memcpy(dp, sp, pixel_bytes);
+               /* Next pixel */
+               dp += pixel_bytes;
+            }
+            break;
+         }
+      }
+      /* Set new row width */
+      row_info->width = (row_info->width +
+         png_pass_inc[pass] - 1 -
+         png_pass_start[pass]) /
+         png_pass_inc[pass];
+         row_info->rowbytes = PNG_ROWBYTES(row_info->pixel_depth,
+            row_info->width);
+   }
+}
+#endif
+
+/* This filters the row, chooses which filter to use, if it has not already
+ * been specified by the application, and then writes the row out with the
+ * chosen filter.
+ */
+#define PNG_MAXSUM (((png_uint_32)(-1)) >> 1)
+#define PNG_HISHIFT 10
+#define PNG_LOMASK ((png_uint_32)0xffffL)
+#define PNG_HIMASK ((png_uint_32)(~PNG_LOMASK >> PNG_HISHIFT))
+void /* PRIVATE */
+png_write_find_filter(png_structp png_ptr, png_row_infop row_info)
+{
+   png_bytep best_row;
+#ifdef PNG_WRITE_FILTER_SUPPORTED
+   png_bytep prev_row, row_buf;
+   png_uint_32 mins, bpp;
+   png_byte filter_to_do = png_ptr->do_filter;
+   png_uint_32 row_bytes = row_info->rowbytes;
+#ifdef PNG_WRITE_WEIGHTED_FILTER_SUPPORTED
+   int num_p_filters = (int)png_ptr->num_prev_filters;
+#endif 
+
+   png_debug(1, "in png_write_find_filter");
+
+#ifndef PNG_WRITE_WEIGHTED_FILTER_SUPPORTED
+  if (png_ptr->row_number == 0 && filter_to_do == PNG_ALL_FILTERS)
+  {
+      /* These will never be selected so we need not test them. */
+      filter_to_do &= ~(PNG_FILTER_UP | PNG_FILTER_PAETH);
+  }
+#endif 
+
+   /* Find out how many bytes offset each pixel is */
+   bpp = (row_info->pixel_depth + 7) >> 3;
+
+   prev_row = png_ptr->prev_row;
+#endif
+   best_row = png_ptr->row_buf;
+#ifdef PNG_WRITE_FILTER_SUPPORTED
+   row_buf = best_row;
+   mins = PNG_MAXSUM;
+
+   /* The prediction method we use is to find which method provides the
+    * smallest value when summing the absolute values of the distances
+    * from zero, using anything >= 128 as negative numbers.  This is known
+    * as the "minimum sum of absolute differences" heuristic.  Other
+    * heuristics are the "weighted minimum sum of absolute differences"
+    * (experimental and can in theory improve compression), and the "zlib
+    * predictive" method (not implemented yet), which does test compressions
+    * of lines using different filter methods, and then chooses the
+    * (series of) filter(s) that give minimum compressed data size (VERY
+    * computationally expensive).
+    *
+    * GRR 980525:  consider also
+    *   (1) minimum sum of absolute differences from running average (i.e.,
+    *       keep running sum of non-absolute differences & count of bytes)
+    *       [track dispersion, too?  restart average if dispersion too large?]
+    *  (1b) minimum sum of absolute differences from sliding average, probably
+    *       with window size <= deflate window (usually 32K)
+    *   (2) minimum sum of squared differences from zero or running average
+    *       (i.e., ~ root-mean-square approach)
+    */
+
+
+   /* We don't need to test the 'no filter' case if this is the only filter
+    * that has been chosen, as it doesn't actually do anything to the data.
+    */
+   if ((filter_to_do & PNG_FILTER_NONE) &&
+       filter_to_do != PNG_FILTER_NONE)
+   {
+      png_bytep rp;
+      png_uint_32 sum = 0;
+      png_uint_32 i;
+      int v;
+
+      for (i = 0, rp = row_buf + 1; i < row_bytes; i++, rp++)
+      {
+         v = *rp;
+         sum += (v < 128) ? v : 256 - v;
+      }
+
+#ifdef PNG_WRITE_WEIGHTED_FILTER_SUPPORTED
+      if (png_ptr->heuristic_method == PNG_FILTER_HEURISTIC_WEIGHTED)
+      {
+         png_uint_32 sumhi, sumlo;
+         int j;
+         sumlo = sum & PNG_LOMASK;
+         sumhi = (sum >> PNG_HISHIFT) & PNG_HIMASK; /* Gives us some footroom */
+
+         /* Reduce the sum if we match any of the previous rows */
+         for (j = 0; j < num_p_filters; j++)
+         {
+            if (png_ptr->prev_filters[j] == PNG_FILTER_VALUE_NONE)
+            {
+               sumlo = (sumlo * png_ptr->filter_weights[j]) >>
+                  PNG_WEIGHT_SHIFT;
+               sumhi = (sumhi * png_ptr->filter_weights[j]) >>
+                  PNG_WEIGHT_SHIFT;
+            }
+         }
+
+         /* Factor in the cost of this filter (this is here for completeness,
+          * but it makes no sense to have a "cost" for the NONE filter, as
+          * it has the minimum possible computational cost - none).
+          */
+         sumlo = (sumlo * png_ptr->filter_costs[PNG_FILTER_VALUE_NONE]) >>
+            PNG_COST_SHIFT;
+         sumhi = (sumhi * png_ptr->filter_costs[PNG_FILTER_VALUE_NONE]) >>
+            PNG_COST_SHIFT;
+
+         if (sumhi > PNG_HIMASK)
+            sum = PNG_MAXSUM;
+         else
+            sum = (sumhi << PNG_HISHIFT) + sumlo;
+      }
+#endif
+      mins = sum;
+   }
+
+   /* Sub filter */
+   if (filter_to_do == PNG_FILTER_SUB)
+   /* It's the only filter so no testing is needed */
+   {
+      png_bytep rp, lp, dp;
+      png_uint_32 i;
+      for (i = 0, rp = row_buf + 1, dp = png_ptr->sub_row + 1; i < bpp;
+           i++, rp++, dp++)
+      {
+         *dp = *rp;
+      }
+      for (lp = row_buf + 1; i < row_bytes;
+         i++, rp++, lp++, dp++)
+      {
+         *dp = (png_byte)(((int)*rp - (int)*lp) & 0xff);
+      }
+      best_row = png_ptr->sub_row;
+   }
+
+   else if (filter_to_do & PNG_FILTER_SUB)
+   {
+      png_bytep rp, dp, lp;
+      png_uint_32 sum = 0, lmins = mins;
+      png_uint_32 i;
+      int v;
+
+#ifdef PNG_WRITE_WEIGHTED_FILTER_SUPPORTED
+      /* We temporarily increase the "minimum sum" by the factor we
+       * would reduce the sum of this filter, so that we can do the
+       * early exit comparison without scaling the sum each time.
+       */
+      if (png_ptr->heuristic_method == PNG_FILTER_HEURISTIC_WEIGHTED)
+      {
+         int j;
+         png_uint_32 lmhi, lmlo;
+         lmlo = lmins & PNG_LOMASK;
+         lmhi = (lmins >> PNG_HISHIFT) & PNG_HIMASK;
+
+         for (j = 0; j < num_p_filters; j++)
+         {
+            if (png_ptr->prev_filters[j] == PNG_FILTER_VALUE_SUB)
+            {
+               lmlo = (lmlo * png_ptr->inv_filter_weights[j]) >>
+                  PNG_WEIGHT_SHIFT;
+               lmhi = (lmhi * png_ptr->inv_filter_weights[j]) >>
+                  PNG_WEIGHT_SHIFT;
+            }
+         }
+
+         lmlo = (lmlo * png_ptr->inv_filter_costs[PNG_FILTER_VALUE_SUB]) >>
+            PNG_COST_SHIFT;
+         lmhi = (lmhi * png_ptr->inv_filter_costs[PNG_FILTER_VALUE_SUB]) >>
+            PNG_COST_SHIFT;
+
+         if (lmhi > PNG_HIMASK)
+            lmins = PNG_MAXSUM;
+         else
+            lmins = (lmhi << PNG_HISHIFT) + lmlo;
+      }
+#endif
+
+      for (i = 0, rp = row_buf + 1, dp = png_ptr->sub_row + 1; i < bpp;
+           i++, rp++, dp++)
+      {
+         v = *dp = *rp;
+
+         sum += (v < 128) ? v : 256 - v;
+      }
+      for (lp = row_buf + 1; i < row_bytes;
+         i++, rp++, lp++, dp++)
+      {
+         v = *dp = (png_byte)(((int)*rp - (int)*lp) & 0xff);
+
+         sum += (v < 128) ? v : 256 - v;
+
+         if (sum > lmins)  /* We are already worse, don't continue. */
+            break;
+      }
+
+#ifdef PNG_WRITE_WEIGHTED_FILTER_SUPPORTED
+      if (png_ptr->heuristic_method == PNG_FILTER_HEURISTIC_WEIGHTED)
+      {
+         int j;
+         png_uint_32 sumhi, sumlo;
+         sumlo = sum & PNG_LOMASK;
+         sumhi = (sum >> PNG_HISHIFT) & PNG_HIMASK;
+
+         for (j = 0; j < num_p_filters; j++)
+         {
+            if (png_ptr->prev_filters[j] == PNG_FILTER_VALUE_SUB)
+            {
+               sumlo = (sumlo * png_ptr->inv_filter_weights[j]) >>
+                  PNG_WEIGHT_SHIFT;
+               sumhi = (sumhi * png_ptr->inv_filter_weights[j]) >>
+                  PNG_WEIGHT_SHIFT;
+            }
+         }
+
+         sumlo = (sumlo * png_ptr->inv_filter_costs[PNG_FILTER_VALUE_SUB]) >>
+            PNG_COST_SHIFT;
+         sumhi = (sumhi * png_ptr->inv_filter_costs[PNG_FILTER_VALUE_SUB]) >>
+            PNG_COST_SHIFT;
+
+         if (sumhi > PNG_HIMASK)
+            sum = PNG_MAXSUM;
+         else
+            sum = (sumhi << PNG_HISHIFT) + sumlo;
+      }
+#endif
+
+      if (sum < mins)
+      {
+         mins = sum;
+         best_row = png_ptr->sub_row;
+      }
+   }
+
+   /* Up filter */
+   if (filter_to_do == PNG_FILTER_UP)
+   {
+      png_bytep rp, dp, pp;
+      png_uint_32 i;
+
+      for (i = 0, rp = row_buf + 1, dp = png_ptr->up_row + 1,
+           pp = prev_row + 1; i < row_bytes;
+           i++, rp++, pp++, dp++)
+      {
+         *dp = (png_byte)(((int)*rp - (int)*pp) & 0xff);
+      }
+      best_row = png_ptr->up_row;
+   }
+
+   else if (filter_to_do & PNG_FILTER_UP)
+   {
+      png_bytep rp, dp, pp;
+      png_uint_32 sum = 0, lmins = mins;
+      png_uint_32 i;
+      int v;
+
+
+#ifdef PNG_WRITE_WEIGHTED_FILTER_SUPPORTED
+      if (png_ptr->heuristic_method == PNG_FILTER_HEURISTIC_WEIGHTED)
+      {
+         int j;
+         png_uint_32 lmhi, lmlo;
+         lmlo = lmins & PNG_LOMASK;
+         lmhi = (lmins >> PNG_HISHIFT) & PNG_HIMASK;
+
+         for (j = 0; j < num_p_filters; j++)
+         {
+            if (png_ptr->prev_filters[j] == PNG_FILTER_VALUE_UP)
+            {
+               lmlo = (lmlo * png_ptr->inv_filter_weights[j]) >>
+                  PNG_WEIGHT_SHIFT;
+               lmhi = (lmhi * png_ptr->inv_filter_weights[j]) >>
+                  PNG_WEIGHT_SHIFT;
+            }
+         }
+
+         lmlo = (lmlo * png_ptr->inv_filter_costs[PNG_FILTER_VALUE_UP]) >>
+            PNG_COST_SHIFT;
+         lmhi = (lmhi * png_ptr->inv_filter_costs[PNG_FILTER_VALUE_UP]) >>
+            PNG_COST_SHIFT;
+
+         if (lmhi > PNG_HIMASK)
+            lmins = PNG_MAXSUM;
+         else
+            lmins = (lmhi << PNG_HISHIFT) + lmlo;
+      }
+#endif
+
+      for (i = 0, rp = row_buf + 1, dp = png_ptr->up_row + 1,
+           pp = prev_row + 1; i < row_bytes; i++)
+      {
+         v = *dp++ = (png_byte)(((int)*rp++ - (int)*pp++) & 0xff);
+
+         sum += (v < 128) ? v : 256 - v;
+
+         if (sum > lmins)  /* We are already worse, don't continue. */
+            break;
+      }
+
+#ifdef PNG_WRITE_WEIGHTED_FILTER_SUPPORTED
+      if (png_ptr->heuristic_method == PNG_FILTER_HEURISTIC_WEIGHTED)
+      {
+         int j;
+         png_uint_32 sumhi, sumlo;
+         sumlo = sum & PNG_LOMASK;
+         sumhi = (sum >> PNG_HISHIFT) & PNG_HIMASK;
+
+         for (j = 0; j < num_p_filters; j++)
+         {
+            if (png_ptr->prev_filters[j] == PNG_FILTER_VALUE_UP)
+            {
+               sumlo = (sumlo * png_ptr->filter_weights[j]) >>
+                  PNG_WEIGHT_SHIFT;
+               sumhi = (sumhi * png_ptr->filter_weights[j]) >>
+                  PNG_WEIGHT_SHIFT;
+            }
+         }
+
+         sumlo = (sumlo * png_ptr->filter_costs[PNG_FILTER_VALUE_UP]) >>
+            PNG_COST_SHIFT;
+         sumhi = (sumhi * png_ptr->filter_costs[PNG_FILTER_VALUE_UP]) >>
+            PNG_COST_SHIFT;
+
+         if (sumhi > PNG_HIMASK)
+            sum = PNG_MAXSUM;
+         else
+            sum = (sumhi << PNG_HISHIFT) + sumlo;
+      }
+#endif
+
+      if (sum < mins)
+      {
+         mins = sum;
+         best_row = png_ptr->up_row;
+      }
+   }
+
+   /* Avg filter */
+   if (filter_to_do == PNG_FILTER_AVG)
+   {
+      png_bytep rp, dp, pp, lp;
+      png_uint_32 i;
+      for (i = 0, rp = row_buf + 1, dp = png_ptr->avg_row + 1,
+           pp = prev_row + 1; i < bpp; i++)
+      {
+         *dp++ = (png_byte)(((int)*rp++ - ((int)*pp++ / 2)) & 0xff);
+      }
+      for (lp = row_buf + 1; i < row_bytes; i++)
+      {
+         *dp++ = (png_byte)(((int)*rp++ - (((int)*pp++ + (int)*lp++) / 2))
+                 & 0xff);
+      }
+      best_row = png_ptr->avg_row;
+   }
+
+   else if (filter_to_do & PNG_FILTER_AVG)
+   {
+      png_bytep rp, dp, pp, lp;
+      png_uint_32 sum = 0, lmins = mins;
+      png_uint_32 i;
+      int v;
+
+#ifdef PNG_WRITE_WEIGHTED_FILTER_SUPPORTED
+      if (png_ptr->heuristic_method == PNG_FILTER_HEURISTIC_WEIGHTED)
+      {
+         int j;
+         png_uint_32 lmhi, lmlo;
+         lmlo = lmins & PNG_LOMASK;
+         lmhi = (lmins >> PNG_HISHIFT) & PNG_HIMASK;
+
+         for (j = 0; j < num_p_filters; j++)
+         {
+            if (png_ptr->prev_filters[j] == PNG_FILTER_VALUE_AVG)
+            {
+               lmlo = (lmlo * png_ptr->inv_filter_weights[j]) >>
+                  PNG_WEIGHT_SHIFT;
+               lmhi = (lmhi * png_ptr->inv_filter_weights[j]) >>
+                  PNG_WEIGHT_SHIFT;
+            }
+         }
+
+         lmlo = (lmlo * png_ptr->inv_filter_costs[PNG_FILTER_VALUE_AVG]) >>
+            PNG_COST_SHIFT;
+         lmhi = (lmhi * png_ptr->inv_filter_costs[PNG_FILTER_VALUE_AVG]) >>
+            PNG_COST_SHIFT;
+
+         if (lmhi > PNG_HIMASK)
+            lmins = PNG_MAXSUM;
+         else
+            lmins = (lmhi << PNG_HISHIFT) + lmlo;
+      }
+#endif
+
+      for (i = 0, rp = row_buf + 1, dp = png_ptr->avg_row + 1,
+           pp = prev_row + 1; i < bpp; i++)
+      {
+         v = *dp++ = (png_byte)(((int)*rp++ - ((int)*pp++ / 2)) & 0xff);
+
+         sum += (v < 128) ? v : 256 - v;
+      }
+      for (lp = row_buf + 1; i < row_bytes; i++)
+      {
+         v = *dp++ =
+          (png_byte)(((int)*rp++ - (((int)*pp++ + (int)*lp++) / 2)) & 0xff);
+
+         sum += (v < 128) ? v : 256 - v;
+
+         if (sum > lmins)  /* We are already worse, don't continue. */
+            break;
+      }
+
+#ifdef PNG_WRITE_WEIGHTED_FILTER_SUPPORTED
+      if (png_ptr->heuristic_method == PNG_FILTER_HEURISTIC_WEIGHTED)
+      {
+         int j;
+         png_uint_32 sumhi, sumlo;
+         sumlo = sum & PNG_LOMASK;
+         sumhi = (sum >> PNG_HISHIFT) & PNG_HIMASK;
+
+         for (j = 0; j < num_p_filters; j++)
+         {
+            if (png_ptr->prev_filters[j] == PNG_FILTER_VALUE_NONE)
+            {
+               sumlo = (sumlo * png_ptr->filter_weights[j]) >>
+                  PNG_WEIGHT_SHIFT;
+               sumhi = (sumhi * png_ptr->filter_weights[j]) >>
+                  PNG_WEIGHT_SHIFT;
+            }
+         }
+
+         sumlo = (sumlo * png_ptr->filter_costs[PNG_FILTER_VALUE_AVG]) >>
+            PNG_COST_SHIFT;
+         sumhi = (sumhi * png_ptr->filter_costs[PNG_FILTER_VALUE_AVG]) >>
+            PNG_COST_SHIFT;
+
+         if (sumhi > PNG_HIMASK)
+            sum = PNG_MAXSUM;
+         else
+            sum = (sumhi << PNG_HISHIFT) + sumlo;
+      }
+#endif
+
+      if (sum < mins)
+      {
+         mins = sum;
+         best_row = png_ptr->avg_row;
+      }
+   }
+
+   /* Paeth filter */
+   if (filter_to_do == PNG_FILTER_PAETH)
+   {
+      png_bytep rp, dp, pp, cp, lp;
+      png_uint_32 i;
+      for (i = 0, rp = row_buf + 1, dp = png_ptr->paeth_row + 1,
+           pp = prev_row + 1; i < bpp; i++)
+      {
+         *dp++ = (png_byte)(((int)*rp++ - (int)*pp++) & 0xff);
+      }
+
+      for (lp = row_buf + 1, cp = prev_row + 1; i < row_bytes; i++)
+      {
+         int a, b, c, pa, pb, pc, p;
+
+         b = *pp++;
+         c = *cp++;
+         a = *lp++;
+
+         p = b - c;
+         pc = a - c;
+
+#ifdef PNG_USE_ABS
+         pa = abs(p);
+         pb = abs(pc);
+         pc = abs(p + pc);
+#else
+         pa = p < 0 ? -p : p;
+         pb = pc < 0 ? -pc : pc;
+         pc = (p + pc) < 0 ? -(p + pc) : p + pc;
+#endif
+
+         p = (pa <= pb && pa <=pc) ? a : (pb <= pc) ? b : c;
+
+         *dp++ = (png_byte)(((int)*rp++ - p) & 0xff);
+      }
+      best_row = png_ptr->paeth_row;
+   }
+
+   else if (filter_to_do & PNG_FILTER_PAETH)
+   {
+      png_bytep rp, dp, pp, cp, lp;
+      png_uint_32 sum = 0, lmins = mins;
+      png_uint_32 i;
+      int v;
+
+#ifdef PNG_WRITE_WEIGHTED_FILTER_SUPPORTED
+      if (png_ptr->heuristic_method == PNG_FILTER_HEURISTIC_WEIGHTED)
+      {
+         int j;
+         png_uint_32 lmhi, lmlo;
+         lmlo = lmins & PNG_LOMASK;
+         lmhi = (lmins >> PNG_HISHIFT) & PNG_HIMASK;
+
+         for (j = 0; j < num_p_filters; j++)
+         {
+            if (png_ptr->prev_filters[j] == PNG_FILTER_VALUE_PAETH)
+            {
+               lmlo = (lmlo * png_ptr->inv_filter_weights[j]) >>
+                  PNG_WEIGHT_SHIFT;
+               lmhi = (lmhi * png_ptr->inv_filter_weights[j]) >>
+                  PNG_WEIGHT_SHIFT;
+            }
+         }
+
+         lmlo = (lmlo * png_ptr->inv_filter_costs[PNG_FILTER_VALUE_PAETH]) >>
+            PNG_COST_SHIFT;
+         lmhi = (lmhi * png_ptr->inv_filter_costs[PNG_FILTER_VALUE_PAETH]) >>
+            PNG_COST_SHIFT;
+
+         if (lmhi > PNG_HIMASK)
+            lmins = PNG_MAXSUM;
+         else
+            lmins = (lmhi << PNG_HISHIFT) + lmlo;
+      }
+#endif
+
+      for (i = 0, rp = row_buf + 1, dp = png_ptr->paeth_row + 1,
+           pp = prev_row + 1; i < bpp; i++)
+      {
+         v = *dp++ = (png_byte)(((int)*rp++ - (int)*pp++) & 0xff);
+
+         sum += (v < 128) ? v : 256 - v;
+      }
+
+      for (lp = row_buf + 1, cp = prev_row + 1; i < row_bytes; i++)
+      {
+         int a, b, c, pa, pb, pc, p;
+
+         b = *pp++;
+         c = *cp++;
+         a = *lp++;
+
+#ifndef PNG_SLOW_PAETH
+         p = b - c;
+         pc = a - c;
+#ifdef PNG_USE_ABS
+         pa = abs(p);
+         pb = abs(pc);
+         pc = abs(p + pc);
+#else
+         pa = p < 0 ? -p : p;
+         pb = pc < 0 ? -pc : pc;
+         pc = (p + pc) < 0 ? -(p + pc) : p + pc;
+#endif
+         p = (pa <= pb && pa <=pc) ? a : (pb <= pc) ? b : c;
+#else /* PNG_SLOW_PAETH */
+         p = a + b - c;
+         pa = abs(p - a);
+         pb = abs(p - b);
+         pc = abs(p - c);
+         if (pa <= pb && pa <= pc)
+            p = a;
+         else if (pb <= pc)
+            p = b;
+         else
+            p = c;
+#endif /* PNG_SLOW_PAETH */
+
+         v = *dp++ = (png_byte)(((int)*rp++ - p) & 0xff);
+
+         sum += (v < 128) ? v : 256 - v;
+
+         if (sum > lmins)  /* We are already worse, don't continue. */
+            break;
+      }
+
+#ifdef PNG_WRITE_WEIGHTED_FILTER_SUPPORTED
+      if (png_ptr->heuristic_method == PNG_FILTER_HEURISTIC_WEIGHTED)
+      {
+         int j;
+         png_uint_32 sumhi, sumlo;
+         sumlo = sum & PNG_LOMASK;
+         sumhi = (sum >> PNG_HISHIFT) & PNG_HIMASK;
+
+         for (j = 0; j < num_p_filters; j++)
+         {
+            if (png_ptr->prev_filters[j] == PNG_FILTER_VALUE_PAETH)
+            {
+               sumlo = (sumlo * png_ptr->filter_weights[j]) >>
+                  PNG_WEIGHT_SHIFT;
+               sumhi = (sumhi * png_ptr->filter_weights[j]) >>
+                  PNG_WEIGHT_SHIFT;
+            }
+         }
+
+         sumlo = (sumlo * png_ptr->filter_costs[PNG_FILTER_VALUE_PAETH]) >>
+            PNG_COST_SHIFT;
+         sumhi = (sumhi * png_ptr->filter_costs[PNG_FILTER_VALUE_PAETH]) >>
+            PNG_COST_SHIFT;
+
+         if (sumhi > PNG_HIMASK)
+            sum = PNG_MAXSUM;
+         else
+            sum = (sumhi << PNG_HISHIFT) + sumlo;
+      }
+#endif
+
+      if (sum < mins)
+      {
+         best_row = png_ptr->paeth_row;
+      }
+   }
+#endif /* PNG_WRITE_FILTER_SUPPORTED */
+   /* Do the actual writing of the filtered row data from the chosen filter. */
+
+   png_write_filtered_row(png_ptr, best_row);
+
+#ifdef PNG_WRITE_FILTER_SUPPORTED
+#ifdef PNG_WRITE_WEIGHTED_FILTER_SUPPORTED
+   /* Save the type of filter we picked this time for future calculations */
+   if (png_ptr->num_prev_filters > 0)
+   {
+      int j;
+      for (j = 1; j < num_p_filters; j++)
+      {
+         png_ptr->prev_filters[j] = png_ptr->prev_filters[j - 1];
+      }
+      png_ptr->prev_filters[j] = best_row[0];
+   }
+#endif
+#endif /* PNG_WRITE_FILTER_SUPPORTED */
+}
+
+
+/* Do the actual writing of a previously filtered row. */
+void /* PRIVATE */
+png_write_filtered_row(png_structp png_ptr, png_bytep filtered_row)
+{
+   png_debug(1, "in png_write_filtered_row");
+
+   png_debug1(2, "filter = %d", filtered_row[0]);
+   /* Set up the zlib input buffer */
+
+   png_ptr->zstream.next_in = filtered_row;
+   png_ptr->zstream.avail_in = (uInt)png_ptr->row_info.rowbytes + 1;
+   /* Repeat until we have compressed all the data */
+   do
+   {
+      int ret; /* Return of zlib */
+
+      /* Compress the data */
+      ret = deflate(&png_ptr->zstream, Z_NO_FLUSH);
+      /* Check for compression errors */
+      if (ret != Z_OK)
+      {
+         if (png_ptr->zstream.msg != NULL)
+            png_error(png_ptr, png_ptr->zstream.msg);
+         else
+            png_error(png_ptr, "zlib error");
+      }
+
+      /* See if it is time to write another IDAT */
+      if (!(png_ptr->zstream.avail_out))
+      {
+         /* Write the IDAT and reset the zlib output buffer */
+         png_write_IDAT(png_ptr, png_ptr->zbuf, png_ptr->zbuf_size);
+         png_ptr->zstream.next_out = png_ptr->zbuf;
+         png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;
+      }
+   /* Repeat until all data has been compressed */
+   } while (png_ptr->zstream.avail_in);
+
+   /* Swap the current and previous rows */
+   if (png_ptr->prev_row != NULL)
+   {
+      png_bytep tptr;
+
+      tptr = png_ptr->prev_row;
+      png_ptr->prev_row = png_ptr->row_buf;
+      png_ptr->row_buf = tptr;
+   }
+
+   /* Finish row - updates counters and flushes zlib if last row */
+   png_write_finish_row(png_ptr);
+
+#ifdef PNG_WRITE_FLUSH_SUPPORTED
+   png_ptr->flush_rows++;
+
+   if (png_ptr->flush_dist > 0 &&
+       png_ptr->flush_rows >= png_ptr->flush_dist)
+   {
+      png_write_flush(png_ptr);
+   }
+#endif
+}
+#endif /* PNG_WRITE_SUPPORTED */
diff --git a/Externals/wxWidgets3/build_wx.sh b/Externals/wxWidgets3/build_wx.sh
index 2173572bfa..82670d6e9f 100755
--- a/Externals/wxWidgets3/build_wx.sh
+++ b/Externals/wxWidgets3/build_wx.sh
@@ -5,7 +5,9 @@ cd wxWidgets
 
 case $OSTYPE in
 darwin*)
+export CC=clang CXX=clang++ CFLAGS="-stdlib=libc++" CXXFLAGS="-stdlib=libc++" CPPFLAGS="-stdlib=libc++"
 BACKEND="osx_cocoa"
+ADD_OPTS=--with-macosx-version-min=10.7 --enable-stl
 ;;
 linux*)
 BACKEND="gtk"
@@ -15,5 +17,5 @@ esac
 mkdir build-local
 cd build-local
 
-../configure --with-$BACKEND --disable-shared --enable-unicode --disable-compat28 --disable-exceptions --disable-fswatcher --without-regex --without-expat --disable-xml --disable-ribbon --disable-propgrid --disable-stc --disable-html --disable-richtext --without-libjpeg --without-libtiff --disable-webview --disable-markup
+../configure --with-$BACKEND --disable-shared --enable-unicode --disable-compat28 --disable-exceptions --disable-fswatcher --without-regex --without-expat --disable-xml --disable-ribbon --disable-propgrid --disable-stc --disable-html --disable-richtext --without-libjpeg --without-libtiff --disable-webview --disable-markup $ADD_OPTS
 make
diff --git a/Externals/wxWidgets3/wx/wxcocoa.h b/Externals/wxWidgets3/wx/wxcocoa.h
index 841d17e949..33a19cda5b 100644
--- a/Externals/wxWidgets3/wx/wxcocoa.h
+++ b/Externals/wxWidgets3/wx/wxcocoa.h
@@ -16,7 +16,7 @@
 #endif /* __cplusplus */
 
 /* fill in with the string wxGetOsDescription() will return */
-#define WXWIN_OS_DESCRIPTION "Darwin 11.3.0 i386"
+#define WXWIN_OS_DESCRIPTION "Darwin 11.4.2 x86_64"
 
 /* the installation location prefix from configure */
 #define wxINSTALL_PREFIX "/usr/local"
@@ -205,7 +205,7 @@
 
 
 
-#define wxUSE_STL 0
+#define wxUSE_STL 1
 
 #if defined(__DMC__) || defined(__WATCOMC__) \
         || (defined(_MSC_VER) && _MSC_VER < 1200)
@@ -214,7 +214,7 @@
     #define wxUSE_STD_DEFAULT  0
 #endif
 
-#define wxUSE_STD_CONTAINERS 0
+#define wxUSE_STD_CONTAINERS 1
 
 #define wxUSE_STD_IOSTREAM 1
 
@@ -715,7 +715,7 @@
 /*
  * Define if your compiler has compliant std::string::compare
  */
-/* #undef HAVE_STD_STRING_COMPARE */
+#define HAVE_STD_STRING_COMPARE 1
 /*
  * Define if your compiler has <hash_map>
  */
@@ -736,12 +736,12 @@
 /*
  * Define if your compiler has std::unordered_map
  */
-/* #undef HAVE_STD_UNORDERED_MAP */
+#define HAVE_STD_UNORDERED_MAP 1
 
 /*
  * Define if your compiler has std::unordered_set
  */
-/* #undef HAVE_STD_UNORDERED_SET */
+#define HAVE_STD_UNORDERED_SET 1
 
 /*
  * Define if your compiler has std::tr1::unordered_map
@@ -756,12 +756,12 @@
 /*
  * Define if your compiler has <tr1/type_traits>
  */
-#define HAVE_TR1_TYPE_TRAITS 1
+/* #undef HAVE_TR1_TYPE_TRAITS */
 
 /*
  * Define if your compiler has <type_traits>
  */
-/* #undef HAVE_TYPE_TRAITS */
+#define HAVE_TYPE_TRAITS 1
 
 /*
  * Define if the compiler supports simple visibility declarations.
@@ -830,7 +830,7 @@
 /*
  * Define if compiler has __thread keyword.
  */
-/* #undef HAVE___THREAD_KEYWORD */
+#define HAVE___THREAD_KEYWORD 1
 /*
  * Define if large (64 bit file offsets) files are supported.
  */
@@ -996,25 +996,25 @@
 #define HAVE_USLEEP 1
 
 /* Define if you have wcscasecmp() function  */
-/* #undef HAVE_WCSCASECMP 1 */
+#define HAVE_WCSCASECMP 1
 
 /* Define if you have wcsncasecmp() function  */
-/* #undef HAVE_WCSNCASECMP 1 */
+#define HAVE_WCSNCASECMP 1
 
 /* Define if you have wcslen function  */
 #define HAVE_WCSLEN 1
 
 /* Define if you have wcsdup function  */
-/* #undef HAVE_WCSDUP 1 */
+#define HAVE_WCSDUP 1
 
 /* Define if you have wcsftime() function  */
 #define HAVE_WCSFTIME 1
 
 /* Define if you have strnlen() function */
-/* #undef HAVE_STRNLEN 1 */
+#define HAVE_STRNLEN 1
 
 /* Define if you have wcsnlen() function */
-/* #undef HAVE_WCSNLEN 1 */
+#define HAVE_WCSNLEN 1
 
 /* Define if you have wcstoull() and wcstoll() */
 /* #undef HAVE_WCSTOULL */
diff --git a/Languages/Languages.vcxproj b/Languages/Languages.vcxproj
index b10b94bfcd..1e1ac6d7ba 100644
--- a/Languages/Languages.vcxproj
+++ b/Languages/Languages.vcxproj
@@ -74,6 +74,7 @@
     <msgfmt Include="po/pt.po" />
     <msgfmt Include="po/ru.po" />
     <msgfmt Include="po/sr.po" />
+    <msgfmt Include="po/sv.po" />
     <msgfmt Include="po/tr.po" />
     <msgfmt Include="po/zh_CN.po" />
     <msgfmt Include="po/zh_TW.po" />
@@ -99,8 +100,9 @@
     <None Include="po/pt_BR.po" />
     <None Include="po/pt.po" />
     <None Include="po/ru.po" />
-    <None Include="po/tr.po" />
     <None Include="po/sr.po" />
+    <None Include="po/sv.po" />
+    <None Include="po/tr.po" />
     <None Include="po/zh_CN.po" />
     <None Include="po/zh_TW.po" />
   </ItemGroup>
diff --git a/Languages/po/ar.po b/Languages/po/ar.po
index 21b3dabdbd..63679d1f50 100644
--- a/Languages/po/ar.po
+++ b/Languages/po/ar.po
@@ -3,13 +3,13 @@
 # This file is distributed under the same license as the dolphin-emu package.
 #
 # Translators:
-# mansoor, 2011.
+# mansoor, 2011
 msgid ""
 msgstr ""
 "Project-Id-Version: Dolphin Emulator\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-10 08:56-0500\n"
-"PO-Revision-Date: 2013-02-02 17:46+0000\n"
+"POT-Creation-Date: 2013-04-18 23:00-0500\n"
+"PO-Revision-Date: 2013-04-04 08:13+0000\n"
 "Last-Translator: glennricster <glennricster@gmail.com>\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/dolphin-emu/"
 "language/ar/)\n"
@@ -20,21 +20,21 @@ msgstr ""
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
 "&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:511
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:499
 msgid " (too many to display)"
 msgstr "(كثير جدا العرض)"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:270
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:273
 #: Source/Core/DolphinWX/Src/NetWindow.cpp:491
 #: Source/Core/DolphinWX/Src/NetWindow.cpp:530
 msgid " Game : "
 msgstr " لعبة : "
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:507
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494
 msgid "! NOT"
 msgstr "! لا"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:70
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:58
 #, c-format
 msgid ""
 "\"%s\" does not exist.\n"
@@ -43,47 +43,57 @@ msgstr ""
 "\"%s\" لا وجود لها.\n"
 " إنشاء جديد بطاقة الذاكرة ?"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:142
+#: Source/Core/Core/Src/CoreParameter.cpp:131
 #, c-format
 msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:722
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:721
 #, c-format
 msgid "%08X:  "
 msgstr "%08X:  "
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:196
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:183
 #, c-format
 msgid "%1$sCopy%1$s"
 msgstr "%1$sنسخ%1$s"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:128
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:296
+#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:113
+#, c-format
+msgid "%d samples"
+msgstr ""
+
+#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:112
+#, c-format
+msgid "%d samples (quality level %d)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:121
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:289
 #, c-format
 msgid "%s already exists, overwrite?"
 msgstr "%s موجود بالفعل، الكتابة فوقة؟"
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:167
+#: Source/Core/DiscIO/Src/CompressedBlob.cpp:154
 #, c-format
 msgid "%s failed to be scrubbed. Probably the image is corrupt."
 msgstr "%s فشل في أن تكون نقيت. ربما كانت الصورة معطوب."
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:95
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:83
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
 " Card file size is invalid (0x%x bytes)"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:110
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:98
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
 " Card size is invalid (0x%x bytes)"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:90
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:78
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
@@ -92,48 +102,37 @@ msgstr ""
 "%s فشل تحميل في بطاقة الذاكرة \n"
 "الملف ليس كبيرا بما يكفي لتكون بطاقة الذاكرة ملف صحيح (0x%x bytes)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:367
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:359
 #, c-format
 msgid "%s failed to open"
 msgstr "%s فشل في فتح"
 
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:97
-#, c-format
-msgid ""
-"%s has an incorrect hash.\n"
-"Would you like to stop now to fix the problem?\n"
-"If you select \"No\", audio will be garbled."
-msgstr ""
-"%s لديه التجزئة غير صحيحة.\n"
-"تريد أن تتوقف الآن لإصلاح المشكلة?\n"
-"سيتم تشويش الصوت \"لا\", إذا قمت باختيار."
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:360
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:352
 #, c-format
 msgid "%s is a 0 byte file"
 msgstr "%s ملف 0 بايت"
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:159
+#: Source/Core/DiscIO/Src/CompressedBlob.cpp:146
 #, c-format
 msgid "%s is already compressed! Cannot compress it further."
 msgstr "%s مضغوط بالفعل! لا يستطيع أن يضغط أكثر من ذلك."
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:345
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:337
 #, c-format
 msgid "%s is too long for the filename, max chars is 45"
 msgstr "%s اسم الملف طويل جدا الحد الاقصى هو 45 "
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:202
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:189
 #, c-format
 msgid "%sDelete%s"
 msgstr "%sمسح%s"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:200
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:187
 #, c-format
 msgid "%sExport GCI%s"
 msgstr "%sتصدير GCI%s"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:198
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:185
 #, c-format
 msgid "%sImport GCI%s"
 msgstr "%sاستيراد GCI%s"
@@ -143,251 +142,273 @@ msgstr "%sاستيراد GCI%s"
 msgid "%u Free Blocks; %u Free Dir Entries"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:506
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:493
 msgid "&& AND"
 msgstr "&& و"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:295
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:301
 msgid "&About..."
 msgstr "&حول البرنامج  "
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:99
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:100
 msgid "&Boot from DVD Drive..."
 msgstr "&التشغيل من محرك الاقراص"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:231
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:234
 msgid "&Breakpoints"
 msgstr "&نقاط التوقف"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:110
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:111
 msgid "&Browse for ISOs..."
 msgstr "&استعراض الايزو "
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:192
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:195
 msgid "&Cheats Manager"
 msgstr "&مدير الاسرار"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:177
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:180
 msgid "&DSP Settings"
 msgstr "&إعدادات الصوت"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:885
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:876
 msgid "&Delete ISO..."
 msgstr "&مسح ايزو"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:903
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:897
 msgid "&Delete selected ISOs..."
 msgstr "&حذف تحديد ايزو"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:170
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:173
 msgid "&Emulation"
 msgstr "&محاكاة"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:113
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:114
 msgid "&File"
 msgstr "&ملف"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:335
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:341
 msgid "&Frame Advance"
 msgstr "&الاطار المسبق"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:352
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:358
 msgid "&Fullscreen"
 msgstr "&ملء الشاشة"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:176
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:179
 msgid "&Graphics Settings"
 msgstr "&إعدادات الرسومات"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:296
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:302
 msgid "&Help"
 msgstr "&مساعدة"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:180
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:183
 msgid "&Hotkey Settings"
 msgstr "&إعدادات الاختصارات"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:233
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:236
 msgid "&JIT"
 msgstr "&JIT"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:148
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:149
 msgid "&Load State"
 msgstr "&تحميل الحالة"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:190
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:193
 msgid "&Memcard Manager (GC)"
 msgstr "&بطاقه الذكره جيم كيوب"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:232
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:235
 msgid "&Memory"
 msgstr "&الذاكرة"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:313
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:319
 msgid "&Open..."
 msgstr "&فتح"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:186
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:189
 msgid "&Options"
 msgstr "&خيارات"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:324
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:330
 msgid "&Pause"
 msgstr "&وقفة"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:326
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:332
 msgid "&Play"
 msgstr "&ابداء اللعبه"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:867
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:858
 msgid "&Properties"
 msgstr "&خصائص"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:348
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:354
 msgid "&Read-only mode"
 msgstr "&وضع للقراءة فقط"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:319
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:325
 msgid "&Refresh List"
 msgstr "&تحديث القائمة"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:230
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:233
 msgid "&Registers"
 msgstr "&تسجل"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:332
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:338
 msgid "&Reset"
 msgstr "&إعادة اللعبه"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:234
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:237
 msgid "&Sound"
 msgstr "&الصوت"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:329
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:335
 msgid "&Stop"
 msgstr "اغلق اللعبه"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:207
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:210
 msgid "&Tools"
 msgstr "&أدوات"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:235
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:238
 msgid "&Video"
 msgstr "&فديو"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:284
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:287
 msgid "&View"
 msgstr "&القائمة"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:179
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:182
 msgid "&Wiimote Settings"
 msgstr "&إعدادات تحكم الوي"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:868
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:859
 msgid "&Wiki"
 msgstr "&معلومات عن اللعبة"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504
 msgid "'"
 msgstr "'"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:59
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:46
 msgid "(-)+zFar"
 msgstr "(-)+zFar"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:54
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:41
 msgid "(-)+zNear"
 msgstr "(-)+zNear"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:99
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:86
 msgid "(UNKNOWN)"
 msgstr "(معروف)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:376
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:384
 msgid "(off)"
 msgstr "(ايقاف)"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:655
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:654
 msgid "0x44"
 msgstr "0x44"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+msgid "1.5x Native (960x792)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:158
 msgid "16 bit"
 msgstr "16 بت"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+msgid "1x Native (640x528)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+msgid "2.5x Native (1600x1320)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+msgid "2x Native (1280x1056)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:159
 msgid "32 bit"
 msgstr "32 بت"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:412
 msgid "3D Vision"
 msgstr "الرؤية ثلاثية الأبعاد"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+msgid "3x Native (1920x1584)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+msgid "4x Native (2560x2112)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:157
 msgid "8 bit"
 msgstr "8 بت"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:43
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:30
 msgid "<Insert name here>"
 msgstr "<أدخل اسم هنا>"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:255
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:262
 msgid "<No resolutions found>"
 msgstr "<لم يتم العثور على القرارات>"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:104
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84
 msgid "<Nothing>"
 msgstr "<لا شيء>"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:162
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:162
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:150
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:150
 msgid "<Press Key>"
 msgstr "<اضغط على مفتاح>"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286
 msgid "<System>"
 msgstr "<النظام>"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695
 msgid "A"
 msgstr "A"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:201
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:235
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:204
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:238
 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:353
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:387
 msgid "A game is not currently running."
 msgstr "اللعبة ليست قيد التشغيل حاليا."
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:68
-#, fuzzy
 msgid ""
 "A supported bluetooth device could not be found.\n"
 "You must manually connect your wiimotes."
 msgstr ""
-"لم يتم العثور على جهاز بلوتوث!\n"
-"(فقط بلوتوث مايكروسوفت معتمد.)"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:109
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:100
+#, fuzzy
 msgid ""
 "ALERT:\n"
 "\n"
-"NetPlay will currently only work properly when using the following "
-"settings:\n"
-" - Dual Core [OFF]\n"
-" - Audio Throttle [OFF]\n"
-" - DSP-HLE with \"Null Audio\" or DSP-LLE\n"
-" - Manually set the exact number of controllers that will be used to "
-"[Standard Controller]\n"
+"Netplay will only work with the following settings:\n"
+" - Enable Dual Core [OFF]\n"
+" - DSP Emulator Engine Must be the same on all computers!\n"
+" - DSP on Dedicated Thread [OFF]\n"
+" - Framelimit NOT set to [Audio]\n"
+" - Manually set the exact number of controllers to be used to [Standard "
+"Controller]\n"
 "\n"
-"All players should try to use the same Dolphin version and settings.\n"
-"Disable all memory cards or send them to all players before starting.\n"
-"Wiimote support has not been implemented.\n"
+"All players should use the same Dolphin version and settings.\n"
+"All memory cards must be identical between players or disabled.\n"
+"Wiimote support has not been implemented!\n"
 "\n"
-"You must forward TCP port to host!!"
+"The host must have the chosen TCP port open/forwarded!\n"
 msgstr ""
 "تنبيه:\n"
 "\n"
@@ -403,17 +424,17 @@ msgstr ""
 "\n"
 "يجب عليك إعادة توجيه البرنامج منفذ الهوست!!"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:111
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:116
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96
 msgid "AM-Baseboard"
 msgstr "AM-Baseboard"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:299
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:115
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:300
 msgid "AR Codes"
 msgstr "اسرار"
 
-#: Source/Core/DolphinWX/Src/AboutDolphin.h:33
+#: Source/Core/DolphinWX/Src/AboutDolphin.h:21
 msgid "About Dolphin"
 msgstr "ترجمة البرنامج بواسطة منصور العسيري"
 
@@ -421,15 +442,11 @@ msgstr "ترجمة البرنامج بواسطة منصور العسيري"
 msgid "Acceleration"
 msgstr "تسريع"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:463
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473
 msgid "Accuracy:"
 msgstr "ضبط:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317
-msgid "Accurate VBeam emulation"
-msgstr "Accurate VBeam emulation"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97
 msgid ""
 "Accurately emulate EFB copies.\n"
 "Some games depend on this for certain graphical effects or gameplay "
@@ -442,12 +459,12 @@ msgstr ""
 "\n"
 "إذا لم تكن متأكدا اترك هذا التحقق."
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:239
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:239
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:227
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:227
 msgid "Action"
 msgstr "العمل"
 
-#: Source/Core/Core/Src/ARDecrypt.cpp:481
+#: Source/Core/Core/Src/ARDecrypt.cpp:469
 #, c-format
 msgid ""
 "Action Replay Code Decryption Error:\n"
@@ -457,102 +474,102 @@ msgid ""
 "%s"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:667
+#: Source/Core/Core/Src/ActionReplay.cpp:657
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:755
+#: Source/Core/Core/Src/ActionReplay.cpp:745
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide "
 "(%s)"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:547
+#: Source/Core/Core/Src/ActionReplay.cpp:537
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And "
 "Fill (%s)"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:607
+#: Source/Core/Core/Src/ActionReplay.cpp:597
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Write To "
 "Pointer (%s)"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:802
+#: Source/Core/Core/Src/ActionReplay.cpp:792
 #, c-format
 msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:682
+#: Source/Core/Core/Src/ActionReplay.cpp:672
 #, c-format
 msgid ""
 "Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)\n"
 "Master codes are not needed. Do not use master codes."
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:196
+#: Source/Core/Core/Src/ActionReplay.cpp:184
 #, c-format
 msgid "Action Replay Error: invalid AR code line: %s"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:872
+#: Source/Core/Core/Src/ActionReplay.cpp:862
 #, c-format
 msgid "Action Replay: Conditional Code: Invalid Size %08x (%s)"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:945
+#: Source/Core/Core/Src/ActionReplay.cpp:935
 #, c-format
 msgid "Action Replay: Invalid Normal Code Type %08x (%s)"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:896
+#: Source/Core/Core/Src/ActionReplay.cpp:886
 #, c-format
 msgid "Action Replay: Normal Code %i: Invalid subtype %08x (%s)"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:838
+#: Source/Core/Core/Src/ActionReplay.cpp:828
 #, c-format
 msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:242
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:247
 msgid "Adapter:"
 msgstr "كرت الشاشه :"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:76
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:63
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:63
 msgid "Add"
 msgstr "أضف"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1275
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1301
 msgid "Add ActionReplay Code"
 msgstr "إضافة رمز ActionReplay"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1204
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1230
 msgid "Add Patch"
 msgstr "أضف باتش"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:507
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:528
 msgid "Add new pane"
 msgstr "إضافة جزء جديد"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:404
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:426
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:811
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:408
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:430
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:792
 msgid "Add..."
 msgstr "أضف"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:90
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:81
 msgid "Address :"
 msgstr "العنوان :"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:58
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:45
 msgid ""
 "Adds the specified value to zFar Parameter.\n"
 "Two ways to express the floating point values.\n"
@@ -563,7 +580,7 @@ msgid ""
 "NOTE: Check LogWindow/Console for the acquired values."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:53
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:40
 msgid ""
 "Adds the specified value to zNear Parameter.\n"
 "Two ways to express the floating point values.\n"
@@ -574,48 +591,48 @@ msgid ""
 "NOTE: Check LogWindow/Console for the acquired values."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:755
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:744
 msgid "Adjust the analog control pressure required to activate buttons."
 msgstr "ضبط السيطرة على ضغط التناظرية المطلوبة لتنشيط الأزرار."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:509
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:522
 msgid "Advanced"
 msgstr "متقدم"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561
 msgid "Advanced Settings"
 msgstr "إعدادات متقدمة"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:584
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:587
 msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)"
 msgstr "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:816
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:797
 msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)"
 msgstr "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1189
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1190
 msgid "All Gamecube GCM files (gcm)"
 msgstr "جميع ملفات الجيم كيوب (gcm)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1390
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1404
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1417
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1431
 msgid "All Save States (sav, s##)"
 msgstr "حفظ جميع الحالات (sav, s##)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1187
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1188
 msgid "All Wii ISO files (iso)"
 msgstr "جميع ملفات ايزو الوي"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1207
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1208
 msgid "All compressed GC/Wii ISO files (gcz)"
 msgstr "جميع مضغوط GC/Wii ISO files (gcz)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:124
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:104
 msgid "All files (*.*)|*.*"
 msgstr "جميع الملفات (*.*)|*.*"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123
 msgid ""
 "Allows toggling certain options via the hotkeys 3 (Internal Resolution), 4 "
 "(Aspect Ratio), 5 (Copy EFB) and 6 (Fog) within the emulation window.\n"
@@ -623,39 +640,39 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:285
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:272
 msgid "Analyze"
 msgstr "تحليل"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:298
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:285
 msgid "Angle"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:367
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:375
 msgid "Anisotropic Filtering:"
 msgstr "تصفية متباينة الخواص :"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:350
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:358
 msgid "Anti-Aliasing:"
 msgstr "تنعيم الحواف:"
 
-#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:308
+#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:299
 msgid "Apploader is the wrong size...is it really an apploader?"
 msgstr "محمل التطبيق هو حجم الخطأ... هل حقا محمل التطبيق؟"
 
-#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:302
+#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:293
 msgid "Apploader unable to load from file"
 msgstr "Apploader غير قادر على تحميل ملف من"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:841
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:822
 msgid "Apploader:"
 msgstr "Apploader:"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:135
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:122
 msgid "Apply"
 msgstr "تطبيق"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124
 msgid ""
 "Apply a post-processing effect after finishing a frame.\n"
 "\n"
@@ -665,11 +682,11 @@ msgstr ""
 "\n"
 "إذا لم تكن متأكدا حدد إيقاف."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287
 msgid "Arabic"
 msgstr "العربية"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:614
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:603
 #, c-format
 msgid "Are you sure you want to delete \"%s\"?"
 msgstr "هل أنت متأكد أنك تريد حذف \"%s\"?"
@@ -684,46 +701,50 @@ msgstr "هل أنت متأكد أنك تريد حذف هذه الملف؟ "
 msgid "Are you sure you want to delete this file?  It will be gone forever!"
 msgstr "هل أنت متأكد أنك تريد حذف هذه الملفات؟"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:789
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:277
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:44
+msgid "Arm JIT (experimental)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:285
 msgid "Aspect Ratio:"
 msgstr "نسبة العرض :"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:70
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:58
 msgid "At least one pane must remain open."
 msgstr "يجب أن لا يقل عن جزء واحد لا تزال مفتوحة."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:553
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533
 msgid "Audio"
 msgstr "الصوت"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:694
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675
 msgid "Audio Backend:"
 msgstr "صوت الخلفية :"
 
-#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:41
+#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:28
 msgid "AudioCommon: Error opening AO device.\n"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:275
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283
 msgid "Auto"
 msgstr "تلقائي"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:337
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345
 msgid "Auto (Multiple of 640x528)"
 msgstr "تلقائي (Multiple of 640x528)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:337
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345
 msgid "Auto (Window Size)"
 msgstr "تلقائي حجم النافذة"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:297
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305
 msgid "Auto adjust Window Size"
 msgstr "ضبط حجم النافذة تلقائي "
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77
 msgid ""
 "Automatically adjusts the window size to your internal resolution.\n"
 "\n"
@@ -733,160 +754,160 @@ msgstr ""
 "\n"
 "إذا لم تكن متأكدا اترك هذا غير محددة."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:697
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696
 msgid "B"
 msgstr "B"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:755
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:754
 msgid "BP register "
 msgstr "BP تسجل"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:27
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:14
 msgid "Back"
 msgstr "رجوع"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:698
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:679
 msgid "Backend Settings"
 msgstr "إعدادات الخلفية"
 
-#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:60
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:206
+#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:47
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:211
 msgid "Backend:"
 msgstr "الخلفية:"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:318
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:95
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:305
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:82
 msgid "Background Input"
 msgstr "خلفية الإدخال"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:279
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:266
 msgid "Backward"
 msgstr "الى الوراء"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:264
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:257
 msgid "Bad File Header"
 msgstr "سيء  بداية الملف "
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:627
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:621
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:290
 msgid "Banner"
 msgstr "بنر"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:519
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:529
 msgid "Banner Details"
 msgstr "تفاصيل بنر"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491
 msgid "Banner:"
 msgstr "بنر:"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:57
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:61
 msgid "Bar"
 msgstr "شريط"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:308
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:316
 msgid "Basic"
 msgstr "الأساسية"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555
 msgid "Basic Settings"
 msgstr "إعدادات أساسية"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:22
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Bass"
 msgstr "صوت عميق"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:186
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:174
 msgid "Block Allocation Table checksum failed"
 msgstr "كتلة الاختباري جدول تخصيص فشل"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:631
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625
 msgid "Blocks"
 msgstr "كتل"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:21
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Blue"
 msgstr "أزرق"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:24
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Blue Left"
 msgstr "اليسار أزرق"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:25
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Blue Right"
 msgstr "اليمين أزرق"
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:87
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270
 msgid "Bottom"
 msgstr "أسفل"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:238
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:225
 #, c-format
 msgid "Bound Controls: %lu"
 msgstr "يلزم التحكم: %lu"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348
 msgid "Broken"
 msgstr "معطلة"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:422
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:428
 msgid "Browse"
 msgstr "أستعرض"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:256
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:243
 msgid "Browse for a directory to add"
 msgstr "لتصفح دليل لإضافة"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:422
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:428
 msgid "Browse for an ISO directory..."
 msgstr "لاستعراض الدليل ايزو"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1079
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1080
 msgid "Browse for output directory"
 msgstr "لاستعراض الدليل الإخراج"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:328
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:331
 msgid "Buffer:"
 msgstr "العازلة :"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:58
 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:119
+#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:106
 msgid "Buttons"
 msgstr "أزرار"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317
 msgid ""
 "Bypass the clearing of the data cache by the DCBZ instruction. Usually leave "
 "this option disabled."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:698
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:697
 msgid "C"
 msgstr "C"
 
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:77
+#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:64
 msgid "C Stick"
 msgstr "العصا الأيمن "
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:77
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:64
 msgid "C-Stick"
 msgstr "العصا الأيمن "
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:764
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:763
 msgid "CP reg"
 msgstr "CP reg"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:567
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547
 msgid "CPU Emulator Engine"
 msgstr "محرك محاكي المعالج"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:490
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500
 msgid "Cache Display Lists"
 msgstr "شاشة القوائم المؤقته"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88
 msgid ""
 "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n"
 "Decreases emulation speed by some percent (depending on your GPU).\n"
@@ -900,23 +921,38 @@ msgstr ""
 "\n"
 "إذا لم تكن متأكدا اترك هذا غير محددة."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1858
+#, c-format
+msgid "Can't find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x"
+msgstr ""
+
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1872
+#, c-format
+msgid "Can't find WiiMote by connection handle %02x"
+msgstr ""
+
+#: Source/Core/Core/Src/HW/DVDInterface.cpp:669
+#: Source/Core/Core/Src/HW/DVDInterface.cpp:679
+msgid "Can't read from DVD_Plugin - DVD-Interface: Fatal Error"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:124
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:28
 msgid "Cancel"
 msgstr "إلغاء"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:91
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:178
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:240
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:84
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:171
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:233
 #, c-format
 msgid "Cannot open %s"
 msgstr "لا يمكن فتح %s"
 
-#: Source/Core/Core/Src/CoreTiming.cpp:141
+#: Source/Core/Core/Src/CoreTiming.cpp:128
 msgid "Cannot unregister events with events pending"
 msgstr "لا يمكن إلغاء تسجيل الأحداث مع الأحداث المعلقة"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1078
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1061
 #, c-format
 msgid ""
 "Cannot use that file as a memory card.\n"
@@ -927,7 +963,7 @@ msgstr ""
 "%s\n"
 "ليست ذاكرة جيم كيوب ملف بطاقة صالحة"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1108
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1091
 msgid ""
 "Cannot use that file as a memory card.\n"
 "Are you trying to use the same file in both slots?"
@@ -935,30 +971,15 @@ msgstr ""
 "لا يمكن استخدام هذا الملف كبطاقة الذاكرة.\n"
 "هل تحاول استخدام نفس الملف في كل من فتحات?"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1867
-#, 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:1881
-#, c-format
-msgid "Cant find WiiMote by connection handle %02x"
-msgstr "غير قادر على العثور ويموت بواسطة معالج الاتصال %02x"
-
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:679
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:689
-msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:52
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:39
 msgid "Caps Lock"
 msgstr "Caps Lock"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288
 msgid "Catalan"
 msgstr "الكاتالونية"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:311
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:298
 msgid "Center"
 msgstr "مركز"
 
@@ -966,12 +987,12 @@ msgstr "مركز"
 msgid "Change"
 msgstr "تغيير"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:316
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:322
 msgid "Change &Disc..."
 msgstr "تغيير &القرص"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:179
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:179
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:167
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:167
 msgid "Change Disc"
 msgstr "تغيير القرص"
 
@@ -979,7 +1000,7 @@ msgstr "تغيير القرص"
 msgid "Change Game"
 msgstr "تغيير اللعبة"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:515
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495
 msgid ""
 "Change the language of the user interface.\n"
 "Requires restart."
@@ -987,102 +1008,102 @@ msgstr ""
 "تغيير لغة واجهة المستخدم.\n"
 "يتطلب إعادة التشغيل."
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:60
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:47
 msgid "Changes sign to zFar Parameter (after correction)"
 msgstr "Changes sign to zFar Parameter (بعد التصحيح)"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:55
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:42
 msgid "Changes sign to zNear Parameter (after correction)"
 msgstr "Changes sign to zNear Parameter (بعد التصحيح)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:519
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499
 msgid "Changing this will have no effect while the emulator is running!"
 msgstr "تغيير هذه ليس لها أي أثر في حين أن المحاكي قيد التشغيل!"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:295
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:298
 msgid "Chat"
 msgstr "شات"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:47
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:34
 msgid "Cheat Code"
 msgstr "اسرار"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:118
 msgid "Cheat Search"
 msgstr "بحث عن اسرار"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:38
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:25
 msgid "Cheats Manager"
 msgstr "قائمة الاسرار"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:633
 msgid "Check Partition Integrity"
 msgstr "تحقق سلامة التقسيم"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:864
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:880
 msgid "Checking integrity..."
 msgstr "التحقق من سلامة ..."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289
 msgid "Chinese (Simplified)"
 msgstr "الصينية المبسطة"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290
 msgid "Chinese (Traditional)"
 msgstr "الصينية التقليدية"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:818
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:799
 msgid "Choose a DVD root directory:"
 msgstr "DVD اختيار الدليل أصل  :"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:822
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803
 msgid "Choose a NAND root directory:"
 msgstr "Choose a NAND root directory:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:815
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:796
 msgid "Choose a default ISO:"
 msgstr "اختيار ايزو الافتراضية :"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1236
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1219
 msgid "Choose a directory to add"
 msgstr "اختيار دليل لإضافة"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1065
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1048
 msgid "Choose a file to open"
 msgstr "اختيار ملف لفتح"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:217
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:204
 msgid "Choose a memory card:"
 msgstr "اختيار بطاقة الذاكرة :"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:819
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800
 msgid ""
 "Choose file to use as apploader: (applies to discs constructed from "
 "directories only)"
 msgstr ""
 "اختيار ملف لاستخدام رافعة التطبيقات: (ينطبق على الأقراص مصنوعة من الادله فقط)"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:767
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:806
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:781
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:822
 msgid "Choose the folder to extract to"
 msgstr "اختيار مجلد لاستخراج"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:297
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:284
 msgid "Circle Stick"
 msgstr "دائرة العصا"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:52
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:56
 msgid "Classic"
 msgstr "الكلاسيكية"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:144
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:43
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:487
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:913
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:137
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:30
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:474
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:904
 msgid "Clear"
 msgstr "أزال"
 
-#: Source/Core/Core/Src/NetPlayServer.cpp:259
+#: Source/Core/Core/Src/NetPlayServer.cpp:263
 msgid ""
 "Client disconnect while game is running!! NetPlay is disabled. You must "
 "manually stop the game."
@@ -1090,122 +1111,122 @@ msgstr ""
 "أثناء قطع الاتصال اللعبة العميل قيد التشغيل! يتم تعطيل اللعب شبكة. يجب عليك "
 "يدويا إيقاف اللعبة."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:298
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:247
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:552
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:578
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:285
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:234
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:562
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:590
 msgid "Close"
 msgstr "إغلاق"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:174
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:177
 msgid "Co&nfigure..."
 msgstr "الإعدادات العامة"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:86
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:73
 msgid "Code Info"
 msgstr "رمز المعلومات"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:568
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:556
 msgid "Code: "
 msgstr "رمز: "
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:35
 msgid "Command"
 msgstr "الأمر"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:629
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:623
 msgid "Comment"
 msgstr "التعليق"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489
 msgid "Comment:"
 msgstr "التعليق:"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:893
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:884
 msgid "Compress ISO..."
 msgstr "ضغط ايزو"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:905
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:899
 msgid "Compress selected ISOs..."
 msgstr "اختيار ضغط ايزو"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1088
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1224
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1089
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1225
 msgid "Compressing ISO"
 msgstr "ضغط ايزو"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:429
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:435
 msgid "Config"
 msgstr "إعدادات"
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:37
-#: Source/Core/DolphinWX/Src/InputConfigDiag.h:135
-#: Source/Core/DolphinWX/Src/InputConfigDiag.h:154
+#: Source/Core/DolphinWX/Src/InputConfigDiag.h:122
+#: Source/Core/DolphinWX/Src/InputConfigDiag.h:141
 msgid "Configure"
 msgstr "إعدادات"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:111
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:98
 msgid "Configure Control"
 msgstr "إعدادات التحكم"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:306
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
 #: Source/Core/DolphinWX/Src/NetWindow.cpp:583
 msgid "Configure Pads"
 msgstr "تكوين منصات"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:429
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:435
 msgid "Configure..."
 msgstr "إعدادات"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1119
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1147
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1217
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1120
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1218
 msgid "Confirm File Overwrite"
 msgstr "تأكيد الكتابة فوق ملف"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:597
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:577
 msgid "Confirm on Stop"
 msgstr "تأكيد على التوقف"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:83
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:105
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:74
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:96
 msgid "Connect"
 msgstr "اتصال"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:783
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:764
 msgid "Connect USB Keyboard"
 msgstr "ربط كيبورد يو اس بي"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:362
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:368
 #, c-format
 msgid "Connect Wiimote %i"
 msgstr " توصيل ويموت%i"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:195
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183
 msgid "Connect Wiimote 1"
 msgstr "توصيل ويموت 1"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184
 msgid "Connect Wiimote 2"
 msgstr "توصيل ويموت 2"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:185
 msgid "Connect Wiimote 3"
 msgstr "توصيل ويموت 3"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:198
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:186
 msgid "Connect Wiimote 4"
 msgstr "توصيل ويموت 4"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:627
+#: Source/Core/DolphinWX/Src/Main.cpp:655
 msgid "Connecting..."
 msgstr "توصيل"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:155
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:156
 msgid "Console"
 msgstr "وحدة التحكم"
 
@@ -1213,15 +1234,15 @@ msgstr "وحدة التحكم"
 msgid "Continuous Scanning"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:46
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:33
 msgid "Control"
 msgstr "عصا تحكم"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:189
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:176
 msgid "Convert to GCI"
 msgstr "GCIتحويل إلى "
 
-#: Source/Core/Core/Src/CoreParameter.cpp:379
+#: Source/Core/Core/Src/CoreParameter.cpp:368
 msgid "Copy failed"
 msgstr "فشل نسخ"
 
@@ -1230,21 +1251,21 @@ msgstr "فشل نسخ"
 msgid "Copy to Memcard %c"
 msgstr "نسخ إلى بطاقة الذاكرة %c"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:359
 msgid "Core"
 msgstr "الأساسية"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:154
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:148
 #, c-format
 msgid "Could not create %s"
 msgstr "لا يمكن إنشاء %s"
 
-#: Source/Core/AudioCommon/Src/AudioCommon.cpp:75
+#: Source/Core/AudioCommon/Src/AudioCommon.cpp:62
 #, c-format
 msgid "Could not initialize backend %s."
 msgstr "لا يمكن تهيئة الخلفية %s."
 
-#: Source/Core/Core/Src/CoreParameter.cpp:137
+#: Source/Core/Core/Src/CoreParameter.cpp:126
 #, c-format
 msgid ""
 "Could not read \"%s\".  There is no disc in the drive, or it is not a GC/Wii "
@@ -1255,12 +1276,12 @@ msgstr ""
 "backup.    يرجى ملاحظة أن جيم كيوب الأصلي وأقراص الوي لا يمكن قراءتها من قبل "
 "معظم أجهزة الكمبيوتر محركات الأقراص دي في دي."
 
-#: Source/Core/Core/Src/CoreParameter.cpp:292
+#: Source/Core/Core/Src/CoreParameter.cpp:281
 #, c-format
 msgid "Could not recognize ISO file %s"
 msgstr "لا يمكن التعرف ملف ايزو %s"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:569
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:579
 #, c-format
 msgid "Could not save %s"
 msgstr "لا يمكن حفظ %s"
@@ -1273,24 +1294,24 @@ msgstr ""
 "تعذر تعيين منصات. وغادر لاعب أو لعبة قيد التشغيل حاليا!\n"
 "(منصات الإعداد أثناء قيد التشغيل اللعبة غير معتمد حتى الآن)"
 
-#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:123
+#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119
 #, c-format
 msgid ""
 "Could not write memory card file %s.\n"
 "\n"
 "Are you running Dolphin from a CD/DVD, or is the save file maybe write "
-"protected?"
-msgstr ""
-"لا يمكن كتابة ملف بطاقة الذكرة %s.\n"
+"protected?\n"
 "\n"
-"Are you running Dolphin from a CD/DVD, or is the save file maybe write "
-"protected?"
+"Are you receiving this after moving the emulator directory?\n"
+"If so, then you may need to re-specify your memory card location in the "
+"options."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1107
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1133
 msgid "Couldn't find open command for extension 'ini'!"
 msgstr "لا يمكن العثور فتح الأوامر للتمديد 'ini'!"
 
-#: Source/Core/Core/Src/BootManager.cpp:146
+#: Source/Core/Core/Src/BootManager.cpp:137
 msgid ""
 "Couldn't init the core.\n"
 "Check your configuration."
@@ -1298,38 +1319,38 @@ msgstr ""
 "لا يمكن التهيئة الأساسية.\n"
 "تحقق التكوين الخاص بك."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:183
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:507
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:495
 msgid "Count:"
 msgstr "الاحصاء :"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:452
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456
 msgid "Country:"
 msgstr "البلد:"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:186
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:562
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:173
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:550
 msgid "Create AR Code"
 msgstr "إنشاء رموز اسرار"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:543
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:608
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:569
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:641
 msgid "Create new perspective"
 msgstr "إنشاء منظور جديد"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:17
 msgid "Creator: "
 msgstr "المنشئ :"
 
-#: Source/Core/Common/Src/MsgHandler.cpp:68
+#: Source/Core/Common/Src/MsgHandler.cpp:54
 msgid "Critical"
 msgstr "حرج"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562
 msgid "Crop"
 msgstr "محصول"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119
 msgid ""
 "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n"
 "\n"
@@ -1339,140 +1360,140 @@ msgstr ""
 "\n"
 "إذا لم تكن متأكدا اترك هذا غير محددة."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:48
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:52
 msgid "Crossfade"
 msgstr "الإبهات المتداخل"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:597
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:600
 #, c-format
-msgid "Current dir changed from %s to %s after wxFileSelector!"
-msgstr "المسار الحالي تغيرت من %s to %s after wxFileSelector!"
+msgid "Current directory changed from %s to %s after wxFileSelector!"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339
 msgid "Custom Projection Hack"
 msgstr "هاك مخصص العرض"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.h:30
+#: Source/Core/DolphinWX/Src/PHackSettings.h:17
 msgid "Custom Projection Hack Settings"
 msgstr "إعدادات هاك مخصص العرض"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342
 msgid "Customize some Orthographic Projection parameters."
 msgstr "تخصيص بعض المعلمات العرض على إملائي."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291
 msgid "Czech"
 msgstr "التشيكية"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:698
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:697
 msgid "D"
 msgstr "D"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:89
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
 msgid "D-Pad"
 msgstr "الاسهم"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:431
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
 msgid "DSP"
 msgstr "الصوت"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:639
 msgid "DSP Emulator Engine"
 msgstr "محرك محاكي الصوت"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:254
 msgid "DSP HLE emulation (fast)"
 msgstr "DSP HLE emulation (سريع)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:256
 msgid "DSP LLE interpreter (slow)"
 msgstr "DSP LLE interpreter (بطيء)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660
-msgid "DSP LLE on Thread"
-msgstr "DSP LLE on Thread"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:255
 msgid "DSP LLE recompiler"
 msgstr "DSP LLE recompiler"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:431
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:641
+msgid "DSP on Dedicated Thread"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
 msgid "DSP settings"
 msgstr "إعدادات الصوت"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:838
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:819
 msgid "DVD Root:"
 msgstr "DVD Root:"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:239
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:226
 msgid "DVDLowRead - Fatal Error: failed to read from volume"
 msgstr ""
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:333
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:320
 msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:176
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:163
 msgid "Data Size"
 msgstr "حجم البيانات"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468
 msgid "Date:"
 msgstr "التاريخ :"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:528
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:564
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:518
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:557
 msgid "Datel MaxDrive/Pro files(*.sav)"
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:242
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:259
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:267
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:281
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:296
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:229
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:246
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:254
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:268
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:283
 msgid "Dead Zone"
 msgstr "المنطقة الميتة"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:35
 msgid "Debug"
 msgstr "التصحيح"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:521
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534
 msgid "Debugging"
 msgstr "التصحيح"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:79
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:66
 msgid "Decimal"
 msgstr "عشري"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:890
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:881
 msgid "Decompress ISO..."
 msgstr "ضغط ايزو"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:906
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:900
 msgid "Decompress selected ISOs..."
 msgstr "اختيار إلغاء ضغط ايزو "
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1088
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1224
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1089
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1225
 msgid "Decompressing ISO"
 msgstr "فك ايزو"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:912
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:903
 msgid "Default"
 msgstr "الافتراضي"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:835
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:816
 msgid "Default ISO:"
 msgstr "ايزو الافتراضية :"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:114
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:107
 msgid "Default font"
 msgstr "الخط الافتراضي"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:32
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:926
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:19
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917
 msgid "Delete"
 msgstr "حذف"
 
@@ -1480,49 +1501,49 @@ msgstr "حذف"
 msgid "Delete Save"
 msgstr "حذف الحفظ"
 
-#: Source/Core/VideoCommon/Src/AVIDump.cpp:77
+#: Source/Core/VideoCommon/Src/AVIDump.cpp:64
 #, c-format
 msgid "Delete the existing file '%s'?"
 msgstr "حذف الملف الموجود '%s'?"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:671
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:683
 msgid "Description"
 msgstr "الوصف"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:472
 msgid "Detect"
 msgstr "كشف"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:233
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:328
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:220
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:315
 msgid ""
 "Detected attempt to read more data from the DVD than fit inside the out "
 "buffer. Clamp."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:127
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:898
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:114
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:889
 msgid "Device"
 msgstr "أداة"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:798
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:731
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779
 msgid "Device Settings"
 msgstr "إعدادات الجهاز"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:45
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:49
 msgid "Dial"
 msgstr "الاتصال الهاتفي"
 
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:146
+#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:135
 msgid "Direct3D11"
 msgstr "Direct3D11"
 
-#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:128
+#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:125
 msgid "Direct3D9"
 msgstr "Direct3D9"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:167
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:155
 msgid ""
 "Directory checksum failed\n"
 " and Directory backup checksum failed"
@@ -1530,16 +1551,20 @@ msgstr ""
 "فشل الدليل الاختباري\n"
 " و فشل دليل الاختباري الاحتياطية"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:433
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:443
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485
 msgid "Disable"
 msgstr "تعطيل"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:491
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501
+msgid "Disable Destination Alpha"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:409
 msgid "Disable Fog"
 msgstr "تعطيل الضباب"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108
 msgid ""
 "Disable any XFB emulation.\n"
 "Speeds up emulation a lot but causes heavy glitches in many games which rely "
@@ -1553,7 +1578,7 @@ msgstr ""
 "\n"
 "إذا لم تكن متأكدا اترك هذا التحقق."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95
 msgid ""
 "Disable emulation of EFB copies.\n"
 "These are often used for post-processing or render-to-texture effects, so "
@@ -1569,20 +1594,32 @@ msgstr ""
 "\n"
 "إذا لم تكن متأكدا اترك هذا غير محددة."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:543
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101
+#, fuzzy
+msgid ""
+"Disables emulation of a hardware feature called destination alpha, which is "
+"used in many games for various graphical effects.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+"تخطي الوجهة في كثير من الألعاب لمختلف التأثيرات الرسومية.\n"
+"\n"
+"إذا لم تكن متأكدا اترك هذا غير محددة."
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:553
 msgid "Disc"
 msgstr "القرص"
 
-#: Source/Core/DiscIO/Src/DriveBlob.cpp:107
-#: Source/Core/DiscIO/Src/DriveBlob.cpp:126
+#: Source/Core/DiscIO/Src/DriveBlob.cpp:94
+#: Source/Core/DiscIO/Src/DriveBlob.cpp:113
 msgid "Disc Read Error"
 msgstr "خطأ قراءة القرص"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:312
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:320
 msgid "Display"
 msgstr "العرض"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104
 msgid ""
 "Display the inputs read by the emulator.\n"
 "\n"
@@ -1592,32 +1629,32 @@ msgstr ""
 "\n"
 "إذا لم تكن متأكدا اترك هذا غير محددة."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:80
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:67
 msgid "Divide"
 msgstr "انقسام"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:987
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:990
 msgid "Do you want to stop the current emulation?"
 msgstr "هل تريد اغلق اللعبة الحالية؟"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:663
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:644
 msgid "Dolby Pro Logic II decoder"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:864
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:856
 msgid "Dolphin"
 msgstr "دولفين"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:183
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:188
 #, c-format
 msgid "Dolphin %s Graphics Configuration"
 msgstr "Dolphin %s إعدادات الرسومات"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:292
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:298
 msgid "Dolphin &Web Site"
 msgstr "موقع دولفين"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.h:37
+#: Source/Core/DolphinWX/Src/ConfigMain.h:24
 msgid "Dolphin Configuration"
 msgstr "إعدادات دولفين"
 
@@ -1625,16 +1662,16 @@ msgstr "إعدادات دولفين"
 msgid "Dolphin Emulated Wiimote Configuration"
 msgstr "إعدادات تحكم الوي"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:394
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:383
 msgid "Dolphin FIFO"
 msgstr "دولفين"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1136
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1153
 msgid "Dolphin GCPad Configuration"
 msgstr "إعدادات تحكم الجيم كيوب"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:679
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1074
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:685
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1089
 msgid "Dolphin TAS Movies (*.dtm)"
 msgstr ""
 
@@ -1642,68 +1679,77 @@ msgstr ""
 msgid "Dolphin Wiimote Configuration"
 msgstr "إعدادات تحكم الوي"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:293
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:299
 msgid "Dolphin at &Google Code"
 msgstr "دولفين على مدونة قوقل"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:364
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:351
 msgid ""
 "Dolphin could not find any GC/Wii ISOs.  Doubleclick here to browse for "
 "files..."
 msgstr ""
 "لايمكن العثور على اي لعبه جيم كيوب او وي . دبل كيك هنا لاستعراض الملفات "
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:368
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:355
 msgid ""
 "Dolphin is currently set to hide all games.  Doubleclick here to show all "
 "games..."
 msgstr ""
 "تم تعيين دولفين حاليا إخفاء جميع الألعاب. دبل كليك هنا لإظهار جميع الألعاب..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1159
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1160
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1246
 msgid "Dolphin was unable to complete the requested action."
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:275
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:58
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
+#, fuzzy
+msgid ""
+"Doubles the emulated GPU clock rate. May speed up some games (ON = Fast, OFF "
+"= Compatible)"
+msgstr ""
+"تمكين الوصول السريع القرص.اللازمة لعدد قليل من الألعاب. (ON = Fast, OFF = "
+"Compatible)"
+
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:262
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:45
 msgid "Down"
 msgstr "أسفل"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:54
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:44
 msgid "Download Codes (WiiRD Database)"
 msgstr "تحميل اسرار للعبة"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:297
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:287
 #, c-format
 msgid "Downloaded %lu codes. (added %lu)"
 msgstr "%lu وأضاف %lu تم تحميل الاسرار  "
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:31
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:35
 msgid "Drums"
 msgstr "الطبول"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:105
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
 msgid "Dummy"
 msgstr "وهمي "
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:661
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:642
 msgid "Dump Audio"
 msgstr "Dump Audio"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:532
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545
 msgid "Dump EFB Target"
 msgstr "Dump EFB Target"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546
 msgid "Dump Frames"
 msgstr "تفريغ الإطارات"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543
 msgid "Dump Textures"
 msgstr "Dump Textures"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114
 msgid ""
 "Dump all rendered frames to an AVI file in User/Dump/Frames/\n"
 "\n"
@@ -1713,7 +1759,7 @@ msgstr ""
 "\n"
 "إذا لم تكن متأكدا اترك هذا غير محددة."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111
 msgid ""
 "Dump decoded game textures to User/Dump/Textures/<game_id>/\n"
 "\n"
@@ -1723,7 +1769,7 @@ msgstr ""
 "\n"
 "إذا لم تكن متأكدا اترك هذا غير محددة."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113
 msgid ""
 "Dump the contents of EFB copies to User/Dump/Textures/\n"
 "\n"
@@ -1733,21 +1779,21 @@ msgstr ""
 "\n"
 "إذا لم تكن متأكدا اترك هذا غير محددة."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:474
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292
 msgid "Dutch"
 msgstr "الهولندية"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:112
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:113
 msgid "E&xit"
 msgstr "خروج"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:441
 msgid "EFB Copies"
 msgstr "EFB Copies"
 
-#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:223
+#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:210
 #, c-format
 msgid ""
 "ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least "
@@ -1756,52 +1802,52 @@ msgid ""
 "driver."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:166
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:160
 msgid "EUROPE"
 msgstr "أوروبا"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:156
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:143
 msgid "Early Memory Updates"
 msgstr "بداية تحديث الذاكرة"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:447
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:453
 msgid "Edit"
 msgstr "تحرير"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.h:30
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.h:17
 msgid "Edit ActionReplay Code"
 msgstr "تعديل رمز ActionReplay"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:285
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:286
 msgid "Edit Config"
 msgstr "تعديل الاعدادات"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.h:30
+#: Source/Core/DolphinWX/Src/PatchAddEdit.h:17
 msgid "Edit Patch"
 msgstr "تعديل الباتش"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:447
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:453
 msgid "Edit current perspective"
 msgstr "تعديل المنظور الحالي"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:403
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:425
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:407
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:429
 msgid "Edit..."
 msgstr "تحرير"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:44
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:48
 msgid "Effect"
 msgstr "تأثير"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:425
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435
 msgid "Embedded Frame Buffer"
 msgstr "عازل الإطار المضمن "
 
-#: Source/Core/Core/Src/Core.cpp:201
+#: Source/Core/Core/Src/Core.cpp:190
 msgid "Emu Thread already running"
 msgstr "المحاكي قيد التشغيل بالفعل"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110
 msgid ""
 "Emulate XFBs accurately.\n"
 "Slows down emulation a lot and prohibits high-resolution rendering but is "
@@ -1810,7 +1856,7 @@ msgid ""
 "If unsure, check virtual XFB emulation instead."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109
 msgid ""
 "Emulate XFBs using GPU texture objects.\n"
 "Fixes many games which don't work without XFB emulation while not being as "
@@ -1830,7 +1876,7 @@ msgstr ""
 msgid "Emulated Wiimote"
 msgstr "محاكاة ويموت"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346
 msgid "Emulation State: "
 msgstr "حالة المحاكاه: "
 
@@ -1838,7 +1884,7 @@ msgstr "حالة المحاكاه: "
 msgid "Enable"
 msgstr "تمكين"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91
 msgid ""
 "Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's "
 "supported by your GPU.\n"
@@ -1855,72 +1901,71 @@ msgstr ""
 "يتطلب ملء الشاشة للعمل.\n"
 "إذا لم تكن متأكدا اترك هذا غير محددة."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:111
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:98
 msgid "Enable AR Logging"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324
 msgid "Enable Block Merging"
 msgstr "تمكين منع الدمج"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331
 msgid "Enable Bounding Box Calculation"
 msgstr "تمكين تنظيم حساب الإطار"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:446
 msgid "Enable Cache"
 msgstr "تمكين التخزين المؤقت"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:562
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542
 msgid "Enable Cheats"
 msgstr "تمكين الاسرار "
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310
 msgid "Enable Dual Core"
 msgstr "Enable Dual Core"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
 msgid "Enable Dual Core (speedup)"
 msgstr "Enable Dual Core (لزيادة السرعة)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:550
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:563
 msgid "Enable Hotkeys"
 msgstr "تمكين الاختصارات"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311
 msgid "Enable Idle Skipping"
 msgstr "Enable Idle Skipping"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541
 msgid "Enable Idle Skipping (speedup)"
 msgstr "Enable Idle Skipping (لزيادة السرعة)"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312
 msgid "Enable MMU"
 msgstr "MMU تمكين"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:554
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:567
 msgid "Enable Progressive Scan"
 msgstr "تمكين المسح التقدمي"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757
 msgid "Enable Screen Saver"
 msgstr "تمكين شاشة التوقف"
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:75
-#, fuzzy
 msgid "Enable Speaker Data"
-msgstr "تمكين صفحات"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
 msgid "Enable WideScreen"
 msgstr "تمكين شاشة عريضة"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:516
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529
 msgid "Enable Wireframe"
 msgstr "تمكين الإطار السلكي"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85
 msgid ""
 "Enable anisotropic filtering.\n"
 "Enhances visual quality of textures that are at oblique viewing angles.\n"
@@ -1934,7 +1979,7 @@ msgstr ""
 "\n"
 "إذا لم تكن متأكدا حدد X1."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323
 msgid ""
 "Enable fast disc access.  Needed for a few games. (ON = Fast, OFF = "
 "Compatible)"
@@ -1946,7 +1991,7 @@ msgstr ""
 msgid "Enable pages"
 msgstr "تمكين صفحات"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76
 msgid ""
 "Enable this if you want the whole screen to be used for rendering.\n"
 "If this is disabled, a render window will be created instead.\n"
@@ -1958,7 +2003,7 @@ msgstr ""
 "\n"
 "إذا لم تكن متأكدا اترك هذا غير محددة."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80
 msgid ""
 "Enable this if you want to use the main Dolphin window for rendering rather "
 "than a separate render window.\n"
@@ -1970,34 +2015,34 @@ msgstr ""
 "\n"
 "إذا لم تكن متأكدا اترك هذا غير محددة."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:335
 msgid ""
 "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for "
 "ANY other game."
 msgstr "تمكين هذا لتسريع أسطورة زيلدا : الشفق الاميرة. لتعطيل أي لعبة أخرى."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340
 msgid "Enables Custom Projection Hack"
 msgstr "يمكن توقعات مخصص هاك"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:528
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508
 msgid ""
 "Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on "
 "OSX."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510
 msgid ""
 "Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:512
 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
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81
 msgid ""
 "Enables progressive scan if supported by the emulated software.\n"
 "Most games don't care about this.\n"
@@ -2009,13 +2054,13 @@ msgstr ""
 "\n"
 "إذا لم تكن متأكدا اترك هذه غير محددة."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313
 msgid ""
 "Enables the Memory Management Unit, needed for some games. (ON = Compatible, "
 "OFF = Fast)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116
 msgid ""
 "Encode frame dumps using the FFV1 codec.\n"
 "\n"
@@ -2025,57 +2070,57 @@ msgstr ""
 "\n"
 "إذا لم تكن متأكدا اترك هذا غير محددة."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:40
 msgid "End"
 msgstr "نهاية"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:469
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:280
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:260
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293
 msgid "English"
 msgstr "الإنجليزية"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:329
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:407
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:337
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:417
 msgid "Enhancements"
 msgstr "تحسينات"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:607
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:640
 msgid "Enter a name for the new perspective:"
 msgstr "أدخل اسم للمنظور جديد :"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:191
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:178
 #, c-format
 msgid "Entry %d/%d"
 msgstr "دخول %d/%d"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:85
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:72
 #, c-format
 msgid "Entry 1/%d"
 msgstr "دخول 1/%d"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:204
 msgid "Equal"
 msgstr "المساواة"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:45
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:156
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1242
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:32
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:150
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226
 msgid "Error"
 msgstr "خطأ"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:381
+#: Source/Core/DolphinWX/Src/Main.cpp:409
 msgid "Error loading selected language. Falling back to system default."
 msgstr "خطأ في تحميل اللغة المختارة. يتراجع إلى النظام الافتراضية."
 
-#: Source/Core/Common/Src/ChunkFile.h:226
+#: Source/Core/Common/Src/ChunkFile.h:221
 #, c-format
 msgid ""
 "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). "
 "Aborting savestate load..."
 msgstr ""
 
-#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:342
+#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:329
 #, c-format
 msgid ""
 "Error: Trying to access %s fonts but they are not loaded. Games may not show "
@@ -2084,38 +2129,38 @@ msgstr ""
 "ولكن لم يتم تحميلها. ألعاب قد لا تظهر الخطوط بشكل صحيح، أو تعطل %s خطأ : "
 "محاولة الوصول إلى الخطوط."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:30
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:17
 msgid "Escape"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:26
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:30
 msgid "Euphoria"
 msgstr ""
 
 #: Source/Core/Core/Src/ArmMemTools.cpp:78
-#: Source/Core/Core/Src/x64MemTools.cpp:217
+#: Source/Core/Core/Src/x64MemTools.cpp:206
 #, c-format
 msgid "Exception handler - access below memory space. %08llx%08llx"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:61
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
 msgid "Execute"
 msgstr "تنفيذ"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:459
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:446
 msgid "Export Failed"
 msgstr "فشل تصدير"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:639
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:649
 msgid "Export File"
 msgstr "فشل تصدير"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:177
 msgid "Export Recording"
 msgstr "تصدير تسجيل"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:345
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:351
 msgid "Export Recording..."
 msgstr "تصدير تسجيل"
 
@@ -2123,7 +2168,7 @@ msgstr "تصدير تسجيل"
 msgid "Export Save"
 msgstr "تصدير حفظ"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:874
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:865
 msgid "Export Wii save (Experimental)"
 msgstr "تصدير حفظ الوي"
 
@@ -2131,100 +2176,100 @@ msgstr "تصدير حفظ الوي"
 msgid "Export all saves"
 msgstr "تصدير جميع الحفظ"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:80
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:72
 msgid "Export failed, try again?"
 msgstr "فشل تصدير، حاول مرة أخرى؟"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:559
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:552
 msgid "Export save as..."
 msgstr "تصدير حفظ باسم"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:297
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:284
 msgid "Extension"
 msgstr "تمديد"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483
 msgid "External Frame Buffer"
 msgstr "عزل الاطار الخارجي"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:61
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:48
 msgid "Extra Parameter"
 msgstr "معلمة إضافية"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:62
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:49
 msgid "Extra Parameter useful in ''Metroid: Other M'' only."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:614
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:624
 msgid "Extract All Files..."
 msgstr "استخراج كافة الملفات"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:616
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:626
 msgid "Extract Apploader..."
 msgstr "استخراج Apploader"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:617
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627
 msgid "Extract DOL..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:610
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:620
 msgid "Extract Directory..."
 msgstr "استخراج دليل"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:612
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:622
 msgid "Extract File..."
 msgstr "استخراج الملفات"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:608
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:618
 msgid "Extract Partition..."
 msgstr "استخراج التقسيم"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:724
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:738
 #, c-format
 msgid "Extracting %s"
 msgstr "استخراج %s"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:707
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:721
 msgid "Extracting All Files"
 msgstr "استخراج كافة الملفات"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:707
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:721
 msgid "Extracting Directory"
 msgstr "استخراج دليل"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:710
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:724
 msgid "Extracting..."
 msgstr "استخراج"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:892
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:893
 msgid "FIFO Byte"
 msgstr "بايت"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:45
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:32
 msgid "FIFO Player"
 msgstr "لاعبين"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:169
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:163
 msgid "FRANCE"
 msgstr "فرنسا"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472
 msgid "FST Size:"
 msgstr "الحجم :"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:77
+#: Source/Core/Core/Src/NetPlayClient.cpp:81
 msgid "Failed to Connect!"
 msgstr "خطأ الاتصال"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:225
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:228
 msgid "Failed to Listen!!"
 msgstr "لم اسمع!"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:307
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:300
 msgid "Failed to download codes."
 msgstr "اللعبه لاتوجد  في قاعده البيانات."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:827
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:843
 #, c-format
 msgid "Failed to extract to %s!"
 msgstr "فشل في الاستخراج إلى %s!"
@@ -2242,26 +2287,30 @@ msgid ""
 "(Choose it from the \"Audio\" tab of the configuration dialog.)"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:116
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:139
+#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:108
+#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:131
 msgid "Failed to load bthprops.cpl"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:100
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:109
+#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:90
+#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:101
 msgid "Failed to load hid.dll"
 msgstr "فشل تحميل hid.dll"
 
-#: Source/Core/Core/Src/Movie.cpp:792
+#: Source/Core/Core/Src/Movie.cpp:783
 #, c-format
 msgid "Failed to read %s"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:151
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:144
 msgid "Failed to read banner.bin"
 msgstr "فشل في قراءة banner.bin"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:223
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:178
+msgid "Failed to read bk header"
+msgstr ""
+
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:211
 #, c-format
 msgid ""
 "Failed to read block %d of the save data\n"
@@ -2272,98 +2321,107 @@ msgstr ""
 "Memcard may be truncated\n"
 "FilePosition:%llx"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:148
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:136
 msgid ""
 "Failed to read block allocation table backup correctly\n"
 "(0x8000-0x9FFF)"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:142
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:130
 msgid ""
 "Failed to read block allocation table correctly\n"
 "(0x6000-0x7FFF)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:286
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:279
 #, c-format
 msgid "Failed to read data from file %d"
 msgstr "فشل في قراءة البيانات من ملف %d"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:136
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:367
+#, c-format
+msgid "Failed to read data from file: %s"
+msgstr ""
+
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:124
 msgid ""
 "Failed to read directory backup correctly\n"
 "(0x4000-0x5FFF)"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:130
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:118
 msgid ""
 "Failed to read directory correctly\n"
 "(0x2000-0x3FFF)"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:119
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:90
+msgid "Failed to read header"
+msgstr ""
+
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:107
 msgid ""
 "Failed to read header correctly\n"
 "(0x0000-0x1FFF)"
 msgstr ""
 
-#: Source/Core/DiscIO/Src/VolumeGC.cpp:61
+#: Source/Core/DiscIO/Src/VolumeGC.cpp:48
 msgid "Failed to read unique ID from disc image"
 msgstr "فشل في قراءة معرف فريد من صورة القرص"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:84
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:71
 msgid "Failed to write BT.DINF to SYSCONF"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:228
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:221
 msgid "Failed to write bkhdr"
 msgstr "فشل لكتابة bkhdr"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:164
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:157
 #, c-format
 msgid "Failed to write header for %s"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:258
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:251
 #, c-format
 msgid "Failed to write header for file %d"
 msgstr "فشل لكتابة عنوان لملف %d"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294
 msgid "Farsi"
 msgstr "الفارسية"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477
 msgid "Fast"
 msgstr "سريع"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315
 msgid "Fast version of the MMU.  Does not work for every game."
 msgstr " لا يعمل في كل لعبة MMU إصدار سريع من."
 
-#: Source/Core/Core/Src/Movie.cpp:1046
+#: Source/Core/Core/Src/Movie.cpp:1037
 #, c-format
 msgid ""
 "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:199
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:202
 msgid "Fifo Player"
 msgstr "لاعبين"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:99
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:86
 msgid "File Info"
 msgstr "ملف المعلومات"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:304
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:295
 msgid "File contained no codes."
 msgstr "الملف لا يتضمن اسرار."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:413
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:400
 msgid "File converted to .gci"
 msgstr "تحويل ملف إلى .gci"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:428
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:415
 msgid ""
 "File could not be opened\n"
 "or does not have a valid extension"
@@ -2371,7 +2429,7 @@ msgstr ""
 "قد لا يمكن فتح ملف\n"
 "أو لا يكون امتداد صالح"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:84
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:72
 #, c-format
 msgid ""
 "File has the extension \"%s\"\n"
@@ -2380,36 +2438,36 @@ msgstr ""
 "ملف يحتوي على ملحق \"%s\"\n"
 "ملحقات الصالحة (.raw/.gcp)"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:425
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:412
 msgid "File is not recognized as a memcard"
 msgstr "لم يتم التعرف على الملف كملف بطاقة ذاكرة"
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:294
+#: Source/Core/DiscIO/Src/CompressedBlob.cpp:281
 msgid "File not compressed"
 msgstr "ملف غير مضغوط "
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:127
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:109
 #, c-format
 msgid "FileIO: Unknown open mode : 0x%02x"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:531
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:541
 msgid "Filesystem"
 msgstr "الملفات"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1100
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1126
 msgid "Filetype 'ini' is unknown! Will not open!"
 msgstr "نوع الملف غير معروف! لن تفتح!"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:265
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:252
 msgid "Find next"
 msgstr "بحث عن التالي"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:266
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:253
 msgid "Find previous"
 msgstr "البحث السابقة"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:632
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626
 msgid "First Block"
 msgstr "أول بلوك"
 
@@ -2417,23 +2475,23 @@ msgstr "أول بلوك"
 msgid "Fix Checksums"
 msgstr "الإصلاح اختبارية"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:275
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283
 msgid "Force 16:9"
 msgstr "العرض 16:9"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:275
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283
 msgid "Force 4:3"
 msgstr "العرض 4:3"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:568
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548
 msgid "Force Console as NTSC-J"
 msgstr "فرض وحدة التحكم على النظام الياباني"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406
 msgid "Force Texture Filtering"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90
 msgid ""
 "Force texture filtering even if the emulated game explicitly disabled it.\n"
 "Improves texture quality slightly but causes glitches in some games.\n"
@@ -2445,7 +2503,7 @@ msgstr ""
 "\n"
 "إذا لم تكن متأكدا اترك هذا غير محددة."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83
 msgid ""
 "Force the game to output graphics for widescreen resolutions.\n"
 "Causes graphical glitches is some games.\n"
@@ -2457,7 +2515,7 @@ msgstr ""
 "\n"
 "إذا لم تكن متأكدا اترك هذا غير محددة."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488
 msgid ""
 "Forces NTSC-J mode for using the Japanese ROM font.\n"
 "Left unchecked, dolphin defaults to NTSC-U and automatically enables this "
@@ -2467,154 +2525,153 @@ msgstr ""
 "ترك دون ,المحاكي يكون افتراضي على النظام الانجليزي ويتيح هذا الاعداد تلقائيا "
 "عند اللعب اليابانية ."
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:74
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:62
 msgid ""
 "Format as ascii (NTSC\\PAL)?\n"
 "Choose no for sjis (NTSC-J)"
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:278
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:265
 msgid "Forward"
 msgstr "إلى الأمام"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504
 #, c-format
 msgid "Found %d results for '"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:857
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:925
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:858
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:926
 msgid "Frame"
 msgstr "الإطار"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:867
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:868
 msgid "Frame "
 msgstr "الإطار"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:185
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:173
 msgid "Frame Advance"
 msgstr "الإطار المسبق"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:536
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549
 msgid "Frame Dumps use FFV1"
 msgstr "Frame Dumps use FFV1"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:227
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:214
 msgid "Frame Info"
 msgstr "معلومات الإطار "
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:116
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:103
 msgid "Frame Range"
 msgstr "مجموعة الإطار "
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:138
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:139
 msgid "Frame S&kipping"
 msgstr "تخطي الإطار "
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:572
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552
 msgid "Framelimit:"
 msgstr "حد الإطار:"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:204
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:191
 msgid "Frames To Record"
 msgstr "إطارات لتسجيل"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547
 msgid "Free Look"
 msgstr "تحكم بكاميرا اللعبة"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
 msgid "French"
 msgstr "الفرنسية"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:38
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:42
 msgid "Frets"
 msgstr "الحنق"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:118
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:137
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:105
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:124
 msgid "From"
 msgstr "من"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:426
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:432
 msgid "FullScr"
 msgstr "شاشه كامله"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:256
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263
 msgid "Fullscreen resolution:"
 msgstr "دقة العرض :"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:534
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524
 msgid "GCI File(*.gci)"
 msgstr "GCI File(*.gci)"
 
-#: Source/Core/DolphinWX/Src/GCMicDlg.h:44
+#: Source/Core/DolphinWX/Src/GCMicDlg.h:31
 msgid "GCMic Configuration"
 msgstr "GCMic اعدادات"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:432
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
 msgid "GCPad"
 msgstr "تحكم الجيم كيوب"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:659
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:658
 msgid "GX_CMD_INVL_VC"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:448
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:452
 msgid "Game ID:"
 msgstr "معرف اللعبة:"
 
-#: Source/Core/Core/Src/NetPlay.cpp:229
+#: Source/Core/Core/Src/NetPlay.cpp:216
 msgid "Game is already running!"
 msgstr "لعبة تستخدم بالفعل!"
 
-#: Source/Core/Core/Src/NetPlay.cpp:259
+#: Source/Core/Core/Src/NetPlay.cpp:246
 msgid "Game isn't running!"
 msgstr "اللعبة ليست على التوالي!"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:389
-#, fuzzy
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:393
 msgid "Game not found!"
-msgstr "لم يتم العثور على لعبة"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:385
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:389
 msgid "Game-Specific Settings"
 msgstr "إعدادات معينه للعبه"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:293
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:294
 msgid "GameConfig"
 msgstr "إعدادات اللعبة"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:525
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:515
 msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)"
 msgstr "ملفات حفظ لعبة جيم كيوب(*.gci;*.gcs;*.sav)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534
 msgid "Gamecube"
 msgstr "جيم كيوب"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:178
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:181
 msgid "Gamecube &Pad Settings"
 msgstr "إعدادات تحكم جيم كيوب"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:218
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1069
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:205
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1052
 msgid "Gamecube Memory Cards (*.raw,*.gcp)"
 msgstr "بطاقه ذاكره الجيم كيوب (*.raw,*.gcp) "
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:432
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
 msgid "Gamecube Pad settings"
 msgstr "إعدادات تحكم جيم كيوب"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:117
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302
 msgid "Gecko Codes"
 msgstr "تحميل اسرار"
 
-#: Source/Core/Core/Src/GeckoCode.cpp:222
+#: Source/Core/Core/Src/GeckoCode.cpp:214
 #, c-format
 msgid ""
 "GeckoCode failed to run (CT%i CST%i) (%s)\n"
@@ -2625,10 +2682,10 @@ msgstr ""
 "GeckoCode فشل تشغيل (CT%i CST%i) (%s)\n"
 "(إما غير رمز سيئة أو نوع رمز غير مدعومة حتى الآن.)"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:172
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:197
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:160
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:160
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:202
 msgid "General"
 msgstr "عام"
 
@@ -2636,30 +2693,30 @@ msgstr "عام"
 msgid "General Settings"
 msgstr "الإعدادات العامة"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:470
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:281
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:316
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:261
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
 msgid "German"
 msgstr "الألمانية"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:449
+#: Source/Core/Core/Src/ActionReplay.cpp:439
 #, c-format
 msgid "GetARCode: Index is greater than ar code list size %lu"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:430
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:436
 msgid "Graphics"
 msgstr "الرسومات"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:430
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:436
 msgid "Graphics settings"
 msgstr "إعدادات الرسومات"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:205
 msgid "Greater Than"
 msgstr "أكبر من"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87
 msgid ""
 "Greatly increases quality of textures generated using render to texture "
 "effects.\n"
@@ -2675,51 +2732,67 @@ msgstr ""
 "\n"
 "إذا لم تكن متأكدا، اترك هذا التحقق."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:317
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
 msgid "Greek"
 msgstr "اليونانية"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:22
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Green"
 msgstr "أخضر"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:24
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Green Left"
 msgstr "اليسار أخضر"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:25
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Green Right"
 msgstr "اليمين أخضر"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:35
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:39
 msgid "Guitar"
 msgstr "غيتار"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1259
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1250
 msgid "HCI_CMD_INQUIRY is called, please report!"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:421
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504
+msgid "Hacked Buffer Upload"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431
 msgid "Hacks"
 msgstr "هاك"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:158
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:146
 msgid "Header checksum failed"
 msgstr "عنوان اختباري فشل"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:318
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298
 msgid "Hebrew"
 msgstr "العبرية"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:313
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:300
 msgid "Height"
 msgstr "ارتفاع"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:64
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:51
 msgid "Help"
 msgstr "مساعدة"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:209
+#: Source/Core/DolphinWX/Src/Main.cpp:229
+msgid ""
+"Hi,\n"
+"\n"
+"Dolphin requires Mac OS X 10.7 or greater.\n"
+"Unfortunately you're running an old version of OS X.\n"
+"The last Dolphin version to support OS X 10.6 is Dolphin 3.5\n"
+"Please upgrade to 10.7 or greater to use the newest Dolphin version.\n"
+"\n"
+"Sayonara!\n"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/Main.cpp:220
 msgid ""
 "Hi,\n"
 "\n"
@@ -2736,15 +2809,15 @@ msgstr ""
 "\n"
 "الوداع!\n"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:309
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:296
 msgid "Hide"
 msgstr "إخفاء"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:307
 msgid "Hide Mouse Cursor"
 msgstr "إخفاء مؤشر الماوس"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79
 msgid ""
 "Hides the mouse cursor if it's on top of the emulation window.\n"
 "\n"
@@ -2754,26 +2827,26 @@ msgstr ""
 "\n"
 "إذا لم تكن متأكدا ترك هذا التحقق."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:54
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41
 msgid "Home"
 msgstr "الصفحة الرئيسية"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:85
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:138
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:76
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:141
 msgid "Host"
 msgstr "هوست"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.h:44
+#: Source/Core/DolphinWX/Src/HotkeyDlg.h:31
 msgid "Hotkey Configuration"
 msgstr "إعدادات الاختصارات"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:272
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:272
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:594
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:260
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:260
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574
 msgid "Hotkeys"
 msgstr "الاختصارات"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:319
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299
 msgid "Hungarian"
 msgstr "الهنغارية"
 
@@ -2781,29 +2854,29 @@ msgstr "الهنغارية"
 msgid "Hybrid Wiimote"
 msgstr "ويموت هجين"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:532
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:519
 #, 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:786
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:773
 #, c-format
 msgid ""
-"IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available "
-"in your nand dump\n"
+"IOCTL_ES_LAUNCH: Game tried to reload an IOS or a title that is not "
+"available in your NAND dump\n"
 "TitleID %016llx.\n"
-" Dolphin will likely hang now"
+" Dolphin will likely hang now."
 msgstr ""
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:313
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:300
 msgid "IOCTL_ES_READCONTENT - bad destination"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729
 msgid "IPL Settings"
 msgstr "IPL إعدادات"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269
 msgid "IR"
 msgstr "IR"
 
@@ -2815,23 +2888,23 @@ msgstr "IR المؤشر"
 msgid "IR Sensitivity:"
 msgstr "IR حساسية:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:502
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:512
 msgid "ISO Details"
 msgstr "تفاصيل ايزو"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:830
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:811
 msgid "ISO Directories"
 msgstr "مجلد الايزو"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:172
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:166
 msgid "ITALY"
 msgstr "إيطاليا"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:630
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:624
 msgid "Icon"
 msgstr " أيقونة"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332
 msgid ""
 "If checked, the bounding box registers will be updated. Used by the Paper "
 "Mario games."
@@ -2839,25 +2912,11 @@ msgstr ""
 "إذا كانت محددة، سيتم تحديث سجلات المربع المحيط. المستخدمة من قبل لعبه بابير "
 "ماريو"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318
-msgid ""
-"If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505
-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 ""
-"لجعلها فعالة Audio Throttle يجب عليك تعطيل   NTSC:60, PAL:50 إذا قمت بتعيين "
-"حد الإطار أعلى من السرعة لعبة الافتراضية "
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:428
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438
 msgid "Ignore Format Changes"
 msgstr "تجاهل تنسيق التغييرات "
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94
 msgid ""
 "Ignore any changes to the EFB format.\n"
 "Improves performance in many games without any negative effect. Causes "
@@ -2871,7 +2930,7 @@ msgstr ""
 "\n"
 "إذا لم تكن متأكدا اترك هذا التحقق."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93
 msgid ""
 "Ignore any requests of the CPU to read from or write to the EFB.\n"
 "Improves performance in some games, but might disable some gameplay-related "
@@ -2889,39 +2948,27 @@ msgstr ""
 msgid "Import Save"
 msgstr "حفظ استيراد"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:59
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:48
 msgid "Import failed, try again?"
 msgstr "فشل الاستيراد، حاول مرة أخرى؟"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:454
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:441
 msgid ""
 "Imported file has gsc extension\n"
 "but does not have a correct header"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:442
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:429
 msgid "Imported file has invalid length"
 msgstr "الملف يحتوي على طول المستوردة غير صالحة"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:451
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:438
 msgid ""
 "Imported file has sav extension\n"
 "but does not have a correct header"
 msgstr ""
 
-#: 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 ""
-"تحسين الأداء لكن يسبب الخلل في معظم الألعاب التي تعتمد على المضاهاة الضباب "
-"الصحيح.\n"
-"\n"
-"إذا لم تكن متأكدا ترك هذا غير محددة."
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350
 msgid "In Game"
 msgstr "تتعطل في اللعبة"
 
@@ -2929,84 +2976,84 @@ msgstr "تتعطل في اللعبة"
 msgid "In-Game"
 msgstr "في اللعبة"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:34
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305
 msgid "Info"
 msgstr "معلومات"
 
-#: Source/Core/Common/Src/MsgHandler.cpp:65
+#: Source/Core/Common/Src/MsgHandler.cpp:51
 msgid "Information"
 msgstr "المعلومات"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:481
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:468
 msgid "Input"
 msgstr "معلومات"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:63
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:50
 msgid "Insert"
 msgstr "إدراج"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:176
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:166
 msgid "Insert Encrypted or Decrypted code here..."
 msgstr "إدراج رمز المشفرة أو فك شفرة هنا"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:763
 msgid "Insert SD Card"
 msgstr "SD Card ادرج   "
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:34
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:21
 msgid "Insert name here.."
 msgstr "أدخل اسم هنا"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:196
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:199
 msgid "Install WAD"
 msgstr "wad تثبيت"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:895
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:888
 msgid "Install to Wii Menu"
 msgstr "تثبيت إلى قائمة الوي"
 
-#: Source/Core/Core/Src/x64MemTools.cpp:252
+#: Source/Core/Core/Src/x64MemTools.cpp:242
 msgid ""
 "InstallExceptionHandler called, but this platform does not yet support it."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1297
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
 msgid "Installing WAD..."
 msgstr "wad تثبيت"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:885
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:901
 msgid "Integrity Check Error"
 msgstr "تحقق من سلامة الخطأ"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:891
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:907
 msgid "Integrity check completed"
 msgstr "التحقق من سلامة الانتهاء"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:890
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:906
 msgid "Integrity check completed. No errors have been found."
 msgstr "انتهاء التدقيق من سلامة لم يتم العثور على أخطاء"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:882
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:898
 #, 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:552
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532
 msgid "Interface"
 msgstr "الواجهة"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:646
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627
 msgid "Interface Settings"
 msgstr "واجهة الإعدادات"
 
-#: Source/Core/Core/Src/State.cpp:240
+#: Source/Core/Core/Src/State.cpp:228
 msgid "Internal LZO Error - compression failed"
 msgstr ""
 
-#: Source/Core/Core/Src/State.cpp:348
+#: Source/Core/Core/Src/State.cpp:336
 #, c-format
 msgid ""
 "Internal LZO Error - decompression failed (%d) (%li, %li) \n"
@@ -3015,41 +3062,45 @@ msgstr ""
 "Internal LZO Error - decompression failed (%d) (%li, %li) \n"
 "حاول تحميل الحالة مرة أخرى"
 
-#: Source/Core/Core/Src/State.cpp:485
+#: Source/Core/Core/Src/State.cpp:473
 msgid "Internal LZO Error - lzo_init() failed"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:344
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:352
 msgid "Internal Resolution:"
 msgstr "الدقة الداخلية :"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:42
+msgid "Interpreter (VERY slow)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349
 msgid "Intro"
 msgstr "تتعطل في المقدمة"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:194
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:187
 #, c-format
 msgid "Invalid Size(%x) or Magic word (%x)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:612
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:600
 msgid "Invalid Value!"
 msgstr "قيمة غير صالحة!"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:462
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:449
 msgid "Invalid bat.map or dir entry"
 msgstr ""
 
-#: Source/Core/Core/Src/CoreTiming.cpp:548
+#: Source/Core/Core/Src/CoreTiming.cpp:553
 #, c-format
 msgid "Invalid event type %i"
 msgstr "غير صالح نوع الحدث %i"
 
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:326
+#: Source/Core/Core/Src/HW/DVDInterface.cpp:309
 msgid "Invalid file"
 msgstr "ملف غير صالح"
 
-#: Source/Core/DiscIO/Src/BannerLoaderGC.cpp:41
+#: Source/Core/DiscIO/Src/BannerLoaderGC.cpp:28
 #, c-format
 msgid ""
 "Invalid opening.bnr found in gcm:\n"
@@ -3057,46 +3108,54 @@ msgid ""
 " You may need to redump this game."
 msgstr ""
 
-#: Source/Core/Core/Src/Movie.cpp:735
+#: Source/Core/Core/Src/Movie.cpp:726
 msgid "Invalid recording file"
 msgstr "تسجيل الملف غير صالح"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:473
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:472
 msgid "Invalid search parameters (no object selected)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:456
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:455
 msgid "Invalid search string (couldn't convert to number)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:444
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:443
 msgid "Invalid search string (only even string lengths supported)"
 msgstr ""
 
-#: Source/Core/Core/Src/Core.cpp:513
+#: Source/Core/Core/Src/Core.cpp:511
 msgid "Invalid state"
 msgstr "غير صالح حالة"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:473
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:320
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300
 msgid "Italian"
 msgstr "الإيطالية"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:183
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:177
 msgid "JAPAN"
 msgstr "اليابان"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:321
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:46
+msgid "JIT Recompiler (recommended)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:47
+msgid "JITIL experimental recompiler"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:279
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
 msgid "Japanese"
 msgstr "اليابانية"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:188
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:182
 msgid "KOREA"
 msgstr "كوريا"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78
 msgid ""
 "Keep the game window on top of all other windows.\n"
 "\n"
@@ -3106,62 +3165,62 @@ msgstr ""
 "\n"
 "إذا لم تكن متأكدا ترك هذا التحقق."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:298
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:306
 msgid "Keep window on top"
 msgstr "إبقاء النافذة على أعلى"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:241
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:241
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:229
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:229
 msgid "Key"
 msgstr "المفتاح"
 
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282
 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:322
 msgid "Korean"
 msgstr "الكورية"
 
 #. i18n:  Left
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:57
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:44
 msgid "L"
 msgstr "L"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:39
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:26
 msgid "L Button"
 msgstr "L Button"
 
 #. i18n:  Left-Analog
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:61
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:48
 msgid "L-Analog"
 msgstr "L-Analog"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:585
 msgid "Language:"
 msgstr "اللغة :"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:152
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:153
 msgid "Last Overwritten State"
 msgstr "الكتابة فوق آخر حالة"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:159
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:161
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:160
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:162
 msgid "Last Saved State"
 msgstr "آخر حالة محفوظة"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:696
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:677
 msgid "Latency:"
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:276
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:55
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:263
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:42
 msgid "Left"
 msgstr "اليسار"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:60
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:64
 msgid "Left Stick"
 msgstr "العصا الأيسر"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:257
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:257
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:245
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:245
 msgid ""
 "Left click to detect hotkeys.\n"
 "Enter space to clear."
@@ -3169,89 +3228,89 @@ msgstr ""
 "انقر الأيسر لاكتشاف مفاتيح الاختصار.\n"
 "أدخل لمسح المساحة."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:689
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:678
 msgid ""
 "Left-click to detect input.\n"
 "Middle-click to clear.\n"
 "Right-click for more options."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:694
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:683
 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:206
 msgid "Less Than"
 msgstr "أقل من"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:565
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545
 msgid "Limit by FPS"
 msgstr "الحد من عدد الإطارات في الثانية "
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:924
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:915
 msgid "Load"
 msgstr "تحميل"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544
 msgid "Load Custom Textures"
 msgstr "تحميل القوام المخصص"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
 msgid "Load State Slot 1"
 msgstr "1 تحميل حالة "
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189
 msgid "Load State Slot 2"
 msgstr "2 تحميل حالة "
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:190
 msgid "Load State Slot 3"
 msgstr "3 تحميل حالة "
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:203
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:191
 msgid "Load State Slot 4"
 msgstr "4 تحميل حالة "
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192
 msgid "Load State Slot 5"
 msgstr "5 تحميل حالة "
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193
 msgid "Load State Slot 6"
 msgstr "6 تحميل حالة"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:194
 msgid "Load State Slot 7"
 msgstr "7 تحميل حالة"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:195
 msgid "Load State Slot 8"
 msgstr "8 تحميل حالة"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:155
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:156
 msgid "Load State..."
 msgstr "تحميل حالة"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1332
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1359
 msgid "Load Wii System Menu"
 msgstr "تحميل قائمة نظام الوي"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1327
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1354
 #, c-format
 msgid "Load Wii System Menu %d%c"
 msgstr "تحميل قائمة نظام الوي %d%c"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112
 msgid ""
 "Load custom textures from User/Load/Textures/<game_id>/\n"
 "\n"
@@ -3261,7 +3320,7 @@ msgstr ""
 "\n"
 "إذا لم تكن متأكدا اترك هذا غير محددة."
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:50
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:37
 msgid "Load preset values from hack patterns available."
 msgstr "قيمة تحميل إعداد مسبق من هاك نماذج المتوفرة."
 
@@ -3269,23 +3328,23 @@ msgstr "قيمة تحميل إعداد مسبق من هاك نماذج المت
 msgid "Local"
 msgstr "المحلية"
 
-#: Source/Core/DolphinWX/Src/LogWindow.h:51
+#: Source/Core/DolphinWX/Src/LogWindow.h:38
 msgid "Log"
 msgstr "سجل"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:26
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:13
 msgid "Log Configuration"
 msgstr "سجل الإعدادات"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:296
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304
 msgid "Log FPS to file"
 msgstr "تسجيل عدد الاطارات في ملف"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:96
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83
 msgid "Log Types"
 msgstr "نوع السجل"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103
 msgid ""
 "Log the number of frames rendered per second to User/Logs/fps.txt. Use this "
 "feature when you want to measure the performance of Dolphin.\n"
@@ -3297,81 +3356,90 @@ msgstr ""
 "\n"
 "إذا لم تكن متأكدا اترك هذا غير محددة."
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:81
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:68
 msgid "Logger Outputs"
 msgstr "مختلفان النواتج"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132
-#: Source/Core/DolphinWX/Src/Frame.cpp:328
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:119
+#: Source/Core/DolphinWX/Src/Frame.cpp:314
 msgid "Logging"
 msgstr "تسجيل"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:255
+#: Source/Core/Core/Src/NetPlayClient.cpp:259
 msgid "Lost connection to server!"
 msgstr "إنقطع الإتصال الملقم!"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:42
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:29
 msgid "M Button"
 msgstr "M Button"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:119
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:112
 #, c-format
 msgid ""
 "MD5 mismatch\n"
 " %016llx%016llx != %016llx%016llx"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314
 msgid "MMU Speed Hack"
 msgstr "MMU سرعة هاك"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:527
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:563
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:517
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:556
 msgid "MadCatz Gameshark files(*.gcs)"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:51
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:63
+#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:38
 msgid "Main Stick"
 msgstr "العصا الأيسر"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460
 msgid "Maker ID:"
 msgstr "معرف المنتج :"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487
 msgid "Maker:"
 msgstr "المنتج :"
 
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100
+msgid ""
+"Makes distant objects more visible by removing fog, thus increasing the "
+"overall detail.\n"
+"Disabling fog will break some games which rely on proper fog emulation.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:97
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:100
 msgid "Max"
 msgstr "عالي"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:448
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:435
 msgid "Memcard already has a save for this title"
 msgstr "بطاقة الذاكرة لديه بالفعل باستثناء هذا العنوان"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:291
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:278
 msgid "Memcard already opened"
 msgstr "بطاقة الذاكرة فتحت بالفعل"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:912
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:913
 msgid "Memory Byte"
 msgstr "ذاكرة بايت"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:225
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:113
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:212
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:93
 msgid "Memory Card"
 msgstr "بطاقة الذاكرة"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.h:36
+#: Source/Core/DolphinWX/Src/MemcardManager.h:23
 msgid ""
 "Memory Card Manager WARNING-Make backups before using, should be fixed but "
 "could mangle stuff!"
 msgstr "إدارة بطاقة الذاكرة تنبية قم بعمل نسخة احتياطية قبل الاستخدام"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:371
+#: Source/Core/Core/Src/CoreParameter.cpp:360
 #, c-format
 msgid ""
 "Memory Card filename in Slot %c is incorrect\n"
@@ -3388,15 +3456,15 @@ msgstr ""
 "%s\n"
 "هل ترغب في نسخ الملف القديم إلى هذا الموقع الجديد?\n"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:124
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:112
 msgid "Memorycard filesize does not match the header size"
 msgstr "حجم بطاقة الذاكرة لا تتطابق مع حجم الملف "
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:50
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:37
 msgid "Menu"
 msgstr "القائمة"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:114
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:94
 msgid "Mic"
 msgstr "الميكروفون"
 
@@ -3405,20 +3473,20 @@ msgstr "الميكروفون"
 msgid "Min"
 msgstr "منخفض"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:580
 msgid "Misc"
 msgstr "متفرقات"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:795
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776
 msgid "Misc Settings"
 msgstr "إعدادات منوعة"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:240
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:294
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:227
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:281
 msgid "Modifier"
 msgstr "معدل"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106
 msgid ""
 "Modify textures to show the format they're encoded in. Needs an emulation "
 "reset in most cases.\n"
@@ -3430,20 +3498,20 @@ msgstr ""
 "\n"
 "إذا لم تكن متأكدا اترك هذا غير محددة."
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:115
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:108
 msgid "Monospaced font"
 msgstr "الخط أحادي المسافة"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:305
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:292
 msgid "Motion Plus"
 msgstr "موشن بلس"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:309
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:86
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:296
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73
 msgid "Motor"
 msgstr "محرك"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:654
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:666
 msgid ""
 "Move the mouse pointer over an option to display a detailed description.\n"
 "\n"
@@ -3461,224 +3529,235 @@ msgstr ""
 "\n"
 "\n"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:75
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:62
 msgid "Multiply"
 msgstr "تضاعف"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:651
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:650
 msgid "NOP"
 msgstr "NOP"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:629
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:628
 msgid "NOTE: Stream size doesn't match actual data length\n"
 msgstr "ملاحظة: حجم التدفق لا يطابق مدة البيانات الفعلية\n"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:129
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:116
 msgid "NP Add"
 msgstr "أضف"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:124
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:111
 msgid "NP Begin"
 msgstr "بدء"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:132
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:119
 msgid "NP Decimal"
 msgstr "عشري"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:126
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:113
 msgid "NP Delete"
 msgstr "حذف"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:133
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:120
 msgid "NP Divide"
 msgstr "انقسام"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:120
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:107
 msgid "NP Down"
 msgstr "أسفل"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:123
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:110
 msgid "NP End"
 msgstr "نهاية"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:111
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:98
 msgid "NP Enter"
 msgstr "دخول"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:127
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:114
 msgid "NP Equal"
 msgstr "متساوية"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:116
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:103
 msgid "NP Home"
 msgstr "منزل"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:125
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:112
 msgid "NP Insert"
 msgstr "أدخل"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:117
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:104
 msgid "NP Left"
 msgstr "اليسار"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:128
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:115
 msgid "NP Multiply"
 msgstr "ضرب"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:122
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:109
 msgid "NP Page Down"
 msgstr "صفحة لأسفل"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:121
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:108
 msgid "NP Page Up"
 msgstr "صفحة لأ أعلى"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:119
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:106
 msgid "NP Right"
 msgstr "اليمين"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:130
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:117
 msgid "NP Separator"
 msgstr "الفاصل"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:109
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:96
 msgid "NP Space"
 msgstr "مساحة"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:131
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:118
 msgid "NP Subtract"
 msgstr "طرح"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:110
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:97
 msgid "NP Tab"
 msgstr "التبويب"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:118
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:105
 msgid "NP Up"
 msgstr "فوق"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:444
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:59
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:50
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:448
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:46
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:37
 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:25
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:72
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:282
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:553
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:15
 msgid "Name: "
 msgstr "الاسم :"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:526
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:562
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:516
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:555
 msgid "Native GCI files(*.gci)"
 msgstr "Native GCI files(*.gci)"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:161
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:148
 msgid "New Scan"
 msgstr "بحث جديد"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:206
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:193
 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:801
 msgid "Next Page"
 msgstr "الصفحة التالية"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:165
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:152
 msgid "Next Scan"
 msgstr "البحث التالي"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:68
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:59
 msgid "Nickname :"
 msgstr "اسمك :"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:196
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:190
 msgid "No Country (SDK)"
 msgstr "لا يوجد بلد (SDK)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:370
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:357
 msgid "No ISOs or WADS found"
 msgstr "لم يتم العثور على الايزو "
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:508
+#: Source/Core/Core/Src/ConfigManager.h:17
+msgid "No audio output"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:501
 #, c-format
 msgid "No banner file found for title  %s"
 msgstr "لم يتم العثور على ملف البنر  %s"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:761
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:768
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:760
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:767
 msgid "No description available"
 msgstr "لا يوجد وصف متاح"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:514
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:535
 msgid "No docking"
 msgstr "لا الالتحام"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:859
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:860
 msgid "No file loaded"
 msgstr "لا يوجد ملف تحميل"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:439
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:426
 msgid "No free dir index entries"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:895
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:896
 msgid "No recorded file"
 msgstr "لا ملف مسجل"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:501
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:494
 #, c-format
 msgid "No save folder found for title %s"
 msgstr "لا حفظ المجلد نتيجة البحث عن العنوان %s"
 
+#: Source/Plugins/Plugin_VideoOGL/Src/main.cpp:132
+#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:111
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:23
 #: Source/Core/DolphinWX/Src/NetWindow.cpp:600
 msgid "None"
 msgstr "لا شيء"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:323
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303
 msgid "Norwegian Bokmaal"
 msgstr "النرويجية"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:203
 msgid "Not Equal"
 msgstr "لا يساوي"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:804
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:794
 msgid "Not Set"
 msgstr "غير مجموعة"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:626
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:101
+#, c-format
+msgid "Not a Wii save or read failure for file header size %x"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/Main.cpp:654
 msgid "Not connected"
 msgstr "غير متصل"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:309
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:296
 msgid "Notes"
 msgstr "ملاحظات"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:16
 msgid "Notes: "
 msgstr "ملاحظات :"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:71
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:74
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:580
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:621
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:629
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:59
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:64
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:613
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:659
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:667
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:31
 msgid "Notice"
 msgstr "إشعار"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:105
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:92
 msgid "Num Lock"
 msgstr "ارقام القفل"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:88
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:75
 msgid "Number Of Codes: "
 msgstr "عدد من رموز :"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:30
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:34
 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26
 msgid "Nunchuk"
 msgstr "ننشوك"
@@ -3687,96 +3766,97 @@ msgstr "ننشوك"
 msgid "Nunchuk Acceleration"
 msgstr "تسريع ننشوك"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:877
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:878
 msgid "Object"
 msgstr "الهدف"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:135
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:122
 msgid "Object Range"
 msgstr "نطاق الهدف"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:243
 msgid "Off"
 msgstr "إيقاف"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:62
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:49
 msgid "Offset:"
 msgstr "تعويض :"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:582
 msgid "On-Screen Display Messages"
 msgstr "عرض الرسائل التي تظهر على الشاشة"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:436
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:423
 #, c-format
 msgid "Only %d blocks available"
 msgstr "فقط %d كتل متاحة"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:420
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:178
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:426
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:166
 msgid "Open"
 msgstr "فتح"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:876
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:867
 msgid "Open &containing folder"
 msgstr "فتح المجلد المتضمن"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:873
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:864
 msgid "Open Wii &save folder"
 msgstr "افتح مجلد حفظ الوي"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:420
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:426
 msgid "Open file..."
 msgstr "فتح الملف"
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:61
+#: Source/Core/AudioCommon/Src/OpenALStream.cpp:48
 #, c-format
 msgid "OpenAL: can't create context for device %s"
 msgstr "OpenAL : لا يمكن إنشاء سياق الجهاز  %s"
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:72
+#: Source/Core/AudioCommon/Src/OpenALStream.cpp:59
 msgid "OpenAL: can't find sound devices"
 msgstr "OpenAL : لا يمكن العثور على أجهزة الصوت"
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:66
+#: Source/Core/AudioCommon/Src/OpenALStream.cpp:53
 #, c-format
 msgid "OpenAL: can't open device %s"
 msgstr "OpenAL : لا يمكن فتح الجهاز %s"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502
 msgid "OpenCL Texture Decoder"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503
 msgid "OpenMP Texture Decoder"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:317
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:94
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:304
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:81
 msgid "Options"
 msgstr "خيارات"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:22
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Orange"
 msgstr "البرتقالي"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:468
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:455
+#, fuzzy
 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"
+"and import the saves to a new memcard\n"
 msgstr ""
 "ترتيب الملفات في دليل الملفات لا تتطابق مع ترتيب كتلة\n"
 "انقر بالزر الأيمن للتصدير كافة حفظ,\n"
 "واستيراد وحفظ لبطاقة ذاكرة جديدة\n"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:316
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:324
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:509
 msgid "Other"
 msgstr "أخرى"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:206
+#: Source/Core/Core/Src/NetPlayClient.cpp:210
 msgid ""
 "Other client disconnected while game is running!! NetPlay is disabled. You "
 "manually stop the game."
@@ -3784,15 +3864,15 @@ msgstr ""
 "العميل قطع أخرى في حين يتم تشغيل اللعبة! تم تعطيل تشغيل نت. كنت يدويا إيقاف "
 "اللعبة."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:481
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:468
 msgid "Output"
 msgstr "الإخراج"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:342
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:348
 msgid "P&lay Recording..."
 msgstr "تشغيل التسجيل"
 
-#: Source/Core/Core/Src/HW/GCPad.cpp:30
+#: Source/Core/Core/Src/HW/GCPad.cpp:18
 msgid "Pad"
 msgstr "تحكم"
 
@@ -3800,160 +3880,160 @@ msgstr "تحكم"
 msgid "Pad "
 msgstr "تحكم"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:34
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:38
 msgid "Pads"
 msgstr "منصات"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:108
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:95
 msgid "Page Down"
 msgstr "صفحة لأسفل"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:107
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:94
 msgid "Page Up"
 msgstr "أعلى الصفحة"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:35
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:22
 msgid "Paragraph"
 msgstr "الفقرة"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:64
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:51
 msgid "Parameters"
 msgstr "معلمات"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:222
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:217
 #, c-format
 msgid "Partition %i"
 msgstr "قسم %i"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:296
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:297
 msgid "Patches"
 msgstr "باتش"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:556
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536
 msgid "Paths"
 msgstr "مسارات"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1538
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1539
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:51
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1565
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1566
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:38
 msgid "Pause"
 msgstr "وقفة"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:128
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:129
 msgid "Pause at end of movie"
 msgstr "توقف في نهاية الفيلم"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:397
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405
 msgid "Per-Pixel Lighting"
 msgstr "لكل بكسل إضاءة"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352
 msgid "Perfect"
 msgstr "مثالية"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:609
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:642
 #, c-format
 msgid "Perspective %d"
 msgstr "مشهد %d"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:165
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:424
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1547
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1548
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:152
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:430
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1574
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1575
 msgid "Play"
 msgstr "بدأ اللعبه"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176
 msgid "Play Recording"
 msgstr "تشغيل التسجيل"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:170
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:170
 msgid "Play/Pause"
 msgstr "بدأ/ايقاف"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351
 msgid "Playable"
 msgstr "قابلة للتشغيل"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:154
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:141
 msgid "Playback Options"
 msgstr "خيارات التشغيل"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:301
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:304
 msgid "Players"
 msgstr "لاعبين"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:988
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:991
 msgid "Please confirm..."
 msgstr "يرجى تأكيد"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:579
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:612
 msgid "Please create a perspective before saving"
 msgstr "الرجاء إنشاء منظور قبل الحفظ"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:36
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:23
 msgid "Plus-Minus"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:324
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304
 msgid "Polish"
 msgstr "البولندية"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:713
 msgid "Port 1"
 msgstr "تحكم 1"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714
 msgid "Port 2"
 msgstr "تحكم 2"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:734
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715
 msgid "Port 3"
 msgstr "تحكم 3"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716
 msgid "Port 4"
 msgstr "تحكم 4"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:97
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:130
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:88
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:133
 msgid "Port :"
 msgstr "المنفذ :"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:325
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305
 msgid "Portuguese"
 msgstr "البرتغالية"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:326
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306
 msgid "Portuguese (Brazilian)"
 msgstr "البرتغالية البرازيلية"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:391
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:399
 msgid "Post-Processing Effect:"
 msgstr "بعد معالجة تأثير:"
 
-#: Source/Core/Core/Src/Movie.cpp:936
+#: Source/Core/Core/Src/Movie.cpp:927
 #, c-format
 msgid "Premature movie end in PlayController. %u + 8 > %u"
 msgstr ""
 
-#: Source/Core/Core/Src/Movie.cpp:1055
+#: Source/Core/Core/Src/Movie.cpp:1046
 #, c-format
 msgid "Premature movie end in PlayWiimote. %u + %d > %u"
 msgstr ""
 
-#: Source/Core/Core/Src/Movie.cpp:1032
+#: Source/Core/Core/Src/Movie.cpp:1023
 #, c-format
 msgid "Premature movie end in PlayWiimote. %u > %u"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:48
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:35
 msgid "Presets: "
 msgstr "إعدادات مسبقة :"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:205
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:192
 msgid "Prev Page"
 msgstr "الصفحة السابقة"
 
@@ -3961,67 +4041,67 @@ msgstr "الصفحة السابقة"
 msgid "Previous Page"
 msgstr "الصفحة السابقة"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:183
 msgid "Previous Value"
 msgstr "القيمة السابقة"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:60
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:47
 msgid "Print"
 msgstr "طباعة"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:894
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:885
 msgid "Profile"
 msgstr "الملف الشخصي"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.h:55
+#: Source/Core/DolphinWX/Src/ISOProperties.h:42
 msgid "Properties"
 msgstr "خصائص"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:283
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:286
 msgid "Purge Cache"
 msgstr "إزالة التخزين المؤقت"
 
-#: Source/Core/Common/Src/MsgHandler.cpp:66
+#: Source/Core/Common/Src/MsgHandler.cpp:52
 msgid "Question"
 msgstr "السؤال"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:159
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:316
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:162
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:319
 msgid "Quit"
 msgstr "خروج"
 
 #. i18n:  Right
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:59
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:46
 msgid "R"
 msgstr "R"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:40
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:27
 msgid "R Button"
 msgstr "R Button"
 
 #. i18n:  Right-Analog
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:63
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
 msgid "R-Analog"
 msgstr "R-Analog"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:445
 msgid "RAM"
 msgstr "RAM"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:175
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:169
 msgid "RUSSIA"
 msgstr "روسيا"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:528
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:515
 msgid "Range"
 msgstr "قوه"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:190
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:178
 msgid "Read-only mode"
 msgstr "وضع القراءة فقط"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:487
 msgid "Real"
 msgstr "حقيقي"
 
@@ -4037,33 +4117,33 @@ msgstr "ويموت حقيقي "
 msgid "Reconnect Wiimote on State Loading"
 msgstr "إعادة تحميل حالة ويموت"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:193
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:217
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:791
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:180
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:204
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:790
 msgid "Record"
 msgstr "تسجيل"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:174
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:161
 msgid "Recording Info"
 msgstr "تسجيل معلومات"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:202
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:189
 msgid "Recording Options"
 msgstr "تسجيل الخيارات"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:21
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Red"
 msgstr "أحمر"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:24
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Red Left"
 msgstr "اليسار أحمر"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:25
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Red Right"
 msgstr "اليمين أحمر"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86
 msgid ""
 "Reduces the amount of aliasing caused by rasterizing 3D graphics.\n"
 "This makes the rendered picture look less blocky.\n"
@@ -4078,28 +4158,28 @@ msgstr ""
 "إذا لم تكن متأكدا حدد لا شيء."
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:60
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:421
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:903
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:427
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:894
 msgid "Refresh"
 msgstr "تحديث"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:180
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:168
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:168
 msgid "Refresh List"
 msgstr "تحديث قائمة"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:421
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:427
 msgid "Refresh game list"
 msgstr "تحديث القائمة"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:405
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:427
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:77
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:812
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:409
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:431
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:64
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:793
 msgid "Remove"
 msgstr "إزالة"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99
 msgid ""
 "Render the scene as a wireframe.\n"
 "\n"
@@ -4109,196 +4189,202 @@ msgstr ""
 "\n"
 "إذا لم تكن متأكدا اترك هذا غير محددة."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:308
 msgid "Render to Main Window"
 msgstr "تقدم إلى الشاشة الرئيسية"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:915
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:172
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:906
 msgid "Reset"
 msgstr "إعادة ضبط"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:190
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:177
 msgid "Results"
 msgstr "النتائج"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:29
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:16
 msgid "Return"
 msgstr "Enter"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:277
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:57
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464
+msgid "Revision:"
+msgstr ""
+
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:264
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:44
 msgid "Right"
 msgstr "اليمين"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:61
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:65
 msgid "Right Stick"
 msgstr "العصا الايمن"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:85
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:295
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:72
 msgid "Rumble"
 msgstr "هزاز"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:518
-msgid "Run DSP LLE on a dedicated thread (not recommended)."
-msgstr "Run DSP LLE on a dedicated thread (غير مستحسن)."
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498
+msgid ""
+"Run DSP HLE and LLE on a dedicated thread (not recommended: might cause "
+"audio glitches with HLE and freezes with LLE)."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:327
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307
 msgid "Russian"
 msgstr "الروسية"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:149
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:150
 msgid "Sa&ve State"
 msgstr "حفظ الحالة"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:465
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475
 msgid "Safe"
 msgstr "آمنة"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:196
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:446
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:925
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:183
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:452
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916
 msgid "Save"
 msgstr "حفظ"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:532
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:522
 msgid "Save GCI as..."
 msgstr "GCI حفظ باسم "
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
 msgid "Save State Slot 1"
 msgstr "1 حفظ حالة"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:198
 msgid "Save State Slot 2"
 msgstr "2 حفظ حالة"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:199
 msgid "Save State Slot 3"
 msgstr "3 حفظ حالة"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:212
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:212
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200
 msgid "Save State Slot 4"
 msgstr "4 حفظ حالة"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201
 msgid "Save State Slot 5"
 msgstr "5 حفظ حالة"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202
 msgid "Save State Slot 6"
 msgstr "6 حفظ حالة"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:203
 msgid "Save State Slot 7"
 msgstr "7 حفظ حالة"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204
 msgid "Save State Slot 8"
 msgstr "8 حفظ حالة"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:151
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:152
 msgid "Save State..."
 msgstr "حفظ حالة"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:582
 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:592
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:602
 msgid "Save as..."
 msgstr "حفظ باسم"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1203
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1204
 msgid "Save compressed GCM/ISO"
 msgstr "حفظ مضغوط GCM/ISO"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:446
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:452
 msgid "Save current perspective"
 msgstr "حفظ المنظور الحالي"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1192
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193
 msgid "Save decompressed GCM/ISO"
 msgstr "حفظ الضغط GCM/ISO"
 
-#: Source/Core/Core/Src/Movie.cpp:801
+#: Source/Core/Core/Src/Movie.cpp:792
 #, c-format
 msgid "Savestate movie %s is corrupted, movie recording stopping..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:396
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:404
 msgid "Scaled EFB Copy"
 msgstr "EFB Copia a escala"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:556
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:543
 #, c-format
 msgid "Scanning %s"
 msgstr "فحص %s"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:539
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:526
 msgid "Scanning for ISOs"
 msgstr "بحث ايزو"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:540
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:527
 msgid "Scanning..."
 msgstr "فحص"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:427
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
 msgid "ScrShot"
 msgstr "التقاط صوره"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:106
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:93
 msgid "Scroll Lock"
 msgstr "انتقل تأمين"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:264
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:251
 msgid "Search"
 msgstr "بحث"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:227
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:214
 msgid "Search Filter"
 msgstr "بحث فلتر"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:810
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:791
 msgid "Search Subfolders"
 msgstr "البحث في المجلدات الفرعية"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:250
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:237
 msgid "Search current Object"
 msgstr "البحث عن الكائن الحالي"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:254
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:241
 msgid "Search for hex Value:"
 msgstr "البحث عن قيمة هيكس:"
 
-#: Source/Core/Common/Src/SysConf.h:103 Source/Core/Common/Src/SysConf.h:126
-#: Source/Core/Common/Src/SysConf.h:146 Source/Core/Common/Src/SysConf.h:167
+#: Source/Core/Common/Src/SysConf.h:90 Source/Core/Common/Src/SysConf.h:113
+#: Source/Core/Common/Src/SysConf.h:133 Source/Core/Common/Src/SysConf.h:154
 #, c-format
 msgid "Section %s not found in SYSCONF"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:59
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:490
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:46
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:477
 msgid "Select"
 msgstr "حدد"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:677
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1072
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:683
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1087
 msgid "Select The Recording File"
 msgstr "اختر ملف تسجيل"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1285
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1312
 msgid "Select a Wii WAD file to install"
 msgstr "لتثبيت wad حدد ملف"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:70
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74
 msgid ""
 "Select a hardware adapter to use.\n"
 "\n"
@@ -4308,31 +4394,31 @@ msgstr ""
 "\n"
 "إذا لم تكن متأكدا استخدم أول واحد."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:520
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:510
 msgid "Select a save file to import"
 msgstr "اختر حفظ ملف للاستيراد"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:363
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:366
 msgid "Select floating windows"
 msgstr "اختر النوافذ العائمة"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:582
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:585
 msgid "Select the file to load"
 msgstr "حدد الملف لتحميل"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1241
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1268
 msgid "Select the save file"
 msgstr "حدد حفظ الملف"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1388
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1415
 msgid "Select the state to load"
 msgstr "حدد حالة التحميل"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1429
 msgid "Select the state to save"
 msgstr "حدد حالة الحفظ"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82
 msgid ""
 "Select what aspect ratio to use when rendering:\n"
 "Auto: Use the native aspect ratio\n"
@@ -4350,15 +4436,15 @@ msgstr ""
 "\n"
 "إذاغير متأكد حدد التلقائي."
 
-#: Source/Core/InputCommon/Src/InputConfig.cpp:61
+#: Source/Core/InputCommon/Src/InputConfig.cpp:48
 msgid "Selected controller profile does not exist"
 msgstr "اختيار الملف التحكم الشخصي غير موجود "
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:116
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:109
 msgid "Selected font"
 msgstr "تحديد الخط"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75
 msgid ""
 "Selects the display resolution used in fullscreen mode.\n"
 "This should always be bigger than or equal to the internal resolution. "
@@ -4374,23 +4460,27 @@ msgstr ""
 "إذا لم تكن متأكدا، استخدم دقة سطح المكتب.\n"
 "إذا لم تكن متأكدا من ذلك ، استخدم أعلى دقة."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:69
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:70
 msgid ""
 "Selects what graphics API to use internally.\n"
 "Direct3D 9 usually is the fastest one. OpenGL is more accurate though. "
 "Direct3D 11 is somewhere between the two.\n"
 "Note that the Direct3D backends are only available on Windows.\n"
 "\n"
-"If unsure, use Direct3D 9."
+"If unsure, use Direct3D 11."
 msgstr ""
-"حدد الجرافيك لاستخدام داخليا.\n"
-"ديركت 9 هو عادة أسرع واحد. اوبن جل هو أكثر دقة على الرغم من. ديركت 11 هو في "
-"مكان ما بين الاثنين.\n"
-"تتوفر فقط على ويندوز Direct3D علما بأن.\n"
-"\n"
-"Direct3D إذا لم تكن متأكدا استخدام ."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:288
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72
+msgid ""
+"Selects what graphics API to use internally.\n"
+"Direct3D 9 usually is the fastest one. OpenGL is more accurate though. "
+"Direct3D 11 is somewhere between the two.\n"
+"Note that the Direct3D backends are only available on Windows.\n"
+"\n"
+"If unsure, use OpenGL."
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:291
 msgid "Send"
 msgstr "إرسال"
 
@@ -4398,24 +4488,24 @@ msgstr "إرسال"
 msgid "Sensor Bar Position:"
 msgstr "موضع الاستشعار:"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:77
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:64
 msgid "Separator"
 msgstr "الفاصل"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:328
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308
 msgid "Serbian"
 msgstr "الصربية"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:522
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502
 msgid ""
 "Serial Port 1 - This is the port which devices such as the net adapter use"
 msgstr "المنفذ التسلسلي 1 -- وهذا هو المنفذ الذي الأجهزة مثل استخدام محول شبكة"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:488
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:475
 msgid "Set"
 msgstr "ضبط"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:877
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:868
 msgid "Set as &default ISO"
 msgstr "تعيين كافتراضي ايزو"
 
@@ -4424,134 +4514,134 @@ msgstr "تعيين كافتراضي ايزو"
 msgid "Set as default Memcard %c"
 msgstr "تعيين كافتراضي بطاقة الذاكرة %c"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:460
+#: Source/Core/Core/Src/ActionReplay.cpp:450
 #, c-format
 msgid "SetARCode_IsActive: Index is greater than ar code list size %lu"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:515
 msgid ""
 "Sets the latency (in ms).  Higher values may reduce audio crackling. OpenAL "
 "backend only."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341
 msgid "Settings..."
 msgstr "إعدادات"
 
-#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:222
+#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:209
 msgid "SetupWiiMem: Cant find setting file"
 msgstr "SetupWiiMem: الإعداد غير قادر على إيجاد ملف"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:291
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:278
 msgid "Shake"
 msgstr "هزة"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
 msgid "Short Name:"
 msgstr "الاسم المختصر :"
 
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:103
+#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:90
 msgid "Shoulder Buttons"
 msgstr "أزرار الكتف"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:217
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:220
 msgid "Show &Console"
 msgstr "اظهار &لوحة المراقبة"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:215
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:218
 msgid "Show &Log"
 msgstr "اظهار السجل"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:212
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:215
 msgid "Show &Statusbar"
 msgstr "عرض شريط الحالة"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:210
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:213
 msgid "Show &Toolbar"
 msgstr "أظهر شريط الأدوات"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:281
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:284
 msgid "Show Drives"
 msgstr "اظهر محرك الاقراص"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:517
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530
 msgid "Show EFB Copy Regions"
 msgstr "إظهار نسخة الصادرات للمناطق"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:295
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303
 msgid "Show FPS"
 msgstr "أظهر عدد الاطارات"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:271
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:274
 msgid "Show France"
 msgstr "فرنسا"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:257
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:260
 msgid "Show GameCube"
 msgstr "جيم كيوب"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561
 msgid "Show Input Display"
 msgstr "إظهار مدخلات العرض"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:273
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:276
 msgid "Show Italy"
 msgstr "إيطاليا"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:264
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:267
 msgid "Show JAP"
 msgstr "اليابان"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:275
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:278
 msgid "Show Korea"
 msgstr "كوريا"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476
 msgid "Show Language:"
 msgstr "أظهر اللغة :"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:216
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:219
 msgid "Show Log &Configuration"
 msgstr "عرض سجل الاعدادات"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:266
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:269
 msgid "Show PAL"
 msgstr "اوروبا"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:254
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:257
 msgid "Show Platforms"
 msgstr "عرض الاجهزه"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:263
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:266
 msgid "Show Regions"
 msgstr "إظهار المناطق"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:518
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531
 msgid "Show Statistics"
 msgstr "إظهار الإحصاءات"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:277
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:280
 msgid "Show Taiwan"
 msgstr "تايوان"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:268
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:271
 msgid "Show USA"
 msgstr "امريكا"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:259
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:262
 msgid "Show Wad"
 msgstr "Wad اظهار"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:255
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:258
 msgid "Show Wii"
 msgstr "الوي"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491
 msgid "Show a confirmation box before stopping a game."
 msgstr "ظهور رسالة قبل وقف اللعبة."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:512
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492
 msgid ""
 "Show a message box when a potentially serious error has occurred.\n"
 "Disabling this may avoid annoying and non-fatal messages, but it may also "
@@ -4565,11 +4655,11 @@ msgstr ""
 msgid "Show first block"
 msgstr "إظهار اول كتلة"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:130
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:131
 msgid "Show lag counter"
 msgstr "إظهار عداد التأخر"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493
 msgid ""
 "Show messages on the emulation screen area.\n"
 "These messages include memory card writes, video backend and CPU "
@@ -4592,7 +4682,7 @@ msgstr "إظهار أيقونة الحفظ "
 msgid "Show save title"
 msgstr "إظهارعنوان الحفظ "
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102
 msgid ""
 "Show the number of frames rendered per second as a measure of emulation "
 "speed.\n"
@@ -4603,11 +4693,11 @@ msgstr ""
 "\n"
 "إذا لم تكن متأكدا اترك هذا غير محددة."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:279
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:282
 msgid "Show unknown"
 msgstr "غير معروف"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105
 msgid ""
 "Show various statistics.\n"
 "\n"
@@ -4617,46 +4707,31 @@ msgstr ""
 "\n"
 "إذا لم تكن متأكدا ترك هذا غير محددة."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:319
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:306
 msgid "Sideways Wiimote"
 msgstr "ويموت جانبي"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:280
 msgid "Simplified Chinese"
 msgstr "الصينية المبسطة"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:311
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:298
 msgid "Size"
 msgstr "الحجم"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:696
 msgid "Skip BIOS"
 msgstr "تخطي البيوس"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316
 msgid "Skip DCBZ clearing"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:492
-msgid "Skip Dest. Alpha Pass"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:444
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:454
 msgid "Skip EFB Access from CPU"
 msgstr "Skip EFB Access from CPU"
 
-#: 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:120
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125
 msgid ""
 "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n"
 "Sometimes also increases visual quality.\n"
@@ -4672,25 +4747,25 @@ msgstr ""
 "\n"
 "إذا لم تكن متأكدا اترك هذا غير محددة."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:374
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:386
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:380
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:392
 #, c-format
 msgid "Slot %i"
 msgstr "فتحة %i"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:700
 msgid "Slot A"
 msgstr "A خانة "
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:701
 msgid "Slot B"
 msgstr "B خانة "
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:62
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:49
 msgid "Snapshot"
 msgstr "لقطة"
 
-#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:58
+#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:46
 msgid "Software Renderer"
 msgstr "Software Renderer"
 
@@ -4705,27 +4780,27 @@ msgstr ""
 "انها مفيدة فقط لأغراض التصحيح.\n"
 "هل حقا تريد تمكين تقديم البرامج؟ إذا لم تكن متأكدا، اختر 'لا'.."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:683
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:664
 msgid "Sound Settings"
 msgstr "إعدادات الصوت"
 
-#: Source/Core/AudioCommon/Src/AudioCommon.cpp:77
+#: Source/Core/AudioCommon/Src/AudioCommon.cpp:64
 #, c-format
 msgid "Sound backend %s is not valid."
 msgstr "غير صالحة %s خلفية الصوت."
 
-#: Source/Core/AudioCommon/Src/DSoundStream.cpp:59
+#: Source/Core/AudioCommon/Src/DSoundStream.cpp:46
 #, c-format
 msgid "Sound buffer creation failed: %s"
 msgstr "فشل إنشاء المخزن المؤقت الصوت : %s"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:31
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:18
 msgid "Space"
 msgstr "مجال"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:329
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309
 msgid "Spanish"
 msgstr "الأسبانية"
 
@@ -4733,7 +4808,7 @@ msgstr "الأسبانية"
 msgid "Speaker Volume:"
 msgstr "مكبر الصوت:"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92
 msgid ""
 "Specifies the resolution used to render at. A high resolution will improve "
 "visual quality a lot but is also quite heavy on performance and might cause "
@@ -4753,63 +4828,63 @@ msgstr ""
 "\n"
 "إذا لم تكن متأكدا حدد 528*640 ."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322
 msgid "Speed up Disc Transfer Rate"
 msgstr "تسريع معدل نقل القرص"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:243
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:230
 msgid "Square Stick"
 msgstr "مربع العصا"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:107
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87
 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:322
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:37
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:25
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:325
 msgid "Start"
 msgstr "Start"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:194
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:197
 msgid "Start &NetPlay"
 msgstr "بدء &اللعب عبر الشبكة"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:339
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:345
 msgid "Start Re&cording"
 msgstr "بدء التسجيل"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:175
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:175
 msgid "Start Recording"
 msgstr "بدء التسجيل"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:312
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:299
 msgid "State"
 msgstr "الحالة"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:173
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:161
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:161
 msgid "State Saves"
 msgstr "حفظ الحالة"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:108
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88
 msgid "Steering Wheel"
 msgstr "عجلة القيادة"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:53
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:57
 msgid "Stick"
 msgstr "عصا"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:420
-#: 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:325
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:419
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:431
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:171
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:171
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:328
 msgid "Stop"
 msgstr "اغلق اللعبه"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96
 msgid ""
 "Store EFB copies in GPU texture objects.\n"
 "This is not so accurate, but it works well enough for most games and gives a "
@@ -4823,107 +4898,117 @@ msgstr ""
 "\n"
 "إذا لم تكن متأكدا اترك هذا التحقق."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:275
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283
 msgid "Stretch to Window"
 msgstr "امتداد لنافذة"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:43
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:47
 msgid "Strum"
 msgstr "داعب الأ وتار"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:78
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:65
 msgid "Subtract"
 msgstr "طرح"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:77
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:67
 #, c-format
 msgid "Successfully exported file to %s"
 msgstr "بنجاح تصدير الملف إلى %s"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:56
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:43
 msgid "Successfully imported save files"
 msgstr "استيرادها بنجاح حفظ الملفات"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:285
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:272
 msgid "Swing"
 msgstr "هز"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:744
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:792
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320
+msgid "Synchronize GPU thread"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321
+msgid ""
+"Synchronizes the GPU and CPU threads to help prevent random freezes in Dual "
+"Core mode. (ON = Compatible, OFF = Fast)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773
 msgid "System Language:"
 msgstr "نظام اللغة :"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:191
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:185
 msgid "TAIWAN"
 msgstr "تايوان"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:127
-#: Source/Core/DolphinWX/Src/TASInputDlg.h:32
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:128
+#: Source/Core/DolphinWX/Src/TASInputDlg.h:19
 msgid "TAS Input"
 msgstr "الإدخال"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:28
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:15
 msgid "Tab"
 msgstr "التبويب"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:510
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:531
 msgid "Tab split"
 msgstr "تقسيم الجدول"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:37
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:41
 msgid "Table Left"
 msgstr "الجدول الأيسر"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:38
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:42
 msgid "Table Right"
 msgstr "الجدول الأيمن"
 
-#: 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
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:361
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:181
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:181
 msgid "Take Screenshot"
 msgstr "اخذ لقطه من الشاشه"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:109
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89
 msgid "TaruKonga (Bongos)"
 msgstr "TaruKonga (Bongos)"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:472
 msgid "Test"
 msgstr "اختبار"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:444
 msgid "Texture"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:451
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:461
 msgid "Texture Cache"
 msgstr "Texture Cache"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:519
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:532
 msgid "Texture Format Overlay"
 msgstr ""
 
-#: Source/Core/Core/Src/CoreParameter.cpp:226
+#: Source/Core/Core/Src/CoreParameter.cpp:215
 msgid "The WAD has been installed successfully"
 msgstr " بنجاح wad وقد تم تركيب"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:197
+#: Source/Core/Core/Src/ActionReplay.cpp:185
 msgid "The address is invalid"
 msgstr "عنوان غير صالح"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:509
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:496
 msgid "The checksum was successfully fixed"
 msgstr "تم إصلاح بنجاح الاختباري"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1242
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226
 msgid "The chosen directory is already in the list"
 msgstr "الدليل المختار هو بالفعل في قائمة"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1117
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1216
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1118
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1146
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1217
 #, c-format
 msgid ""
 "The file %s already exists.\n"
@@ -4932,7 +5017,7 @@ msgstr ""
 "The file %s already exists.\n"
 "هل ترغب في استبدالها?"
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:51
+#: Source/Core/AudioCommon/Src/WaveFile.cpp:38
 #, c-format
 msgid ""
 "The file %s could not be opened for writing. Please check if it's already "
@@ -4940,29 +5025,29 @@ msgid ""
 msgstr ""
 "الملف %s تعذر فتح للكتابة. يرجى التحقق من إذا فتحت بالفعل من قبل برنامج آخر."
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:44
+#: Source/Core/AudioCommon/Src/WaveFile.cpp:31
 #, c-format
 msgid "The file %s was already open, the file header will not be written."
 msgstr "الملف %s بالفعل مفتوح، لن الملف غير عنوان مكتوب."
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:332
+#: Source/Core/Core/Src/Boot/Boot.cpp:320
 #, c-format
 msgid "The file you specified (%s) does not exist"
 msgstr "لا وجود له (%s) الملف الذي حددته"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:628
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:666
 msgid "The name can not be empty"
 msgstr "يمكن أن يكون اسم لا يتم فارغا"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:620
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:658
 msgid "The name can not contain the character ','"
 msgstr "يمكن أن يكون اسم لا تحتوي على الأحرف '،'"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:142
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:129
 msgid "The resulting decrypted AR code doesn't contain any lines."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98
 msgid ""
 "The safer you adjust this, the less likely the emulator will be missing any "
 "texture updates from RAM.\n"
@@ -4974,69 +5059,69 @@ msgstr ""
 "\n"
 "إذا لم تكن متأكدا، استخدم القيمة الثانية الأسرع من الجهة اليمنى."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:445
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:432
 msgid "The save you are trying to copy has an invalid file size"
 msgstr "حفظ تحاول نسخة له حجم ملف غير صالح"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:388
+#: Source/Core/DolphinWX/Src/Main.cpp:416
 msgid ""
 "The selected language is not supported by your system. Falling back to "
 "system default."
 msgstr ""
 "لا يتم اعتماد اللغة المحددة من قبل النظام. يتراجع إلى النظام الافتراضية."
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:43
+#: Source/Core/Core/Src/NetPlayClient.cpp:47
 msgid "The server and client's NetPlay versions are incompatible!"
 msgstr "الملقم والعميل إصدارات لعب نت تتعارض"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:40
+#: Source/Core/Core/Src/NetPlayClient.cpp:44
 msgid "The server is full!"
 msgstr "الملقم ممتلئ"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:46
+#: Source/Core/Core/Src/NetPlayClient.cpp:50
 msgid "The server responded: the game is currently running!"
 msgstr "أجاب الخادم : اللعبة قيد التشغيل حاليا"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:49
+#: Source/Core/Core/Src/NetPlayClient.cpp:53
 msgid "The server sent an unknown error message!"
 msgstr "بعث الملقم رسالة خطأ غير معروف"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:119
+#: Source/Core/Core/Src/CoreParameter.cpp:108
 #, c-format
 msgid "The specified file \"%s\" does not exist"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:198
+#: Source/Core/Core/Src/ActionReplay.cpp:186
 msgid "The value is invalid"
 msgstr "قيمة غير صالحة"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:642
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:623
 msgid "Theme:"
 msgstr "ثيم:"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:476
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:463
 msgid ""
 "There must be a ticket for 00000001/00000002. Your NAND dump is probably "
 "incomplete."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308
 msgid ""
 "These settings override core Dolphin settings.\n"
 "Undetermined means the game uses Dolphin's setting."
 msgstr "تجاوز هذه الإعدادات إعدادات دولفين الأساسية ."
 
-#: Source/Core/Core/Src/ActionReplay.cpp:355
+#: Source/Core/Core/Src/ActionReplay.cpp:345
 msgid ""
 "This action replay simulator does not support codes that modify Action "
 "Replay itself."
 msgstr "هذه المحاكاة إعادة العمل لا تدعم تعديل الرموز التي اعادتها العمل نفسه."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505
 msgid "This could cause slow down in Wii Menu and some games."
 msgstr "هذا يمكن أن يسبب بطء في القائمة لوى وبعض الألعاب."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118
 msgid ""
 "This feature allows you to change the game's camera.\n"
 "Move the mouse while holding the right mouse button to pan and while holding "
@@ -5048,7 +5133,18 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485
+#, fuzzy
+msgid ""
+"This limits the game speed to the specified number of frames per second "
+"(full speed is 60 for NTSC and 50 for PAL). Alternatively, use Audio to "
+"throttle using the DSP (might fix audio clicks but can also cause constant "
+"noise depending on the game)."
+msgstr ""
+"لجعلها فعالة Audio Throttle يجب عليك تعطيل   NTSC:60, PAL:50 إذا قمت بتعيين "
+"حد الإطار أعلى من السرعة لعبة الافتراضية "
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484
 msgid ""
 "This splits the Video and CPU threads, so they can be run on separate "
 "cores.\n"
@@ -5056,75 +5152,75 @@ msgid ""
 "cause occasional crashes/glitches."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:286
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:287
 msgid "This will let you Manually Edit the INI config file"
 msgstr "هذا تسمح لك التعديل اليدوي رسائل كتبها هذا المؤلف ملف التكوين"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:249
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:254
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:236
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:241
 msgid "Threshold"
 msgstr "بداية"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:288
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:275
 msgid "Tilt"
 msgstr "إمالة"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:628
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:304
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:622
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:291
 msgid "Title"
 msgstr "العنوان"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:125
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:144
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:112
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:131
 msgid "To"
 msgstr "إلى"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:72
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59
 msgid "Toggle All Log Types"
 msgstr "تبديل جميع أنواع السجل"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:426
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:432
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:180
 msgid "Toggle Fullscreen"
 msgstr "اللعب بالشاشة كاملة"
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:87
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:271
 msgid "Top"
 msgstr "أعلى"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:281
 msgid "Traditional Chinese"
 msgstr "الصينية التقليدية"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:426
+#: Source/Core/Core/Src/Boot/Boot.cpp:414
 msgid "Tried to load an unknown file type."
 msgstr "حاول تحميل نوع ملف غير معروف."
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:80
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:67
 msgid "Triggers"
 msgstr "Triggers"
 
-#: Source/Core/Common/Src/SysConf.h:91 Source/Core/Common/Src/SysConf.h:114
+#: Source/Core/Common/Src/SysConf.h:78 Source/Core/Common/Src/SysConf.h:101
 msgid "Trying to read from invalid SYSCONF"
 msgstr "محاولة قراءة من SYSCONF غير صالحة"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:44
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:31
 msgid ""
 "Trying to read from invalid SYSCONF\n"
 "Wiimote bt ids are not available"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:330
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
 msgid "Turkish"
 msgstr "التركية"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:33
 msgid "Turntable"
 msgstr "القرص الدوار"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:71
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58
 msgid "Type"
 msgstr "نوع"
 
@@ -5132,25 +5228,25 @@ msgstr "نوع"
 msgid "UDP Port:"
 msgstr "UDP منفذ :"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:279
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:266
 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12
 msgid "UDP Wiimote"
 msgstr "UDP Wiimote"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:199
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:193
 msgid "UNKNOWN"
 msgstr "غير معروف"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:756
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:755
 #, c-format
 msgid "UNKNOWN_%02X"
 msgstr "غير معروف_%02X"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:178
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:172
 msgid "USA"
 msgstr "امريكا"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:225
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:214
 msgid ""
 "Unable to create patch from given values.\n"
 "Entry not modified."
@@ -5158,7 +5254,7 @@ msgstr ""
 "غير قادر على إنشاء التصحيح من قيم المعينة.\n"
 "الدخول غير معدل."
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:124
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:111
 #, c-format
 msgid ""
 "Unable to parse line %lu of the entered AR code as a valid encrypted or "
@@ -5169,74 +5265,88 @@ msgstr ""
 "decrypted code.  Make sure you typed it correctly.\n"
 "هل ترغب في تجاهل هذا الخط ، ومواصلة تحليل?"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:391
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:397
 #, c-format
 msgid "Undefined %i"
 msgstr "غير محدود %i"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:163
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:164
 msgid "Undo Load State"
 msgstr "التراجع عن تحميل الحالة"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:718
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:717
 msgid "Unexpected 0x80 call? Aborting..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:215
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:202
 msgid "Unknown"
 msgstr "غير معروف"
 
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:971
+#: Source/Core/Core/Src/HW/DVDInterface.cpp:965
 #, c-format
 msgid "Unknown DVD command %08x - fatal error"
 msgstr ""
 
-#: Source/Core/Common/Src/SysConf.cpp:145
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:444
+#, c-format
+msgid "Unknown command 0x%08x"
+msgstr ""
+
+#: Source/Core/Common/Src/SysConf.cpp:132
 #, c-format
 msgid "Unknown entry type %i in SYSCONF (%s@%x)!"
 msgstr ""
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:228
+#: Source/Core/Core/Src/NetPlayClient.cpp:232
 #, c-format
 msgid "Unknown message received with id : %d"
 msgstr "تلقى رسالة مجهولة مع معرف : %d"
 
-#: Source/Core/Core/Src/NetPlayServer.cpp:504
+#: Source/Core/Core/Src/NetPlayServer.cpp:508
 #, c-format
 msgid "Unknown message with id:%d received from player:%d Kicking player!"
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:274
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:56
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:261
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:43
 msgid "Up"
 msgstr "أعلى"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:108
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:95
 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17
 msgid "Update"
 msgstr "التحديث"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:320
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:307
 msgid "Upright Wiimote"
 msgstr "ويموت مستقيم"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:777
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758
 msgid "Use EuRGB60 Mode (PAL60)"
 msgstr "(PAL60) استخدم وضع "
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:294
 msgid "Use Fullscreen"
 msgstr "استخدام شاشة كاملة"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:575
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:563
 msgid "Use Hex"
 msgstr "استخدام الهيكس"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:600
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580
 msgid "Use Panic Handlers"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89
+msgid ""
+"Use a hacked upload strategy to stream vertices.\n"
+"This usually speed up, but is forbidden by OpenGL specification and may "
+"causes heavy glitches.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122
 msgid ""
 "Use multiple threads to decode textures.\n"
 "Might result in a speedup (especially on CPUs with more than two cores).\n"
@@ -5249,7 +5359,7 @@ msgstr ""
 "\n"
 "إذا لم تكن متأكدا اترك هذا غير محددة."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126
 msgid ""
 "Usually if shader compilation fails, an error message is displayed.\n"
 "However, one may skip the popups to allow interruption free gameplay by "
@@ -5263,53 +5373,58 @@ msgstr ""
 "\n"
 "إذا لم تكن متأكدا اترك هذا غير محددة."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:539
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:552
 msgid "Utility"
 msgstr "فائدة"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:285
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:293
 msgid "V-Sync"
 msgstr "تحديد أقصى معدل الاطار"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:209
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318
+#, fuzzy
+msgid "VBeam Speed Hack"
+msgstr "MMU سرعة هاك"
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196
 msgid "Value"
 msgstr "القيمة"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:73
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:60
 msgid "Value:"
 msgstr "القيمة:"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:572
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:560
 msgid "Value: "
 msgstr "القيمة:"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:51
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:38
 msgid "Verbosity"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:377
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:381
 msgid "Video"
 msgstr "فديو"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:486
 msgid "Virtual"
 msgstr "الظاهري"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:689
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670
 msgid "Volume"
 msgstr "الصوت"
 
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:498
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:527
+#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:488
+#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:517
 #, c-format
 msgid "WAD installation failed: error creating %s"
 msgstr "خطأ في إنشاء wad: فشل التثبيت %s"
 
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:547
+#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:537
 msgid "WAD installation failed: error creating ticket"
 msgstr "خطأ في إنشاء wad: فشل التثبيت %s"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84
 msgid ""
 "Wait for vertical blanks in order to reduce tearing.\n"
 "Decreases performance if emulation speed is below 100%.\n"
@@ -5321,25 +5436,25 @@ msgstr ""
 "\n"
 "إذا لم تكن متأكدا اترك هذا غير محددة."
 
-#: Source/Core/Common/Src/MsgHandler.cpp:67
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46
+#: Source/Core/Common/Src/MsgHandler.cpp:53
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:33
 #: Source/Core/DolphinWX/Src/VideoConfigDiag.h:85
 msgid "Warning"
 msgstr "التنبيه"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:291
+#: Source/Core/Core/Src/Boot/Boot.cpp:279
 msgid "Warning - starting DOL in wrong console mode!"
 msgstr ""
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:341
+#: Source/Core/Core/Src/Boot/Boot.cpp:329
 msgid "Warning - starting ELF in wrong console mode!"
 msgstr ""
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:221
+#: Source/Core/Core/Src/Boot/Boot.cpp:209
 msgid "Warning - starting ISO in wrong console mode!"
 msgstr "تحذير -- ايزو ابتداء من الخطأ وضع وحدة التحكم!"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:519
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:512
 #, c-format
 msgid ""
 "Warning! it is advised to backup all files in the folder:\n"
@@ -5350,7 +5465,7 @@ msgstr ""
 "%s\n"
 "هل ترغب في الاستمرار?"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:585
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:578
 #, c-format
 msgid ""
 "Warning: This will overwrite any existing saves that are in the folder:\n"
@@ -5363,7 +5478,7 @@ msgstr ""
 "ولها نفس اسم الملف على بطاقة ذاكرة الخاصة بك\n"
 "تستمر?"
 
-#: Source/Core/Core/Src/Movie.cpp:844
+#: Source/Core/Core/Src/Movie.cpp:835
 #, c-format
 msgid ""
 "Warning: You loaded a save that's after the end of the current movie. (byte "
@@ -5371,7 +5486,7 @@ msgid ""
 "load this state with read-only mode off."
 msgstr ""
 
-#: Source/Core/Core/Src/Movie.cpp:861
+#: Source/Core/Core/Src/Movie.cpp:852
 #, c-format
 msgid ""
 "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You "
@@ -5379,7 +5494,7 @@ msgid ""
 "only mode off. Otherwise you'll probably get a desync."
 msgstr ""
 
-#: Source/Core/Core/Src/Movie.cpp:870
+#: Source/Core/Core/Src/Movie.cpp:861
 #, c-format
 msgid ""
 "Warning: You loaded a save whose movie mismatches on frame %d. You should "
@@ -5398,49 +5513,49 @@ msgid ""
 "%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d"
 msgstr ""
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:106
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:129
+#: Source/Core/AudioCommon/Src/WaveFile.cpp:93
+#: Source/Core/AudioCommon/Src/WaveFile.cpp:116
 msgid "WaveFileWriter - file not open."
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:56
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:60
 msgid "Whammy"
 msgstr "الضربة"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:404
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:408
 msgid "Widescreen Hack"
 msgstr "شاشة واسعة هاك"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:312
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:299
 msgid "Width"
 msgstr "عرض"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535
 msgid "Wii"
 msgstr "الوي"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:372
 msgid "Wii Console"
 msgstr "جهاز الوي"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:844
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:825
 msgid "Wii NAND Root:"
 msgstr "Wii NAND Root:"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:191
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:194
 msgid "Wii Save Import"
 msgstr "استيراد حفظ الوي"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1243
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1270
 msgid "Wii save files (*.bin)|*.bin"
 msgstr "ملفات حفظ الوي (*.bin)|*.bin"
 
-#: Source/Core/DiscIO/Src/WiiWad.cpp:82
+#: Source/Core/DiscIO/Src/WiiWad.cpp:69
 msgid "WiiWAD: Could not read from file"
 msgstr "WiiWAD: لا يمكن القراءة من الملف"
 
-#: Source/Core/Core/Src/HW/Wiimote.cpp:17
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
+#: Source/Core/Core/Src/HW/Wiimote.cpp:20
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
 msgid "Wiimote"
 msgstr "تحكم الوي"
 
@@ -5449,7 +5564,7 @@ msgstr "تحكم الوي"
 msgid "Wiimote %i"
 msgstr "ويموت %i"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:628
+#: Source/Core/DolphinWX/Src/Main.cpp:656
 msgid "Wiimote Connected"
 msgstr "ويموت متصل"
 
@@ -5457,7 +5572,7 @@ msgstr "ويموت متصل"
 msgid "Wiimote Motor"
 msgstr "محرك ويموت"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
 msgid "Wiimote settings"
 msgstr "إعدادات ويموت"
 
@@ -5465,105 +5580,123 @@ msgstr "إعدادات ويموت"
 msgid "Wiimotes"
 msgstr "تحكم الوي"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:134
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:121
 msgid "Windows Left"
 msgstr "نوافذ اليسار"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:136
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:123
 msgid "Windows Menu"
 msgstr "نوافذ القائمة"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:135
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:122
 msgid "Windows Right"
 msgstr "نوافذ اليمين"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:131
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:124
 msgid "Word Wrap"
 msgstr "كلمة ختامية"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1298
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:864
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1089
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1225
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1325
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:880
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1090
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1226
 msgid "Working..."
 msgstr "العمل"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:338
+msgid "Write memcards (GC)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46
 msgid "Write to Console"
 msgstr "الكتابة إلى وحدة التحكم"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:67
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:54
 msgid "Write to Debugger"
 msgstr "كتابة إلى مصحح الأخطاء"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:57
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44
 msgid "Write to File"
 msgstr "الكتابة على الملف"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:61
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48
 msgid "Write to Window"
 msgstr "الكتابة إلى نافذة"
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:60
+#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:47
 #, c-format
 msgid "XAudio2 CreateSourceVoice failed: %#X"
 msgstr ""
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:114
+#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:101
 #, c-format
 msgid "XAudio2 init failed: %#X"
 msgstr ""
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:124
+#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:111
 #, c-format
 msgid "XAudio2 master voice creation failed: %#X"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:766
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:765
 msgid "XF reg"
 msgstr "XF reg"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:21
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Yellow"
 msgstr "أصفر"
 
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:107
+#: Source/Core/Core/Src/DSP/DSPCore.cpp:120
 msgid ""
-"You are using free dsp roms made by Dolphin Team.\n"
-"Only Zelda ucode games will work correctly with them.\n"
+"You are using a free DSP ROM made by the Dolphin Team.\n"
+"All Wii games will work correctly, and most GC games should also work fine, "
+"but the GBA/IPL/CARD UCodes will not work.\n"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:73
+#: Source/Core/Core/Src/DSP/DSPCore.cpp:116
+msgid ""
+"You are using an old free DSP ROM made by the Dolphin Team.\n"
+"Only games using the Zelda UCode will work correctly.\n"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:63
 msgid "You can't close panes that have pages in them."
 msgstr "لا يمكنك إغلاق أجزاء الصفحات التي فيها."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:207
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:210
 msgid "You must choose a game!!"
 msgstr "عليك اختيار لعبة!"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:605
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:593
 msgid "You must enter a name!"
 msgstr "يجب إدخال اسم!"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:450
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:438
 msgid "You must enter a valid decimal, hexadecimal or octal value."
 msgstr "يجب إدخال صالح العشري، أو الست عشرية قيمة ثماني."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:603
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:591
 msgid "You must enter a valid profile name."
 msgstr "يجب إدخال اسم الملف صالح."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:936
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:917
 msgid "You must restart Dolphin in order for the change to take effect."
 msgstr "يجب إعادة تشغيل دولفين من أجل التغيير نافذ المفعول."
 
-#: Source/Core/Core/Src/CoreParameter.cpp:175
+#: Source/Core/Core/Src/DSP/DSPCore.cpp:109
+msgid ""
+"Your DSP ROMs have incorrect hashes.\n"
+"Would you like to stop now to fix the problem?\n"
+"If you select \"No\", audio might be garbled."
+msgstr ""
+
+#: Source/Core/Core/Src/CoreParameter.cpp:164
 msgid ""
 "Your GCM/ISO file seems to be invalid (invalid country).\n"
 "Continue with PAL region?"
 msgstr ""
 
-#: Source/Core/Common/Src/SysConf.cpp:58
+#: Source/Core/Common/Src/SysConf.cpp:45
 #, c-format
 msgid ""
 "Your SYSCONF file is the wrong size.\n"
@@ -5574,25 +5707,25 @@ msgstr ""
 "يجب أن يكون 0x%04x (but is 0x%04llx)\n"
 "هل تريد إنشاء واحدة جديدة?"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:334
 msgid "ZTP hack"
 msgstr "ZTP هاك"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:387
+#: Source/Core/Core/Src/ActionReplay.cpp:377
 msgid "Zero 3 code not supported"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:408
+#: Source/Core/Core/Src/ActionReplay.cpp:398
 #, c-format
 msgid "Zero code unknown to dolphin: %08x"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:436
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:460
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:423
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:447
 msgid "[ waiting ]"
 msgstr "[انتظار]"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107
 msgid ""
 "[BROKEN]\n"
 "Highlight regions the EFB was copied from.\n"
@@ -5604,11 +5737,11 @@ msgstr ""
 "\n"
 "إذا لم تكن متأكدا اترك هذا غير محددة."
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:91
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:78
 msgid "[Custom]"
 msgstr "[مخصص]"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120
 msgid ""
 "[EXPERIMENTAL]\n"
 "Aims to speed up emulation by offloading texture decoding to the GPU using "
@@ -5626,7 +5759,7 @@ msgstr ""
 "\n"
 "إذا لم تكن متأكدا اترك هذا غير محددة."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121
 msgid ""
 "[EXPERIMENTAL]\n"
 "Speeds up emulation a bit by caching display lists.\n"
@@ -5640,97 +5773,38 @@ msgstr ""
 "\n"
 "إذا لم تكن متأكدا اترك هذا غير محددة."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:508
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:495
 msgid "^ ADD"
 msgstr "^أضف "
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:820
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:801
 msgid "apploader (.img)"
 msgstr "apploader (.img)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:185
-msgid "failed to read bk header"
-msgstr "فشل في قراءة عنوان"
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:375
-#, c-format
-msgid "failed to read data from file: %s"
-msgstr "فشل في قراءة البيانات من ملف: %s"
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:97
-msgid "failed to read header"
-msgstr "فشل في قراءة عنوان"
-
-#: Source/Core/Core/Src/PowerPC/JitInterface.cpp:285
+#: Source/Core/Core/Src/PowerPC/JitInterface.cpp:272
 #, c-format
 msgid "iCacheJIT: Reading Opcode from %x. Please report."
 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 "ليس حفظ  الوي أو قراءة فشلة لحجم عنوان الملف %x"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:935
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:936
 msgid "s"
 msgstr "s"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:457
-#, c-format
-msgid "unknown cmd 0x%08x"
-msgstr "أمر غير معروف 0x%08x"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1110
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1136
 msgid "wxExecute returned -1 on application run!"
 msgstr "wxExecute returned -1 on application run!"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:56
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:43
 msgid "zFar Correction: "
 msgstr "zFar تصحيح: "
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:51
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:38
 msgid "zNear Correction: "
 msgstr "zNear تصحيح: "
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:493
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:480
 msgid "| OR"
 msgstr "أو"
 
-#~ msgid "%i connected"
-#~ msgstr "%i متصل"
-
-#~ msgid "Alternate Wiimote Timing"
-#~ msgstr "بديل ويموت"
-
-#~ msgid "Interpreter (VERY slow)"
-#~ msgstr "Interpreter (بطيئة جدا)"
-
-#~ msgid "JIT Recompiler (recommended)"
-#~ msgstr "JIT Recompiler (موصى به)"
-
-#~ msgid "JITIL experimental recompiler"
-#~ msgstr "JITIL recompiler (تجريبي )"
-
-#~ msgid ""
-#~ "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. "
-#~ "No effect on emulated wiimotes."
-#~ msgstr ""
-#~ "كتم صوت الويموت بإصلاح الانقطاع العشوائي على الويموت الحقيقي. أي تأثير "
-#~ "على الويموت يحتذى به."
-
-#~ msgid "Pair Up"
-#~ msgstr "اقتران"
-
-#~ msgid "Reconnect Wiimote Confirm"
-#~ msgstr "إعادة توصيل تأكيد ويموت"
-
-#~ msgid ""
-#~ "Wiimote %i has been disconnected by system.\n"
-#~ "Maybe this game doesn't support multi-wiimote,\n"
-#~ "or maybe it is due to idle time out or other reason.\n"
-#~ "Do you want to reconnect immediately?"
-#~ msgstr ""
-#~ "ويموت  %i تم قطع الاتصال من قبل النظام.\n"
-#~ "ربما هذه اللعبة لا تدعم متعددة ييموت,\n"
-#~ "أو ربما هو بسبب الخمول وقت مستقطع أو لسبب آخر.\n"
-#~ "هل تريد إعادة الاتصال على الفور?"
+#~ msgid "Accurate VBeam emulation"
+#~ msgstr "Accurate VBeam emulation"
diff --git a/Languages/po/ca.po b/Languages/po/ca.po
index 87458946cd..a718c2a240 100644
--- a/Languages/po/ca.po
+++ b/Languages/po/ca.po
@@ -3,15 +3,16 @@
 # This file is distributed under the same license as the dolphin-emu package.
 #
 # Translators:
-# Jordi Coma, 2011.
-# Jordi Coma <jordicoma22@gmail.com>, 2011.
-#  <roger---92@hotmail.com>, 2013.
+# Jordi Coma, 2011
+# Jordi Coma <jordicoma22@gmail.com>, 2011
+# Puniasterus <puniasterus@gmail.com>, 2013
+# Puniasterus <puniasterus@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: Dolphin Emulator\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-10 08:56-0500\n"
-"PO-Revision-Date: 2013-02-27 12:02+0000\n"
+"POT-Creation-Date: 2013-04-18 23:00-0500\n"
+"PO-Revision-Date: 2013-04-04 08:13+0000\n"
 "Last-Translator: Puniasterus <puniasterus@gmail.com>\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/dolphin-emu/"
 "language/ca/)\n"
@@ -21,21 +22,21 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:511
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:499
 msgid " (too many to display)"
-msgstr " (massa per ensenyar)"
+msgstr "(massa per ensenyar)"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:270
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:273
 #: Source/Core/DolphinWX/Src/NetWindow.cpp:491
 #: Source/Core/DolphinWX/Src/NetWindow.cpp:530
 msgid " Game : "
 msgstr "Joc:"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:507
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494
 msgid "! NOT"
 msgstr "! NO"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:70
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:58
 #, c-format
 msgid ""
 "\"%s\" does not exist.\n"
@@ -44,33 +45,43 @@ msgstr ""
 "\"%s \" no existeix.\n"
 " Crear una nova targeta de memòria de 16MB?"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:142
+#: Source/Core/Core/Src/CoreParameter.cpp:131
 #, c-format
 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:722
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:721
 #, c-format
 msgid "%08X:  "
 msgstr "%08X:  "
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:196
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:183
 #, c-format
 msgid "%1$sCopy%1$s"
 msgstr "%1$sCopia%1$s"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:128
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:296
+#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:113
+#, c-format
+msgid "%d samples"
+msgstr ""
+
+#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:112
+#, c-format
+msgid "%d samples (quality level %d)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:121
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:289
 #, c-format
 msgid "%s already exists, overwrite?"
 msgstr "%s ja existeix, vols sobreescriure?"
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:167
+#: Source/Core/DiscIO/Src/CompressedBlob.cpp:154
 #, c-format
 msgid "%s failed to be scrubbed. Probably the image is corrupt."
 msgstr "%s no s'ha pogut esborrar. Probablement, la imatge està danyada."
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:95
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:83
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
@@ -79,7 +90,7 @@ msgstr ""
 "%s ha fallat la càrrega com a targeta de memòria\n"
 "La mida del fitxer no és vàlida (0x%x bytes)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:110
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:98
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
@@ -88,7 +99,7 @@ msgstr ""
 "%s ha fallat la càrrega com a targeta de memòria\n"
 "La mida de la targeta no és vàlida (0x%x bytes)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:90
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:78
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
@@ -98,50 +109,39 @@ msgstr ""
 "El fitxer no és suficientment gran per ser una targeta de memòria vàlida (0x"
 "%x bytes)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:367
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:359
 #, c-format
 msgid "%s failed to open"
 msgstr "%s no s'ha pogut obrir"
 
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:97
-#, c-format
-msgid ""
-"%s has an incorrect hash.\n"
-"Would you like to stop now to fix the problem?\n"
-"If you select \"No\", audio will be garbled."
-msgstr ""
-"%s té un hash incorrecte.\n"
-"T'agradaria parar ara per solucionar el problema?\n"
-"Si selecciones \"No\", el so serà distorsionat."
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:360
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:352
 #, c-format
 msgid "%s is a 0 byte file"
 msgstr "%s és un arxiu de 0 bytes"
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:159
+#: Source/Core/DiscIO/Src/CompressedBlob.cpp:146
 #, c-format
 msgid "%s is already compressed! Cannot compress it further."
 msgstr "%s ja està comprimit! No es pot comprimir encara més."
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:345
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:337
 #, c-format
 msgid "%s is too long for the filename, max chars is 45"
 msgstr ""
 "%s és massa llarg per al nom de l'arxiu, el nombre de caràcters màxim és de "
 "45"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:202
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:189
 #, c-format
 msgid "%sDelete%s"
 msgstr "%sEsborra%s"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:200
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:187
 #, c-format
 msgid "%sExport GCI%s"
 msgstr "%sExportar com a GCI%s"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:198
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:185
 #, c-format
 msgid "%sImport GCI%s"
 msgstr "%sImportar GCI%s"
@@ -151,252 +151,275 @@ msgstr "%sImportar GCI%s"
 msgid "%u Free Blocks; %u Free Dir Entries"
 msgstr "%u Blocs lliures; %u entrades de dir. lliures"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:506
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:493
 msgid "&& AND"
 msgstr "&& I"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:295
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:301
 msgid "&About..."
 msgstr "&Sobre..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:99
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:100
 msgid "&Boot from DVD Drive..."
 msgstr "&Arrencar des de la unitat de DVD..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:231
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:234
 msgid "&Breakpoints"
 msgstr "&Punts d'interrupció"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:110
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:111
 msgid "&Browse for ISOs..."
 msgstr "&Cerca ISOs..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:192
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:195
 msgid "&Cheats Manager"
 msgstr "Gestor de &Trucs"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:177
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:180
 msgid "&DSP Settings"
 msgstr "Configuració de &DSP"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:885
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:876
 msgid "&Delete ISO..."
 msgstr "&Eliminar ISO..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:903
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:897
 msgid "&Delete selected ISOs..."
 msgstr "&Eliminar ISOs seleccionades..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:170
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:173
 msgid "&Emulation"
 msgstr "&Emulació"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:113
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:114
 msgid "&File"
 msgstr "&Arxiu"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:335
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:341
 msgid "&Frame Advance"
 msgstr "&Avança imatge"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:352
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:358
 msgid "&Fullscreen"
 msgstr "&Pantalla completa"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:176
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:179
 msgid "&Graphics Settings"
 msgstr "Configuració de &gràfics"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:296
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:302
 msgid "&Help"
 msgstr "&Ajuda"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:180
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:183
 msgid "&Hotkey Settings"
 msgstr "Configuració de &tecles d'accés"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:233
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:236
 msgid "&JIT"
 msgstr "&JIT"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:148
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:149
 msgid "&Load State"
 msgstr "&Càrrega estat"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:190
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:193
 msgid "&Memcard Manager (GC)"
 msgstr "&Administrador de targeta de memòria (GC)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:232
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:235
 msgid "&Memory"
 msgstr "&Memòria"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:313
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:319
 msgid "&Open..."
 msgstr "&Obrir..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:186
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:189
 msgid "&Options"
 msgstr "&Opcions"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:324
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:330
 msgid "&Pause"
 msgstr "&Pausa"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:326
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:332
 msgid "&Play"
 msgstr "&Executar"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:867
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:858
 msgid "&Properties"
 msgstr "&Propietats"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:348
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:354
 msgid "&Read-only mode"
 msgstr "Modalitat de només &lectura"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:319
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:325
 msgid "&Refresh List"
 msgstr "&Actualitzar llista"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:230
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:233
 msgid "&Registers"
 msgstr "&Registres"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:332
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:338
 msgid "&Reset"
 msgstr "&Reiniciar"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:234
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:237
 msgid "&Sound"
 msgstr "&So"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:329
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:335
 msgid "&Stop"
 msgstr "&Aturar"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:207
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:210
 msgid "&Tools"
 msgstr "&Eines"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:235
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:238
 msgid "&Video"
 msgstr "&Vídeo"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:284
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:287
 msgid "&View"
 msgstr "&Visualitzar"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:179
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:182
 msgid "&Wiimote Settings"
 msgstr "Configuració &Wiimote"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:868
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:859
 msgid "&Wiki"
 msgstr "&Wiki"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504
 msgid "'"
 msgstr "'"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:59
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:46
 msgid "(-)+zFar"
 msgstr "(-)+zLluny"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:54
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:41
 msgid "(-)+zNear"
 msgstr "(-)+zAprop"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:99
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:86
 msgid "(UNKNOWN)"
 msgstr "(DESCONEGUT)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:376
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:384
 msgid "(off)"
 msgstr "(Deshabilitat)"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:655
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:654
 msgid "0x44"
 msgstr "0x44"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+msgid "1.5x Native (960x792)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:158
 msgid "16 bit"
 msgstr "16 bits"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+msgid "1x Native (640x528)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+msgid "2.5x Native (1600x1320)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+msgid "2x Native (1280x1056)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:159
 msgid "32 bit"
 msgstr "32 bits"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:412
 msgid "3D Vision"
 msgstr "3D Vision"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+msgid "3x Native (1920x1584)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+msgid "4x Native (2560x2112)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:157
 msgid "8 bit"
 msgstr "8 bits"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:43
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:30
 msgid "<Insert name here>"
 msgstr "<Inseriu el nom aquí>"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:255
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:262
 msgid "<No resolutions found>"
 msgstr "<No s'han trobat resolucions>"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:104
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84
 msgid "<Nothing>"
 msgstr "<Res>"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:162
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:162
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:150
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:150
 msgid "<Press Key>"
 msgstr "<Premeu alguna tecla>"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286
 msgid "<System>"
 msgstr "<Sistema>"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695
 msgid "A"
 msgstr "A"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:201
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:235
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:204
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:238
 msgid "A NetPlay window is already open!!"
 msgstr "Una finestra de NetPlay ja està oberta!!"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:365
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:399
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:353
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:387
 msgid "A game is not currently running."
 msgstr "No s'està executant cap joc actualment."
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:68
-#, fuzzy
 msgid ""
 "A supported bluetooth device could not be found.\n"
 "You must manually connect your wiimotes."
 msgstr ""
-"No s'ha trobat cap dispositiu bluetooth compatible!\n"
-"Si no estàs fent servir un dispositiu Microsoft bluetooth hauràs de "
-"sincronitzar els wiimotes manualment fent servir el botó \"Refrescar\"."
+"No s'ha trobat cap dispositiu bluetooth compatible.\n"
+"Has de connectar manualment els wiimotes."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:109
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:100
+#, fuzzy
 msgid ""
 "ALERT:\n"
 "\n"
-"NetPlay will currently only work properly when using the following "
-"settings:\n"
-" - Dual Core [OFF]\n"
-" - Audio Throttle [OFF]\n"
-" - DSP-HLE with \"Null Audio\" or DSP-LLE\n"
-" - Manually set the exact number of controllers that will be used to "
-"[Standard Controller]\n"
+"Netplay will only work with the following settings:\n"
+" - Enable Dual Core [OFF]\n"
+" - DSP Emulator Engine Must be the same on all computers!\n"
+" - DSP on Dedicated Thread [OFF]\n"
+" - Framelimit NOT set to [Audio]\n"
+" - Manually set the exact number of controllers to be used to [Standard "
+"Controller]\n"
 "\n"
-"All players should try to use the same Dolphin version and settings.\n"
-"Disable all memory cards or send them to all players before starting.\n"
-"Wiimote support has not been implemented.\n"
+"All players should use the same Dolphin version and settings.\n"
+"All memory cards must be identical between players or disabled.\n"
+"Wiimote support has not been implemented!\n"
 "\n"
-"You must forward TCP port to host!!"
+"The host must have the chosen TCP port open/forwarded!\n"
 msgstr ""
 "ALERTA:\n"
 "\n"
@@ -416,17 +439,17 @@ msgstr ""
 "\n"
 "Has de redireccionar el port TCP per fer d'amfitrió!"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:111
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:116
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96
 msgid "AM-Baseboard"
 msgstr "AM-placa base"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:299
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:115
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:300
 msgid "AR Codes"
 msgstr "Codis AR "
 
-#: Source/Core/DolphinWX/Src/AboutDolphin.h:33
+#: Source/Core/DolphinWX/Src/AboutDolphin.h:21
 msgid "About Dolphin"
 msgstr "Sobre Dolphin"
 
@@ -434,15 +457,11 @@ msgstr "Sobre Dolphin"
 msgid "Acceleration"
 msgstr "Acceleració"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:463
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473
 msgid "Accuracy:"
 msgstr "Precisió:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317
-msgid "Accurate VBeam emulation"
-msgstr "Emulació acurada de Vbeam"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97
 msgid ""
 "Accurately emulate EFB copies.\n"
 "Some games depend on this for certain graphical effects or gameplay "
@@ -456,12 +475,12 @@ msgstr ""
 "\n"
 "Si no n'estàs segur, activa l'EFB a mode textura."
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:239
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:239
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:227
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:227
 msgid "Action"
 msgstr "Acció"
 
-#: Source/Core/Core/Src/ARDecrypt.cpp:481
+#: Source/Core/Core/Src/ARDecrypt.cpp:469
 #, c-format
 msgid ""
 "Action Replay Code Decryption Error:\n"
@@ -476,7 +495,7 @@ msgstr ""
 "Codi culpable: \n"
 "%s"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:667
+#: Source/Core/Core/Src/ActionReplay.cpp:657
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)"
@@ -484,7 +503,7 @@ msgstr ""
 "Error d'Action Replay: Mida no vàlida (%08x: Adreça = %08x) a codi afegit "
 "(%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:755
+#: Source/Core/Core/Src/ActionReplay.cpp:745
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide "
@@ -492,7 +511,7 @@ msgid ""
 msgstr ""
 "Error d'Action Replay: Mida no vàlida (%08x: Adreça = %08X) a emplenar (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:547
+#: Source/Core/Core/Src/ActionReplay.cpp:537
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And "
@@ -501,7 +520,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:607
+#: Source/Core/Core/Src/ActionReplay.cpp:597
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Write To "
@@ -510,13 +529,13 @@ msgstr ""
 "Error d'Action Replay: Mida no vàlida (%08x: Adreça = %08x) a l'escriure al "
 "punter (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:802
+#: Source/Core/Core/Src/ActionReplay.cpp:792
 #, c-format
 msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)"
 msgstr ""
 "Error d'Action Replay: Valor no vàlid (%08x) en la copia de memòria (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:682
+#: Source/Core/Core/Src/ActionReplay.cpp:672
 #, c-format
 msgid ""
 "Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)\n"
@@ -526,63 +545,63 @@ msgstr ""
 "(% s)\n"
 "Els Codis Mestres no fan falta. No els utilitzis."
 
-#: Source/Core/Core/Src/ActionReplay.cpp:196
+#: Source/Core/Core/Src/ActionReplay.cpp:184
 #, c-format
 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:872
+#: Source/Core/Core/Src/ActionReplay.cpp:862
 #, 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:945
+#: Source/Core/Core/Src/ActionReplay.cpp:935
 #, 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:896
+#: Source/Core/Core/Src/ActionReplay.cpp:886
 #, 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:838
+#: Source/Core/Core/Src/ActionReplay.cpp:828
 #, 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:242
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:247
 msgid "Adapter:"
 msgstr "Adaptador:"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:76
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:63
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:63
 msgid "Add"
 msgstr "Afegeix"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1275
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1301
 msgid "Add ActionReplay Code"
 msgstr "Afegeix codi ActionReplay"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1204
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1230
 msgid "Add Patch"
 msgstr "Afegeix Pedaç"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:507
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:528
 msgid "Add new pane"
 msgstr "Afegeix una nova finestra"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:404
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:426
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:811
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:408
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:430
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:792
 msgid "Add..."
 msgstr "Afegir..."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:90
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:81
 msgid "Address :"
 msgstr "Adreça IP/Nom màquina:"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:58
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:45
 msgid ""
 "Adds the specified value to zFar Parameter.\n"
 "Two ways to express the floating point values.\n"
@@ -600,7 +619,7 @@ msgstr ""
 "\n"
 "NOTA: Comproveu la Finestra de Log o consola dels valors adquirits."
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:53
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:40
 msgid ""
 "Adds the specified value to zNear Parameter.\n"
 "Two ways to express the floating point values.\n"
@@ -618,48 +637,48 @@ msgstr ""
 "\n"
 "NOTA: Comproveu la finestra de Log o consola dels valors adquirits."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:755
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:744
 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:509
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:522
 msgid "Advanced"
 msgstr "Avançada"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561
 msgid "Advanced Settings"
 msgstr "Configuració avançada"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:584
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:587
 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:816
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:797
 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:1189
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1190
 msgid "All Gamecube GCM files (gcm)"
 msgstr "Tots els fitxers GameCube GCM (gcm)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1390
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1404
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1417
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1431
 msgid "All Save States (sav, s##)"
 msgstr "Tots els Estats Guardats (sav, s##)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1187
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1188
 msgid "All Wii ISO files (iso)"
 msgstr "Tots els fitxers ISO Wii (iso)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1207
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1208
 msgid "All compressed GC/Wii ISO files (gcz)"
 msgstr "Tots els fitxers ISO comprimits de GC/Wii (gcz)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:124
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:104
 msgid "All files (*.*)|*.*"
 msgstr "Tots els fitxers (*.*)|*.*"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123
 msgid ""
 "Allows toggling certain options via the hotkeys 3 (Internal Resolution), 4 "
 "(Aspect Ratio), 5 (Copy EFB) and 6 (Fog) within the emulation window.\n"
@@ -672,39 +691,39 @@ msgstr ""
 "\n"
 "Si no n'estàs segur, deixa-ho desactivat."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:285
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:272
 msgid "Analyze"
 msgstr "Analitzar"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:298
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:285
 msgid "Angle"
 msgstr "Angle"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:367
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:375
 msgid "Anisotropic Filtering:"
 msgstr "Filtrat anisotròpic:"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:350
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:358
 msgid "Anti-Aliasing:"
 msgstr "Anti-Aliasing:"
 
-#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:308
+#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:299
 msgid "Apploader is the wrong size...is it really an apploader?"
 msgstr "Apploader té una mida dolenta... realment és un apploader?"
 
-#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:302
+#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:293
 msgid "Apploader unable to load from file"
 msgstr "Apploader no s'ha pogut carregar des de l'arxiu"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:841
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:822
 msgid "Apploader:"
 msgstr "Apploader:"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:135
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:122
 msgid "Apply"
 msgstr "Aplicar"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124
 msgid ""
 "Apply a post-processing effect after finishing a frame.\n"
 "\n"
@@ -714,11 +733,11 @@ msgstr ""
 "\n"
 "Si no n'estàs segur, deixa-ho desmarcat (off)."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287
 msgid "Arabic"
 msgstr "Àrab"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:614
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:603
 #, c-format
 msgid "Are you sure you want to delete \"%s\"?"
 msgstr "Estàs segur que vols suprimir \"%s\"?"
@@ -735,46 +754,50 @@ msgstr ""
 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à definitiva!"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:789
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:277
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:44
+msgid "Arm JIT (experimental)"
+msgstr "Arm JIT (experimental)"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:285
 msgid "Aspect Ratio:"
 msgstr "Relació d'aspecte:"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:70
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:58
 msgid "At least one pane must remain open."
 msgstr "Almenys un panell ha de romandre obert."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:553
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533
 msgid "Audio"
 msgstr "Àudio"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:694
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675
 msgid "Audio Backend:"
 msgstr "Suport d'àudio:"
 
-#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:41
+#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:28
 msgid "AudioCommon: Error opening AO device.\n"
 msgstr "AudioCommon: Error en obrir el dispositiu AO \n"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:275
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283
 msgid "Auto"
 msgstr "Auto"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:337
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345
 msgid "Auto (Multiple of 640x528)"
 msgstr "Auto (Múltiple de 640x528)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:337
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345
 msgid "Auto (Window Size)"
 msgstr "Auto (Mida de la finestra)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:297
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305
 msgid "Auto adjust Window Size"
 msgstr "Ajust automàtic de la mida de la finestra"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77
 msgid ""
 "Automatically adjusts the window size to your internal resolution.\n"
 "\n"
@@ -784,130 +807,130 @@ msgstr ""
 "\n"
 "Si no n'estàs segur, deixa-ho desactivat."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:697
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696
 msgid "B"
 msgstr "B"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:755
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:754
 msgid "BP register "
 msgstr "Registre BP"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:27
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:14
 msgid "Back"
 msgstr "Enrere"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:698
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:679
 msgid "Backend Settings"
 msgstr "Configuració del motor"
 
-#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:60
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:206
+#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:47
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:211
 msgid "Backend:"
 msgstr "Suport:"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:318
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:95
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:305
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:82
 msgid "Background Input"
 msgstr "Suport d'entrada"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:279
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:266
 msgid "Backward"
 msgstr "Suport"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:264
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:257
 msgid "Bad File Header"
 msgstr "Mala capçalera a l'arxiu"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:627
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:621
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:290
 msgid "Banner"
 msgstr "Imatge"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:519
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:529
 msgid "Banner Details"
 msgstr "Detalls del Imatge"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491
 msgid "Banner:"
 msgstr "Imatge:"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:57
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:61
 msgid "Bar"
 msgstr "Barra"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:308
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:316
 msgid "Basic"
 msgstr "Bàsic"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555
 msgid "Basic Settings"
 msgstr "Configuració bàsica"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:22
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Bass"
 msgstr "Baix"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:186
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:174
 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:631
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625
 msgid "Blocks"
 msgstr "Blocs"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:21
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Blue"
 msgstr "Blau"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:24
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Blue Left"
 msgstr "Blau esquerra"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:25
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Blue Right"
 msgstr "Blau dret"
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:87
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270
 msgid "Bottom"
 msgstr "Fons"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:238
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:225
 #, c-format
 msgid "Bound Controls: %lu"
 msgstr "Controls enllaçats: %lu"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348
 msgid "Broken"
 msgstr "Trencat"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:422
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:428
 msgid "Browse"
 msgstr "Examinar"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:256
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:243
 msgid "Browse for a directory to add"
 msgstr "Examineu un directori per afegir"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:422
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:428
 msgid "Browse for an ISO directory..."
 msgstr "Examina un directori ISO..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1079
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1080
 msgid "Browse for output directory"
 msgstr "Examina el directori de sortida"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:328
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:331
 msgid "Buffer:"
 msgstr "Buffer:"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:58
 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:119
+#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:106
 msgid "Buttons"
 msgstr "Botons"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317
 msgid ""
 "Bypass the clearing of the data cache by the DCBZ instruction. Usually leave "
 "this option disabled."
@@ -915,31 +938,31 @@ msgstr ""
 "Ometre la neteja de la memòria cau mitjançant la instrucció DCBZ. En general "
 "deixa aquesta opció desactivada."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:698
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:697
 msgid "C"
 msgstr "C"
 
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:77
+#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:64
 msgid "C Stick"
 msgstr "Palanca C"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:77
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:64
 msgid "C-Stick"
 msgstr "Palanca-C"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:764
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:763
 msgid "CP reg"
 msgstr "Registre CP"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:567
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547
 msgid "CPU Emulator Engine"
 msgstr "Motor d'emulació de CPU"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:490
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500
 msgid "Cache Display Lists"
 msgstr "Llistes de memòria cau de pantalla"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88
 msgid ""
 "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n"
 "Decreases emulation speed by some percent (depending on your GPU).\n"
@@ -954,23 +977,38 @@ msgstr ""
 "\n"
 "Si no n'estàs segur, deixa-ho desmarcat."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1858
+#, c-format
+msgid "Can't find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x"
+msgstr ""
+
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1872
+#, c-format
+msgid "Can't find WiiMote by connection handle %02x"
+msgstr ""
+
+#: Source/Core/Core/Src/HW/DVDInterface.cpp:669
+#: Source/Core/Core/Src/HW/DVDInterface.cpp:679
+msgid "Can't read from DVD_Plugin - DVD-Interface: Fatal Error"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:124
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:28
 msgid "Cancel"
 msgstr "Cancel·lar"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:91
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:178
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:240
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:84
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:171
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:233
 #, c-format
 msgid "Cannot open %s"
 msgstr "No es pot obrir% s"
 
-#: Source/Core/Core/Src/CoreTiming.cpp:141
+#: Source/Core/Core/Src/CoreTiming.cpp:128
 msgid "Cannot unregister events with events pending"
 msgstr "No es pot des-registrar esdeveniments amb esdeveniments pendents"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1078
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1061
 #, c-format
 msgid ""
 "Cannot use that file as a memory card.\n"
@@ -981,7 +1019,7 @@ msgstr ""
 "%s\n"
 "No és un arxiu de targeta de memòria gamecube vàlid."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1108
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1091
 msgid ""
 "Cannot use that file as a memory card.\n"
 "Are you trying to use the same file in both slots?"
@@ -989,30 +1027,15 @@ 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:1867
-#, 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:1881
-#, 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: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"
-
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:52
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:39
 msgid "Caps Lock"
 msgstr "Bloc Maj."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288
 msgid "Catalan"
 msgstr "Català"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:311
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:298
 msgid "Center"
 msgstr "Centre"
 
@@ -1020,12 +1043,12 @@ msgstr "Centre"
 msgid "Change"
 msgstr "Canviar"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:316
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:322
 msgid "Change &Disc..."
 msgstr "Canviar &Disc..."
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:179
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:179
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:167
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:167
 msgid "Change Disc"
 msgstr "Canviar Disc"
 
@@ -1033,7 +1056,7 @@ msgstr "Canviar Disc"
 msgid "Change Game"
 msgstr "Canvi de joc"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:515
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495
 msgid ""
 "Change the language of the user interface.\n"
 "Requires restart."
@@ -1041,75 +1064,75 @@ msgstr ""
 "Canviar l'idioma de la interfície d'usuari. \n"
 "Requereix reiniciar."
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:60
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:47
 msgid "Changes sign to zFar Parameter (after correction)"
 msgstr "Canvia el signe del paràmetre zLluny (després de correcció)"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:55
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:42
 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:519
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499
 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:295
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:298
 msgid "Chat"
 msgstr "Chat"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:47
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:34
 msgid "Cheat Code"
 msgstr "Codi de trucs"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:118
 msgid "Cheat Search"
 msgstr "Cerca trucs"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:38
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:25
 msgid "Cheats Manager"
 msgstr "Administrador de trucs"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:633
 msgid "Check Partition Integrity"
 msgstr "Comprovar la integritat de la partició"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:864
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:880
 msgid "Checking integrity..."
 msgstr "Comprovant integritat..."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289
 msgid "Chinese (Simplified)"
 msgstr "Xinès (simplificat)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290
 msgid "Chinese (Traditional)"
 msgstr "Xinès (tradicional)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:818
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:799
 msgid "Choose a DVD root directory:"
 msgstr "Tria un directori arrel del DVD:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:822
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803
 msgid "Choose a NAND root directory:"
 msgstr "Tria el directori arrel del NAND:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:815
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:796
 msgid "Choose a default ISO:"
 msgstr "Triar una ISO per defecte:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1236
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1219
 msgid "Choose a directory to add"
 msgstr "Trieu un directori per afegir"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1065
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1048
 msgid "Choose a file to open"
 msgstr "Trieu un arxiu per obrir"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:217
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:204
 msgid "Choose a memory card:"
 msgstr "Triar una targeta de memòria:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:819
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800
 msgid ""
 "Choose file to use as apploader: (applies to discs constructed from "
 "directories only)"
@@ -1117,27 +1140,27 @@ 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:767
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:806
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:781
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:822
 msgid "Choose the folder to extract to"
 msgstr "Selecciona la carpeta on extreure"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:297
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:284
 msgid "Circle Stick"
 msgstr "Palanca Cercle"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:52
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:56
 msgid "Classic"
 msgstr "Clàssic"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:144
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:43
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:487
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:913
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:137
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:30
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:474
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:904
 msgid "Clear"
 msgstr "Esborrar"
 
-#: Source/Core/Core/Src/NetPlayServer.cpp:259
+#: Source/Core/Core/Src/NetPlayServer.cpp:263
 msgid ""
 "Client disconnect while game is running!! NetPlay is disabled. You must "
 "manually stop the game."
@@ -1145,138 +1168,138 @@ 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:298
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:247
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:552
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:578
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:285
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:234
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:562
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:590
 msgid "Close"
 msgstr "Tancar"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:174
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:177
 msgid "Co&nfigure..."
 msgstr "&Configurar..."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:86
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:73
 msgid "Code Info"
 msgstr "Codi d'Informació"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:568
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:556
 msgid "Code: "
 msgstr "Codi:"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:35
 msgid "Command"
 msgstr "Comanda"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:629
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:623
 msgid "Comment"
 msgstr "Comentari"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489
 msgid "Comment:"
 msgstr "Comentari:"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:893
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:884
 msgid "Compress ISO..."
 msgstr "Comprimir ISO..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:905
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:899
 msgid "Compress selected ISOs..."
 msgstr "Comprimir ISOs seleccionades..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1088
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1224
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1089
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1225
 msgid "Compressing ISO"
 msgstr "Comprimeix ISO"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:429
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:435
 msgid "Config"
 msgstr "Configuració"
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:37
-#: Source/Core/DolphinWX/Src/InputConfigDiag.h:135
-#: Source/Core/DolphinWX/Src/InputConfigDiag.h:154
+#: Source/Core/DolphinWX/Src/InputConfigDiag.h:122
+#: Source/Core/DolphinWX/Src/InputConfigDiag.h:141
 msgid "Configure"
 msgstr "Configuració"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:111
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:98
 msgid "Configure Control"
 msgstr "Configurar Control"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:306
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
 #: Source/Core/DolphinWX/Src/NetWindow.cpp:583
 msgid "Configure Pads"
 msgstr "Configurar Control"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:429
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:435
 msgid "Configure..."
 msgstr "Configuració..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1119
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1147
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1217
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1120
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1218
 msgid "Confirm File Overwrite"
 msgstr "Confirmar contraescriptura del fitxer"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:597
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:577
 msgid "Confirm on Stop"
 msgstr "Confirmar a l'aturar"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:83
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:105
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:74
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:96
 msgid "Connect"
 msgstr "Connectar"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:783
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:764
 msgid "Connect USB Keyboard"
 msgstr "Connectar el teclat USB"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:362
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:368
 #, c-format
 msgid "Connect Wiimote %i"
 msgstr "Connectar Wiimote %i"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:195
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183
 msgid "Connect Wiimote 1"
 msgstr "Connectar Wiimote 1"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184
 msgid "Connect Wiimote 2"
 msgstr "Connectar Wiimote 2"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:185
 msgid "Connect Wiimote 3"
 msgstr "Connectar Wiimote 3"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:198
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:186
 msgid "Connect Wiimote 4"
 msgstr "Connectar Wiimote 4"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:627
+#: Source/Core/DolphinWX/Src/Main.cpp:655
 msgid "Connecting..."
 msgstr "Connectant..."
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:155
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:156
 msgid "Console"
 msgstr "Consola"
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:71
 msgid "Continuous Scanning"
-msgstr ""
+msgstr "Escaneig continu"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:46
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:33
 msgid "Control"
 msgstr "Control"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:189
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:176
 msgid "Convert to GCI"
 msgstr "Convertir a GCI"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:379
+#: Source/Core/Core/Src/CoreParameter.cpp:368
 msgid "Copy failed"
 msgstr "Copia fallada"
 
@@ -1285,21 +1308,21 @@ msgstr "Copia fallada"
 msgid "Copy to Memcard %c"
 msgstr "Copiar a la targeta de memòria %c"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:359
 msgid "Core"
 msgstr "Nucli"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:154
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:148
 #, c-format
 msgid "Could not create %s"
 msgstr "No s'ha pogut crear %s"
 
-#: Source/Core/AudioCommon/Src/AudioCommon.cpp:75
+#: Source/Core/AudioCommon/Src/AudioCommon.cpp:62
 #, c-format
 msgid "Could not initialize backend %s."
 msgstr "No s'ha pogut inicialitzar el suport %s."
 
-#: Source/Core/Core/Src/CoreParameter.cpp:137
+#: Source/Core/Core/Src/CoreParameter.cpp:126
 #, c-format
 msgid ""
 "Could not read \"%s\".  There is no disc in the drive, or it is not a GC/Wii "
@@ -1310,12 +1333,12 @@ msgstr ""
 "Wii. Els discs originals de Gamecube i Wii no es poden llegir per la majoria "
 "de lectors DVD."
 
-#: Source/Core/Core/Src/CoreParameter.cpp:292
+#: Source/Core/Core/Src/CoreParameter.cpp:281
 #, c-format
 msgid "Could not recognize ISO file %s"
 msgstr "No es pot reconèixer el fitxer ISO %s"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:569
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:579
 #, c-format
 msgid "Could not save %s"
 msgstr "No s'ha pogut desar %s"
@@ -1329,24 +1352,24 @@ msgstr ""
 "executant actualment! \n"
 "(Configurar els controls mentre el joc s'executa no està actualment suportat)"
 
-#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:123
+#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119
 #, c-format
 msgid ""
 "Could not write memory card file %s.\n"
 "\n"
 "Are you running Dolphin from a CD/DVD, or is the save file maybe write "
-"protected?"
-msgstr ""
-"No es pot escriure el fitxer de targeta de memòria %s. \n"
+"protected?\n"
 "\n"
-"Estàs executant Dolphin des d'un CD / DVD, o l'arxiu de targeta de memòria "
-"està protegit contra escriptura?"
+"Are you receiving this after moving the emulator directory?\n"
+"If so, then you may need to re-specify your memory card location in the "
+"options."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1107
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1133
 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:146
+#: Source/Core/Core/Src/BootManager.cpp:137
 msgid ""
 "Couldn't init the core.\n"
 "Check your configuration."
@@ -1354,38 +1377,38 @@ 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:170
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:495
 msgid "Count:"
 msgstr "Compta:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:452
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456
 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:173
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:550
 msgid "Create AR Code"
 msgstr "Crear Codi AR"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:543
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:608
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:569
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:641
 msgid "Create new perspective"
 msgstr "Crear una nova perspectiva"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:17
 msgid "Creator: "
 msgstr "Creador:"
 
-#: Source/Core/Common/Src/MsgHandler.cpp:68
+#: Source/Core/Common/Src/MsgHandler.cpp:54
 msgid "Critical"
 msgstr "Crític"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562
 msgid "Crop"
 msgstr "Retallar"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119
 msgid ""
 "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n"
 "\n"
@@ -1395,140 +1418,140 @@ msgstr ""
 "\n"
 "Si no n'estàs segur, deixa-ho desmarcat."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:48
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:52
 msgid "Crossfade"
 msgstr "Atenuar"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:597
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:600
 #, 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!"
+msgid "Current directory changed from %s to %s after wxFileSelector!"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339
 msgid "Custom Projection Hack"
 msgstr "Projecció personalitzada"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.h:30
+#: Source/Core/DolphinWX/Src/PHackSettings.h:17
 msgid "Custom Projection Hack Settings"
 msgstr "Configuració de la projecció personalitzada"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342
 msgid "Customize some Orthographic Projection parameters."
 msgstr "Configuració d'alguns paràmetres de projecció Ortogràfica."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291
 msgid "Czech"
 msgstr "Txec"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:698
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:697
 msgid "D"
 msgstr "D"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:89
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
 msgid "D-Pad"
 msgstr "Direcció digital"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:431
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
 msgid "DSP"
 msgstr "DSP"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:639
 msgid "DSP Emulator Engine"
 msgstr "Motor d'emulació DSP"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:254
 msgid "DSP HLE emulation (fast)"
 msgstr "Emulació DSP HLE (ràpid)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:256
 msgid "DSP LLE interpreter (slow)"
 msgstr "Intèrpret DSP LLE  (lent)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660
-msgid "DSP LLE on Thread"
-msgstr "DSP LLE al fil d'execució"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:255
 msgid "DSP LLE recompiler"
 msgstr "Recompilador DSP LLE "
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:431
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:641
+msgid "DSP on Dedicated Thread"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
 msgid "DSP settings"
 msgstr "Configuració DSP "
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:838
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:819
 msgid "DVD Root:"
 msgstr "Arrel del DVD:"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:239
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:226
 msgid "DVDLowRead - Fatal Error: failed to read from volume"
 msgstr "DVDLowRead - Error fatal: error al llegir el volumen"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:333
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:320
 msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume"
 msgstr "DVDLowUnencryptedRead - Error fatal: error al llegir el volumen"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:176
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:163
 msgid "Data Size"
 msgstr "Mida de dades"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468
 msgid "Date:"
 msgstr "Data:"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:528
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:564
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:518
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:557
 msgid "Datel MaxDrive/Pro files(*.sav)"
 msgstr "Arxius Datel MaxDrive/Pro (*. sav)"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:242
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:259
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:267
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:281
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:296
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:229
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:246
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:254
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:268
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:283
 msgid "Dead Zone"
 msgstr "Zona morta"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:35
 msgid "Debug"
 msgstr "Depuració"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:521
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534
 msgid "Debugging"
 msgstr "Depuració"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:79
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:66
 msgid "Decimal"
 msgstr "Decimals"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:890
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:881
 msgid "Decompress ISO..."
 msgstr "Descomprimir ISO..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:906
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:900
 msgid "Decompress selected ISOs..."
 msgstr "Descomprimir ISO seleccionades..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1088
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1224
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1089
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1225
 msgid "Decompressing ISO"
 msgstr "Descomprimint ISO"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:912
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:903
 msgid "Default"
 msgstr "Per defecte"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:835
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:816
 msgid "Default ISO:"
 msgstr "ISO per defecte:"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:114
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:107
 msgid "Default font"
 msgstr "Font per defecte"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:32
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:926
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:19
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917
 msgid "Delete"
 msgstr "Eliminar"
 
@@ -1536,50 +1559,50 @@ msgstr "Eliminar"
 msgid "Delete Save"
 msgstr "Eliminar partida desada"
 
-#: Source/Core/VideoCommon/Src/AVIDump.cpp:77
+#: Source/Core/VideoCommon/Src/AVIDump.cpp:64
 #, c-format
 msgid "Delete the existing file '%s'?"
 msgstr "Eliminar el fitxer existent '%s'?"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:671
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:683
 msgid "Description"
 msgstr "Descripció"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:472
 msgid "Detect"
 msgstr "Detectar"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:233
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:328
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:220
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:315
 msgid ""
 "Detected attempt to read more data from the DVD than fit inside the out "
 "buffer. Clamp."
 msgstr ""
 "Detectat intent de llegir més dades des del DVD que caben dins de la memòria."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:127
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:898
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:114
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:889
 msgid "Device"
 msgstr "Dispositiu"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:798
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:731
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779
 msgid "Device Settings"
 msgstr "Configuració del dispositiu"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:45
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:49
 msgid "Dial"
 msgstr "Dial"
 
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:146
+#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:135
 msgid "Direct3D11"
 msgstr "Direct3D11"
 
-#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:128
+#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:125
 msgid "Direct3D9"
 msgstr "Direct3D9"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:167
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:155
 msgid ""
 "Directory checksum failed\n"
 " and Directory backup checksum failed"
@@ -1587,16 +1610,20 @@ msgstr ""
 "Ha fallat la suma de comprovació\n"
 "i també ha fallat la comprovació de la suma de la copia del directory"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:433
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:443
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485
 msgid "Disable"
 msgstr "Deshabilitar"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:491
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501
+msgid "Disable Destination Alpha"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:409
 msgid "Disable Fog"
 msgstr "Deshabilitar boira"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108
 msgid ""
 "Disable any XFB emulation.\n"
 "Speeds up emulation a lot but causes heavy glitches in many games which rely "
@@ -1611,7 +1638,7 @@ msgstr ""
 "\n"
 "Si no n'estàs segur, deixa-ho desmarcat."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95
 msgid ""
 "Disable emulation of EFB copies.\n"
 "These are often used for post-processing or render-to-texture effects, so "
@@ -1627,20 +1654,33 @@ msgstr ""
 "\n"
 "Si no n'estàs segur, deixa-ho desmarcat."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:543
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101
+#, fuzzy
+msgid ""
+"Disables emulation of a hardware feature called destination alpha, which is "
+"used in many games for various graphical effects.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+"Saltar el destí del pas d'alfa que utilitzen molts de jocs per varis efectes "
+"gràfics.\n"
+"\n"
+"Si no n'estàs segur, deixa-ho desactivat."
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:553
 msgid "Disc"
 msgstr "Disc"
 
-#: Source/Core/DiscIO/Src/DriveBlob.cpp:107
-#: Source/Core/DiscIO/Src/DriveBlob.cpp:126
+#: Source/Core/DiscIO/Src/DriveBlob.cpp:94
+#: Source/Core/DiscIO/Src/DriveBlob.cpp:113
 msgid "Disc Read Error"
 msgstr "Error de lectura de disc"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:312
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:320
 msgid "Display"
 msgstr "Pantalla"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104
 msgid ""
 "Display the inputs read by the emulator.\n"
 "\n"
@@ -1650,32 +1690,32 @@ msgstr ""
 "\n"
 "Si no n'estàs segur, deixa-ho desactivat."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:80
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:67
 msgid "Divide"
 msgstr "Divideix"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:987
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:990
 msgid "Do you want to stop the current emulation?"
 msgstr "Voleu aturar l'emulació actual?"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:663
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:644
 msgid "Dolby Pro Logic II decoder"
 msgstr "Decodificador Dolby Pro Logic II"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:864
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:856
 msgid "Dolphin"
 msgstr "Dolphin"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:183
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:188
 #, c-format
 msgid "Dolphin %s Graphics Configuration"
 msgstr "Configuració de gràfics de Dolphin %s"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:292
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:298
 msgid "Dolphin &Web Site"
 msgstr "Lloc &Web Dolphin"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.h:37
+#: Source/Core/DolphinWX/Src/ConfigMain.h:24
 msgid "Dolphin Configuration"
 msgstr "Configuració de Dolphin"
 
@@ -1683,16 +1723,16 @@ msgstr "Configuració de Dolphin"
 msgid "Dolphin Emulated Wiimote Configuration"
 msgstr "Configuració de Wiimote emulat"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:394
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:383
 msgid "Dolphin FIFO"
 msgstr "FIFO Dolphin"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1136
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1153
 msgid "Dolphin GCPad Configuration"
 msgstr "Configuració del control GC Dolphin"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:679
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1074
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:685
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1089
 msgid "Dolphin TAS Movies (*.dtm)"
 msgstr "Dolphin Pel·lícules TAS (*.dtm)"
 
@@ -1700,11 +1740,11 @@ msgstr "Dolphin Pel·lícules TAS (*.dtm)"
 msgid "Dolphin Wiimote Configuration"
 msgstr "Configuració Wiimote Dolphin"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:293
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:299
 msgid "Dolphin at &Google Code"
 msgstr "Dolphin a &Google Code"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:364
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:351
 msgid ""
 "Dolphin could not find any GC/Wii ISOs.  Doubleclick here to browse for "
 "files..."
@@ -1712,7 +1752,7 @@ msgstr ""
 "Dolphin no ha pogut trobar cap ISO GC/Wii. Fes doble clic aquí per buscar-"
 "les..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:368
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:355
 msgid ""
 "Dolphin is currently set to hide all games.  Doubleclick here to show all "
 "games..."
@@ -1720,50 +1760,59 @@ msgstr ""
 "Dolphin està actualment configurat per ocultar tots els jocs. Fea doble clic "
 "aquí per mostrar-los tots..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1159
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1160
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1246
 msgid "Dolphin was unable to complete the requested action."
 msgstr "Dolphin no ha pogut completar l'acció sol·licitada."
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:275
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:58
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
+#, fuzzy
+msgid ""
+"Doubles the emulated GPU clock rate. May speed up some games (ON = Fast, OFF "
+"= Compatible)"
+msgstr ""
+"Habilitar l'accés al disc ràpid. Necessari per a alguns jocs. (Activat = "
+"ràpid, Desactivat = Compatible)"
+
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:262
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:45
 msgid "Down"
 msgstr "Avall"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:54
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:44
 msgid "Download Codes (WiiRD Database)"
 msgstr "Descarregar Codis (base de dades WiiRD)"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:297
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:287
 #, c-format
 msgid "Downloaded %lu codes. (added %lu)"
 msgstr "Descarregat %lu codis. (Afegits %lu)"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:31
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:35
 msgid "Drums"
 msgstr "Tambors"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:105
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
 msgid "Dummy"
 msgstr "Maniquí"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:661
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:642
 msgid "Dump Audio"
 msgstr "Bolcat d'àudio"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:532
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545
 msgid "Dump EFB Target"
 msgstr "Bolcat de destinació EFB"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546
 msgid "Dump Frames"
 msgstr "Bolcat d'imatges"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543
 msgid "Dump Textures"
 msgstr "Bolcat de textures"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114
 msgid ""
 "Dump all rendered frames to an AVI file in User/Dump/Frames/\n"
 "\n"
@@ -1774,7 +1823,7 @@ msgstr ""
 "\n"
 "Si no n'estàs segur, deixa-ho desmarcat."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111
 msgid ""
 "Dump decoded game textures to User/Dump/Textures/<game_id>/\n"
 "\n"
@@ -1784,7 +1833,7 @@ msgstr ""
 "\n"
 "Si no n'estàs segur, deixa-ho desactivat."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113
 msgid ""
 "Dump the contents of EFB copies to User/Dump/Textures/\n"
 "\n"
@@ -1794,21 +1843,21 @@ msgstr ""
 "\n"
 "Si no n'estàs segur, deixa-ho desmarcat."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:474
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292
 msgid "Dutch"
 msgstr "Holandès"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:112
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:113
 msgid "E&xit"
 msgstr "&Sortir"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:441
 msgid "EFB Copies"
 msgstr "Còpies EFB"
 
-#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:223
+#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:210
 #, c-format
 msgid ""
 "ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least "
@@ -1821,52 +1870,52 @@ msgstr ""
 "Dolphin, probablement serà necessari reiniciar el Windows per veure el nou "
 "controlador."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:166
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:160
 msgid "EUROPE"
 msgstr "EUROPA"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:156
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:143
 msgid "Early Memory Updates"
 msgstr "Actualitzacions recents de memòria"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:447
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:453
 msgid "Edit"
 msgstr "Edita"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.h:30
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.h:17
 msgid "Edit ActionReplay Code"
 msgstr "Modificar codi ActionReplay"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:285
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:286
 msgid "Edit Config"
 msgstr "Modificar configuració"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.h:30
+#: Source/Core/DolphinWX/Src/PatchAddEdit.h:17
 msgid "Edit Patch"
 msgstr "Modificar el pedaç"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:447
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:453
 msgid "Edit current perspective"
 msgstr "Modificar perspectiva actual"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:403
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:425
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:407
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:429
 msgid "Edit..."
 msgstr "Modificació..."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:44
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:48
 msgid "Effect"
 msgstr "Efecte"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:425
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435
 msgid "Embedded Frame Buffer"
 msgstr "Activar la memòria cau d'imatge («Frame Buffer»)"
 
-#: Source/Core/Core/Src/Core.cpp:201
+#: Source/Core/Core/Src/Core.cpp:190
 msgid "Emu Thread already running"
 msgstr "El fil de l'emulador ja s'està executant"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110
 msgid ""
 "Emulate XFBs accurately.\n"
 "Slows down emulation a lot and prohibits high-resolution rendering but is "
@@ -1880,7 +1929,7 @@ msgstr ""
 "\n"
 "Si no n'estàs segur, activa l'emulació virtual de XFB."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109
 msgid ""
 "Emulate XFBs using GPU texture objects.\n"
 "Fixes many games which don't work without XFB emulation while not being as "
@@ -1900,7 +1949,7 @@ msgstr ""
 msgid "Emulated Wiimote"
 msgstr "Wiimote emulat"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346
 msgid "Emulation State: "
 msgstr "Estat d'emulació:"
 
@@ -1908,7 +1957,7 @@ msgstr "Estat d'emulació:"
 msgid "Enable"
 msgstr "Habilitar"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91
 msgid ""
 "Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's "
 "supported by your GPU.\n"
@@ -1925,72 +1974,71 @@ msgstr ""
 "\n"
 "Si no n'estàs segur, deixa-ho desmarcat."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:111
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:98
 msgid "Enable AR Logging"
 msgstr "Habilitar el registre de logs d'AR"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324
 msgid "Enable Block Merging"
 msgstr "Habilitar fusió de Bloc"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331
 msgid "Enable Bounding Box Calculation"
 msgstr "Permetre el càlcul del quadre delimitador"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:446
 msgid "Enable Cache"
 msgstr "Habilitar memòria cau"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:562
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542
 msgid "Enable Cheats"
 msgstr "Activar Trucs"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310
 msgid "Enable Dual Core"
 msgstr "Habilitar Doble nucli"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
 msgid "Enable Dual Core (speedup)"
 msgstr "Habilitar Doble nucli (acceleració)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:550
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:563
 msgid "Enable Hotkeys"
 msgstr "Activar tecles d'accés ràpid"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311
 msgid "Enable Idle Skipping"
 msgstr "Habilitar salt d'inactiu"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541
 msgid "Enable Idle Skipping (speedup)"
 msgstr "Habilitar salt d'inactiu (acceleració)"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312
 msgid "Enable MMU"
 msgstr "Habilitar MMU"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:554
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:567
 msgid "Enable Progressive Scan"
 msgstr "Habilitar exploració &Progressiva"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757
 msgid "Enable Screen Saver"
 msgstr "Habilitar el protector de pantalla"
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:75
-#, fuzzy
 msgid "Enable Speaker Data"
-msgstr "Habilitar pàgines"
+msgstr "Activar altaveu de dades"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
 msgid "Enable WideScreen"
 msgstr "Habilitar pantalla panoràmica"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:516
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529
 msgid "Enable Wireframe"
 msgstr "Habilitar filferro (wireframe)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85
 msgid ""
 "Enable anisotropic filtering.\n"
 "Enhances visual quality of textures that are at oblique viewing angles.\n"
@@ -2005,7 +2053,7 @@ msgstr ""
 "\n"
 "Si no n'estàs segur, selecciona 1x."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323
 msgid ""
 "Enable fast disc access.  Needed for a few games. (ON = Fast, OFF = "
 "Compatible)"
@@ -2017,7 +2065,7 @@ msgstr ""
 msgid "Enable pages"
 msgstr "Habilitar pàgines"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76
 msgid ""
 "Enable this if you want the whole screen to be used for rendering.\n"
 "If this is disabled, a render window will be created instead.\n"
@@ -2029,7 +2077,7 @@ msgstr ""
 "\n"
 "Si no n'estàs segur, deixa-ho desactivat."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80
 msgid ""
 "Enable this if you want to use the main Dolphin window for rendering rather "
 "than a separate render window.\n"
@@ -2041,7 +2089,7 @@ msgstr ""
 "\n"
 "Si no n'estàs segur, deixa-ho desactivat."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:335
 msgid ""
 "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for "
 "ANY other game."
@@ -2049,11 +2097,11 @@ msgstr ""
 "Activa aquesta opció per accelerar The Legend of Zelda: Twilight Princess. "
 "Deshabilitar per a qualsevol altre joc."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340
 msgid "Enables Custom Projection Hack"
 msgstr "Activa la modificació personalitzada de projecció"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:528
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508
 msgid ""
 "Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on "
 "OSX."
@@ -2061,12 +2109,12 @@ msgstr ""
 "Activa la emulació de Dolby Pro Logic II fent servir 5.1 surround. No "
 "disponible a OSX."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510
 msgid ""
 "Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only."
 msgstr "Activa la emulació de Dolby Pro Logic II. Només pel motor OpenAL."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:512
 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."
@@ -2074,7 +2122,7 @@ msgstr ""
 "Activa la emulació de Dolby Pro Logic II. Només pel motor OpenAL. Pot ser "
 "que tinguis que renombrar soft_oal.dll a OpenAL.dll perquè funcioni."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81
 msgid ""
 "Enables progressive scan if supported by the emulated software.\n"
 "Most games don't care about this.\n"
@@ -2086,7 +2134,7 @@ msgstr ""
 "\n"
 "Si no n'estàs segur, deixa-ho desactivat."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313
 msgid ""
 "Enables the Memory Management Unit, needed for some games. (ON = Compatible, "
 "OFF = Fast)"
@@ -2094,7 +2142,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:111
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116
 msgid ""
 "Encode frame dumps using the FFV1 codec.\n"
 "\n"
@@ -2104,52 +2152,52 @@ msgstr ""
 "\n"
 "Si no n'estàs segur, deixa-ho desmarcat."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:40
 msgid "End"
 msgstr "Fi"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:469
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:280
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:260
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293
 msgid "English"
 msgstr "Anglès"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:329
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:407
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:337
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:417
 msgid "Enhancements"
 msgstr "Millores"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:607
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:640
 msgid "Enter a name for the new perspective:"
 msgstr "Escriviu un nom per la nova perspectiva:"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:191
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:178
 #, c-format
 msgid "Entry %d/%d"
 msgstr "Entrada %d/%d"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:85
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:72
 #, c-format
 msgid "Entry 1/%d"
 msgstr "Entrada 1/%d"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:204
 msgid "Equal"
 msgstr "Igual"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:45
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:156
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1242
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:32
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:150
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226
 msgid "Error"
 msgstr "Error"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:381
+#: Source/Core/DolphinWX/Src/Main.cpp:409
 msgid "Error loading selected language. Falling back to system default."
 msgstr ""
 "Error en carregar l'idioma seleccionat. Es retorna a l'idioma per defecte "
 "del sistema."
 
-#: Source/Core/Common/Src/ChunkFile.h:226
+#: Source/Core/Common/Src/ChunkFile.h:221
 #, c-format
 msgid ""
 "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). "
@@ -2158,7 +2206,7 @@ msgstr ""
 "Error: Després de \"%s\", s'ha trobat %d (0x%X) en lloc de la marca de "
 "guardat %d (0x%X). Cancel·lant carrega del guardat..."
 
-#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:342
+#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:329
 #, c-format
 msgid ""
 "Error: Trying to access %s fonts but they are not loaded. Games may not show "
@@ -2167,39 +2215,39 @@ msgstr ""
 "Error: Provant d'accedir a fonts %s però no es carreguen. Els jocs pot ser "
 "que no mostrin les fonts correctament, o un tancar-se."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:30
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:17
 msgid "Escape"
 msgstr "Escape"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:26
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:30
 msgid "Euphoria"
 msgstr "Eufòria"
 
 #: Source/Core/Core/Src/ArmMemTools.cpp:78
-#: Source/Core/Core/Src/x64MemTools.cpp:217
+#: Source/Core/Core/Src/x64MemTools.cpp:206
 #, c-format
 msgid "Exception handler - access below memory space. %08llx%08llx"
 msgstr ""
 "Controlador d'excepcions - accés per sota d'espai de memòria. %08llx%08llx"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:61
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
 msgid "Execute"
 msgstr "Executar"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:459
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:446
 msgid "Export Failed"
 msgstr "Fallada d'exportació"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:639
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:649
 msgid "Export File"
 msgstr "Exportar fitxer"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:177
 msgid "Export Recording"
 msgstr "Exportar gravació"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:345
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:351
 msgid "Export Recording..."
 msgstr "Exportar gravació..."
 
@@ -2207,7 +2255,7 @@ msgstr "Exportar gravació..."
 msgid "Export Save"
 msgstr "Exportar partida desada"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:874
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:865
 msgid "Export Wii save (Experimental)"
 msgstr "Exportar partida desada Wii (Experimental)"
 
@@ -2215,100 +2263,100 @@ msgstr "Exportar partida desada Wii (Experimental)"
 msgid "Export all saves"
 msgstr "Exportar totes les partides desades"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:80
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:72
 msgid "Export failed, try again?"
 msgstr "Exportació fallada, intenteu de nou?"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:559
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:552
 msgid "Export save as..."
 msgstr "Desar exportació com a..."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:297
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:284
 msgid "Extension"
 msgstr "Extensió"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483
 msgid "External Frame Buffer"
 msgstr "Memòria cau d'imatge externa"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:61
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:48
 msgid "Extra Parameter"
 msgstr "Paràmetre addicional"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:62
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:49
 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:614
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:624
 msgid "Extract All Files..."
 msgstr "Extreure tots els arxius..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:616
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:626
 msgid "Extract Apploader..."
 msgstr "Extreure Apploader..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:617
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627
 msgid "Extract DOL..."
 msgstr "Extreure DOL..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:610
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:620
 msgid "Extract Directory..."
 msgstr "Extreure directori..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:612
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:622
 msgid "Extract File..."
 msgstr "Extreure arxiu..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:608
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:618
 msgid "Extract Partition..."
 msgstr "Extreure partició..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:724
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:738
 #, c-format
 msgid "Extracting %s"
 msgstr "Extraient %s"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:707
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:721
 msgid "Extracting All Files"
 msgstr "Extreure tots els arxius"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:707
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:721
 msgid "Extracting Directory"
 msgstr "Extraient Directori"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:710
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:724
 msgid "Extracting..."
 msgstr "Extraient..."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:892
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:893
 msgid "FIFO Byte"
 msgstr "Byte FIFO"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:45
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:32
 msgid "FIFO Player"
 msgstr "Jugador FIFO"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:169
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:163
 msgid "FRANCE"
 msgstr "FRANÇA"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472
 msgid "FST Size:"
 msgstr "Mida FST:"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:77
+#: Source/Core/Core/Src/NetPlayClient.cpp:81
 msgid "Failed to Connect!"
 msgstr "Error al connectar!"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:225
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:228
 msgid "Failed to Listen!!"
 msgstr "Error a l'escoltar!"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:307
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:300
 msgid "Failed to download codes."
 msgstr "Error al descarregar codis."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:827
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:843
 #, c-format
 msgid "Failed to extract to %s!"
 msgstr "Error a l' extreure a %s!"
@@ -2334,26 +2382,30 @@ msgstr ""
 "Podríeu utilitzar el motor DSP HLE que no requereix bolcat ROM.\n"
 "(Esculliu-ho des de la pastanya \"Audio\" de la finestra de configuració)"
 
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:116
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:139
+#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:108
+#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:131
 msgid "Failed to load bthprops.cpl"
 msgstr "No s'ha pogut carregar bthprops.cpl"
 
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:100
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:109
+#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:90
+#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:101
 msgid "Failed to load hid.dll"
 msgstr "No s'ha pogut carregar hid.dll"
 
-#: Source/Core/Core/Src/Movie.cpp:792
+#: Source/Core/Core/Src/Movie.cpp:783
 #, c-format
 msgid "Failed to read %s"
 msgstr "Error al llegir %s"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:151
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:144
 msgid "Failed to read banner.bin"
 msgstr "No s'ha pogut llegir Imatge.bin"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:223
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:178
+msgid "Failed to read bk header"
+msgstr ""
+
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:211
 #, c-format
 msgid ""
 "Failed to read block %d of the save data\n"
@@ -2364,7 +2416,7 @@ msgstr ""
 "La targeta de memòria pot estar trencada\n"
 "Posició de l'arxiu:%llx"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:148
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:136
 msgid ""
 "Failed to read block allocation table backup correctly\n"
 "(0x8000-0x9FFF)"
@@ -2372,7 +2424,7 @@ msgstr ""
 "No s'ha pogut llegir la còpia de taula d'assignació de blocs correctament\n"
 "(0x8000-0x9FFF)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:142
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:130
 msgid ""
 "Failed to read block allocation table correctly\n"
 "(0x6000-0x7FFF)"
@@ -2380,12 +2432,17 @@ msgstr ""
 "No s'ha pogut llegir la taula d'assignació de blocs correctament\n"
 "(0x6000-0x7FFF)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:286
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:279
 #, c-format
 msgid "Failed to read data from file %d"
 msgstr "No s'han pogut llegir les dades des del fitxer %d"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:136
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:367
+#, c-format
+msgid "Failed to read data from file: %s"
+msgstr ""
+
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:124
 msgid ""
 "Failed to read directory backup correctly\n"
 "(0x4000-0x5FFF)"
@@ -2393,7 +2450,7 @@ msgstr ""
 "No s'ha pogut llegir la carpeta de còpia correctament\n"
 "(0x4000-0x5FFF)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:130
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:118
 msgid ""
 "Failed to read directory correctly\n"
 "(0x2000-0x3FFF)"
@@ -2401,7 +2458,11 @@ msgstr ""
 "No es pot llegir el directori correctament \n"
 "(0x2000-0x3fff)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:119
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:90
+msgid "Failed to read header"
+msgstr ""
+
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:107
 msgid ""
 "Failed to read header correctly\n"
 "(0x0000-0x1FFF)"
@@ -2409,41 +2470,41 @@ msgstr ""
 "No s'ha pogut llegir la capçalera correctament\n"
 "(0x0000-0x1FFF)"
 
-#: Source/Core/DiscIO/Src/VolumeGC.cpp:61
+#: Source/Core/DiscIO/Src/VolumeGC.cpp:48
 msgid "Failed to read unique ID from disc image"
 msgstr "No s'ha pogut llegir Identificador únic de la imatge de disc"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:84
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:71
 msgid "Failed to write BT.DINF to SYSCONF"
 msgstr "No s'ha pogut escriure BT.DINF a SYSCONF"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:228
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:221
 msgid "Failed to write bkhdr"
 msgstr "No s'ha pogut escriure bkhdr"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:164
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:157
 #, c-format
 msgid "Failed to write header for %s"
 msgstr "No s'ha pogut escriure la capçalera per %s"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:258
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:251
 #, c-format
 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:314
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294
 msgid "Farsi"
 msgstr "Persa"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477
 msgid "Fast"
 msgstr "Ràpid"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315
 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:1046
+#: Source/Core/Core/Src/Movie.cpp:1037
 #, c-format
 msgid ""
 "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s"
@@ -2451,23 +2512,23 @@ msgstr ""
 "Desincronització fatal. Cancel·lant reproducció. (Error a PlayWiimote: %u != "
 "%u, byte %u.)%s"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:199
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:202
 msgid "Fifo Player"
 msgstr "Jugador fifo"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:99
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:86
 msgid "File Info"
 msgstr "informació del fitxer"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:304
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:295
 msgid "File contained no codes."
 msgstr "L'arxiu no conté codis."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:413
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:400
 msgid "File converted to .gci"
 msgstr "Arxiu convertit a. GCI"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:428
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:415
 msgid ""
 "File could not be opened\n"
 "or does not have a valid extension"
@@ -2475,7 +2536,7 @@ msgstr ""
 "L'arxiu no s'ha pogut obrir \n"
 "o no té una extensió vàlida"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:84
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:72
 #, c-format
 msgid ""
 "File has the extension \"%s\"\n"
@@ -2484,36 +2545,36 @@ msgstr ""
 "L'arxiu té la extensió  \"%s\n"
 "les extensions vàlides són (.raw /.gcp)"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:425
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:412
 msgid "File is not recognized as a memcard"
 msgstr "L'arxiu no es pot reconèixer com una targeta de memòria"
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:294
+#: Source/Core/DiscIO/Src/CompressedBlob.cpp:281
 msgid "File not compressed"
 msgstr "Arxiu no comprimit"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:127
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:109
 #, c-format
 msgid "FileIO: Unknown open mode : 0x%02x"
 msgstr "FileIO: Mode d'obertura desconegut: 0x% 02x "
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:531
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:541
 msgid "Filesystem"
 msgstr "Sistema d'arxius"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1100
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1126
 msgid "Filetype 'ini' is unknown! Will not open!"
 msgstr "Tipus de fitxer 'ini' és desconegut! No s'obrirà!"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:265
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:252
 msgid "Find next"
 msgstr "Trobar següent"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:266
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:253
 msgid "Find previous"
 msgstr "Trobar anterior"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:632
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626
 msgid "First Block"
 msgstr "Primer Bloc"
 
@@ -2521,23 +2582,23 @@ msgstr "Primer Bloc"
 msgid "Fix Checksums"
 msgstr "Arregla les sumes de comprovació"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:275
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283
 msgid "Force 16:9"
 msgstr "Forçar 16:9"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:275
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283
 msgid "Force 4:3"
 msgstr "Forçar 4:3"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:568
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548
 msgid "Force Console as NTSC-J"
 msgstr "Força la consola com NTSC-J"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406
 msgid "Force Texture Filtering"
 msgstr "Forçar Filtrat de textura"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90
 msgid ""
 "Force texture filtering even if the emulated game explicitly disabled it.\n"
 "Improves texture quality slightly but causes glitches in some games.\n"
@@ -2550,7 +2611,7 @@ msgstr ""
 "\n"
 "Si no n'estàs segur, deixa-ho desactivat."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83
 msgid ""
 "Force the game to output graphics for widescreen resolutions.\n"
 "Causes graphical glitches is some games.\n"
@@ -2562,7 +2623,7 @@ msgstr ""
 "\n"
 "Si no n'estàs segur, deixa-ho desmarcat."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488
 msgid ""
 "Forces NTSC-J mode for using the Japanese ROM font.\n"
 "Left unchecked, dolphin defaults to NTSC-U and automatically enables this "
@@ -2572,7 +2633,7 @@ msgstr ""
 "Sent desactivat, dolphin posa per defecte NTSC-U i automàticament ho activa "
 "quant es juga amb jocs Japonesos."
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:74
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:62
 msgid ""
 "Format as ascii (NTSC\\PAL)?\n"
 "Choose no for sjis (NTSC-J)"
@@ -2580,148 +2641,147 @@ msgstr ""
 "Format ascii (NTSC \\PAL)? \n"
 "Tria no per sjis (NTSC-J)"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:278
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:265
 msgid "Forward"
 msgstr "Endavant"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504
 #, c-format
 msgid "Found %d results for '"
 msgstr "Trobats %d resultats per '"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:857
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:925
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:858
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:926
 msgid "Frame"
 msgstr "Imatge"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:867
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:868
 msgid "Frame "
 msgstr "Imatge"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:185
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:173
 msgid "Frame Advance"
 msgstr "Avançar imatges"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:536
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549
 msgid "Frame Dumps use FFV1"
 msgstr "Bolcat d'imatges utilitzant FFV1"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:227
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:214
 msgid "Frame Info"
 msgstr "Info del frame"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:116
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:103
 msgid "Frame Range"
 msgstr "Rang d'imatges"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:138
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:139
 msgid "Frame S&kipping"
 msgstr "Salta imatge&s"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:572
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552
 msgid "Framelimit:"
 msgstr "Limit d'imatges/s:"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:204
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:191
 msgid "Frames To Record"
 msgstr "Imatges a Enregistrar"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547
 msgid "Free Look"
 msgstr "Visió lliure"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
 msgid "French"
 msgstr "Francès"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:38
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:42
 msgid "Frets"
 msgstr "Trasts"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:118
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:137
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:105
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:124
 msgid "From"
 msgstr "de"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:426
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:432
 msgid "FullScr"
 msgstr "Pantalla completa"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:256
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263
 msgid "Fullscreen resolution:"
 msgstr "Resolució de pantalla a pantalla completa:"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:534
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524
 msgid "GCI File(*.gci)"
 msgstr "Arxiu de GCI (*.gci)"
 
-#: Source/Core/DolphinWX/Src/GCMicDlg.h:44
+#: Source/Core/DolphinWX/Src/GCMicDlg.h:31
 msgid "GCMic Configuration"
 msgstr "Configuració del micro de GC"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:432
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
 msgid "GCPad"
 msgstr "Control GC"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:659
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:658
 msgid "GX_CMD_INVL_VC"
 msgstr "GX_CMD_INVL_VC"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:448
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:452
 msgid "Game ID:"
 msgstr "ID del Joc:"
 
-#: Source/Core/Core/Src/NetPlay.cpp:229
+#: Source/Core/Core/Src/NetPlay.cpp:216
 msgid "Game is already running!"
 msgstr "El joc encara està en marxa!"
 
-#: Source/Core/Core/Src/NetPlay.cpp:259
+#: Source/Core/Core/Src/NetPlay.cpp:246
 msgid "Game isn't running!"
 msgstr "El joc no està funcionant!"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:389
-#, fuzzy
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:393
 msgid "Game not found!"
 msgstr "Joc no trobat!"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:385
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:389
 msgid "Game-Specific Settings"
 msgstr "Configuració de jocs específics"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:293
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:294
 msgid "GameConfig"
 msgstr "Configuració de joc"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:525
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:515
 msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)"
 msgstr "Fitxers de guardat de GameCube (*.gci;*.gcs;*.sav)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534
 msgid "Gamecube"
 msgstr "Gamecube"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:178
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:181
 msgid "Gamecube &Pad Settings"
 msgstr "Configuració control «&Gamecube»"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:218
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1069
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:205
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1052
 msgid "Gamecube Memory Cards (*.raw,*.gcp)"
 msgstr "Targetes de memòria per GameCube (*.raw, *.gcp)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:432
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
 msgid "Gamecube Pad settings"
 msgstr "Configuració control Gamecube"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:117
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302
 msgid "Gecko Codes"
 msgstr "Codis Gecko"
 
-#: Source/Core/Core/Src/GeckoCode.cpp:222
+#: Source/Core/Core/Src/GeckoCode.cpp:214
 #, c-format
 msgid ""
 "GeckoCode failed to run (CT%i CST%i) (%s)\n"
@@ -2734,10 +2794,10 @@ msgstr ""
 "Prova fent servir el controlador de codi natiu col·locant el arxiu "
 "codehandler.bin al directori Sys i reiniciant Dolphin.)"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:172
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:197
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:160
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:160
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:202
 msgid "General"
 msgstr "General"
 
@@ -2745,32 +2805,32 @@ msgstr "General"
 msgid "General Settings"
 msgstr "Configuració General"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:470
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:281
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:316
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:261
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
 msgid "German"
 msgstr "Alemany"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:449
+#: Source/Core/Core/Src/ActionReplay.cpp:439
 #, 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:430
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:436
 msgid "Graphics"
 msgstr "Gràfics"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:430
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:436
 msgid "Graphics settings"
 msgstr "Configuració de gràfics"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:205
 msgid "Greater Than"
 msgstr "Més gran que"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87
 msgid ""
 "Greatly increases quality of textures generated using render to texture "
 "effects.\n"
@@ -2788,51 +2848,67 @@ msgstr ""
 "\n"
 "Si no n'estàs segur, deixa-ho desmarcat."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:317
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
 msgid "Greek"
 msgstr "Grec"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:22
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Green"
 msgstr "Verd"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:24
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Green Left"
 msgstr "Verd Esquerra"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:25
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Green Right"
 msgstr "Verd Dret"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:35
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:39
 msgid "Guitar"
 msgstr "Guitarra"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1259
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1250
 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:421
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504
+msgid "Hacked Buffer Upload"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431
 msgid "Hacks"
 msgstr "Modificacions"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:158
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:146
 msgid "Header checksum failed"
 msgstr "Comprovació de la checksum de capçalera ha fallat"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:318
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298
 msgid "Hebrew"
 msgstr "Hebreu"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:313
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:300
 msgid "Height"
 msgstr "Alçada"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:64
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:51
 msgid "Help"
 msgstr "Ajuda"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:209
+#: Source/Core/DolphinWX/Src/Main.cpp:229
+msgid ""
+"Hi,\n"
+"\n"
+"Dolphin requires Mac OS X 10.7 or greater.\n"
+"Unfortunately you're running an old version of OS X.\n"
+"The last Dolphin version to support OS X 10.6 is Dolphin 3.5\n"
+"Please upgrade to 10.7 or greater to use the newest Dolphin version.\n"
+"\n"
+"Sayonara!\n"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/Main.cpp:220
 msgid ""
 "Hi,\n"
 "\n"
@@ -2849,15 +2925,15 @@ msgstr ""
 "\n"
 "Sayonara! \n"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:309
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:296
 msgid "Hide"
 msgstr "Oculta"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:307
 msgid "Hide Mouse Cursor"
 msgstr "Ocultar el cursor del ratolí"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79
 msgid ""
 "Hides the mouse cursor if it's on top of the emulation window.\n"
 "\n"
@@ -2867,26 +2943,26 @@ msgstr ""
 "\n"
 "Si no n'estàs segur, deixa-ho desactivat."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:54
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41
 msgid "Home"
 msgstr "Inici"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:85
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:138
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:76
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:141
 msgid "Host"
 msgstr "Amfitrió"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.h:44
+#: Source/Core/DolphinWX/Src/HotkeyDlg.h:31
 msgid "Hotkey Configuration"
 msgstr "Tecla d'accés de configuració"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:272
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:272
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:594
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:260
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:260
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574
 msgid "Hotkeys"
 msgstr "Tecles d'accés"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:319
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299
 msgid "Hungarian"
 msgstr "Hongarès"
 
@@ -2894,35 +2970,31 @@ msgstr "Hongarès"
 msgid "Hybrid Wiimote"
 msgstr "Wiimote Híbrid"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:532
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:519
 #, 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:786
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:773
 #, c-format
 msgid ""
-"IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available "
-"in your nand dump\n"
+"IOCTL_ES_LAUNCH: Game tried to reload an IOS or a title that is not "
+"available in your NAND dump\n"
 "TitleID %016llx.\n"
-" Dolphin will likely hang now"
+" Dolphin will likely hang now."
 msgstr ""
-"IOCTL_ES_LAUNCH: Joc ha intentat de tornar a carregar ios o un títol que no "
-"està disponible en el seu bolcat de la nand  \n"
-"TitleID %016llx. \n"
-"Probablement Dolphin es penjarà ara."
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:313
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:300
 msgid "IOCTL_ES_READCONTENT - bad destination"
 msgstr "IOCTL_ES_READCONTENT - destinació dolenta"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729
 msgid "IPL Settings"
 msgstr "Configuració de IPL"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269
 msgid "IR"
 msgstr "IR"
 
@@ -2934,23 +3006,23 @@ msgstr "Punter IR"
 msgid "IR Sensitivity:"
 msgstr "Sensibilitat d'IR:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:502
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:512
 msgid "ISO Details"
 msgstr "Detalls d'ISO:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:830
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:811
 msgid "ISO Directories"
 msgstr "Directoris ISO:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:172
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:166
 msgid "ITALY"
 msgstr "ITÀLIA"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:630
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:624
 msgid "Icon"
 msgstr "Icona"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332
 msgid ""
 "If checked, the bounding box registers will be updated. Used by the Paper "
 "Mario games."
@@ -2958,28 +3030,11 @@ msgstr ""
 "Si es selecciona, els registres del quadre delimitador seràn actualitzats. "
 "Es utilitzat pels jocs de Paper Mario."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318
-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:505
-msgid ""
-"If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use "
-"Audio to throttle using the DSP (might fix audio clicks but can also cause "
-"constant noise depending on the game)."
-msgstr ""
-"Si s'ha establert un límit al nombre d'imatges per segon major que la "
-"velocitat del joc màxima (NTSC: 60, PAL: 50), també cal deshabilitar la "
-"regulació de so DSP per a fer-ho efectiu."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:428
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438
 msgid "Ignore Format Changes"
 msgstr "Ignora els canvis de format"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94
 msgid ""
 "Ignore any changes to the EFB format.\n"
 "Improves performance in many games without any negative effect. Causes "
@@ -2993,7 +3048,7 @@ msgstr ""
 "\n"
 "Si no n'estàs segur, deixa-ho desmarcat."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93
 msgid ""
 "Ignore any requests of the CPU to read from or write to the EFB.\n"
 "Improves performance in some games, but might disable some gameplay-related "
@@ -3011,11 +3066,11 @@ msgstr ""
 msgid "Import Save"
 msgstr "Desar importació"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:59
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:48
 msgid "Import failed, try again?"
 msgstr "Fallada a l'importació, tornar a provar?"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:454
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:441
 msgid ""
 "Imported file has gsc extension\n"
 "but does not have a correct header"
@@ -3023,11 +3078,11 @@ msgstr ""
 "L'arxiu importat té extensió sgc \n"
 "però té una capçalera incorrecte."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:442
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:429
 msgid "Imported file has invalid length"
 msgstr "l'Arxiu importat té una longitud no vàlida"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:451
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:438
 msgid ""
 "Imported file has sav extension\n"
 "but does not have a correct header"
@@ -3035,19 +3090,7 @@ msgstr ""
 "L'Arxiu importat té extensio sav \n"
 "però la capçalera és incorrecte"
 
-#: 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 ""
-"Millora el rendiment en molts jocs, però causa errors gràfics en els jocs "
-"que es basen en l'emulació de boira\n"
-"\n"
-"Si no n'estàs segur, deixa-ho desactivat."
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350
 msgid "In Game"
 msgstr "En Joc"
 
@@ -3055,67 +3098,67 @@ msgstr "En Joc"
 msgid "In-Game"
 msgstr "En-joc"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:34
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305
 msgid "Info"
 msgstr "Info"
 
-#: Source/Core/Common/Src/MsgHandler.cpp:65
+#: Source/Core/Common/Src/MsgHandler.cpp:51
 msgid "Information"
 msgstr "Informació"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:481
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:468
 msgid "Input"
 msgstr "Entrada"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:63
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:50
 msgid "Insert"
 msgstr "Insereix"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:176
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:166
 msgid "Insert Encrypted or Decrypted code here..."
 msgstr "Inserta el codi xifrat o desxifrat aquí..."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:763
 msgid "Insert SD Card"
 msgstr "Inserir la targeta SD"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:34
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:21
 msgid "Insert name here.."
 msgstr "Introduïu un nom aquí .."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:196
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:199
 msgid "Install WAD"
 msgstr "Instal·lar WAD"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:895
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:888
 msgid "Install to Wii Menu"
 msgstr "Instal·lar al Menú de Wii"
 
-#: Source/Core/Core/Src/x64MemTools.cpp:252
+#: Source/Core/Core/Src/x64MemTools.cpp:242
 msgid ""
 "InstallExceptionHandler called, but this platform does not yet support it."
 msgstr ""
 "InstallExceptionHandler cridat, però aquesta plataforma no està suportada "
 "encara."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1297
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
 msgid "Installing WAD..."
 msgstr "Instal·lant WAD..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:885
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:901
 msgid "Integrity Check Error"
 msgstr "Error de comprovació d'integritat"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:891
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:907
 msgid "Integrity check completed"
 msgstr "Comprovació d'integritat finalitzat"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:890
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:906
 msgid "Integrity check completed. No errors have been found."
 msgstr "Comprovació d'integritat finalitzat. No s'han trobat errors."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:882
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:898
 #, c-format
 msgid ""
 "Integrity check for partition %d failed. Your dump is most likely corrupted "
@@ -3124,19 +3167,19 @@ msgstr ""
 "Comprovació d'integritat per la partició %d ha fallat. El teu bolcat "
 "probablement s'ha corromput o s'ha apedaçat incorrectament."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532
 msgid "Interface"
 msgstr "Interfície"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:646
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627
 msgid "Interface Settings"
 msgstr "Configuració d'interfície"
 
-#: Source/Core/Core/Src/State.cpp:240
+#: Source/Core/Core/Src/State.cpp:228
 msgid "Internal LZO Error - compression failed"
 msgstr "Error intern LZO  - la compressió ha fallat"
 
-#: Source/Core/Core/Src/State.cpp:348
+#: Source/Core/Core/Src/State.cpp:336
 #, c-format
 msgid ""
 "Internal LZO Error - decompression failed (%d) (%li, %li) \n"
@@ -3145,41 +3188,45 @@ msgstr ""
 "Error intern LZO - descompressió fallada (% d) (%li, %li) \n"
 "Intenteu carregar l'estat de nou"
 
-#: Source/Core/Core/Src/State.cpp:485
+#: Source/Core/Core/Src/State.cpp:473
 msgid "Internal LZO Error - lzo_init() failed"
 msgstr "Error intern LZO - lzo_init () ha fallat"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:344
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:352
 msgid "Internal Resolution:"
 msgstr "Resolució Interna:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:42
+msgid "Interpreter (VERY slow)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349
 msgid "Intro"
 msgstr "Introducció"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:194
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:187
 #, c-format
 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:600
 msgid "Invalid Value!"
 msgstr "Valor invàlid!"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:462
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:449
 msgid "Invalid bat.map or dir entry"
 msgstr "Invàlid bat.map o entrada al directori"
 
-#: Source/Core/Core/Src/CoreTiming.cpp:548
+#: Source/Core/Core/Src/CoreTiming.cpp:553
 #, c-format
 msgid "Invalid event type %i"
 msgstr "Tipus d'esdeveniment invàlid %i"
 
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:326
+#: Source/Core/Core/Src/HW/DVDInterface.cpp:309
 msgid "Invalid file"
 msgstr "Arxiu invàlid"
 
-#: Source/Core/DiscIO/Src/BannerLoaderGC.cpp:41
+#: Source/Core/DiscIO/Src/BannerLoaderGC.cpp:28
 #, c-format
 msgid ""
 "Invalid opening.bnr found in gcm:\n"
@@ -3190,46 +3237,54 @@ msgstr ""
 "% s\n"
 "És possible que necessiti re-descarregar aquest joc."
 
-#: Source/Core/Core/Src/Movie.cpp:735
+#: Source/Core/Core/Src/Movie.cpp:726
 msgid "Invalid recording file"
 msgstr "Enregistrament de fitxer invàlid"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:473
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:472
 msgid "Invalid search parameters (no object selected)"
 msgstr "Paràmetres de búsqueda invàlids (cap objecte seleccionat)"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:456
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:455
 msgid "Invalid search string (couldn't convert to number)"
 msgstr "Cerca de cadena invàlida (no s'ha pogut convertir a número)"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:444
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:443
 msgid "Invalid search string (only even string lengths supported)"
 msgstr "Cerca de cadena invàlida (només es soporten algunes longituds)"
 
-#: Source/Core/Core/Src/Core.cpp:513
+#: Source/Core/Core/Src/Core.cpp:511
 msgid "Invalid state"
 msgstr "Estat invàlid"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:473
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:320
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300
 msgid "Italian"
 msgstr "Italià"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:183
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:177
 msgid "JAPAN"
 msgstr "JAPÓ"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:321
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:46
+msgid "JIT Recompiler (recommended)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:47
+msgid "JITIL experimental recompiler"
+msgstr "Recompilador experimental JITIL"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:279
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
 msgid "Japanese"
 msgstr "Japonès"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:188
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:182
 msgid "KOREA"
 msgstr "COREA"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78
 msgid ""
 "Keep the game window on top of all other windows.\n"
 "\n"
@@ -3239,62 +3294,62 @@ msgstr ""
 "\n"
 "Si no n'estàs segur, deixa-ho desactivat."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:298
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:306
 msgid "Keep window on top"
 msgstr "Mantenir la finestra sempre visible"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:241
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:241
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:229
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:229
 msgid "Key"
 msgstr "Clau"
 
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282
 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:322
 msgid "Korean"
 msgstr "Corea"
 
 #. i18n:  Left
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:57
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:44
 msgid "L"
 msgstr "L"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:39
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:26
 msgid "L Button"
 msgstr "Botó L"
 
 #. i18n:  Left-Analog
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:61
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:48
 msgid "L-Analog"
 msgstr "L-Analògic"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:585
 msgid "Language:"
 msgstr "Idioma:"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:152
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:153
 msgid "Last Overwritten State"
 msgstr "Últim estat sobreescrit"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:159
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:161
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:160
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:162
 msgid "Last Saved State"
 msgstr "Últim estat desat"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:696
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:677
 msgid "Latency:"
 msgstr "Latència:"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:276
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:55
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:263
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:42
 msgid "Left"
 msgstr "Esquerra"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:60
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:64
 msgid "Left Stick"
 msgstr "Palanca esquerra"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:257
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:257
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:245
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:245
 msgid ""
 "Left click to detect hotkeys.\n"
 "Enter space to clear."
@@ -3302,7 +3357,7 @@ msgstr ""
 "Clic esquerre per detectar tecles d'accés. \n"
 "Entrar a l'espai per esborrar."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:689
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:678
 msgid ""
 "Left-click to detect input.\n"
 "Middle-click to clear.\n"
@@ -3312,7 +3367,7 @@ msgstr ""
 "Clic mig per desactivar. \n"
 "Clic det per més opcions."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:694
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:683
 msgid ""
 "Left/Right-click for more options.\n"
 "Middle-click to clear."
@@ -3320,76 +3375,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:206
 msgid "Less Than"
 msgstr "Menys de"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:565
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545
 msgid "Limit by FPS"
 msgstr "Limitar per FPS "
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:924
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:915
 msgid "Load"
 msgstr "Carregar"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544
 msgid "Load Custom Textures"
 msgstr "Carrega textures personalitzades"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
 msgid "Load State Slot 1"
 msgstr "Carregar ranura d'estat 1"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189
 msgid "Load State Slot 2"
 msgstr "Carregar ranura d'estat 2"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:190
 msgid "Load State Slot 3"
 msgstr "Carregar ranura d'estat 3"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:203
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:191
 msgid "Load State Slot 4"
 msgstr "Carregar ranura d'estat 4"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192
 msgid "Load State Slot 5"
 msgstr "Carregar ranura d'estat 5"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193
 msgid "Load State Slot 6"
 msgstr "Carregar ranura d'estat 6"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:194
 msgid "Load State Slot 7"
 msgstr "Carregar ranura d'estat 7"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:195
 msgid "Load State Slot 8"
 msgstr "Carregar ranura d'estat 8"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:155
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:156
 msgid "Load State..."
 msgstr "Carregar Estat..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1332
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1359
 msgid "Load Wii System Menu"
 msgstr "Carregar el menú del sistema Wii"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1327
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1354
 #, c-format
 msgid "Load Wii System Menu %d%c"
 msgstr "Carregar menú del sistema Wii %d%c"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112
 msgid ""
 "Load custom textures from User/Load/Textures/<game_id>/\n"
 "\n"
@@ -3399,7 +3454,7 @@ msgstr ""
 "\n"
 "Si no n'estàs segur, deixa-ho desactivat."
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:50
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:37
 msgid "Load preset values from hack patterns available."
 msgstr "Carrega els valors  preestablerts dels patrons disponibles."
 
@@ -3407,23 +3462,23 @@ msgstr "Carrega els valors  preestablerts dels patrons disponibles."
 msgid "Local"
 msgstr "Local"
 
-#: Source/Core/DolphinWX/Src/LogWindow.h:51
+#: Source/Core/DolphinWX/Src/LogWindow.h:38
 msgid "Log"
 msgstr "Registre Log"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:26
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:13
 msgid "Log Configuration"
 msgstr "Configuració del registre Log"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:296
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304
 msgid "Log FPS to file"
 msgstr "Escriure FPS en un fitxer"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:96
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83
 msgid "Log Types"
 msgstr "Tipus de registre Log"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103
 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"
@@ -3435,24 +3490,24 @@ msgstr ""
 "\n"
 "Si no n'estàs segur, deixa-ho desmarcat."
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:81
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:68
 msgid "Logger Outputs"
 msgstr "Sortides del registrador Log"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132
-#: Source/Core/DolphinWX/Src/Frame.cpp:328
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:119
+#: Source/Core/DolphinWX/Src/Frame.cpp:314
 msgid "Logging"
 msgstr "Inici de sessió"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:255
+#: Source/Core/Core/Src/NetPlayClient.cpp:259
 msgid "Lost connection to server!"
 msgstr "Perdut la connexió amb el servidor!"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:42
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:29
 msgid "M Button"
 msgstr "Botó M"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:119
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:112
 #, c-format
 msgid ""
 "MD5 mismatch\n"
@@ -3461,51 +3516,60 @@ msgstr ""
 "desajust MD5 \n"
 " %016llx%016llx != %016llx%016llx"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314
 msgid "MMU Speed Hack"
 msgstr "Modificació de velocitat MMU"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:527
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:563
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:517
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:556
 msgid "MadCatz Gameshark files(*.gcs)"
 msgstr "Arxius MadCatz Gameshark (*.gcs)"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:51
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:63
+#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:38
 msgid "Main Stick"
 msgstr "Palanca principal"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460
 msgid "Maker ID:"
 msgstr "ID Fabricant:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487
 msgid "Maker:"
 msgstr "Fabricant:"
 
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100
+msgid ""
+"Makes distant objects more visible by removing fog, thus increasing the "
+"overall detail.\n"
+"Disabling fog will break some games which rely on proper fog emulation.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:97
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:100
 msgid "Max"
 msgstr "Màxim"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:448
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:435
 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:291
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:278
 msgid "Memcard already opened"
 msgstr "Targeta de memòria ja oberta"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:912
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:913
 msgid "Memory Byte"
 msgstr "Byte de memòria"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:225
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:113
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:212
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:93
 msgid "Memory Card"
 msgstr "Targeta de memòria"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.h:36
+#: Source/Core/DolphinWX/Src/MemcardManager.h:23
 msgid ""
 "Memory Card Manager WARNING-Make backups before using, should be fixed but "
 "could mangle stuff!"
@@ -3513,7 +3577,7 @@ msgstr ""
 "Targeta de memòria Administrador ADVERTÈNCIA-Fes còpies de seguretat abans "
 "d'utilitzar, hauria d'estar arreglat, però pots perdre dades!"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:371
+#: Source/Core/Core/Src/CoreParameter.cpp:360
 #, c-format
 msgid ""
 "Memory Card filename in Slot %c is incorrect\n"
@@ -3530,16 +3594,16 @@ msgstr ""
 "%s \n"
 "Voleu copiar el fitxer antic a aquesta nova ubicació? \n"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:124
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:112
 msgid "Memorycard filesize does not match the header size"
 msgstr ""
 "La mida de la targeta de memòria no correspon a la mida de la capçalera"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:50
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:37
 msgid "Menu"
 msgstr "Menú"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:114
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:94
 msgid "Mic"
 msgstr "Micròfon"
 
@@ -3548,20 +3612,20 @@ msgstr "Micròfon"
 msgid "Min"
 msgstr "Mínim"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:580
 msgid "Misc"
 msgstr "Varis"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:795
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776
 msgid "Misc Settings"
 msgstr "Varies Configuracions"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:240
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:294
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:227
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:281
 msgid "Modifier"
 msgstr "Modificador"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106
 msgid ""
 "Modify textures to show the format they're encoded in. Needs an emulation "
 "reset in most cases.\n"
@@ -3573,20 +3637,20 @@ msgstr ""
 "\n"
 "Si no n'estàs segur, deixa-ho desmarcat."
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:115
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:108
 msgid "Monospaced font"
 msgstr "Fonts d'espiat simple"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:305
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:292
 msgid "Motion Plus"
 msgstr "Motion Plus®"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:309
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:86
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:296
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73
 msgid "Motor"
 msgstr "Motor"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:654
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:666
 msgid ""
 "Move the mouse pointer over an option to display a detailed description.\n"
 "\n"
@@ -3605,225 +3669,236 @@ msgstr ""
 "\n"
 "\n"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:75
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:62
 msgid "Multiply"
 msgstr "Múltiple"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:651
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:650
 msgid "NOP"
 msgstr "NOP"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:629
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:628
 msgid "NOTE: Stream size doesn't match actual data length\n"
 msgstr ""
 "NOTA: El tamany de fluxe no coincideix amb la longitud actual de dades\n"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:129
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:116
 msgid "NP Add"
 msgstr "NP Afegir"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:124
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:111
 msgid "NP Begin"
 msgstr "NP Començar"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:132
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:119
 msgid "NP Decimal"
 msgstr "NP Decimal"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:126
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:113
 msgid "NP Delete"
 msgstr "NP Esborrar"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:133
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:120
 msgid "NP Divide"
 msgstr "NP Dividir"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:120
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:107
 msgid "NP Down"
 msgstr "NP Avall"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:123
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:110
 msgid "NP End"
 msgstr "NP Fi"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:111
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:98
 msgid "NP Enter"
 msgstr "NP Entrar"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:127
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:114
 msgid "NP Equal"
 msgstr "NP Igual"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:116
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:103
 msgid "NP Home"
 msgstr "NP Inici"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:125
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:112
 msgid "NP Insert"
 msgstr "NP Inserir"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:117
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:104
 msgid "NP Left"
 msgstr "NP Esquerra"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:128
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:115
 msgid "NP Multiply"
 msgstr "NP Multiplicar"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:122
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:109
 msgid "NP Page Down"
 msgstr "NP Baixar pagina"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:121
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:108
 msgid "NP Page Up"
 msgstr "NP Pàgina"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:119
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:106
 msgid "NP Right"
 msgstr "Dret NP"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:130
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:117
 msgid "NP Separator"
 msgstr "NP Separador"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:109
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:96
 msgid "NP Space"
 msgstr "NP Espai"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:131
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:118
 msgid "NP Subtract"
 msgstr "NP Restar"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:110
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:97
 msgid "NP Tab"
 msgstr "NP Tabulador"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:118
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:105
 msgid "NP Up"
 msgstr "NP Amunt"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:444
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:59
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:50
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:448
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:46
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:37
 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:25
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:72
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:282
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:553
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:15
 msgid "Name: "
 msgstr "Nom:"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:526
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:562
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:516
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:555
 msgid "Native GCI files(*.gci)"
 msgstr "Arxius natius GCI (*.gci)"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:161
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:148
 msgid "New Scan"
 msgstr "Nou escaneig"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:206
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:193
 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:801
 msgid "Next Page"
 msgstr "Pàgina següent"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:165
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:152
 msgid "Next Scan"
 msgstr "Següent escaneig"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:68
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:59
 msgid "Nickname :"
 msgstr "Sobrenom:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:196
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:190
 msgid "No Country (SDK)"
 msgstr "No país (SDK)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:370
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:357
 msgid "No ISOs or WADS found"
 msgstr "No s'han trobat ISOs o WADs"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:508
+#: Source/Core/Core/Src/ConfigManager.h:17
+msgid "No audio output"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:501
 #, c-format
 msgid "No banner file found for title  %s"
 msgstr "No s'ha trobat la imatge pel joc %s"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:761
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:768
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:760
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:767
 msgid "No description available"
 msgstr "No hi ha descripció disponible"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:514
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:535
 msgid "No docking"
 msgstr "No acoblament"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:859
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:860
 msgid "No file loaded"
 msgstr "No s'ha carregat cap fitxer"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:439
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:426
 msgid "No free dir index entries"
 msgstr "No hi ha entrades lliures a l'índex de directoris"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:895
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:896
 msgid "No recorded file"
 msgstr "Arxiu no enregistrat"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:501
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:494
 #, c-format
 msgid "No save folder found for title %s"
 msgstr "No s'ha trobat la carpeta de partides desades per el joc %s"
 
+#: Source/Plugins/Plugin_VideoOGL/Src/main.cpp:132
+#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:111
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:23
 #: Source/Core/DolphinWX/Src/NetWindow.cpp:600
 msgid "None"
 msgstr "Cap"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:323
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303
 msgid "Norwegian Bokmaal"
 msgstr "Noruega Bokmaal"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:203
 msgid "Not Equal"
 msgstr "No igual"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:804
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:794
 msgid "Not Set"
 msgstr "Sense establir"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:626
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:101
+#, c-format
+msgid "Not a Wii save or read failure for file header size %x"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/Main.cpp:654
 msgid "Not connected"
 msgstr "No està connectat"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:309
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:296
 msgid "Notes"
 msgstr "Notes"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:16
 msgid "Notes: "
 msgstr "Notes:"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:71
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:74
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:580
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:621
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:629
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:59
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:64
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:613
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:659
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:667
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:31
 msgid "Notice"
 msgstr "Avís"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:105
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:92
 msgid "Num Lock"
 msgstr "Bloq Numèric"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:88
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:75
 msgid "Number Of Codes: "
 msgstr "Nombre de codis:"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:30
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:34
 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26
 msgid "Nunchuk"
 msgstr "Nunchuk"
@@ -3832,96 +3907,97 @@ msgstr "Nunchuk"
 msgid "Nunchuk Acceleration"
 msgstr "Acceleració del Nunchuk"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:877
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:878
 msgid "Object"
 msgstr "Objecte"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:135
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:122
 msgid "Object Range"
 msgstr "Rang d'objecte"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:243
 msgid "Off"
 msgstr "Apagar"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:62
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:49
 msgid "Offset:"
 msgstr "Desplaçament:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:582
 msgid "On-Screen Display Messages"
 msgstr "Missatges en pantalla"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:436
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:423
 #, c-format
 msgid "Only %d blocks available"
 msgstr "Només queden %d blocs disponibles"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:420
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:178
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:426
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:166
 msgid "Open"
 msgstr "Obrir"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:876
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:867
 msgid "Open &containing folder"
 msgstr "Obrir directori &contingut"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:873
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:864
 msgid "Open Wii &save folder"
 msgstr "Obrir la carpeta de partide&s desades"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:420
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:426
 msgid "Open file..."
 msgstr "Obrir fitxer..."
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:61
+#: Source/Core/AudioCommon/Src/OpenALStream.cpp:48
 #, 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:72
+#: Source/Core/AudioCommon/Src/OpenALStream.cpp:59
 msgid "OpenAL: can't find sound devices"
 msgstr "OpenAL: no es poden trobar dispositius de so"
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:66
+#: Source/Core/AudioCommon/Src/OpenALStream.cpp:53
 #, c-format
 msgid "OpenAL: can't open device %s"
 msgstr "OpenAL: no es pot obrir el dispositiu %s"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502
 msgid "OpenCL Texture Decoder"
 msgstr "Descodificador de textura OpenCL"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503
 msgid "OpenMP Texture Decoder"
 msgstr "Activar descodificador de textura OpenMP"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:317
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:94
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:304
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:81
 msgid "Options"
 msgstr "Opcions"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:22
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Orange"
 msgstr "Taronja"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:468
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:455
+#, fuzzy
 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"
+"and import the saves to a new memcard\n"
 msgstr ""
 "L'ordre dels arxius en el directori no coincideix amb l'ordre de blocs\n"
 "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:316
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:324
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:509
 msgid "Other"
 msgstr "Altres"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:206
+#: Source/Core/Core/Src/NetPlayClient.cpp:210
 msgid ""
 "Other client disconnected while game is running!! NetPlay is disabled. You "
 "manually stop the game."
@@ -3929,15 +4005,15 @@ msgstr ""
 "Un altre client s'ha desconnectat mentre el joc s'estava executant! NetPlay "
 "s'ha desactivat. Aturar manualment el joc."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:481
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:468
 msgid "Output"
 msgstr "Sortida"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:342
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:348
 msgid "P&lay Recording..."
 msgstr "&Reproduir gravació..."
 
-#: Source/Core/Core/Src/HW/GCPad.cpp:30
+#: Source/Core/Core/Src/HW/GCPad.cpp:18
 msgid "Pad"
 msgstr "Control"
 
@@ -3945,160 +4021,160 @@ msgstr "Control"
 msgid "Pad "
 msgstr "Control"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:34
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:38
 msgid "Pads"
 msgstr "Controls"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:108
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:95
 msgid "Page Down"
 msgstr "Retocedir pàgina"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:107
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:94
 msgid "Page Up"
 msgstr "Avançar Pàgina"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:35
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:22
 msgid "Paragraph"
 msgstr "Paràgraf"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:64
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:51
 msgid "Parameters"
 msgstr "Paràmetres"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:222
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:217
 #, c-format
 msgid "Partition %i"
 msgstr "Partició %i"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:296
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:297
 msgid "Patches"
 msgstr "Pedaços"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:556
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536
 msgid "Paths"
 msgstr "Camins"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1538
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1539
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:51
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1565
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1566
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:38
 msgid "Pause"
 msgstr "Pausa"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:128
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:129
 msgid "Pause at end of movie"
 msgstr "Pausar al acabar la pel·lícula"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:397
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405
 msgid "Per-Pixel Lighting"
 msgstr "Il·luminació per píxel"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352
 msgid "Perfect"
 msgstr "Perfecte"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:609
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:642
 #, c-format
 msgid "Perspective %d"
 msgstr "Perspectiva %d"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:165
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:424
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1547
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1548
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:152
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:430
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1574
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1575
 msgid "Play"
 msgstr "Executar"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176
 msgid "Play Recording"
 msgstr "Reproduir enregistrament"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:170
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:170
 msgid "Play/Pause"
 msgstr "Reproduir/Pausa"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351
 msgid "Playable"
 msgstr "Jugable"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:154
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:141
 msgid "Playback Options"
 msgstr "Opcions de reproducció"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:301
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:304
 msgid "Players"
 msgstr "Jugadors"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:988
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:991
 msgid "Please confirm..."
 msgstr "Confirma..."
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:579
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:612
 msgid "Please create a perspective before saving"
 msgstr "Creeu una perspectiva abans de desar"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:36
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:23
 msgid "Plus-Minus"
 msgstr "Més-Menys"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:324
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304
 msgid "Polish"
 msgstr "Polonès"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:713
 msgid "Port 1"
 msgstr "Port 1"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714
 msgid "Port 2"
 msgstr "Port 2"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:734
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715
 msgid "Port 3"
 msgstr "Port 3"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716
 msgid "Port 4"
 msgstr "Port 4"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:97
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:130
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:88
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:133
 msgid "Port :"
 msgstr "Port :"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:325
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305
 msgid "Portuguese"
 msgstr "Portuguès"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:326
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306
 msgid "Portuguese (Brazilian)"
 msgstr "Portuguès (Brasil)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:391
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:399
 msgid "Post-Processing Effect:"
 msgstr "Efectes de post-procés:"
 
-#: Source/Core/Core/Src/Movie.cpp:936
+#: Source/Core/Core/Src/Movie.cpp:927
 #, c-format
 msgid "Premature movie end in PlayController. %u + 8 > %u"
 msgstr "Final prematur de la pel·lícula a PlayController. %u + 8 > %u"
 
-#: Source/Core/Core/Src/Movie.cpp:1055
+#: Source/Core/Core/Src/Movie.cpp:1046
 #, c-format
 msgid "Premature movie end in PlayWiimote. %u + %d > %u"
 msgstr "Final prematur de la pel·lícula a PlayWiimote. %u + %d > %u"
 
-#: Source/Core/Core/Src/Movie.cpp:1032
+#: Source/Core/Core/Src/Movie.cpp:1023
 #, c-format
 msgid "Premature movie end in PlayWiimote. %u > %u"
 msgstr "Final prematur de la pel·lícula a PlayWiimote. %u > %u"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:48
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:35
 msgid "Presets: "
 msgstr "Preestablerts:"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:205
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:192
 msgid "Prev Page"
 msgstr "Pàgina anterior"
 
@@ -4106,67 +4182,67 @@ msgstr "Pàgina anterior"
 msgid "Previous Page"
 msgstr "Pàgina anterior"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:183
 msgid "Previous Value"
 msgstr "Valor anterior"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:60
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:47
 msgid "Print"
 msgstr "Imprimir"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:894
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:885
 msgid "Profile"
 msgstr "Perfil"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.h:55
+#: Source/Core/DolphinWX/Src/ISOProperties.h:42
 msgid "Properties"
 msgstr "Propietats"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:283
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:286
 msgid "Purge Cache"
 msgstr "Netejar memòria cau"
 
-#: Source/Core/Common/Src/MsgHandler.cpp:66
+#: Source/Core/Common/Src/MsgHandler.cpp:52
 msgid "Question"
 msgstr "Pregunta"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:159
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:316
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:162
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:319
 msgid "Quit"
 msgstr "Sortir"
 
 #. i18n:  Right
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:59
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:46
 msgid "R"
 msgstr "R"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:40
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:27
 msgid "R Button"
 msgstr "Botó R"
 
 #. i18n:  Right-Analog
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:63
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
 msgid "R-Analog"
 msgstr "R-Analògic"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:445
 msgid "RAM"
 msgstr "RAM"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:175
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:169
 msgid "RUSSIA"
 msgstr "RÚSSIA"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:528
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:515
 msgid "Range"
 msgstr "Rang"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:190
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:178
 msgid "Read-only mode"
 msgstr "Només lectura"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:487
 msgid "Real"
 msgstr "Real"
 
@@ -4182,33 +4258,33 @@ msgstr "Wiimotes reals"
 msgid "Reconnect Wiimote on State Loading"
 msgstr "Tornar a connectar el Wiimote al carregar l'estat"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:193
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:217
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:791
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:180
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:204
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:790
 msgid "Record"
 msgstr "Enregistrar"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:174
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:161
 msgid "Recording Info"
 msgstr "Informació d'enregistrament"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:202
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:189
 msgid "Recording Options"
 msgstr "Enregistrant Opcions"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:21
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Red"
 msgstr "Vermell"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:24
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Red Left"
 msgstr "Vermell Esquerra"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:25
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Red Right"
 msgstr "Vermell Dret"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86
 msgid ""
 "Reduces the amount of aliasing caused by rasterizing 3D graphics.\n"
 "This makes the rendered picture look less blocky.\n"
@@ -4224,28 +4300,28 @@ msgstr ""
 "Si no n'estàs segur, selecciona Cap."
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:60
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:421
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:903
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:427
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:894
 msgid "Refresh"
 msgstr "Actualitzar"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:180
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:168
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:168
 msgid "Refresh List"
 msgstr "Actualitzar llista"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:421
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:427
 msgid "Refresh game list"
 msgstr "Actualitza la llista de jocs"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:405
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:427
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:77
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:812
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:409
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:431
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:64
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:793
 msgid "Remove"
 msgstr "Treure"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99
 msgid ""
 "Render the scene as a wireframe.\n"
 "\n"
@@ -4255,197 +4331,203 @@ msgstr ""
 "\n"
 "Si no n'estàs segur, deixa-ho desactivat."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:308
 msgid "Render to Main Window"
 msgstr "Renderitzar a la finestra principal"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:915
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:172
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:906
 msgid "Reset"
 msgstr "Reiniciar"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:190
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:177
 msgid "Results"
 msgstr "Resultats"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:29
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:16
 msgid "Return"
 msgstr "Tornar"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:277
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:57
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464
+msgid "Revision:"
+msgstr ""
+
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:264
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:44
 msgid "Right"
 msgstr "Dreta"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:61
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:65
 msgid "Right Stick"
 msgstr "Palanca dreta"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:85
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:295
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:72
 msgid "Rumble"
 msgstr "Vibració"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:518
-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:498
+msgid ""
+"Run DSP HLE and LLE on a dedicated thread (not recommended: might cause "
+"audio glitches with HLE and freezes with LLE)."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:327
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307
 msgid "Russian"
 msgstr "Rus"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:149
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:150
 msgid "Sa&ve State"
 msgstr "&Desa l'estat"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:465
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475
 msgid "Safe"
 msgstr "Segur"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:196
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:446
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:925
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:183
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:452
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916
 msgid "Save"
 msgstr "Desar"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:532
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:522
 msgid "Save GCI as..."
 msgstr "Anomena i desa GCI..."
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
 msgid "Save State Slot 1"
 msgstr "Desar ranura estat 1"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:198
 msgid "Save State Slot 2"
 msgstr "Desar ranura estat 2"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:199
 msgid "Save State Slot 3"
 msgstr "Desar ranura estat 3"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:212
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:212
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200
 msgid "Save State Slot 4"
 msgstr "Desar ranura estat 4"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201
 msgid "Save State Slot 5"
 msgstr "Desar ranura estat 5"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202
 msgid "Save State Slot 6"
 msgstr "Desar ranura estat 6"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:203
 msgid "Save State Slot 7"
 msgstr "Desar ranura estat 7"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204
 msgid "Save State Slot 8"
 msgstr "Desar ranura estat 8"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:151
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:152
 msgid "Save State..."
 msgstr "Desar Estat..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:582
 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:592
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:602
 msgid "Save as..."
 msgstr "Desar com..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1203
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1204
 msgid "Save compressed GCM/ISO"
 msgstr "Desar GCM/ISO comprimit"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:446
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:452
 msgid "Save current perspective"
 msgstr "Desar perspectiva actual"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1192
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193
 msgid "Save decompressed GCM/ISO"
 msgstr "Desar GCM/ISO descomprimit"
 
-#: Source/Core/Core/Src/Movie.cpp:801
+#: Source/Core/Core/Src/Movie.cpp:792
 #, c-format
 msgid "Savestate movie %s is corrupted, movie recording stopping..."
 msgstr ""
 "El guardat de la pel·lícula %s és corrupta, la gravació s'està aturant..."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:396
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:404
 msgid "Scaled EFB Copy"
 msgstr "Copia EFB escalada"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:556
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:543
 #, c-format
 msgid "Scanning %s"
 msgstr "Escanejant %s"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:539
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:526
 msgid "Scanning for ISOs"
 msgstr "Cercant ISOs"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:540
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:527
 msgid "Scanning..."
 msgstr "Cercant..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:427
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
 msgid "ScrShot"
 msgstr "Capturar"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:106
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:93
 msgid "Scroll Lock"
 msgstr "Bloc desplaçament"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:264
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:251
 msgid "Search"
 msgstr "Buscar"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:227
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:214
 msgid "Search Filter"
 msgstr "Filtre de cerca"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:810
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:791
 msgid "Search Subfolders"
 msgstr "Cercar en subcarpetes"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:250
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:237
 msgid "Search current Object"
 msgstr "Buscar objecte actual"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:254
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:241
 msgid "Search for hex Value:"
 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
+#: Source/Core/Common/Src/SysConf.h:90 Source/Core/Common/Src/SysConf.h:113
+#: Source/Core/Common/Src/SysConf.h:133 Source/Core/Common/Src/SysConf.h:154
 #, c-format
 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:490
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:46
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:477
 msgid "Select"
 msgstr "Seleccionar"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:677
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1072
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:683
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1087
 msgid "Select The Recording File"
 msgstr "Selecciona el fitxer de gravació"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1285
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1312
 msgid "Select a Wii WAD file to install"
 msgstr "Selecciona un fitxer WAD de Wii per instal·lar"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:70
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74
 msgid ""
 "Select a hardware adapter to use.\n"
 "\n"
@@ -4454,31 +4536,31 @@ msgstr ""
 "Seleccionar un adaptador de maquinari per utilitzar.\n"
 "En cas de dubte, utilitza el primer."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:520
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:510
 msgid "Select a save file to import"
 msgstr "Selecciona un arxiu per guardar la importació"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:363
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:366
 msgid "Select floating windows"
 msgstr "Selecciona finestres flotants"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:582
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:585
 msgid "Select the file to load"
 msgstr "Selecciona el fitxer a carregar"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1241
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1268
 msgid "Select the save file"
 msgstr "Selecciona el fitxer de partida guardada"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1388
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1415
 msgid "Select the state to load"
 msgstr "Selecciona l'estat a carregar"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1429
 msgid "Select the state to save"
 msgstr "Selecciona l'estat a guardar"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82
 msgid ""
 "Select what aspect ratio to use when rendering:\n"
 "Auto: Use the native aspect ratio\n"
@@ -4496,15 +4578,15 @@ msgstr ""
 "\n"
 "Si no n'estàs segur, selecciona Automàtic."
 
-#: Source/Core/InputCommon/Src/InputConfig.cpp:61
+#: Source/Core/InputCommon/Src/InputConfig.cpp:48
 msgid "Selected controller profile does not exist"
 msgstr "El perfil del controlador seleccionat no existeix"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:116
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:109
 msgid "Selected font"
 msgstr "Font seleccionada"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75
 msgid ""
 "Selects the display resolution used in fullscreen mode.\n"
 "This should always be bigger than or equal to the internal resolution. "
@@ -4520,23 +4602,27 @@ msgstr ""
 "Si no n'estàs segur, utilitza la resolució de l'escriptori.\n"
 "Si encara no n'estàs segurs, utilitza la resolució més alta que et funcioni."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:69
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:70
 msgid ""
 "Selects what graphics API to use internally.\n"
 "Direct3D 9 usually is the fastest one. OpenGL is more accurate though. "
 "Direct3D 11 is somewhere between the two.\n"
 "Note that the Direct3D backends are only available on Windows.\n"
 "\n"
-"If unsure, use Direct3D 9."
+"If unsure, use Direct3D 11."
 msgstr ""
-"Escull la API gràfica que utilitza internament.\n"
-"Direct3D 9 normalment és la més ràpida. Però OpenGL és la més exacta. "
-"Direct3D 11 és en un punt entre mig.\n"
-"Tingues en compte que Direct3D només funciona a Windows.\n"
-"\n"
-"Si no n'estàs segur, utilitza Direct3D 9."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:288
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72
+msgid ""
+"Selects what graphics API to use internally.\n"
+"Direct3D 9 usually is the fastest one. OpenGL is more accurate though. "
+"Direct3D 11 is somewhere between the two.\n"
+"Note that the Direct3D backends are only available on Windows.\n"
+"\n"
+"If unsure, use OpenGL."
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:291
 msgid "Send"
 msgstr "Enviar"
 
@@ -4544,26 +4630,26 @@ msgstr "Enviar"
 msgid "Sensor Bar Position:"
 msgstr "Barra de sensors de posició"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:77
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:64
 msgid "Separator"
 msgstr "Separador"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:328
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308
 msgid "Serbian"
 msgstr "Serbi"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:522
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502
 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 "
 "l'adaptador de xarxa"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:488
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:475
 msgid "Set"
 msgstr "Definir"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:877
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:868
 msgid "Set as &default ISO"
 msgstr "Definir la imatge ISO per &defecte"
 
@@ -4572,14 +4658,14 @@ msgstr "Definir la imatge ISO per &defecte"
 msgid "Set as default Memcard %c"
 msgstr "Definir com a targeta de memòria predeterminada %c"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:460
+#: Source/Core/Core/Src/ActionReplay.cpp:450
 #, 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/ConfigMain.cpp:535
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:515
 msgid ""
 "Sets the latency (in ms).  Higher values may reduce audio crackling. OpenAL "
 "backend only."
@@ -4587,123 +4673,123 @@ msgstr ""
 "Ajusta la latència (en ms). Valors més alts poden reduir el soroll. Només "
 "pel motor Open AL."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341
 msgid "Settings..."
 msgstr "Configuració..."
 
-#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:222
+#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:209
 msgid "SetupWiiMem: Cant find setting file"
 msgstr "SetupWiiMem: No es troba el fitxer de configuració"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:291
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:278
 msgid "Shake"
 msgstr "Sacsejar"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
 msgid "Short Name:"
 msgstr "Nom curt:"
 
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:103
+#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:90
 msgid "Shoulder Buttons"
 msgstr "Botons LR"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:217
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:220
 msgid "Show &Console"
 msgstr "Mostrar &Consola"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:215
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:218
 msgid "Show &Log"
 msgstr "Mostrar &Log"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:212
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:215
 msgid "Show &Statusbar"
 msgstr "Mostrar Barra d'e&stat"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:210
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:213
 msgid "Show &Toolbar"
 msgstr "Mostrar Barra d'&eines"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:281
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:284
 msgid "Show Drives"
 msgstr "Mostrar unitats"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:517
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530
 msgid "Show EFB Copy Regions"
 msgstr "Mostrar regions de copia EFB"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:295
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303
 msgid "Show FPS"
 msgstr "Mostra FPS (imatges/s)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:271
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:274
 msgid "Show France"
 msgstr "Mostrar França"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:257
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:260
 msgid "Show GameCube"
 msgstr "Mostrar GameCube"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561
 msgid "Show Input Display"
 msgstr "Mostrar entrada"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:273
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:276
 msgid "Show Italy"
 msgstr "Mostrar Itàlia"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:264
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:267
 msgid "Show JAP"
 msgstr "Mostrar Japó"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:275
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:278
 msgid "Show Korea"
 msgstr "Mostrar Corea"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476
 msgid "Show Language:"
 msgstr "Mostrar Idioma:"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:216
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:219
 msgid "Show Log &Configuration"
 msgstr "Mostrar la &Configuració del registre de log"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:266
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:269
 msgid "Show PAL"
 msgstr "Mostrar PAL"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:254
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:257
 msgid "Show Platforms"
 msgstr "Mostrar Plataformes"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:263
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:266
 msgid "Show Regions"
 msgstr "Mostrar Regions"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:518
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531
 msgid "Show Statistics"
 msgstr "Mostrar estadístiques"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:277
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:280
 msgid "Show Taiwan"
 msgstr "Mostrar Taiwan"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:268
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:271
 msgid "Show USA"
 msgstr "Mostrar EUA"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:259
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:262
 msgid "Show Wad"
 msgstr "Mostrar Wad"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:255
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:258
 msgid "Show Wii"
 msgstr "Mostrar Wii"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491
 msgid "Show a confirmation box before stopping a game."
 msgstr "Mostrar un missatge de confirmació abans d'aturar el joc."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:512
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492
 msgid ""
 "Show a message box when a potentially serious error has occurred.\n"
 "Disabling this may avoid annoying and non-fatal messages, but it may also "
@@ -4717,11 +4803,11 @@ msgstr ""
 msgid "Show first block"
 msgstr "Mostra primer bloc"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:130
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:131
 msgid "Show lag counter"
 msgstr "Mostrar contador de lag"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493
 msgid ""
 "Show messages on the emulation screen area.\n"
 "These messages include memory card writes, video backend and CPU "
@@ -4747,7 +4833,7 @@ msgstr "Mostra icona de desar"
 msgid "Show save title"
 msgstr "Mostra títol desat"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102
 msgid ""
 "Show the number of frames rendered per second as a measure of emulation "
 "speed.\n"
@@ -4759,11 +4845,11 @@ msgstr ""
 "\n"
 "Si no n'estàs segur, deixa-ho desmarcat."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:279
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:282
 msgid "Show unknown"
 msgstr "Mostrar desconeguda"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105
 msgid ""
 "Show various statistics.\n"
 "\n"
@@ -4773,47 +4859,31 @@ msgstr ""
 "\n"
 "Si no n'estàs segur, deixa-ho desmarcat."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:319
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:306
 msgid "Sideways Wiimote"
 msgstr "Wiimote horitzontal"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:280
 msgid "Simplified Chinese"
 msgstr "Xinès simplificat"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:311
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:298
 msgid "Size"
 msgstr "Mida"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:696
 msgid "Skip BIOS"
 msgstr "Saltar BIOS"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316
 msgid "Skip DCBZ clearing"
 msgstr "Saltar la neteja DCBZ"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:492
-msgid "Skip Dest. Alpha Pass"
-msgstr "Salta pas Dest. Alpha"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:444
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:454
 msgid "Skip EFB Access from CPU"
 msgstr "Salta l'accés d'EFB des de la CPU"
 
-#: 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 ""
-"Saltar el destí del pas d'alfa que utilitzen molts de jocs per varis efectes "
-"gràfics.\n"
-"\n"
-"Si no n'estàs segur, deixa-ho desactivat."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125
 msgid ""
 "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n"
 "Sometimes also increases visual quality.\n"
@@ -4830,25 +4900,25 @@ msgstr ""
 "\n"
 "Si no n'estàs segur, deixa-ho desmarcat."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:374
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:386
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:380
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:392
 #, c-format
 msgid "Slot %i"
 msgstr "Ranura %i"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:700
 msgid "Slot A"
 msgstr "Ranura A"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:701
 msgid "Slot B"
 msgstr "Ranura B"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:62
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:49
 msgid "Snapshot"
 msgstr "Captura"
 
-#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:58
+#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:46
 msgid "Software Renderer"
 msgstr "Renderitzat per programari"
 
@@ -4864,27 +4934,27 @@ msgstr ""
 "Realment vols activar el renderitzat per software? Si no n'estàs segur, "
 "selecciona 'No'."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:683
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:664
 msgid "Sound Settings"
 msgstr "Configuració de so"
 
-#: Source/Core/AudioCommon/Src/AudioCommon.cpp:77
+#: Source/Core/AudioCommon/Src/AudioCommon.cpp:64
 #, c-format
 msgid "Sound backend %s is not valid."
 msgstr "Suport de so %s invàlid."
 
-#: Source/Core/AudioCommon/Src/DSoundStream.cpp:59
+#: Source/Core/AudioCommon/Src/DSoundStream.cpp:46
 #, c-format
 msgid "Sound buffer creation failed: %s"
 msgstr "Ha fallat la creació del buffer de so: %s"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:31
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:18
 msgid "Space"
 msgstr "Espai"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:329
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309
 msgid "Spanish"
 msgstr "Espanyol"
 
@@ -4892,7 +4962,7 @@ msgstr "Espanyol"
 msgid "Speaker Volume:"
 msgstr "Volum de l'altaveu:"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92
 msgid ""
 "Specifies the resolution used to render at. A high resolution will improve "
 "visual quality a lot but is also quite heavy on performance and might cause "
@@ -4912,63 +4982,63 @@ msgstr ""
 "\n"
 "Si no n'estàs segur, selecciona 640x528."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322
 msgid "Speed up Disc Transfer Rate"
 msgstr "Accelerar la tassa de transferència de Disc"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:243
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:230
 msgid "Square Stick"
 msgstr "Palanca quadrada"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:107
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87
 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:322
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:37
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:25
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:325
 msgid "Start"
 msgstr "Començar"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:194
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:197
 msgid "Start &NetPlay"
 msgstr "Iniciar &NetPlay"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:339
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:345
 msgid "Start Re&cording"
 msgstr "Iniciar grava&ció"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:175
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:175
 msgid "Start Recording"
 msgstr "Iniciar gravació"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:312
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:299
 msgid "State"
 msgstr "Estat"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:173
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:161
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:161
 msgid "State Saves"
 msgstr "Estats desats"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:108
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88
 msgid "Steering Wheel"
 msgstr "Volant"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:53
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:57
 msgid "Stick"
 msgstr "Palanca"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:420
-#: 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:325
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:419
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:431
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:171
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:171
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:328
 msgid "Stop"
 msgstr "Aturar"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96
 msgid ""
 "Store EFB copies in GPU texture objects.\n"
 "This is not so accurate, but it works well enough for most games and gives a "
@@ -4982,107 +5052,117 @@ msgstr ""
 "\n"
 "Si no n'estàs segur, deixa-ho desmarcat."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:275
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283
 msgid "Stretch to Window"
 msgstr "Ajustar a la finestra"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:43
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:47
 msgid "Strum"
 msgstr "Cop"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:78
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:65
 msgid "Subtract"
 msgstr "Extreure"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:77
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:67
 #, c-format
 msgid "Successfully exported file to %s"
 msgstr "Arxiu exportat amb èxit a %s"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:56
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:43
 msgid "Successfully imported save files"
 msgstr "Arxius de partides desades importats correctament"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:285
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:272
 msgid "Swing"
 msgstr "Oscil·lació"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:744
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:792
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320
+msgid "Synchronize GPU thread"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321
+msgid ""
+"Synchronizes the GPU and CPU threads to help prevent random freezes in Dual "
+"Core mode. (ON = Compatible, OFF = Fast)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773
 msgid "System Language:"
 msgstr "Idioma del sistema:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:191
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:185
 msgid "TAIWAN"
 msgstr "TAIWAN"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:127
-#: Source/Core/DolphinWX/Src/TASInputDlg.h:32
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:128
+#: Source/Core/DolphinWX/Src/TASInputDlg.h:19
 msgid "TAS Input"
 msgstr "Entrada TAS"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:28
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:15
 msgid "Tab"
 msgstr "Pestanya"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:510
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:531
 msgid "Tab split"
 msgstr "Divisió de pestanya"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:37
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:41
 msgid "Table Left"
 msgstr "Taula esquerra"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:38
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:42
 msgid "Table Right"
 msgstr "Taula dreta"
 
-#: 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
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:361
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:181
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:181
 msgid "Take Screenshot"
 msgstr "Capturar pantalla"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:109
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89
 msgid "TaruKonga (Bongos)"
 msgstr "TaruKonga (Bongos)"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:472
 msgid "Test"
 msgstr "Prova"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:444
 msgid "Texture"
 msgstr "Textura"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:451
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:461
 msgid "Texture Cache"
 msgstr "Memòria cau de textura"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:519
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:532
 msgid "Texture Format Overlay"
 msgstr "Superposició del format de textura"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:226
+#: Source/Core/Core/Src/CoreParameter.cpp:215
 msgid "The WAD has been installed successfully"
 msgstr "El WAD s'ha instal·lat amb èxit"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:197
+#: Source/Core/Core/Src/ActionReplay.cpp:185
 msgid "The address is invalid"
 msgstr "L'adreça és invàlida"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:509
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:496
 msgid "The checksum was successfully fixed"
 msgstr "La suma de comprovació s'ha fixat amb èxit"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1242
+#: 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:1117
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1216
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1118
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1146
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1217
 #, c-format
 msgid ""
 "The file %s already exists.\n"
@@ -5091,7 +5171,7 @@ msgstr ""
 "El fitxer %s ja existeix. \n"
 "Voleu reemplaçar-lo?"
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:51
+#: Source/Core/AudioCommon/Src/WaveFile.cpp:38
 #, c-format
 msgid ""
 "The file %s could not be opened for writing. Please check if it's already "
@@ -5100,29 +5180,29 @@ msgstr ""
 "El fitxer %s no s'ha pogut obrir per escriptura. Comproveu si ja està obert "
 "per un altre programa."
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:44
+#: Source/Core/AudioCommon/Src/WaveFile.cpp:31
 #, c-format
 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:332
+#: Source/Core/Core/Src/Boot/Boot.cpp:320
 #, c-format
 msgid "The file you specified (%s) does not exist"
 msgstr "L'arxiu especificat (%s) no existeix"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:628
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:666
 msgid "The name can not be empty"
 msgstr "El nom no pot estar buit"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:620
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:658
 msgid "The name can not contain the character ','"
 msgstr "El nom no pot contenir el caràcter ','"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:142
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:129
 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:93
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98
 msgid ""
 "The safer you adjust this, the less likely the emulator will be missing any "
 "texture updates from RAM.\n"
@@ -5134,12 +5214,12 @@ msgstr ""
 "\n"
 "Si no n'estàs segur, deixa-ho al màxim valor de la dreta."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:445
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:432
 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:388
+#: Source/Core/DolphinWX/Src/Main.cpp:416
 msgid ""
 "The selected language is not supported by your system. Falling back to "
 "system default."
@@ -5147,36 +5227,36 @@ msgstr ""
 "L'idioma seleccionat no és compatible amb el seu sistema. Es tornarà a "
 "l'idioma per defecte del sistema."
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:43
+#: Source/Core/Core/Src/NetPlayClient.cpp:47
 msgid "The server and client's NetPlay versions are incompatible!"
 msgstr "El servidor i les versions de client NetPlay són incompatibles!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:40
+#: Source/Core/Core/Src/NetPlayClient.cpp:44
 msgid "The server is full!"
 msgstr "El servidor està ple!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:46
+#: Source/Core/Core/Src/NetPlayClient.cpp:50
 msgid "The server responded: the game is currently running!"
 msgstr "El servidor ha espòs: el joc està en marxa!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:49
+#: Source/Core/Core/Src/NetPlayClient.cpp:53
 msgid "The server sent an unknown error message!"
 msgstr "El servidor ha enviat un missatge d'error desconegut!"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:119
+#: Source/Core/Core/Src/CoreParameter.cpp:108
 #, c-format
 msgid "The specified file \"%s\" does not exist"
 msgstr "L'arxiu especificat \"%s\" no existeix"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:198
+#: Source/Core/Core/Src/ActionReplay.cpp:186
 msgid "The value is invalid"
 msgstr "El valor és invàlid."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:642
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:623
 msgid "Theme:"
 msgstr "Tema visual:"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:476
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:463
 msgid ""
 "There must be a ticket for 00000001/00000002. Your NAND dump is probably "
 "incomplete."
@@ -5184,7 +5264,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:307
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308
 msgid ""
 "These settings override core Dolphin settings.\n"
 "Undetermined means the game uses Dolphin's setting."
@@ -5192,7 +5272,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:355
+#: Source/Core/Core/Src/ActionReplay.cpp:345
 msgid ""
 "This action replay simulator does not support codes that modify Action "
 "Replay itself."
@@ -5200,11 +5280,11 @@ msgstr ""
 "Aquest simulador d'ActionReplay no és compatible amb els codis que "
 "modifiquen ActionReplay."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505
 msgid "This could cause slow down in Wii Menu and some games."
 msgstr "Pot causar alentiment al Menú Wii i alguns jocs."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118
 msgid ""
 "This feature allows you to change the game's camera.\n"
 "Move the mouse while holding the right mouse button to pan and while holding "
@@ -5224,7 +5304,19 @@ msgstr ""
 "\n"
 "Si no n'estàs segur, deixa-ho desactivat."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485
+#, fuzzy
+msgid ""
+"This limits the game speed to the specified number of frames per second "
+"(full speed is 60 for NTSC and 50 for PAL). Alternatively, use Audio to "
+"throttle using the DSP (might fix audio clicks but can also cause constant "
+"noise depending on the game)."
+msgstr ""
+"Si s'ha establert un límit al nombre d'imatges per segon major que la "
+"velocitat del joc màxima (NTSC: 60, PAL: 50), també cal deshabilitar la "
+"regulació de so DSP per a fer-ho efectiu."
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484
 msgid ""
 "This splits the Video and CPU threads, so they can be run on separate "
 "cores.\n"
@@ -5236,61 +5328,61 @@ 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:286
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:287
 msgid "This will let you Manually Edit the INI config file"
 msgstr "Li permetrà editar manualment el fitxer de configuració INI"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:249
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:254
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:236
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:241
 msgid "Threshold"
 msgstr "Llindar"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:288
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:275
 msgid "Tilt"
 msgstr "Inclinació"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:628
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:304
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:622
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:291
 msgid "Title"
 msgstr "Títol"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:125
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:144
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:112
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:131
 msgid "To"
 msgstr "A"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:72
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59
 msgid "Toggle All Log Types"
 msgstr "Activar tots els tipus de registre de Log"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:426
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:432
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:180
 msgid "Toggle Fullscreen"
 msgstr "Activar pantalla completa"
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:87
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:271
 msgid "Top"
 msgstr "Dalt"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:281
 msgid "Traditional Chinese"
 msgstr "Xinès tradicional"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:426
+#: Source/Core/Core/Src/Boot/Boot.cpp:414
 msgid "Tried to load an unknown file type."
 msgstr "S'ha intentat de carregar un tipus de fitxer desconegut."
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:80
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:67
 msgid "Triggers"
 msgstr "Gatells"
 
-#: Source/Core/Common/Src/SysConf.h:91 Source/Core/Common/Src/SysConf.h:114
+#: Source/Core/Common/Src/SysConf.h:78 Source/Core/Common/Src/SysConf.h:101
 msgid "Trying to read from invalid SYSCONF"
 msgstr "Provant de llegir des d'un SYSCONF invàlid"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:44
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:31
 msgid ""
 "Trying to read from invalid SYSCONF\n"
 "Wiimote bt ids are not available"
@@ -5298,15 +5390,15 @@ msgstr ""
 "Intentant de llegir des d'un SYSCONF invàlid \n"
 "identificadors de Wiimote bt no estan disponibles"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:330
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
 msgid "Turkish"
 msgstr "Turc"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:33
 msgid "Turntable"
 msgstr "Taula DJ"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:71
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58
 msgid "Type"
 msgstr "Tipus"
 
@@ -5314,25 +5406,25 @@ msgstr "Tipus"
 msgid "UDP Port:"
 msgstr "Port UDP:"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:279
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:266
 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12
 msgid "UDP Wiimote"
 msgstr "Wiimote UDP"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:199
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:193
 msgid "UNKNOWN"
 msgstr "DESCONEGUT"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:756
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:755
 #, c-format
 msgid "UNKNOWN_%02X"
 msgstr "DESCONEGUT_%02X"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:178
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:172
 msgid "USA"
 msgstr "EUA"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:225
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:214
 msgid ""
 "Unable to create patch from given values.\n"
 "Entry not modified."
@@ -5340,7 +5432,7 @@ msgstr ""
 "Incapaç de crear un pedaç amb els valors donats.\n"
 "No s'ha modificat l'entrada."
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:124
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:111
 #, c-format
 msgid ""
 "Unable to parse line %lu of the entered AR code as a valid encrypted or "
@@ -5351,75 +5443,89 @@ msgstr ""
 "desenciptat vàlid. Assegura't d'haver-lo escrit correctament.\n"
 "Vols ignorar aquesta línia i continuar analitzant?"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:391
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:397
 #, c-format
 msgid "Undefined %i"
 msgstr "%i Indefinit"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:163
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:164
 msgid "Undo Load State"
 msgstr "Desfer la càrrega de l'estat"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:718
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:717
 msgid "Unexpected 0x80 call? Aborting..."
 msgstr "Trucada inesperada a 0x80? Cancel·lant..."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:215
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:202
 msgid "Unknown"
 msgstr "Desconegut"
 
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:971
+#: Source/Core/Core/Src/HW/DVDInterface.cpp:965
 #, c-format
 msgid "Unknown DVD command %08x - fatal error"
 msgstr "Comanda de DVD desconeguda %08x - error crític"
 
-#: Source/Core/Common/Src/SysConf.cpp:145
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:444
+#, c-format
+msgid "Unknown command 0x%08x"
+msgstr ""
+
+#: Source/Core/Common/Src/SysConf.cpp:132
 #, c-format
 msgid "Unknown entry type %i in SYSCONF (%s@%x)!"
 msgstr "Tipus desconegut d'entrada %i a SYSCONF (%s@%x)!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:228
+#: Source/Core/Core/Src/NetPlayClient.cpp:232
 #, c-format
 msgid "Unknown message received with id : %d"
 msgstr "Missatge desconegut rebut amb id: %d"
 
-#: Source/Core/Core/Src/NetPlayServer.cpp:504
+#: Source/Core/Core/Src/NetPlayServer.cpp:508
 #, c-format
 msgid "Unknown message with id:%d received from player:%d Kicking player!"
 msgstr ""
 "Missatge desconegut amb id: %d rebut des del jugador: Expulsant jugador %d!"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:274
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:56
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:261
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:43
 msgid "Up"
 msgstr "Amunt"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:108
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:95
 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17
 msgid "Update"
 msgstr "Actualitzar"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:320
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:307
 msgid "Upright Wiimote"
 msgstr "Wiimote vertical"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:777
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758
 msgid "Use EuRGB60 Mode (PAL60)"
 msgstr "Utilitzar mode EuRGB60 (PAL60)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:294
 msgid "Use Fullscreen"
 msgstr "Utilitzar pantalla completa"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:575
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:563
 msgid "Use Hex"
 msgstr "Utilitzar hexadecimal"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:600
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580
 msgid "Use Panic Handlers"
 msgstr "Utilitzar advertències"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89
+msgid ""
+"Use a hacked upload strategy to stream vertices.\n"
+"This usually speed up, but is forbidden by OpenGL specification and may "
+"causes heavy glitches.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122
 msgid ""
 "Use multiple threads to decode textures.\n"
 "Might result in a speedup (especially on CPUs with more than two cores).\n"
@@ -5432,7 +5538,7 @@ msgstr ""
 "\n"
 "Si no n'estàs segur, deixa-ho desmarcat."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126
 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,53 +5553,58 @@ msgstr ""
 "\n"
 "Si no n'estàs segur, deixa-ho desmarcat."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:539
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:552
 msgid "Utility"
 msgstr "Utilitat"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:285
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:293
 msgid "V-Sync"
 msgstr "Sincronització Vertical"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:209
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318
+#, fuzzy
+msgid "VBeam Speed Hack"
+msgstr "Modificació de velocitat MMU"
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196
 msgid "Value"
 msgstr "Valor"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:73
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:60
 msgid "Value:"
 msgstr "Valor:"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:572
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:560
 msgid "Value: "
 msgstr "Valor:"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:51
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:38
 msgid "Verbosity"
 msgstr "Verbositat"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:377
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:381
 msgid "Video"
 msgstr "Vídeo"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:486
 msgid "Virtual"
 msgstr "Virtual"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:689
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670
 msgid "Volume"
 msgstr "Volum"
 
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:498
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:527
+#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:488
+#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:517
 #, c-format
 msgid "WAD installation failed: error creating %s"
 msgstr "instal·lació del WAD ha fallat: Error en crear %s"
 
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:547
+#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:537
 msgid "WAD installation failed: error creating ticket"
 msgstr "Instal·lació del WAD ha fallat: Error en crear tiquet"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84
 msgid ""
 "Wait for vertical blanks in order to reduce tearing.\n"
 "Decreases performance if emulation speed is below 100%.\n"
@@ -5505,25 +5616,25 @@ msgstr ""
 "\n"
 "Si no n'estàs segur, deixa-ho desmarcat."
 
-#: Source/Core/Common/Src/MsgHandler.cpp:67
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46
+#: Source/Core/Common/Src/MsgHandler.cpp:53
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:33
 #: Source/Core/DolphinWX/Src/VideoConfigDiag.h:85
 msgid "Warning"
 msgstr "Advertència"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:291
+#: Source/Core/Core/Src/Boot/Boot.cpp:279
 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:341
+#: Source/Core/Core/Src/Boot/Boot.cpp:329
 msgid "Warning - starting ELF in wrong console mode!"
 msgstr "Advertència - Inicialitzant ELF en mode de consola incorrecte!"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:221
+#: Source/Core/Core/Src/Boot/Boot.cpp:209
 msgid "Warning - starting ISO in wrong console mode!"
 msgstr "Advertència - Inicialitzant ISO en mode de consola incorrecte!"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:519
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:512
 #, c-format
 msgid ""
 "Warning! it is advised to backup all files in the folder:\n"
@@ -5535,7 +5646,7 @@ msgstr ""
 "%s \n"
 "Vols continuar?"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:585
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:578
 #, c-format
 msgid ""
 "Warning: This will overwrite any existing saves that are in the folder:\n"
@@ -5549,7 +5660,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:844
+#: Source/Core/Core/Src/Movie.cpp:835
 #, c-format
 msgid ""
 "Warning: You loaded a save that's after the end of the current movie. (byte "
@@ -5561,7 +5672,7 @@ msgstr ""
 "altre guardat abans de continuar, o carregar aquest amb el mode de només "
 "lectura desactivat."
 
-#: Source/Core/Core/Src/Movie.cpp:861
+#: Source/Core/Core/Src/Movie.cpp:852
 #, c-format
 msgid ""
 "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You "
@@ -5573,7 +5684,7 @@ msgstr ""
 "aquest amb el mode de només lectura desactivat. Si no probablement tindràs "
 "una desincronització."
 
-#: Source/Core/Core/Src/Movie.cpp:870
+#: Source/Core/Core/Src/Movie.cpp:861
 #, c-format
 msgid ""
 "Warning: You loaded a save whose movie mismatches on frame %d. You should "
@@ -5606,49 +5717,49 @@ msgstr ""
 "Start=%d, A=%d, B=%d, X=%d, Y=%d, Z=%d, DUp=%d, DDown=%d, DLeft=%d, DRight="
 "%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d"
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:106
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:129
+#: Source/Core/AudioCommon/Src/WaveFile.cpp:93
+#: Source/Core/AudioCommon/Src/WaveFile.cpp:116
 msgid "WaveFileWriter - file not open."
 msgstr "WaveFileWriter - Fitxer no obert."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:56
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:60
 msgid "Whammy"
 msgstr "Whammy"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:404
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:408
 msgid "Widescreen Hack"
 msgstr "Modificació de pantalla panoràmica"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:312
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:299
 msgid "Width"
 msgstr "Ample"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535
 msgid "Wii"
 msgstr "Wii"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:372
 msgid "Wii Console"
 msgstr "Consola Wii"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:844
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:825
 msgid "Wii NAND Root:"
 msgstr "Arrel de la NAND:"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:191
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:194
 msgid "Wii Save Import"
 msgstr "Importar partida guardada Wii"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1243
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1270
 msgid "Wii save files (*.bin)|*.bin"
 msgstr "Arxius de partida guardada Wii (*.bin)|*.bin"
 
-#: Source/Core/DiscIO/Src/WiiWad.cpp:82
+#: Source/Core/DiscIO/Src/WiiWad.cpp:69
 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:17
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
+#: Source/Core/Core/Src/HW/Wiimote.cpp:20
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
 msgid "Wiimote"
 msgstr "Wiimote"
 
@@ -5657,7 +5768,7 @@ msgstr "Wiimote"
 msgid "Wiimote %i"
 msgstr "Wiimote %i"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:628
+#: Source/Core/DolphinWX/Src/Main.cpp:656
 msgid "Wiimote Connected"
 msgstr "Wiimote connectat"
 
@@ -5665,7 +5776,7 @@ msgstr "Wiimote connectat"
 msgid "Wiimote Motor"
 msgstr "Motor de Wiimote"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
 msgid "Wiimote settings"
 msgstr "Configuració de Wiimote"
 
@@ -5673,101 +5784,117 @@ msgstr "Configuració de Wiimote"
 msgid "Wiimotes"
 msgstr "Wiimotes"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:134
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:121
 msgid "Windows Left"
 msgstr "Finestra esquerra"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:136
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:123
 msgid "Windows Menu"
 msgstr "Finestra menú"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:135
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:122
 msgid "Windows Right"
 msgstr "Finestra dreta"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:131
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:124
 msgid "Word Wrap"
 msgstr "Envoltant de paraula"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1298
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:864
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1089
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1225
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1325
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:880
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1090
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1226
 msgid "Working..."
 msgstr "Treballant..."
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:338
+msgid "Write memcards (GC)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46
 msgid "Write to Console"
 msgstr "Escriu a consola"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:67
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:54
 msgid "Write to Debugger"
 msgstr "Escriu al depurador"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:57
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44
 msgid "Write to File"
 msgstr "Escriu en un Fitxer"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:61
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48
 msgid "Write to Window"
 msgstr "Escriu a una Finestra"
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:60
+#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:47
 #, c-format
 msgid "XAudio2 CreateSourceVoice failed: %#X"
 msgstr "XAudio2 CreateSourceVoice ha fallat:%#X"
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:114
+#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:101
 #, c-format
 msgid "XAudio2 init failed: %#X"
 msgstr "XAudio2 init ha fallat:%#X"
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:124
+#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:111
 #, c-format
 msgid "XAudio2 master voice creation failed: %#X"
 msgstr "La creació de la veu principal XAudio2 ha fallat:%#X"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:766
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:765
 msgid "XF reg"
 msgstr "Registre XF"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:21
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Yellow"
 msgstr "Groc"
 
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:107
+#: Source/Core/Core/Src/DSP/DSPCore.cpp:120
 msgid ""
-"You are using free dsp roms made by Dolphin Team.\n"
-"Only Zelda ucode games will work correctly with them.\n"
+"You are using a free DSP ROM made by the Dolphin Team.\n"
+"All Wii games will work correctly, and most GC games should also work fine, "
+"but the GBA/IPL/CARD UCodes will not work.\n"
 msgstr ""
-"Estàs utilitzant roms dsp creades per l'equip Dolphin.\n"
-"Només els jocs Zelda ucode funcionaran correctament.\n"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:73
+#: Source/Core/Core/Src/DSP/DSPCore.cpp:116
+msgid ""
+"You are using an old free DSP ROM made by the Dolphin Team.\n"
+"Only games using the Zelda UCode will work correctly.\n"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:63
 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:207
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:210
 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:593
 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:438
 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:603
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:591
 msgid "You must enter a valid profile name."
 msgstr "Heu d'introduir un nom de perfil vàlid."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:936
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:917
 msgid "You must restart Dolphin in order for the change to take effect."
 msgstr "Ha de reiniciar Dolphin perquè el canvi tingui efecte."
 
-#: Source/Core/Core/Src/CoreParameter.cpp:175
+#: Source/Core/Core/Src/DSP/DSPCore.cpp:109
+msgid ""
+"Your DSP ROMs have incorrect hashes.\n"
+"Would you like to stop now to fix the problem?\n"
+"If you select \"No\", audio might be garbled."
+msgstr ""
+
+#: Source/Core/Core/Src/CoreParameter.cpp:164
 msgid ""
 "Your GCM/ISO file seems to be invalid (invalid country).\n"
 "Continue with PAL region?"
@@ -5775,7 +5902,7 @@ msgstr ""
 "El seu arxiu GCM/ISO sembla invàlid (país invàlid). \n"
 "Continuar amb la regió PAL?"
 
-#: Source/Core/Common/Src/SysConf.cpp:58
+#: Source/Core/Common/Src/SysConf.cpp:45
 #, c-format
 msgid ""
 "Your SYSCONF file is the wrong size.\n"
@@ -5786,25 +5913,25 @@ msgstr ""
 "Hauria de ser 0x%04x (però és 0x%04llx) \n"
 "Vol generar un de nou?"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:334
 msgid "ZTP hack"
 msgstr "Modificador ZTP"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:387
+#: Source/Core/Core/Src/ActionReplay.cpp:377
 msgid "Zero 3 code not supported"
 msgstr "Codi Zero 3 no està suportat"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:408
+#: Source/Core/Core/Src/ActionReplay.cpp:398
 #, c-format
 msgid "Zero code unknown to dolphin: %08x"
 msgstr "Codi Zero desconegut per Dolphin: %08x"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:436
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:460
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:423
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:447
 msgid "[ waiting ]"
 msgstr "[ Esperant ]"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107
 msgid ""
 "[BROKEN]\n"
 "Highlight regions the EFB was copied from.\n"
@@ -5816,11 +5943,11 @@ msgstr ""
 "\n"
 "Si no n'estàs segur, deixa-ho desmarcat."
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:91
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:78
 msgid "[Custom]"
 msgstr "[Personalitzat]"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120
 msgid ""
 "[EXPERIMENTAL]\n"
 "Aims to speed up emulation by offloading texture decoding to the GPU using "
@@ -5839,7 +5966,7 @@ msgstr ""
 "\n"
 "Si no n'estàs segur, deixa-ho desmarcat."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121
 msgid ""
 "[EXPERIMENTAL]\n"
 "Speeds up emulation a bit by caching display lists.\n"
@@ -5854,99 +5981,47 @@ msgstr ""
 "\n"
 "Si no n'estàs segur, deixa-ho desmarcat."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:508
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:495
 msgid "^ ADD"
 msgstr "^ Afegir"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:820
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:801
 msgid "apploader (.img)"
 msgstr "apploader (.img)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:185
-msgid "failed to read bk header"
-msgstr "Error al llegir la capçalera bk"
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:375
-#, c-format
-msgid "failed to read data from file: %s"
-msgstr "Error al llegir les dades del fitxer: %s"
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:97
-msgid "failed to read header"
-msgstr "Error al llegir la capçalera"
-
-#: Source/Core/Core/Src/PowerPC/JitInterface.cpp:285
+#: Source/Core/Core/Src/PowerPC/JitInterface.cpp:272
 #, c-format
 msgid "iCacheJIT: Reading Opcode from %x. Please report."
 msgstr "iCacheJIT: Llegint Opcode des de%x Si us plau, informeu."
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:108
-#, c-format
-msgid "not a wii save or read failure for file header size %x"
-msgstr ""
-"No é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:935
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:936
 msgid "s"
 msgstr "s"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:457
-#, c-format
-msgid "unknown cmd 0x%08x"
-msgstr "Comanda desconeguda 0x%08x"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1110
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1136
 msgid "wxExecute returned -1 on application run!"
 msgstr "wxExecute Ha retornat -1 en  l'execució de l'aplicació!"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:56
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:43
 msgid "zFar Correction: "
 msgstr "Correcció zLluny:"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:51
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:38
 msgid "zNear Correction: "
 msgstr "Correcció ZAprop"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:493
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:480
 msgid "| OR"
 msgstr "| O"
 
-#~ msgid "%i connected"
-#~ msgstr "%i connectat"
-
-#~ msgid "Alternate Wiimote Timing"
-#~ msgstr "Sincronització alternativa del Wiimote"
-
-#~ msgid "Interpreter (VERY slow)"
-#~ msgstr "Intèrpret (molt lent)"
-
-#~ msgid "JIT Recompiler (recommended)"
-#~ msgstr "Recompilador JIT (recomanat)"
-
-#~ msgid "JITIL experimental recompiler"
-#~ msgstr "Recompilador JITIL experimental"
+#~ msgid "Accurate VBeam emulation"
+#~ msgstr "Emulació acurada de Vbeam"
 
 #~ msgid ""
-#~ "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. "
-#~ "No effect on emulated wiimotes."
+#~ "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)"
 #~ msgstr ""
-#~ "Silencia l'altaveu del «Wiimote». Arregla desconnexions aleatòries en "
-#~ "«wiimotes» reals. No afecta els «wiimotes» emulats."
+#~ "Si el FPS és irregular, aquesta opció pot ser útil. (Activat = "
+#~ "compatible, Desactivat = ràpid)"
 
-#~ msgid "Pair Up"
-#~ msgstr "Aparellar"
-
-#~ msgid "Reconnect Wiimote Confirm"
-#~ msgstr "Confirmar tornar a connectar el Wiimote"
-
-#~ msgid ""
-#~ "Wiimote %i has been disconnected by system.\n"
-#~ "Maybe this game doesn't support multi-wiimote,\n"
-#~ "or maybe it is due to idle time out or other reason.\n"
-#~ "Do you want to reconnect immediately?"
-#~ msgstr ""
-#~ "Wiimote %i ha estat desconnectat pel sistema. \n"
-#~ "Potser aquest joc no és compatible amb múltiples wiimote, \n"
-#~ "o potser és perquè l'estàs fent servir fora de temps o una altra raó. \n"
-#~ "Vols tornar a connectar-lo immediatament?"
+#~ msgid "Skip Dest. Alpha Pass"
+#~ msgstr "Salta pas Dest. Alpha"
diff --git a/Languages/po/cs.po b/Languages/po/cs.po
index dc9e4103b4..5a3668c624 100644
--- a/Languages/po/cs.po
+++ b/Languages/po/cs.po
@@ -3,13 +3,13 @@
 # This file is distributed under the same license as the dolphin-emu package.
 #
 # Translators:
-# Zbyněk Schwarz <zbynek.schwarz@gmail.com>, 2011-2013.
+# Zbyněk Schwarz <zbynek.schwarz@gmail.com>, 2011-2013
 msgid ""
 msgstr ""
 "Project-Id-Version: Dolphin Emulator\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-10 08:56-0500\n"
-"PO-Revision-Date: 2013-02-03 17:07+0000\n"
+"POT-Creation-Date: 2013-04-18 23:00-0500\n"
+"PO-Revision-Date: 2013-04-11 08:08+0000\n"
 "Last-Translator: Zbyněk Schwarz <zbynek.schwarz@gmail.com>\n"
 "Language-Team: Czech (http://www.transifex.com/projects/p/dolphin-emu/"
 "language/cs/)\n"
@@ -19,21 +19,21 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:511
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:499
 msgid " (too many to display)"
 msgstr "(příliš mnoho pro zobrazení)"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:270
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:273
 #: Source/Core/DolphinWX/Src/NetWindow.cpp:491
 #: Source/Core/DolphinWX/Src/NetWindow.cpp:530
 msgid " Game : "
 msgstr " Hra : "
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:507
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494
 msgid "! NOT"
 msgstr "! NE"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:70
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:58
 #, c-format
 msgid ""
 "\"%s\" does not exist.\n"
@@ -42,33 +42,43 @@ msgstr ""
 "\"%s\" neexistuje.\n"
 " Vytvořit novou 16MB Paměťovou kartu?"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:142
+#: Source/Core/Core/Src/CoreParameter.cpp:131
 #, c-format
 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:722
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:721
 #, c-format
 msgid "%08X:  "
 msgstr "%08X:  "
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:196
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:183
 #, c-format
 msgid "%1$sCopy%1$s"
 msgstr "%1$sKopírovat%1$s"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:128
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:296
+#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:113
+#, c-format
+msgid "%d samples"
+msgstr "%d vzorků"
+
+#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:112
+#, c-format
+msgid "%d samples (quality level %d)"
+msgstr "%d vzorků (úroveň kvality %d)"
+
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:121
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:289
 #, c-format
 msgid "%s already exists, overwrite?"
 msgstr "%s už existuje, přepsat?"
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:167
+#: Source/Core/DiscIO/Src/CompressedBlob.cpp:154
 #, c-format
 msgid "%s failed to be scrubbed. Probably the image is corrupt."
 msgstr "%s nelze vyčistit. Obraz je pravděpodobně poškozen."
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:95
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:83
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
@@ -77,7 +87,7 @@ msgstr ""
 "%s nelze načíst jako paměťovou kartu\n"
 "Soubor karty je neplatný (0x%x bajtů)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:110
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:98
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
@@ -86,7 +96,7 @@ msgstr ""
 "%s nelze načíst jako paměťovou kartu\n"
 "Velikost karty je neplatná (0x%x bajtů)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:90
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:78
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
@@ -96,48 +106,37 @@ msgstr ""
 "soubor není dostatečně velký, aby byl platným souborem paměťové karty (0x%x "
 "bajtů)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:367
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:359
 #, c-format
 msgid "%s failed to open"
 msgstr "%s nelze otevřít"
 
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:97
-#, c-format
-msgid ""
-"%s has an incorrect hash.\n"
-"Would you like to stop now to fix the problem?\n"
-"If you select \"No\", audio will be garbled."
-msgstr ""
-"%s má nesprávný otisk.\n"
-"Chtěli byste hned teď zastavit a opravit problém?\n"
-"Pokud vyberete \"Ne\", zvuk bude zkomolený."
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:360
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:352
 #, c-format
 msgid "%s is a 0 byte file"
 msgstr "%s má velikost 0 bajtů"
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:159
+#: Source/Core/DiscIO/Src/CompressedBlob.cpp:146
 #, c-format
 msgid "%s is already compressed! Cannot compress it further."
 msgstr "%s je už komprimován! Nelze dále komprimovat."
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:345
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:337
 #, c-format
 msgid "%s is too long for the filename, max chars is 45"
 msgstr "%s je jako jméno příliš dlouhé, max znaků je 45"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:202
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:189
 #, c-format
 msgid "%sDelete%s"
 msgstr "%sVymazat%s"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:200
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:187
 #, c-format
 msgid "%sExport GCI%s"
 msgstr "%sExportovat GCI%s"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:198
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:185
 #, c-format
 msgid "%sImport GCI%s"
 msgstr "%sImportovat GCI%s"
@@ -147,252 +146,275 @@ msgstr "%sImportovat GCI%s"
 msgid "%u Free Blocks; %u Free Dir Entries"
 msgstr "%u Volných Bloků; %u Volných Záznamů Adr"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:506
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:493
 msgid "&& AND"
 msgstr "&& A"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:295
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:301
 msgid "&About..."
 msgstr "O progr&amu..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:99
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:100
 msgid "&Boot from DVD Drive..."
 msgstr "&Zavést z DVD Mechaniky..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:231
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:234
 msgid "&Breakpoints"
 msgstr "&Body přerušení"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:110
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:111
 msgid "&Browse for ISOs..."
 msgstr "&Procházet pro ISO..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:192
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:195
 msgid "&Cheats Manager"
 msgstr "Správce &Cheatů"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:177
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:180
 msgid "&DSP Settings"
 msgstr "&DSP Nastavení"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:885
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:876
 msgid "&Delete ISO..."
 msgstr "&Smazat ISO..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:903
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:897
 msgid "&Delete selected ISOs..."
 msgstr "&Smazat vybraná ISO..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:170
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:173
 msgid "&Emulation"
 msgstr "&Emulace"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:113
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:114
 msgid "&File"
 msgstr "&Soubor"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:335
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:341
 msgid "&Frame Advance"
 msgstr "&Postup snímkem"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:352
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:358
 msgid "&Fullscreen"
 msgstr "&Celá obrazovka"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:176
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:179
 msgid "&Graphics Settings"
 msgstr "&Grafická nastavení"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:296
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:302
 msgid "&Help"
 msgstr "&Nápověda"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:180
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:183
 msgid "&Hotkey Settings"
 msgstr "Nastavení &klávesových zkratek"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:233
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:236
 msgid "&JIT"
 msgstr "&JIT"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:148
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:149
 msgid "&Load State"
 msgstr "&Nahrát Stav"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:190
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:193
 msgid "&Memcard Manager (GC)"
 msgstr "Správce Pa&měťových karet (GC)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:232
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:235
 msgid "&Memory"
 msgstr "Pa&měť"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:313
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:319
 msgid "&Open..."
 msgstr "&Otevřít..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:186
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:189
 msgid "&Options"
 msgstr "V&olby"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:324
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:330
 msgid "&Pause"
 msgstr "&Pauza"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:326
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:332
 msgid "&Play"
 msgstr "&Přehrát"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:867
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:858
 msgid "&Properties"
 msgstr "&Vlastnosti"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:348
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:354
 msgid "&Read-only mode"
 msgstr "&Režim pouze pro čtení"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:319
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:325
 msgid "&Refresh List"
 msgstr "&Obnovit Seznam"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:230
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:233
 msgid "&Registers"
 msgstr "&Registry"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:332
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:338
 msgid "&Reset"
 msgstr "&Resetovat"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:234
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:237
 msgid "&Sound"
 msgstr "&Zvuk"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:329
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:335
 msgid "&Stop"
 msgstr "Za&stavit"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:207
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:210
 msgid "&Tools"
 msgstr "Nás&troje"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:235
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:238
 msgid "&Video"
 msgstr "&Video"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:284
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:287
 msgid "&View"
 msgstr "&Zobrazit"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:179
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:182
 msgid "&Wiimote Settings"
 msgstr "&Wiimote Nastavení"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:868
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:859
 msgid "&Wiki"
 msgstr "&Wiki"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504
 msgid "'"
 msgstr "'"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:59
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:46
 msgid "(-)+zFar"
 msgstr "(-)+zFar"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:54
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:41
 msgid "(-)+zNear"
 msgstr "(-)+zNear"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:99
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:86
 msgid "(UNKNOWN)"
 msgstr "(NEZNÁMÝ)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:376
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:384
 msgid "(off)"
 msgstr "(vypnuto)"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:655
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:654
 msgid "0x44"
 msgstr "0x44"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+msgid "1.5x Native (960x792)"
+msgstr "1.5x Původní (960x792)"
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:158
 msgid "16 bit"
 msgstr "16 bit"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+msgid "1x Native (640x528)"
+msgstr "1x Původní (640x528)"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+msgid "2.5x Native (1600x1320)"
+msgstr "2.5x Původní (1600x1320)"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+msgid "2x Native (1280x1056)"
+msgstr "2x Původní (1280x1056)"
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:159
 msgid "32 bit"
 msgstr "32 bit"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:412
 msgid "3D Vision"
 msgstr "3D Vision"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+msgid "3x Native (1920x1584)"
+msgstr "3x Původní (1920x1584)"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+msgid "4x Native (2560x2112)"
+msgstr "4x Původní (2560x2112)"
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:157
 msgid "8 bit"
 msgstr "8 bit"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:43
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:30
 msgid "<Insert name here>"
 msgstr "<Zde vložte jméno>"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:255
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:262
 msgid "<No resolutions found>"
 msgstr "<Žádné rozlišení nenalezeno>"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:104
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84
 msgid "<Nothing>"
 msgstr "<Nic>"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:162
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:162
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:150
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:150
 msgid "<Press Key>"
 msgstr "<Zmáčkněte klávesu>"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286
 msgid "<System>"
 msgstr "<Systém>"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695
 msgid "A"
 msgstr "A"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:201
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:235
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:204
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:238
 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:353
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:387
 msgid "A game is not currently running."
 msgstr "Hra v současnosti neběží!"
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:68
-#, fuzzy
 msgid ""
 "A supported bluetooth device could not be found.\n"
 "You must manually connect your wiimotes."
 msgstr ""
 "Podporované zařízení bluetooth nebylo nalezeno!\n"
-"Pokud nepoužíváte zásobník Microsoft bluetooth, musíte ručně spárovat vaše "
-"wiimoty a pouze používat tlačítko \"Obnovit\"."
+"Vaše wiimoty musíte připojit ručně."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:109
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:100
+#, fuzzy
 msgid ""
 "ALERT:\n"
 "\n"
-"NetPlay will currently only work properly when using the following "
-"settings:\n"
-" - Dual Core [OFF]\n"
-" - Audio Throttle [OFF]\n"
-" - DSP-HLE with \"Null Audio\" or DSP-LLE\n"
-" - Manually set the exact number of controllers that will be used to "
-"[Standard Controller]\n"
+"Netplay will only work with the following settings:\n"
+" - Enable Dual Core [OFF]\n"
+" - DSP Emulator Engine Must be the same on all computers!\n"
+" - DSP on Dedicated Thread [OFF]\n"
+" - Framelimit NOT set to [Audio]\n"
+" - Manually set the exact number of controllers to be used to [Standard "
+"Controller]\n"
 "\n"
-"All players should try to use the same Dolphin version and settings.\n"
-"Disable all memory cards or send them to all players before starting.\n"
-"Wiimote support has not been implemented.\n"
+"All players should use the same Dolphin version and settings.\n"
+"All memory cards must be identical between players or disabled.\n"
+"Wiimote support has not been implemented!\n"
 "\n"
-"You must forward TCP port to host!!"
+"The host must have the chosen TCP port open/forwarded!\n"
 msgstr ""
 "POZOR:\n"
 "\n"
@@ -410,17 +432,17 @@ msgstr ""
 "\n"
 "Musíte přesměrovat Váš TCP port na hostitele!!"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:111
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:116
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96
 msgid "AM-Baseboard"
 msgstr "AM Základní Deska"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:299
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:115
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:300
 msgid "AR Codes"
 msgstr "Kódy AR"
 
-#: Source/Core/DolphinWX/Src/AboutDolphin.h:33
+#: Source/Core/DolphinWX/Src/AboutDolphin.h:21
 msgid "About Dolphin"
 msgstr "O Dolphinu"
 
@@ -428,15 +450,11 @@ msgstr "O Dolphinu"
 msgid "Acceleration"
 msgstr "Zrychlení"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:463
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473
 msgid "Accuracy:"
 msgstr "Přesnost:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317
-msgid "Accurate VBeam emulation"
-msgstr "Precizní emulace VBeam"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97
 msgid ""
 "Accurately emulate EFB copies.\n"
 "Some games depend on this for certain graphical effects or gameplay "
@@ -449,12 +467,12 @@ msgstr ""
 "\n"
 "Pokud si nejste jisti, zaškrtněte radějí EFB do Textury."
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:239
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:239
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:227
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:227
 msgid "Action"
 msgstr "Činnost"
 
-#: Source/Core/Core/Src/ARDecrypt.cpp:481
+#: Source/Core/Core/Src/ARDecrypt.cpp:469
 #, c-format
 msgid ""
 "Action Replay Code Decryption Error:\n"
@@ -469,7 +487,7 @@ msgstr ""
 "Viníkem je Kód:\n"
 "%s"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:667
+#: Source/Core/Core/Src/ActionReplay.cpp:657
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)"
@@ -477,7 +495,7 @@ msgstr ""
 "Chyba Action Replay: Neplatná velikost (%08x : adresa = %08x) v Kódu Přidat "
 "(%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:755
+#: Source/Core/Core/Src/ActionReplay.cpp:745
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide "
@@ -486,7 +504,7 @@ msgstr ""
 "Chyba Action Replay: Neplatná velikost (%08x : adresa = %08x) v Naplnit a "
 "Sesunout (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:547
+#: Source/Core/Core/Src/ActionReplay.cpp:537
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And "
@@ -495,7 +513,7 @@ msgstr ""
 "Chyba Action Replay: Neplatná velikost (%08x : adresa = %08x) v Ram Zápisu A "
 "Naplnění (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:607
+#: Source/Core/Core/Src/ActionReplay.cpp:597
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Write To "
@@ -504,12 +522,12 @@ msgstr ""
 "Chyba Action Replay: Neplatná velikost (%08x : adresa = %08x) v Zápisu Do "
 "Ukazatele (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:802
+#: Source/Core/Core/Src/ActionReplay.cpp:792
 #, c-format
 msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)"
 msgstr "Chyba Action Replay: Neplatná hodnota (%08x) v Kopii Paměti (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:682
+#: Source/Core/Core/Src/ActionReplay.cpp:672
 #, c-format
 msgid ""
 "Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)\n"
@@ -518,63 +536,63 @@ msgstr ""
 "Chyba Action Replay: Hlavní Kód a Zápis do CCXXXXXX nejsou zavedeny (%s)\n"
 "Hlavní kódy nejsou potřeba, nepoužívejte je."
 
-#: Source/Core/Core/Src/ActionReplay.cpp:196
+#: Source/Core/Core/Src/ActionReplay.cpp:184
 #, c-format
 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:872
+#: Source/Core/Core/Src/ActionReplay.cpp:862
 #, 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:945
+#: Source/Core/Core/Src/ActionReplay.cpp:935
 #, 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:896
+#: Source/Core/Core/Src/ActionReplay.cpp:886
 #, 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:838
+#: Source/Core/Core/Src/ActionReplay.cpp:828
 #, 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:242
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:247
 msgid "Adapter:"
 msgstr "Adaptér:"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:76
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:63
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:63
 msgid "Add"
 msgstr "Přidat"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1275
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1301
 msgid "Add ActionReplay Code"
 msgstr "Přidat kód ActionReplay"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1204
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1230
 msgid "Add Patch"
 msgstr "Přidat Záplatu"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:507
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:528
 msgid "Add new pane"
 msgstr "Přidat nový panel"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:404
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:426
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:811
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:408
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:430
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:792
 msgid "Add..."
 msgstr "Přidat..."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:90
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:81
 msgid "Address :"
 msgstr "Adresa :"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:58
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:45
 msgid ""
 "Adds the specified value to zFar Parameter.\n"
 "Two ways to express the floating point values.\n"
@@ -592,7 +610,7 @@ msgstr ""
 "\n"
 "Poznámka: Zkontrolujte Konzoli/Okno protokolu pro získané hodnoty"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:53
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:40
 msgid ""
 "Adds the specified value to zNear Parameter.\n"
 "Two ways to express the floating point values.\n"
@@ -610,48 +628,48 @@ msgstr ""
 "\n"
 "Poznámka: Zkontrolujte Konzoli/Okno protokolu pro získané hodnoty\""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:755
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:744
 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:509
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:522
 msgid "Advanced"
 msgstr "Pokročilé"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561
 msgid "Advanced Settings"
 msgstr "Pokročilá Nastavení"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:584
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:587
 msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)"
 msgstr "Všechny soubory GC/Wii (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:816
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:797
 msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)"
 msgstr "Všechny obrazy GC/Wii (gcm, iso, wbfs, ciso, gcz)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1189
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1190
 msgid "All Gamecube GCM files (gcm)"
 msgstr "Všechny soubory Gamecube GCM )gcm)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1390
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1404
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1417
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1431
 msgid "All Save States (sav, s##)"
 msgstr "Všechny Uložené Stavy (sav, s##)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1187
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1188
 msgid "All Wii ISO files (iso)"
 msgstr "Všechny soubory Wii ISO (iso)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1207
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1208
 msgid "All compressed GC/Wii ISO files (gcz)"
 msgstr "Všechny komprimované soubory GC/WII ISO (gcz)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:124
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:104
 msgid "All files (*.*)|*.*"
 msgstr "Všechny soubory (*.*)|*.*"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123
 msgid ""
 "Allows toggling certain options via the hotkeys 3 (Internal Resolution), 4 "
 "(Aspect Ratio), 5 (Copy EFB) and 6 (Fog) within the emulation window.\n"
@@ -663,39 +681,39 @@ msgstr ""
 "\n"
 "Pokud si nejste jisti, nechejte toto odškrtnuté."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:285
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:272
 msgid "Analyze"
 msgstr "Analyzovat"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:298
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:285
 msgid "Angle"
 msgstr "Úhel"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:367
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:375
 msgid "Anisotropic Filtering:"
 msgstr "Anizotropní Filtrování:"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:350
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:358
 msgid "Anti-Aliasing:"
 msgstr "Vyhlazení okrajů"
 
-#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:308
+#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:299
 msgid "Apploader is the wrong size...is it really an apploader?"
 msgstr "Zavaděč aplikace má špatnou velikost... je to vážně zavaděč?"
 
-#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:302
+#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:293
 msgid "Apploader unable to load from file"
 msgstr "Zavaděč aplikace nemohl načíst soubor"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:841
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:822
 msgid "Apploader:"
 msgstr "Zavaděč aplikace:"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:135
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:122
 msgid "Apply"
 msgstr "Použít"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124
 msgid ""
 "Apply a post-processing effect after finishing a frame.\n"
 "\n"
@@ -705,11 +723,11 @@ msgstr ""
 "\n"
 " Pokud si nejste jisti, zvolte (vypnuto)."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287
 msgid "Arabic"
 msgstr "Arabština"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:614
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:603
 #, c-format
 msgid "Are you sure you want to delete \"%s\"?"
 msgstr "Jste si jisti, že chcete smazat \"%s\"?"
@@ -726,46 +744,50 @@ msgstr ""
 msgid "Are you sure you want to delete this file?  It will be gone forever!"
 msgstr "Opravdu chcete smazat tento soubor? Bude navždy ztracen!"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:789
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:277
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:44
+msgid "Arm JIT (experimental)"
+msgstr "Arm JIT (experimentální)"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:285
 msgid "Aspect Ratio:"
 msgstr "Poměr Stran:"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:70
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:58
 msgid "At least one pane must remain open."
 msgstr "Alespoň jeden panel musí být otevřen."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:553
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533
 msgid "Audio"
 msgstr "Audio"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:694
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675
 msgid "Audio Backend:"
 msgstr "Podpůrná vrstva zvuku:"
 
-#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:41
+#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:28
 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:264
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:275
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283
 msgid "Auto"
 msgstr "Auto"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:337
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345
 msgid "Auto (Multiple of 640x528)"
 msgstr "Auto (Násobek 640x528)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:337
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345
 msgid "Auto (Window Size)"
 msgstr "Auto (Velikost Okna)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:297
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305
 msgid "Auto adjust Window Size"
 msgstr "Automaticky upravovat Velikost Okna"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77
 msgid ""
 "Automatically adjusts the window size to your internal resolution.\n"
 "\n"
@@ -775,130 +797,130 @@ msgstr ""
 "\n"
 "Pokud si nejste jisti, nechejte toto odškrtnuté."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:697
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696
 msgid "B"
 msgstr "B"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:755
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:754
 msgid "BP register "
 msgstr "Registr BP"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:27
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:14
 msgid "Back"
 msgstr "Zpět"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:698
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:679
 msgid "Backend Settings"
 msgstr "Nastavení podpůrné vrstvy"
 
-#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:60
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:206
+#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:47
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:211
 msgid "Backend:"
 msgstr "Podpůrná vrstva:"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:318
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:95
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:305
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:82
 msgid "Background Input"
 msgstr "Zadní Vstup"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:279
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:266
 msgid "Backward"
 msgstr "Dozadu"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:264
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:257
 msgid "Bad File Header"
 msgstr "Špatná hlavička souboru"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:627
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:621
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:290
 msgid "Banner"
 msgstr "Plakát"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:519
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:529
 msgid "Banner Details"
 msgstr "Detaily Plakátu"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491
 msgid "Banner:"
 msgstr "Plakát:"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:57
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:61
 msgid "Bar"
 msgstr "Vibráto"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:308
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:316
 msgid "Basic"
 msgstr "Základní"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555
 msgid "Basic Settings"
 msgstr "Základní nastavení"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:22
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Bass"
 msgstr "Basy"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:186
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:174
 msgid "Block Allocation Table checksum failed"
 msgstr "Kontrolní součet Alokační Tabulky Bloku selhal"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:631
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625
 msgid "Blocks"
 msgstr "Bloky"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:21
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Blue"
 msgstr "Modrá"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:24
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Blue Left"
 msgstr "Modrá vlevo"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:25
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Blue Right"
 msgstr "Modrá vpravo"
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:87
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270
 msgid "Bottom"
 msgstr "Dole"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:238
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:225
 #, c-format
 msgid "Bound Controls: %lu"
 msgstr "Spojené ovladače: %lu"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348
 msgid "Broken"
 msgstr "Rozbité"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:422
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:428
 msgid "Browse"
 msgstr "Procházet"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:256
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:243
 msgid "Browse for a directory to add"
 msgstr "Procházet pro přidání adresáře"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:422
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:428
 msgid "Browse for an ISO directory..."
 msgstr "Procházet pro adresář ISO..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1079
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1080
 msgid "Browse for output directory"
 msgstr "Procházet pro výstupní adresář"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:328
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:331
 msgid "Buffer:"
 msgstr "Vyrovnávací paměť:"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:58
 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:119
+#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:106
 msgid "Buttons"
 msgstr "Tlačítka"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317
 msgid ""
 "Bypass the clearing of the data cache by the DCBZ instruction. Usually leave "
 "this option disabled."
@@ -906,31 +928,31 @@ msgstr ""
 "Potlačit čištění mezipaměti dat vyvolaných instrukcí DCBZ. Tato volba je "
 "standardně vypnutá. "
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:698
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:697
 msgid "C"
 msgstr "C"
 
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:77
+#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:64
 msgid "C Stick"
 msgstr "Kr Stick"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:77
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:64
 msgid "C-Stick"
 msgstr "Kr-Stick"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:764
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:763
 msgid "CP reg"
 msgstr "CP reg"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:567
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547
 msgid "CPU Emulator Engine"
 msgstr "Jádro Emulátoru Procesoru"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:490
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500
 msgid "Cache Display Lists"
 msgstr "Ukládat předvyt. obj. do vyr. pam."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88
 msgid ""
 "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n"
 "Decreases emulation speed by some percent (depending on your GPU).\n"
@@ -945,23 +967,38 @@ msgstr ""
 "\n"
 "Pokud si nejste jisti, nechejte toto odškrtnuté."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1858
+#, c-format
+msgid "Can't find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x"
+msgstr "Nelze najít Wiimote podle bd: %02x:%02x:%02x:%02x:%02x:%02x"
+
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1872
+#, c-format
+msgid "Can't find WiiMote by connection handle %02x"
+msgstr "Nelze najít Wiimote pomocí obslužné rutiny spojení %02x"
+
+#: Source/Core/Core/Src/HW/DVDInterface.cpp:669
+#: Source/Core/Core/Src/HW/DVDInterface.cpp:679
+msgid "Can't read from DVD_Plugin - DVD-Interface: Fatal Error"
+msgstr "Nelze číst ze zásuvného modulu DVD - DVD-Rozhraní: Závažná chyba"
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:124
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:28
 msgid "Cancel"
 msgstr "Zrušit"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:91
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:178
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:240
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:84
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:171
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:233
 #, c-format
 msgid "Cannot open %s"
 msgstr "Nelze otevřít %s"
 
-#: Source/Core/Core/Src/CoreTiming.cpp:141
+#: Source/Core/Core/Src/CoreTiming.cpp:128
 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:1078
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1061
 #, c-format
 msgid ""
 "Cannot use that file as a memory card.\n"
@@ -972,7 +1009,7 @@ msgstr ""
 "%s\n"
 "není platný soubor paměťové karty gamecube"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1108
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1091
 msgid ""
 "Cannot use that file as a memory card.\n"
 "Are you trying to use the same file in both slots?"
@@ -980,30 +1017,15 @@ 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:1867
-#, 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:1881
-#, 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: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"
-
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:52
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:39
 msgid "Caps Lock"
 msgstr "Caps Lock"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288
 msgid "Catalan"
 msgstr "Katalánština"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:311
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:298
 msgid "Center"
 msgstr "Střed"
 
@@ -1011,12 +1033,12 @@ msgstr "Střed"
 msgid "Change"
 msgstr "Změnit"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:316
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:322
 msgid "Change &Disc..."
 msgstr "Vyměnit &Disk..."
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:179
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:179
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:167
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:167
 msgid "Change Disc"
 msgstr "Vyměnit Disk"
 
@@ -1024,7 +1046,7 @@ msgstr "Vyměnit Disk"
 msgid "Change Game"
 msgstr "Změnit hru"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:515
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495
 msgid ""
 "Change the language of the user interface.\n"
 "Requires restart."
@@ -1032,75 +1054,75 @@ msgstr ""
 "Změní jazyk uživatelského rozhraní.\n"
 "Vyžaduje restart."
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:60
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:47
 msgid "Changes sign to zFar Parameter (after correction)"
 msgstr "Změní znaménko na Parametr zFar (po korekci)"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:55
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:42
 msgid "Changes sign to zNear Parameter (after correction)"
 msgstr "Změní znaménko na Parametr zNear (po korekci)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:519
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499
 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:295
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:298
 msgid "Chat"
 msgstr "Chat"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:47
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:34
 msgid "Cheat Code"
 msgstr "Cheat Kód"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:118
 msgid "Cheat Search"
 msgstr "Hledání Cheatů"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:38
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:25
 msgid "Cheats Manager"
 msgstr "Správce Cheatů"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:633
 msgid "Check Partition Integrity"
 msgstr "Zkontrolovat celistvost oddílu"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:864
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:880
 msgid "Checking integrity..."
 msgstr "Kontrolování celistvosti..."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289
 msgid "Chinese (Simplified)"
 msgstr "Čínština (Zjednodušená)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290
 msgid "Chinese (Traditional)"
 msgstr "Čínština (Tradiční)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:818
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:799
 msgid "Choose a DVD root directory:"
 msgstr "Zvolte kořenový adresář DVD:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:822
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803
 msgid "Choose a NAND root directory:"
 msgstr "Zvolte kořenový adresář NAND:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:815
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:796
 msgid "Choose a default ISO:"
 msgstr "Zvolte výchozí ISO:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1236
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1219
 msgid "Choose a directory to add"
 msgstr "Zvolte adresář k přidání"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1065
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1048
 msgid "Choose a file to open"
 msgstr "Zvolte soubor k otevření"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:217
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:204
 msgid "Choose a memory card:"
 msgstr "Zvolte paměťovou kartu:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:819
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800
 msgid ""
 "Choose file to use as apploader: (applies to discs constructed from "
 "directories only)"
@@ -1108,165 +1130,165 @@ 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:767
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:806
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:781
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:822
 msgid "Choose the folder to extract to"
 msgstr "Zvolte adresář pro umístění extrakce"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:297
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:284
 msgid "Circle Stick"
 msgstr "Kruhový Stick"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:52
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:56
 msgid "Classic"
 msgstr "Klasické"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:144
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:43
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:487
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:913
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:137
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:30
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:474
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:904
 msgid "Clear"
 msgstr "Vyčistit"
 
-#: Source/Core/Core/Src/NetPlayServer.cpp:259
+#: Source/Core/Core/Src/NetPlayServer.cpp:263
 msgid ""
 "Client disconnect while game is running!! NetPlay is disabled. You must "
 "manually stop the game."
 msgstr ""
 "Klient odpojen při běhu hry!! NetPlay je vypnut. Hru musíte ukončit ručně."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:298
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:247
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:552
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:578
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:285
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:234
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:562
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:590
 msgid "Close"
 msgstr "Zavřít"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:174
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:177
 msgid "Co&nfigure..."
 msgstr "&Nastavit..."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:86
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:73
 msgid "Code Info"
 msgstr "Informace o kódu"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:568
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:556
 msgid "Code: "
 msgstr "Kód:"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:35
 msgid "Command"
 msgstr "Příkaz"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:629
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:623
 msgid "Comment"
 msgstr "Komentář"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489
 msgid "Comment:"
 msgstr "Komentář:"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:893
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:884
 msgid "Compress ISO..."
 msgstr "Komprimovat ISO..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:905
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:899
 msgid "Compress selected ISOs..."
 msgstr "Komprimovat vybraná ISO..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1088
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1224
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1089
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1225
 msgid "Compressing ISO"
 msgstr "Komprimuji ISO"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:429
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:435
 msgid "Config"
 msgstr "Nastavení"
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:37
-#: Source/Core/DolphinWX/Src/InputConfigDiag.h:135
-#: Source/Core/DolphinWX/Src/InputConfigDiag.h:154
+#: Source/Core/DolphinWX/Src/InputConfigDiag.h:122
+#: Source/Core/DolphinWX/Src/InputConfigDiag.h:141
 msgid "Configure"
 msgstr "Nastavit"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:111
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:98
 msgid "Configure Control"
 msgstr "Nastavit Ovládání"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:306
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
 #: Source/Core/DolphinWX/Src/NetWindow.cpp:583
 msgid "Configure Pads"
 msgstr "Nastavit Pady"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:429
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:435
 msgid "Configure..."
 msgstr "Nastavit..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1119
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1147
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1217
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1120
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1218
 msgid "Confirm File Overwrite"
 msgstr "Potvrdit Přepsání Souboru"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:597
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:577
 msgid "Confirm on Stop"
 msgstr "Při zastavení Potvrdit"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:83
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:105
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:74
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:96
 msgid "Connect"
 msgstr "Připojit"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:783
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:764
 msgid "Connect USB Keyboard"
 msgstr "Připojit USB Klávesnici"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:362
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:368
 #, c-format
 msgid "Connect Wiimote %i"
 msgstr "Připojit Wiimote %i"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:195
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183
 msgid "Connect Wiimote 1"
 msgstr "Připojit Wiimote 1"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184
 msgid "Connect Wiimote 2"
 msgstr "Připojit Wiimote 2"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:185
 msgid "Connect Wiimote 3"
 msgstr "Připojit Wiimote 3"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:198
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:186
 msgid "Connect Wiimote 4"
 msgstr "Připojit Wiimote 4"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:627
+#: Source/Core/DolphinWX/Src/Main.cpp:655
 msgid "Connecting..."
 msgstr "Připojuji..."
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:155
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:156
 msgid "Console"
 msgstr "Konzole"
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:71
 msgid "Continuous Scanning"
-msgstr ""
+msgstr "Průběžné skenování"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:46
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:33
 msgid "Control"
 msgstr "Ctrl"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:189
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:176
 msgid "Convert to GCI"
 msgstr "Převést na GCI"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:379
+#: Source/Core/Core/Src/CoreParameter.cpp:368
 msgid "Copy failed"
 msgstr "Kopírování selhalo"
 
@@ -1275,21 +1297,21 @@ msgstr "Kopírování selhalo"
 msgid "Copy to Memcard %c"
 msgstr "Kopírovat na Paměťovou kartu %c"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:359
 msgid "Core"
 msgstr "Jádro"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:154
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:148
 #, c-format
 msgid "Could not create %s"
 msgstr "Nelze vytvořit %s"
 
-#: Source/Core/AudioCommon/Src/AudioCommon.cpp:75
+#: Source/Core/AudioCommon/Src/AudioCommon.cpp:62
 #, c-format
 msgid "Could not initialize backend %s."
 msgstr "Nelze spustit podpůrnou vrstvu %s."
 
-#: Source/Core/Core/Src/CoreParameter.cpp:137
+#: Source/Core/Core/Src/CoreParameter.cpp:126
 #, c-format
 msgid ""
 "Could not read \"%s\".  There is no disc in the drive, or it is not a GC/Wii "
@@ -1300,12 +1322,12 @@ msgstr ""
 "Wii. Nezapomeňte, že původní disky GameCube a Wii nepřečte většina PC DVD "
 "mechanik."
 
-#: Source/Core/Core/Src/CoreParameter.cpp:292
+#: Source/Core/Core/Src/CoreParameter.cpp:281
 #, c-format
 msgid "Could not recognize ISO file %s"
 msgstr "Nelze rozpoznat ISO soubor %s"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:569
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:579
 #, c-format
 msgid "Could not save %s"
 msgstr "Nelze uložit %s"
@@ -1318,24 +1340,31 @@ 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:123
+#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119
 #, c-format
 msgid ""
 "Could not write memory card file %s.\n"
 "\n"
 "Are you running Dolphin from a CD/DVD, or is the save file maybe write "
-"protected?"
+"protected?\n"
+"\n"
+"Are you receiving this after moving the emulator directory?\n"
+"If so, then you may need to re-specify your memory card location in the "
+"options."
 msgstr ""
 "Nelze zapsat soubor paměťové karty %s.\n"
 "\n"
 "Spouštíte Dolphina z CD/DVD, nebo je snad soubor s uložením chráněný proti "
-"zápisu?"
+"zápisu?\n"
+"\n"
+"Objevila se tato chyba po přesunu adresáře s emulátorem?\n"
+"Pokud ano, pak je třeba znovu zadat umístění vaší paměťové karty v nastavení."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1107
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1133
 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:146
+#: Source/Core/Core/Src/BootManager.cpp:137
 msgid ""
 "Couldn't init the core.\n"
 "Check your configuration."
@@ -1343,38 +1372,38 @@ 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:170
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:495
 msgid "Count:"
 msgstr "Počet:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:452
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456
 msgid "Country:"
 msgstr "Země:"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:186
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:562
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:173
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:550
 msgid "Create AR Code"
 msgstr "Vytvořit AR kód"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:543
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:608
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:569
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:641
 msgid "Create new perspective"
 msgstr "Vytvořit novou perspektivu"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:17
 msgid "Creator: "
 msgstr "Tvůrce:"
 
-#: Source/Core/Common/Src/MsgHandler.cpp:68
+#: Source/Core/Common/Src/MsgHandler.cpp:54
 msgid "Critical"
 msgstr "Kritické"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562
 msgid "Crop"
 msgstr "Oříznout"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119
 msgid ""
 "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n"
 "\n"
@@ -1384,140 +1413,140 @@ msgstr ""
 "\n"
 "Pokud si nejste jisti, nechejte toto odškrtnuté."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:48
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:52
 msgid "Crossfade"
 msgstr "Crossfade"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:597
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:600
 #, c-format
-msgid "Current dir changed from %s to %s after wxFileSelector!"
+msgid "Current directory changed from %s to %s after wxFileSelector!"
 msgstr "Současný adresář se změnil z %s na %s po wxFileSelector!"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339
 msgid "Custom Projection Hack"
 msgstr "Vlastní Hack Projekce"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.h:30
+#: Source/Core/DolphinWX/Src/PHackSettings.h:17
 msgid "Custom Projection Hack Settings"
 msgstr "Nastavení Vlastního Hacku Projekce"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342
 msgid "Customize some Orthographic Projection parameters."
 msgstr "Přizpůsobte některé Ortografické parametry Projekce"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291
 msgid "Czech"
 msgstr "Čeština"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:698
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:697
 msgid "D"
 msgstr "D"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:89
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
 msgid "D-Pad"
 msgstr "D-Pad"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:431
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
 msgid "DSP"
 msgstr "DSP"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:639
 msgid "DSP Emulator Engine"
 msgstr "Jádro Emulátoru DSP"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:254
 msgid "DSP HLE emulation (fast)"
 msgstr "DSP HLE emulace (rychlé)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:256
 msgid "DSP LLE interpreter (slow)"
 msgstr "DSP LLE převaděč (pomalé)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660
-msgid "DSP LLE on Thread"
-msgstr "DSP LLE ve Vlákně"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:255
 msgid "DSP LLE recompiler"
 msgstr "DSP LLE rekompilátor"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:431
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:641
+msgid "DSP on Dedicated Thread"
+msgstr "DSP na samostatném vlákně"
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
 msgid "DSP settings"
 msgstr "Nastavení DSP"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:838
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:819
 msgid "DVD Root:"
 msgstr "Kořen DVD:"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:239
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:226
 msgid "DVDLowRead - Fatal Error: failed to read from volume"
 msgstr "DVDLowRead - Fatální chyba: nelze číst ze svazku"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:333
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:320
 msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume"
 msgstr "DVDLowUnencryptedRead - Fatální chyba: nelze přečíst svazek"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:176
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:163
 msgid "Data Size"
 msgstr "Velikost data"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468
 msgid "Date:"
 msgstr "Datum:"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:528
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:564
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:518
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:557
 msgid "Datel MaxDrive/Pro files(*.sav)"
 msgstr "Soubory Datel MaxDrive/Pro(*.sav)"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:242
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:259
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:267
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:281
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:296
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:229
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:246
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:254
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:268
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:283
 msgid "Dead Zone"
 msgstr "Mrtvá Zóna"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:35
 msgid "Debug"
 msgstr "Ladění"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:521
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534
 msgid "Debugging"
 msgstr "Ladění"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:79
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:66
 msgid "Decimal"
 msgstr "Desetinné"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:890
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:881
 msgid "Decompress ISO..."
 msgstr "Dekomprimovat ISO..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:906
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:900
 msgid "Decompress selected ISOs..."
 msgstr "Dekomprimovat vybraná ISO..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1088
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1224
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1089
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1225
 msgid "Decompressing ISO"
 msgstr "Dekomprimuji ISO"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:912
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:903
 msgid "Default"
 msgstr "Výchozí"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:835
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:816
 msgid "Default ISO:"
 msgstr "Výchozí ISO:"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:114
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:107
 msgid "Default font"
 msgstr "Výchozí typ písma"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:32
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:926
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:19
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917
 msgid "Delete"
 msgstr "Smazat"
 
@@ -1525,21 +1554,21 @@ msgstr "Smazat"
 msgid "Delete Save"
 msgstr "Smazat Uloženou Hru"
 
-#: Source/Core/VideoCommon/Src/AVIDump.cpp:77
+#: Source/Core/VideoCommon/Src/AVIDump.cpp:64
 #, c-format
 msgid "Delete the existing file '%s'?"
 msgstr "Vymazat existující soubor '%s'?"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:671
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:683
 msgid "Description"
 msgstr "Popis"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:472
 msgid "Detect"
 msgstr "Zjistit"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:233
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:328
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:220
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:315
 msgid ""
 "Detected attempt to read more data from the DVD than fit inside the out "
 "buffer. Clamp."
@@ -1547,29 +1576,29 @@ 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:127
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:898
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:114
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:889
 msgid "Device"
 msgstr "Zařízení"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:798
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:731
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779
 msgid "Device Settings"
 msgstr "Nastavení Zařízení"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:45
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:49
 msgid "Dial"
 msgstr "Kruhová stupnice"
 
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:146
+#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:135
 msgid "Direct3D11"
 msgstr "Direct3D11"
 
-#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:128
+#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:125
 msgid "Direct3D9"
 msgstr "Direct3D9"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:167
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:155
 msgid ""
 "Directory checksum failed\n"
 " and Directory backup checksum failed"
@@ -1577,16 +1606,20 @@ msgstr ""
 "Kontrolní součet adresáře\n"
 "i záložní kontrolní součet Adresáře selhal"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:433
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:443
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485
 msgid "Disable"
 msgstr "Zakázat"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:491
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501
+msgid "Disable Destination Alpha"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:409
 msgid "Disable Fog"
 msgstr "Zakázat Mlhu"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108
 msgid ""
 "Disable any XFB emulation.\n"
 "Speeds up emulation a lot but causes heavy glitches in many games which rely "
@@ -1600,7 +1633,7 @@ msgstr ""
 "\n"
 "Pokud si nejste jisti, nechejte toto zaškrtnuté."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95
 msgid ""
 "Disable emulation of EFB copies.\n"
 "These are often used for post-processing or render-to-texture effects, so "
@@ -1616,20 +1649,33 @@ msgstr ""
 "\n"
 "Pokud si nejste jisti, nechejte toto odškrtnuté."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:543
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101
+#, fuzzy
+msgid ""
+"Disables emulation of a hardware feature called destination alpha, which is "
+"used in many games for various graphical effects.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+"Přeskočit průchod cílové průhlednosti používaný ve většině her pro různé "
+"grafické efekty.\n"
+"\n"
+"Pokud si nejste jisti, nechejte toto odškrtnuté."
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:553
 msgid "Disc"
 msgstr "Disk"
 
-#: Source/Core/DiscIO/Src/DriveBlob.cpp:107
-#: Source/Core/DiscIO/Src/DriveBlob.cpp:126
+#: Source/Core/DiscIO/Src/DriveBlob.cpp:94
+#: Source/Core/DiscIO/Src/DriveBlob.cpp:113
 msgid "Disc Read Error"
 msgstr "Chyba čtení disku"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:312
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:320
 msgid "Display"
 msgstr "Obraz"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104
 msgid ""
 "Display the inputs read by the emulator.\n"
 "\n"
@@ -1639,32 +1685,32 @@ msgstr ""
 "\n"
 "Pokud si nejste jisti, nechejte toto odškrtnuté."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:80
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:67
 msgid "Divide"
 msgstr "Rozdělit"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:987
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:990
 msgid "Do you want to stop the current emulation?"
 msgstr "Chcete současnou emulaci zastavit?"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:663
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:644
 msgid "Dolby Pro Logic II decoder"
 msgstr "Dekodér Dolby Pro Logic II"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:864
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:856
 msgid "Dolphin"
 msgstr "Dolphin"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:183
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:188
 #, c-format
 msgid "Dolphin %s Graphics Configuration"
 msgstr "Dolphin %s Grafická Nastavení"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:292
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:298
 msgid "Dolphin &Web Site"
 msgstr "&Webová stránka Dolphin"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.h:37
+#: Source/Core/DolphinWX/Src/ConfigMain.h:24
 msgid "Dolphin Configuration"
 msgstr "Dolphin Nastavení"
 
@@ -1672,16 +1718,16 @@ msgstr "Dolphin Nastavení"
 msgid "Dolphin Emulated Wiimote Configuration"
 msgstr "Nastavení Emulovaného Dolphin Wiimote"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:394
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:383
 msgid "Dolphin FIFO"
 msgstr "Dolphin FIFO"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1136
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1153
 msgid "Dolphin GCPad Configuration"
 msgstr "Dolphin GCPad Nastavení"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:679
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1074
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:685
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1089
 msgid "Dolphin TAS Movies (*.dtm)"
 msgstr "Doplhin Filmy TAS (*.dtm)"
 
@@ -1689,11 +1735,11 @@ msgstr "Doplhin Filmy TAS (*.dtm)"
 msgid "Dolphin Wiimote Configuration"
 msgstr "Dolphin Wiimote Nastavení"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:293
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:299
 msgid "Dolphin at &Google Code"
 msgstr "Dolphin na &Google Code"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:364
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:351
 msgid ""
 "Dolphin could not find any GC/Wii ISOs.  Doubleclick here to browse for "
 "files..."
@@ -1701,7 +1747,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:368
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:355
 msgid ""
 "Dolphin is currently set to hide all games.  Doubleclick here to show all "
 "games..."
@@ -1709,50 +1755,59 @@ 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:1159
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1160
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1246
 msgid "Dolphin was unable to complete the requested action."
 msgstr "Dolhpin nemohl dokončit požadovanou činnost."
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:275
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:58
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
+#, fuzzy
+msgid ""
+"Doubles the emulated GPU clock rate. May speed up some games (ON = Fast, OFF "
+"= Compatible)"
+msgstr ""
+"Zapnout rychlý přístup k disku. Některé hry to potřebují. (ZAPNUTO = rychlé, "
+"VYPNUTO = Kompatibilní)"
+
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:262
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:45
 msgid "Down"
 msgstr "Dolů"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:54
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:44
 msgid "Download Codes (WiiRD Database)"
 msgstr "Stáhnout kódy (Databáze WiiRD)"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:297
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:287
 #, c-format
 msgid "Downloaded %lu codes. (added %lu)"
 msgstr "Stáhnuto %lu kódů. (přídáno %lu)"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:31
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:35
 msgid "Drums"
 msgstr "Bubny"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:105
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
 msgid "Dummy"
 msgstr "Atrapa"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:661
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:642
 msgid "Dump Audio"
 msgstr "Vypsat Zvuk"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:532
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545
 msgid "Dump EFB Target"
 msgstr "Vypsat Cíl EFB"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546
 msgid "Dump Frames"
 msgstr "Vypsat Snímky"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543
 msgid "Dump Textures"
 msgstr "Vypsat Textury"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114
 msgid ""
 "Dump all rendered frames to an AVI file in User/Dump/Frames/\n"
 "\n"
@@ -1762,7 +1817,7 @@ msgstr ""
 "\n"
 "Pokud si nejste jisti, nechejte toto odškrtnuté."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111
 msgid ""
 "Dump decoded game textures to User/Dump/Textures/<game_id>/\n"
 "\n"
@@ -1772,7 +1827,7 @@ msgstr ""
 "\n"
 "Pokud si nejste jisti, nechejte toto odškrtnuté."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113
 msgid ""
 "Dump the contents of EFB copies to User/Dump/Textures/\n"
 "\n"
@@ -1782,21 +1837,21 @@ msgstr ""
 "\n"
 "Pokud si nejste jisti, nechejte toto odškrtnuté."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:474
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292
 msgid "Dutch"
 msgstr "Nizozemština"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:112
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:113
 msgid "E&xit"
 msgstr "O&dejít"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:441
 msgid "EFB Copies"
 msgstr "EFB Kopie"
 
-#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:223
+#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:210
 #, c-format
 msgid ""
 "ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least "
@@ -1808,52 +1863,52 @@ msgstr ""
 "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:166
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:160
 msgid "EUROPE"
 msgstr "EVROPA"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:156
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:143
 msgid "Early Memory Updates"
 msgstr "Předčasné Aktualizace Paměti"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:447
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:453
 msgid "Edit"
 msgstr "Upravit"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.h:30
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.h:17
 msgid "Edit ActionReplay Code"
 msgstr "Upravit kód ActionReplay"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:285
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:286
 msgid "Edit Config"
 msgstr "Upravit nastavení"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.h:30
+#: Source/Core/DolphinWX/Src/PatchAddEdit.h:17
 msgid "Edit Patch"
 msgstr "Upravit záplatu"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:447
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:453
 msgid "Edit current perspective"
 msgstr "Upravit současnou perspektivu"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:403
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:425
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:407
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:429
 msgid "Edit..."
 msgstr "Upravit"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:44
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:48
 msgid "Effect"
 msgstr "Efekt"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:425
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435
 msgid "Embedded Frame Buffer"
 msgstr "Vnořená Vyr. Pamět Snímků"
 
-#: Source/Core/Core/Src/Core.cpp:201
+#: Source/Core/Core/Src/Core.cpp:190
 msgid "Emu Thread already running"
 msgstr "Vlákno Emulace již běží"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110
 msgid ""
 "Emulate XFBs accurately.\n"
 "Slows down emulation a lot and prohibits high-resolution rendering but is "
@@ -1867,7 +1922,7 @@ msgstr ""
 "\n"
 "Pokud si nejste jisti, zaškrtněte místo tohoto virtuální emulaci XFB."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109
 msgid ""
 "Emulate XFBs using GPU texture objects.\n"
 "Fixes many games which don't work without XFB emulation while not being as "
@@ -1887,7 +1942,7 @@ msgstr ""
 msgid "Emulated Wiimote"
 msgstr "Emulovaný Wiimote"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346
 msgid "Emulation State: "
 msgstr "Stav Emulace:"
 
@@ -1895,7 +1950,7 @@ msgstr "Stav Emulace:"
 msgid "Enable"
 msgstr "Povolit"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91
 msgid ""
 "Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's "
 "supported by your GPU.\n"
@@ -1911,72 +1966,71 @@ msgstr ""
 "\n"
 "Pokud si nejste jisti, nechejte toto odškrtnuté."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:111
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:98
 msgid "Enable AR Logging"
 msgstr "Povolit protokolování AR"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324
 msgid "Enable Block Merging"
 msgstr "Zapnout Slučování Bloků"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331
 msgid "Enable Bounding Box Calculation"
 msgstr "Povolit výpočet ohraničujícího rámečku"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:446
 msgid "Enable Cache"
 msgstr "Povolit vyrovnávací paměť"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:562
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542
 msgid "Enable Cheats"
 msgstr "Povolit Cheaty"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310
 msgid "Enable Dual Core"
 msgstr "Povolit dvojité jádro"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
 msgid "Enable Dual Core (speedup)"
 msgstr "Zapnout dvojité jádro (zrychlení)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:550
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:563
 msgid "Enable Hotkeys"
 msgstr "Povolit klávesové zkratky"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311
 msgid "Enable Idle Skipping"
 msgstr "Povolit Přeskakování Nečinných Příkazů"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541
 msgid "Enable Idle Skipping (speedup)"
 msgstr "Povolit Přeskakování Nečinných Příkazů (zrychlení)"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312
 msgid "Enable MMU"
 msgstr "Zapnout MMU"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:554
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:567
 msgid "Enable Progressive Scan"
 msgstr "Povolit Progresivní Skenování"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757
 msgid "Enable Screen Saver"
 msgstr "Povolit Spořič Obrazovky"
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:75
-#, fuzzy
 msgid "Enable Speaker Data"
-msgstr "Zapnout stránky"
+msgstr "Povolit data reproduktorů"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
 msgid "Enable WideScreen"
 msgstr "Povolit Širokoúhlou obrazovku"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:516
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529
 msgid "Enable Wireframe"
 msgstr "Povolit Drátěný Model"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85
 msgid ""
 "Enable anisotropic filtering.\n"
 "Enhances visual quality of textures that are at oblique viewing angles.\n"
@@ -1990,7 +2044,7 @@ msgstr ""
 "\n"
 "Pokud si nejste jisti, zvolte 1x."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323
 msgid ""
 "Enable fast disc access.  Needed for a few games. (ON = Fast, OFF = "
 "Compatible)"
@@ -2002,7 +2056,7 @@ msgstr ""
 msgid "Enable pages"
 msgstr "Zapnout stránky"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76
 msgid ""
 "Enable this if you want the whole screen to be used for rendering.\n"
 "If this is disabled, a render window will be created instead.\n"
@@ -2015,7 +2069,7 @@ msgstr ""
 "\n"
 "Pokud si nejste jisti, nechejte toto odškrtnuté."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80
 msgid ""
 "Enable this if you want to use the main Dolphin window for rendering rather "
 "than a separate render window.\n"
@@ -2027,7 +2081,7 @@ msgstr ""
 "\n"
 "Pokud si nejste jisti, nechejte toto odškrtnuté."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:335
 msgid ""
 "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for "
 "ANY other game."
@@ -2035,11 +2089,11 @@ msgstr ""
 "Povolte toto pro zrychlení The Legend of Zelda: Twilight Princess. Zakažte "
 "pro VŠECHNY ostatní hry."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340
 msgid "Enables Custom Projection Hack"
 msgstr "Povolit Vlastní Hack Projekce"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:528
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508
 msgid ""
 "Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on "
 "OSX."
@@ -2047,14 +2101,14 @@ msgstr ""
 "Povolí emulaci Dolby Pro Logic II používající prostorový zvuk 5.1. Není "
 "dostupné v OSX."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510
 msgid ""
 "Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only."
 msgstr ""
 "Povolí emulaci Dolby Pro Logic II používající prostorový zvuk 5.1. Pouze pro "
 "podpůrnou vrstvu OpenAL."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:512
 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."
@@ -2063,7 +2117,7 @@ msgstr ""
 "podpůrnou vrstvu OpenAL. Možná bude třeba přejmenovat soft_oal.dll na "
 "OpenAL32.dll aby toto fungovalo."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81
 msgid ""
 "Enables progressive scan if supported by the emulated software.\n"
 "Most games don't care about this.\n"
@@ -2075,7 +2129,7 @@ msgstr ""
 "\n"
 "Pokud si nejste jisti, nechejte toto odškrtnuté."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313
 msgid ""
 "Enables the Memory Management Unit, needed for some games. (ON = Compatible, "
 "OFF = Fast)"
@@ -2083,7 +2137,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:111
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116
 msgid ""
 "Encode frame dumps using the FFV1 codec.\n"
 "\n"
@@ -2093,51 +2147,51 @@ msgstr ""
 "\n"
 "Pokud si nejste jisti, nechejte toto odškrtnuté."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:40
 msgid "End"
 msgstr "End"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:469
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:280
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:260
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293
 msgid "English"
 msgstr "Angličtina"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:329
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:407
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:337
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:417
 msgid "Enhancements"
 msgstr "Vylepšení"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:607
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:640
 msgid "Enter a name for the new perspective:"
 msgstr "Zadejte jméno nové perspektivy:"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:191
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:178
 #, c-format
 msgid "Entry %d/%d"
 msgstr "Záznam %d/%d"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:85
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:72
 #, c-format
 msgid "Entry 1/%d"
 msgstr "Záznam 1/%d"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:204
 msgid "Equal"
 msgstr "Rovná se"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:45
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:156
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1242
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:32
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:150
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226
 msgid "Error"
 msgstr "Chyba"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:381
+#: Source/Core/DolphinWX/Src/Main.cpp:409
 msgid "Error loading selected language. Falling back to system default."
 msgstr ""
 "Chyba při nahrávání zvoleného jazyka. Vracím se na výchozí jazyk systému."
 
-#: Source/Core/Common/Src/ChunkFile.h:226
+#: Source/Core/Common/Src/ChunkFile.h:221
 #, c-format
 msgid ""
 "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). "
@@ -2146,7 +2200,7 @@ msgstr ""
 "Chyba: Po \"%s\", nalezeno %d (0x%X) místo značky uložení %d (0x%X). "
 "Ukončuji načtení uloženého stavu..."
 
-#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:342
+#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:329
 #, c-format
 msgid ""
 "Error: Trying to access %s fonts but they are not loaded. Games may not show "
@@ -2155,38 +2209,38 @@ msgstr ""
 "Chyba: Pokus o přístup k písmům %s, ale ty nejsou načtena. Hry nemusí "
 "zobrazit písma správně, nebo se můžou zhroutit"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:30
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:17
 msgid "Escape"
 msgstr "Escape"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:26
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:30
 msgid "Euphoria"
 msgstr "Euforie"
 
 #: Source/Core/Core/Src/ArmMemTools.cpp:78
-#: Source/Core/Core/Src/x64MemTools.cpp:217
+#: Source/Core/Core/Src/x64MemTools.cpp:206
 #, c-format
 msgid "Exception handler - access below memory space. %08llx%08llx"
 msgstr "Obslužná rutina výjimky - přístup pod paměťovým místem. %08llx%08llx"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:61
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
 msgid "Execute"
 msgstr "Spustit"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:459
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:446
 msgid "Export Failed"
 msgstr "Export Selhal"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:639
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:649
 msgid "Export File"
 msgstr "Exportovat Soubor"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:177
 msgid "Export Recording"
 msgstr "Exportovat Nahrávku"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:345
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:351
 msgid "Export Recording..."
 msgstr "Exportovat Nahrávku..."
 
@@ -2194,7 +2248,7 @@ msgstr "Exportovat Nahrávku..."
 msgid "Export Save"
 msgstr "Exportovat Uloženou hru"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:874
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:865
 msgid "Export Wii save (Experimental)"
 msgstr "Exportovat uloženou hru Wii (Experimentální)"
 
@@ -2202,100 +2256,100 @@ msgstr "Exportovat uloženou hru Wii (Experimentální)"
 msgid "Export all saves"
 msgstr "Exportovat všechny Uložené hry"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:80
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:72
 msgid "Export failed, try again?"
 msgstr "Exportování selhalo, zkusit znovu?"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:559
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:552
 msgid "Export save as..."
 msgstr "Exportovat Uloženou hru jako..."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:297
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:284
 msgid "Extension"
 msgstr "Rozšíření"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483
 msgid "External Frame Buffer"
 msgstr "Vnější vyrovnávací paměť Snímků"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:61
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:48
 msgid "Extra Parameter"
 msgstr "Extra Parametr"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:62
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:49
 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:614
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:624
 msgid "Extract All Files..."
 msgstr "Extrahovat Všechny Soubory..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:616
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:626
 msgid "Extract Apploader..."
 msgstr "Extrahovat Zavaděč Aplikace..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:617
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627
 msgid "Extract DOL..."
 msgstr "Extrahovat DOL..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:610
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:620
 msgid "Extract Directory..."
 msgstr "Extrahovat Adresář..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:612
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:622
 msgid "Extract File..."
 msgstr "Extrahovat Soubor..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:608
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:618
 msgid "Extract Partition..."
 msgstr "Extrahovat Oddíl..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:724
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:738
 #, c-format
 msgid "Extracting %s"
 msgstr "Extrahuji %s"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:707
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:721
 msgid "Extracting All Files"
 msgstr "Extrahuji Všechny Soubory"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:707
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:721
 msgid "Extracting Directory"
 msgstr "Extrahuji Adresář"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:710
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:724
 msgid "Extracting..."
 msgstr "Extrahuji..."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:892
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:893
 msgid "FIFO Byte"
 msgstr "FIFO Bajt"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:45
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:32
 msgid "FIFO Player"
 msgstr "Přehrávač FIFO"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:169
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:163
 msgid "FRANCE"
 msgstr "FRANCIE"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472
 msgid "FST Size:"
 msgstr "Velikost FST:"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:77
+#: Source/Core/Core/Src/NetPlayClient.cpp:81
 msgid "Failed to Connect!"
 msgstr "Připojení Selhalo!"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:225
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:228
 msgid "Failed to Listen!!"
 msgstr "Naslouchání Selhalo!!"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:307
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:300
 msgid "Failed to download codes."
 msgstr "Stahování kódů selhalo."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:827
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:843
 #, c-format
 msgid "Failed to extract to %s!"
 msgstr "Nelze extrahovat do %s!"
@@ -2322,26 +2376,30 @@ msgstr ""
 "Můžete použít jádro DSP HLE, které nevyžaduje výpisy ROM.\n"
 "(Zvolte ho z karty \"Zvuk\" z dialogového okna nastavení.)"
 
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:116
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:139
+#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:108
+#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:131
 msgid "Failed to load bthprops.cpl"
 msgstr "Nelze nahrát bthprops.cpl"
 
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:100
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:109
+#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:90
+#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:101
 msgid "Failed to load hid.dll"
 msgstr "Nelze nahrát hid.dll"
 
-#: Source/Core/Core/Src/Movie.cpp:792
+#: Source/Core/Core/Src/Movie.cpp:783
 #, c-format
 msgid "Failed to read %s"
 msgstr "Nelze přečíst %s"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:151
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:144
 msgid "Failed to read banner.bin"
 msgstr "Nelze číst z banner.bin"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:223
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:178
+msgid "Failed to read bk header"
+msgstr "Nelze přečíst hlavičku bk"
+
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:211
 #, c-format
 msgid ""
 "Failed to read block %d of the save data\n"
@@ -2352,7 +2410,7 @@ msgstr ""
 "Data v paměťové kartě můžou být zkrácena\n"
 "Pozice souboru: %llx"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:148
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:136
 msgid ""
 "Failed to read block allocation table backup correctly\n"
 "(0x8000-0x9FFF)"
@@ -2360,7 +2418,7 @@ msgstr ""
 "Nelze správně číst zálohu alokační tabulky bloku\n"
 "(0x8000-0x9FFF)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:142
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:130
 msgid ""
 "Failed to read block allocation table correctly\n"
 "(0x6000-0x7FFF)"
@@ -2368,12 +2426,17 @@ msgstr ""
 "Nelze správně číst alokační tabulku bloku\n"
 "(0x6000-0x7FFF)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:286
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:279
 #, c-format
 msgid "Failed to read data from file %d"
 msgstr "Nelze číst data ze souboru %d"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:136
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:367
+#, c-format
+msgid "Failed to read data from file: %s"
+msgstr "Čtení dat ze souboru selhalo: %s"
+
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:124
 msgid ""
 "Failed to read directory backup correctly\n"
 "(0x4000-0x5FFF)"
@@ -2381,7 +2444,7 @@ msgstr ""
 "Nelze správně číst zálohu adresáře\n"
 "(0x4000-0x5FFF)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:130
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:118
 msgid ""
 "Failed to read directory correctly\n"
 "(0x2000-0x3FFF)"
@@ -2389,7 +2452,11 @@ msgstr ""
 "Nelze správně číst adresář\n"
 "(0x2000-0x3FFF)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:119
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:90
+msgid "Failed to read header"
+msgstr "Nelze přečíst hlavičku"
+
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:107
 msgid ""
 "Failed to read header correctly\n"
 "(0x0000-0x1FFF)"
@@ -2397,41 +2464,41 @@ msgstr ""
 "Nelze správně číst hlavičku\n"
 "(0x0000-0x1FFF)"
 
-#: Source/Core/DiscIO/Src/VolumeGC.cpp:61
+#: Source/Core/DiscIO/Src/VolumeGC.cpp:48
 msgid "Failed to read unique ID from disc image"
 msgstr "Nelze přečíst jedinečné ID z obrazu disku"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:84
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:71
 msgid "Failed to write BT.DINF to SYSCONF"
 msgstr "Selhal zápis BT.DINF do SYSCONF"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:228
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:221
 msgid "Failed to write bkhdr"
 msgstr "Zápis bkhdr selhal"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:164
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:157
 #, c-format
 msgid "Failed to write header for %s"
 msgstr "Zápis hlavičky selhal pro %s"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:258
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:251
 #, c-format
 msgid "Failed to write header for file %d"
 msgstr "Selhal zápis hlavičky souboru %d"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294
 msgid "Farsi"
 msgstr "Perština"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477
 msgid "Fast"
 msgstr "Rychlá"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315
 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:1046
+#: Source/Core/Core/Src/Movie.cpp:1037
 #, c-format
 msgid ""
 "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s"
@@ -2439,23 +2506,23 @@ msgstr ""
 "závažná desynchronizace. Přehrávání ukončeno. (Chyba v PlayWiimote: %u != "
 "%u, bajt %u.)%s"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:199
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:202
 msgid "Fifo Player"
 msgstr "Přehrávač Fifo"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:99
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:86
 msgid "File Info"
 msgstr "Informace o souboru"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:304
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:295
 msgid "File contained no codes."
 msgstr "Soubor neobsahoval žádné kódy"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:413
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:400
 msgid "File converted to .gci"
 msgstr "Soubor převeden na .gci"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:428
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:415
 msgid ""
 "File could not be opened\n"
 "or does not have a valid extension"
@@ -2463,7 +2530,7 @@ msgstr ""
 "Soubor nelze otevřít\n"
 "nebo nemá platnou příponu"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:84
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:72
 #, c-format
 msgid ""
 "File has the extension \"%s\"\n"
@@ -2472,36 +2539,36 @@ msgstr ""
 "Soubor má příponu \"%s\"\n"
 "platné přípony jsou (.raw/.gcp)"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:425
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:412
 msgid "File is not recognized as a memcard"
 msgstr "Soubor nerozpoznán jako paměťová karta"
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:294
+#: Source/Core/DiscIO/Src/CompressedBlob.cpp:281
 msgid "File not compressed"
 msgstr "Soubor není komprimovaný"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:127
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:109
 #, c-format
 msgid "FileIO: Unknown open mode : 0x%02x"
 msgstr "FileIO: Neznámý režim otevření : 0x%02x"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:531
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:541
 msgid "Filesystem"
 msgstr "Souborový systém"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1100
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1126
 msgid "Filetype 'ini' is unknown! Will not open!"
 msgstr "Typ souboru 'ini' je neznámý! Nelze otevřít!"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:265
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:252
 msgid "Find next"
 msgstr "Najít další"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:266
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:253
 msgid "Find previous"
 msgstr "Najít předchozí"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:632
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626
 msgid "First Block"
 msgstr "První blok"
 
@@ -2509,23 +2576,23 @@ msgstr "První blok"
 msgid "Fix Checksums"
 msgstr "Spravit Kontrolní Součty"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:275
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283
 msgid "Force 16:9"
 msgstr "Vynutit 16:9"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:275
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283
 msgid "Force 4:3"
 msgstr "Vynutit 4:3"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:568
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548
 msgid "Force Console as NTSC-J"
 msgstr "Donutit konzoli být jako NTSC-J"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406
 msgid "Force Texture Filtering"
 msgstr "Vynutit Filtrování Textur"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90
 msgid ""
 "Force texture filtering even if the emulated game explicitly disabled it.\n"
 "Improves texture quality slightly but causes glitches in some games.\n"
@@ -2537,7 +2604,7 @@ msgstr ""
 "\n"
 "Pokud si nejste jisti, nechejte toto odškrtnuté."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83
 msgid ""
 "Force the game to output graphics for widescreen resolutions.\n"
 "Causes graphical glitches is some games.\n"
@@ -2549,7 +2616,7 @@ msgstr ""
 "\n"
 "Pokud si nejste jisti, nechejte toto odškrtnuté."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488
 msgid ""
 "Forces NTSC-J mode for using the Japanese ROM font.\n"
 "Left unchecked, dolphin defaults to NTSC-U and automatically enables this "
@@ -2559,7 +2626,7 @@ msgstr ""
 "Pokud není zaškrtnuto, Dolphin standardně přejde na NTSC-U a automaticky "
 "zapne toto nastavení při hraní Japonských her."
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:74
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:62
 msgid ""
 "Format as ascii (NTSC\\PAL)?\n"
 "Choose no for sjis (NTSC-J)"
@@ -2567,148 +2634,147 @@ msgstr ""
 "Formátovat jako ascii (NTSC\\PAL)?\n"
 "Zvolte ne pro sjis (NTSC-J)"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:278
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:265
 msgid "Forward"
 msgstr "Dopředu"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504
 #, c-format
 msgid "Found %d results for '"
 msgstr "Nalezeno %d výsledků pro '"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:857
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:925
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:858
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:926
 msgid "Frame"
 msgstr "Snímek"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:867
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:868
 msgid "Frame "
 msgstr "Snímek"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:185
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:173
 msgid "Frame Advance"
 msgstr "Postup Snímkem"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:536
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549
 msgid "Frame Dumps use FFV1"
 msgstr "Uložení snímků použije FFV1"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:227
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:214
 msgid "Frame Info"
 msgstr "Informace o snímku"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:116
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:103
 msgid "Frame Range"
 msgstr "Rozsah Snímku"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:138
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:139
 msgid "Frame S&kipping"
 msgstr "Přes&kakování snímků:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:572
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552
 msgid "Framelimit:"
 msgstr "Limit Snímků:"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:204
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:191
 msgid "Frames To Record"
 msgstr "Snímky k Nahrání"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547
 msgid "Free Look"
 msgstr "Rozhlížení pomocí myši"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
 msgid "French"
 msgstr "Francouzština"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:38
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:42
 msgid "Frets"
 msgstr "Pražce"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:118
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:137
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:105
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:124
 msgid "From"
 msgstr "Z"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:426
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:432
 msgid "FullScr"
 msgstr "CelObr"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:256
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263
 msgid "Fullscreen resolution:"
 msgstr "Rozlišení celé obrazovky:"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:534
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524
 msgid "GCI File(*.gci)"
 msgstr "Soubor GCI(*.gci)"
 
-#: Source/Core/DolphinWX/Src/GCMicDlg.h:44
+#: Source/Core/DolphinWX/Src/GCMicDlg.h:31
 msgid "GCMic Configuration"
 msgstr "Nastavení GCMic"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:432
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
 msgid "GCPad"
 msgstr "GCPad"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:659
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:658
 msgid "GX_CMD_INVL_VC"
 msgstr "GX_CMD_INVL_VC"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:448
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:452
 msgid "Game ID:"
 msgstr "ID Hry:"
 
-#: Source/Core/Core/Src/NetPlay.cpp:229
+#: Source/Core/Core/Src/NetPlay.cpp:216
 msgid "Game is already running!"
 msgstr "Hra už běží!"
 
-#: Source/Core/Core/Src/NetPlay.cpp:259
+#: Source/Core/Core/Src/NetPlay.cpp:246
 msgid "Game isn't running!"
 msgstr "Hra neběží!"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:389
-#, fuzzy
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:393
 msgid "Game not found!"
-msgstr "Hra nenalezena!!"
+msgstr "Hra nenalezena!"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:385
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:389
 msgid "Game-Specific Settings"
 msgstr "Nastavení Konkrétní Hry"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:293
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:294
 msgid "GameConfig"
 msgstr "Nastavení Hry"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:525
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:515
 msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)"
 msgstr "Soubory uložených her GameCube (*.gci;*.gcs;*.sav)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534
 msgid "Gamecube"
 msgstr "Gamecube"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:178
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:181
 msgid "Gamecube &Pad Settings"
 msgstr "Nastavení Gamecube &Pad"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:218
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1069
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:205
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1052
 msgid "Gamecube Memory Cards (*.raw,*.gcp)"
 msgstr "Paměťové karty Gamecube (*.raw,*.gcp)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:432
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
 msgid "Gamecube Pad settings"
 msgstr "Gamecube Pad nastavení"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:117
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302
 msgid "Gecko Codes"
 msgstr "Kódy Gecko"
 
-#: Source/Core/Core/Src/GeckoCode.cpp:222
+#: Source/Core/Core/Src/GeckoCode.cpp:214
 #, c-format
 msgid ""
 "GeckoCode failed to run (CT%i CST%i) (%s)\n"
@@ -2719,10 +2785,10 @@ msgstr ""
 "Nelze spustit GeckoKód (CT%i CST%i) (%s)\n"
 "(buď špatný kód, nebo typ kódu není ještě podporován. Zkuste použít )"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:172
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:197
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:160
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:160
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:202
 msgid "General"
 msgstr "Obecné"
 
@@ -2730,30 +2796,30 @@ msgstr "Obecné"
 msgid "General Settings"
 msgstr "Obecná Nastavení"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:470
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:281
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:316
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:261
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
 msgid "German"
 msgstr "Němčina"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:449
+#: Source/Core/Core/Src/ActionReplay.cpp:439
 #, 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:430
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:436
 msgid "Graphics"
 msgstr "Grafika"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:430
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:436
 msgid "Graphics settings"
 msgstr "Grafická nastavení"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:205
 msgid "Greater Than"
 msgstr "Větší než"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87
 msgid ""
 "Greatly increases quality of textures generated using render to texture "
 "effects.\n"
@@ -2770,51 +2836,77 @@ msgstr ""
 "\n"
 "Pokud si nejste jisti, nechejte toto zaškrtnuté."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:317
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
 msgid "Greek"
 msgstr "Řečtina"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:22
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Green"
 msgstr "Zelená"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:24
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Green Left"
 msgstr "Zelená vlevo"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:25
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Green Right"
 msgstr "Zelená vpravo"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:35
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:39
 msgid "Guitar"
 msgstr "Kytara"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1259
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1250
 msgid "HCI_CMD_INQUIRY is called, please report!"
 msgstr "Byl zavolán HCI_CMD_INQUIRY, prosím ohlaste!"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:421
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504
+msgid "Hacked Buffer Upload"
+msgstr "Změněné nahrávání vyrovnávací paměti"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431
 msgid "Hacks"
 msgstr "Hacky"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:158
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:146
 msgid "Header checksum failed"
 msgstr "Kontrolní součet hlavičky selhal"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:318
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298
 msgid "Hebrew"
 msgstr "Hebrejština"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:313
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:300
 msgid "Height"
 msgstr "Výška"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:64
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:51
 msgid "Help"
 msgstr "Nápověda"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:209
+#: Source/Core/DolphinWX/Src/Main.cpp:229
+msgid ""
+"Hi,\n"
+"\n"
+"Dolphin requires Mac OS X 10.7 or greater.\n"
+"Unfortunately you're running an old version of OS X.\n"
+"The last Dolphin version to support OS X 10.6 is Dolphin 3.5\n"
+"Please upgrade to 10.7 or greater to use the newest Dolphin version.\n"
+"\n"
+"Sayonara!\n"
+msgstr ""
+"Ahoj,\n"
+"\n"
+"Dolphin vyžaduje, OS X 10.7 nebo lepší.\n"
+"Bohužel máte příliš starou verzi OS X.\n"
+"Poslední verze Dolphin podporující OS X 10.6 je Dolphin 3.5\n"
+"Prosím aktualizujte na 10.7 nebo lepší, abyste mohli použít nejnovější verzi "
+"Dolphin.\n"
+"\n"
+"\n"
+"Sajonara!\n"
+
+#: Source/Core/DolphinWX/Src/Main.cpp:220
 msgid ""
 "Hi,\n"
 "\n"
@@ -2830,15 +2922,15 @@ msgstr ""
 "\n"
 "Sajonara!\n"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:309
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:296
 msgid "Hide"
 msgstr "Skrýt"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:307
 msgid "Hide Mouse Cursor"
 msgstr "Skrýt kurzor myši"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79
 msgid ""
 "Hides the mouse cursor if it's on top of the emulation window.\n"
 "\n"
@@ -2848,26 +2940,26 @@ msgstr ""
 "\n"
 "Pokud si nejste jisti, nechejte toto zaškrtnuté."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:54
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41
 msgid "Home"
 msgstr "Home"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:85
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:138
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:76
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:141
 msgid "Host"
 msgstr "Hostovat"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.h:44
+#: Source/Core/DolphinWX/Src/HotkeyDlg.h:31
 msgid "Hotkey Configuration"
 msgstr "Nastavení klávesových zkratek"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:272
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:272
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:594
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:260
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:260
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574
 msgid "Hotkeys"
 msgstr "Klávesové zkratky"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:319
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299
 msgid "Hungarian"
 msgstr "Maďarština"
 
@@ -2875,33 +2967,33 @@ msgstr "Maďarština"
 msgid "Hybrid Wiimote"
 msgstr "Hybridní Wiimote"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:532
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:519
 #, 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:786
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:773
 #, c-format
 msgid ""
-"IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available "
-"in your nand dump\n"
+"IOCTL_ES_LAUNCH: Game tried to reload an IOS or a title that is not "
+"available in your NAND dump\n"
 "TitleID %016llx.\n"
-" Dolphin will likely hang now"
+" Dolphin will likely hang now."
 msgstr ""
-"IOCTL_ES_LAUNCH: Hra se pokusila znovu načíst ios nebo název, který není "
-"dostupný ve Vašem nand výpisu\n"
+"IOCTL_ES_LAUNCH: Hra se pokusila znovu načíst IOS nebo název, který není "
+"dostupný ve vašem NAND výpisu\n"
 "IDNázvu %016llx.\n"
-"Dolphin se teď pravděpodobně zasekne"
+"Dolphin se teď pravděpodobně zasekne."
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:313
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:300
 msgid "IOCTL_ES_READCONTENT - bad destination"
 msgstr "IOCTL_ES_READCONTENT - špatný cíl"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729
 msgid "IPL Settings"
 msgstr "Nastavení IPL"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269
 msgid "IR"
 msgstr "Infrč."
 
@@ -2913,23 +3005,23 @@ msgstr "Infračer. Ukazovátko"
 msgid "IR Sensitivity:"
 msgstr "Citlivost Infračer.:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:502
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:512
 msgid "ISO Details"
 msgstr "Detaily ISO"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:830
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:811
 msgid "ISO Directories"
 msgstr "Adresáře ISO"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:172
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:166
 msgid "ITALY"
 msgstr "ITÁLIE"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:630
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:624
 msgid "Icon"
 msgstr "Ikona"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332
 msgid ""
 "If checked, the bounding box registers will be updated. Used by the Paper "
 "Mario games."
@@ -2937,28 +3029,11 @@ 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:318
-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:505
-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 (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:428
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438
 msgid "Ignore Format Changes"
 msgstr "Ignorovat Změny Formátu"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94
 msgid ""
 "Ignore any changes to the EFB format.\n"
 "Improves performance in many games without any negative effect. Causes "
@@ -2972,7 +3047,7 @@ msgstr ""
 "\n"
 "Pokud si nejste jisti, nechejte toto zaškrtnuté."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93
 msgid ""
 "Ignore any requests of the CPU to read from or write to the EFB.\n"
 "Improves performance in some games, but might disable some gameplay-related "
@@ -2990,11 +3065,11 @@ msgstr ""
 msgid "Import Save"
 msgstr "Importovat Uloženou hru"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:59
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:48
 msgid "Import failed, try again?"
 msgstr "Import selhal, zkusit znovu?"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:454
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:441
 msgid ""
 "Imported file has gsc extension\n"
 "but does not have a correct header"
@@ -3002,11 +3077,11 @@ msgstr ""
 "Importovaný soubor má příponu gsc\n"
 "ale nemá správnou hlavičku"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:442
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:429
 msgid "Imported file has invalid length"
 msgstr "Importovaný soubor má neplatnou délku"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:451
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:438
 msgid ""
 "Imported file has sav extension\n"
 "but does not have a correct header"
@@ -3014,19 +3089,7 @@ msgstr ""
 "\"Importovaný soubor má příponu sav\n"
 "ale nemá správnou hlavičku\""
 
-#: 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 ""
-"Zlepší výkon, ale způsobuje chyby ve většině her, které závisejí na správné "
-"emulaci mlhy.\n"
-"\n"
-"Pokud si nejste jisti, nechejte toto odškrtnuté."
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350
 msgid "In Game"
 msgstr "Ve Hře"
 
@@ -3034,67 +3097,67 @@ msgstr "Ve Hře"
 msgid "In-Game"
 msgstr "Ve Hře"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:34
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305
 msgid "Info"
 msgstr "Info"
 
-#: Source/Core/Common/Src/MsgHandler.cpp:65
+#: Source/Core/Common/Src/MsgHandler.cpp:51
 msgid "Information"
 msgstr "Informace"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:481
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:468
 msgid "Input"
 msgstr "Vstup"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:63
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:50
 msgid "Insert"
 msgstr "Vložit"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:176
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:166
 msgid "Insert Encrypted or Decrypted code here..."
 msgstr "Zde vložte Zašifrovaný nebo Rozšifrovaný kód..."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:763
 msgid "Insert SD Card"
 msgstr "Vložit SD Kartu"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:34
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:21
 msgid "Insert name here.."
 msgstr "Zde vložte jméno..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:196
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:199
 msgid "Install WAD"
 msgstr "Instalovat WAD"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:895
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:888
 msgid "Install to Wii Menu"
 msgstr "Instalovat do Wii Menu"
 
-#: Source/Core/Core/Src/x64MemTools.cpp:252
+#: Source/Core/Core/Src/x64MemTools.cpp:242
 msgid ""
 "InstallExceptionHandler called, but this platform does not yet support it."
 msgstr ""
 "Byl zavolán InstallExceptionHandler, ale tato platforma toto ještě "
 "nepodporuje."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1297
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
 msgid "Installing WAD..."
 msgstr "Instaluji WAD..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:885
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:901
 msgid "Integrity Check Error"
 msgstr "Chyba v kontrole celistvosti"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:891
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:907
 msgid "Integrity check completed"
 msgstr "Kontrola celistvosti dokončena"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:890
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:906
 msgid "Integrity check completed. No errors have been found."
 msgstr "Kontrola celistvosti dokončena. Nebyly nalezeny žádné chyby."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:882
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:898
 #, c-format
 msgid ""
 "Integrity check for partition %d failed. Your dump is most likely corrupted "
@@ -3103,19 +3166,19 @@ 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:552
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532
 msgid "Interface"
 msgstr "Rozhraní"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:646
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627
 msgid "Interface Settings"
 msgstr "Nastavení Rozhraní"
 
-#: Source/Core/Core/Src/State.cpp:240
+#: Source/Core/Core/Src/State.cpp:228
 msgid "Internal LZO Error - compression failed"
 msgstr "Vnitřní chyba LZO - komprimace selhala"
 
-#: Source/Core/Core/Src/State.cpp:348
+#: Source/Core/Core/Src/State.cpp:336
 #, c-format
 msgid ""
 "Internal LZO Error - decompression failed (%d) (%li, %li) \n"
@@ -3124,41 +3187,45 @@ msgstr ""
 "Vnitřní chyba LZO - dekomprimace selhala (%d) (%ld, %ld) \n"
 "Zkuste znovu nahrát stav"
 
-#: Source/Core/Core/Src/State.cpp:485
+#: Source/Core/Core/Src/State.cpp:473
 msgid "Internal LZO Error - lzo_init() failed"
 msgstr "Vnitřní chyba LZO - lzo_init() selhalo"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:344
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:352
 msgid "Internal Resolution:"
 msgstr "Vnitřní Rozlišení:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:42
+msgid "Interpreter (VERY slow)"
+msgstr "Převaděč (VELMI pomalé)"
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349
 msgid "Intro"
 msgstr "Intro"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:194
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:187
 #, c-format
 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:600
 msgid "Invalid Value!"
 msgstr "Neplatná Hodnota!"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:462
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:449
 msgid "Invalid bat.map or dir entry"
 msgstr "Neplatný bat.map nebo záznam adr."
 
-#: Source/Core/Core/Src/CoreTiming.cpp:548
+#: Source/Core/Core/Src/CoreTiming.cpp:553
 #, c-format
 msgid "Invalid event type %i"
 msgstr "Neplatná událost typu %i"
 
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:326
+#: Source/Core/Core/Src/HW/DVDInterface.cpp:309
 msgid "Invalid file"
 msgstr "Neplatný soubor"
 
-#: Source/Core/DiscIO/Src/BannerLoaderGC.cpp:41
+#: Source/Core/DiscIO/Src/BannerLoaderGC.cpp:28
 #, c-format
 msgid ""
 "Invalid opening.bnr found in gcm:\n"
@@ -3169,46 +3236,54 @@ msgstr ""
 "%s\n"
 "Možná budete muset hru znovu vypsat."
 
-#: Source/Core/Core/Src/Movie.cpp:735
+#: Source/Core/Core/Src/Movie.cpp:726
 msgid "Invalid recording file"
 msgstr "Neplatný soubor s nahrávkou"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:473
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:472
 msgid "Invalid search parameters (no object selected)"
 msgstr "Neplatné parametry hledání (není vybrán žádný objekt)"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:456
+#: 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:444
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:443
 msgid "Invalid search string (only even string lengths supported)"
 msgstr "Neplatný řetězec hledání (jsou podporovány pouze sudé délky řetězce)"
 
-#: Source/Core/Core/Src/Core.cpp:513
+#: Source/Core/Core/Src/Core.cpp:511
 msgid "Invalid state"
 msgstr "Neplatný stav"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:473
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:320
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300
 msgid "Italian"
 msgstr "Italština"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:183
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:177
 msgid "JAPAN"
 msgstr "JAPONSKO"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:321
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:46
+msgid "JIT Recompiler (recommended)"
+msgstr "JIT Rekompilátor (doporučeno)"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:47
+msgid "JITIL experimental recompiler"
+msgstr "JITIL experimentální rekompilátor"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:279
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
 msgid "Japanese"
 msgstr "Japonština"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:188
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:182
 msgid "KOREA"
 msgstr "KOREA"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78
 msgid ""
 "Keep the game window on top of all other windows.\n"
 "\n"
@@ -3218,62 +3293,62 @@ msgstr ""
 "\n"
 "Pokud si nejste jisti, nechejte toto odškrtnuté."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:298
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:306
 msgid "Keep window on top"
 msgstr "Okno vždy navrchu"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:241
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:241
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:229
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:229
 msgid "Key"
 msgstr "Klávesa"
 
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282
 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:322
 msgid "Korean"
 msgstr "Korejština"
 
 #. i18n:  Left
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:57
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:44
 msgid "L"
 msgstr "L"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:39
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:26
 msgid "L Button"
 msgstr "Tlačítko L"
 
 #. i18n:  Left-Analog
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:61
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:48
 msgid "L-Analog"
 msgstr "Levý Analog"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:585
 msgid "Language:"
 msgstr "Jazyk:"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:152
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:153
 msgid "Last Overwritten State"
 msgstr "Poslední Přepsaný Stav"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:159
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:161
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:160
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:162
 msgid "Last Saved State"
 msgstr "Poslední Uložený Stav"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:696
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:677
 msgid "Latency:"
 msgstr "Zpoždění:"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:276
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:55
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:263
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:42
 msgid "Left"
 msgstr "Vlevo"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:60
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:64
 msgid "Left Stick"
 msgstr "Levý Stick"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:257
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:257
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:245
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:245
 msgid ""
 "Left click to detect hotkeys.\n"
 "Enter space to clear."
@@ -3281,7 +3356,7 @@ msgstr ""
 "Levé kliknutí pro detekci zkratky.\n"
 "Zadejte mezerník pro vyčištění."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:689
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:678
 msgid ""
 "Left-click to detect input.\n"
 "Middle-click to clear.\n"
@@ -3291,7 +3366,7 @@ msgstr ""
 "Prostřední kliknutí pro vyčištění.\n"
 "Pravé kliknutí pro více možností."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:694
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:683
 msgid ""
 "Left/Right-click for more options.\n"
 "Middle-click to clear."
@@ -3299,76 +3374,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:206
 msgid "Less Than"
 msgstr "Menší než"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:565
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545
 msgid "Limit by FPS"
 msgstr "Limitovat podle SzS"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:924
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:915
 msgid "Load"
 msgstr "Nahrát"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544
 msgid "Load Custom Textures"
 msgstr "Nahrát Vlastní Textury"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
 msgid "Load State Slot 1"
 msgstr "Nahrát Slot Stavu 1"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189
 msgid "Load State Slot 2"
 msgstr "Nahrát Slot Stavu 2"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:190
 msgid "Load State Slot 3"
 msgstr "Nahrát Slot Stavu 3"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:203
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:191
 msgid "Load State Slot 4"
 msgstr "Nahrát Slot Stavu 4"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192
 msgid "Load State Slot 5"
 msgstr "Nahrát Slot Stavu 5"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193
 msgid "Load State Slot 6"
 msgstr "Nahrát Slot Stavu 6"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:194
 msgid "Load State Slot 7"
 msgstr "Nahrát Slot Stavu 7"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:195
 msgid "Load State Slot 8"
 msgstr "Nahrát Slot Stavu 8"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:155
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:156
 msgid "Load State..."
 msgstr "Nahrát Stav..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1332
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1359
 msgid "Load Wii System Menu"
 msgstr "Nahrát Systémové Menu Wii"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1327
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1354
 #, c-format
 msgid "Load Wii System Menu %d%c"
 msgstr "Nahrát Systémové Menu Wii %d%c"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112
 msgid ""
 "Load custom textures from User/Load/Textures/<game_id>/\n"
 "\n"
@@ -3378,7 +3453,7 @@ msgstr ""
 "\n"
 "Pokud si nejste jisti, nechejte toto odškrtnuté."
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:50
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:37
 msgid "Load preset values from hack patterns available."
 msgstr "Načíst přednastavené hodnoty z dostupných hackových vzorů."
 
@@ -3386,23 +3461,23 @@ msgstr "Načíst přednastavené hodnoty z dostupných hackových vzorů."
 msgid "Local"
 msgstr "Místní"
 
-#: Source/Core/DolphinWX/Src/LogWindow.h:51
+#: Source/Core/DolphinWX/Src/LogWindow.h:38
 msgid "Log"
 msgstr "Záznam"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:26
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:13
 msgid "Log Configuration"
 msgstr "Nastavení Záznamu"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:296
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304
 msgid "Log FPS to file"
 msgstr "Zaznamenat SzS do souboru"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:96
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83
 msgid "Log Types"
 msgstr "Typy Záznamu"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103
 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"
@@ -3414,24 +3489,24 @@ msgstr ""
 "\n"
 ".Pokud si nejste jisti, nechejte toto odškrtnuté."
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:81
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:68
 msgid "Logger Outputs"
 msgstr "Výstup Zapisovače"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132
-#: Source/Core/DolphinWX/Src/Frame.cpp:328
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:119
+#: Source/Core/DolphinWX/Src/Frame.cpp:314
 msgid "Logging"
 msgstr "Protokolování"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:255
+#: Source/Core/Core/Src/NetPlayClient.cpp:259
 msgid "Lost connection to server!"
 msgstr "Připojení k serveru ztraceno!"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:42
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:29
 msgid "M Button"
 msgstr "Tlačítko M"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:119
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:112
 #, c-format
 msgid ""
 "MD5 mismatch\n"
@@ -3440,51 +3515,65 @@ msgstr ""
 "MD5 se neshoduje\n"
 " %016llx%016llx != %016llx%016llx"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314
 msgid "MMU Speed Hack"
 msgstr "MMU Hack Rychlosti"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:527
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:563
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:517
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:556
 msgid "MadCatz Gameshark files(*.gcs)"
 msgstr "Soubory MadCatz Gameshark (*.gcs)"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:51
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:63
+#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:38
 msgid "Main Stick"
 msgstr "Hlavní Stick"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460
 msgid "Maker ID:"
 msgstr "ID Výrobce:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487
 msgid "Maker:"
 msgstr "Výrobce:"
 
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100
+msgid ""
+"Makes distant objects more visible by removing fog, thus increasing the "
+"overall detail.\n"
+"Disabling fog will break some games which rely on proper fog emulation.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+"Odstraněním mlhy budou vzdálenější objekty budou viditelnější.\n"
+"Zakázání může způsobit chyby v některých hrách, které závisejí na správné "
+"emulaci mlhy.\n"
+"\n"
+"Pokud si nejste jisti, nechejte toto odškrtnuté."
+
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:97
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:100
 msgid "Max"
 msgstr "Max"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:448
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:435
 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:291
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:278
 msgid "Memcard already opened"
 msgstr "Pam. karta již otevřena"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:912
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:913
 msgid "Memory Byte"
 msgstr "Bajt Paměti"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:225
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:113
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:212
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:93
 msgid "Memory Card"
 msgstr "Paměťová karta"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.h:36
+#: Source/Core/DolphinWX/Src/MemcardManager.h:23
 msgid ""
 "Memory Card Manager WARNING-Make backups before using, should be fixed but "
 "could mangle stuff!"
@@ -3492,7 +3581,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:371
+#: Source/Core/Core/Src/CoreParameter.cpp:360
 #, c-format
 msgid ""
 "Memory Card filename in Slot %c is incorrect\n"
@@ -3509,15 +3598,15 @@ msgstr ""
 "%s\n"
 "Chtěli byste starý soubor zkopírovat do nového umístění?\n"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:124
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:112
 msgid "Memorycard filesize does not match the header size"
 msgstr "Velikost paměťové karty se neshoduje s velikosti hlavičky"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:50
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:37
 msgid "Menu"
 msgstr "Menu"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:114
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:94
 msgid "Mic"
 msgstr "Mikrofon"
 
@@ -3526,20 +3615,20 @@ msgstr "Mikrofon"
 msgid "Min"
 msgstr "Min"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:580
 msgid "Misc"
 msgstr "Ostatní"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:795
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776
 msgid "Misc Settings"
 msgstr "Ostatní Nastavení"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:240
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:294
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:227
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:281
 msgid "Modifier"
 msgstr "Modifikátor"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106
 msgid ""
 "Modify textures to show the format they're encoded in. Needs an emulation "
 "reset in most cases.\n"
@@ -3551,20 +3640,20 @@ msgstr ""
 "\n"
 "Pokud si nejste jisti, nechejte toto odškrtnuté."
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:115
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:108
 msgid "Monospaced font"
 msgstr "Písmo se stejnou roztečí"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:305
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:292
 msgid "Motion Plus"
 msgstr "Motion Plus"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:309
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:86
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:296
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73
 msgid "Motor"
 msgstr "Motor"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:654
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:666
 msgid ""
 "Move the mouse pointer over an option to display a detailed description.\n"
 "\n"
@@ -3582,226 +3671,237 @@ msgstr ""
 "\n"
 "\n"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:75
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:62
 msgid "Multiply"
 msgstr "Násobit"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:651
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:650
 msgid "NOP"
 msgstr "NOP"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:629
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:628
 msgid "NOTE: Stream size doesn't match actual data length\n"
 msgstr ""
 "POZNÁMKA: Velikost proudu se neshoduje se\n"
 "skutečnou délkou dat\n"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:129
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:116
 msgid "NP Add"
 msgstr "NK Přidat"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:124
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:111
 msgid "NP Begin"
 msgstr "NK Začít"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:132
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:119
 msgid "NP Decimal"
 msgstr "NK Des. čárka"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:126
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:113
 msgid "NP Delete"
 msgstr "NK Delete"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:133
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:120
 msgid "NP Divide"
 msgstr "NK Dělení"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:120
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:107
 msgid "NP Down"
 msgstr "NK Dolů"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:123
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:110
 msgid "NP End"
 msgstr "NK End"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:111
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:98
 msgid "NP Enter"
 msgstr "NK Enter"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:127
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:114
 msgid "NP Equal"
 msgstr "NK Rovná se"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:116
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:103
 msgid "NP Home"
 msgstr "NK Home"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:125
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:112
 msgid "NP Insert"
 msgstr "NK Insert"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:117
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:104
 msgid "NP Left"
 msgstr "NK Vlevo"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:128
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:115
 msgid "NP Multiply"
 msgstr "NK Násobení"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:122
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:109
 msgid "NP Page Down"
 msgstr "NK Page Down"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:121
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:108
 msgid "NP Page Up"
 msgstr "Nk Page Up"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:119
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:106
 msgid "NP Right"
 msgstr "NK Vpravo"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:130
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:117
 msgid "NP Separator"
 msgstr "NP Oddělovač"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:109
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:96
 msgid "NP Space"
 msgstr "NK Mezerník"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:131
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:118
 msgid "NP Subtract"
 msgstr "NK Mínus"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:110
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:97
 msgid "NP Tab"
 msgstr "NK Tab"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:118
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:105
 msgid "NP Up"
 msgstr "NK Nahoru"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:444
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:59
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:50
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:448
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:46
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:37
 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:25
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:72
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:282
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:553
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:15
 msgid "Name: "
 msgstr "Jméno: "
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:526
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:562
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:516
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:555
 msgid "Native GCI files(*.gci)"
 msgstr "Původní soubory CGI(*.gci)"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:161
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:148
 msgid "New Scan"
 msgstr "Nové Skenování"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:206
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:193
 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:801
 msgid "Next Page"
 msgstr "Další Stránka"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:165
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:152
 msgid "Next Scan"
 msgstr "Další Skenování"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:68
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:59
 msgid "Nickname :"
 msgstr "Přezdívka :"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:196
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:190
 msgid "No Country (SDK)"
 msgstr "Žádná Země (SDK)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:370
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:357
 msgid "No ISOs or WADS found"
 msgstr "Nenalezena žádná ISO nebo WADS"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:508
+#: Source/Core/Core/Src/ConfigManager.h:17
+msgid "No audio output"
+msgstr "Žádný zvukový výstup"
+
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:501
 #, c-format
 msgid "No banner file found for title  %s"
 msgstr "Nebyl nalezen žádný plakát s názvem  %s"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:761
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:768
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:760
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:767
 msgid "No description available"
 msgstr "Žádný popis není dostupný"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:514
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:535
 msgid "No docking"
 msgstr "Žádné připínání"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:859
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:860
 msgid "No file loaded"
 msgstr "Není načten žádný soubor"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:439
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:426
 msgid "No free dir index entries"
 msgstr "Žádné volné záznamy indexu adresáře"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:895
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:896
 msgid "No recorded file"
 msgstr "Žádný soubor s nahrávkou"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:501
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:494
 #, c-format
 msgid "No save folder found for title %s"
 msgstr "Nebyl nalezen žádný ukládací adresář pro název %s"
 
+#: Source/Plugins/Plugin_VideoOGL/Src/main.cpp:132
+#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:111
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:23
 #: Source/Core/DolphinWX/Src/NetWindow.cpp:600
 msgid "None"
 msgstr "Žádný"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:323
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303
 msgid "Norwegian Bokmaal"
 msgstr "Norský Bokmål"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:203
 msgid "Not Equal"
 msgstr "Nerovná se"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:804
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:794
 msgid "Not Set"
 msgstr "Nenastaven"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:626
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:101
+#, c-format
+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/Main.cpp:654
 msgid "Not connected"
 msgstr "Nepřipojen"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:309
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:296
 msgid "Notes"
 msgstr "Poznámky"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:16
 msgid "Notes: "
 msgstr "Poznámky:"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:71
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:74
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:580
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:621
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:629
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:59
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:64
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:613
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:659
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:667
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:31
 msgid "Notice"
 msgstr "Upozornění"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:105
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:92
 msgid "Num Lock"
 msgstr "Num Lock"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:88
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:75
 msgid "Number Of Codes: "
 msgstr "Počet Kódů:"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:30
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:34
 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26
 msgid "Nunchuk"
 msgstr "Nunčak"
@@ -3810,111 +3910,112 @@ msgstr "Nunčak"
 msgid "Nunchuk Acceleration"
 msgstr "Zrychlení Nunčaku"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:877
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:878
 msgid "Object"
 msgstr "Objekt"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:135
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:122
 msgid "Object Range"
 msgstr "Rozsah Objektu"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:243
 msgid "Off"
 msgstr "Vypnuto"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:62
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:49
 msgid "Offset:"
 msgstr "Logická Adresa:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:582
 msgid "On-Screen Display Messages"
 msgstr "Zobrazovat zprávy na obrazovce"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:436
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:423
 #, c-format
 msgid "Only %d blocks available"
 msgstr "Pouze bloky %d jsou dostupné"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:420
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:178
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:426
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:166
 msgid "Open"
 msgstr "Otevřít"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:876
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:867
 msgid "Open &containing folder"
 msgstr "Otevřít &adresář umístění"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:873
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:864
 msgid "Open Wii &save folder"
 msgstr "Otevřít Wii adre&sář uložení"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:420
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:426
 msgid "Open file..."
 msgstr "Otevřít soubor..."
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:61
+#: Source/Core/AudioCommon/Src/OpenALStream.cpp:48
 #, 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:72
+#: Source/Core/AudioCommon/Src/OpenALStream.cpp:59
 msgid "OpenAL: can't find sound devices"
 msgstr "OpenAL: nelze nalézt zvuková zařízení"
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:66
+#: Source/Core/AudioCommon/Src/OpenALStream.cpp:53
 #, c-format
 msgid "OpenAL: can't open device %s"
 msgstr "OpenAL: nelze otevřít zařízení %s"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502
 msgid "OpenCL Texture Decoder"
 msgstr "OpenCL Dekodér Textury"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503
 msgid "OpenMP Texture Decoder"
 msgstr "OpenMP Dekodér Textury"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:317
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:94
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:304
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:81
 msgid "Options"
 msgstr "Volby"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:22
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Orange"
 msgstr "Oranžová"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:468
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:455
+#, fuzzy
 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"
+"and import the saves to a new memcard\n"
 msgstr ""
 "Pořadí souborů v Adresáři Souborů se neshoduje s pořadím bloku\n"
 "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:316
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:324
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:509
 msgid "Other"
 msgstr "Jiné"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:206
+#: Source/Core/Core/Src/NetPlayClient.cpp:210
 msgid ""
 "Other client disconnected while game is running!! NetPlay is disabled. You "
 "manually stop the game."
 msgstr ""
 "Jiný klient odpojen při běhu hry!! NetPlay je vypnut. Hru ukončete ručně."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:481
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:468
 msgid "Output"
 msgstr "Výstup"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:342
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:348
 msgid "P&lay Recording..."
 msgstr "S&pustit nahrávku..."
 
-#: Source/Core/Core/Src/HW/GCPad.cpp:30
+#: Source/Core/Core/Src/HW/GCPad.cpp:18
 msgid "Pad"
 msgstr "Pad"
 
@@ -3922,160 +4023,160 @@ msgstr "Pad"
 msgid "Pad "
 msgstr "Pad "
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:34
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:38
 msgid "Pads"
 msgstr "Pady"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:108
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:95
 msgid "Page Down"
 msgstr "Page Down"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:107
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:94
 msgid "Page Up"
 msgstr "Page Up"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:35
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:22
 msgid "Paragraph"
 msgstr "Odstavec"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:64
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:51
 msgid "Parameters"
 msgstr "Parametry"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:222
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:217
 #, c-format
 msgid "Partition %i"
 msgstr "Oddíl %i"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:296
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:297
 msgid "Patches"
 msgstr "Záplaty"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:556
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536
 msgid "Paths"
 msgstr "Cesty"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1538
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1539
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:51
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1565
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1566
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:38
 msgid "Pause"
 msgstr "Pozastavit"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:128
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:129
 msgid "Pause at end of movie"
 msgstr "Pozastavit na konci filmu"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:397
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405
 msgid "Per-Pixel Lighting"
 msgstr "Osvětlení Podle Pixelu"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352
 msgid "Perfect"
 msgstr "Dokonalá"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:609
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:642
 #, c-format
 msgid "Perspective %d"
 msgstr "Perspektiva %d"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:165
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:424
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1547
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1548
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:152
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:430
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1574
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1575
 msgid "Play"
 msgstr "Spustit"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176
 msgid "Play Recording"
 msgstr "Přehrát nahrávku"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:170
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:170
 msgid "Play/Pause"
 msgstr "Přehrát/Pozastavit"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351
 msgid "Playable"
 msgstr "Hratelné"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:154
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:141
 msgid "Playback Options"
 msgstr "Možnosti Přehrávání"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:301
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:304
 msgid "Players"
 msgstr "Hráči"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:988
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:991
 msgid "Please confirm..."
 msgstr "Prosím potvrďte..."
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:579
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:612
 msgid "Please create a perspective before saving"
 msgstr "Před uložením si prosím vytvořte perspektivu"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:36
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:23
 msgid "Plus-Minus"
 msgstr "Plus-Mínus"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:324
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304
 msgid "Polish"
 msgstr "Polština"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:713
 msgid "Port 1"
 msgstr "Port 1"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714
 msgid "Port 2"
 msgstr "Port 2"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:734
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715
 msgid "Port 3"
 msgstr "Port 3"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716
 msgid "Port 4"
 msgstr "Port 4"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:97
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:130
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:88
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:133
 msgid "Port :"
 msgstr "Port :"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:325
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305
 msgid "Portuguese"
 msgstr "Portugalština"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:326
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306
 msgid "Portuguese (Brazilian)"
 msgstr "Portugalština (Brazilská)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:391
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:399
 msgid "Post-Processing Effect:"
 msgstr "Efekt Následného Zpracování:"
 
-#: Source/Core/Core/Src/Movie.cpp:936
+#: Source/Core/Core/Src/Movie.cpp:927
 #, 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:1055
+#: Source/Core/Core/Src/Movie.cpp:1046
 #, 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:1032
+#: Source/Core/Core/Src/Movie.cpp:1023
 #, c-format
 msgid "Premature movie end in PlayWiimote. %u > %u"
 msgstr "Předčasný konec filmu v PlayWiimote. %u > %u"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:48
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:35
 msgid "Presets: "
 msgstr "Předvolby:"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:205
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:192
 msgid "Prev Page"
 msgstr "Před. stránka"
 
@@ -4083,67 +4184,67 @@ msgstr "Před. stránka"
 msgid "Previous Page"
 msgstr "Předchozí Stránka"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:183
 msgid "Previous Value"
 msgstr "Předchozí Hodnota"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:60
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:47
 msgid "Print"
 msgstr "Vytisknout"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:894
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:885
 msgid "Profile"
 msgstr "Profil"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.h:55
+#: Source/Core/DolphinWX/Src/ISOProperties.h:42
 msgid "Properties"
 msgstr "Vlastnosti"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:283
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:286
 msgid "Purge Cache"
 msgstr "Zahodit Vyrovnávací Paměť"
 
-#: Source/Core/Common/Src/MsgHandler.cpp:66
+#: Source/Core/Common/Src/MsgHandler.cpp:52
 msgid "Question"
 msgstr "Otázka"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:159
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:316
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:162
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:319
 msgid "Quit"
 msgstr "Ukončit"
 
 #. i18n:  Right
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:59
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:46
 msgid "R"
 msgstr "R"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:40
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:27
 msgid "R Button"
 msgstr "Tlačítko R"
 
 #. i18n:  Right-Analog
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:63
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
 msgid "R-Analog"
 msgstr "Pravý Analog"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:445
 msgid "RAM"
 msgstr "RAM"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:175
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:169
 msgid "RUSSIA"
 msgstr "RUSKO"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:528
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:515
 msgid "Range"
 msgstr "Rozsah"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:190
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:178
 msgid "Read-only mode"
 msgstr "Režim pouze pro čtení"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:487
 msgid "Real"
 msgstr "Opravdová"
 
@@ -4159,33 +4260,33 @@ msgstr "Opravdové Wiimoty"
 msgid "Reconnect Wiimote on State Loading"
 msgstr "Znovu připojit Wiimote při Nahrání Stavu"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:193
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:217
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:791
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:180
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:204
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:790
 msgid "Record"
 msgstr "Nahrávat"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:174
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:161
 msgid "Recording Info"
 msgstr "Informace o Nahrávání"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:202
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:189
 msgid "Recording Options"
 msgstr "Možnosti Nahrávání"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:21
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Red"
 msgstr "Červená"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:24
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Red Left"
 msgstr "Červená vlevo"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:25
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Red Right"
 msgstr "Červená vpravo"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86
 msgid ""
 "Reduces the amount of aliasing caused by rasterizing 3D graphics.\n"
 "This makes the rendered picture look less blocky.\n"
@@ -4200,28 +4301,28 @@ msgstr ""
 "Pokud si nejste jisti, vyberte Žádný."
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:60
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:421
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:903
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:427
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:894
 msgid "Refresh"
 msgstr "Obnovit"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:180
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:168
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:168
 msgid "Refresh List"
 msgstr "Obnovit Seznam"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:421
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:427
 msgid "Refresh game list"
 msgstr "Obnovit seznam her"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:405
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:427
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:77
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:812
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:409
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:431
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:64
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:793
 msgid "Remove"
 msgstr "Odstranit"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99
 msgid ""
 "Render the scene as a wireframe.\n"
 "\n"
@@ -4231,196 +4332,204 @@ msgstr ""
 "\n"
 "Pokud si nejste jisti, nechejte toto odškrtnuté."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:308
 msgid "Render to Main Window"
 msgstr "Vykreslit do Hlavního okna"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:915
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:172
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:906
 msgid "Reset"
 msgstr "Resetovat"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:190
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:177
 msgid "Results"
 msgstr "Výsledky"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:29
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:16
 msgid "Return"
 msgstr "Enter"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:277
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:57
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464
+msgid "Revision:"
+msgstr ""
+
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:264
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:44
 msgid "Right"
 msgstr "Vpravo"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:61
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:65
 msgid "Right Stick"
 msgstr "Pravý Stick"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:85
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:295
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:72
 msgid "Rumble"
 msgstr "Vibrace"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:518
-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:498
+msgid ""
+"Run DSP HLE and LLE on a dedicated thread (not recommended: might cause "
+"audio glitches with HLE and freezes with LLE)."
+msgstr ""
+"Spustit DSP HLE a LLE na samostatném vlákně (nedoporučeno: může způsobit "
+"problémy se zvukem u HLE a zasekávání u LLE)."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:327
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307
 msgid "Russian"
 msgstr "Ruština"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:149
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:150
 msgid "Sa&ve State"
 msgstr "Uložit Sta&v"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:465
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475
 msgid "Safe"
 msgstr "Bezpečná"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:196
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:446
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:925
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:183
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:452
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916
 msgid "Save"
 msgstr "Uložit"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:532
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:522
 msgid "Save GCI as..."
 msgstr "Uložit GCI jako..."
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
 msgid "Save State Slot 1"
 msgstr "Uložit do Slotu Stavu 1"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:198
 msgid "Save State Slot 2"
 msgstr "Uložit do Slotu Stavu 2"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:199
 msgid "Save State Slot 3"
 msgstr "Uložit do Slotu Stavu 3"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:212
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:212
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200
 msgid "Save State Slot 4"
 msgstr "Uložit do Slotu Stavu 4"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201
 msgid "Save State Slot 5"
 msgstr "Uložit do Slotu Stavu 5"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202
 msgid "Save State Slot 6"
 msgstr "Uložit do Slotu Stavu 6"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:203
 msgid "Save State Slot 7"
 msgstr "Uložit do Slotu Stavu 7"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204
 msgid "Save State Slot 8"
 msgstr "Uložit do Slotu Stavu 8"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:151
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:152
 msgid "Save State..."
 msgstr "Uložit Stav..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:582
 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:592
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:602
 msgid "Save as..."
 msgstr "Uložit jako"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1203
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1204
 msgid "Save compressed GCM/ISO"
 msgstr "Uložit komprimované GCM/ISO"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:446
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:452
 msgid "Save current perspective"
 msgstr "Uložit současnou perspektivu"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1192
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193
 msgid "Save decompressed GCM/ISO"
 msgstr "Uložit dekomprimované GCM/ISO"
 
-#: Source/Core/Core/Src/Movie.cpp:801
+#: Source/Core/Core/Src/Movie.cpp:792
 #, 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:396
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:404
 msgid "Scaled EFB Copy"
 msgstr "EFB Kopie Změněné Velikosti"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:556
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:543
 #, c-format
 msgid "Scanning %s"
 msgstr "Skenuji %s"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:539
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:526
 msgid "Scanning for ISOs"
 msgstr "Skenuji pro ISO"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:540
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:527
 msgid "Scanning..."
 msgstr "Skenuji..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:427
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
 msgid "ScrShot"
 msgstr "SnímkObrz"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:106
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:93
 msgid "Scroll Lock"
 msgstr "Scroll Lock"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:264
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:251
 msgid "Search"
 msgstr "Hledat"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:227
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:214
 msgid "Search Filter"
 msgstr "Hledat Filtr"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:810
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:791
 msgid "Search Subfolders"
 msgstr "Hledat Podadresáře"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:250
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:237
 msgid "Search current Object"
 msgstr "Hledat v současném objektu"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:254
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:241
 msgid "Search for hex Value:"
 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
+#: Source/Core/Common/Src/SysConf.h:90 Source/Core/Common/Src/SysConf.h:113
+#: Source/Core/Common/Src/SysConf.h:133 Source/Core/Common/Src/SysConf.h:154
 #, c-format
 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:490
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:46
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:477
 msgid "Select"
 msgstr "Vybrat"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:677
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1072
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:683
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1087
 msgid "Select The Recording File"
 msgstr "Vyberte Soubor s Nahrávkou"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1285
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1312
 msgid "Select a Wii WAD file to install"
 msgstr "Vyberte soubor Wii WAD k instalování"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:70
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74
 msgid ""
 "Select a hardware adapter to use.\n"
 "\n"
@@ -4430,31 +4539,31 @@ msgstr ""
 "\n"
 "Pokud si nejste jisti, použijte ten první."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:520
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:510
 msgid "Select a save file to import"
 msgstr "Vyberte soubor s uloženou pozicí pro import"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:363
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:366
 msgid "Select floating windows"
 msgstr "Vybrat plovoucí okna"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:582
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:585
 msgid "Select the file to load"
 msgstr "Vyberte soubor k nahrání"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1241
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1268
 msgid "Select the save file"
 msgstr "Vyberte soubor s uloženou hrou"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1388
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1415
 msgid "Select the state to load"
 msgstr "Vyberte stav k nahrání"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1429
 msgid "Select the state to save"
 msgstr "Vyberte stav k uložení"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82
 msgid ""
 "Select what aspect ratio to use when rendering:\n"
 "Auto: Use the native aspect ratio\n"
@@ -4470,15 +4579,15 @@ 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
+#: Source/Core/InputCommon/Src/InputConfig.cpp:48
 msgid "Selected controller profile does not exist"
 msgstr "Vybraný profil ovladače neexistuje"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:116
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:109
 msgid "Selected font"
 msgstr "Vybraný typ písma"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75
 msgid ""
 "Selects the display resolution used in fullscreen mode.\n"
 "This should always be bigger than or equal to the internal resolution. "
@@ -4495,23 +4604,39 @@ msgstr ""
 "Pokud si stále nejste jisti, použijte takové nejvyšší rozlišení, které Vám "
 "funguje."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:69
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:70
 msgid ""
 "Selects what graphics API to use internally.\n"
 "Direct3D 9 usually is the fastest one. OpenGL is more accurate though. "
 "Direct3D 11 is somewhere between the two.\n"
 "Note that the Direct3D backends are only available on Windows.\n"
 "\n"
-"If unsure, use Direct3D 9."
+"If unsure, use Direct3D 11."
 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"
+"Zvolí jaké grafické API bude vnitřně použito.\n"
+"Direct3D 9 je většinou nejrychlejší. OpenGL je ale přesnější. Direct3D 11 je "
+"někde mezi nimi.\n"
 "Nezapomeňte, že podpůrné vrstvy Direct3D jsou dostupné pouze ve Windows.\n"
 "\n"
-"Pokud si nejste jisti, použijte Direct3D 9"
+"Pokud si nejste jisti, použijte Direct3D 11."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:288
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72
+msgid ""
+"Selects what graphics API to use internally.\n"
+"Direct3D 9 usually is the fastest one. OpenGL is more accurate though. "
+"Direct3D 11 is somewhere between the two.\n"
+"Note that the Direct3D backends are only available on Windows.\n"
+"\n"
+"If unsure, use OpenGL."
+msgstr ""
+"Zvolí jaké grafické API bude vnitřně použito.\n"
+"Direct3D 9 je většinou nejrychlejší. OpenGL je ale přesnější. Direct3D 11 je "
+"někde mezi nimi.\n"
+"Nezapomeňte, že podpůrné vrstvy Direct3D jsou dostupné pouze ve Windows.\n"
+"\n"
+"Pokud si nejste jisti, použijte OpenGL."
+
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:291
 msgid "Send"
 msgstr "Poslat"
 
@@ -4519,26 +4644,26 @@ msgstr "Poslat"
 msgid "Sensor Bar Position:"
 msgstr "Umístění Senzorové Tyče:"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:77
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:64
 msgid "Separator"
 msgstr "Oddělovač"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:328
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308
 msgid "Serbian"
 msgstr "Srbština"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:522
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502
 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:488
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:475
 msgid "Set"
 msgstr "Nastavit"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:877
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:868
 msgid "Set as &default ISO"
 msgstr "Nastavit jako &výchozí ISO"
 
@@ -4547,12 +4672,12 @@ msgstr "Nastavit jako &výchozí ISO"
 msgid "Set as default Memcard %c"
 msgstr "Nastavit jako výchozí paměťovou kartu %c"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:460
+#: Source/Core/Core/Src/ActionReplay.cpp:450
 #, 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/ConfigMain.cpp:535
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:515
 msgid ""
 "Sets the latency (in ms).  Higher values may reduce audio crackling. OpenAL "
 "backend only."
@@ -4560,123 +4685,123 @@ msgstr ""
 "Nastavá zpoždění (v ms). Vyšší hodnoty mohou snížit praskání zvuku. Pouze "
 "pro podpůrnou vrstvu OpenAL."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341
 msgid "Settings..."
 msgstr "Nastavení..."
 
-#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:222
+#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:209
 msgid "SetupWiiMem: Cant find setting file"
 msgstr "SetupWiiMem: Nelze najít soubor s nastavením"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:291
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:278
 msgid "Shake"
 msgstr "Třes"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
 msgid "Short Name:"
 msgstr "Krátké Jméno:"
 
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:103
+#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:90
 msgid "Shoulder Buttons"
 msgstr "Zadní Tlačítka"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:217
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:220
 msgid "Show &Console"
 msgstr "Zobrazit &Konzoli"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:215
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:218
 msgid "Show &Log"
 msgstr "Zobrazit Záznam"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:212
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:215
 msgid "Show &Statusbar"
 msgstr "Zobrazit &Stavový řádek"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:210
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:213
 msgid "Show &Toolbar"
 msgstr "Zobrazit Panel Nás&trojů"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:281
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:284
 msgid "Show Drives"
 msgstr "Zobrazit Disky"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:517
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530
 msgid "Show EFB Copy Regions"
 msgstr "Zobrazit EFB Regiony Kopie"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:295
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303
 msgid "Show FPS"
 msgstr "Zobrazit Snímky za Sekundu"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:271
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:274
 msgid "Show France"
 msgstr "Zobrazit Francii"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:257
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:260
 msgid "Show GameCube"
 msgstr "Zobrazit GameCube"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561
 msgid "Show Input Display"
 msgstr "Zobrazit Obrazovku Vstupu"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:273
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:276
 msgid "Show Italy"
 msgstr "Zobrazit Itálii"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:264
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:267
 msgid "Show JAP"
 msgstr "Zobrazit JAP"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:275
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:278
 msgid "Show Korea"
 msgstr "Zobrazit Koreu"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476
 msgid "Show Language:"
 msgstr "Jazyk Zobrazení:"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:216
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:219
 msgid "Show Log &Configuration"
 msgstr "Zobrazit Nastavení &Záznamu"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:266
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:269
 msgid "Show PAL"
 msgstr "Zobrazit PAL"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:254
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:257
 msgid "Show Platforms"
 msgstr "Zobrazit Platformy"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:263
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:266
 msgid "Show Regions"
 msgstr "Zobrazit Regiony"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:518
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531
 msgid "Show Statistics"
 msgstr "Zobrazit Statistiky"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:277
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:280
 msgid "Show Taiwan"
 msgstr "Zobrazit Tchaj-wan"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:268
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:271
 msgid "Show USA"
 msgstr "Zobrazit USA"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:259
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:262
 msgid "Show Wad"
 msgstr "Zobrazit Wad"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:255
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:258
 msgid "Show Wii"
 msgstr "Zobrazit Wii"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491
 msgid "Show a confirmation box before stopping a game."
 msgstr "Zobrazí rámeček s potvrzením před zastavením hry."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:512
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492
 msgid ""
 "Show a message box when a potentially serious error has occurred.\n"
 "Disabling this may avoid annoying and non-fatal messages, but it may also "
@@ -4690,11 +4815,11 @@ msgstr ""
 msgid "Show first block"
 msgstr "Zobrazit první blok"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:130
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:131
 msgid "Show lag counter"
 msgstr "Zobrazit počítadlo zpoždění"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493
 msgid ""
 "Show messages on the emulation screen area.\n"
 "These messages include memory card writes, video backend and CPU "
@@ -4720,7 +4845,7 @@ msgstr "Zobrazit ikonu uložení"
 msgid "Show save title"
 msgstr "Zobrazit název uložení"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102
 msgid ""
 "Show the number of frames rendered per second as a measure of emulation "
 "speed.\n"
@@ -4732,11 +4857,11 @@ msgstr ""
 "\n"
 "Pokud si nejste jisti, nechejte toto odškrtnuté."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:279
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:282
 msgid "Show unknown"
 msgstr "Zobrazit neznámé"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105
 msgid ""
 "Show various statistics.\n"
 "\n"
@@ -4746,47 +4871,31 @@ msgstr ""
 "\n"
 "Pokud si nejste jisti, nechejte toto odškrtnuté."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:319
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:306
 msgid "Sideways Wiimote"
 msgstr "Šikmý Wiimote"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:280
 msgid "Simplified Chinese"
 msgstr "Zjednodušená čínština"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:311
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:298
 msgid "Size"
 msgstr "Velikost"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:696
 msgid "Skip BIOS"
 msgstr "Přeskočit BIOS"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316
 msgid "Skip DCBZ clearing"
 msgstr "Přeskočit čištění DCBZ"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:492
-msgid "Skip Dest. Alpha Pass"
-msgstr "Vypnout Průchod Cíl. Průhl."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:444
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:454
 msgid "Skip EFB Access from CPU"
 msgstr "Přeskočit EFB Přístup z Procesoru"
 
-#: 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 ""
-"Přeskočit průchod cílové průhlednosti používaný ve většině her pro různé "
-"grafické efekty.\n"
-"\n"
-"Pokud si nejste jisti, nechejte toto odškrtnuté."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125
 msgid ""
 "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n"
 "Sometimes also increases visual quality.\n"
@@ -4802,25 +4911,25 @@ msgstr ""
 "\n"
 "Pokud si nejste jisti, nechejte toto odškrtnuté."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:374
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:386
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:380
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:392
 #, c-format
 msgid "Slot %i"
 msgstr "Slot %i"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:700
 msgid "Slot A"
 msgstr "Slot A"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:701
 msgid "Slot B"
 msgstr "Slot B"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:62
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:49
 msgid "Snapshot"
 msgstr "Snímek"
 
-#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:58
+#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:46
 msgid "Software Renderer"
 msgstr "Softwarový Vykreslovač"
 
@@ -4837,27 +4946,27 @@ msgstr ""
 "Opravdu chcete zapnout softwarové vykreslování? Pokud si nejste jisti, "
 "zvolte 'Ne'."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:683
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:664
 msgid "Sound Settings"
 msgstr "Nastavení Zvuku"
 
-#: Source/Core/AudioCommon/Src/AudioCommon.cpp:77
+#: Source/Core/AudioCommon/Src/AudioCommon.cpp:64
 #, c-format
 msgid "Sound backend %s is not valid."
 msgstr "Podpůrná vrstva zvuku %s je neplatná."
 
-#: Source/Core/AudioCommon/Src/DSoundStream.cpp:59
+#: Source/Core/AudioCommon/Src/DSoundStream.cpp:46
 #, c-format
 msgid "Sound buffer creation failed: %s"
 msgstr "Vytvoření vyrovnávací paměti zvuku selhalo: %s"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:31
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:18
 msgid "Space"
 msgstr "Mezerník"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:329
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309
 msgid "Spanish"
 msgstr "Španělština"
 
@@ -4865,7 +4974,7 @@ msgstr "Španělština"
 msgid "Speaker Volume:"
 msgstr "Hlasitost Reproduktoru:"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92
 msgid ""
 "Specifies the resolution used to render at. A high resolution will improve "
 "visual quality a lot but is also quite heavy on performance and might cause "
@@ -4885,63 +4994,63 @@ msgstr ""
 "\n"
 "Pokud si nejste jisti, zvolte 640x528."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322
 msgid "Speed up Disc Transfer Rate"
 msgstr "Zvýšit rychlost přenosu Disku"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:243
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:230
 msgid "Square Stick"
 msgstr "Čtvercový Stick"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:107
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87
 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:322
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:37
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:25
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:325
 msgid "Start"
 msgstr "Start"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:194
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:197
 msgid "Start &NetPlay"
 msgstr "Spustit &NetPlay"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:339
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:345
 msgid "Start Re&cording"
 msgstr "Začít na&hrávat"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:175
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:175
 msgid "Start Recording"
 msgstr "Začít Nahrávat"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:312
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:299
 msgid "State"
 msgstr "Stav"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:173
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:161
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:161
 msgid "State Saves"
 msgstr "Ukládání stavu"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:108
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88
 msgid "Steering Wheel"
 msgstr "Volant"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:53
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:57
 msgid "Stick"
 msgstr "Stick"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:420
-#: 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:325
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:419
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:431
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:171
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:171
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:328
 msgid "Stop"
 msgstr "Zastavit"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96
 msgid ""
 "Store EFB copies in GPU texture objects.\n"
 "This is not so accurate, but it works well enough for most games and gives a "
@@ -4955,107 +5064,119 @@ msgstr ""
 "\n"
 "Pokud si nejste jisti, nechejte toto odškrtnuté."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:275
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283
 msgid "Stretch to Window"
 msgstr "Roztáhnout do Okna"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:43
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:47
 msgid "Strum"
 msgstr "Brnkat"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:78
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:65
 msgid "Subtract"
 msgstr "Odečíst"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:77
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:67
 #, c-format
 msgid "Successfully exported file to %s"
 msgstr "Soubor úspěšně exportován do %s"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:56
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:43
 msgid "Successfully imported save files"
 msgstr "Uložení byly úspěšně importovány"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:285
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:272
 msgid "Swing"
 msgstr "Švihnutí"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:744
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:792
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320
+msgid "Synchronize GPU thread"
+msgstr "Synchronizovat vlákno GPU"
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321
+msgid ""
+"Synchronizes the GPU and CPU threads to help prevent random freezes in Dual "
+"Core mode. (ON = Compatible, OFF = Fast)"
+msgstr ""
+"Synchronizuje vlákna GPU a CPU, aby se zabránilo náhodným zasekáváním v "
+"režimu dvojitého jádra. (ZAPNUTO = Kompatibilní, VYPNUTO = Rychlé)"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773
 msgid "System Language:"
 msgstr "Jazyk Systému:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:191
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:185
 msgid "TAIWAN"
 msgstr "TCHAJ-WAN"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:127
-#: Source/Core/DolphinWX/Src/TASInputDlg.h:32
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:128
+#: Source/Core/DolphinWX/Src/TASInputDlg.h:19
 msgid "TAS Input"
 msgstr "TAS Vstup"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:28
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:15
 msgid "Tab"
 msgstr "Tab"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:510
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:531
 msgid "Tab split"
 msgstr "Rozdělit okno"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:37
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:41
 msgid "Table Left"
 msgstr "Deska vlevo"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:38
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:42
 msgid "Table Right"
 msgstr "Deska vpravo"
 
-#: 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
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:361
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:181
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:181
 msgid "Take Screenshot"
 msgstr "Vytvořit Snímek Obrazovky"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:109
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89
 msgid "TaruKonga (Bongos)"
 msgstr "TaruKonga (Bonga)"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:472
 msgid "Test"
 msgstr "Test"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:444
 msgid "Texture"
 msgstr "Textura"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:451
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:461
 msgid "Texture Cache"
 msgstr "Vyrovnávací Paměť Textur"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:519
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:532
 msgid "Texture Format Overlay"
 msgstr "Překryv Formátu Textury"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:226
+#: Source/Core/Core/Src/CoreParameter.cpp:215
 msgid "The WAD has been installed successfully"
 msgstr "WAD byl úspěšně nainstalován"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:197
+#: Source/Core/Core/Src/ActionReplay.cpp:185
 msgid "The address is invalid"
 msgstr "Adresa je neplatná"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:509
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:496
 msgid "The checksum was successfully fixed"
 msgstr "Kontrolní součet byl úspěšně opraven"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1242
+#: 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:1117
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1216
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1118
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1146
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1217
 #, c-format
 msgid ""
 "The file %s already exists.\n"
@@ -5064,7 +5185,7 @@ msgstr ""
 "Soubor %s už existuje.\n"
 "Chcete ho nahradit?"
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:51
+#: Source/Core/AudioCommon/Src/WaveFile.cpp:38
 #, c-format
 msgid ""
 "The file %s could not be opened for writing. Please check if it's already "
@@ -5073,29 +5194,29 @@ msgstr ""
 "Soubor %s nemohl být otevřen pro zápis. Zkontrolujte, prosím, je-li už "
 "otevřen jiným programem."
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:44
+#: Source/Core/AudioCommon/Src/WaveFile.cpp:31
 #, c-format
 msgid "The file %s was already open, the file header will not be written."
 msgstr "Soubor %s je už otevřen, hlavička souboru nebude zapsána."
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:332
+#: Source/Core/Core/Src/Boot/Boot.cpp:320
 #, c-format
 msgid "The file you specified (%s) does not exist"
 msgstr "Zadaný soubor (%s) neexistuje"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:628
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:666
 msgid "The name can not be empty"
 msgstr "Jméno nemůže být prázdné"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:620
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:658
 msgid "The name can not contain the character ','"
 msgstr "Jméno nemůže obsahovat znak ','"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:142
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:129
 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:93
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98
 msgid ""
 "The safer you adjust this, the less likely the emulator will be missing any "
 "texture updates from RAM.\n"
@@ -5107,11 +5228,11 @@ msgstr ""
 "\n"
 "Pokud si nejste jisti, použijte hodnotu zcela vpravo."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:445
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:432
 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:388
+#: Source/Core/DolphinWX/Src/Main.cpp:416
 msgid ""
 "The selected language is not supported by your system. Falling back to "
 "system default."
@@ -5119,36 +5240,36 @@ msgstr ""
 "Zvolený jazyk není Vašim systémem podporován. Vracím se na výchozí jazyk "
 "systému."
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:43
+#: Source/Core/Core/Src/NetPlayClient.cpp:47
 msgid "The server and client's NetPlay versions are incompatible!"
 msgstr "Verze serveru a Netplay klienta jsou nekompatibilní!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:40
+#: Source/Core/Core/Src/NetPlayClient.cpp:44
 msgid "The server is full!"
 msgstr "Server je plný!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:46
+#: Source/Core/Core/Src/NetPlayClient.cpp:50
 msgid "The server responded: the game is currently running!"
 msgstr "Server odpověděl: hra v současnosti běží!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:49
+#: Source/Core/Core/Src/NetPlayClient.cpp:53
 msgid "The server sent an unknown error message!"
 msgstr "Server zaslal neznámou chybovou zprávu!"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:119
+#: Source/Core/Core/Src/CoreParameter.cpp:108
 #, c-format
 msgid "The specified file \"%s\" does not exist"
 msgstr "Zadaný soubor \"%s\" neexistuje"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:198
+#: Source/Core/Core/Src/ActionReplay.cpp:186
 msgid "The value is invalid"
 msgstr "Hodnota je neplatná"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:642
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:623
 msgid "Theme:"
 msgstr "Vzhled:"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:476
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:463
 msgid ""
 "There must be a ticket for 00000001/00000002. Your NAND dump is probably "
 "incomplete."
@@ -5156,7 +5277,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:307
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308
 msgid ""
 "These settings override core Dolphin settings.\n"
 "Undetermined means the game uses Dolphin's setting."
@@ -5164,7 +5285,7 @@ msgstr ""
 "Tato nastavení potlačí hlavní nastavení Dolphinu.\n"
 "Neurčený znamená, že hra použije nastavení Dolphin."
 
-#: Source/Core/Core/Src/ActionReplay.cpp:355
+#: Source/Core/Core/Src/ActionReplay.cpp:345
 msgid ""
 "This action replay simulator does not support codes that modify Action "
 "Replay itself."
@@ -5172,11 +5293,11 @@ msgstr ""
 "Tento simulátor action replay nepodporuje kód, který mění samotný Action "
 "Replay."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505
 msgid "This could cause slow down in Wii Menu and some games."
 msgstr "Toto může způsobit zpomalení ve Wii Menu a v některých hrách."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118
 msgid ""
 "This feature allows you to change the game's camera.\n"
 "Move the mouse while holding the right mouse button to pan and while holding "
@@ -5196,7 +5317,19 @@ msgstr ""
 "\n"
 "Pokud si nejste jisti, nechejte toto odškrtnuté."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485
+#, fuzzy
+msgid ""
+"This limits the game speed to the specified number of frames per second "
+"(full speed is 60 for NTSC and 50 for PAL). Alternatively, 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 (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/ConfigMain.cpp:484
 msgid ""
 "This splits the Video and CPU threads, so they can be run on separate "
 "cores.\n"
@@ -5207,61 +5340,61 @@ 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:286
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:287
 msgid "This will let you Manually Edit the INI config file"
 msgstr "Tohle Vám umožní Ručně Upravovat konfigurační soubory INI"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:249
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:254
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:236
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:241
 msgid "Threshold"
 msgstr "Práh"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:288
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:275
 msgid "Tilt"
 msgstr "Naklánění"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:628
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:304
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:622
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:291
 msgid "Title"
 msgstr "Název"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:125
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:144
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:112
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:131
 msgid "To"
 msgstr "Do"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:72
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59
 msgid "Toggle All Log Types"
 msgstr "Zapnout Všechny Typy Záznamů"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:426
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:432
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:180
 msgid "Toggle Fullscreen"
 msgstr "Přepnout na Celou Obrazovku"
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:87
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:271
 msgid "Top"
 msgstr "Nahoře"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:281
 msgid "Traditional Chinese"
 msgstr "Tradiční Čínština"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:426
+#: Source/Core/Core/Src/Boot/Boot.cpp:414
 msgid "Tried to load an unknown file type."
 msgstr "Pokus o načtení souboru neznámého typu."
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:80
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:67
 msgid "Triggers"
 msgstr "Spínače"
 
-#: Source/Core/Common/Src/SysConf.h:91 Source/Core/Common/Src/SysConf.h:114
+#: Source/Core/Common/Src/SysConf.h:78 Source/Core/Common/Src/SysConf.h:101
 msgid "Trying to read from invalid SYSCONF"
 msgstr "Pokus o čtení z neplatného SYSCONF"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:44
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:31
 msgid ""
 "Trying to read from invalid SYSCONF\n"
 "Wiimote bt ids are not available"
@@ -5269,15 +5402,15 @@ msgstr ""
 "Pokus o čtení z neplatného SYSCONF\n"
 "ID bt wiimote nejsou dostupné"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:330
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
 msgid "Turkish"
 msgstr "Turečtina"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:33
 msgid "Turntable"
 msgstr "Točna"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:71
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58
 msgid "Type"
 msgstr "Typ"
 
@@ -5285,25 +5418,25 @@ msgstr "Typ"
 msgid "UDP Port:"
 msgstr "UDP Port:"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:279
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:266
 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12
 msgid "UDP Wiimote"
 msgstr "UDP Wiimote"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:199
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:193
 msgid "UNKNOWN"
 msgstr "NEZNÁMÝ"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:756
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:755
 #, c-format
 msgid "UNKNOWN_%02X"
 msgstr "NEZNÁMÉ_%02X"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:178
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:172
 msgid "USA"
 msgstr "USA"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:225
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:214
 msgid ""
 "Unable to create patch from given values.\n"
 "Entry not modified."
@@ -5311,7 +5444,7 @@ msgstr ""
 "Ze zadaných hodnot nelze vytvořit záplatu.\n"
 "Záznam není změněn."
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:124
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:111
 #, c-format
 msgid ""
 "Unable to parse line %lu of the entered AR code as a valid encrypted or "
@@ -5322,74 +5455,93 @@ 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:391
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:397
 #, c-format
 msgid "Undefined %i"
 msgstr "Nedefinován %i"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:163
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:164
 msgid "Undo Load State"
 msgstr "Vrátit zpět Nahrání Stavu"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:718
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:717
 msgid "Unexpected 0x80 call? Aborting..."
 msgstr "Neočekávané volání 0x80? Ukončování..."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:215
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:202
 msgid "Unknown"
 msgstr "Neznámé"
 
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:971
+#: Source/Core/Core/Src/HW/DVDInterface.cpp:965
 #, c-format
 msgid "Unknown DVD command %08x - fatal error"
 msgstr "Neznámý příkaz DVD %08x - závažná chyba"
 
-#: Source/Core/Common/Src/SysConf.cpp:145
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:444
+#, c-format
+msgid "Unknown command 0x%08x"
+msgstr "Neznámý příkaz 0x%08x"
+
+#: Source/Core/Common/Src/SysConf.cpp:132
 #, c-format
 msgid "Unknown entry type %i in SYSCONF (%s@%x)!"
 msgstr "Neznámý záznam typu %i v SYSCONF (%s@%x)!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:228
+#: Source/Core/Core/Src/NetPlayClient.cpp:232
 #, c-format
 msgid "Unknown message received with id : %d"
 msgstr "Přijata neznámá zpráva s id : %d"
 
-#: Source/Core/Core/Src/NetPlayServer.cpp:504
+#: Source/Core/Core/Src/NetPlayServer.cpp:508
 #, c-format
 msgid "Unknown message with id:%d received from player:%d Kicking player!"
 msgstr "Neznámá zpráva s id:%d přijata od hráče:%d Vyhazuji hráče!"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:274
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:56
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:261
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:43
 msgid "Up"
 msgstr "Nahoru"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:108
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:95
 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17
 msgid "Update"
 msgstr "Aktualizovat"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:320
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:307
 msgid "Upright Wiimote"
 msgstr "Svislý Wiimote"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:777
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758
 msgid "Use EuRGB60 Mode (PAL60)"
 msgstr "Použít režim EuRGB60 (PAL60)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:294
 msgid "Use Fullscreen"
 msgstr "Použít Celou Obrazovku"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:575
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:563
 msgid "Use Hex"
 msgstr "Použít Šestnáctkovou soustavu"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:600
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580
 msgid "Use Panic Handlers"
 msgstr "Použít Obslužné Rutiny Paniky"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89
+msgid ""
+"Use a hacked upload strategy to stream vertices.\n"
+"This usually speed up, but is forbidden by OpenGL specification and may "
+"causes heavy glitches.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+"Použít pozměněnou strategii nahrávání pro proudový přenos vertexů.\n"
+"Většinou umožňuje zrychlení, ale specifikace OpenGL ji zakazuje a může "
+"způsobit vážné chyby.\n"
+"\n"
+"Pokud si nejste jisti, nechejte odškrtnuté."
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122
 msgid ""
 "Use multiple threads to decode textures.\n"
 "Might result in a speedup (especially on CPUs with more than two cores).\n"
@@ -5402,7 +5554,7 @@ msgstr ""
 "\n"
 "Pokud si nejste jisti, nechejte toto odškrtnuté."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126
 msgid ""
 "Usually if shader compilation fails, an error message is displayed.\n"
 "However, one may skip the popups to allow interruption free gameplay by "
@@ -5416,53 +5568,58 @@ msgstr ""
 "\n"
 "Pokud si nejste jisti, nechejte toto odškrtnuté."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:539
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:552
 msgid "Utility"
 msgstr "Pomůcky"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:285
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:293
 msgid "V-Sync"
 msgstr "V-Synch"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:209
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318
+#, fuzzy
+msgid "VBeam Speed Hack"
+msgstr "MMU Hack Rychlosti"
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196
 msgid "Value"
 msgstr "Hodnota"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:73
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:60
 msgid "Value:"
 msgstr "Hodnota:"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:572
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:560
 msgid "Value: "
 msgstr "Hodnota:"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:51
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:38
 msgid "Verbosity"
 msgstr "Úroveň"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:377
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:381
 msgid "Video"
 msgstr "Obraz"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:486
 msgid "Virtual"
 msgstr "Virtuální"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:689
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670
 msgid "Volume"
 msgstr "Hlasitost"
 
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:498
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:527
+#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:488
+#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:517
 #, c-format
 msgid "WAD installation failed: error creating %s"
 msgstr "Instalace WAD selhala: chyba při vytváření %s"
 
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:547
+#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:537
 msgid "WAD installation failed: error creating ticket"
 msgstr "Instalace WAD selhala: chyba při vytváření lístku"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84
 msgid ""
 "Wait for vertical blanks in order to reduce tearing.\n"
 "Decreases performance if emulation speed is below 100%.\n"
@@ -5474,25 +5631,25 @@ msgstr ""
 "\n"
 "Pokud si nejste jisti, nechejte toto odškrtnuté."
 
-#: Source/Core/Common/Src/MsgHandler.cpp:67
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46
+#: Source/Core/Common/Src/MsgHandler.cpp:53
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:33
 #: Source/Core/DolphinWX/Src/VideoConfigDiag.h:85
 msgid "Warning"
 msgstr "Varování"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:291
+#: Source/Core/Core/Src/Boot/Boot.cpp:279
 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:341
+#: Source/Core/Core/Src/Boot/Boot.cpp:329
 msgid "Warning - starting ELF in wrong console mode!"
 msgstr "Varování - ELF se spouští ve špatném režimu konzole!"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:221
+#: Source/Core/Core/Src/Boot/Boot.cpp:209
 msgid "Warning - starting ISO in wrong console mode!"
 msgstr "Varování - ISO se spouští ve špatném režimu konzole!"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:519
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:512
 #, c-format
 msgid ""
 "Warning! it is advised to backup all files in the folder:\n"
@@ -5503,7 +5660,7 @@ msgstr ""
 "%s\n"
 "Přejete si pokračovat?"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:585
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:578
 #, c-format
 msgid ""
 "Warning: This will overwrite any existing saves that are in the folder:\n"
@@ -5516,7 +5673,7 @@ msgstr ""
 "a mají stejný název jako soubor na Vaši paměťové kartě\n"
 "Pokračovat?"
 
-#: Source/Core/Core/Src/Movie.cpp:844
+#: Source/Core/Core/Src/Movie.cpp:835
 #, c-format
 msgid ""
 "Warning: You loaded a save that's after the end of the current movie. (byte "
@@ -5528,7 +5685,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:861
+#: Source/Core/Core/Src/Movie.cpp:852
 #, c-format
 msgid ""
 "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You "
@@ -5540,7 +5697,7 @@ msgstr ""
 "načíst bez zapnutého režimu pouze pro čtení. Jinak pravděpodobně dojde k "
 "desynchronizaci."
 
-#: Source/Core/Core/Src/Movie.cpp:870
+#: Source/Core/Core/Src/Movie.cpp:861
 #, c-format
 msgid ""
 "Warning: You loaded a save whose movie mismatches on frame %d. You should "
@@ -5573,49 +5730,49 @@ msgstr ""
 "Start=%d, A=%d, B=%d, X=%d, Y=%d, Z=%d, DUp=%d, DDown=%d, DLeft=%d, DRight="
 "%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d"
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:106
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:129
+#: Source/Core/AudioCommon/Src/WaveFile.cpp:93
+#: Source/Core/AudioCommon/Src/WaveFile.cpp:116
 msgid "WaveFileWriter - file not open."
 msgstr "WaveFileWriter - soubor není otevřen."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:56
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:60
 msgid "Whammy"
 msgstr "Whammy"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:404
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:408
 msgid "Widescreen Hack"
 msgstr "Hack Širokoúhlého obrazu"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:312
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:299
 msgid "Width"
 msgstr "Šířka"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535
 msgid "Wii"
 msgstr "Wii"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:372
 msgid "Wii Console"
 msgstr "Konzole Wii"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:844
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:825
 msgid "Wii NAND Root:"
 msgstr "Wii Kořen NAND:"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:191
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:194
 msgid "Wii Save Import"
 msgstr "Import uložených pozic Wii"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1243
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1270
 msgid "Wii save files (*.bin)|*.bin"
 msgstr "Wii soubory s uložením (*.bin)|*.bin"
 
-#: Source/Core/DiscIO/Src/WiiWad.cpp:82
+#: Source/Core/DiscIO/Src/WiiWad.cpp:69
 msgid "WiiWAD: Could not read from file"
 msgstr "WiiWAD Nelze číst ze souboru"
 
-#: Source/Core/Core/Src/HW/Wiimote.cpp:17
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
+#: Source/Core/Core/Src/HW/Wiimote.cpp:20
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
 msgid "Wiimote"
 msgstr "Wiimote"
 
@@ -5624,7 +5781,7 @@ msgstr "Wiimote"
 msgid "Wiimote %i"
 msgstr "Wiimote %i"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:628
+#: Source/Core/DolphinWX/Src/Main.cpp:656
 msgid "Wiimote Connected"
 msgstr "Wiimote Připojen"
 
@@ -5632,7 +5789,7 @@ msgstr "Wiimote Připojen"
 msgid "Wiimote Motor"
 msgstr "Wiimote Motor"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
 msgid "Wiimote settings"
 msgstr "Wiimote nastavení"
 
@@ -5640,103 +5797,127 @@ msgstr "Wiimote nastavení"
 msgid "Wiimotes"
 msgstr "Wiimoty"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:134
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:121
 msgid "Windows Left"
 msgstr "Klávesa Windows Vlevo"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:136
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:123
 msgid "Windows Menu"
 msgstr "Klávesa Windows Menu"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:135
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:122
 msgid "Windows Right"
 msgstr "Klávesa Windows Vpravo"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:131
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:124
 msgid "Word Wrap"
 msgstr "Zalamování textu"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1298
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:864
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1089
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1225
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1325
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:880
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1090
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1226
 msgid "Working..."
 msgstr "Pracuji..."
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:338
+msgid "Write memcards (GC)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46
 msgid "Write to Console"
 msgstr "Zapsat do Konzole"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:67
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:54
 msgid "Write to Debugger"
 msgstr "Zapsat do Ladiče"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:57
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44
 msgid "Write to File"
 msgstr "Zapsat do Souboru"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:61
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48
 msgid "Write to Window"
 msgstr "Zapsat do Okna"
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:60
+#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:47
 #, c-format
 msgid "XAudio2 CreateSourceVoice failed: %#X"
 msgstr "XAudio2 CreateSourceVoice selhalo: %#X"
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:114
+#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:101
 #, c-format
 msgid "XAudio2 init failed: %#X"
 msgstr "XAudio2 spuštění selhalo: %#X"
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:124
+#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:111
 #, c-format
 msgid "XAudio2 master voice creation failed: %#X"
 msgstr "XAudio2 vytvoření hlavního hlasu selhalo: %#X"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:766
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:765
 msgid "XF reg"
 msgstr "XF reg"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:21
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Yellow"
 msgstr "Žlutá"
 
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:107
+#: Source/Core/Core/Src/DSP/DSPCore.cpp:120
 msgid ""
-"You are using free dsp roms made by Dolphin Team.\n"
-"Only Zelda ucode games will work correctly with them.\n"
+"You are using a free DSP ROM made by the Dolphin Team.\n"
+"All Wii games will work correctly, and most GC games should also work fine, "
+"but the GBA/IPL/CARD UCodes will not work.\n"
 msgstr ""
-"Používáte volné romy dsp vytvořené Týmem Doplhin.\n"
-"Správně s nimi bude fungovat pouze Zelda ucode.\n"
+"Používáte volný ROM DSP, který vytvořil Tým Dolphin.\n"
+"Všechny hri Wii budou správně pracovat a většina her na GC by také měla "
+"fungovat dobře, ale UKódy GBA/IPL/CARD nebudou fungovat.\n"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:73
+#: Source/Core/Core/Src/DSP/DSPCore.cpp:116
+msgid ""
+"You are using an old free DSP ROM made by the Dolphin Team.\n"
+"Only games using the Zelda UCode will work correctly.\n"
+msgstr ""
+"Používáte starý volný ROM DSP, který vytvořil Tým Doplhin.\n"
+"Správně pracovat budou pouze hry používající Zelda UCode.\n"
+
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:63
 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:207
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:210
 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:593
 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:438
 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:603
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:591
 msgid "You must enter a valid profile name."
 msgstr "Musíte zadat platné jméno profilu."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:936
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:917
 msgid "You must restart Dolphin in order for the change to take effect."
 msgstr "Pro uplatnění změn musíte Dolphin restartovat."
 
-#: Source/Core/Core/Src/CoreParameter.cpp:175
+#: Source/Core/Core/Src/DSP/DSPCore.cpp:109
+msgid ""
+"Your DSP ROMs have incorrect hashes.\n"
+"Would you like to stop now to fix the problem?\n"
+"If you select \"No\", audio might be garbled."
+msgstr ""
+"Váš ROM DSP má nesprávné haše.\n"
+"Chtěli byste nyní přestat a problém opravit?\n"
+"Pokud zvolíte \"Ne\", mlže být zvuk poškozený."
+
+#: Source/Core/Core/Src/CoreParameter.cpp:164
 msgid ""
 "Your GCM/ISO file seems to be invalid (invalid country).\n"
 "Continue with PAL region?"
@@ -5744,7 +5925,7 @@ msgstr ""
 "Váš GCM/ISO soubor se zdá být neplatný (neplatná země).\n"
 "Pokračovat s regionem PAL?"
 
-#: Source/Core/Common/Src/SysConf.cpp:58
+#: Source/Core/Common/Src/SysConf.cpp:45
 #, c-format
 msgid ""
 "Your SYSCONF file is the wrong size.\n"
@@ -5755,25 +5936,25 @@ msgstr ""
 "Měl by být 0x%04x (ale je 0x%04llx)\n"
 "Chcete vytvořit nový?"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:334
 msgid "ZTP hack"
 msgstr "ZTP hack"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:387
+#: Source/Core/Core/Src/ActionReplay.cpp:377
 msgid "Zero 3 code not supported"
 msgstr "Kód Zero 3 není podporován"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:408
+#: Source/Core/Core/Src/ActionReplay.cpp:398
 #, c-format
 msgid "Zero code unknown to dolphin: %08x"
 msgstr "Nulový kód, který dolphin nezná: %08x"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:436
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:460
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:423
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:447
 msgid "[ waiting ]"
 msgstr "[ čekám ]"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107
 msgid ""
 "[BROKEN]\n"
 "Highlight regions the EFB was copied from.\n"
@@ -5785,11 +5966,11 @@ msgstr ""
 "\n"
 "Pokud si nejste jisti, nechejte toto odškrtnuté."
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:91
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:78
 msgid "[Custom]"
 msgstr "[Vlastní]"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120
 msgid ""
 "[EXPERIMENTAL]\n"
 "Aims to speed up emulation by offloading texture decoding to the GPU using "
@@ -5808,7 +5989,7 @@ msgstr ""
 "\n"
 "Pokud si nejste jisti, nechejte toto odškrtnuté."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121
 msgid ""
 "[EXPERIMENTAL]\n"
 "Speeds up emulation a bit by caching display lists.\n"
@@ -5823,97 +6004,47 @@ msgstr ""
 "\n"
 "Pokud si nejste jisti, nechejte toto odškrtnuté."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:508
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:495
 msgid "^ ADD"
 msgstr "^ PŘIDAT"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:820
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:801
 msgid "apploader (.img)"
 msgstr "zavaděč aplikace (.img)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:185
-msgid "failed to read bk header"
-msgstr "čtení hlavičky bk selhalo"
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:375
-#, c-format
-msgid "failed to read data from file: %s"
-msgstr "Čtení dat selhalo ze souboru: %s"
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:97
-msgid "failed to read header"
-msgstr "Nelze číst z hlavičky"
-
-#: Source/Core/Core/Src/PowerPC/JitInterface.cpp:285
+#: Source/Core/Core/Src/PowerPC/JitInterface.cpp:272
 #, c-format
 msgid "iCacheJIT: Reading Opcode from %x. Please report."
 msgstr "iCacheJIT: Přečten Opcode z %x. Prosím nahlaste."
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:108
-#, c-format
-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:935
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:936
 msgid "s"
 msgstr "s"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:457
-#, c-format
-msgid "unknown cmd 0x%08x"
-msgstr "neznámý příkaz 0x%08x"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1110
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1136
 msgid "wxExecute returned -1 on application run!"
 msgstr "wxExecute při běhu aplikace vrátil -1!"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:56
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:43
 msgid "zFar Correction: "
 msgstr "Korekce z Far:"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:51
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:38
 msgid "zNear Correction: "
 msgstr "Korekce zNear:"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:493
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:480
 msgid "| OR"
 msgstr "| NEBO"
 
-#~ msgid "%i connected"
-#~ msgstr "Připojeno %i"
-
-#~ msgid "Alternate Wiimote Timing"
-#~ msgstr "Střídat časování Wiimote"
-
-#~ msgid "Interpreter (VERY slow)"
-#~ msgstr "Převaděč (VELMI pomalé)"
-
-#~ msgid "JIT Recompiler (recommended)"
-#~ msgstr "JIT Rekompilátor (doporučeno)"
-
-#~ msgid "JITIL experimental recompiler"
-#~ msgstr "JITIL experimentální rekompilátor"
+#~ msgid "Accurate VBeam emulation"
+#~ msgstr "Precizní emulace VBeam"
 
 #~ msgid ""
-#~ "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. "
-#~ "No effect on emulated wiimotes."
+#~ "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)"
 #~ msgstr ""
-#~ "Ztlumí reproduktor Wiimote. Spravuje náhodná odpojování u opravdových "
-#~ "Wiimote. Žádný efekt na emulovaná Wiimote."
+#~ "Pokud jsou SzS nestálé, tato volba může pomoci. (ZAPNUTO = Kompatibilní, "
+#~ "VYPNUTO = Rychlé)"
 
-#~ msgid "Pair Up"
-#~ msgstr "Spárovat"
-
-#~ msgid "Reconnect Wiimote Confirm"
-#~ msgstr "Potvrzení o znovupřipojení Wiimote"
-
-#~ msgid ""
-#~ "Wiimote %i has been disconnected by system.\n"
-#~ "Maybe this game doesn't support multi-wiimote,\n"
-#~ "or maybe it is due to idle time out or other reason.\n"
-#~ "Do you want to reconnect immediately?"
-#~ msgstr ""
-#~ "Wiimote %i byl odpojen systémem.\n"
-#~ "Možná tato hra nepodporuje více wiimotů,\n"
-#~ "nebo je to vypršení limitu neaktivity, nebo z jiného důvodu.\n"
-#~ "Chcete ho hned znovu připojit?"
+#~ msgid "Skip Dest. Alpha Pass"
+#~ msgstr "Vypnout Průchod Cíl. Průhl."
diff --git a/Languages/po/de.po b/Languages/po/de.po
index ad17bbf813..e1960b5d8b 100644
--- a/Languages/po/de.po
+++ b/Languages/po/de.po
@@ -3,17 +3,18 @@
 # This file is distributed under the same license as the dolphin-emu package.
 #
 # Translators:
-# Danny Krug <Dan_krug@gmx.de>, 2013.
-#  <darkmodx@gmail.com>, 2013.
-# JackyCola <jackycola@gmail.com>, LucasX <lucasx790@gmail.com>, 2011.
-#  <neobrainx@gmail.com>, 2013.
+# DasD aus der Spree <Dan_krug@gmx.de>, 2013
+# DefenderX <darkmodx@gmail.com>, 2013
+# Ghabry <gabelk@web.de>, 2013
+# JackyCola <jackycola@gmail.com>, LucasX <lucasx790@gmail.com>, 2011
+# no_cluez <neobrainx@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: Dolphin Emulator\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-10 08:56-0500\n"
-"PO-Revision-Date: 2013-03-02 19:42+0000\n"
-"Last-Translator: DefenderX <darkmodx@gmail.com>\n"
+"POT-Creation-Date: 2013-04-18 23:00-0500\n"
+"PO-Revision-Date: 2013-04-05 23:28+0000\n"
+"Last-Translator: Ghabry <gabelk@web.de>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/dolphin-emu/"
 "language/de/)\n"
 "Language: de\n"
@@ -22,21 +23,21 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:511
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:499
 msgid " (too many to display)"
 msgstr " (zu viele zum anzeigen)"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:270
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:273
 #: Source/Core/DolphinWX/Src/NetWindow.cpp:491
 #: Source/Core/DolphinWX/Src/NetWindow.cpp:530
 msgid " Game : "
 msgstr " Spiel: "
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:507
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494
 msgid "! NOT"
 msgstr "! NICHT"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:70
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:58
 #, c-format
 msgid ""
 "\"%s\" does not exist.\n"
@@ -45,53 +46,64 @@ msgstr ""
 "\"%s\" existiert nicht.\n"
 "Eine neue 16MB Memcard erstellen?"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:142
+#: Source/Core/Core/Src/CoreParameter.cpp:131
 #, c-format
 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."
+msgstr "\"%s\" ist kein gültiges GC/Wii-Image oder kein GC/Wii-Image."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:722
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:721
 #, c-format
 msgid "%08X:  "
 msgstr "%08X:"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:196
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:183
 #, c-format
 msgid "%1$sCopy%1$s"
-msgstr "%1$sKopie%1$s"
+msgstr "%1$sKopieren%1$s"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:128
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:296
+#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:113
+#, c-format
+msgid "%d samples"
+msgstr ""
+
+#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:112
+#, c-format
+msgid "%d samples (quality level %d)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:121
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:289
 #, c-format
 msgid "%s already exists, overwrite?"
 msgstr ""
-"%s existiert bereits.\n"
-"Soll diese Datei überschrieben werden?"
+"%s ist bereits vorhanden.\n"
+"Vorhandene Datei ersetzen?"
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:167
+#: Source/Core/DiscIO/Src/CompressedBlob.cpp:154
 #, c-format
 msgid "%s failed to be scrubbed. Probably the image is corrupt."
-msgstr "%s konnte nicht komprimiert werden, weil das Image fehlerhaft ist."
+msgstr ""
+"%s konnte nicht komprimiert werden, möglicherweise ist das Image fehlerhaft."
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:95
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:83
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
 " Card file size is invalid (0x%x bytes)"
 msgstr ""
-"%s konnte nicht als Memory Card geladen werden\n"
-"Die Kartendateigröße ist ungültig (0x%x bytes)"
+"%s konnte nicht als Speicherkarte geladen werden.\n"
+"Die Dateigröße der Speicherkarten-Datei ist ungültig (0x%x bytes)."
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:110
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:98
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
 " Card size is invalid (0x%x bytes)"
 msgstr ""
-"%s konnte nicht als Memory Card geladen werden\n"
-"Die Kartengröße ist ungültig (0x%x bytes)"
+"%s konnte nicht als Speicherkarte geladen werden.\n"
+"Die Speicherkartengröße ist ungültig (0x%x bytes)."
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:90
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:78
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
@@ -101,49 +113,37 @@ msgstr ""
 "Die Datei ist nicht groß genug um eine gültige Memory Card Datei zu sein (0x"
 "%x bytes)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:367
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:359
 #, c-format
 msgid "%s failed to open"
 msgstr "%s konnte nicht geöffnet werden."
 
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:97
-#, c-format
-msgid ""
-"%s has an incorrect hash.\n"
-"Would you like to stop now to fix the problem?\n"
-"If you select \"No\", audio will be garbled."
-msgstr ""
-"%s besitzt einen fehlerhaften Hash.\n"
-"Möchten Sie jetzt abbrechen, um das Problem zu beheben?\n"
-"Wenn Sie \"Nein\" wählen, wird der Ton verzerrt."
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:360
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:352
 #, c-format
 msgid "%s is a 0 byte file"
-msgstr "Die Datei %s beinhaltet 0 Byte."
+msgstr "Die Datei %s ist 0 Byte groß."
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:159
+#: Source/Core/DiscIO/Src/CompressedBlob.cpp:146
 #, c-format
 msgid "%s is already compressed! Cannot compress it further."
-msgstr ""
-"%s ist bereits komprimiert! Und kann nicht nocheinmal komprimiert werden."
+msgstr "%s ist bereits komprimiert und kann nicht erneut komprimiert werden."
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:345
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:337
 #, c-format
 msgid "%s is too long for the filename, max chars is 45"
 msgstr "Der Dateiname %s ist zu lang (maximal 45 Zeichen)"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:202
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:189
 #, c-format
 msgid "%sDelete%s"
 msgstr "%sLöschen%s"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:200
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:187
 #, c-format
 msgid "%sExport GCI%s"
 msgstr "%sGCI exportieren%s"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:198
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:185
 #, c-format
 msgid "%sImport GCI%s"
 msgstr "%sGCI importieren%s"
@@ -153,252 +153,275 @@ msgstr "%sGCI importieren%s"
 msgid "%u Free Blocks; %u Free Dir Entries"
 msgstr "%u freie Blöcke; %u freie Verzeichniseinträge"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:506
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:493
 msgid "&& AND"
 msgstr "&& UND"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:295
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:301
 msgid "&About..."
 msgstr "Über &Dolphin"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:99
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:100
 msgid "&Boot from DVD Drive..."
 msgstr "Von &DVD-Laufwerk starten..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:231
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:234
 msgid "&Breakpoints"
 msgstr "&Haltepunkte"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:110
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:111
 msgid "&Browse for ISOs..."
 msgstr "Nach ISOs &suchen..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:192
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:195
 msgid "&Cheats Manager"
-msgstr "&Cheat Manager"
+msgstr "&Cheat-Manager"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:177
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:180
 msgid "&DSP Settings"
-msgstr "&DSP Einstellungen"
+msgstr "&DSP-Einstellungen"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:885
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:876
 msgid "&Delete ISO..."
 msgstr "ISO &löschen"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:903
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:897
 msgid "&Delete selected ISOs..."
 msgstr "Ausgewählte ISOs &löschen"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:170
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:173
 msgid "&Emulation"
 msgstr "&Emulation"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:113
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:114
 msgid "&File"
 msgstr "&Datei"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:335
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:341
 msgid "&Frame Advance"
 msgstr "&Einzelbildwiedergabe"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:352
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:358
 msgid "&Fullscreen"
 msgstr "&Vollbild"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:176
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:179
 msgid "&Graphics Settings"
-msgstr "&Grafik Einstellungen"
+msgstr "&Grafikeinstellungen"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:296
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:302
 msgid "&Help"
 msgstr "&Hilfe"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:180
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:183
 msgid "&Hotkey Settings"
 msgstr "&Tastenkürzel Einstellungen"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:233
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:236
 msgid "&JIT"
 msgstr "&JIT"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:148
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:149
 msgid "&Load State"
-msgstr "Status &laden"
+msgstr "Spielstand &laden"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:190
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:193
 msgid "&Memcard Manager (GC)"
-msgstr "&Memory-Card Manager (GC)"
+msgstr "&Speicherkarten-Verwaltung (GC)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:232
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:235
 msgid "&Memory"
 msgstr "&Arbeitsspeicher"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:313
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:319
 msgid "&Open..."
 msgstr "Ö&ffnen..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:186
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:189
 msgid "&Options"
 msgstr "&Optionen"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:324
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:330
 msgid "&Pause"
 msgstr "Pau&se"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:326
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:332
 msgid "&Play"
 msgstr "&Start"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:867
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:858
 msgid "&Properties"
 msgstr "&Eigenschaften"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:348
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:354
 msgid "&Read-only mode"
-msgstr "&Nur-Lese-Modus"
+msgstr "S&chreibgeschützer Modus"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:319
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:325
 msgid "&Refresh List"
-msgstr "&Liste aktualisieren"
+msgstr "Liste &aktualisieren"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:230
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:233
 msgid "&Registers"
 msgstr "&Register"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:332
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:338
 msgid "&Reset"
 msgstr "&Reset"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:234
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:237
 msgid "&Sound"
-msgstr "&Sound"
+msgstr "S&ound"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:329
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:335
 msgid "&Stop"
 msgstr "Sto&pp"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:207
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:210
 msgid "&Tools"
-msgstr "&Werkzeuge"
+msgstr "E&xtras"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:235
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:238
 msgid "&Video"
 msgstr "&Video"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:284
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:287
 msgid "&View"
 msgstr "&Ansicht"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:179
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:182
 msgid "&Wiimote Settings"
-msgstr "&Wiimote Einstellungen"
+msgstr "&Wiimote-Einstellungen"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:868
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:859
 msgid "&Wiki"
 msgstr "&Wiki"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504
 msgid "'"
 msgstr "''"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:59
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:46
 msgid "(-)+zFar"
 msgstr "(-)+zFar"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:54
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:41
 msgid "(-)+zNear"
 msgstr "(-)+zNear"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:99
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:86
 msgid "(UNKNOWN)"
 msgstr "(UNBEKANNT)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:376
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:384
 msgid "(off)"
 msgstr "(aus)"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:655
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:654
 msgid "0x44"
 msgstr "0x44"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+msgid "1.5x Native (960x792)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:158
 msgid "16 bit"
 msgstr "16 Bit"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+msgid "1x Native (640x528)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+msgid "2.5x Native (1600x1320)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+msgid "2x Native (1280x1056)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:159
 msgid "32 bit"
 msgstr "32 Bit"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:412
 msgid "3D Vision"
 msgstr "3D Vision"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+msgid "3x Native (1920x1584)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+msgid "4x Native (2560x2112)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:157
 msgid "8 bit"
 msgstr "8 Bit"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:43
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:30
 msgid "<Insert name here>"
 msgstr "<Namen hier eingeben>"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:255
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:262
 msgid "<No resolutions found>"
-msgstr "<keine Auflösungen gefunden>"
+msgstr "<Keine Auflösungen gefunden>"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:104
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84
 msgid "<Nothing>"
 msgstr "<Nichts>"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:162
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:162
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:150
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:150
 msgid "<Press Key>"
 msgstr "<Taste drücken>"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286
 msgid "<System>"
 msgstr "<Systemsprache>"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695
 msgid "A"
 msgstr "A"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:201
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:235
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:204
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:238
 msgid "A NetPlay window is already open!!"
-msgstr "Ein NetPlay Fenster ist bereits geöffnet!"
+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:353
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:387
 msgid "A game is not currently running."
-msgstr "Es wird derzeit kein Spiel ausgeführt."
+msgstr "Derzeit wird kein Spiel ausgeführt."
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:68
-#, fuzzy
 msgid ""
 "A supported bluetooth device could not be found.\n"
 "You must manually connect your wiimotes."
 msgstr ""
-"Es wurde kein unterstütztes Bluetoothgerät gefunden!\n"
-"Wenn du den Bluetooth Stack von Microsoft nutzt musst du deine Wiimotes "
-"manuell Paaren und dann nur den \"Refresh\" Knopf drücken"
+"Es konnte kein unterstütztes Bluetooth-Gerät gefunden werden.\n"
+"Du musst deine Wiimotes manuell verbinden."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:109
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:100
+#, fuzzy
 msgid ""
 "ALERT:\n"
 "\n"
-"NetPlay will currently only work properly when using the following "
-"settings:\n"
-" - Dual Core [OFF]\n"
-" - Audio Throttle [OFF]\n"
-" - DSP-HLE with \"Null Audio\" or DSP-LLE\n"
-" - Manually set the exact number of controllers that will be used to "
-"[Standard Controller]\n"
+"Netplay will only work with the following settings:\n"
+" - Enable Dual Core [OFF]\n"
+" - DSP Emulator Engine Must be the same on all computers!\n"
+" - DSP on Dedicated Thread [OFF]\n"
+" - Framelimit NOT set to [Audio]\n"
+" - Manually set the exact number of controllers to be used to [Standard "
+"Controller]\n"
 "\n"
-"All players should try to use the same Dolphin version and settings.\n"
-"Disable all memory cards or send them to all players before starting.\n"
-"Wiimote support has not been implemented.\n"
+"All players should use the same Dolphin version and settings.\n"
+"All memory cards must be identical between players or disabled.\n"
+"Wiimote support has not been implemented!\n"
 "\n"
-"You must forward TCP port to host!!"
+"The host must have the chosen TCP port open/forwarded!\n"
 msgstr ""
 "ACHTUNG:\n"
 "\n"
@@ -417,17 +440,17 @@ msgstr ""
 "\n"
 "TCP Port zum Hoster muss geöffnet sein!!"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:111
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:116
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96
 msgid "AM-Baseboard"
 msgstr "AM-Baseboard"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:299
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:115
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:300
 msgid "AR Codes"
 msgstr "AR Codes"
 
-#: Source/Core/DolphinWX/Src/AboutDolphin.h:33
+#: Source/Core/DolphinWX/Src/AboutDolphin.h:21
 msgid "About Dolphin"
 msgstr "Über Dolphin"
 
@@ -435,15 +458,11 @@ msgstr "Über Dolphin"
 msgid "Acceleration"
 msgstr "Beschleunigung"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:463
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473
 msgid "Accuracy:"
 msgstr "Genauigkeit:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317
-msgid "Accurate VBeam emulation"
-msgstr "Genaue VBeam Emulation"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97
 msgid ""
 "Accurately emulate EFB copies.\n"
 "Some games depend on this for certain graphical effects or gameplay "
@@ -451,18 +470,17 @@ msgid ""
 "\n"
 "If unsure, check EFB to Texture instead."
 msgstr ""
-"Emuliert genau EFB Kopien.\n"
-"Einige Spiele benötigen dies für bestimmte Gerafikeffekte oder "
-"Gameplayfunktionen.\n"
+"Einige Spiele benötigen eine exakte Emulation von EFB-Kopien, für bestimmte "
+"Grafikeffekte oder Gameplayfunktionen.\n"
 "\n"
-"Wenn du dir unsicher bist nutze stattdessen EFB zu Textur."
+"In der Regel ist \"EFB to Texture\" ausreichend."
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:239
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:239
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:227
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:227
 msgid "Action"
 msgstr "Aktion"
 
-#: Source/Core/Core/Src/ARDecrypt.cpp:481
+#: Source/Core/Core/Src/ARDecrypt.cpp:469
 #, c-format
 msgid ""
 "Action Replay Code Decryption Error:\n"
@@ -477,7 +495,7 @@ msgstr ""
 "Fehlerhafter Code:\n"
 "%s"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:667
+#: Source/Core/Core/Src/ActionReplay.cpp:657
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)"
@@ -485,7 +503,7 @@ msgstr ""
 "Action Replay Fehler: Fehlerhafte Größe (%08x : address = %08x) im folgendem "
 "Code (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:755
+#: Source/Core/Core/Src/ActionReplay.cpp:745
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide "
@@ -494,7 +512,7 @@ msgstr ""
 "Action Replay Fehler: Ungültige Größe (%08x : address = %08x) in Fill and "
 "Slide (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:547
+#: Source/Core/Core/Src/ActionReplay.cpp:537
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And "
@@ -503,7 +521,7 @@ msgstr ""
 "Action Replay Fehler: Ungültige Größe (%08x : address = %08x) in Ram Write "
 "And Fill (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:607
+#: Source/Core/Core/Src/ActionReplay.cpp:597
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Write To "
@@ -512,13 +530,13 @@ msgstr ""
 "Action Replay Fehler: Fehlerhafte Größe (%08x : address = %08x) im "
 "geschriebennen Pointer (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:802
+#: Source/Core/Core/Src/ActionReplay.cpp:792
 #, c-format
 msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)"
 msgstr ""
 "Action Replay Fehler: Fehlerhafte Größe (%08x) im kopierten Speicher (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:682
+#: Source/Core/Core/Src/ActionReplay.cpp:672
 #, c-format
 msgid ""
 "Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)\n"
@@ -528,63 +546,63 @@ msgstr ""
 "(%s)\n"
 "Master Codes werden nicht benötigt. Benutze keine Master Codes."
 
-#: Source/Core/Core/Src/ActionReplay.cpp:196
+#: Source/Core/Core/Src/ActionReplay.cpp:184
 #, c-format
 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:872
+#: Source/Core/Core/Src/ActionReplay.cpp:862
 #, c-format
 msgid "Action Replay: Conditional Code: Invalid Size %08x (%s)"
 msgstr "Action Replay: Conditional Code: ungültige Größe %08x (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:945
+#: Source/Core/Core/Src/ActionReplay.cpp:935
 #, c-format
 msgid "Action Replay: Invalid Normal Code Type %08x (%s)"
 msgstr "Action Replay: Ungültiger Normal Code %08x (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:896
+#: Source/Core/Core/Src/ActionReplay.cpp:886
 #, c-format
 msgid "Action Replay: Normal Code %i: Invalid subtype %08x (%s)"
 msgstr "Action Replay: Normaler Code %i: ungültiger Subtype %08x (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:838
+#: Source/Core/Core/Src/ActionReplay.cpp:828
 #, c-format
 msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)"
 msgstr "Action Replay: Normal Code 0: ungültiger Subtype %08x (%s)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:242
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:247
 msgid "Adapter:"
 msgstr "Grafikkarte:"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:76
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:63
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:63
 msgid "Add"
 msgstr "Hinzufügen"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1275
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1301
 msgid "Add ActionReplay Code"
-msgstr "ActionReplay Code hinzufügen"
+msgstr "ActionReplay-Code hinzufügen"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1204
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1230
 msgid "Add Patch"
 msgstr "Patch hinzufügen"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:507
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:528
 msgid "Add new pane"
 msgstr "Neue Palette hinzufügen"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:404
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:426
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:811
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:408
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:430
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:792
 msgid "Add..."
 msgstr "Hinzufügen..."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:90
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:81
 msgid "Address :"
-msgstr "Adresse: "
+msgstr "Adresse:"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:58
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:45
 msgid ""
 "Adds the specified value to zFar Parameter.\n"
 "Two ways to express the floating point values.\n"
@@ -602,7 +620,7 @@ msgstr ""
 "\n"
 "NOTIZ: Prüfe im Logfenster/Konsole die ermittelten Werte."
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:53
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:40
 msgid ""
 "Adds the specified value to zNear Parameter.\n"
 "Two ways to express the floating point values.\n"
@@ -620,48 +638,48 @@ msgstr ""
 "\n"
 "NOTIZ: Prüfe im Logfenster/Konsole die ermittelten Werte."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:755
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:744
 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:509
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:522
 msgid "Advanced"
 msgstr "Erweitert"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561
 msgid "Advanced Settings"
 msgstr "Erweiterte Einstellungen"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:584
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:587
 msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)"
-msgstr "Alle GC/Wii Dateien(elf, dol, gcm, wbfs, ciso, gcz, wad)"
+msgstr "Alle GC/Wii-Dateien (elf, dol, gcm, wbfs, ciso, gcz, wad)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:816
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:797
 msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)"
-msgstr "Alle GC/Wii Images (gcm, iso, wbfs, ciso, gcz)"
+msgstr "Alle GC/Wii-Imagedateien (gcm, iso, wbfs, ciso, gcz)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1189
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1190
 msgid "All Gamecube GCM files (gcm)"
-msgstr "Alle Gamecube GCM Dateien (gcm)"
+msgstr "Alle Gamecube GCM-Dateien (gcm)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1390
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1404
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1417
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1431
 msgid "All Save States (sav, s##)"
 msgstr "Alle Speicherstände (sav, s##)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1187
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1188
 msgid "All Wii ISO files (iso)"
 msgstr "Alle Wii ISO Dateien (iso)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1207
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1208
 msgid "All compressed GC/Wii ISO files (gcz)"
 msgstr "Alle komprimierten GC/Wii ISO Dateien (gcz)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:124
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:104
 msgid "All files (*.*)|*.*"
 msgstr "Alle Dateien (*.*)|*.*"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123
 msgid ""
 "Allows toggling certain options via the hotkeys 3 (Internal Resolution), 4 "
 "(Aspect Ratio), 5 (Copy EFB) and 6 (Fog) within the emulation window.\n"
@@ -669,40 +687,40 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:285
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:272
 msgid "Analyze"
 msgstr "Analysiere"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:298
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:285
 msgid "Angle"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:367
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:375
 msgid "Anisotropic Filtering:"
-msgstr "Anisotropische Filterung:"
+msgstr "Anisotrope Filterung:"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:350
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:358
 msgid "Anti-Aliasing:"
-msgstr "Anti-Aliasing:"
+msgstr "Antialiasing:"
 
-#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:308
+#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:299
 msgid "Apploader is the wrong size...is it really an apploader?"
 msgstr ""
 "Der Apploader hat eine falsche Größe... ist dies wirklich ein AppLoader?"
 
-#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:302
+#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:293
 msgid "Apploader unable to load from file"
 msgstr "Kann Apploader aus dieser Datei nicht laden."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:841
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:822
 msgid "Apploader:"
 msgstr "Apploader:"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:135
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:122
 msgid "Apply"
 msgstr "Übernehmen"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124
 msgid ""
 "Apply a post-processing effect after finishing a frame.\n"
 "\n"
@@ -711,14 +729,14 @@ msgstr ""
 "Schaltet einen Post-Processing Effekt wenn ein Frame beendet wurde. Wenn "
 "unsicher, wähle (aus)."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287
 msgid "Arabic"
 msgstr "Arabisch"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:614
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:603
 #, c-format
 msgid "Are you sure you want to delete \"%s\"?"
-msgstr "Sind Sie sicher, dass Sie \"%s\" löschen möchten?"
+msgstr "Möchtest du wirklich \"%s\" löschen?"
 
 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1013
 msgid ""
@@ -733,46 +751,50 @@ 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:789
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:277
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:44
+msgid "Arm JIT (experimental)"
+msgstr "ARM JIT (Experimentell)"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:285
 msgid "Aspect Ratio:"
 msgstr "Seitenverhältnis:"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:70
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:58
 msgid "At least one pane must remain open."
 msgstr "Mindestens eine Palette muss geöffnet bleiben."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:553
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533
 msgid "Audio"
 msgstr "Audio"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:694
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675
 msgid "Audio Backend:"
 msgstr "Audio Backend:"
 
-#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:41
+#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:28
 msgid "AudioCommon: Error opening AO device.\n"
 msgstr "AudioCommon: Fehler beim öffnen des AO-Gerätes.\n"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:275
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283
 msgid "Auto"
 msgstr "Automatisch"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:337
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345
 msgid "Auto (Multiple of 640x528)"
-msgstr "Automatisch (Mehrfaches von 640x528)"
+msgstr "Automatisch (Vielfaches von 640x528)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:337
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345
 msgid "Auto (Window Size)"
-msgstr "Automatisch (Fenstermodus)"
+msgstr "Automatisch (Fenstergröße)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:297
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305
 msgid "Auto adjust Window Size"
 msgstr "Lege die Größe des Fenstermodus automatisch fest."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77
 msgid ""
 "Automatically adjusts the window size to your internal resolution.\n"
 "\n"
@@ -782,160 +804,160 @@ msgstr ""
 "\n"
 "Wenn du dir unsicher bist lass diesen Punkt ausgeschaltet."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:697
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696
 msgid "B"
 msgstr "B"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:755
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:754
 msgid "BP register "
-msgstr "BP Registrieren"
+msgstr "BP-Register"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:27
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:14
 msgid "Back"
 msgstr "Zurück"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:698
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:679
 msgid "Backend Settings"
-msgstr "Backend Einstellungen"
+msgstr "Backend-Einstellungen"
 
-#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:60
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:206
+#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:47
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:211
 msgid "Backend:"
 msgstr "Backend:"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:318
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:95
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:305
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:82
 msgid "Background Input"
 msgstr "Hintergrund-Eingabe"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:279
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:266
 msgid "Backward"
 msgstr "Rückwärts"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:264
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:257
 msgid "Bad File Header"
 msgstr "Ungültige Header-Datei"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:627
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:621
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:290
 msgid "Banner"
 msgstr "Banner"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:519
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:529
 msgid "Banner Details"
-msgstr "Banner Details"
+msgstr "Bannerdetails"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491
 msgid "Banner:"
 msgstr "Banner:"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:57
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:61
 msgid "Bar"
 msgstr "Leiste"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:308
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:316
 msgid "Basic"
 msgstr "Standard"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555
 msgid "Basic Settings"
 msgstr "Grundeinstellungen"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:22
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Bass"
 msgstr "Bass"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:186
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:174
 msgid "Block Allocation Table checksum failed"
 msgstr "Blockzuteilungs-Tabellen-Prüfsumme fehlerhaft."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:631
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625
 msgid "Blocks"
 msgstr "Blöcke"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:21
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Blue"
 msgstr "Blau"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:24
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Blue Left"
 msgstr "Blau links"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:25
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Blue Right"
 msgstr "Blau rechts"
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:87
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270
 msgid "Bottom"
 msgstr "Unten"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:238
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:225
 #, c-format
 msgid "Bound Controls: %lu"
 msgstr "Steuerung festlegen: %lu"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348
 msgid "Broken"
 msgstr "Defekt"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:422
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:428
 msgid "Browse"
 msgstr "Durchsuchen"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:256
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:243
 msgid "Browse for a directory to add"
 msgstr "Ordner suchen und hinzufügen"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:422
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:428
 msgid "Browse for an ISO directory..."
 msgstr "ISO-Verzeichnis hinzufügen..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1079
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1080
 msgid "Browse for output directory"
 msgstr "Ausgabeverzeichnis auswählen"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:328
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:331
 msgid "Buffer:"
 msgstr "Buffer:"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:58
 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:119
+#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:106
 msgid "Buttons"
 msgstr "Tasten"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317
 msgid ""
 "Bypass the clearing of the data cache by the DCBZ instruction. Usually leave "
 "this option disabled."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:698
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:697
 msgid "C"
 msgstr "C"
 
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:77
+#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:64
 msgid "C Stick"
 msgstr "C-Stick"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:77
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:64
 msgid "C-Stick"
 msgstr "C-Stick"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:764
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:763
 msgid "CP reg"
 msgstr "CP reg"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:567
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547
 msgid "CPU Emulator Engine"
 msgstr "CPU Emulator Engine"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:490
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500
 msgid "Cache Display Lists"
 msgstr "Anzeigeliste zwischenspeichern"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88
 msgid ""
 "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n"
 "Decreases emulation speed by some percent (depending on your GPU).\n"
@@ -951,65 +973,64 @@ msgstr ""
 "\n"
 "Wenn du dir unsicher bist, wähle es nicht aus."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1858
+#, c-format
+msgid "Can't find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x"
+msgstr ""
+
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1872
+#, c-format
+msgid "Can't find WiiMote by connection handle %02x"
+msgstr ""
+
+#: Source/Core/Core/Src/HW/DVDInterface.cpp:669
+#: Source/Core/Core/Src/HW/DVDInterface.cpp:679
+msgid "Can't read from DVD_Plugin - DVD-Interface: Fatal Error"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:124
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:28
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:91
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:178
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:240
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:84
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:171
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:233
 #, c-format
 msgid "Cannot open %s"
 msgstr "Kann %s nicht öffnen"
 
-#: Source/Core/Core/Src/CoreTiming.cpp:141
+#: Source/Core/Core/Src/CoreTiming.cpp:128
 msgid "Cannot unregister events with events pending"
 msgstr "Kann während ausstehenden Events keine bereits Events de-registrieren."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1078
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1061
 #, c-format
 msgid ""
 "Cannot use that file as a memory card.\n"
 "%s\n"
 "is not a valid gamecube memory card file"
 msgstr ""
-"Kann diese Datei nicht als Memory Card verwenden.\n"
-"%s\n"
-"ist keine gültige Gamecube Memory Card Datei."
+"Die Datei %s kann nicht als Speicherkarte verwendet werden, weil sie keine "
+"gültige Gamecube-Speicherkarte ist."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1108
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1091
 msgid ""
 "Cannot use that file as a memory card.\n"
 "Are you trying to use the same file in both slots?"
 msgstr ""
-"Kann diese Datei nicht als Memory Card verwanden.\n"
-"Versuchst du vielleicht die selbe Datei in beiden Slots zu verwanden?"
+"Diese Datei kann nicht als Speicherkarte verwendet werden.\n"
+"Versuchts du möglicherweise die selbe Datei in beiden Slots zu verwenden?"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1867
-#, 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:1881
-#, 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: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"
-
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:52
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:39
 msgid "Caps Lock"
-msgstr "Feststellen"
+msgstr "Feststelltaste"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288
 msgid "Catalan"
 msgstr "Katalanisch"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:311
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:298
 msgid "Center"
 msgstr "Mitte"
 
@@ -1017,12 +1038,12 @@ msgstr "Mitte"
 msgid "Change"
 msgstr "Wechseln"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:316
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:322
 msgid "Change &Disc..."
 msgstr "Disc &wechseln..."
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:179
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:179
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:167
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:167
 msgid "Change Disc"
 msgstr "Disc wechseln"
 
@@ -1030,7 +1051,7 @@ msgstr "Disc wechseln"
 msgid "Change Game"
 msgstr "Spiel wechseln"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:515
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495
 msgid ""
 "Change the language of the user interface.\n"
 "Requires restart."
@@ -1038,103 +1059,103 @@ msgstr ""
 "Sprache der Benutzeroberfläche ändern.\n"
 "Dolphin muss neu gestartet werden, damit die Änderung wirksam wird."
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:60
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:47
 msgid "Changes sign to zFar Parameter (after correction)"
 msgstr "Parameter sign zu zFar ändern (nach Korrektur)"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:55
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:42
 msgid "Changes sign to zNear Parameter (after correction)"
 msgstr "Parameter sign zu zNear ändern (nach Korrektur)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:519
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499
 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:295
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:298
 msgid "Chat"
 msgstr "Chat"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:47
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:34
 msgid "Cheat Code"
 msgstr "Cheat Code"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:118
 msgid "Cheat Search"
-msgstr "Cheat Suche"
+msgstr "Cheatsuche"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:38
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:25
 msgid "Cheats Manager"
-msgstr "Cheat Manager"
+msgstr "Cheat-Verwaltung"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:633
 msgid "Check Partition Integrity"
 msgstr "Prüfe die Unversehrtheit der Partition"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:864
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:880
 msgid "Checking integrity..."
 msgstr "Prüfe die Unversehrtheit der Partition..."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289
 msgid "Chinese (Simplified)"
 msgstr "Chinesisch (Vereinfacht)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290
 msgid "Chinese (Traditional)"
 msgstr "Chinesisch (Traditionell)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:818
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:799
 msgid "Choose a DVD root directory:"
 msgstr "Wähle ein Standard DVD-Verzeichnis:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:822
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803
 msgid "Choose a NAND root directory:"
 msgstr "Wähle ein NAND Stammverzeichnis"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:815
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:796
 msgid "Choose a default ISO:"
 msgstr "Standard ISO auswählen:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1236
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1219
 msgid "Choose a directory to add"
 msgstr "Ordner zum Hinzufügen auswählen."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1065
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1048
 msgid "Choose a file to open"
 msgstr "Datei zum Öffnen auswählen"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:217
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:204
 msgid "Choose a memory card:"
 msgstr "Wähle eine Memory Card:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:819
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800
 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:767
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:806
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:781
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:822
 msgid "Choose the folder to extract to"
-msgstr "Ordner zum Extrahieren auswählen"
+msgstr "Zielordner für Extraktion auswählen"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:297
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:284
 msgid "Circle Stick"
 msgstr "Circle Stick"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:52
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:56
 msgid "Classic"
 msgstr "Klassik"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:144
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:43
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:487
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:913
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:137
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:30
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:474
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:904
 msgid "Clear"
 msgstr "Löschen"
 
-#: Source/Core/Core/Src/NetPlayServer.cpp:259
+#: Source/Core/Core/Src/NetPlayServer.cpp:263
 msgid ""
 "Client disconnect while game is running!! NetPlay is disabled. You must "
 "manually stop the game."
@@ -1142,122 +1163,122 @@ 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:298
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:247
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:552
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:578
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:285
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:234
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:562
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:590
 msgid "Close"
 msgstr "Schließen"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:174
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:177
 msgid "Co&nfigure..."
-msgstr "&Konfiguration"
+msgstr "&Einstellungen..."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:86
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:73
 msgid "Code Info"
-msgstr "Code Info"
+msgstr "Code-Info"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:568
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:556
 msgid "Code: "
-msgstr "Code: "
+msgstr "Code:"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:35
 msgid "Command"
 msgstr "Befehl"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:629
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:623
 msgid "Comment"
 msgstr "Kommentar"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489
 msgid "Comment:"
 msgstr "Kommentar:"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:893
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:884
 msgid "Compress ISO..."
 msgstr "ISO komprimieren..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:905
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:899
 msgid "Compress selected ISOs..."
 msgstr "Ausgewählte ISOs komprimieren..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1088
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1224
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1089
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1225
 msgid "Compressing ISO"
 msgstr "Komprimiere ISO"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:429
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:435
 msgid "Config"
 msgstr "Einstellungen"
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:37
-#: Source/Core/DolphinWX/Src/InputConfigDiag.h:135
-#: Source/Core/DolphinWX/Src/InputConfigDiag.h:154
+#: Source/Core/DolphinWX/Src/InputConfigDiag.h:122
+#: Source/Core/DolphinWX/Src/InputConfigDiag.h:141
 msgid "Configure"
 msgstr "Einstellungen"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:111
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:98
 msgid "Configure Control"
 msgstr "Steuerung bearbeiten"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:306
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
 #: Source/Core/DolphinWX/Src/NetWindow.cpp:583
 msgid "Configure Pads"
 msgstr "Pads konfigurieren"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:429
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:435
 msgid "Configure..."
 msgstr "Einstellungen ...."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1119
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1147
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1217
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1120
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1218
 msgid "Confirm File Overwrite"
 msgstr "Überschreiben Bestätigen"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:597
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:577
 msgid "Confirm on Stop"
-msgstr "Beim Beenden Bestätigen"
+msgstr "Beim Beenden bestätigen"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:83
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:105
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:74
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:96
 msgid "Connect"
 msgstr "Verbinden"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:783
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:764
 msgid "Connect USB Keyboard"
-msgstr "USB-Keyboard anschließen"
+msgstr "USB-Tastatur angeschlossen"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:362
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:368
 #, c-format
 msgid "Connect Wiimote %i"
 msgstr "Wiimote %i verbinden"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:195
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183
 msgid "Connect Wiimote 1"
 msgstr "Wiimote 1 verbinden"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184
 msgid "Connect Wiimote 2"
 msgstr "Wiimote 2 verbinden"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:185
 msgid "Connect Wiimote 3"
 msgstr "Wiimote 3 verbinden"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:198
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:186
 msgid "Connect Wiimote 4"
 msgstr "Wiimote 4 verbinden"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:627
+#: Source/Core/DolphinWX/Src/Main.cpp:655
 msgid "Connecting..."
 msgstr "Verbinden..."
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:155
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:156
 msgid "Console"
 msgstr "Konsole"
 
@@ -1265,15 +1286,15 @@ msgstr "Konsole"
 msgid "Continuous Scanning"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:46
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:33
 msgid "Control"
 msgstr "Strg"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:189
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:176
 msgid "Convert to GCI"
 msgstr "Zu GCI konvertieren"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:379
+#: Source/Core/Core/Src/CoreParameter.cpp:368
 msgid "Copy failed"
 msgstr "Kopieren fehlgeschlagen"
 
@@ -1282,21 +1303,21 @@ msgstr "Kopieren fehlgeschlagen"
 msgid "Copy to Memcard %c"
 msgstr "Auf Memcard %c kopieren"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:359
 msgid "Core"
 msgstr "Kern"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:154
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:148
 #, c-format
 msgid "Could not create %s"
 msgstr "%s konnte nicht erstellt werden"
 
-#: Source/Core/AudioCommon/Src/AudioCommon.cpp:75
+#: Source/Core/AudioCommon/Src/AudioCommon.cpp:62
 #, c-format
 msgid "Could not initialize backend %s."
 msgstr "Konnte Backend %s nicht initialisieren."
 
-#: Source/Core/Core/Src/CoreParameter.cpp:137
+#: Source/Core/Core/Src/CoreParameter.cpp:126
 #, c-format
 msgid ""
 "Could not read \"%s\".  There is no disc in the drive, or it is not a GC/Wii "
@@ -1307,15 +1328,15 @@ msgstr ""
 "dies ist kein GC/Wii Backup. Bitte beachten Sie, dass die ursprünglichen GC/"
 "Wii-Discs von den meisten PC-DVD-Laufwerken nicht gelesen werden können."
 
-#: Source/Core/Core/Src/CoreParameter.cpp:292
+#: Source/Core/Core/Src/CoreParameter.cpp:281
 #, c-format
 msgid "Could not recognize ISO file %s"
 msgstr "Konnte ISO-Datei %s nicht erkennen."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:569
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:579
 #, c-format
 msgid "Could not save %s"
-msgstr "Konnte %s nicht speichern."
+msgstr "Konnte %s nicht speichern"
 
 #: Source/Core/DolphinWX/Src/NetWindow.cpp:551
 msgid ""
@@ -1323,24 +1344,34 @@ msgid ""
 "(setting pads while the game is running is not yet supported)"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:123
+#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119
 #, c-format
 msgid ""
 "Could not write memory card file %s.\n"
 "\n"
 "Are you running Dolphin from a CD/DVD, or is the save file maybe write "
-"protected?"
-msgstr ""
-"Konnte die Memorycard-Datei %s nicht schreiben.\n"
+"protected?\n"
 "\n"
-"Führen Sie Dolphin von einer CD/DVD aus, oder ist die Speicherdatei "
-"vielleicht schreibgeschützt?"
+"Are you receiving this after moving the emulator directory?\n"
+"If so, then you may need to re-specify your memory card location in the "
+"options."
+msgstr ""
+"Die Speicherkartendatei %s konnte nicht geschrieben werden.\n"
+"\n"
+"Dies tritt auf, wenn du Dolphin von einem nicht schreibbaren Medium, "
+"beispielsweise einer CD/DVD ausführst oder die Datei als schreibgeschützt "
+"markiert ist.\n"
+"\n"
+"Eine weitere Möglichkeit ist, dass du den Dolphin-Ordner verschoben hast.\n"
+"\n"
+"Wenn einer dieser Fälle zutriffst, solltest du den Speicherort der "
+"Speicherkarte in den Optionen ändern."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1107
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1133
 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:146
+#: Source/Core/Core/Src/BootManager.cpp:137
 msgid ""
 "Couldn't init the core.\n"
 "Check your configuration."
@@ -1348,231 +1379,233 @@ msgstr ""
 "Konnte Kern nicht initialisieren.\n"
 "Überprüfe deine Konfiguration."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:183
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:507
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:495
 msgid "Count:"
 msgstr "Anzahl:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:452
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456
 msgid "Country:"
 msgstr "Land:"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:186
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:562
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:173
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:550
 msgid "Create AR Code"
 msgstr "AR-Code erstellen"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:543
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:608
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:569
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:641
 msgid "Create new perspective"
 msgstr "Neue Perspektive erstellen"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:17
 msgid "Creator: "
-msgstr "Ersteller: "
+msgstr "Autor: "
 
-#: Source/Core/Common/Src/MsgHandler.cpp:68
+#: Source/Core/Common/Src/MsgHandler.cpp:54
 msgid "Critical"
 msgstr "Kritisch"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562
 msgid "Crop"
 msgstr "Abschneiden"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119
 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 ""
+"Schneidet das Bild von 4:3 auf 5:4 bzw. von 16:9 auf 16:10 zurecht.\n"
+"\n"
+"Aktiviere diese Option nur, wenn du weißt, was du tust."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:48
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:52
 msgid "Crossfade"
 msgstr "Fadenkreuz"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:597
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:600
 #, c-format
-msgid "Current dir changed from %s to %s after wxFileSelector!"
+msgid "Current directory changed from %s to %s after wxFileSelector!"
 msgstr ""
-"Aktuelles Verzeichnis wird gemäß wxFileSelector von %s nach %s geändert!"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339
 msgid "Custom Projection Hack"
 msgstr "Benutzerdefinierter Projection-Hack"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.h:30
+#: Source/Core/DolphinWX/Src/PHackSettings.h:17
 msgid "Custom Projection Hack Settings"
 msgstr "Benutzerdefinierter Projection-Hack Einstellungen"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342
 msgid "Customize some Orthographic Projection parameters."
 msgstr "Einige orthographische Projection Parameter anpassen."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291
 msgid "Czech"
 msgstr "Tschechisch"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:698
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:697
 msgid "D"
 msgstr "D"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:89
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
 msgid "D-Pad"
 msgstr "D-Pad"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:431
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
 msgid "DSP"
 msgstr "DSP"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:639
 msgid "DSP Emulator Engine"
 msgstr "DSP Emulator Engine"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:254
 msgid "DSP HLE emulation (fast)"
 msgstr "DSP HLE Emulation (schnell)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:256
 msgid "DSP LLE interpreter (slow)"
 msgstr "DSP LLE Interpreter (langsam)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660
-msgid "DSP LLE on Thread"
-msgstr "DSP LLE in eigenem Thread ausführen"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:255
 msgid "DSP LLE recompiler"
 msgstr "DSP LLE Recompiler"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:431
-msgid "DSP settings"
-msgstr "DSP Einstellungen"
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:641
+msgid "DSP on Dedicated Thread"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:838
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
+msgid "DSP settings"
+msgstr "DSP-Einstellungen"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:819
 msgid "DVD Root:"
 msgstr "DVD Laufwerk:"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:239
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:226
 msgid "DVDLowRead - Fatal Error: failed to read from volume"
 msgstr "DVDLowRead - Kritischer Fehler: Datenträger kann nicht gelesen werden"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:333
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:320
 msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume"
 msgstr ""
 "DVDLowUnencryptedRead - Kritischer Fehler: Datenträger kann nicht gelesen "
 "werden."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:176
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:163
 msgid "Data Size"
 msgstr "Datengröße"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468
 msgid "Date:"
 msgstr "Datum:"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:528
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:564
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:518
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:557
 msgid "Datel MaxDrive/Pro files(*.sav)"
 msgstr "Datel MaxDrive/Pro Dateien(*.sav)"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:242
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:259
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:267
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:281
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:296
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:229
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:246
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:254
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:268
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:283
 msgid "Dead Zone"
 msgstr "Tote Zone"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:35
 msgid "Debug"
 msgstr "Debug"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:521
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534
 msgid "Debugging"
 msgstr "Debug"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:79
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:66
 msgid "Decimal"
-msgstr "Dezimal"
+msgstr "Komma"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:890
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:881
 msgid "Decompress ISO..."
 msgstr "ISO dekomprimieren..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:906
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:900
 msgid "Decompress selected ISOs..."
 msgstr "Ausgewählte ISOs dekomprimieren..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1088
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1224
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1089
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1225
 msgid "Decompressing ISO"
 msgstr "Dekomprimiere ISO"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:912
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:903
 msgid "Default"
 msgstr "Standard"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:835
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:816
 msgid "Default ISO:"
 msgstr "Standard ISO:"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:114
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:107
 msgid "Default font"
 msgstr "Standard Schriftart"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:32
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:926
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:19
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917
 msgid "Delete"
-msgstr "Löschen"
+msgstr "Entfernen"
 
 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:790
 msgid "Delete Save"
 msgstr "Spielstand löschen"
 
-#: Source/Core/VideoCommon/Src/AVIDump.cpp:77
+#: Source/Core/VideoCommon/Src/AVIDump.cpp:64
 #, c-format
 msgid "Delete the existing file '%s'?"
 msgstr "Wollen Sie die vorhandende Datei '%s' löschen?"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:671
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:683
 msgid "Description"
 msgstr "Beschreibung"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:472
 msgid "Detect"
 msgstr "Erkenne"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:233
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:328
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:220
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:315
 msgid ""
 "Detected attempt to read more data from the DVD than fit inside the out "
 "buffer. Clamp."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:127
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:898
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:114
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:889
 msgid "Device"
 msgstr "Gerät"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:798
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:731
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779
 msgid "Device Settings"
 msgstr "Geräteeinstellungen"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:45
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:49
 msgid "Dial"
 msgstr "Skala"
 
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:146
+#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:135
 msgid "Direct3D11"
 msgstr "Direct3D11"
 
-#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:128
+#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:125
 msgid "Direct3D9"
 msgstr "Direct3D9"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:167
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:155
 msgid ""
 "Directory checksum failed\n"
 " and Directory backup checksum failed"
@@ -1580,16 +1613,20 @@ msgstr ""
 "Die Verzeichnis-Prüfsumme ist fehlerhaft,\n"
 "und ebenfalls die Backup-Verzeichnis-Prüfsumme."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:433
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:443
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485
 msgid "Disable"
 msgstr "Deaktivieren"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:491
-msgid "Disable Fog"
-msgstr "kein Nebel"
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501
+msgid "Disable Destination Alpha"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:409
+msgid "Disable Fog"
+msgstr "Nebel deaktivieren"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108
 msgid ""
 "Disable any XFB emulation.\n"
 "Speeds up emulation a lot but causes heavy glitches in many games which rely "
@@ -1597,8 +1634,13 @@ msgid ""
 "\n"
 "If unsure, leave this checked."
 msgstr ""
+"Deaktiviert jegliche XFB-Emulation.\n"
+"Dadurch wird die Emulation beschleunigt, auf Kosten von vielen Problemen in "
+"davon abhängigen Spielen (insbesondere Homebrew)´.\n"
+"\n"
+"Aktiviere diese Option nur, wenn du weißt, was du tust."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95
 msgid ""
 "Disable emulation of EFB copies.\n"
 "These are often used for post-processing or render-to-texture effects, so "
@@ -1607,70 +1649,87 @@ msgid ""
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
+"Deaktiviert die Emulation von EFB-Kopien.\n"
+"Diese werden oft für Post-Processing- oder Render to Texture-Effekte "
+"verwendet. Die Option ist zwar mit einer schnelleren Emulation verbunden, "
+"aber verursacht fast immer Probleme.\n"
+"\n"
+"Aktiviere diese Option nur, wenn du weißt, was du tust."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:543
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101
+msgid ""
+"Disables emulation of a hardware feature called destination alpha, which is "
+"used in many games for various graphical effects.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:553
 msgid "Disc"
 msgstr "Disc"
 
-#: Source/Core/DiscIO/Src/DriveBlob.cpp:107
-#: Source/Core/DiscIO/Src/DriveBlob.cpp:126
+#: Source/Core/DiscIO/Src/DriveBlob.cpp:94
+#: Source/Core/DiscIO/Src/DriveBlob.cpp:113
 msgid "Disc Read Error"
 msgstr "Disc Lesefehler"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:312
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:320
 msgid "Display"
 msgstr "Anzeige"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104
 msgid ""
 "Display the inputs read by the emulator.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
+"Zeigt die vom Emulator gelesenen Eingaben an.\n"
+"\n"
+"Aktiviere diese Option nur, wenn du weißt, was du tust."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:80
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:67
 msgid "Divide"
-msgstr "Dividieren"
+msgstr "Division"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:987
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:990
 msgid "Do you want to stop the current emulation?"
 msgstr "Laufende Emulation stoppen?"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:663
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:644
 msgid "Dolby Pro Logic II decoder"
 msgstr "Dolby Pro Logic II Dekodierer"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:864
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:856
 msgid "Dolphin"
 msgstr "Dolphin"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:183
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:188
 #, c-format
 msgid "Dolphin %s Graphics Configuration"
 msgstr "Dolphin %s Grafik Einstellungen"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:292
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:298
 msgid "Dolphin &Web Site"
-msgstr "Dolphin &Webseite"
+msgstr "Dolphin-&Webseite"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.h:37
+#: Source/Core/DolphinWX/Src/ConfigMain.h:24
 msgid "Dolphin Configuration"
-msgstr "Dolphin Einstellungen"
+msgstr "Dolphin-Einstellungen"
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:183
 msgid "Dolphin Emulated Wiimote Configuration"
 msgstr "Dolphin Emulierte-Wiimote Einstellungen"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:394
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:383
 msgid "Dolphin FIFO"
-msgstr "Dolphin FIFO"
+msgstr "Dolphin-FIFO"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1136
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1153
 msgid "Dolphin GCPad Configuration"
 msgstr "Dolphin GCPad Konfiguration"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:679
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1074
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:685
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1089
 msgid "Dolphin TAS Movies (*.dtm)"
 msgstr "Dolphin TAS Filme (*.dtm)"
 
@@ -1678,11 +1737,11 @@ msgstr "Dolphin TAS Filme (*.dtm)"
 msgid "Dolphin Wiimote Configuration"
 msgstr "Dolphin Wiimote Einstellungen"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:293
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:299
 msgid "Dolphin at &Google Code"
 msgstr "Dolphin auf &Google Code"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:364
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:351
 msgid ""
 "Dolphin could not find any GC/Wii ISOs.  Doubleclick here to browse for "
 "files..."
@@ -1690,7 +1749,7 @@ msgstr ""
 "Dolphin konnte keine GC oder Wii ISOs finden.  Hier doppelklicken um nach "
 "ISOs zu suchen..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:368
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:355
 msgid ""
 "Dolphin is currently set to hide all games.  Doubleclick here to show all "
 "games..."
@@ -1698,85 +1757,106 @@ msgstr ""
 "Dolphin ist so eingestellt, dass alle Spiele versteckt werden. Hier "
 "doppelklicken um alle Spiele anzuzeigen..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1159
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1160
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1246
 msgid "Dolphin was unable to complete the requested action."
 msgstr "Dolphin war nicht in der Lage die gewünschte Aktion auszuführen."
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:275
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:58
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
+#, fuzzy
+msgid ""
+"Doubles the emulated GPU clock rate. May speed up some games (ON = Fast, OFF "
+"= Compatible)"
+msgstr ""
+"Aktiviert schnellen Zugriff auf die Disc. Wird für einige Spiele benötigt. "
+"(ON = Schnell, OFF = Kompatibel)"
+
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:262
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:45
 msgid "Down"
-msgstr "Runter"
+msgstr "Unten"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:54
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:44
 msgid "Download Codes (WiiRD Database)"
-msgstr "Codes Herunterladen (WiiRD Database)"
+msgstr "Codes Herunterladen (WiiRD)"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:297
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:287
 #, c-format
 msgid "Downloaded %lu codes. (added %lu)"
 msgstr "%lu Codes heruntergeladen. (%lu hinzugefügt)"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:31
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:35
 msgid "Drums"
 msgstr "Trommeln"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:105
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
 msgid "Dummy"
 msgstr "Dummy"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:661
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:642
 msgid "Dump Audio"
 msgstr "Audio dumpen"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:532
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545
 msgid "Dump EFB Target"
 msgstr "EFB-Target dumpen"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546
 msgid "Dump Frames"
 msgstr "Frames dumpen"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543
 msgid "Dump Textures"
 msgstr "Texturen dumpen"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114
 msgid ""
 "Dump all rendered frames to an AVI file in User/Dump/Frames/\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
+"Schreibt alle während der Emulation gerenderten Bilder in eine AVI-Datei in "
+"User/Dump/Frames.\n"
+"\n"
+"Aktiviere diese Option nur, wenn du weißt, was du tust."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111
 msgid ""
 "Dump decoded game textures to User/Dump/Textures/<game_id>/\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
+"Speichert alle während der Emulation decodierten Spiele-Texturen in den "
+"Ordner User/Dump/Textures/<game_id>/.\n"
+"\n"
+"Aktiviere diese Option nur, wenn du weißt, was du tust."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113
 msgid ""
 "Dump the contents of EFB copies to User/Dump/Textures/\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
+"Speichert alle während der Emulation erzeugten EFB-Kopien in den Ordner User/"
+"Dump/Textures/.\n"
+"\n"
+"Aktiviere diese Option nur, wenn du weißt, was du tust."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:474
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292
 msgid "Dutch"
 msgstr "Holländisch"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:112
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:113
 msgid "E&xit"
 msgstr "&Beenden"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:441
 msgid "EFB Copies"
 msgstr "EFB Kopien"
 
-#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:223
+#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:210
 #, c-format
 msgid ""
 "ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least "
@@ -1788,52 +1868,52 @@ msgstr ""
 "mindestens Version %d.%d -- Wenn du Dolphin kürzlich aktualisiert hast, ist "
 "eventuell ein Neustart nötig, damit Windows den neuen Treiber erkennt."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:166
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:160
 msgid "EUROPE"
 msgstr "EUROPA"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:156
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:143
 msgid "Early Memory Updates"
 msgstr "Frühe Speicher Updates"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:447
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:453
 msgid "Edit"
 msgstr "Bearbeiten"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.h:30
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.h:17
 msgid "Edit ActionReplay Code"
 msgstr "ActionReplay Code bearbeiten"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:285
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:286
 msgid "Edit Config"
 msgstr "Einstellungen bearbeiten"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.h:30
+#: Source/Core/DolphinWX/Src/PatchAddEdit.h:17
 msgid "Edit Patch"
 msgstr "Patch bearbeiten"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:447
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:453
 msgid "Edit current perspective"
 msgstr "Aktuelle Ansicht ändern"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:403
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:425
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:407
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:429
 msgid "Edit..."
 msgstr "Bearbeiten..."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:44
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:48
 msgid "Effect"
 msgstr "Effekt"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:425
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435
 msgid "Embedded Frame Buffer"
 msgstr ""
 
-#: Source/Core/Core/Src/Core.cpp:201
+#: Source/Core/Core/Src/Core.cpp:190
 msgid "Emu Thread already running"
 msgstr "Emu-Thread läuft bereits."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110
 msgid ""
 "Emulate XFBs accurately.\n"
 "Slows down emulation a lot and prohibits high-resolution rendering but is "
@@ -1841,8 +1921,14 @@ msgid ""
 "\n"
 "If unsure, check virtual XFB emulation instead."
 msgstr ""
+"Aktiviert die exakte Emulation von XFB.\n"
+"Dies beinträchtigt die emulationsgeschwindigkeit erheblich und verhindert "
+"das Rendern in hohen Auflösungen, wird aber für die korrekte Emulation "
+"einiger Spiele benötigt.\n"
+"\n"
+"Aktiviere diese Option nur, wenn du weißt, was du tust."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109
 msgid ""
 "Emulate XFBs using GPU texture objects.\n"
 "Fixes many games which don't work without XFB emulation while not being as "
@@ -1851,20 +1937,27 @@ msgid ""
 "\n"
 "If unsure, leave this checked."
 msgstr ""
+"Emuliert XFB unter Verwendung von GPU-Texturobjekten.\n"
+"Dies behebt Probleme in vielen Spielen, die ohne XFB-Emulation nicht "
+"funktionieren und nebenbei erheblich schneller als die exakte XFB-Emulation "
+"ist. Dennoch ist diese Option für viele Spiele (insbesondere Homebrew) nicht "
+"ausreichend.\n"
+"\n"
+"Aktiviere diese Option nur, wenn du weißt, was du tust."
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:24
 msgid "Emulated Wiimote"
 msgstr "Emulierte Wiimote"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346
 msgid "Emulation State: "
-msgstr "Emulierbarkeit:"
+msgstr "Status:"
 
 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22
 msgid "Enable"
 msgstr "Aktivieren"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91
 msgid ""
 "Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's "
 "supported by your GPU.\n"
@@ -1873,73 +1966,77 @@ msgid ""
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
+"Aktiviert, sofern von deiner GPU unterstützt, 3D-Effekte mittels "
+"Stereoskopie unter Verwendung der Nvidia 3D Vision-Technologie.\n"
+"Verursacht gerne Probleme und funktioniert nur im Vollbildmodus.\n"
+"\n"
+"Aktiviere diese Option nur, wenn du weißt, was du tust."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:111
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:98
 msgid "Enable AR Logging"
 msgstr "AR Logging aktivieren"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324
 msgid "Enable Block Merging"
 msgstr "Blockvereinigung aktivieren"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331
 msgid "Enable Bounding Box Calculation"
 msgstr "Aktiviere Bounding Box Calculation"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:446
 msgid "Enable Cache"
 msgstr "Aktiviere Cache"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:562
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542
 msgid "Enable Cheats"
 msgstr "Cheats aktivieren"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310
 msgid "Enable Dual Core"
 msgstr "Dual Core aktivieren"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
 msgid "Enable Dual Core (speedup)"
 msgstr "Dual Core aktivieren (Beschleunigung)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:550
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:563
 msgid "Enable Hotkeys"
-msgstr "Tastenkürzel aktivieren"
+msgstr "Kurztasten aktivieren"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311
 msgid "Enable Idle Skipping"
 msgstr "Idle-Skipping aktivieren"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541
 msgid "Enable Idle Skipping (speedup)"
-msgstr "Idle-Skipping aktivieren (Beschleunigung)"
+msgstr "Idle-Skipping aktivieren (schneller)"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312
 msgid "Enable MMU"
 msgstr "MMU aktivieren"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:554
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:567
 msgid "Enable Progressive Scan"
-msgstr "Vollbildverfahren aktivieren"
+msgstr "Progressiven Scan aktivieren"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757
 msgid "Enable Screen Saver"
-msgstr "Aktiviere Bildschirmschoner"
+msgstr "Bildschirmschoner aktivieren"
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:75
-#, fuzzy
 msgid "Enable Speaker Data"
-msgstr "Blättern verwenden"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
 msgid "Enable WideScreen"
 msgstr "Breitbildmodus"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:516
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529
 msgid "Enable Wireframe"
-msgstr "Drahtgitter aktivieren"
+msgstr "Wireframe aktivieren"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85
 msgid ""
 "Enable anisotropic filtering.\n"
 "Enhances visual quality of textures that are at oblique viewing angles.\n"
@@ -1948,7 +2045,7 @@ msgid ""
 "If unsure, select 1x."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323
 msgid ""
 "Enable fast disc access.  Needed for a few games. (ON = Fast, OFF = "
 "Compatible)"
@@ -1960,7 +2057,7 @@ msgstr ""
 msgid "Enable pages"
 msgstr "Blättern verwenden"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76
 msgid ""
 "Enable this if you want the whole screen to be used for rendering.\n"
 "If this is disabled, a render window will be created instead.\n"
@@ -1968,7 +2065,7 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80
 msgid ""
 "Enable this if you want to use the main Dolphin window for rendering rather "
 "than a separate render window.\n"
@@ -1976,7 +2073,7 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:335
 msgid ""
 "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for "
 "ANY other game."
@@ -1984,11 +2081,11 @@ 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:337
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340
 msgid "Enables Custom Projection Hack"
 msgstr "Benutzerdefinierten Projection-Hack aktivieren"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:528
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508
 msgid ""
 "Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on "
 "OSX."
@@ -1996,20 +2093,20 @@ msgstr ""
 "Dolby Pro Logic II Emulation wird aktiviert, indem 5.1 Surround verwendet "
 "wird. Nicht für OS X verfügbar."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510
 msgid ""
 "Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only."
 msgstr ""
 "Dolby Pro Logic II Emulation wird aktiviert, indem 5.1 Surround verwendet "
 "wird. Funktioniert nur mit OpenAL backend."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:512
 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
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81
 msgid ""
 "Enables progressive scan if supported by the emulated software.\n"
 "Most games don't care about this.\n"
@@ -2017,7 +2114,7 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313
 msgid ""
 "Enables the Memory Management Unit, needed for some games. (ON = Compatible, "
 "OFF = Fast)"
@@ -2025,66 +2122,68 @@ msgstr ""
 "Aktiviert die Speicher-Verwaltungs-Einheit, die für einige Spiele gebraucht "
 "wird. (ON = Kompatibel, OFF = Schnell)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116
 msgid ""
 "Encode frame dumps using the FFV1 codec.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:40
 msgid "End"
 msgstr "Ende"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:469
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:280
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:260
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293
 msgid "English"
 msgstr "Englisch"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:329
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:407
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:337
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:417
 msgid "Enhancements"
-msgstr "Erweiterungen"
+msgstr "Verbesserungen"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:607
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:640
 msgid "Enter a name for the new perspective:"
 msgstr "Namen für die neue Ansicht eingeben:"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:191
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:178
 #, c-format
 msgid "Entry %d/%d"
 msgstr "Eintrag %d/%d"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:85
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:72
 #, c-format
 msgid "Entry 1/%d"
 msgstr "Eintrag 1/%d"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:204
 msgid "Equal"
 msgstr "Gleich"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:45
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:156
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1242
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:32
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:150
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226
 msgid "Error"
 msgstr "Fehler"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:381
+#: Source/Core/DolphinWX/Src/Main.cpp:409
 msgid "Error loading selected language. Falling back to system default."
 msgstr ""
 "Fehler beim Laden der ausgewählten Sprache. Kehre nun zu dem Systemstandart "
 "zurück."
 
-#: Source/Core/Common/Src/ChunkFile.h:226
+#: Source/Core/Common/Src/ChunkFile.h:221
 #, c-format
 msgid ""
 "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). "
 "Aborting savestate load..."
 msgstr ""
+"Fehler: Nach \"%s\" wurde %d (0x%X), anstatt %d (0x%X) gefunden. Spielstand "
+"laden wird abgebrochen..."
 
-#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:342
+#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:329
 #, c-format
 msgid ""
 "Error: Trying to access %s fonts but they are not loaded. Games may not show "
@@ -2093,38 +2192,38 @@ msgstr ""
 "Fehler: Versuche auf Schriftart %s zuzugreifen, aber sie wurde nicht "
 "geladen. Das Spiel wird die Schriftart nicht anzeigen, oder Abstürzen."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:30
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:17
 msgid "Escape"
 msgstr "Escape"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:26
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:30
 msgid "Euphoria"
 msgstr "Euphorie"
 
 #: Source/Core/Core/Src/ArmMemTools.cpp:78
-#: Source/Core/Core/Src/x64MemTools.cpp:217
+#: Source/Core/Core/Src/x64MemTools.cpp:206
 #, c-format
 msgid "Exception handler - access below memory space. %08llx%08llx"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:61
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
 msgid "Execute"
 msgstr "Ausführen"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:459
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:446
 msgid "Export Failed"
 msgstr "Exportieren fehlgeschlagen"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:639
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:649
 msgid "Export File"
 msgstr "Datei exportieren"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:177
 msgid "Export Recording"
 msgstr "Aufnahme exportieren"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:345
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:351
 msgid "Export Recording..."
 msgstr "Aufnahme exportieren..."
 
@@ -2132,7 +2231,7 @@ msgstr "Aufnahme exportieren..."
 msgid "Export Save"
 msgstr "Spielstand exportieren"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:874
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:865
 msgid "Export Wii save (Experimental)"
 msgstr "Wii Spielstand exportieren (Experimentell)..."
 
@@ -2140,103 +2239,103 @@ msgstr "Wii Spielstand exportieren (Experimentell)..."
 msgid "Export all saves"
 msgstr "Alle Spielstände exportieren"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:80
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:72
 msgid "Export failed, try again?"
 msgstr "Exportieren fehlgeschlagen, ein weiteres mal versuchen?"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:559
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:552
 msgid "Export save as..."
 msgstr "Spielstand exportieren als..."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:297
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:284
 msgid "Extension"
 msgstr "Erweiterung"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483
 msgid "External Frame Buffer"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:61
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:48
 msgid "Extra Parameter"
 msgstr "Extra Parameter"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:62
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:49
 msgid "Extra Parameter useful in ''Metroid: Other M'' only."
 msgstr "Extra Parameter nur in ''Metroid: Other M'' sinnvoll."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:614
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:624
 msgid "Extract All Files..."
 msgstr "Alle Dateien extrahieren..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:616
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:626
 msgid "Extract Apploader..."
 msgstr "Apploader extrahieren..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:617
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627
 msgid "Extract DOL..."
 msgstr "DOL extrahieren..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:610
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:620
 msgid "Extract Directory..."
 msgstr "Ordner extrahieren..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:612
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:622
 msgid "Extract File..."
 msgstr "Datei extrahieren..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:608
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:618
 msgid "Extract Partition..."
 msgstr "Partition extrahieren..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:724
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:738
 #, c-format
 msgid "Extracting %s"
 msgstr "Extrahiere %s"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:707
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:721
 msgid "Extracting All Files"
-msgstr "Alle Dateien extrahieren"
+msgstr "Extrahiere alle Dateien"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:707
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:721
 msgid "Extracting Directory"
-msgstr "Ordner extrahieren"
+msgstr "Extrahiere Ordner"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:710
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:724
 msgid "Extracting..."
 msgstr "Extrahieren..."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:892
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:893
 msgid "FIFO Byte"
 msgstr "FIFO Byte"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:45
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:32
 msgid "FIFO Player"
 msgstr "FIFO Player"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:169
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:163
 msgid "FRANCE"
 msgstr "FRANKREICH"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472
 msgid "FST Size:"
 msgstr "FST Größe:"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:77
+#: Source/Core/Core/Src/NetPlayClient.cpp:81
 msgid "Failed to Connect!"
 msgstr "Verbindungsaufbau fehlgeschlagen!"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:225
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:228
 msgid "Failed to Listen!!"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:307
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:300
 msgid "Failed to download codes."
-msgstr "Download von Codes ist Fehlgeschlagen."
+msgstr "Download der Codes fehlgeschlagen."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:827
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:843
 #, c-format
 msgid "Failed to extract to %s!"
-msgstr "Entpacken nach %s ist Fehlgeschlagen!"
+msgstr "Extrahieren nach %s ist fehlgeschlagen!"
 
 #: Source/Core/Core/Src/DSP/DSPCore.cpp:66
 #, c-format
@@ -2251,34 +2350,41 @@ msgid ""
 "(Choose it from the \"Audio\" tab of the configuration dialog.)"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:116
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:139
+#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:108
+#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:131
 msgid "Failed to load bthprops.cpl"
 msgstr "bthprops.cpl konnte nicht geladen werden."
 
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:100
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:109
+#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:90
+#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:101
 msgid "Failed to load hid.dll"
 msgstr "Fehler beim Laden von hid.dll"
 
-#: Source/Core/Core/Src/Movie.cpp:792
+#: Source/Core/Core/Src/Movie.cpp:783
 #, c-format
 msgid "Failed to read %s"
 msgstr "Konnte %s nicht lesen"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:151
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:144
 msgid "Failed to read banner.bin"
 msgstr "Fehler beim Lesen von banner.bin"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:223
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:178
+msgid "Failed to read bk header"
+msgstr ""
+
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:211
 #, c-format
 msgid ""
 "Failed to read block %d of the save data\n"
 "Memcard may be truncated\n"
 "FilePosition:%llx"
 msgstr ""
+"Konnte Block %d der Speicherdaten nicht lesen.\n"
+"Die Speicherkarte ist vermutlich unvollständig.\n"
+"FilePosition: %llx"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:148
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:136
 msgid ""
 "Failed to read block allocation table backup correctly\n"
 "(0x8000-0x9FFF)"
@@ -2286,7 +2392,7 @@ msgstr ""
 "Konnte das Blockzuteilungtabellen-Backup nicht richtig lesen\n"
 "(0x8000-0x9FFF)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:142
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:130
 msgid ""
 "Failed to read block allocation table correctly\n"
 "(0x6000-0x7FFF)"
@@ -2294,12 +2400,17 @@ msgstr ""
 "Konnte die Blockzuteilungtabellen nicht richtig lesen\n"
 "(0x6000-0x7FFF)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:286
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:279
 #, c-format
 msgid "Failed to read data from file %d"
 msgstr "Fehler beim Lesen von Daten aus Datei %d"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:136
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:367
+#, c-format
+msgid "Failed to read data from file: %s"
+msgstr ""
+
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:124
 msgid ""
 "Failed to read directory backup correctly\n"
 "(0x4000-0x5FFF)"
@@ -2307,7 +2418,7 @@ msgstr ""
 "Konnte das Backup-Verzeichnis nicht richtig lesen\n"
 "(0x4000-0x5FFF)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:130
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:118
 msgid ""
 "Failed to read directory correctly\n"
 "(0x2000-0x3FFF)"
@@ -2315,7 +2426,11 @@ msgstr ""
 "Konnte das Verzeichnis nicht richtig lesen\n"
 "(0x2000-0x3FFF)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:119
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:90
+msgid "Failed to read header"
+msgstr ""
+
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:107
 msgid ""
 "Failed to read header correctly\n"
 "(0x0000-0x1FFF)"
@@ -2323,63 +2438,63 @@ msgstr ""
 "Konnte den Header nicht richtig lesen\n"
 "(0x0000-0x1FFF)"
 
-#: Source/Core/DiscIO/Src/VolumeGC.cpp:61
+#: Source/Core/DiscIO/Src/VolumeGC.cpp:48
 msgid "Failed to read unique ID from disc image"
 msgstr "Fehler beim Lesen einer eindeutigen ID des Disc-Images."
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:84
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:71
 msgid "Failed to write BT.DINF to SYSCONF"
 msgstr "Fehler beim Schreiben von BT.DINF nach SYSCONF"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:228
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:221
 msgid "Failed to write bkhdr"
 msgstr "Fehler beim Schreiben von bkhdr"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:164
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:157
 #, c-format
 msgid "Failed to write header for %s"
 msgstr "Fehler beim Schreiben eines Header für %s"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:258
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:251
 #, c-format
 msgid "Failed to write header for file %d"
 msgstr "Fehler beim Schreiben eines Header für Datei %d"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294
 msgid "Farsi"
 msgstr "Farsi"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477
 msgid "Fast"
 msgstr "Schnell"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315
 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:1046
+#: Source/Core/Core/Src/Movie.cpp:1037
 #, c-format
 msgid ""
 "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:199
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:202
 msgid "Fifo Player"
 msgstr "Fifo Player"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:99
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:86
 msgid "File Info"
-msgstr "Dateiinformationen"
+msgstr "Datei-Informationen"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:304
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:295
 msgid "File contained no codes."
 msgstr "Datei enthielt keine Codes."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:413
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:400
 msgid "File converted to .gci"
 msgstr "Datei zu .gci konvertiert."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:428
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:415
 msgid ""
 "File could not be opened\n"
 "or does not have a valid extension"
@@ -2387,7 +2502,7 @@ msgstr ""
 "Datei konnte nicht geöffnet werden\n"
 "oder hat keine gültige Erweiterung"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:84
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:72
 #, c-format
 msgid ""
 "File has the extension \"%s\"\n"
@@ -2396,36 +2511,36 @@ msgstr ""
 "Die Datei besitzt die Erweiterung \"%s\",\n"
 "gültige Erweiterungen sind (.raw/.gcp)."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:425
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:412
 msgid "File is not recognized as a memcard"
 msgstr "Diese Datei wird nicht als Memorycard anerkannt."
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:294
+#: Source/Core/DiscIO/Src/CompressedBlob.cpp:281
 msgid "File not compressed"
 msgstr "Datei nicht komprimiert"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:127
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:109
 #, c-format
 msgid "FileIO: Unknown open mode : 0x%02x"
 msgstr "FileIO: Unbekanter Open-Modus : 0x%02x"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:531
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:541
 msgid "Filesystem"
 msgstr "Dateisystem"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1100
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1126
 msgid "Filetype 'ini' is unknown! Will not open!"
 msgstr "Der Datentyp 'ini' ist unbekannt! Wird nicht geöffnet!"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:265
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:252
 msgid "Find next"
 msgstr "Finde nächste"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:266
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:253
 msgid "Find previous"
 msgstr "Finde vorherige"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:632
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626
 msgid "First Block"
 msgstr "Erster Block"
 
@@ -2433,23 +2548,23 @@ msgstr "Erster Block"
 msgid "Fix Checksums"
 msgstr "Prüfsummen korrigieren"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:275
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283
 msgid "Force 16:9"
 msgstr "16:9 erzwingen"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:275
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283
 msgid "Force 4:3"
 msgstr "4:3 erzwingen"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:568
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548
 msgid "Force Console as NTSC-J"
-msgstr "Erzwinge NTSC-J "
+msgstr "NTSC-J erzwingen"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406
 msgid "Force Texture Filtering"
-msgstr "Erzwinge Filtern von Texturen"
+msgstr "Texturfilterung erzwingen"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90
 msgid ""
 "Force texture filtering even if the emulated game explicitly disabled it.\n"
 "Improves texture quality slightly but causes glitches in some games.\n"
@@ -2457,7 +2572,7 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83
 msgid ""
 "Force the game to output graphics for widescreen resolutions.\n"
 "Causes graphical glitches is some games.\n"
@@ -2465,16 +2580,18 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 "Zwingt das Spiel, Grafiken für Breitbild-Auflösungen auszugeben.\n"
-"Dies kann Grafikfehler verursachen!"
+"Dies kann Grafikfehler verursachen!\n"
+"\n"
+"Aktiviere diese Option nur, wenn du weißt, was du tust."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488
 msgid ""
 "Forces NTSC-J mode for using the Japanese ROM font.\n"
 "Left unchecked, dolphin defaults to NTSC-U and automatically enables this "
 "setting when playing Japanese games."
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:74
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:62
 msgid ""
 "Format as ascii (NTSC\\PAL)?\n"
 "Choose no for sjis (NTSC-J)"
@@ -2482,148 +2599,147 @@ msgstr ""
 "Das Format ähnelt dem ASCII-Zeichensatz (NTSC\\PAL)?\n"
 "Wähle 'Nein' für SJIS (NTSC-J)."
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:278
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:265
 msgid "Forward"
 msgstr "Vorwärts"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504
 #, c-format
 msgid "Found %d results for '"
 msgstr "%d Ergebnisse gefunden für '"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:857
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:925
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:858
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:926
 msgid "Frame"
 msgstr "Bild"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:867
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:868
 msgid "Frame "
 msgstr "Bild"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:185
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:173
 msgid "Frame Advance"
 msgstr "Einzelbildwiedergabe"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:536
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549
 msgid "Frame Dumps use FFV1"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:227
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:214
 msgid "Frame Info"
 msgstr "Bildinfo"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:116
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:103
 msgid "Frame Range"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:138
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:139
 msgid "Frame S&kipping"
 msgstr "Frames ü&berspringen"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:572
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552
 msgid "Framelimit:"
 msgstr "Framelimit:"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:204
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:191
 msgid "Frames To Record"
 msgstr "Bilder zum Aufzeichnen"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547
 msgid "Free Look"
 msgstr "Frei Umsehen"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
 msgid "French"
 msgstr "Französisch"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:38
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:42
 msgid "Frets"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:118
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:137
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:105
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:124
 msgid "From"
 msgstr "von"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:426
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:432
 msgid "FullScr"
 msgstr "Vollbild"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:256
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263
 msgid "Fullscreen resolution:"
 msgstr "Vollbildauflösung:"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:534
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524
 msgid "GCI File(*.gci)"
 msgstr "GCI Datei(*.gci)"
 
-#: Source/Core/DolphinWX/Src/GCMicDlg.h:44
+#: Source/Core/DolphinWX/Src/GCMicDlg.h:31
 msgid "GCMic Configuration"
 msgstr "GCMic Konfiguration"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:432
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
 msgid "GCPad"
 msgstr "GC-Pad"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:659
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:658
 msgid "GX_CMD_INVL_VC"
 msgstr "GX_CMD_INVL_VC"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:448
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:452
 msgid "Game ID:"
-msgstr "Spiel ID:"
+msgstr "Spiel-ID:"
 
-#: Source/Core/Core/Src/NetPlay.cpp:229
+#: Source/Core/Core/Src/NetPlay.cpp:216
 msgid "Game is already running!"
 msgstr "Spiel wird bereits emuliert!"
 
-#: Source/Core/Core/Src/NetPlay.cpp:259
+#: Source/Core/Core/Src/NetPlay.cpp:246
 msgid "Game isn't running!"
 msgstr "Spiel wird nicht emuliert!"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:389
-#, fuzzy
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:393
 msgid "Game not found!"
 msgstr "Spiel nicht gefunden!"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:385
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:389
 msgid "Game-Specific Settings"
 msgstr "Spiel-Spezifische Einstellungen"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:293
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:294
 msgid "GameConfig"
 msgstr "Spieleinstellungen"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:525
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:515
 msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)"
 msgstr "GameCube Speicherdateien (*.gci;*.gcs;*.sav)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534
 msgid "Gamecube"
 msgstr "Gamecube"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:178
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:181
 msgid "Gamecube &Pad Settings"
 msgstr "GameCube &Pad Einstellungen"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:218
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1069
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:205
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1052
 msgid "Gamecube Memory Cards (*.raw,*.gcp)"
-msgstr "Gamecube Memory Cards (*.raw,*.gcp)"
+msgstr "Gamecube-Speicherkarten (*.raw,*.gcp)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:432
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
 msgid "Gamecube Pad settings"
 msgstr "Gamecube Pad Einstellungen"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:117
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302
 msgid "Gecko Codes"
-msgstr "Gecko Codes"
+msgstr "Gecko-Codes"
 
-#: Source/Core/Core/Src/GeckoCode.cpp:222
+#: Source/Core/Core/Src/GeckoCode.cpp:214
 #, c-format
 msgid ""
 "GeckoCode failed to run (CT%i CST%i) (%s)\n"
@@ -2632,10 +2748,10 @@ msgid ""
 "directory and restarting Dolphin.)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:172
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:197
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:160
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:160
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:202
 msgid "General"
 msgstr "Allgemein"
 
@@ -2643,30 +2759,30 @@ msgstr "Allgemein"
 msgid "General Settings"
 msgstr "Allgemeine Einstellungen"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:470
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:281
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:316
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:261
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
 msgid "German"
 msgstr "Deutsch"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:449
+#: Source/Core/Core/Src/ActionReplay.cpp:439
 #, 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:430
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:436
 msgid "Graphics"
 msgstr "Grafik"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:430
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:436
 msgid "Graphics settings"
-msgstr "Grafik Einstellungen"
+msgstr "Grafikeinstellungen"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:205
 msgid "Greater Than"
 msgstr "Größer als"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87
 msgid ""
 "Greatly increases quality of textures generated using render to texture "
 "effects.\n"
@@ -2677,51 +2793,67 @@ msgid ""
 "If unsure, leave this checked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:317
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
 msgid "Greek"
 msgstr "Griechisch"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:22
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Green"
 msgstr "Grün"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:24
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Green Left"
 msgstr "Grün links"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:25
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Green Right"
 msgstr "Grün rechts"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:35
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:39
 msgid "Guitar"
 msgstr "Gitarre"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1259
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1250
 msgid "HCI_CMD_INQUIRY is called, please report!"
 msgstr "HCI_CMD_INQUIRY wurde aufgerufen, bitte berichten!"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:421
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504
+msgid "Hacked Buffer Upload"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431
 msgid "Hacks"
 msgstr "Hacks"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:158
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:146
 msgid "Header checksum failed"
 msgstr "Header-Prüfsumme fehlerhaft"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:318
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298
 msgid "Hebrew"
 msgstr "Hebräisch"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:313
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:300
 msgid "Height"
 msgstr "Höhe"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:64
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:51
 msgid "Help"
 msgstr "Hilfe"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:209
+#: Source/Core/DolphinWX/Src/Main.cpp:229
+msgid ""
+"Hi,\n"
+"\n"
+"Dolphin requires Mac OS X 10.7 or greater.\n"
+"Unfortunately you're running an old version of OS X.\n"
+"The last Dolphin version to support OS X 10.6 is Dolphin 3.5\n"
+"Please upgrade to 10.7 or greater to use the newest Dolphin version.\n"
+"\n"
+"Sayonara!\n"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/Main.cpp:220
 msgid ""
 "Hi,\n"
 "\n"
@@ -2738,77 +2870,73 @@ msgstr ""
 "\n"
 "Sayonara!\n"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:309
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:296
 msgid "Hide"
 msgstr "Verbergen"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:307
 msgid "Hide Mouse Cursor"
-msgstr "Mauszeiger verstecken"
+msgstr "Mauszeiger ausblenden"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79
 msgid ""
 "Hides the mouse cursor if it's on top of the emulation window.\n"
 "\n"
 "If unsure, leave this checked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:54
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41
 msgid "Home"
-msgstr "Home"
+msgstr "Pos1"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:85
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:138
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:76
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:141
 msgid "Host"
 msgstr "Host"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.h:44
+#: Source/Core/DolphinWX/Src/HotkeyDlg.h:31
 msgid "Hotkey Configuration"
-msgstr "Tastenkürzel Einstellungen"
+msgstr "Kurztastenbelegung"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:272
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:272
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:594
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:260
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:260
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574
 msgid "Hotkeys"
-msgstr "Tastenkürzel"
+msgstr "Kurztasten"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:319
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299
 msgid "Hungarian"
 msgstr "Ungarisch"
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:24
 msgid "Hybrid Wiimote"
-msgstr "Hybrid Wiimote"
+msgstr "Hybride Wiimote"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:532
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:519
 #, 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:786
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:773
 #, c-format
 msgid ""
-"IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available "
-"in your nand dump\n"
+"IOCTL_ES_LAUNCH: Game tried to reload an IOS or a title that is not "
+"available in your NAND dump\n"
 "TitleID %016llx.\n"
-" Dolphin will likely hang now"
+" Dolphin will likely hang now."
 msgstr ""
-"IOCTL_ES_LAUNCH: Das Spiel versucht ein IOS oder ein Titel, der nicht in "
-"Ihrer NAND-Dump verfügbar ist, neu zu laden.\n"
-"TitleID %016llx.\n"
-" Dolphin wird wahrscheinlich jetzt hängen bleiben."
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:313
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:300
 msgid "IOCTL_ES_READCONTENT - bad destination"
-msgstr "IOCTL_ES_READCONTENT - Fehlerhafte Beschreibung"
+msgstr "IOCTL_ES_READCONTENT - Fehlerhaftes Ziel"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729
 msgid "IPL Settings"
-msgstr "IPL Einstellungen"
+msgstr "IPL-Einstellungen"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269
 msgid "IR"
 msgstr "IR"
 
@@ -2818,49 +2946,35 @@ msgstr "IR-Zeiger"
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:95
 msgid "IR Sensitivity:"
-msgstr "IR-Empfindlichkeit"
+msgstr "IR-Empfindlichkeit:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:502
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:512
 msgid "ISO Details"
-msgstr "ISO Details"
+msgstr "ISO-Details"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:830
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:811
 msgid "ISO Directories"
-msgstr "ISO Verzeichnisse"
+msgstr "ISO-Verzeichnisse"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:172
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:166
 msgid "ITALY"
 msgstr "ITALIEN"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:630
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:624
 msgid "Icon"
 msgstr "Symbol"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332
 msgid ""
 "If checked, the bounding box registers will be updated. Used by the Paper "
 "Mario games."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318
-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:505
-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:428
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438
 msgid "Ignore Format Changes"
 msgstr "Formatänderungen ignorieren"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94
 msgid ""
 "Ignore any changes to the EFB format.\n"
 "Improves performance in many games without any negative effect. Causes "
@@ -2869,7 +2983,7 @@ msgid ""
 "If unsure, leave this checked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93
 msgid ""
 "Ignore any requests of the CPU to read from or write to the EFB.\n"
 "Improves performance in some games, but might disable some gameplay-related "
@@ -2882,11 +2996,11 @@ msgstr ""
 msgid "Import Save"
 msgstr "Spielstand importieren"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:59
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:48
 msgid "Import failed, try again?"
 msgstr "Importieren fehlgeschlagen, noch einmal versuchen?"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:454
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:441
 msgid ""
 "Imported file has gsc extension\n"
 "but does not have a correct header"
@@ -2894,11 +3008,11 @@ msgstr ""
 "Die importierte Datei hat die Erweiterung gsc, aber besitzt keinen korrekten "
 "Header."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:442
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:429
 msgid "Imported file has invalid length"
 msgstr "Importierte Datei hat eine ungültige Länge"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:451
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:438
 msgid ""
 "Imported file has sav extension\n"
 "but does not have a correct header"
@@ -2906,102 +3020,94 @@ msgstr ""
 "Importierte Datei hat die Erweiterung sav,\n"
 "aber besitzt keinen korrekten Header."
 
-#: 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/ISOProperties.cpp:347
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350
 msgid "In Game"
-msgstr "Ingame"
+msgstr "Im Spiel"
 
 #: Source/Core/DolphinWX/Src/NetWindow.cpp:594
 msgid "In-Game"
 msgstr "In-Game"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:34
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305
 msgid "Info"
 msgstr "Info"
 
-#: Source/Core/Common/Src/MsgHandler.cpp:65
+#: Source/Core/Common/Src/MsgHandler.cpp:51
 msgid "Information"
-msgstr "Informationen"
+msgstr "Information"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:481
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:468
 msgid "Input"
 msgstr "Eingabe"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:63
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:50
 msgid "Insert"
 msgstr "Einfügen"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:176
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:166
 msgid "Insert Encrypted or Decrypted code here..."
 msgstr "Verschlüsselten oder unverschlüsselten Code hier eingeben..."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:763
 msgid "Insert SD Card"
-msgstr "SD-Karte einlegen"
+msgstr "SD-Karte eingesetzt"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:34
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:21
 msgid "Insert name here.."
 msgstr "Namen hier eingeben.."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:196
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:199
 msgid "Install WAD"
-msgstr "Installiere WAD"
+msgstr "WAD installieren"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:895
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:888
 msgid "Install to Wii Menu"
 msgstr "Zum Wii-Menü hinzufügen"
 
-#: Source/Core/Core/Src/x64MemTools.cpp:252
+#: Source/Core/Core/Src/x64MemTools.cpp:242
 msgid ""
 "InstallExceptionHandler called, but this platform does not yet support it."
 msgstr ""
 "InstallExceptionHandler aufgerufen, aber diese Platform unterstüzt diesn "
 "noch nicht."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1297
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
 msgid "Installing WAD..."
-msgstr "Installiere WAD..."
+msgstr "WAD installieren..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:885
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:901
 msgid "Integrity Check Error"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:891
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:907
 msgid "Integrity check completed"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:890
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:906
 msgid "Integrity check completed. No errors have been found."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:882
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:898
 #, 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:552
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532
 msgid "Interface"
-msgstr "Interface"
+msgstr "Oberfläche"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:646
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627
 msgid "Interface Settings"
-msgstr "Interface Einstellungen"
+msgstr "Benutzeroberflächeneinstellungen"
 
-#: Source/Core/Core/Src/State.cpp:240
+#: Source/Core/Core/Src/State.cpp:228
 msgid "Internal LZO Error - compression failed"
 msgstr "Internationaler LZO-Fehler - Komprimierung fehlgeschlagen"
 
-#: Source/Core/Core/Src/State.cpp:348
+#: Source/Core/Core/Src/State.cpp:336
 #, c-format
 msgid ""
 "Internal LZO Error - decompression failed (%d) (%li, %li) \n"
@@ -3011,41 +3117,45 @@ msgstr ""
 "%li) \n"
 "Versuche diesen Status nochmal zu laden."
 
-#: Source/Core/Core/Src/State.cpp:485
+#: Source/Core/Core/Src/State.cpp:473
 msgid "Internal LZO Error - lzo_init() failed"
 msgstr "Internationaler LZO-Fehler - lzo_init() fehlerhaft"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:344
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:352
 msgid "Internal Resolution:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:42
+msgid "Interpreter (VERY slow)"
+msgstr "Interpreter (SEHR langsam)"
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349
 msgid "Intro"
 msgstr "Intro"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:194
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:187
 #, c-format
 msgid "Invalid Size(%x) or Magic word (%x)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:612
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:600
 msgid "Invalid Value!"
-msgstr "Ungültigen Wert!"
+msgstr "Ungültiger Wert!"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:462
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:449
 msgid "Invalid bat.map or dir entry"
 msgstr "Ungültige bat.map oder Verzeichnis-Eintrag"
 
-#: Source/Core/Core/Src/CoreTiming.cpp:548
+#: Source/Core/Core/Src/CoreTiming.cpp:553
 #, c-format
 msgid "Invalid event type %i"
 msgstr "Ungültiger Ereignis-Typ %i"
 
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:326
+#: Source/Core/Core/Src/HW/DVDInterface.cpp:309
 msgid "Invalid file"
 msgstr "Ungültige Datei"
 
-#: Source/Core/DiscIO/Src/BannerLoaderGC.cpp:41
+#: Source/Core/DiscIO/Src/BannerLoaderGC.cpp:28
 #, c-format
 msgid ""
 "Invalid opening.bnr found in gcm:\n"
@@ -3056,108 +3166,116 @@ msgstr ""
 "%s\n"
 " Möglicherweise müssen Sie dieses Spiel neu dumpen."
 
-#: Source/Core/Core/Src/Movie.cpp:735
+#: Source/Core/Core/Src/Movie.cpp:726
 msgid "Invalid recording file"
 msgstr "Ungültige Aufnahmedatei"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:473
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:472
 msgid "Invalid search parameters (no object selected)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:456
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:455
 msgid "Invalid search string (couldn't convert to number)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:444
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:443
 msgid "Invalid search string (only even string lengths supported)"
 msgstr ""
 
-#: Source/Core/Core/Src/Core.cpp:513
+#: Source/Core/Core/Src/Core.cpp:511
 msgid "Invalid state"
 msgstr "Ungültiger Status"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:473
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:320
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300
 msgid "Italian"
 msgstr "Italienisch"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:183
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:177
 msgid "JAPAN"
 msgstr "JAPAN"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:321
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:46
+msgid "JIT Recompiler (recommended)"
+msgstr "JIT-Recompiler (Empfohlen)"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:47
+msgid "JITIL experimental recompiler"
+msgstr "JITIL-Recompiler (Experimentell)"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:279
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
 msgid "Japanese"
 msgstr "Japanisch"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:188
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:182
 msgid "KOREA"
 msgstr "KOREA"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78
 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:298
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:306
 msgid "Keep window on top"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:241
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:241
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:229
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:229
 msgid "Key"
 msgstr "Taste"
 
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282
 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:322
 msgid "Korean"
 msgstr "Koreanisch"
 
 #. i18n:  Left
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:57
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:44
 msgid "L"
 msgstr "L"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:39
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:26
 msgid "L Button"
-msgstr "L Taste"
+msgstr "L-Taste"
 
 #. i18n:  Left-Analog
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:61
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:48
 msgid "L-Analog"
 msgstr "L-Analog"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:585
 msgid "Language:"
 msgstr "Sprache:"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:152
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:153
 msgid "Last Overwritten State"
 msgstr "Letzter überschriebener Status"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:159
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:161
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:160
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:162
 msgid "Last Saved State"
 msgstr "Letzter gespeicherter Status"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:696
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:677
 msgid "Latency:"
 msgstr "Latenz:"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:276
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:55
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:263
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:42
 msgid "Left"
 msgstr "Links"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:60
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:64
 msgid "Left Stick"
 msgstr "Stick links"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:257
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:257
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:245
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:245
 msgid ""
 "Left click to detect hotkeys.\n"
 "Enter space to clear."
@@ -3165,7 +3283,7 @@ msgstr ""
 "Zum Erkennen, auf Tastenkürzel linksklicken.\n"
 "Drücken Sie die Leertaste, zum löschen."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:689
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:678
 msgid ""
 "Left-click to detect input.\n"
 "Middle-click to clear.\n"
@@ -3175,7 +3293,7 @@ msgstr ""
 "Mittlere Maustaste zum Löschen.\n"
 "Rechtsklick für weitere Optionen."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:694
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:683
 msgid ""
 "Left/Right-click for more options.\n"
 "Middle-click to clear."
@@ -3183,83 +3301,83 @@ 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:206
 msgid "Less Than"
 msgstr "Kleiner als"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:565
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545
 msgid "Limit by FPS"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:924
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:915
 msgid "Load"
 msgstr "Laden"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544
 msgid "Load Custom Textures"
 msgstr "Lade benutzerdefinierte Texturen"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
 msgid "Load State Slot 1"
 msgstr "Status aus Slot 1 laden"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189
 msgid "Load State Slot 2"
 msgstr "Status aus Slot 2 laden"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:190
 msgid "Load State Slot 3"
 msgstr "Status aus Slot 3 laden"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:203
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:191
 msgid "Load State Slot 4"
 msgstr "Status aus Slot 4 laden"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192
 msgid "Load State Slot 5"
 msgstr "Status aus Slot 5 laden"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193
 msgid "Load State Slot 6"
 msgstr "Status aus Slot 6 laden"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:194
 msgid "Load State Slot 7"
 msgstr "Status aus Slot 7 laden"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:195
 msgid "Load State Slot 8"
 msgstr "Status aus Slot 8 laden"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:155
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:156
 msgid "Load State..."
 msgstr "Status laden..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1332
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1359
 msgid "Load Wii System Menu"
-msgstr "Lade Wii System Menü"
+msgstr "Wii-Systemmenü laden"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1327
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1354
 #, c-format
 msgid "Load Wii System Menu %d%c"
-msgstr "Lade Wii System Menü %d%c"
+msgstr "Wii-Systemmenü %d%c laden"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112
 msgid ""
 "Load custom textures from User/Load/Textures/<game_id>/\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:50
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:37
 msgid "Load preset values from hack patterns available."
 msgstr ""
 
@@ -3267,23 +3385,23 @@ msgstr ""
 msgid "Local"
 msgstr "Lokal"
 
-#: Source/Core/DolphinWX/Src/LogWindow.h:51
+#: Source/Core/DolphinWX/Src/LogWindow.h:38
 msgid "Log"
 msgstr "Log"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:26
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:13
 msgid "Log Configuration"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:296
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304
 msgid "Log FPS to file"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:96
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83
 msgid "Log Types"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103
 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"
@@ -3291,24 +3409,24 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:81
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:68
 msgid "Logger Outputs"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132
-#: Source/Core/DolphinWX/Src/Frame.cpp:328
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:119
+#: Source/Core/DolphinWX/Src/Frame.cpp:314
 msgid "Logging"
 msgstr "Logging"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:255
+#: Source/Core/Core/Src/NetPlayClient.cpp:259
 msgid "Lost connection to server!"
 msgstr "Die Verbindung zum Server wurde getrennt!"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:42
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:29
 msgid "M Button"
 msgstr "Mittlere Taste"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:119
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:112
 #, c-format
 msgid ""
 "MD5 mismatch\n"
@@ -3317,51 +3435,60 @@ msgstr ""
 "MD5 Konflikt\n"
 " %016llx%016llx != %016llx%016llx"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314
 msgid "MMU Speed Hack"
 msgstr "MMU Speed Hack"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:527
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:563
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:517
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:556
 msgid "MadCatz Gameshark files(*.gcs)"
 msgstr "MadCatz Gameshark Dateien(*.gcs)"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:51
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:63
+#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:38
 msgid "Main Stick"
 msgstr "Main Stick"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460
 msgid "Maker ID:"
-msgstr "Hersteller ID"
+msgstr "Hersteller-ID:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487
 msgid "Maker:"
 msgstr "Hersteller:"
 
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100
+msgid ""
+"Makes distant objects more visible by removing fog, thus increasing the "
+"overall detail.\n"
+"Disabling fog will break some games which rely on proper fog emulation.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:97
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:100
 msgid "Max"
 msgstr "Max"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:448
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:435
 msgid "Memcard already has a save for this title"
-msgstr "Memorycard hat bereits eine Spielstand für diesen Tittel"
+msgstr "Die Speicherkarte enthält bereits ein Spiel mit dem gleichen Titel."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:291
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:278
 msgid "Memcard already opened"
 msgstr "Memorycard ist bereits geöffnet"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:912
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:913
 msgid "Memory Byte"
 msgstr "Seicherbyte"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:225
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:113
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:212
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:93
 msgid "Memory Card"
-msgstr "Memory Card"
+msgstr "Speicherkarte"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.h:36
+#: Source/Core/DolphinWX/Src/MemcardManager.h:23
 msgid ""
 "Memory Card Manager WARNING-Make backups before using, should be fixed but "
 "could mangle stuff!"
@@ -3369,7 +3496,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:371
+#: Source/Core/Core/Src/CoreParameter.cpp:360
 #, c-format
 msgid ""
 "Memory Card filename in Slot %c is incorrect\n"
@@ -3386,15 +3513,17 @@ msgstr ""
 "%s\n"
 "Möchten Sie die alte Datei, zu diesem neuen Speicherort kopieren?\n"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:124
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:112
 msgid "Memorycard filesize does not match the header size"
 msgstr ""
+"Die Dateigröße der Speicherkarte stimmt nicht mit der Dateigrößenangabe im "
+"Header überein."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:50
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:37
 msgid "Menu"
 msgstr "Menü"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:114
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:94
 msgid "Mic"
 msgstr "Mikrofon"
 
@@ -3403,20 +3532,20 @@ msgstr "Mikrofon"
 msgid "Min"
 msgstr "Min"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:580
 msgid "Misc"
 msgstr "Sonstiges"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:795
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776
 msgid "Misc Settings"
 msgstr "Sonstige Einstellungen"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:240
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:294
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:227
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:281
 msgid "Modifier"
 msgstr "Modifikator"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106
 msgid ""
 "Modify textures to show the format they're encoded in. Needs an emulation "
 "reset in most cases.\n"
@@ -3424,20 +3553,20 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:115
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:108
 msgid "Monospaced font"
 msgstr "Monospaced Schriftart"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:305
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:292
 msgid "Motion Plus"
 msgstr "Motion Plus"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:309
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:86
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:296
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73
 msgid "Motor"
 msgstr "Motor"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:654
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:666
 msgid ""
 "Move the mouse pointer over an option to display a detailed description.\n"
 "\n"
@@ -3447,225 +3576,246 @@ msgid ""
 "\n"
 "\n"
 msgstr ""
+"Bewege den Mauszeiger über eine Option um detaillierte Beschreibungen "
+"einzublenden.\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:75
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:62
 msgid "Multiply"
-msgstr "Stern"
+msgstr "Multiplikation"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:651
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:650
 msgid "NOP"
-msgstr ""
+msgstr "NOP"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:629
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:628
 msgid "NOTE: Stream size doesn't match actual data length\n"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:129
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:116
 msgid "NP Add"
-msgstr "NP Plus"
+msgstr "Num Addition"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:124
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:111
 msgid "NP Begin"
 msgstr "NP Start"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:132
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:119
 msgid "NP Decimal"
-msgstr "NP Komma"
+msgstr "Num Komma"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:126
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:113
 msgid "NP Delete"
-msgstr "NP Entf"
-
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:133
-msgid "NP Divide"
-msgstr "NP Geteilt"
+msgstr "Num Entf"
 
 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:120
+msgid "NP Divide"
+msgstr "Num Division"
+
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:107
 msgid "NP Down"
-msgstr "NP Runter"
+msgstr "Num Unten"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:123
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:110
 msgid "NP End"
-msgstr "NP Ende"
+msgstr "Num Ende"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:111
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:98
 msgid "NP Enter"
-msgstr "NP Eingabe"
+msgstr "Num Eingabe"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:127
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:114
 msgid "NP Equal"
-msgstr "NP Gleich"
+msgstr "Num Gleich"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:116
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:103
 msgid "NP Home"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:125
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:112
 msgid "NP Insert"
-msgstr "NP Einfg"
+msgstr "Num Einfg"
+
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:104
+msgid "NP Left"
+msgstr "Num Links"
+
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:115
+msgid "NP Multiply"
+msgstr "Num Multiplizieren"
+
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:109
+msgid "NP Page Down"
+msgstr "Num Bild-Ab"
+
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:108
+msgid "NP Page Up"
+msgstr "Num Bild-Hoch"
+
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:106
+msgid "NP Right"
+msgstr "Num Rechts"
 
 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:117
-msgid "NP Left"
-msgstr "NP Links"
-
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:128
-msgid "NP Multiply"
-msgstr "NP Stern"
-
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:122
-msgid "NP Page Down"
-msgstr "NP Bild Runter"
-
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:121
-msgid "NP Page Up"
-msgstr "NP Bild Hoch"
-
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:119
-msgid "NP Right"
-msgstr "NP Rechts"
-
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:130
 msgid "NP Separator"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:109
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:96
 msgid "NP Space"
-msgstr "NP Leertaste"
-
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:131
-msgid "NP Subtract"
-msgstr "NP Minus"
-
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:110
-msgid "NP Tab"
-msgstr "NP Tab"
+msgstr "Num Leertaste"
 
 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:118
-msgid "NP Up"
-msgstr "NP Hoch"
+msgid "NP Subtract"
+msgstr "Num Minus"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:444
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:59
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:50
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:97
+msgid "NP Tab"
+msgstr "Num Tab"
+
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:105
+msgid "NP Up"
+msgstr "Num Hoch"
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:448
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:46
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:37
 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:25
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:72
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:282
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:553
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:15
 msgid "Name: "
 msgstr "Name: "
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:526
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:562
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:516
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:555
 msgid "Native GCI files(*.gci)"
 msgstr "Native GCI Dateien(*.gci)"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:161
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:148
 msgid "New Scan"
-msgstr "Neuer Scan"
+msgstr "Neue Suche"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:206
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:193
 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:801
 msgid "Next Page"
 msgstr "Nächste Seite"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:165
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:152
 msgid "Next Scan"
-msgstr "Nächster Scan"
+msgstr "Nächste Suche"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:68
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:59
 msgid "Nickname :"
 msgstr "Nickname:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:196
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:190
 msgid "No Country (SDK)"
 msgstr "Kein Land (SDK)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:370
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:357
 msgid "No ISOs or WADS found"
 msgstr "Keine ISOs oder WADs gefunden"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:508
-#, c-format
-msgid "No banner file found for title  %s"
-msgstr "Keine Banner-Datei für Tittel %s gefunden."
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:761
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:768
-msgid "No description available"
-msgstr "Keine Beschreibung vorhanden"
-
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:514
-msgid "No docking"
-msgstr "Nicht Andocken"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:859
-msgid "No file loaded"
-msgstr "Keine Date geladen"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:439
-msgid "No free dir index entries"
-msgstr "Keine freien Verzeichnis-Indexeinträge."
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:895
-msgid "No recorded file"
+#: Source/Core/Core/Src/ConfigManager.h:17
+msgid "No audio output"
 msgstr ""
 
 #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:501
 #, c-format
+msgid "No banner file found for title  %s"
+msgstr "Keine Banner-Datei für Tittel %s gefunden."
+
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:760
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:767
+msgid "No description available"
+msgstr "Keine Beschreibung vorhanden"
+
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:535
+msgid "No docking"
+msgstr "Nicht Andocken"
+
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:860
+msgid "No file loaded"
+msgstr "Keine Datei geladen"
+
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:426
+msgid "No free dir index entries"
+msgstr "Keine freien Verzeichnis-Indexeinträge."
+
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:896
+msgid "No recorded file"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:494
+#, c-format
 msgid "No save folder found for title %s"
 msgstr "Keinen Spielstand-Ordner für Tittel %s gefunden."
 
+#: Source/Plugins/Plugin_VideoOGL/Src/main.cpp:132
+#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:111
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:23
 #: Source/Core/DolphinWX/Src/NetWindow.cpp:600
 msgid "None"
 msgstr "Keine"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:323
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303
 msgid "Norwegian Bokmaal"
 msgstr "Norwegisch"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:203
 msgid "Not Equal"
 msgstr "Ungleich"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:804
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:794
 msgid "Not Set"
 msgstr "Nicht Festgelegt"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:626
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:101
+#, c-format
+msgid "Not a Wii save or read failure for file header size %x"
+msgstr ""
+"Dies ist kein Wii-Spielstand oder das Lesen der Größenangabe im Dateiheader "
+"%x ist gescheitert."
+
+#: Source/Core/DolphinWX/Src/Main.cpp:654
 msgid "Not connected"
 msgstr "Nicht Verbunden"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:309
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:296
 msgid "Notes"
 msgstr "Notizen"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:16
 msgid "Notes: "
 msgstr "Notizen: "
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:71
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:74
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:580
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:621
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:629
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:59
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:64
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:613
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:659
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:667
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:31
 msgid "Notice"
 msgstr "Notizen"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:105
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:92
 msgid "Num Lock"
 msgstr "Num Lock"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:88
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:75
 msgid "Number Of Codes: "
-msgstr "Anzahl von Codes: "
+msgstr "Codeanzahl:"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:30
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:34
 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26
 msgid "Nunchuk"
 msgstr "Nunchuk"
@@ -3674,97 +3824,98 @@ msgstr "Nunchuk"
 msgid "Nunchuk Acceleration"
 msgstr "Nunchuck Beschleunigung"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:877
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:878
 msgid "Object"
 msgstr "Objekt"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:135
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:122
 msgid "Object Range"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:243
 msgid "Off"
 msgstr "Aus"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:62
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:49
 msgid "Offset:"
 msgstr "Offset:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:582
 msgid "On-Screen Display Messages"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:436
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:423
 #, c-format
 msgid "Only %d blocks available"
 msgstr "Nur %d Blöcke verfügbar"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:420
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:178
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:426
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:166
 msgid "Open"
 msgstr "Öffnen"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:876
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:867
 msgid "Open &containing folder"
 msgstr "Beinhaltenden &Ordner öffnen..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:873
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:864
 msgid "Open Wii &save folder"
 msgstr "&Wii Spielstand-Ordner öffnen..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:420
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:426
 msgid "Open file..."
 msgstr "Datei öffnen..."
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:61
+#: Source/Core/AudioCommon/Src/OpenALStream.cpp:48
 #, 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:72
+#: Source/Core/AudioCommon/Src/OpenALStream.cpp:59
 msgid "OpenAL: can't find sound devices"
 msgstr "OpenAL: Kann kein Sound-Gerät finden"
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:66
+#: Source/Core/AudioCommon/Src/OpenALStream.cpp:53
 #, c-format
 msgid "OpenAL: can't open device %s"
 msgstr "OpenAL: Kann Gerät %s nicht öffnen"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502
 msgid "OpenCL Texture Decoder"
-msgstr "OpenCL Texturen Dekodierer"
+msgstr "OpenCL Textur-Dekoder"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503
 msgid "OpenMP Texture Decoder"
 msgstr "OpenMP Texturen Dekodierer"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:317
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:94
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:304
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:81
 msgid "Options"
-msgstr "Optionen"
+msgstr "Einstellungen"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:22
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Orange"
 msgstr "Orange"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:468
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:455
+#, fuzzy
 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"
+"and import the saves to a new memcard\n"
 msgstr ""
 "Die Reihenfolge der Dateien im Datei-Verzeichnis übereinstimmen nicht mit "
 "der Block-Reihenfolge,\n"
 "klicke Rechts und exportiere alle Spielstände,\n"
 "und importiere die Spielstände auf eine neue Memorycard.\n"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:316
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:324
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:509
 msgid "Other"
 msgstr "Andere"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:206
+#: Source/Core/Core/Src/NetPlayClient.cpp:210
 msgid ""
 "Other client disconnected while game is running!! NetPlay is disabled. You "
 "manually stop the game."
@@ -3772,15 +3923,15 @@ 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:481
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:468
 msgid "Output"
 msgstr "Ausgabe"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:342
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:348
 msgid "P&lay Recording..."
 msgstr "Au&fnahme abspielen..."
 
-#: Source/Core/Core/Src/HW/GCPad.cpp:30
+#: Source/Core/Core/Src/HW/GCPad.cpp:18
 msgid "Pad"
 msgstr "Pad"
 
@@ -3788,160 +3939,160 @@ msgstr "Pad"
 msgid "Pad "
 msgstr "Pad "
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:34
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:38
 msgid "Pads"
 msgstr "Pads"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:108
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:95
 msgid "Page Down"
-msgstr "Bild Ab"
+msgstr "Bild-Ab"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:107
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:94
 msgid "Page Up"
-msgstr "Bild Hoch"
+msgstr "Bild-Auf"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:35
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:22
 msgid "Paragraph"
 msgstr "Paragraph"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:64
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:51
 msgid "Parameters"
 msgstr "Parameter"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:222
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:217
 #, c-format
 msgid "Partition %i"
 msgstr "Partition %i"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:296
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:297
 msgid "Patches"
-msgstr "Patches"
+msgstr "Patche"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:556
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536
 msgid "Paths"
 msgstr "Pfade"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1538
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1539
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:51
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1565
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1566
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:38
 msgid "Pause"
 msgstr "Pause"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:128
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:129
 msgid "Pause at end of movie"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:397
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405
 msgid "Per-Pixel Lighting"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352
 msgid "Perfect"
 msgstr "Perfekt"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:609
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:642
 #, c-format
 msgid "Perspective %d"
 msgstr "Perspektive %d"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:165
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:424
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1547
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1548
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:152
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:430
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1574
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1575
 msgid "Play"
 msgstr "Start"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176
 msgid "Play Recording"
 msgstr "Aufnahme abspielen"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:170
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:170
 msgid "Play/Pause"
 msgstr "Start/Pause"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351
 msgid "Playable"
 msgstr "Spielbar"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:154
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:141
 msgid "Playback Options"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:301
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:304
 msgid "Players"
 msgstr "Spieler"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:988
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:991
 msgid "Please confirm..."
 msgstr "Bitte Bestätigen..."
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:579
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:612
 msgid "Please create a perspective before saving"
 msgstr "Bitte legen Sie vor dem Speichern eine Perspektive fest"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:36
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:23
 msgid "Plus-Minus"
 msgstr "Plus-Minus"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:324
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304
 msgid "Polish"
 msgstr "Polnisch"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:713
 msgid "Port 1"
-msgstr "Port 1"
+msgstr "Port 1:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714
 msgid "Port 2"
-msgstr "Port 2"
+msgstr "Port 2:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:734
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715
 msgid "Port 3"
-msgstr "Port 3"
+msgstr "Port 3:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716
 msgid "Port 4"
-msgstr "Port 4"
+msgstr "Port 4:"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:97
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:130
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:88
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:133
 msgid "Port :"
 msgstr "Port:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:325
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305
 msgid "Portuguese"
 msgstr "Portugiesisch"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:326
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306
 msgid "Portuguese (Brazilian)"
 msgstr "Portugiesisch (Brasilianisch)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:391
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:399
 msgid "Post-Processing Effect:"
 msgstr ""
 
-#: Source/Core/Core/Src/Movie.cpp:936
+#: Source/Core/Core/Src/Movie.cpp:927
 #, c-format
 msgid "Premature movie end in PlayController. %u + 8 > %u"
 msgstr ""
 
-#: Source/Core/Core/Src/Movie.cpp:1055
+#: Source/Core/Core/Src/Movie.cpp:1046
 #, c-format
 msgid "Premature movie end in PlayWiimote. %u + %d > %u"
 msgstr ""
 
-#: Source/Core/Core/Src/Movie.cpp:1032
+#: Source/Core/Core/Src/Movie.cpp:1023
 #, c-format
 msgid "Premature movie end in PlayWiimote. %u > %u"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:48
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:35
 msgid "Presets: "
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:205
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:192
 msgid "Prev Page"
 msgstr "Vorh. Seite"
 
@@ -3949,67 +4100,67 @@ msgstr "Vorh. Seite"
 msgid "Previous Page"
 msgstr "Vorherige Seite"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:183
 msgid "Previous Value"
 msgstr "Vorheriger Wert"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:60
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:47
 msgid "Print"
 msgstr "Druck"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:894
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:885
 msgid "Profile"
 msgstr "Profil"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.h:55
+#: Source/Core/DolphinWX/Src/ISOProperties.h:42
 msgid "Properties"
 msgstr "Eigenschaften"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:283
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:286
 msgid "Purge Cache"
-msgstr "Cache löschen"
+msgstr "Cache leeren"
 
-#: Source/Core/Common/Src/MsgHandler.cpp:66
+#: Source/Core/Common/Src/MsgHandler.cpp:52
 msgid "Question"
 msgstr "Frage"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:159
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:316
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:162
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:319
 msgid "Quit"
 msgstr "Beenden"
 
 #. i18n:  Right
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:59
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:46
 msgid "R"
 msgstr "R"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:40
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:27
 msgid "R Button"
-msgstr "R Taste"
+msgstr "R-Taste"
 
 #. i18n:  Right-Analog
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:63
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
 msgid "R-Analog"
 msgstr "R-Analog"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:445
 msgid "RAM"
 msgstr "RAM"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:175
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:169
 msgid "RUSSIA"
 msgstr "RUSSLAND"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:528
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:515
 msgid "Range"
 msgstr "Weite"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:190
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:178
 msgid "Read-only mode"
 msgstr "Nur-Lese-Modus"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:487
 msgid "Real"
 msgstr "Echt"
 
@@ -4025,33 +4176,33 @@ msgstr "Echte Wiimotes"
 msgid "Reconnect Wiimote on State Loading"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:193
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:217
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:791
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:180
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:204
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:790
 msgid "Record"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:174
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:161
 msgid "Recording Info"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:202
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:189
 msgid "Recording Options"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:21
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Red"
 msgstr "Rot"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:24
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Red Left"
 msgstr "Rot links"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:25
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Red Right"
 msgstr "Rot rechts"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86
 msgid ""
 "Reduces the amount of aliasing caused by rasterizing 3D graphics.\n"
 "This makes the rendered picture look less blocky.\n"
@@ -4061,255 +4212,261 @@ msgid ""
 msgstr ""
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:60
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:421
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:903
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:427
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:894
 msgid "Refresh"
 msgstr "Aktualisieren"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:180
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:168
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:168
 msgid "Refresh List"
 msgstr "Liste aktualisieren"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:421
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:427
 msgid "Refresh game list"
 msgstr "Spieleliste aktualisieren"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:405
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:427
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:77
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:812
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:409
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:431
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:64
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:793
 msgid "Remove"
 msgstr "Entfernen"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99
 msgid ""
 "Render the scene as a wireframe.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:308
 msgid "Render to Main Window"
 msgstr "Im Hauptfenster Rendern"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:915
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:172
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:906
 msgid "Reset"
 msgstr "Zurücksetzen"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:190
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:177
 msgid "Results"
 msgstr "Ergebnisse"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:29
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:16
 msgid "Return"
-msgstr "Enter"
+msgstr "Eingabe"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:277
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:57
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464
+msgid "Revision:"
+msgstr ""
+
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:264
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:44
 msgid "Right"
 msgstr "Rechts"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:61
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:65
 msgid "Right Stick"
 msgstr "Stick rechts"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:85
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:295
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:72
 msgid "Rumble"
 msgstr "Rumble"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:518
-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:498
+msgid ""
+"Run DSP HLE and LLE on a dedicated thread (not recommended: might cause "
+"audio glitches with HLE and freezes with LLE)."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:327
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307
 msgid "Russian"
 msgstr "Russisch"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:149
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:150
 msgid "Sa&ve State"
 msgstr "S&tatus speichern"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:465
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475
 msgid "Safe"
 msgstr "Sicher"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:196
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:446
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:925
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:183
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:452
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916
 msgid "Save"
 msgstr "Speichern"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:532
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:522
 msgid "Save GCI as..."
-msgstr "CGI speichern unter..."
+msgstr "GCI speichern unter..."
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
 msgid "Save State Slot 1"
-msgstr "Status in Slot 1 speichern"
+msgstr "In Slot 1 speichern"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:198
 msgid "Save State Slot 2"
-msgstr "Status in Slot 2 speichern"
+msgstr "In Slot 2 speichern"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:199
 msgid "Save State Slot 3"
-msgstr "Status in Slot 3 speichern"
+msgstr "In Slot 3 speichern"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:212
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:212
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200
 msgid "Save State Slot 4"
-msgstr "Status in Slot 4 speichern"
+msgstr "In Slot 4 speichern"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201
 msgid "Save State Slot 5"
-msgstr "Status in Slot 5 speichern"
+msgstr "In Slot 5 speichern"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202
 msgid "Save State Slot 6"
-msgstr "Status in Slot 6 speichern"
+msgstr "In Slot 6 speichern"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:203
 msgid "Save State Slot 7"
-msgstr "Status in Slot 7 speichern"
+msgstr "In Slot 7 speichern"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204
 msgid "Save State Slot 8"
-msgstr "Status in Slot 8 speichern"
+msgstr "In Slot 8 speichern"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:151
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:152
 msgid "Save State..."
-msgstr "Status speichern..."
+msgstr "Spiel speichern..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:582
 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:592
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:602
 msgid "Save as..."
 msgstr "Speichern unter..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1203
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1204
 msgid "Save compressed GCM/ISO"
 msgstr "Komprimierte GCM/ISO speichern"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:446
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:452
 msgid "Save current perspective"
 msgstr "Aktuelle Perspektive speichern"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1192
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193
 msgid "Save decompressed GCM/ISO"
 msgstr "Dekomprimierte GCM/ISO speichern"
 
-#: Source/Core/Core/Src/Movie.cpp:801
+#: Source/Core/Core/Src/Movie.cpp:792
 #, 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:396
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:404
 msgid "Scaled EFB Copy"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:556
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:543
 #, c-format
 msgid "Scanning %s"
 msgstr "Scannen %s"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:539
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:526
 msgid "Scanning for ISOs"
 msgstr "Suche nach ISOs"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:540
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:527
 msgid "Scanning..."
 msgstr "Suche..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:427
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
 msgid "ScrShot"
 msgstr "ScrShot"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:106
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:93
 msgid "Scroll Lock"
-msgstr "Rollen Feststell"
+msgstr "Scroll-Lock"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:264
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:251
 msgid "Search"
 msgstr "Suche"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:227
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:214
 msgid "Search Filter"
 msgstr "Suchfilter"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:810
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:791
 msgid "Search Subfolders"
 msgstr "Unterordner durchsuchen"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:250
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:237
 msgid "Search current Object"
 msgstr "Suche derzeitiges Objekt"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:254
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:241
 msgid "Search for hex Value:"
 msgstr ""
 
-#: Source/Core/Common/Src/SysConf.h:103 Source/Core/Common/Src/SysConf.h:126
-#: Source/Core/Common/Src/SysConf.h:146 Source/Core/Common/Src/SysConf.h:167
+#: Source/Core/Common/Src/SysConf.h:90 Source/Core/Common/Src/SysConf.h:113
+#: Source/Core/Common/Src/SysConf.h:133 Source/Core/Common/Src/SysConf.h:154
 #, c-format
 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:490
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:46
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:477
 msgid "Select"
 msgstr "Auswählen"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:677
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1072
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:683
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1087
 msgid "Select The Recording File"
 msgstr "Aufnahmedatei auswählen"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1285
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1312
 msgid "Select a Wii WAD file to install"
 msgstr "Wähle eine Wii WAD zum Installieren aus."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:70
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74
 msgid ""
 "Select a hardware adapter to use.\n"
 "\n"
 "If unsure, use the first one."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:520
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:510
 msgid "Select a save file to import"
 msgstr "Speicherdatei zum Importieren auswählen"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:363
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:366
 msgid "Select floating windows"
 msgstr "Wähle unverankerte Fenster"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:582
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:585
 msgid "Select the file to load"
 msgstr "Datei zum Laden auswählen"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1241
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1268
 msgid "Select the save file"
 msgstr "Wii-Spielstand auswählen"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1388
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1415
 msgid "Select the state to load"
 msgstr "Status zum Laden auswählen"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1429
 msgid "Select the state to save"
 msgstr "Status zum Speichern auswählen"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82
 msgid ""
 "Select what aspect ratio to use when rendering:\n"
 "Auto: Use the native aspect ratio\n"
@@ -4320,15 +4477,15 @@ msgid ""
 "If unsure, select Auto."
 msgstr ""
 
-#: Source/Core/InputCommon/Src/InputConfig.cpp:61
+#: Source/Core/InputCommon/Src/InputConfig.cpp:48
 msgid "Selected controller profile does not exist"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:116
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:109
 msgid "Selected font"
 msgstr "Ausgewählte Schriftart"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75
 msgid ""
 "Selects the display resolution used in fullscreen mode.\n"
 "This should always be bigger than or equal to the internal resolution. "
@@ -4338,17 +4495,27 @@ msgid ""
 "If still unsure, use the highest resolution which works for you."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:69
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:70
 msgid ""
 "Selects what graphics API to use internally.\n"
 "Direct3D 9 usually is the fastest one. OpenGL is more accurate though. "
 "Direct3D 11 is somewhere between the two.\n"
 "Note that the Direct3D backends are only available on Windows.\n"
 "\n"
-"If unsure, use Direct3D 9."
+"If unsure, use Direct3D 11."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:288
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72
+msgid ""
+"Selects what graphics API to use internally.\n"
+"Direct3D 9 usually is the fastest one. OpenGL is more accurate though. "
+"Direct3D 11 is somewhere between the two.\n"
+"Note that the Direct3D backends are only available on Windows.\n"
+"\n"
+"If unsure, use OpenGL."
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:291
 msgid "Send"
 msgstr "Senden"
 
@@ -4356,26 +4523,26 @@ msgstr "Senden"
 msgid "Sensor Bar Position:"
 msgstr "Position der Sensorleiste:"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:77
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:64
 msgid "Separator"
 msgstr "Trennzeichen"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:328
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308
 msgid "Serbian"
 msgstr "Serbisch"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:522
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502
 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:488
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:475
 msgid "Set"
 msgstr "Zuweisen"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:877
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:868
 msgid "Set as &default ISO"
 msgstr "Als &Standard-ISO festlegen"
 
@@ -4384,135 +4551,135 @@ msgstr "Als &Standard-ISO festlegen"
 msgid "Set as default Memcard %c"
 msgstr "Als Standard-Speicherkarte %c auswählen"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:460
+#: Source/Core/Core/Src/ActionReplay.cpp:450
 #, 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/ConfigMain.cpp:535
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:515
 msgid ""
 "Sets the latency (in ms).  Higher values may reduce audio crackling. OpenAL "
 "backend only."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341
 msgid "Settings..."
 msgstr "Einstellungen..."
 
-#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:222
+#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:209
 msgid "SetupWiiMem: Cant find setting file"
 msgstr "SetupWiiMem: Kann die Einstellungsdatei nicht finden"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:291
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:278
 msgid "Shake"
 msgstr "Schütteln"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
 msgid "Short Name:"
 msgstr "Kurzer Name:"
 
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:103
+#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:90
 msgid "Shoulder Buttons"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:217
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:220
 msgid "Show &Console"
 msgstr "&Konsole anzeigen"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:215
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:218
 msgid "Show &Log"
 msgstr "&Log anzeigen"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:212
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:215
 msgid "Show &Statusbar"
 msgstr "&Statusleiste anzeigen"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:210
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:213
 msgid "Show &Toolbar"
 msgstr "&Werkzeugleiste anzeigen"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:281
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:284
 msgid "Show Drives"
 msgstr "Laufwerke anzeigen"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:517
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530
 msgid "Show EFB Copy Regions"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:295
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303
 msgid "Show FPS"
 msgstr "FPS anzeigen"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:271
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:274
 msgid "Show France"
 msgstr "Frankreich anzeigen"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:257
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:260
 msgid "Show GameCube"
 msgstr "GameCube anzeigen"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561
 msgid "Show Input Display"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:273
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:276
 msgid "Show Italy"
 msgstr "Italien anzeigen"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:264
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:267
 msgid "Show JAP"
 msgstr "JAP anzeigen"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:275
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:278
 msgid "Show Korea"
 msgstr "Korea anzeigen"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476
 msgid "Show Language:"
-msgstr "Sprache anzeigen:"
+msgstr "Anzeigen auf:"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:216
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:219
 msgid "Show Log &Configuration"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:266
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:269
 msgid "Show PAL"
 msgstr "PAL anzeigen"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:254
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:257
 msgid "Show Platforms"
 msgstr "Plattformen anzeigen"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:263
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:266
 msgid "Show Regions"
 msgstr "Regionen anzeigen"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:518
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531
 msgid "Show Statistics"
-msgstr "Zeige Statistik"
+msgstr "Statistiken anzeigen"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:277
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:280
 msgid "Show Taiwan"
 msgstr "Taiwan anzeigen"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:268
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:271
 msgid "Show USA"
 msgstr "USA anzeigen"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:259
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:262
 msgid "Show Wad"
 msgstr "Wad anzeigen"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:255
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:258
 msgid "Show Wii"
 msgstr "Wii anzeigen"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491
 msgid "Show a confirmation box before stopping a game."
-msgstr "Hinweisfenster anzeigen, bevor die Emulation beendet wird."
+msgstr "Vor dem Beenden der Emulation bestätigen."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:512
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492
 msgid ""
 "Show a message box when a potentially serious error has occurred.\n"
 "Disabling this may avoid annoying and non-fatal messages, but it may also "
@@ -4528,11 +4695,11 @@ msgstr ""
 msgid "Show first block"
 msgstr "Ersten Block anzeigen"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:130
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:131
 msgid "Show lag counter"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493
 msgid ""
 "Show messages on the emulation screen area.\n"
 "These messages include memory card writes, video backend and CPU "
@@ -4555,7 +4722,7 @@ msgstr "Symbol anzeigen"
 msgid "Show save title"
 msgstr "Namen anzeigen"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102
 msgid ""
 "Show the number of frames rendered per second as a measure of emulation "
 "speed.\n"
@@ -4563,54 +4730,42 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:279
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:282
 msgid "Show unknown"
 msgstr "Unbekannte Anzeigen"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105
 msgid ""
 "Show various statistics.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:319
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:306
 msgid "Sideways Wiimote"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:280
 msgid "Simplified Chinese"
-msgstr "Vereinfachtes Chinesisch"
+msgstr "Chinesisch (Vereinfacht)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:311
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:298
 msgid "Size"
 msgstr "Größe"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:696
 msgid "Skip BIOS"
-msgstr "Überspringe BIOS"
+msgstr "BIOS überspringen"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316
 msgid "Skip DCBZ clearing"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:492
-msgid "Skip Dest. Alpha Pass"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:444
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:454
 msgid "Skip EFB Access from CPU"
 msgstr ""
 
-#: 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 ""
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125
 msgid ""
 "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n"
 "Sometimes also increases visual quality.\n"
@@ -4620,27 +4775,27 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:374
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:386
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:380
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:392
 #, c-format
 msgid "Slot %i"
 msgstr "Slot %i"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:700
 msgid "Slot A"
-msgstr "Slot A"
+msgstr "Slot A:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:701
 msgid "Slot B"
-msgstr "Slot B"
+msgstr "Slot B:"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:62
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:49
 msgid "Snapshot"
 msgstr "Snapshot"
 
-#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:58
+#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:46
 msgid "Software Renderer"
-msgstr ""
+msgstr "Software-Renderer"
 
 #: Source/Core/DolphinWX/Src/VideoConfigDiag.h:84
 msgid ""
@@ -4650,27 +4805,27 @@ msgid ""
 "Do you really want to enable software rendering? If unsure, select 'No'."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:683
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:664
 msgid "Sound Settings"
-msgstr "Sound Einstelungen"
+msgstr "Audio-Einstellungen"
 
-#: Source/Core/AudioCommon/Src/AudioCommon.cpp:77
+#: Source/Core/AudioCommon/Src/AudioCommon.cpp:64
 #, c-format
 msgid "Sound backend %s is not valid."
 msgstr "Sound-Backend %s ist ungültig."
 
-#: Source/Core/AudioCommon/Src/DSoundStream.cpp:59
+#: Source/Core/AudioCommon/Src/DSoundStream.cpp:46
 #, c-format
 msgid "Sound buffer creation failed: %s"
 msgstr "Erstellen des Sound-Buffer fehlgeschlagen: %s"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:31
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:18
 msgid "Space"
 msgstr "Leertaste"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:329
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309
 msgid "Spanish"
 msgstr "Spanisch"
 
@@ -4678,7 +4833,7 @@ msgstr "Spanisch"
 msgid "Speaker Volume:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92
 msgid ""
 "Specifies the resolution used to render at. A high resolution will improve "
 "visual quality a lot but is also quite heavy on performance and might cause "
@@ -4690,63 +4845,63 @@ msgid ""
 "If unsure, select 640x528."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322
 msgid "Speed up Disc Transfer Rate"
 msgstr "Disc-Übertragungsrate beschleunigen"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:243
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:230
 msgid "Square Stick"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:107
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87
 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:322
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:37
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:25
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:325
 msgid "Start"
 msgstr "Start"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:194
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:197
 msgid "Start &NetPlay"
-msgstr "Starte &NetPlay"
+msgstr "&NetPlay starten"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:339
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:345
 msgid "Start Re&cording"
 msgstr "&Aufnahme starten"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:175
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:175
 msgid "Start Recording"
 msgstr "Aufnahme starten"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:312
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:299
 msgid "State"
 msgstr "Status"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:173
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:161
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:161
 msgid "State Saves"
 msgstr "Status"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:108
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88
 msgid "Steering Wheel"
 msgstr "Lenkrad"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:53
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:57
 msgid "Stick"
 msgstr "Stick"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:420
-#: 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:325
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:419
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:431
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:171
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:171
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:328
 msgid "Stop"
 msgstr "Stopp"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96
 msgid ""
 "Store EFB copies in GPU texture objects.\n"
 "This is not so accurate, but it works well enough for most games and gives a "
@@ -4755,107 +4910,117 @@ msgid ""
 "If unsure, leave this checked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:275
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283
 msgid "Stretch to Window"
 msgstr "An Fenstergröße anpassen"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:43
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:47
 msgid "Strum"
 msgstr "Klimpern"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:78
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:65
 msgid "Subtract"
 msgstr "Subtrahieren"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:77
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:67
 #, c-format
 msgid "Successfully exported file to %s"
 msgstr "Die Datei wurde erfolgreich nach %s exportiert"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:56
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:43
 msgid "Successfully imported save files"
 msgstr "Die gespeicherte Datei wurde erfolgreich importiert"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:285
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:272
 msgid "Swing"
-msgstr "Schwenken"
+msgstr "Schwingen"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:744
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:792
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320
+msgid "Synchronize GPU thread"
+msgstr "GPU-Thread synchronisieren"
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321
+msgid ""
+"Synchronizes the GPU and CPU threads to help prevent random freezes in Dual "
+"Core mode. (ON = Compatible, OFF = Fast)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773
 msgid "System Language:"
 msgstr "Systemsprache:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:191
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:185
 msgid "TAIWAN"
 msgstr "TAIWAN"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:127
-#: Source/Core/DolphinWX/Src/TASInputDlg.h:32
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:128
+#: Source/Core/DolphinWX/Src/TASInputDlg.h:19
 msgid "TAS Input"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:28
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:15
 msgid "Tab"
 msgstr "Tab"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:510
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:531
 msgid "Tab split"
 msgstr "Nebeneinander öffnen"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:37
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:41
 msgid "Table Left"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:38
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:42
 msgid "Table Right"
 msgstr ""
 
-#: 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
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:361
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:181
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:181
 msgid "Take Screenshot"
 msgstr "Screenshot erstellen"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:109
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89
 msgid "TaruKonga (Bongos)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:472
 msgid "Test"
 msgstr "Testen"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:444
 msgid "Texture"
 msgstr "Textur"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:451
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:461
 msgid "Texture Cache"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:519
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:532
 msgid "Texture Format Overlay"
 msgstr ""
 
-#: Source/Core/Core/Src/CoreParameter.cpp:226
+#: Source/Core/Core/Src/CoreParameter.cpp:215
 msgid "The WAD has been installed successfully"
 msgstr "Die WAD-Datei wurde erfolgreich installiert"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:197
+#: Source/Core/Core/Src/ActionReplay.cpp:185
 msgid "The address is invalid"
 msgstr "Die Adresse ist ungültig"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:509
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:496
 msgid "The checksum was successfully fixed"
 msgstr "Die Prüfsumme wurde erfolgreich korrigiert"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1242
+#: 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:1117
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1216
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1118
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1146
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1217
 #, c-format
 msgid ""
 "The file %s already exists.\n"
@@ -4864,7 +5029,7 @@ msgstr ""
 "Die Datei %s existiert bereits.\n"
 "Soll diese Datei ersetzt werden?"
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:51
+#: Source/Core/AudioCommon/Src/WaveFile.cpp:38
 #, c-format
 msgid ""
 "The file %s could not be opened for writing. Please check if it's already "
@@ -4873,31 +5038,31 @@ msgstr ""
 "Konnte die Datei %s nicht zum Schreiben öffnen. Bitte überprüfe ob sie "
 "bereits in einem anderen Programm geöffnet ist."
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:44
+#: Source/Core/AudioCommon/Src/WaveFile.cpp:31
 #, c-format
 msgid "The file %s was already open, the file header will not be written."
 msgstr ""
 "Die Datei %s wurde bereits geöffnet, der Header für die Datei wird nicht "
 "geschrieben."
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:332
+#: Source/Core/Core/Src/Boot/Boot.cpp:320
 #, c-format
 msgid "The file you specified (%s) does not exist"
 msgstr "Die angegebene Datei (%s) existiert nicht"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:628
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:666
 msgid "The name can not be empty"
 msgstr "Der Name kann nicht leer bleiben."
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:620
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:658
 msgid "The name can not contain the character ','"
 msgstr "Der Name darf nicht das Zeichen \",\" enthalten"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:142
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:129
 msgid "The resulting decrypted AR code doesn't contain any lines."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98
 msgid ""
 "The safer you adjust this, the less likely the emulator will be missing any "
 "texture updates from RAM.\n"
@@ -4905,13 +5070,12 @@ msgid ""
 "If unsure, use the rightmost value."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:445
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:432
 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."
+"Der Spielstand, den du kopieren möchtest, hat eine ungültige Dateigröße."
 
-#: Source/Core/DolphinWX/Src/Main.cpp:388
+#: Source/Core/DolphinWX/Src/Main.cpp:416
 msgid ""
 "The selected language is not supported by your system. Falling back to "
 "system default."
@@ -4919,37 +5083,37 @@ msgstr ""
 "Die ausgewählte Sprache wird von Ihrem System nicht unterstützt. Kehre nun "
 "zum Systemstandart zurück."
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:43
+#: Source/Core/Core/Src/NetPlayClient.cpp:47
 msgid "The server and client's NetPlay versions are incompatible!"
 msgstr ""
 "Die Version von dem Server und Client´s NetPlay sind zueinander inkompatibel!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:40
+#: Source/Core/Core/Src/NetPlayClient.cpp:44
 msgid "The server is full!"
 msgstr "Der Server ist voll!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:46
+#: Source/Core/Core/Src/NetPlayClient.cpp:50
 msgid "The server responded: the game is currently running!"
 msgstr "Der Server meldet: Das Spiel läuft derzeit!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:49
+#: Source/Core/Core/Src/NetPlayClient.cpp:53
 msgid "The server sent an unknown error message!"
 msgstr "Der Server sendete einen unbekannten Fehler!"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:119
+#: Source/Core/Core/Src/CoreParameter.cpp:108
 #, c-format
 msgid "The specified file \"%s\" does not exist"
 msgstr "Die ausgewählte Datei \"%s\" existiert nicht"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:198
+#: Source/Core/Core/Src/ActionReplay.cpp:186
 msgid "The value is invalid"
-msgstr "Dieser Wert ist ungültig"
+msgstr "Der eingegebene Wert ist ungültig"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:642
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:623
 msgid "Theme:"
-msgstr ""
+msgstr "Design:"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:476
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:463
 msgid ""
 "There must be a ticket for 00000001/00000002. Your NAND dump is probably "
 "incomplete."
@@ -4957,7 +5121,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:307
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308
 msgid ""
 "These settings override core Dolphin settings.\n"
 "Undetermined means the game uses Dolphin's setting."
@@ -4966,7 +5130,7 @@ msgstr ""
 "Grau hinterlegte Kästchen bedeuten, dass die globalen Einstellungen benutzt "
 "werden."
 
-#: Source/Core/Core/Src/ActionReplay.cpp:355
+#: Source/Core/Core/Src/ActionReplay.cpp:345
 msgid ""
 "This action replay simulator does not support codes that modify Action "
 "Replay itself."
@@ -4974,11 +5138,11 @@ msgstr ""
 "Dieser Action-Replay-Simulator unterstützt keine Codes, die sich selber "
 "verändern können."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505
 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:113
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118
 msgid ""
 "This feature allows you to change the game's camera.\n"
 "Move the mouse while holding the right mouse button to pan and while holding "
@@ -4990,7 +5154,15 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485
+msgid ""
+"This limits the game speed to the specified number of frames per second "
+"(full speed is 60 for NTSC and 50 for PAL). Alternatively, 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/ConfigMain.cpp:484
 msgid ""
 "This splits the Video and CPU threads, so they can be run on separate "
 "cores.\n"
@@ -5003,61 +5175,61 @@ msgstr ""
 "als einem Kern,\n"
 "kann aber gelegentlich Abstürze/Fehler verursachen."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:286
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:287
 msgid "This will let you Manually Edit the INI config file"
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:249
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:254
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:236
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:241
 msgid "Threshold"
 msgstr "Schwelle"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:288
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:275
 msgid "Tilt"
 msgstr "Neigung"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:628
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:304
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:622
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:291
 msgid "Title"
 msgstr "Titel"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:125
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:144
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:112
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:131
 msgid "To"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:72
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59
 msgid "Toggle All Log Types"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:426
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:432
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:180
 msgid "Toggle Fullscreen"
-msgstr "Vollbildmodus wechseln"
+msgstr "Vollbildmodus umschalten"
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:87
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:271
 msgid "Top"
 msgstr "Oben"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:281
 msgid "Traditional Chinese"
-msgstr "Traditionelles Chinesisch"
+msgstr "Chinesisch (Traditionell)"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:426
+#: Source/Core/Core/Src/Boot/Boot.cpp:414
 msgid "Tried to load an unknown file type."
 msgstr "Versuche gerade einen unbekannten Dateityp zu Laden."
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:80
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:67
 msgid "Triggers"
 msgstr "Schultertasten"
 
-#: Source/Core/Common/Src/SysConf.h:91 Source/Core/Common/Src/SysConf.h:114
+#: Source/Core/Common/Src/SysConf.h:78 Source/Core/Common/Src/SysConf.h:101
 msgid "Trying to read from invalid SYSCONF"
 msgstr "Versuche gerade eine ungültige SYSCONF zu Lesen"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:44
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:31
 msgid ""
 "Trying to read from invalid SYSCONF\n"
 "Wiimote bt ids are not available"
@@ -5065,15 +5237,15 @@ msgstr ""
 "Versuche gerade eine ungültige SYSCONF zu Lesen\n"
 "Wiimote BT-IDs sind nicht verfügbar"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:330
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
 msgid "Turkish"
 msgstr "Türkisch"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:33
 msgid "Turntable"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:71
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58
 msgid "Type"
 msgstr "Typ"
 
@@ -5081,31 +5253,31 @@ msgstr "Typ"
 msgid "UDP Port:"
 msgstr "UDP Port:"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:279
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:266
 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12
 msgid "UDP Wiimote"
-msgstr "UDP Wiimote"
+msgstr "UDP-Wiimote"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:199
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:193
 msgid "UNKNOWN"
 msgstr "UNBEKANNT"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:756
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:755
 #, c-format
 msgid "UNKNOWN_%02X"
-msgstr ""
+msgstr "UNBEKANNT_%02X"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:178
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:172
 msgid "USA"
 msgstr "USA"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:225
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:214
 msgid ""
 "Unable to create patch from given values.\n"
 "Entry not modified."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:124
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:111
 #, c-format
 msgid ""
 "Unable to parse line %lu of the entered AR code as a valid encrypted or "
@@ -5113,75 +5285,89 @@ msgid ""
 "Would you like to ignore this line and continue parsing?"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:391
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:397
 #, c-format
 msgid "Undefined %i"
 msgstr "Undefiniert %i"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:163
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:164
 msgid "Undo Load State"
 msgstr "Status laden rückgängig machen"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:718
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:717
 msgid "Unexpected 0x80 call? Aborting..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:215
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:202
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:971
+#: Source/Core/Core/Src/HW/DVDInterface.cpp:965
 #, c-format
 msgid "Unknown DVD command %08x - fatal error"
 msgstr "Unbekannter DVD-Befehl %08x - fataler Fehler"
 
-#: Source/Core/Common/Src/SysConf.cpp:145
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:444
+#, c-format
+msgid "Unknown command 0x%08x"
+msgstr "Unbekannter Befehl 0x%08x"
+
+#: Source/Core/Common/Src/SysConf.cpp:132
 #, c-format
 msgid "Unknown entry type %i in SYSCONF (%s@%x)!"
 msgstr "Unbekannter Eintrag-Typ %i in SYSCONF (%s@%x)!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:228
+#: Source/Core/Core/Src/NetPlayClient.cpp:232
 #, c-format
 msgid "Unknown message received with id : %d"
 msgstr "Unbekannte Meldung mit ID: %d"
 
-#: Source/Core/Core/Src/NetPlayServer.cpp:504
+#: Source/Core/Core/Src/NetPlayServer.cpp:508
 #, c-format
 msgid "Unknown message with id:%d received from player:%d Kicking player!"
 msgstr ""
 "Unbekannte Meldung mit ID %d erhalten von Spieler %d, Spieler herausgeworfen!"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:274
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:56
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:261
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:43
 msgid "Up"
 msgstr "Hoch"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:108
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:95
 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17
 msgid "Update"
 msgstr "Update"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:320
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:307
 msgid "Upright Wiimote"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:777
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758
 msgid "Use EuRGB60 Mode (PAL60)"
 msgstr "EuRGB60 Modus (PAL60) verwenden"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:294
 msgid "Use Fullscreen"
 msgstr "Verwende gesamten Bildschirm"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:575
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:563
 msgid "Use Hex"
 msgstr "Hex verwenden"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:600
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580
 msgid "Use Panic Handlers"
 msgstr "Warnmeldungen anzeigen"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89
+msgid ""
+"Use a hacked upload strategy to stream vertices.\n"
+"This usually speed up, but is forbidden by OpenGL specification and may "
+"causes heavy glitches.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122
 msgid ""
 "Use multiple threads to decode textures.\n"
 "Might result in a speedup (especially on CPUs with more than two cores).\n"
@@ -5189,7 +5375,7 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126
 msgid ""
 "Usually if shader compilation fails, an error message is displayed.\n"
 "However, one may skip the popups to allow interruption free gameplay by "
@@ -5198,53 +5384,58 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:539
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:552
 msgid "Utility"
 msgstr "Hilfsmittel"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:285
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:293
 msgid "V-Sync"
 msgstr "V-Sync"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:209
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318
+#, fuzzy
+msgid "VBeam Speed Hack"
+msgstr "MMU Speed Hack"
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196
 msgid "Value"
 msgstr "Wert"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:73
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:60
 msgid "Value:"
 msgstr "Wert:"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:572
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:560
 msgid "Value: "
 msgstr "Wert: "
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:51
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:38
 msgid "Verbosity"
 msgstr "Ausführung"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:377
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:381
 msgid "Video"
 msgstr "Video"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:486
 msgid "Virtual"
 msgstr "Virtuell"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:689
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670
 msgid "Volume"
 msgstr "Lautstärke"
 
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:498
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:527
+#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:488
+#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:517
 #, c-format
 msgid "WAD installation failed: error creating %s"
-msgstr ""
+msgstr "WAD-Installation fehlgeschlagen: Konnte %s nicht erstellen"
 
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:547
+#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:537
 msgid "WAD installation failed: error creating ticket"
-msgstr ""
+msgstr "WAD-Installation fehlgeschlagen: Fehler bei der Ticket-Erstellung"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84
 msgid ""
 "Wait for vertical blanks in order to reduce tearing.\n"
 "Decreases performance if emulation speed is below 100%.\n"
@@ -5252,25 +5443,25 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/Common/Src/MsgHandler.cpp:67
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46
+#: Source/Core/Common/Src/MsgHandler.cpp:53
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:33
 #: Source/Core/DolphinWX/Src/VideoConfigDiag.h:85
 msgid "Warning"
 msgstr "Warnungen"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:291
+#: Source/Core/Core/Src/Boot/Boot.cpp:279
 msgid "Warning - starting DOL in wrong console mode!"
 msgstr "Warnung - Starte DOL im falschen Consolen-Modus!"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:341
+#: Source/Core/Core/Src/Boot/Boot.cpp:329
 msgid "Warning - starting ELF in wrong console mode!"
 msgstr "Warnung - Starte ELF im falschen Consolen-Modus!"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:221
+#: Source/Core/Core/Src/Boot/Boot.cpp:209
 msgid "Warning - starting ISO in wrong console mode!"
 msgstr "Warnung - Starte ISO im falschen Consolen-Modus!"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:519
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:512
 #, c-format
 msgid ""
 "Warning! it is advised to backup all files in the folder:\n"
@@ -5281,7 +5472,7 @@ msgstr ""
 "%s\n"
 "Wollen Sie fortfahren?"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:585
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:578
 #, c-format
 msgid ""
 "Warning: This will overwrite any existing saves that are in the folder:\n"
@@ -5289,28 +5480,36 @@ msgid ""
 "and have the same name as a file on your memcard\n"
 "Continue?"
 msgstr ""
-"Warnung: Dies überschreibt alle vorhandenen Spielstände im Ordner:\n"
-"%s\n"
-"und hat den gleichen Namen wie die Datei auf Ihrer Memory-Card\n"
-"Fortfahren?"
+"Warnung: Dies überschreibt alle vorhandenen Spielstände im Ordner\n"
+"%s, sofern diese die gleichen Dateinamen wie Dateien auf der Speicherkarte "
+"besitzen.\n"
+"Möchtest du fortfahren?"
 
-#: Source/Core/Core/Src/Movie.cpp:844
+#: Source/Core/Core/Src/Movie.cpp:835
 #, 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 ""
+"Warnung: Du hast einen Spielstand geladen, dessen Speicherpunkt hinter dem "
+"Ende der aktuellen Aufnahme liegt. (Byte %u > %u) (Frame %u > %u). Lade "
+"einen anderen Spielstand, bevor du fortfährst oder lade diesen Spielstand im "
+"schreibgeschützen Modus."
 
-#: Source/Core/Core/Src/Movie.cpp:861
+#: Source/Core/Core/Src/Movie.cpp:852
 #, 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 ""
+"Warnung: Du hast einen Spielstand geladen, dessen Aufnahme bei Byte %d (0x"
+"%X) nicht übereinstimmt. Lade einen anderen Spielstand, bevor du fortfährst "
+"oder lade diesen Spielstand im schreibgeschützen Modus, andernfalls könnten "
+"Desyncs auftreten."
 
-#: Source/Core/Core/Src/Movie.cpp:870
+#: Source/Core/Core/Src/Movie.cpp:861
 #, c-format
 msgid ""
 "Warning: You loaded a save whose movie mismatches on frame %d. You should "
@@ -5328,59 +5527,76 @@ 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 ""
+"Warnung: Du hast einen Spielstand geladen, dessen Aufnahme bei Frame %d "
+"nicht übereinstimmt. Lade einen anderen Spielstand, bevor du fortfährst oder "
+"lade diesen Spielstand mit deaktiviertem Schreibschutz, andernfalls könnten "
+"Desyncs auftreten.\n"
+"\n"
+"Weitere Informationen: Die aktuelle Aufnahme hat eine Länge von %d Frames "
+"und die Aufnahme vom Spielstand ist %d Frames lang.\n"
+"\n"
+"Bei Frame %d werden in der aktuellen Aufnahme die folgenden Tasten "
+"gedrückt:\n"
+"Start=%d, A=%d, B=%d, X=%d, Y=%d, Z=%d, DUp=%d, DDown=%d, DLeft=%d, DRight="
+"%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d\n"
+"\n"
+"Bei Frame %d werden in der Aufnahme vom Spielstand die folgenden Tasten "
+"gedrückt:\n"
+"Start=%d, A=%d, B=%d, X=%d, Y=%d, Z=%d, DUp=%d, DDown=%d, DLeft=%d, DRight="
+"%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d"
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:106
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:129
+#: Source/Core/AudioCommon/Src/WaveFile.cpp:93
+#: Source/Core/AudioCommon/Src/WaveFile.cpp:116
 msgid "WaveFileWriter - file not open."
 msgstr "WaveFileWriter - Konnte Datei nicht öffnen."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:56
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:60
 msgid "Whammy"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:404
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:408
 msgid "Widescreen Hack"
-msgstr "Breitbild Hack"
+msgstr "Breitbild-Hack"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:312
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:299
 msgid "Width"
 msgstr "Weite"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535
 msgid "Wii"
 msgstr "Wii"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:372
 msgid "Wii Console"
-msgstr "Wii Konsole"
+msgstr "Wii-Konsole"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:844
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:825
 msgid "Wii NAND Root:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:191
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:194
 msgid "Wii Save Import"
-msgstr "Wii Spielstand importieren"
+msgstr "Wii-Spielstand importieren"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1243
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1270
 msgid "Wii save files (*.bin)|*.bin"
-msgstr "Wii Speicherdateien (*.bin)|*.bin"
+msgstr "Wii-Speicherdaten (*.bin)|*.bin"
 
-#: Source/Core/DiscIO/Src/WiiWad.cpp:82
+#: Source/Core/DiscIO/Src/WiiWad.cpp:69
 msgid "WiiWAD: Could not read from file"
 msgstr "WiiWAD: Konnte die Datei nicht lesen"
 
-#: Source/Core/Core/Src/HW/Wiimote.cpp:17
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
+#: Source/Core/Core/Src/HW/Wiimote.cpp:20
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
 msgid "Wiimote"
 msgstr "Wiimote"
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:21
 #, c-format
 msgid "Wiimote %i"
-msgstr ""
+msgstr "Wiimote %i"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:628
+#: Source/Core/DolphinWX/Src/Main.cpp:656
 msgid "Wiimote Connected"
 msgstr "Wiimote Verbunden"
 
@@ -5388,107 +5604,133 @@ msgstr "Wiimote Verbunden"
 msgid "Wiimote Motor"
 msgstr "Wiimote Motor"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
 msgid "Wiimote settings"
-msgstr "Wiimote Einstellungen"
+msgstr "Wiimote-Einstellungen"
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:48
 msgid "Wiimotes"
 msgstr "Wiimotes"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:134
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:121
 msgid "Windows Left"
 msgstr "Windows Links"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:136
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:123
 msgid "Windows Menu"
-msgstr "Windows Menü"
+msgstr "Kontextmenü"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:135
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:122
 msgid "Windows Right"
 msgstr "Windows Rechts"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:131
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:124
 msgid "Word Wrap"
 msgstr "Zeilenumbruch"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1298
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:864
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1089
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1225
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1325
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:880
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1090
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1226
 msgid "Working..."
 msgstr "Arbeite..."
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:338
+msgid "Write memcards (GC)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46
 msgid "Write to Console"
 msgstr "In Konsole ausgeben"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:67
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:54
 msgid "Write to Debugger"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:57
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44
 msgid "Write to File"
 msgstr "In Datei ausgeben"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:61
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48
 msgid "Write to Window"
 msgstr ""
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:60
+#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:47
 #, c-format
 msgid "XAudio2 CreateSourceVoice failed: %#X"
 msgstr "XAudio2 CreateSourceVoice fehlgeschlagen: %#X"
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:114
+#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:101
 #, c-format
 msgid "XAudio2 init failed: %#X"
-msgstr ""
+msgstr "Initialisierung von XAudio2 gescheitert: %#X"
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:124
+#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:111
 #, c-format
 msgid "XAudio2 master voice creation failed: %#X"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:766
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:765
 msgid "XF reg"
 msgstr "XF reg"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:21
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Yellow"
 msgstr "Gelb"
 
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:107
+#: Source/Core/Core/Src/DSP/DSPCore.cpp:120
 msgid ""
-"You are using free dsp roms made by Dolphin Team.\n"
-"Only Zelda ucode games will work correctly with them.\n"
+"You are using a free DSP ROM made by the Dolphin Team.\n"
+"All Wii games will work correctly, and most GC games should also work fine, "
+"but the GBA/IPL/CARD UCodes will not work.\n"
 msgstr ""
+"Du verwendest das freie DSP-ROM vom Dolphin Team.\n"
+"Alle Wii- und die meisten GameCube-Spiele werden problemlos funktionen, aber "
+"die GBA/IPL/CARD-UCodes nicht.\n"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:73
+#: Source/Core/Core/Src/DSP/DSPCore.cpp:116
+msgid ""
+"You are using an old free DSP ROM made by the Dolphin Team.\n"
+"Only games using the Zelda UCode will work correctly.\n"
+msgstr ""
+"Du verwendest ein veraltetes, freies DSP-ROM vom Dolphin Team.\n"
+"Nur Spiele, die den Zelda-UCode verwenden werden korrekt funktionieren.\n"
+
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:63
 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:207
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:210
 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:593
 msgid "You must enter a name!"
-msgstr "Sie müssen einen Namen eingeben!"
+msgstr "Du musst einen Namen eingeben!"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:450
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:438
 msgid "You must enter a valid decimal, hexadecimal or octal value."
-msgstr ""
+msgstr "Du musst eine gültige Dezimal-, Hexadezimal- oder Oktalzahl eingeben."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:603
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:591
 msgid "You must enter a valid profile name."
 msgstr "Sie müssen einen gültigen Profilamen eingeben!"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:936
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:917
 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."
 
-#: Source/Core/Core/Src/CoreParameter.cpp:175
+#: Source/Core/Core/Src/DSP/DSPCore.cpp:109
+msgid ""
+"Your DSP ROMs have incorrect hashes.\n"
+"Would you like to stop now to fix the problem?\n"
+"If you select \"No\", audio might be garbled."
+msgstr ""
+"Dein DSP-ROMs haben ungültige Hashwerte.\n"
+"Möchtest du die Emulation anhalten und das Problem beheben?\n"
+"Wenn du \"Nein\" wählst, könnte die Audiowiedergabe merkwürdig klingen."
+
+#: Source/Core/Core/Src/CoreParameter.cpp:164
 msgid ""
 "Your GCM/ISO file seems to be invalid (invalid country).\n"
 "Continue with PAL region?"
@@ -5496,33 +5738,36 @@ msgstr ""
 "Ihre GCM/ISO-Datei scheint ungültig zu sein (Land ungültig).\n"
 "Mit PAL-Region fortfahren?"
 
-#: Source/Core/Common/Src/SysConf.cpp:58
+#: Source/Core/Common/Src/SysConf.cpp:45
 #, c-format
 msgid ""
 "Your SYSCONF file is the wrong size.\n"
 "It should be 0x%04x (but is 0x%04llx)\n"
 "Do you want to generate a new one?"
 msgstr ""
+"Deine SYSCONF-Datei hat die falsche Dateigröße.\n"
+"Erwartet wurde eine Größe von 0x%04x (aber deine ist 0x%04llx).\n"
+"Soll eine neue Datei generiert werden?"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:334
 msgid "ZTP hack"
-msgstr "ZTP Hack"
+msgstr "ZTP-Hack"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:387
+#: Source/Core/Core/Src/ActionReplay.cpp:377
 msgid "Zero 3 code not supported"
 msgstr "Zero 3 Code wird nicht unterstüzt"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:408
+#: Source/Core/Core/Src/ActionReplay.cpp:398
 #, c-format
 msgid "Zero code unknown to dolphin: %08x"
 msgstr "Der Zero Code ist in Dolphin unbekannt: %08x"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:436
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:460
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:423
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:447
 msgid "[ waiting ]"
 msgstr "[ warte ]"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107
 msgid ""
 "[BROKEN]\n"
 "Highlight regions the EFB was copied from.\n"
@@ -5530,11 +5775,11 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:91
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:78
 msgid "[Custom]"
 msgstr "[Benutzerdefiniert]"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120
 msgid ""
 "[EXPERIMENTAL]\n"
 "Aims to speed up emulation by offloading texture decoding to the GPU using "
@@ -5545,7 +5790,7 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121
 msgid ""
 "[EXPERIMENTAL]\n"
 "Speeds up emulation a bit by caching display lists.\n"
@@ -5554,90 +5799,44 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:508
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:495
 msgid "^ ADD"
 msgstr "^ HINZUF."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:820
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:801
 msgid "apploader (.img)"
 msgstr "Apploader (.img)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:185
-msgid "failed to read bk header"
-msgstr "Lesen des BK-Header fehlgeschlagen"
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:375
-#, c-format
-msgid "failed to read data from file: %s"
-msgstr "Fehler beim Lesen von Daten aus der Datei: %s"
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:97
-msgid "failed to read header"
-msgstr "Fehler beim Lesen des Header"
-
-#: Source/Core/Core/Src/PowerPC/JitInterface.cpp:285
+#: Source/Core/Core/Src/PowerPC/JitInterface.cpp:272
 #, c-format
 msgid "iCacheJIT: Reading Opcode from %x. Please report."
 msgstr "iCacheJIT: Lesen des Opcode aus %x. Bitte berichten."
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:108
-#, c-format
-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:935
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:936
 msgid "s"
 msgstr "s"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:457
-#, c-format
-msgid "unknown cmd 0x%08x"
-msgstr "Unbekanter CMD 0x%08x"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1110
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1136
 msgid "wxExecute returned -1 on application run!"
-msgstr "wxExecute meldet -1 beim Start der Anwendung!"
+msgstr "wxExecute gab beim Anwendungsstart -1 zurück!"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:56
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:43
 msgid "zFar Correction: "
 msgstr "zFar Korrektion: "
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:51
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:38
 msgid "zNear Correction: "
 msgstr "zNear Korrektion: "
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:493
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:480
 msgid "| OR"
 msgstr "| ODER"
 
-#~ msgid "%i connected"
-#~ msgstr "%i verbunden"
-
-#~ msgid "Alternate Wiimote Timing"
-#~ msgstr "Alternatives Wiimote Timing"
-
-#~ msgid "Interpreter (VERY slow)"
-#~ msgstr "Interpreter (SEHR langsam)"
-
-#~ msgid "JIT Recompiler (recommended)"
-#~ msgstr "JIT Recompiler (empfohlen)"
-
-#~ msgid "JITIL experimental recompiler"
-#~ msgstr "JITIL experimenteller Recompiler"
-
-#~ msgid "Pair Up"
-#~ msgstr "Verbinden"
-
-#~ msgid "Reconnect Wiimote Confirm"
-#~ msgstr "Wiimote Wiederverbindung Bestätigen"
+#~ msgid "Accurate VBeam emulation"
+#~ msgstr "Genaue VBeam Emulation"
 
 #~ msgid ""
-#~ "Wiimote %i has been disconnected by system.\n"
-#~ "Maybe this game doesn't support multi-wiimote,\n"
-#~ "or maybe it is due to idle time out or other reason.\n"
-#~ "Do you want to reconnect immediately?"
+#~ "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)"
 #~ msgstr ""
-#~ "Verbindung zu Wiimote %i wurde vom System unterbrochen.\n"
-#~ "Vielleicht unterstützt das Spiel nicht mehrere Wiimotes,\n"
-#~ "oder die Wiimote war zulange inaktiv oder andere Ursachen.\n"
-#~ "Soll die Wiimote jetzt wieder verbunden werden?"
+#~ "Wenn die FPS sprunghaft ist, kann diese Option helfen. (ON = Kompatibel, "
+#~ "OFF = Schnell)"
diff --git a/Languages/po/dolphin-emu.pot b/Languages/po/dolphin-emu.pot
index 29c6fffefa..a5f0080711 100644
--- a/Languages/po/dolphin-emu.pot
+++ b/Languages/po/dolphin-emu.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Dolphin Emulator\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-10 08:56-0500\n"
+"POT-Creation-Date: 2013-04-18 23:02-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,113 +17,115 @@ 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:499
 msgid " (too many to display)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:270
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:273
 #: Source/Core/DolphinWX/Src/NetWindow.cpp:491
 #: Source/Core/DolphinWX/Src/NetWindow.cpp:530
 msgid " Game : "
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:507
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494
 msgid "! NOT"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:70
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:58
 #, c-format
 msgid ""
 "\"%s\" does not exist.\n"
 " Create a new 16MB Memcard?"
 msgstr ""
 
-#: Source/Core/Core/Src/CoreParameter.cpp:142
+#: Source/Core/Core/Src/CoreParameter.cpp:131
 #, c-format
 msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:722
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:721
 #, c-format
 msgid "%08X:  "
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:196
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:183
 #, c-format
 msgid "%1$sCopy%1$s"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:128
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:296
+#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:113
+#, c-format
+msgid "%d samples"
+msgstr ""
+
+#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:112
+#, c-format
+msgid "%d samples (quality level %d)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:121
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:289
 #, c-format
 msgid "%s already exists, overwrite?"
 msgstr ""
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:167
+#: Source/Core/DiscIO/Src/CompressedBlob.cpp:154
 #, c-format
 msgid "%s failed to be scrubbed. Probably the image is corrupt."
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:95
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:83
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
 " Card file size is invalid (0x%x bytes)"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:110
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:98
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
 " Card size is invalid (0x%x bytes)"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:90
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:78
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
 "file is not large enough to be a valid memory card file (0x%x bytes)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:367
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:359
 #, c-format
 msgid "%s failed to open"
 msgstr ""
 
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:97
-#, c-format
-msgid ""
-"%s has an incorrect hash.\n"
-"Would you like to stop now to fix the problem?\n"
-"If you select \"No\", audio will be garbled."
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:360
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:352
 #, c-format
 msgid "%s is a 0 byte file"
 msgstr ""
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:159
+#: Source/Core/DiscIO/Src/CompressedBlob.cpp:146
 #, c-format
 msgid "%s is already compressed! Cannot compress it further."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:345
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:337
 #, c-format
 msgid "%s is too long for the filename, max chars is 45"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:202
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:189
 #, c-format
 msgid "%sDelete%s"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:200
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:187
 #, c-format
 msgid "%sExport GCI%s"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:198
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:185
 #, c-format
 msgid "%sImport GCI%s"
 msgstr ""
@@ -133,222 +135,246 @@ msgstr ""
 msgid "%u Free Blocks; %u Free Dir Entries"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:506
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:493
 msgid "&& AND"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:295
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:301
 msgid "&About..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:99
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:100
 msgid "&Boot from DVD Drive..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:231
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:234
 msgid "&Breakpoints"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:110
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:111
 msgid "&Browse for ISOs..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:192
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:195
 msgid "&Cheats Manager"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:177
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:180
 msgid "&DSP Settings"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:885
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:876
 msgid "&Delete ISO..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:903
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:897
 msgid "&Delete selected ISOs..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:170
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:173
 msgid "&Emulation"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:113
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:114
 msgid "&File"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:335
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:341
 msgid "&Frame Advance"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:352
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:358
 msgid "&Fullscreen"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:176
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:179
 msgid "&Graphics Settings"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:296
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:302
 msgid "&Help"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:180
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:183
 msgid "&Hotkey Settings"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:233
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:236
 msgid "&JIT"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:148
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:149
 msgid "&Load State"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:190
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:193
 msgid "&Memcard Manager (GC)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:232
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:235
 msgid "&Memory"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:313
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:319
 msgid "&Open..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:186
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:189
 msgid "&Options"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:324
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:330
 msgid "&Pause"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:326
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:332
 msgid "&Play"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:867
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:858
 msgid "&Properties"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:348
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:354
 msgid "&Read-only mode"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:319
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:325
 msgid "&Refresh List"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:230
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:233
 msgid "&Registers"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:332
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:338
 msgid "&Reset"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:234
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:237
 msgid "&Sound"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:329
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:335
 msgid "&Stop"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:207
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:210
 msgid "&Tools"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:235
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:238
 msgid "&Video"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:284
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:287
 msgid "&View"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:179
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:182
 msgid "&Wiimote Settings"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:868
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:859
 msgid "&Wiki"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504
 msgid "'"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:59
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:46
 msgid "(-)+zFar"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:54
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:41
 msgid "(-)+zNear"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:99
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:86
 msgid "(UNKNOWN)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:376
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:384
 msgid "(off)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:655
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:654
 msgid "0x44"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+msgid "1.5x Native (960x792)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:158
 msgid "16 bit"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+msgid "1x Native (640x528)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+msgid "2.5x Native (1600x1320)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+msgid "2x Native (1280x1056)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:159
 msgid "32 bit"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:412
 msgid "3D Vision"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+msgid "3x Native (1920x1584)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+msgid "4x Native (2560x2112)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:157
 msgid "8 bit"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:43
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:30
 msgid "<Insert name here>"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:255
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:262
 msgid "<No resolutions found>"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:104
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84
 msgid "<Nothing>"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:162
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:162
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:150
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:150
 msgid "<Press Key>"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286
 msgid "<System>"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695
 msgid "A"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:201
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:235
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:204
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:238
 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:353
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:387
 msgid "A game is not currently running."
 msgstr ""
 
@@ -358,36 +384,36 @@ msgid ""
 "You must manually connect your wiimotes."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:109
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:100
 msgid ""
 "ALERT:\n"
 "\n"
-"NetPlay will currently only work properly when using the following "
-"settings:\n"
-" - Dual Core [OFF]\n"
-" - Audio Throttle [OFF]\n"
-" - DSP-HLE with \"Null Audio\" or DSP-LLE\n"
-" - Manually set the exact number of controllers that will be used to "
-"[Standard Controller]\n"
+"Netplay will only work with the following settings:\n"
+" - Enable Dual Core [OFF]\n"
+" - DSP Emulator Engine Must be the same on all computers!\n"
+" - DSP on Dedicated Thread [OFF]\n"
+" - Framelimit NOT set to [Audio]\n"
+" - Manually set the exact number of controllers to be used to [Standard "
+"Controller]\n"
 "\n"
-"All players should try to use the same Dolphin version and settings.\n"
-"Disable all memory cards or send them to all players before starting.\n"
-"Wiimote support has not been implemented.\n"
+"All players should use the same Dolphin version and settings.\n"
+"All memory cards must be identical between players or disabled.\n"
+"Wiimote support has not been implemented!\n"
 "\n"
-"You must forward TCP port to host!!"
+"The host must have the chosen TCP port open/forwarded!\n"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:111
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:116
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96
 msgid "AM-Baseboard"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:299
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:115
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:300
 msgid "AR Codes"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/AboutDolphin.h:33
+#: Source/Core/DolphinWX/Src/AboutDolphin.h:21
 msgid "About Dolphin"
 msgstr ""
 
@@ -395,15 +421,11 @@ msgstr ""
 msgid "Acceleration"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:463
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473
 msgid "Accuracy:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317
-msgid "Accurate VBeam emulation"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97
 msgid ""
 "Accurately emulate EFB copies.\n"
 "Some games depend on this for certain graphical effects or gameplay "
@@ -412,12 +434,12 @@ msgid ""
 "If unsure, check EFB to Texture instead."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:239
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:239
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:227
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:227
 msgid "Action"
 msgstr ""
 
-#: Source/Core/Core/Src/ARDecrypt.cpp:481
+#: Source/Core/Core/Src/ARDecrypt.cpp:469
 #, c-format
 msgid ""
 "Action Replay Code Decryption Error:\n"
@@ -427,102 +449,102 @@ msgid ""
 "%s"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:667
+#: Source/Core/Core/Src/ActionReplay.cpp:657
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:755
+#: Source/Core/Core/Src/ActionReplay.cpp:745
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide "
 "(%s)"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:547
+#: Source/Core/Core/Src/ActionReplay.cpp:537
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And "
 "Fill (%s)"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:607
+#: Source/Core/Core/Src/ActionReplay.cpp:597
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Write To "
 "Pointer (%s)"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:802
+#: Source/Core/Core/Src/ActionReplay.cpp:792
 #, c-format
 msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:682
+#: Source/Core/Core/Src/ActionReplay.cpp:672
 #, c-format
 msgid ""
 "Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)\n"
 "Master codes are not needed. Do not use master codes."
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:196
+#: Source/Core/Core/Src/ActionReplay.cpp:184
 #, c-format
 msgid "Action Replay Error: invalid AR code line: %s"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:872
+#: Source/Core/Core/Src/ActionReplay.cpp:862
 #, c-format
 msgid "Action Replay: Conditional Code: Invalid Size %08x (%s)"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:945
+#: Source/Core/Core/Src/ActionReplay.cpp:935
 #, c-format
 msgid "Action Replay: Invalid Normal Code Type %08x (%s)"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:896
+#: Source/Core/Core/Src/ActionReplay.cpp:886
 #, c-format
 msgid "Action Replay: Normal Code %i: Invalid subtype %08x (%s)"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:838
+#: Source/Core/Core/Src/ActionReplay.cpp:828
 #, c-format
 msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:242
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:247
 msgid "Adapter:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:76
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:63
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:63
 msgid "Add"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1275
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1301
 msgid "Add ActionReplay Code"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1204
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1230
 msgid "Add Patch"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:507
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:528
 msgid "Add new pane"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:404
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:426
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:811
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:408
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:430
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:792
 msgid "Add..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:90
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:81
 msgid "Address :"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:58
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:45
 msgid ""
 "Adds the specified value to zFar Parameter.\n"
 "Two ways to express the floating point values.\n"
@@ -533,7 +555,7 @@ msgid ""
 "NOTE: Check LogWindow/Console for the acquired values."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:53
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:40
 msgid ""
 "Adds the specified value to zNear Parameter.\n"
 "Two ways to express the floating point values.\n"
@@ -544,48 +566,48 @@ msgid ""
 "NOTE: Check LogWindow/Console for the acquired values."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:755
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:744
 msgid "Adjust the analog control pressure required to activate buttons."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:509
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:522
 msgid "Advanced"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561
 msgid "Advanced Settings"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:584
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:587
 msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:816
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:797
 msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1189
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1190
 msgid "All Gamecube GCM files (gcm)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1390
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1404
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1417
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1431
 msgid "All Save States (sav, s##)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1187
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1188
 msgid "All Wii ISO files (iso)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1207
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1208
 msgid "All compressed GC/Wii ISO files (gcz)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:124
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:104
 msgid "All files (*.*)|*.*"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123
 msgid ""
 "Allows toggling certain options via the hotkeys 3 (Internal Resolution), 4 "
 "(Aspect Ratio), 5 (Copy EFB) and 6 (Fog) within the emulation window.\n"
@@ -593,50 +615,50 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:285
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:272
 msgid "Analyze"
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:298
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:285
 msgid "Angle"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:367
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:375
 msgid "Anisotropic Filtering:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:350
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:358
 msgid "Anti-Aliasing:"
 msgstr ""
 
-#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:308
+#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:299
 msgid "Apploader is the wrong size...is it really an apploader?"
 msgstr ""
 
-#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:302
+#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:293
 msgid "Apploader unable to load from file"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:841
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:822
 msgid "Apploader:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:135
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:122
 msgid "Apply"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124
 msgid ""
 "Apply a post-processing effect after finishing a frame.\n"
 "\n"
 "If unsure, select (off)."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287
 msgid "Arabic"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:614
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:603
 #, c-format
 msgid "Are you sure you want to delete \"%s\"?"
 msgstr ""
@@ -651,206 +673,210 @@ msgstr ""
 msgid "Are you sure you want to delete this file?  It will be gone forever!"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:789
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:277
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:44
+msgid "Arm JIT (experimental)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:285
 msgid "Aspect Ratio:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:70
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:58
 msgid "At least one pane must remain open."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:553
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533
 msgid "Audio"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:694
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675
 msgid "Audio Backend:"
 msgstr ""
 
-#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:41
+#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:28
 msgid "AudioCommon: Error opening AO device.\n"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:275
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283
 msgid "Auto"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:337
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345
 msgid "Auto (Multiple of 640x528)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:337
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345
 msgid "Auto (Window Size)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:297
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305
 msgid "Auto adjust Window Size"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77
 msgid ""
 "Automatically adjusts the window size to your internal resolution.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:697
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696
 msgid "B"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:755
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:754
 msgid "BP register "
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:27
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:14
 msgid "Back"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:698
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:679
 msgid "Backend Settings"
 msgstr ""
 
-#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:60
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:206
+#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:47
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:211
 msgid "Backend:"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:318
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:95
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:305
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:82
 msgid "Background Input"
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:279
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:266
 msgid "Backward"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:264
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:257
 msgid "Bad File Header"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:627
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:621
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:290
 msgid "Banner"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:519
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:529
 msgid "Banner Details"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491
 msgid "Banner:"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:57
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:61
 msgid "Bar"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:308
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:316
 msgid "Basic"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555
 msgid "Basic Settings"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:22
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Bass"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:186
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:174
 msgid "Block Allocation Table checksum failed"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:631
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625
 msgid "Blocks"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:21
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Blue"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:24
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Blue Left"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:25
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Blue Right"
 msgstr ""
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:87
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270
 msgid "Bottom"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:238
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:225
 #, c-format
 msgid "Bound Controls: %lu"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348
 msgid "Broken"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:422
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:428
 msgid "Browse"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:256
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:243
 msgid "Browse for a directory to add"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:422
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:428
 msgid "Browse for an ISO directory..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1079
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1080
 msgid "Browse for output directory"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:328
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:331
 msgid "Buffer:"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:58
 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:119
+#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:106
 msgid "Buttons"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317
 msgid ""
 "Bypass the clearing of the data cache by the DCBZ instruction. Usually leave "
 "this option disabled."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:698
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:697
 msgid "C"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:77
+#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:64
 msgid "C Stick"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:77
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:64
 msgid "C-Stick"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:764
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:763
 msgid "CP reg"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:567
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547
 msgid "CPU Emulator Engine"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:490
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500
 msgid "Cache Display Lists"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88
 msgid ""
 "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n"
 "Decreases emulation speed by some percent (depending on your GPU).\n"
@@ -859,23 +885,38 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1858
+#, c-format
+msgid "Can't find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x"
+msgstr ""
+
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1872
+#, c-format
+msgid "Can't find WiiMote by connection handle %02x"
+msgstr ""
+
+#: Source/Core/Core/Src/HW/DVDInterface.cpp:669
+#: Source/Core/Core/Src/HW/DVDInterface.cpp:679
+msgid "Can't read from DVD_Plugin - DVD-Interface: Fatal Error"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:124
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:28
 msgid "Cancel"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:91
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:178
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:240
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:84
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:171
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:233
 #, c-format
 msgid "Cannot open %s"
 msgstr ""
 
-#: Source/Core/Core/Src/CoreTiming.cpp:141
+#: Source/Core/Core/Src/CoreTiming.cpp:128
 msgid "Cannot unregister events with events pending"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1078
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1061
 #, c-format
 msgid ""
 "Cannot use that file as a memory card.\n"
@@ -883,36 +924,21 @@ msgid ""
 "is not a valid gamecube memory card file"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1108
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1091
 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:1867
-#, 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:1881
-#, c-format
-msgid "Cant find WiiMote by connection handle %02x"
-msgstr ""
-
-#: 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 ""
-
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:52
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:39
 msgid "Caps Lock"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288
 msgid "Catalan"
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:311
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:298
 msgid "Center"
 msgstr ""
 
@@ -920,12 +946,12 @@ msgstr ""
 msgid "Change"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:316
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:322
 msgid "Change &Disc..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:179
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:179
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:167
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:167
 msgid "Change Disc"
 msgstr ""
 
@@ -933,228 +959,228 @@ msgstr ""
 msgid "Change Game"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:515
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495
 msgid ""
 "Change the language of the user interface.\n"
 "Requires restart."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:60
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:47
 msgid "Changes sign to zFar Parameter (after correction)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:55
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:42
 msgid "Changes sign to zNear Parameter (after correction)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:519
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499
 msgid "Changing this will have no effect while the emulator is running!"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:295
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:298
 msgid "Chat"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:47
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:34
 msgid "Cheat Code"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:118
 msgid "Cheat Search"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:38
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:25
 msgid "Cheats Manager"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:633
 msgid "Check Partition Integrity"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:864
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:880
 msgid "Checking integrity..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289
 msgid "Chinese (Simplified)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290
 msgid "Chinese (Traditional)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:818
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:799
 msgid "Choose a DVD root directory:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:822
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803
 msgid "Choose a NAND root directory:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:815
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:796
 msgid "Choose a default ISO:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1236
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1219
 msgid "Choose a directory to add"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1065
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1048
 msgid "Choose a file to open"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:217
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:204
 msgid "Choose a memory card:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:819
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800
 msgid ""
 "Choose file to use as apploader: (applies to discs constructed from "
 "directories only)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:767
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:806
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:781
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:822
 msgid "Choose the folder to extract to"
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:297
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:284
 msgid "Circle Stick"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:52
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:56
 msgid "Classic"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:144
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:43
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:487
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:913
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:137
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:30
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:474
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:904
 msgid "Clear"
 msgstr ""
 
-#: Source/Core/Core/Src/NetPlayServer.cpp:259
+#: Source/Core/Core/Src/NetPlayServer.cpp:263
 msgid ""
 "Client disconnect while game is running!! NetPlay is disabled. You must "
 "manually stop the game."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:298
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:247
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:552
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:578
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:285
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:234
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:562
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:590
 msgid "Close"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:174
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:177
 msgid "Co&nfigure..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:86
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:73
 msgid "Code Info"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:568
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:556
 msgid "Code: "
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:35
 msgid "Command"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:629
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:623
 msgid "Comment"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489
 msgid "Comment:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:893
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:884
 msgid "Compress ISO..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:905
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:899
 msgid "Compress selected ISOs..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1088
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1224
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1089
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1225
 msgid "Compressing ISO"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:429
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:435
 msgid "Config"
 msgstr ""
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:37
-#: Source/Core/DolphinWX/Src/InputConfigDiag.h:135
-#: Source/Core/DolphinWX/Src/InputConfigDiag.h:154
+#: Source/Core/DolphinWX/Src/InputConfigDiag.h:122
+#: Source/Core/DolphinWX/Src/InputConfigDiag.h:141
 msgid "Configure"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:111
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:98
 msgid "Configure Control"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:306
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
 #: Source/Core/DolphinWX/Src/NetWindow.cpp:583
 msgid "Configure Pads"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:429
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:435
 msgid "Configure..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1119
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1147
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1217
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1120
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1218
 msgid "Confirm File Overwrite"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:597
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:577
 msgid "Confirm on Stop"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:83
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:105
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:74
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:96
 msgid "Connect"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:783
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:764
 msgid "Connect USB Keyboard"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:362
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:368
 #, c-format
 msgid "Connect Wiimote %i"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:195
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183
 msgid "Connect Wiimote 1"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184
 msgid "Connect Wiimote 2"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:185
 msgid "Connect Wiimote 3"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:198
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:186
 msgid "Connect Wiimote 4"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/Main.cpp:627
+#: Source/Core/DolphinWX/Src/Main.cpp:655
 msgid "Connecting..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:155
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:156
 msgid "Console"
 msgstr ""
 
@@ -1162,15 +1188,15 @@ msgstr ""
 msgid "Continuous Scanning"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:46
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:33
 msgid "Control"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:189
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:176
 msgid "Convert to GCI"
 msgstr ""
 
-#: Source/Core/Core/Src/CoreParameter.cpp:379
+#: Source/Core/Core/Src/CoreParameter.cpp:368
 msgid "Copy failed"
 msgstr ""
 
@@ -1179,21 +1205,21 @@ msgstr ""
 msgid "Copy to Memcard %c"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:359
 msgid "Core"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:154
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:148
 #, c-format
 msgid "Could not create %s"
 msgstr ""
 
-#: Source/Core/AudioCommon/Src/AudioCommon.cpp:75
+#: Source/Core/AudioCommon/Src/AudioCommon.cpp:62
 #, c-format
 msgid "Could not initialize backend %s."
 msgstr ""
 
-#: Source/Core/Core/Src/CoreParameter.cpp:137
+#: Source/Core/Core/Src/CoreParameter.cpp:126
 #, c-format
 msgid ""
 "Could not read \"%s\".  There is no disc in the drive, or it is not a GC/Wii "
@@ -1201,12 +1227,12 @@ msgid ""
 "most PC DVD drives."
 msgstr ""
 
-#: Source/Core/Core/Src/CoreParameter.cpp:292
+#: Source/Core/Core/Src/CoreParameter.cpp:281
 #, c-format
 msgid "Could not recognize ISO file %s"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:569
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:579
 #, c-format
 msgid "Could not save %s"
 msgstr ""
@@ -1217,197 +1243,201 @@ msgid ""
 "(setting pads while the game is running is not yet supported)"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:123
+#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119
 #, c-format
 msgid ""
 "Could not write memory card file %s.\n"
 "\n"
 "Are you running Dolphin from a CD/DVD, or is the save file maybe write "
-"protected?"
+"protected?\n"
+"\n"
+"Are you receiving this after moving the emulator directory?\n"
+"If so, then you may need to re-specify your memory card location in the "
+"options."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1107
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1133
 msgid "Couldn't find open command for extension 'ini'!"
 msgstr ""
 
-#: Source/Core/Core/Src/BootManager.cpp:146
+#: Source/Core/Core/Src/BootManager.cpp:137
 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:170
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:495
 msgid "Count:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:452
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456
 msgid "Country:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:186
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:562
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:173
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:550
 msgid "Create AR Code"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:543
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:608
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:569
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:641
 msgid "Create new perspective"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:17
 msgid "Creator: "
 msgstr ""
 
-#: Source/Core/Common/Src/MsgHandler.cpp:68
+#: Source/Core/Common/Src/MsgHandler.cpp:54
 msgid "Critical"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562
 msgid "Crop"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119
 msgid ""
 "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:48
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:52
 msgid "Crossfade"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:597
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:600
 #, c-format
-msgid "Current dir changed from %s to %s after wxFileSelector!"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336
-msgid "Custom Projection Hack"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/PHackSettings.h:30
-msgid "Custom Projection Hack Settings"
+msgid "Current directory changed from %s to %s after wxFileSelector!"
 msgstr ""
 
 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:339
+msgid "Custom Projection Hack"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/PHackSettings.h:17
+msgid "Custom Projection Hack Settings"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342
 msgid "Customize some Orthographic Projection parameters."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291
 msgid "Czech"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:698
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:697
 msgid "D"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:89
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
 msgid "D-Pad"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:431
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
 msgid "DSP"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:639
 msgid "DSP Emulator Engine"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:254
 msgid "DSP HLE emulation (fast)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:256
 msgid "DSP LLE interpreter (slow)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660
-msgid "DSP LLE on Thread"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:255
 msgid "DSP LLE recompiler"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:431
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:641
+msgid "DSP on Dedicated Thread"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
 msgid "DSP settings"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:838
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:819
 msgid "DVD Root:"
 msgstr ""
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:239
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:226
 msgid "DVDLowRead - Fatal Error: failed to read from volume"
 msgstr ""
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:333
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:320
 msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:176
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:163
 msgid "Data Size"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468
 msgid "Date:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:528
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:564
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:518
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:557
 msgid "Datel MaxDrive/Pro files(*.sav)"
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:242
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:259
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:267
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:281
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:296
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:229
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:246
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:254
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:268
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:283
 msgid "Dead Zone"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:35
 msgid "Debug"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:521
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534
 msgid "Debugging"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:79
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:66
 msgid "Decimal"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:890
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:881
 msgid "Decompress ISO..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:906
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:900
 msgid "Decompress selected ISOs..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1088
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1224
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1089
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1225
 msgid "Decompressing ISO"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:912
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:903
 msgid "Default"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:835
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:816
 msgid "Default ISO:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:114
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:107
 msgid "Default font"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:32
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:926
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:19
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917
 msgid "Delete"
 msgstr ""
 
@@ -1415,64 +1445,68 @@ msgstr ""
 msgid "Delete Save"
 msgstr ""
 
-#: Source/Core/VideoCommon/Src/AVIDump.cpp:77
+#: Source/Core/VideoCommon/Src/AVIDump.cpp:64
 #, c-format
 msgid "Delete the existing file '%s'?"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:671
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:683
 msgid "Description"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:472
 msgid "Detect"
 msgstr ""
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:233
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:328
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:220
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:315
 msgid ""
 "Detected attempt to read more data from the DVD than fit inside the out "
 "buffer. Clamp."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:127
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:898
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:114
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:889
 msgid "Device"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:798
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:731
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779
 msgid "Device Settings"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:45
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:49
 msgid "Dial"
 msgstr ""
 
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:146
+#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:135
 msgid "Direct3D11"
 msgstr ""
 
-#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:128
+#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:125
 msgid "Direct3D9"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:167
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:155
 msgid ""
 "Directory checksum failed\n"
 " and Directory backup checksum failed"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:433
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:443
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485
 msgid "Disable"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:491
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501
+msgid "Disable Destination Alpha"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:409
 msgid "Disable Fog"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108
 msgid ""
 "Disable any XFB emulation.\n"
 "Speeds up emulation a lot but causes heavy glitches in many games which rely "
@@ -1481,7 +1515,7 @@ msgid ""
 "If unsure, leave this checked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95
 msgid ""
 "Disable emulation of EFB copies.\n"
 "These are often used for post-processing or render-to-texture effects, so "
@@ -1491,52 +1525,60 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:543
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101
+msgid ""
+"Disables emulation of a hardware feature called destination alpha, which is "
+"used in many games for various graphical effects.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:553
 msgid "Disc"
 msgstr ""
 
-#: Source/Core/DiscIO/Src/DriveBlob.cpp:107
-#: Source/Core/DiscIO/Src/DriveBlob.cpp:126
+#: Source/Core/DiscIO/Src/DriveBlob.cpp:94
+#: Source/Core/DiscIO/Src/DriveBlob.cpp:113
 msgid "Disc Read Error"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:312
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:320
 msgid "Display"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104
 msgid ""
 "Display the inputs read by the emulator.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:80
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:67
 msgid "Divide"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:987
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:990
 msgid "Do you want to stop the current emulation?"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:663
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:644
 msgid "Dolby Pro Logic II decoder"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:864
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:856
 msgid "Dolphin"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:183
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:188
 #, c-format
 msgid "Dolphin %s Graphics Configuration"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:292
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:298
 msgid "Dolphin &Web Site"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.h:37
+#: Source/Core/DolphinWX/Src/ConfigMain.h:24
 msgid "Dolphin Configuration"
 msgstr ""
 
@@ -1544,16 +1586,16 @@ msgstr ""
 msgid "Dolphin Emulated Wiimote Configuration"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:394
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:383
 msgid "Dolphin FIFO"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1136
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1153
 msgid "Dolphin GCPad Configuration"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:679
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1074
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:685
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1089
 msgid "Dolphin TAS Movies (*.dtm)"
 msgstr ""
 
@@ -1561,101 +1603,107 @@ msgstr ""
 msgid "Dolphin Wiimote Configuration"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:293
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:299
 msgid "Dolphin at &Google Code"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:364
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:351
 msgid ""
 "Dolphin could not find any GC/Wii ISOs.  Doubleclick here to browse for "
 "files..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:368
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:355
 msgid ""
 "Dolphin is currently set to hide all games.  Doubleclick here to show all "
 "games..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1159
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1160
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1246
 msgid "Dolphin was unable to complete the requested action."
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:275
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:58
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
+msgid ""
+"Doubles the emulated GPU clock rate. May speed up some games (ON = Fast, OFF "
+"= Compatible)"
+msgstr ""
+
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:262
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:45
 msgid "Down"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:54
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:44
 msgid "Download Codes (WiiRD Database)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:297
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:287
 #, c-format
 msgid "Downloaded %lu codes. (added %lu)"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:31
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:35
 msgid "Drums"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:105
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
 msgid "Dummy"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:661
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:642
 msgid "Dump Audio"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:532
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545
 msgid "Dump EFB Target"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546
 msgid "Dump Frames"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543
 msgid "Dump Textures"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114
 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:106
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111
 msgid ""
 "Dump decoded game textures to User/Dump/Textures/<game_id>/\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113
 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:474
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292
 msgid "Dutch"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:112
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:113
 msgid "E&xit"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:441
 msgid "EFB Copies"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:223
+#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:210
 #, c-format
 msgid ""
 "ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least "
@@ -1664,52 +1712,52 @@ msgid ""
 "driver."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:166
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:160
 msgid "EUROPE"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:156
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:143
 msgid "Early Memory Updates"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:447
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:453
 msgid "Edit"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.h:30
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.h:17
 msgid "Edit ActionReplay Code"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:285
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:286
 msgid "Edit Config"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.h:30
+#: Source/Core/DolphinWX/Src/PatchAddEdit.h:17
 msgid "Edit Patch"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:447
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:453
 msgid "Edit current perspective"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:403
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:425
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:407
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:429
 msgid "Edit..."
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:44
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:48
 msgid "Effect"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:425
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435
 msgid "Embedded Frame Buffer"
 msgstr ""
 
-#: Source/Core/Core/Src/Core.cpp:201
+#: Source/Core/Core/Src/Core.cpp:190
 msgid "Emu Thread already running"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110
 msgid ""
 "Emulate XFBs accurately.\n"
 "Slows down emulation a lot and prohibits high-resolution rendering but is "
@@ -1718,7 +1766,7 @@ msgid ""
 "If unsure, check virtual XFB emulation instead."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109
 msgid ""
 "Emulate XFBs using GPU texture objects.\n"
 "Fixes many games which don't work without XFB emulation while not being as "
@@ -1732,7 +1780,7 @@ msgstr ""
 msgid "Emulated Wiimote"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346
 msgid "Emulation State: "
 msgstr ""
 
@@ -1740,7 +1788,7 @@ msgstr ""
 msgid "Enable"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91
 msgid ""
 "Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's "
 "supported by your GPU.\n"
@@ -1750,55 +1798,55 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:111
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:98
 msgid "Enable AR Logging"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324
 msgid "Enable Block Merging"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331
 msgid "Enable Bounding Box Calculation"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:446
 msgid "Enable Cache"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:562
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542
 msgid "Enable Cheats"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310
 msgid "Enable Dual Core"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
 msgid "Enable Dual Core (speedup)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:550
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:563
 msgid "Enable Hotkeys"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311
 msgid "Enable Idle Skipping"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541
 msgid "Enable Idle Skipping (speedup)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312
 msgid "Enable MMU"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:554
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:567
 msgid "Enable Progressive Scan"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757
 msgid "Enable Screen Saver"
 msgstr ""
 
@@ -1806,15 +1854,15 @@ msgstr ""
 msgid "Enable Speaker Data"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
 msgid "Enable WideScreen"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:516
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529
 msgid "Enable Wireframe"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85
 msgid ""
 "Enable anisotropic filtering.\n"
 "Enhances visual quality of textures that are at oblique viewing angles.\n"
@@ -1823,7 +1871,7 @@ msgid ""
 "If unsure, select 1x."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323
 msgid ""
 "Enable fast disc access.  Needed for a few games. (ON = Fast, OFF = "
 "Compatible)"
@@ -1833,7 +1881,7 @@ msgstr ""
 msgid "Enable pages"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76
 msgid ""
 "Enable this if you want the whole screen to be used for rendering.\n"
 "If this is disabled, a render window will be created instead.\n"
@@ -1841,7 +1889,7 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80
 msgid ""
 "Enable this if you want to use the main Dolphin window for rendering rather "
 "than a separate render window.\n"
@@ -1849,34 +1897,34 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:335
 msgid ""
 "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for "
 "ANY other game."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340
 msgid "Enables Custom Projection Hack"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:528
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508
 msgid ""
 "Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on "
 "OSX."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510
 msgid ""
 "Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:512
 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
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81
 msgid ""
 "Enables progressive scan if supported by the emulated software.\n"
 "Most games don't care about this.\n"
@@ -1884,108 +1932,108 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313
 msgid ""
 "Enables the Memory Management Unit, needed for some games. (ON = Compatible, "
 "OFF = Fast)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116
 msgid ""
 "Encode frame dumps using the FFV1 codec.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:40
 msgid "End"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:469
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:280
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:260
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293
 msgid "English"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:329
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:407
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:337
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:417
 msgid "Enhancements"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:607
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:640
 msgid "Enter a name for the new perspective:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:191
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:178
 #, c-format
 msgid "Entry %d/%d"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:85
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:72
 #, c-format
 msgid "Entry 1/%d"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:204
 msgid "Equal"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:45
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:156
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1242
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:32
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:150
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226
 msgid "Error"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/Main.cpp:381
+#: Source/Core/DolphinWX/Src/Main.cpp:409
 msgid "Error loading selected language. Falling back to system default."
 msgstr ""
 
-#: Source/Core/Common/Src/ChunkFile.h:226
+#: Source/Core/Common/Src/ChunkFile.h:221
 #, c-format
 msgid ""
 "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). "
 "Aborting savestate load..."
 msgstr ""
 
-#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:342
+#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:329
 #, c-format
 msgid ""
 "Error: Trying to access %s fonts but they are not loaded. Games may not show "
 "fonts correctly, or crash."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:30
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:17
 msgid "Escape"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:26
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:30
 msgid "Euphoria"
 msgstr ""
 
 #: Source/Core/Core/Src/ArmMemTools.cpp:78
-#: Source/Core/Core/Src/x64MemTools.cpp:217
+#: Source/Core/Core/Src/x64MemTools.cpp:206
 #, c-format
 msgid "Exception handler - access below memory space. %08llx%08llx"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:61
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
 msgid "Execute"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:459
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:446
 msgid "Export Failed"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:639
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:649
 msgid "Export File"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:177
 msgid "Export Recording"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:345
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:351
 msgid "Export Recording..."
 msgstr ""
 
@@ -1993,7 +2041,7 @@ msgstr ""
 msgid "Export Save"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:874
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:865
 msgid "Export Wii save (Experimental)"
 msgstr ""
 
@@ -2001,100 +2049,100 @@ msgstr ""
 msgid "Export all saves"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:80
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:72
 msgid "Export failed, try again?"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:559
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:552
 msgid "Export save as..."
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:297
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:284
 msgid "Extension"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483
 msgid "External Frame Buffer"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:61
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:48
 msgid "Extra Parameter"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:62
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:49
 msgid "Extra Parameter useful in ''Metroid: Other M'' only."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:614
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:624
 msgid "Extract All Files..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:616
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:626
 msgid "Extract Apploader..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:617
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627
 msgid "Extract DOL..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:610
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:620
 msgid "Extract Directory..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:612
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:622
 msgid "Extract File..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:608
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:618
 msgid "Extract Partition..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:724
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:738
 #, c-format
 msgid "Extracting %s"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:707
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:721
 msgid "Extracting All Files"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:707
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:721
 msgid "Extracting Directory"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:710
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:724
 msgid "Extracting..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:892
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:893
 msgid "FIFO Byte"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:45
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:32
 msgid "FIFO Player"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:169
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:163
 msgid "FRANCE"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472
 msgid "FST Size:"
 msgstr ""
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:77
+#: Source/Core/Core/Src/NetPlayClient.cpp:81
 msgid "Failed to Connect!"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:225
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:228
 msgid "Failed to Listen!!"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:307
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:300
 msgid "Failed to download codes."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:827
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:843
 #, c-format
 msgid "Failed to extract to %s!"
 msgstr ""
@@ -2112,26 +2160,30 @@ msgid ""
 "(Choose it from the \"Audio\" tab of the configuration dialog.)"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:116
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:139
+#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:108
+#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:131
 msgid "Failed to load bthprops.cpl"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:100
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:109
+#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:90
+#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:101
 msgid "Failed to load hid.dll"
 msgstr ""
 
-#: Source/Core/Core/Src/Movie.cpp:792
+#: Source/Core/Core/Src/Movie.cpp:783
 #, c-format
 msgid "Failed to read %s"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:151
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:144
 msgid "Failed to read banner.bin"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:223
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:178
+msgid "Failed to read bk header"
+msgstr ""
+
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:211
 #, c-format
 msgid ""
 "Failed to read block %d of the save data\n"
@@ -2139,140 +2191,149 @@ msgid ""
 "FilePosition:%llx"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:148
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:136
 msgid ""
 "Failed to read block allocation table backup correctly\n"
 "(0x8000-0x9FFF)"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:142
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:130
 msgid ""
 "Failed to read block allocation table correctly\n"
 "(0x6000-0x7FFF)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:286
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:279
 #, c-format
 msgid "Failed to read data from file %d"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:136
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:367
+#, c-format
+msgid "Failed to read data from file: %s"
+msgstr ""
+
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:124
 msgid ""
 "Failed to read directory backup correctly\n"
 "(0x4000-0x5FFF)"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:130
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:118
 msgid ""
 "Failed to read directory correctly\n"
 "(0x2000-0x3FFF)"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:119
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:90
+msgid "Failed to read header"
+msgstr ""
+
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:107
 msgid ""
 "Failed to read header correctly\n"
 "(0x0000-0x1FFF)"
 msgstr ""
 
-#: Source/Core/DiscIO/Src/VolumeGC.cpp:61
+#: Source/Core/DiscIO/Src/VolumeGC.cpp:48
 msgid "Failed to read unique ID from disc image"
 msgstr ""
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:84
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:71
 msgid "Failed to write BT.DINF to SYSCONF"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:228
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:221
 msgid "Failed to write bkhdr"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:164
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:157
 #, c-format
 msgid "Failed to write header for %s"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:258
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:251
 #, c-format
 msgid "Failed to write header for file %d"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294
 msgid "Farsi"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477
 msgid "Fast"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315
 msgid "Fast version of the MMU.  Does not work for every game."
 msgstr ""
 
-#: Source/Core/Core/Src/Movie.cpp:1046
+#: Source/Core/Core/Src/Movie.cpp:1037
 #, c-format
 msgid ""
 "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:199
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:202
 msgid "Fifo Player"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:99
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:86
 msgid "File Info"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:304
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:295
 msgid "File contained no codes."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:413
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:400
 msgid "File converted to .gci"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:428
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:415
 msgid ""
 "File could not be opened\n"
 "or does not have a valid extension"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:84
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:72
 #, c-format
 msgid ""
 "File has the extension \"%s\"\n"
 "valid extensions are (.raw/.gcp)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:425
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:412
 msgid "File is not recognized as a memcard"
 msgstr ""
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:294
+#: Source/Core/DiscIO/Src/CompressedBlob.cpp:281
 msgid "File not compressed"
 msgstr ""
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:127
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:109
 #, c-format
 msgid "FileIO: Unknown open mode : 0x%02x"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:531
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:541
 msgid "Filesystem"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1100
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1126
 msgid "Filetype 'ini' is unknown! Will not open!"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:265
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:252
 msgid "Find next"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:266
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:253
 msgid "Find previous"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:632
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626
 msgid "First Block"
 msgstr ""
 
@@ -2280,23 +2341,23 @@ msgstr ""
 msgid "Fix Checksums"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:275
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283
 msgid "Force 16:9"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:275
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283
 msgid "Force 4:3"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:568
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548
 msgid "Force Console as NTSC-J"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406
 msgid "Force Texture Filtering"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90
 msgid ""
 "Force texture filtering even if the emulated game explicitly disabled it.\n"
 "Improves texture quality slightly but causes glitches in some games.\n"
@@ -2304,7 +2365,7 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83
 msgid ""
 "Force the game to output graphics for widescreen resolutions.\n"
 "Causes graphical glitches is some games.\n"
@@ -2312,160 +2373,160 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488
 msgid ""
 "Forces NTSC-J mode for using the Japanese ROM font.\n"
 "Left unchecked, dolphin defaults to NTSC-U and automatically enables this "
 "setting when playing Japanese games."
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:74
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:62
 msgid ""
 "Format as ascii (NTSC\\PAL)?\n"
 "Choose no for sjis (NTSC-J)"
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:278
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:265
 msgid "Forward"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504
 #, c-format
 msgid "Found %d results for '"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:857
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:925
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:858
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:926
 msgid "Frame"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:867
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:868
 msgid "Frame "
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:185
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:173
 msgid "Frame Advance"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:536
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549
 msgid "Frame Dumps use FFV1"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:227
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:214
 msgid "Frame Info"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:116
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:103
 msgid "Frame Range"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:138
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:139
 msgid "Frame S&kipping"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:572
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552
 msgid "Framelimit:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:204
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:191
 msgid "Frames To Record"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547
 msgid "Free Look"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
 msgid "French"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:38
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:42
 msgid "Frets"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:118
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:137
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:105
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:124
 msgid "From"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:426
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:432
 msgid "FullScr"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:256
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263
 msgid "Fullscreen resolution:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:534
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524
 msgid "GCI File(*.gci)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GCMicDlg.h:44
+#: Source/Core/DolphinWX/Src/GCMicDlg.h:31
 msgid "GCMic Configuration"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:432
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
 msgid "GCPad"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:659
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:658
 msgid "GX_CMD_INVL_VC"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:448
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:452
 msgid "Game ID:"
 msgstr ""
 
-#: Source/Core/Core/Src/NetPlay.cpp:229
+#: Source/Core/Core/Src/NetPlay.cpp:216
 msgid "Game is already running!"
 msgstr ""
 
-#: Source/Core/Core/Src/NetPlay.cpp:259
+#: Source/Core/Core/Src/NetPlay.cpp:246
 msgid "Game isn't running!"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:389
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:393
 msgid "Game not found!"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:385
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:389
 msgid "Game-Specific Settings"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:293
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:294
 msgid "GameConfig"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:525
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:515
 msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534
 msgid "Gamecube"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:178
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:181
 msgid "Gamecube &Pad Settings"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:218
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1069
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:205
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1052
 msgid "Gamecube Memory Cards (*.raw,*.gcp)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:432
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
 msgid "Gamecube Pad settings"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:117
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302
 msgid "Gecko Codes"
 msgstr ""
 
-#: Source/Core/Core/Src/GeckoCode.cpp:222
+#: Source/Core/Core/Src/GeckoCode.cpp:214
 #, c-format
 msgid ""
 "GeckoCode failed to run (CT%i CST%i) (%s)\n"
@@ -2474,10 +2535,10 @@ msgid ""
 "directory and restarting Dolphin.)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:172
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:197
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:160
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:160
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:202
 msgid "General"
 msgstr ""
 
@@ -2485,30 +2546,30 @@ msgstr ""
 msgid "General Settings"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:470
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:281
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:316
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:261
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
 msgid "German"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:449
+#: Source/Core/Core/Src/ActionReplay.cpp:439
 #, c-format
 msgid "GetARCode: Index is greater than ar code list size %lu"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:430
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:436
 msgid "Graphics"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:430
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:436
 msgid "Graphics settings"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:205
 msgid "Greater Than"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87
 msgid ""
 "Greatly increases quality of textures generated using render to texture "
 "effects.\n"
@@ -2519,51 +2580,67 @@ msgid ""
 "If unsure, leave this checked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:317
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
 msgid "Greek"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:22
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Green"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:24
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Green Left"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:25
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Green Right"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:35
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:39
 msgid "Guitar"
 msgstr ""
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1259
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1250
 msgid "HCI_CMD_INQUIRY is called, please report!"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:421
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504
+msgid "Hacked Buffer Upload"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431
 msgid "Hacks"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:158
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:146
 msgid "Header checksum failed"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:318
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298
 msgid "Hebrew"
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:313
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:300
 msgid "Height"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:64
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:51
 msgid "Help"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/Main.cpp:209
+#: Source/Core/DolphinWX/Src/Main.cpp:229
+msgid ""
+"Hi,\n"
+"\n"
+"Dolphin requires Mac OS X 10.7 or greater.\n"
+"Unfortunately you're running an old version of OS X.\n"
+"The last Dolphin version to support OS X 10.6 is Dolphin 3.5\n"
+"Please upgrade to 10.7 or greater to use the newest Dolphin version.\n"
+"\n"
+"Sayonara!\n"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/Main.cpp:220
 msgid ""
 "Hi,\n"
 "\n"
@@ -2573,41 +2650,41 @@ msgid ""
 "Sayonara!\n"
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:309
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:296
 msgid "Hide"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:307
 msgid "Hide Mouse Cursor"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79
 msgid ""
 "Hides the mouse cursor if it's on top of the emulation window.\n"
 "\n"
 "If unsure, leave this checked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:54
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41
 msgid "Home"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:85
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:138
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:76
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:141
 msgid "Host"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.h:44
+#: Source/Core/DolphinWX/Src/HotkeyDlg.h:31
 msgid "Hotkey Configuration"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:272
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:272
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:594
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:260
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:260
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574
 msgid "Hotkeys"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:319
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299
 msgid "Hungarian"
 msgstr ""
 
@@ -2615,29 +2692,29 @@ msgstr ""
 msgid "Hybrid Wiimote"
 msgstr ""
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:532
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:519
 #, 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:786
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:773
 #, c-format
 msgid ""
-"IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available "
-"in your nand dump\n"
+"IOCTL_ES_LAUNCH: Game tried to reload an IOS or a title that is not "
+"available in your NAND dump\n"
 "TitleID %016llx.\n"
-" Dolphin will likely hang now"
+" Dolphin will likely hang now."
 msgstr ""
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:313
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:300
 msgid "IOCTL_ES_READCONTENT - bad destination"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729
 msgid "IPL Settings"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269
 msgid "IR"
 msgstr ""
 
@@ -2649,45 +2726,33 @@ msgstr ""
 msgid "IR Sensitivity:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:502
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:512
 msgid "ISO Details"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:830
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:811
 msgid "ISO Directories"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:172
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:166
 msgid "ITALY"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:630
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:624
 msgid "Icon"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332
 msgid ""
 "If checked, the bounding box registers will be updated. Used by the Paper "
 "Mario games."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318
-msgid ""
-"If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505
-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:428
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438
 msgid "Ignore Format Changes"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94
 msgid ""
 "Ignore any changes to the EFB format.\n"
 "Improves performance in many games without any negative effect. Causes "
@@ -2696,7 +2761,7 @@ msgid ""
 "If unsure, leave this checked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93
 msgid ""
 "Ignore any requests of the CPU to read from or write to the EFB.\n"
 "Improves performance in some games, but might disable some gameplay-related "
@@ -2709,35 +2774,27 @@ msgstr ""
 msgid "Import Save"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:59
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:48
 msgid "Import failed, try again?"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:454
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:441
 msgid ""
 "Imported file has gsc extension\n"
 "but does not have a correct header"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:442
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:429
 msgid "Imported file has invalid length"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:451
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:438
 msgid ""
 "Imported file has sav extension\n"
 "but does not have a correct header"
 msgstr ""
 
-#: 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/ISOProperties.cpp:347
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350
 msgid "In Game"
 msgstr ""
 
@@ -2745,125 +2802,129 @@ msgstr ""
 msgid "In-Game"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:34
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305
 msgid "Info"
 msgstr ""
 
-#: Source/Core/Common/Src/MsgHandler.cpp:65
+#: Source/Core/Common/Src/MsgHandler.cpp:51
 msgid "Information"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:481
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:468
 msgid "Input"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:63
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:50
 msgid "Insert"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:176
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:166
 msgid "Insert Encrypted or Decrypted code here..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:763
 msgid "Insert SD Card"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:34
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:21
 msgid "Insert name here.."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:196
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:199
 msgid "Install WAD"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:895
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:888
 msgid "Install to Wii Menu"
 msgstr ""
 
-#: Source/Core/Core/Src/x64MemTools.cpp:252
+#: Source/Core/Core/Src/x64MemTools.cpp:242
 msgid ""
 "InstallExceptionHandler called, but this platform does not yet support it."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1297
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
 msgid "Installing WAD..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:885
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:901
 msgid "Integrity Check Error"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:891
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:907
 msgid "Integrity check completed"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:890
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:906
 msgid "Integrity check completed. No errors have been found."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:882
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:898
 #, 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:552
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532
 msgid "Interface"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:646
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627
 msgid "Interface Settings"
 msgstr ""
 
-#: Source/Core/Core/Src/State.cpp:240
+#: Source/Core/Core/Src/State.cpp:228
 msgid "Internal LZO Error - compression failed"
 msgstr ""
 
-#: Source/Core/Core/Src/State.cpp:348
+#: Source/Core/Core/Src/State.cpp:336
 #, c-format
 msgid ""
 "Internal LZO Error - decompression failed (%d) (%li, %li) \n"
 "Try loading the state again"
 msgstr ""
 
-#: Source/Core/Core/Src/State.cpp:485
+#: Source/Core/Core/Src/State.cpp:473
 msgid "Internal LZO Error - lzo_init() failed"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:344
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:352
 msgid "Internal Resolution:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:42
+msgid "Interpreter (VERY slow)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349
 msgid "Intro"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:194
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:187
 #, c-format
 msgid "Invalid Size(%x) or Magic word (%x)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:612
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:600
 msgid "Invalid Value!"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:462
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:449
 msgid "Invalid bat.map or dir entry"
 msgstr ""
 
-#: Source/Core/Core/Src/CoreTiming.cpp:548
+#: Source/Core/Core/Src/CoreTiming.cpp:553
 #, c-format
 msgid "Invalid event type %i"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:326
+#: Source/Core/Core/Src/HW/DVDInterface.cpp:309
 msgid "Invalid file"
 msgstr ""
 
-#: Source/Core/DiscIO/Src/BannerLoaderGC.cpp:41
+#: Source/Core/DiscIO/Src/BannerLoaderGC.cpp:28
 #, c-format
 msgid ""
 "Invalid opening.bnr found in gcm:\n"
@@ -2871,203 +2932,211 @@ msgid ""
 " You may need to redump this game."
 msgstr ""
 
-#: Source/Core/Core/Src/Movie.cpp:735
+#: Source/Core/Core/Src/Movie.cpp:726
 msgid "Invalid recording file"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:473
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:472
 msgid "Invalid search parameters (no object selected)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:456
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:455
 msgid "Invalid search string (couldn't convert to number)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:444
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:443
 msgid "Invalid search string (only even string lengths supported)"
 msgstr ""
 
-#: Source/Core/Core/Src/Core.cpp:513
+#: Source/Core/Core/Src/Core.cpp:511
 msgid "Invalid state"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:473
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:320
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300
 msgid "Italian"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:183
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:177
 msgid "JAPAN"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:321
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:46
+msgid "JIT Recompiler (recommended)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:47
+msgid "JITIL experimental recompiler"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:279
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
 msgid "Japanese"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:188
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:182
 msgid "KOREA"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78
 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:298
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:306
 msgid "Keep window on top"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:241
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:241
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:229
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:229
 msgid "Key"
 msgstr ""
 
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282
 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:322
 msgid "Korean"
 msgstr ""
 
 #. i18n:  Left
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:57
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:44
 msgid "L"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:39
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:26
 msgid "L Button"
 msgstr ""
 
 #. i18n:  Left-Analog
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:61
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:48
 msgid "L-Analog"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:585
 msgid "Language:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:152
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:153
 msgid "Last Overwritten State"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:159
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:161
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:160
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:162
 msgid "Last Saved State"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:696
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:677
 msgid "Latency:"
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:276
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:55
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:263
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:42
 msgid "Left"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:60
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:64
 msgid "Left Stick"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:257
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:257
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:245
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:245
 msgid ""
 "Left click to detect hotkeys.\n"
 "Enter space to clear."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:689
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:678
 msgid ""
 "Left-click to detect input.\n"
 "Middle-click to clear.\n"
 "Right-click for more options."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:694
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:683
 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:206
 msgid "Less Than"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:565
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545
 msgid "Limit by FPS"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:924
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:915
 msgid "Load"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544
 msgid "Load Custom Textures"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
 msgid "Load State Slot 1"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189
 msgid "Load State Slot 2"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:190
 msgid "Load State Slot 3"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:203
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:191
 msgid "Load State Slot 4"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192
 msgid "Load State Slot 5"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193
 msgid "Load State Slot 6"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:194
 msgid "Load State Slot 7"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:195
 msgid "Load State Slot 8"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:155
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:156
 msgid "Load State..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1332
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1359
 msgid "Load Wii System Menu"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1327
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1354
 #, c-format
 msgid "Load Wii System Menu %d%c"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112
 msgid ""
 "Load custom textures from User/Load/Textures/<game_id>/\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:50
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:37
 msgid "Load preset values from hack patterns available."
 msgstr ""
 
@@ -3075,23 +3144,23 @@ msgstr ""
 msgid "Local"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogWindow.h:51
+#: Source/Core/DolphinWX/Src/LogWindow.h:38
 msgid "Log"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:26
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:13
 msgid "Log Configuration"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:296
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304
 msgid "Log FPS to file"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:96
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83
 msgid "Log Types"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103
 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"
@@ -3099,81 +3168,90 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:81
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:68
 msgid "Logger Outputs"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132
-#: Source/Core/DolphinWX/Src/Frame.cpp:328
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:119
+#: Source/Core/DolphinWX/Src/Frame.cpp:314
 msgid "Logging"
 msgstr ""
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:255
+#: Source/Core/Core/Src/NetPlayClient.cpp:259
 msgid "Lost connection to server!"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:42
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:29
 msgid "M Button"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:119
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:112
 #, c-format
 msgid ""
 "MD5 mismatch\n"
 " %016llx%016llx != %016llx%016llx"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314
 msgid "MMU Speed Hack"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:527
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:563
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:517
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:556
 msgid "MadCatz Gameshark files(*.gcs)"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:51
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:63
+#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:38
 msgid "Main Stick"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460
 msgid "Maker ID:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487
 msgid "Maker:"
 msgstr ""
 
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100
+msgid ""
+"Makes distant objects more visible by removing fog, thus increasing the "
+"overall detail.\n"
+"Disabling fog will break some games which rely on proper fog emulation.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:97
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:100
 msgid "Max"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:448
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:435
 msgid "Memcard already has a save for this title"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:291
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:278
 msgid "Memcard already opened"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:912
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:913
 msgid "Memory Byte"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:225
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:113
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:212
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:93
 msgid "Memory Card"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.h:36
+#: Source/Core/DolphinWX/Src/MemcardManager.h:23
 msgid ""
 "Memory Card Manager WARNING-Make backups before using, should be fixed but "
 "could mangle stuff!"
 msgstr ""
 
-#: Source/Core/Core/Src/CoreParameter.cpp:371
+#: Source/Core/Core/Src/CoreParameter.cpp:360
 #, c-format
 msgid ""
 "Memory Card filename in Slot %c is incorrect\n"
@@ -3184,15 +3262,15 @@ msgid ""
 "Would you like to copy the old file to this new location?\n"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:124
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:112
 msgid "Memorycard filesize does not match the header size"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:50
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:37
 msgid "Menu"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:114
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:94
 msgid "Mic"
 msgstr ""
 
@@ -3201,20 +3279,20 @@ msgstr ""
 msgid "Min"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:580
 msgid "Misc"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:795
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776
 msgid "Misc Settings"
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:240
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:294
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:227
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:281
 msgid "Modifier"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106
 msgid ""
 "Modify textures to show the format they're encoded in. Needs an emulation "
 "reset in most cases.\n"
@@ -3222,20 +3300,20 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:115
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:108
 msgid "Monospaced font"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:305
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:292
 msgid "Motion Plus"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:309
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:86
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:296
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73
 msgid "Motor"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:654
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:666
 msgid ""
 "Move the mouse pointer over an option to display a detailed description.\n"
 "\n"
@@ -3246,224 +3324,235 @@ msgid ""
 "\n"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:75
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:62
 msgid "Multiply"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:651
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:650
 msgid "NOP"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:629
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:628
 msgid "NOTE: Stream size doesn't match actual data length\n"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:129
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:116
 msgid "NP Add"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:124
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:111
 msgid "NP Begin"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:132
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:119
 msgid "NP Decimal"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:126
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:113
 msgid "NP Delete"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:133
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:120
 msgid "NP Divide"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:120
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:107
 msgid "NP Down"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:123
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:110
 msgid "NP End"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:111
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:98
 msgid "NP Enter"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:127
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:114
 msgid "NP Equal"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:116
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:103
 msgid "NP Home"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:125
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:112
 msgid "NP Insert"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:117
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:104
 msgid "NP Left"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:128
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:115
 msgid "NP Multiply"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:122
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:109
 msgid "NP Page Down"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:121
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:108
 msgid "NP Page Up"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:119
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:106
 msgid "NP Right"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:130
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:117
 msgid "NP Separator"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:109
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:96
 msgid "NP Space"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:131
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:118
 msgid "NP Subtract"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:110
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:97
 msgid "NP Tab"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:118
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:105
 msgid "NP Up"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:444
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:59
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:50
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:448
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:46
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:37
 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:25
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:72
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:282
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:553
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:15
 msgid "Name: "
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:526
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:562
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:516
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:555
 msgid "Native GCI files(*.gci)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:161
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:148
 msgid "New Scan"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:206
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:193
 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:801
 msgid "Next Page"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:165
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:152
 msgid "Next Scan"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:68
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:59
 msgid "Nickname :"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:196
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:190
 msgid "No Country (SDK)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:370
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:357
 msgid "No ISOs or WADS found"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:508
-#, c-format
-msgid "No banner file found for title  %s"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:761
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:768
-msgid "No description available"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:514
-msgid "No docking"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:859
-msgid "No file loaded"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:439
-msgid "No free dir index entries"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:895
-msgid "No recorded file"
+#: Source/Core/Core/Src/ConfigManager.h:17
+msgid "No audio output"
 msgstr ""
 
 #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:501
 #, c-format
+msgid "No banner file found for title  %s"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:760
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:767
+msgid "No description available"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:535
+msgid "No docking"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:860
+msgid "No file loaded"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:426
+msgid "No free dir index entries"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:896
+msgid "No recorded file"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:494
+#, c-format
 msgid "No save folder found for title %s"
 msgstr ""
 
+#: Source/Plugins/Plugin_VideoOGL/Src/main.cpp:132
+#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:111
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:23
 #: Source/Core/DolphinWX/Src/NetWindow.cpp:600
 msgid "None"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:323
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303
 msgid "Norwegian Bokmaal"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:203
 msgid "Not Equal"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:804
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:794
 msgid "Not Set"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/Main.cpp:626
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:101
+#, c-format
+msgid "Not a Wii save or read failure for file header size %x"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/Main.cpp:654
 msgid "Not connected"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:309
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:296
 msgid "Notes"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:16
 msgid "Notes: "
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:71
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:74
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:580
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:621
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:629
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:59
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:64
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:613
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:659
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:667
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:31
 msgid "Notice"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:105
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:92
 msgid "Num Lock"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:88
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:75
 msgid "Number Of Codes: "
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:30
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:34
 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26
 msgid "Nunchuk"
 msgstr ""
@@ -3472,107 +3561,107 @@ msgstr ""
 msgid "Nunchuk Acceleration"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:877
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:878
 msgid "Object"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:135
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:122
 msgid "Object Range"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:243
 msgid "Off"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:62
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:49
 msgid "Offset:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:582
 msgid "On-Screen Display Messages"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:436
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:423
 #, c-format
 msgid "Only %d blocks available"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:420
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:178
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:426
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:166
 msgid "Open"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:876
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:867
 msgid "Open &containing folder"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:873
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:864
 msgid "Open Wii &save folder"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:420
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:426
 msgid "Open file..."
 msgstr ""
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:61
+#: Source/Core/AudioCommon/Src/OpenALStream.cpp:48
 #, c-format
 msgid "OpenAL: can't create context for device %s"
 msgstr ""
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:72
+#: Source/Core/AudioCommon/Src/OpenALStream.cpp:59
 msgid "OpenAL: can't find sound devices"
 msgstr ""
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:66
+#: Source/Core/AudioCommon/Src/OpenALStream.cpp:53
 #, c-format
 msgid "OpenAL: can't open device %s"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502
 msgid "OpenCL Texture Decoder"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503
 msgid "OpenMP Texture Decoder"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:317
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:94
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:304
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:81
 msgid "Options"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:22
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Orange"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:468
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:455
 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"
+"and import the saves to a new memcard\n"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:316
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:324
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:509
 msgid "Other"
 msgstr ""
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:206
+#: Source/Core/Core/Src/NetPlayClient.cpp:210
 msgid ""
 "Other client disconnected while game is running!! NetPlay is disabled. You "
 "manually stop the game."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:481
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:468
 msgid "Output"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:342
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:348
 msgid "P&lay Recording..."
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCPad.cpp:30
+#: Source/Core/Core/Src/HW/GCPad.cpp:18
 msgid "Pad"
 msgstr ""
 
@@ -3580,160 +3669,160 @@ msgstr ""
 msgid "Pad "
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:34
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:38
 msgid "Pads"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:108
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:95
 msgid "Page Down"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:107
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:94
 msgid "Page Up"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:35
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:22
 msgid "Paragraph"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:64
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:51
 msgid "Parameters"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:222
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:217
 #, c-format
 msgid "Partition %i"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:296
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:297
 msgid "Patches"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:556
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536
 msgid "Paths"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1538
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1539
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:51
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1565
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1566
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:38
 msgid "Pause"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:128
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:129
 msgid "Pause at end of movie"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:397
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405
 msgid "Per-Pixel Lighting"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352
 msgid "Perfect"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:609
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:642
 #, c-format
 msgid "Perspective %d"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:165
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:424
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1547
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1548
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:152
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:430
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1574
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1575
 msgid "Play"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176
 msgid "Play Recording"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:170
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:170
 msgid "Play/Pause"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351
 msgid "Playable"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:154
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:141
 msgid "Playback Options"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:301
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:304
 msgid "Players"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:988
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:991
 msgid "Please confirm..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:579
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:612
 msgid "Please create a perspective before saving"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:36
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:23
 msgid "Plus-Minus"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:324
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304
 msgid "Polish"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:713
 msgid "Port 1"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714
 msgid "Port 2"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:734
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715
 msgid "Port 3"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716
 msgid "Port 4"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:97
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:130
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:88
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:133
 msgid "Port :"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:325
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305
 msgid "Portuguese"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:326
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306
 msgid "Portuguese (Brazilian)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:391
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:399
 msgid "Post-Processing Effect:"
 msgstr ""
 
-#: Source/Core/Core/Src/Movie.cpp:936
+#: Source/Core/Core/Src/Movie.cpp:927
 #, c-format
 msgid "Premature movie end in PlayController. %u + 8 > %u"
 msgstr ""
 
-#: Source/Core/Core/Src/Movie.cpp:1055
+#: Source/Core/Core/Src/Movie.cpp:1046
 #, c-format
 msgid "Premature movie end in PlayWiimote. %u + %d > %u"
 msgstr ""
 
-#: Source/Core/Core/Src/Movie.cpp:1032
+#: Source/Core/Core/Src/Movie.cpp:1023
 #, c-format
 msgid "Premature movie end in PlayWiimote. %u > %u"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:48
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:35
 msgid "Presets: "
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:205
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:192
 msgid "Prev Page"
 msgstr ""
 
@@ -3741,67 +3830,67 @@ msgstr ""
 msgid "Previous Page"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:183
 msgid "Previous Value"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:60
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:47
 msgid "Print"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:894
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:885
 msgid "Profile"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.h:55
+#: Source/Core/DolphinWX/Src/ISOProperties.h:42
 msgid "Properties"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:283
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:286
 msgid "Purge Cache"
 msgstr ""
 
-#: Source/Core/Common/Src/MsgHandler.cpp:66
+#: Source/Core/Common/Src/MsgHandler.cpp:52
 msgid "Question"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:159
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:316
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:162
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:319
 msgid "Quit"
 msgstr ""
 
 #. i18n:  Right
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:59
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:46
 msgid "R"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:40
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:27
 msgid "R Button"
 msgstr ""
 
 #. i18n:  Right-Analog
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:63
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
 msgid "R-Analog"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:445
 msgid "RAM"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:175
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:169
 msgid "RUSSIA"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:528
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:515
 msgid "Range"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:190
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:178
 msgid "Read-only mode"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:487
 msgid "Real"
 msgstr ""
 
@@ -3817,33 +3906,33 @@ msgstr ""
 msgid "Reconnect Wiimote on State Loading"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:193
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:217
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:791
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:180
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:204
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:790
 msgid "Record"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:174
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:161
 msgid "Recording Info"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:202
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:189
 msgid "Recording Options"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:21
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Red"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:24
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Red Left"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:25
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Red Right"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86
 msgid ""
 "Reduces the amount of aliasing caused by rasterizing 3D graphics.\n"
 "This makes the rendered picture look less blocky.\n"
@@ -3853,255 +3942,261 @@ msgid ""
 msgstr ""
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:60
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:421
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:903
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:427
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:894
 msgid "Refresh"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:180
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:168
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:168
 msgid "Refresh List"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:421
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:427
 msgid "Refresh game list"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:405
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:427
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:77
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:812
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:409
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:431
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:64
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:793
 msgid "Remove"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99
 msgid ""
 "Render the scene as a wireframe.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:308
 msgid "Render to Main Window"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:915
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:172
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:906
 msgid "Reset"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:190
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:177
 msgid "Results"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:29
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:16
 msgid "Return"
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:277
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:57
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464
+msgid "Revision:"
+msgstr ""
+
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:264
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:44
 msgid "Right"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:61
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:65
 msgid "Right Stick"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:85
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:295
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:72
 msgid "Rumble"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:518
-msgid "Run DSP LLE on a dedicated thread (not recommended)."
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498
+msgid ""
+"Run DSP HLE and LLE on a dedicated thread (not recommended: might cause "
+"audio glitches with HLE and freezes with LLE)."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:327
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307
 msgid "Russian"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:149
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:150
 msgid "Sa&ve State"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:465
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475
 msgid "Safe"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:196
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:446
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:925
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:183
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:452
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916
 msgid "Save"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:532
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:522
 msgid "Save GCI as..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
 msgid "Save State Slot 1"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:198
 msgid "Save State Slot 2"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:199
 msgid "Save State Slot 3"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:212
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:212
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200
 msgid "Save State Slot 4"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201
 msgid "Save State Slot 5"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202
 msgid "Save State Slot 6"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:203
 msgid "Save State Slot 7"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204
 msgid "Save State Slot 8"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:151
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:152
 msgid "Save State..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:582
 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:592
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:602
 msgid "Save as..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1203
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1204
 msgid "Save compressed GCM/ISO"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:446
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:452
 msgid "Save current perspective"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1192
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193
 msgid "Save decompressed GCM/ISO"
 msgstr ""
 
-#: Source/Core/Core/Src/Movie.cpp:801
+#: Source/Core/Core/Src/Movie.cpp:792
 #, c-format
 msgid "Savestate movie %s is corrupted, movie recording stopping..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:396
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:404
 msgid "Scaled EFB Copy"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:556
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:543
 #, c-format
 msgid "Scanning %s"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:539
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:526
 msgid "Scanning for ISOs"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:540
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:527
 msgid "Scanning..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:427
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
 msgid "ScrShot"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:106
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:93
 msgid "Scroll Lock"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:264
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:251
 msgid "Search"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:227
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:214
 msgid "Search Filter"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:810
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:791
 msgid "Search Subfolders"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:250
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:237
 msgid "Search current Object"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:254
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:241
 msgid "Search for hex Value:"
 msgstr ""
 
-#: Source/Core/Common/Src/SysConf.h:103 Source/Core/Common/Src/SysConf.h:126
-#: Source/Core/Common/Src/SysConf.h:146 Source/Core/Common/Src/SysConf.h:167
+#: Source/Core/Common/Src/SysConf.h:90 Source/Core/Common/Src/SysConf.h:113
+#: Source/Core/Common/Src/SysConf.h:133 Source/Core/Common/Src/SysConf.h:154
 #, c-format
 msgid "Section %s not found in SYSCONF"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:59
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:490
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:46
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:477
 msgid "Select"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:677
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1072
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:683
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1087
 msgid "Select The Recording File"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1285
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1312
 msgid "Select a Wii WAD file to install"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:70
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74
 msgid ""
 "Select a hardware adapter to use.\n"
 "\n"
 "If unsure, use the first one."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:520
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:510
 msgid "Select a save file to import"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:363
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:366
 msgid "Select floating windows"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:582
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:585
 msgid "Select the file to load"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1241
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1268
 msgid "Select the save file"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1388
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1415
 msgid "Select the state to load"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1429
 msgid "Select the state to save"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82
 msgid ""
 "Select what aspect ratio to use when rendering:\n"
 "Auto: Use the native aspect ratio\n"
@@ -4112,15 +4207,15 @@ msgid ""
 "If unsure, select Auto."
 msgstr ""
 
-#: Source/Core/InputCommon/Src/InputConfig.cpp:61
+#: Source/Core/InputCommon/Src/InputConfig.cpp:48
 msgid "Selected controller profile does not exist"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:116
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:109
 msgid "Selected font"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75
 msgid ""
 "Selects the display resolution used in fullscreen mode.\n"
 "This should always be bigger than or equal to the internal resolution. "
@@ -4130,17 +4225,27 @@ msgid ""
 "If still unsure, use the highest resolution which works for you."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:69
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:70
 msgid ""
 "Selects what graphics API to use internally.\n"
 "Direct3D 9 usually is the fastest one. OpenGL is more accurate though. "
 "Direct3D 11 is somewhere between the two.\n"
 "Note that the Direct3D backends are only available on Windows.\n"
 "\n"
-"If unsure, use Direct3D 9."
+"If unsure, use Direct3D 11."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:288
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72
+msgid ""
+"Selects what graphics API to use internally.\n"
+"Direct3D 9 usually is the fastest one. OpenGL is more accurate though. "
+"Direct3D 11 is somewhere between the two.\n"
+"Note that the Direct3D backends are only available on Windows.\n"
+"\n"
+"If unsure, use OpenGL."
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:291
 msgid "Send"
 msgstr ""
 
@@ -4148,24 +4253,24 @@ msgstr ""
 msgid "Sensor Bar Position:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:77
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:64
 msgid "Separator"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:328
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308
 msgid "Serbian"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:522
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502
 msgid ""
 "Serial Port 1 - This is the port which devices such as the net adapter use"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:488
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:475
 msgid "Set"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:877
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:868
 msgid "Set as &default ISO"
 msgstr ""
 
@@ -4174,134 +4279,134 @@ msgstr ""
 msgid "Set as default Memcard %c"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:460
+#: Source/Core/Core/Src/ActionReplay.cpp:450
 #, c-format
 msgid "SetARCode_IsActive: Index is greater than ar code list size %lu"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:515
 msgid ""
 "Sets the latency (in ms).  Higher values may reduce audio crackling. OpenAL "
 "backend only."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341
 msgid "Settings..."
 msgstr ""
 
-#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:222
+#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:209
 msgid "SetupWiiMem: Cant find setting file"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:291
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:278
 msgid "Shake"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
 msgid "Short Name:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:103
+#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:90
 msgid "Shoulder Buttons"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:217
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:220
 msgid "Show &Console"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:215
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:218
 msgid "Show &Log"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:212
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:215
 msgid "Show &Statusbar"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:210
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:213
 msgid "Show &Toolbar"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:281
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:284
 msgid "Show Drives"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:517
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530
 msgid "Show EFB Copy Regions"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:295
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303
 msgid "Show FPS"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:271
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:274
 msgid "Show France"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:257
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:260
 msgid "Show GameCube"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561
 msgid "Show Input Display"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:273
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:276
 msgid "Show Italy"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:264
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:267
 msgid "Show JAP"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:275
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:278
 msgid "Show Korea"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476
 msgid "Show Language:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:216
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:219
 msgid "Show Log &Configuration"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:266
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:269
 msgid "Show PAL"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:254
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:257
 msgid "Show Platforms"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:263
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:266
 msgid "Show Regions"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:518
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531
 msgid "Show Statistics"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:277
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:280
 msgid "Show Taiwan"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:268
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:271
 msgid "Show USA"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:259
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:262
 msgid "Show Wad"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:255
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:258
 msgid "Show Wii"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491
 msgid "Show a confirmation box before stopping a game."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:512
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492
 msgid ""
 "Show a message box when a potentially serious error has occurred.\n"
 "Disabling this may avoid annoying and non-fatal messages, but it may also "
@@ -4312,11 +4417,11 @@ msgstr ""
 msgid "Show first block"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:130
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:131
 msgid "Show lag counter"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493
 msgid ""
 "Show messages on the emulation screen area.\n"
 "These messages include memory card writes, video backend and CPU "
@@ -4339,7 +4444,7 @@ msgstr ""
 msgid "Show save title"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102
 msgid ""
 "Show the number of frames rendered per second as a measure of emulation "
 "speed.\n"
@@ -4347,54 +4452,42 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:279
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:282
 msgid "Show unknown"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105
 msgid ""
 "Show various statistics.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:319
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:306
 msgid "Sideways Wiimote"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:280
 msgid "Simplified Chinese"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:311
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:298
 msgid "Size"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:696
 msgid "Skip BIOS"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316
 msgid "Skip DCBZ clearing"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:492
-msgid "Skip Dest. Alpha Pass"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:444
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:454
 msgid "Skip EFB Access from CPU"
 msgstr ""
 
-#: 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 ""
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125
 msgid ""
 "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n"
 "Sometimes also increases visual quality.\n"
@@ -4404,25 +4497,25 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:374
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:386
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:380
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:392
 #, c-format
 msgid "Slot %i"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:700
 msgid "Slot A"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:701
 msgid "Slot B"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:62
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:49
 msgid "Snapshot"
 msgstr ""
 
-#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:58
+#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:46
 msgid "Software Renderer"
 msgstr ""
 
@@ -4434,27 +4527,27 @@ msgid ""
 "Do you really want to enable software rendering? If unsure, select 'No'."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:683
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:664
 msgid "Sound Settings"
 msgstr ""
 
-#: Source/Core/AudioCommon/Src/AudioCommon.cpp:77
+#: Source/Core/AudioCommon/Src/AudioCommon.cpp:64
 #, c-format
 msgid "Sound backend %s is not valid."
 msgstr ""
 
-#: Source/Core/AudioCommon/Src/DSoundStream.cpp:59
+#: Source/Core/AudioCommon/Src/DSoundStream.cpp:46
 #, c-format
 msgid "Sound buffer creation failed: %s"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:31
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:18
 msgid "Space"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:329
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309
 msgid "Spanish"
 msgstr ""
 
@@ -4462,7 +4555,7 @@ msgstr ""
 msgid "Speaker Volume:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92
 msgid ""
 "Specifies the resolution used to render at. A high resolution will improve "
 "visual quality a lot but is also quite heavy on performance and might cause "
@@ -4474,63 +4567,63 @@ msgid ""
 "If unsure, select 640x528."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322
 msgid "Speed up Disc Transfer Rate"
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:243
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:230
 msgid "Square Stick"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:107
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87
 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:322
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:37
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:25
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:325
 msgid "Start"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:194
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:197
 msgid "Start &NetPlay"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:339
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:345
 msgid "Start Re&cording"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:175
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:175
 msgid "Start Recording"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:312
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:299
 msgid "State"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:173
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:161
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:161
 msgid "State Saves"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:108
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88
 msgid "Steering Wheel"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:53
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:57
 msgid "Stick"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:420
-#: 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:325
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:419
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:431
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:171
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:171
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:328
 msgid "Stop"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96
 msgid ""
 "Store EFB copies in GPU texture objects.\n"
 "This is not so accurate, but it works well enough for most games and gives a "
@@ -4539,143 +4632,153 @@ msgid ""
 "If unsure, leave this checked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:275
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283
 msgid "Stretch to Window"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:43
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:47
 msgid "Strum"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:78
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:65
 msgid "Subtract"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:77
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:67
 #, c-format
 msgid "Successfully exported file to %s"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:56
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:43
 msgid "Successfully imported save files"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:285
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:272
 msgid "Swing"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:744
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:792
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320
+msgid "Synchronize GPU thread"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321
+msgid ""
+"Synchronizes the GPU and CPU threads to help prevent random freezes in Dual "
+"Core mode. (ON = Compatible, OFF = Fast)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773
 msgid "System Language:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:191
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:185
 msgid "TAIWAN"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:127
-#: Source/Core/DolphinWX/Src/TASInputDlg.h:32
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:128
+#: Source/Core/DolphinWX/Src/TASInputDlg.h:19
 msgid "TAS Input"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:28
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:15
 msgid "Tab"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:510
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:531
 msgid "Tab split"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:37
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:41
 msgid "Table Left"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:38
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:42
 msgid "Table Right"
 msgstr ""
 
-#: 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
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:361
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:181
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:181
 msgid "Take Screenshot"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:109
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89
 msgid "TaruKonga (Bongos)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:472
 msgid "Test"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:444
 msgid "Texture"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:451
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:461
 msgid "Texture Cache"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:519
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:532
 msgid "Texture Format Overlay"
 msgstr ""
 
-#: Source/Core/Core/Src/CoreParameter.cpp:226
+#: Source/Core/Core/Src/CoreParameter.cpp:215
 msgid "The WAD has been installed successfully"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:197
+#: Source/Core/Core/Src/ActionReplay.cpp:185
 msgid "The address is invalid"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:509
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:496
 msgid "The checksum was successfully fixed"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1242
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226
 msgid "The chosen directory is already in the list"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1117
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1216
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1118
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1146
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1217
 #, c-format
 msgid ""
 "The file %s already exists.\n"
 "Do you wish to replace it?"
 msgstr ""
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:51
+#: Source/Core/AudioCommon/Src/WaveFile.cpp:38
 #, c-format
 msgid ""
 "The file %s could not be opened for writing. Please check if it's already "
 "opened by another program."
 msgstr ""
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:44
+#: Source/Core/AudioCommon/Src/WaveFile.cpp:31
 #, c-format
 msgid "The file %s was already open, the file header will not be written."
 msgstr ""
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:332
+#: Source/Core/Core/Src/Boot/Boot.cpp:320
 #, c-format
 msgid "The file you specified (%s) does not exist"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:628
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:666
 msgid "The name can not be empty"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:620
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:658
 msgid "The name can not contain the character ','"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:142
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:129
 msgid "The resulting decrypted AR code doesn't contain any lines."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98
 msgid ""
 "The safer you adjust this, the less likely the emulator will be missing any "
 "texture updates from RAM.\n"
@@ -4683,68 +4786,68 @@ msgid ""
 "If unsure, use the rightmost value."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:445
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:432
 msgid "The save you are trying to copy has an invalid file size"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/Main.cpp:388
+#: Source/Core/DolphinWX/Src/Main.cpp:416
 msgid ""
 "The selected language is not supported by your system. Falling back to "
 "system default."
 msgstr ""
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:43
+#: Source/Core/Core/Src/NetPlayClient.cpp:47
 msgid "The server and client's NetPlay versions are incompatible!"
 msgstr ""
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:40
+#: Source/Core/Core/Src/NetPlayClient.cpp:44
 msgid "The server is full!"
 msgstr ""
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:46
+#: Source/Core/Core/Src/NetPlayClient.cpp:50
 msgid "The server responded: the game is currently running!"
 msgstr ""
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:49
+#: Source/Core/Core/Src/NetPlayClient.cpp:53
 msgid "The server sent an unknown error message!"
 msgstr ""
 
-#: Source/Core/Core/Src/CoreParameter.cpp:119
+#: Source/Core/Core/Src/CoreParameter.cpp:108
 #, c-format
 msgid "The specified file \"%s\" does not exist"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:198
+#: Source/Core/Core/Src/ActionReplay.cpp:186
 msgid "The value is invalid"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:642
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:623
 msgid "Theme:"
 msgstr ""
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:476
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:463
 msgid ""
 "There must be a ticket for 00000001/00000002. Your NAND dump is probably "
 "incomplete."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308
 msgid ""
 "These settings override core Dolphin settings.\n"
 "Undetermined means the game uses Dolphin's setting."
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:355
+#: Source/Core/Core/Src/ActionReplay.cpp:345
 msgid ""
 "This action replay simulator does not support codes that modify Action "
 "Replay itself."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505
 msgid "This could cause slow down in Wii Menu and some games."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118
 msgid ""
 "This feature allows you to change the game's camera.\n"
 "Move the mouse while holding the right mouse button to pan and while holding "
@@ -4756,7 +4859,15 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485
+msgid ""
+"This limits the game speed to the specified number of frames per second "
+"(full speed is 60 for NTSC and 50 for PAL). Alternatively, 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/ConfigMain.cpp:484
 msgid ""
 "This splits the Video and CPU threads, so they can be run on separate "
 "cores.\n"
@@ -4764,75 +4875,75 @@ msgid ""
 "cause occasional crashes/glitches."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:286
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:287
 msgid "This will let you Manually Edit the INI config file"
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:249
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:254
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:236
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:241
 msgid "Threshold"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:288
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:275
 msgid "Tilt"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:628
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:304
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:622
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:291
 msgid "Title"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:125
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:144
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:112
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:131
 msgid "To"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:72
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59
 msgid "Toggle All Log Types"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:426
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:432
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:180
 msgid "Toggle Fullscreen"
 msgstr ""
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:87
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:271
 msgid "Top"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:281
 msgid "Traditional Chinese"
 msgstr ""
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:426
+#: Source/Core/Core/Src/Boot/Boot.cpp:414
 msgid "Tried to load an unknown file type."
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:80
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:67
 msgid "Triggers"
 msgstr ""
 
-#: Source/Core/Common/Src/SysConf.h:91 Source/Core/Common/Src/SysConf.h:114
+#: Source/Core/Common/Src/SysConf.h:78 Source/Core/Common/Src/SysConf.h:101
 msgid "Trying to read from invalid SYSCONF"
 msgstr ""
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:44
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:31
 msgid ""
 "Trying to read from invalid SYSCONF\n"
 "Wiimote bt ids are not available"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:330
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
 msgid "Turkish"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:33
 msgid "Turntable"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:71
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58
 msgid "Type"
 msgstr ""
 
@@ -4840,31 +4951,31 @@ msgstr ""
 msgid "UDP Port:"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:279
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:266
 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12
 msgid "UDP Wiimote"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:199
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:193
 msgid "UNKNOWN"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:756
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:755
 #, c-format
 msgid "UNKNOWN_%02X"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:178
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:172
 msgid "USA"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:225
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:214
 msgid ""
 "Unable to create patch from given values.\n"
 "Entry not modified."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:124
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:111
 #, c-format
 msgid ""
 "Unable to parse line %lu of the entered AR code as a valid encrypted or "
@@ -4872,74 +4983,88 @@ msgid ""
 "Would you like to ignore this line and continue parsing?"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:391
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:397
 #, c-format
 msgid "Undefined %i"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:163
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:164
 msgid "Undo Load State"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:718
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:717
 msgid "Unexpected 0x80 call? Aborting..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:215
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:202
 msgid "Unknown"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:971
+#: Source/Core/Core/Src/HW/DVDInterface.cpp:965
 #, c-format
 msgid "Unknown DVD command %08x - fatal error"
 msgstr ""
 
-#: Source/Core/Common/Src/SysConf.cpp:145
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:444
+#, c-format
+msgid "Unknown command 0x%08x"
+msgstr ""
+
+#: Source/Core/Common/Src/SysConf.cpp:132
 #, c-format
 msgid "Unknown entry type %i in SYSCONF (%s@%x)!"
 msgstr ""
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:228
+#: Source/Core/Core/Src/NetPlayClient.cpp:232
 #, c-format
 msgid "Unknown message received with id : %d"
 msgstr ""
 
-#: Source/Core/Core/Src/NetPlayServer.cpp:504
+#: Source/Core/Core/Src/NetPlayServer.cpp:508
 #, c-format
 msgid "Unknown message with id:%d received from player:%d Kicking player!"
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:274
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:56
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:261
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:43
 msgid "Up"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:108
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:95
 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17
 msgid "Update"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:320
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:307
 msgid "Upright Wiimote"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:777
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758
 msgid "Use EuRGB60 Mode (PAL60)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:294
 msgid "Use Fullscreen"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:575
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:563
 msgid "Use Hex"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:600
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580
 msgid "Use Panic Handlers"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89
+msgid ""
+"Use a hacked upload strategy to stream vertices.\n"
+"This usually speed up, but is forbidden by OpenGL specification and may "
+"causes heavy glitches.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122
 msgid ""
 "Use multiple threads to decode textures.\n"
 "Might result in a speedup (especially on CPUs with more than two cores).\n"
@@ -4947,7 +5072,7 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126
 msgid ""
 "Usually if shader compilation fails, an error message is displayed.\n"
 "However, one may skip the popups to allow interruption free gameplay by "
@@ -4956,53 +5081,57 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:539
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:552
 msgid "Utility"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:285
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:293
 msgid "V-Sync"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:209
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318
+msgid "VBeam Speed Hack"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196
 msgid "Value"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:73
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:60
 msgid "Value:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:572
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:560
 msgid "Value: "
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:51
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:38
 msgid "Verbosity"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:377
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:381
 msgid "Video"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:486
 msgid "Virtual"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:689
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670
 msgid "Volume"
 msgstr ""
 
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:498
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:527
+#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:488
+#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:517
 #, c-format
 msgid "WAD installation failed: error creating %s"
 msgstr ""
 
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:547
+#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:537
 msgid "WAD installation failed: error creating ticket"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84
 msgid ""
 "Wait for vertical blanks in order to reduce tearing.\n"
 "Decreases performance if emulation speed is below 100%.\n"
@@ -5010,25 +5139,25 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/Common/Src/MsgHandler.cpp:67
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46
+#: Source/Core/Common/Src/MsgHandler.cpp:53
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:33
 #: Source/Core/DolphinWX/Src/VideoConfigDiag.h:85
 msgid "Warning"
 msgstr ""
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:291
+#: Source/Core/Core/Src/Boot/Boot.cpp:279
 msgid "Warning - starting DOL in wrong console mode!"
 msgstr ""
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:341
+#: Source/Core/Core/Src/Boot/Boot.cpp:329
 msgid "Warning - starting ELF in wrong console mode!"
 msgstr ""
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:221
+#: Source/Core/Core/Src/Boot/Boot.cpp:209
 msgid "Warning - starting ISO in wrong console mode!"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:519
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:512
 #, c-format
 msgid ""
 "Warning! it is advised to backup all files in the folder:\n"
@@ -5036,7 +5165,7 @@ msgid ""
 "Do you wish to continue?"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:585
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:578
 #, c-format
 msgid ""
 "Warning: This will overwrite any existing saves that are in the folder:\n"
@@ -5045,7 +5174,7 @@ msgid ""
 "Continue?"
 msgstr ""
 
-#: Source/Core/Core/Src/Movie.cpp:844
+#: Source/Core/Core/Src/Movie.cpp:835
 #, c-format
 msgid ""
 "Warning: You loaded a save that's after the end of the current movie. (byte "
@@ -5053,7 +5182,7 @@ msgid ""
 "load this state with read-only mode off."
 msgstr ""
 
-#: Source/Core/Core/Src/Movie.cpp:861
+#: Source/Core/Core/Src/Movie.cpp:852
 #, c-format
 msgid ""
 "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You "
@@ -5061,7 +5190,7 @@ msgid ""
 "only mode off. Otherwise you'll probably get a desync."
 msgstr ""
 
-#: Source/Core/Core/Src/Movie.cpp:870
+#: Source/Core/Core/Src/Movie.cpp:861
 #, c-format
 msgid ""
 "Warning: You loaded a save whose movie mismatches on frame %d. You should "
@@ -5080,49 +5209,49 @@ msgid ""
 "%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d"
 msgstr ""
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:106
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:129
+#: Source/Core/AudioCommon/Src/WaveFile.cpp:93
+#: Source/Core/AudioCommon/Src/WaveFile.cpp:116
 msgid "WaveFileWriter - file not open."
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:56
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:60
 msgid "Whammy"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:404
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:408
 msgid "Widescreen Hack"
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:312
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:299
 msgid "Width"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535
 msgid "Wii"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:372
 msgid "Wii Console"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:844
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:825
 msgid "Wii NAND Root:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:191
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:194
 msgid "Wii Save Import"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1243
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1270
 msgid "Wii save files (*.bin)|*.bin"
 msgstr ""
 
-#: Source/Core/DiscIO/Src/WiiWad.cpp:82
+#: Source/Core/DiscIO/Src/WiiWad.cpp:69
 msgid "WiiWAD: Could not read from file"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/Wiimote.cpp:17
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
+#: Source/Core/Core/Src/HW/Wiimote.cpp:20
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
 msgid "Wiimote"
 msgstr ""
 
@@ -5131,7 +5260,7 @@ msgstr ""
 msgid "Wiimote %i"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/Main.cpp:628
+#: Source/Core/DolphinWX/Src/Main.cpp:656
 msgid "Wiimote Connected"
 msgstr ""
 
@@ -5139,7 +5268,7 @@ msgstr ""
 msgid "Wiimote Motor"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
 msgid "Wiimote settings"
 msgstr ""
 
@@ -5147,105 +5276,123 @@ msgstr ""
 msgid "Wiimotes"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:134
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:121
 msgid "Windows Left"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:136
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:123
 msgid "Windows Menu"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:135
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:122
 msgid "Windows Right"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:131
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:124
 msgid "Word Wrap"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1298
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:864
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1089
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1225
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1325
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:880
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1090
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1226
 msgid "Working..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:338
+msgid "Write memcards (GC)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46
 msgid "Write to Console"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:67
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:54
 msgid "Write to Debugger"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:57
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44
 msgid "Write to File"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:61
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48
 msgid "Write to Window"
 msgstr ""
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:60
+#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:47
 #, c-format
 msgid "XAudio2 CreateSourceVoice failed: %#X"
 msgstr ""
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:114
+#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:101
 #, c-format
 msgid "XAudio2 init failed: %#X"
 msgstr ""
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:124
+#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:111
 #, c-format
 msgid "XAudio2 master voice creation failed: %#X"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:766
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:765
 msgid "XF reg"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:21
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Yellow"
 msgstr ""
 
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:107
+#: Source/Core/Core/Src/DSP/DSPCore.cpp:120
 msgid ""
-"You are using free dsp roms made by Dolphin Team.\n"
-"Only Zelda ucode games will work correctly with them.\n"
+"You are using a free DSP ROM made by the Dolphin Team.\n"
+"All Wii games will work correctly, and most GC games should also work fine, "
+"but the GBA/IPL/CARD UCodes will not work.\n"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:73
+#: Source/Core/Core/Src/DSP/DSPCore.cpp:116
+msgid ""
+"You are using an old free DSP ROM made by the Dolphin Team.\n"
+"Only games using the Zelda UCode will work correctly.\n"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:63
 msgid "You can't close panes that have pages in them."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:207
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:210
 msgid "You must choose a game!!"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:605
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:593
 msgid "You must enter a name!"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:450
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:438
 msgid "You must enter a valid decimal, hexadecimal or octal value."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:603
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:591
 msgid "You must enter a valid profile name."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:936
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:917
 msgid "You must restart Dolphin in order for the change to take effect."
 msgstr ""
 
-#: Source/Core/Core/Src/CoreParameter.cpp:175
+#: Source/Core/Core/Src/DSP/DSPCore.cpp:109
+msgid ""
+"Your DSP ROMs have incorrect hashes.\n"
+"Would you like to stop now to fix the problem?\n"
+"If you select \"No\", audio might be garbled."
+msgstr ""
+
+#: Source/Core/Core/Src/CoreParameter.cpp:164
 msgid ""
 "Your GCM/ISO file seems to be invalid (invalid country).\n"
 "Continue with PAL region?"
 msgstr ""
 
-#: Source/Core/Common/Src/SysConf.cpp:58
+#: Source/Core/Common/Src/SysConf.cpp:45
 #, c-format
 msgid ""
 "Your SYSCONF file is the wrong size.\n"
@@ -5253,25 +5400,25 @@ msgid ""
 "Do you want to generate a new one?"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:334
 msgid "ZTP hack"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:387
+#: Source/Core/Core/Src/ActionReplay.cpp:377
 msgid "Zero 3 code not supported"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:408
+#: Source/Core/Core/Src/ActionReplay.cpp:398
 #, c-format
 msgid "Zero code unknown to dolphin: %08x"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:436
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:460
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:423
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:447
 msgid "[ waiting ]"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107
 msgid ""
 "[BROKEN]\n"
 "Highlight regions the EFB was copied from.\n"
@@ -5279,11 +5426,11 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:91
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:78
 msgid "[Custom]"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120
 msgid ""
 "[EXPERIMENTAL]\n"
 "Aims to speed up emulation by offloading texture decoding to the GPU using "
@@ -5294,7 +5441,7 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121
 msgid ""
 "[EXPERIMENTAL]\n"
 "Speeds up emulation a bit by caching display lists.\n"
@@ -5303,58 +5450,35 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:508
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:495
 msgid "^ ADD"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:820
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:801
 msgid "apploader (.img)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:185
-msgid "failed to read bk header"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:375
-#, c-format
-msgid "failed to read data from file: %s"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:97
-msgid "failed to read header"
-msgstr ""
-
-#: Source/Core/Core/Src/PowerPC/JitInterface.cpp:285
+#: Source/Core/Core/Src/PowerPC/JitInterface.cpp:272
 #, c-format
 msgid "iCacheJIT: Reading Opcode from %x. Please report."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:108
-#, c-format
-msgid "not a wii save or read failure for file header size %x"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:935
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:936
 msgid "s"
 msgstr ""
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:457
-#, c-format
-msgid "unknown cmd 0x%08x"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1110
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1136
 msgid "wxExecute returned -1 on application run!"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:56
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:43
 msgid "zFar Correction: "
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:51
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:38
 msgid "zNear Correction: "
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:493
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:480
 msgid "| OR"
 msgstr ""
diff --git a/Languages/po/el.po b/Languages/po/el.po
index 7e4f2e5934..d8253167e4 100644
--- a/Languages/po/el.po
+++ b/Languages/po/el.po
@@ -3,36 +3,38 @@
 # This file is distributed under the same license as the dolphin-emu package.
 #
 # Translators:
-# Gpower2 <gpower2@yahoo.com>, 2011.
+# Gpower2 <gpower2@yahoo.com>, 2011
+# link_to_the_past <kostamarino@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: Dolphin Emulator\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-10 08:56-0500\n"
-"PO-Revision-Date: 2013-02-02 08:31+0000\n"
-"Last-Translator: delroth <delroth@gmail.com>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"POT-Creation-Date: 2013-04-18 23:00-0500\n"
+"PO-Revision-Date: 2013-04-04 19:05+0000\n"
+"Last-Translator: link_to_the_past <kostamarino@gmail.com>\n"
+"Language-Team: Greek (http://www.transifex.com/projects/p/dolphin-emu/"
+"language/el/)\n"
 "Language: el\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:511
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:499
 msgid " (too many to display)"
 msgstr "(πολλά αποτελέσματα για να εμφανιστούν)"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:270
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:273
 #: Source/Core/DolphinWX/Src/NetWindow.cpp:491
 #: Source/Core/DolphinWX/Src/NetWindow.cpp:530
 msgid " Game : "
 msgstr "Παιχνίδι : "
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:507
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494
 msgid "! NOT"
 msgstr "! NOT"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:70
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:58
 #, c-format
 msgid ""
 "\"%s\" does not exist.\n"
@@ -41,35 +43,45 @@ msgstr ""
 "Το \"%s\" δεν υπάρχει.\n"
 "Δημιουργία καινούριας Memcard 16MB;"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:142
+#: Source/Core/Core/Src/CoreParameter.cpp:131
 #, c-format
 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:722
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:721
 #, c-format
 msgid "%08X:  "
 msgstr "%08X: "
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:196
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:183
 #, c-format
 msgid "%1$sCopy%1$s"
 msgstr "%1$sΑντιγραφή%1$s"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:128
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:296
+#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:113
+#, c-format
+msgid "%d samples"
+msgstr "%d δείγματα"
+
+#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:112
+#, c-format
+msgid "%d samples (quality level %d)"
+msgstr "%d δείγματα (επίπεδο ποιότητας %d)"
+
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:121
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:289
 #, c-format
 msgid "%s already exists, overwrite?"
 msgstr "%s υπάρχει ήδη, θέλετε αντικατάσταση;"
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:167
+#: Source/Core/DiscIO/Src/CompressedBlob.cpp:154
 #, c-format
 msgid "%s failed to be scrubbed. Probably the image is corrupt."
 msgstr ""
 "%s απέτυχε να γίνει scrubbed. Πιθανότατα το αρχείο εικόνας είναι φθαρμένο."
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:95
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:83
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
@@ -78,7 +90,7 @@ msgstr ""
 "%s απέτυχε να φορτώσει ως κάρτα μνήμης\n"
 " Το μέγεθος του αρχείου της κάρτας δεν είναι έγκυρο (0x%x bytes)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:110
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:98
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
@@ -87,7 +99,7 @@ msgstr ""
 "%s απέτυχε να φορτώσει ως κάρτα μνήμης\n"
 " Το μέγεθος της κάρτας δεν είναι έγκυρο (0x%x bytes)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:90
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:78
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
@@ -97,50 +109,39 @@ msgstr ""
 "το αρχείο δεν είναι αρκετά μεγάλο ώστε να αποτελεί έγκυρο αρχείο κάρτας "
 "μνήμης (0x%x bytes)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:367
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:359
 #, c-format
 msgid "%s failed to open"
 msgstr "αποτυχία ανοίγματος %s"
 
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:97
-#, c-format
-msgid ""
-"%s has an incorrect hash.\n"
-"Would you like to stop now to fix the problem?\n"
-"If you select \"No\", audio will be garbled."
-msgstr ""
-"Το %s έχει εσφαλμένο hash.\n"
-"Θέλετε να γίνει διακοπή τώρα και να διορθωθεί  το πρόβλημα;\n"
-"Εάν επιλέξετε όχι, ο ήχος θα είναι χαλασμένος."
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:360
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:352
 #, c-format
 msgid "%s is a 0 byte file"
 msgstr "Το %s είναι ένα αρχείο με 0 byte"
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:159
+#: Source/Core/DiscIO/Src/CompressedBlob.cpp:146
 #, c-format
 msgid "%s is already compressed! Cannot compress it further."
 msgstr "Το %s είναι ήδη συμπιεσμένο! Δε γίνεται να συμπιεστεί περαιτέρω."
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:345
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:337
 #, c-format
 msgid "%s is too long for the filename, max chars is 45"
 msgstr ""
 "Το %s είναι πολύ μεγάλο για όνομα αρχείου, ο μέγιστος αριθμός χαρακτήρων "
 "είναι 45"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:202
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:189
 #, c-format
 msgid "%sDelete%s"
 msgstr "%sΔιαγραφή%s"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:200
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:187
 #, c-format
 msgid "%sExport GCI%s"
 msgstr "%sΕξαγωγή GCI%s"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:198
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:185
 #, c-format
 msgid "%sImport GCI%s"
 msgstr "%sΕισαγωγή GCI%s"
@@ -150,222 +151,246 @@ msgstr "%sΕισαγωγή GCI%s"
 msgid "%u Free Blocks; %u Free Dir Entries"
 msgstr "%u Ελεύθερα μπλοκ; %u Ελεύθερες Θέσεις Φακέλων"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:506
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:493
 msgid "&& AND"
 msgstr "&& AND"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:295
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:301
 msgid "&About..."
 msgstr "&Περί..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:99
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:100
 msgid "&Boot from DVD Drive..."
 msgstr "&Εκκίνηση από τον οδηγό DVD..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:231
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:234
 msgid "&Breakpoints"
 msgstr "&Σημεία Διακοπής"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:110
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:111
 msgid "&Browse for ISOs..."
 msgstr "&Εύρεση ISO..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:192
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:195
 msgid "&Cheats Manager"
 msgstr "&Διαχειριστής Cheat"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:177
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:180
 msgid "&DSP Settings"
 msgstr "&Ρυθμίσεις DSP"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:885
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:876
 msgid "&Delete ISO..."
 msgstr "&Διαγραφή ISO..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:903
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:897
 msgid "&Delete selected ISOs..."
 msgstr "&Διαγραφή επιλεγμένων ISO..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:170
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:173
 msgid "&Emulation"
 msgstr "&Εξομοίωση"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:113
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:114
 msgid "&File"
 msgstr "&Αρχείο"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:335
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:341
 msgid "&Frame Advance"
 msgstr "&Προώθηση ανά Καρέ"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:352
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:358
 msgid "&Fullscreen"
 msgstr "&Πλήρης Οθόνη"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:176
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:179
 msgid "&Graphics Settings"
 msgstr "&Ρυθμίσεις Γραφικών"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:296
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:302
 msgid "&Help"
 msgstr "&Βοήθεια"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:180
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:183
 msgid "&Hotkey Settings"
 msgstr "&Ρυθμίσεις Πλήκτρων Συντόμευσης"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:233
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:236
 msgid "&JIT"
 msgstr "&JIT"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:148
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:149
 msgid "&Load State"
 msgstr "&Φόρτωση Σημείου Αποθήκευσης"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:190
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:193
 msgid "&Memcard Manager (GC)"
 msgstr "&Διαχειριστής Καρτών Μνήμης (GC)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:232
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:235
 msgid "&Memory"
 msgstr "&Μνήμη"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:313
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:319
 msgid "&Open..."
 msgstr "&Άνοιγμα..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:186
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:189
 msgid "&Options"
 msgstr "&Ρυθμίσεις"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:324
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:330
 msgid "&Pause"
 msgstr "&Παύση"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:326
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:332
 msgid "&Play"
 msgstr "&Αναπαραγωγή"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:867
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:858
 msgid "&Properties"
 msgstr "&Ιδιότητες"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:348
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:354
 msgid "&Read-only mode"
 msgstr "&Μόνο Για Ανάγνωση (Εγγραφής)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:319
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:325
 msgid "&Refresh List"
 msgstr "&Ανανέωση Λίστας"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:230
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:233
 msgid "&Registers"
 msgstr "&Καταχωρητές"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:332
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:338
 msgid "&Reset"
 msgstr "&Επανεκκίνηση"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:234
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:237
 msgid "&Sound"
 msgstr "&Ήχος"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:329
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:335
 msgid "&Stop"
 msgstr "&Διακοπή"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:207
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:210
 msgid "&Tools"
 msgstr "&Εργαλεία"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:235
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:238
 msgid "&Video"
 msgstr "&Βίντεο"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:284
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:287
 msgid "&View"
 msgstr "&Προβολή"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:179
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:182
 msgid "&Wiimote Settings"
 msgstr "&Ρυθμίσεις Wiimote"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:868
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:859
 msgid "&Wiki"
 msgstr "&Wiki"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504
 msgid "'"
 msgstr "'"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:59
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:46
 msgid "(-)+zFar"
 msgstr "(-)+zFar"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:54
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:41
 msgid "(-)+zNear"
 msgstr "(-)+zNear"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:99
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:86
 msgid "(UNKNOWN)"
 msgstr "(ΑΓΝΩΣΤΟ)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:376
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:384
 msgid "(off)"
 msgstr "(ανενεργό)"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:655
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:654
 msgid "0x44"
 msgstr "0x44"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+msgid "1.5x Native (960x792)"
+msgstr "1.5x Αρχική (960x792)"
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:158
 msgid "16 bit"
 msgstr "16 bit"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+msgid "1x Native (640x528)"
+msgstr "1x Αρχική (640x528)"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+msgid "2.5x Native (1600x1320)"
+msgstr "2.5x Αρχική (1600x1320)"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+msgid "2x Native (1280x1056)"
+msgstr "2x Αρχική (1280x1056)"
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:159
 msgid "32 bit"
 msgstr "32 bit"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:412
 msgid "3D Vision"
 msgstr "3D Vision"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+msgid "3x Native (1920x1584)"
+msgstr "3x Αρχική (1920x1584)"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+msgid "4x Native (2560x2112)"
+msgstr "4x Αρχική (2560x2112)"
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:157
 msgid "8 bit"
 msgstr "8 bit"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:43
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:30
 msgid "<Insert name here>"
 msgstr "<Εισάγετε όνομα εδώ>"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:255
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:262
 msgid "<No resolutions found>"
 msgstr "<Δε βρέθηκαν αναλύσεις>"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:104
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84
 msgid "<Nothing>"
 msgstr "<Τίποτα>"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:162
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:162
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:150
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:150
 msgid "<Press Key>"
 msgstr "<Πατήστε Πλήκτρο>"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286
 msgid "<System>"
 msgstr "<Συστήματος>"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695
 msgid "A"
 msgstr "A"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:201
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:235
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:204
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:238
 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:353
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:387
 msgid "A game is not currently running."
 msgstr "Αυτή τη στιγμή δεν εκτελείται κάπιο παιχνίδι."
 
@@ -374,24 +399,27 @@ msgid ""
 "A supported bluetooth device could not be found.\n"
 "You must manually connect your wiimotes."
 msgstr ""
+"Δεν εντοπίστηκε υποστηριζόμενη συσκευή bluetooth.\n"
+"Θα πρέπει να συνδέσετε χειροκίνητα τα wiimotes."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:109
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:100
+#, fuzzy
 msgid ""
 "ALERT:\n"
 "\n"
-"NetPlay will currently only work properly when using the following "
-"settings:\n"
-" - Dual Core [OFF]\n"
-" - Audio Throttle [OFF]\n"
-" - DSP-HLE with \"Null Audio\" or DSP-LLE\n"
-" - Manually set the exact number of controllers that will be used to "
-"[Standard Controller]\n"
+"Netplay will only work with the following settings:\n"
+" - Enable Dual Core [OFF]\n"
+" - DSP Emulator Engine Must be the same on all computers!\n"
+" - DSP on Dedicated Thread [OFF]\n"
+" - Framelimit NOT set to [Audio]\n"
+" - Manually set the exact number of controllers to be used to [Standard "
+"Controller]\n"
 "\n"
-"All players should try to use the same Dolphin version and settings.\n"
-"Disable all memory cards or send them to all players before starting.\n"
-"Wiimote support has not been implemented.\n"
+"All players should use the same Dolphin version and settings.\n"
+"All memory cards must be identical between players or disabled.\n"
+"Wiimote support has not been implemented!\n"
 "\n"
-"You must forward TCP port to host!!"
+"The host must have the chosen TCP port open/forwarded!\n"
 msgstr ""
 "ΠΡΟΣΟΧΗ:\n"
 "\n"
@@ -409,17 +437,17 @@ msgstr ""
 "\n"
 "Θα πρέπει να έχετε κάνει προώθηση της πόρτας TCP στον host!!"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:111
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:116
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96
 msgid "AM-Baseboard"
 msgstr "AM-Baseboard"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:299
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:115
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:300
 msgid "AR Codes"
 msgstr "Κωδικοί AR"
 
-#: Source/Core/DolphinWX/Src/AboutDolphin.h:33
+#: Source/Core/DolphinWX/Src/AboutDolphin.h:21
 msgid "About Dolphin"
 msgstr "Σχετικά με το Dolphin"
 
@@ -427,15 +455,11 @@ msgstr "Σχετικά με το Dolphin"
 msgid "Acceleration"
 msgstr "Επιτάχυνση"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:463
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473
 msgid "Accuracy:"
 msgstr "Ακρίβεια:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317
-msgid "Accurate VBeam emulation"
-msgstr "Ακριβής VBeam εξομοίωση"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97
 msgid ""
 "Accurately emulate EFB copies.\n"
 "Some games depend on this for certain graphical effects or gameplay "
@@ -449,12 +473,12 @@ msgstr ""
 "\n"
 "Αν δεν είστε σίγουροι, επιλέξτε EFB Αντίγραφα σε Υφή."
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:239
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:239
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:227
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:227
 msgid "Action"
 msgstr "Ενέργεια"
 
-#: Source/Core/Core/Src/ARDecrypt.cpp:481
+#: Source/Core/Core/Src/ARDecrypt.cpp:469
 #, c-format
 msgid ""
 "Action Replay Code Decryption Error:\n"
@@ -469,7 +493,7 @@ msgstr ""
 "Προβληματικός Κωδικός:\n"
 "%s"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:667
+#: Source/Core/Core/Src/ActionReplay.cpp:657
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)"
@@ -477,7 +501,7 @@ msgstr ""
 "Σφάλμα Action Replay: Μη έγκυρο μέγεθος (%08x : διεύθυνση = %08x) στην "
 "Προσθήκη Κωδικού (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:755
+#: Source/Core/Core/Src/ActionReplay.cpp:745
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide "
@@ -486,7 +510,7 @@ msgstr ""
 "Σφάλμα Action Replay: Μη έγκυρο μέγεθος (%08x : διεύθυνση = %08x) σε Fill "
 "και Slide (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:547
+#: Source/Core/Core/Src/ActionReplay.cpp:537
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And "
@@ -495,7 +519,7 @@ msgstr ""
 "Σφάλμα Action Replay: Μη έγκυρο μέγεθος (%08x : διεύθυνση = %08x) σε Ram "
 "Write και Fill (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:607
+#: Source/Core/Core/Src/ActionReplay.cpp:597
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Write To "
@@ -504,75 +528,78 @@ msgstr ""
 "Σφάλμα Action Replay: Μη έγκυρο μέγεθος (%08x : διεύθυνση = %08x) σε Write "
 "To Pointer (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:802
+#: Source/Core/Core/Src/ActionReplay.cpp:792
 #, c-format
 msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)"
 msgstr "Σφάλμα Action Replay: Μη έγκυρη τιμή (%08x) σε Memory Copy (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:682
+#: Source/Core/Core/Src/ActionReplay.cpp:672
 #, c-format
 msgid ""
 "Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)\n"
 "Master codes are not needed. Do not use master codes."
 msgstr ""
+"Σφάλμα Action Replay: Οι λειτουργίες Master Code και Write To CCXXXXXX δεν "
+"έχουν υλοποιηθεί (%s)\n"
+"Δεν χρειάζονται master codes.  Μην χρησιμοποιείτε master codes."
 
-#: Source/Core/Core/Src/ActionReplay.cpp:196
+#: Source/Core/Core/Src/ActionReplay.cpp:184
 #, c-format
 msgid "Action Replay Error: invalid AR code line: %s"
 msgstr "Σφάλμα Action Replay: μη έγκυρη γραμμή κώδικα AR: %s"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:872
+#: Source/Core/Core/Src/ActionReplay.cpp:862
 #, c-format
 msgid "Action Replay: Conditional Code: Invalid Size %08x (%s)"
 msgstr "Action Replay: Conditional Code: Μη έγκυρο μέγεθος %08x (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:945
+#: Source/Core/Core/Src/ActionReplay.cpp:935
 #, 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:896
+#: Source/Core/Core/Src/ActionReplay.cpp:886
 #, 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:838
+#: Source/Core/Core/Src/ActionReplay.cpp:828
 #, 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:242
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:247
 msgid "Adapter:"
 msgstr "Προσαρμογέας:"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:76
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:63
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:63
 msgid "Add"
 msgstr "Προσθήκη"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1275
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1301
 msgid "Add ActionReplay Code"
 msgstr "Προσθήκη Κωδικού ActionReplay"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1204
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1230
 msgid "Add Patch"
 msgstr "Προσθήκη Patch"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:507
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:528
 msgid "Add new pane"
 msgstr "Προσθήκη νέου pane"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:404
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:426
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:811
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:408
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:430
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:792
 msgid "Add..."
 msgstr "Προσθήκη..."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:90
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:81
 msgid "Address :"
 msgstr "Διεύθυνση :"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:58
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:45
 msgid ""
 "Adds the specified value to zFar Parameter.\n"
 "Two ways to express the floating point values.\n"
@@ -583,7 +610,7 @@ msgid ""
 "NOTE: Check LogWindow/Console for the acquired values."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:53
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:40
 msgid ""
 "Adds the specified value to zNear Parameter.\n"
 "Two ways to express the floating point values.\n"
@@ -594,90 +621,95 @@ msgid ""
 "NOTE: Check LogWindow/Console for the acquired values."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:755
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:744
 msgid "Adjust the analog control pressure required to activate buttons."
 msgstr ""
 "Ρύθμιση της απαιτούμενης πίεσης του αναλογικού χειριστηρίου για την "
 "ενεργοποίηση των κουμπιών."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:509
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:522
 msgid "Advanced"
 msgstr "Για προχωρημένους"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561
 msgid "Advanced Settings"
 msgstr "Ρυθμίσεις για Προχωρημένους"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:584
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:587
 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:816
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:797
 msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)"
 msgstr "Όλες οι εικόνες GC/Wii (gcm, iso, wbfs, ciso, gcz)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1189
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1190
 msgid "All Gamecube GCM files (gcm)"
 msgstr "Όλα τα αρχεία Gamecube GCM (gcm)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1390
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1404
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1417
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1431
 msgid "All Save States (sav, s##)"
 msgstr "Όλα τα Σημεία Αποθήκευσης(sav, s##)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1187
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1188
 msgid "All Wii ISO files (iso)"
 msgstr "Όλα τα αρχεία Wii ISO (iso)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1207
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1208
 msgid "All compressed GC/Wii ISO files (gcz)"
 msgstr "Όλα τα συμπιεσμένα αρχεία GC/Wii ISO (gcz)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:124
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:104
 msgid "All files (*.*)|*.*"
 msgstr "Όλα τα αρχεία (*.*)|*.*"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123
 msgid ""
 "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 (EFB Αντίγραφα) και 6 (Ομίχλη) "
+"μέσα από το παράθυρο εξομοίωσης.\n"
+"\n"
+" Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:285
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:272
 msgid "Analyze"
 msgstr "Ανάλυση"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:298
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:285
 msgid "Angle"
-msgstr ""
+msgstr "Γωνεία"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:367
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:375
 msgid "Anisotropic Filtering:"
 msgstr "Ανισοτροπικό Φιλτράρισμα:"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:350
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:358
 msgid "Anti-Aliasing:"
 msgstr "Εξομάλυνση Ορίων:"
 
-#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:308
+#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:299
 msgid "Apploader is the wrong size...is it really an apploader?"
 msgstr "Ο Apploader έχει λάθος μέγεθος... είναι πράγματι apploader;"
 
-#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:302
+#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:293
 msgid "Apploader unable to load from file"
 msgstr "Ο Apploader απέτυχε να φορτωθεί από αρχείο"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:841
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:822
 msgid "Apploader:"
 msgstr "Apploader:"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:135
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:122
 msgid "Apply"
 msgstr "Εφαρμογή"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124
 msgid ""
 "Apply a post-processing effect after finishing a frame.\n"
 "\n"
@@ -687,11 +719,11 @@ msgstr ""
 "\n"
 "Αν δεν είστε σίγουροι, επιλέξτε (ανενεργό)."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287
 msgid "Arabic"
 msgstr "Αραβικά"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:614
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:603
 #, c-format
 msgid "Are you sure you want to delete \"%s\"?"
 msgstr "Είστε σίγουροι ότι θέλετε να διαγράψετε το \"%s\";"
@@ -710,46 +742,50 @@ msgstr ""
 "Είστε σίγουροι ότι θέλετε να διαγράψετε αυτό το αρχείο; Θα εξαφανιστεί για "
 "πάντα!"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:789
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:277
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:44
+msgid "Arm JIT (experimental)"
+msgstr "Arm JIT (πειραματικός)"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:285
 msgid "Aspect Ratio:"
 msgstr "Αναλογία Οθόνης:"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:70
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:58
 msgid "At least one pane must remain open."
 msgstr "Τουλάχιστον ένα pane πρέπει να μένει ανοιχτό."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:553
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533
 msgid "Audio"
 msgstr "Ήχος"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:694
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675
 msgid "Audio Backend:"
 msgstr "Backend Ήχου:"
 
-#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:41
+#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:28
 msgid "AudioCommon: Error opening AO device.\n"
 msgstr "AudioCommon: Σφάλμα ανοίγματος AO συσκευής.\n"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:275
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283
 msgid "Auto"
 msgstr "Αυτόματα"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:337
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345
 msgid "Auto (Multiple of 640x528)"
 msgstr "Αυτόματα (Πολλαπλάσιο του 640x528)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:337
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345
 msgid "Auto (Window Size)"
 msgstr "Αυτόματα (Μέγεθος Παραθύρου)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:297
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305
 msgid "Auto adjust Window Size"
 msgstr "Αυτόματη Προσαρμογή Μεγέθους Παραθύρου"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77
 msgid ""
 "Automatically adjusts the window size to your internal resolution.\n"
 "\n"
@@ -760,160 +796,162 @@ msgstr ""
 "\n"
 "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:697
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696
 msgid "B"
 msgstr "B"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:755
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:754
 msgid "BP register "
 msgstr "BP Καταχωρητές"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:27
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:14
 msgid "Back"
 msgstr "Πίσω"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:698
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:679
 msgid "Backend Settings"
 msgstr "Backend Ρυθμίσεις"
 
-#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:60
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:206
+#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:47
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:211
 msgid "Backend:"
 msgstr "Backend:"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:318
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:95
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:305
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:82
 msgid "Background Input"
 msgstr "Χειρισμός με Ανεστίαστο Παραθ."
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:279
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:266
 msgid "Backward"
 msgstr "Πίσω"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:264
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:257
 msgid "Bad File Header"
 msgstr "Μη Έγκυρη Κεφαλίδα Αρχείου"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:627
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:621
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:290
 msgid "Banner"
 msgstr "Εικονίδιο"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:519
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:529
 msgid "Banner Details"
 msgstr "Λεπτομέρειες Εικονιδίου:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491
 msgid "Banner:"
 msgstr "Εικονίδιο:"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:57
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:61
 msgid "Bar"
 msgstr "Bar"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:308
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:316
 msgid "Basic"
 msgstr "Βασικές"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555
 msgid "Basic Settings"
 msgstr "Βασικές Ρυθμίσεις"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:22
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Bass"
 msgstr "Μπάσο"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:186
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:174
 msgid "Block Allocation Table checksum failed"
 msgstr "Αποτυχία ελέγχου checksum για τον BAT"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:631
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625
 msgid "Blocks"
 msgstr "Μπλοκ"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:21
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Blue"
 msgstr "Μπλε"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:24
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Blue Left"
 msgstr "Αριστερό Μπλε"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:25
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Blue Right"
 msgstr "Δεξί Μπλε"
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:87
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270
 msgid "Bottom"
 msgstr "Βάση"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:238
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:225
 #, c-format
 msgid "Bound Controls: %lu"
 msgstr "Δεσμευμένοι Χειρισμοί: %lu"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348
 msgid "Broken"
 msgstr "Χαλασμένο"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:422
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:428
 msgid "Browse"
 msgstr "Εύρεση"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:256
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:243
 msgid "Browse for a directory to add"
 msgstr "Εύρεση φακέλου για προσθήκη"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:422
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:428
 msgid "Browse for an ISO directory..."
 msgstr "Εύρεση φακέλου ISO..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1079
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1080
 msgid "Browse for output directory"
 msgstr "Εύρεση φακέλου προορισμού"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:328
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:331
 msgid "Buffer:"
 msgstr "Buffer:"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:58
 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:119
+#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:106
 msgid "Buttons"
 msgstr "Κουμπιά"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317
 msgid ""
 "Bypass the clearing of the data cache by the DCBZ instruction. Usually leave "
 "this option disabled."
 msgstr ""
+"Προσπελάστε τον καθαρισμό της cache δεδομένων από την εντολή DCBZ. "
+"Προτείνεται συνήθως να αφήνεται αυτή η επιλογή απενεργοποιημένη."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:698
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:697
 msgid "C"
 msgstr "C"
 
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:77
+#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:64
 msgid "C Stick"
 msgstr "Stick Κάμερας "
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:77
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:64
 msgid "C-Stick"
 msgstr "Stick Κάμερας"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:764
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:763
 msgid "CP reg"
 msgstr "CP reg"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:567
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547
 msgid "CPU Emulator Engine"
 msgstr "Μηχανή Εξομοίωσης CPU"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:490
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500
 msgid "Cache Display Lists"
 msgstr "Cache Display Lists"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88
 msgid ""
 "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n"
 "Decreases emulation speed by some percent (depending on your GPU).\n"
@@ -928,24 +966,39 @@ msgstr ""
 "\n"
 "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1858
+#, c-format
+msgid "Can't 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:1872
+#, c-format
+msgid "Can't find WiiMote by connection handle %02x"
+msgstr "Αδυναμία εύρεσης του WiiMote με handle σύνδεσης %02x"
+
+#: Source/Core/Core/Src/HW/DVDInterface.cpp:669
+#: Source/Core/Core/Src/HW/DVDInterface.cpp:679
+msgid "Can't read from DVD_Plugin - DVD-Interface: Fatal Error"
+msgstr "Αδυναμία ανάγνωσης από το DVD_Plugin - DVD-Interface: Κρίσιμο Σφάλμα"
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:124
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:28
 msgid "Cancel"
 msgstr "Άκυρο"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:91
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:178
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:240
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:84
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:171
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:233
 #, c-format
 msgid "Cannot open %s"
 msgstr "Αποτυχία ανοίγματος %s"
 
-#: Source/Core/Core/Src/CoreTiming.cpp:141
+#: Source/Core/Core/Src/CoreTiming.cpp:128
 msgid "Cannot unregister events with events pending"
 msgstr ""
 "Δεν μπορεί να γίνει κατάργηση καταχώρησης συμβάντων όταν ορισμένα εκκρεμούν."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1078
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1061
 #, c-format
 msgid ""
 "Cannot use that file as a memory card.\n"
@@ -956,7 +1009,7 @@ msgstr ""
 "%s\n"
 "δεν είναι έγκυρο αρχείο κάρτας μνήμης gamecube"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1108
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1091
 msgid ""
 "Cannot use that file as a memory card.\n"
 "Are you trying to use the same file in both slots?"
@@ -964,30 +1017,15 @@ msgstr ""
 "Αδυναμία χρήσης αυτού του αρχείου σαν κάρτα μνήμης.\n"
 "Προσπαθείτε να χρησιμοποιήσετε το ίδιο αρχείο σε δύο slot;"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1867
-#, 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:1881
-#, c-format
-msgid "Cant find WiiMote by connection handle %02x"
-msgstr "Αδυναμία εύρεσης του WiiMote με handle σύνδεσης %02x"
-
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:679
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:689
-msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error"
-msgstr "Αδυναμία ανάγνωσης από το DVD_Plugin - DVD-Interface: Κρίσιμο Σφάλμα"
-
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:52
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:39
 msgid "Caps Lock"
 msgstr "Caps Lock"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288
 msgid "Catalan"
 msgstr "Καταλανικά"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:311
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:298
 msgid "Center"
 msgstr "Κέντρο"
 
@@ -995,12 +1033,12 @@ msgstr "Κέντρο"
 msgid "Change"
 msgstr "Αλλαγή"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:316
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:322
 msgid "Change &Disc..."
 msgstr "Αλλαγή &Δίσκου..."
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:179
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:179
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:167
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:167
 msgid "Change Disc"
 msgstr "Αλλαγή Δίσκου"
 
@@ -1008,7 +1046,7 @@ msgstr "Αλλαγή Δίσκου"
 msgid "Change Game"
 msgstr "Αλλαγή Παιχνιδιού"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:515
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495
 msgid ""
 "Change the language of the user interface.\n"
 "Requires restart."
@@ -1016,75 +1054,75 @@ msgstr ""
 "Αλλαγή της γλώσσας περιβάλλοντος.\n"
 "Απαιτεί επανεκκίνηση."
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:60
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:47
 msgid "Changes sign to zFar Parameter (after correction)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:55
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:42
 msgid "Changes sign to zNear Parameter (after correction)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:519
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499
 msgid "Changing this will have no effect while the emulator is running!"
 msgstr "Αυτή η αλλαγή δε θα έχει επίπτωση όσο ο εξομοιωτής εκτελείται!"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:295
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:298
 msgid "Chat"
 msgstr "Συνομιλία"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:47
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:34
 msgid "Cheat Code"
 msgstr "Κωδικός Cheat"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:118
 msgid "Cheat Search"
 msgstr "Αναζήτηση Cheat"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:38
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:25
 msgid "Cheats Manager"
 msgstr "Διαχείριση Cheat"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:633
 msgid "Check Partition Integrity"
 msgstr "Έλεγχος Ακεραιότητας Κατάτμησης"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:864
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:880
 msgid "Checking integrity..."
 msgstr "Έλεγχος ακεραιότητας..."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289
 msgid "Chinese (Simplified)"
 msgstr "Κινέζικα (Απλοποιημένα)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290
 msgid "Chinese (Traditional)"
 msgstr "Κινέζικα (Παραδοσιακά)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:818
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:799
 msgid "Choose a DVD root directory:"
 msgstr "Επιλέξτε έναν φάκελο ρίζας DVD:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:822
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803
 msgid "Choose a NAND root directory:"
 msgstr "Επιλέξτε έναν φάκελο ρίζας NAND:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:815
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:796
 msgid "Choose a default ISO:"
 msgstr "Επιλέξτε ένα προεπιλεγμένο ISO:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1236
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1219
 msgid "Choose a directory to add"
 msgstr "Επιλέξτε έναν φάκελο για προσθήκη"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1065
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1048
 msgid "Choose a file to open"
 msgstr "Επιλέξτε ένα αρχείο για άνοιγμα"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:217
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:204
 msgid "Choose a memory card:"
 msgstr "Επιλέξτε μια κάρτα μνήμης:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:819
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800
 msgid ""
 "Choose file to use as apploader: (applies to discs constructed from "
 "directories only)"
@@ -1092,27 +1130,27 @@ msgstr ""
 "Επιλέξτε ένα αρχείο για χρήση ως apploader: (έχει εφαρμογή σε δίσκους που "
 "απαρτίζονται μόνο από φακέλους)"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:767
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:806
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:781
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:822
 msgid "Choose the folder to extract to"
 msgstr "Επιλέξτε τον φάκελο προς αποσυμπίεση"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:297
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:284
 msgid "Circle Stick"
 msgstr "Κυκλικό Stick"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:52
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:56
 msgid "Classic"
 msgstr "Κλασικό Χειριστήριο"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:144
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:43
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:487
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:913
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:137
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:30
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:474
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:904
 msgid "Clear"
 msgstr "Καθάρισ."
 
-#: Source/Core/Core/Src/NetPlayServer.cpp:259
+#: Source/Core/Core/Src/NetPlayServer.cpp:263
 msgid ""
 "Client disconnect while game is running!! NetPlay is disabled. You must "
 "manually stop the game."
@@ -1120,138 +1158,138 @@ msgstr ""
 "Ο Client έχει αποσυνδεθεί ενώ το παιχνίδι εκτελείται!! Το NetPlay έχει "
 "απενεργοποιηθεί. Θα πρέπει να σταματήσετε χειροκίνητα το παιχνίδι."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:298
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:247
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:552
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:578
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:285
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:234
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:562
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:590
 msgid "Close"
 msgstr "Κλείσιμο"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:174
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:177
 msgid "Co&nfigure..."
 msgstr "Ρυ&θμίσεις..."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:86
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:73
 msgid "Code Info"
 msgstr "Πληροφορίες Κωδικού"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:568
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:556
 msgid "Code: "
 msgstr "Κωδικός: "
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:35
 msgid "Command"
 msgstr "Εντολή"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:629
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:623
 msgid "Comment"
 msgstr "Σχόλιο"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489
 msgid "Comment:"
 msgstr "Σχόλιο:"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:893
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:884
 msgid "Compress ISO..."
 msgstr "Συμπίεση ISO..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:905
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:899
 msgid "Compress selected ISOs..."
 msgstr "Συμπίεση επιλεγμένων ISO..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1088
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1224
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1089
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1225
 msgid "Compressing ISO"
 msgstr "Συμπίεση ISO"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:429
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:435
 msgid "Config"
 msgstr "Ρυθμίσεις"
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:37
-#: Source/Core/DolphinWX/Src/InputConfigDiag.h:135
-#: Source/Core/DolphinWX/Src/InputConfigDiag.h:154
+#: Source/Core/DolphinWX/Src/InputConfigDiag.h:122
+#: Source/Core/DolphinWX/Src/InputConfigDiag.h:141
 msgid "Configure"
 msgstr "Ρυθμίσεις"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:111
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:98
 msgid "Configure Control"
 msgstr "Ρυθμίσεις Χειριστηρίου"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:306
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
 #: Source/Core/DolphinWX/Src/NetWindow.cpp:583
 msgid "Configure Pads"
 msgstr "Ρυθμίσεις Χειριστηρίων"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:429
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:435
 msgid "Configure..."
 msgstr "Γενικές Ρυθμίσεις..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1119
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1147
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1217
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1120
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1218
 msgid "Confirm File Overwrite"
 msgstr "Επιβεβαίωση Αντικατάστασης Αρχείου"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:597
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:577
 msgid "Confirm on Stop"
 msgstr "Επιβεβαίωση Διακοπής"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:83
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:105
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:74
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:96
 msgid "Connect"
 msgstr "Σύνδεση"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:783
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:764
 msgid "Connect USB Keyboard"
 msgstr "Σύνδεση Πληκτρολογίου USB"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:362
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:368
 #, c-format
 msgid "Connect Wiimote %i"
 msgstr "Σύνδεση Wiimote %i"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:195
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183
 msgid "Connect Wiimote 1"
 msgstr "Σύνδεση Wiimote 1"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184
 msgid "Connect Wiimote 2"
 msgstr "Σύνδεση Wiimote 2"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:185
 msgid "Connect Wiimote 3"
 msgstr "Σύνδεση Wiimote 3"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:198
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:186
 msgid "Connect Wiimote 4"
 msgstr "Σύνδεση Wiimote 4"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:627
+#: Source/Core/DolphinWX/Src/Main.cpp:655
 msgid "Connecting..."
 msgstr "Γίνεται Σύνδεση..."
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:155
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:156
 msgid "Console"
 msgstr "Κονσόλα"
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:71
 msgid "Continuous Scanning"
-msgstr ""
+msgstr "Συνεχής Ανίχνευση"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:46
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:33
 msgid "Control"
 msgstr "Χειριστήριο"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:189
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:176
 msgid "Convert to GCI"
 msgstr "Μετατροπή σε GCI"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:379
+#: Source/Core/Core/Src/CoreParameter.cpp:368
 msgid "Copy failed"
 msgstr "Η αντιγραφή απέτυχε"
 
@@ -1260,21 +1298,21 @@ msgstr "Η αντιγραφή απέτυχε"
 msgid "Copy to Memcard %c"
 msgstr "Αντιγραφή στην κάρτα μνήμης %c"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:359
 msgid "Core"
 msgstr "Πυρήνας"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:154
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:148
 #, c-format
 msgid "Could not create %s"
 msgstr "Αποτυχία δημιουργίας %s"
 
-#: Source/Core/AudioCommon/Src/AudioCommon.cpp:75
+#: Source/Core/AudioCommon/Src/AudioCommon.cpp:62
 #, c-format
 msgid "Could not initialize backend %s."
 msgstr "Αποτυχία εκκίνησης backend %s"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:137
+#: Source/Core/Core/Src/CoreParameter.cpp:126
 #, c-format
 msgid ""
 "Could not read \"%s\".  There is no disc in the drive, or it is not a GC/Wii "
@@ -1286,12 +1324,12 @@ msgstr ""
 " Σημειώστε πως αυθεντικοί Gamecube και Wii δίσκοι δεν μπορούν να αναγνωστούν "
 "από τους περισσότερους PC DVD οδηγούς."
 
-#: Source/Core/Core/Src/CoreParameter.cpp:292
+#: Source/Core/Core/Src/CoreParameter.cpp:281
 #, c-format
 msgid "Could not recognize ISO file %s"
 msgstr "Αποτυχία αναγνώρισης του αρχείου ISO %s"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:569
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:579
 #, c-format
 msgid "Could not save %s"
 msgstr "Αποτυχία αποθήκευσης του %s"
@@ -1306,24 +1344,32 @@ msgstr ""
 "(ο καθορισμός των χειριστηρίων ενώ το παιχνίδι τρέχει δεν υποστηρίζεται προς "
 "το παρόν)"
 
-#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:123
+#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119
 #, c-format
 msgid ""
 "Could not write memory card file %s.\n"
 "\n"
 "Are you running Dolphin from a CD/DVD, or is the save file maybe write "
-"protected?"
+"protected?\n"
+"\n"
+"Are you receiving this after moving the emulator directory?\n"
+"If so, then you may need to re-specify your memory card location in the "
+"options."
 msgstr ""
 "Δεν μπόρεσε να γίνει εγγραφή των αρχείων της κάρτας μνήμης %s.\n"
 "\n"
 "Μήπως εκτελείτε το Dolphin από CD/DVD, ή το αποθηκευόμενο αρχείο έχει "
-"προστασία εγγραφής;"
+"προστασία εγγραφής;\n"
+"\n"
+"Λαμβάνετε αυτό το μήνυμα μετά από μετακίνηση του φακέλου του εξομοιωτή;\n"
+"Άμα ναι, τότε μπορεί να χρειαστεί να ορίσετε ξανά την θέση της κάρτας μνήμης "
+"στις ρυθμίσεις."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1107
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1133
 msgid "Couldn't find open command for extension 'ini'!"
 msgstr "Αδυναμία εύρεσης εντολής ανοίγματος για την επέκταση 'ini'!"
 
-#: Source/Core/Core/Src/BootManager.cpp:146
+#: Source/Core/Core/Src/BootManager.cpp:137
 msgid ""
 "Couldn't init the core.\n"
 "Check your configuration."
@@ -1331,38 +1377,38 @@ msgstr ""
 "Αδυναμία εκκίνησης του πυρήνα.\n"
 "Ελέξγτε τις ρυθμίσεις σας."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:183
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:507
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:495
 msgid "Count:"
 msgstr "Πλήθος:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:452
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456
 msgid "Country:"
 msgstr "Χώρα:"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:186
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:562
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:173
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:550
 msgid "Create AR Code"
 msgstr "Δημιουργία Κωδικού AR"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:543
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:608
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:569
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:641
 msgid "Create new perspective"
 msgstr "Δημιουργία νέας οπτικής"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:17
 msgid "Creator: "
 msgstr "Δημιουργός: "
 
-#: Source/Core/Common/Src/MsgHandler.cpp:68
+#: Source/Core/Common/Src/MsgHandler.cpp:54
 msgid "Critical"
 msgstr "Κρίσιμο"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562
 msgid "Crop"
 msgstr "Κόψιμο"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119
 msgid ""
 "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n"
 "\n"
@@ -1372,141 +1418,141 @@ msgstr ""
 "\n"
 "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:48
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:52
 msgid "Crossfade"
 msgstr "Crossfade"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:597
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:600
 #, c-format
-msgid "Current dir changed from %s to %s after wxFileSelector!"
+msgid "Current directory changed from %s to %s after wxFileSelector!"
 msgstr "Ο τρέχων φάκελος άλλαξε από %s σε %s μετά από τον wxFileSelector!"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339
 msgid "Custom Projection Hack"
 msgstr "Προσαρμοζόμενο Projection Hack"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.h:30
+#: Source/Core/DolphinWX/Src/PHackSettings.h:17
 msgid "Custom Projection Hack Settings"
 msgstr "Ρυθμίσεις Προσαρμοζόμενου Projection Hack"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342
 msgid "Customize some Orthographic Projection parameters."
-msgstr ""
+msgstr "Προσαρμόστε ορισμένες παραμέτρους Ορθογραφικής Προβολής."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291
 msgid "Czech"
 msgstr "Τσέχικα"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:698
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:697
 msgid "D"
 msgstr "D"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:89
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
 msgid "D-Pad"
 msgstr "Ψηφιακό Pad"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:431
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
 msgid "DSP"
 msgstr "Ήχος (DSP)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:639
 msgid "DSP Emulator Engine"
 msgstr "Μηχανή Εξομοίωσης DSP"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:254
 msgid "DSP HLE emulation (fast)"
 msgstr "DSP HLE εξομοίωση (γρήγορη)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:256
 msgid "DSP LLE interpreter (slow)"
 msgstr "DSP LLE interpreter (αργή)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660
-msgid "DSP LLE on Thread"
-msgstr "DSP LLE σε Ξεχωριστό Νήμα"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:255
 msgid "DSP LLE recompiler"
 msgstr "DSP LLE recompiler"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:431
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:641
+msgid "DSP on Dedicated Thread"
+msgstr "DSP σε Ξεχωριστό Νήμα"
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
 msgid "DSP settings"
 msgstr "Ρυθμίσεις ήχου (DSP)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:838
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:819
 msgid "DVD Root:"
 msgstr "Ρίζα DVD:"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:239
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:226
 msgid "DVDLowRead - Fatal Error: failed to read from volume"
 msgstr "DVDLowRead - Σφάλμα Τερματισμού: αποτυχία ανάγνωσης από τον τομέα"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:333
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:320
 msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume"
 msgstr ""
 "DVDLowUnencryptedRead - Σφάλμα Τερματισμού: αποτυχία ανάγνωσης από τον τομέα"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:176
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:163
 msgid "Data Size"
 msgstr "Μέγεθος Δεδομένων"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468
 msgid "Date:"
 msgstr "Ημερομηνία:"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:528
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:564
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:518
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:557
 msgid "Datel MaxDrive/Pro files(*.sav)"
 msgstr "Αρχεία Datel MaxDrive/Pro(*.sav)"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:242
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:259
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:267
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:281
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:296
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:229
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:246
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:254
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:268
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:283
 msgid "Dead Zone"
 msgstr "Νεκρή Ζώνη"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:35
 msgid "Debug"
 msgstr "Debug"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:521
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534
 msgid "Debugging"
 msgstr "Debugging"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:79
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:66
 msgid "Decimal"
 msgstr "Δεκαδικός"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:890
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:881
 msgid "Decompress ISO..."
 msgstr "Αποσυμπίεση ISO..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:906
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:900
 msgid "Decompress selected ISOs..."
 msgstr "Αποσυμπίεση επιλεγμένων ISO..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1088
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1224
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1089
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1225
 msgid "Decompressing ISO"
 msgstr "Γίνεται αποσυμπίεση ISO"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:912
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:903
 msgid "Default"
 msgstr "Προεπιλ."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:835
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:816
 msgid "Default ISO:"
 msgstr "Προεπιλεγμένο ISO:"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:114
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:107
 msgid "Default font"
 msgstr "Προεπιλεγμένη γραμματοσειρά"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:32
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:926
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:19
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917
 msgid "Delete"
 msgstr "Διαγραφή"
 
@@ -1514,21 +1560,21 @@ msgstr "Διαγραφή"
 msgid "Delete Save"
 msgstr "Διαγραφή Αποθήκευσης"
 
-#: Source/Core/VideoCommon/Src/AVIDump.cpp:77
+#: Source/Core/VideoCommon/Src/AVIDump.cpp:64
 #, c-format
 msgid "Delete the existing file '%s'?"
 msgstr "Διαγραφή του υπάρχοντος αρχείου '%s';"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:671
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:683
 msgid "Description"
 msgstr "Περιγραφή"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:472
 msgid "Detect"
 msgstr "Ανίχνευση"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:233
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:328
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:220
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:315
 msgid ""
 "Detected attempt to read more data from the DVD than fit inside the out "
 "buffer. Clamp."
@@ -1536,29 +1582,29 @@ msgstr ""
 "Εντοπίστηκε προσπάθεια ανάγνωσης περισσότερων δεδομένων από το DVD από όσα "
 "χωράνε μέσα στο buffer. Clamp."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:127
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:898
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:114
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:889
 msgid "Device"
 msgstr "Συσκευή"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:798
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:731
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779
 msgid "Device Settings"
 msgstr "Ρυθμίσεις Συσκευής"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:45
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:49
 msgid "Dial"
 msgstr "Dial"
 
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:146
+#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:135
 msgid "Direct3D11"
 msgstr "Direct3D11"
 
-#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:128
+#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:125
 msgid "Direct3D9"
 msgstr "Direct3D9"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:167
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:155
 msgid ""
 "Directory checksum failed\n"
 " and Directory backup checksum failed"
@@ -1566,16 +1612,20 @@ msgstr ""
 "Το checksum του Καταλόγου απέτυχε\n"
 " καθώς και το checksum του εφεδρικού Καταλόγου απέτυχε"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:433
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:443
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485
 msgid "Disable"
 msgstr "Απενεργοποίηση"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:491
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501
+msgid "Disable Destination Alpha"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:409
 msgid "Disable Fog"
 msgstr "Απενεργοποίηση Ομίχλης"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108
 msgid ""
 "Disable any XFB emulation.\n"
 "Speeds up emulation a lot but causes heavy glitches in many games which rely "
@@ -1589,7 +1639,7 @@ msgstr ""
 "\n"
 "Αν δεν είστε σίγουροι, αφήστε το επιλεγμένο."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95
 msgid ""
 "Disable emulation of EFB copies.\n"
 "These are often used for post-processing or render-to-texture effects, so "
@@ -1605,20 +1655,33 @@ msgstr ""
 "\n"
 "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:543
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101
+#, fuzzy
+msgid ""
+"Disables emulation of a hardware feature called destination alpha, which is "
+"used in many games for various graphical effects.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+"Παράλειψη του destination alpha pass που χρησιμοποιείται από πολλά παιχνίδια "
+"σε διάφορα γραφικά εφέ.\n"
+"\n"
+"Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο."
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:553
 msgid "Disc"
 msgstr "Δίσκος"
 
-#: Source/Core/DiscIO/Src/DriveBlob.cpp:107
-#: Source/Core/DiscIO/Src/DriveBlob.cpp:126
+#: Source/Core/DiscIO/Src/DriveBlob.cpp:94
+#: Source/Core/DiscIO/Src/DriveBlob.cpp:113
 msgid "Disc Read Error"
 msgstr "Σφάλμα Ανάγνωσης Δίσκου"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:312
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:320
 msgid "Display"
 msgstr "Οθόνη"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104
 msgid ""
 "Display the inputs read by the emulator.\n"
 "\n"
@@ -1628,49 +1691,49 @@ msgstr ""
 "\n"
 "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:80
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:67
 msgid "Divide"
 msgstr "Divide"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:987
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:990
 msgid "Do you want to stop the current emulation?"
 msgstr "Θέλετε να σταματήσετε την τρέχουσα εξομοίωση;"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:663
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:644
 msgid "Dolby Pro Logic II decoder"
-msgstr ""
+msgstr "Dolby Pro Logic II αποκωδικοποιητής"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:864
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:856
 msgid "Dolphin"
 msgstr "Dolphin"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:183
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:188
 #, c-format
 msgid "Dolphin %s Graphics Configuration"
 msgstr "Ρυθμίσεις Γραφικών Dolphin %s"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:292
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:298
 msgid "Dolphin &Web Site"
 msgstr "Ιστοσελίδα του &Dolphin"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.h:37
+#: Source/Core/DolphinWX/Src/ConfigMain.h:24
 msgid "Dolphin Configuration"
 msgstr "Ρυθμίσεις Dolphin"
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:183
 msgid "Dolphin Emulated Wiimote Configuration"
-msgstr "Ρυθμίσεις Εξοιμοιωμένου Dolphin Wiimote"
+msgstr "Ρυθμίσεις Εξομοιωμένου Dolphin Wiimote"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:394
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:383
 msgid "Dolphin FIFO"
 msgstr "Dolphin FIFO"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1136
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1153
 msgid "Dolphin GCPad Configuration"
 msgstr "Ρυθμίσεις Dolphin GCPad"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:679
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1074
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:685
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1089
 msgid "Dolphin TAS Movies (*.dtm)"
 msgstr "Dolphin TAS Ταινίες (*.dtm)"
 
@@ -1678,11 +1741,11 @@ msgstr "Dolphin TAS Ταινίες (*.dtm)"
 msgid "Dolphin Wiimote Configuration"
 msgstr "Ρυθμίσεις Dolphin Wiimote"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:293
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:299
 msgid "Dolphin at &Google Code"
 msgstr "Dolphin στο &Google Code"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:364
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:351
 msgid ""
 "Dolphin could not find any GC/Wii ISOs.  Doubleclick here to browse for "
 "files..."
@@ -1690,7 +1753,7 @@ msgstr ""
 "Το Dolphin δεν μπόρεσε να βρει GC/Wii ISO. Κάντε διπλό κλίκ εδώ για εύρεση "
 "αρχείων..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:368
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:355
 msgid ""
 "Dolphin is currently set to hide all games.  Doubleclick here to show all "
 "games..."
@@ -1698,50 +1761,59 @@ msgstr ""
 "Το Dolphin είναι ρυθμισμένο να αποκρύπτει όλα τα παιχνίδια. Κάντε διπλό κλίκ "
 "εδώ για να εμφανιστούν όλα τα παιχνίδια..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1159
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1160
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1246
 msgid "Dolphin was unable to complete the requested action."
-msgstr ""
+msgstr "Το Dolphin δεν μπόρεσε να ολοκληρώσει την ζητούμενη ενέργεια."
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:275
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:58
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
+#, fuzzy
+msgid ""
+"Doubles the emulated GPU clock rate. May speed up some games (ON = Fast, OFF "
+"= Compatible)"
+msgstr ""
+"Ενεργοποιεί τη γρήγορη πρόσβαση δίσκου. Απαραίτητο για μερικά παιχνίδια. "
+"(ΕΝΕΡΓΟ = Γρήγορο, ΑΝΕΝΕΡΓΟ = Συμβατό)"
+
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:262
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:45
 msgid "Down"
 msgstr "Κάτω"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:54
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:44
 msgid "Download Codes (WiiRD Database)"
 msgstr "Μεταφόρτωση Κωδικών (WiiRD Database)"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:297
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:287
 #, c-format
 msgid "Downloaded %lu codes. (added %lu)"
 msgstr "Μεταφορτώθηκαν %lu κωδικοί. (προστέθηκαν %lu)"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:31
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:35
 msgid "Drums"
 msgstr "Τύμπανα"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:105
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
 msgid "Dummy"
 msgstr "Dummy"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:661
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:642
 msgid "Dump Audio"
 msgstr "Εξαγωγή Ήχου"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:532
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545
 msgid "Dump EFB Target"
 msgstr "Εξαγωγή EFB Target"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546
 msgid "Dump Frames"
 msgstr "Εξαγωγή Καρέ"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543
 msgid "Dump Textures"
 msgstr "Εξαγωγή Υφών"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114
 msgid ""
 "Dump all rendered frames to an AVI file in User/Dump/Frames/\n"
 "\n"
@@ -1752,7 +1824,7 @@ msgstr ""
 "\n"
 "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111
 msgid ""
 "Dump decoded game textures to User/Dump/Textures/<game_id>/\n"
 "\n"
@@ -1763,7 +1835,7 @@ msgstr ""
 "\n"
 "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113
 msgid ""
 "Dump the contents of EFB copies to User/Dump/Textures/\n"
 "\n"
@@ -1773,21 +1845,21 @@ msgstr ""
 "\n"
 "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:474
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292
 msgid "Dutch"
 msgstr "Ολλανδικά"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:112
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:113
 msgid "E&xit"
 msgstr "Έ&ξοδος"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:441
 msgid "EFB Copies"
 msgstr "EFB Αντίγραφα"
 
-#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:223
+#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:210
 #, c-format
 msgid ""
 "ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least "
@@ -1800,52 +1872,52 @@ msgstr ""
 "Dolphin σας, πιθανότατα απαιτείται μία επανεκκίνηση ώστε τα Windows να δούνε "
 "τους νέους οδηγούς."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:166
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:160
 msgid "EUROPE"
 msgstr "ΕΥΡΩΠΗ"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:156
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:143
 msgid "Early Memory Updates"
 msgstr "Ενημερώσεις Μνήμης Νωρίς"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:447
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:453
 msgid "Edit"
 msgstr "Επεξεργασία"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.h:30
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.h:17
 msgid "Edit ActionReplay Code"
 msgstr "Επεξεργασία Κωδικού ActionReplay"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:285
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:286
 msgid "Edit Config"
 msgstr "Επεξεργασία Ρυθμίσεων"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.h:30
+#: Source/Core/DolphinWX/Src/PatchAddEdit.h:17
 msgid "Edit Patch"
 msgstr "Επεξεργασία Patch"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:447
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:453
 msgid "Edit current perspective"
 msgstr "Επεξεργασία τρέχουσας οπτικής"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:403
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:425
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:407
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:429
 msgid "Edit..."
 msgstr "Επεξεργασία..."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:44
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:48
 msgid "Effect"
 msgstr "Εφέ"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:425
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435
 msgid "Embedded Frame Buffer"
 msgstr "Embedded Frame Buffer"
 
-#: Source/Core/Core/Src/Core.cpp:201
+#: Source/Core/Core/Src/Core.cpp:190
 msgid "Emu Thread already running"
 msgstr "Το νήμα εξομοίωσης εκτελείται ήδη"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110
 msgid ""
 "Emulate XFBs accurately.\n"
 "Slows down emulation a lot and prohibits high-resolution rendering but is "
@@ -1860,7 +1932,7 @@ msgstr ""
 "\n"
 "Αν δεν είστε σίγουροι, επιλέξτε εικονική XFB εξομοίωση."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109
 msgid ""
 "Emulate XFBs using GPU texture objects.\n"
 "Fixes many games which don't work without XFB emulation while not being as "
@@ -1880,7 +1952,7 @@ msgstr ""
 msgid "Emulated Wiimote"
 msgstr "Εξομοιωμένο Wiimote"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346
 msgid "Emulation State: "
 msgstr "Κατάσταση Λειτουργίας:"
 
@@ -1888,7 +1960,7 @@ msgstr "Κατάσταση Λειτουργίας:"
 msgid "Enable"
 msgstr "Ενεργοποίηση"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91
 msgid ""
 "Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's "
 "supported by your GPU.\n"
@@ -1904,72 +1976,71 @@ msgstr ""
 "\n"
 "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:111
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:98
 msgid "Enable AR Logging"
 msgstr "Ενεργοποίηση Καταγραφής AR"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324
 msgid "Enable Block Merging"
 msgstr "Ενεργοποίηση Block Merging"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331
 msgid "Enable Bounding Box Calculation"
 msgstr "Ενεργοποίηση Bounding Box Υπολογισμών"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:446
 msgid "Enable Cache"
 msgstr "Ενεργοποίηση Cache"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:562
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542
 msgid "Enable Cheats"
 msgstr "Ενεργοποίηση Cheat"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310
 msgid "Enable Dual Core"
 msgstr "Ενεργοποίηση Διπλού Πυρήνα"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
 msgid "Enable Dual Core (speedup)"
 msgstr "Ενεργοποίηση Διπλού Πυρήνα (επιτάχυνση)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:550
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:563
 msgid "Enable Hotkeys"
 msgstr "Ενεργοποίηση Συντομεύσεων"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311
 msgid "Enable Idle Skipping"
 msgstr "Ενεργοποίηση Idle Skipping"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541
 msgid "Enable Idle Skipping (speedup)"
 msgstr "Ενεργοποίηση Idle Skipping (επιτάχυνση)"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312
 msgid "Enable MMU"
 msgstr "Ενεργοποίηση MMU"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:554
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:567
 msgid "Enable Progressive Scan"
 msgstr "Ενεργοποίηση Προοδευτικής Σάρωσης"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757
 msgid "Enable Screen Saver"
 msgstr "Ενεργοποίηση Προφύλαξης Οθόνης"
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:75
-#, fuzzy
 msgid "Enable Speaker Data"
-msgstr "Ενεργοποίηση σελίδων"
+msgstr "Ενεργοποίηση Δεδομένων Ηχείου"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
 msgid "Enable WideScreen"
 msgstr "Ενεργοποίηση Ευρείας Οθόνης"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:516
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529
 msgid "Enable Wireframe"
 msgstr "Ενεργοποίηση Wireframe"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85
 msgid ""
 "Enable anisotropic filtering.\n"
 "Enhances visual quality of textures that are at oblique viewing angles.\n"
@@ -1984,7 +2055,7 @@ msgstr ""
 "\n"
 "Αν δεν είστε σίγουροι, επιλέξτε 1x."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323
 msgid ""
 "Enable fast disc access.  Needed for a few games. (ON = Fast, OFF = "
 "Compatible)"
@@ -1996,7 +2067,7 @@ msgstr ""
 msgid "Enable pages"
 msgstr "Ενεργοποίηση σελίδων"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76
 msgid ""
 "Enable this if you want the whole screen to be used for rendering.\n"
 "If this is disabled, a render window will be created instead.\n"
@@ -2009,7 +2080,7 @@ msgstr ""
 "\n"
 "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80
 msgid ""
 "Enable this if you want to use the main Dolphin window for rendering rather "
 "than a separate render window.\n"
@@ -2021,7 +2092,7 @@ msgstr ""
 "\n"
 "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:335
 msgid ""
 "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for "
 "ANY other game."
@@ -2029,28 +2100,35 @@ msgstr ""
 "Ενεργοποιήστε το για να επιταχύνετε το The Legend of Zelda: Twilight "
 "Princess. Απενεργοποιήστε το για τα υπόλοιπα παιχνίδια."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340
 msgid "Enables Custom Projection Hack"
 msgstr "Ενεργοποιεί το Προσαρμοζόμενο Projection Hack"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:528
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508
 msgid ""
 "Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on "
 "OSX."
 msgstr ""
+"Ενεργοποιεί την Dolby Pro Logic II εξομοίωση χρησιμοποιώντας 5.1 surround. "
+"Δεν διατίθεται για OSX."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510
 msgid ""
 "Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only."
 msgstr ""
+"Ενεργοποιεί την Dolby Pro Logic II εξομοίωση χρησιμοποιώντας 5.1 surround. "
+"Μόνο για OpenAL backend."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:512
 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 surround. "
+"Μόνο για OpenAL backend. Μπορεί να χρειαστεί να μετονομάσετε το soft_oal.dll "
+"σε OpenAL32.dll για να λειτουργήσει."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81
 msgid ""
 "Enables progressive scan if supported by the emulated software.\n"
 "Most games don't care about this.\n"
@@ -2062,7 +2140,7 @@ msgstr ""
 "\n"
 "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313
 msgid ""
 "Enables the Memory Management Unit, needed for some games. (ON = Compatible, "
 "OFF = Fast)"
@@ -2070,7 +2148,7 @@ msgstr ""
 "Ενεργοποιεί τη Μονάδα Διαχείρισης Μνήμης, απαραίτητο για μερικά παιχνίδια. "
 "(Ενεργό = Συμβατό, Ανενεργό = Γρήγορο)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116
 msgid ""
 "Encode frame dumps using the FFV1 codec.\n"
 "\n"
@@ -2080,52 +2158,52 @@ msgstr ""
 "\n"
 "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:40
 msgid "End"
 msgstr "Τέλος"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:469
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:280
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:260
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293
 msgid "English"
 msgstr "Αγγλικά"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:329
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:407
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:337
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:417
 msgid "Enhancements"
 msgstr "Βελτιώσεις"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:607
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:640
 msgid "Enter a name for the new perspective:"
 msgstr "Εισάγετε όνομα για τη νέα οπτική:"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:191
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:178
 #, c-format
 msgid "Entry %d/%d"
 msgstr "Εγγραφή %d/%d"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:85
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:72
 #, c-format
 msgid "Entry 1/%d"
 msgstr "Εγγραφή 1/%d"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:204
 msgid "Equal"
 msgstr "Ίσο"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:45
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:156
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1242
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:32
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:150
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226
 msgid "Error"
 msgstr "Σφάλμα"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:381
+#: Source/Core/DolphinWX/Src/Main.cpp:409
 msgid "Error loading selected language. Falling back to system default."
 msgstr ""
 "Αποτυχία φόρτωσης της επιλεγμένης γλώσσας. Επαναφορά στην προεπιλογή "
 "συστήματος."
 
-#: Source/Core/Common/Src/ChunkFile.h:226
+#: Source/Core/Common/Src/ChunkFile.h:221
 #, c-format
 msgid ""
 "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). "
@@ -2134,7 +2212,7 @@ msgstr ""
 "Σφάλμα: Μετά από \"%s\", βρέθηκε %d (0x%X) αντί του σημείου αποθήκευσης %d "
 "(0x%X). Ματαίωση φόρτωσης σημείου αποθήκευσης..."
 
-#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:342
+#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:329
 #, c-format
 msgid ""
 "Error: Trying to access %s fonts but they are not loaded. Games may not show "
@@ -2144,39 +2222,39 @@ msgstr ""
 "φορτωμένες. Τα παιχνίδια μπορεί να μη δείχνουν τις γραμματοσειρές σωστά, ή "
 "να κρασάρουν."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:30
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:17
 msgid "Escape"
 msgstr "Escape"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:26
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:30
 msgid "Euphoria"
 msgstr "Euphoria"
 
 #: Source/Core/Core/Src/ArmMemTools.cpp:78
-#: Source/Core/Core/Src/x64MemTools.cpp:217
+#: Source/Core/Core/Src/x64MemTools.cpp:206
 #, c-format
 msgid "Exception handler - access below memory space. %08llx%08llx"
 msgstr ""
 "Χειριστής εξαιρέσεων - πρόσβαση κάτω από την περιοχή μνήμης. %08llx%08llx"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:61
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
 msgid "Execute"
 msgstr "Εκτέλεση"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:459
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:446
 msgid "Export Failed"
 msgstr "Αποτυχία Εξαγωγής"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:639
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:649
 msgid "Export File"
 msgstr "Εξαγωγή Αρχείου"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:177
 msgid "Export Recording"
 msgstr "Εξαγωγή Εγγραφής"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:345
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:351
 msgid "Export Recording..."
 msgstr "Εξαγωγή Εγγραφής..."
 
@@ -2184,7 +2262,7 @@ msgstr "Εξαγωγή Εγγραφής..."
 msgid "Export Save"
 msgstr "Εξαγωγή Αποθήκευσης"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:874
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:865
 msgid "Export Wii save (Experimental)"
 msgstr "Εξαγωγή Αποθήκευσης Wii (Πειραματικό)"
 
@@ -2192,100 +2270,100 @@ msgstr "Εξαγωγή Αποθήκευσης Wii (Πειραματικό)"
 msgid "Export all saves"
 msgstr "Εξαγωγή όλων των αποθηκεύσεων"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:80
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:72
 msgid "Export failed, try again?"
 msgstr "Αποτυχία εξαγωγής, προσπάθεια ξανά;"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:559
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:552
 msgid "Export save as..."
 msgstr "Εξαγωγή αποθήκευσης ως..."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:297
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:284
 msgid "Extension"
 msgstr "Επέκταση"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483
 msgid "External Frame Buffer"
 msgstr "Εξωτερικό Frame Buffer"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:61
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:48
 msgid "Extra Parameter"
 msgstr "Επιπλέον Παράμετρος"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:62
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:49
 msgid "Extra Parameter useful in ''Metroid: Other M'' only."
 msgstr "Η Επιπλέον Παράμετρος είναι χρήσιμη μόνο στο ''Metroid: Other M''."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:614
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:624
 msgid "Extract All Files..."
 msgstr "Εξαγωγή όλων των αρχείων..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:616
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:626
 msgid "Extract Apploader..."
 msgstr "Εξαγωγή Apploader..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:617
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627
 msgid "Extract DOL..."
 msgstr "Εξαγωγή DOL..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:610
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:620
 msgid "Extract Directory..."
 msgstr "Εξαγωγή Φακέλου..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:612
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:622
 msgid "Extract File..."
 msgstr "Εξαγωγή Αρχείου..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:608
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:618
 msgid "Extract Partition..."
 msgstr "Εξαγωγή Κατάτμησης..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:724
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:738
 #, c-format
 msgid "Extracting %s"
 msgstr "Γίνεται εξαγωγή %s"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:707
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:721
 msgid "Extracting All Files"
 msgstr "Γίνεται εξαγωγή όλων των αρχείων"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:707
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:721
 msgid "Extracting Directory"
 msgstr "Γίνεται εξαγωγή φακέλου"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:710
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:724
 msgid "Extracting..."
 msgstr "Γίνεται εξαγωγή..."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:892
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:893
 msgid "FIFO Byte"
 msgstr "FIFO Byte"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:45
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:32
 msgid "FIFO Player"
 msgstr "Αναπαραγωγή FIFO"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:169
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:163
 msgid "FRANCE"
 msgstr "ΓΑΛΛΙΑ"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472
 msgid "FST Size:"
 msgstr "Μέγεθος FST:"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:77
+#: Source/Core/Core/Src/NetPlayClient.cpp:81
 msgid "Failed to Connect!"
 msgstr "Αποτυχία σύνδεσης!"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:225
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:228
 msgid "Failed to Listen!!"
 msgstr "Αποτυχία ακρόασης!!"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:307
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:300
 msgid "Failed to download codes."
 msgstr "Αποτυχία μεταφόρτωσης κωδικών."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:827
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:843
 #, c-format
 msgid "Failed to extract to %s!"
 msgstr "Αποτυχία εξαγωγής στο %s!"
@@ -2313,26 +2391,30 @@ msgstr ""
 "dumps.\n"
 "(Επιλέξτε την από την καρτέλα \"Ήχος\" του παραθύρου των γενικών ρυθμίσεων.)"
 
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:116
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:139
+#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:108
+#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:131
 msgid "Failed to load bthprops.cpl"
 msgstr "Αποτυχία φόρτωσης bthprops.cpl"
 
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:100
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:109
+#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:90
+#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:101
 msgid "Failed to load hid.dll"
 msgstr "Αποτυχία φόρτωσης hid.dll"
 
-#: Source/Core/Core/Src/Movie.cpp:792
+#: Source/Core/Core/Src/Movie.cpp:783
 #, c-format
 msgid "Failed to read %s"
-msgstr ""
+msgstr "Αποτυχία ανάγνωσης %s"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:151
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:144
 msgid "Failed to read banner.bin"
 msgstr "Αποτυχία ανάγνωσης banner.bin"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:223
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:178
+msgid "Failed to read bk header"
+msgstr "Αποτυχία ανάγνωσης της κεφαλίδας bk"
+
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:211
 #, c-format
 msgid ""
 "Failed to read block %d of the save data\n"
@@ -2343,7 +2425,7 @@ msgstr ""
 "Μπορεί να έχουν περικοπεί τα δεδομένα στην κάρτα μνήμης\n"
 "Θέση αρχείου:%llx"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:148
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:136
 msgid ""
 "Failed to read block allocation table backup correctly\n"
 "(0x8000-0x9FFF)"
@@ -2351,7 +2433,7 @@ msgstr ""
 "Αποτυχία σωστής ανάγνωσης του αντιγράφου ασφαλείας του BAT\n"
 "(0x8000-0x9FFF)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:142
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:130
 msgid ""
 "Failed to read block allocation table correctly\n"
 "(0x6000-0x7FFF)"
@@ -2359,12 +2441,17 @@ msgstr ""
 "Αποτυχία σωστής ανάγνωσης του BAT\n"
 "(0x6000-0x7FFF)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:286
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:279
 #, c-format
 msgid "Failed to read data from file %d"
 msgstr "Αποτυχία ανάγνωσης δεδομένων από το αρχείο %d"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:136
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:367
+#, c-format
+msgid "Failed to read data from file: %s"
+msgstr "Αποτυχία ανάγνωσης δεδομένων από το αρχείο: %s"
+
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:124
 msgid ""
 "Failed to read directory backup correctly\n"
 "(0x4000-0x5FFF)"
@@ -2372,7 +2459,7 @@ msgstr ""
 "Αποτυχία σωστής ανάγνωσης του αντιγράφου ασφαλείας των φακέλων\n"
 "(0x4000-0x5FFF)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:130
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:118
 msgid ""
 "Failed to read directory correctly\n"
 "(0x2000-0x3FFF)"
@@ -2380,7 +2467,11 @@ msgstr ""
 "Αποτυχία σωστής ανάγνωσης των φακέλων\n"
 "(0x2000-0x3FFF)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:119
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:90
+msgid "Failed to read header"
+msgstr "Αποτυχία ανάγνωσης κεφαλίδας"
+
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:107
 msgid ""
 "Failed to read header correctly\n"
 "(0x0000-0x1FFF)"
@@ -2388,41 +2479,41 @@ msgstr ""
 "Αποτυχία σωστής ανάγνωσης της κεφαλίδας\n"
 "(0x0000-0x1FFF)"
 
-#: Source/Core/DiscIO/Src/VolumeGC.cpp:61
+#: Source/Core/DiscIO/Src/VolumeGC.cpp:48
 msgid "Failed to read unique ID from disc image"
 msgstr "Αποτυχία ανάγνωσης μοναδικού ID από την εικόνα δίσκου"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:84
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:71
 msgid "Failed to write BT.DINF to SYSCONF"
 msgstr "Αποτυχία εγγραφής του BT.DINF στο SYSCONF"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:228
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:221
 msgid "Failed to write bkhdr"
 msgstr "Αποτυχία εγγραφής του bkhdr"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:164
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:157
 #, c-format
 msgid "Failed to write header for %s"
 msgstr "Αποτυχία εγγραφής της κεφαλίδας για το %s"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:258
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:251
 #, c-format
 msgid "Failed to write header for file %d"
 msgstr "Αποτυχία εγγραφής της κεφαλίδας για το αρχείο %d"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294
 msgid "Farsi"
 msgstr "Περσικά"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477
 msgid "Fast"
 msgstr "Γρήγορη"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315
 msgid "Fast version of the MMU.  Does not work for every game."
 msgstr "Γρήγορη έκδοση του MMU. Δε δουλεύει για όλα τα παιχνίδια."
 
-#: Source/Core/Core/Src/Movie.cpp:1046
+#: Source/Core/Core/Src/Movie.cpp:1037
 #, c-format
 msgid ""
 "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s"
@@ -2430,23 +2521,23 @@ msgstr ""
 "Ανεπανόρθωτος αποσυγχρονισμός. Ακύρωση αναπαραγωγής.  (Σφάλμα σε "
 "PlayWiimote: %u != %u, byte %u.)%s"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:199
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:202
 msgid "Fifo Player"
 msgstr "Αναπαραγωγή Fifo"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:99
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:86
 msgid "File Info"
 msgstr "Πληροφορίες Αρχείου"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:304
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:295
 msgid "File contained no codes."
 msgstr "Το αρχείο δεν περιείχε κωδικούς."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:413
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:400
 msgid "File converted to .gci"
 msgstr "Το αρχείο μετατράπηκε σε .gci"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:428
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:415
 msgid ""
 "File could not be opened\n"
 "or does not have a valid extension"
@@ -2454,7 +2545,7 @@ msgstr ""
 "Το αρχείο απέτυχε στο άνοιγμα\n"
 "ή δεν έχει έγκυρη επέκταση"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:84
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:72
 #, c-format
 msgid ""
 "File has the extension \"%s\"\n"
@@ -2463,36 +2554,36 @@ msgstr ""
 "Το αρχείο έχει επέκταση \"%s\"\n"
 "έγκυρες επεκτάσεις είναι (.raw/.gcp)"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:425
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:412
 msgid "File is not recognized as a memcard"
 msgstr "Το αρχείο δεν αναγνωρίζεται σαν κάρτα μνήμης"
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:294
+#: Source/Core/DiscIO/Src/CompressedBlob.cpp:281
 msgid "File not compressed"
 msgstr "Το αρχείο δεν είναι συμπιεσμένο"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:127
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:109
 #, c-format
 msgid "FileIO: Unknown open mode : 0x%02x"
 msgstr "FileIO: Άγνωστη λειτουργία ανοίγματος : 0x%02x"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:531
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:541
 msgid "Filesystem"
 msgstr "Αρχεία δίσκου"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1100
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1126
 msgid "Filetype 'ini' is unknown! Will not open!"
 msgstr "Ο τύπος αρχείου 'ini' είναι άγνωστος! Δε θα γίνει άνοιγμα!"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:265
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:252
 msgid "Find next"
 msgstr "Εύρεση επομένου"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:266
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:253
 msgid "Find previous"
 msgstr "Εύρεση προηγούμενου"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:632
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626
 msgid "First Block"
 msgstr "Πρώτο Μπλοκ"
 
@@ -2500,23 +2591,23 @@ msgstr "Πρώτο Μπλοκ"
 msgid "Fix Checksums"
 msgstr "Επιδιόρθωση Checksum"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:275
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283
 msgid "Force 16:9"
 msgstr "Επιβολή 16:9"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:275
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283
 msgid "Force 4:3"
 msgstr "Επιβολή 4:3"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:568
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548
 msgid "Force Console as NTSC-J"
 msgstr "Επιβολή της Κονσόλας ως NTSC-J"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406
 msgid "Force Texture Filtering"
 msgstr "Επιβολή Φιλτραρίσματος Υφών"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90
 msgid ""
 "Force texture filtering even if the emulated game explicitly disabled it.\n"
 "Improves texture quality slightly but causes glitches in some games.\n"
@@ -2529,7 +2620,7 @@ msgstr ""
 "\n"
 "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83
 msgid ""
 "Force the game to output graphics for widescreen resolutions.\n"
 "Causes graphical glitches is some games.\n"
@@ -2541,7 +2632,7 @@ msgstr ""
 "\n"
 "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488
 msgid ""
 "Forces NTSC-J mode for using the Japanese ROM font.\n"
 "Left unchecked, dolphin defaults to NTSC-U and automatically enables this "
@@ -2552,7 +2643,7 @@ msgstr ""
 "Άμα αφεθεί αποεπιλεγμένο, το dolphin προεπιλέγει τη NTSC-U και ενεργοποιεί "
 "αυτόματα αυτήν την ρύθμιση όταν παίζονται Ιαπωνικά παιχνίδια."
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:74
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:62
 msgid ""
 "Format as ascii (NTSC\\PAL)?\n"
 "Choose no for sjis (NTSC-J)"
@@ -2560,148 +2651,147 @@ msgstr ""
 "Διαμόρφωση ως ascii (NTSC\\PAL)?\n"
 "Επιλέξτε όχι για sjis (NTSC-J)"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:278
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:265
 msgid "Forward"
 msgstr "Μπροστά"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504
 #, c-format
 msgid "Found %d results for '"
 msgstr "Βρέθηκαν %d αποτελέσματα για '"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:857
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:925
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:858
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:926
 msgid "Frame"
 msgstr "Καρέ"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:867
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:868
 msgid "Frame "
 msgstr "Καρέ"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:185
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:173
 msgid "Frame Advance"
 msgstr "Προώθηση ανά Καρέ"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:536
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549
 msgid "Frame Dumps use FFV1"
 msgstr "FFV1 Για Τα Εξαγώμενα Καρέ"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:227
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:214
 msgid "Frame Info"
 msgstr "Πληροφορίες Καρέ"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:116
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:103
 msgid "Frame Range"
 msgstr "Εύρος Καρέ"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:138
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:139
 msgid "Frame S&kipping"
 msgstr "Παράλειψη Κ&αρέ"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:572
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552
 msgid "Framelimit:"
 msgstr "Περιορισμός Καρέ:"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:204
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:191
 msgid "Frames To Record"
 msgstr "Καρέ Προς Εγγραφή"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547
 msgid "Free Look"
 msgstr "Ελεύθερη Ματιά"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
 msgid "French"
 msgstr "Γαλλικά"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:38
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:42
 msgid "Frets"
 msgstr "Frets"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:118
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:137
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:105
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:124
 msgid "From"
 msgstr "Από"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:426
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:432
 msgid "FullScr"
 msgstr "Πλήρης Οθόνη"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:256
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263
 msgid "Fullscreen resolution:"
 msgstr "Ανάλυση Πλήρους Οθόνης:"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:534
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524
 msgid "GCI File(*.gci)"
 msgstr "Αρχεία GCI(*.gci)"
 
-#: Source/Core/DolphinWX/Src/GCMicDlg.h:44
+#: Source/Core/DolphinWX/Src/GCMicDlg.h:31
 msgid "GCMic Configuration"
 msgstr "Ρυθμίσεις Μικροφώνου GC"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:432
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
 msgid "GCPad"
 msgstr "GCPad"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:659
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:658
 msgid "GX_CMD_INVL_VC"
 msgstr "GX_CMD_INVL_VC"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:448
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:452
 msgid "Game ID:"
 msgstr "ID Παιχνιδιού:"
 
-#: Source/Core/Core/Src/NetPlay.cpp:229
+#: Source/Core/Core/Src/NetPlay.cpp:216
 msgid "Game is already running!"
 msgstr "Το παιχνίδι εκτελείται ήδη!"
 
-#: Source/Core/Core/Src/NetPlay.cpp:259
+#: Source/Core/Core/Src/NetPlay.cpp:246
 msgid "Game isn't running!"
 msgstr "Το παιχνίδι δεν εκτελείται!"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:389
-#, fuzzy
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:393
 msgid "Game not found!"
-msgstr "Το παιχνίδι δε βρέθηκε!!"
+msgstr "Το παιχνίδι δεν βρέθηκε!"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:385
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:389
 msgid "Game-Specific Settings"
 msgstr "Ρυθμίσεις Συγκεκριμένου Παιχνιδιού"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:293
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:294
 msgid "GameConfig"
 msgstr "Ρυθμίσεις Παιχνιδιού"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:525
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:515
 msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)"
 msgstr "GameCube αρχεία αποθήκευσης(*.gci;*.gcs;*.sav)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534
 msgid "Gamecube"
 msgstr "Gamecube"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:178
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:181
 msgid "Gamecube &Pad Settings"
 msgstr "Ρυθμίσεις Gamecube &Pad"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:218
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1069
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:205
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1052
 msgid "Gamecube Memory Cards (*.raw,*.gcp)"
 msgstr "Κάρτες Μνήμης Gamecube (*.raw,*.gcp)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:432
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
 msgid "Gamecube Pad settings"
 msgstr "Ρυθμίσεις Χειριστηρίου Gamecube"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:117
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302
 msgid "Gecko Codes"
 msgstr "Κωδικοί Gecko"
 
-#: Source/Core/Core/Src/GeckoCode.cpp:222
+#: Source/Core/Core/Src/GeckoCode.cpp:214
 #, c-format
 msgid ""
 "GeckoCode failed to run (CT%i CST%i) (%s)\n"
@@ -2714,10 +2804,10 @@ msgstr ""
 "Δοκιμάστε να χρησιμοποιήσετε τον εγγενή διαχειριστή κώδικα τοποθετώντας το "
 "codehandler.bin αρχείο στον φάκελο Sys και επανεκκινώντας το Dolphin.)"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:172
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:197
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:160
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:160
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:202
 msgid "General"
 msgstr "Γενικά"
 
@@ -2725,32 +2815,32 @@ msgstr "Γενικά"
 msgid "General Settings"
 msgstr "Γενικές Ρυθμίσεις"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:470
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:281
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:316
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:261
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
 msgid "German"
 msgstr "Γερμανικά"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:449
+#: Source/Core/Core/Src/ActionReplay.cpp:439
 #, c-format
 msgid "GetARCode: Index is greater than ar code list size %lu"
 msgstr ""
 "GetARCode: Ο δείκτης είναι μεγαλύτερος από το μέγεθος %lu της λίστας των "
 "κωδικών ar"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:430
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:436
 msgid "Graphics"
 msgstr "Γραφικά"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:430
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:436
 msgid "Graphics settings"
 msgstr "Ρυθμίσεις Γραφικών"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:205
 msgid "Greater Than"
 msgstr "Μεγαλύτερο από"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87
 msgid ""
 "Greatly increases quality of textures generated using render to texture "
 "effects.\n"
@@ -2768,51 +2858,77 @@ msgstr ""
 "\n"
 "Αν δεν είστε σίγουροι, αφήστε το επιλεγμένο."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:317
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
 msgid "Greek"
 msgstr "Ελληνικά"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:22
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Green"
 msgstr "Πράσινο"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:24
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Green Left"
 msgstr "Αριστερό Πράσινο"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:25
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Green Right"
 msgstr "Δεξί Πράσινο"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:35
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:39
 msgid "Guitar"
 msgstr "Κιθάρα"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1259
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1250
 msgid "HCI_CMD_INQUIRY is called, please report!"
 msgstr "Γίνεται κλήση του HCI_CMD_INQUIRY, παρακαλώ αναφέρετε!"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:421
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504
+msgid "Hacked Buffer Upload"
+msgstr "Χακαρισμένο Ανέβασμα Buffer"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431
 msgid "Hacks"
 msgstr "Hacks"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:158
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:146
 msgid "Header checksum failed"
 msgstr "Αποτυχία ελέγχου κεφαλίδας"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:318
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298
 msgid "Hebrew"
 msgstr "Εβραϊκά"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:313
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:300
 msgid "Height"
 msgstr "Ύψος"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:64
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:51
 msgid "Help"
 msgstr "Βοήθεια"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:209
+#: Source/Core/DolphinWX/Src/Main.cpp:229
+msgid ""
+"Hi,\n"
+"\n"
+"Dolphin requires Mac OS X 10.7 or greater.\n"
+"Unfortunately you're running an old version of OS X.\n"
+"The last Dolphin version to support OS X 10.6 is Dolphin 3.5\n"
+"Please upgrade to 10.7 or greater to use the newest Dolphin version.\n"
+"\n"
+"Sayonara!\n"
+msgstr ""
+"Χαίρετε,\n"
+"\n"
+"το Dolphin απαιτεί OS X 10.7 ή νεώτερο.\n"
+"Δυστυχώς χρησιμοποιείτε μια παλιά έκδοση του OS X.\n"
+"Η τελευταία έκδοση του Dolphin που υποστηρίζει το OS X 10.6 είναι το Dolphin "
+"3.5.\n"
+"Παρακαλώ κάντε αναβάθμιση σε 10.7 ή νεώτερο για να μπορείτε να "
+"χρησιμοποιήσετε την νεώτερη έκδοση του Dolphin.\n"
+"\n"
+"Αντίο!\n"
+
+#: Source/Core/DolphinWX/Src/Main.cpp:220
 msgid ""
 "Hi,\n"
 "\n"
@@ -2828,15 +2944,15 @@ msgstr ""
 "\n"
 "Αντίο!\n"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:309
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:296
 msgid "Hide"
 msgstr "Απόκρυψη"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:307
 msgid "Hide Mouse Cursor"
 msgstr "Απόκρυψη Δείκτη Ποντικιού"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79
 msgid ""
 "Hides the mouse cursor if it's on top of the emulation window.\n"
 "\n"
@@ -2847,26 +2963,26 @@ msgstr ""
 "\n"
 "Αν δεν είστε σίγουροι, αφήστε το επιλεγμένο."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:54
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41
 msgid "Home"
 msgstr "Home"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:85
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:138
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:76
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:141
 msgid "Host"
 msgstr "Host"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.h:44
+#: Source/Core/DolphinWX/Src/HotkeyDlg.h:31
 msgid "Hotkey Configuration"
 msgstr "Ρυθμίσεις Πλήκτρων Συντόμευσης"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:272
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:272
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:594
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:260
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:260
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574
 msgid "Hotkeys"
 msgstr "Πλήκτρα Συντόμευσης"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:319
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299
 msgid "Hungarian"
 msgstr "Ουγγρικά"
 
@@ -2874,35 +2990,35 @@ msgstr "Ουγγρικά"
 msgid "Hybrid Wiimote"
 msgstr "Υβριδικό Wiimote"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:532
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:519
 #, 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:786
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:773
 #, c-format
 msgid ""
-"IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available "
-"in your nand dump\n"
+"IOCTL_ES_LAUNCH: Game tried to reload an IOS or a title that is not "
+"available in your NAND dump\n"
 "TitleID %016llx.\n"
-" Dolphin will likely hang now"
+" Dolphin will likely hang now."
 msgstr ""
-"IOCTL_ES_LAUNCH: Το παιχνίδι προσπάθησε να επαναφορτώσει ios ή έναν τίτλο "
-"που δεν είναι διαθέσιμος στο nand dump\n"
+"IOCTL_ES_LAUNCH: Το παιχνίδι προσπάθησε να επαναφορτώσει ένα IOS ή έναν "
+"τίτλο που δεν είναι διαθέσιμος στο NAND dump σας.\n"
 "TitleID %016llx.\n"
 "Το Dolphin πιθανότατα θα κολλήσει τώρα."
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:313
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:300
 msgid "IOCTL_ES_READCONTENT - bad destination"
 msgstr "IOCTL_ES_READCONTENT - μη έγκυρος προορισμός"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729
 msgid "IPL Settings"
 msgstr "Ρυθμίσεις IPL"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269
 msgid "IR"
 msgstr "IR"
 
@@ -2914,23 +3030,23 @@ msgstr "Δείκτης IR"
 msgid "IR Sensitivity:"
 msgstr "Ευαισθησία IR:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:502
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:512
 msgid "ISO Details"
 msgstr "Λεπτομέρειες ISO"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:830
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:811
 msgid "ISO Directories"
 msgstr "Φάκελοι ISO"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:172
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:166
 msgid "ITALY"
 msgstr "ΙΤΑΛΙΑ"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:630
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:624
 msgid "Icon"
 msgstr "Εικονίδιο"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332
 msgid ""
 "If checked, the bounding box registers will be updated. Used by the Paper "
 "Mario games."
@@ -2938,29 +3054,11 @@ msgstr ""
 "Εάν επιλεχθεί, οι καταχωρητές bounding box θα ανανεώνονται. Χρησιμοποιούνται "
 "από τα Paper Mario παιχνίδια."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318
-msgid ""
-"If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)"
-msgstr ""
-"Αν τα FPS διακυμαίνονται, αυτή η επιλογή μπορείο να βοηθήσει. (Ενεργό = "
-"Συμβατό, Ανενεργό = Γρήγορο)"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505
-msgid ""
-"If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use "
-"Audio to throttle using the DSP (might fix audio clicks but can also cause "
-"constant noise depending on the game)."
-msgstr ""
-"Αν θέσετε τιμή υψηλότερη από την πλήρη ταχύτητα του παιχνιδιού (NTSC:60, "
-"PAL:50), χρησιμοποιήστε τον ήχο για να κάνετε Throttle μέσω DSP (μπορεί να "
-"διορθώσει ορισμένα κλικαρίσματα στον ήχο άλλα και να προκαλέσει συνεχές "
-"θόρυβο αναλόγα με το παιχνίδι)."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:428
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438
 msgid "Ignore Format Changes"
 msgstr "Αγνόηση Αλλαγών Format"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94
 msgid ""
 "Ignore any changes to the EFB format.\n"
 "Improves performance in many games without any negative effect. Causes "
@@ -2974,7 +3072,7 @@ msgstr ""
 "\n"
 "Αν δεν είστε σίγουροι, αφήστε το επιλεγμένο."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93
 msgid ""
 "Ignore any requests of the CPU to read from or write to the EFB.\n"
 "Improves performance in some games, but might disable some gameplay-related "
@@ -2993,11 +3091,11 @@ msgstr ""
 msgid "Import Save"
 msgstr "Εισαγωγή Αποθήκευσης"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:59
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:48
 msgid "Import failed, try again?"
 msgstr "Αποτυχία εισαγωγής, δοκιμή ξανά;"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:454
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:441
 msgid ""
 "Imported file has gsc extension\n"
 "but does not have a correct header"
@@ -3005,11 +3103,11 @@ msgstr ""
 "Το αρχείο εισαγωγής έχει επέκταση gsc\n"
 "αλλά δεν έχει σωστή κεφαλίδα"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:442
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:429
 msgid "Imported file has invalid length"
 msgstr "Το αρχείο εισαγωγής έχει μη έγκυρο μήκος"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:451
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:438
 msgid ""
 "Imported file has sav extension\n"
 "but does not have a correct header"
@@ -3017,19 +3115,7 @@ msgstr ""
 "Το εισαγώμενο αρχείο έχει sav επέκταση\n"
 "άλλα δεν έχει σωστή κεφαλίδα."
 
-#: 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 ""
-"Βελτιώνει τις επιδόσεις αλλά προκαλεί προβλήματα σε παιχνίδια που βασίζονται "
-"στη σωστή εξομοίωση της ομίχλης.\n"
-"\n"
-"Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο."
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350
 msgid "In Game"
 msgstr "Εντός Παιχνιδιού"
 
@@ -3037,67 +3123,67 @@ msgstr "Εντός Παιχνιδιού"
 msgid "In-Game"
 msgstr "Εντός Παιχνιδιού"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:34
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305
 msgid "Info"
 msgstr "Πληροφορίες"
 
-#: Source/Core/Common/Src/MsgHandler.cpp:65
+#: Source/Core/Common/Src/MsgHandler.cpp:51
 msgid "Information"
 msgstr "Πληροφορίες"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:481
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:468
 msgid "Input"
 msgstr "Είσοδος"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:63
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:50
 msgid "Insert"
 msgstr "Εισάγετε"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:176
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:166
 msgid "Insert Encrypted or Decrypted code here..."
 msgstr "Εισάγετε Κωδικοποιημένο ή μη Κωδικό εδώ..."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:763
 msgid "Insert SD Card"
 msgstr "Εισαγωγή Κάρτας SD"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:34
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:21
 msgid "Insert name here.."
 msgstr "Εισάγετε όνομα εδώ..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:196
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:199
 msgid "Install WAD"
 msgstr "Εγκατάσταση WAD"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:895
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:888
 msgid "Install to Wii Menu"
 msgstr "Εγκατάσταση στο Μενού Wii"
 
-#: Source/Core/Core/Src/x64MemTools.cpp:252
+#: Source/Core/Core/Src/x64MemTools.cpp:242
 msgid ""
 "InstallExceptionHandler called, but this platform does not yet support it."
 msgstr ""
 "InstallExceptionHandler καλέστηκε, αλλά αυτή η πλατφόρμα δεν το υποστηρίζει "
 "ακόμα."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1297
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
 msgid "Installing WAD..."
 msgstr "Γίνεται εγκατάσταση WAD..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:885
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:901
 msgid "Integrity Check Error"
 msgstr "Σφάλμα Ελέγχου Ακεραιότητας"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:891
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:907
 msgid "Integrity check completed"
 msgstr "Ο έλεγχος ακεραιότητας ολοκληρώθηκε."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:890
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:906
 msgid "Integrity check completed. No errors have been found."
 msgstr "Ο έλεγχος ακεραιότητας ολοκληρώθηκε. Δε βρέθηκαν σφάλματα."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:882
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:898
 #, c-format
 msgid ""
 "Integrity check for partition %d failed. Your dump is most likely corrupted "
@@ -3106,19 +3192,19 @@ msgstr ""
 "Ο έλεγχος ακεραιότητας για την κατάτμηση %d απέτυχε. Το αρχείο έχει "
 "πιθανότατα αλλοιωθεί ή έχει γίνει patched με λάθος τρόπο."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532
 msgid "Interface"
 msgstr "Διεπαφή"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:646
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627
 msgid "Interface Settings"
 msgstr "Ρυθμίσεις Διεπαφής"
 
-#: Source/Core/Core/Src/State.cpp:240
+#: Source/Core/Core/Src/State.cpp:228
 msgid "Internal LZO Error - compression failed"
 msgstr "Εσωτερικό Σφάλμα LZO - αποτυχία συμπίεσης"
 
-#: Source/Core/Core/Src/State.cpp:348
+#: Source/Core/Core/Src/State.cpp:336
 #, c-format
 msgid ""
 "Internal LZO Error - decompression failed (%d) (%li, %li) \n"
@@ -3127,41 +3213,45 @@ msgstr ""
 "Εσωτερικό Σφάλμα LZO - αποτυχία αποσυμπίεσης (%d) (%ld, %ld) \n"
 "Δοκιμάστε να φορτώσετε ξανά το σημείο αποθήκευσης"
 
-#: Source/Core/Core/Src/State.cpp:485
+#: Source/Core/Core/Src/State.cpp:473
 msgid "Internal LZO Error - lzo_init() failed"
 msgstr "Εσωτερικό Σφάλμα LZO - αποτυχία lzo_init()"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:344
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:352
 msgid "Internal Resolution:"
 msgstr "Εσωτερική Ανάλυση:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:42
+msgid "Interpreter (VERY slow)"
+msgstr "Interpreter (ΠΟΛΥ αργός)"
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349
 msgid "Intro"
 msgstr "Εισαγωγή"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:194
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:187
 #, c-format
 msgid "Invalid Size(%x) or Magic word (%x)"
 msgstr "Μη έγκυρο μέγεθος (%x) ή μαγική λέξη (%x)"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:612
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:600
 msgid "Invalid Value!"
 msgstr "Μη έγκυρη τιμή!"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:462
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:449
 msgid "Invalid bat.map or dir entry"
 msgstr "Μη έγκυρο bat.map ή εγγραφή φακέλου"
 
-#: Source/Core/Core/Src/CoreTiming.cpp:548
+#: Source/Core/Core/Src/CoreTiming.cpp:553
 #, c-format
 msgid "Invalid event type %i"
 msgstr "Μη έγκυρος τύπος συμβάντος %i"
 
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:326
+#: Source/Core/Core/Src/HW/DVDInterface.cpp:309
 msgid "Invalid file"
 msgstr "Μη έγκυρο αρχείο"
 
-#: Source/Core/DiscIO/Src/BannerLoaderGC.cpp:41
+#: Source/Core/DiscIO/Src/BannerLoaderGC.cpp:28
 #, c-format
 msgid ""
 "Invalid opening.bnr found in gcm:\n"
@@ -3172,46 +3262,54 @@ msgstr ""
 "%s\n"
 " Ίσως χρειαστεί να ξαναεξάγετε την εικόνα αυτού του παιχνιδιού από τον δίσκο."
 
-#: Source/Core/Core/Src/Movie.cpp:735
+#: Source/Core/Core/Src/Movie.cpp:726
 msgid "Invalid recording file"
 msgstr "Μη έγκυρο αρχείο εγγραφής"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:473
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:472
 msgid "Invalid search parameters (no object selected)"
 msgstr "Μη έγκυρες παράμετροι αναζήτησης (δεν επιλέχθηκε αντικείμενο)"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:456
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:455
 msgid "Invalid search string (couldn't convert to number)"
 msgstr "Μη έγκυρο string αναζήτησης (δεν μπορεί να γίνει μετατροπή σε νούμερο)"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:444
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:443
 msgid "Invalid search string (only even string lengths supported)"
 msgstr "Μη έγκυρο string αναζήτησης (μόνο ζυγά μήκη string υποστηρίζονται)"
 
-#: Source/Core/Core/Src/Core.cpp:513
+#: Source/Core/Core/Src/Core.cpp:511
 msgid "Invalid state"
 msgstr "Μη έγκυρο κατάσταση"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:473
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:320
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300
 msgid "Italian"
 msgstr "Ιταλικά"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:183
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:177
 msgid "JAPAN"
 msgstr "ΙΑΠΩΝΙΑ"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:321
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:46
+msgid "JIT Recompiler (recommended)"
+msgstr "JIT Recompiler (προτείνεται)"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:47
+msgid "JITIL experimental recompiler"
+msgstr "JITIL πειραματικός recompiler"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:279
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
 msgid "Japanese"
 msgstr "Ιαπωνικά"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:188
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:182
 msgid "KOREA"
 msgstr "ΚΟΡΕΑ"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78
 msgid ""
 "Keep the game window on top of all other windows.\n"
 "\n"
@@ -3221,62 +3319,62 @@ msgstr ""
 "\n"
 "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:298
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:306
 msgid "Keep window on top"
-msgstr "Διατήρηση παραθύρου στην κορυφή."
+msgstr "Διατήρηση Παραθύρου στην Κορυφή"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:241
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:241
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:229
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:229
 msgid "Key"
 msgstr "Πλήκτρο"
 
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282
 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:322
 msgid "Korean"
 msgstr "Κορεάτικα"
 
 #. i18n:  Left
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:57
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:44
 msgid "L"
 msgstr "L"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:39
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:26
 msgid "L Button"
 msgstr "L Button"
 
 #. i18n:  Left-Analog
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:61
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:48
 msgid "L-Analog"
 msgstr "L-Αναλογική"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:585
 msgid "Language:"
 msgstr "Γλώσσα:"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:152
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:153
 msgid "Last Overwritten State"
 msgstr "Τελευταίο Επαναγραμμένο Σημείο Αποθ."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:159
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:161
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:160
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:162
 msgid "Last Saved State"
 msgstr "Τελευταίο Αποθηκευμένο Σημείο Αποθ."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:696
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:677
 msgid "Latency:"
-msgstr ""
+msgstr "Χρονοκαθυστέρηση: "
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:276
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:55
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:263
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:42
 msgid "Left"
 msgstr "Αριστερά"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:60
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:64
 msgid "Left Stick"
 msgstr "Αριστερό Stick"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:257
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:257
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:245
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:245
 msgid ""
 "Left click to detect hotkeys.\n"
 "Enter space to clear."
@@ -3284,7 +3382,7 @@ msgstr ""
 "Αριστερό κλίκ για εντοπισμό των πλήκτρων συντόμευσης.\n"
 "Πατήστε το πλήκτρο διαστήματος για καθαρισμό."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:689
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:678
 msgid ""
 "Left-click to detect input.\n"
 "Middle-click to clear.\n"
@@ -3294,7 +3392,7 @@ msgstr ""
 "Μεσαίο κλικ για καθάρισμα.\n"
 "Δεξί κλικ για περισσότερες επιλογές."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:694
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:683
 msgid ""
 "Left/Right-click for more options.\n"
 "Middle-click to clear."
@@ -3302,76 +3400,76 @@ msgstr ""
 "Αριστερό/Δεξί κλικ για περισσότερες επιλογές.\n"
 "Μεσαίο κλικ για καθάρισμα."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:219
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:206
 msgid "Less Than"
 msgstr "Μικρότερο από"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:565
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545
 msgid "Limit by FPS"
 msgstr "Περιορισμός με βάση τα Καρέ"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:924
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:915
 msgid "Load"
 msgstr "Φόρτωσ."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544
 msgid "Load Custom Textures"
 msgstr "Φόρτωση Τροποποιημένων Υφών"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
 msgid "Load State Slot 1"
 msgstr "Φόρτωση Σημείου Αποθήκευσης 1"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189
 msgid "Load State Slot 2"
 msgstr "Φόρτωση Σημείου Αποθήκευσης 2"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:190
 msgid "Load State Slot 3"
 msgstr "Φόρτωση Σημείου Αποθήκευσης 3"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:203
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:191
 msgid "Load State Slot 4"
 msgstr "Φόρτωση Σημείου Αποθήκευσης 4"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192
 msgid "Load State Slot 5"
 msgstr "Φόρτωση Σημείου Αποθήκευσης 5"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193
 msgid "Load State Slot 6"
 msgstr "Φόρτωση Σημείου Αποθήκευσης 6"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:194
 msgid "Load State Slot 7"
 msgstr "Φόρτωση Σημείου Αποθήκευσης 7"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:195
 msgid "Load State Slot 8"
 msgstr "Φόρτωση Σημείου Αποθήκευσης 8"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:155
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:156
 msgid "Load State..."
 msgstr "Φόρτωση Σημείου Αποθήκευσης..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1332
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1359
 msgid "Load Wii System Menu"
 msgstr "Φόρτωση Μενού Συστήματος Wii"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1327
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1354
 #, c-format
 msgid "Load Wii System Menu %d%c"
 msgstr "Φόρτωση Μενού Συστήματος Wii %d%c"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112
 msgid ""
 "Load custom textures from User/Load/Textures/<game_id>/\n"
 "\n"
@@ -3381,7 +3479,7 @@ msgstr ""
 "\n"
 "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο."
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:50
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:37
 msgid "Load preset values from hack patterns available."
 msgstr "Φόρτωση προεπιλεγμένων τιμών από διαθέσιμα πρότυπα hack."
 
@@ -3389,23 +3487,23 @@ msgstr "Φόρτωση προεπιλεγμένων τιμών από διαθέ
 msgid "Local"
 msgstr "Τοπικό"
 
-#: Source/Core/DolphinWX/Src/LogWindow.h:51
+#: Source/Core/DolphinWX/Src/LogWindow.h:38
 msgid "Log"
 msgstr "Καταγραφή"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:26
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:13
 msgid "Log Configuration"
 msgstr "Ρυθμίσεις Καταγραφής"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:296
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304
 msgid "Log FPS to file"
 msgstr "Καταγραφή FPS σε αρχείο"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:96
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83
 msgid "Log Types"
 msgstr "Τύποι Καταγραφής"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103
 msgid ""
 "Log the number of frames rendered per second to User/Logs/fps.txt. Use this "
 "feature when you want to measure the performance of Dolphin.\n"
@@ -3418,24 +3516,24 @@ msgstr ""
 "\n"
 "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο."
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:81
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:68
 msgid "Logger Outputs"
 msgstr "Έξοδοι Καταγραφής"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132
-#: Source/Core/DolphinWX/Src/Frame.cpp:328
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:119
+#: Source/Core/DolphinWX/Src/Frame.cpp:314
 msgid "Logging"
 msgstr "Καταγραφή"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:255
+#: Source/Core/Core/Src/NetPlayClient.cpp:259
 msgid "Lost connection to server!"
 msgstr "Χάθηκε η σύνδεση με τον διακομιστή!"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:42
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:29
 msgid "M Button"
 msgstr "M Button"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:119
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:112
 #, c-format
 msgid ""
 "MD5 mismatch\n"
@@ -3444,51 +3542,66 @@ msgstr ""
 "Ασυμφωνία MD5\n"
 " %016llx%016llx != %016llx%016llx"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314
 msgid "MMU Speed Hack"
 msgstr "MMU Speed Hack"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:527
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:563
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:517
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:556
 msgid "MadCatz Gameshark files(*.gcs)"
 msgstr "Αρχεία MadCatz Gameshark (*.gcs)"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:51
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:63
+#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:38
 msgid "Main Stick"
 msgstr "Κύριο Stick"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460
 msgid "Maker ID:"
 msgstr "ID Δημιουργού:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487
 msgid "Maker:"
 msgstr "Δημιουργός:"
 
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100
+msgid ""
+"Makes distant objects more visible by removing fog, thus increasing the "
+"overall detail.\n"
+"Disabling fog will break some games which rely on proper fog emulation.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+"Κάνει τα μακρινά αντικείμενα να είναι περισσότερο ορατά αφαιρώντας την "
+"ομίχλη, ανεβάζοντας την συνολική λεπτομέρεια.\n"
+"Η απενεργοποίηση της ομίχλης μπορεί να χαλάσει ορισμένα παιχνίδια που "
+"βασίζονται σε σωστή εξομοίωση της ομίχλης.\n"
+"\n"
+"Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο."
+
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:97
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:100
 msgid "Max"
 msgstr "Μέγιστη"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:448
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:435
 msgid "Memcard already has a save for this title"
 msgstr "Η κάρτα μνήμης έχει ήδη αποθηκευμένα δεδομένα για τον τίτλο"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:291
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:278
 msgid "Memcard already opened"
 msgstr "Η κάρτα μνήμης είναι ήδη ανοιχτή"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:912
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:913
 msgid "Memory Byte"
 msgstr "Memory Byte"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:225
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:113
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:212
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:93
 msgid "Memory Card"
 msgstr "Κάρτα Μνήμης"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.h:36
+#: Source/Core/DolphinWX/Src/MemcardManager.h:23
 msgid ""
 "Memory Card Manager WARNING-Make backups before using, should be fixed but "
 "could mangle stuff!"
@@ -3496,7 +3609,7 @@ msgstr ""
 "Διαχειριστής Καρτών Μνήμης ΠΡΟΕΙΔΟΠΟΙΗΣΗ-Κάντε αντίγραφα ασφαλείας πριν την "
 "χρήση, αν και διορθωμένος μπορεί να χαλάσει πράγματα!"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:371
+#: Source/Core/Core/Src/CoreParameter.cpp:360
 #, c-format
 msgid ""
 "Memory Card filename in Slot %c is incorrect\n"
@@ -3513,17 +3626,17 @@ msgstr ""
 "%s\n"
 "Θέλετε να αντιγράψετε το παλιό αρχείο σε αυτή την νέα τοποθεσία;\n"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:124
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:112
 msgid "Memorycard filesize does not match the header size"
 msgstr ""
 "Το μέγεθος του αρχείου της κάρτας μνήμης δεν ταιριάζει με το μέγεθος της "
 "κεφαλίδας."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:50
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:37
 msgid "Menu"
 msgstr "Μενού"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:114
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:94
 msgid "Mic"
 msgstr "Μικρόφωνο"
 
@@ -3532,20 +3645,20 @@ msgstr "Μικρόφωνο"
 msgid "Min"
 msgstr "Ελάχιστη"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:580
 msgid "Misc"
 msgstr "Διάφορα"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:795
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776
 msgid "Misc Settings"
 msgstr "Διάφορες Ρυθμίσεις"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:240
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:294
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:227
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:281
 msgid "Modifier"
 msgstr "Modifier"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106
 msgid ""
 "Modify textures to show the format they're encoded in. Needs an emulation "
 "reset in most cases.\n"
@@ -3558,20 +3671,20 @@ msgstr ""
 "\n"
 "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο."
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:115
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:108
 msgid "Monospaced font"
 msgstr "Ισοπλατής γραμματοσειρά"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:305
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:292
 msgid "Motion Plus"
 msgstr "Motion Plus"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:309
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:86
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:296
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73
 msgid "Motor"
 msgstr "Μοτέρ"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:654
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:666
 msgid ""
 "Move the mouse pointer over an option to display a detailed description.\n"
 "\n"
@@ -3588,226 +3701,239 @@ msgstr ""
 "\n"
 "\n"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:75
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:62
 msgid "Multiply"
 msgstr "Multiply"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:651
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:650
 msgid "NOP"
 msgstr "NOP"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:629
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:628
 msgid "NOTE: Stream size doesn't match actual data length\n"
 msgstr ""
 "ΣΗΜΕΙΩΣΗ: Το μέγεθος της ροής δεν ταιριάζει με το πραγματικό μήκος των "
 "δεδομένων.\n"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:129
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:116
 msgid "NP Add"
 msgstr "NP Add"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:124
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:111
 msgid "NP Begin"
 msgstr "NP Begin"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:132
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:119
 msgid "NP Decimal"
 msgstr "NP Decimal"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:126
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:113
 msgid "NP Delete"
 msgstr "NP Delete"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:133
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:120
 msgid "NP Divide"
 msgstr "NP Divide"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:120
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:107
 msgid "NP Down"
 msgstr "NP Down"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:123
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:110
 msgid "NP End"
 msgstr "NP End"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:111
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:98
 msgid "NP Enter"
 msgstr "NP Enter"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:127
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:114
 msgid "NP Equal"
 msgstr "NP Equal"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:116
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:103
 msgid "NP Home"
 msgstr "NP Home"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:125
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:112
 msgid "NP Insert"
 msgstr "NP Insert"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:117
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:104
 msgid "NP Left"
 msgstr "NP Left"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:128
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:115
 msgid "NP Multiply"
 msgstr "NP Multiply"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:122
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:109
 msgid "NP Page Down"
 msgstr "NP Page Down"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:121
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:108
 msgid "NP Page Up"
 msgstr "NP Page Up"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:119
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:106
 msgid "NP Right"
 msgstr "NP Right"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:130
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:117
 msgid "NP Separator"
 msgstr "NP Separator"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:109
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:96
 msgid "NP Space"
 msgstr "NP Space"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:131
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:118
 msgid "NP Subtract"
 msgstr "NP Subtract"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:110
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:97
 msgid "NP Tab"
 msgstr "NP Tab"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:118
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:105
 msgid "NP Up"
 msgstr "NP Up"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:444
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:59
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:50
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:448
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:46
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:37
 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:25
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:72
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:282
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:553
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:15
 msgid "Name: "
 msgstr "Όνομα: "
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:526
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:562
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:516
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:555
 msgid "Native GCI files(*.gci)"
 msgstr "Αρχεία Native GCI (*.gci)"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:161
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:148
 msgid "New Scan"
 msgstr "Νέα Ανίχνευση"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:206
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:193
 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:801
 msgid "Next Page"
 msgstr "Επόμενη Σελίδα"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:165
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:152
 msgid "Next Scan"
 msgstr "Επόμενη Ανίχνευση"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:68
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:59
 msgid "Nickname :"
 msgstr "Ψευδώνυμο :"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:196
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:190
 msgid "No Country (SDK)"
 msgstr "Καμία Χώρα (SDK)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:370
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:357
 msgid "No ISOs or WADS found"
 msgstr "Δε βρέθηκαν ISO ή WAD"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:508
+#: Source/Core/Core/Src/ConfigManager.h:17
+msgid "No audio output"
+msgstr "Καμία έξοδος ήχου"
+
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:501
 #, c-format
 msgid "No banner file found for title  %s"
 msgstr "Δε βρέθηκε αρχείο εικονιδίου για τον τίτλο %s"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:761
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:768
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:760
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:767
 msgid "No description available"
 msgstr "Μη διαθέσιμη περιγραφή"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:514
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:535
 msgid "No docking"
 msgstr "Απενεργοποίηση του docking"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:859
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:860
 msgid "No file loaded"
 msgstr "Δεν φορτώθηκε αρχείο"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:439
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:426
 msgid "No free dir index entries"
 msgstr "Δεν υπάρχουν ελεύθερες εγγραφές φακέλων"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:895
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:896
 msgid "No recorded file"
 msgstr "Κανένα εγγεγραμένο αρχείο"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:501
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:494
 #, c-format
 msgid "No save folder found for title %s"
 msgstr "Δε βρέθηκε φάκελος αποθήκευσης για τον τίτλο %s"
 
+#: Source/Plugins/Plugin_VideoOGL/Src/main.cpp:132
+#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:111
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:23
 #: Source/Core/DolphinWX/Src/NetWindow.cpp:600
 msgid "None"
 msgstr "Καμία"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:323
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303
 msgid "Norwegian Bokmaal"
 msgstr "Νορβηγικά Bokmaal"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:203
 msgid "Not Equal"
 msgstr "Όχι ίσο"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:804
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:794
 msgid "Not Set"
 msgstr "Μη Ορισμένο"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:626
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:101
+#, c-format
+msgid "Not a Wii save or read failure for file header size %x"
+msgstr ""
+"Δεν είναι σημείο αποθήκευσης wii ή αποτυχία ανάγνωσης κεφαλίδας αρχείου "
+"μεγέθους %x"
+
+#: Source/Core/DolphinWX/Src/Main.cpp:654
 msgid "Not connected"
 msgstr "Μη Συνδεδεμένο"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:309
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:296
 msgid "Notes"
 msgstr "Σημειώσεις"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:16
 msgid "Notes: "
 msgstr "Σημειώσεις: "
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:71
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:74
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:580
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:621
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:629
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:59
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:64
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:613
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:659
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:667
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:31
 msgid "Notice"
 msgstr "Σημείωση"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:105
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:92
 msgid "Num Lock"
 msgstr "Num Lock"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:88
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:75
 msgid "Number Of Codes: "
 msgstr "Αριθμός Κωδικών: "
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:30
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:34
 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26
 msgid "Nunchuk"
 msgstr "Nunchuk"
@@ -3816,97 +3942,98 @@ msgstr "Nunchuk"
 msgid "Nunchuk Acceleration"
 msgstr "Επιτάχυνση Nunchuk"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:877
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:878
 msgid "Object"
 msgstr "Αντικείμενο"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:135
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:122
 msgid "Object Range"
 msgstr "Εύρος Αντικειμένου"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:243
 msgid "Off"
 msgstr "Ανενεργός"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:62
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:49
 msgid "Offset:"
 msgstr "Offset:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:582
 msgid "On-Screen Display Messages"
 msgstr "Απεικόνιση Μηνυμάτων Στην Οθόνη"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:436
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:423
 #, c-format
 msgid "Only %d blocks available"
 msgstr "Διαθέσιμα μόνο %d μπλοκ"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:420
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:178
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:426
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:166
 msgid "Open"
 msgstr "Άνοιγμα"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:876
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:867
 msgid "Open &containing folder"
 msgstr "Άνοιγμα &τοποθεσίας αρχείου"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:873
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:864
 msgid "Open Wii &save folder"
 msgstr "Άνοιγμα φακέλου αποθήκευσης Wii"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:420
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:426
 msgid "Open file..."
 msgstr "Άνοιγμα αρχείου..."
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:61
+#: Source/Core/AudioCommon/Src/OpenALStream.cpp:48
 #, c-format
 msgid "OpenAL: can't create context for device %s"
 msgstr "OpenAL: δεν μπορεί να δημιουργηθεί περιεχόμενο για την συσκευή %s"
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:72
+#: Source/Core/AudioCommon/Src/OpenALStream.cpp:59
 msgid "OpenAL: can't find sound devices"
 msgstr "OpenAL: αδυναμία εύρεσης συσκευών ήχου"
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:66
+#: Source/Core/AudioCommon/Src/OpenALStream.cpp:53
 #, c-format
 msgid "OpenAL: can't open device %s"
 msgstr "OpenAL: αδυναμία ανοίγματος της συσκευής %s"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502
 msgid "OpenCL Texture Decoder"
 msgstr "OpenCL Αποκωδικοποιητής Υφών"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503
 msgid "OpenMP Texture Decoder"
 msgstr "OpenMP Αποκωδικοποιητής Υφών"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:317
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:94
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:304
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:81
 msgid "Options"
 msgstr "Ρυθμίσεις"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:22
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Orange"
 msgstr "Πορτοκαλί"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:468
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:455
+#, fuzzy
 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"
+"and import the saves to a new memcard\n"
 msgstr ""
 "Η σειρά των αρχείων στον Κατάλογο Αρχείων δεν ταιριάζει με την σειρά των "
 "block.\n"
 "Κάντε δεξί κλίκ, εξάγετε όλα τα αρχεία αποθήκευσης\n"
 "και εισάγετέ τα σε μία νέα κάρτα μνήμης.\n"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:316
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:324
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:509
 msgid "Other"
 msgstr "Άλλα"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:206
+#: Source/Core/Core/Src/NetPlayClient.cpp:210
 msgid ""
 "Other client disconnected while game is running!! NetPlay is disabled. You "
 "manually stop the game."
@@ -3914,15 +4041,15 @@ msgstr ""
 "Ο άλλος client έχει αποσυνδεθεί ενώ το παιχνίδι εκτελείται!! Το NetPlay έχει "
 "απενεργοποιηθεί. Σταματήστε χειροκίνητα το παιχνίδι."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:481
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:468
 msgid "Output"
 msgstr "Έξοδος"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:342
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:348
 msgid "P&lay Recording..."
 msgstr "Αναπα&ραγωγή Εγγραφής"
 
-#: Source/Core/Core/Src/HW/GCPad.cpp:30
+#: Source/Core/Core/Src/HW/GCPad.cpp:18
 msgid "Pad"
 msgstr "Χειριστήριο"
 
@@ -3930,160 +4057,160 @@ msgstr "Χειριστήριο"
 msgid "Pad "
 msgstr "Χειριστήριο"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:34
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:38
 msgid "Pads"
 msgstr "Χειριστήρια"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:108
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:95
 msgid "Page Down"
 msgstr "Page Down"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:107
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:94
 msgid "Page Up"
 msgstr "Page Up"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:35
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:22
 msgid "Paragraph"
 msgstr "Παράγραφος"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:64
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:51
 msgid "Parameters"
 msgstr "Παράμετροι"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:222
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:217
 #, c-format
 msgid "Partition %i"
 msgstr "Κατάτμηση %i"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:296
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:297
 msgid "Patches"
 msgstr "Patches"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:556
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536
 msgid "Paths"
 msgstr "Φάκελοι"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1538
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1539
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:51
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1565
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1566
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:38
 msgid "Pause"
 msgstr "Παύση"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:128
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:129
 msgid "Pause at end of movie"
 msgstr "Παύση στο τέλος της ταινίας"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:397
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405
 msgid "Per-Pixel Lighting"
 msgstr "Φωτισμός ανά Pixel"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352
 msgid "Perfect"
 msgstr "Τέλειο"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:609
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:642
 #, c-format
 msgid "Perspective %d"
 msgstr "Οπτική %d"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:165
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:424
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1547
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1548
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:152
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:430
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1574
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1575
 msgid "Play"
 msgstr "Αναπαραγωγή"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176
 msgid "Play Recording"
 msgstr "Αναπαραγωγή Εγγραφής"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:170
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:170
 msgid "Play/Pause"
 msgstr "Αναπαραγωγή/Παύση"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351
 msgid "Playable"
 msgstr "Παίζεται"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:154
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:141
 msgid "Playback Options"
 msgstr "Ρυθμίσεις Αναπαραγωγής"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:301
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:304
 msgid "Players"
 msgstr "Παίχτες"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:988
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:991
 msgid "Please confirm..."
 msgstr "Παρακαλώ επιβεβαιώστε..."
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:579
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:612
 msgid "Please create a perspective before saving"
 msgstr "Παρακαλώ δημιουργήστε μια οπτική πριν την αποθήκευση"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:36
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:23
 msgid "Plus-Minus"
 msgstr "Plus-Minus"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:324
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304
 msgid "Polish"
 msgstr "Πολωνέζικα"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:713
 msgid "Port 1"
 msgstr "Θύρα 1"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714
 msgid "Port 2"
 msgstr "Θύρα 2"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:734
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715
 msgid "Port 3"
 msgstr "Θύρα 3"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716
 msgid "Port 4"
 msgstr "Θύρα 4"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:97
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:130
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:88
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:133
 msgid "Port :"
 msgstr "Θύρα :"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:325
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305
 msgid "Portuguese"
 msgstr "Πορτογαλικά"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:326
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306
 msgid "Portuguese (Brazilian)"
 msgstr "Πορτογαλικά (Βραζιλιάνικα)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:391
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:399
 msgid "Post-Processing Effect:"
 msgstr "Post-Processing Εφέ:"
 
-#: Source/Core/Core/Src/Movie.cpp:936
+#: Source/Core/Core/Src/Movie.cpp:927
 #, c-format
 msgid "Premature movie end in PlayController. %u + 8 > %u"
 msgstr "Πρόωρος τερματισμός της ταινίας σε PlayController. %u + 8 > %u"
 
-#: Source/Core/Core/Src/Movie.cpp:1055
+#: Source/Core/Core/Src/Movie.cpp:1046
 #, c-format
 msgid "Premature movie end in PlayWiimote. %u + %d > %u"
 msgstr "Πρόωρος τερματισμός της ταινίας σε PlayWiimote. %u + %d > %u"
 
-#: Source/Core/Core/Src/Movie.cpp:1032
+#: Source/Core/Core/Src/Movie.cpp:1023
 #, c-format
 msgid "Premature movie end in PlayWiimote. %u > %u"
 msgstr "Πρόωρος τερματισμός της ταινίας σε PlayWiimote. %u > %u"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:48
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:35
 msgid "Presets: "
 msgstr "Προεπιλογές: "
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:205
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:192
 msgid "Prev Page"
 msgstr "Προηγούμενη Σελίδα"
 
@@ -4091,67 +4218,67 @@ msgstr "Προηγούμενη Σελίδα"
 msgid "Previous Page"
 msgstr "Προηγούμενη Σελίδα"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:183
 msgid "Previous Value"
 msgstr "Προηγούμενη Τιμή"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:60
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:47
 msgid "Print"
 msgstr "Εκτύπωση"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:894
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:885
 msgid "Profile"
 msgstr "Προφίλ"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.h:55
+#: Source/Core/DolphinWX/Src/ISOProperties.h:42
 msgid "Properties"
 msgstr "Ιδιότητες"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:283
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:286
 msgid "Purge Cache"
 msgstr "Καθαρισμός Cache"
 
-#: Source/Core/Common/Src/MsgHandler.cpp:66
+#: Source/Core/Common/Src/MsgHandler.cpp:52
 msgid "Question"
 msgstr "Ερώτηση"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:159
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:316
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:162
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:319
 msgid "Quit"
 msgstr "Έξοδος"
 
 #. i18n:  Right
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:59
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:46
 msgid "R"
 msgstr "R"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:40
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:27
 msgid "R Button"
 msgstr "R Button"
 
 #. i18n:  Right-Analog
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:63
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
 msgid "R-Analog"
 msgstr "R-Αναλογική"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:445
 msgid "RAM"
 msgstr "RAM"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:175
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:169
 msgid "RUSSIA"
 msgstr "ΡΩΣΙΑ"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:528
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:515
 msgid "Range"
 msgstr "Εύρος"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:190
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:178
 msgid "Read-only mode"
 msgstr "Μόνο Για Ανάγνωση (Εγγραφής)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:487
 msgid "Real"
 msgstr "Πραγματικό"
 
@@ -4167,33 +4294,33 @@ msgstr "Πραγματικά Wiimotes"
 msgid "Reconnect Wiimote on State Loading"
 msgstr "Επανασύνδεση Wiimote Κατά Την Φόρτωση Σημείου Αποθήκευσης"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:193
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:217
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:791
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:180
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:204
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:790
 msgid "Record"
 msgstr "Εγγραφή"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:174
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:161
 msgid "Recording Info"
 msgstr "Πληροφορίες Εγγραφής"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:202
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:189
 msgid "Recording Options"
 msgstr "Ρυθμίσεις Εγγραφής"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:21
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Red"
 msgstr "Κόκκινο"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:24
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Red Left"
 msgstr "Αριστερό Κόκκινο"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:25
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Red Right"
 msgstr "Δεξί Κόκκινο"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86
 msgid ""
 "Reduces the amount of aliasing caused by rasterizing 3D graphics.\n"
 "This makes the rendered picture look less blocky.\n"
@@ -4208,28 +4335,28 @@ msgstr ""
 "Αν δεν είστε σίγουροι, επιλέξτε Καμία."
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:60
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:421
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:903
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:427
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:894
 msgid "Refresh"
 msgstr "Ανανέωση"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:180
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:168
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:168
 msgid "Refresh List"
 msgstr "Ανανέωση Λίστας"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:421
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:427
 msgid "Refresh game list"
 msgstr "Ανανέωση λίστας παιχνιδιών"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:405
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:427
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:77
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:812
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:409
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:431
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:64
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:793
 msgid "Remove"
 msgstr "Αφαίρεση"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99
 msgid ""
 "Render the scene as a wireframe.\n"
 "\n"
@@ -4239,198 +4366,206 @@ msgstr ""
 "\n"
 "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:308
 msgid "Render to Main Window"
 msgstr "Αναπαραγωγή στο Κεντρικό Παράθυρο"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:915
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:172
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:906
 msgid "Reset"
 msgstr "Επανεκκίνηση"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:190
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:177
 msgid "Results"
 msgstr "Αποτελέσματα"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:29
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:16
 msgid "Return"
 msgstr "Return"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:277
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:57
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464
+msgid "Revision:"
+msgstr ""
+
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:264
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:44
 msgid "Right"
 msgstr "Δεξιά"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:61
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:65
 msgid "Right Stick"
 msgstr "Δεξί Stick"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:85
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:295
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:72
 msgid "Rumble"
 msgstr "Δόνηση"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:518
-msgid "Run DSP LLE on a dedicated thread (not recommended)."
-msgstr "Εκτέλεση DSP LLE σε ξεχωριστό νήμα (δεν προτείνεται)."
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498
+msgid ""
+"Run DSP HLE and LLE on a dedicated thread (not recommended: might cause "
+"audio glitches with HLE and freezes with LLE)."
+msgstr ""
+"Εκτέλεση DSP HLE και LLE σε ξεχωριστό νήμα (δεν προτείνεται: μπορεί να "
+"προκαλέσει προβλήματα στον ήχο με HLE και κολλήματα με LLE)."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:327
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307
 msgid "Russian"
 msgstr "Ρώσικα"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:149
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:150
 msgid "Sa&ve State"
 msgstr "Απ&οθήκευση Σημείου Αποθήκευσης"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:465
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475
 msgid "Safe"
 msgstr "Ασφαλής"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:196
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:446
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:925
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:183
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:452
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916
 msgid "Save"
 msgstr "Αποθήκ."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:532
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:522
 msgid "Save GCI as..."
 msgstr "Αποθήκευση GCI ως..."
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
 msgid "Save State Slot 1"
 msgstr "Αποθήκευση Σημείου Αποθήκευσης 1"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:198
 msgid "Save State Slot 2"
 msgstr "Αποθήκευση Σημείου Αποθήκευσης 2"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:199
 msgid "Save State Slot 3"
 msgstr "Αποθήκευση Σημείου Αποθήκευσης 3"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:212
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:212
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200
 msgid "Save State Slot 4"
 msgstr "Αποθήκευση Σημείου Αποθήκευσης 4"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201
 msgid "Save State Slot 5"
 msgstr "Αποθήκευση Σημείου Αποθήκευσης 5"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202
 msgid "Save State Slot 6"
 msgstr "Αποθήκευση Σημείου Αποθήκευσης 6"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:203
 msgid "Save State Slot 7"
 msgstr "Αποθήκευση Σημείου Αποθήκευσης 7"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204
 msgid "Save State Slot 8"
 msgstr "Αποθήκευση Σημείου Αποθήκευσης 8"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:151
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:152
 msgid "Save State..."
 msgstr "Αποθήκευση Σημείου..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:582
 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:592
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:602
 msgid "Save as..."
 msgstr "Αποθήκευση ως..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1203
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1204
 msgid "Save compressed GCM/ISO"
 msgstr "Αποθήκευση συμπιεσμένου GCM/ISO"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:446
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:452
 msgid "Save current perspective"
 msgstr "Αποθήκευση τρέχουσας οπτικής"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1192
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193
 msgid "Save decompressed GCM/ISO"
 msgstr "Αποθήκευση αποσυμπιεσμένου GCM/ISO"
 
-#: Source/Core/Core/Src/Movie.cpp:801
+#: Source/Core/Core/Src/Movie.cpp:792
 #, c-format
 msgid "Savestate movie %s is corrupted, movie recording stopping..."
 msgstr ""
 "Η ταινία του σημείου αποθήκευσης %s είναι αλλοιωμένη, γίνεται διακοπή της "
 "εγγραφής της ταινίας..."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:396
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:404
 msgid "Scaled EFB Copy"
 msgstr "Κλιμακούμενα EFB Αντίγραφα"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:556
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:543
 #, c-format
 msgid "Scanning %s"
 msgstr "Ανίχνευση %s"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:539
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:526
 msgid "Scanning for ISOs"
 msgstr "Αναζήτηση για ISOs"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:540
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:527
 msgid "Scanning..."
 msgstr "Ανίχνευση..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:427
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
 msgid "ScrShot"
 msgstr "Στιγμιότυπο"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:106
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:93
 msgid "Scroll Lock"
 msgstr "Scroll Lock"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:264
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:251
 msgid "Search"
 msgstr "Αναζήτηση"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:227
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:214
 msgid "Search Filter"
 msgstr "Φίλτρο Αναζήτησης"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:810
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:791
 msgid "Search Subfolders"
 msgstr "Αναζήτηση σε Υποφακέλους"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:250
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:237
 msgid "Search current Object"
 msgstr "Αναζήτηση τρέχων Αντικειμένου"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:254
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:241
 msgid "Search for hex Value:"
 msgstr "Αναζήτηση δεκαεξαδικής Τιμής:"
 
-#: Source/Core/Common/Src/SysConf.h:103 Source/Core/Common/Src/SysConf.h:126
-#: Source/Core/Common/Src/SysConf.h:146 Source/Core/Common/Src/SysConf.h:167
+#: Source/Core/Common/Src/SysConf.h:90 Source/Core/Common/Src/SysConf.h:113
+#: Source/Core/Common/Src/SysConf.h:133 Source/Core/Common/Src/SysConf.h:154
 #, c-format
 msgid "Section %s not found in SYSCONF"
 msgstr "Η ενότητα %s δε βρέθηκε στο SYSCONF"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:59
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:490
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:46
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:477
 msgid "Select"
 msgstr "Επιλογή"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:677
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1072
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:683
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1087
 msgid "Select The Recording File"
 msgstr "Επιλέξτε το Αρχείο Εγγραφής"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1285
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1312
 msgid "Select a Wii WAD file to install"
 msgstr "Επιλέξτε ένα Wii WAD αρχείο για εγκατάσταση"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:70
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74
 msgid ""
 "Select a hardware adapter to use.\n"
 "\n"
@@ -4440,31 +4575,31 @@ msgstr ""
 "\n"
 "Αν δεν είστε σίγουροι, χρησιμοποιήστε τον πρώτο."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:520
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:510
 msgid "Select a save file to import"
 msgstr "Επιλέξτε ένα αρχείο αποθήκευσης για εισαγωγή"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:363
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:366
 msgid "Select floating windows"
 msgstr "Επιλέξτε αιωρούμενα παράθυρα"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:582
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:585
 msgid "Select the file to load"
 msgstr "Επιλέξτε το αρχείο για φόρτωση"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1241
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1268
 msgid "Select the save file"
 msgstr "Επιλέξτε αρχείο αποθήκευσης"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1388
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1415
 msgid "Select the state to load"
 msgstr "Επιλέξτε το σημείο φόρτωσης"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1429
 msgid "Select the state to save"
 msgstr "Επιλέξτε το σημείο αποθήκευσης"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82
 msgid ""
 "Select what aspect ratio to use when rendering:\n"
 "Auto: Use the native aspect ratio\n"
@@ -4483,15 +4618,15 @@ msgstr ""
 "\n"
 "Αν δεν είστε σίγουροι επιλέξτε Αυτόματα."
 
-#: Source/Core/InputCommon/Src/InputConfig.cpp:61
+#: Source/Core/InputCommon/Src/InputConfig.cpp:48
 msgid "Selected controller profile does not exist"
-msgstr ""
+msgstr "Το επιλεγμένο προφίλ χειρισμού δεν υπάρχει"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:116
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:109
 msgid "Selected font"
 msgstr "Επιλεγμένη γραμματοσειρά"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75
 msgid ""
 "Selects the display resolution used in fullscreen mode.\n"
 "This should always be bigger than or equal to the internal resolution. "
@@ -4508,23 +4643,39 @@ msgstr ""
 "σας.\n"
 "Αν πάλι δεν είστε σίγουροι, χρησιμοποιήστε την υψηλότερη λειτουργική ανάλυση."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:69
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:70
 msgid ""
 "Selects what graphics API to use internally.\n"
 "Direct3D 9 usually is the fastest one. OpenGL is more accurate though. "
 "Direct3D 11 is somewhere between the two.\n"
 "Note that the Direct3D backends are only available on Windows.\n"
 "\n"
-"If unsure, use Direct3D 9."
+"If unsure, use Direct3D 11."
 msgstr ""
 "Επιλέγει το API γραφικών που θα χρησιμοποιηθεί εσωτερικά.\n"
 "Το Direct3D 9 συνήθως είναι το γρηγορότερο. Το OpenGL είναι περισσότερο "
 "ακριβές όμως. Το Direct3D 11 βρίσκεται κάπου ενδιάμεσα μεταξύ των δύο.\n"
 "Σημειώστε ότι τα Direct3D backends είναι διαθέσιμα μόνο στα Windows.\n"
 "\n"
-"Αν δεν είστε σίγουροι, χρησιμοποιήστε το Direct3D 9."
+"Αν δεν είστε σίγουροι, χρησιμοποιήστε το Direct3D 11."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:288
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72
+msgid ""
+"Selects what graphics API to use internally.\n"
+"Direct3D 9 usually is the fastest one. OpenGL is more accurate though. "
+"Direct3D 11 is somewhere between the two.\n"
+"Note that the Direct3D backends are only available on Windows.\n"
+"\n"
+"If unsure, use OpenGL."
+msgstr ""
+"Επιλέγει το API γραφικών που θα χρησιμοποιηθεί εσωτερικά.\n"
+"Το Direct3D 9 συνήθως είναι το γρηγορότερο. Το OpenGL είναι περισσότερο "
+"ακριβές όμως. Το Direct3D 11 βρίσκεται κάπου ενδιάμεσα μεταξύ των δύο.\n"
+"Σημειώστε ότι τα Direct3D backends είναι διαθέσιμα μόνο στα Windows.\n"
+"\n"
+"Αν δεν είστε σίγουροι, χρησιμοποιήστε το OpenGL."
+
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:291
 msgid "Send"
 msgstr "Αποστολή"
 
@@ -4532,26 +4683,26 @@ msgstr "Αποστολή"
 msgid "Sensor Bar Position:"
 msgstr "Θέση Sensor Bar:"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:77
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:64
 msgid "Separator"
 msgstr "Διαχωριστής"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:328
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308
 msgid "Serbian"
 msgstr "Σερβικά"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:522
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502
 msgid ""
 "Serial Port 1 - This is the port which devices such as the net adapter use"
 msgstr ""
 "Σειριακή Θύρα 1 - Αυτή είναι η θύρα που χρησιμοποιούν οι συσκευές όπως ο "
 "προσαρμογέας δικτύου"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:488
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:475
 msgid "Set"
 msgstr "Ορισμός"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:877
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:868
 msgid "Set as &default ISO"
 msgstr "Ορισμός ως προεπιλεγμένο &ISO"
 
@@ -4560,136 +4711,138 @@ msgstr "Ορισμός ως προεπιλεγμένο &ISO"
 msgid "Set as default Memcard %c"
 msgstr "Ορισμός ως προεπιλεγμένη Κάρτα Μνήμης %c"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:460
+#: Source/Core/Core/Src/ActionReplay.cpp:450
 #, c-format
 msgid "SetARCode_IsActive: Index is greater than ar code list size %lu"
 msgstr ""
 "SetARCode_IsActive: Ο δείκτης είναι μεγαλύτερος από το μέγεθος λίστας των "
 "κωδικών ar %lu"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:515
 msgid ""
 "Sets the latency (in ms).  Higher values may reduce audio crackling. OpenAL "
 "backend only."
 msgstr ""
+"Ορίζει την χρονοκαθυστέρηση (σε ms). Υψηλότερες τιμές μπορεί να μειώσουν τις "
+"διακοπές στον ήχο. Μόνο για OpenAL backend."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341
 msgid "Settings..."
 msgstr "Ρυθμίσεις..."
 
-#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:222
+#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:209
 msgid "SetupWiiMem: Cant find setting file"
 msgstr "SetupWiiMem:Αδυναμία εύρεσης αρχείου ρυθμίσεων"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:291
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:278
 msgid "Shake"
 msgstr "Κούνημα"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
 msgid "Short Name:"
 msgstr "Σύντομο Όνομα:"
 
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:103
+#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:90
 msgid "Shoulder Buttons"
 msgstr "Κουμπιά Shoulder"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:217
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:220
 msgid "Show &Console"
 msgstr "Εμφάνιση &Κονσόλας"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:215
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:218
 msgid "Show &Log"
 msgstr "Εμφάνιση Παραθύρου Κατα&γραφής "
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:212
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:215
 msgid "Show &Statusbar"
 msgstr "Εμφάνιση Μπάρας Κατάστασης"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:210
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:213
 msgid "Show &Toolbar"
 msgstr "Εμφάνιση Γραμμής &Εργαλείων"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:281
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:284
 msgid "Show Drives"
 msgstr "Εμφάνιση Οδηγών"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:517
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530
 msgid "Show EFB Copy Regions"
 msgstr "Εμφάνιση Περιοχών EFB Αντιγραφών"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:295
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303
 msgid "Show FPS"
 msgstr "Εμφάνιση FPS"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:271
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:274
 msgid "Show France"
 msgstr "Εμφάνιση Γαλλίας"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:257
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:260
 msgid "Show GameCube"
 msgstr "Εμφάνιση GameCube"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561
 msgid "Show Input Display"
 msgstr "Εμφάνιση Προβολής Χειρισμών"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:273
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:276
 msgid "Show Italy"
 msgstr "Εμφάνιση Ιταλίας"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:264
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:267
 msgid "Show JAP"
 msgstr "Εμφάνιση JAP"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:275
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:278
 msgid "Show Korea"
 msgstr "Εμφάνιση Κορέας"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476
 msgid "Show Language:"
 msgstr "Εμφάνιση Γλώσσας:"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:216
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:219
 msgid "Show Log &Configuration"
 msgstr "Εμφάνιση Ρυθμίσεων &Καταγραφέα"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:266
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:269
 msgid "Show PAL"
 msgstr "Εμφάνιση PAL"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:254
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:257
 msgid "Show Platforms"
 msgstr "Εμφάνιση Πλατφόρμας"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:263
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:266
 msgid "Show Regions"
 msgstr "Εμφάνιση Περιοχών"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:518
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531
 msgid "Show Statistics"
 msgstr "Εμφάνιση Στατιστικών"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:277
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:280
 msgid "Show Taiwan"
 msgstr "Εμφάνιση Ταϊβάν"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:268
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:271
 msgid "Show USA"
 msgstr "Εμφάνιση USA"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:259
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:262
 msgid "Show Wad"
 msgstr "Εμφάνιση Wad"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:255
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:258
 msgid "Show Wii"
 msgstr "Εμφάνιση Wii"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491
 msgid "Show a confirmation box before stopping a game."
 msgstr "Εμφάνιση επιβεβαίωσης πριν τη διακοπή ενός παιχνιδιού."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:512
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492
 msgid ""
 "Show a message box when a potentially serious error has occurred.\n"
 "Disabling this may avoid annoying and non-fatal messages, but it may also "
@@ -4704,11 +4857,11 @@ msgstr ""
 msgid "Show first block"
 msgstr "Εμφάνιση πρώτου μπλοκ"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:130
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:131
 msgid "Show lag counter"
 msgstr "Εμφάνιση μετρητή καθυστέρησης "
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493
 msgid ""
 "Show messages on the emulation screen area.\n"
 "These messages include memory card writes, video backend and CPU "
@@ -4735,7 +4888,7 @@ msgstr "Εμφάνιση αποθηκευμένου εικονιδίου"
 msgid "Show save title"
 msgstr "Εμφάνιση αποθηκευμένου τίτλου"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102
 msgid ""
 "Show the number of frames rendered per second as a measure of emulation "
 "speed.\n"
@@ -4747,11 +4900,11 @@ msgstr ""
 "\n"
 "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:279
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:282
 msgid "Show unknown"
 msgstr "Εμφάνιση Αγνώστων"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105
 msgid ""
 "Show various statistics.\n"
 "\n"
@@ -4761,47 +4914,31 @@ msgstr ""
 "\n"
 "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:319
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:306
 msgid "Sideways Wiimote"
 msgstr "Οριζόντια Θέση Wiimote"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:280
 msgid "Simplified Chinese"
 msgstr "Κινέζικα Απλοποιημένα"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:311
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:298
 msgid "Size"
 msgstr "Μέγεθος"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:696
 msgid "Skip BIOS"
 msgstr "Παράλειψη BIOS"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316
 msgid "Skip DCBZ clearing"
-msgstr ""
+msgstr "Παράληψη εκκαθάρισης DCBZ"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:492
-msgid "Skip Dest. Alpha Pass"
-msgstr "Παράλειψη Dest. Alpha Pass"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:444
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:454
 msgid "Skip EFB Access from CPU"
 msgstr "Παράλειψη EFB Πρόσβασης από τη CPU"
 
-#: 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 ""
-"Παράλειψη του destination alpha pass που χρησιμοποιείται από πολλά παιχνίδια "
-"σε διάφορα γραφικά εφέ.\n"
-"\n"
-"Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125
 msgid ""
 "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n"
 "Sometimes also increases visual quality.\n"
@@ -4818,25 +4955,25 @@ msgstr ""
 "\n"
 "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:374
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:386
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:380
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:392
 #, c-format
 msgid "Slot %i"
 msgstr "Θέση %i"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:700
 msgid "Slot A"
 msgstr "Θέση Α"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:701
 msgid "Slot B"
 msgstr "Θέση Β"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:62
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:49
 msgid "Snapshot"
 msgstr "Στιγμιότυπο"
 
-#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:58
+#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:46
 msgid "Software Renderer"
 msgstr "Απεικόνιση Λογισμικού"
 
@@ -4853,35 +4990,35 @@ msgstr ""
 "Θέλετε όντως να χρησιμοποιήσετε την απεικόνιση λογισμικού; Αν δεν είστε "
 "σίγουροι, επιλέξτε 'Όχι'."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:683
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:664
 msgid "Sound Settings"
 msgstr "Ρυθμίσεις Ήχου"
 
-#: Source/Core/AudioCommon/Src/AudioCommon.cpp:77
+#: Source/Core/AudioCommon/Src/AudioCommon.cpp:64
 #, c-format
 msgid "Sound backend %s is not valid."
 msgstr "Το backend ήχου %s δεν είναι έγκυρο."
 
-#: Source/Core/AudioCommon/Src/DSoundStream.cpp:59
+#: Source/Core/AudioCommon/Src/DSoundStream.cpp:46
 #, c-format
 msgid "Sound buffer creation failed: %s"
 msgstr "Αποτυχία δημιουργίας buffer ήχου: %s"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:31
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:18
 msgid "Space"
 msgstr "Space"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:329
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309
 msgid "Spanish"
 msgstr "Ισπανικά"
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:98
 msgid "Speaker Volume:"
-msgstr "Ένταση ηχείου:"
+msgstr "Ένταση Ηχείου:"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92
 msgid ""
 "Specifies the resolution used to render at. A high resolution will improve "
 "visual quality a lot but is also quite heavy on performance and might cause "
@@ -4902,63 +5039,63 @@ msgstr ""
 "\n"
 "Αν δεν είστε σίγουροι, επιλέξτε 640x528."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322
 msgid "Speed up Disc Transfer Rate"
 msgstr "Επιτάχυνση του Ρυθμού Μεταφοράς από τον Δίσκο"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:243
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:230
 msgid "Square Stick"
 msgstr "Τετράγωνο Stick"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:107
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87
 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:322
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:37
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:25
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:325
 msgid "Start"
 msgstr "Εκκίνηση"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:194
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:197
 msgid "Start &NetPlay"
 msgstr "Εκκίνηση Λειτουργίας &NetPlay"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:339
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:345
 msgid "Start Re&cording"
 msgstr "Εκκίνηση Ε&γγραφής"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:175
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:175
 msgid "Start Recording"
 msgstr "Εκκίνηση Εγγραφής"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:312
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:299
 msgid "State"
 msgstr "Λειτ."
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:173
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:161
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:161
 msgid "State Saves"
 msgstr "Σημεία Αποθήκευσης"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:108
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88
 msgid "Steering Wheel"
-msgstr ""
+msgstr "Τιμόνι"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:53
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:57
 msgid "Stick"
 msgstr "Stick"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:420
-#: 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:325
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:419
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:431
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:171
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:171
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:328
 msgid "Stop"
 msgstr "Διακοπή"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96
 msgid ""
 "Store EFB copies in GPU texture objects.\n"
 "This is not so accurate, but it works well enough for most games and gives a "
@@ -4972,107 +5109,120 @@ msgstr ""
 "\n"
 "Αν δεν είστε σίγουροι, αφήστε το επιλεγμένο."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:275
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283
 msgid "Stretch to Window"
 msgstr "Προσαρμογή στο Παράθυρο"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:43
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:47
 msgid "Strum"
 msgstr "Strum"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:78
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:65
 msgid "Subtract"
 msgstr "Subtract"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:77
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:67
 #, c-format
 msgid "Successfully exported file to %s"
 msgstr "Επιτυχής εξαγωγή αρχείου στο %s"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:56
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:43
 msgid "Successfully imported save files"
 msgstr "Επιτυχής εισαγωγή σημείων αποθήκευσης"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:285
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:272
 msgid "Swing"
 msgstr "Swing"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:744
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:792
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320
+msgid "Synchronize GPU thread"
+msgstr "Συγχρονισμός του νήματος της GPU"
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321
+msgid ""
+"Synchronizes the GPU and CPU threads to help prevent random freezes in Dual "
+"Core mode. (ON = Compatible, OFF = Fast)"
+msgstr ""
+"Συγχρονίζει τα νήματα της GPU και της CPU ώστε να προληφθούν τυχαία "
+"κολλήματα σε λειτουργία Διπλού Πυρήνα . (Ενεργό = Συμβατότητα, Ανενεργό = "
+"Ταχύτητα)"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773
 msgid "System Language:"
 msgstr "Γλώσσα Συστήματος:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:191
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:185
 msgid "TAIWAN"
 msgstr "ΤΑΪΒΑΝ"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:127
-#: Source/Core/DolphinWX/Src/TASInputDlg.h:32
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:128
+#: Source/Core/DolphinWX/Src/TASInputDlg.h:19
 msgid "TAS Input"
 msgstr "TAS Είσοδος"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:28
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:15
 msgid "Tab"
 msgstr "Tab"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:510
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:531
 msgid "Tab split"
 msgstr "Tab split"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:37
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:41
 msgid "Table Left"
 msgstr "Αριστερό Table"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:38
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:42
 msgid "Table Right"
 msgstr "Δεξί Table"
 
-#: 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
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:361
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:181
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:181
 msgid "Take Screenshot"
 msgstr "Δημιουργία Στιγμιότυπου"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:109
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89
 msgid "TaruKonga (Bongos)"
 msgstr "TaruKonga (Bongos)"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:472
 msgid "Test"
 msgstr "Τέστ"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:444
 msgid "Texture"
 msgstr "Υφή"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:451
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:461
 msgid "Texture Cache"
 msgstr "Cache Υφών"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:519
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:532
 msgid "Texture Format Overlay"
 msgstr "Επικάλυψη Του Format Υφών"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:226
+#: Source/Core/Core/Src/CoreParameter.cpp:215
 msgid "The WAD has been installed successfully"
 msgstr "Το WAD εγκαταστάθηκε με επιτυχία"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:197
+#: Source/Core/Core/Src/ActionReplay.cpp:185
 msgid "The address is invalid"
 msgstr "Η διεύθυνση είναι άκυρη"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:509
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:496
 msgid "The checksum was successfully fixed"
 msgstr "Το checksum διορθώθηκε με επιτυχία"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1242
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226
 msgid "The chosen directory is already in the list"
 msgstr "Ο επιλεγμένος φάκελος βρίσκεται ήδη στη λίστα"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1117
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1216
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1118
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1146
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1217
 #, c-format
 msgid ""
 "The file %s already exists.\n"
@@ -5081,7 +5231,7 @@ msgstr ""
 "Το αρχείο %s υπάρχει ήδη.\n"
 "Θέλετε να το αντικαταστήσετε;"
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:51
+#: Source/Core/AudioCommon/Src/WaveFile.cpp:38
 #, c-format
 msgid ""
 "The file %s could not be opened for writing. Please check if it's already "
@@ -5090,30 +5240,30 @@ msgstr ""
 "Αδυναμία ανοίγματος του αρχείου %s για εγγραφή. Παρακαλώ ελέγξτε αν είναι "
 "ήδη ανοιχτό από άλλο πρόγραμμα."
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:44
+#: Source/Core/AudioCommon/Src/WaveFile.cpp:31
 #, c-format
 msgid "The file %s was already open, the file header will not be written."
 msgstr "Το αρχείο %s ήταν ήδη ανοιχτό, η κεφαλίδα του αρχείου δε θα γραφεί."
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:332
+#: Source/Core/Core/Src/Boot/Boot.cpp:320
 #, c-format
 msgid "The file you specified (%s) does not exist"
 msgstr "Το αρχείο που επιλέξατε (%s) δεν υπάρχει"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:628
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:666
 msgid "The name can not be empty"
 msgstr "Το όνομα δεν μπορεί να είναι κενό"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:620
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:658
 msgid "The name can not contain the character ','"
 msgstr "Το όνομα δεν μπορεί να περιέχει τον χαρακτήρα ','"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:142
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:129
 msgid "The resulting decrypted AR code doesn't contain any lines."
 msgstr ""
 "Το αποτέλεσμα αποκρυπτογράφησης του κωδικού AR δεν περιέχει καθόλου γραμμές."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98
 msgid ""
 "The safer you adjust this, the less likely the emulator will be missing any "
 "texture updates from RAM.\n"
@@ -5125,12 +5275,12 @@ msgstr ""
 "\n"
 "Αν δεν είστε σίγουροι, χρησιμοποιήστε την δεξιότερη τιμή."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:445
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:432
 msgid "The save you are trying to copy has an invalid file size"
 msgstr ""
 "Το σημείο αποθήκευσης που προσπαθείτε να αντιγράψετε έχει μη έγκυρο μέγεθος"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:388
+#: Source/Core/DolphinWX/Src/Main.cpp:416
 msgid ""
 "The selected language is not supported by your system. Falling back to "
 "system default."
@@ -5138,36 +5288,36 @@ msgstr ""
 "Η επιλεγμένη γλώσσα δεν υποστηρίζεται από το σύστημά σας. Επαναφορά στην "
 "προεπιλογή συστήματος."
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:43
+#: Source/Core/Core/Src/NetPlayClient.cpp:47
 msgid "The server and client's NetPlay versions are incompatible!"
 msgstr "Οι εκδόσεις NetPlay του διακομιστή και του πελάτη δεν είναι συμβατές!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:40
+#: Source/Core/Core/Src/NetPlayClient.cpp:44
 msgid "The server is full!"
 msgstr "Ο διακομιστής είναι γεμάτος!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:46
+#: Source/Core/Core/Src/NetPlayClient.cpp:50
 msgid "The server responded: the game is currently running!"
 msgstr "Ο διακομιστής απάντησε: το παιχνίδι τρέχει!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:49
+#: Source/Core/Core/Src/NetPlayClient.cpp:53
 msgid "The server sent an unknown error message!"
 msgstr "Ο διακομιστής επέστρεψε ένα άγνωστο μήνυμα σφάλματος!"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:119
+#: Source/Core/Core/Src/CoreParameter.cpp:108
 #, c-format
 msgid "The specified file \"%s\" does not exist"
 msgstr "Το επιλεγμένο αρχείο \"%s\" δεν υπάρχει"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:198
+#: Source/Core/Core/Src/ActionReplay.cpp:186
 msgid "The value is invalid"
 msgstr "Η τιμή είναι άκυρη"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:642
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:623
 msgid "Theme:"
-msgstr ""
+msgstr "Θέμα:"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:476
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:463
 msgid ""
 "There must be a ticket for 00000001/00000002. Your NAND dump is probably "
 "incomplete."
@@ -5175,7 +5325,7 @@ msgstr ""
 "Πρέπει να υπάρχει εισητήριο για 00000001/00000002. Το NAND dump σας είναι "
 "πιθανότατα ημιτελές."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308
 msgid ""
 "These settings override core Dolphin settings.\n"
 "Undetermined means the game uses Dolphin's setting."
@@ -5184,7 +5334,7 @@ msgstr ""
 "Αν είναι ακαθόριστη η επιλογή το παιχνίδι χρησιμοποιεί τις γενικές ρυθμίσεις "
 "του Dolphin. "
 
-#: Source/Core/Core/Src/ActionReplay.cpp:355
+#: Source/Core/Core/Src/ActionReplay.cpp:345
 msgid ""
 "This action replay simulator does not support codes that modify Action "
 "Replay itself."
@@ -5192,13 +5342,13 @@ msgstr ""
 "Αυτός ο προσομοιωτής action replay δεν υποστηρίζει κωδικούς που αλλάζουν το "
 "ίδιο το Action Replay."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505
 msgid "This could cause slow down in Wii Menu and some games."
 msgstr ""
 "Αυτό μπορεί να προκαλέσει καθυστερήσεις στο Μενού Wii και σε μερικά "
 "παιχνίδια."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118
 msgid ""
 "This feature allows you to change the game's camera.\n"
 "Move the mouse while holding the right mouse button to pan and while holding "
@@ -5209,8 +5359,32 @@ msgid ""
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
+"Αυτό το χαρακτηριστικό σας επιτρέπει να πειράξετε την κάμερα του "
+"παιχνιδιού.\n"
+"Μετακινήστε το ποντίκι κρατώντας πατημένο το δεξί πλήκτρο του ποντικιού για "
+"να μετακινήσετε οριζόντια την κάμερα γύρω από κάθετο άξονα, και κρατώντας το "
+"μεσαίο πλήκτρο για μετακίνησή της. \n"
+"Κρατώντας πατημένο το SHIFT πιέστε ένα από τα WASD πλήκτρα για να "
+"μετακινήσετε την κάμερα κατά μία καθορισμένη απόσταση (SHIFT+0 για να "
+"κινηθεί γρηγορότερα και SHIFT+9 για να κινηθεί πιο αργά). Πατήστε SHIFT+R "
+"για να επαναφέρετε την κάμερα στην αρχική της θέση. \n"
+"\n"
+"Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485
+#, fuzzy
+msgid ""
+"This limits the game speed to the specified number of frames per second "
+"(full speed is 60 for NTSC and 50 for PAL). Alternatively, use Audio to "
+"throttle using the DSP (might fix audio clicks but can also cause constant "
+"noise depending on the game)."
+msgstr ""
+"Αν θέσετε τιμή υψηλότερη από την πλήρη ταχύτητα του παιχνιδιού (NTSC:60, "
+"PAL:50), χρησιμοποιήστε τον ήχο για να κάνετε Throttle μέσω DSP (μπορεί να "
+"διορθώσει ορισμένα κλικαρίσματα στον ήχο άλλα και να προκαλέσει συνεχές "
+"θόρυβο αναλόγα με το παιχνίδι)."
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484
 msgid ""
 "This splits the Video and CPU threads, so they can be run on separate "
 "cores.\n"
@@ -5222,62 +5396,62 @@ msgstr ""
 "Προκαλεί μεγάλη επιτάχυνση σε PC με περισσότερους από έναν πυρήνες,\n"
 "αλλά μπορεί να προκαλέσει κρασαρίσματα ή άλλα προβλήματα. "
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:286
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:287
 msgid "This will let you Manually Edit the INI config file"
 msgstr ""
 "Αυτό σας επιτρέπει την χειροκίνητη επεξεργασία του αρχείου ρυθμίσεων INI"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:249
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:254
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:236
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:241
 msgid "Threshold"
 msgstr "Κατώφλι"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:288
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:275
 msgid "Tilt"
 msgstr "Πλάγιασμα"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:628
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:304
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:622
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:291
 msgid "Title"
 msgstr "Τίτλος"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:125
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:144
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:112
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:131
 msgid "To"
 msgstr "Εώς"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:72
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59
 msgid "Toggle All Log Types"
 msgstr "Εναλλαγή Όλων Τύπων Καταγραφής "
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:426
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:432
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:180
 msgid "Toggle Fullscreen"
 msgstr "Εναλλαγή Πλήρους Οθόνης"
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:87
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:271
 msgid "Top"
 msgstr "Κορυφή"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:281
 msgid "Traditional Chinese"
 msgstr "Κινέζικα Παραδοσιακά "
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:426
+#: Source/Core/Core/Src/Boot/Boot.cpp:414
 msgid "Tried to load an unknown file type."
 msgstr "Προσπάθεια φόρτωσης ενός άγνωστου τύπου αρχείο."
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:80
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:67
 msgid "Triggers"
 msgstr "Σκανδάλες"
 
-#: Source/Core/Common/Src/SysConf.h:91 Source/Core/Common/Src/SysConf.h:114
+#: Source/Core/Common/Src/SysConf.h:78 Source/Core/Common/Src/SysConf.h:101
 msgid "Trying to read from invalid SYSCONF"
 msgstr "Προσπάθεια ανάγνωσης από ένα μη έγκυρο SYSCONF"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:44
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:31
 msgid ""
 "Trying to read from invalid SYSCONF\n"
 "Wiimote bt ids are not available"
@@ -5285,15 +5459,15 @@ msgstr ""
 "Προσπάθεια ανάγνωσης από ένα μη έγκυρο SYSCONF\n"
 "Τα Wiimote bt ids δεν είναι διαθέσιμα"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:330
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
 msgid "Turkish"
 msgstr "Τουρκικά"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:33
 msgid "Turntable"
 msgstr "Πικάπ"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:71
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58
 msgid "Type"
 msgstr "Τύπος"
 
@@ -5301,25 +5475,25 @@ msgstr "Τύπος"
 msgid "UDP Port:"
 msgstr "Πόρτα UDP:"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:279
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:266
 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12
 msgid "UDP Wiimote"
 msgstr "UDP Wiimote"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:199
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:193
 msgid "UNKNOWN"
 msgstr "ΑΓΝΩΣΤΟ"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:756
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:755
 #, c-format
 msgid "UNKNOWN_%02X"
 msgstr "ΑΓΝΩΣΤΟ_%02X"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:178
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:172
 msgid "USA"
 msgstr "ΗΠΑ"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:225
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:214
 msgid ""
 "Unable to create patch from given values.\n"
 "Entry not modified."
@@ -5327,7 +5501,7 @@ msgstr ""
 "Αδυναμία δημιουργίας patch από τις δοθείσες τιμές.\n"
 "Η entry δεν μεταβλήθηκε."
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:124
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:111
 #, c-format
 msgid ""
 "Unable to parse line %lu of the entered AR code as a valid encrypted or "
@@ -5339,74 +5513,94 @@ msgstr ""
 "τον πληκτρολογήσατε σωστά.\n"
 "Θα θέλατε να αγνοήσετε αυτήν την γραμμή και να συνεχίσετε με το parsing;"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:391
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:397
 #, c-format
 msgid "Undefined %i"
 msgstr "Μη ορισμένο %i"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:163
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:164
 msgid "Undo Load State"
 msgstr "Αναίρεση Φόρτωσης Σημείου Αποθ. "
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:718
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:717
 msgid "Unexpected 0x80 call? Aborting..."
 msgstr "Αναπάντεχη 0x80 κλήση; Ματαίωση..."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:215
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:202
 msgid "Unknown"
 msgstr "Άγνωστο"
 
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:971
+#: Source/Core/Core/Src/HW/DVDInterface.cpp:965
 #, c-format
 msgid "Unknown DVD command %08x - fatal error"
 msgstr "Άγνωστη εντολή DVD %08x - κρίσιμο σφάλμα"
 
-#: Source/Core/Common/Src/SysConf.cpp:145
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:444
+#, c-format
+msgid "Unknown command 0x%08x"
+msgstr "Άγνωστη εντολή 0x%08x"
+
+#: Source/Core/Common/Src/SysConf.cpp:132
 #, c-format
 msgid "Unknown entry type %i in SYSCONF (%s@%x)!"
 msgstr "Άγνωστος τύπος καταχώρησης %i στο SYSCONF (%s@%x)!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:228
+#: Source/Core/Core/Src/NetPlayClient.cpp:232
 #, c-format
 msgid "Unknown message received with id : %d"
 msgstr "Ελήφθη άγνωστο μήνυμα με id : %d"
 
-#: Source/Core/Core/Src/NetPlayServer.cpp:504
+#: Source/Core/Core/Src/NetPlayServer.cpp:508
 #, c-format
 msgid "Unknown message with id:%d received from player:%d Kicking player!"
 msgstr "Ελήφθη άγνωστο μήνυμα με:%d από τον παίκτη:%d Αποσύνδεση παίκτη!"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:274
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:56
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:261
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:43
 msgid "Up"
 msgstr "Πάνω"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:108
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:95
 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17
 msgid "Update"
 msgstr "Ενημέρωση"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:320
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:307
 msgid "Upright Wiimote"
 msgstr "Κάθετη Θέση Wiimote"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:777
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758
 msgid "Use EuRGB60 Mode (PAL60)"
 msgstr "Χρήση Λειτουργίας EuRGB60 (PAL60)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:294
 msgid "Use Fullscreen"
 msgstr "Χρήση Πλήρους Οθόνης"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:575
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:563
 msgid "Use Hex"
 msgstr "Χρήση Hex"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:600
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580
 msgid "Use Panic Handlers"
 msgstr "Χρήση Οθονών Πανικού"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89
+msgid ""
+"Use a hacked upload strategy to stream vertices.\n"
+"This usually speed up, but is forbidden by OpenGL specification and may "
+"causes heavy glitches.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+"Χρησιμοποιείται μια χακαρισμένη στρατηγική ανεβάσματος για την ροή των "
+"γωνιών.\n"
+"Αυτό συνήθως αυξάνει την ταχύτητα, αλλά απαγορεύεται απο τις προδιαγραφές "
+"του OpenGL και μπορεί να προκαλέσει μεγάλα προβλήματα.\n"
+"\n"
+"Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο."
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122
 msgid ""
 "Use multiple threads to decode textures.\n"
 "Might result in a speedup (especially on CPUs with more than two cores).\n"
@@ -5419,7 +5613,7 @@ msgstr ""
 "\n"
 "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126
 msgid ""
 "Usually if shader compilation fails, an error message is displayed.\n"
 "However, one may skip the popups to allow interruption free gameplay by "
@@ -5434,53 +5628,58 @@ msgstr ""
 "\n"
 "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:539
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:552
 msgid "Utility"
 msgstr "Εργαλεία"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:285
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:293
 msgid "V-Sync"
 msgstr "Κάθετος Συγχρονισμός"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:209
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318
+#, fuzzy
+msgid "VBeam Speed Hack"
+msgstr "MMU Speed Hack"
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196
 msgid "Value"
 msgstr "Τιμή"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:73
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:60
 msgid "Value:"
 msgstr "Τιμή:"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:572
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:560
 msgid "Value: "
 msgstr "Τιμή: "
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:51
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:38
 msgid "Verbosity"
 msgstr "Αναλυτικότητα"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:377
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:381
 msgid "Video"
 msgstr "Βίντεο"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:486
 msgid "Virtual"
 msgstr "Εικονικό"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:689
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670
 msgid "Volume"
 msgstr "Ένταση"
 
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:498
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:527
+#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:488
+#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:517
 #, c-format
 msgid "WAD installation failed: error creating %s"
 msgstr "Αποτυχία εγκατάστασης WAD: σφάλμα κατά τη δημιουργία του %s"
 
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:547
+#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:537
 msgid "WAD installation failed: error creating ticket"
 msgstr "Αποτυχία εγκατάστασης WAD: σφάλμα κατά τη δημιουργία του εισιτηρίου"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84
 msgid ""
 "Wait for vertical blanks in order to reduce tearing.\n"
 "Decreases performance if emulation speed is below 100%.\n"
@@ -5493,25 +5692,25 @@ msgstr ""
 "\n"
 "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο."
 
-#: Source/Core/Common/Src/MsgHandler.cpp:67
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46
+#: Source/Core/Common/Src/MsgHandler.cpp:53
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:33
 #: Source/Core/DolphinWX/Src/VideoConfigDiag.h:85
 msgid "Warning"
 msgstr "Προειδοποίηση"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:291
+#: Source/Core/Core/Src/Boot/Boot.cpp:279
 msgid "Warning - starting DOL in wrong console mode!"
 msgstr "Προειδοποίηση - εκκίνηση DOL σε λάθος λειτουργία κονσόλας!"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:341
+#: Source/Core/Core/Src/Boot/Boot.cpp:329
 msgid "Warning - starting ELF in wrong console mode!"
 msgstr "Προειδοποίηση - εκκίνηση ELF σε λάθος λειτουργία κονσόλας!"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:221
+#: Source/Core/Core/Src/Boot/Boot.cpp:209
 msgid "Warning - starting ISO in wrong console mode!"
 msgstr "Προειδοποίηση - εκκίνηση ISO σε λάθος λειτουργία κονσόλας!"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:519
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:512
 #, c-format
 msgid ""
 "Warning! it is advised to backup all files in the folder:\n"
@@ -5523,7 +5722,7 @@ msgstr ""
 "%s\n"
 "Θέλετε να συνεχίσετε;"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:585
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:578
 #, c-format
 msgid ""
 "Warning: This will overwrite any existing saves that are in the folder:\n"
@@ -5537,7 +5736,7 @@ msgstr ""
 "και έχουν το ίδιο όνομα με αρχεία στη memcard\n"
 "Συνέχεια;"
 
-#: Source/Core/Core/Src/Movie.cpp:844
+#: Source/Core/Core/Src/Movie.cpp:835
 #, c-format
 msgid ""
 "Warning: You loaded a save that's after the end of the current movie. (byte "
@@ -5549,7 +5748,7 @@ msgstr ""
 "φορτώσετε άλλο σημείο αποθήκευσης πρωτού συνεχίσετε ή να φορτώσετε το τρέχων "
 "με απενεργοποιημένη την λειτουργία Μόνο Για Ανάγνωση (Εγγραφής)."
 
-#: Source/Core/Core/Src/Movie.cpp:861
+#: Source/Core/Core/Src/Movie.cpp:852
 #, c-format
 msgid ""
 "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You "
@@ -5562,7 +5761,7 @@ msgstr ""
 "την λειτουργία Μόνο Για Ανάγνωση (Εγγραφής). Ειδάλλως πιθανώς θα εμφανιστεί "
 "ασυγχρονισμός."
 
-#: Source/Core/Core/Src/Movie.cpp:870
+#: Source/Core/Core/Src/Movie.cpp:861
 #, c-format
 msgid ""
 "Warning: You loaded a save whose movie mismatches on frame %d. You should "
@@ -5597,49 +5796,49 @@ msgstr ""
 "Start=%d, A=%d, B=%d, X=%d, Y=%d, Z=%d, DUp=%d, DDown=%d, DLeft=%d, DRight="
 "%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d"
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:106
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:129
+#: Source/Core/AudioCommon/Src/WaveFile.cpp:93
+#: Source/Core/AudioCommon/Src/WaveFile.cpp:116
 msgid "WaveFileWriter - file not open."
 msgstr "WaveFileWriter - το αρχείο δεν είναι ανοιχτό."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:56
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:60
 msgid "Whammy"
 msgstr "Whammy"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:404
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:408
 msgid "Widescreen Hack"
 msgstr "Hack Ευρείας Οθόνης"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:312
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:299
 msgid "Width"
 msgstr "Πλάτος"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535
 msgid "Wii"
 msgstr "Wii"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:372
 msgid "Wii Console"
 msgstr "Wii Κονσόλα"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:844
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:825
 msgid "Wii NAND Root:"
 msgstr "Wii NAND Ρίζα:"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:191
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:194
 msgid "Wii Save Import"
 msgstr "Εισαγωγή Αποθήκευσης Wii"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1243
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1270
 msgid "Wii save files (*.bin)|*.bin"
 msgstr "Αρχεία αποθήκευσης Wii (*.bin)|*.bin"
 
-#: Source/Core/DiscIO/Src/WiiWad.cpp:82
+#: Source/Core/DiscIO/Src/WiiWad.cpp:69
 msgid "WiiWAD: Could not read from file"
 msgstr "WiiWAD: Αδυναμία ανάγνωσης από αρχείο"
 
-#: Source/Core/Core/Src/HW/Wiimote.cpp:17
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
+#: Source/Core/Core/Src/HW/Wiimote.cpp:20
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
 msgid "Wiimote"
 msgstr "Wiimote"
 
@@ -5648,7 +5847,7 @@ msgstr "Wiimote"
 msgid "Wiimote %i"
 msgstr "Wiimote %i"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:628
+#: Source/Core/DolphinWX/Src/Main.cpp:656
 msgid "Wiimote Connected"
 msgstr "Συνδεδεμένο Wiimote"
 
@@ -5656,7 +5855,7 @@ msgstr "Συνδεδεμένο Wiimote"
 msgid "Wiimote Motor"
 msgstr "Μοτέρ Wiimote"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
 msgid "Wiimote settings"
 msgstr "Ρυθμίσεις Wiimote"
 
@@ -5664,102 +5863,129 @@ msgstr "Ρυθμίσεις Wiimote"
 msgid "Wiimotes"
 msgstr "Wiimotes"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:134
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:121
 msgid "Windows Left"
 msgstr "Windows Left"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:136
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:123
 msgid "Windows Menu"
 msgstr "Windows Menu"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:135
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:122
 msgid "Windows Right"
 msgstr "Windows Right"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:131
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:124
 msgid "Word Wrap"
 msgstr "Αναδίπλωση Λέξεων"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1298
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:864
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1089
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1225
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1325
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:880
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1090
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1226
 msgid "Working..."
 msgstr "Σε εργασία..."
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:338
+msgid "Write memcards (GC)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46
 msgid "Write to Console"
 msgstr "Εγγραφή στην Κονσόλα"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:67
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:54
 msgid "Write to Debugger"
 msgstr "Εγγραφή στον Debugger"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:57
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44
 msgid "Write to File"
 msgstr "Εγγραφή σε Αρχείο"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:61
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48
 msgid "Write to Window"
 msgstr "Εγγραφή στο Παράθυρο"
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:60
+#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:47
 #, c-format
 msgid "XAudio2 CreateSourceVoice failed: %#X"
 msgstr "Αποτυχία CreateSourceVoice XAudio2: %#X"
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:114
+#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:101
 #, c-format
 msgid "XAudio2 init failed: %#X"
 msgstr "Αποτυχία αρχικοποίησης XAudio2: %#X"
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:124
+#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:111
 #, c-format
 msgid "XAudio2 master voice creation failed: %#X"
 msgstr "Αποτυχία δημιουργίας κεντρικής φωνής XAudio2: %#X"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:766
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:765
 msgid "XF reg"
 msgstr "XF reg"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:21
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Yellow"
 msgstr "Κίτρινο"
 
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:107
+#: Source/Core/Core/Src/DSP/DSPCore.cpp:120
 msgid ""
-"You are using free dsp roms made by Dolphin Team.\n"
-"Only Zelda ucode games will work correctly with them.\n"
+"You are using a free DSP ROM made by the Dolphin Team.\n"
+"All Wii games will work correctly, and most GC games should also work fine, "
+"but the GBA/IPL/CARD UCodes will not work.\n"
 msgstr ""
-"Χρησιμοποιείτε ελεύθερα dsp roms που φτιάχτηκαν από την ομάδα του Dolphin.\n"
-"Μόνο Zelda ucode παιχνίδια θα δουλέψουν σωστά με αυτά.\n"
+"Χρησιμοποιείτε ένα ελεύθερο DSP ROM που φτιάχτηκε από την ομάδα του "
+"Dolphin.\n"
+" Όλα τα παιχνίδια του Wii και τα περισσότερα του GC θα δουλέψουν σωστά, αλλά "
+"τα GBA/IPL/CARD UCodes δεν θα δουλέψουν.\n"
+"\n"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:73
+#: Source/Core/Core/Src/DSP/DSPCore.cpp:116
+msgid ""
+"You are using an old free DSP ROM made by the Dolphin Team.\n"
+"Only games using the Zelda UCode will work correctly.\n"
+msgstr ""
+"Χρησιμοποιείτε ένα παλιό ελεύθερο DSP ROM που φτιάχτηκε από την ομάδα του "
+"Dolphin.\n"
+"Μόνο τα Zelda ucode παιχνίδια θα δουλέψουν σωστά με αυτό.\n"
+
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:63
 msgid "You can't close panes that have pages in them."
 msgstr "Δεν μπορείτε να κλείσετε pane που έχουν σελίδες."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:207
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:210
 msgid "You must choose a game!!"
 msgstr "Πρέπει να επιλέξετε ένα παιχνίδι!!"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:605
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:593
 msgid "You must enter a name!"
 msgstr "Πρέπει να εισάγετε ένα όνομα!"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:450
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:438
 msgid "You must enter a valid decimal, hexadecimal or octal value."
 msgstr "Πρέπει να εισάγετε μία έγκυρη οκταδική ή δεκαεξαδική τιμή."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:603
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:591
 msgid "You must enter a valid profile name."
 msgstr "Πρέπει να εισάγετε ένα έγκυρο όνομα προφίλ."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:936
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:917
 msgid "You must restart Dolphin in order for the change to take effect."
 msgstr ""
 "Πρέπει να κάνετε επανεκκίνηση του Dolphin για να έχει επίπτωση αυτή η αλλαγή."
 
-#: Source/Core/Core/Src/CoreParameter.cpp:175
+#: Source/Core/Core/Src/DSP/DSPCore.cpp:109
+msgid ""
+"Your DSP ROMs have incorrect hashes.\n"
+"Would you like to stop now to fix the problem?\n"
+"If you select \"No\", audio might be garbled."
+msgstr ""
+"Τα DSP ROMs έχουν εσφαλμένα hashes.\n"
+"Θέλετε να γίνει διακοπή τώρα για να διορθώσετε το πρόβλημα;\n"
+"Εάν επιλέξετε \"Όχι\", ο ήχος μπορεί να είναι χαλασμένος."
+
+#: Source/Core/Core/Src/CoreParameter.cpp:164
 msgid ""
 "Your GCM/ISO file seems to be invalid (invalid country).\n"
 "Continue with PAL region?"
@@ -5767,7 +5993,7 @@ msgstr ""
 "Το αρχείο GCM/ISO φαίνεται να είναι μη έγκυρο (μη έγκυρη χώρα).\n"
 "Συνέχεια με περιοχή PAL;"
 
-#: Source/Core/Common/Src/SysConf.cpp:58
+#: Source/Core/Common/Src/SysConf.cpp:45
 #, c-format
 msgid ""
 "Your SYSCONF file is the wrong size.\n"
@@ -5778,25 +6004,25 @@ msgstr ""
 "Θα έπρεπε να είναι 0x%04x (αλλά είναι 0x%04llx)\n"
 "Θέλετε να δημιουργηθεί ένα καινούριο;"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:334
 msgid "ZTP hack"
 msgstr "ZTP hack"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:387
+#: Source/Core/Core/Src/ActionReplay.cpp:377
 msgid "Zero 3 code not supported"
 msgstr "Δεν υποστηρίζεται ο Zero 3 code"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:408
+#: Source/Core/Core/Src/ActionReplay.cpp:398
 #, c-format
 msgid "Zero code unknown to dolphin: %08x"
 msgstr "Άγνωστος Zero code: %08x"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:436
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:460
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:423
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:447
 msgid "[ waiting ]"
 msgstr "[ σε αναμονή ]"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107
 msgid ""
 "[BROKEN]\n"
 "Highlight regions the EFB was copied from.\n"
@@ -5808,11 +6034,11 @@ msgstr ""
 "\n"
 "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο."
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:91
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:78
 msgid "[Custom]"
 msgstr "[Προσαρμοζόμενο]"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120
 msgid ""
 "[EXPERIMENTAL]\n"
 "Aims to speed up emulation by offloading texture decoding to the GPU using "
@@ -5831,7 +6057,7 @@ msgstr ""
 "\n"
 "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121
 msgid ""
 "[EXPERIMENTAL]\n"
 "Speeds up emulation a bit by caching display lists.\n"
@@ -5845,99 +6071,47 @@ msgstr ""
 "\n"
 "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:508
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:495
 msgid "^ ADD"
 msgstr "^ ADD"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:820
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:801
 msgid "apploader (.img)"
 msgstr "apploader (.img)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:185
-msgid "failed to read bk header"
-msgstr "αποτυχία ανάγνωσης της κεφαλίδας bk"
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:375
-#, c-format
-msgid "failed to read data from file: %s"
-msgstr "αποτυχία ανάγνωσης δεδομένων από το αρχείο: %s"
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:97
-msgid "failed to read header"
-msgstr "αποτυχία ανάγνωσης κεφαλίδας"
-
-#: Source/Core/Core/Src/PowerPC/JitInterface.cpp:285
+#: Source/Core/Core/Src/PowerPC/JitInterface.cpp:272
 #, c-format
 msgid "iCacheJIT: Reading Opcode from %x. Please report."
 msgstr "iCacheJIT: Ανάγνωση Opcode από %x. Παρακαλώ να το αναφέρετε."
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:108
-#, c-format
-msgid "not a wii save or read failure for file header size %x"
-msgstr ""
-"δεν είναι σημείο αποθήκευσης wii ή αποτυχία ανάγνωσης κεφαλίδας αρχείου "
-"μεγέθους %x"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:935
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:936
 msgid "s"
 msgstr "."
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:457
-#, c-format
-msgid "unknown cmd 0x%08x"
-msgstr "άγνωστη εντολή 0x%08x"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1110
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1136
 msgid "wxExecute returned -1 on application run!"
 msgstr "Το wxExecute επέστρεψε -1 κατά την εκκίνηση της εφαρμογής!"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:56
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:43
 msgid "zFar Correction: "
 msgstr "zFar Διόρθωση: "
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:51
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:38
 msgid "zNear Correction: "
 msgstr "zNear Διόρθωση: "
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:493
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:480
 msgid "| OR"
 msgstr "| OR"
 
-#~ msgid "%i connected"
-#~ msgstr "%i Συνδεδεμένο"
-
-#~ msgid "Alternate Wiimote Timing"
-#~ msgstr "Εναλλακτικός Χρονισμός Wiimote"
-
-#~ msgid "Interpreter (VERY slow)"
-#~ msgstr "Interpreter (ΠΟΛΥ αργός)"
-
-#~ msgid "JIT Recompiler (recommended)"
-#~ msgstr "JIT Recompiler (προτείνεται)"
-
-#~ msgid "JITIL experimental recompiler"
-#~ msgstr "JITIL δοκιμαστικός recompiler"
+#~ msgid "Accurate VBeam emulation"
+#~ msgstr "Ακριβής VBeam εξομοίωση"
 
 #~ msgid ""
-#~ "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. "
-#~ "No effect on emulated wiimotes."
+#~ "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)"
 #~ msgstr ""
-#~ "Απενεργοποιεί το ηχείο του Wiimote. Διορθώνει τυχαίες αποσυνδέσεις σε "
-#~ "πραγματικά wiimotes. Δεν έχει καμία επίδραση σε εξομοιωμένα wiimotes."
+#~ "Αν τα FPS διακυμαίνονται, αυτή η επιλογή μπορείο να βοηθήσει. (Ενεργό = "
+#~ "Συμβατό, Ανενεργό = Γρήγορο)"
 
-#~ msgid "Pair Up"
-#~ msgstr "Ταίριασμα"
-
-#~ msgid "Reconnect Wiimote Confirm"
-#~ msgstr "Επιβεβαίωση Επανασύνδεσης Wiimote"
-
-#~ msgid ""
-#~ "Wiimote %i has been disconnected by system.\n"
-#~ "Maybe this game doesn't support multi-wiimote,\n"
-#~ "or maybe it is due to idle time out or other reason.\n"
-#~ "Do you want to reconnect immediately?"
-#~ msgstr ""
-#~ "Το Wiimote %i 'εχει αποσυνδεθεί από το σύστημα.\n"
-#~ "Ίσως αυτό το παιχνίδι να μην υποστηρίζει πολλά wiimote,\n"
-#~ "ή πιθανόν να οφείλεται σε χρόνο αδράνειας ή κάποιον άλλο λόγο.\n"
-#~ "Θέλετε να γίνει άμεση επανασύνδεση;"
+#~ msgid "Skip Dest. Alpha Pass"
+#~ msgstr "Παράλειψη Dest. Alpha Pass"
diff --git a/Languages/po/en.po b/Languages/po/en.po
index 989dd5a33d..5ada15fc21 100644
--- a/Languages/po/en.po
+++ b/Languages/po/en.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Dolphin Emu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-10 08:56-0500\n"
+"POT-Creation-Date: 2013-04-18 23:00-0500\n"
 "PO-Revision-Date: 2011-01-06 14:53+0100\n"
 "Last-Translator: BhaaL <bhaal@0x1337.org>\n"
 "Language-Team: \n"
@@ -16,113 +16,115 @@ 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:499
 msgid " (too many to display)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:270
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:273
 #: Source/Core/DolphinWX/Src/NetWindow.cpp:491
 #: Source/Core/DolphinWX/Src/NetWindow.cpp:530
 msgid " Game : "
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:507
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494
 msgid "! NOT"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:70
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:58
 #, c-format
 msgid ""
 "\"%s\" does not exist.\n"
 " Create a new 16MB Memcard?"
 msgstr ""
 
-#: Source/Core/Core/Src/CoreParameter.cpp:142
+#: Source/Core/Core/Src/CoreParameter.cpp:131
 #, c-format
 msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:722
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:721
 #, c-format
 msgid "%08X:  "
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:196
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:183
 #, c-format
 msgid "%1$sCopy%1$s"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:128
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:296
+#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:113
+#, c-format
+msgid "%d samples"
+msgstr ""
+
+#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:112
+#, c-format
+msgid "%d samples (quality level %d)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:121
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:289
 #, c-format
 msgid "%s already exists, overwrite?"
 msgstr ""
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:167
+#: Source/Core/DiscIO/Src/CompressedBlob.cpp:154
 #, c-format
 msgid "%s failed to be scrubbed. Probably the image is corrupt."
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:95
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:83
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
 " Card file size is invalid (0x%x bytes)"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:110
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:98
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
 " Card size is invalid (0x%x bytes)"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:90
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:78
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
 "file is not large enough to be a valid memory card file (0x%x bytes)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:367
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:359
 #, c-format
 msgid "%s failed to open"
 msgstr ""
 
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:97
-#, c-format
-msgid ""
-"%s has an incorrect hash.\n"
-"Would you like to stop now to fix the problem?\n"
-"If you select \"No\", audio will be garbled."
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:360
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:352
 #, c-format
 msgid "%s is a 0 byte file"
 msgstr ""
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:159
+#: Source/Core/DiscIO/Src/CompressedBlob.cpp:146
 #, c-format
 msgid "%s is already compressed! Cannot compress it further."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:345
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:337
 #, c-format
 msgid "%s is too long for the filename, max chars is 45"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:202
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:189
 #, c-format
 msgid "%sDelete%s"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:200
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:187
 #, c-format
 msgid "%sExport GCI%s"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:198
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:185
 #, c-format
 msgid "%sImport GCI%s"
 msgstr ""
@@ -132,222 +134,246 @@ msgstr ""
 msgid "%u Free Blocks; %u Free Dir Entries"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:506
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:493
 msgid "&& AND"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:295
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:301
 msgid "&About..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:99
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:100
 msgid "&Boot from DVD Drive..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:231
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:234
 msgid "&Breakpoints"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:110
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:111
 msgid "&Browse for ISOs..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:192
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:195
 msgid "&Cheats Manager"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:177
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:180
 msgid "&DSP Settings"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:885
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:876
 msgid "&Delete ISO..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:903
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:897
 msgid "&Delete selected ISOs..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:170
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:173
 msgid "&Emulation"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:113
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:114
 msgid "&File"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:335
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:341
 msgid "&Frame Advance"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:352
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:358
 msgid "&Fullscreen"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:176
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:179
 msgid "&Graphics Settings"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:296
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:302
 msgid "&Help"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:180
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:183
 msgid "&Hotkey Settings"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:233
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:236
 msgid "&JIT"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:148
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:149
 msgid "&Load State"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:190
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:193
 msgid "&Memcard Manager (GC)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:232
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:235
 msgid "&Memory"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:313
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:319
 msgid "&Open..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:186
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:189
 msgid "&Options"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:324
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:330
 msgid "&Pause"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:326
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:332
 msgid "&Play"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:867
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:858
 msgid "&Properties"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:348
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:354
 msgid "&Read-only mode"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:319
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:325
 msgid "&Refresh List"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:230
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:233
 msgid "&Registers"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:332
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:338
 msgid "&Reset"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:234
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:237
 msgid "&Sound"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:329
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:335
 msgid "&Stop"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:207
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:210
 msgid "&Tools"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:235
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:238
 msgid "&Video"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:284
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:287
 msgid "&View"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:179
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:182
 msgid "&Wiimote Settings"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:868
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:859
 msgid "&Wiki"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504
 msgid "'"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:59
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:46
 msgid "(-)+zFar"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:54
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:41
 msgid "(-)+zNear"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:99
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:86
 msgid "(UNKNOWN)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:376
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:384
 msgid "(off)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:655
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:654
 msgid "0x44"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+msgid "1.5x Native (960x792)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:158
 msgid "16 bit"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+msgid "1x Native (640x528)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+msgid "2.5x Native (1600x1320)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+msgid "2x Native (1280x1056)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:159
 msgid "32 bit"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:412
 msgid "3D Vision"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+msgid "3x Native (1920x1584)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+msgid "4x Native (2560x2112)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:157
 msgid "8 bit"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:43
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:30
 msgid "<Insert name here>"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:255
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:262
 msgid "<No resolutions found>"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:104
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84
 msgid "<Nothing>"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:162
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:162
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:150
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:150
 msgid "<Press Key>"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286
 msgid "<System>"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695
 msgid "A"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:201
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:235
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:204
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:238
 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:353
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:387
 msgid "A game is not currently running."
 msgstr ""
 
@@ -357,36 +383,36 @@ msgid ""
 "You must manually connect your wiimotes."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:109
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:100
 msgid ""
 "ALERT:\n"
 "\n"
-"NetPlay will currently only work properly when using the following "
-"settings:\n"
-" - Dual Core [OFF]\n"
-" - Audio Throttle [OFF]\n"
-" - DSP-HLE with \"Null Audio\" or DSP-LLE\n"
-" - Manually set the exact number of controllers that will be used to "
-"[Standard Controller]\n"
+"Netplay will only work with the following settings:\n"
+" - Enable Dual Core [OFF]\n"
+" - DSP Emulator Engine Must be the same on all computers!\n"
+" - DSP on Dedicated Thread [OFF]\n"
+" - Framelimit NOT set to [Audio]\n"
+" - Manually set the exact number of controllers to be used to [Standard "
+"Controller]\n"
 "\n"
-"All players should try to use the same Dolphin version and settings.\n"
-"Disable all memory cards or send them to all players before starting.\n"
-"Wiimote support has not been implemented.\n"
+"All players should use the same Dolphin version and settings.\n"
+"All memory cards must be identical between players or disabled.\n"
+"Wiimote support has not been implemented!\n"
 "\n"
-"You must forward TCP port to host!!"
+"The host must have the chosen TCP port open/forwarded!\n"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:111
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:116
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96
 msgid "AM-Baseboard"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:299
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:115
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:300
 msgid "AR Codes"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/AboutDolphin.h:33
+#: Source/Core/DolphinWX/Src/AboutDolphin.h:21
 msgid "About Dolphin"
 msgstr ""
 
@@ -394,15 +420,11 @@ msgstr ""
 msgid "Acceleration"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:463
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473
 msgid "Accuracy:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317
-msgid "Accurate VBeam emulation"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97
 msgid ""
 "Accurately emulate EFB copies.\n"
 "Some games depend on this for certain graphical effects or gameplay "
@@ -411,12 +433,12 @@ msgid ""
 "If unsure, check EFB to Texture instead."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:239
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:239
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:227
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:227
 msgid "Action"
 msgstr ""
 
-#: Source/Core/Core/Src/ARDecrypt.cpp:481
+#: Source/Core/Core/Src/ARDecrypt.cpp:469
 #, c-format
 msgid ""
 "Action Replay Code Decryption Error:\n"
@@ -426,102 +448,102 @@ msgid ""
 "%s"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:667
+#: Source/Core/Core/Src/ActionReplay.cpp:657
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:755
+#: Source/Core/Core/Src/ActionReplay.cpp:745
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide "
 "(%s)"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:547
+#: Source/Core/Core/Src/ActionReplay.cpp:537
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And "
 "Fill (%s)"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:607
+#: Source/Core/Core/Src/ActionReplay.cpp:597
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Write To "
 "Pointer (%s)"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:802
+#: Source/Core/Core/Src/ActionReplay.cpp:792
 #, c-format
 msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:682
+#: Source/Core/Core/Src/ActionReplay.cpp:672
 #, c-format
 msgid ""
 "Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)\n"
 "Master codes are not needed. Do not use master codes."
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:196
+#: Source/Core/Core/Src/ActionReplay.cpp:184
 #, c-format
 msgid "Action Replay Error: invalid AR code line: %s"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:872
+#: Source/Core/Core/Src/ActionReplay.cpp:862
 #, c-format
 msgid "Action Replay: Conditional Code: Invalid Size %08x (%s)"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:945
+#: Source/Core/Core/Src/ActionReplay.cpp:935
 #, c-format
 msgid "Action Replay: Invalid Normal Code Type %08x (%s)"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:896
+#: Source/Core/Core/Src/ActionReplay.cpp:886
 #, c-format
 msgid "Action Replay: Normal Code %i: Invalid subtype %08x (%s)"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:838
+#: Source/Core/Core/Src/ActionReplay.cpp:828
 #, c-format
 msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:242
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:247
 msgid "Adapter:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:76
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:63
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:63
 msgid "Add"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1275
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1301
 msgid "Add ActionReplay Code"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1204
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1230
 msgid "Add Patch"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:507
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:528
 msgid "Add new pane"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:404
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:426
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:811
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:408
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:430
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:792
 msgid "Add..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:90
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:81
 msgid "Address :"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:58
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:45
 msgid ""
 "Adds the specified value to zFar Parameter.\n"
 "Two ways to express the floating point values.\n"
@@ -532,7 +554,7 @@ msgid ""
 "NOTE: Check LogWindow/Console for the acquired values."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:53
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:40
 msgid ""
 "Adds the specified value to zNear Parameter.\n"
 "Two ways to express the floating point values.\n"
@@ -543,48 +565,48 @@ msgid ""
 "NOTE: Check LogWindow/Console for the acquired values."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:755
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:744
 msgid "Adjust the analog control pressure required to activate buttons."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:509
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:522
 msgid "Advanced"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561
 msgid "Advanced Settings"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:584
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:587
 msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:816
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:797
 msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1189
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1190
 msgid "All Gamecube GCM files (gcm)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1390
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1404
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1417
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1431
 msgid "All Save States (sav, s##)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1187
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1188
 msgid "All Wii ISO files (iso)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1207
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1208
 msgid "All compressed GC/Wii ISO files (gcz)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:124
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:104
 msgid "All files (*.*)|*.*"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123
 msgid ""
 "Allows toggling certain options via the hotkeys 3 (Internal Resolution), 4 "
 "(Aspect Ratio), 5 (Copy EFB) and 6 (Fog) within the emulation window.\n"
@@ -592,50 +614,50 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:285
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:272
 msgid "Analyze"
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:298
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:285
 msgid "Angle"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:367
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:375
 msgid "Anisotropic Filtering:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:350
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:358
 msgid "Anti-Aliasing:"
 msgstr ""
 
-#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:308
+#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:299
 msgid "Apploader is the wrong size...is it really an apploader?"
 msgstr ""
 
-#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:302
+#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:293
 msgid "Apploader unable to load from file"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:841
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:822
 msgid "Apploader:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:135
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:122
 msgid "Apply"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124
 msgid ""
 "Apply a post-processing effect after finishing a frame.\n"
 "\n"
 "If unsure, select (off)."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287
 msgid "Arabic"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:614
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:603
 #, c-format
 msgid "Are you sure you want to delete \"%s\"?"
 msgstr ""
@@ -650,206 +672,210 @@ msgstr ""
 msgid "Are you sure you want to delete this file?  It will be gone forever!"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:789
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:277
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:44
+msgid "Arm JIT (experimental)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:285
 msgid "Aspect Ratio:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:70
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:58
 msgid "At least one pane must remain open."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:553
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533
 msgid "Audio"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:694
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675
 msgid "Audio Backend:"
 msgstr ""
 
-#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:41
+#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:28
 msgid "AudioCommon: Error opening AO device.\n"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:275
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283
 msgid "Auto"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:337
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345
 msgid "Auto (Multiple of 640x528)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:337
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345
 msgid "Auto (Window Size)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:297
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305
 msgid "Auto adjust Window Size"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77
 msgid ""
 "Automatically adjusts the window size to your internal resolution.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:697
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696
 msgid "B"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:755
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:754
 msgid "BP register "
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:27
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:14
 msgid "Back"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:698
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:679
 msgid "Backend Settings"
 msgstr ""
 
-#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:60
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:206
+#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:47
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:211
 msgid "Backend:"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:318
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:95
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:305
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:82
 msgid "Background Input"
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:279
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:266
 msgid "Backward"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:264
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:257
 msgid "Bad File Header"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:627
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:621
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:290
 msgid "Banner"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:519
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:529
 msgid "Banner Details"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491
 msgid "Banner:"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:57
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:61
 msgid "Bar"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:308
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:316
 msgid "Basic"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555
 msgid "Basic Settings"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:22
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Bass"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:186
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:174
 msgid "Block Allocation Table checksum failed"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:631
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625
 msgid "Blocks"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:21
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Blue"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:24
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Blue Left"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:25
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Blue Right"
 msgstr ""
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:87
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270
 msgid "Bottom"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:238
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:225
 #, c-format
 msgid "Bound Controls: %lu"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348
 msgid "Broken"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:422
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:428
 msgid "Browse"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:256
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:243
 msgid "Browse for a directory to add"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:422
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:428
 msgid "Browse for an ISO directory..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1079
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1080
 msgid "Browse for output directory"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:328
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:331
 msgid "Buffer:"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:58
 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:119
+#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:106
 msgid "Buttons"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317
 msgid ""
 "Bypass the clearing of the data cache by the DCBZ instruction. Usually leave "
 "this option disabled."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:698
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:697
 msgid "C"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:77
+#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:64
 msgid "C Stick"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:77
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:64
 msgid "C-Stick"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:764
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:763
 msgid "CP reg"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:567
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547
 msgid "CPU Emulator Engine"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:490
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500
 msgid "Cache Display Lists"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88
 msgid ""
 "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n"
 "Decreases emulation speed by some percent (depending on your GPU).\n"
@@ -858,23 +884,38 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1858
+#, c-format
+msgid "Can't find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x"
+msgstr ""
+
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1872
+#, c-format
+msgid "Can't find WiiMote by connection handle %02x"
+msgstr ""
+
+#: Source/Core/Core/Src/HW/DVDInterface.cpp:669
+#: Source/Core/Core/Src/HW/DVDInterface.cpp:679
+msgid "Can't read from DVD_Plugin - DVD-Interface: Fatal Error"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:124
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:28
 msgid "Cancel"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:91
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:178
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:240
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:84
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:171
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:233
 #, c-format
 msgid "Cannot open %s"
 msgstr ""
 
-#: Source/Core/Core/Src/CoreTiming.cpp:141
+#: Source/Core/Core/Src/CoreTiming.cpp:128
 msgid "Cannot unregister events with events pending"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1078
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1061
 #, c-format
 msgid ""
 "Cannot use that file as a memory card.\n"
@@ -882,36 +923,21 @@ msgid ""
 "is not a valid gamecube memory card file"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1108
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1091
 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:1867
-#, 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:1881
-#, c-format
-msgid "Cant find WiiMote by connection handle %02x"
-msgstr ""
-
-#: 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 ""
-
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:52
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:39
 msgid "Caps Lock"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288
 msgid "Catalan"
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:311
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:298
 msgid "Center"
 msgstr ""
 
@@ -919,12 +945,12 @@ msgstr ""
 msgid "Change"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:316
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:322
 msgid "Change &Disc..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:179
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:179
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:167
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:167
 msgid "Change Disc"
 msgstr ""
 
@@ -932,228 +958,228 @@ msgstr ""
 msgid "Change Game"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:515
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495
 msgid ""
 "Change the language of the user interface.\n"
 "Requires restart."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:60
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:47
 msgid "Changes sign to zFar Parameter (after correction)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:55
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:42
 msgid "Changes sign to zNear Parameter (after correction)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:519
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499
 msgid "Changing this will have no effect while the emulator is running!"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:295
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:298
 msgid "Chat"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:47
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:34
 msgid "Cheat Code"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:118
 msgid "Cheat Search"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:38
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:25
 msgid "Cheats Manager"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:633
 msgid "Check Partition Integrity"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:864
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:880
 msgid "Checking integrity..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289
 msgid "Chinese (Simplified)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290
 msgid "Chinese (Traditional)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:818
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:799
 msgid "Choose a DVD root directory:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:822
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803
 msgid "Choose a NAND root directory:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:815
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:796
 msgid "Choose a default ISO:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1236
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1219
 msgid "Choose a directory to add"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1065
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1048
 msgid "Choose a file to open"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:217
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:204
 msgid "Choose a memory card:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:819
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800
 msgid ""
 "Choose file to use as apploader: (applies to discs constructed from "
 "directories only)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:767
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:806
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:781
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:822
 msgid "Choose the folder to extract to"
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:297
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:284
 msgid "Circle Stick"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:52
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:56
 msgid "Classic"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:144
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:43
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:487
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:913
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:137
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:30
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:474
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:904
 msgid "Clear"
 msgstr ""
 
-#: Source/Core/Core/Src/NetPlayServer.cpp:259
+#: Source/Core/Core/Src/NetPlayServer.cpp:263
 msgid ""
 "Client disconnect while game is running!! NetPlay is disabled. You must "
 "manually stop the game."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:298
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:247
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:552
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:578
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:285
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:234
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:562
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:590
 msgid "Close"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:174
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:177
 msgid "Co&nfigure..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:86
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:73
 msgid "Code Info"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:568
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:556
 msgid "Code: "
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:35
 msgid "Command"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:629
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:623
 msgid "Comment"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489
 msgid "Comment:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:893
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:884
 msgid "Compress ISO..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:905
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:899
 msgid "Compress selected ISOs..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1088
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1224
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1089
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1225
 msgid "Compressing ISO"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:429
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:435
 msgid "Config"
 msgstr ""
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:37
-#: Source/Core/DolphinWX/Src/InputConfigDiag.h:135
-#: Source/Core/DolphinWX/Src/InputConfigDiag.h:154
+#: Source/Core/DolphinWX/Src/InputConfigDiag.h:122
+#: Source/Core/DolphinWX/Src/InputConfigDiag.h:141
 msgid "Configure"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:111
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:98
 msgid "Configure Control"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:306
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
 #: Source/Core/DolphinWX/Src/NetWindow.cpp:583
 msgid "Configure Pads"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:429
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:435
 msgid "Configure..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1119
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1147
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1217
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1120
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1218
 msgid "Confirm File Overwrite"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:597
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:577
 msgid "Confirm on Stop"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:83
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:105
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:74
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:96
 msgid "Connect"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:783
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:764
 msgid "Connect USB Keyboard"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:362
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:368
 #, c-format
 msgid "Connect Wiimote %i"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:195
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183
 msgid "Connect Wiimote 1"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184
 msgid "Connect Wiimote 2"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:185
 msgid "Connect Wiimote 3"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:198
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:186
 msgid "Connect Wiimote 4"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/Main.cpp:627
+#: Source/Core/DolphinWX/Src/Main.cpp:655
 msgid "Connecting..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:155
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:156
 msgid "Console"
 msgstr ""
 
@@ -1161,15 +1187,15 @@ msgstr ""
 msgid "Continuous Scanning"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:46
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:33
 msgid "Control"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:189
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:176
 msgid "Convert to GCI"
 msgstr ""
 
-#: Source/Core/Core/Src/CoreParameter.cpp:379
+#: Source/Core/Core/Src/CoreParameter.cpp:368
 msgid "Copy failed"
 msgstr ""
 
@@ -1178,21 +1204,21 @@ msgstr ""
 msgid "Copy to Memcard %c"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:359
 msgid "Core"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:154
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:148
 #, c-format
 msgid "Could not create %s"
 msgstr ""
 
-#: Source/Core/AudioCommon/Src/AudioCommon.cpp:75
+#: Source/Core/AudioCommon/Src/AudioCommon.cpp:62
 #, c-format
 msgid "Could not initialize backend %s."
 msgstr ""
 
-#: Source/Core/Core/Src/CoreParameter.cpp:137
+#: Source/Core/Core/Src/CoreParameter.cpp:126
 #, c-format
 msgid ""
 "Could not read \"%s\".  There is no disc in the drive, or it is not a GC/Wii "
@@ -1200,12 +1226,12 @@ msgid ""
 "most PC DVD drives."
 msgstr ""
 
-#: Source/Core/Core/Src/CoreParameter.cpp:292
+#: Source/Core/Core/Src/CoreParameter.cpp:281
 #, c-format
 msgid "Could not recognize ISO file %s"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:569
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:579
 #, c-format
 msgid "Could not save %s"
 msgstr ""
@@ -1216,197 +1242,201 @@ msgid ""
 "(setting pads while the game is running is not yet supported)"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:123
+#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119
 #, c-format
 msgid ""
 "Could not write memory card file %s.\n"
 "\n"
 "Are you running Dolphin from a CD/DVD, or is the save file maybe write "
-"protected?"
+"protected?\n"
+"\n"
+"Are you receiving this after moving the emulator directory?\n"
+"If so, then you may need to re-specify your memory card location in the "
+"options."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1107
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1133
 msgid "Couldn't find open command for extension 'ini'!"
 msgstr ""
 
-#: Source/Core/Core/Src/BootManager.cpp:146
+#: Source/Core/Core/Src/BootManager.cpp:137
 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:170
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:495
 msgid "Count:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:452
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456
 msgid "Country:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:186
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:562
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:173
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:550
 msgid "Create AR Code"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:543
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:608
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:569
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:641
 msgid "Create new perspective"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:17
 msgid "Creator: "
 msgstr ""
 
-#: Source/Core/Common/Src/MsgHandler.cpp:68
+#: Source/Core/Common/Src/MsgHandler.cpp:54
 msgid "Critical"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562
 msgid "Crop"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119
 msgid ""
 "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:48
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:52
 msgid "Crossfade"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:597
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:600
 #, c-format
-msgid "Current dir changed from %s to %s after wxFileSelector!"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336
-msgid "Custom Projection Hack"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/PHackSettings.h:30
-msgid "Custom Projection Hack Settings"
+msgid "Current directory changed from %s to %s after wxFileSelector!"
 msgstr ""
 
 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:339
+msgid "Custom Projection Hack"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/PHackSettings.h:17
+msgid "Custom Projection Hack Settings"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342
 msgid "Customize some Orthographic Projection parameters."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291
 msgid "Czech"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:698
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:697
 msgid "D"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:89
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
 msgid "D-Pad"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:431
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
 msgid "DSP"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:639
 msgid "DSP Emulator Engine"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:254
 msgid "DSP HLE emulation (fast)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:256
 msgid "DSP LLE interpreter (slow)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660
-msgid "DSP LLE on Thread"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:255
 msgid "DSP LLE recompiler"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:431
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:641
+msgid "DSP on Dedicated Thread"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
 msgid "DSP settings"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:838
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:819
 msgid "DVD Root:"
 msgstr ""
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:239
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:226
 msgid "DVDLowRead - Fatal Error: failed to read from volume"
 msgstr ""
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:333
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:320
 msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:176
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:163
 msgid "Data Size"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468
 msgid "Date:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:528
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:564
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:518
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:557
 msgid "Datel MaxDrive/Pro files(*.sav)"
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:242
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:259
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:267
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:281
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:296
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:229
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:246
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:254
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:268
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:283
 msgid "Dead Zone"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:35
 msgid "Debug"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:521
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534
 msgid "Debugging"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:79
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:66
 msgid "Decimal"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:890
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:881
 msgid "Decompress ISO..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:906
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:900
 msgid "Decompress selected ISOs..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1088
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1224
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1089
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1225
 msgid "Decompressing ISO"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:912
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:903
 msgid "Default"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:835
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:816
 msgid "Default ISO:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:114
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:107
 msgid "Default font"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:32
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:926
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:19
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917
 msgid "Delete"
 msgstr ""
 
@@ -1414,64 +1444,68 @@ msgstr ""
 msgid "Delete Save"
 msgstr ""
 
-#: Source/Core/VideoCommon/Src/AVIDump.cpp:77
+#: Source/Core/VideoCommon/Src/AVIDump.cpp:64
 #, c-format
 msgid "Delete the existing file '%s'?"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:671
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:683
 msgid "Description"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:472
 msgid "Detect"
 msgstr ""
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:233
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:328
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:220
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:315
 msgid ""
 "Detected attempt to read more data from the DVD than fit inside the out "
 "buffer. Clamp."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:127
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:898
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:114
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:889
 msgid "Device"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:798
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:731
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779
 msgid "Device Settings"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:45
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:49
 msgid "Dial"
 msgstr ""
 
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:146
+#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:135
 msgid "Direct3D11"
 msgstr ""
 
-#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:128
+#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:125
 msgid "Direct3D9"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:167
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:155
 msgid ""
 "Directory checksum failed\n"
 " and Directory backup checksum failed"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:433
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:443
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485
 msgid "Disable"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:491
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501
+msgid "Disable Destination Alpha"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:409
 msgid "Disable Fog"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108
 msgid ""
 "Disable any XFB emulation.\n"
 "Speeds up emulation a lot but causes heavy glitches in many games which rely "
@@ -1480,7 +1514,7 @@ msgid ""
 "If unsure, leave this checked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95
 msgid ""
 "Disable emulation of EFB copies.\n"
 "These are often used for post-processing or render-to-texture effects, so "
@@ -1490,52 +1524,60 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:543
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101
+msgid ""
+"Disables emulation of a hardware feature called destination alpha, which is "
+"used in many games for various graphical effects.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:553
 msgid "Disc"
 msgstr ""
 
-#: Source/Core/DiscIO/Src/DriveBlob.cpp:107
-#: Source/Core/DiscIO/Src/DriveBlob.cpp:126
+#: Source/Core/DiscIO/Src/DriveBlob.cpp:94
+#: Source/Core/DiscIO/Src/DriveBlob.cpp:113
 msgid "Disc Read Error"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:312
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:320
 msgid "Display"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104
 msgid ""
 "Display the inputs read by the emulator.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:80
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:67
 msgid "Divide"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:987
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:990
 msgid "Do you want to stop the current emulation?"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:663
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:644
 msgid "Dolby Pro Logic II decoder"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:864
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:856
 msgid "Dolphin"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:183
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:188
 #, c-format
 msgid "Dolphin %s Graphics Configuration"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:292
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:298
 msgid "Dolphin &Web Site"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.h:37
+#: Source/Core/DolphinWX/Src/ConfigMain.h:24
 msgid "Dolphin Configuration"
 msgstr ""
 
@@ -1543,16 +1585,16 @@ msgstr ""
 msgid "Dolphin Emulated Wiimote Configuration"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:394
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:383
 msgid "Dolphin FIFO"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1136
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1153
 msgid "Dolphin GCPad Configuration"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:679
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1074
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:685
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1089
 msgid "Dolphin TAS Movies (*.dtm)"
 msgstr ""
 
@@ -1560,101 +1602,107 @@ msgstr ""
 msgid "Dolphin Wiimote Configuration"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:293
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:299
 msgid "Dolphin at &Google Code"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:364
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:351
 msgid ""
 "Dolphin could not find any GC/Wii ISOs.  Doubleclick here to browse for "
 "files..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:368
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:355
 msgid ""
 "Dolphin is currently set to hide all games.  Doubleclick here to show all "
 "games..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1159
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1160
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1246
 msgid "Dolphin was unable to complete the requested action."
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:275
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:58
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
+msgid ""
+"Doubles the emulated GPU clock rate. May speed up some games (ON = Fast, OFF "
+"= Compatible)"
+msgstr ""
+
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:262
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:45
 msgid "Down"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:54
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:44
 msgid "Download Codes (WiiRD Database)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:297
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:287
 #, c-format
 msgid "Downloaded %lu codes. (added %lu)"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:31
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:35
 msgid "Drums"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:105
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
 msgid "Dummy"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:661
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:642
 msgid "Dump Audio"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:532
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545
 msgid "Dump EFB Target"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546
 msgid "Dump Frames"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543
 msgid "Dump Textures"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114
 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:106
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111
 msgid ""
 "Dump decoded game textures to User/Dump/Textures/<game_id>/\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113
 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:474
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292
 msgid "Dutch"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:112
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:113
 msgid "E&xit"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:441
 msgid "EFB Copies"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:223
+#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:210
 #, c-format
 msgid ""
 "ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least "
@@ -1663,52 +1711,52 @@ msgid ""
 "driver."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:166
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:160
 msgid "EUROPE"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:156
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:143
 msgid "Early Memory Updates"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:447
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:453
 msgid "Edit"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.h:30
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.h:17
 msgid "Edit ActionReplay Code"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:285
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:286
 msgid "Edit Config"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.h:30
+#: Source/Core/DolphinWX/Src/PatchAddEdit.h:17
 msgid "Edit Patch"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:447
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:453
 msgid "Edit current perspective"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:403
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:425
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:407
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:429
 msgid "Edit..."
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:44
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:48
 msgid "Effect"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:425
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435
 msgid "Embedded Frame Buffer"
 msgstr ""
 
-#: Source/Core/Core/Src/Core.cpp:201
+#: Source/Core/Core/Src/Core.cpp:190
 msgid "Emu Thread already running"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110
 msgid ""
 "Emulate XFBs accurately.\n"
 "Slows down emulation a lot and prohibits high-resolution rendering but is "
@@ -1717,7 +1765,7 @@ msgid ""
 "If unsure, check virtual XFB emulation instead."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109
 msgid ""
 "Emulate XFBs using GPU texture objects.\n"
 "Fixes many games which don't work without XFB emulation while not being as "
@@ -1731,7 +1779,7 @@ msgstr ""
 msgid "Emulated Wiimote"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346
 msgid "Emulation State: "
 msgstr ""
 
@@ -1739,7 +1787,7 @@ msgstr ""
 msgid "Enable"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91
 msgid ""
 "Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's "
 "supported by your GPU.\n"
@@ -1749,55 +1797,55 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:111
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:98
 msgid "Enable AR Logging"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324
 msgid "Enable Block Merging"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331
 msgid "Enable Bounding Box Calculation"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:446
 msgid "Enable Cache"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:562
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542
 msgid "Enable Cheats"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310
 msgid "Enable Dual Core"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
 msgid "Enable Dual Core (speedup)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:550
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:563
 msgid "Enable Hotkeys"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311
 msgid "Enable Idle Skipping"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541
 msgid "Enable Idle Skipping (speedup)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312
 msgid "Enable MMU"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:554
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:567
 msgid "Enable Progressive Scan"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757
 msgid "Enable Screen Saver"
 msgstr ""
 
@@ -1805,15 +1853,15 @@ msgstr ""
 msgid "Enable Speaker Data"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
 msgid "Enable WideScreen"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:516
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529
 msgid "Enable Wireframe"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85
 msgid ""
 "Enable anisotropic filtering.\n"
 "Enhances visual quality of textures that are at oblique viewing angles.\n"
@@ -1822,7 +1870,7 @@ msgid ""
 "If unsure, select 1x."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323
 msgid ""
 "Enable fast disc access.  Needed for a few games. (ON = Fast, OFF = "
 "Compatible)"
@@ -1832,7 +1880,7 @@ msgstr ""
 msgid "Enable pages"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76
 msgid ""
 "Enable this if you want the whole screen to be used for rendering.\n"
 "If this is disabled, a render window will be created instead.\n"
@@ -1840,7 +1888,7 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80
 msgid ""
 "Enable this if you want to use the main Dolphin window for rendering rather "
 "than a separate render window.\n"
@@ -1848,34 +1896,34 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:335
 msgid ""
 "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for "
 "ANY other game."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340
 msgid "Enables Custom Projection Hack"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:528
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508
 msgid ""
 "Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on "
 "OSX."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510
 msgid ""
 "Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:512
 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
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81
 msgid ""
 "Enables progressive scan if supported by the emulated software.\n"
 "Most games don't care about this.\n"
@@ -1883,108 +1931,108 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313
 msgid ""
 "Enables the Memory Management Unit, needed for some games. (ON = Compatible, "
 "OFF = Fast)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116
 msgid ""
 "Encode frame dumps using the FFV1 codec.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:40
 msgid "End"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:469
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:280
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:260
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293
 msgid "English"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:329
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:407
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:337
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:417
 msgid "Enhancements"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:607
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:640
 msgid "Enter a name for the new perspective:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:191
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:178
 #, c-format
 msgid "Entry %d/%d"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:85
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:72
 #, c-format
 msgid "Entry 1/%d"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:204
 msgid "Equal"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:45
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:156
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1242
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:32
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:150
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226
 msgid "Error"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/Main.cpp:381
+#: Source/Core/DolphinWX/Src/Main.cpp:409
 msgid "Error loading selected language. Falling back to system default."
 msgstr ""
 
-#: Source/Core/Common/Src/ChunkFile.h:226
+#: Source/Core/Common/Src/ChunkFile.h:221
 #, c-format
 msgid ""
 "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). "
 "Aborting savestate load..."
 msgstr ""
 
-#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:342
+#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:329
 #, c-format
 msgid ""
 "Error: Trying to access %s fonts but they are not loaded. Games may not show "
 "fonts correctly, or crash."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:30
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:17
 msgid "Escape"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:26
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:30
 msgid "Euphoria"
 msgstr ""
 
 #: Source/Core/Core/Src/ArmMemTools.cpp:78
-#: Source/Core/Core/Src/x64MemTools.cpp:217
+#: Source/Core/Core/Src/x64MemTools.cpp:206
 #, c-format
 msgid "Exception handler - access below memory space. %08llx%08llx"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:61
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
 msgid "Execute"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:459
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:446
 msgid "Export Failed"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:639
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:649
 msgid "Export File"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:177
 msgid "Export Recording"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:345
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:351
 msgid "Export Recording..."
 msgstr ""
 
@@ -1992,7 +2040,7 @@ msgstr ""
 msgid "Export Save"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:874
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:865
 msgid "Export Wii save (Experimental)"
 msgstr ""
 
@@ -2000,100 +2048,100 @@ msgstr ""
 msgid "Export all saves"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:80
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:72
 msgid "Export failed, try again?"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:559
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:552
 msgid "Export save as..."
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:297
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:284
 msgid "Extension"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483
 msgid "External Frame Buffer"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:61
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:48
 msgid "Extra Parameter"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:62
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:49
 msgid "Extra Parameter useful in ''Metroid: Other M'' only."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:614
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:624
 msgid "Extract All Files..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:616
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:626
 msgid "Extract Apploader..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:617
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627
 msgid "Extract DOL..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:610
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:620
 msgid "Extract Directory..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:612
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:622
 msgid "Extract File..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:608
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:618
 msgid "Extract Partition..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:724
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:738
 #, c-format
 msgid "Extracting %s"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:707
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:721
 msgid "Extracting All Files"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:707
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:721
 msgid "Extracting Directory"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:710
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:724
 msgid "Extracting..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:892
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:893
 msgid "FIFO Byte"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:45
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:32
 msgid "FIFO Player"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:169
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:163
 msgid "FRANCE"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472
 msgid "FST Size:"
 msgstr ""
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:77
+#: Source/Core/Core/Src/NetPlayClient.cpp:81
 msgid "Failed to Connect!"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:225
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:228
 msgid "Failed to Listen!!"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:307
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:300
 msgid "Failed to download codes."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:827
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:843
 #, c-format
 msgid "Failed to extract to %s!"
 msgstr ""
@@ -2111,26 +2159,30 @@ msgid ""
 "(Choose it from the \"Audio\" tab of the configuration dialog.)"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:116
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:139
+#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:108
+#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:131
 msgid "Failed to load bthprops.cpl"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:100
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:109
+#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:90
+#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:101
 msgid "Failed to load hid.dll"
 msgstr ""
 
-#: Source/Core/Core/Src/Movie.cpp:792
+#: Source/Core/Core/Src/Movie.cpp:783
 #, c-format
 msgid "Failed to read %s"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:151
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:144
 msgid "Failed to read banner.bin"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:223
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:178
+msgid "Failed to read bk header"
+msgstr ""
+
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:211
 #, c-format
 msgid ""
 "Failed to read block %d of the save data\n"
@@ -2138,140 +2190,149 @@ msgid ""
 "FilePosition:%llx"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:148
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:136
 msgid ""
 "Failed to read block allocation table backup correctly\n"
 "(0x8000-0x9FFF)"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:142
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:130
 msgid ""
 "Failed to read block allocation table correctly\n"
 "(0x6000-0x7FFF)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:286
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:279
 #, c-format
 msgid "Failed to read data from file %d"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:136
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:367
+#, c-format
+msgid "Failed to read data from file: %s"
+msgstr ""
+
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:124
 msgid ""
 "Failed to read directory backup correctly\n"
 "(0x4000-0x5FFF)"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:130
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:118
 msgid ""
 "Failed to read directory correctly\n"
 "(0x2000-0x3FFF)"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:119
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:90
+msgid "Failed to read header"
+msgstr ""
+
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:107
 msgid ""
 "Failed to read header correctly\n"
 "(0x0000-0x1FFF)"
 msgstr ""
 
-#: Source/Core/DiscIO/Src/VolumeGC.cpp:61
+#: Source/Core/DiscIO/Src/VolumeGC.cpp:48
 msgid "Failed to read unique ID from disc image"
 msgstr ""
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:84
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:71
 msgid "Failed to write BT.DINF to SYSCONF"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:228
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:221
 msgid "Failed to write bkhdr"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:164
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:157
 #, c-format
 msgid "Failed to write header for %s"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:258
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:251
 #, c-format
 msgid "Failed to write header for file %d"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294
 msgid "Farsi"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477
 msgid "Fast"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315
 msgid "Fast version of the MMU.  Does not work for every game."
 msgstr ""
 
-#: Source/Core/Core/Src/Movie.cpp:1046
+#: Source/Core/Core/Src/Movie.cpp:1037
 #, c-format
 msgid ""
 "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:199
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:202
 msgid "Fifo Player"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:99
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:86
 msgid "File Info"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:304
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:295
 msgid "File contained no codes."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:413
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:400
 msgid "File converted to .gci"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:428
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:415
 msgid ""
 "File could not be opened\n"
 "or does not have a valid extension"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:84
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:72
 #, c-format
 msgid ""
 "File has the extension \"%s\"\n"
 "valid extensions are (.raw/.gcp)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:425
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:412
 msgid "File is not recognized as a memcard"
 msgstr ""
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:294
+#: Source/Core/DiscIO/Src/CompressedBlob.cpp:281
 msgid "File not compressed"
 msgstr ""
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:127
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:109
 #, c-format
 msgid "FileIO: Unknown open mode : 0x%02x"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:531
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:541
 msgid "Filesystem"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1100
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1126
 msgid "Filetype 'ini' is unknown! Will not open!"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:265
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:252
 msgid "Find next"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:266
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:253
 msgid "Find previous"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:632
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626
 msgid "First Block"
 msgstr ""
 
@@ -2279,23 +2340,23 @@ msgstr ""
 msgid "Fix Checksums"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:275
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283
 msgid "Force 16:9"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:275
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283
 msgid "Force 4:3"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:568
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548
 msgid "Force Console as NTSC-J"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406
 msgid "Force Texture Filtering"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90
 msgid ""
 "Force texture filtering even if the emulated game explicitly disabled it.\n"
 "Improves texture quality slightly but causes glitches in some games.\n"
@@ -2303,7 +2364,7 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83
 msgid ""
 "Force the game to output graphics for widescreen resolutions.\n"
 "Causes graphical glitches is some games.\n"
@@ -2311,160 +2372,160 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488
 msgid ""
 "Forces NTSC-J mode for using the Japanese ROM font.\n"
 "Left unchecked, dolphin defaults to NTSC-U and automatically enables this "
 "setting when playing Japanese games."
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:74
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:62
 msgid ""
 "Format as ascii (NTSC\\PAL)?\n"
 "Choose no for sjis (NTSC-J)"
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:278
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:265
 msgid "Forward"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504
 #, c-format
 msgid "Found %d results for '"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:857
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:925
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:858
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:926
 msgid "Frame"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:867
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:868
 msgid "Frame "
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:185
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:173
 msgid "Frame Advance"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:536
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549
 msgid "Frame Dumps use FFV1"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:227
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:214
 msgid "Frame Info"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:116
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:103
 msgid "Frame Range"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:138
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:139
 msgid "Frame S&kipping"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:572
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552
 msgid "Framelimit:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:204
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:191
 msgid "Frames To Record"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547
 msgid "Free Look"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
 msgid "French"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:38
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:42
 msgid "Frets"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:118
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:137
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:105
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:124
 msgid "From"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:426
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:432
 msgid "FullScr"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:256
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263
 msgid "Fullscreen resolution:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:534
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524
 msgid "GCI File(*.gci)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GCMicDlg.h:44
+#: Source/Core/DolphinWX/Src/GCMicDlg.h:31
 msgid "GCMic Configuration"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:432
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
 msgid "GCPad"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:659
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:658
 msgid "GX_CMD_INVL_VC"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:448
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:452
 msgid "Game ID:"
 msgstr ""
 
-#: Source/Core/Core/Src/NetPlay.cpp:229
+#: Source/Core/Core/Src/NetPlay.cpp:216
 msgid "Game is already running!"
 msgstr ""
 
-#: Source/Core/Core/Src/NetPlay.cpp:259
+#: Source/Core/Core/Src/NetPlay.cpp:246
 msgid "Game isn't running!"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:389
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:393
 msgid "Game not found!"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:385
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:389
 msgid "Game-Specific Settings"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:293
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:294
 msgid "GameConfig"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:525
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:515
 msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534
 msgid "Gamecube"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:178
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:181
 msgid "Gamecube &Pad Settings"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:218
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1069
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:205
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1052
 msgid "Gamecube Memory Cards (*.raw,*.gcp)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:432
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
 msgid "Gamecube Pad settings"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:117
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302
 msgid "Gecko Codes"
 msgstr ""
 
-#: Source/Core/Core/Src/GeckoCode.cpp:222
+#: Source/Core/Core/Src/GeckoCode.cpp:214
 #, c-format
 msgid ""
 "GeckoCode failed to run (CT%i CST%i) (%s)\n"
@@ -2473,10 +2534,10 @@ msgid ""
 "directory and restarting Dolphin.)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:172
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:197
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:160
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:160
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:202
 msgid "General"
 msgstr ""
 
@@ -2484,30 +2545,30 @@ msgstr ""
 msgid "General Settings"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:470
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:281
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:316
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:261
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
 msgid "German"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:449
+#: Source/Core/Core/Src/ActionReplay.cpp:439
 #, c-format
 msgid "GetARCode: Index is greater than ar code list size %lu"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:430
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:436
 msgid "Graphics"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:430
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:436
 msgid "Graphics settings"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:205
 msgid "Greater Than"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87
 msgid ""
 "Greatly increases quality of textures generated using render to texture "
 "effects.\n"
@@ -2518,51 +2579,67 @@ msgid ""
 "If unsure, leave this checked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:317
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
 msgid "Greek"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:22
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Green"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:24
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Green Left"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:25
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Green Right"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:35
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:39
 msgid "Guitar"
 msgstr ""
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1259
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1250
 msgid "HCI_CMD_INQUIRY is called, please report!"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:421
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504
+msgid "Hacked Buffer Upload"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431
 msgid "Hacks"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:158
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:146
 msgid "Header checksum failed"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:318
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298
 msgid "Hebrew"
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:313
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:300
 msgid "Height"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:64
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:51
 msgid "Help"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/Main.cpp:209
+#: Source/Core/DolphinWX/Src/Main.cpp:229
+msgid ""
+"Hi,\n"
+"\n"
+"Dolphin requires Mac OS X 10.7 or greater.\n"
+"Unfortunately you're running an old version of OS X.\n"
+"The last Dolphin version to support OS X 10.6 is Dolphin 3.5\n"
+"Please upgrade to 10.7 or greater to use the newest Dolphin version.\n"
+"\n"
+"Sayonara!\n"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/Main.cpp:220
 msgid ""
 "Hi,\n"
 "\n"
@@ -2572,41 +2649,41 @@ msgid ""
 "Sayonara!\n"
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:309
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:296
 msgid "Hide"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:307
 msgid "Hide Mouse Cursor"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79
 msgid ""
 "Hides the mouse cursor if it's on top of the emulation window.\n"
 "\n"
 "If unsure, leave this checked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:54
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41
 msgid "Home"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:85
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:138
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:76
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:141
 msgid "Host"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.h:44
+#: Source/Core/DolphinWX/Src/HotkeyDlg.h:31
 msgid "Hotkey Configuration"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:272
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:272
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:594
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:260
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:260
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574
 msgid "Hotkeys"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:319
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299
 msgid "Hungarian"
 msgstr ""
 
@@ -2614,29 +2691,29 @@ msgstr ""
 msgid "Hybrid Wiimote"
 msgstr ""
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:532
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:519
 #, 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:786
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:773
 #, c-format
 msgid ""
-"IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available "
-"in your nand dump\n"
+"IOCTL_ES_LAUNCH: Game tried to reload an IOS or a title that is not "
+"available in your NAND dump\n"
 "TitleID %016llx.\n"
-" Dolphin will likely hang now"
+" Dolphin will likely hang now."
 msgstr ""
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:313
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:300
 msgid "IOCTL_ES_READCONTENT - bad destination"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729
 msgid "IPL Settings"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269
 msgid "IR"
 msgstr ""
 
@@ -2648,45 +2725,33 @@ msgstr ""
 msgid "IR Sensitivity:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:502
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:512
 msgid "ISO Details"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:830
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:811
 msgid "ISO Directories"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:172
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:166
 msgid "ITALY"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:630
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:624
 msgid "Icon"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332
 msgid ""
 "If checked, the bounding box registers will be updated. Used by the Paper "
 "Mario games."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318
-msgid ""
-"If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505
-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:428
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438
 msgid "Ignore Format Changes"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94
 msgid ""
 "Ignore any changes to the EFB format.\n"
 "Improves performance in many games without any negative effect. Causes "
@@ -2695,7 +2760,7 @@ msgid ""
 "If unsure, leave this checked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93
 msgid ""
 "Ignore any requests of the CPU to read from or write to the EFB.\n"
 "Improves performance in some games, but might disable some gameplay-related "
@@ -2708,35 +2773,27 @@ msgstr ""
 msgid "Import Save"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:59
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:48
 msgid "Import failed, try again?"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:454
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:441
 msgid ""
 "Imported file has gsc extension\n"
 "but does not have a correct header"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:442
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:429
 msgid "Imported file has invalid length"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:451
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:438
 msgid ""
 "Imported file has sav extension\n"
 "but does not have a correct header"
 msgstr ""
 
-#: 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/ISOProperties.cpp:347
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350
 msgid "In Game"
 msgstr ""
 
@@ -2744,125 +2801,129 @@ msgstr ""
 msgid "In-Game"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:34
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305
 msgid "Info"
 msgstr ""
 
-#: Source/Core/Common/Src/MsgHandler.cpp:65
+#: Source/Core/Common/Src/MsgHandler.cpp:51
 msgid "Information"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:481
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:468
 msgid "Input"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:63
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:50
 msgid "Insert"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:176
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:166
 msgid "Insert Encrypted or Decrypted code here..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:763
 msgid "Insert SD Card"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:34
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:21
 msgid "Insert name here.."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:196
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:199
 msgid "Install WAD"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:895
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:888
 msgid "Install to Wii Menu"
 msgstr ""
 
-#: Source/Core/Core/Src/x64MemTools.cpp:252
+#: Source/Core/Core/Src/x64MemTools.cpp:242
 msgid ""
 "InstallExceptionHandler called, but this platform does not yet support it."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1297
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
 msgid "Installing WAD..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:885
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:901
 msgid "Integrity Check Error"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:891
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:907
 msgid "Integrity check completed"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:890
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:906
 msgid "Integrity check completed. No errors have been found."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:882
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:898
 #, 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:552
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532
 msgid "Interface"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:646
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627
 msgid "Interface Settings"
 msgstr ""
 
-#: Source/Core/Core/Src/State.cpp:240
+#: Source/Core/Core/Src/State.cpp:228
 msgid "Internal LZO Error - compression failed"
 msgstr ""
 
-#: Source/Core/Core/Src/State.cpp:348
+#: Source/Core/Core/Src/State.cpp:336
 #, c-format
 msgid ""
 "Internal LZO Error - decompression failed (%d) (%li, %li) \n"
 "Try loading the state again"
 msgstr ""
 
-#: Source/Core/Core/Src/State.cpp:485
+#: Source/Core/Core/Src/State.cpp:473
 msgid "Internal LZO Error - lzo_init() failed"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:344
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:352
 msgid "Internal Resolution:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:42
+msgid "Interpreter (VERY slow)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349
 msgid "Intro"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:194
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:187
 #, c-format
 msgid "Invalid Size(%x) or Magic word (%x)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:612
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:600
 msgid "Invalid Value!"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:462
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:449
 msgid "Invalid bat.map or dir entry"
 msgstr ""
 
-#: Source/Core/Core/Src/CoreTiming.cpp:548
+#: Source/Core/Core/Src/CoreTiming.cpp:553
 #, c-format
 msgid "Invalid event type %i"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:326
+#: Source/Core/Core/Src/HW/DVDInterface.cpp:309
 msgid "Invalid file"
 msgstr ""
 
-#: Source/Core/DiscIO/Src/BannerLoaderGC.cpp:41
+#: Source/Core/DiscIO/Src/BannerLoaderGC.cpp:28
 #, c-format
 msgid ""
 "Invalid opening.bnr found in gcm:\n"
@@ -2870,203 +2931,211 @@ msgid ""
 " You may need to redump this game."
 msgstr ""
 
-#: Source/Core/Core/Src/Movie.cpp:735
+#: Source/Core/Core/Src/Movie.cpp:726
 msgid "Invalid recording file"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:473
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:472
 msgid "Invalid search parameters (no object selected)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:456
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:455
 msgid "Invalid search string (couldn't convert to number)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:444
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:443
 msgid "Invalid search string (only even string lengths supported)"
 msgstr ""
 
-#: Source/Core/Core/Src/Core.cpp:513
+#: Source/Core/Core/Src/Core.cpp:511
 msgid "Invalid state"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:473
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:320
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300
 msgid "Italian"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:183
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:177
 msgid "JAPAN"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:321
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:46
+msgid "JIT Recompiler (recommended)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:47
+msgid "JITIL experimental recompiler"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:279
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
 msgid "Japanese"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:188
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:182
 msgid "KOREA"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78
 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:298
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:306
 msgid "Keep window on top"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:241
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:241
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:229
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:229
 msgid "Key"
 msgstr ""
 
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282
 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:322
 msgid "Korean"
 msgstr ""
 
 #. i18n:  Left
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:57
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:44
 msgid "L"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:39
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:26
 msgid "L Button"
 msgstr ""
 
 #. i18n:  Left-Analog
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:61
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:48
 msgid "L-Analog"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:585
 msgid "Language:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:152
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:153
 msgid "Last Overwritten State"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:159
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:161
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:160
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:162
 msgid "Last Saved State"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:696
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:677
 msgid "Latency:"
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:276
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:55
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:263
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:42
 msgid "Left"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:60
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:64
 msgid "Left Stick"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:257
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:257
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:245
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:245
 msgid ""
 "Left click to detect hotkeys.\n"
 "Enter space to clear."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:689
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:678
 msgid ""
 "Left-click to detect input.\n"
 "Middle-click to clear.\n"
 "Right-click for more options."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:694
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:683
 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:206
 msgid "Less Than"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:565
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545
 msgid "Limit by FPS"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:924
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:915
 msgid "Load"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544
 msgid "Load Custom Textures"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
 msgid "Load State Slot 1"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189
 msgid "Load State Slot 2"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:190
 msgid "Load State Slot 3"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:203
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:191
 msgid "Load State Slot 4"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192
 msgid "Load State Slot 5"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193
 msgid "Load State Slot 6"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:194
 msgid "Load State Slot 7"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:195
 msgid "Load State Slot 8"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:155
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:156
 msgid "Load State..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1332
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1359
 msgid "Load Wii System Menu"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1327
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1354
 #, c-format
 msgid "Load Wii System Menu %d%c"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112
 msgid ""
 "Load custom textures from User/Load/Textures/<game_id>/\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:50
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:37
 msgid "Load preset values from hack patterns available."
 msgstr ""
 
@@ -3074,23 +3143,23 @@ msgstr ""
 msgid "Local"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogWindow.h:51
+#: Source/Core/DolphinWX/Src/LogWindow.h:38
 msgid "Log"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:26
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:13
 msgid "Log Configuration"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:296
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304
 msgid "Log FPS to file"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:96
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83
 msgid "Log Types"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103
 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"
@@ -3098,81 +3167,90 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:81
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:68
 msgid "Logger Outputs"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132
-#: Source/Core/DolphinWX/Src/Frame.cpp:328
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:119
+#: Source/Core/DolphinWX/Src/Frame.cpp:314
 msgid "Logging"
 msgstr ""
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:255
+#: Source/Core/Core/Src/NetPlayClient.cpp:259
 msgid "Lost connection to server!"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:42
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:29
 msgid "M Button"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:119
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:112
 #, c-format
 msgid ""
 "MD5 mismatch\n"
 " %016llx%016llx != %016llx%016llx"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314
 msgid "MMU Speed Hack"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:527
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:563
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:517
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:556
 msgid "MadCatz Gameshark files(*.gcs)"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:51
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:63
+#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:38
 msgid "Main Stick"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460
 msgid "Maker ID:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487
 msgid "Maker:"
 msgstr ""
 
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100
+msgid ""
+"Makes distant objects more visible by removing fog, thus increasing the "
+"overall detail.\n"
+"Disabling fog will break some games which rely on proper fog emulation.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:97
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:100
 msgid "Max"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:448
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:435
 msgid "Memcard already has a save for this title"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:291
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:278
 msgid "Memcard already opened"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:912
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:913
 msgid "Memory Byte"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:225
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:113
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:212
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:93
 msgid "Memory Card"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.h:36
+#: Source/Core/DolphinWX/Src/MemcardManager.h:23
 msgid ""
 "Memory Card Manager WARNING-Make backups before using, should be fixed but "
 "could mangle stuff!"
 msgstr ""
 
-#: Source/Core/Core/Src/CoreParameter.cpp:371
+#: Source/Core/Core/Src/CoreParameter.cpp:360
 #, c-format
 msgid ""
 "Memory Card filename in Slot %c is incorrect\n"
@@ -3183,15 +3261,15 @@ msgid ""
 "Would you like to copy the old file to this new location?\n"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:124
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:112
 msgid "Memorycard filesize does not match the header size"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:50
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:37
 msgid "Menu"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:114
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:94
 msgid "Mic"
 msgstr ""
 
@@ -3200,20 +3278,20 @@ msgstr ""
 msgid "Min"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:580
 msgid "Misc"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:795
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776
 msgid "Misc Settings"
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:240
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:294
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:227
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:281
 msgid "Modifier"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106
 msgid ""
 "Modify textures to show the format they're encoded in. Needs an emulation "
 "reset in most cases.\n"
@@ -3221,20 +3299,20 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:115
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:108
 msgid "Monospaced font"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:305
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:292
 msgid "Motion Plus"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:309
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:86
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:296
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73
 msgid "Motor"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:654
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:666
 msgid ""
 "Move the mouse pointer over an option to display a detailed description.\n"
 "\n"
@@ -3245,224 +3323,235 @@ msgid ""
 "\n"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:75
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:62
 msgid "Multiply"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:651
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:650
 msgid "NOP"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:629
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:628
 msgid "NOTE: Stream size doesn't match actual data length\n"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:129
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:116
 msgid "NP Add"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:124
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:111
 msgid "NP Begin"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:132
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:119
 msgid "NP Decimal"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:126
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:113
 msgid "NP Delete"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:133
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:120
 msgid "NP Divide"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:120
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:107
 msgid "NP Down"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:123
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:110
 msgid "NP End"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:111
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:98
 msgid "NP Enter"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:127
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:114
 msgid "NP Equal"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:116
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:103
 msgid "NP Home"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:125
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:112
 msgid "NP Insert"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:117
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:104
 msgid "NP Left"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:128
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:115
 msgid "NP Multiply"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:122
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:109
 msgid "NP Page Down"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:121
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:108
 msgid "NP Page Up"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:119
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:106
 msgid "NP Right"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:130
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:117
 msgid "NP Separator"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:109
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:96
 msgid "NP Space"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:131
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:118
 msgid "NP Subtract"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:110
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:97
 msgid "NP Tab"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:118
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:105
 msgid "NP Up"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:444
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:59
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:50
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:448
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:46
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:37
 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:25
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:72
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:282
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:553
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:15
 msgid "Name: "
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:526
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:562
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:516
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:555
 msgid "Native GCI files(*.gci)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:161
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:148
 msgid "New Scan"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:206
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:193
 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:801
 msgid "Next Page"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:165
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:152
 msgid "Next Scan"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:68
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:59
 msgid "Nickname :"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:196
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:190
 msgid "No Country (SDK)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:370
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:357
 msgid "No ISOs or WADS found"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:508
-#, c-format
-msgid "No banner file found for title  %s"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:761
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:768
-msgid "No description available"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:514
-msgid "No docking"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:859
-msgid "No file loaded"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:439
-msgid "No free dir index entries"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:895
-msgid "No recorded file"
+#: Source/Core/Core/Src/ConfigManager.h:17
+msgid "No audio output"
 msgstr ""
 
 #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:501
 #, c-format
+msgid "No banner file found for title  %s"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:760
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:767
+msgid "No description available"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:535
+msgid "No docking"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:860
+msgid "No file loaded"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:426
+msgid "No free dir index entries"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:896
+msgid "No recorded file"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:494
+#, c-format
 msgid "No save folder found for title %s"
 msgstr ""
 
+#: Source/Plugins/Plugin_VideoOGL/Src/main.cpp:132
+#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:111
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:23
 #: Source/Core/DolphinWX/Src/NetWindow.cpp:600
 msgid "None"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:323
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303
 msgid "Norwegian Bokmaal"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:203
 msgid "Not Equal"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:804
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:794
 msgid "Not Set"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/Main.cpp:626
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:101
+#, c-format
+msgid "Not a Wii save or read failure for file header size %x"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/Main.cpp:654
 msgid "Not connected"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:309
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:296
 msgid "Notes"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:16
 msgid "Notes: "
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:71
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:74
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:580
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:621
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:629
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:59
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:64
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:613
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:659
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:667
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:31
 msgid "Notice"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:105
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:92
 msgid "Num Lock"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:88
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:75
 msgid "Number Of Codes: "
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:30
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:34
 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26
 msgid "Nunchuk"
 msgstr ""
@@ -3471,107 +3560,107 @@ msgstr ""
 msgid "Nunchuk Acceleration"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:877
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:878
 msgid "Object"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:135
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:122
 msgid "Object Range"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:243
 msgid "Off"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:62
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:49
 msgid "Offset:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:582
 msgid "On-Screen Display Messages"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:436
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:423
 #, c-format
 msgid "Only %d blocks available"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:420
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:178
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:426
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:166
 msgid "Open"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:876
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:867
 msgid "Open &containing folder"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:873
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:864
 msgid "Open Wii &save folder"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:420
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:426
 msgid "Open file..."
 msgstr ""
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:61
+#: Source/Core/AudioCommon/Src/OpenALStream.cpp:48
 #, c-format
 msgid "OpenAL: can't create context for device %s"
 msgstr ""
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:72
+#: Source/Core/AudioCommon/Src/OpenALStream.cpp:59
 msgid "OpenAL: can't find sound devices"
 msgstr ""
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:66
+#: Source/Core/AudioCommon/Src/OpenALStream.cpp:53
 #, c-format
 msgid "OpenAL: can't open device %s"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502
 msgid "OpenCL Texture Decoder"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503
 msgid "OpenMP Texture Decoder"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:317
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:94
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:304
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:81
 msgid "Options"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:22
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Orange"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:468
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:455
 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"
+"and import the saves to a new memcard\n"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:316
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:324
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:509
 msgid "Other"
 msgstr ""
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:206
+#: Source/Core/Core/Src/NetPlayClient.cpp:210
 msgid ""
 "Other client disconnected while game is running!! NetPlay is disabled. You "
 "manually stop the game."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:481
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:468
 msgid "Output"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:342
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:348
 msgid "P&lay Recording..."
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCPad.cpp:30
+#: Source/Core/Core/Src/HW/GCPad.cpp:18
 msgid "Pad"
 msgstr ""
 
@@ -3579,160 +3668,160 @@ msgstr ""
 msgid "Pad "
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:34
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:38
 msgid "Pads"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:108
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:95
 msgid "Page Down"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:107
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:94
 msgid "Page Up"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:35
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:22
 msgid "Paragraph"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:64
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:51
 msgid "Parameters"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:222
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:217
 #, c-format
 msgid "Partition %i"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:296
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:297
 msgid "Patches"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:556
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536
 msgid "Paths"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1538
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1539
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:51
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1565
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1566
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:38
 msgid "Pause"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:128
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:129
 msgid "Pause at end of movie"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:397
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405
 msgid "Per-Pixel Lighting"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352
 msgid "Perfect"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:609
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:642
 #, c-format
 msgid "Perspective %d"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:165
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:424
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1547
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1548
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:152
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:430
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1574
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1575
 msgid "Play"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176
 msgid "Play Recording"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:170
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:170
 msgid "Play/Pause"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351
 msgid "Playable"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:154
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:141
 msgid "Playback Options"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:301
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:304
 msgid "Players"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:988
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:991
 msgid "Please confirm..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:579
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:612
 msgid "Please create a perspective before saving"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:36
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:23
 msgid "Plus-Minus"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:324
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304
 msgid "Polish"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:713
 msgid "Port 1"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714
 msgid "Port 2"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:734
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715
 msgid "Port 3"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716
 msgid "Port 4"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:97
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:130
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:88
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:133
 msgid "Port :"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:325
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305
 msgid "Portuguese"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:326
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306
 msgid "Portuguese (Brazilian)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:391
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:399
 msgid "Post-Processing Effect:"
 msgstr ""
 
-#: Source/Core/Core/Src/Movie.cpp:936
+#: Source/Core/Core/Src/Movie.cpp:927
 #, c-format
 msgid "Premature movie end in PlayController. %u + 8 > %u"
 msgstr ""
 
-#: Source/Core/Core/Src/Movie.cpp:1055
+#: Source/Core/Core/Src/Movie.cpp:1046
 #, c-format
 msgid "Premature movie end in PlayWiimote. %u + %d > %u"
 msgstr ""
 
-#: Source/Core/Core/Src/Movie.cpp:1032
+#: Source/Core/Core/Src/Movie.cpp:1023
 #, c-format
 msgid "Premature movie end in PlayWiimote. %u > %u"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:48
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:35
 msgid "Presets: "
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:205
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:192
 msgid "Prev Page"
 msgstr ""
 
@@ -3740,67 +3829,67 @@ msgstr ""
 msgid "Previous Page"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:183
 msgid "Previous Value"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:60
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:47
 msgid "Print"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:894
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:885
 msgid "Profile"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.h:55
+#: Source/Core/DolphinWX/Src/ISOProperties.h:42
 msgid "Properties"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:283
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:286
 msgid "Purge Cache"
 msgstr ""
 
-#: Source/Core/Common/Src/MsgHandler.cpp:66
+#: Source/Core/Common/Src/MsgHandler.cpp:52
 msgid "Question"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:159
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:316
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:162
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:319
 msgid "Quit"
 msgstr ""
 
 #. i18n:  Right
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:59
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:46
 msgid "R"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:40
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:27
 msgid "R Button"
 msgstr ""
 
 #. i18n:  Right-Analog
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:63
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
 msgid "R-Analog"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:445
 msgid "RAM"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:175
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:169
 msgid "RUSSIA"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:528
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:515
 msgid "Range"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:190
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:178
 msgid "Read-only mode"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:487
 msgid "Real"
 msgstr ""
 
@@ -3816,33 +3905,33 @@ msgstr ""
 msgid "Reconnect Wiimote on State Loading"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:193
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:217
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:791
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:180
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:204
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:790
 msgid "Record"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:174
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:161
 msgid "Recording Info"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:202
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:189
 msgid "Recording Options"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:21
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Red"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:24
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Red Left"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:25
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Red Right"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86
 msgid ""
 "Reduces the amount of aliasing caused by rasterizing 3D graphics.\n"
 "This makes the rendered picture look less blocky.\n"
@@ -3852,255 +3941,261 @@ msgid ""
 msgstr ""
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:60
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:421
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:903
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:427
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:894
 msgid "Refresh"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:180
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:168
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:168
 msgid "Refresh List"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:421
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:427
 msgid "Refresh game list"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:405
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:427
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:77
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:812
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:409
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:431
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:64
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:793
 msgid "Remove"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99
 msgid ""
 "Render the scene as a wireframe.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:308
 msgid "Render to Main Window"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:915
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:172
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:906
 msgid "Reset"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:190
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:177
 msgid "Results"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:29
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:16
 msgid "Return"
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:277
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:57
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464
+msgid "Revision:"
+msgstr ""
+
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:264
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:44
 msgid "Right"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:61
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:65
 msgid "Right Stick"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:85
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:295
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:72
 msgid "Rumble"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:518
-msgid "Run DSP LLE on a dedicated thread (not recommended)."
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498
+msgid ""
+"Run DSP HLE and LLE on a dedicated thread (not recommended: might cause "
+"audio glitches with HLE and freezes with LLE)."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:327
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307
 msgid "Russian"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:149
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:150
 msgid "Sa&ve State"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:465
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475
 msgid "Safe"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:196
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:446
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:925
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:183
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:452
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916
 msgid "Save"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:532
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:522
 msgid "Save GCI as..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
 msgid "Save State Slot 1"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:198
 msgid "Save State Slot 2"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:199
 msgid "Save State Slot 3"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:212
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:212
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200
 msgid "Save State Slot 4"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201
 msgid "Save State Slot 5"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202
 msgid "Save State Slot 6"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:203
 msgid "Save State Slot 7"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204
 msgid "Save State Slot 8"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:151
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:152
 msgid "Save State..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:582
 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:592
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:602
 msgid "Save as..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1203
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1204
 msgid "Save compressed GCM/ISO"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:446
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:452
 msgid "Save current perspective"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1192
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193
 msgid "Save decompressed GCM/ISO"
 msgstr ""
 
-#: Source/Core/Core/Src/Movie.cpp:801
+#: Source/Core/Core/Src/Movie.cpp:792
 #, c-format
 msgid "Savestate movie %s is corrupted, movie recording stopping..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:396
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:404
 msgid "Scaled EFB Copy"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:556
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:543
 #, c-format
 msgid "Scanning %s"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:539
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:526
 msgid "Scanning for ISOs"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:540
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:527
 msgid "Scanning..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:427
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
 msgid "ScrShot"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:106
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:93
 msgid "Scroll Lock"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:264
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:251
 msgid "Search"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:227
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:214
 msgid "Search Filter"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:810
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:791
 msgid "Search Subfolders"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:250
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:237
 msgid "Search current Object"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:254
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:241
 msgid "Search for hex Value:"
 msgstr ""
 
-#: Source/Core/Common/Src/SysConf.h:103 Source/Core/Common/Src/SysConf.h:126
-#: Source/Core/Common/Src/SysConf.h:146 Source/Core/Common/Src/SysConf.h:167
+#: Source/Core/Common/Src/SysConf.h:90 Source/Core/Common/Src/SysConf.h:113
+#: Source/Core/Common/Src/SysConf.h:133 Source/Core/Common/Src/SysConf.h:154
 #, c-format
 msgid "Section %s not found in SYSCONF"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:59
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:490
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:46
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:477
 msgid "Select"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:677
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1072
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:683
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1087
 msgid "Select The Recording File"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1285
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1312
 msgid "Select a Wii WAD file to install"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:70
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74
 msgid ""
 "Select a hardware adapter to use.\n"
 "\n"
 "If unsure, use the first one."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:520
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:510
 msgid "Select a save file to import"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:363
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:366
 msgid "Select floating windows"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:582
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:585
 msgid "Select the file to load"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1241
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1268
 msgid "Select the save file"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1388
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1415
 msgid "Select the state to load"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1429
 msgid "Select the state to save"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82
 msgid ""
 "Select what aspect ratio to use when rendering:\n"
 "Auto: Use the native aspect ratio\n"
@@ -4111,15 +4206,15 @@ msgid ""
 "If unsure, select Auto."
 msgstr ""
 
-#: Source/Core/InputCommon/Src/InputConfig.cpp:61
+#: Source/Core/InputCommon/Src/InputConfig.cpp:48
 msgid "Selected controller profile does not exist"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:116
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:109
 msgid "Selected font"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75
 msgid ""
 "Selects the display resolution used in fullscreen mode.\n"
 "This should always be bigger than or equal to the internal resolution. "
@@ -4129,17 +4224,27 @@ msgid ""
 "If still unsure, use the highest resolution which works for you."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:69
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:70
 msgid ""
 "Selects what graphics API to use internally.\n"
 "Direct3D 9 usually is the fastest one. OpenGL is more accurate though. "
 "Direct3D 11 is somewhere between the two.\n"
 "Note that the Direct3D backends are only available on Windows.\n"
 "\n"
-"If unsure, use Direct3D 9."
+"If unsure, use Direct3D 11."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:288
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72
+msgid ""
+"Selects what graphics API to use internally.\n"
+"Direct3D 9 usually is the fastest one. OpenGL is more accurate though. "
+"Direct3D 11 is somewhere between the two.\n"
+"Note that the Direct3D backends are only available on Windows.\n"
+"\n"
+"If unsure, use OpenGL."
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:291
 msgid "Send"
 msgstr ""
 
@@ -4147,24 +4252,24 @@ msgstr ""
 msgid "Sensor Bar Position:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:77
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:64
 msgid "Separator"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:328
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308
 msgid "Serbian"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:522
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502
 msgid ""
 "Serial Port 1 - This is the port which devices such as the net adapter use"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:488
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:475
 msgid "Set"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:877
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:868
 msgid "Set as &default ISO"
 msgstr ""
 
@@ -4173,134 +4278,134 @@ msgstr ""
 msgid "Set as default Memcard %c"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:460
+#: Source/Core/Core/Src/ActionReplay.cpp:450
 #, c-format
 msgid "SetARCode_IsActive: Index is greater than ar code list size %lu"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:515
 msgid ""
 "Sets the latency (in ms).  Higher values may reduce audio crackling. OpenAL "
 "backend only."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341
 msgid "Settings..."
 msgstr ""
 
-#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:222
+#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:209
 msgid "SetupWiiMem: Cant find setting file"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:291
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:278
 msgid "Shake"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
 msgid "Short Name:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:103
+#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:90
 msgid "Shoulder Buttons"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:217
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:220
 msgid "Show &Console"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:215
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:218
 msgid "Show &Log"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:212
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:215
 msgid "Show &Statusbar"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:210
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:213
 msgid "Show &Toolbar"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:281
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:284
 msgid "Show Drives"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:517
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530
 msgid "Show EFB Copy Regions"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:295
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303
 msgid "Show FPS"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:271
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:274
 msgid "Show France"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:257
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:260
 msgid "Show GameCube"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561
 msgid "Show Input Display"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:273
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:276
 msgid "Show Italy"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:264
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:267
 msgid "Show JAP"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:275
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:278
 msgid "Show Korea"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476
 msgid "Show Language:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:216
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:219
 msgid "Show Log &Configuration"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:266
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:269
 msgid "Show PAL"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:254
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:257
 msgid "Show Platforms"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:263
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:266
 msgid "Show Regions"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:518
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531
 msgid "Show Statistics"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:277
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:280
 msgid "Show Taiwan"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:268
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:271
 msgid "Show USA"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:259
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:262
 msgid "Show Wad"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:255
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:258
 msgid "Show Wii"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491
 msgid "Show a confirmation box before stopping a game."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:512
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492
 msgid ""
 "Show a message box when a potentially serious error has occurred.\n"
 "Disabling this may avoid annoying and non-fatal messages, but it may also "
@@ -4311,11 +4416,11 @@ msgstr ""
 msgid "Show first block"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:130
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:131
 msgid "Show lag counter"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493
 msgid ""
 "Show messages on the emulation screen area.\n"
 "These messages include memory card writes, video backend and CPU "
@@ -4338,7 +4443,7 @@ msgstr ""
 msgid "Show save title"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102
 msgid ""
 "Show the number of frames rendered per second as a measure of emulation "
 "speed.\n"
@@ -4346,54 +4451,42 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:279
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:282
 msgid "Show unknown"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105
 msgid ""
 "Show various statistics.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:319
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:306
 msgid "Sideways Wiimote"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:280
 msgid "Simplified Chinese"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:311
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:298
 msgid "Size"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:696
 msgid "Skip BIOS"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316
 msgid "Skip DCBZ clearing"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:492
-msgid "Skip Dest. Alpha Pass"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:444
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:454
 msgid "Skip EFB Access from CPU"
 msgstr ""
 
-#: 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 ""
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125
 msgid ""
 "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n"
 "Sometimes also increases visual quality.\n"
@@ -4403,25 +4496,25 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:374
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:386
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:380
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:392
 #, c-format
 msgid "Slot %i"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:700
 msgid "Slot A"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:701
 msgid "Slot B"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:62
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:49
 msgid "Snapshot"
 msgstr ""
 
-#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:58
+#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:46
 msgid "Software Renderer"
 msgstr ""
 
@@ -4433,27 +4526,27 @@ msgid ""
 "Do you really want to enable software rendering? If unsure, select 'No'."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:683
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:664
 msgid "Sound Settings"
 msgstr ""
 
-#: Source/Core/AudioCommon/Src/AudioCommon.cpp:77
+#: Source/Core/AudioCommon/Src/AudioCommon.cpp:64
 #, c-format
 msgid "Sound backend %s is not valid."
 msgstr ""
 
-#: Source/Core/AudioCommon/Src/DSoundStream.cpp:59
+#: Source/Core/AudioCommon/Src/DSoundStream.cpp:46
 #, c-format
 msgid "Sound buffer creation failed: %s"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:31
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:18
 msgid "Space"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:329
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309
 msgid "Spanish"
 msgstr ""
 
@@ -4461,7 +4554,7 @@ msgstr ""
 msgid "Speaker Volume:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92
 msgid ""
 "Specifies the resolution used to render at. A high resolution will improve "
 "visual quality a lot but is also quite heavy on performance and might cause "
@@ -4473,63 +4566,63 @@ msgid ""
 "If unsure, select 640x528."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322
 msgid "Speed up Disc Transfer Rate"
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:243
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:230
 msgid "Square Stick"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:107
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87
 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:322
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:37
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:25
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:325
 msgid "Start"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:194
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:197
 msgid "Start &NetPlay"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:339
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:345
 msgid "Start Re&cording"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:175
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:175
 msgid "Start Recording"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:312
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:299
 msgid "State"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:173
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:161
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:161
 msgid "State Saves"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:108
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88
 msgid "Steering Wheel"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:53
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:57
 msgid "Stick"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:420
-#: 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:325
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:419
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:431
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:171
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:171
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:328
 msgid "Stop"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96
 msgid ""
 "Store EFB copies in GPU texture objects.\n"
 "This is not so accurate, but it works well enough for most games and gives a "
@@ -4538,143 +4631,153 @@ msgid ""
 "If unsure, leave this checked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:275
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283
 msgid "Stretch to Window"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:43
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:47
 msgid "Strum"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:78
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:65
 msgid "Subtract"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:77
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:67
 #, c-format
 msgid "Successfully exported file to %s"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:56
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:43
 msgid "Successfully imported save files"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:285
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:272
 msgid "Swing"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:744
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:792
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320
+msgid "Synchronize GPU thread"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321
+msgid ""
+"Synchronizes the GPU and CPU threads to help prevent random freezes in Dual "
+"Core mode. (ON = Compatible, OFF = Fast)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773
 msgid "System Language:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:191
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:185
 msgid "TAIWAN"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:127
-#: Source/Core/DolphinWX/Src/TASInputDlg.h:32
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:128
+#: Source/Core/DolphinWX/Src/TASInputDlg.h:19
 msgid "TAS Input"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:28
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:15
 msgid "Tab"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:510
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:531
 msgid "Tab split"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:37
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:41
 msgid "Table Left"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:38
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:42
 msgid "Table Right"
 msgstr ""
 
-#: 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
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:361
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:181
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:181
 msgid "Take Screenshot"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:109
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89
 msgid "TaruKonga (Bongos)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:472
 msgid "Test"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:444
 msgid "Texture"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:451
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:461
 msgid "Texture Cache"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:519
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:532
 msgid "Texture Format Overlay"
 msgstr ""
 
-#: Source/Core/Core/Src/CoreParameter.cpp:226
+#: Source/Core/Core/Src/CoreParameter.cpp:215
 msgid "The WAD has been installed successfully"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:197
+#: Source/Core/Core/Src/ActionReplay.cpp:185
 msgid "The address is invalid"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:509
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:496
 msgid "The checksum was successfully fixed"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1242
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226
 msgid "The chosen directory is already in the list"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1117
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1216
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1118
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1146
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1217
 #, c-format
 msgid ""
 "The file %s already exists.\n"
 "Do you wish to replace it?"
 msgstr ""
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:51
+#: Source/Core/AudioCommon/Src/WaveFile.cpp:38
 #, c-format
 msgid ""
 "The file %s could not be opened for writing. Please check if it's already "
 "opened by another program."
 msgstr ""
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:44
+#: Source/Core/AudioCommon/Src/WaveFile.cpp:31
 #, c-format
 msgid "The file %s was already open, the file header will not be written."
 msgstr ""
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:332
+#: Source/Core/Core/Src/Boot/Boot.cpp:320
 #, c-format
 msgid "The file you specified (%s) does not exist"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:628
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:666
 msgid "The name can not be empty"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:620
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:658
 msgid "The name can not contain the character ','"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:142
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:129
 msgid "The resulting decrypted AR code doesn't contain any lines."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98
 msgid ""
 "The safer you adjust this, the less likely the emulator will be missing any "
 "texture updates from RAM.\n"
@@ -4682,68 +4785,68 @@ msgid ""
 "If unsure, use the rightmost value."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:445
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:432
 msgid "The save you are trying to copy has an invalid file size"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/Main.cpp:388
+#: Source/Core/DolphinWX/Src/Main.cpp:416
 msgid ""
 "The selected language is not supported by your system. Falling back to "
 "system default."
 msgstr ""
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:43
+#: Source/Core/Core/Src/NetPlayClient.cpp:47
 msgid "The server and client's NetPlay versions are incompatible!"
 msgstr ""
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:40
+#: Source/Core/Core/Src/NetPlayClient.cpp:44
 msgid "The server is full!"
 msgstr ""
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:46
+#: Source/Core/Core/Src/NetPlayClient.cpp:50
 msgid "The server responded: the game is currently running!"
 msgstr ""
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:49
+#: Source/Core/Core/Src/NetPlayClient.cpp:53
 msgid "The server sent an unknown error message!"
 msgstr ""
 
-#: Source/Core/Core/Src/CoreParameter.cpp:119
+#: Source/Core/Core/Src/CoreParameter.cpp:108
 #, c-format
 msgid "The specified file \"%s\" does not exist"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:198
+#: Source/Core/Core/Src/ActionReplay.cpp:186
 msgid "The value is invalid"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:642
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:623
 msgid "Theme:"
 msgstr ""
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:476
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:463
 msgid ""
 "There must be a ticket for 00000001/00000002. Your NAND dump is probably "
 "incomplete."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308
 msgid ""
 "These settings override core Dolphin settings.\n"
 "Undetermined means the game uses Dolphin's setting."
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:355
+#: Source/Core/Core/Src/ActionReplay.cpp:345
 msgid ""
 "This action replay simulator does not support codes that modify Action "
 "Replay itself."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505
 msgid "This could cause slow down in Wii Menu and some games."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118
 msgid ""
 "This feature allows you to change the game's camera.\n"
 "Move the mouse while holding the right mouse button to pan and while holding "
@@ -4755,7 +4858,15 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485
+msgid ""
+"This limits the game speed to the specified number of frames per second "
+"(full speed is 60 for NTSC and 50 for PAL). Alternatively, 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/ConfigMain.cpp:484
 msgid ""
 "This splits the Video and CPU threads, so they can be run on separate "
 "cores.\n"
@@ -4763,75 +4874,75 @@ msgid ""
 "cause occasional crashes/glitches."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:286
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:287
 msgid "This will let you Manually Edit the INI config file"
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:249
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:254
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:236
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:241
 msgid "Threshold"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:288
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:275
 msgid "Tilt"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:628
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:304
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:622
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:291
 msgid "Title"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:125
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:144
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:112
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:131
 msgid "To"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:72
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59
 msgid "Toggle All Log Types"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:426
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:432
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:180
 msgid "Toggle Fullscreen"
 msgstr ""
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:87
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:271
 msgid "Top"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:281
 msgid "Traditional Chinese"
 msgstr ""
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:426
+#: Source/Core/Core/Src/Boot/Boot.cpp:414
 msgid "Tried to load an unknown file type."
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:80
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:67
 msgid "Triggers"
 msgstr ""
 
-#: Source/Core/Common/Src/SysConf.h:91 Source/Core/Common/Src/SysConf.h:114
+#: Source/Core/Common/Src/SysConf.h:78 Source/Core/Common/Src/SysConf.h:101
 msgid "Trying to read from invalid SYSCONF"
 msgstr ""
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:44
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:31
 msgid ""
 "Trying to read from invalid SYSCONF\n"
 "Wiimote bt ids are not available"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:330
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
 msgid "Turkish"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:33
 msgid "Turntable"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:71
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58
 msgid "Type"
 msgstr ""
 
@@ -4839,31 +4950,31 @@ msgstr ""
 msgid "UDP Port:"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:279
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:266
 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12
 msgid "UDP Wiimote"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:199
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:193
 msgid "UNKNOWN"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:756
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:755
 #, c-format
 msgid "UNKNOWN_%02X"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:178
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:172
 msgid "USA"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:225
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:214
 msgid ""
 "Unable to create patch from given values.\n"
 "Entry not modified."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:124
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:111
 #, c-format
 msgid ""
 "Unable to parse line %lu of the entered AR code as a valid encrypted or "
@@ -4871,74 +4982,88 @@ msgid ""
 "Would you like to ignore this line and continue parsing?"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:391
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:397
 #, c-format
 msgid "Undefined %i"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:163
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:164
 msgid "Undo Load State"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:718
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:717
 msgid "Unexpected 0x80 call? Aborting..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:215
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:202
 msgid "Unknown"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:971
+#: Source/Core/Core/Src/HW/DVDInterface.cpp:965
 #, c-format
 msgid "Unknown DVD command %08x - fatal error"
 msgstr ""
 
-#: Source/Core/Common/Src/SysConf.cpp:145
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:444
+#, c-format
+msgid "Unknown command 0x%08x"
+msgstr ""
+
+#: Source/Core/Common/Src/SysConf.cpp:132
 #, c-format
 msgid "Unknown entry type %i in SYSCONF (%s@%x)!"
 msgstr ""
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:228
+#: Source/Core/Core/Src/NetPlayClient.cpp:232
 #, c-format
 msgid "Unknown message received with id : %d"
 msgstr ""
 
-#: Source/Core/Core/Src/NetPlayServer.cpp:504
+#: Source/Core/Core/Src/NetPlayServer.cpp:508
 #, c-format
 msgid "Unknown message with id:%d received from player:%d Kicking player!"
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:274
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:56
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:261
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:43
 msgid "Up"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:108
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:95
 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17
 msgid "Update"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:320
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:307
 msgid "Upright Wiimote"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:777
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758
 msgid "Use EuRGB60 Mode (PAL60)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:294
 msgid "Use Fullscreen"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:575
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:563
 msgid "Use Hex"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:600
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580
 msgid "Use Panic Handlers"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89
+msgid ""
+"Use a hacked upload strategy to stream vertices.\n"
+"This usually speed up, but is forbidden by OpenGL specification and may "
+"causes heavy glitches.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122
 msgid ""
 "Use multiple threads to decode textures.\n"
 "Might result in a speedup (especially on CPUs with more than two cores).\n"
@@ -4946,7 +5071,7 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126
 msgid ""
 "Usually if shader compilation fails, an error message is displayed.\n"
 "However, one may skip the popups to allow interruption free gameplay by "
@@ -4955,53 +5080,57 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:539
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:552
 msgid "Utility"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:285
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:293
 msgid "V-Sync"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:209
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318
+msgid "VBeam Speed Hack"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196
 msgid "Value"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:73
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:60
 msgid "Value:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:572
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:560
 msgid "Value: "
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:51
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:38
 msgid "Verbosity"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:377
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:381
 msgid "Video"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:486
 msgid "Virtual"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:689
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670
 msgid "Volume"
 msgstr ""
 
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:498
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:527
+#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:488
+#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:517
 #, c-format
 msgid "WAD installation failed: error creating %s"
 msgstr ""
 
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:547
+#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:537
 msgid "WAD installation failed: error creating ticket"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84
 msgid ""
 "Wait for vertical blanks in order to reduce tearing.\n"
 "Decreases performance if emulation speed is below 100%.\n"
@@ -5009,25 +5138,25 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/Common/Src/MsgHandler.cpp:67
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46
+#: Source/Core/Common/Src/MsgHandler.cpp:53
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:33
 #: Source/Core/DolphinWX/Src/VideoConfigDiag.h:85
 msgid "Warning"
 msgstr ""
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:291
+#: Source/Core/Core/Src/Boot/Boot.cpp:279
 msgid "Warning - starting DOL in wrong console mode!"
 msgstr ""
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:341
+#: Source/Core/Core/Src/Boot/Boot.cpp:329
 msgid "Warning - starting ELF in wrong console mode!"
 msgstr ""
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:221
+#: Source/Core/Core/Src/Boot/Boot.cpp:209
 msgid "Warning - starting ISO in wrong console mode!"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:519
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:512
 #, c-format
 msgid ""
 "Warning! it is advised to backup all files in the folder:\n"
@@ -5035,7 +5164,7 @@ msgid ""
 "Do you wish to continue?"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:585
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:578
 #, c-format
 msgid ""
 "Warning: This will overwrite any existing saves that are in the folder:\n"
@@ -5044,7 +5173,7 @@ msgid ""
 "Continue?"
 msgstr ""
 
-#: Source/Core/Core/Src/Movie.cpp:844
+#: Source/Core/Core/Src/Movie.cpp:835
 #, c-format
 msgid ""
 "Warning: You loaded a save that's after the end of the current movie. (byte "
@@ -5052,7 +5181,7 @@ msgid ""
 "load this state with read-only mode off."
 msgstr ""
 
-#: Source/Core/Core/Src/Movie.cpp:861
+#: Source/Core/Core/Src/Movie.cpp:852
 #, c-format
 msgid ""
 "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You "
@@ -5060,7 +5189,7 @@ msgid ""
 "only mode off. Otherwise you'll probably get a desync."
 msgstr ""
 
-#: Source/Core/Core/Src/Movie.cpp:870
+#: Source/Core/Core/Src/Movie.cpp:861
 #, c-format
 msgid ""
 "Warning: You loaded a save whose movie mismatches on frame %d. You should "
@@ -5079,49 +5208,49 @@ msgid ""
 "%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d"
 msgstr ""
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:106
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:129
+#: Source/Core/AudioCommon/Src/WaveFile.cpp:93
+#: Source/Core/AudioCommon/Src/WaveFile.cpp:116
 msgid "WaveFileWriter - file not open."
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:56
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:60
 msgid "Whammy"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:404
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:408
 msgid "Widescreen Hack"
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:312
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:299
 msgid "Width"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535
 msgid "Wii"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:372
 msgid "Wii Console"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:844
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:825
 msgid "Wii NAND Root:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:191
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:194
 msgid "Wii Save Import"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1243
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1270
 msgid "Wii save files (*.bin)|*.bin"
 msgstr ""
 
-#: Source/Core/DiscIO/Src/WiiWad.cpp:82
+#: Source/Core/DiscIO/Src/WiiWad.cpp:69
 msgid "WiiWAD: Could not read from file"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/Wiimote.cpp:17
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
+#: Source/Core/Core/Src/HW/Wiimote.cpp:20
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
 msgid "Wiimote"
 msgstr ""
 
@@ -5130,7 +5259,7 @@ msgstr ""
 msgid "Wiimote %i"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/Main.cpp:628
+#: Source/Core/DolphinWX/Src/Main.cpp:656
 msgid "Wiimote Connected"
 msgstr ""
 
@@ -5138,7 +5267,7 @@ msgstr ""
 msgid "Wiimote Motor"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
 msgid "Wiimote settings"
 msgstr ""
 
@@ -5146,105 +5275,123 @@ msgstr ""
 msgid "Wiimotes"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:134
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:121
 msgid "Windows Left"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:136
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:123
 msgid "Windows Menu"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:135
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:122
 msgid "Windows Right"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:131
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:124
 msgid "Word Wrap"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1298
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:864
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1089
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1225
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1325
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:880
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1090
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1226
 msgid "Working..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:338
+msgid "Write memcards (GC)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46
 msgid "Write to Console"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:67
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:54
 msgid "Write to Debugger"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:57
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44
 msgid "Write to File"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:61
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48
 msgid "Write to Window"
 msgstr ""
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:60
+#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:47
 #, c-format
 msgid "XAudio2 CreateSourceVoice failed: %#X"
 msgstr ""
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:114
+#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:101
 #, c-format
 msgid "XAudio2 init failed: %#X"
 msgstr ""
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:124
+#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:111
 #, c-format
 msgid "XAudio2 master voice creation failed: %#X"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:766
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:765
 msgid "XF reg"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:21
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Yellow"
 msgstr ""
 
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:107
+#: Source/Core/Core/Src/DSP/DSPCore.cpp:120
 msgid ""
-"You are using free dsp roms made by Dolphin Team.\n"
-"Only Zelda ucode games will work correctly with them.\n"
+"You are using a free DSP ROM made by the Dolphin Team.\n"
+"All Wii games will work correctly, and most GC games should also work fine, "
+"but the GBA/IPL/CARD UCodes will not work.\n"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:73
+#: Source/Core/Core/Src/DSP/DSPCore.cpp:116
+msgid ""
+"You are using an old free DSP ROM made by the Dolphin Team.\n"
+"Only games using the Zelda UCode will work correctly.\n"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:63
 msgid "You can't close panes that have pages in them."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:207
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:210
 msgid "You must choose a game!!"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:605
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:593
 msgid "You must enter a name!"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:450
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:438
 msgid "You must enter a valid decimal, hexadecimal or octal value."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:603
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:591
 msgid "You must enter a valid profile name."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:936
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:917
 msgid "You must restart Dolphin in order for the change to take effect."
 msgstr ""
 
-#: Source/Core/Core/Src/CoreParameter.cpp:175
+#: Source/Core/Core/Src/DSP/DSPCore.cpp:109
+msgid ""
+"Your DSP ROMs have incorrect hashes.\n"
+"Would you like to stop now to fix the problem?\n"
+"If you select \"No\", audio might be garbled."
+msgstr ""
+
+#: Source/Core/Core/Src/CoreParameter.cpp:164
 msgid ""
 "Your GCM/ISO file seems to be invalid (invalid country).\n"
 "Continue with PAL region?"
 msgstr ""
 
-#: Source/Core/Common/Src/SysConf.cpp:58
+#: Source/Core/Common/Src/SysConf.cpp:45
 #, c-format
 msgid ""
 "Your SYSCONF file is the wrong size.\n"
@@ -5252,25 +5399,25 @@ msgid ""
 "Do you want to generate a new one?"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:334
 msgid "ZTP hack"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:387
+#: Source/Core/Core/Src/ActionReplay.cpp:377
 msgid "Zero 3 code not supported"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:408
+#: Source/Core/Core/Src/ActionReplay.cpp:398
 #, c-format
 msgid "Zero code unknown to dolphin: %08x"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:436
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:460
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:423
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:447
 msgid "[ waiting ]"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107
 msgid ""
 "[BROKEN]\n"
 "Highlight regions the EFB was copied from.\n"
@@ -5278,11 +5425,11 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:91
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:78
 msgid "[Custom]"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120
 msgid ""
 "[EXPERIMENTAL]\n"
 "Aims to speed up emulation by offloading texture decoding to the GPU using "
@@ -5293,7 +5440,7 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121
 msgid ""
 "[EXPERIMENTAL]\n"
 "Speeds up emulation a bit by caching display lists.\n"
@@ -5302,58 +5449,35 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:508
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:495
 msgid "^ ADD"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:820
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:801
 msgid "apploader (.img)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:185
-msgid "failed to read bk header"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:375
-#, c-format
-msgid "failed to read data from file: %s"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:97
-msgid "failed to read header"
-msgstr ""
-
-#: Source/Core/Core/Src/PowerPC/JitInterface.cpp:285
+#: Source/Core/Core/Src/PowerPC/JitInterface.cpp:272
 #, c-format
 msgid "iCacheJIT: Reading Opcode from %x. Please report."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:108
-#, c-format
-msgid "not a wii save or read failure for file header size %x"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:935
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:936
 msgid "s"
 msgstr ""
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:457
-#, c-format
-msgid "unknown cmd 0x%08x"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1110
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1136
 msgid "wxExecute returned -1 on application run!"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:56
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:43
 msgid "zFar Correction: "
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:51
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:38
 msgid "zNear Correction: "
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:493
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:480
 msgid "| OR"
 msgstr ""
diff --git a/Languages/po/es.po b/Languages/po/es.po
index 85d0f240a8..bb555624c5 100644
--- a/Languages/po/es.po
+++ b/Languages/po/es.po
@@ -3,15 +3,17 @@
 # This file is distributed under the same license as the dolphin-emu package.
 #
 # Translators:
-# Dario_ff <dariosamo@gmail.com>, 2011.
-#  <diegoae@gmail.com>, 2013.
-#  <roger---92@hotmail.com>, 2013.
+# Dario_ff <dariosamo@gmail.com>, 2011
+# Petiso_Carambanal <diegoae@gmail.com>, 2013
+# dfersd01 <dfersd@yahoo.com>, 2013
+# Puniasterus <puniasterus@gmail.com>, 2013
+# Puniasterus <puniasterus@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: Dolphin Emulator\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-10 08:56-0500\n"
-"PO-Revision-Date: 2013-02-19 09:31+0000\n"
+"POT-Creation-Date: 2013-04-18 23:00-0500\n"
+"PO-Revision-Date: 2013-04-17 21:42+0000\n"
 "Last-Translator: Puniasterus <puniasterus@gmail.com>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/dolphin-emu/"
 "language/es/)\n"
@@ -21,21 +23,21 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:511
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:499
 msgid " (too many to display)"
 msgstr "(demasiados para mostrar)"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:270
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:273
 #: Source/Core/DolphinWX/Src/NetWindow.cpp:491
 #: Source/Core/DolphinWX/Src/NetWindow.cpp:530
 msgid " Game : "
 msgstr " Juego:"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:507
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494
 msgid "! NOT"
 msgstr "! NO"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:70
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:58
 #, c-format
 msgid ""
 "\"%s\" does not exist.\n"
@@ -44,33 +46,43 @@ msgstr ""
 "\"%s\" no existe.\n"
 "¿Crear una nueva tarjeta de memoria de 16 MB?"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:142
+#: Source/Core/Core/Src/CoreParameter.cpp:131
 #, c-format
 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:722
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:721
 #, c-format
 msgid "%08X:  "
-msgstr "%08X:  "
+msgstr "%08X:"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:196
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:183
 #, c-format
 msgid "%1$sCopy%1$s"
 msgstr "%1$sCopiar%1$s"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:128
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:296
+#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:113
+#, c-format
+msgid "%d samples"
+msgstr "muestras %d"
+
+#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:112
+#, c-format
+msgid "%d samples (quality level %d)"
+msgstr "muestras %d (nivel de calidad %d)"
+
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:121
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:289
 #, c-format
 msgid "%s already exists, overwrite?"
-msgstr "%s ya existe. ¿Remplazar?"
+msgstr "%s ya existe. ¿Sobrescribir?"
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:167
+#: Source/Core/DiscIO/Src/CompressedBlob.cpp:154
 #, c-format
 msgid "%s failed to be scrubbed. Probably the image is corrupt."
 msgstr "%s falló al ser \"scrubbed\". Probablemente la imagen esté corrupta."
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:95
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:83
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
@@ -79,7 +91,7 @@ msgstr ""
 "%s falló al cargar como una tarjeta de memoria.\n"
 "El tamaño de la tarjeta no es válido (0x%x bytes)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:110
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:98
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
@@ -88,7 +100,7 @@ msgstr ""
 "%s falló al cargar como una tarjeta de memoria.\n"
 "El tamaño de la tarjeta no es válido (0x%x bytes)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:90
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:78
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
@@ -98,50 +110,39 @@ msgstr ""
 "El fichero no es suficientemente grande para ser un fichero de tarjeta de "
 "memoria válido(0x%x bytes)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:367
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:359
 #, c-format
 msgid "%s failed to open"
 msgstr "Fallo al abrir %s"
 
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:97
-#, c-format
-msgid ""
-"%s has an incorrect hash.\n"
-"Would you like to stop now to fix the problem?\n"
-"If you select \"No\", audio will be garbled."
-msgstr ""
-"%s tiene un hash incorrecto.\n"
-"¿Deseas detener ahora para reparar el problema?\n"
-"Si seleccionas \"No\", el audio se oirá con ruidos."
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:360
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:352
 #, c-format
 msgid "%s is a 0 byte file"
 msgstr "%s es un archivo de 0 bytes"
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:159
+#: Source/Core/DiscIO/Src/CompressedBlob.cpp:146
 #, c-format
 msgid "%s is already compressed! Cannot compress it further."
 msgstr "¡%s ya está comprimido! No puede comprimirse más."
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:345
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:337
 #, c-format
 msgid "%s is too long for the filename, max chars is 45"
 msgstr ""
 "%s es muy largo para el nombre del archivo, la cantidad máxima de caracteres "
 "es 45"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:202
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:189
 #, c-format
 msgid "%sDelete%s"
 msgstr "%sEliminar%s"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:200
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:187
 #, c-format
 msgid "%sExport GCI%s"
 msgstr "%sExportar GCI%s"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:198
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:185
 #, c-format
 msgid "%sImport GCI%s"
 msgstr "%sImportar GCI%s"
@@ -151,252 +152,275 @@ msgstr "%sImportar GCI%s"
 msgid "%u Free Blocks; %u Free Dir Entries"
 msgstr "%u Bloques libres; %u entradas de dir. libres"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:506
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:493
 msgid "&& AND"
 msgstr "&& Y"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:295
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:301
 msgid "&About..."
 msgstr "&Acerca de..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:99
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:100
 msgid "&Boot from DVD Drive..."
 msgstr "&Iniciar desde unidad de DVD..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:231
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:234
 msgid "&Breakpoints"
 msgstr "&Puntos de partida"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:110
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:111
 msgid "&Browse for ISOs..."
 msgstr "&Buscar ISO en..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:192
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:195
 msgid "&Cheats Manager"
 msgstr "Administrador de &trucos"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:177
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:180
 msgid "&DSP Settings"
 msgstr "&Configuración DSP"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:885
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:876
 msgid "&Delete ISO..."
 msgstr "&Borrar ISO..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:903
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:897
 msgid "&Delete selected ISOs..."
 msgstr "&Borrar ISO seleccionadas..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:170
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:173
 msgid "&Emulation"
 msgstr "&Emulación"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:113
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:114
 msgid "&File"
 msgstr "&Archivo"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:335
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:341
 msgid "&Frame Advance"
 msgstr "Avanzar &frame"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:352
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:358
 msgid "&Fullscreen"
 msgstr "&Pantalla completa"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:176
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:179
 msgid "&Graphics Settings"
 msgstr "&Configuración gráfica"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:296
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:302
 msgid "&Help"
 msgstr "&Ayuda"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:180
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:183
 msgid "&Hotkey Settings"
 msgstr "&Configuración de atajos"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:233
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:236
 msgid "&JIT"
 msgstr "&JIT"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:148
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:149
 msgid "&Load State"
 msgstr "&Cargar estado"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:190
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:193
 msgid "&Memcard Manager (GC)"
 msgstr "&Administrador de tarjetas de memoria (GC)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:232
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:235
 msgid "&Memory"
 msgstr "&Memoria"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:313
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:319
 msgid "&Open..."
 msgstr "&Abrir..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:186
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:189
 msgid "&Options"
 msgstr "&Opciones"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:324
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:330
 msgid "&Pause"
 msgstr "&Pausa"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:326
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:332
 msgid "&Play"
 msgstr "&Jugar"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:867
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:858
 msgid "&Properties"
 msgstr "&Propiedades"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:348
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:354
 msgid "&Read-only mode"
 msgstr "&Modo de solo lectura"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:319
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:325
 msgid "&Refresh List"
 msgstr "&Actualizar lista"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:230
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:233
 msgid "&Registers"
 msgstr "&Registros"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:332
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:338
 msgid "&Reset"
 msgstr "&Reiniciar"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:234
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:237
 msgid "&Sound"
 msgstr "&Sonido"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:329
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:335
 msgid "&Stop"
 msgstr "&Detener"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:207
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:210
 msgid "&Tools"
 msgstr "&Herramientas"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:235
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:238
 msgid "&Video"
 msgstr "&Vídeo"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:284
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:287
 msgid "&View"
 msgstr "&Vista"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:179
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:182
 msgid "&Wiimote Settings"
 msgstr "&Configuración de wiimote"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:868
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:859
 msgid "&Wiki"
 msgstr "&Wiki"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504
 msgid "'"
 msgstr "'"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:59
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:46
 msgid "(-)+zFar"
 msgstr "(-)+zFar"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:54
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:41
 msgid "(-)+zNear"
 msgstr "(-)+zNear"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:99
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:86
 msgid "(UNKNOWN)"
 msgstr "(DESCONOCIDO)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:376
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:384
 msgid "(off)"
 msgstr "(off)"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:655
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:654
 msgid "0x44"
 msgstr "0x44"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+msgid "1.5x Native (960x792)"
+msgstr "1.5x Nativo (960x792)"
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:158
 msgid "16 bit"
 msgstr "16 bit"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+msgid "1x Native (640x528)"
+msgstr "1x Nativo (640x528)"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+msgid "2.5x Native (1600x1320)"
+msgstr "2.5x Nativo (1600x1320)"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+msgid "2x Native (1280x1056)"
+msgstr "2x Nativo (1280x1056)"
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:159
 msgid "32 bit"
 msgstr "32 bit"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:412
 msgid "3D Vision"
 msgstr "Visión 3D"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+msgid "3x Native (1920x1584)"
+msgstr "3x Nativo (1920x1584)"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+msgid "4x Native (2560x2112)"
+msgstr "4x Nativo (2560x2112)"
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:157
 msgid "8 bit"
 msgstr "8 bit"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:43
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:30
 msgid "<Insert name here>"
 msgstr "<Insertar nombre aquí>"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:255
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:262
 msgid "<No resolutions found>"
 msgstr "<No se encontraron resoluciones>"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:104
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84
 msgid "<Nothing>"
 msgstr "<Nada>"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:162
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:162
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:150
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:150
 msgid "<Press Key>"
 msgstr "<Pulsa una tecla>"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286
 msgid "<System>"
 msgstr "<Sistema>"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695
 msgid "A"
 msgstr "A"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:201
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:235
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:204
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:238
 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:353
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:387
 msgid "A game is not currently running."
 msgstr "Ningún juego está emulándose actualmente."
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:68
-#, fuzzy
 msgid ""
 "A supported bluetooth device could not be found.\n"
 "You must manually connect your wiimotes."
 msgstr ""
-"¡No se ha podido encontrar un dispositivo de Bluetooth soportado!\n"
-"Si no estás usando el stack de Microsoft tendrás que emparejarlos "
-"manualmente y usar solo el botón \"Refrescar\"."
+"No se ha podido encontrar un dispositivo de Bluetooth soportado.\n"
+"Tendrás que emparejar manualmente tus Wiimotes."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:109
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:100
+#, fuzzy
 msgid ""
 "ALERT:\n"
 "\n"
-"NetPlay will currently only work properly when using the following "
-"settings:\n"
-" - Dual Core [OFF]\n"
-" - Audio Throttle [OFF]\n"
-" - DSP-HLE with \"Null Audio\" or DSP-LLE\n"
-" - Manually set the exact number of controllers that will be used to "
-"[Standard Controller]\n"
+"Netplay will only work with the following settings:\n"
+" - Enable Dual Core [OFF]\n"
+" - DSP Emulator Engine Must be the same on all computers!\n"
+" - DSP on Dedicated Thread [OFF]\n"
+" - Framelimit NOT set to [Audio]\n"
+" - Manually set the exact number of controllers to be used to [Standard "
+"Controller]\n"
 "\n"
-"All players should try to use the same Dolphin version and settings.\n"
-"Disable all memory cards or send them to all players before starting.\n"
-"Wiimote support has not been implemented.\n"
+"All players should use the same Dolphin version and settings.\n"
+"All memory cards must be identical between players or disabled.\n"
+"Wiimote support has not been implemented!\n"
 "\n"
-"You must forward TCP port to host!!"
+"The host must have the chosen TCP port open/forwarded!\n"
 msgstr ""
 "ALERTA:\n"
 "\n"
@@ -415,17 +439,17 @@ msgstr ""
 "\n"
 "¡¡Debes redireccionar el puerto TCP para alojar!!"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:111
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:116
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96
 msgid "AM-Baseboard"
 msgstr "Placa base AM"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:299
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:115
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:300
 msgid "AR Codes"
 msgstr "Códigos AR"
 
-#: Source/Core/DolphinWX/Src/AboutDolphin.h:33
+#: Source/Core/DolphinWX/Src/AboutDolphin.h:21
 msgid "About Dolphin"
 msgstr "Acerca de Dolphin"
 
@@ -433,15 +457,11 @@ msgstr "Acerca de Dolphin"
 msgid "Acceleration"
 msgstr "Aceleración"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:463
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473
 msgid "Accuracy:"
 msgstr "Exactitud:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317
-msgid "Accurate VBeam emulation"
-msgstr "Emulación de VBeam Precisa"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97
 msgid ""
 "Accurately emulate EFB copies.\n"
 "Some games depend on this for certain graphical effects or gameplay "
@@ -455,12 +475,12 @@ msgstr ""
 "\n"
 "Si no estás seguro, elige EFB a textura."
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:239
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:239
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:227
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:227
 msgid "Action"
 msgstr "Acción"
 
-#: Source/Core/Core/Src/ARDecrypt.cpp:481
+#: Source/Core/Core/Src/ARDecrypt.cpp:469
 #, c-format
 msgid ""
 "Action Replay Code Decryption Error:\n"
@@ -475,7 +495,7 @@ msgstr ""
 "Código culpable:\n"
 "%s"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:667
+#: Source/Core/Core/Src/ActionReplay.cpp:657
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)"
@@ -483,7 +503,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:755
+#: Source/Core/Core/Src/ActionReplay.cpp:745
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide "
@@ -492,7 +512,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:547
+#: Source/Core/Core/Src/ActionReplay.cpp:537
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And "
@@ -501,7 +521,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:607
+#: Source/Core/Core/Src/ActionReplay.cpp:597
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Write To "
@@ -510,13 +530,13 @@ msgstr ""
 "Error de Action Replay: Tamaño no válido (%08x : dirección = %08x) en "
 "Escribir con el puntero (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:802
+#: Source/Core/Core/Src/ActionReplay.cpp:792
 #, c-format
 msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)"
 msgstr ""
 "Error de Action Replay: Valor no válido (%08x) en copia de la memoria (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:682
+#: Source/Core/Core/Src/ActionReplay.cpp:672
 #, c-format
 msgid ""
 "Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)\n"
@@ -526,63 +546,63 @@ msgstr ""
 "implementados (%s)\n"
 "Los códigos maestros no son necesarios. No los uses."
 
-#: Source/Core/Core/Src/ActionReplay.cpp:196
+#: Source/Core/Core/Src/ActionReplay.cpp:184
 #, 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:872
+#: Source/Core/Core/Src/ActionReplay.cpp:862
 #, 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:945
+#: Source/Core/Core/Src/ActionReplay.cpp:935
 #, 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:896
+#: Source/Core/Core/Src/ActionReplay.cpp:886
 #, 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:838
+#: Source/Core/Core/Src/ActionReplay.cpp:828
 #, 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:242
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:247
 msgid "Adapter:"
 msgstr "Adaptador:"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:76
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:63
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:63
 msgid "Add"
 msgstr "Añadir"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1275
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1301
 msgid "Add ActionReplay Code"
 msgstr "Añadir código ActionReplay"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1204
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1230
 msgid "Add Patch"
 msgstr "Añadir parche"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:507
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:528
 msgid "Add new pane"
 msgstr "Añadir nueva ventana"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:404
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:426
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:811
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:408
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:430
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:792
 msgid "Add..."
 msgstr "Añadir..."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:90
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:81
 msgid "Address :"
 msgstr "Dirección:"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:58
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:45
 msgid ""
 "Adds the specified value to zFar Parameter.\n"
 "Two ways to express the floating point values.\n"
@@ -600,7 +620,7 @@ msgstr ""
 "\n"
 "NOTA: Consulta LogWindow/Consola para ver los valores adquiridos."
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:53
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:40
 msgid ""
 "Adds the specified value to zNear Parameter.\n"
 "Two ways to express the floating point values.\n"
@@ -618,49 +638,49 @@ msgstr ""
 "\n"
 "NOTA: Consulta LogWindow/Consola para ver los valores adquiridos."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:755
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:744
 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:509
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:522
 msgid "Advanced"
 msgstr "Avanzado"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561
 msgid "Advanced Settings"
 msgstr "Configuración avanzada"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:584
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:587
 msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)"
 msgstr "Todos los archivos de GC/Wii (elf, dol, gcm, iso, wbfs, ciso, wad)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:816
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:797
 msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)"
 msgstr "Todas las imágenes de GC/Wii (gcm, iso, wbfs, ciso, gcz)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1189
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1190
 msgid "All Gamecube GCM files (gcm)"
 msgstr "Todos los archivos Gamecube GCM (gcm)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1390
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1404
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1417
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1431
 msgid "All Save States (sav, s##)"
 msgstr "Todos los estados guardados (sav, s##)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1187
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1188
 msgid "All Wii ISO files (iso)"
 msgstr "Todos los archivos ISO de Wii (iso)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1207
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1208
 msgid "All compressed GC/Wii ISO files (gcz)"
 msgstr "Todos los archivos ISO comprimidos de GC/Wii (gcz)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:124
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:104
 msgid "All files (*.*)|*.*"
 msgstr "Todos los archivos (*.*)|*.*"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123
 msgid ""
 "Allows toggling certain options via the hotkeys 3 (Internal Resolution), 4 "
 "(Aspect Ratio), 5 (Copy EFB) and 6 (Fog) within the emulation window.\n"
@@ -673,39 +693,39 @@ msgstr ""
 "\n"
 "Si no estás seguro, déjala sin marcar."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:285
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:272
 msgid "Analyze"
 msgstr "Analizar"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:298
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:285
 msgid "Angle"
 msgstr "Ángulo"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:367
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:375
 msgid "Anisotropic Filtering:"
 msgstr "Filtro anisotrópico:"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:350
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:358
 msgid "Anti-Aliasing:"
 msgstr "Antialias:"
 
-#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:308
+#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:299
 msgid "Apploader is the wrong size...is it really an apploader?"
 msgstr "Apploader tiene tamaño incorrecto... ¿Es realmente un apploader?"
 
-#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:302
+#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:293
 msgid "Apploader unable to load from file"
 msgstr "Apploader no puede cargar desde el archivo"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:841
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:822
 msgid "Apploader:"
 msgstr "Apploader:"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:135
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:122
 msgid "Apply"
 msgstr "Aplicar"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124
 msgid ""
 "Apply a post-processing effect after finishing a frame.\n"
 "\n"
@@ -715,11 +735,11 @@ msgstr ""
 "\n"
 "Si no estás seguro, selecciona (off)."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287
 msgid "Arabic"
 msgstr "Árabe"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:614
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:603
 #, c-format
 msgid "Are you sure you want to delete \"%s\"?"
 msgstr "¿Estás seguro de que quieres borrar \"%s\"?"
@@ -736,46 +756,50 @@ msgstr ""
 msgid "Are you sure you want to delete this file?  It will be gone forever!"
 msgstr "¿Seguro que quieres borrar este archivo? ¡Desaparecerá para siempre!"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:789
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:277
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:44
+msgid "Arm JIT (experimental)"
+msgstr "Arm JIT (experimental)"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:285
 msgid "Aspect Ratio:"
 msgstr "Relación de aspecto:"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:70
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:58
 msgid "At least one pane must remain open."
 msgstr "Al menos una ventana debe permancer abierta."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:553
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533
 msgid "Audio"
 msgstr "Audio"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:694
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675
 msgid "Audio Backend:"
 msgstr "Motor de audio:"
 
-#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:41
+#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:28
 msgid "AudioCommon: Error opening AO device.\n"
 msgstr "AudioCommon: Error al abrir dispositivo AO.\n"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:275
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283
 msgid "Auto"
 msgstr "Automático"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:337
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345
 msgid "Auto (Multiple of 640x528)"
 msgstr "Auto (múltiplo de 640x528)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:337
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345
 msgid "Auto (Window Size)"
 msgstr "Auto (tamaño de ventana)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:297
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305
 msgid "Auto adjust Window Size"
 msgstr "Autoajuste del tamaño de la ventana"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77
 msgid ""
 "Automatically adjusts the window size to your internal resolution.\n"
 "\n"
@@ -785,130 +809,130 @@ msgstr ""
 "\n"
 "Si no estás seguro, déjala sin marcar."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:697
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696
 msgid "B"
 msgstr "B"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:755
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:754
 msgid "BP register "
 msgstr "Registro BP"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:27
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:14
 msgid "Back"
 msgstr "Atrás"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:698
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:679
 msgid "Backend Settings"
 msgstr "Configuración del motor"
 
-#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:60
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:206
+#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:47
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:211
 msgid "Backend:"
 msgstr "Motor:"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:318
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:95
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:305
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:82
 msgid "Background Input"
 msgstr "Detectar entrada sin foco"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:279
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:266
 msgid "Backward"
 msgstr "Atrás"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:264
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:257
 msgid "Bad File Header"
 msgstr "Cabecera de archivo incorrecta"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:627
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:621
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:290
 msgid "Banner"
 msgstr "Imagen"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:519
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:529
 msgid "Banner Details"
 msgstr "Detalles de la imagen"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491
 msgid "Banner:"
 msgstr "Imagen:"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:57
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:61
 msgid "Bar"
 msgstr "Barra"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:308
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:316
 msgid "Basic"
 msgstr "Básico"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555
 msgid "Basic Settings"
 msgstr "Configuración básica"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:22
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Bass"
 msgstr "Bajo"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:186
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:174
 msgid "Block Allocation Table checksum failed"
 msgstr "La suma de verificación de la tabla de localización de bloques falló"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:631
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625
 msgid "Blocks"
 msgstr "Bloques"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:21
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Blue"
 msgstr "Azul"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:24
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Blue Left"
 msgstr "Azul izquierda"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:25
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Blue Right"
 msgstr "Azul derecha"
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:87
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270
 msgid "Bottom"
 msgstr "Inferior"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:238
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:225
 #, c-format
 msgid "Bound Controls: %lu"
 msgstr "Controles asignados: %lu"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348
 msgid "Broken"
-msgstr "Quebrado"
+msgstr "Roto"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:422
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:428
 msgid "Browse"
 msgstr "Buscar"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:256
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:243
 msgid "Browse for a directory to add"
 msgstr "Busca un directorio para añadir"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:422
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:428
 msgid "Browse for an ISO directory..."
 msgstr "Buscar un directorio de ISO..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1079
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1080
 msgid "Browse for output directory"
 msgstr "Busca un directorio de salida"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:328
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:331
 msgid "Buffer:"
 msgstr "Búfer:"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:58
 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:119
+#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:106
 msgid "Buttons"
 msgstr "Botones"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317
 msgid ""
 "Bypass the clearing of the data cache by the DCBZ instruction. Usually leave "
 "this option disabled."
@@ -916,31 +940,31 @@ msgstr ""
 "Saltar la limpieza de la caché de la instrucción DCBZ. Normalmente deja esta "
 "opción deshabilitada."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:698
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:697
 msgid "C"
 msgstr "C"
 
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:77
+#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:64
 msgid "C Stick"
 msgstr "Stick C"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:77
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:64
 msgid "C-Stick"
 msgstr "C-Stick"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:764
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:763
 msgid "CP reg"
 msgstr "Registro CP"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:567
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547
 msgid "CPU Emulator Engine"
 msgstr "Emulador de CPU"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:490
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500
 msgid "Cache Display Lists"
 msgstr "Caché de listas de visualización"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88
 msgid ""
 "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n"
 "Decreases emulation speed by some percent (depending on your GPU).\n"
@@ -955,25 +979,40 @@ msgstr ""
 "Esto generalmente es una mejora segura, pero a veces puede causar "
 "problemas.\n"
 "\n"
-"Si no estás seguro, deja esta casilla sin marcar."
+"Si no estás seguro, déjala sin marcar."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1858
+#, c-format
+msgid "Can't 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:1872
+#, c-format
+msgid "Can't find WiiMote by connection handle %02x"
+msgstr "No se puede encontrar un WiiMote por el manejador de conexión %02x"
+
+#: Source/Core/Core/Src/HW/DVDInterface.cpp:669
+#: Source/Core/Core/Src/HW/DVDInterface.cpp:679
+msgid "Can't read from DVD_Plugin - DVD-Interface: Fatal Error"
+msgstr "No se puede leer del DVD_Plugin - DVD-Interface: Error Fatal"
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:124
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:28
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:91
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:178
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:240
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:84
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:171
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:233
 #, c-format
 msgid "Cannot open %s"
 msgstr "No se puede abrir %s"
 
-#: Source/Core/Core/Src/CoreTiming.cpp:141
+#: Source/Core/Core/Src/CoreTiming.cpp:128
 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:1078
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1061
 #, c-format
 msgid ""
 "Cannot use that file as a memory card.\n"
@@ -982,9 +1021,9 @@ msgid ""
 msgstr ""
 "No se puede usar ese archivo como una tarjeta de memoria.\n"
 "%s\n"
-"no es un fichero válido de tarjeta de memoria de Gamecube."
+"no es un fichero válido de tarjeta de memoria de Gamecube"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1108
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1091
 msgid ""
 "Cannot use that file as a memory card.\n"
 "Are you trying to use the same file in both slots?"
@@ -992,30 +1031,15 @@ 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:1867
-#, 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:1881
-#, 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: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"
-
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:52
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:39
 msgid "Caps Lock"
 msgstr "Bloq Mayús"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288
 msgid "Catalan"
 msgstr "Catalán"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:311
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:298
 msgid "Center"
 msgstr "Centro"
 
@@ -1023,12 +1047,12 @@ msgstr "Centro"
 msgid "Change"
 msgstr "Cambiar"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:316
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:322
 msgid "Change &Disc..."
 msgstr "Cambiar &disco..."
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:179
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:179
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:167
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:167
 msgid "Change Disc"
 msgstr "Cambiar disco"
 
@@ -1036,7 +1060,7 @@ msgstr "Cambiar disco"
 msgid "Change Game"
 msgstr "Cambiar juego"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:515
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495
 msgid ""
 "Change the language of the user interface.\n"
 "Requires restart."
@@ -1044,243 +1068,243 @@ msgstr ""
 "Cambiar el idioma de la interfaz de usuario.\n"
 "Requiere reiniciar el programa."
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:60
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:47
 msgid "Changes sign to zFar Parameter (after correction)"
 msgstr "Cambia el signo del parámetro zFar (después de la corrección)"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:55
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:42
 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:519
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499
 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:295
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:298
 msgid "Chat"
 msgstr "Chat"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:47
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:34
 msgid "Cheat Code"
 msgstr "Código de truco"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:118
 msgid "Cheat Search"
 msgstr "Buscar trucos"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:38
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:25
 msgid "Cheats Manager"
 msgstr "Administrador de trucos"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:633
 msgid "Check Partition Integrity"
 msgstr "Comprobar integridad de la partición"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:864
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:880
 msgid "Checking integrity..."
 msgstr "Comprobando integridad..."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289
 msgid "Chinese (Simplified)"
-msgstr "Chino Simplificado"
+msgstr "Chino (Simplificado)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290
 msgid "Chinese (Traditional)"
 msgstr "Chino (Tradicional)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:818
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:799
 msgid "Choose a DVD root directory:"
 msgstr "Escoge un directorio raíz de DVD:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:822
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803
 msgid "Choose a NAND root directory:"
 msgstr "Escoge un directorio raíz para la NAND:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:815
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:796
 msgid "Choose a default ISO:"
 msgstr "Escoge una ISO por defecto:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1236
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1219
 msgid "Choose a directory to add"
 msgstr "Escoge un directorio para añadir"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1065
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1048
 msgid "Choose a file to open"
-msgstr "Escoge un archivo a abrir"
+msgstr "Escoge un archivo para abrir"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:217
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:204
 msgid "Choose a memory card:"
 msgstr "Escoge una tarjeta de memoria:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:819
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800
 msgid ""
 "Choose file to use as apploader: (applies to discs constructed from "
 "directories only)"
 msgstr ""
-"Escoge el archivo que usar como apploader (se aplica a los discos armados a "
-"partir de directorios solamente):"
+"Escoge el archivo a usar como apploader: (se aplica a los discos construidos "
+"a partir de directorios solamente)"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:767
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:806
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:781
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:822
 msgid "Choose the folder to extract to"
 msgstr "Escoge la carpeta de destino"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:297
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:284
 msgid "Circle Stick"
 msgstr "Circle Stick"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:52
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:56
 msgid "Classic"
 msgstr "Clásico"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:144
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:43
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:487
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:913
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:137
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:30
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:474
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:904
 msgid "Clear"
 msgstr "Limpiar"
 
-#: Source/Core/Core/Src/NetPlayServer.cpp:259
+#: Source/Core/Core/Src/NetPlayServer.cpp:263
 msgid ""
 "Client disconnect while game is running!! NetPlay is disabled. You must "
 "manually stop the game."
 msgstr ""
 "¡¡El cliente se desconectó mientras el juego estaba ejecutándose!! NetPlay "
-"ha sido deshabilitado. Debe detener el juego manualmente."
+"ha sido deshabilitado. Debes detener el juego manualmente."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:298
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:247
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:552
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:578
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:285
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:234
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:562
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:590
 msgid "Close"
 msgstr "Cerrar"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:174
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:177
 msgid "Co&nfigure..."
 msgstr "Co&nfigurar..."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:86
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:73
 msgid "Code Info"
 msgstr "Información del código"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:568
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:556
 msgid "Code: "
 msgstr "Código:"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:35
 msgid "Command"
 msgstr "Comando"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:629
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:623
 msgid "Comment"
 msgstr "Comentario"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489
 msgid "Comment:"
 msgstr "Comentario:"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:893
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:884
 msgid "Compress ISO..."
 msgstr "Comprimir ISO..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:905
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:899
 msgid "Compress selected ISOs..."
-msgstr "Comprimir ISO seleccionadas..."
+msgstr "Comprimir ISOs seleccionadas..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1088
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1224
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1089
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1225
 msgid "Compressing ISO"
 msgstr "Comprimiendo ISO"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:429
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:435
 msgid "Config"
 msgstr "Configuración"
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:37
-#: Source/Core/DolphinWX/Src/InputConfigDiag.h:135
-#: Source/Core/DolphinWX/Src/InputConfigDiag.h:154
+#: Source/Core/DolphinWX/Src/InputConfigDiag.h:122
+#: Source/Core/DolphinWX/Src/InputConfigDiag.h:141
 msgid "Configure"
 msgstr "Configurar"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:111
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:98
 msgid "Configure Control"
 msgstr "Configurar control"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:306
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
 #: Source/Core/DolphinWX/Src/NetWindow.cpp:583
 msgid "Configure Pads"
 msgstr "Configurar mandos"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:429
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:435
 msgid "Configure..."
 msgstr "Configurar..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1119
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1147
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1217
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1120
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1218
 msgid "Confirm File Overwrite"
 msgstr "Confirmar sobrescritura de archivo"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:597
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:577
 msgid "Confirm on Stop"
 msgstr "Confirmar al detenerse"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:83
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:105
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:74
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:96
 msgid "Connect"
 msgstr "Conectar"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:783
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:764
 msgid "Connect USB Keyboard"
 msgstr "Conectar teclado USB"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:362
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:368
 #, c-format
 msgid "Connect Wiimote %i"
 msgstr "Conectar Wiimote %i"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:195
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183
 msgid "Connect Wiimote 1"
 msgstr "Conectar Wiimote 1"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184
 msgid "Connect Wiimote 2"
 msgstr "Conectar Wiimote 2"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:185
 msgid "Connect Wiimote 3"
 msgstr "Conectar Wiimote 3"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:198
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:186
 msgid "Connect Wiimote 4"
 msgstr "Conectar Wiimote 4"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:627
+#: Source/Core/DolphinWX/Src/Main.cpp:655
 msgid "Connecting..."
 msgstr "Conectando..."
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:155
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:156
 msgid "Console"
 msgstr "Consola"
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:71
 msgid "Continuous Scanning"
-msgstr ""
+msgstr "Escaneo continuo"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:46
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:33
 msgid "Control"
 msgstr "Control"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:189
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:176
 msgid "Convert to GCI"
 msgstr "Convertir a GCI"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:379
+#: Source/Core/Core/Src/CoreParameter.cpp:368
 msgid "Copy failed"
 msgstr "Fallo al copiar"
 
@@ -1289,37 +1313,37 @@ msgstr "Fallo al copiar"
 msgid "Copy to Memcard %c"
 msgstr "Copiar a tarjeta de memoria %c"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:359
 msgid "Core"
 msgstr "Núcleo"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:154
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:148
 #, c-format
 msgid "Could not create %s"
 msgstr "No se pudo crear %s"
 
-#: Source/Core/AudioCommon/Src/AudioCommon.cpp:75
+#: Source/Core/AudioCommon/Src/AudioCommon.cpp:62
 #, c-format
 msgid "Could not initialize backend %s."
 msgstr "No se pudo inicializar el motor %s."
 
-#: Source/Core/Core/Src/CoreParameter.cpp:137
+#: Source/Core/Core/Src/CoreParameter.cpp:126
 #, c-format
 msgid ""
 "Could not read \"%s\".  There is no disc in the drive, or it is not a GC/Wii "
 "backup.  Please note that original Gamecube and Wii discs cannot be read by "
 "most PC DVD drives."
 msgstr ""
-"No se pudo leer \"%s\".  No hay disco en la unidad, o no es una copia de "
+"No se pudo leer \"%s\". No hay disco en la unidad, o no es una copia de "
 "seguridad de GC/Wii. Ten en cuenta que discos de Gamecube o Wii originales "
 "no pueden ser leídos en la mayoría de los lectores DVD."
 
-#: Source/Core/Core/Src/CoreParameter.cpp:292
+#: Source/Core/Core/Src/CoreParameter.cpp:281
 #, c-format
 msgid "Could not recognize ISO file %s"
 msgstr "No se pudo reconocer el archivo ISO %s"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:569
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:579
 #, c-format
 msgid "Could not save %s"
 msgstr "No se pudo guardar %s"
@@ -1329,29 +1353,37 @@ msgid ""
 "Could not set pads. The player left or the game is currently running!\n"
 "(setting pads while the game is running is not yet supported)"
 msgstr ""
-"No se pudieron definir los pads. ¡El jugador se fue, o el juego está "
-"ejecutándose todavía!\n"
+"No se pudieron definir los pads. ¡El jugador se fue, o el juego aún se está "
+"ejecutándo!\n"
 "(definir los pads mientras el juego está ejecutándose no está permitido "
 "todavía)"
 
-#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:123
+#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119
 #, c-format
 msgid ""
 "Could not write memory card file %s.\n"
 "\n"
 "Are you running Dolphin from a CD/DVD, or is the save file maybe write "
-"protected?"
+"protected?\n"
+"\n"
+"Are you receiving this after moving the emulator directory?\n"
+"If so, then you may need to re-specify your memory card location in the "
+"options."
 msgstr ""
 "No se pudo escribir el archivo de tarjeta de memoria %s.\n"
 "\n"
 "¿Estás ejecutando Dolphin desde un CD/DVD, o el archivo de guardado está "
-"protegido contra escritura?"
+"protegido contra escritura?\n"
+"\n"
+"¿Estás recibiendo esto después de mover el directorio de emulador?\n"
+"Si es así, entonces es posible que tengas que volver a especificar la "
+"ubicación de la tarjeta de memoria en las opciones."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1107
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1133
 msgid "Couldn't find open command for extension 'ini'!"
-msgstr "No se pudo encontrar el comando para abrir la extension 'ini'!"
+msgstr "No se pudo encontrar el comando para abrir la extensión 'ini'!"
 
-#: Source/Core/Core/Src/BootManager.cpp:146
+#: Source/Core/Core/Src/BootManager.cpp:137
 msgid ""
 "Couldn't init the core.\n"
 "Check your configuration."
@@ -1359,38 +1391,38 @@ 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:170
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:495
 msgid "Count:"
 msgstr "Cuenta:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:452
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456
 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:173
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:550
 msgid "Create AR Code"
 msgstr "Crear Código AR"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:543
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:608
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:569
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:641
 msgid "Create new perspective"
 msgstr "Crear nueva perspectiva"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:17
 msgid "Creator: "
 msgstr "Creador:"
 
-#: Source/Core/Common/Src/MsgHandler.cpp:68
+#: Source/Core/Common/Src/MsgHandler.cpp:54
 msgid "Critical"
 msgstr "Crítico"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562
 msgid "Crop"
-msgstr "Cortar"
+msgstr "Recortar"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119
 msgid ""
 "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n"
 "\n"
@@ -1400,140 +1432,141 @@ msgstr ""
 "\n"
 "Si no estás seguro, déjala sin marcar."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:48
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:52
 msgid "Crossfade"
-msgstr "Fundido"
+msgstr "Desvanecimiento cruzado"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:597
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:600
 #, c-format
-msgid "Current dir changed from %s to %s after wxFileSelector!"
-msgstr "El directorio actual cambio de %s a %s luego de wxFileSelector!"
+msgid "Current directory changed from %s to %s after wxFileSelector!"
+msgstr ""
+"¡El directorio actual ha cambiado de %s a %s después de wxFileSelector!"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339
 msgid "Custom Projection Hack"
 msgstr "Hack de proyección personalizado"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.h:30
+#: Source/Core/DolphinWX/Src/PHackSettings.h:17
 msgid "Custom Projection Hack Settings"
 msgstr "Configuración del hack de proyección personalizado"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342
 msgid "Customize some Orthographic Projection parameters."
 msgstr "Personalizar algunos párametros de la proyección ortográfica."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291
 msgid "Czech"
 msgstr "Checo"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:698
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:697
 msgid "D"
 msgstr "D"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:89
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
 msgid "D-Pad"
 msgstr "Pad direccional"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:431
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
 msgid "DSP"
 msgstr "DSP"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:639
 msgid "DSP Emulator Engine"
 msgstr "Motor de emulación DSP"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:254
 msgid "DSP HLE emulation (fast)"
 msgstr "Emulación DSP HLE (rápido)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:256
 msgid "DSP LLE interpreter (slow)"
 msgstr "Intérprete DSP LLE (lento)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660
-msgid "DSP LLE on Thread"
-msgstr "DSP LLE en un proceso"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:255
 msgid "DSP LLE recompiler"
 msgstr "Recompilador DSP LLE"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:431
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:641
+msgid "DSP on Dedicated Thread"
+msgstr "DSP en proceso dedicado"
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
 msgid "DSP settings"
 msgstr "Configuración DSP"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:838
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:819
 msgid "DVD Root:"
 msgstr "Raíz DVD:"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:239
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:226
 msgid "DVDLowRead - Fatal Error: failed to read from volume"
 msgstr "DVDLowRead - Error fatal: fallo al leer del volumen"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:333
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:320
 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:163
 msgid "Data Size"
 msgstr "Tamaño de datos"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468
 msgid "Date:"
 msgstr "Fecha:"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:528
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:564
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:518
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:557
 msgid "Datel MaxDrive/Pro files(*.sav)"
 msgstr "Archivos Datel MaxDrive/Pro(*.sav)"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:242
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:259
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:267
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:281
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:296
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:229
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:246
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:254
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:268
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:283
 msgid "Dead Zone"
 msgstr "Zona muerta"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:35
 msgid "Debug"
 msgstr "Depurar"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:521
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534
 msgid "Debugging"
 msgstr "Depuración"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:79
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:66
 msgid "Decimal"
 msgstr "Decimal"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:890
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:881
 msgid "Decompress ISO..."
 msgstr "Descomprimir ISO..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:906
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:900
 msgid "Decompress selected ISOs..."
 msgstr "Descomprimir ISO seleccionadas..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1088
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1224
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1089
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1225
 msgid "Decompressing ISO"
 msgstr "Descomprimir ISO"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:912
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:903
 msgid "Default"
 msgstr "Predeterminado"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:835
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:816
 msgid "Default ISO:"
 msgstr "ISO por defecto:"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:114
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:107
 msgid "Default font"
 msgstr "Fuente por defecto"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:32
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:926
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:19
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917
 msgid "Delete"
 msgstr "Borrar"
 
@@ -1541,21 +1574,21 @@ msgstr "Borrar"
 msgid "Delete Save"
 msgstr "Borrar guardado"
 
-#: Source/Core/VideoCommon/Src/AVIDump.cpp:77
+#: Source/Core/VideoCommon/Src/AVIDump.cpp:64
 #, c-format
 msgid "Delete the existing file '%s'?"
 msgstr "¿Borrar el archivo existente '%s'?"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:671
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:683
 msgid "Description"
 msgstr "Descripción"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:472
 msgid "Detect"
 msgstr "Detectar"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:233
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:328
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:220
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:315
 msgid ""
 "Detected attempt to read more data from the DVD than fit inside the out "
 "buffer. Clamp."
@@ -1563,29 +1596,29 @@ 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:127
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:898
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:114
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:889
 msgid "Device"
 msgstr "Dispositivo"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:798
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:731
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779
 msgid "Device Settings"
 msgstr "Configuración del dispositivo"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:45
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:49
 msgid "Dial"
 msgstr "Marcar"
 
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:146
+#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:135
 msgid "Direct3D11"
 msgstr "Direct3D11"
 
-#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:128
+#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:125
 msgid "Direct3D9"
 msgstr "Direct3D9"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:167
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:155
 msgid ""
 "Directory checksum failed\n"
 " and Directory backup checksum failed"
@@ -1593,16 +1626,20 @@ msgstr ""
 "Falló la suma de verificación del directorio\n"
 " y falló la suma de verificación del directorio backup"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:433
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:443
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485
 msgid "Disable"
 msgstr "Deshabilitar"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:491
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501
+msgid "Disable Destination Alpha"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:409
 msgid "Disable Fog"
 msgstr "Deshabilitar niebla"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108
 msgid ""
 "Disable any XFB emulation.\n"
 "Speeds up emulation a lot but causes heavy glitches in many games which rely "
@@ -1611,13 +1648,13 @@ msgid ""
 "If unsure, leave this checked."
 msgstr ""
 "Desactivar cualquier emulación de XFB.\n"
-"Aumenta la velocidad de la emulación en gran medida, pero causa fallos "
-"graves en muchos juegos que confian en él (especialmente aplicaciones "
+"Acelera la velocidad de la emulación en gran medida, pero causa fallos "
+"graves en muchos juegos que dependen de ellos (especialmente aplicaciones "
 "caseras).\n"
 "\n"
 "Si no estás seguro, déjala sin marcar."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95
 msgid ""
 "Disable emulation of EFB copies.\n"
 "These are often used for post-processing or render-to-texture effects, so "
@@ -1633,20 +1670,33 @@ msgstr ""
 "\n"
 "Si no estás seguro, déjala sin marcar."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:543
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101
+#, fuzzy
+msgid ""
+"Disables emulation of a hardware feature called destination alpha, which is "
+"used in many games for various graphical effects.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+"Salta el destino del pase alfa usado en muchos juegos para varios efectos "
+"gráficos.\n"
+"\n"
+"Si no estás seguro, déjala sin marcar."
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:553
 msgid "Disc"
 msgstr "Disco"
 
-#: Source/Core/DiscIO/Src/DriveBlob.cpp:107
-#: Source/Core/DiscIO/Src/DriveBlob.cpp:126
+#: Source/Core/DiscIO/Src/DriveBlob.cpp:94
+#: Source/Core/DiscIO/Src/DriveBlob.cpp:113
 msgid "Disc Read Error"
 msgstr "Error de lectura de disco"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:312
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:320
 msgid "Display"
 msgstr "Pantalla"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104
 msgid ""
 "Display the inputs read by the emulator.\n"
 "\n"
@@ -1656,61 +1706,61 @@ msgstr ""
 "\n"
 "Si no estás seguro, déjala sin marcar."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:80
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:67
 msgid "Divide"
 msgstr "Dividir"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:987
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:990
 msgid "Do you want to stop the current emulation?"
 msgstr "¿Quieres detener la emulación actual?"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:663
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:644
 msgid "Dolby Pro Logic II decoder"
 msgstr "Decodificador Dolby Pro Logic II"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:864
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:856
 msgid "Dolphin"
 msgstr "Dolphin"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:183
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:188
 #, c-format
 msgid "Dolphin %s Graphics Configuration"
 msgstr "Configuración gráfica %s de Dolphin"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:292
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:298
 msgid "Dolphin &Web Site"
 msgstr "&Website de Dolphin"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.h:37
+#: Source/Core/DolphinWX/Src/ConfigMain.h:24
 msgid "Dolphin Configuration"
 msgstr "Configuración de Dolphin"
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:183
 msgid "Dolphin Emulated Wiimote Configuration"
-msgstr "Configuración de wiimote emulado de Dolphin"
+msgstr "Configuración de Wiimote emulado de Dolphin"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:394
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:383
 msgid "Dolphin FIFO"
 msgstr "Dolphin FIFO"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1136
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1153
 msgid "Dolphin GCPad Configuration"
 msgstr "Configuración de GCPad Dolphin"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:679
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1074
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:685
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1089
 msgid "Dolphin TAS Movies (*.dtm)"
 msgstr "Películas TAS de Dolphin (*.dtm)"
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:8
 msgid "Dolphin Wiimote Configuration"
-msgstr "Configuración de wiimote de Dolphin"
+msgstr "Configuración de Wiimote de Dolphin"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:293
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:299
 msgid "Dolphin at &Google Code"
 msgstr "Dolphin en &Google Code"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:364
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:351
 msgid ""
 "Dolphin could not find any GC/Wii ISOs.  Doubleclick here to browse for "
 "files..."
@@ -1718,7 +1768,7 @@ msgstr ""
 "Dolphin no pudo encontrar ninguna ISO de GC/Wii. Haz doble clic aquí para "
 "buscar..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:368
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:355
 msgid ""
 "Dolphin is currently set to hide all games.  Doubleclick here to show all "
 "games..."
@@ -1726,50 +1776,59 @@ msgstr ""
 "Dolphin está configurado actualmente para esconder todos los juegos. Haz "
 "doble clic aquí para mostrarlos..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1159
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1160
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1246
 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
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
+#, fuzzy
+msgid ""
+"Doubles the emulated GPU clock rate. May speed up some games (ON = Fast, OFF "
+"= Compatible)"
+msgstr ""
+"Habilitar acceso rápido al disco. Es necesario para algunos juegos. (ON = "
+"Rápido, OFF = Compatible)"
+
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:262
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:45
 msgid "Down"
 msgstr "Abajo"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:54
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:44
 msgid "Download Codes (WiiRD Database)"
 msgstr "Descargar códigos (base de datos de WiiRD)"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:297
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:287
 #, c-format
 msgid "Downloaded %lu codes. (added %lu)"
 msgstr "Se descargaron %lu códigos. (%lu añadidos)"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:31
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:35
 msgid "Drums"
 msgstr "Tambores"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:105
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
 msgid "Dummy"
-msgstr "Dummy"
+msgstr "Falso"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:661
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:642
 msgid "Dump Audio"
 msgstr "Depósito de audio"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:532
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545
 msgid "Dump EFB Target"
 msgstr "Volcar objetivo EFB"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546
 msgid "Dump Frames"
 msgstr "Volcar frames"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543
 msgid "Dump Textures"
 msgstr "Volcar texturas"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114
 msgid ""
 "Dump all rendered frames to an AVI file in User/Dump/Frames/\n"
 "\n"
@@ -1779,7 +1838,7 @@ msgstr ""
 "\n"
 "Si no estás seguro, déjala sin marcar."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111
 msgid ""
 "Dump decoded game textures to User/Dump/Textures/<game_id>/\n"
 "\n"
@@ -1789,7 +1848,7 @@ msgstr ""
 "\n"
 "Si no estás seguro, déjala sin marcar."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113
 msgid ""
 "Dump the contents of EFB copies to User/Dump/Textures/\n"
 "\n"
@@ -1799,21 +1858,21 @@ msgstr ""
 "\n"
 "Si no estás seguro, déjala sin marcar."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:474
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292
 msgid "Dutch"
 msgstr "Holandés"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:112
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:113
 msgid "E&xit"
 msgstr "&Salir"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:441
 msgid "EFB Copies"
 msgstr "Copias de EFB"
 
-#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:223
+#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:210
 #, c-format
 msgid ""
 "ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least "
@@ -1826,52 +1885,52 @@ msgstr ""
 "de Dolphin, puede que se necesite reiniciar para que Windows reconozca el "
 "nuevo controlador."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:166
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:160
 msgid "EUROPE"
 msgstr "EUROPA"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:156
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:143
 msgid "Early Memory Updates"
-msgstr "Actualización frecuente de memoria "
+msgstr "Actualización frecuente de memoria"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:447
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:453
 msgid "Edit"
 msgstr "Editar"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.h:30
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.h:17
 msgid "Edit ActionReplay Code"
 msgstr "Editar código ActionReplay"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:285
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:286
 msgid "Edit Config"
 msgstr "Editar configuración"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.h:30
+#: Source/Core/DolphinWX/Src/PatchAddEdit.h:17
 msgid "Edit Patch"
 msgstr "Editar parche"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:447
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:453
 msgid "Edit current perspective"
 msgstr "Editar perspectiva actual"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:403
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:425
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:407
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:429
 msgid "Edit..."
 msgstr "Editar..."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:44
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:48
 msgid "Effect"
 msgstr "Efecto"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:425
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435
 msgid "Embedded Frame Buffer"
 msgstr "Búfer de fotogramas embebido"
 
-#: Source/Core/Core/Src/Core.cpp:201
+#: Source/Core/Core/Src/Core.cpp:190
 msgid "Emu Thread already running"
 msgstr "El proceso de emulación ya está ejecutándose"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110
 msgid ""
 "Emulate XFBs accurately.\n"
 "Slows down emulation a lot and prohibits high-resolution rendering but is "
@@ -1886,7 +1945,7 @@ msgstr ""
 "\n"
 "Si no estás seguro, activa Emulación virtual de XFB."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109
 msgid ""
 "Emulate XFBs using GPU texture objects.\n"
 "Fixes many games which don't work without XFB emulation while not being as "
@@ -1906,7 +1965,7 @@ msgstr ""
 msgid "Emulated Wiimote"
 msgstr "Wiimote emulado"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346
 msgid "Emulation State: "
 msgstr "Estado de emulación:"
 
@@ -1914,7 +1973,7 @@ msgstr "Estado de emulación:"
 msgid "Enable"
 msgstr "Habilitar"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91
 msgid ""
 "Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's "
 "supported by your GPU.\n"
@@ -1930,72 +1989,71 @@ msgstr ""
 "\n"
 "Si no estás seguro, déjala sin marcar."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:111
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:98
 msgid "Enable AR Logging"
 msgstr "Habilitar Registro de AR"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324
 msgid "Enable Block Merging"
 msgstr "Habilitar asociación de bloques"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331
 msgid "Enable Bounding Box Calculation"
 msgstr "Permitir el cálculo del cuadro delimitador"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:446
 msgid "Enable Cache"
 msgstr "Habilitar caché"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:562
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542
 msgid "Enable Cheats"
 msgstr "Habilitar trucos"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310
 msgid "Enable Dual Core"
 msgstr "Habilitar doble núcleo"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
 msgid "Enable Dual Core (speedup)"
 msgstr "Habilitar doble núcleo (mejora)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:550
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:563
 msgid "Enable Hotkeys"
 msgstr "Habilitar atajos"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311
 msgid "Enable Idle Skipping"
 msgstr "Habilitar salto de fotogramas inactivos"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541
 msgid "Enable Idle Skipping (speedup)"
 msgstr "Habilitar salto de fotogramas inactivos (mejora)"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312
 msgid "Enable MMU"
 msgstr "Habilitar MMU"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:554
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:567
 msgid "Enable Progressive Scan"
 msgstr "Habilitar escaneado progresivo"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757
 msgid "Enable Screen Saver"
 msgstr "Habilitar salvapantallas"
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:75
-#, fuzzy
 msgid "Enable Speaker Data"
-msgstr "Habilitar páginas"
+msgstr "Activar datos de altavoz"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
 msgid "Enable WideScreen"
 msgstr "Habilitar pantalla panorámica"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:516
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529
 msgid "Enable Wireframe"
 msgstr "Habilitar \"alambrado\" (wireframe)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85
 msgid ""
 "Enable anisotropic filtering.\n"
 "Enhances visual quality of textures that are at oblique viewing angles.\n"
@@ -2009,19 +2067,19 @@ msgstr ""
 "\n"
 "Si no estás seguro, elige 1x."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323
 msgid ""
 "Enable fast disc access.  Needed for a few games. (ON = Fast, OFF = "
 "Compatible)"
 msgstr ""
 "Habilitar acceso rápido al disco. Es necesario para algunos juegos. (ON = "
-"Rápido, OFF=Compatible)"
+"Rápido, OFF = Compatible)"
 
 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:803
 msgid "Enable pages"
 msgstr "Habilitar páginas"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76
 msgid ""
 "Enable this if you want the whole screen to be used for rendering.\n"
 "If this is disabled, a render window will be created instead.\n"
@@ -2034,7 +2092,7 @@ msgstr ""
 "\n"
 "Si no estás seguro, déjala sin marcar."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80
 msgid ""
 "Enable this if you want to use the main Dolphin window for rendering rather "
 "than a separate render window.\n"
@@ -2046,7 +2104,7 @@ msgstr ""
 "\n"
 "Si no estás seguro, déjala sin marcar."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:335
 msgid ""
 "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for "
 "ANY other game."
@@ -2054,11 +2112,11 @@ msgstr ""
 "Habilitar esto para acelerar The Legend of Zelda: Twilight Princess. "
 "Deshabilitar para CUALQUIER OTRO juego."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340
 msgid "Enables Custom Projection Hack"
 msgstr "Habilta un hack de proyección personalizado"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:528
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508
 msgid ""
 "Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on "
 "OSX."
@@ -2066,12 +2124,12 @@ msgstr ""
 "Activa la emulación de Dolby Pro Logic II usando 5.1 surround. No disponible "
 "en OSX."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510
 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:532
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:512
 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."
@@ -2079,7 +2137,7 @@ 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
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81
 msgid ""
 "Enables progressive scan if supported by the emulated software.\n"
 "Most games don't care about this.\n"
@@ -2091,15 +2149,15 @@ msgstr ""
 "\n"
 "Si no estás seguro, déjala sin marcar."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313
 msgid ""
 "Enables the Memory Management Unit, needed for some games. (ON = Compatible, "
 "OFF = Fast)"
 msgstr ""
-"Habilita la Unidad de Manejo de Memoria(MMU), necesario para algunos juegos. "
-"(ON = Compatible, OFF = Rápido)"
+"Habilita la Unidad de Manejo de Memoria, necesario para algunos juegos. (ON "
+"= Compatible, OFF = Rápido)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116
 msgid ""
 "Encode frame dumps using the FFV1 codec.\n"
 "\n"
@@ -2109,52 +2167,52 @@ msgstr ""
 "\n"
 "Si no estás seguro, déjala sin marcar."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:40
 msgid "End"
 msgstr "Fin"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:469
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:280
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:260
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293
 msgid "English"
 msgstr "Inglés"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:329
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:407
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:337
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:417
 msgid "Enhancements"
 msgstr "Mejoras"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:607
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:640
 msgid "Enter a name for the new perspective:"
 msgstr "Escribe un nombre para la nueva perspectiva:"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:191
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:178
 #, c-format
 msgid "Entry %d/%d"
 msgstr "Entrada %d/%d"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:85
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:72
 #, c-format
 msgid "Entry 1/%d"
 msgstr "Entrada 1/%d"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:204
 msgid "Equal"
 msgstr "Igual"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:45
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:156
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1242
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:32
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:150
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226
 msgid "Error"
 msgstr "Error"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:381
+#: Source/Core/DolphinWX/Src/Main.cpp:409
 msgid "Error loading selected language. Falling back to system default."
 msgstr ""
 "Error al cargar el idioma seleccionado. Volviendo al predeterminado del "
 "sistema."
 
-#: Source/Core/Common/Src/ChunkFile.h:226
+#: Source/Core/Common/Src/ChunkFile.h:221
 #, c-format
 msgid ""
 "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). "
@@ -2163,7 +2221,7 @@ msgstr ""
 "Error: Después de \"%s\", se ha encontrado %d (0x%X) en vez de la marca de "
 "guardado %d (0x%X). Cancelando carga del guardado..."
 
-#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:342
+#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:329
 #, c-format
 msgid ""
 "Error: Trying to access %s fonts but they are not loaded. Games may not show "
@@ -2172,38 +2230,38 @@ msgstr ""
 "Error: Se intentó acceder a %s fuentes, pero no han sido cargadas. Los "
 "juegos pueden no mostrar las fuentes correctamente, o tener errores."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:30
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:17
 msgid "Escape"
 msgstr "Escape"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:26
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:30
 msgid "Euphoria"
 msgstr "Euforia"
 
 #: Source/Core/Core/Src/ArmMemTools.cpp:78
-#: Source/Core/Core/Src/x64MemTools.cpp:217
+#: Source/Core/Core/Src/x64MemTools.cpp:206
 #, c-format
 msgid "Exception handler - access below memory space. %08llx%08llx"
 msgstr "Exception handler - acceso debajo del espacio de memoria. %08llx%08llx"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:61
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
 msgid "Execute"
 msgstr "Ejecutar"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:459
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:446
 msgid "Export Failed"
 msgstr "Fallo al exportar"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:639
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:649
 msgid "Export File"
 msgstr "Exportar archivo"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:177
 msgid "Export Recording"
 msgstr "Exportar grabación"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:345
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:351
 msgid "Export Recording..."
 msgstr "Exportar grabación..."
 
@@ -2211,7 +2269,7 @@ msgstr "Exportar grabación..."
 msgid "Export Save"
 msgstr "Exportar guardado"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:874
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:865
 msgid "Export Wii save (Experimental)"
 msgstr "Exportar guardado a uno de Wii (experimental)"
 
@@ -2219,100 +2277,100 @@ msgstr "Exportar guardado a uno de Wii (experimental)"
 msgid "Export all saves"
 msgstr "Exportar todos los guardados"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:80
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:72
 msgid "Export failed, try again?"
 msgstr "Fallo al exportar. ¿Intentar de nuevo?"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:559
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:552
 msgid "Export save as..."
 msgstr "Exportar guardado como..."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:297
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:284
 msgid "Extension"
 msgstr "Extensión"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483
 msgid "External Frame Buffer"
 msgstr "Buffer de frames externo"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:61
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:48
 msgid "Extra Parameter"
 msgstr "Parámetro extra"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:62
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:49
 msgid "Extra Parameter useful in ''Metroid: Other M'' only."
-msgstr "Parámetro extra útil en «Metroid: Other M» exclusivamente."
+msgstr "Parámetro extra que es útil en «Metroid: Other M» exclusivamente."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:614
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:624
 msgid "Extract All Files..."
 msgstr "Extraer todos los archivos..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:616
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:626
 msgid "Extract Apploader..."
 msgstr "Extraer Apploader..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:617
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627
 msgid "Extract DOL..."
 msgstr "Extraer DOL..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:610
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:620
 msgid "Extract Directory..."
 msgstr "Extraer directorio..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:612
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:622
 msgid "Extract File..."
 msgstr "Extraer archivo..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:608
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:618
 msgid "Extract Partition..."
 msgstr "Extraer partición..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:724
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:738
 #, c-format
 msgid "Extracting %s"
 msgstr "Extrayendo %s"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:707
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:721
 msgid "Extracting All Files"
 msgstr "Extrayendo todos los archivos"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:707
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:721
 msgid "Extracting Directory"
 msgstr "Extrayendo directorio"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:710
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:724
 msgid "Extracting..."
 msgstr "Extrayendo..."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:892
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:893
 msgid "FIFO Byte"
 msgstr "Byte de FIFO"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:45
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:32
 msgid "FIFO Player"
 msgstr "Jugador FIFO"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:169
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:163
 msgid "FRANCE"
 msgstr "FRANCIA"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472
 msgid "FST Size:"
 msgstr "Tamaño del FST:"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:77
+#: Source/Core/Core/Src/NetPlayClient.cpp:81
 msgid "Failed to Connect!"
 msgstr "¡Fallo al conectar!"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:225
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:228
 msgid "Failed to Listen!!"
 msgstr "¡Fallo al escuchar!"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:307
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:300
 msgid "Failed to download codes."
 msgstr "Fallo al descargar los códigos."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:827
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:843
 #, c-format
 msgid "Failed to extract to %s!"
 msgstr "Fallo al extraer a %s!"
@@ -2329,35 +2387,39 @@ 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 ""
-"Fallo al cargar DSP ROM:\t%s\n"
+"Fallo al cargar DSP ROM:»%s\n"
 "\n"
 "Este fichero se requiere para usar DSP LLE.\n"
 "No está incluido con Dolphin porque contiene datos con copyright.\n"
 "Usa DSPSpy para extraer el fichero de tu Wii física.\n"
 "\n"
 "Puedes usar el motor DSP HLE, que no requiere extraer la ROM.\n"
-"(Elígelo en la pestaña  \"Audio\" de la ventana de configuración.)"
+"(Elígelo en la pestaña \"Audio\" de la ventana de configuración.)"
 
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:116
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:139
+#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:108
+#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:131
 msgid "Failed to load bthprops.cpl"
 msgstr "Fallo al cargar bthprops.cpl"
 
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:100
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:109
+#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:90
+#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:101
 msgid "Failed to load hid.dll"
 msgstr "Fallo al cargar hid.dll"
 
-#: Source/Core/Core/Src/Movie.cpp:792
+#: Source/Core/Core/Src/Movie.cpp:783
 #, c-format
 msgid "Failed to read %s"
 msgstr "Error al leer %s"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:151
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:144
 msgid "Failed to read banner.bin"
 msgstr "Fallo al leer banner.bin"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:223
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:178
+msgid "Failed to read bk header"
+msgstr "Fallo al leer la cabecera bk"
+
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:211
 #, c-format
 msgid ""
 "Failed to read block %d of the save data\n"
@@ -2366,9 +2428,9 @@ msgid ""
 msgstr ""
 "Falló al leer el bloque %d de los datos guardados.\n"
 "La tarjeta de memoria puede estar truncada.\n"
-"Posición del fichero %llx."
+"Posición del fichero:%llx"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:148
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:136
 msgid ""
 "Failed to read block allocation table backup correctly\n"
 "(0x8000-0x9FFF)"
@@ -2376,7 +2438,7 @@ msgstr ""
 "Falló leer la tabla de asignación de bloques de respaldo correctamente\n"
 "(0x8000-0x9FFF)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:142
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:130
 msgid ""
 "Failed to read block allocation table correctly\n"
 "(0x6000-0x7FFF)"
@@ -2384,12 +2446,17 @@ msgstr ""
 "Falló leer la tabla de asignación de bloques correctamente\n"
 "(0x6000-0x7FFF)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:286
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:279
 #, c-format
 msgid "Failed to read data from file %d"
 msgstr "Fallo al leer los datos del archivo %d"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:136
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:367
+#, c-format
+msgid "Failed to read data from file: %s"
+msgstr "Fallo al leer los datos del archivo: %s"
+
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:124
 msgid ""
 "Failed to read directory backup correctly\n"
 "(0x4000-0x5FFF)"
@@ -2397,7 +2464,7 @@ msgstr ""
 "Falló la lectura del directorio de respaldo\n"
 "(0x4000-0x5FFF)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:130
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:118
 msgid ""
 "Failed to read directory correctly\n"
 "(0x2000-0x3FFF)"
@@ -2405,7 +2472,11 @@ msgstr ""
 "Falló la lectura del directorio\n"
 "(0x2000-0x3FFF)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:119
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:90
+msgid "Failed to read header"
+msgstr "Fallo al leer la cabecera"
+
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:107
 msgid ""
 "Failed to read header correctly\n"
 "(0x0000-0x1FFF)"
@@ -2413,41 +2484,41 @@ msgstr ""
 "Falló leer la cabecera correctamente\n"
 "(0x0000-0x1FFF)"
 
-#: Source/Core/DiscIO/Src/VolumeGC.cpp:61
+#: Source/Core/DiscIO/Src/VolumeGC.cpp:48
 msgid "Failed to read unique ID from disc image"
 msgstr "Fallo al leer la ID única de la imagen de disco"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:84
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:71
 msgid "Failed to write BT.DINF to SYSCONF"
 msgstr "Fallo al escribir BT.DINF a SYSCONF"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:228
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:221
 msgid "Failed to write bkhdr"
 msgstr "Fallo al escribir bkhdr"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:164
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:157
 #, c-format
 msgid "Failed to write header for %s"
 msgstr "Fallo al escribir la cabecera para %s"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:258
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:251
 #, c-format
 msgid "Failed to write header for file %d"
 msgstr "Fallo al escribir la cabecera para el archivo %d"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294
 msgid "Farsi"
-msgstr "Iraní"
+msgstr "Persa"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477
 msgid "Fast"
 msgstr "Rápido"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315
 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:1046
+#: Source/Core/Core/Src/Movie.cpp:1037
 #, c-format
 msgid ""
 "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s"
@@ -2455,23 +2526,23 @@ msgstr ""
 "Desincronización fatal. Cancelando reproducción. (Error en PlayWiimote: %u !"
 "= %u, byte %u.)%s"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:199
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:202
 msgid "Fifo Player"
 msgstr "Jugador Fifo"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:99
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:86
 msgid "File Info"
 msgstr "Información del fichero"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:304
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:295
 msgid "File contained no codes."
 msgstr "El archivo no contenía códigos."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:413
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:400
 msgid "File converted to .gci"
 msgstr "Archivo convertido a .gci"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:428
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:415
 msgid ""
 "File could not be opened\n"
 "or does not have a valid extension"
@@ -2479,7 +2550,7 @@ msgstr ""
 "El archivo no pudo ser abierto\n"
 "o no tiene una extensión válida"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:84
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:72
 #, c-format
 msgid ""
 "File has the extension \"%s\"\n"
@@ -2488,36 +2559,36 @@ msgstr ""
 "El archivo tiene la extensión \"%s\"\n"
 "Extensiones válidas son (.raw/.gcp)"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:425
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:412
 msgid "File is not recognized as a memcard"
 msgstr "El archivo no es reconocido como una tarjeta de memoria"
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:294
+#: Source/Core/DiscIO/Src/CompressedBlob.cpp:281
 msgid "File not compressed"
 msgstr "Archivo sin comprimir"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:127
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:109
 #, c-format
 msgid "FileIO: Unknown open mode : 0x%02x"
 msgstr "FileIO: Modo desconocido de apertura : 0x%02x"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:531
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:541
 msgid "Filesystem"
 msgstr "Sistema de archivos"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1100
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1126
 msgid "Filetype 'ini' is unknown! Will not open!"
-msgstr "¡Tipo de archivo INI desconocido: no se abrirá!"
+msgstr "¡Tipo de archivo 'ini' desconocido¡ !No se abrirá!"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:265
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:252
 msgid "Find next"
 msgstr "Encontrar siguiente"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:266
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:253
 msgid "Find previous"
 msgstr "Encontrar anterior"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:632
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626
 msgid "First Block"
 msgstr "Primer bloque"
 
@@ -2525,23 +2596,23 @@ msgstr "Primer bloque"
 msgid "Fix Checksums"
 msgstr "Reparar sumas de verificación"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:275
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283
 msgid "Force 16:9"
 msgstr "Forzar 16:9"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:275
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283
 msgid "Force 4:3"
 msgstr "Forzar 4:3"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:568
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548
 msgid "Force Console as NTSC-J"
 msgstr "Forzar consola como NTSC-J"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406
 msgid "Force Texture Filtering"
 msgstr "Forzar filtrado de texturas"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90
 msgid ""
 "Force texture filtering even if the emulated game explicitly disabled it.\n"
 "Improves texture quality slightly but causes glitches in some games.\n"
@@ -2555,7 +2626,7 @@ msgstr ""
 "\n"
 "Si no estás seguro, déjala sin marcar."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83
 msgid ""
 "Force the game to output graphics for widescreen resolutions.\n"
 "Causes graphical glitches is some games.\n"
@@ -2568,166 +2639,165 @@ msgstr ""
 "\n"
 "Si no estás seguro, déjala sin marcar."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488
 msgid ""
 "Forces NTSC-J mode for using the Japanese ROM font.\n"
 "Left unchecked, dolphin defaults to NTSC-U and automatically enables this "
 "setting when playing Japanese games."
 msgstr ""
 "Fuerza el modo NTSC-J para usar la ROM de la fuente japonesa.\n"
-"Sin marcar, Dolphin por defecto usa NTSC-U y activa automáticamente esta "
-"característica cuando se juega a juegos japoneses."
+"Deja sin marcar, Dolphin por defecto usa NTSC-U y activa automáticamente "
+"esta característica cuando se juega a juegos japoneses."
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:74
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:62
 msgid ""
 "Format as ascii (NTSC\\PAL)?\n"
 "Choose no for sjis (NTSC-J)"
 msgstr ""
-"Formato como ASCII (NTSC\\PAL)?\n"
+"¿Dar formato como ASCII (NTSC\\PAL)?\n"
 "Elige no para sjis (NTSC-J)"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:278
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:265
 msgid "Forward"
 msgstr "Adelante"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504
 #, c-format
 msgid "Found %d results for '"
 msgstr "%d coincidencias para '"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:857
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:925
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:858
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:926
 msgid "Frame"
 msgstr "Frame"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:867
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:868
 msgid "Frame "
-msgstr "Frame "
+msgstr "Frame"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:185
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:173
 msgid "Frame Advance"
 msgstr "Avanzar &fotogramas"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:536
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549
 msgid "Frame Dumps use FFV1"
 msgstr "Volcado de fotogramas usa FFV1"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:227
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:214
 msgid "Frame Info"
 msgstr "Info del frame"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:116
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:103
 msgid "Frame Range"
 msgstr "Información de la grabación"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:138
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:139
 msgid "Frame S&kipping"
 msgstr "Salto de &fotogramas"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:572
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552
 msgid "Framelimit:"
 msgstr "Límite de fotogramas:"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:204
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:191
 msgid "Frames To Record"
 msgstr "Frames a grabar"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547
 msgid "Free Look"
 msgstr "Cámara libre"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
 msgid "French"
 msgstr "Francés"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:38
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:42
 msgid "Frets"
 msgstr "Cuerdas"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:118
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:137
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:105
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:124
 msgid "From"
 msgstr "Desde"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:426
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:432
 msgid "FullScr"
 msgstr "Pant. compl."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:256
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263
 msgid "Fullscreen resolution:"
 msgstr "Resolución en pantalla completa:"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:534
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524
 msgid "GCI File(*.gci)"
 msgstr "Archivo GCI (*.gci)"
 
-#: Source/Core/DolphinWX/Src/GCMicDlg.h:44
+#: Source/Core/DolphinWX/Src/GCMicDlg.h:31
 msgid "GCMic Configuration"
 msgstr "Configuración del micro de GC"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:432
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
 msgid "GCPad"
 msgstr "Pad GC"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:659
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:658
 msgid "GX_CMD_INVL_VC"
 msgstr "GX_CMD_INVL_VC"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:448
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:452
 msgid "Game ID:"
 msgstr "ID del juego:"
 
-#: Source/Core/Core/Src/NetPlay.cpp:229
+#: Source/Core/Core/Src/NetPlay.cpp:216
 msgid "Game is already running!"
 msgstr "¡El juego ya está ejecutándose!"
 
-#: Source/Core/Core/Src/NetPlay.cpp:259
+#: Source/Core/Core/Src/NetPlay.cpp:246
 msgid "Game isn't running!"
 msgstr "¡El juego no está ejecutándose!"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:389
-#, fuzzy
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:393
 msgid "Game not found!"
-msgstr "¡¡Juego no encontrado!!"
+msgstr "¡Juego no encontrado!"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:385
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:389
 msgid "Game-Specific Settings"
 msgstr "Configuración específica del juego"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:293
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:294
 msgid "GameConfig"
 msgstr "Configurar Juego"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:525
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:515
 msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)"
 msgstr "Ficheros de guardado de GameCube (*.gci;*.gcs;*.sav)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534
 msgid "Gamecube"
 msgstr "Gamecube"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:178
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:181
 msgid "Gamecube &Pad Settings"
 msgstr "&Configuración del mando Gamecube"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:218
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1069
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:205
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1052
 msgid "Gamecube Memory Cards (*.raw,*.gcp)"
 msgstr "Tarjetas de memoria de Gamecube (*.raw,*.gcp)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:432
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
 msgid "Gamecube Pad settings"
 msgstr "Configuración del Pad de Gamecube"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:117
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302
 msgid "Gecko Codes"
 msgstr "Códigos Gecko"
 
-#: Source/Core/Core/Src/GeckoCode.cpp:222
+#: Source/Core/Core/Src/GeckoCode.cpp:214
 #, c-format
 msgid ""
 "GeckoCode failed to run (CT%i CST%i) (%s)\n"
@@ -2735,15 +2805,15 @@ msgid ""
 "native code handler by placing the codehandler.bin file into the Sys "
 "directory and restarting Dolphin.)"
 msgstr ""
-"GeckoCode falló al ejecutar (CT%i CST%i) (%s)\n"
+"Código Gecko falló al ejecutar (CT%i CST%i) (%s)\n"
 "(puede ser un código incorrecto o su tipo no es soportado todavía. Prueba "
 "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:172
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:172
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:197
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:160
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:160
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:202
 msgid "General"
 msgstr "General"
 
@@ -2751,31 +2821,31 @@ msgstr "General"
 msgid "General Settings"
 msgstr "Ajustes generales"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:470
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:281
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:316
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:261
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
 msgid "German"
 msgstr "Alemán"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:449
+#: Source/Core/Core/Src/ActionReplay.cpp:439
 #, 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:430
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:436
 msgid "Graphics"
 msgstr "Gráficos"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:430
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:436
 msgid "Graphics settings"
 msgstr "Configuración gráfica"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:205
 msgid "Greater Than"
 msgstr "Mayor que"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87
 msgid ""
 "Greatly increases quality of textures generated using render to texture "
 "effects.\n"
@@ -2793,51 +2863,76 @@ msgstr ""
 "\n"
 "Si no estás seguro, déjala marcada."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:317
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
 msgid "Greek"
 msgstr "Griego"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:22
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Green"
 msgstr "Verde"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:24
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Green Left"
 msgstr "Verde izquierda"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:25
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Green Right"
 msgstr "Verde derecha"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:35
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:39
 msgid "Guitar"
 msgstr "Guitarra"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1259
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1250
 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:421
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504
+msgid "Hacked Buffer Upload"
+msgstr "Búfer hackeado cargado"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431
 msgid "Hacks"
 msgstr "Hacks"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:158
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:146
 msgid "Header checksum failed"
 msgstr "Falló la suma de verificación de cabecera"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:318
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298
 msgid "Hebrew"
 msgstr "Hebreo"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:313
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:300
 msgid "Height"
 msgstr "Altura"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:64
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:51
 msgid "Help"
 msgstr "Ayuda"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:209
+#: Source/Core/DolphinWX/Src/Main.cpp:229
+msgid ""
+"Hi,\n"
+"\n"
+"Dolphin requires Mac OS X 10.7 or greater.\n"
+"Unfortunately you're running an old version of OS X.\n"
+"The last Dolphin version to support OS X 10.6 is Dolphin 3.5\n"
+"Please upgrade to 10.7 or greater to use the newest Dolphin version.\n"
+"\n"
+"Sayonara!\n"
+msgstr ""
+"Hola,\n"
+"\n"
+"Dolphin requiere Mac OS X 10.7 o superior.\n"
+"Desafortunadamente estás utilizando una versión antigua de OS X.\n"
+"La última version de Doplhin compatible con OS X10.6 es Dolphin 3.5\n"
+"Por favor actualiza a 10.7 o superior para usar la versión más nueva de "
+"Dolphin.\n"
+"\n"
+"¡Adiós!\n"
+
+#: Source/Core/DolphinWX/Src/Main.cpp:220
 msgid ""
 "Hi,\n"
 "\n"
@@ -2851,17 +2946,17 @@ msgstr ""
 "Dolphin requiere que tu CPU soporte extensiones SSE2.\n"
 "Desafortunadamente, tu CPU no las soporta, así que Dolphin no funcionará.\n"
 "\n"
-"Sayonara!\n"
+"¡Adiós!\n"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:309
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:296
 msgid "Hide"
 msgstr "Esconder"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:307
 msgid "Hide Mouse Cursor"
 msgstr "Esconder cursor"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79
 msgid ""
 "Hides the mouse cursor if it's on top of the emulation window.\n"
 "\n"
@@ -2872,26 +2967,26 @@ msgstr ""
 "\n"
 "Si no estás seguro, déjala marcada."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:54
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41
 msgid "Home"
 msgstr "Home"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:85
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:138
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:76
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:141
 msgid "Host"
 msgstr "Hostear"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.h:44
+#: Source/Core/DolphinWX/Src/HotkeyDlg.h:31
 msgid "Hotkey Configuration"
 msgstr "Configuración de atajos"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:272
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:272
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:594
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:260
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:260
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574
 msgid "Hotkeys"
 msgstr "Atajos"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:319
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299
 msgid "Hungarian"
 msgstr "Húngaro"
 
@@ -2899,35 +2994,35 @@ msgstr "Húngaro"
 msgid "Hybrid Wiimote"
 msgstr "Wiimote híbrido"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:532
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:519
 #, 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:786
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:773
 #, c-format
 msgid ""
-"IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available "
-"in your nand dump\n"
+"IOCTL_ES_LAUNCH: Game tried to reload an IOS or a title that is not "
+"available in your NAND dump\n"
 "TitleID %016llx.\n"
-" Dolphin will likely hang now"
+" Dolphin will likely hang now."
 msgstr ""
-"IOCTL_ES_LAUNCH: El juego intentó recargar el ios o un título que no está "
-"disponible en su volcado nand\n"
+"IOCTL_ES_LAUNCH: El juego intentó recargar el IOS o un título que no está "
+"disponible en su volcado de NAND\n"
 "TitleID %016llx.\n"
-" Dolphin probablemente se bloqueará ahora"
+"Dolphin probablemente se colgará ahora."
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:313
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:300
 msgid "IOCTL_ES_READCONTENT - bad destination"
 msgstr "IOCTL_ES_READCONTENT - destino incorrecto"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729
 msgid "IPL Settings"
 msgstr "Configuración IPL"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269
 msgid "IR"
 msgstr "IR"
 
@@ -2939,23 +3034,23 @@ msgstr "Puntero IR"
 msgid "IR Sensitivity:"
 msgstr "Sensibilidad IR:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:502
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:512
 msgid "ISO Details"
-msgstr "Detalles del ISO"
+msgstr "Detalles de la ISO"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:830
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:811
 msgid "ISO Directories"
 msgstr "Directorios de ISO"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:172
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:166
 msgid "ITALY"
 msgstr "ITALIA"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:630
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:624
 msgid "Icon"
 msgstr "Icono"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332
 msgid ""
 "If checked, the bounding box registers will be updated. Used by the Paper "
 "Mario games."
@@ -2963,29 +3058,11 @@ 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:318
-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:505
-msgid ""
-"If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use "
-"Audio to throttle using the DSP (might fix audio clicks but can also cause "
-"constant noise depending on the game)."
-msgstr ""
-"Si defines un límite de fotogramas mayor que la velocidad de juego completa "
-"(NTSC: 60, PAL: 50), también debes deshabilitar la regulación de audio en "
-"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:428
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438
 msgid "Ignore Format Changes"
 msgstr "Ignorar cambios de formato"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94
 msgid ""
 "Ignore any changes to the EFB format.\n"
 "Improves performance in many games without any negative effect. Causes "
@@ -2999,7 +3076,7 @@ msgstr ""
 "\n"
 "Si no estás seguro, déjala marcada."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93
 msgid ""
 "Ignore any requests of the CPU to read from or write to the EFB.\n"
 "Improves performance in some games, but might disable some gameplay-related "
@@ -3017,43 +3094,31 @@ msgstr ""
 msgid "Import Save"
 msgstr "Importar Guardado"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:59
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:48
 msgid "Import failed, try again?"
 msgstr "Fallo al importar. ¿Probar otra vez?"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:454
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:441
 msgid ""
 "Imported file has gsc extension\n"
 "but does not have a correct header"
 msgstr ""
-"El archivo importado tiene una extensión .gsc,\n"
-"pero no tiene la cabecera correcta."
+"El archivo importado tiene una extensión .gsc\n"
+"pero no tiene la cabecera correcta"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:442
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:429
 msgid "Imported file has invalid length"
 msgstr "El archivo importado tiene una longitud no válida"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:451
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:438
 msgid ""
 "Imported file has sav extension\n"
 "but does not have a correct header"
 msgstr ""
-"El archivo importado tiene extensión .sav,\n"
+"El archivo importado tiene extensión .sav\n"
 "pero no tiene la cabecera correcta"
 
-#: 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 ""
-"Mejora el rendimiento, pero puede provocar fallos en juegos que requieran de "
-"emulación adecuada de la niebla.\n"
-"\n"
-"Si no estás seguro, déjala sin marcar."
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350
 msgid "In Game"
 msgstr "En juego"
 
@@ -3061,67 +3126,67 @@ msgstr "En juego"
 msgid "In-Game"
 msgstr "En juego"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:34
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305
 msgid "Info"
 msgstr "Información"
 
-#: Source/Core/Common/Src/MsgHandler.cpp:65
+#: Source/Core/Common/Src/MsgHandler.cpp:51
 msgid "Information"
 msgstr "Información"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:481
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:468
 msgid "Input"
 msgstr "Entrada"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:63
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:50
 msgid "Insert"
 msgstr "Insertar"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:176
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:166
 msgid "Insert Encrypted or Decrypted code here..."
 msgstr "Insertar código encriptado o desencriptado aquí..."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:763
 msgid "Insert SD Card"
 msgstr "Insertar tarjeta SD"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:34
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:21
 msgid "Insert name here.."
 msgstr "Insertar un nombre aquí.."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:196
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:199
 msgid "Install WAD"
 msgstr "Instalar WAD"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:895
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:888
 msgid "Install to Wii Menu"
 msgstr "Instalar al menú de la Wii"
 
-#: Source/Core/Core/Src/x64MemTools.cpp:252
+#: Source/Core/Core/Src/x64MemTools.cpp:242
 msgid ""
 "InstallExceptionHandler called, but this platform does not yet support it."
 msgstr ""
 "Se ha llamado InstallExceptionHandler, pero esta plataforma no lo soporta "
 "todavía."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1297
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
 msgid "Installing WAD..."
 msgstr "Instalando WAD..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:885
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:901
 msgid "Integrity Check Error"
 msgstr "Error de comprobación de la integridad"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:891
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:907
 msgid "Integrity check completed"
 msgstr "Comprobación de la integridad finalizada"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:890
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:906
 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:882
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:898
 #, c-format
 msgid ""
 "Integrity check for partition %d failed. Your dump is most likely corrupted "
@@ -3130,19 +3195,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:552
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532
 msgid "Interface"
 msgstr "Interfaz"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:646
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627
 msgid "Interface Settings"
 msgstr "Configuración de la interfaz"
 
-#: Source/Core/Core/Src/State.cpp:240
+#: Source/Core/Core/Src/State.cpp:228
 msgid "Internal LZO Error - compression failed"
 msgstr "Error Interno de LZO - Fallo al comprimir"
 
-#: Source/Core/Core/Src/State.cpp:348
+#: Source/Core/Core/Src/State.cpp:336
 #, c-format
 msgid ""
 "Internal LZO Error - decompression failed (%d) (%li, %li) \n"
@@ -3151,41 +3216,45 @@ 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:485
+#: Source/Core/Core/Src/State.cpp:473
 msgid "Internal LZO Error - lzo_init() failed"
 msgstr "Error Interno de LZO - lzo_init() falló"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:344
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:352
 msgid "Internal Resolution:"
 msgstr "Resolución interna:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:42
+msgid "Interpreter (VERY slow)"
+msgstr "Intérprete (MUY lento)"
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349
 msgid "Intro"
 msgstr "Intro"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:194
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:187
 #, c-format
 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:600
 msgid "Invalid Value!"
 msgstr "¡Valor no válido!"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:462
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:449
 msgid "Invalid bat.map or dir entry"
 msgstr "bat.map o entrada de directorio no válido"
 
-#: Source/Core/Core/Src/CoreTiming.cpp:548
+#: Source/Core/Core/Src/CoreTiming.cpp:553
 #, c-format
 msgid "Invalid event type %i"
 msgstr "Evento de tipo %i no válido"
 
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:326
+#: Source/Core/Core/Src/HW/DVDInterface.cpp:309
 msgid "Invalid file"
 msgstr "Archivo no válido"
 
-#: Source/Core/DiscIO/Src/BannerLoaderGC.cpp:41
+#: Source/Core/DiscIO/Src/BannerLoaderGC.cpp:28
 #, c-format
 msgid ""
 "Invalid opening.bnr found in gcm:\n"
@@ -3194,48 +3263,56 @@ msgid ""
 msgstr ""
 "opening.bnr no váldio encontrado en gcm:\n"
 "%s\n"
-" Puede que necesitas volcar este juego de nuevo."
+"Puede ser que necesites volcar este juego de nuevo."
 
-#: Source/Core/Core/Src/Movie.cpp:735
+#: Source/Core/Core/Src/Movie.cpp:726
 msgid "Invalid recording file"
 msgstr "Archivo de grabación no válido"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:473
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:472
 msgid "Invalid search parameters (no object selected)"
 msgstr "Parámetros de búsqueda inválidos (ningún objeto seleccionado)"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:456
+#: 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:444
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:443
 msgid "Invalid search string (only even string lengths supported)"
 msgstr "Búsqueda de cadena incorrecta (solo se soportan algunas longitudes)"
 
-#: Source/Core/Core/Src/Core.cpp:513
+#: Source/Core/Core/Src/Core.cpp:511
 msgid "Invalid state"
 msgstr "Estado no válido"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:473
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:320
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300
 msgid "Italian"
 msgstr "Italiano"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:183
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:177
 msgid "JAPAN"
 msgstr "JAPÓN"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:321
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:46
+msgid "JIT Recompiler (recommended)"
+msgstr "Recompilador JIT (recomendado)"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:47
+msgid "JITIL experimental recompiler"
+msgstr "Recompilador experimental JITIL"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:279
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
 msgid "Japanese"
 msgstr "Japonés"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:188
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:182
 msgid "KOREA"
 msgstr "COREA"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78
 msgid ""
 "Keep the game window on top of all other windows.\n"
 "\n"
@@ -3245,62 +3322,62 @@ msgstr ""
 "\n"
 "Si no estás seguro, déjala sin marcar."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:298
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:306
 msgid "Keep window on top"
 msgstr "Mantener la ventana siempre visible"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:241
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:241
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:229
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:229
 msgid "Key"
 msgstr "Clave"
 
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282
 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:322
 msgid "Korean"
 msgstr "Coreano"
 
 #. i18n:  Left
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:57
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:44
 msgid "L"
 msgstr "L"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:39
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:26
 msgid "L Button"
 msgstr "Botón L"
 
 #. i18n:  Left-Analog
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:61
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:48
 msgid "L-Analog"
 msgstr "L-Analógico"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:585
 msgid "Language:"
 msgstr "Idioma:"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:152
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:153
 msgid "Last Overwritten State"
 msgstr "Último estado sobrescrito"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:159
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:161
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:160
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:162
 msgid "Last Saved State"
 msgstr "Último estado guardado"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:696
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:677
 msgid "Latency:"
 msgstr "Latencia:"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:276
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:55
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:263
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:42
 msgid "Left"
 msgstr "Izquierda"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:60
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:64
 msgid "Left Stick"
 msgstr "Stick izquierdo"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:257
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:257
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:245
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:245
 msgid ""
 "Left click to detect hotkeys.\n"
 "Enter space to clear."
@@ -3308,7 +3385,7 @@ msgstr ""
 "Clic izquierdo para detectar atajos.\n"
 "Introduce espacio para limpiar."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:689
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:678
 msgid ""
 "Left-click to detect input.\n"
 "Middle-click to clear.\n"
@@ -3318,7 +3395,7 @@ msgstr ""
 "Clic medio para borrar.\n"
 "Clic der. para más opciones."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:694
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:683
 msgid ""
 "Left/Right-click for more options.\n"
 "Middle-click to clear."
@@ -3326,76 +3403,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:206
 msgid "Less Than"
 msgstr "Menor que"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:565
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545
 msgid "Limit by FPS"
 msgstr "Usar FPS para limitar"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:924
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:915
 msgid "Load"
 msgstr "Cargar"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544
 msgid "Load Custom Textures"
 msgstr "Cargar texturas personalizadas"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
 msgid "Load State Slot 1"
 msgstr "&Cargar estado 1"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189
 msgid "Load State Slot 2"
 msgstr "&Cargar estado 2"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:190
 msgid "Load State Slot 3"
 msgstr "&Cargar estado 3"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:203
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:191
 msgid "Load State Slot 4"
 msgstr "&Cargar estado 4"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192
 msgid "Load State Slot 5"
 msgstr "&Cargar estado 5"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193
 msgid "Load State Slot 6"
 msgstr "&Cargar estado 6"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:194
 msgid "Load State Slot 7"
 msgstr "&Cargar estado 7"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:195
 msgid "Load State Slot 8"
 msgstr "&Cargar estado 8"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:155
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:156
 msgid "Load State..."
 msgstr "Cargar estado..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1332
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1359
 msgid "Load Wii System Menu"
 msgstr "Cargar Menú de sistema Wii"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1327
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1354
 #, c-format
 msgid "Load Wii System Menu %d%c"
 msgstr "Cargar Menú de sistema Wii %d %c"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112
 msgid ""
 "Load custom textures from User/Load/Textures/<game_id>/\n"
 "\n"
@@ -3405,7 +3482,7 @@ msgstr ""
 "\n"
 "Si no estás seguro, déjala sin marcar."
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:50
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:37
 msgid "Load preset values from hack patterns available."
 msgstr "Cargar valores ya definidos de los patrones de hack disponibles."
 
@@ -3413,23 +3490,23 @@ msgstr "Cargar valores ya definidos de los patrones de hack disponibles."
 msgid "Local"
 msgstr "Local"
 
-#: Source/Core/DolphinWX/Src/LogWindow.h:51
+#: Source/Core/DolphinWX/Src/LogWindow.h:38
 msgid "Log"
 msgstr "Registrar"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:26
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:13
 msgid "Log Configuration"
 msgstr "Configuración de registro"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:296
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304
 msgid "Log FPS to file"
 msgstr "Escribir FPS en un fichero"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:96
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83
 msgid "Log Types"
 msgstr "Tipos de registro"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103
 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"
@@ -3442,77 +3519,92 @@ msgstr ""
 "\n"
 "Si no estás seguro, déjala sin marcar."
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:81
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:68
 msgid "Logger Outputs"
 msgstr "Salida de registro"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132
-#: Source/Core/DolphinWX/Src/Frame.cpp:328
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:119
+#: Source/Core/DolphinWX/Src/Frame.cpp:314
 msgid "Logging"
 msgstr "Registrando"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:255
+#: Source/Core/Core/Src/NetPlayClient.cpp:259
 msgid "Lost connection to server!"
 msgstr "¡Se perdió la conexión con el servidor!"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:42
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:29
 msgid "M Button"
 msgstr "Botón M"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:119
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:112
 #, c-format
 msgid ""
 "MD5 mismatch\n"
 " %016llx%016llx != %016llx%016llx"
 msgstr ""
 "MD5 no coinciden\n"
-" %016llx%016llx != %016llx%016llx"
+"%016llx%016llx != %016llx%016llx"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314
 msgid "MMU Speed Hack"
 msgstr "Hack de velocidad MMU"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:527
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:563
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:517
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:556
 msgid "MadCatz Gameshark files(*.gcs)"
 msgstr "Archivos MadCatz Gameshark (*.gcs)"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:51
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:63
+#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:38
 msgid "Main Stick"
 msgstr "Stick principal"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460
 msgid "Maker ID:"
 msgstr "ID del fabricante:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487
 msgid "Maker:"
 msgstr "Fabricante:"
 
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100
+msgid ""
+"Makes distant objects more visible by removing fog, thus increasing the "
+"overall detail.\n"
+"Disabling fog will break some games which rely on proper fog emulation.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+"Hace que los objetos distantes más visibles mediante la eliminación de "
+"niebla, lo que aumenta el detalle general.\n"
+"Desactivar la niebla provocará que algunos juegos basados en la emulación de "
+"niebla dejen de funcionar correctamente.\n"
+"\n"
+"Si no estás seguro, déjala sin marcar."
+
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:97
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:100
 msgid "Max"
 msgstr "Máx."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:448
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:435
 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:291
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:278
 msgid "Memcard already opened"
 msgstr "La tarjeta de memoria ya está abierta"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:912
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:913
 msgid "Memory Byte"
 msgstr "Byte de memoria"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:225
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:113
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:212
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:93
 msgid "Memory Card"
 msgstr "Tarjeta de memoria"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.h:36
+#: Source/Core/DolphinWX/Src/MemcardManager.h:23
 msgid ""
 "Memory Card Manager WARNING-Make backups before using, should be fixed but "
 "could mangle stuff!"
@@ -3520,7 +3612,7 @@ msgstr ""
 "Administrador de tarjetas de memoria. ADVERTENCIA: Haz copias antes de "
 "usarlo; debería estar arreglado, ¡pero puede estropear cosas!"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:371
+#: Source/Core/Core/Src/CoreParameter.cpp:360
 #, c-format
 msgid ""
 "Memory Card filename in Slot %c is incorrect\n"
@@ -3537,17 +3629,17 @@ msgstr ""
 "%s\n"
 "¿Deseas copiar el viejo archivo a esta nueva dirección?\n"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:124
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:112
 msgid "Memorycard filesize does not match the header size"
 msgstr ""
 "El tamaño del fichero de la tarjeta de memoria no corresponde con el tamaño "
 "de la cabecera."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:50
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:37
 msgid "Menu"
 msgstr "Menú"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:114
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:94
 msgid "Mic"
 msgstr "Mic"
 
@@ -3556,20 +3648,20 @@ msgstr "Mic"
 msgid "Min"
 msgstr "Mín."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:580
 msgid "Misc"
 msgstr "Varios"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:795
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776
 msgid "Misc Settings"
 msgstr "Configuraciones varias"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:240
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:294
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:227
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:281
 msgid "Modifier"
 msgstr "Modificador"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106
 msgid ""
 "Modify textures to show the format they're encoded in. Needs an emulation "
 "reset in most cases.\n"
@@ -3581,20 +3673,20 @@ msgstr ""
 "\n"
 "Si no estás seguro, déjala sin marcar."
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:115
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:108
 msgid "Monospaced font"
 msgstr "Fuente monoespaciada"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:305
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:292
 msgid "Motion Plus"
 msgstr "Motion Plus"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:309
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:86
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:296
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73
 msgid "Motor"
 msgstr "Motor"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:654
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:666
 msgid ""
 "Move the mouse pointer over an option to display a detailed description.\n"
 "\n"
@@ -3611,227 +3703,239 @@ msgstr ""
 "\n"
 "\n"
 "\n"
-"\n"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:75
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:62
 msgid "Multiply"
 msgstr "Multiplicar"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:651
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:650
 msgid "NOP"
 msgstr "NOP"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:629
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:628
 msgid "NOTE: Stream size doesn't match actual data length\n"
 msgstr ""
 "NOTA: El tamaño del flujo no coincide con la longitud actual de los datos\n"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:129
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:116
 msgid "NP Add"
 msgstr "NP Añadir"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:124
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:111
 msgid "NP Begin"
 msgstr "NP Iniciar"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:132
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:119
 msgid "NP Decimal"
 msgstr "NP Decimal"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:126
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:113
 msgid "NP Delete"
 msgstr "NP Borrar"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:133
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:120
 msgid "NP Divide"
 msgstr "NP Dividir"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:120
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:107
 msgid "NP Down"
 msgstr "NP Abajo"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:123
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:110
 msgid "NP End"
 msgstr "NP Fin"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:111
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:98
 msgid "NP Enter"
 msgstr "NP Entrar"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:127
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:114
 msgid "NP Equal"
 msgstr "NP Igual"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:116
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:103
 msgid "NP Home"
 msgstr "NP Hogar"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:125
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:112
 msgid "NP Insert"
 msgstr "NP Insertar"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:117
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:104
 msgid "NP Left"
 msgstr "NP Izquierda"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:128
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:115
 msgid "NP Multiply"
 msgstr "NP Multiplicar"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:122
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:109
 msgid "NP Page Down"
 msgstr "NP Pág. Abajo"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:121
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:108
 msgid "NP Page Up"
 msgstr "NP Pág. Arriba"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:119
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:106
 msgid "NP Right"
 msgstr "NP Derecha"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:130
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:117
 msgid "NP Separator"
 msgstr "NP Separador"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:109
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:96
 msgid "NP Space"
 msgstr "NP Espacio"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:131
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:118
 msgid "NP Subtract"
 msgstr "NP Sustraer"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:110
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:97
 msgid "NP Tab"
 msgstr "NP Tab"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:118
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:105
 msgid "NP Up"
 msgstr "NP Arriba"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:444
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:59
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:50
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:448
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:46
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:37
 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:25
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:72
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:282
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:553
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:15
 msgid "Name: "
 msgstr "Nombre:"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:526
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:562
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:516
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:555
 msgid "Native GCI files(*.gci)"
 msgstr "Archivos nativos GCI (*.gci)"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:161
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:148
 msgid "New Scan"
 msgstr "Nuevo escaneado"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:206
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:193
 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:801
 msgid "Next Page"
 msgstr "Próxima página"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:165
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:152
 msgid "Next Scan"
 msgstr "Próximo escaneado"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:68
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:59
 msgid "Nickname :"
 msgstr "Apodo:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:196
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:190
 msgid "No Country (SDK)"
 msgstr "Ningún país (SDK)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:370
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:357
 msgid "No ISOs or WADS found"
 msgstr "Ninguna ISO o WAD ha sido encontrada."
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:508
+#: Source/Core/Core/Src/ConfigManager.h:17
+msgid "No audio output"
+msgstr "Sin salida de audio"
+
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:501
 #, c-format
 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:761
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:768
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:760
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:767
 msgid "No description available"
 msgstr "Sin descripción"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:514
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:535
 msgid "No docking"
-msgstr "Sin uniones"
+msgstr "Sin acoplamiento"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:859
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:860
 msgid "No file loaded"
 msgstr "No se ha cargado ningún fichero"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:439
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:426
 msgid "No free dir index entries"
 msgstr "No hay entradas de índice de directorio libres"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:895
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:896
 msgid "No recorded file"
 msgstr "No hay grabaciones guardadas"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:501
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:494
 #, c-format
 msgid "No save folder found for title %s"
 msgstr "No se encontró carpeta de guardado para el juego %s"
 
+#: Source/Plugins/Plugin_VideoOGL/Src/main.cpp:132
+#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:111
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:23
 #: Source/Core/DolphinWX/Src/NetWindow.cpp:600
 msgid "None"
 msgstr "Ninguno"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:323
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303
 msgid "Norwegian Bokmaal"
 msgstr "Noruego Bokmal"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:203
 msgid "Not Equal"
 msgstr "No igual"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:804
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:794
 msgid "Not Set"
 msgstr "No definido"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:626
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:101
+#, c-format
+msgid "Not a Wii save or read failure for file header size %x"
+msgstr ""
+"No es un guardado de Wii o fallo de lectura para la cabecera de archivo de "
+"tamaño %x"
+
+#: Source/Core/DolphinWX/Src/Main.cpp:654
 msgid "Not connected"
 msgstr "Sin conectar"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:309
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:296
 msgid "Notes"
 msgstr "Notas"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:16
 msgid "Notes: "
 msgstr "Notas:"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:71
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:74
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:580
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:621
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:629
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:59
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:64
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:613
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:659
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:667
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:31
 msgid "Notice"
 msgstr "Aviso"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:105
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:92
 msgid "Num Lock"
 msgstr "Bloq Num"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:88
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:75
 msgid "Number Of Codes: "
 msgstr "Número de códigos:"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:30
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:34
 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26
 msgid "Nunchuk"
 msgstr "Nunchuk"
@@ -3840,97 +3944,98 @@ msgstr "Nunchuk"
 msgid "Nunchuk Acceleration"
 msgstr "Aceleración del nunchuk"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:877
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:878
 msgid "Object"
 msgstr "Objeto"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:135
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:122
 msgid "Object Range"
 msgstr "Rango de objeto"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:243
 msgid "Off"
 msgstr "Off"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:62
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:49
 msgid "Offset:"
 msgstr "Offset:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:582
 msgid "On-Screen Display Messages"
 msgstr "Mensajes en pantalla"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:436
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:423
 #, c-format
 msgid "Only %d blocks available"
 msgstr "Solo %d bloques disponibles"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:420
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:178
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:426
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:166
 msgid "Open"
 msgstr "Abrir"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:876
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:867
 msgid "Open &containing folder"
 msgstr "Abrir directorio &contenedor"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:873
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:864
 msgid "Open Wii &save folder"
 msgstr "Abrir carpeta de guardado&s de Wii"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:420
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:426
 msgid "Open file..."
 msgstr "Abrir archivo..."
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:61
+#: Source/Core/AudioCommon/Src/OpenALStream.cpp:48
 #, 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:72
+#: Source/Core/AudioCommon/Src/OpenALStream.cpp:59
 msgid "OpenAL: can't find sound devices"
 msgstr "OpenAL: no se encuentran dispositivos de sonido"
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:66
+#: Source/Core/AudioCommon/Src/OpenALStream.cpp:53
 #, c-format
 msgid "OpenAL: can't open device %s"
 msgstr "OpenAL: no se puede abrir el dispositivo %s"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502
 msgid "OpenCL Texture Decoder"
 msgstr "Descodificador de texturas OpenCL"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503
 msgid "OpenMP Texture Decoder"
 msgstr "Descodificador de texturas OpenMP"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:317
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:94
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:304
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:81
 msgid "Options"
 msgstr "Opciones"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:22
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Orange"
 msgstr "Naranja"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:468
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:455
+#, fuzzy
 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"
+"and import the saves to a new memcard\n"
 msgstr ""
 "El orden de los archivos en el directorio no corresponden con el orden de "
 "bloques\n"
 "Haz clic derecho y exporta todos los guardados,\n"
 "e impórtalos a una nueva tarjeta de memoria\n"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:316
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:324
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:509
 msgid "Other"
 msgstr "Otros"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:206
+#: Source/Core/Core/Src/NetPlayClient.cpp:210
 msgid ""
 "Other client disconnected while game is running!! NetPlay is disabled. You "
 "manually stop the game."
@@ -3938,15 +4043,15 @@ 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:481
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:468
 msgid "Output"
 msgstr "Salida"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:342
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:348
 msgid "P&lay Recording..."
 msgstr "&Reproducir grabación"
 
-#: Source/Core/Core/Src/HW/GCPad.cpp:30
+#: Source/Core/Core/Src/HW/GCPad.cpp:18
 msgid "Pad"
 msgstr "Pad"
 
@@ -3954,160 +4059,160 @@ msgstr "Pad"
 msgid "Pad "
 msgstr "Pad"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:34
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:38
 msgid "Pads"
 msgstr "Pads"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:108
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:95
 msgid "Page Down"
 msgstr "Pág. abajo"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:107
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:94
 msgid "Page Up"
 msgstr "Pág. arriba"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:35
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:22
 msgid "Paragraph"
 msgstr "Párrafo"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:64
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:51
 msgid "Parameters"
 msgstr "Parámetros"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:222
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:217
 #, c-format
 msgid "Partition %i"
 msgstr "Partición %i"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:296
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:297
 msgid "Patches"
 msgstr "Parches"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:556
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536
 msgid "Paths"
 msgstr "Directorios"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1538
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1539
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:51
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1565
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1566
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:38
 msgid "Pause"
 msgstr "Pausa"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:128
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:129
 msgid "Pause at end of movie"
 msgstr "Pausar al acabar la película"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:397
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405
 msgid "Per-Pixel Lighting"
 msgstr "Iluminación por píxel"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352
 msgid "Perfect"
 msgstr "Perfecto"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:609
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:642
 #, c-format
 msgid "Perspective %d"
 msgstr "Perspectiva %d"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:165
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:424
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1547
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1548
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:152
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:430
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1574
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1575
 msgid "Play"
 msgstr "Reproducir"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176
 msgid "Play Recording"
 msgstr "Reproducir grabación"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:170
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:170
 msgid "Play/Pause"
 msgstr "Reproducir/pausa"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351
 msgid "Playable"
 msgstr "Jugable"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:154
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:141
 msgid "Playback Options"
 msgstr "Opciones de reproducción"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:301
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:304
 msgid "Players"
 msgstr "Jugadores"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:988
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:991
 msgid "Please confirm..."
 msgstr "Confirma, por favor..."
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:579
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:612
 msgid "Please create a perspective before saving"
 msgstr "Por favor, crea una perspectiva antes de guardar"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:36
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:23
 msgid "Plus-Minus"
 msgstr "Más-menos"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:324
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304
 msgid "Polish"
 msgstr "Polaco"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:713
 msgid "Port 1"
 msgstr "Puerto 1"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714
 msgid "Port 2"
 msgstr "Puerto 2"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:734
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715
 msgid "Port 3"
 msgstr "Puerto 3"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716
 msgid "Port 4"
 msgstr "Puerto 4"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:97
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:130
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:88
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:133
 msgid "Port :"
 msgstr "Puerto:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:325
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305
 msgid "Portuguese"
 msgstr "Portugués"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:326
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306
 msgid "Portuguese (Brazilian)"
 msgstr "Portugués (Brasil)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:391
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:399
 msgid "Post-Processing Effect:"
 msgstr "Efecto de posprocesado:"
 
-#: Source/Core/Core/Src/Movie.cpp:936
+#: Source/Core/Core/Src/Movie.cpp:927
 #, 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:1055
+#: Source/Core/Core/Src/Movie.cpp:1046
 #, 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:1032
+#: Source/Core/Core/Src/Movie.cpp:1023
 #, c-format
 msgid "Premature movie end in PlayWiimote. %u > %u"
 msgstr "Final prematuro de la película en PlayWiimote. %u > %u"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:48
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:35
 msgid "Presets: "
 msgstr "Predefinidos:"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:205
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:192
 msgid "Prev Page"
 msgstr "Página previa"
 
@@ -4115,67 +4220,67 @@ msgstr "Página previa"
 msgid "Previous Page"
 msgstr "Página previa"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:183
 msgid "Previous Value"
 msgstr "Valor anterior"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:60
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:47
 msgid "Print"
 msgstr "Imprimir"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:894
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:885
 msgid "Profile"
 msgstr "Perfil"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.h:55
+#: Source/Core/DolphinWX/Src/ISOProperties.h:42
 msgid "Properties"
 msgstr "Propiedades"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:283
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:286
 msgid "Purge Cache"
 msgstr "Limpiar caché"
 
-#: Source/Core/Common/Src/MsgHandler.cpp:66
+#: Source/Core/Common/Src/MsgHandler.cpp:52
 msgid "Question"
 msgstr "Pregunta"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:159
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:316
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:162
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:319
 msgid "Quit"
 msgstr "Salir"
 
 #. i18n:  Right
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:59
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:46
 msgid "R"
 msgstr "R"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:40
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:27
 msgid "R Button"
 msgstr "Botón R"
 
 #. i18n:  Right-Analog
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:63
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
 msgid "R-Analog"
 msgstr "R-Analógico"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:445
 msgid "RAM"
 msgstr "RAM"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:175
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:169
 msgid "RUSSIA"
 msgstr "RUSIA"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:528
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:515
 msgid "Range"
 msgstr "Rango"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:190
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:178
 msgid "Read-only mode"
 msgstr "Solo lectura"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:487
 msgid "Real"
 msgstr "Real"
 
@@ -4191,33 +4296,33 @@ msgstr "Wiimotes reales"
 msgid "Reconnect Wiimote on State Loading"
 msgstr "Reconectar Wiimote al cargar estado"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:193
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:217
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:791
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:180
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:204
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:790
 msgid "Record"
 msgstr "Grabar"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:174
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:161
 msgid "Recording Info"
 msgstr "Información de la grabación"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:202
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:189
 msgid "Recording Options"
 msgstr "Opciones de grabación"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:21
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Red"
 msgstr "Rojo"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:24
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Red Left"
 msgstr "Rojo izquierda"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:25
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Red Right"
 msgstr "Rojo derecha"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86
 msgid ""
 "Reduces the amount of aliasing caused by rasterizing 3D graphics.\n"
 "This makes the rendered picture look less blocky.\n"
@@ -4229,31 +4334,31 @@ msgstr ""
 "Esto hace que la imagen se vea menos pixelada.\n"
 "Reduce el rendimiento fuertemente y puede causar problemas.\n"
 "\n"
-"Si no estás seguro, déjala sin marcar."
+"Si no estás seguro, selecciona Ninguno."
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:60
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:421
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:903
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:427
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:894
 msgid "Refresh"
 msgstr "Actualizar"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:180
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:168
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:168
 msgid "Refresh List"
 msgstr "Actualizar lista"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:421
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:427
 msgid "Refresh game list"
 msgstr "Actualizar lista de juegos"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:405
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:427
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:77
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:812
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:409
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:431
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:64
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:793
 msgid "Remove"
 msgstr "Eliminar"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99
 msgid ""
 "Render the scene as a wireframe.\n"
 "\n"
@@ -4263,198 +4368,206 @@ msgstr ""
 "\n"
 "Si no estás seguro, déjala sin marcar."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:308
 msgid "Render to Main Window"
 msgstr "Renderizar a ventana principal"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:915
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:172
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:906
 msgid "Reset"
 msgstr "Reiniciar"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:190
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:177
 msgid "Results"
 msgstr "Resultados"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:29
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:16
 msgid "Return"
 msgstr "Volver"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:277
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:57
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464
+msgid "Revision:"
+msgstr ""
+
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:264
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:44
 msgid "Right"
 msgstr "Derecha"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:61
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:65
 msgid "Right Stick"
 msgstr "Stick Derecho"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:85
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:295
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:72
 msgid "Rumble"
 msgstr "Vibración"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:518
-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:498
+msgid ""
+"Run DSP HLE and LLE on a dedicated thread (not recommended: might cause "
+"audio glitches with HLE and freezes with LLE)."
+msgstr ""
+"Ejecutar DSP HLE y LLE en un proceso dedicado (no recomendado: podría causar "
+"interferencias de audio con HLE y se cuelgue con LLE)."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:327
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307
 msgid "Russian"
 msgstr "Ruso"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:149
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:150
 msgid "Sa&ve State"
 msgstr "Guardar estado"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:465
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475
 msgid "Safe"
 msgstr "Seguro"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:196
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:446
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:925
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:183
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:452
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916
 msgid "Save"
 msgstr "Guardar"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:532
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:522
 msgid "Save GCI as..."
 msgstr "Guardar GCI como..."
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
 msgid "Save State Slot 1"
 msgstr "Guardar estado 1"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:198
 msgid "Save State Slot 2"
 msgstr "Guardar estado 2"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:199
 msgid "Save State Slot 3"
 msgstr "Guardar estado 3"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:212
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:212
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200
 msgid "Save State Slot 4"
 msgstr "Guardar estado 4"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201
 msgid "Save State Slot 5"
 msgstr "Guardar estado 5"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202
 msgid "Save State Slot 6"
 msgstr "Guardar estado 6"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:203
 msgid "Save State Slot 7"
 msgstr "Guardar estado 7"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204
 msgid "Save State Slot 8"
 msgstr "Guardar estado 8"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:151
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:152
 msgid "Save State..."
 msgstr "Guardar estado..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:582
 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:592
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:602
 msgid "Save as..."
 msgstr "Guardar como..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1203
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1204
 msgid "Save compressed GCM/ISO"
 msgstr "Guardar GCM/ISO comprimido"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:446
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:452
 msgid "Save current perspective"
 msgstr "Guardar perspectiva actual"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1192
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193
 msgid "Save decompressed GCM/ISO"
 msgstr "Guardar GCM/ISO descomprimido"
 
-#: Source/Core/Core/Src/Movie.cpp:801
+#: Source/Core/Core/Src/Movie.cpp:792
 #, 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:396
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:404
 msgid "Scaled EFB Copy"
 msgstr "EFB Copia a escala"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:556
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:543
 #, c-format
 msgid "Scanning %s"
 msgstr "Escaneando %s"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:539
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:526
 msgid "Scanning for ISOs"
-msgstr "Buscando ISO"
+msgstr "Buscando ISOs"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:540
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:527
 msgid "Scanning..."
 msgstr "Escaneando..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:427
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
 msgid "ScrShot"
 msgstr "Pantallazo"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:106
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:93
 msgid "Scroll Lock"
 msgstr "Bloq. desplazamiento"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:264
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:251
 msgid "Search"
 msgstr "Buscar"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:227
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:214
 msgid "Search Filter"
 msgstr "Filtro de búsqueda"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:810
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:791
 msgid "Search Subfolders"
 msgstr "Buscar en subcarpetas"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:250
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:237
 msgid "Search current Object"
 msgstr "Buscar objeto actual"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:254
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:241
 msgid "Search for hex Value:"
 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
+#: Source/Core/Common/Src/SysConf.h:90 Source/Core/Common/Src/SysConf.h:113
+#: Source/Core/Common/Src/SysConf.h:133 Source/Core/Common/Src/SysConf.h:154
 #, c-format
 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:490
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:46
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:477
 msgid "Select"
 msgstr "Seleccionar"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:677
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1072
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:683
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1087
 msgid "Select The Recording File"
 msgstr "Seleccionar archivo de grabación"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1285
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1312
 msgid "Select a Wii WAD file to install"
 msgstr "Elige un WAD de Wii para instalar"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:70
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74
 msgid ""
 "Select a hardware adapter to use.\n"
 "\n"
@@ -4464,31 +4577,31 @@ msgstr ""
 "\n"
 "Si no estás seguro, usa el primero."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:520
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:510
 msgid "Select a save file to import"
 msgstr "Selecciona un archivo de guardado para importar"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:363
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:366
 msgid "Select floating windows"
 msgstr "Selecciona las ventanas flotantes"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:582
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:585
 msgid "Select the file to load"
 msgstr "Selecciona el archivo para cargar"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1241
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1268
 msgid "Select the save file"
 msgstr "Selecciona el archivo de guardado"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1388
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1415
 msgid "Select the state to load"
 msgstr "Selecciona el estado para cargar"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1429
 msgid "Select the state to save"
 msgstr "Selecciona el estado para guardar"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82
 msgid ""
 "Select what aspect ratio to use when rendering:\n"
 "Auto: Use the native aspect ratio\n"
@@ -4506,15 +4619,15 @@ msgstr ""
 "\n"
 "Si no estás seguro, elige Automático."
 
-#: Source/Core/InputCommon/Src/InputConfig.cpp:61
+#: Source/Core/InputCommon/Src/InputConfig.cpp:48
 msgid "Selected controller profile does not exist"
 msgstr "El perfil del controlador escogido no existe"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:116
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:109
 msgid "Selected font"
 msgstr "Fuente seleccionada"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75
 msgid ""
 "Selects the display resolution used in fullscreen mode.\n"
 "This should always be bigger than or equal to the internal resolution. "
@@ -4531,23 +4644,40 @@ 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:69
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:70
 msgid ""
 "Selects what graphics API to use internally.\n"
 "Direct3D 9 usually is the fastest one. OpenGL is more accurate though. "
 "Direct3D 11 is somewhere between the two.\n"
 "Note that the Direct3D backends are only available on Windows.\n"
 "\n"
-"If unsure, use Direct3D 9."
+"If unsure, use Direct3D 11."
 msgstr ""
 "Elige la aplicación gráfica para ser usada internamente.\n"
-"Direct3D9 habitualmente es la más rápida. OpenGL es más exacta. Direct3D11 "
+"Direct3D 9 habitualmente es la más rápida. OpenGL es más exacta. Direct3D 11 "
 "está entre las dos.\n"
 "Los sistemas Direct3D solo están disponibles en Windows.\n"
 "\n"
-"Si no estás seguro, usa Direct3D9."
+"Si no estás seguro, utiliza Direct3D 11."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:288
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72
+msgid ""
+"Selects what graphics API to use internally.\n"
+"Direct3D 9 usually is the fastest one. OpenGL is more accurate though. "
+"Direct3D 11 is somewhere between the two.\n"
+"Note that the Direct3D backends are only available on Windows.\n"
+"\n"
+"If unsure, use OpenGL."
+msgstr ""
+"Elige la aplicación gráfica para ser usada internamente.\n"
+"Direct3D 9 habitualmente es la más rápida. OpenGL es más exacta. Direct3D 11 "
+"está entre las dos.\n"
+"Los sistemas Direct3D solo están disponibles en Windows.\n"
+"\n"
+"\n"
+"Si no estás seguro, utiliza OpenGL."
+
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:291
 msgid "Send"
 msgstr "Enviar"
 
@@ -4555,26 +4685,26 @@ msgstr "Enviar"
 msgid "Sensor Bar Position:"
 msgstr "Posición de la barra sensora:"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:77
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:64
 msgid "Separator"
 msgstr "Separador"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:328
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308
 msgid "Serbian"
 msgstr "Serbio"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:522
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502
 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:488
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:475
 msgid "Set"
 msgstr "Definir"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:877
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:868
 msgid "Set as &default ISO"
 msgstr "Definir como ISO por &defecto"
 
@@ -4583,14 +4713,14 @@ msgstr "Definir como ISO por &defecto"
 msgid "Set as default Memcard %c"
 msgstr "Definir como Memory Card por defecto %c"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:460
+#: Source/Core/Core/Src/ActionReplay.cpp:450
 #, 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/ConfigMain.cpp:535
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:515
 msgid ""
 "Sets the latency (in ms).  Higher values may reduce audio crackling. OpenAL "
 "backend only."
@@ -4598,123 +4728,123 @@ msgstr ""
 "Ajusta la latencia (en ms). Valores más altos pueden reducir el petardeo del "
 "audio. Solo para el motor OpenAL."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341
 msgid "Settings..."
 msgstr "Configuración..."
 
-#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:222
+#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:209
 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:291
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:278
 msgid "Shake"
 msgstr "Sacudir"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
 msgid "Short Name:"
 msgstr "Nombre corto:"
 
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:103
+#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:90
 msgid "Shoulder Buttons"
 msgstr "Botones laterales"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:217
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:220
 msgid "Show &Console"
 msgstr "Mostrar &consola"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:215
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:218
 msgid "Show &Log"
 msgstr "Mostrar &registro"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:212
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:215
 msgid "Show &Statusbar"
 msgstr "Mostrar barra de e&stado"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:210
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:213
 msgid "Show &Toolbar"
 msgstr "Mostrar barra de herramien&tas"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:281
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:284
 msgid "Show Drives"
 msgstr "Mostrar unidades"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:517
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530
 msgid "Show EFB Copy Regions"
 msgstr "Mostrar regiones de copiado de EFB"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:295
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303
 msgid "Show FPS"
 msgstr "Mostrar FPS"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:271
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:274
 msgid "Show France"
 msgstr "Mostrar Francia"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:257
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:260
 msgid "Show GameCube"
 msgstr "Mostrar Gamecube"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561
 msgid "Show Input Display"
 msgstr "Mostrar entrada"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:273
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:276
 msgid "Show Italy"
 msgstr "Mostrar Italia"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:264
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:267
 msgid "Show JAP"
 msgstr "Mostrar JAP"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:275
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:278
 msgid "Show Korea"
 msgstr "Mostrar Corea"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476
 msgid "Show Language:"
 msgstr "Mostrar idioma:"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:216
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:219
 msgid "Show Log &Configuration"
 msgstr "Mostrar configuración de &registro"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:266
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:269
 msgid "Show PAL"
 msgstr "Mostrar PAL"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:254
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:257
 msgid "Show Platforms"
 msgstr "Mostrar plataformas"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:263
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:266
 msgid "Show Regions"
 msgstr "Mostrar regiones"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:518
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531
 msgid "Show Statistics"
 msgstr "Mostar estadísticas"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:277
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:280
 msgid "Show Taiwan"
 msgstr "Mostrar Taiwán"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:268
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:271
 msgid "Show USA"
 msgstr "Mostrar USA"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:259
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:262
 msgid "Show Wad"
 msgstr "Mostrar WAD"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:255
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:258
 msgid "Show Wii"
 msgstr "Mostrar Wii"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491
 msgid "Show a confirmation box before stopping a game."
 msgstr "Mostrar una ventana de confirmación antes de detener un juego."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:512
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492
 msgid ""
 "Show a message box when a potentially serious error has occurred.\n"
 "Disabling this may avoid annoying and non-fatal messages, but it may also "
@@ -4729,11 +4859,11 @@ msgstr ""
 msgid "Show first block"
 msgstr "Mostrar primer bloque"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:130
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:131
 msgid "Show lag counter"
 msgstr "Mostrar contador de lag"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493
 msgid ""
 "Show messages on the emulation screen area.\n"
 "These messages include memory card writes, video backend and CPU "
@@ -4759,7 +4889,7 @@ msgstr "Mostrar icono del guardado"
 msgid "Show save title"
 msgstr "Mostrar título del guardado"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102
 msgid ""
 "Show the number of frames rendered per second as a measure of emulation "
 "speed.\n"
@@ -4771,11 +4901,11 @@ msgstr ""
 "\n"
 "Si no estás seguro, déjala sin marcar."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:279
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:282
 msgid "Show unknown"
 msgstr "Mostrar desconocido"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105
 msgid ""
 "Show various statistics.\n"
 "\n"
@@ -4785,47 +4915,31 @@ msgstr ""
 "\n"
 "Si no estás seguro, déjala sin marcar."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:319
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:306
 msgid "Sideways Wiimote"
 msgstr "Wiimote de costado"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:280
 msgid "Simplified Chinese"
 msgstr "Chino simplificado"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:311
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:298
 msgid "Size"
 msgstr "Tamaño"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:696
 msgid "Skip BIOS"
 msgstr "Saltar BIOS"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316
 msgid "Skip DCBZ clearing"
 msgstr "Saltar limpieza DCBZ"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:492
-msgid "Skip Dest. Alpha Pass"
-msgstr "Saltar pase de alpha en dest."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:444
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:454
 msgid "Skip EFB Access from CPU"
 msgstr "Saltar el acceso al EFB desde la CPU"
 
-#: 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 ""
-"Salta el destino del pase alfa usado en muchos juegos para varios efectos "
-"gráficos.\n"
-"\n"
-"Si no estás seguro, déjala sin marcar."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125
 msgid ""
 "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n"
 "Sometimes also increases visual quality.\n"
@@ -4842,25 +4956,25 @@ msgstr ""
 "\n"
 "Si no estás seguro, déjala sin marcar."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:374
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:386
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:380
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:392
 #, c-format
 msgid "Slot %i"
 msgstr "Ranura %i"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:700
 msgid "Slot A"
 msgstr "Ranura A"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:701
 msgid "Slot B"
 msgstr "Ranura B"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:62
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:49
 msgid "Snapshot"
 msgstr "Instántanea"
 
-#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:58
+#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:46
 msgid "Software Renderer"
 msgstr "Renderizado por software"
 
@@ -4876,35 +4990,35 @@ msgstr ""
 "¿Realmente quieres activar renderizado por software? Si no estás seguro, "
 "elige No."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:683
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:664
 msgid "Sound Settings"
 msgstr "Configuración de sonido"
 
-#: Source/Core/AudioCommon/Src/AudioCommon.cpp:77
+#: Source/Core/AudioCommon/Src/AudioCommon.cpp:64
 #, c-format
 msgid "Sound backend %s is not valid."
 msgstr "El motor de sonido %s no es válido."
 
-#: Source/Core/AudioCommon/Src/DSoundStream.cpp:59
+#: Source/Core/AudioCommon/Src/DSoundStream.cpp:46
 #, c-format
 msgid "Sound buffer creation failed: %s"
 msgstr "Falló la creación del búfer de sonido: %s"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:31
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:18
 msgid "Space"
 msgstr "Espacio"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:329
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309
 msgid "Spanish"
 msgstr "Español"
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:98
 msgid "Speaker Volume:"
-msgstr "Volumen del altavoz"
+msgstr "Volumen del altavoz:"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92
 msgid ""
 "Specifies the resolution used to render at. A high resolution will improve "
 "visual quality a lot but is also quite heavy on performance and might cause "
@@ -4924,63 +5038,63 @@ msgstr ""
 "\n"
 "Si no estás seguro, elige 640x528."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322
 msgid "Speed up Disc Transfer Rate"
 msgstr "Acelerar la transferencia de disco"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:243
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:230
 msgid "Square Stick"
 msgstr "Stick cuadrado"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:107
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87
 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:322
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:37
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:25
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:325
 msgid "Start"
 msgstr "Comenzar"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:194
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:197
 msgid "Start &NetPlay"
 msgstr "Comenzar &NetPlay"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:339
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:345
 msgid "Start Re&cording"
 msgstr "Comenzar graba&ción"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:175
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:175
 msgid "Start Recording"
 msgstr "Comenzar grabación"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:312
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:299
 msgid "State"
 msgstr "Estado"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:173
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:161
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:161
 msgid "State Saves"
 msgstr "Estados guardados"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:108
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88
 msgid "Steering Wheel"
 msgstr "Volante"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:53
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:57
 msgid "Stick"
 msgstr "Stick"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:420
-#: 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:325
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:419
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:431
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:171
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:171
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:328
 msgid "Stop"
 msgstr "Detener"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96
 msgid ""
 "Store EFB copies in GPU texture objects.\n"
 "This is not so accurate, but it works well enough for most games and gives a "
@@ -4988,125 +5102,134 @@ msgid ""
 "\n"
 "If unsure, leave this checked."
 msgstr ""
-"Calcular la iluminación de los gráficos 3D por píxel en lugar de por "
-"vértice.\n"
-"Disminuye la velocidad de emulación en un pequeño porcentaje (dependiendo de "
-"la GPU).\n"
-"Esto generalmente es una mejora segura, pero a veces podría causar "
-"problemas.\n"
+"Almacena copias de EFB en los objetos textura de GPU.\n"
+"Esto no es tan preciso, pero funciona bastante bien para la mayoría de los "
+"juegos y le da un gran aumento de velocidad de sobre EFB a RAM.\n"
 "\n"
-"Si no estás seguro, deja esta casilla sin marcar."
+"Si no estás seguro, déjala marcada."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:275
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283
 msgid "Stretch to Window"
 msgstr "Estirar a la ventana"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:43
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:47
 msgid "Strum"
 msgstr "Rasgar"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:78
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:65
 msgid "Subtract"
 msgstr "Sustraer"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:77
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:67
 #, c-format
 msgid "Successfully exported file to %s"
 msgstr "Se exportó correctamente al archivo %s"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:56
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:43
 msgid "Successfully imported save files"
 msgstr "Los archivos de guardado se han importado con éxito."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:285
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:272
 msgid "Swing"
 msgstr "Oscilar"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:744
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:792
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320
+msgid "Synchronize GPU thread"
+msgstr "Sincronizar subproceso de GPU"
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321
+msgid ""
+"Synchronizes the GPU and CPU threads to help prevent random freezes in Dual "
+"Core mode. (ON = Compatible, OFF = Fast)"
+msgstr ""
+"Sincroniza los subprocesos la GPU y la CPU para ayudar a prevenir bloqueos "
+"aleatorios en el modo a Doble Núcleo. (ON = Compatible, OFF = rápido)"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773
 msgid "System Language:"
 msgstr "Idioma del sistema:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:191
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:185
 msgid "TAIWAN"
 msgstr "TAIWÁN"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:127
-#: Source/Core/DolphinWX/Src/TASInputDlg.h:32
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:128
+#: Source/Core/DolphinWX/Src/TASInputDlg.h:19
 msgid "TAS Input"
 msgstr "Entrada TAS"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:28
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:15
 msgid "Tab"
 msgstr "Pestaña"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:510
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:531
 msgid "Tab split"
 msgstr "División de pestaña"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:37
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:41
 msgid "Table Left"
 msgstr "Tabla izquierda"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:38
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:42
 msgid "Table Right"
 msgstr "Tabla derecha"
 
-#: 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
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:361
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:181
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:181
 msgid "Take Screenshot"
 msgstr "Captura de pantalla"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:109
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89
 msgid "TaruKonga (Bongos)"
 msgstr "TaruKonga (Bongos)"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:472
 msgid "Test"
 msgstr "Prueba"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:444
 msgid "Texture"
 msgstr "Textura"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:451
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:461
 msgid "Texture Cache"
 msgstr "Caché de texturas"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:519
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:532
 msgid "Texture Format Overlay"
 msgstr "Superposición del formato de la textura"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:226
+#: Source/Core/Core/Src/CoreParameter.cpp:215
 msgid "The WAD has been installed successfully"
 msgstr "El WAD ha sido instalado con éxito"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:197
+#: Source/Core/Core/Src/ActionReplay.cpp:185
 msgid "The address is invalid"
 msgstr "La dirección no es válida"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:509
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:496
 msgid "The checksum was successfully fixed"
 msgstr "La suma de verificación fue reparada con éxito."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1242
+#: 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:1117
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1216
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1118
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1146
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1217
 #, c-format
 msgid ""
 "The file %s already exists.\n"
 "Do you wish to replace it?"
 msgstr ""
-"El archivo %s ya existe. \n"
-"¿Desea remplazarlo?"
+"El archivo %s ya existe.\n"
+"¿Deseas remplazarlo?"
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:51
+#: Source/Core/AudioCommon/Src/WaveFile.cpp:38
 #, c-format
 msgid ""
 "The file %s could not be opened for writing. Please check if it's already "
@@ -5115,30 +5238,30 @@ msgstr ""
 "El archivo %s no pudo ser abierto para su escritura. Por favor, comprueba si "
 "no está ya abierto por otro programa."
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:44
+#: Source/Core/AudioCommon/Src/WaveFile.cpp:31
 #, c-format
 msgid "The file %s was already open, the file header will not be written."
 msgstr ""
 "El archivo %s ya estaba abierto, la cabecera de archivo no será escrita."
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:332
+#: Source/Core/Core/Src/Boot/Boot.cpp:320
 #, c-format
 msgid "The file you specified (%s) does not exist"
 msgstr "El archivo especificado (%s) no existe"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:628
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:666
 msgid "The name can not be empty"
 msgstr "El nombre no puede estar vacío"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:620
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:658
 msgid "The name can not contain the character ','"
 msgstr "El nombre no puede contener coma (,)"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:142
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:129
 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:93
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98
 msgid ""
 "The safer you adjust this, the less likely the emulator will be missing any "
 "texture updates from RAM.\n"
@@ -5150,12 +5273,12 @@ msgstr ""
 "\n"
 "Si no estás seguro, utiliza el valor más a la derecha."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:445
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:432
 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:388
+#: Source/Core/DolphinWX/Src/Main.cpp:416
 msgid ""
 "The selected language is not supported by your system. Falling back to "
 "system default."
@@ -5163,36 +5286,36 @@ msgstr ""
 "El idioma seleccionado no es soportado por tu sistema. Volviendo al "
 "predeterminado del sistema."
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:43
+#: Source/Core/Core/Src/NetPlayClient.cpp:47
 msgid "The server and client's NetPlay versions are incompatible!"
 msgstr "¡Las versiones de NetPlay del client y el servidor son incompatibles!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:40
+#: Source/Core/Core/Src/NetPlayClient.cpp:44
 msgid "The server is full!"
 msgstr "¡El servidor está lleno!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:46
+#: Source/Core/Core/Src/NetPlayClient.cpp:50
 msgid "The server responded: the game is currently running!"
-msgstr "El servidor respondió: el juego está andando actualmente!"
+msgstr "El servidor respondió: ¡el juego actualmente está funcionando!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:49
+#: Source/Core/Core/Src/NetPlayClient.cpp:53
 msgid "The server sent an unknown error message!"
-msgstr "El servidor envió un mensaje de error desconocido!"
+msgstr "¡El servidor envió un mensaje de error desconocido!"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:119
+#: Source/Core/Core/Src/CoreParameter.cpp:108
 #, c-format
 msgid "The specified file \"%s\" does not exist"
 msgstr "El archivo especificado \"%s\" no existe"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:198
+#: Source/Core/Core/Src/ActionReplay.cpp:186
 msgid "The value is invalid"
 msgstr "El valor no es válido"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:642
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:623
 msgid "Theme:"
 msgstr "Tema:"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:476
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:463
 msgid ""
 "There must be a ticket for 00000001/00000002. Your NAND dump is probably "
 "incomplete."
@@ -5200,7 +5323,7 @@ msgstr ""
 "Debe haber un ticket para 00000001/00000002. Probablemente su volcado de "
 "NAND esté incompleto."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308
 msgid ""
 "These settings override core Dolphin settings.\n"
 "Undetermined means the game uses Dolphin's setting."
@@ -5208,7 +5331,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:355
+#: Source/Core/Core/Src/ActionReplay.cpp:345
 msgid ""
 "This action replay simulator does not support codes that modify Action "
 "Replay itself."
@@ -5216,12 +5339,12 @@ msgstr ""
 "El simulador de Action Replay no soporta códigos que modifiquen al Action "
 "Replay."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505
 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:113
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118
 msgid ""
 "This feature allows you to change the game's camera.\n"
 "Move the mouse while holding the right mouse button to pan and while holding "
@@ -5240,9 +5363,22 @@ msgstr ""
 "(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."
+"Si no estás seguro, déjala sin marcar."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485
+#, fuzzy
+msgid ""
+"This limits the game speed to the specified number of frames per second "
+"(full speed is 60 for NTSC and 50 for PAL). Alternatively, use Audio to "
+"throttle using the DSP (might fix audio clicks but can also cause constant "
+"noise depending on the game)."
+msgstr ""
+"Si defines un límite de fotogramas mayor que la velocidad de juego completa "
+"(NTSC: 60, PAL: 50), también debes deshabilitar la regulación de audio en "
+"DSP para que tenga efecto (debería arreglar los \"clics\" de audio, pero "
+"puede causar ruido constante dependiendo del juego)."
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484
 msgid ""
 "This splits the Video and CPU threads, so they can be run on separate "
 "cores.\n"
@@ -5254,61 +5390,61 @@ 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:286
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:287
 msgid "This will let you Manually Edit the INI config file"
 msgstr "Esto te permitirá editar manualmente el archivo de configuración INI"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:249
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:254
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:236
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:241
 msgid "Threshold"
 msgstr "Límite"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:288
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:275
 msgid "Tilt"
 msgstr "Inclinar"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:628
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:304
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:622
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:291
 msgid "Title"
 msgstr "Título"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:125
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:144
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:112
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:131
 msgid "To"
 msgstr "A"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:72
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59
 msgid "Toggle All Log Types"
 msgstr "Alternar todos los tipos de registro"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:426
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:432
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:180
 msgid "Toggle Fullscreen"
 msgstr "Cambiar a pantalla completa"
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:87
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:271
 msgid "Top"
 msgstr "Superior"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:281
 msgid "Traditional Chinese"
 msgstr "Chino tradicional"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:426
+#: Source/Core/Core/Src/Boot/Boot.cpp:414
 msgid "Tried to load an unknown file type."
 msgstr "Se trató de cargar un archivo de tipo desconocido."
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:80
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:67
 msgid "Triggers"
 msgstr "Gatillos"
 
-#: Source/Core/Common/Src/SysConf.h:91 Source/Core/Common/Src/SysConf.h:114
+#: Source/Core/Common/Src/SysConf.h:78 Source/Core/Common/Src/SysConf.h:101
 msgid "Trying to read from invalid SYSCONF"
 msgstr "Intentando leer de un SYSCONF no válido"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:44
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:31
 msgid ""
 "Trying to read from invalid SYSCONF\n"
 "Wiimote bt ids are not available"
@@ -5316,15 +5452,15 @@ msgstr ""
 "Intentando leer de un SYSCONF no válido\n"
 "bt ids del Wiimote no están disponibles"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:330
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
 msgid "Turkish"
 msgstr "Turco"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:33
 msgid "Turntable"
 msgstr "Mesa de DJ"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:71
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58
 msgid "Type"
 msgstr "Tipo"
 
@@ -5332,25 +5468,25 @@ msgstr "Tipo"
 msgid "UDP Port:"
 msgstr "Puerto UDP:"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:279
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:266
 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12
 msgid "UDP Wiimote"
 msgstr "UDP Wiimote"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:199
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:193
 msgid "UNKNOWN"
 msgstr "DESCONOCIDO"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:756
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:755
 #, c-format
 msgid "UNKNOWN_%02X"
 msgstr "DESCONOCIDO_%02X"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:178
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:172
 msgid "USA"
 msgstr "EUA"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:225
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:214
 msgid ""
 "Unable to create patch from given values.\n"
 "Entry not modified."
@@ -5358,7 +5494,7 @@ msgstr ""
 "No se pudo crear el parche de los valores dados.\n"
 "Entrada no modificada."
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:124
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:111
 #, c-format
 msgid ""
 "Unable to parse line %lu of the entered AR code as a valid encrypted or "
@@ -5369,75 +5505,94 @@ 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:391
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:397
 #, c-format
 msgid "Undefined %i"
 msgstr "Indefinido %i"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:163
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:164
 msgid "Undo Load State"
 msgstr "Deshacer cargar estado"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:718
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:717
 msgid "Unexpected 0x80 call? Aborting..."
 msgstr "¿Llamada inesperada a 0x80? Cancelando..."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:215
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:202
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:971
+#: Source/Core/Core/Src/HW/DVDInterface.cpp:965
 #, c-format
 msgid "Unknown DVD command %08x - fatal error"
 msgstr "Comando desconocido de DVD %08x - error fatal"
 
-#: Source/Core/Common/Src/SysConf.cpp:145
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:444
+#, c-format
+msgid "Unknown command 0x%08x"
+msgstr "Comando desconocido 0x%08x"
+
+#: Source/Core/Common/Src/SysConf.cpp:132
 #, c-format
 msgid "Unknown entry type %i in SYSCONF (%s@%x)!"
-msgstr "Entrada desconocida de tipo %i en SYSCONF (%s@%x)!"
+msgstr "¡Entrada desconocida de tipo %i en SYSCONF (%s@%x)!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:228
+#: Source/Core/Core/Src/NetPlayClient.cpp:232
 #, c-format
 msgid "Unknown message received with id : %d"
 msgstr "Se recibió un mensaje desconocido de id: %d"
 
-#: Source/Core/Core/Src/NetPlayServer.cpp:504
+#: Source/Core/Core/Src/NetPlayServer.cpp:508
 #, c-format
 msgid "Unknown message with id:%d received from player:%d Kicking player!"
 msgstr ""
 "Mensaje desconocido con id:%d recibido del jugador:%d ¡Echando al jugador!"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:274
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:56
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:261
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:43
 msgid "Up"
 msgstr "Arriba"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:108
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:95
 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17
 msgid "Update"
 msgstr "Actualizar"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:320
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:307
 msgid "Upright Wiimote"
 msgstr "Wiimote parado"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:777
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758
 msgid "Use EuRGB60 Mode (PAL60)"
 msgstr "Usar Modo EuRGB60 (PAL60)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:294
 msgid "Use Fullscreen"
 msgstr "Usar pantalla completa"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:575
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:563
 msgid "Use Hex"
 msgstr "Usar hexadecimal"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:600
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580
 msgid "Use Panic Handlers"
 msgstr "Usar advertencias"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89
+msgid ""
+"Use a hacked upload strategy to stream vertices.\n"
+"This usually speed up, but is forbidden by OpenGL specification and may "
+"causes heavy glitches.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+"Utilizar un búfer de carga hackeada a los vértices de flujo.\n"
+"Normalmente mejora la velocidad, pero esta prohibido en OpenGL y puede "
+"causar errores graves.\n"
+"\n"
+"Si no estás seguro, déjala desmarcada."
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122
 msgid ""
 "Use multiple threads to decode textures.\n"
 "Might result in a speedup (especially on CPUs with more than two cores).\n"
@@ -5450,7 +5605,7 @@ msgstr ""
 "\n"
 "Si no estás seguro, déjala sin marcar."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126
 msgid ""
 "Usually if shader compilation fails, an error message is displayed.\n"
 "However, one may skip the popups to allow interruption free gameplay by "
@@ -5465,53 +5620,58 @@ msgstr ""
 "\n"
 "Si no estás seguro, déjala sin marcar."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:539
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:552
 msgid "Utility"
 msgstr "Utilidad"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:285
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:293
 msgid "V-Sync"
 msgstr "V-Sync"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:209
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318
+#, fuzzy
+msgid "VBeam Speed Hack"
+msgstr "Hack de velocidad MMU"
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196
 msgid "Value"
 msgstr "Valor"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:73
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:60
 msgid "Value:"
 msgstr "Valor:"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:572
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:560
 msgid "Value: "
 msgstr "Valor:"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:51
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:38
 msgid "Verbosity"
 msgstr "Verbosidad"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:377
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:381
 msgid "Video"
 msgstr "Vídeo"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:486
 msgid "Virtual"
 msgstr "Virtual"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:689
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670
 msgid "Volume"
 msgstr "Volumen"
 
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:498
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:527
+#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:488
+#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:517
 #, c-format
 msgid "WAD installation failed: error creating %s"
 msgstr "La instalación del WAD falló: error al crear %s"
 
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:547
+#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:537
 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:80
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84
 msgid ""
 "Wait for vertical blanks in order to reduce tearing.\n"
 "Decreases performance if emulation speed is below 100%.\n"
@@ -5524,25 +5684,25 @@ msgstr ""
 "\n"
 "Si no estás seguro, déjala sin marcar."
 
-#: Source/Core/Common/Src/MsgHandler.cpp:67
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46
+#: Source/Core/Common/Src/MsgHandler.cpp:53
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:33
 #: Source/Core/DolphinWX/Src/VideoConfigDiag.h:85
 msgid "Warning"
 msgstr "Advertencia"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:291
+#: Source/Core/Core/Src/Boot/Boot.cpp:279
 msgid "Warning - starting DOL in wrong console mode!"
-msgstr "Advertencia - arrancando un DOL en un modo de consola incorrecto!"
+msgstr "¡Advertencia - arrancando un DOL en un modo de consola incorrecto!"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:341
+#: Source/Core/Core/Src/Boot/Boot.cpp:329
 msgid "Warning - starting ELF in wrong console mode!"
-msgstr "Advertencia - arrancando un ELF en un modo de consola incorrecto!"
+msgstr "¡Advertencia - arrancando un ELF en un modo de consola incorrecto!"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:221
+#: Source/Core/Core/Src/Boot/Boot.cpp:209
 msgid "Warning - starting ISO in wrong console mode!"
-msgstr "Advertencia - arrancando un ISO en un modo de consola incorrecto!"
+msgstr "¡Advertencia - arrancando un ISO en un modo de consola incorrecto!"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:519
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:512
 #, c-format
 msgid ""
 "Warning! it is advised to backup all files in the folder:\n"
@@ -5554,7 +5714,7 @@ msgstr ""
 "%s\n"
 "¿Quieres continuar?"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:585
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:578
 #, c-format
 msgid ""
 "Warning: This will overwrite any existing saves that are in the folder:\n"
@@ -5566,9 +5726,9 @@ msgstr ""
 "la carpeta:\n"
 "%s\n"
 "y tienen el mismo nombre que el archivo en tu memcard\n"
-"Continuar?"
+"¿Continuar?"
 
-#: Source/Core/Core/Src/Movie.cpp:844
+#: Source/Core/Core/Src/Movie.cpp:835
 #, c-format
 msgid ""
 "Warning: You loaded a save that's after the end of the current movie. (byte "
@@ -5579,7 +5739,7 @@ msgstr ""
 "actual.(Byte %u > %u) (frame %u > %u). Deberías cargar otro guardado antes "
 "de continuar, o cargar éste sin el modo de solo lectura."
 
-#: Source/Core/Core/Src/Movie.cpp:861
+#: Source/Core/Core/Src/Movie.cpp:852
 #, c-format
 msgid ""
 "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You "
@@ -5591,7 +5751,7 @@ msgstr ""
 "con el modo de solo lectura desactivado. De lo contrario probablemente "
 "obtengas una desincronización."
 
-#: Source/Core/Core/Src/Movie.cpp:870
+#: Source/Core/Core/Src/Movie.cpp:861
 #, c-format
 msgid ""
 "Warning: You loaded a save whose movie mismatches on frame %d. You should "
@@ -5625,49 +5785,49 @@ msgstr ""
 "Start=%d, A=%d, B=%d, X=%d, Y=%d, Z=%d, DUp=%d, DDown=%d, DLeft=%d, DRight="
 "%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d"
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:106
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:129
+#: Source/Core/AudioCommon/Src/WaveFile.cpp:93
+#: Source/Core/AudioCommon/Src/WaveFile.cpp:116
 msgid "WaveFileWriter - file not open."
 msgstr "WaveFileWriter - el archivo no está abierto."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:56
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:60
 msgid "Whammy"
 msgstr "Whammy"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:404
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:408
 msgid "Widescreen Hack"
 msgstr "Hack de pantalla ancha (widescreen)"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:312
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:299
 msgid "Width"
 msgstr "Ancho"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535
 msgid "Wii"
 msgstr "Wii"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:372
 msgid "Wii Console"
 msgstr "Consola Wii"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:844
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:825
 msgid "Wii NAND Root:"
 msgstr "Raíz de la NAND de Wii:"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:191
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:194
 msgid "Wii Save Import"
 msgstr "Importar guardado de Wii"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1243
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1270
 msgid "Wii save files (*.bin)|*.bin"
 msgstr "Archivos de guardado Wii (*.bin)|*.bin"
 
-#: Source/Core/DiscIO/Src/WiiWad.cpp:82
+#: Source/Core/DiscIO/Src/WiiWad.cpp:69
 msgid "WiiWAD: Could not read from file"
 msgstr "WiiWAD: No se pudo leer el archivo"
 
-#: Source/Core/Core/Src/HW/Wiimote.cpp:17
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
+#: Source/Core/Core/Src/HW/Wiimote.cpp:20
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
 msgid "Wiimote"
 msgstr "Wiimote"
 
@@ -5676,7 +5836,7 @@ msgstr "Wiimote"
 msgid "Wiimote %i"
 msgstr "Wiimote %i"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:628
+#: Source/Core/DolphinWX/Src/Main.cpp:656
 msgid "Wiimote Connected"
 msgstr "Wiimote conectado"
 
@@ -5684,7 +5844,7 @@ msgstr "Wiimote conectado"
 msgid "Wiimote Motor"
 msgstr "Motor Wiimote"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
 msgid "Wiimote settings"
 msgstr "Configuración Wiimote"
 
@@ -5692,101 +5852,125 @@ msgstr "Configuración Wiimote"
 msgid "Wiimotes"
 msgstr "Wiimotes"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:134
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:121
 msgid "Windows Left"
 msgstr "Windows Izquierda"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:136
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:123
 msgid "Windows Menu"
 msgstr "Windows Menú"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:135
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:122
 msgid "Windows Right"
 msgstr "Windows Derecha"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:131
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:124
 msgid "Word Wrap"
 msgstr "Word Wrap"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1298
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:864
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1089
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1225
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1325
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:880
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1090
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1226
 msgid "Working..."
 msgstr "Trabajando..."
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:338
+msgid "Write memcards (GC)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46
 msgid "Write to Console"
 msgstr "Escribir a la consola"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:67
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:54
 msgid "Write to Debugger"
-msgstr "Escribir en el  depurador"
+msgstr "Escribir en el depurador"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:57
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44
 msgid "Write to File"
-msgstr "Escribir a archivo"
+msgstr "Escribir al archivo"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:61
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48
 msgid "Write to Window"
-msgstr "Escribir a ventana"
+msgstr "Escribir a la ventana"
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:60
+#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:47
 #, c-format
 msgid "XAudio2 CreateSourceVoice failed: %#X"
 msgstr "XAudio2 CreateSourceVoice falló: %#X"
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:114
+#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:101
 #, c-format
 msgid "XAudio2 init failed: %#X"
 msgstr "XAudio2 init falló: %#X"
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:124
+#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:111
 #, c-format
 msgid "XAudio2 master voice creation failed: %#X"
 msgstr "XAudio2 creación de voz maestra falló: %#X"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:766
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:765
 msgid "XF reg"
 msgstr "Registro XF"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:21
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Yellow"
 msgstr "Amarillo"
 
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:107
+#: Source/Core/Core/Src/DSP/DSPCore.cpp:120
 msgid ""
-"You are using free dsp roms made by Dolphin Team.\n"
-"Only Zelda ucode games will work correctly with them.\n"
+"You are using a free DSP ROM made by the Dolphin Team.\n"
+"All Wii games will work correctly, and most GC games should also work fine, "
+"but the GBA/IPL/CARD UCodes will not work.\n"
 msgstr ""
-"Estás usando imágenes dsp libres creadas por Dolphin Team.\n"
-"Solo los juegos ucode de Zelda funcionan correctamente con ellas.\n"
+"Estás utilizando una DSP ROM libre del Equipo Dolphin.\n"
+"Todos los juegos de Wii funcionarán correctamente, y la mayoría de juegos de "
+"GC deberían funcionar bien, pero los UCodes de GBA/IPL/CARD no funcionarán.\n"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:73
+#: Source/Core/Core/Src/DSP/DSPCore.cpp:116
+msgid ""
+"You are using an old free DSP ROM made by the Dolphin Team.\n"
+"Only games using the Zelda UCode will work correctly.\n"
+msgstr ""
+"Estás utilizando una DSP ROM libre y antigua del Equipo Dolphin.\n"
+"Solo los juegos Ucode de Zelda funcionarán correctamente.\n"
+
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:63
 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:207
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:210
 msgid "You must choose a game!!"
 msgstr "¡¡Debes elegir un juego!!"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:605
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:593
 msgid "You must enter a name!"
 msgstr "¡Debes escribir un nombre!"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:450
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:438
 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:603
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:591
 msgid "You must enter a valid profile name."
 msgstr "Debes introducir un nombre de perfil válido."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:936
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:917
 msgid "You must restart Dolphin in order for the change to take effect."
 msgstr "Debes reiniciar Dolphin para que el cambio tenga efecto."
 
-#: Source/Core/Core/Src/CoreParameter.cpp:175
+#: Source/Core/Core/Src/DSP/DSPCore.cpp:109
+msgid ""
+"Your DSP ROMs have incorrect hashes.\n"
+"Would you like to stop now to fix the problem?\n"
+"If you select \"No\", audio might be garbled."
+msgstr ""
+"Tus DSP ROMs tienen un hash incorrecto.\n"
+"¿Deseas detener ahora para arreglar el problema?\n"
+"Si seleccionas \"No\", el audio se oirá con ruidos."
+
+#: Source/Core/Core/Src/CoreParameter.cpp:164
 msgid ""
 "Your GCM/ISO file seems to be invalid (invalid country).\n"
 "Continue with PAL region?"
@@ -5794,7 +5978,7 @@ msgstr ""
 "Su archivo GCM/ISO no parece ser válido (país no válido).\n"
 "¿Continuar con la región PAL?"
 
-#: Source/Core/Common/Src/SysConf.cpp:58
+#: Source/Core/Common/Src/SysConf.cpp:45
 #, c-format
 msgid ""
 "Your SYSCONF file is the wrong size.\n"
@@ -5805,25 +5989,25 @@ msgstr ""
 "Debería ser 0x%04x (pero es 0x%04llx)\n"
 "¿Quiere crear uno nuevo?"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:334
 msgid "ZTP hack"
 msgstr "Zelda TP hack"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:387
+#: Source/Core/Core/Src/ActionReplay.cpp:377
 msgid "Zero 3 code not supported"
 msgstr "Código Zero 3 no soportado"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:408
+#: Source/Core/Core/Src/ActionReplay.cpp:398
 #, c-format
 msgid "Zero code unknown to dolphin: %08x"
-msgstr "Código cero desconocido para Dolphin:  %08x"
+msgstr "Código cero desconocido para Dolphin: %08x"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:436
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:460
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:423
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:447
 msgid "[ waiting ]"
 msgstr "[ esperando ]"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107
 msgid ""
 "[BROKEN]\n"
 "Highlight regions the EFB was copied from.\n"
@@ -5835,11 +6019,11 @@ msgstr ""
 "\n"
 "Si no estás seguro, déjala sin marcar."
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:91
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:78
 msgid "[Custom]"
 msgstr "[Personalizado]"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120
 msgid ""
 "[EXPERIMENTAL]\n"
 "Aims to speed up emulation by offloading texture decoding to the GPU using "
@@ -5859,7 +6043,7 @@ msgstr ""
 "\n"
 "Si no estás seguro, déjala sin marcar."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121
 msgid ""
 "[EXPERIMENTAL]\n"
 "Speeds up emulation a bit by caching display lists.\n"
@@ -5874,99 +6058,47 @@ msgstr ""
 "\n"
 "Si no estás seguro, déjala sin marcar."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:508
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:495
 msgid "^ ADD"
 msgstr "^ ADD"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:820
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:801
 msgid "apploader (.img)"
 msgstr "apploader (.img)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:185
-msgid "failed to read bk header"
-msgstr "Fallo al leer la cabecera bk"
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:375
-#, c-format
-msgid "failed to read data from file: %s"
-msgstr "Fallo al leer los datos del archivo: %s"
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:97
-msgid "failed to read header"
-msgstr "Fallo al leer la cabecera."
-
-#: Source/Core/Core/Src/PowerPC/JitInterface.cpp:285
+#: Source/Core/Core/Src/PowerPC/JitInterface.cpp:272
 #, c-format
 msgid "iCacheJIT: Reading Opcode from %x. Please report."
 msgstr "iCacheJIT: Leyendo Opcode desde %x. Por favor, comunícalo."
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:108
-#, c-format
-msgid "not a wii save or read failure for file header size %x"
-msgstr ""
-"no es un guardado de Wii o fallo de lectura para la cabecera de archivo de "
-"tamaño %x"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:935
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:936
 msgid "s"
 msgstr "s"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:457
-#, c-format
-msgid "unknown cmd 0x%08x"
-msgstr "cmd 0x%08x desconocido"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1110
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1136
 msgid "wxExecute returned -1 on application run!"
 msgstr "¡wxExecute dio un -1 al iniciar la aplicación!"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:56
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:43
 msgid "zFar Correction: "
 msgstr "Correción zFar:"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:51
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:38
 msgid "zNear Correction: "
 msgstr "Correción zNear:"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:493
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:480
 msgid "| OR"
 msgstr "| OR"
 
-#~ msgid "%i connected"
-#~ msgstr "%i conectado"
-
-#~ msgid "Alternate Wiimote Timing"
-#~ msgstr "Sincronización alternativa del Wiimote"
-
-#~ msgid "Interpreter (VERY slow)"
-#~ msgstr "Intérprete (MUY lento)"
-
-#~ msgid "JIT Recompiler (recommended)"
-#~ msgstr "Recompilador JIT (recomendado)"
-
-#~ msgid "JITIL experimental recompiler"
-#~ msgstr "Recompilador experimental JITIL"
+#~ msgid "Accurate VBeam emulation"
+#~ msgstr "Emulación de VBeam precisa"
 
 #~ msgid ""
-#~ "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. "
-#~ "No effect on emulated wiimotes."
+#~ "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)"
 #~ msgstr ""
-#~ "Silencia el altavoz del Wiimote. Arregla las desconexiones aleatorias en "
-#~ "wiimotes reales. No tiene ningún efecto en wiimotes emulados."
+#~ "Si los FPS son erróneos, esta opción puede ayudar. (ON = Compatible, OFF "
+#~ "= Rápido)"
 
-#~ msgid "Pair Up"
-#~ msgstr "Emparejar"
-
-#~ msgid "Reconnect Wiimote Confirm"
-#~ msgstr "Confirmar reconectar Wiimote"
-
-#~ msgid ""
-#~ "Wiimote %i has been disconnected by system.\n"
-#~ "Maybe this game doesn't support multi-wiimote,\n"
-#~ "or maybe it is due to idle time out or other reason.\n"
-#~ "Do you want to reconnect immediately?"
-#~ msgstr ""
-#~ "El Wiimote %i ha sido desconectado por el sistema.\n"
-#~ "Puede ser que este juego no suporte multiwiimote\n"
-#~ "o mucho tiempo de espera, o alguna otra razón.\n"
-#~ "¿Desea reconectarlo inmediatamente?"
+#~ msgid "Skip Dest. Alpha Pass"
+#~ msgstr "Saltar pase de alpha en dest."
diff --git a/Languages/po/fa.po b/Languages/po/fa.po
index dc011ec53a..6a93672689 100644
--- a/Languages/po/fa.po
+++ b/Languages/po/fa.po
@@ -3,13 +3,13 @@
 # This file is distributed under the same license as the dolphin-emu package.
 #
 # Translators:
-# Hamed Khakbiz <hamed.khakbiz@gmail.com>, 2011.
+# Hamed Khakbiz <hamed.khakbiz@gmail.com>, 2011
 msgid ""
 msgstr ""
 "Project-Id-Version: Dolphin Emulator\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-10 08:56-0500\n"
-"PO-Revision-Date: 2013-02-17 11:21+0000\n"
+"POT-Creation-Date: 2013-04-18 23:00-0500\n"
+"PO-Revision-Date: 2013-04-04 08:13+0000\n"
 "Last-Translator: Delayline <hamed.khakbiz@gmail.com>\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/dolphin-emu/"
 "language/fa/)\n"
@@ -19,21 +19,21 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:511
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:499
 msgid " (too many to display)"
 msgstr "(برای نمایش دادن بسیار زیاد است)"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:270
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:273
 #: Source/Core/DolphinWX/Src/NetWindow.cpp:491
 #: Source/Core/DolphinWX/Src/NetWindow.cpp:530
 msgid " Game : "
 msgstr "بازی :"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:507
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494
 msgid "! NOT"
 msgstr "! نه"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:70
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:58
 #, c-format
 msgid ""
 "\"%s\" does not exist.\n"
@@ -42,35 +42,45 @@ msgstr ""
 "\"%s\" وجود ندارد.\n"
 "یک کارت حافظه ۱۶ مگا بایتی جدید ساخته شود؟"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:142
+#: Source/Core/Core/Src/CoreParameter.cpp:131
 #, 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:722
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:721
 #, c-format
 msgid "%08X:  "
 msgstr "%08X:  "
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:196
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:183
 #, c-format
 msgid "%1$sCopy%1$s"
 msgstr "%1$sکپی%1$s"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:128
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:296
+#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:113
+#, c-format
+msgid "%d samples"
+msgstr ""
+
+#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:112
+#, c-format
+msgid "%d samples (quality level %d)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:121
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:289
 #, c-format
 msgid "%s already exists, overwrite?"
 msgstr "%s وجود دارد، بازنویسی شود؟"
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:167
+#: Source/Core/DiscIO/Src/CompressedBlob.cpp:154
 #, c-format
 msgid "%s failed to be scrubbed. Probably the image is corrupt."
 msgstr "%s تمیز کارى آیزو با شکست مواجه شد. شاید فایل آیزو خراب است."
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:95
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:83
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
@@ -79,7 +89,7 @@ msgstr ""
 "%s بارگذاری بعنوان کارت حافظه با شکست مواجه شد \n"
 "حجم فایل کارت نامعتبر است (0x%x بایت)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:110
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:98
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
@@ -88,7 +98,7 @@ msgstr ""
 "%s بارگذاری بعنوان کارت حافظه با شکست مواجه شد \n"
 "حجم کارت حافظه نامعتبر است (0x%x بایت)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:90
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:78
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
@@ -97,48 +107,37 @@ msgstr ""
 "%s بارگذاری بعنوان کارت حافظه با شکست مواجه شد \n"
 "فایل به اندازه کافی بزرگ نیست که یک فایل کارت حافظه معتبر باشد (0x%x بایت)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:367
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:359
 #, c-format
 msgid "%s failed to open"
 msgstr "%s بازکردن با شکست مواجه شد"
 
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:97
-#, c-format
-msgid ""
-"%s has an incorrect hash.\n"
-"Would you like to stop now to fix the problem?\n"
-"If you select \"No\", audio will be garbled."
-msgstr ""
-"%s دارای یک درهم‌ساز نا درست است.\n"
-"آیا مایل هستید برابرسازی حالا متوقف شود تا مشکل را اصلاح کنید؟اگر شما \"نه\" "
-"را انتخاب کنید، صدا مغشوش خواهد شد."
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:360
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:352
 #, c-format
 msgid "%s is a 0 byte file"
 msgstr "%s یک فایل با حجم ۰ بایت است"
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:159
+#: Source/Core/DiscIO/Src/CompressedBlob.cpp:146
 #, c-format
 msgid "%s is already compressed! Cannot compress it further."
 msgstr "%s فشرده شده است! توان فشرده سازی بیشتر را ندارد."
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:345
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:337
 #, c-format
 msgid "%s is too long for the filename, max chars is 45"
 msgstr "%s برای اسم فایل بسیار دراز است، حداکثر تعداد کاراکترها ۴۵ است"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:202
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:189
 #, c-format
 msgid "%sDelete%s"
 msgstr "%sحذف%s"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:200
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:187
 #, c-format
 msgid "%sExport GCI%s"
 msgstr "%sصادر کردن جی سی آی%s"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:198
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:185
 #, c-format
 msgid "%sImport GCI%s"
 msgstr "%sوارد کردن جی سی آی%s"
@@ -148,252 +147,273 @@ msgstr "%sوارد کردن جی سی آی%s"
 msgid "%u Free Blocks; %u Free Dir Entries"
 msgstr "%u بلوک های آزاد; %u ورودی های پوشه آزاد"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:506
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:493
 msgid "&& AND"
 msgstr "&& و"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:295
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:301
 msgid "&About..."
 msgstr "&درباره..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:99
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:100
 msgid "&Boot from DVD Drive..."
 msgstr "&بوت شدن از درایو دی وی دی..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:231
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:234
 msgid "&Breakpoints"
 msgstr "&نقاط انفصال"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:110
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:111
 msgid "&Browse for ISOs..."
 msgstr "&مرور برای فایل های آیزو..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:192
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:195
 msgid "&Cheats Manager"
 msgstr "مدیریت کدهای &تقلب"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:177
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:180
 msgid "&DSP Settings"
 msgstr "تنظیمات پردازشگر &صدای دلفین"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:885
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:876
 msgid "&Delete ISO..."
 msgstr "&حذف آیزو..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:903
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:897
 msgid "&Delete selected ISOs..."
 msgstr "&حذف آیزو های انتخاب شده..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:170
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:173
 msgid "&Emulation"
 msgstr "&برابرسازی"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:113
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:114
 msgid "&File"
 msgstr "&فایل"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:335
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:341
 msgid "&Frame Advance"
 msgstr "&پيشروى فریم"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:352
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:358
 msgid "&Fullscreen"
 msgstr "&تمام صفحه"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:176
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:179
 msgid "&Graphics Settings"
 msgstr "تنظیمات &گرافیک"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:296
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:302
 msgid "&Help"
 msgstr "&کمک"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:180
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:183
 msgid "&Hotkey Settings"
 msgstr "تنظیم &شرت کاتها"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:233
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:236
 msgid "&JIT"
 msgstr "&جیت"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:148
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:149
 msgid "&Load State"
 msgstr "&بارگذاری وضعیت"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:190
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:193
 msgid "&Memcard Manager (GC)"
 msgstr "مدیر &کارت حافظه (گیم کیوب)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:232
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:235
 msgid "&Memory"
 msgstr "&حافظه"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:313
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:319
 msgid "&Open..."
 msgstr "&باز کردن..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:186
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:189
 msgid "&Options"
 msgstr "&گزینه ها"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:324
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:330
 msgid "&Pause"
 msgstr "مکث"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:326
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:332
 msgid "&Play"
 msgstr "&شروع بازی"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:867
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:858
 msgid "&Properties"
 msgstr "خواص"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:348
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:354
 msgid "&Read-only mode"
 msgstr "&حالت فقط خواندنی"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:319
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:325
 msgid "&Refresh List"
 msgstr "&به روز کردن لیست"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:230
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:233
 msgid "&Registers"
 msgstr "ثبت کردن"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:332
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:338
 msgid "&Reset"
 msgstr "شروع &دوباره"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:234
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:237
 msgid "&Sound"
 msgstr "&صدا"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:329
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:335
 msgid "&Stop"
 msgstr "&توقف"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:207
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:210
 msgid "&Tools"
 msgstr "&ابزارها"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:235
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:238
 msgid "&Video"
 msgstr "&ویدیو"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:284
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:287
 msgid "&View"
 msgstr "&دیدگاه"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:179
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:182
 msgid "&Wiimote Settings"
 msgstr "تنظیمات &ویموت"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:868
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:859
 msgid "&Wiki"
 msgstr "&ویکی"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504
 msgid "'"
 msgstr "'"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:59
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:46
 msgid "(-)+zFar"
 msgstr "z دور+(-)"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:54
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:41
 msgid "(-)+zNear"
 msgstr "z نزدیک+(-)"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:99
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:86
 msgid "(UNKNOWN)"
 msgstr "(ناشناخته)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:376
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:384
 msgid "(off)"
 msgstr "(خاموش)"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:655
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:654
 msgid "0x44"
 msgstr "۰x۴۴"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+msgid "1.5x Native (960x792)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:158
 msgid "16 bit"
 msgstr "۱۶ بیت"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+msgid "1x Native (640x528)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+msgid "2.5x Native (1600x1320)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+msgid "2x Native (1280x1056)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:159
 msgid "32 bit"
 msgstr "۳۲ بیت"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:412
 msgid "3D Vision"
 msgstr "نمایش سه بعدی"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+msgid "3x Native (1920x1584)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+msgid "4x Native (2560x2112)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:157
 msgid "8 bit"
 msgstr "۸ بیت"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:43
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:30
 msgid "<Insert name here>"
 msgstr "<اسم را اینجا وارد کنید>"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:255
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:262
 msgid "<No resolutions found>"
 msgstr "<سایز تصویر پیدا نشد>"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:104
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84
 msgid "<Nothing>"
 msgstr "<هیچ>"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:162
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:162
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:150
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:150
 msgid "<Press Key>"
 msgstr "<تکمه فشارى>"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286
 msgid "<System>"
 msgstr "<سیستم>"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695
 msgid "A"
 msgstr "A"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:201
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:235
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:204
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:238
 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:353
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:387
 msgid "A game is not currently running."
 msgstr "بازی در حال حاضر اجرا نشده است."
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:68
-#, fuzzy
 msgid ""
 "A supported bluetooth device could not be found.\n"
 "You must manually connect your wiimotes."
 msgstr ""
-"دستگاه بلوتوث مورد پشتیبانی پیدا نشد!\n"
-"اگر شما از نرم افزار پیاده سازی بلوتوث ماکروسافت استفاده نمی کنید شما باید "
-"ویموت خود را دستی جفت کنید و فقط از دکمه \"به روز کردن\" استفاده کنید."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:109
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:100
+#, fuzzy
 msgid ""
 "ALERT:\n"
 "\n"
-"NetPlay will currently only work properly when using the following "
-"settings:\n"
-" - Dual Core [OFF]\n"
-" - Audio Throttle [OFF]\n"
-" - DSP-HLE with \"Null Audio\" or DSP-LLE\n"
-" - Manually set the exact number of controllers that will be used to "
-"[Standard Controller]\n"
+"Netplay will only work with the following settings:\n"
+" - Enable Dual Core [OFF]\n"
+" - DSP Emulator Engine Must be the same on all computers!\n"
+" - DSP on Dedicated Thread [OFF]\n"
+" - Framelimit NOT set to [Audio]\n"
+" - Manually set the exact number of controllers to be used to [Standard "
+"Controller]\n"
 "\n"
-"All players should try to use the same Dolphin version and settings.\n"
-"Disable all memory cards or send them to all players before starting.\n"
-"Wiimote support has not been implemented.\n"
+"All players should use the same Dolphin version and settings.\n"
+"All memory cards must be identical between players or disabled.\n"
+"Wiimote support has not been implemented!\n"
 "\n"
-"You must forward TCP port to host!!"
+"The host must have the chosen TCP port open/forwarded!\n"
 msgstr ""
 "اخطار:\n"
 "\n"
@@ -412,17 +432,17 @@ msgstr ""
 "\n"
 "شما باید درگاه TCP را به میزبان ارسال کنید!!"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:111
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:116
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96
 msgid "AM-Baseboard"
 msgstr "بُردِ مادر ای ام"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:299
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:115
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:300
 msgid "AR Codes"
 msgstr "کدهای اکشن ریپلی"
 
-#: Source/Core/DolphinWX/Src/AboutDolphin.h:33
+#: Source/Core/DolphinWX/Src/AboutDolphin.h:21
 msgid "About Dolphin"
 msgstr "درباره دلفین"
 
@@ -430,15 +450,11 @@ msgstr "درباره دلفین"
 msgid "Acceleration"
 msgstr "شتاب"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:463
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473
 msgid "Accuracy:"
 msgstr "دقت:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317
-msgid "Accurate VBeam emulation"
-msgstr "برابرسازی دقیق وی بیم"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97
 msgid ""
 "Accurately emulate EFB copies.\n"
 "Some games depend on this for certain graphical effects or gameplay "
@@ -452,12 +468,12 @@ msgstr ""
 "اگر در این مورد اطمینان ندارید، به جای آن گزینه ای اف بی به بافت اشیاء را "
 "انتخاب کنید."
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:239
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:239
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:227
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:227
 msgid "Action"
 msgstr "اکشن"
 
-#: Source/Core/Core/Src/ARDecrypt.cpp:481
+#: Source/Core/Core/Src/ARDecrypt.cpp:469
 #, c-format
 msgid ""
 "Action Replay Code Decryption Error:\n"
@@ -472,14 +488,14 @@ msgstr ""
 "کد خراب:\n"
 "%s"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:667
+#: Source/Core/Core/Src/ActionReplay.cpp:657
 #, 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:755
+#: Source/Core/Core/Src/ActionReplay.cpp:745
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide "
@@ -487,7 +503,7 @@ msgid ""
 msgstr ""
 "خطای اکشن ریپلی: سایز نامعتبر (%08x : آدرس = %08x) در پر و اسلاید کردن (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:547
+#: Source/Core/Core/Src/ActionReplay.cpp:537
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And "
@@ -496,7 +512,7 @@ msgstr ""
 "خطای اکشن ریپلی: سایز نامعتبر (%08x : آدرس = %08x) در پر کردن و نوشتن حافظه "
 "(%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:607
+#: Source/Core/Core/Src/ActionReplay.cpp:597
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Write To "
@@ -504,12 +520,12 @@ msgid ""
 msgstr ""
 "خطای اکشن ریپلی: سایز نامعتبر (%08x : آدرس = %08x) در نوشتن به اشاره گر (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:802
+#: Source/Core/Core/Src/ActionReplay.cpp:792
 #, c-format
 msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)"
 msgstr "خطای اکشن ریپلی: مقدار نامعتبر (%08x) در کپی حافظه (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:682
+#: Source/Core/Core/Src/ActionReplay.cpp:672
 #, c-format
 msgid ""
 "Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)\n"
@@ -518,63 +534,63 @@ msgstr ""
 "خطای اکشن ریپلی: کد مستر و نوشتن به CCXXXXXX تکمیل نشده است (%s)\n"
 "به کدهای مستر نیاز نیست. از کدهای مستر استفاده نکنید."
 
-#: Source/Core/Core/Src/ActionReplay.cpp:196
+#: Source/Core/Core/Src/ActionReplay.cpp:184
 #, c-format
 msgid "Action Replay Error: invalid AR code line: %s"
 msgstr "خطای اکشن ریپلی: خط کد نامعتبر اکشن ریپلی: %s"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:872
+#: Source/Core/Core/Src/ActionReplay.cpp:862
 #, c-format
 msgid "Action Replay: Conditional Code: Invalid Size %08x (%s)"
 msgstr "خطای اکشن ریپلی: کد نامعلوم: سایز نامعتبر %08x (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:945
+#: Source/Core/Core/Src/ActionReplay.cpp:935
 #, c-format
 msgid "Action Replay: Invalid Normal Code Type %08x (%s)"
 msgstr "خطای اکشن ریپلی: الگوی کد عادی نامعتبر %08x (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:896
+#: Source/Core/Core/Src/ActionReplay.cpp:886
 #, c-format
 msgid "Action Replay: Normal Code %i: Invalid subtype %08x (%s)"
 msgstr "خطای اکشن ریپلی:  کد عادی %i: کد فرعی نامعتبر %08x (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:838
+#: Source/Core/Core/Src/ActionReplay.cpp:828
 #, c-format
 msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)"
 msgstr "خطای اکشن ریپلی:  کد عادی ۰: کد فرعی نامعتبر %08x (%s)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:242
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:247
 msgid "Adapter:"
 msgstr "آداپتور:"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:76
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:63
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:63
 msgid "Add"
 msgstr "اضافه کردن"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1275
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1301
 msgid "Add ActionReplay Code"
 msgstr "اضافه کردن کد اکشن ریپلی"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1204
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1230
 msgid "Add Patch"
 msgstr "اضافه کردن وصله"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:507
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:528
 msgid "Add new pane"
 msgstr "اضافه کردن تکه جدید"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:404
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:426
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:811
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:408
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:430
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:792
 msgid "Add..."
 msgstr "اضافه کردن..."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:90
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:81
 msgid "Address :"
 msgstr "آدرس :"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:58
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:45
 msgid ""
 "Adds the specified value to zFar Parameter.\n"
 "Two ways to express the floating point values.\n"
@@ -592,7 +608,7 @@ msgstr ""
 "\n"
 "توجه: پنجره/کنسول ثبت وقایع را برای بدست آوردن مقادیر برسی کنید."
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:53
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:40
 msgid ""
 "Adds the specified value to zNear Parameter.\n"
 "Two ways to express the floating point values.\n"
@@ -610,48 +626,48 @@ msgstr ""
 "\n"
 "توجه: پنجره/کنسول ثبت وقایع را برای بدست آوردن مقادیر برسی کنید."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:755
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:744
 msgid "Adjust the analog control pressure required to activate buttons."
 msgstr "تنظیم فشار کنترل آنالوگ برای فعال کردن دکمه ها لازم است."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:509
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:522
 msgid "Advanced"
 msgstr "پیشرفته"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561
 msgid "Advanced Settings"
 msgstr "تنظیمات پیشرفته"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:584
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:587
 msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)"
 msgstr "همه فایل های گیم کیوب/وی (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:816
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:797
 msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)"
 msgstr "همه ایمیجهای گیم کیوب/وی (gcm, iso, wbfs, ciso, gcz)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1189
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1190
 msgid "All Gamecube GCM files (gcm)"
 msgstr "همه فایل های گیم کیوب جی سی ام (gcm)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1390
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1404
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1417
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1431
 msgid "All Save States (sav, s##)"
 msgstr "همه وضعیت های ذخیره (sav, s##)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1187
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1188
 msgid "All Wii ISO files (iso)"
 msgstr "همه فایل های آیزو وی (iso)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1207
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1208
 msgid "All compressed GC/Wii ISO files (gcz)"
 msgstr "همه فایل های آیزو فشرده شده گیم کیوب/وی (gcz)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:124
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:104
 msgid "All files (*.*)|*.*"
 msgstr "همه فایل ها  (*.*)|*.*"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123
 msgid ""
 "Allows toggling certain options via the hotkeys 3 (Internal Resolution), 4 "
 "(Aspect Ratio), 5 (Copy EFB) and 6 (Fog) within the emulation window.\n"
@@ -663,39 +679,39 @@ msgstr ""
 "\n"
 "اگر در این مورد اطمینان ندارید، این گزینه را فعال نکنید."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:285
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:272
 msgid "Analyze"
 msgstr "تحلیل کردن"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:298
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:285
 msgid "Angle"
 msgstr "زاویه"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:367
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:375
 msgid "Anisotropic Filtering:"
 msgstr "فیلتر ناهمسانگر:"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:350
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:358
 msgid "Anti-Aliasing:"
 msgstr "آنتی آلیاسینگ:"
 
-#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:308
+#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:299
 msgid "Apploader is the wrong size...is it really an apploader?"
 msgstr "سایز بارگذار برنامه اشتباه است...آیا این واقعا بارگذار برنامه است؟"
 
-#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:302
+#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:293
 msgid "Apploader unable to load from file"
 msgstr "بارگذار برنامه ناتوان در بارگذاری از فایل"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:841
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:822
 msgid "Apploader:"
 msgstr "بار گذار برنامه:"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:135
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:122
 msgid "Apply"
 msgstr "اعمال کردن"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124
 msgid ""
 "Apply a post-processing effect after finishing a frame.\n"
 "\n"
@@ -705,11 +721,11 @@ msgstr ""
 "\n"
 "اگر در این مورد اطمینان ندارید، (خاموش) را انتخاب کنید."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287
 msgid "Arabic"
 msgstr "عربی"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:614
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:603
 #, c-format
 msgid "Are you sure you want to delete \"%s\"?"
 msgstr "آیا شما مطمئن هستید که میخواهید \"%s\" را حذف کنید؟"
@@ -728,46 +744,50 @@ msgstr ""
 "آیا شما مطمئن هستید که میخواهید این فایل را حذف کنید؟  این فایل برای همیشه "
 "از بین خواهند رفت!"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:789
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:277
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:44
+msgid "Arm JIT (experimental)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:285
 msgid "Aspect Ratio:"
 msgstr "نسبت طول به عرض تصویر:"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:70
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:58
 msgid "At least one pane must remain open."
 msgstr "حداقل یک قطه می بایست باز بماند."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:553
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533
 msgid "Audio"
 msgstr "صدا"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:694
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675
 msgid "Audio Backend:"
 msgstr "پشتوانه صدا:"
 
-#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:41
+#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:28
 msgid "AudioCommon: Error opening AO device.\n"
 msgstr "AudioCommon: خطا در باز کردن دستگاه خروجی صدا.\n"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:275
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283
 msgid "Auto"
 msgstr "اتوماتیک"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:337
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345
 msgid "Auto (Multiple of 640x528)"
 msgstr "اتوماتیک (ضریب ۶۴۰x۵۲۸)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:337
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345
 msgid "Auto (Window Size)"
 msgstr "اتوماتیک (سایز پنجره)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:297
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305
 msgid "Auto adjust Window Size"
 msgstr "تنظیم اتوماتیک سایز پنجره"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77
 msgid ""
 "Automatically adjusts the window size to your internal resolution.\n"
 "\n"
@@ -777,130 +797,130 @@ msgstr ""
 "\n"
 "اگر در این مورد اطمینان ندارید، این گزینه را فعال نکنید."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:697
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696
 msgid "B"
 msgstr "B"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:755
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:754
 msgid "BP register "
 msgstr "ثبت اشاره گر پایه"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:27
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:14
 msgid "Back"
 msgstr "برگشت"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:698
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:679
 msgid "Backend Settings"
 msgstr "تنظیمات پشتوانه"
 
-#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:60
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:206
+#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:47
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:211
 msgid "Backend:"
 msgstr "پشتوانه:"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:318
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:95
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:305
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:82
 msgid "Background Input"
 msgstr "ورودی پس زمینه"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:279
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:266
 msgid "Backward"
 msgstr "به عقب"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:264
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:257
 msgid "Bad File Header"
 msgstr "سرخط ناصحیح فایل"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:627
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:621
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:290
 msgid "Banner"
 msgstr "نشان"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:519
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:529
 msgid "Banner Details"
 msgstr "جزئیات نشان"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491
 msgid "Banner:"
 msgstr "نشان:"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:57
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:61
 msgid "Bar"
 msgstr "نوار"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:308
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:316
 msgid "Basic"
 msgstr "بنیانی"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555
 msgid "Basic Settings"
 msgstr "تنظیمات بنیانی"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:22
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Bass"
 msgstr "بم"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:186
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:174
 msgid "Block Allocation Table checksum failed"
 msgstr "چک سام جدول تخصیص بلوک با شکست مواجه شد"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:631
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625
 msgid "Blocks"
 msgstr "بلوک ها"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:21
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Blue"
 msgstr "آبی"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:24
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Blue Left"
 msgstr "آبی چپ"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:25
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Blue Right"
 msgstr "آبی راست"
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:87
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270
 msgid "Bottom"
 msgstr "پائین"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:238
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:225
 #, c-format
 msgid "Bound Controls: %lu"
 msgstr "کنترل های محدودیت: %lu"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348
 msgid "Broken"
 msgstr "خراب"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:422
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:428
 msgid "Browse"
 msgstr "مرور"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:256
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:243
 msgid "Browse for a directory to add"
 msgstr "مرور برای پوشه جهت اضافه کردن"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:422
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:428
 msgid "Browse for an ISO directory..."
 msgstr "مرور برای پوشه آیزو..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1079
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1080
 msgid "Browse for output directory"
 msgstr "مرور برای پوشه خروجی"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:328
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:331
 msgid "Buffer:"
 msgstr "حافظه موقت:"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:58
 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:119
+#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:106
 msgid "Buttons"
 msgstr "دکمه ها"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317
 msgid ""
 "Bypass the clearing of the data cache by the DCBZ instruction. Usually leave "
 "this option disabled."
@@ -908,31 +928,31 @@ msgstr ""
 "گذشتن از پاکسازی حافظه ميانى دادها توسط دستور DCBZ. معمولا این گزینه را غیر "
 "فعال رها کنید."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:698
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:697
 msgid "C"
 msgstr "C"
 
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:77
+#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:64
 msgid "C Stick"
 msgstr "استیک سی"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:77
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:64
 msgid "C-Stick"
 msgstr "استیک سی"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:764
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:763
 msgid "CP reg"
 msgstr "ثبت سی پی"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:567
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547
 msgid "CPU Emulator Engine"
 msgstr "موتور پردازشگر برابرساز"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:490
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500
 msgid "Cache Display Lists"
 msgstr "لیست های حافظه ميانى تصویر"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88
 msgid ""
 "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n"
 "Decreases emulation speed by some percent (depending on your GPU).\n"
@@ -946,23 +966,38 @@ msgstr ""
 "\n"
 "اگر در این مورد اطمینان ندارید، این گزینه را فعال نکنید."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1858
+#, c-format
+msgid "Can't find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x"
+msgstr ""
+
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1872
+#, c-format
+msgid "Can't find WiiMote by connection handle %02x"
+msgstr ""
+
+#: Source/Core/Core/Src/HW/DVDInterface.cpp:669
+#: Source/Core/Core/Src/HW/DVDInterface.cpp:679
+msgid "Can't read from DVD_Plugin - DVD-Interface: Fatal Error"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:124
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:28
 msgid "Cancel"
 msgstr "لغو کردن"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:91
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:178
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:240
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:84
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:171
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:233
 #, c-format
 msgid "Cannot open %s"
 msgstr "قادر به باز گشایی نیست %s"
 
-#: Source/Core/Core/Src/CoreTiming.cpp:141
+#: Source/Core/Core/Src/CoreTiming.cpp:128
 msgid "Cannot unregister events with events pending"
 msgstr "رویدادهایی را که معوق اند نمی تواند از ثبت درآورد."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1078
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1061
 #, c-format
 msgid ""
 "Cannot use that file as a memory card.\n"
@@ -973,7 +1008,7 @@ msgstr ""
 "%s\n"
 "این یک فایل کارت حافظه معتبر گیم کیوب نیست"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1108
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1091
 msgid ""
 "Cannot use that file as a memory card.\n"
 "Are you trying to use the same file in both slots?"
@@ -981,31 +1016,15 @@ msgstr ""
 "قادر به استفاده از این فایل به عنوان کارت حافظه نیست.\n"
 "آیا شما سعی دارید از یک فایل برای هر دو شکاف استفاده کنید؟"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1867
-#, 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:1881
-#, c-format
-msgid "Cant find WiiMote by connection handle %02x"
-msgstr "قادر به یافتن ویموت بواسطه دستگذار اتصال %02x نیست"
-
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:679
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:689
-msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error"
-msgstr "قادر به خواندن از پلاگ-این دی وی دی نیست - واسط دی وی دی: خطای مهلک"
-
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:52
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:39
 msgid "Caps Lock"
 msgstr "کپس لاک"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288
 msgid "Catalan"
 msgstr "کاتالان"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:311
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:298
 msgid "Center"
 msgstr "مرکز"
 
@@ -1013,12 +1032,12 @@ msgstr "مرکز"
 msgid "Change"
 msgstr "تعویض"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:316
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:322
 msgid "Change &Disc..."
 msgstr "تعویض &دیسک..."
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:179
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:179
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:167
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:167
 msgid "Change Disc"
 msgstr "تعویض دیسک"
 
@@ -1026,7 +1045,7 @@ msgstr "تعویض دیسک"
 msgid "Change Game"
 msgstr "تعویض بازی"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:515
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495
 msgid ""
 "Change the language of the user interface.\n"
 "Requires restart."
@@ -1034,76 +1053,76 @@ msgstr ""
 "تغییر زبان برنامه.\n"
 "شروع دوباره برنامه لازم است."
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:60
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:47
 msgid "Changes sign to zFar Parameter (after correction)"
 msgstr "تغییرات علامت به پارامتر z دور (بعد از تصحیح)"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:55
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:42
 msgid "Changes sign to zNear Parameter (after correction)"
 msgstr "تغییرات علامت به پارامتر z نزدیک (بعد از تصحیح)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:519
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499
 msgid "Changing this will have no effect while the emulator is running!"
 msgstr ""
 "تغییر دادن این مورد در حالی که برابرساز در حال اجراست اثری نخواهد داشت!"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:295
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:298
 msgid "Chat"
 msgstr "گپ زدن"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:47
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:34
 msgid "Cheat Code"
 msgstr "کد تقلب"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:118
 msgid "Cheat Search"
 msgstr "جستجوی کد تقلب"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:38
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:25
 msgid "Cheats Manager"
 msgstr "مدیر کدهای تقلب"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:633
 msgid "Check Partition Integrity"
 msgstr "برسی عدم نقص پارتیشن"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:864
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:880
 msgid "Checking integrity..."
 msgstr "برسی عدم نقص..."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289
 msgid "Chinese (Simplified)"
 msgstr "چینی (ساده شده)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290
 msgid "Chinese (Traditional)"
 msgstr "چینی (سنتی)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:818
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:799
 msgid "Choose a DVD root directory:"
 msgstr "انتخاب یک پوشه ریشه برای دی وی دی:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:822
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803
 msgid "Choose a NAND root directory:"
 msgstr "انتخاب یک پوشه ریشه برای نند:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:815
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:796
 msgid "Choose a default ISO:"
 msgstr "انتخاب آیزو پیش فرض:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1236
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1219
 msgid "Choose a directory to add"
 msgstr "انتخاب پوشه برای اضافه کردن"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1065
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1048
 msgid "Choose a file to open"
 msgstr "انتخاب فایل برای باز کردن"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:217
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:204
 msgid "Choose a memory card:"
 msgstr "انتخاب کارت حافظه:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:819
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800
 msgid ""
 "Choose file to use as apploader: (applies to discs constructed from "
 "directories only)"
@@ -1111,27 +1130,27 @@ msgstr ""
 "انتخاب فایل برای استفاده بعنوان بارگذار برنامه: (به دیسک هایی که فقط از پوشه "
 "ها ساخته شده اند اعمال می کند)"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:767
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:806
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:781
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:822
 msgid "Choose the folder to extract to"
 msgstr "انتخاب پوشه برای استخراج به آن"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:297
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:284
 msgid "Circle Stick"
 msgstr "استیک دایره"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:52
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:56
 msgid "Classic"
 msgstr "کلاسیک"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:144
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:43
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:487
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:913
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:137
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:30
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:474
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:904
 msgid "Clear"
 msgstr "پاک کردن"
 
-#: Source/Core/Core/Src/NetPlayServer.cpp:259
+#: Source/Core/Core/Src/NetPlayServer.cpp:263
 msgid ""
 "Client disconnect while game is running!! NetPlay is disabled. You must "
 "manually stop the game."
@@ -1139,122 +1158,122 @@ msgstr ""
 "ارتباط مشتری در حالی که بازی در حال اجراست قطع شد!! نت پلی از کار افتاد. شما "
 "باید بازی را دستی متوقف کنید."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:298
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:247
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:552
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:578
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:285
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:234
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:562
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:590
 msgid "Close"
 msgstr "بستن"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:174
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:177
 msgid "Co&nfigure..."
 msgstr "پی&کربندی..."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:86
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:73
 msgid "Code Info"
 msgstr "مشخصات کد"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:568
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:556
 msgid "Code: "
 msgstr "کد:"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:35
 msgid "Command"
 msgstr "دستور"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:629
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:623
 msgid "Comment"
 msgstr "توضیح"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489
 msgid "Comment:"
 msgstr "توضیح:"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:893
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:884
 msgid "Compress ISO..."
 msgstr "فشرده کردن آیزو..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:905
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:899
 msgid "Compress selected ISOs..."
 msgstr "فشرده کردن آیزو های انتخاب شده..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1088
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1224
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1089
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1225
 msgid "Compressing ISO"
 msgstr "در حال فشرده کردن آیزو"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:429
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:435
 msgid "Config"
 msgstr "پیکربندی"
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:37
-#: Source/Core/DolphinWX/Src/InputConfigDiag.h:135
-#: Source/Core/DolphinWX/Src/InputConfigDiag.h:154
+#: Source/Core/DolphinWX/Src/InputConfigDiag.h:122
+#: Source/Core/DolphinWX/Src/InputConfigDiag.h:141
 msgid "Configure"
 msgstr "پیکربندی"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:111
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:98
 msgid "Configure Control"
 msgstr "کنترل پیکربندی"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:306
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
 #: Source/Core/DolphinWX/Src/NetWindow.cpp:583
 msgid "Configure Pads"
 msgstr "پیکربندی گیم پدها"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:429
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:435
 msgid "Configure..."
 msgstr "پیکربندی..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1119
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1147
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1217
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1120
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1218
 msgid "Confirm File Overwrite"
 msgstr "تائید بازنویسی فایل"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:597
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:577
 msgid "Confirm on Stop"
 msgstr "تائید برای توقف"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:83
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:105
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:74
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:96
 msgid "Connect"
 msgstr "اتصال"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:783
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:764
 msgid "Connect USB Keyboard"
 msgstr "اتصال کیبورد USB"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:362
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:368
 #, c-format
 msgid "Connect Wiimote %i"
 msgstr "اتصال ویموت %i"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:195
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183
 msgid "Connect Wiimote 1"
 msgstr "اتصال ویموت ۱"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184
 msgid "Connect Wiimote 2"
 msgstr "اتصال ویموت ۲"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:185
 msgid "Connect Wiimote 3"
 msgstr "اتصال ویموت ۳"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:198
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:186
 msgid "Connect Wiimote 4"
 msgstr "اتصال ویموت ۴"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:627
+#: Source/Core/DolphinWX/Src/Main.cpp:655
 msgid "Connecting..."
 msgstr "در حال اتصال..."
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:155
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:156
 msgid "Console"
 msgstr "میز فرمان"
 
@@ -1262,15 +1281,15 @@ msgstr "میز فرمان"
 msgid "Continuous Scanning"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:46
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:33
 msgid "Control"
 msgstr "کنترل"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:189
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:176
 msgid "Convert to GCI"
 msgstr "تبدیل به جی سی آی"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:379
+#: Source/Core/Core/Src/CoreParameter.cpp:368
 msgid "Copy failed"
 msgstr "کپی با شکست مواجه شد"
 
@@ -1279,21 +1298,21 @@ msgstr "کپی با شکست مواجه شد"
 msgid "Copy to Memcard %c"
 msgstr "کپی به کارت حافظه %c"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:359
 msgid "Core"
 msgstr "هسته"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:154
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:148
 #, c-format
 msgid "Could not create %s"
 msgstr "قادر به ساخت نیست %s"
 
-#: Source/Core/AudioCommon/Src/AudioCommon.cpp:75
+#: Source/Core/AudioCommon/Src/AudioCommon.cpp:62
 #, c-format
 msgid "Could not initialize backend %s."
 msgstr "قادر به نصب پشتوانه نیست %s"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:137
+#: Source/Core/Core/Src/CoreParameter.cpp:126
 #, c-format
 msgid ""
 "Could not read \"%s\".  There is no disc in the drive, or it is not a GC/Wii "
@@ -1304,12 +1323,12 @@ msgstr ""
 "نیست. لطفا توجه داشته باشید که دیسک های اصلی گیم کیوب/وی توسط اکثر دی وی دی "
 "درایوهای کامپیوتر قابل خواندن نیستند."
 
-#: Source/Core/Core/Src/CoreParameter.cpp:292
+#: Source/Core/Core/Src/CoreParameter.cpp:281
 #, c-format
 msgid "Could not recognize ISO file %s"
 msgstr "قادر به تشخیص فایل آیزو %s نبود"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:569
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:579
 #, c-format
 msgid "Could not save %s"
 msgstr "قادر به ذخیره کردن نیست %s"
@@ -1323,24 +1342,24 @@ msgstr ""
 "اجرا است!\n"
 "(ست کردن گیم پدها در حالی که بازی در حال اجرا است فعلا پشتیبانی نمی شود)"
 
-#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:123
+#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119
 #, c-format
 msgid ""
 "Could not write memory card file %s.\n"
 "\n"
 "Are you running Dolphin from a CD/DVD, or is the save file maybe write "
-"protected?"
-msgstr ""
-"قادر به نوشتن فایل کارت حافظه نیست %s.\n"
+"protected?\n"
 "\n"
-"آیا شما بازی را از روی یک سی دی و یا دی وی دی اجرا کرده اید، و یا شاید فایل "
-"ذخیره محافظت شده (Write Protect) است."
+"Are you receiving this after moving the emulator directory?\n"
+"If so, then you may need to re-specify your memory card location in the "
+"options."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1107
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1133
 msgid "Couldn't find open command for extension 'ini'!"
 msgstr "قادر به یافتن دستور باز برای پسوند 'ini' نیست!"
 
-#: Source/Core/Core/Src/BootManager.cpp:146
+#: Source/Core/Core/Src/BootManager.cpp:137
 msgid ""
 "Couldn't init the core.\n"
 "Check your configuration."
@@ -1348,38 +1367,38 @@ msgstr ""
 "قادر به اينيت کردن هسته نیست.\n"
 "تنظیمات خود را چک کنید."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:183
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:507
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:495
 msgid "Count:"
 msgstr "شماردن:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:452
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456
 msgid "Country:"
 msgstr "کشور:"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:186
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:562
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:173
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:550
 msgid "Create AR Code"
 msgstr "ساخت کد اکشن ریپلی"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:543
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:608
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:569
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:641
 msgid "Create new perspective"
 msgstr "ساخت پرسپکتیو جدید"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:17
 msgid "Creator: "
 msgstr "سازنده:"
 
-#: Source/Core/Common/Src/MsgHandler.cpp:68
+#: Source/Core/Common/Src/MsgHandler.cpp:54
 msgid "Critical"
 msgstr "بحرانی"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562
 msgid "Crop"
 msgstr "حذف قسمتی از تصوير"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119
 msgid ""
 "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n"
 "\n"
@@ -1389,143 +1408,143 @@ msgstr ""
 "\n"
 "اگر در این مورد اطمینان ندارید، این گزینه را فعال نکنید."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:48
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:52
 msgid "Crossfade"
 msgstr "ضرب دری"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:597
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:600
 #, c-format
-msgid "Current dir changed from %s to %s after wxFileSelector!"
-msgstr "بعد از انتخابگر فایل wx پوشه فعلی از %s به %s تغییر کرد!"
+msgid "Current directory changed from %s to %s after wxFileSelector!"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339
 msgid "Custom Projection Hack"
 msgstr "هک کردن دستی تصویر"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.h:30
+#: Source/Core/DolphinWX/Src/PHackSettings.h:17
 msgid "Custom Projection Hack Settings"
 msgstr "تنظیمات مربوط به هک کردن دستی تصویر"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342
 msgid "Customize some Orthographic Projection parameters."
 msgstr "دستکاری برخی از پارامتر های خطوط عمودی تصویر."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291
 msgid "Czech"
 msgstr "چکوسلواکی"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:698
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:697
 msgid "D"
 msgstr "D"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:89
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
 msgid "D-Pad"
 msgstr "پد هدایتی"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:431
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
 msgid "DSP"
 msgstr "پردازشگر صدای دلفین"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:639
 msgid "DSP Emulator Engine"
 msgstr "موتور برابرساز پردازشگر صدای دلفین"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:254
 msgid "DSP HLE emulation (fast)"
 msgstr "برابرسازی سطح بالای پردازشگر صدای دلفین (سریع)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:256
 msgid "DSP LLE interpreter (slow)"
 msgstr "مفسر سطح پائین پردازشگر صدای دلفین (کند)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660
-msgid "DSP LLE on Thread"
-msgstr "قرار دادن برابرساز سطح پائین پردازشگر صدای دلفین بر روی ریسمان جداگانه"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:255
 msgid "DSP LLE recompiler"
 msgstr "ری کامپایلر سطح پائین پردازشگر صدای دلفین"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:431
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:641
+msgid "DSP on Dedicated Thread"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
 msgid "DSP settings"
 msgstr "تنظیمات پردازشگر صدای دلفین"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:838
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:819
 msgid "DVD Root:"
 msgstr "ریشه دی وی دی:"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:239
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:226
 msgid "DVDLowRead - Fatal Error: failed to read from volume"
 msgstr ""
 "خواندن سطح پائین دی وی دی - خطای مهلک: خواندن از روی دیسک با شکست مواجه شد"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:333
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:320
 msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume"
 msgstr ""
 "خواندن سطح پائین کد گشایی شده دی وی دی - خطای مهلک: خواندن از روی دیسک با "
 "شکست مواجه شد"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:176
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:163
 msgid "Data Size"
 msgstr "اندازه داده"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468
 msgid "Date:"
 msgstr "تاریخ:"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:528
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:564
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:518
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:557
 msgid "Datel MaxDrive/Pro files(*.sav)"
 msgstr "فایل های داتل مکس درایو/حرفه ای (*,sav)"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:242
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:259
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:267
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:281
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:296
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:229
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:246
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:254
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:268
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:283
 msgid "Dead Zone"
 msgstr "منطقه مرده"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:35
 msgid "Debug"
 msgstr "اشکال زدائی"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:521
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534
 msgid "Debugging"
 msgstr "اشکال زدائی کردن"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:79
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:66
 msgid "Decimal"
 msgstr "دسیمال"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:890
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:881
 msgid "Decompress ISO..."
 msgstr "ناهمفشرده کردن آیزو..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:906
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:900
 msgid "Decompress selected ISOs..."
 msgstr "ناهمفشرده کردن آیزو های انتخاب شده..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1088
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1224
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1089
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1225
 msgid "Decompressing ISO"
 msgstr "در حال ناهمفشرده کردن آیزو"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:912
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:903
 msgid "Default"
 msgstr "پیش فرز"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:835
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:816
 msgid "Default ISO:"
 msgstr "آیزو پیش فرز:"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:114
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:107
 msgid "Default font"
 msgstr "دست خط پیش فرز"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:32
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:926
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:19
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917
 msgid "Delete"
 msgstr "حذف"
 
@@ -1533,21 +1552,21 @@ msgstr "حذف"
 msgid "Delete Save"
 msgstr "حذف ذخیره"
 
-#: Source/Core/VideoCommon/Src/AVIDump.cpp:77
+#: Source/Core/VideoCommon/Src/AVIDump.cpp:64
 #, c-format
 msgid "Delete the existing file '%s'?"
 msgstr "فایل موجود '%s' حذف شود؟"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:671
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:683
 msgid "Description"
 msgstr "شرح"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:472
 msgid "Detect"
 msgstr "شناسایی"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:233
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:328
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:220
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:315
 msgid ""
 "Detected attempt to read more data from the DVD than fit inside the out "
 "buffer. Clamp."
@@ -1555,29 +1574,29 @@ msgstr ""
 "کوشش برای خواند داده بیشتر از دی وی دی نسبت به داده ای که در حافظه میانجی "
 "گنجانده شده یافت شد. مهار کردن."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:127
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:898
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:114
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:889
 msgid "Device"
 msgstr "دستگاه"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:798
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:731
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779
 msgid "Device Settings"
 msgstr "تنظیمات دستگاه"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:45
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:49
 msgid "Dial"
 msgstr "شماره گیری"
 
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:146
+#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:135
 msgid "Direct3D11"
 msgstr "Direct3D ۱۱"
 
-#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:128
+#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:125
 msgid "Direct3D9"
 msgstr "Direct3D ۹"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:167
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:155
 msgid ""
 "Directory checksum failed\n"
 " and Directory backup checksum failed"
@@ -1585,16 +1604,20 @@ msgstr ""
 "چک سام پوشه با شکست مواجه شد\n"
 " و چک سام بکاپ پوشه با شکست مواجه شد"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:433
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:443
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485
 msgid "Disable"
 msgstr "از کارانداختن"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:491
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501
+msgid "Disable Destination Alpha"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:409
 msgid "Disable Fog"
 msgstr "از کارانداختن مه"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108
 msgid ""
 "Disable any XFB emulation.\n"
 "Speeds up emulation a lot but causes heavy glitches in many games which rely "
@@ -1609,7 +1632,7 @@ msgstr ""
 "\n"
 "اگر در این مورد اطمینان ندارید، این گزینه را رها کنید."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95
 msgid ""
 "Disable emulation of EFB copies.\n"
 "These are often used for post-processing or render-to-texture effects, so "
@@ -1625,20 +1648,33 @@ msgstr ""
 "\n"
 "اگر در این مورد اطمینان ندارید، این گزینه را رها کنید."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:543
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101
+#, fuzzy
+msgid ""
+"Disables emulation of a hardware feature called destination alpha, which is "
+"used in many games for various graphical effects.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+"از قلم انداختن مقصد آلفا پاس در بسیاری از بازی ها برای افکت های متفرقه "
+"گرافیک استفاده می شود.\n"
+"\n"
+"اگر در این مورد اطمینان ندارید، این گزینه را فعال نکنید."
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:553
 msgid "Disc"
 msgstr "دیسک"
 
-#: Source/Core/DiscIO/Src/DriveBlob.cpp:107
-#: Source/Core/DiscIO/Src/DriveBlob.cpp:126
+#: Source/Core/DiscIO/Src/DriveBlob.cpp:94
+#: Source/Core/DiscIO/Src/DriveBlob.cpp:113
 msgid "Disc Read Error"
 msgstr "خواندن دیسک با مشکل مواجه گردید"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:312
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:320
 msgid "Display"
 msgstr "نمایش"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104
 msgid ""
 "Display the inputs read by the emulator.\n"
 "\n"
@@ -1648,32 +1684,32 @@ msgstr ""
 "\n"
 "اگر در این مورد اطمینان ندارید، این گزینه را فعال نکنید."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:80
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:67
 msgid "Divide"
 msgstr "تقسیم"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:987
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:990
 msgid "Do you want to stop the current emulation?"
 msgstr "آیا می خواهید برابرسازی فعلی را متوقف کنید؟"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:663
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:644
 msgid "Dolby Pro Logic II decoder"
 msgstr "کدبردار دالبی پرو لاجیک دو"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:864
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:856
 msgid "Dolphin"
 msgstr "دلفین"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:183
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:188
 #, c-format
 msgid "Dolphin %s Graphics Configuration"
 msgstr "دلفین %s پیکربندی گرافیک"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:292
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:298
 msgid "Dolphin &Web Site"
 msgstr "&وب سایت دلفین"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.h:37
+#: Source/Core/DolphinWX/Src/ConfigMain.h:24
 msgid "Dolphin Configuration"
 msgstr "پیکر بندی دلفین"
 
@@ -1681,16 +1717,16 @@ msgstr "پیکر بندی دلفین"
 msgid "Dolphin Emulated Wiimote Configuration"
 msgstr "پیکربندی ویمیوت برابرسازی شده دلفین"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:394
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:383
 msgid "Dolphin FIFO"
 msgstr "دلفین فیفو"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1136
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1153
 msgid "Dolphin GCPad Configuration"
 msgstr "پیکربندی گیم پد گیم کیوب دلفین"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:679
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1074
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:685
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1089
 msgid "Dolphin TAS Movies (*.dtm)"
 msgstr "فیلم های تاس دلفین (*.dtm)"
 
@@ -1698,11 +1734,11 @@ msgstr "فیلم های تاس دلفین (*.dtm)"
 msgid "Dolphin Wiimote Configuration"
 msgstr "پیکربندی ویموت دلفین"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:293
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:299
 msgid "Dolphin at &Google Code"
 msgstr "دلفین در &گوگل کد"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:364
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:351
 msgid ""
 "Dolphin could not find any GC/Wii ISOs.  Doubleclick here to browse for "
 "files..."
@@ -1710,7 +1746,7 @@ msgstr ""
 "دلفین قادر به پیدا کردن آیزو های گیم کیوب/وی نیست. برای مرور فایل ها دو بار "
 "اینجا کلیک کنید..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:368
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:355
 msgid ""
 "Dolphin is currently set to hide all games.  Doubleclick here to show all "
 "games..."
@@ -1718,50 +1754,59 @@ msgstr ""
 "دلفین در حال حاضر ست شده است که همه بازی ها را مخفی کند. برای نمایش بازی ها "
 "دو بار اینجا کلیک کنید..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1159
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1160
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1246
 msgid "Dolphin was unable to complete the requested action."
 msgstr "دلفین نتوانست عمل خواسته شده را تکمیل کند."
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:275
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:58
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
+#, fuzzy
+msgid ""
+"Doubles the emulated GPU clock rate. May speed up some games (ON = Fast, OFF "
+"= Compatible)"
+msgstr ""
+"فعال کردن دسترسی سریع به دیسک. این امر برای اجرای تعداد محدودی از بازی ها "
+"لازم است. (ON=سریع، OFF=سازگار)"
+
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:262
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:45
 msgid "Down"
 msgstr "پائین"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:54
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:44
 msgid "Download Codes (WiiRD Database)"
 msgstr "دانلود کدها (WiiRD بانک اطلاعاتی)"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:297
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:287
 #, c-format
 msgid "Downloaded %lu codes. (added %lu)"
 msgstr "%lu کد دانلود شد. (%lu عدد اضافه شد)"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:31
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:35
 msgid "Drums"
 msgstr "طبل ها"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:105
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
 msgid "Dummy"
 msgstr "مصنوعی"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:661
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:642
 msgid "Dump Audio"
 msgstr "نسخه برداری صدا"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:532
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545
 msgid "Dump EFB Target"
 msgstr "نسخه برداری مقصد ای اف بی"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546
 msgid "Dump Frames"
 msgstr "نسخه برداری فریم ها"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543
 msgid "Dump Textures"
 msgstr "نسخه برداری بافت اشیاء"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114
 msgid ""
 "Dump all rendered frames to an AVI file in User/Dump/Frames/\n"
 "\n"
@@ -1772,7 +1817,7 @@ msgstr ""
 "\n"
 "اگر در این مورد اطمینان ندارید، این گزینه را فعال نکنید."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111
 msgid ""
 "Dump decoded game textures to User/Dump/Textures/<game_id>/\n"
 "\n"
@@ -1783,7 +1828,7 @@ msgstr ""
 "\n"
 "اگر در این مورد اطمینان ندارید، این گزینه را فعال نکنید."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113
 msgid ""
 "Dump the contents of EFB copies to User/Dump/Textures/\n"
 "\n"
@@ -1793,21 +1838,21 @@ msgstr ""
 "\n"
 "اگر در این مورد اطمینان ندارید، این گزینه را فعال نکنید."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:474
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292
 msgid "Dutch"
 msgstr "هلندی"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:112
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:113
 msgid "E&xit"
 msgstr "خ&روج"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:441
 msgid "EFB Copies"
 msgstr "کپی های ای اف بی"
 
-#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:223
+#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:210
 #, c-format
 msgid ""
 "ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least "
@@ -1820,52 +1865,52 @@ msgstr ""
 "اندازی مجدد در این مرحله برای اینکه ویندوز درایور جدید را شناسایی کند لازم "
 "باشد."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:166
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:160
 msgid "EUROPE"
 msgstr "اروپا"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:156
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:143
 msgid "Early Memory Updates"
 msgstr "به روز شدن های اولیه حافظه"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:447
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:453
 msgid "Edit"
 msgstr "ویرایش"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.h:30
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.h:17
 msgid "Edit ActionReplay Code"
 msgstr "ویرایش کدهای اکشن ریپلی"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:285
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:286
 msgid "Edit Config"
 msgstr "ویرایش پیکربندی"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.h:30
+#: Source/Core/DolphinWX/Src/PatchAddEdit.h:17
 msgid "Edit Patch"
 msgstr "ویرایش وصله"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:447
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:453
 msgid "Edit current perspective"
 msgstr "ویرایش چشم انداز جاری"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:403
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:425
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:407
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:429
 msgid "Edit..."
 msgstr "ویرایش..."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:44
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:48
 msgid "Effect"
 msgstr "افکت"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:425
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435
 msgid "Embedded Frame Buffer"
 msgstr "حافظه میانجی فریم جاساز شده"
 
-#: Source/Core/Core/Src/Core.cpp:201
+#: Source/Core/Core/Src/Core.cpp:190
 msgid "Emu Thread already running"
 msgstr "ریسمان شبیه ساز قبلا اجرا شده است"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110
 msgid ""
 "Emulate XFBs accurately.\n"
 "Slows down emulation a lot and prohibits high-resolution rendering but is "
@@ -1879,7 +1924,7 @@ msgstr ""
 "\n"
 "اگر در این مورد اطمینان ندارید، گزینه اکس اف بی مجازی را فعال کنید."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109
 msgid ""
 "Emulate XFBs using GPU texture objects.\n"
 "Fixes many games which don't work without XFB emulation while not being as "
@@ -1900,7 +1945,7 @@ msgstr ""
 msgid "Emulated Wiimote"
 msgstr "ویموت برابرسازی شده"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346
 msgid "Emulation State: "
 msgstr "وضعیت برابرساز:"
 
@@ -1908,7 +1953,7 @@ msgstr "وضعیت برابرساز:"
 msgid "Enable"
 msgstr "فراهم کردن"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91
 msgid ""
 "Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's "
 "supported by your GPU.\n"
@@ -1924,72 +1969,71 @@ msgstr ""
 "\n"
 "اگر در این مورد اطمینان ندارید، این گزینه را فعال نکنید."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:111
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:98
 msgid "Enable AR Logging"
 msgstr "فعال کردن واقعه نگاری اکشن ریپلی"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324
 msgid "Enable Block Merging"
 msgstr "فعال کردن ادغام بلوک"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331
 msgid "Enable Bounding Box Calculation"
 msgstr "فعال کردن محاسبه حد جعبه"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:446
 msgid "Enable Cache"
 msgstr "فعال کردن حافظه ميانى"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:562
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542
 msgid "Enable Cheats"
 msgstr "فعال کردن کدهای تقلب"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310
 msgid "Enable Dual Core"
 msgstr "فعال کردن پردازنده با دو هسته یا بیشتر"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
 msgid "Enable Dual Core (speedup)"
 msgstr "فعال کردن پردازنده با دو هسته یا بیشتر (بالا بردن سرعت)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:550
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:563
 msgid "Enable Hotkeys"
 msgstr "فعال کردن شرت کاتها"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311
 msgid "Enable Idle Skipping"
 msgstr "فعال کردن جهش بیکاری"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541
 msgid "Enable Idle Skipping (speedup)"
 msgstr "فعال کردن جهش بیکاری (بالا بردن سرعت)"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312
 msgid "Enable MMU"
 msgstr "فعال کردن واحد مدیریت حافظه"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:554
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:567
 msgid "Enable Progressive Scan"
 msgstr "فعال کردن پويش تصاعدی (Progressive Scan)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757
 msgid "Enable Screen Saver"
 msgstr "فعال کردن اسکیرین سیور"
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:75
-#, fuzzy
 msgid "Enable Speaker Data"
-msgstr "فعال کردن صفحات"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
 msgid "Enable WideScreen"
 msgstr "فعال کردن صفحه عریض"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:516
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529
 msgid "Enable Wireframe"
 msgstr "فعال کردن خطوط فریم"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85
 msgid ""
 "Enable anisotropic filtering.\n"
 "Enhances visual quality of textures that are at oblique viewing angles.\n"
@@ -2003,7 +2047,7 @@ msgstr ""
 "\n"
 "اگر در این مورد اطمینان ندارید، حالت 1x را انتخاب کنید."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323
 msgid ""
 "Enable fast disc access.  Needed for a few games. (ON = Fast, OFF = "
 "Compatible)"
@@ -2015,7 +2059,7 @@ msgstr ""
 msgid "Enable pages"
 msgstr "فعال کردن صفحات"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76
 msgid ""
 "Enable this if you want the whole screen to be used for rendering.\n"
 "If this is disabled, a render window will be created instead.\n"
@@ -2027,7 +2071,7 @@ msgstr ""
 "\n"
 "اگر در این مورد اطمینان ندارید، این گزینه را فعال نکنید."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80
 msgid ""
 "Enable this if you want to use the main Dolphin window for rendering rather "
 "than a separate render window.\n"
@@ -2039,7 +2083,7 @@ msgstr ""
 "\n"
 "اگر در این مورد اطمینان ندارید، این گزینه را فعال نکنید."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:335
 msgid ""
 "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for "
 "ANY other game."
@@ -2047,11 +2091,11 @@ msgstr ""
 "برای بالا بردن سرعت بازی افسانه زلدا: شاهدخت سپیده دم این گزینه را فعال "
 "کنید. غیرفعال برای هر بازی دیگر."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340
 msgid "Enables Custom Projection Hack"
 msgstr "فعال کردن پروژه هک دستی"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:528
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508
 msgid ""
 "Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on "
 "OSX."
@@ -2059,14 +2103,14 @@ msgstr ""
 "فعال کردن برابر سازی دالبی پرو لاجیک دو توسط خروجی فراگیر 5.1 (Surround). در "
 "OSX موجود نیست."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510
 msgid ""
 "Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only."
 msgstr ""
 "فعال کردن برابر سازی دالبی پرو لاجیک دو توسط خروجی فراگیر 5.1 (Surround). "
 "فقط پشتوانه اپن ای ال (OpenAL)."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:512
 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."
@@ -2075,7 +2119,7 @@ msgstr ""
 "فقط پشتوانه اپن ای ال (OpenAL). شاید تغییر نام soft_oal.dll به OpenAL32.dll "
 "برای به کار انداختن این امکان احتیاج باشد."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81
 msgid ""
 "Enables progressive scan if supported by the emulated software.\n"
 "Most games don't care about this.\n"
@@ -2087,7 +2131,7 @@ msgstr ""
 "\n"
 "اگر در این مورد اطمینان ندارید، این گزینه را فعال نکنید."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313
 msgid ""
 "Enables the Memory Management Unit, needed for some games. (ON = Compatible, "
 "OFF = Fast)"
@@ -2095,7 +2139,7 @@ msgstr ""
 "فعال کردن واحد مدیریت حافظه، برای بعضی از بازی ها لازم است. (روشن = سازگار، "
 "خاموش = سریع)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116
 msgid ""
 "Encode frame dumps using the FFV1 codec.\n"
 "\n"
@@ -2105,51 +2149,51 @@ msgstr ""
 "\n"
 "اگر در این مورد اطمینان ندارید، این گزینه را فعال نکنید."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:40
 msgid "End"
 msgstr "پایان"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:469
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:280
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:260
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293
 msgid "English"
 msgstr "انگلیسی"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:329
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:407
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:337
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:417
 msgid "Enhancements"
 msgstr "بهسازی"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:607
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:640
 msgid "Enter a name for the new perspective:"
 msgstr "یک اسم برای چشم انداز جدید وارد کنید:"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:191
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:178
 #, c-format
 msgid "Entry %d/%d"
 msgstr "ورودی %d/%d"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:85
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:72
 #, c-format
 msgid "Entry 1/%d"
 msgstr "ورودی 1/%d"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:204
 msgid "Equal"
 msgstr "همگن"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:45
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:156
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1242
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:32
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:150
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226
 msgid "Error"
 msgstr "خطا"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:381
+#: Source/Core/DolphinWX/Src/Main.cpp:409
 msgid "Error loading selected language. Falling back to system default."
 msgstr ""
 "بارگذاری زبان انتخاب شده با شکست مواجه شد. برگشت به زبان پیش فرض سیستم."
 
-#: Source/Core/Common/Src/ChunkFile.h:226
+#: Source/Core/Common/Src/ChunkFile.h:221
 #, c-format
 msgid ""
 "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). "
@@ -2158,7 +2202,7 @@ msgstr ""
 "خطا: بعد از \"%s\"، %d (0x%X) به جای نشان ذخیره %d (0x%X) پیدا شد. خاتمه "
 "بارگذاری وضعیت ذخیره..."
 
-#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:342
+#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:329
 #, c-format
 msgid ""
 "Error: Trying to access %s fonts but they are not loaded. Games may not show "
@@ -2167,38 +2211,38 @@ msgstr ""
 "خطا: تلاش برای دسترسی به فونت های %s اما آنها بارگذاری نشده اند. ممکن است "
 "بازی ها فونت ها را به درستی نمایش ندهند، یا خرابی به بار آورند."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:30
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:17
 msgid "Escape"
 msgstr "گریختن"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:26
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:30
 msgid "Euphoria"
 msgstr "خوشی"
 
 #: Source/Core/Core/Src/ArmMemTools.cpp:78
-#: Source/Core/Core/Src/x64MemTools.cpp:217
+#: Source/Core/Core/Src/x64MemTools.cpp:206
 #, c-format
 msgid "Exception handler - access below memory space. %08llx%08llx"
 msgstr "دستگذار استثناء - دسترسی فضای پایینی حافظه. %08llx%08llx"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:61
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
 msgid "Execute"
 msgstr "اجرا کردن"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:459
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:446
 msgid "Export Failed"
 msgstr "صادر کردن با شکست مواجه شد"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:639
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:649
 msgid "Export File"
 msgstr "صادر کردن فایل"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:177
 msgid "Export Recording"
 msgstr "صادر کردن ضبط"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:345
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:351
 msgid "Export Recording..."
 msgstr "صادر کردن ضبط..."
 
@@ -2206,7 +2250,7 @@ msgstr "صادر کردن ضبط..."
 msgid "Export Save"
 msgstr "صادر کردن ذخیره"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:874
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:865
 msgid "Export Wii save (Experimental)"
 msgstr "صادر کردن فایل ذخیره وی (آزمایشی)"
 
@@ -2214,100 +2258,100 @@ msgstr "صادر کردن فایل ذخیره وی (آزمایشی)"
 msgid "Export all saves"
 msgstr "صادر کردن همه ذخیره ها"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:80
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:72
 msgid "Export failed, try again?"
 msgstr "صادر کردن با شکست مواجه شد، کوشش دوباره؟"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:559
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:552
 msgid "Export save as..."
 msgstr "صادر کردن ذخیره بعنوان..."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:297
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:284
 msgid "Extension"
 msgstr "پسوند"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483
 msgid "External Frame Buffer"
 msgstr "حافظه میانجی خارجی فریم"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:61
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:48
 msgid "Extra Parameter"
 msgstr "پارامتر اضافی"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:62
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:49
 msgid "Extra Parameter useful in ''Metroid: Other M'' only."
 msgstr "پارامترهای یدکی مفید تنها برای \"Metroid Other M\"."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:614
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:624
 msgid "Extract All Files..."
 msgstr "استخراج همه فایل ها..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:616
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:626
 msgid "Extract Apploader..."
 msgstr "استخراج بارگذار برنامه..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:617
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627
 msgid "Extract DOL..."
 msgstr "استخراج دال..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:610
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:620
 msgid "Extract Directory..."
 msgstr "استخراج پوشه..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:612
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:622
 msgid "Extract File..."
 msgstr "استخراج فایل..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:608
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:618
 msgid "Extract Partition..."
 msgstr "استخراج پارتیشن..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:724
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:738
 #, c-format
 msgid "Extracting %s"
 msgstr "استخراج کردن %s"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:707
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:721
 msgid "Extracting All Files"
 msgstr "استخراج کردن همه فایل ها"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:707
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:721
 msgid "Extracting Directory"
 msgstr "استخراج کردن پوشه"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:710
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:724
 msgid "Extracting..."
 msgstr "استخراج کردن..."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:892
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:893
 msgid "FIFO Byte"
 msgstr "بایت فیفو"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:45
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:32
 msgid "FIFO Player"
 msgstr "پخش کننده فیفو"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:169
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:163
 msgid "FRANCE"
 msgstr "فرانسه"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472
 msgid "FST Size:"
 msgstr "اندازه اف اس تی:"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:77
+#: Source/Core/Core/Src/NetPlayClient.cpp:81
 msgid "Failed to Connect!"
 msgstr "اتصال با شکست مواجه شد!"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:225
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:228
 msgid "Failed to Listen!!"
 msgstr "پذیرفتن با شکست مواجه شد!!"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:307
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:300
 msgid "Failed to download codes."
 msgstr "دانلود کدها با شکست مواجه شد."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:827
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:843
 #, c-format
 msgid "Failed to extract to %s!"
 msgstr "استخراج به %s با شکست مواجه شد!"
@@ -2334,26 +2378,30 @@ msgstr ""
 "که نیازی به فایل حافظه فقط خواندنی ندارد.\n"
 "(نوع پردازشگر را از تب \"صدا\" در پنجره پیکر بندی انتخاب کنید.)"
 
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:116
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:139
+#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:108
+#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:131
 msgid "Failed to load bthprops.cpl"
 msgstr "بارگذاری bthprops.cpl با شکست مواجه شد"
 
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:100
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:109
+#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:90
+#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:101
 msgid "Failed to load hid.dll"
 msgstr "بارگذاری hid.dll با شکست مواجه شد"
 
-#: Source/Core/Core/Src/Movie.cpp:792
+#: Source/Core/Core/Src/Movie.cpp:783
 #, c-format
 msgid "Failed to read %s"
 msgstr "خواندن %s با شکست مواجه شد"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:151
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:144
 msgid "Failed to read banner.bin"
 msgstr "خواندن banner.bin با شکست مواجه شد"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:223
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:178
+msgid "Failed to read bk header"
+msgstr ""
+
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:211
 #, c-format
 msgid ""
 "Failed to read block %d of the save data\n"
@@ -2364,7 +2412,7 @@ msgstr ""
 "امکان ناقص بودن کارت حافظه وجود دارد\n"
 "موقعیت فایل:%llx"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:148
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:136
 msgid ""
 "Failed to read block allocation table backup correctly\n"
 "(0x8000-0x9FFF)"
@@ -2372,7 +2420,7 @@ msgstr ""
 "خواندن صحیح بکاپ جدول تخصیص بلوک با شکست مواجه شد\n"
 "(0x8000-0x9FFF)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:142
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:130
 msgid ""
 "Failed to read block allocation table correctly\n"
 "(0x6000-0x7FFF)"
@@ -2380,12 +2428,17 @@ msgstr ""
 "خواندن صحیح جدول تخصیص بلوک با شکست مواجه شد\n"
 "(0x6000-0x7FFF)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:286
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:279
 #, c-format
 msgid "Failed to read data from file %d"
 msgstr "خواندن داده از فایل با شکست مواجه شد %d"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:136
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:367
+#, c-format
+msgid "Failed to read data from file: %s"
+msgstr ""
+
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:124
 msgid ""
 "Failed to read directory backup correctly\n"
 "(0x4000-0x5FFF)"
@@ -2393,7 +2446,7 @@ msgstr ""
 "خواندن صحیح بکاپ پوشه با شکست مواجه شد\n"
 "(0x4000-0x5FFF)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:130
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:118
 msgid ""
 "Failed to read directory correctly\n"
 "(0x2000-0x3FFF)"
@@ -2401,7 +2454,11 @@ msgstr ""
 "خواندن صحیح پوشه با شکست مواجه شد\n"
 "(0x2000-0x3FFF)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:119
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:90
+msgid "Failed to read header"
+msgstr ""
+
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:107
 msgid ""
 "Failed to read header correctly\n"
 "(0x0000-0x1FFF)"
@@ -2409,64 +2466,64 @@ msgstr ""
 "خواندن سرخط با شکست مواجه شد\n"
 "(0x0000-0x1FFF)"
 
-#: Source/Core/DiscIO/Src/VolumeGC.cpp:61
+#: Source/Core/DiscIO/Src/VolumeGC.cpp:48
 msgid "Failed to read unique ID from disc image"
 msgstr "خواندن آی دی یگانه از ایمیج دیسک با شکست مواجه شد"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:84
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:71
 msgid "Failed to write BT.DINF to SYSCONF"
 msgstr "نوشتن BT.DINF به SYSCONF با شکست مواجه شد"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:228
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:221
 msgid "Failed to write bkhdr"
 msgstr "نوشتن bkhdr با شکست مواجه شد"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:164
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:157
 #, c-format
 msgid "Failed to write header for %s"
 msgstr "نوشتن سرخط برای %s با شکست مواجه شد"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:258
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:251
 #, c-format
 msgid "Failed to write header for file %d"
 msgstr "نوشتن سرخط برای فایل %d با شکست مواجه شد"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294
 msgid "Farsi"
 msgstr "پارسی"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477
 msgid "Fast"
 msgstr "سریع"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315
 msgid "Fast version of the MMU.  Does not work for every game."
 msgstr "نسخه سریع واحد مدیریت حافظه. برای همه بازی ها عمل نمی کند."
 
-#: Source/Core/Core/Src/Movie.cpp:1046
+#: Source/Core/Core/Src/Movie.cpp:1037
 #, 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:199
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:202
 msgid "Fifo Player"
 msgstr "پخش کننده فیفو"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:99
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:86
 msgid "File Info"
 msgstr "مشخصات فایل"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:304
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:295
 msgid "File contained no codes."
 msgstr "فایل شامل کدی نیست."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:413
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:400
 msgid "File converted to .gci"
 msgstr "فایل تبدیل شده است به .gci"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:428
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:415
 msgid ""
 "File could not be opened\n"
 "or does not have a valid extension"
@@ -2474,7 +2531,7 @@ msgstr ""
 "فایل قادر به باز شدن نیست\n"
 "یا دارای پسوند معتبر نیست"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:84
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:72
 #, c-format
 msgid ""
 "File has the extension \"%s\"\n"
@@ -2483,36 +2540,36 @@ msgstr ""
 "فایل پسوند \"%s\" دارد\n"
 "پسوند های معتبر عبارتند از (.raw/,gcp)"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:425
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:412
 msgid "File is not recognized as a memcard"
 msgstr "فایل به عنوان کارت حافظه شناخته نشده است"
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:294
+#: Source/Core/DiscIO/Src/CompressedBlob.cpp:281
 msgid "File not compressed"
 msgstr "فایل فشرده نیست"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:127
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:109
 #, c-format
 msgid "FileIO: Unknown open mode : 0x%02x"
 msgstr "ورودی/خروجی فایل: حالت گشودن ناشناس : 0x%02x"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:531
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:541
 msgid "Filesystem"
 msgstr "فایل سیستم"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1100
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1126
 msgid "Filetype 'ini' is unknown! Will not open!"
 msgstr "نوع فایل 'ini' ناشناس است! باز نخواهد شد!"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:265
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:252
 msgid "Find next"
 msgstr "پیدا کردن بعدی"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:266
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:253
 msgid "Find previous"
 msgstr "پیدا کردن قبلی"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:632
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626
 msgid "First Block"
 msgstr "بلوک اول"
 
@@ -2520,23 +2577,23 @@ msgstr "بلوک اول"
 msgid "Fix Checksums"
 msgstr "درست کردن چک سام ها"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:275
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283
 msgid "Force 16:9"
 msgstr "۱۶:۹ اجباری"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:275
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283
 msgid "Force 4:3"
 msgstr "۴:۳ اجباری"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:568
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548
 msgid "Force Console as NTSC-J"
 msgstr "کنسول به عنوان NTSC-J اجباری"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406
 msgid "Force Texture Filtering"
 msgstr "فیلتر کردن بافت اشیاء اجباری"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90
 msgid ""
 "Force texture filtering even if the emulated game explicitly disabled it.\n"
 "Improves texture quality slightly but causes glitches in some games.\n"
@@ -2549,7 +2606,7 @@ msgstr ""
 "\n"
 "اگر در این مورد اطمینان ندارید، این گزینه را فعال نکنید."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83
 msgid ""
 "Force the game to output graphics for widescreen resolutions.\n"
 "Causes graphical glitches is some games.\n"
@@ -2561,7 +2618,7 @@ msgstr ""
 "\n"
 "اگر در این مورد اطمینان ندارید، این گزینه را فعال نکنید."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488
 msgid ""
 "Forces NTSC-J mode for using the Japanese ROM font.\n"
 "Left unchecked, dolphin defaults to NTSC-U and automatically enables this "
@@ -2571,7 +2628,7 @@ msgstr ""
 "این گزینه را رها کنید، حالت پیش فرض دلفین NTSC-U می باشد, دلفین به طور "
 "خودکار این گزینه را برای بازی های ژاپنی فعال می کند."
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:74
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:62
 msgid ""
 "Format as ascii (NTSC\\PAL)?\n"
 "Choose no for sjis (NTSC-J)"
@@ -2579,148 +2636,147 @@ msgstr ""
 "قالب بندی بعنوان اسکی (NTSC\\PAL)?\n"
 "انتخاب پاسخ منفی برای SJIS (NTSC-J)"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:278
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:265
 msgid "Forward"
 msgstr "جلو"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504
 #, c-format
 msgid "Found %d results for '"
 msgstr "پیدا کردن نتایج %d برای '"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:857
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:925
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:858
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:926
 msgid "Frame"
 msgstr "فریم"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:867
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:868
 msgid "Frame "
 msgstr "فریم"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:185
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:173
 msgid "Frame Advance"
 msgstr "پيشروى فریم"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:536
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549
 msgid "Frame Dumps use FFV1"
 msgstr "نسخه برداری فریم با استفاده از FFV1"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:227
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:214
 msgid "Frame Info"
 msgstr "مشخصات فریم"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:116
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:103
 msgid "Frame Range"
 msgstr "محدوده فریم"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:138
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:139
 msgid "Frame S&kipping"
 msgstr "پری&دن از روی فریم"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:572
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552
 msgid "Framelimit:"
 msgstr "حد فریم:"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:204
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:191
 msgid "Frames To Record"
 msgstr "فریم ها برای ضبط شدن"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547
 msgid "Free Look"
 msgstr "نگاه آزاد"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
 msgid "French"
 msgstr "فرانسوی"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:38
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:42
 msgid "Frets"
 msgstr "تحریک"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:118
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:137
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:105
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:124
 msgid "From"
 msgstr "از"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:426
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:432
 msgid "FullScr"
 msgstr "تمام صفحه"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:256
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263
 msgid "Fullscreen resolution:"
 msgstr "وضوح حالت تمام صفحه:"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:534
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524
 msgid "GCI File(*.gci)"
 msgstr "فایل جی سی آی(*.gci)"
 
-#: Source/Core/DolphinWX/Src/GCMicDlg.h:44
+#: Source/Core/DolphinWX/Src/GCMicDlg.h:31
 msgid "GCMic Configuration"
 msgstr "پیکربندی میکروفن گیم کیوب"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:432
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
 msgid "GCPad"
 msgstr "گیم پد گیم کیوب"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:659
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:658
 msgid "GX_CMD_INVL_VC"
 msgstr "GX_CMD_INVL_VC"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:448
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:452
 msgid "Game ID:"
 msgstr "آی دی بازی:"
 
-#: Source/Core/Core/Src/NetPlay.cpp:229
+#: Source/Core/Core/Src/NetPlay.cpp:216
 msgid "Game is already running!"
 msgstr "بازی قبلا اجرا شده است!"
 
-#: Source/Core/Core/Src/NetPlay.cpp:259
+#: Source/Core/Core/Src/NetPlay.cpp:246
 msgid "Game isn't running!"
 msgstr "بازی اجرا نشده است!"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:389
-#, fuzzy
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:393
 msgid "Game not found!"
-msgstr "بازی پیدا نشد!"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:385
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:389
 msgid "Game-Specific Settings"
 msgstr "تنظیمات مشخصات بازی"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:293
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:294
 msgid "GameConfig"
 msgstr "پیکربندی بازی"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:525
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:515
 msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)"
 msgstr "فایل های ذخیره بازی گیم کیوب(*.gci;*.gcs;*.sav)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534
 msgid "Gamecube"
 msgstr "گیم کیوب"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:178
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:181
 msgid "Gamecube &Pad Settings"
 msgstr "تنظیمات &دسته گیم کیوب"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:218
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1069
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:205
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1052
 msgid "Gamecube Memory Cards (*.raw,*.gcp)"
 msgstr "کارت های حافظه گیم کیوب (*.raw.*.gcp)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:432
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
 msgid "Gamecube Pad settings"
 msgstr "تنظیمات دسته گیم کیوب"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:117
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302
 msgid "Gecko Codes"
 msgstr "کدهای گیکو"
 
-#: Source/Core/Core/Src/GeckoCode.cpp:222
+#: Source/Core/Core/Src/GeckoCode.cpp:214
 #, c-format
 msgid ""
 "GeckoCode failed to run (CT%i CST%i) (%s)\n"
@@ -2733,10 +2789,10 @@ msgstr ""
 "توسط قرار دادن فایل codehandler.bin در داخل پوشه Sys و شروع مجدد دلفین "
 "استفاده کنید.)"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:172
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:197
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:160
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:160
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:202
 msgid "General"
 msgstr "کلی"
 
@@ -2744,30 +2800,30 @@ msgstr "کلی"
 msgid "General Settings"
 msgstr "تنظیمات جامع"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:470
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:281
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:316
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:261
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
 msgid "German"
 msgstr "آلمانی"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:449
+#: Source/Core/Core/Src/ActionReplay.cpp:439
 #, c-format
 msgid "GetARCode: Index is greater than ar code list size %lu"
 msgstr "گرفتن کد اکشن ریپلی: فهرست بزرگتر از سایز لیست است %lu"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:430
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:436
 msgid "Graphics"
 msgstr "گرافیک"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:430
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:436
 msgid "Graphics settings"
 msgstr "تنظیمات گرافیک"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:205
 msgid "Greater Than"
 msgstr "بزرگتر از"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87
 msgid ""
 "Greatly increases quality of textures generated using render to texture "
 "effects.\n"
@@ -2784,51 +2840,67 @@ msgstr ""
 "\n"
 "اگر در این مورد اطمینان ندارید، این گزینه را رها کنید."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:317
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
 msgid "Greek"
 msgstr "یونانی"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:22
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Green"
 msgstr "سبز"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:24
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Green Left"
 msgstr "سبز چپ"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:25
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Green Right"
 msgstr "سبز راست"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:35
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:39
 msgid "Guitar"
 msgstr "گیتار"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1259
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1250
 msgid "HCI_CMD_INQUIRY is called, please report!"
 msgstr "HCI_CMD_INQUIY فرا خوانده شد، لطفا گزارش دهید!"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:421
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504
+msgid "Hacked Buffer Upload"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431
 msgid "Hacks"
 msgstr "هک"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:158
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:146
 msgid "Header checksum failed"
 msgstr "چک کردن سر خط برای یافتن خطا با شکست مواجه شد"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:318
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298
 msgid "Hebrew"
 msgstr "عبری"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:313
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:300
 msgid "Height"
 msgstr "ارتفاع"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:64
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:51
 msgid "Help"
 msgstr "کمک"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:209
+#: Source/Core/DolphinWX/Src/Main.cpp:229
+msgid ""
+"Hi,\n"
+"\n"
+"Dolphin requires Mac OS X 10.7 or greater.\n"
+"Unfortunately you're running an old version of OS X.\n"
+"The last Dolphin version to support OS X 10.6 is Dolphin 3.5\n"
+"Please upgrade to 10.7 or greater to use the newest Dolphin version.\n"
+"\n"
+"Sayonara!\n"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/Main.cpp:220
 msgid ""
 "Hi,\n"
 "\n"
@@ -2846,15 +2918,15 @@ msgstr ""
 "\n"
 "سایونارا!\n"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:309
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:296
 msgid "Hide"
 msgstr "مخفی"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:307
 msgid "Hide Mouse Cursor"
 msgstr "مخفی کردن نشانگر"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79
 msgid ""
 "Hides the mouse cursor if it's on top of the emulation window.\n"
 "\n"
@@ -2864,26 +2936,26 @@ msgstr ""
 "\n"
 "اگر در این مورد اطمینان ندارید، این گزینه را رها کنید."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:54
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41
 msgid "Home"
 msgstr "خانه"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:85
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:138
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:76
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:141
 msgid "Host"
 msgstr "میزبان"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.h:44
+#: Source/Core/DolphinWX/Src/HotkeyDlg.h:31
 msgid "Hotkey Configuration"
 msgstr "پیکربندی شرت کات"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:272
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:272
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:594
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:260
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:260
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574
 msgid "Hotkeys"
 msgstr "شرت کاتها"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:319
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299
 msgid "Hungarian"
 msgstr "مجارستانی"
 
@@ -2891,34 +2963,30 @@ msgstr "مجارستانی"
 msgid "Hybrid Wiimote"
 msgstr "ویموت مخلوط"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:532
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:519
 #, 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:786
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:773
 #, c-format
 msgid ""
-"IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available "
-"in your nand dump\n"
+"IOCTL_ES_LAUNCH: Game tried to reload an IOS or a title that is not "
+"available in your NAND dump\n"
 "TitleID %016llx.\n"
-" Dolphin will likely hang now"
+" Dolphin will likely hang now."
 msgstr ""
-"IOCTL_ES_LAUNCH: بازی بارگذاری آیزوها یا یک عنوان که در نند نسخه برداری شده "
-"شماست را آزمایش کرد\n"
-"آی دی عنوان %016llx.\n"
-" احتمالا اینک دلفین هنگ خواهد کرد"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:313
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:300
 msgid "IOCTL_ES_READCONTENT - bad destination"
 msgstr "IOCTL_ES_READCONTENT - مقصد ناصحیح"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729
 msgid "IPL Settings"
 msgstr "تنظیمات آی پی ال"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269
 msgid "IR"
 msgstr "فروسرخ"
 
@@ -2930,23 +2998,23 @@ msgstr "اشاره گر فروسرخ"
 msgid "IR Sensitivity:"
 msgstr "میزان حساسیت فروسرخ"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:502
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:512
 msgid "ISO Details"
 msgstr "جزئیات آیزو"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:830
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:811
 msgid "ISO Directories"
 msgstr "پوشه های آیزو"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:172
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:166
 msgid "ITALY"
 msgstr "ایتالیا"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:630
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:624
 msgid "Icon"
 msgstr "تندیس"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332
 msgid ""
 "If checked, the bounding box registers will be updated. Used by the Paper "
 "Mario games."
@@ -2954,28 +3022,11 @@ msgstr ""
 "اگر انتخاب شود، ثبت حد جعبه به روز خواهد شد. از سوی بازی های پیپر ماریو "
 "استفاده می شود."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318
-msgid ""
-"If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)"
-msgstr ""
-"اگر تعداد فریم های نمایش داده شده بر ثانیه نامنظم است، شاید این گزینه به رفع "
-"آن کمک کند. (روشن = سازگار، خاموش = سریع)"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505
-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:428
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438
 msgid "Ignore Format Changes"
 msgstr "تغییرات قالب بندی نادیده گرفته شود"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94
 msgid ""
 "Ignore any changes to the EFB format.\n"
 "Improves performance in many games without any negative effect. Causes "
@@ -2989,7 +3040,7 @@ msgstr ""
 "\n"
 "اگر در این مورد اطمینان ندارید، این گزینه را رها کنید."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93
 msgid ""
 "Ignore any requests of the CPU to read from or write to the EFB.\n"
 "Improves performance in some games, but might disable some gameplay-related "
@@ -3007,11 +3058,11 @@ msgstr ""
 msgid "Import Save"
 msgstr "وارد کردن ذخیره"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:59
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:48
 msgid "Import failed, try again?"
 msgstr "وارد کردن با شکست مواجه شد، سعی دوباره؟"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:454
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:441
 msgid ""
 "Imported file has gsc extension\n"
 "but does not have a correct header"
@@ -3019,11 +3070,11 @@ msgstr ""
 "پسوند فایل وارد شده جی اس سی است\n"
 "اما دارای سرخط صحیح نمی باشد"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:442
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:429
 msgid "Imported file has invalid length"
 msgstr "طول فایل وارد شده نامعتبر می باشد"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:451
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:438
 msgid ""
 "Imported file has sav extension\n"
 "but does not have a correct header"
@@ -3031,19 +3082,7 @@ msgstr ""
 "پسوند فایل وارد شده اس ای وی می باشد\n"
 "اما دارای سرخط صحیح نمی باشد"
 
-#: 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 ""
-"کارآئى را بالا می برد اما سبب نقص های گرافیکی در اکثر بازی هایی که بر "
-"برابرسازی مه تکیه می کنند می شود.\n"
-"\n"
-"اگر در این مورد اطمینان ندارید، این گزینه را فعال نکنید."
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350
 msgid "In Game"
 msgstr "در بازی"
 
@@ -3051,67 +3090,67 @@ msgstr "در بازی"
 msgid "In-Game"
 msgstr "در بازی"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:34
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305
 msgid "Info"
 msgstr "مشخصات"
 
-#: Source/Core/Common/Src/MsgHandler.cpp:65
+#: Source/Core/Common/Src/MsgHandler.cpp:51
 msgid "Information"
 msgstr "مشخصات"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:481
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:468
 msgid "Input"
 msgstr "ورودی"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:63
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:50
 msgid "Insert"
 msgstr "درج"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:176
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:166
 msgid "Insert Encrypted or Decrypted code here..."
 msgstr "درج کد رمز شده و یا کشف شده..."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:763
 msgid "Insert SD Card"
 msgstr "درج کارت اس دی"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:34
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:21
 msgid "Insert name here.."
 msgstr "درج اسم..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:196
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:199
 msgid "Install WAD"
 msgstr "نصب واد"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:895
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:888
 msgid "Install to Wii Menu"
 msgstr "نصب به فهرست انتخاب وی"
 
-#: Source/Core/Core/Src/x64MemTools.cpp:252
+#: Source/Core/Core/Src/x64MemTools.cpp:242
 msgid ""
 "InstallExceptionHandler called, but this platform does not yet support it."
 msgstr ""
 "نصب دستگذار استثناء فراخوانده شد، اما این پلتفورم هنوز از این امکان پشتیبانی "
 "نمی کند."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1297
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
 msgid "Installing WAD..."
 msgstr "در حال نصب واد..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:885
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:901
 msgid "Integrity Check Error"
 msgstr "خطای بررسی درست بودن"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:891
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:907
 msgid "Integrity check completed"
 msgstr "بررسی درست بودن به پایان رسید"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:890
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:906
 msgid "Integrity check completed. No errors have been found."
 msgstr "بررسی درست بودن به پایان رسید. خطایی پیدا نشد."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:882
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:898
 #, c-format
 msgid ""
 "Integrity check for partition %d failed. Your dump is most likely corrupted "
@@ -3120,19 +3159,19 @@ msgstr ""
 "بررسی درست بودن پارتیشن %d با شکست مواجه شد. نسخه برداری شما به احتمال زیاد "
 "خراب یا نادرست وصله خورده است."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532
 msgid "Interface"
 msgstr "واسط گرافیک"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:646
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627
 msgid "Interface Settings"
 msgstr "تنظیمات واسط گرافیک"
 
-#: Source/Core/Core/Src/State.cpp:240
+#: Source/Core/Core/Src/State.cpp:228
 msgid "Internal LZO Error - compression failed"
 msgstr "خطای داخلی LZO - فشرده سازی با شکست مواجه شد"
 
-#: Source/Core/Core/Src/State.cpp:348
+#: Source/Core/Core/Src/State.cpp:336
 #, c-format
 msgid ""
 "Internal LZO Error - decompression failed (%d) (%li, %li) \n"
@@ -3141,41 +3180,45 @@ msgstr ""
 "خطای داخلی LZO - ناهمفشرده سازی با شکست مواجه شد (%d) (%li, %li) \n"
 "سعی مجدد برای بار گذاری وضعیت"
 
-#: Source/Core/Core/Src/State.cpp:485
+#: Source/Core/Core/Src/State.cpp:473
 msgid "Internal LZO Error - lzo_init() failed"
 msgstr "خطای داخلی LZO - lzo_init() با شکست مواجه شد"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:344
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:352
 msgid "Internal Resolution:"
 msgstr "وضوح داخلی:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:42
+msgid "Interpreter (VERY slow)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349
 msgid "Intro"
 msgstr "صفحه نخست"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:194
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:187
 #, c-format
 msgid "Invalid Size(%x) or Magic word (%x)"
 msgstr "سایز نا معتبر (%x) یا کلمه جادو (%x)"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:612
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:600
 msgid "Invalid Value!"
 msgstr "مقدار نامعتبر!"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:462
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:449
 msgid "Invalid bat.map or dir entry"
 msgstr "bat.map نامعتبر یا ورودی پوشه"
 
-#: Source/Core/Core/Src/CoreTiming.cpp:548
+#: Source/Core/Core/Src/CoreTiming.cpp:553
 #, c-format
 msgid "Invalid event type %i"
 msgstr "نوع واقعه نامعتبر %i"
 
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:326
+#: Source/Core/Core/Src/HW/DVDInterface.cpp:309
 msgid "Invalid file"
 msgstr "فایل نامعتبر"
 
-#: Source/Core/DiscIO/Src/BannerLoaderGC.cpp:41
+#: Source/Core/DiscIO/Src/BannerLoaderGC.cpp:28
 #, c-format
 msgid ""
 "Invalid opening.bnr found in gcm:\n"
@@ -3186,46 +3229,54 @@ msgstr ""
 "%s\n"
 "شاید لازم باشد شما مجدد از این بازی نسخه برداری کنید."
 
-#: Source/Core/Core/Src/Movie.cpp:735
+#: Source/Core/Core/Src/Movie.cpp:726
 msgid "Invalid recording file"
 msgstr "فایل ضبط نامعتبر"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:473
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:472
 msgid "Invalid search parameters (no object selected)"
 msgstr "پارامتر های جستجوی نامعتبر (هیچ شیئ انتخاب نشده)"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:456
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:455
 msgid "Invalid search string (couldn't convert to number)"
 msgstr "رشته جستجوی نامعتبر (قادر به تبدیل به عدد نیست)"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:444
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:443
 msgid "Invalid search string (only even string lengths supported)"
 msgstr "رشته جستجوی نامعتبر (فقط رشته های با طول زوج پشتیبانی می شود)"
 
-#: Source/Core/Core/Src/Core.cpp:513
+#: Source/Core/Core/Src/Core.cpp:511
 msgid "Invalid state"
 msgstr "وضعیت نامعتبر"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:473
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:320
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300
 msgid "Italian"
 msgstr "ایتالیایی"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:183
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:177
 msgid "JAPAN"
 msgstr "ژاپن"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:321
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:46
+msgid "JIT Recompiler (recommended)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:47
+msgid "JITIL experimental recompiler"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:279
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
 msgid "Japanese"
 msgstr "ژاپنی"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:188
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:182
 msgid "KOREA"
 msgstr "کره"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78
 msgid ""
 "Keep the game window on top of all other windows.\n"
 "\n"
@@ -3235,62 +3286,62 @@ msgstr ""
 "\n"
 "اگر در این مورد اطمینان ندارید، این گزینه را فعال نکنید."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:298
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:306
 msgid "Keep window on top"
 msgstr "بر راس نگه داشتن پنجره"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:241
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:241
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:229
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:229
 msgid "Key"
 msgstr "کلید"
 
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282
 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:322
 msgid "Korean"
 msgstr "کره ای"
 
 #. i18n:  Left
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:57
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:44
 msgid "L"
 msgstr "ال"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:39
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:26
 msgid "L Button"
 msgstr "دکمه ال"
 
 #. i18n:  Left-Analog
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:61
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:48
 msgid "L-Analog"
 msgstr "ال آنالوگ"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:585
 msgid "Language:"
 msgstr "زبان:"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:152
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:153
 msgid "Last Overwritten State"
 msgstr "آخرین وضعیت بازنویسی شده"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:159
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:161
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:160
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:162
 msgid "Last Saved State"
 msgstr "آخرین وضعیت ذخیره شده"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:696
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:677
 msgid "Latency:"
 msgstr "زمان بيکارى:"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:276
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:55
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:263
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:42
 msgid "Left"
 msgstr "چپ"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:60
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:64
 msgid "Left Stick"
 msgstr "استیک چپ"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:257
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:257
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:245
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:245
 msgid ""
 "Left click to detect hotkeys.\n"
 "Enter space to clear."
@@ -3298,7 +3349,7 @@ msgstr ""
 "کلیک چپ برای کشف کلیدهای فوری.\n"
 "کلید فاصله برای پاک کردن."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:689
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:678
 msgid ""
 "Left-click to detect input.\n"
 "Middle-click to clear.\n"
@@ -3308,7 +3359,7 @@ msgstr ""
 "کلیک وسط برای پاک کردن.\n"
 "کلیک راست برای گزینه های بیشتر."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:694
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:683
 msgid ""
 "Left/Right-click for more options.\n"
 "Middle-click to clear."
@@ -3316,76 +3367,76 @@ msgstr ""
 "کلیک چپ/راست برای گزینه های بیشتر.\n"
 "کلیک وسط برای پاک کردن."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:219
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:206
 msgid "Less Than"
 msgstr "کمتر از"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:565
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545
 msgid "Limit by FPS"
 msgstr "محدود کردن توسط تعداد فریم ها بر ثانیه"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:924
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:915
 msgid "Load"
 msgstr "بارگذاری"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544
 msgid "Load Custom Textures"
 msgstr "بارگذاری بافت اشیاء دلخواه"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
 msgid "Load State Slot 1"
 msgstr "بارگذاری وضعیت - شکاف ۱"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189
 msgid "Load State Slot 2"
 msgstr "بارگذاری وضعیت - شکاف ۲"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:190
 msgid "Load State Slot 3"
 msgstr "بارگذاری وضعیت - شکاف ۳"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:203
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:191
 msgid "Load State Slot 4"
 msgstr "بارگذاری وضعیت - شکاف ۴"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192
 msgid "Load State Slot 5"
 msgstr "بارگذاری وضعیت - شکاف ۵"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193
 msgid "Load State Slot 6"
 msgstr "بارگذاری وضعیت - شکاف ۶"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:194
 msgid "Load State Slot 7"
 msgstr "بارگذاری وضعیت - شکاف ۷"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:195
 msgid "Load State Slot 8"
 msgstr "بارگذاری وضعیت - شکاف ۸"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:155
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:156
 msgid "Load State..."
 msgstr "بارگذاری وضعیت..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1332
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1359
 msgid "Load Wii System Menu"
 msgstr "بارگذاری منوی سیستم وی"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1327
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1354
 #, c-format
 msgid "Load Wii System Menu %d%c"
 msgstr "بارگذاری منوی سیستم وی %d%c"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112
 msgid ""
 "Load custom textures from User/Load/Textures/<game_id>/\n"
 "\n"
@@ -3395,7 +3446,7 @@ msgstr ""
 "\n"
 "اگر در این مورد اطمینان ندارید، این گزینه را فعال نکنید."
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:50
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:37
 msgid "Load preset values from hack patterns available."
 msgstr "بارگذاری مقدار های از پیش تنظیم شده از الگوهای هک موجود است."
 
@@ -3403,23 +3454,23 @@ msgstr "بارگذاری مقدار های از پیش تنظیم شده از ا
 msgid "Local"
 msgstr "محلی"
 
-#: Source/Core/DolphinWX/Src/LogWindow.h:51
+#: Source/Core/DolphinWX/Src/LogWindow.h:38
 msgid "Log"
 msgstr "ثبت وقایع"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:26
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:13
 msgid "Log Configuration"
 msgstr "پیکر بندی ثبت وقایع"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:296
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304
 msgid "Log FPS to file"
 msgstr "ثبت فریم بر ثانیه به فایل"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:96
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83
 msgid "Log Types"
 msgstr "انواع ثبت وقایع"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103
 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"
@@ -3431,24 +3482,24 @@ msgstr ""
 "\n"
 "اگر در این مورد اطمینان ندارید، این گزینه را رها کنید."
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:81
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:68
 msgid "Logger Outputs"
 msgstr "خروجی های واقعه نگار"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132
-#: Source/Core/DolphinWX/Src/Frame.cpp:328
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:119
+#: Source/Core/DolphinWX/Src/Frame.cpp:314
 msgid "Logging"
 msgstr "واقعه نگاری"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:255
+#: Source/Core/Core/Src/NetPlayClient.cpp:259
 msgid "Lost connection to server!"
 msgstr "ارتباط با سرور قطع شد!"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:42
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:29
 msgid "M Button"
 msgstr "دکمه ام"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:119
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:112
 #, c-format
 msgid ""
 "MD5 mismatch\n"
@@ -3457,51 +3508,60 @@ msgstr ""
 "چک سام MD5 ناهمسان است\n"
 " %016llx%016llx != %016llx%016llx"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314
 msgid "MMU Speed Hack"
 msgstr "هک کردن سرعت واحد مدیریت حافظه"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:527
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:563
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:517
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:556
 msgid "MadCatz Gameshark files(*.gcs)"
 msgstr "فایل های گیم شارک مد کتذ (*.gcs)"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:51
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:63
+#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:38
 msgid "Main Stick"
 msgstr "استیک اصلی"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460
 msgid "Maker ID:"
 msgstr "آی دی سازنده"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487
 msgid "Maker:"
 msgstr "سازنده"
 
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100
+msgid ""
+"Makes distant objects more visible by removing fog, thus increasing the "
+"overall detail.\n"
+"Disabling fog will break some games which rely on proper fog emulation.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:97
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:100
 msgid "Max"
 msgstr "حداکثر"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:448
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:435
 msgid "Memcard already has a save for this title"
 msgstr "کارت حافظه فایل ذخیره برای این عنوان را دارد"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:291
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:278
 msgid "Memcard already opened"
 msgstr "کارت حافظه قبلا باز شده است"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:912
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:913
 msgid "Memory Byte"
 msgstr "بایت حافظه"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:225
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:113
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:212
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:93
 msgid "Memory Card"
 msgstr "کارت حافظه"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.h:36
+#: Source/Core/DolphinWX/Src/MemcardManager.h:23
 msgid ""
 "Memory Card Manager WARNING-Make backups before using, should be fixed but "
 "could mangle stuff!"
@@ -3509,7 +3569,7 @@ msgstr ""
 "اخطار: قبل از استفاده از کارت حافظه بک آپ بگیرید، شاید درست شود اما اطلاعات "
 "از بین خواهد رفت!"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:371
+#: Source/Core/Core/Src/CoreParameter.cpp:360
 #, c-format
 msgid ""
 "Memory Card filename in Slot %c is incorrect\n"
@@ -3526,15 +3586,15 @@ msgstr ""
 "%s\n"
 "آیا مایل هستید فایل قبلی را به مکان جدید کپی کنید؟\n"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:124
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:112
 msgid "Memorycard filesize does not match the header size"
 msgstr "سایز کارت حافظه با سرخط تطابق ندارد"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:50
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:37
 msgid "Menu"
 msgstr "فهرست انتخاب"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:114
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:94
 msgid "Mic"
 msgstr "میکروفن"
 
@@ -3543,20 +3603,20 @@ msgstr "میکروفن"
 msgid "Min"
 msgstr "حداقل"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:580
 msgid "Misc"
 msgstr "متفرقه"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:795
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776
 msgid "Misc Settings"
 msgstr "تنظیمات متفرقه"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:240
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:294
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:227
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:281
 msgid "Modifier"
 msgstr "پیراینده"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106
 msgid ""
 "Modify textures to show the format they're encoded in. Needs an emulation "
 "reset in most cases.\n"
@@ -3568,20 +3628,20 @@ msgstr ""
 "\n"
 "اگر در این مورد اطمینان ندارید، این گزینه را فعال نکنید."
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:115
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:108
 msgid "Monospaced font"
 msgstr "فونت هم عرض"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:305
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:292
 msgid "Motion Plus"
 msgstr "موشن پلاس"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:309
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:86
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:296
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73
 msgid "Motor"
 msgstr "موتور"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:654
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:666
 msgid ""
 "Move the mouse pointer over an option to display a detailed description.\n"
 "\n"
@@ -3600,224 +3660,235 @@ msgstr ""
 "\n"
 "\n"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:75
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:62
 msgid "Multiply"
 msgstr "ضریب"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:651
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:650
 msgid "NOP"
 msgstr "ناپ"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:629
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:628
 msgid "NOTE: Stream size doesn't match actual data length\n"
 msgstr "توجه: سایز مسیل با طول حقیقی داده برابر نیست\n"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:129
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:116
 msgid "NP Add"
 msgstr "اضافه کردن ان پی"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:124
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:111
 msgid "NP Begin"
 msgstr "شروع ان پی"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:132
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:119
 msgid "NP Decimal"
 msgstr "دسیمال ان پی"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:126
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:113
 msgid "NP Delete"
 msgstr "حذف ان پی"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:133
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:120
 msgid "NP Divide"
 msgstr "جداکردن ان پی"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:120
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:107
 msgid "NP Down"
 msgstr "پایین ان پی"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:123
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:110
 msgid "NP End"
 msgstr "پایان ان پی"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:111
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:98
 msgid "NP Enter"
 msgstr "وارد شدن ان پی"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:127
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:114
 msgid "NP Equal"
 msgstr "یکسان ان پی"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:116
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:103
 msgid "NP Home"
 msgstr "خانه ان پی"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:125
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:112
 msgid "NP Insert"
 msgstr "درج ان پی"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:117
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:104
 msgid "NP Left"
 msgstr "چپ ان پی"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:128
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:115
 msgid "NP Multiply"
 msgstr "تکثیر ان پی"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:122
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:109
 msgid "NP Page Down"
 msgstr "صفحه پایین ان پی"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:121
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:108
 msgid "NP Page Up"
 msgstr "صفحه بالا ان پی"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:119
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:106
 msgid "NP Right"
 msgstr "راست ان پی"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:130
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:117
 msgid "NP Separator"
 msgstr "جدا ساز ان پی"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:109
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:96
 msgid "NP Space"
 msgstr "فاصله ان پی"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:131
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:118
 msgid "NP Subtract"
 msgstr "کاستن ان پی"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:110
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:97
 msgid "NP Tab"
 msgstr "تب ان پی"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:118
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:105
 msgid "NP Up"
 msgstr "بالا ان پی"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:444
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:59
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:50
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:448
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:46
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:37
 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:25
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:72
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:282
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:553
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:15
 msgid "Name: "
 msgstr "اسم:"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:526
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:562
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:516
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:555
 msgid "Native GCI files(*.gci)"
 msgstr "فایل های جی سی آی محلی(*.gci)"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:161
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:148
 msgid "New Scan"
 msgstr "پویش جدید"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:206
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:193
 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:801
 msgid "Next Page"
 msgstr "صفحه بعد"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:165
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:152
 msgid "Next Scan"
 msgstr "پویش بعدی"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:68
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:59
 msgid "Nickname :"
 msgstr "اسم مستعار :"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:196
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:190
 msgid "No Country (SDK)"
 msgstr "بدون کشور (SDK)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:370
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:357
 msgid "No ISOs or WADS found"
 msgstr "هیچ آیزو یا وادی پیدا نشد"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:508
+#: Source/Core/Core/Src/ConfigManager.h:17
+msgid "No audio output"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:501
 #, c-format
 msgid "No banner file found for title  %s"
 msgstr "فایل نشان برای عنوان %s پیدا نشد"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:761
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:768
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:760
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:767
 msgid "No description available"
 msgstr "تشریحی دردسترس نیست"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:514
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:535
 msgid "No docking"
 msgstr "بدون جاخالی کردن"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:859
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:860
 msgid "No file loaded"
 msgstr "هیچ فایلی بارگذاری نشده"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:439
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:426
 msgid "No free dir index entries"
 msgstr "بدون مقادیر اطلاعاتی فهرست پوشه آزاد"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:895
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:896
 msgid "No recorded file"
 msgstr "بدون فایل ضبط شده"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:501
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:494
 #, c-format
 msgid "No save folder found for title %s"
 msgstr "پوشه فایل ذخیره برای عنوان %s پیدا نشد"
 
+#: Source/Plugins/Plugin_VideoOGL/Src/main.cpp:132
+#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:111
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:23
 #: Source/Core/DolphinWX/Src/NetWindow.cpp:600
 msgid "None"
 msgstr "هیچ"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:323
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303
 msgid "Norwegian Bokmaal"
 msgstr "بوکمال نروژی"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:203
 msgid "Not Equal"
 msgstr "برابر نیست"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:804
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:794
 msgid "Not Set"
 msgstr "ست نشده است"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:626
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:101
+#, c-format
+msgid "Not a Wii save or read failure for file header size %x"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/Main.cpp:654
 msgid "Not connected"
 msgstr "متصل نشده است"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:309
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:296
 msgid "Notes"
 msgstr "یادداشت ها"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:16
 msgid "Notes: "
 msgstr "یادداشت ها:"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:71
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:74
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:580
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:621
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:629
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:59
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:64
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:613
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:659
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:667
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:31
 msgid "Notice"
 msgstr "توجه"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:105
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:92
 msgid "Num Lock"
 msgstr "قفل کلید نام لاک"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:88
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:75
 msgid "Number Of Codes: "
 msgstr "تعداد کدها:"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:30
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:34
 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26
 msgid "Nunchuk"
 msgstr "ننچاک"
@@ -3826,96 +3897,97 @@ msgstr "ننچاک"
 msgid "Nunchuk Acceleration"
 msgstr "شتاب دهنده ننچاک"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:877
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:878
 msgid "Object"
 msgstr "شیی"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:135
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:122
 msgid "Object Range"
 msgstr "محدوده شیی"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:243
 msgid "Off"
 msgstr "خاموش"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:62
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:49
 msgid "Offset:"
 msgstr "افست:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:582
 msgid "On-Screen Display Messages"
 msgstr "پیام های روی صفحه نمایش"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:436
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:423
 #, c-format
 msgid "Only %d blocks available"
 msgstr "فقط بلوک های %d موجود است"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:420
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:178
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:426
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:166
 msgid "Open"
 msgstr "گشودن"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:876
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:867
 msgid "Open &containing folder"
 msgstr "باز کردن پوشه &شامل"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:873
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:864
 msgid "Open Wii &save folder"
 msgstr "باز کردن پوشه &ذخیره وی"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:420
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:426
 msgid "Open file..."
 msgstr "گشودن فایل..."
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:61
+#: Source/Core/AudioCommon/Src/OpenALStream.cpp:48
 #, c-format
 msgid "OpenAL: can't create context for device %s"
 msgstr "اپن ای ال (OpenAL): ناتوان در ساخت زمینه برای دستگاه %s"
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:72
+#: Source/Core/AudioCommon/Src/OpenALStream.cpp:59
 msgid "OpenAL: can't find sound devices"
 msgstr "اپن ای ال (OpenAL): ناتوان در پیدا کردن دستگاهای صدا"
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:66
+#: Source/Core/AudioCommon/Src/OpenALStream.cpp:53
 #, c-format
 msgid "OpenAL: can't open device %s"
 msgstr "اپن ای ال (OpenAL): ناتوان در باز کردن دستگاه صدا %s"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502
 msgid "OpenCL Texture Decoder"
 msgstr "کدبرداری بافت اشیاء توسط OpenCL"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503
 msgid "OpenMP Texture Decoder"
 msgstr "کدبرداری بافت اشیاء توسط OpenMP"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:317
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:94
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:304
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:81
 msgid "Options"
 msgstr "گزینه ها"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:22
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Orange"
 msgstr "نارنجی"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:468
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:455
+#, fuzzy
 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"
+"and import the saves to a new memcard\n"
 msgstr ""
 "ترتیب فایل ها در پوشه فایل با ترتیب بلوک یکسان نیست\n"
 "کلیک راست کنید و تمام ذخیره ها را صادر کنید،\n"
 "و ذخیره ها را به کارت حافظه ای جدید وارد کنید\n"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:316
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:324
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:509
 msgid "Other"
 msgstr "غیره"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:206
+#: Source/Core/Core/Src/NetPlayClient.cpp:210
 msgid ""
 "Other client disconnected while game is running!! NetPlay is disabled. You "
 "manually stop the game."
@@ -3923,15 +3995,15 @@ msgstr ""
 "مشتری دیگری در حالی که بازی در حال اجراست قطع شد!! نت پلی غیر فعال است. بازی "
 "را دستی متوقف کنید."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:481
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:468
 msgid "Output"
 msgstr "خروجی"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:342
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:348
 msgid "P&lay Recording..."
 msgstr "ض&بط کردن بازی..."
 
-#: Source/Core/Core/Src/HW/GCPad.cpp:30
+#: Source/Core/Core/Src/HW/GCPad.cpp:18
 msgid "Pad"
 msgstr "گیم پد"
 
@@ -3939,160 +4011,160 @@ msgstr "گیم پد"
 msgid "Pad "
 msgstr "گیم پد"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:34
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:38
 msgid "Pads"
 msgstr "گیم پد ها"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:108
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:95
 msgid "Page Down"
 msgstr "صفحه پايينی"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:107
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:94
 msgid "Page Up"
 msgstr "صفحه بالایی"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:35
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:22
 msgid "Paragraph"
 msgstr "پاراگراف"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:64
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:51
 msgid "Parameters"
 msgstr "پارامترها"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:222
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:217
 #, c-format
 msgid "Partition %i"
 msgstr "پارتیشن %i"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:296
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:297
 msgid "Patches"
 msgstr "وصله ها"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:556
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536
 msgid "Paths"
 msgstr "مسیرها"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1538
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1539
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:51
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1565
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1566
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:38
 msgid "Pause"
 msgstr "مکث"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:128
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:129
 msgid "Pause at end of movie"
 msgstr "مکث در پایان فیلم"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:397
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405
 msgid "Per-Pixel Lighting"
 msgstr "نورپردازی به ازای هر پیکسل"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352
 msgid "Perfect"
 msgstr "کامل"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:609
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:642
 #, c-format
 msgid "Perspective %d"
 msgstr "چشم انداز %d"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:165
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:424
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1547
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1548
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:152
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:430
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1574
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1575
 msgid "Play"
 msgstr "شروع بازی"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176
 msgid "Play Recording"
 msgstr "شروع ضبط"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:170
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:170
 msgid "Play/Pause"
 msgstr "شروع بازی/مکث"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351
 msgid "Playable"
 msgstr "قابل بازی"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:154
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:141
 msgid "Playback Options"
 msgstr "گزینه های بازنواخت"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:301
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:304
 msgid "Players"
 msgstr "بازی کنان"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:988
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:991
 msgid "Please confirm..."
 msgstr "لطفا تایید کنید..."
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:579
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:612
 msgid "Please create a perspective before saving"
 msgstr "لطفا قبل از ذخیره کردن یک چشم انداز بسازید"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:36
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:23
 msgid "Plus-Minus"
 msgstr "مینوس پلاس"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:324
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304
 msgid "Polish"
 msgstr "لهستانی"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:713
 msgid "Port 1"
 msgstr "درگاه ۱"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714
 msgid "Port 2"
 msgstr "درگاه ۲"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:734
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715
 msgid "Port 3"
 msgstr "درگاه ۳"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716
 msgid "Port 4"
 msgstr "درگاه ۴"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:97
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:130
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:88
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:133
 msgid "Port :"
 msgstr "درگاه :"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:325
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305
 msgid "Portuguese"
 msgstr "پرتقالی"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:326
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306
 msgid "Portuguese (Brazilian)"
 msgstr "پرتقالی (برزیلی)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:391
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:399
 msgid "Post-Processing Effect:"
 msgstr "افکت ها:"
 
-#: Source/Core/Core/Src/Movie.cpp:936
+#: Source/Core/Core/Src/Movie.cpp:927
 #, c-format
 msgid "Premature movie end in PlayController. %u + 8 > %u"
 msgstr "پایان نابهنگام فیلم در کنترل کننده پخش. %u + 8 > %u"
 
-#: Source/Core/Core/Src/Movie.cpp:1055
+#: Source/Core/Core/Src/Movie.cpp:1046
 #, c-format
 msgid "Premature movie end in PlayWiimote. %u + %d > %u"
 msgstr "پایان نابهنگام فیلم در ویموت پخش. %u + %d > %u"
 
-#: Source/Core/Core/Src/Movie.cpp:1032
+#: Source/Core/Core/Src/Movie.cpp:1023
 #, c-format
 msgid "Premature movie end in PlayWiimote. %u > %u"
 msgstr "پایان نابهنگام فیلم در ویموت پخش. %u > %u"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:48
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:35
 msgid "Presets: "
 msgstr "حالت های از پیش تنظیم شده:"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:205
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:192
 msgid "Prev Page"
 msgstr "صفحه قبلی"
 
@@ -4100,67 +4172,67 @@ msgstr "صفحه قبلی"
 msgid "Previous Page"
 msgstr "صفحه قبلی"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:183
 msgid "Previous Value"
 msgstr "مقدار قبلی"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:60
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:47
 msgid "Print"
 msgstr "چاپ"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:894
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:885
 msgid "Profile"
 msgstr "پروفایل"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.h:55
+#: Source/Core/DolphinWX/Src/ISOProperties.h:42
 msgid "Properties"
 msgstr "خواص"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:283
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:286
 msgid "Purge Cache"
 msgstr "پاکسازی حافظه ميانى"
 
-#: Source/Core/Common/Src/MsgHandler.cpp:66
+#: Source/Core/Common/Src/MsgHandler.cpp:52
 msgid "Question"
 msgstr "سوال"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:159
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:316
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:162
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:319
 msgid "Quit"
 msgstr "خارج شدن"
 
 #. i18n:  Right
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:59
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:46
 msgid "R"
 msgstr "آر"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:40
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:27
 msgid "R Button"
 msgstr "دکمه آر"
 
 #. i18n:  Right-Analog
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:63
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
 msgid "R-Analog"
 msgstr "آر آنالوگ"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:445
 msgid "RAM"
 msgstr "حافطه رم"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:175
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:169
 msgid "RUSSIA"
 msgstr "روسیه"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:528
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:515
 msgid "Range"
 msgstr "محدوده"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:190
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:178
 msgid "Read-only mode"
 msgstr "حالت فقط خواندنی"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:487
 msgid "Real"
 msgstr "واقعی"
 
@@ -4176,33 +4248,33 @@ msgstr "ویموت های واقعی"
 msgid "Reconnect Wiimote on State Loading"
 msgstr "برقراری ارتباط مجدد ویموت در بارگذاری وضعیت"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:193
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:217
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:791
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:180
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:204
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:790
 msgid "Record"
 msgstr "ضبط"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:174
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:161
 msgid "Recording Info"
 msgstr "اطلاعات ضبط"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:202
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:189
 msgid "Recording Options"
 msgstr "گزینه های ضبط"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:21
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Red"
 msgstr "قرمز"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:24
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Red Left"
 msgstr "قرمز چپ"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:25
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Red Right"
 msgstr "قرمز  راست"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86
 msgid ""
 "Reduces the amount of aliasing caused by rasterizing 3D graphics.\n"
 "This makes the rendered picture look less blocky.\n"
@@ -4218,28 +4290,28 @@ msgstr ""
 "اگر در این مورد اطمینان ندارید، \"هیچ\" را انتخاب کنید."
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:60
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:421
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:903
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:427
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:894
 msgid "Refresh"
 msgstr "به روز کردن"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:180
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:168
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:168
 msgid "Refresh List"
 msgstr "به روز کردن لیست"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:421
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:427
 msgid "Refresh game list"
 msgstr "به روز کردن لیست بازی"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:405
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:427
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:77
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:812
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:409
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:431
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:64
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:793
 msgid "Remove"
 msgstr "پاک کردن"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99
 msgid ""
 "Render the scene as a wireframe.\n"
 "\n"
@@ -4249,198 +4321,202 @@ msgstr ""
 "\n"
 "اگر در این مورد اطمینان ندارید، این گزینه را فعال نکنید."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:308
 msgid "Render to Main Window"
 msgstr "نمایش در پنجره اصلی"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:915
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:172
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:906
 msgid "Reset"
 msgstr "شروع دوباره"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:190
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:177
 msgid "Results"
 msgstr "نتایج"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:29
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:16
 msgid "Return"
 msgstr "برگشت"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:277
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:57
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464
+msgid "Revision:"
+msgstr ""
+
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:264
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:44
 msgid "Right"
 msgstr "راست"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:61
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:65
 msgid "Right Stick"
 msgstr "استیک راست"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:85
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:295
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:72
 msgid "Rumble"
 msgstr "شوک"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:518
-msgid "Run DSP LLE on a dedicated thread (not recommended)."
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498
+msgid ""
+"Run DSP HLE and LLE on a dedicated thread (not recommended: might cause "
+"audio glitches with HLE and freezes with LLE)."
 msgstr ""
-"اجرای شبیه ساز سطح پائین پردازشگر صدای دلفین بر روی ریسمان جداگانه (توصیه "
-"نمی شود)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:327
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307
 msgid "Russian"
 msgstr "روسی"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:149
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:150
 msgid "Sa&ve State"
 msgstr "ذخ&یره وضعیت"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:465
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475
 msgid "Safe"
 msgstr "بی خطر"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:196
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:446
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:925
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:183
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:452
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916
 msgid "Save"
 msgstr "ذخیره"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:532
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:522
 msgid "Save GCI as..."
 msgstr "ذخیره جی سی آی بعنوان..."
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
 msgid "Save State Slot 1"
 msgstr "ذخیره وضعیت - شکاف ۱"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:198
 msgid "Save State Slot 2"
 msgstr "ذخیره وضعیت - شکاف ۲"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:199
 msgid "Save State Slot 3"
 msgstr "ذخیره وضعیت - شکاف ۳"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:212
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:212
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200
 msgid "Save State Slot 4"
 msgstr "ذخیره وضعیت - شکاف ۴"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201
 msgid "Save State Slot 5"
 msgstr "ذخیره وضعیت - شکاف ۵"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202
 msgid "Save State Slot 6"
 msgstr "ذخیره وضعیت - شکاف ۶"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:203
 msgid "Save State Slot 7"
 msgstr "ذخیره وضعیت - شکاف ۷"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204
 msgid "Save State Slot 8"
 msgstr "ذخیره وضعیت - شکاف ۸"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:151
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:152
 msgid "Save State..."
 msgstr "ذخیره وضعیت..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:582
 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:592
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:602
 msgid "Save as..."
 msgstr "ذخیره بعنوان..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1203
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1204
 msgid "Save compressed GCM/ISO"
 msgstr "ذخیره جی سی ام/آیزو فشرده شده"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:446
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:452
 msgid "Save current perspective"
 msgstr "دخیره چشم انداز فعلی"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1192
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193
 msgid "Save decompressed GCM/ISO"
 msgstr "ذخیره جی سی ام/آیزو ناهمفشرده شده"
 
-#: Source/Core/Core/Src/Movie.cpp:801
+#: Source/Core/Core/Src/Movie.cpp:792
 #, c-format
 msgid "Savestate movie %s is corrupted, movie recording stopping..."
 msgstr "ذخیره وضعیت فیلم %s خراب است، ضبط فیلم میایستد..."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:396
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:404
 msgid "Scaled EFB Copy"
 msgstr "کپی ای اف بی تغییر سایز یافته"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:556
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:543
 #, c-format
 msgid "Scanning %s"
 msgstr "در حال پویش %s"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:539
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:526
 msgid "Scanning for ISOs"
 msgstr "پویش برای فایل های آیزو"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:540
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:527
 msgid "Scanning..."
 msgstr "در حال پویش..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:427
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
 msgid "ScrShot"
 msgstr "عکس فوری"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:106
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:93
 msgid "Scroll Lock"
 msgstr "اسکرول لاک"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:264
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:251
 msgid "Search"
 msgstr "جستجو"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:227
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:214
 msgid "Search Filter"
 msgstr "فیلتر جستجو"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:810
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:791
 msgid "Search Subfolders"
 msgstr "جستجوی پوشه های فرعی"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:250
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:237
 msgid "Search current Object"
 msgstr "جستجوی موضوع فعلی"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:254
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:241
 msgid "Search for hex Value:"
 msgstr "جستجو برای مقدار هگزا:"
 
-#: Source/Core/Common/Src/SysConf.h:103 Source/Core/Common/Src/SysConf.h:126
-#: Source/Core/Common/Src/SysConf.h:146 Source/Core/Common/Src/SysConf.h:167
+#: Source/Core/Common/Src/SysConf.h:90 Source/Core/Common/Src/SysConf.h:113
+#: Source/Core/Common/Src/SysConf.h:133 Source/Core/Common/Src/SysConf.h:154
 #, c-format
 msgid "Section %s not found in SYSCONF"
 msgstr "بخش %s در SYSCONF پیدا نشد"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:59
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:490
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:46
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:477
 msgid "Select"
 msgstr "انتخاب"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:677
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1072
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:683
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1087
 msgid "Select The Recording File"
 msgstr "انتخاب فایل ضبط شده"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1285
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1312
 msgid "Select a Wii WAD file to install"
 msgstr "انتخاب فایل وی واد برای نصب"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:70
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74
 msgid ""
 "Select a hardware adapter to use.\n"
 "\n"
@@ -4450,31 +4526,31 @@ msgstr ""
 "\n"
 "اگر در این مورد اطمینان ندارید، گزینه اول را انتخاب کنید."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:520
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:510
 msgid "Select a save file to import"
 msgstr "یک فایل ذخیره برای وارد کردن انتخاب کنید"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:363
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:366
 msgid "Select floating windows"
 msgstr "انتخاب پنجره های شناور"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:582
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:585
 msgid "Select the file to load"
 msgstr "انتخاب فایل برای بارگذاری"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1241
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1268
 msgid "Select the save file"
 msgstr "انتخاب فایل ذخیره"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1388
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1415
 msgid "Select the state to load"
 msgstr "انتخاب وضعیت برای بارگذاری"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1429
 msgid "Select the state to save"
 msgstr "انتخاب وضعیت برای ذخیره"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82
 msgid ""
 "Select what aspect ratio to use when rendering:\n"
 "Auto: Use the native aspect ratio\n"
@@ -4493,15 +4569,15 @@ msgstr ""
 "\n"
 "اگر در این مورد اطمینان ندارید، اتوماتیک را انتخاب کنید."
 
-#: Source/Core/InputCommon/Src/InputConfig.cpp:61
+#: Source/Core/InputCommon/Src/InputConfig.cpp:48
 msgid "Selected controller profile does not exist"
 msgstr "پروفایل انتخاب شده وجود ندارد"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:116
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:109
 msgid "Selected font"
 msgstr "دست خط انتخاب شده"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75
 msgid ""
 "Selects the display resolution used in fullscreen mode.\n"
 "This should always be bigger than or equal to the internal resolution. "
@@ -4518,24 +4594,27 @@ msgstr ""
 "اگر همچنان اطمینان ندارید، از بالاترین وضوحی که برای شما کار می کند استفاده "
 "کنید."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:69
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:70
 msgid ""
 "Selects what graphics API to use internally.\n"
 "Direct3D 9 usually is the fastest one. OpenGL is more accurate though. "
 "Direct3D 11 is somewhere between the two.\n"
 "Note that the Direct3D backends are only available on Windows.\n"
 "\n"
-"If unsure, use Direct3D 9."
+"If unsure, use Direct3D 11."
 msgstr ""
-"انتخاب کنید که چه رابط گرافیکی به طور داخلی بکار گرفته شود.\n"
-"معمولا Direct3D ۹ سریع ترین است. گرچه OpenGL دقیق تر است. Direct3D ۱۱ چیزی "
-"است بین این دو.\n"
-"توجه داشته باشید که پشتوانه Direct3D فقط در ویندوز موجود است.\n"
-"\n"
-"اگر در این مورد اطمینان ندارید، از Direct3D ۹ برای ویندوز و از OpenGL برای "
-"گینو لینوکس/مکینتاش استفاده کنید."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:288
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72
+msgid ""
+"Selects what graphics API to use internally.\n"
+"Direct3D 9 usually is the fastest one. OpenGL is more accurate though. "
+"Direct3D 11 is somewhere between the two.\n"
+"Note that the Direct3D backends are only available on Windows.\n"
+"\n"
+"If unsure, use OpenGL."
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:291
 msgid "Send"
 msgstr "فرستادن"
 
@@ -4543,26 +4622,26 @@ msgstr "فرستادن"
 msgid "Sensor Bar Position:"
 msgstr "موقعیت سنسور بار:"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:77
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:64
 msgid "Separator"
 msgstr "جدا کننده"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:328
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308
 msgid "Serbian"
 msgstr "صربستانی"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:522
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502
 msgid ""
 "Serial Port 1 - This is the port which devices such as the net adapter use"
 msgstr ""
 "درگاه سریال ۱ - این درگاهی است که دستگاه هایی مانند آداپتور شبکه از آن "
 "استفاده می کنند"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:488
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:475
 msgid "Set"
 msgstr "ست"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:877
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:868
 msgid "Set as &default ISO"
 msgstr "ست کردن بعنوان آیزو &پیش فرض"
 
@@ -4571,14 +4650,14 @@ msgstr "ست کردن بعنوان آیزو &پیش فرض"
 msgid "Set as default Memcard %c"
 msgstr "ست کردن بعنوان کارت حافظه پیش فرض %c"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:460
+#: Source/Core/Core/Src/ActionReplay.cpp:450
 #, c-format
 msgid "SetARCode_IsActive: Index is greater than ar code list size %lu"
 msgstr ""
 "ست کردن کد اکشن ریپلی_فعال است: فهرست بزرگتر از سایز لیست کد اکشن ریپلی است "
 "%lu"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:515
 msgid ""
 "Sets the latency (in ms).  Higher values may reduce audio crackling. OpenAL "
 "backend only."
@@ -4586,123 +4665,123 @@ msgstr ""
 "ست کردن زمان بيکارى (بر حسب میلی ثانیه). مقادیر بالاتر این زمان می تواند "
 "صدای ترق و تروق را کاهش دهد. فقط پشتوانه اپن ای ال (OpenAL)."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341
 msgid "Settings..."
 msgstr "تنظیمات..."
 
-#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:222
+#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:209
 msgid "SetupWiiMem: Cant find setting file"
 msgstr "برپاکردن حافظه وی: ناتوان در پیدا کردن فایل تنظیم"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:291
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:278
 msgid "Shake"
 msgstr "لرزش"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
 msgid "Short Name:"
 msgstr "اسم کوتاه:"
 
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:103
+#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:90
 msgid "Shoulder Buttons"
 msgstr "دکمه های شانه"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:217
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:220
 msgid "Show &Console"
 msgstr "نمایش &میز فرمان"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:215
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:218
 msgid "Show &Log"
 msgstr "نمایش &ثبت وقایع"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:212
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:215
 msgid "Show &Statusbar"
 msgstr "نمایش نوار &وضعیت"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:210
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:213
 msgid "Show &Toolbar"
 msgstr "نمایش نوار &ابزار"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:281
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:284
 msgid "Show Drives"
 msgstr "نمایش درایوها"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:517
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530
 msgid "Show EFB Copy Regions"
 msgstr "نمایش مناطق کپی ای اف بی"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:295
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303
 msgid "Show FPS"
 msgstr "نمایش فریم بر ثانیه"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:271
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:274
 msgid "Show France"
 msgstr "نمایش فرانسه"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:257
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:260
 msgid "Show GameCube"
 msgstr "نمایش گیم کیوب"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561
 msgid "Show Input Display"
 msgstr "نمایش ورودی تصویر"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:273
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:276
 msgid "Show Italy"
 msgstr "نمایش ایتالیا"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:264
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:267
 msgid "Show JAP"
 msgstr "نمایش ژاپن"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:275
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:278
 msgid "Show Korea"
 msgstr "نمایش کره"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476
 msgid "Show Language:"
 msgstr "نمایش زبان:"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:216
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:219
 msgid "Show Log &Configuration"
 msgstr "نمایش &پیکربندی ثبت وقایع"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:266
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:269
 msgid "Show PAL"
 msgstr "نمایش پال"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:254
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:257
 msgid "Show Platforms"
 msgstr "نمایش پایگاه ها"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:263
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:266
 msgid "Show Regions"
 msgstr "نمایش مناطق"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:518
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531
 msgid "Show Statistics"
 msgstr "نمایش آمار"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:277
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:280
 msgid "Show Taiwan"
 msgstr "نمایش تایوان"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:268
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:271
 msgid "Show USA"
 msgstr "نمایش ایالات متحده آمریکا"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:259
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:262
 msgid "Show Wad"
 msgstr "نمایش واد"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:255
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:258
 msgid "Show Wii"
 msgstr "نمایش وی"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491
 msgid "Show a confirmation box before stopping a game."
 msgstr "نمایش پنجره تایید قبل از متوقف کردن بازی."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:512
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492
 msgid ""
 "Show a message box when a potentially serious error has occurred.\n"
 "Disabling this may avoid annoying and non-fatal messages, but it may also "
@@ -4717,11 +4796,11 @@ msgstr ""
 msgid "Show first block"
 msgstr "نمایش بلوک اول"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:130
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:131
 msgid "Show lag counter"
 msgstr "نمایش شمارنده تاخیر"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493
 msgid ""
 "Show messages on the emulation screen area.\n"
 "These messages include memory card writes, video backend and CPU "
@@ -4747,7 +4826,7 @@ msgstr "نمایش تندیس ذخیره"
 msgid "Show save title"
 msgstr "نمایش عنوان ذخیره"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102
 msgid ""
 "Show the number of frames rendered per second as a measure of emulation "
 "speed.\n"
@@ -4758,11 +4837,11 @@ msgstr ""
 "\n"
 "اگر در این مورد اطمینان ندارید، این گزینه را فعال نکنید."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:279
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:282
 msgid "Show unknown"
 msgstr "نمایش ناشناخته"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105
 msgid ""
 "Show various statistics.\n"
 "\n"
@@ -4772,47 +4851,31 @@ msgstr ""
 "\n"
 "اگر در این مورد اطمینان ندارید، این گزینه را فعال نکنید."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:319
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:306
 msgid "Sideways Wiimote"
 msgstr "ویموت فرعی"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:280
 msgid "Simplified Chinese"
 msgstr "چینی ساده شده"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:311
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:298
 msgid "Size"
 msgstr "سایز"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:696
 msgid "Skip BIOS"
 msgstr "جهش از روی بایوس"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316
 msgid "Skip DCBZ clearing"
 msgstr "از قلم انداختن پاکسازی DCBZ"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:492
-msgid "Skip Dest. Alpha Pass"
-msgstr "از قلم انداختن مقصد آلفا پاس"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:444
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:454
 msgid "Skip EFB Access from CPU"
 msgstr "از قلم انداختن دسترسی ای اف بی از پردازنده"
 
-#: 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:120
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125
 msgid ""
 "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n"
 "Sometimes also increases visual quality.\n"
@@ -4829,25 +4892,25 @@ msgstr ""
 "\n"
 "اگر در این مورد اطمینان ندارید، این گزینه را فعال نکنید."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:374
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:386
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:380
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:392
 #, c-format
 msgid "Slot %i"
 msgstr "شکاف %i"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:700
 msgid "Slot A"
 msgstr "شکاف ای"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:701
 msgid "Slot B"
 msgstr "شکاف بی"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:62
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:49
 msgid "Snapshot"
 msgstr "عکس فوری"
 
-#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:58
+#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:46
 msgid "Software Renderer"
 msgstr "ارائه دهنده نرم افزاری"
 
@@ -4864,27 +4927,27 @@ msgstr ""
 "آیا شما واقعا قصد فعال کردن این گزینه را دارید؟ اگر در این مورد اطمینان "
 "ندارید، 'نه' را انتخاب کنید."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:683
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:664
 msgid "Sound Settings"
 msgstr "تنظیمات صدا"
 
-#: Source/Core/AudioCommon/Src/AudioCommon.cpp:77
+#: Source/Core/AudioCommon/Src/AudioCommon.cpp:64
 #, c-format
 msgid "Sound backend %s is not valid."
 msgstr "پشتوانه صدا %s معتبر نیست."
 
-#: Source/Core/AudioCommon/Src/DSoundStream.cpp:59
+#: Source/Core/AudioCommon/Src/DSoundStream.cpp:46
 #, c-format
 msgid "Sound buffer creation failed: %s"
 msgstr "ایجاد حافظه میانجی صدا با شکست مواجه شد: %s"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:31
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:18
 msgid "Space"
 msgstr "فضا"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:329
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309
 msgid "Spanish"
 msgstr "اسپانیایی"
 
@@ -4892,7 +4955,7 @@ msgstr "اسپانیایی"
 msgid "Speaker Volume:"
 msgstr "حجم صدای اسپیکر:"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92
 msgid ""
 "Specifies the resolution used to render at. A high resolution will improve "
 "visual quality a lot but is also quite heavy on performance and might cause "
@@ -4911,63 +4974,63 @@ msgstr ""
 "\n"
 "اگر در این مورد اطمینان ندارید، این گزینه \"۶۴۰x۵۲۸\" را انتخاب کنید."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322
 msgid "Speed up Disc Transfer Rate"
 msgstr "بالا بردن نرخ نقل و انتقال دادهای دیسک"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:243
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:230
 msgid "Square Stick"
 msgstr "استیک مربع"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:107
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87
 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:322
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:37
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:25
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:325
 msgid "Start"
 msgstr "شروع"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:194
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:197
 msgid "Start &NetPlay"
 msgstr "شروع &نت پلی"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:339
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:345
 msgid "Start Re&cording"
 msgstr "شروع &ضبط"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:175
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:175
 msgid "Start Recording"
 msgstr "شروع ضبط"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:312
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:299
 msgid "State"
 msgstr "وضعیت"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:173
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:161
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:161
 msgid "State Saves"
 msgstr "ذخیره های وضعیت"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:108
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88
 msgid "Steering Wheel"
 msgstr "چرخ فرمان"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:53
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:57
 msgid "Stick"
 msgstr "استیک"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:420
-#: 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:325
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:419
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:431
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:171
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:171
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:328
 msgid "Stop"
 msgstr "توقف"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96
 msgid ""
 "Store EFB copies in GPU texture objects.\n"
 "This is not so accurate, but it works well enough for most games and gives a "
@@ -4981,107 +5044,117 @@ msgstr ""
 "\n"
 "اگر در این مورد اطمینان ندارید، این گزینه را رها کنید."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:275
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283
 msgid "Stretch to Window"
 msgstr "کشیدن تصویر به سایز فعلی پنجره"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:43
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:47
 msgid "Strum"
 msgstr "مرتعش کردن"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:78
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:65
 msgid "Subtract"
 msgstr "کاستن"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:77
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:67
 #, c-format
 msgid "Successfully exported file to %s"
 msgstr "صادر کردن فایل به %s با موفقیت انجام شد"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:56
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:43
 msgid "Successfully imported save files"
 msgstr "فایل های ذخیره با موفقیت وارد شدند"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:285
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:272
 msgid "Swing"
 msgstr "نوسان"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:744
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:792
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320
+msgid "Synchronize GPU thread"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321
+msgid ""
+"Synchronizes the GPU and CPU threads to help prevent random freezes in Dual "
+"Core mode. (ON = Compatible, OFF = Fast)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773
 msgid "System Language:"
 msgstr "زبان سیستم:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:191
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:185
 msgid "TAIWAN"
 msgstr "تایوان"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:127
-#: Source/Core/DolphinWX/Src/TASInputDlg.h:32
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:128
+#: Source/Core/DolphinWX/Src/TASInputDlg.h:19
 msgid "TAS Input"
 msgstr "ورودی تاس"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:28
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:15
 msgid "Tab"
 msgstr "تب"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:510
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:531
 msgid "Tab split"
 msgstr "جدا کردن تب"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:37
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:41
 msgid "Table Left"
 msgstr "جدول چپ"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:38
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:42
 msgid "Table Right"
 msgstr "جدول راست"
 
-#: 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
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:361
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:181
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:181
 msgid "Take Screenshot"
 msgstr "گرفتن عکس فوری"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:109
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89
 msgid "TaruKonga (Bongos)"
 msgstr "تارو کونگا (بنگوس)"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:472
 msgid "Test"
 msgstr "آزمودن"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:444
 msgid "Texture"
 msgstr "بافت اشیاء"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:451
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:461
 msgid "Texture Cache"
 msgstr "حافظه ميانى بافت اشیاء"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:519
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:532
 msgid "Texture Format Overlay"
 msgstr "قالب بندی بافت اشیاء"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:226
+#: Source/Core/Core/Src/CoreParameter.cpp:215
 msgid "The WAD has been installed successfully"
 msgstr "واد با موفقیت نصب شد"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:197
+#: Source/Core/Core/Src/ActionReplay.cpp:185
 msgid "The address is invalid"
 msgstr "آدرس بی اعتبار است"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:509
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:496
 msgid "The checksum was successfully fixed"
 msgstr "چک سام با موفقیت درست شد"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1242
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226
 msgid "The chosen directory is already in the list"
 msgstr "پوشه برگزیده قبلا در لیست بوده است"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1117
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1216
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1118
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1146
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1217
 #, c-format
 msgid ""
 "The file %s already exists.\n"
@@ -5090,7 +5163,7 @@ msgstr ""
 "فایل %s قبلا به وجود آمده.\n"
 "آیا مایل هستید این فایل را جایگزین کنید؟"
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:51
+#: Source/Core/AudioCommon/Src/WaveFile.cpp:38
 #, c-format
 msgid ""
 "The file %s could not be opened for writing. Please check if it's already "
@@ -5099,29 +5172,29 @@ msgstr ""
 "فایل %s نمی تواند برای نوشتن باز شود. لطفا بررسی کنید که این فایل قبلا توسط "
 "برنامه دیگری باز نشده باشد."
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:44
+#: Source/Core/AudioCommon/Src/WaveFile.cpp:31
 #, c-format
 msgid "The file %s was already open, the file header will not be written."
 msgstr "فایل %s قبلا باز بود، سرخط فایل نوشته نخواهد شد."
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:332
+#: Source/Core/Core/Src/Boot/Boot.cpp:320
 #, c-format
 msgid "The file you specified (%s) does not exist"
 msgstr "فایلی که شما مشخص (%s) کرده اید وجود ندارد"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:628
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:666
 msgid "The name can not be empty"
 msgstr "اسم نمی تواند خالی باشد"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:620
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:658
 msgid "The name can not contain the character ','"
 msgstr "اسم نمی تواند شامل کاراکتر '،' باشد"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:142
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:129
 msgid "The resulting decrypted AR code doesn't contain any lines."
 msgstr "نتیجه کد رمزگشایی شده اکشن ریپلی شامل هیچ خطی نیست."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98
 msgid ""
 "The safer you adjust this, the less likely the emulator will be missing any "
 "texture updates from RAM.\n"
@@ -5133,47 +5206,47 @@ msgstr ""
 "\n"
 "اگر در این مورد اطمینان ندارید، از چپ ترین مقدار استفاده کنید."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:445
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:432
 msgid "The save you are trying to copy has an invalid file size"
 msgstr "سایز فایل ذخیره ای که سعی در کپی کردن آن دارید بی اعتبار است"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:388
+#: Source/Core/DolphinWX/Src/Main.cpp:416
 msgid ""
 "The selected language is not supported by your system. Falling back to "
 "system default."
 msgstr ""
 "زبان انتخاب شده توسط سیستم شما پشتیبانی نمی شود. برگشت به زبان پیش فرض سیستم."
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:43
+#: Source/Core/Core/Src/NetPlayClient.cpp:47
 msgid "The server and client's NetPlay versions are incompatible!"
 msgstr "نسخه سرور و نت پلی مشتری نا سازگار است!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:40
+#: Source/Core/Core/Src/NetPlayClient.cpp:44
 msgid "The server is full!"
 msgstr "سرور پر شده است!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:46
+#: Source/Core/Core/Src/NetPlayClient.cpp:50
 msgid "The server responded: the game is currently running!"
 msgstr "سرور پاسخ داد: بازی در حال اجراست!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:49
+#: Source/Core/Core/Src/NetPlayClient.cpp:53
 msgid "The server sent an unknown error message!"
 msgstr "سرور یک پیغام خطای ناشناخته فرستاد!"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:119
+#: Source/Core/Core/Src/CoreParameter.cpp:108
 #, c-format
 msgid "The specified file \"%s\" does not exist"
 msgstr "فایل مشخص شده \"%s\" وجود ندارد"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:198
+#: Source/Core/Core/Src/ActionReplay.cpp:186
 msgid "The value is invalid"
 msgstr "مقدار بی اعتبار است"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:642
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:623
 msgid "Theme:"
 msgstr "تم:"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:476
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:463
 msgid ""
 "There must be a ticket for 00000001/00000002. Your NAND dump is probably "
 "incomplete."
@@ -5181,7 +5254,7 @@ msgstr ""
 "باید بلیطی برای ۰۰۰۰۰۰۰۱/۰۰۰۰۰۰۰۲ وجود داشته باشد. نسخه برداری نند شما "
 "احتمالا ناقص است."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308
 msgid ""
 "These settings override core Dolphin settings.\n"
 "Undetermined means the game uses Dolphin's setting."
@@ -5189,7 +5262,7 @@ msgstr ""
 "این تنظیمات تنظیمات هسته دلفین را خنثی می کند.\n"
 "نامعین یعنی بازی از تنظیمات دلفین استفاده می کند."
 
-#: Source/Core/Core/Src/ActionReplay.cpp:355
+#: Source/Core/Core/Src/ActionReplay.cpp:345
 msgid ""
 "This action replay simulator does not support codes that modify Action "
 "Replay itself."
@@ -5197,11 +5270,11 @@ msgstr ""
 "این شبیه ساز اکشن ریپلی از کدهایی که توسط خود اکشن ریپلی پیراسته شده باشد "
 "پشتیبانی نمی کند."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505
 msgid "This could cause slow down in Wii Menu and some games."
 msgstr "این مورد میتواند سبب کند شدن منوی وی و تعدادی از بازی ها شود."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118
 msgid ""
 "This feature allows you to change the game's camera.\n"
 "Move the mouse while holding the right mouse button to pan and while holding "
@@ -5221,7 +5294,19 @@ msgstr ""
 "\n"
 "اگر در این مورد اطمینان ندارید، این گزینه را فعال نکنید."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485
+#, fuzzy
+msgid ""
+"This limits the game speed to the specified number of frames per second "
+"(full speed is 60 for NTSC and 50 for PAL). Alternatively, 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/ConfigMain.cpp:484
 msgid ""
 "This splits the Video and CPU threads, so they can be run on separate "
 "cores.\n"
@@ -5233,61 +5318,61 @@ msgstr ""
 "سبب افزایش چشم گیر سرعت روی کامپیوترهایی با بیش از یک هسته می شود، اما "
 "همچنین می تواند خرابی های گاه و بی گاه را سبب شود."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:286
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:287
 msgid "This will let you Manually Edit the INI config file"
 msgstr "این مورد به شما اجازه خواهد داد تا فایل پیکربندی INI را ویرایش کنید"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:249
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:254
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:236
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:241
 msgid "Threshold"
 msgstr "سرحد"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:288
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:275
 msgid "Tilt"
 msgstr "لرزیدن"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:628
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:304
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:622
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:291
 msgid "Title"
 msgstr "عنوان"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:125
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:144
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:112
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:131
 msgid "To"
 msgstr "به"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:72
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59
 msgid "Toggle All Log Types"
 msgstr "تبدیل انواع ثبت وقایع"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:426
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:432
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:180
 msgid "Toggle Fullscreen"
 msgstr "تبدیل حالت تمام صفحه"
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:87
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:271
 msgid "Top"
 msgstr "بالا"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:281
 msgid "Traditional Chinese"
 msgstr "چینی سنتی"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:426
+#: Source/Core/Core/Src/Boot/Boot.cpp:414
 msgid "Tried to load an unknown file type."
 msgstr "آزمایش برای بارگذاری فایل ناشناخته."
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:80
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:67
 msgid "Triggers"
 msgstr "دکمه ها"
 
-#: Source/Core/Common/Src/SysConf.h:91 Source/Core/Common/Src/SysConf.h:114
+#: Source/Core/Common/Src/SysConf.h:78 Source/Core/Common/Src/SysConf.h:101
 msgid "Trying to read from invalid SYSCONF"
 msgstr "تلاش برای خواندن از روی SYSCONF نامعتبر"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:44
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:31
 msgid ""
 "Trying to read from invalid SYSCONF\n"
 "Wiimote bt ids are not available"
@@ -5295,15 +5380,15 @@ msgstr ""
 "تلاش برای خواندن از SYSCONF نامعتبر\n"
 "آی دی های بلوتوث ویموت موجود نیست"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:330
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
 msgid "Turkish"
 msgstr "ترکی"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:33
 msgid "Turntable"
 msgstr "ديسک"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:71
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58
 msgid "Type"
 msgstr "نوع"
 
@@ -5311,25 +5396,25 @@ msgstr "نوع"
 msgid "UDP Port:"
 msgstr "درگاه UDP:"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:279
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:266
 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12
 msgid "UDP Wiimote"
 msgstr "ویموت UDP"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:199
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:193
 msgid "UNKNOWN"
 msgstr "ناشناخته"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:756
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:755
 #, c-format
 msgid "UNKNOWN_%02X"
 msgstr "ناشناخته_%02X"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:178
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:172
 msgid "USA"
 msgstr "ایالات متحده آمریکا"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:225
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:214
 msgid ""
 "Unable to create patch from given values.\n"
 "Entry not modified."
@@ -5337,7 +5422,7 @@ msgstr ""
 "قادر به ساختن وصله از مقادیر داده شده نیست.\n"
 "ورودی اصلاح نشد."
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:124
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:111
 #, c-format
 msgid ""
 "Unable to parse line %lu of the entered AR code as a valid encrypted or "
@@ -5348,74 +5433,88 @@ msgstr ""
 "معتبر. وارسی کنید که کد را درست وارد کرده باشید.\n"
 "آیا مایل هستید که این خط را نادیده بگیرید و به تجزیه ادامه دهید؟"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:391
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:397
 #, c-format
 msgid "Undefined %i"
 msgstr "تعریف نشده %i"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:163
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:164
 msgid "Undo Load State"
 msgstr "خنثی کردن وضعیت بارگذاری"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:718
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:717
 msgid "Unexpected 0x80 call? Aborting..."
 msgstr "فرمان 0x80 غیرمنتظره؟ برنامه در حال اجرا متوقف می شود..."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:215
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:202
 msgid "Unknown"
 msgstr "ناشناخته"
 
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:971
+#: Source/Core/Core/Src/HW/DVDInterface.cpp:965
 #, c-format
 msgid "Unknown DVD command %08x - fatal error"
 msgstr "دستور دی وی دی ناشناخته %08x - خطای مهلک"
 
-#: Source/Core/Common/Src/SysConf.cpp:145
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:444
+#, c-format
+msgid "Unknown command 0x%08x"
+msgstr ""
+
+#: Source/Core/Common/Src/SysConf.cpp:132
 #, c-format
 msgid "Unknown entry type %i in SYSCONF (%s@%x)!"
 msgstr "نوع ورودی ناشناخته %i در SYSCONF (%s@%x)!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:228
+#: Source/Core/Core/Src/NetPlayClient.cpp:232
 #, c-format
 msgid "Unknown message received with id : %d"
 msgstr "پیام ناشناخته با آی دی %d دریافت شد"
 
-#: Source/Core/Core/Src/NetPlayServer.cpp:504
+#: Source/Core/Core/Src/NetPlayServer.cpp:508
 #, c-format
 msgid "Unknown message with id:%d received from player:%d Kicking player!"
 msgstr "پیام ناشناخته با آی دی:%d از بازیکن:%d بیرون انداختن بازیکن!"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:274
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:56
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:261
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:43
 msgid "Up"
 msgstr "بالا"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:108
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:95
 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17
 msgid "Update"
 msgstr "به روز کردن"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:320
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:307
 msgid "Upright Wiimote"
 msgstr "ویموت عمودی"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:777
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758
 msgid "Use EuRGB60 Mode (PAL60)"
 msgstr "استفاده از حالت پال ۶۰ هرتز (PAL60)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:294
 msgid "Use Fullscreen"
 msgstr "استفاده از حالت تمام صفحه"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:575
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:563
 msgid "Use Hex"
 msgstr "استفاده از حالت  شانزده شانزدهی"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:600
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580
 msgid "Use Panic Handlers"
 msgstr "استفاده از دستگذار پنیک"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89
+msgid ""
+"Use a hacked upload strategy to stream vertices.\n"
+"This usually speed up, but is forbidden by OpenGL specification and may "
+"causes heavy glitches.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122
 msgid ""
 "Use multiple threads to decode textures.\n"
 "Might result in a speedup (especially on CPUs with more than two cores).\n"
@@ -5428,7 +5527,7 @@ msgstr ""
 "\n"
 "اگر در این مورد اطمینان ندارید، این گزینه را فعال نکنید."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126
 msgid ""
 "Usually if shader compilation fails, an error message is displayed.\n"
 "However, one may skip the popups to allow interruption free gameplay by "
@@ -5442,53 +5541,58 @@ msgstr ""
 "مزاحمت را از طریق فعال کردن این گزینه امکان پذیر سازد.\n"
 "اگر در این مورد اطمینان ندارید، این گزینه را فعال نکنید."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:539
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:552
 msgid "Utility"
 msgstr "کاربردی"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:285
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:293
 msgid "V-Sync"
 msgstr "هماهنگ کردن فرکانس عمودی بازی با صفحه نمایش"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:209
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318
+#, fuzzy
+msgid "VBeam Speed Hack"
+msgstr "هک کردن سرعت واحد مدیریت حافظه"
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196
 msgid "Value"
 msgstr "مقدار"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:73
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:60
 msgid "Value:"
 msgstr "مقدار:"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:572
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:560
 msgid "Value: "
 msgstr "مقدار:"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:51
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:38
 msgid "Verbosity"
 msgstr "دراز نویسی"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:377
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:381
 msgid "Video"
 msgstr "ویدیو"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:486
 msgid "Virtual"
 msgstr "مجازی"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:689
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670
 msgid "Volume"
 msgstr "حجم صدا"
 
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:498
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:527
+#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:488
+#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:517
 #, c-format
 msgid "WAD installation failed: error creating %s"
 msgstr "نصب واد با شکست مواجه شد: خطای ایجاد %s"
 
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:547
+#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:537
 msgid "WAD installation failed: error creating ticket"
 msgstr "نصب واد با شکست مواجه شد: خطای ایجاد بلیط"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84
 msgid ""
 "Wait for vertical blanks in order to reduce tearing.\n"
 "Decreases performance if emulation speed is below 100%.\n"
@@ -5499,25 +5603,25 @@ msgstr ""
 "\n"
 "اگر در این مورد اطمینان ندارید، این گزینه را فعال نکنید."
 
-#: Source/Core/Common/Src/MsgHandler.cpp:67
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46
+#: Source/Core/Common/Src/MsgHandler.cpp:53
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:33
 #: Source/Core/DolphinWX/Src/VideoConfigDiag.h:85
 msgid "Warning"
 msgstr "اخطار"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:291
+#: Source/Core/Core/Src/Boot/Boot.cpp:279
 msgid "Warning - starting DOL in wrong console mode!"
 msgstr "اخطار - شروع دال در حالت کنسول اشتباه!"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:341
+#: Source/Core/Core/Src/Boot/Boot.cpp:329
 msgid "Warning - starting ELF in wrong console mode!"
 msgstr "اخطار - شروع ای ال اف در حالت کنسول اشتباه!"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:221
+#: Source/Core/Core/Src/Boot/Boot.cpp:209
 msgid "Warning - starting ISO in wrong console mode!"
 msgstr "اخطار - شروع آیزو در حالت کنسول اشتباه!"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:519
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:512
 #, c-format
 msgid ""
 "Warning! it is advised to backup all files in the folder:\n"
@@ -5528,7 +5632,7 @@ msgstr ""
 "%s\n"
 "آیا مایل به ادامه هستید؟"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:585
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:578
 #, c-format
 msgid ""
 "Warning: This will overwrite any existing saves that are in the folder:\n"
@@ -5541,7 +5645,7 @@ msgstr ""
 "و داشتن اسم یکسان مانند یک فایل در کارت حافظه شما\n"
 "ادامه می دهید؟"
 
-#: Source/Core/Core/Src/Movie.cpp:844
+#: Source/Core/Core/Src/Movie.cpp:835
 #, c-format
 msgid ""
 "Warning: You loaded a save that's after the end of the current movie. (byte "
@@ -5553,7 +5657,7 @@ msgstr ""
 "دیگری را بارگذاری کنید، یا این وضعیت را با حالت فقط خواندنی خاموش بارگذاری "
 "کنید."
 
-#: Source/Core/Core/Src/Movie.cpp:861
+#: Source/Core/Core/Src/Movie.cpp:852
 #, c-format
 msgid ""
 "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You "
@@ -5564,7 +5668,7 @@ msgstr ""
 "ندارد. قبل از ادامه شما باید ذخیره دیگری را بارگذاری کنید، یا این وضعیت را "
 "با حالت فقط خواندنی خاموش بارگذاری کنید. وگرنه شاید شما دچار نا همزمانی شوید."
 
-#: Source/Core/Core/Src/Movie.cpp:870
+#: Source/Core/Core/Src/Movie.cpp:861
 #, c-format
 msgid ""
 "Warning: You loaded a save whose movie mismatches on frame %d. You should "
@@ -5597,49 +5701,49 @@ msgstr ""
 "شروع=%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:129
+#: Source/Core/AudioCommon/Src/WaveFile.cpp:93
+#: Source/Core/AudioCommon/Src/WaveFile.cpp:116
 msgid "WaveFileWriter - file not open."
 msgstr "نویسنده فایل ویو - فایل باز نیست."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:56
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:60
 msgid "Whammy"
 msgstr "بد شانسی"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:404
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:408
 msgid "Widescreen Hack"
 msgstr "هک کردن صفحه عریض"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:312
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:299
 msgid "Width"
 msgstr "عرض"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535
 msgid "Wii"
 msgstr "وی"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:372
 msgid "Wii Console"
 msgstr "میز فرمان وی"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:844
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:825
 msgid "Wii NAND Root:"
 msgstr "ریشه وی نند:"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:191
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:194
 msgid "Wii Save Import"
 msgstr "وارد کردن فایل ذخیره وی"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1243
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1270
 msgid "Wii save files (*.bin)|*.bin"
 msgstr "فایل های ذخیره وی (*.bin)|*.bin"
 
-#: Source/Core/DiscIO/Src/WiiWad.cpp:82
+#: Source/Core/DiscIO/Src/WiiWad.cpp:69
 msgid "WiiWAD: Could not read from file"
 msgstr "وی واد: ناتوان در خواندن از فایل"
 
-#: Source/Core/Core/Src/HW/Wiimote.cpp:17
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
+#: Source/Core/Core/Src/HW/Wiimote.cpp:20
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
 msgid "Wiimote"
 msgstr "ویموت"
 
@@ -5648,7 +5752,7 @@ msgstr "ویموت"
 msgid "Wiimote %i"
 msgstr "ویموت %i"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:628
+#: Source/Core/DolphinWX/Src/Main.cpp:656
 msgid "Wiimote Connected"
 msgstr "ویموت متصل شد"
 
@@ -5656,7 +5760,7 @@ msgstr "ویموت متصل شد"
 msgid "Wiimote Motor"
 msgstr "موتور ویموت"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
 msgid "Wiimote settings"
 msgstr "تنظیمات ویموت"
 
@@ -5664,102 +5768,117 @@ msgstr "تنظیمات ویموت"
 msgid "Wiimotes"
 msgstr "ویموت ها"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:134
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:121
 msgid "Windows Left"
 msgstr "پنجره ها چپ"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:136
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:123
 msgid "Windows Menu"
 msgstr "فهرست پنجره ها"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:135
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:122
 msgid "Windows Right"
 msgstr "پنجره ها راست"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:131
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:124
 msgid "Word Wrap"
 msgstr "پیچیدن کلمه"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1298
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:864
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1089
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1225
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1325
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:880
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1090
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1226
 msgid "Working..."
 msgstr "در حال کار..."
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:338
+msgid "Write memcards (GC)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46
 msgid "Write to Console"
 msgstr "نوشتن در میز فرمان"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:67
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:54
 msgid "Write to Debugger"
 msgstr "نوشتن به صورت اشکال زدایی"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:57
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44
 msgid "Write to File"
 msgstr "نوشتن به فایل"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:61
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48
 msgid "Write to Window"
 msgstr "نوشتن در پنجره"
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:60
+#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:47
 #, c-format
 msgid "XAudio2 CreateSourceVoice failed: %#X"
 msgstr "صدای اکس ۲ (XAdudio2) - ساخت آوای منبع با شکست مواجه شد: %#X"
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:114
+#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:101
 #, c-format
 msgid "XAudio2 init failed: %#X"
 msgstr "صدای اکس ۲ (XAdudio2) - اينيت با شکست مواجه شد: %#X"
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:124
+#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:111
 #, c-format
 msgid "XAudio2 master voice creation failed: %#X"
 msgstr "صدای اکس ۲ (XAdudio2) - ساخت آوای مستر منبع با شکست مواجه شد: %#X"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:766
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:765
 msgid "XF reg"
 msgstr "ثبت اکس اف"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:21
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Yellow"
 msgstr "زرد"
 
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:107
+#: Source/Core/Core/Src/DSP/DSPCore.cpp:120
 msgid ""
-"You are using free dsp roms made by Dolphin Team.\n"
-"Only Zelda ucode games will work correctly with them.\n"
+"You are using a free DSP ROM made by the Dolphin Team.\n"
+"All Wii games will work correctly, and most GC games should also work fine, "
+"but the GBA/IPL/CARD UCodes will not work.\n"
 msgstr ""
-"شما از رام های پردازشگر صدای دلفین مجانی که توسط تیم دلفین ساخته شده استفاده "
-"می کنید.\n"
-"فقط بازی های ماکرو کد زلدا درست با این رام ها کار می کنند.\n"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:73
+#: Source/Core/Core/Src/DSP/DSPCore.cpp:116
+msgid ""
+"You are using an old free DSP ROM made by the Dolphin Team.\n"
+"Only games using the Zelda UCode will work correctly.\n"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:63
 msgid "You can't close panes that have pages in them."
 msgstr "شما نمی توانید قطعاتی که حاوی صفحات می باشند را ببندید."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:207
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:210
 msgid "You must choose a game!!"
 msgstr "شما باید یک بازی انتخاب کنید!!"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:605
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:593
 msgid "You must enter a name!"
 msgstr "شما باید یک اسم وارد کنید!"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:450
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:438
 msgid "You must enter a valid decimal, hexadecimal or octal value."
 msgstr "شما باید یک مقدار صحیح برای دسیمال، هگزادسیمال یا اکتال وارد کنید."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:603
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:591
 msgid "You must enter a valid profile name."
 msgstr "شما باید یک اسم معتبر برای پروفایل وارد کنید."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:936
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:917
 msgid "You must restart Dolphin in order for the change to take effect."
 msgstr "برای اعمال تغییرات شما باید دلفین را از نو اجرا کنید."
 
-#: Source/Core/Core/Src/CoreParameter.cpp:175
+#: Source/Core/Core/Src/DSP/DSPCore.cpp:109
+msgid ""
+"Your DSP ROMs have incorrect hashes.\n"
+"Would you like to stop now to fix the problem?\n"
+"If you select \"No\", audio might be garbled."
+msgstr ""
+
+#: Source/Core/Core/Src/CoreParameter.cpp:164
 msgid ""
 "Your GCM/ISO file seems to be invalid (invalid country).\n"
 "Continue with PAL region?"
@@ -5767,7 +5886,7 @@ msgstr ""
 "به نظر می رسد فایل آیزو/جی سی ام شما نامعتبر می باشد (کشور نامعتبر).\n"
 "ادامه با ناحیه پال؟"
 
-#: Source/Core/Common/Src/SysConf.cpp:58
+#: Source/Core/Common/Src/SysConf.cpp:45
 #, c-format
 msgid ""
 "Your SYSCONF file is the wrong size.\n"
@@ -5778,25 +5897,25 @@ msgstr ""
 "سایز فایل باید 0x%04x باشد (اما سایز این فایل 0x%04llx است)\n"
 "آیا میخواهید یک فایل جدید تولید شود؟"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:334
 msgid "ZTP hack"
 msgstr "هک افسانه زلدا: شاهدخت سپیده دم"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:387
+#: Source/Core/Core/Src/ActionReplay.cpp:377
 msgid "Zero 3 code not supported"
 msgstr "کد صفر ۳ پشتیبانی نمی شود"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:408
+#: Source/Core/Core/Src/ActionReplay.cpp:398
 #, c-format
 msgid "Zero code unknown to dolphin: %08x"
 msgstr "کد ناشناخته صفر به دلفین: %08x"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:436
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:460
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:423
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:447
 msgid "[ waiting ]"
 msgstr "[ منتظر بمانید ]"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107
 msgid ""
 "[BROKEN]\n"
 "Highlight regions the EFB was copied from.\n"
@@ -5808,11 +5927,11 @@ msgstr ""
 "\n"
 "اگر در این مورد اطمینان ندارید، این گزینه را فعال نکنید."
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:91
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:78
 msgid "[Custom]"
 msgstr "[دستی]"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120
 msgid ""
 "[EXPERIMENTAL]\n"
 "Aims to speed up emulation by offloading texture decoding to the GPU using "
@@ -5831,7 +5950,7 @@ msgstr ""
 "\n"
 "اگر در این مورد اطمینان ندارید، این گزینه را فعال نکنید."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121
 msgid ""
 "[EXPERIMENTAL]\n"
 "Speeds up emulation a bit by caching display lists.\n"
@@ -5845,97 +5964,47 @@ msgstr ""
 "\n"
 "اگر در این مورد اطمینان ندارید، این گزینه را فعال نکنید."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:508
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:495
 msgid "^ ADD"
 msgstr "^ اضافه کردن"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:820
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:801
 msgid "apploader (.img)"
 msgstr "بارگذار برنامه (.img)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:185
-msgid "failed to read bk header"
-msgstr "خواندن سرخط بی کی با شکست مواجه شد"
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:375
-#, c-format
-msgid "failed to read data from file: %s"
-msgstr "خواندن دادها از فایل با شکست مواجه شد: %s"
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:97
-msgid "failed to read header"
-msgstr "خواندن سرخط با شکست مواجه شد"
-
-#: Source/Core/Core/Src/PowerPC/JitInterface.cpp:285
+#: Source/Core/Core/Src/PowerPC/JitInterface.cpp:272
 #, c-format
 msgid "iCacheJIT: Reading Opcode from %x. Please report."
 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 "یک ذخیره وی نیست یا شکست برای خواندن سایز سرخط فایل %x"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:935
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:936
 msgid "s"
 msgstr "s"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:457
-#, c-format
-msgid "unknown cmd 0x%08x"
-msgstr "فرمان ناشناخته 0x%08x"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1110
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1136
 msgid "wxExecute returned -1 on application run!"
 msgstr "خطای 1- wxExecute در اجرای برنامه!"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:56
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:43
 msgid "zFar Correction: "
 msgstr "اصلاح z دور:"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:51
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:38
 msgid "zNear Correction: "
 msgstr "اصلاح z نزدیک:"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:493
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:480
 msgid "| OR"
 msgstr "| یا"
 
-#~ msgid "%i connected"
-#~ msgstr "%i  متصل شده است"
-
-#~ msgid "Alternate Wiimote Timing"
-#~ msgstr "زمان بندی جایگزین برای ویموت"
-
-#~ msgid "Interpreter (VERY slow)"
-#~ msgstr "مفسر (بسیار کند)"
-
-#~ msgid "JIT Recompiler (recommended)"
-#~ msgstr "ری کامپایلر جیت (تایید شده)"
-
-#~ msgid "JITIL experimental recompiler"
-#~ msgstr "ری کامپایلر آزمایشی جیتیل"
+#~ msgid "Accurate VBeam emulation"
+#~ msgstr "برابرسازی دقیق وی بیم"
 
 #~ msgid ""
-#~ "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. "
-#~ "No effect on emulated wiimotes."
+#~ "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)"
 #~ msgstr ""
-#~ "خفه کردن اسپیکر ویموت. درست کردن قطعی های تصادفی ویموت های واقعی. هیچ "
-#~ "تاثیری بر ویموت های برابرسازی شده ندارد."
+#~ "اگر تعداد فریم های نمایش داده شده بر ثانیه نامنظم است، شاید این گزینه به "
+#~ "رفع آن کمک کند. (روشن = سازگار، خاموش = سریع)"
 
-#~ msgid "Pair Up"
-#~ msgstr "جفت شدن"
-
-#~ msgid "Reconnect Wiimote Confirm"
-#~ msgstr "تایید اتصال ویموت"
-
-#~ msgid ""
-#~ "Wiimote %i has been disconnected by system.\n"
-#~ "Maybe this game doesn't support multi-wiimote,\n"
-#~ "or maybe it is due to idle time out or other reason.\n"
-#~ "Do you want to reconnect immediately?"
-#~ msgstr ""
-#~ "ویموت %i توسط سیستم قطع شد.\n"
-#~ "شاید این بازی از مولتی ویموت پشتیبانی نمی کند،\n"
-#~ "یا شاید این قطعی ناشی از وقفه بیهوده یا دلیلی دیگر باشد.\n"
-#~ "آیا می خواهید بی درنگ از نو متصل شوید؟"
+#~ msgid "Skip Dest. Alpha Pass"
+#~ msgstr "از قلم انداختن مقصد آلفا پاس"
diff --git a/Languages/po/fr.po b/Languages/po/fr.po
index a6a562a634..0c037107d4 100644
--- a/Languages/po/fr.po
+++ b/Languages/po/fr.po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the dolphin-emu package.
 #
 # Translators:
-# Pascal <pascal2j-language@yahoo.com>, 2013.
-# Vinet Sebastien <vinet.sebastien@live.fr>, 2011.
+# FRtranslator <pascal2j-language@yahoo.com>, 2013
+# Vinet Sebastien <vinet.sebastien@live.fr>, 2011
 msgid ""
 msgstr ""
 "Project-Id-Version: Dolphin Emulator\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-10 08:56-0500\n"
-"PO-Revision-Date: 2013-02-02 20:43+0000\n"
+"POT-Creation-Date: 2013-04-18 23:00-0500\n"
+"PO-Revision-Date: 2013-04-18 10:41+0000\n"
 "Last-Translator: FRtranslator <pascal2j-language@yahoo.com>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/dolphin-emu/"
 "language/fr/)\n"
@@ -20,21 +20,21 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:511
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:499
 msgid " (too many to display)"
 msgstr "(trop nombreux pour être affichés)"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:270
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:273
 #: Source/Core/DolphinWX/Src/NetWindow.cpp:491
 #: Source/Core/DolphinWX/Src/NetWindow.cpp:530
 msgid " Game : "
 msgstr "Jeu :"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:507
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494
 msgid "! NOT"
 msgstr "! NOT"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:70
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:58
 #, c-format
 msgid ""
 "\"%s\" does not exist.\n"
@@ -43,34 +43,44 @@ msgstr ""
 "\"%s\" n'existe pas.\n"
 " Voulez-vous créer une nouvelle carte mémoire de 16MB ?"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:142
+#: Source/Core/Core/Src/CoreParameter.cpp:131
 #, c-format
 msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO."
 msgstr ""
 "\"%s\" n'est pas un fichier GCM/ISO valide, ou n'est pas une ISO GC/Wii."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:722
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:721
 #, c-format
 msgid "%08X:  "
 msgstr "%08X:  "
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:196
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:183
 #, c-format
 msgid "%1$sCopy%1$s"
 msgstr "%1$sCopie%1$s"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:128
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:296
+#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:113
+#, c-format
+msgid "%d samples"
+msgstr "%d échantillons"
+
+#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:112
+#, c-format
+msgid "%d samples (quality level %d)"
+msgstr "%d échantillons (de qualité niveau %d)"
+
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:121
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:289
 #, c-format
 msgid "%s already exists, overwrite?"
 msgstr "%s existe déjà. Voulez-vous le remplacer ?"
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:167
+#: Source/Core/DiscIO/Src/CompressedBlob.cpp:154
 #, c-format
 msgid "%s failed to be scrubbed. Probably the image is corrupt."
 msgstr "%s n'a pas pu être compressé. L'image est probablement corrompue."
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:95
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:83
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
@@ -79,7 +89,7 @@ msgstr ""
 "%s n'a pu être lu en tant que carte mémoire.\n"
 " La taille du fichier de la carte n'est pas valide (0x%x octets)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:110
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:98
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
@@ -88,7 +98,7 @@ msgstr ""
 "%s n'a pu être lu en tant que carte mémoire.\n"
 " La taille de la carte n'est pas valide (0x%x octets)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:90
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:78
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
@@ -98,48 +108,37 @@ msgstr ""
 "Le fichier n'est pas assez grand pour être un fichier de carte mémoire "
 "valide (0x%x octets)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:367
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:359
 #, c-format
 msgid "%s failed to open"
 msgstr "Impossible d'ouvrir %s"
 
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:97
-#, c-format
-msgid ""
-"%s has an incorrect hash.\n"
-"Would you like to stop now to fix the problem?\n"
-"If you select \"No\", audio will be garbled."
-msgstr ""
-"%s a un hachage incorrect.\n"
-"Voulez-vous arrêter maintenant pour corriger le problème ?\n"
-"Si vous sélectionnez \"Non\", le son sera déterioré."
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:360
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:352
 #, c-format
 msgid "%s is a 0 byte file"
 msgstr "%s est un fichier de 0 octet"
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:159
+#: Source/Core/DiscIO/Src/CompressedBlob.cpp:146
 #, c-format
 msgid "%s is already compressed! Cannot compress it further."
 msgstr "%s est déjà compressé. Impossible de le compresser d'avantage."
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:345
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:337
 #, c-format
 msgid "%s is too long for the filename, max chars is 45"
 msgstr "%s est un nom de fichier trop long, le maximum est de 45 caractères."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:202
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:189
 #, c-format
 msgid "%sDelete%s"
 msgstr "%sSupprimer%s"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:200
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:187
 #, c-format
 msgid "%sExport GCI%s"
 msgstr "%sExporter GCI%s"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:198
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:185
 #, c-format
 msgid "%sImport GCI%s"
 msgstr "%sImporter GCI%s"
@@ -149,252 +148,275 @@ msgstr "%sImporter GCI%s"
 msgid "%u Free Blocks; %u Free Dir Entries"
 msgstr "%u blocs libres, %u entrées de rép. libres"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:506
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:493
 msgid "&& AND"
 msgstr "&& AND"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:295
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:301
 msgid "&About..."
 msgstr "&A propos..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:99
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:100
 msgid "&Boot from DVD Drive..."
 msgstr "&Démarrer à partir du lecteur..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:231
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:234
 msgid "&Breakpoints"
 msgstr "&Points d'arrêt"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:110
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:111
 msgid "&Browse for ISOs..."
 msgstr "&Rechercher des ISOs"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:192
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:195
 msgid "&Cheats Manager"
 msgstr "Gestionnaire de &cheats"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:177
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:180
 msgid "&DSP Settings"
 msgstr "Paramètres &DSP (audio)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:885
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:876
 msgid "&Delete ISO..."
 msgstr "&Supprimer l'ISO..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:903
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:897
 msgid "&Delete selected ISOs..."
 msgstr "&Supprimer les ISO sélectionnés"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:170
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:173
 msgid "&Emulation"
 msgstr "&Emulation"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:113
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:114
 msgid "&File"
 msgstr "&Fichier"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:335
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:341
 msgid "&Frame Advance"
 msgstr "&Avancement d'image"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:352
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:358
 msgid "&Fullscreen"
 msgstr "&Plein écran"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:176
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:179
 msgid "&Graphics Settings"
 msgstr "Paramètres &Graphiques"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:296
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:302
 msgid "&Help"
 msgstr "&Aide"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:180
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:183
 msgid "&Hotkey Settings"
 msgstr "Paramètres des &Raccouris clavier"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:233
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:236
 msgid "&JIT"
 msgstr "&JIT"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:148
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:149
 msgid "&Load State"
 msgstr "&Charger l'état"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:190
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:193
 msgid "&Memcard Manager (GC)"
 msgstr "Gestionnaire de cartes &mémoires (GC)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:232
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:235
 msgid "&Memory"
 msgstr "&Mémoire"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:313
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:319
 msgid "&Open..."
 msgstr "&Ouvrir..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:186
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:189
 msgid "&Options"
 msgstr "&Options"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:324
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:330
 msgid "&Pause"
 msgstr "&Pause"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:326
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:332
 msgid "&Play"
 msgstr "&Démarrer"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:867
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:858
 msgid "&Properties"
 msgstr "&Propriétés"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:348
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:354
 msgid "&Read-only mode"
 msgstr "Mode &Lecture seule"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:319
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:325
 msgid "&Refresh List"
 msgstr "Rafraîchir la &liste"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:230
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:233
 msgid "&Registers"
 msgstr "&Registres"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:332
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:338
 msgid "&Reset"
 msgstr "&Reset"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:234
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:237
 msgid "&Sound"
 msgstr "&Son"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:329
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:335
 msgid "&Stop"
 msgstr "&Stop"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:207
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:210
 msgid "&Tools"
 msgstr "&Outils"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:235
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:238
 msgid "&Video"
 msgstr "&Vidéo"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:284
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:287
 msgid "&View"
 msgstr "&Affichage"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:179
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:182
 msgid "&Wiimote Settings"
 msgstr "Paramètres de la &Wiimote"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:868
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:859
 msgid "&Wiki"
 msgstr "&Wiki"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504
 msgid "'"
 msgstr "'"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:59
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:46
 msgid "(-)+zFar"
 msgstr "(-)+zFar"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:54
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:41
 msgid "(-)+zNear"
 msgstr "(-)+zNear"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:99
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:86
 msgid "(UNKNOWN)"
 msgstr "Inconnu"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:376
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:384
 msgid "(off)"
 msgstr "(aucun)"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:655
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:654
 msgid "0x44"
 msgstr "0x44"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+msgid "1.5x Native (960x792)"
+msgstr "1,5x la réso. native (960x792)"
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:158
 msgid "16 bit"
 msgstr "16 bit"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+msgid "1x Native (640x528)"
+msgstr "Résolution native : 1x (640x528)"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+msgid "2.5x Native (1600x1320)"
+msgstr "2,5x la réso. native (1600x1320)"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+msgid "2x Native (1280x1056)"
+msgstr "2x la réso. native (1280x1056)"
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:159
 msgid "32 bit"
 msgstr "32 bit"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:412
 msgid "3D Vision"
 msgstr "3D Vision"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+msgid "3x Native (1920x1584)"
+msgstr "3x la réso. native (1920x1584)"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+msgid "4x Native (2560x2112)"
+msgstr "4x la réso. native (2560x2112)"
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:157
 msgid "8 bit"
 msgstr "8 bit"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:43
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:30
 msgid "<Insert name here>"
 msgstr "<Insérer un nom ici>"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:255
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:262
 msgid "<No resolutions found>"
 msgstr "<Aucune résolution trouvée>"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:104
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84
 msgid "<Nothing>"
 msgstr "<Rien>"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:162
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:162
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:150
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:150
 msgid "<Press Key>"
 msgstr "<Appuyez sur une touche>"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286
 msgid "<System>"
 msgstr "<Système>"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695
 msgid "A"
 msgstr "A"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:201
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:235
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:204
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:238
 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:353
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:387
 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:68
-#, fuzzy
 msgid ""
 "A supported bluetooth device could not be found.\n"
 "You must manually connect your wiimotes."
 msgstr ""
-"Aucun périphérique Bluetooth prise en charge n'a été détecté !\n"
-"Si vous n'utilisez pas la pile Bluetooth de Microsoft, vous pouvez jumeler "
-"manuellement vos Wiimotes et utiliser uniquement le bouton \"Rafraîchir\"."
+"Aucun périphérique Bluetooth prise en charge n'a été détecté.\n"
+"Vous devez jumeler manuellement vos Wiimotes."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:109
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:100
+#, fuzzy
 msgid ""
 "ALERT:\n"
 "\n"
-"NetPlay will currently only work properly when using the following "
-"settings:\n"
-" - Dual Core [OFF]\n"
-" - Audio Throttle [OFF]\n"
-" - DSP-HLE with \"Null Audio\" or DSP-LLE\n"
-" - Manually set the exact number of controllers that will be used to "
-"[Standard Controller]\n"
+"Netplay will only work with the following settings:\n"
+" - Enable Dual Core [OFF]\n"
+" - DSP Emulator Engine Must be the same on all computers!\n"
+" - DSP on Dedicated Thread [OFF]\n"
+" - Framelimit NOT set to [Audio]\n"
+" - Manually set the exact number of controllers to be used to [Standard "
+"Controller]\n"
 "\n"
-"All players should try to use the same Dolphin version and settings.\n"
-"Disable all memory cards or send them to all players before starting.\n"
-"Wiimote support has not been implemented.\n"
+"All players should use the same Dolphin version and settings.\n"
+"All memory cards must be identical between players or disabled.\n"
+"Wiimote support has not been implemented!\n"
 "\n"
-"You must forward TCP port to host!!"
+"The host must have the chosen TCP port open/forwarded!\n"
 msgstr ""
 "ATTENTION :\n"
 "\n"
@@ -413,17 +435,17 @@ msgstr ""
 "\n"
 "Vous devez indiquer le port TCP à l'hôte !!"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:111
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:116
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96
 msgid "AM-Baseboard"
 msgstr "AM-Baseboard"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:299
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:115
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:300
 msgid "AR Codes"
 msgstr "Codes AR"
 
-#: Source/Core/DolphinWX/Src/AboutDolphin.h:33
+#: Source/Core/DolphinWX/Src/AboutDolphin.h:21
 msgid "About Dolphin"
 msgstr "A propos de Dolphin"
 
@@ -431,15 +453,11 @@ msgstr "A propos de Dolphin"
 msgid "Acceleration"
 msgstr "Accéleration"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:463
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473
 msgid "Accuracy:"
 msgstr "Précision :"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317
-msgid "Accurate VBeam emulation"
-msgstr "Emulation fidèle VBeam"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97
 msgid ""
 "Accurately emulate EFB copies.\n"
 "Some games depend on this for certain graphical effects or gameplay "
@@ -453,12 +471,12 @@ msgstr ""
 "\n"
 "Dans le doute, cochez plutôt EFB vers texture."
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:239
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:239
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:227
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:227
 msgid "Action"
 msgstr "Action"
 
-#: Source/Core/Core/Src/ARDecrypt.cpp:481
+#: Source/Core/Core/Src/ARDecrypt.cpp:469
 #, c-format
 msgid ""
 "Action Replay Code Decryption Error:\n"
@@ -473,7 +491,7 @@ msgstr ""
 "Culprit Code:\n"
 "%s"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:667
+#: Source/Core/Core/Src/ActionReplay.cpp:657
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)"
@@ -481,7 +499,7 @@ msgstr ""
 "Erreur Action Replay : Taille non valide (%08x : adresse = %08x) dans le "
 "code Ajout (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:755
+#: Source/Core/Core/Src/ActionReplay.cpp:745
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide "
@@ -490,7 +508,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:547
+#: Source/Core/Core/Src/ActionReplay.cpp:537
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And "
@@ -499,7 +517,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:607
+#: Source/Core/Core/Src/ActionReplay.cpp:597
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Write To "
@@ -508,13 +526,13 @@ msgstr ""
 "Erreur Action Replay : Taille non valide (%08x : adresse = %08x) dans Ecrire "
 "vers Pointeur (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:802
+#: Source/Core/Core/Src/ActionReplay.cpp:792
 #, c-format
 msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)"
 msgstr ""
 "Erreur Action Replay : Valeur non valide (%08x) dans la Copie de mémoire (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:682
+#: Source/Core/Core/Src/ActionReplay.cpp:672
 #, c-format
 msgid ""
 "Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)\n"
@@ -524,63 +542,63 @@ msgstr ""
 "(%s)\n"
 "Les Master codes ne sont pas requis. Ne les utilisez pas."
 
-#: Source/Core/Core/Src/ActionReplay.cpp:196
+#: Source/Core/Core/Src/ActionReplay.cpp:184
 #, 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:872
+#: Source/Core/Core/Src/ActionReplay.cpp:862
 #, 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:945
+#: Source/Core/Core/Src/ActionReplay.cpp:935
 #, 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:896
+#: Source/Core/Core/Src/ActionReplay.cpp:886
 #, 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:838
+#: Source/Core/Core/Src/ActionReplay.cpp:828
 #, 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:242
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:247
 msgid "Adapter:"
 msgstr "Carte :"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:76
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:63
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:63
 msgid "Add"
 msgstr "Ajouter"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1275
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1301
 msgid "Add ActionReplay Code"
 msgstr "Ajouter un code ActionReplay"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1204
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1230
 msgid "Add Patch"
 msgstr "Ajouter un patch"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:507
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:528
 msgid "Add new pane"
 msgstr "Ajouter un nouveau panneau"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:404
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:426
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:811
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:408
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:430
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:792
 msgid "Add..."
 msgstr "Ajouter..."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:90
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:81
 msgid "Address :"
 msgstr "Adresse :"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:58
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:45
 msgid ""
 "Adds the specified value to zFar Parameter.\n"
 "Two ways to express the floating point values.\n"
@@ -598,7 +616,7 @@ msgstr ""
 "\n"
 "NOTE: Consultez LogWindow/Console pour les valeurs acquises."
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:53
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:40
 msgid ""
 "Adds the specified value to zNear Parameter.\n"
 "Two ways to express the floating point values.\n"
@@ -616,94 +634,94 @@ msgstr ""
 "\n"
 "NOTE: Consultez LogWindow/Console pour les valeurs acquises."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:755
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:744
 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:509
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:522
 msgid "Advanced"
 msgstr "Avancé"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561
 msgid "Advanced Settings"
 msgstr "Paramètres avancés"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:584
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:587
 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:816
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:797
 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:1189
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1190
 msgid "All Gamecube GCM files (gcm)"
 msgstr "Tous les fichiers GameCube GCM (gcm)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1390
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1404
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1417
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1431
 msgid "All Save States (sav, s##)"
 msgstr "Tous les états sauvegardés (sav, s##)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1187
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1188
 msgid "All Wii ISO files (iso)"
 msgstr "Tous les fichiers ISO Wii (iso)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1207
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1208
 msgid "All compressed GC/Wii ISO files (gcz)"
 msgstr "Tous les fichiers ISO compressés GC/Wii (gcz)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:124
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:104
 msgid "All files (*.*)|*.*"
 msgstr "Tous les fichiers (*.*)|*.*"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123
 msgid ""
 "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 (résolution "
-"interne), 4 (ratio d'image), 5 (Copie d'EFB), et 6 (Brouillard) dans la "
-"fenêtre d'émulation.\n"
+"Permet d'activer certaines options via les raccourcis clavier dans la "
+"fenêtre d'émulation : 3 (résolution interne), 4 (ratio d'image), 5 (Copie "
+"d'EFB), et 6 (Brouillard) .\n"
 "\n"
 "Dans le doute, décochez cette case."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:285
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:272
 msgid "Analyze"
 msgstr "Analyser"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:298
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:285
 msgid "Angle"
 msgstr "Angle"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:367
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:375
 msgid "Anisotropic Filtering:"
 msgstr "Filtrage anisotropique :"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:350
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:358
 msgid "Anti-Aliasing:"
 msgstr "Anti-Aliasing :"
 
-#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:308
+#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:299
 msgid "Apploader is the wrong size...is it really an apploader?"
 msgstr "L'apploader n'a pas la bonne taille... est-ce vraiment un apploader ?"
 
-#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:302
+#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:293
 msgid "Apploader unable to load from file"
 msgstr "L'apploader ne peut charger depuis ce fichier"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:841
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:822
 msgid "Apploader:"
 msgstr "Apploader :"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:135
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:122
 msgid "Apply"
 msgstr "Appliquer"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124
 msgid ""
 "Apply a post-processing effect after finishing a frame.\n"
 "\n"
@@ -714,11 +732,11 @@ msgstr ""
 "\n"
 "Dans le doute, sélectionnez (aucun)."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287
 msgid "Arabic"
 msgstr "Arabe"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:614
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:603
 #, c-format
 msgid "Are you sure you want to delete \"%s\"?"
 msgstr "Êtes-vous sûr de vouloir supprimer \"%s\" ?"
@@ -737,46 +755,50 @@ msgstr ""
 "Êtes-vous sûr de vouloir supprimer ce fichier ?  Il sera supprimé "
 "définitivement !"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:789
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:277
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:44
+msgid "Arm JIT (experimental)"
+msgstr "ARM JIT (expérimental)"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:285
 msgid "Aspect Ratio:"
 msgstr "Format d'écran :"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:70
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:58
 msgid "At least one pane must remain open."
 msgstr "Au moins un panneau doit rester ouvert."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:553
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533
 msgid "Audio"
 msgstr "Audio"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:694
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675
 msgid "Audio Backend:"
 msgstr "Moteur audio :"
 
-#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:41
+#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:28
 msgid "AudioCommon: Error opening AO device.\n"
 msgstr "AudioCommon : impossible d'ouvrir le périphérique AO.\n"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:275
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283
 msgid "Auto"
 msgstr "Auto"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:337
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345
 msgid "Auto (Multiple of 640x528)"
 msgstr "Auto (Multiple de 640x528)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:337
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345
 msgid "Auto (Window Size)"
 msgstr "Auto (taille de la fenêtre)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:297
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305
 msgid "Auto adjust Window Size"
 msgstr "Ajuster auto. la taille de la fenêtre"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77
 msgid ""
 "Automatically adjusts the window size to your internal resolution.\n"
 "\n"
@@ -786,132 +808,132 @@ msgstr ""
 "\n"
 "Dans le doute, décochez cette case."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:697
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696
 msgid "B"
 msgstr "B"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:755
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:754
 msgid "BP register "
 msgstr "Registres BP"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:27
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:14
 msgid "Back"
 msgstr "Retour"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:698
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:679
 msgid "Backend Settings"
 msgstr "Paramètres de l'interface audio"
 
-#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:60
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:206
+#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:47
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:211
 msgid "Backend:"
 msgstr "Moteur :"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:318
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:95
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:305
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:82
 msgid "Background Input"
 msgstr "Entrée en arrière-plan"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:279
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:266
 msgid "Backward"
 msgstr "Arrière"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:264
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:257
 msgid "Bad File Header"
 msgstr "Mauvaise entête de fichier"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:627
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:621
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:290
 msgid "Banner"
 msgstr "Bannière"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:519
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:529
 msgid "Banner Details"
 msgstr "Détails de la bannière"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491
 msgid "Banner:"
 msgstr "Bannière :"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:57
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:61
 msgid "Bar"
 msgstr "Barre"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:308
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:316
 msgid "Basic"
 msgstr "Paramètres de base"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555
 msgid "Basic Settings"
 msgstr "Paramètres de base"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:22
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Bass"
 msgstr "Basse"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:186
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:174
 msgid "Block Allocation Table checksum failed"
 msgstr ""
 "Echec de la vérification de la somme de contrôle de la Table d'Allocation de "
 "Blocs"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:631
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625
 msgid "Blocks"
 msgstr "Blocs"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:21
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Blue"
 msgstr "Bleu"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:24
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Blue Left"
 msgstr "Bleu Gauche"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:25
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Blue Right"
 msgstr "Bleu Droite"
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:87
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270
 msgid "Bottom"
 msgstr "Bas"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:238
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:225
 #, c-format
 msgid "Bound Controls: %lu"
 msgstr "Contrôles liés : %lu"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348
 msgid "Broken"
 msgstr "Corrompu"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:422
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:428
 msgid "Browse"
 msgstr "Parcourir"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:256
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:243
 msgid "Browse for a directory to add"
 msgstr "Choisir un dossier à ajouter"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:422
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:428
 msgid "Browse for an ISO directory..."
 msgstr "Rechercher un dossier contenant des ISO"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1079
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1080
 msgid "Browse for output directory"
 msgstr "Parcourir un dossier de destination"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:328
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:331
 msgid "Buffer:"
 msgstr "Buffer :"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:58
 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:119
+#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:106
 msgid "Buttons"
 msgstr "Boutons"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317
 msgid ""
 "Bypass the clearing of the data cache by the DCBZ instruction. Usually leave "
 "this option disabled."
@@ -919,31 +941,31 @@ msgstr ""
 "Ignore le vidage du cache de données par l'instruction DCBZ. Dans le doute, "
 "décochez cette case."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:698
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:697
 msgid "C"
 msgstr "C"
 
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:77
+#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:64
 msgid "C Stick"
 msgstr "Stick-C"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:77
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:64
 msgid "C-Stick"
 msgstr "Stick-C"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:764
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:763
 msgid "CP reg"
 msgstr "CP reg"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:567
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547
 msgid "CPU Emulator Engine"
 msgstr "Moteur d'émulation du CPU"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:490
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500
 msgid "Cache Display Lists"
 msgstr "Cache des listes d'affichage"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88
 msgid ""
 "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n"
 "Decreases emulation speed by some percent (depending on your GPU).\n"
@@ -959,24 +981,39 @@ msgstr ""
 "\n"
 "Dans le doute, décochez cette case."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1858
+#, c-format
+msgid "Can't 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:1872
+#, c-format
+msgid "Can't 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:669
+#: Source/Core/Core/Src/HW/DVDInterface.cpp:679
+msgid "Can't read from DVD_Plugin - DVD-Interface: Fatal Error"
+msgstr "Impossible de lire depuis DVD_Plugin - erreur fatale de DVD-Interface"
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:124
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:28
 msgid "Cancel"
 msgstr "Annuler"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:91
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:178
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:240
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:84
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:171
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:233
 #, c-format
 msgid "Cannot open %s"
 msgstr "Impossible d'ouvrir %s"
 
-#: Source/Core/Core/Src/CoreTiming.cpp:141
+#: Source/Core/Core/Src/CoreTiming.cpp:128
 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:1078
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1061
 #, c-format
 msgid ""
 "Cannot use that file as a memory card.\n"
@@ -987,7 +1024,7 @@ msgstr ""
 "%s\n"
 "n'est pas un fichier de carte mémoire GameCube valide."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1108
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1091
 msgid ""
 "Cannot use that file as a memory card.\n"
 "Are you trying to use the same file in both slots?"
@@ -995,32 +1032,15 @@ 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:1867
-#, 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:1881
-#, 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: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"
-
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:52
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:39
 msgid "Caps Lock"
 msgstr "Verr Maj"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288
 msgid "Catalan"
 msgstr "Catalan"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:311
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:298
 msgid "Center"
 msgstr "Centre"
 
@@ -1028,12 +1048,12 @@ msgstr "Centre"
 msgid "Change"
 msgstr "Changer"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:316
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:322
 msgid "Change &Disc..."
 msgstr "&Changer de disque..."
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:179
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:179
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:167
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:167
 msgid "Change Disc"
 msgstr "Changer de disque"
 
@@ -1041,7 +1061,7 @@ msgstr "Changer de disque"
 msgid "Change Game"
 msgstr "Changer de Jeu"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:515
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495
 msgid ""
 "Change the language of the user interface.\n"
 "Requires restart."
@@ -1049,75 +1069,75 @@ msgstr ""
 "Changer la langue de l'interface.\n"
 "Demande un redémarrage"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:60
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:47
 msgid "Changes sign to zFar Parameter (after correction)"
 msgstr "Change le signe du paramètre zFar (après correction)"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:55
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:42
 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:519
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499
 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:295
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:298
 msgid "Chat"
 msgstr "Chat"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:47
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:34
 msgid "Cheat Code"
 msgstr "Cheat Code"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:118
 msgid "Cheat Search"
 msgstr "Rechercher un cheat"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:38
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:25
 msgid "Cheats Manager"
 msgstr "Gestionnaire de Cheats"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:633
 msgid "Check Partition Integrity"
 msgstr "Vérifier l'intégrité de la partition"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:864
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:880
 msgid "Checking integrity..."
 msgstr "Vérification de l'intégrité..."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289
 msgid "Chinese (Simplified)"
 msgstr "Chinois (simplifié)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290
 msgid "Chinese (Traditional)"
 msgstr "Chinois (traditionnel)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:818
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:799
 msgid "Choose a DVD root directory:"
 msgstr "Choisir un dossier racine pour le DVD :"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:822
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803
 msgid "Choose a NAND root directory:"
 msgstr "Choisir un dossier racine pour la NAND :"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:815
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:796
 msgid "Choose a default ISO:"
 msgstr "Choisir un ISO par défaut"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1236
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1219
 msgid "Choose a directory to add"
 msgstr "Choisir un dossier à ajouter"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1065
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1048
 msgid "Choose a file to open"
 msgstr "Choisir un fichier à ouvrir"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:217
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:204
 msgid "Choose a memory card:"
 msgstr "Choisir une carte mémoire :"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:819
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800
 msgid ""
 "Choose file to use as apploader: (applies to discs constructed from "
 "directories only)"
@@ -1125,27 +1145,27 @@ msgstr ""
 "Choisir un fichier comme apploader : (uniquement pour les disques créés à "
 "partir de dossiers)"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:767
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:806
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:781
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:822
 msgid "Choose the folder to extract to"
 msgstr "Choisir le dossier de destination de l'extraction"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:297
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:284
 msgid "Circle Stick"
 msgstr "Stick circulaire"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:52
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:56
 msgid "Classic"
 msgstr "Classique"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:144
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:43
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:487
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:913
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:137
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:30
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:474
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:904
 msgid "Clear"
 msgstr "Effacer"
 
-#: Source/Core/Core/Src/NetPlayServer.cpp:259
+#: Source/Core/Core/Src/NetPlayServer.cpp:263
 msgid ""
 "Client disconnect while game is running!! NetPlay is disabled. You must "
 "manually stop the game."
@@ -1153,138 +1173,138 @@ 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:298
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:247
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:552
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:578
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:285
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:234
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:562
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:590
 msgid "Close"
 msgstr "Fermer"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:174
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:177
 msgid "Co&nfigure..."
 msgstr "Co&nfigurer..."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:86
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:73
 msgid "Code Info"
 msgstr "Info du code"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:568
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:556
 msgid "Code: "
 msgstr "Code :"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:35
 msgid "Command"
 msgstr "Commande"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:629
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:623
 msgid "Comment"
 msgstr "Commentaire"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489
 msgid "Comment:"
 msgstr "Commentaire :"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:893
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:884
 msgid "Compress ISO..."
 msgstr "Compresser l'ISO"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:905
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:899
 msgid "Compress selected ISOs..."
 msgstr "Compresser les ISO sélectionnés..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1088
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1224
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1089
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1225
 msgid "Compressing ISO"
 msgstr "Compression de l'ISO"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:429
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:435
 msgid "Config"
 msgstr "Configurer"
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:37
-#: Source/Core/DolphinWX/Src/InputConfigDiag.h:135
-#: Source/Core/DolphinWX/Src/InputConfigDiag.h:154
+#: Source/Core/DolphinWX/Src/InputConfigDiag.h:122
+#: Source/Core/DolphinWX/Src/InputConfigDiag.h:141
 msgid "Configure"
 msgstr "Configurer"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:111
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:98
 msgid "Configure Control"
 msgstr "Configurer le contrôle"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:306
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
 #: Source/Core/DolphinWX/Src/NetWindow.cpp:583
 msgid "Configure Pads"
 msgstr "Configurer les manettes"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:429
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:435
 msgid "Configure..."
 msgstr "Configurer"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1119
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1147
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1217
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1120
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1218
 msgid "Confirm File Overwrite"
 msgstr "Confirmer l'écrasement du fichier"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:597
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:577
 msgid "Confirm on Stop"
 msgstr "Confirmer l'arrêt de l'émulation"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:83
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:105
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:74
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:96
 msgid "Connect"
 msgstr "Connecter"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:783
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:764
 msgid "Connect USB Keyboard"
 msgstr "Connecter le clavier USB"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:362
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:368
 #, c-format
 msgid "Connect Wiimote %i"
 msgstr "Connecter la Wiimote %i"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:195
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183
 msgid "Connect Wiimote 1"
 msgstr "Connecter la 1ère Wiimote"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184
 msgid "Connect Wiimote 2"
 msgstr "Connecter la 2è Wiimote"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:185
 msgid "Connect Wiimote 3"
 msgstr "Connecter la 3è Wiimote"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:198
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:186
 msgid "Connect Wiimote 4"
 msgstr "Connecter la 4è Wiimote"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:627
+#: Source/Core/DolphinWX/Src/Main.cpp:655
 msgid "Connecting..."
 msgstr "Connexion..."
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:155
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:156
 msgid "Console"
 msgstr "Console"
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:71
 msgid "Continuous Scanning"
-msgstr ""
+msgstr "Recherche en continu"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:46
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:33
 msgid "Control"
 msgstr "Contrôle"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:189
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:176
 msgid "Convert to GCI"
 msgstr "Convertir en GCI"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:379
+#: Source/Core/Core/Src/CoreParameter.cpp:368
 msgid "Copy failed"
 msgstr "Echec de la copie"
 
@@ -1293,21 +1313,21 @@ msgstr "Echec de la copie"
 msgid "Copy to Memcard %c"
 msgstr "Copier vers la carte mémoire %c"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:359
 msgid "Core"
 msgstr "Core"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:154
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:148
 #, c-format
 msgid "Could not create %s"
 msgstr "Impossible de créer %s"
 
-#: Source/Core/AudioCommon/Src/AudioCommon.cpp:75
+#: Source/Core/AudioCommon/Src/AudioCommon.cpp:62
 #, c-format
 msgid "Could not initialize backend %s."
 msgstr "Impossible d'initialiser le moteur %s."
 
-#: Source/Core/Core/Src/CoreParameter.cpp:137
+#: Source/Core/Core/Src/CoreParameter.cpp:126
 #, c-format
 msgid ""
 "Could not read \"%s\".  There is no disc in the drive, or it is not a GC/Wii "
@@ -1319,12 +1339,12 @@ msgstr ""
 "GameCube et Wii ne peuvent pas être plus par la plupart des lecteurs DVD sur "
 "PC."
 
-#: Source/Core/Core/Src/CoreParameter.cpp:292
+#: Source/Core/Core/Src/CoreParameter.cpp:281
 #, c-format
 msgid "Could not recognize ISO file %s"
 msgstr "Impossible de reconnaître le fichier ISO %s"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:569
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:579
 #, c-format
 msgid "Could not save %s"
 msgstr "Impossible de sauvegarder %s"
@@ -1339,24 +1359,32 @@ 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:123
+#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119
 #, c-format
 msgid ""
 "Could not write memory card file %s.\n"
 "\n"
 "Are you running Dolphin from a CD/DVD, or is the save file maybe write "
-"protected?"
-msgstr ""
-"Impossible d'écrire le fichier de carte mémoire %s.\n"
+"protected?\n"
 "\n"
-"Exécutez-vous Dolpin à partir d'un CD/DVD, ou le fichier de sauvegarde est "
-"peut-être protégé contré l'écriture ?"
+"Are you receiving this after moving the emulator directory?\n"
+"If so, then you may need to re-specify your memory card location in the "
+"options."
+msgstr ""
+"Impossible d'écrire sur fichier de la carte mémoire %s.\n"
+"\n"
+"Exécutez-vous Dolphin à partir d'un CD/DVD, ou bien le fichier de sauvegarde "
+"est en lecture seule ?\n"
+"\n"
+"Venez-vous de déplacer le répertoire de l'émulateur ?\n"
+"Dans ce cas, vous devez à nouveau spécifier l'emplacement du fichier de "
+"sauvegarde dans les options."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1107
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1133
 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:146
+#: Source/Core/Core/Src/BootManager.cpp:137
 msgid ""
 "Couldn't init the core.\n"
 "Check your configuration."
@@ -1364,38 +1392,38 @@ 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:170
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:495
 msgid "Count:"
 msgstr "Nombre :"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:452
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456
 msgid "Country:"
 msgstr "Pays :"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:186
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:562
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:173
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:550
 msgid "Create AR Code"
 msgstr "Créer un code AR"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:543
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:608
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:569
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:641
 msgid "Create new perspective"
 msgstr "Créer une nouvelle perspective"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:17
 msgid "Creator: "
 msgstr "Créateur :"
 
-#: Source/Core/Common/Src/MsgHandler.cpp:68
+#: Source/Core/Common/Src/MsgHandler.cpp:54
 msgid "Critical"
 msgstr "Critique"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562
 msgid "Crop"
-msgstr "Couper"
+msgstr "Recadrer"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119
 msgid ""
 "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n"
 "\n"
@@ -1405,140 +1433,140 @@ msgstr ""
 "\n"
 "Dans le doute, décochez cette case."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:48
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:52
 msgid "Crossfade"
 msgstr "Crossfade"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:597
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:600
 #, 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 !"
+msgid "Current directory changed from %s to %s after wxFileSelector!"
+msgstr "Le répertoire en cours a changé de %s vers %s après wxFileSelector !"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339
 msgid "Custom Projection Hack"
 msgstr "Hack de projection personnalisé"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.h:30
+#: Source/Core/DolphinWX/Src/PHackSettings.h:17
 msgid "Custom Projection Hack Settings"
 msgstr "Paramètres du hack de projection personnalisé"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342
 msgid "Customize some Orthographic Projection parameters."
 msgstr "Personnalise certains paramètres de projection orthographique."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291
 msgid "Czech"
 msgstr "Tchèque"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:698
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:697
 msgid "D"
 msgstr "D"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:89
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
 msgid "D-Pad"
 msgstr "Pad numérique"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:431
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
 msgid "DSP"
 msgstr "DSP"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:639
 msgid "DSP Emulator Engine"
 msgstr "Moteur d'émulation du DSP (Audio)"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:254
 msgid "DSP HLE emulation (fast)"
 msgstr "Emulation du DSP en HLE (rapide)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:256
 msgid "DSP LLE interpreter (slow)"
 msgstr "Interpréteur du DSP en LLE (lent)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660
-msgid "DSP LLE on Thread"
-msgstr "DSP LLE sur thread"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:255
 msgid "DSP LLE recompiler"
 msgstr "Recompilateur du DSP en LLE"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:431
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:641
+msgid "DSP on Dedicated Thread"
+msgstr "DSP sur un thread dédié"
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
 msgid "DSP settings"
 msgstr "Paramètres DSP (audio)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:838
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:819
 msgid "DVD Root:"
 msgstr "Racine du DVD :"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:239
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:226
 msgid "DVDLowRead - Fatal Error: failed to read from volume"
 msgstr "DVDLowRead - Erreur fatale : impossible de lire le volume"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:333
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:320
 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:163
 msgid "Data Size"
 msgstr "Taille des données"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468
 msgid "Date:"
 msgstr "Date :"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:528
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:564
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:518
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:557
 msgid "Datel MaxDrive/Pro files(*.sav)"
 msgstr "Fichiers Datel MaxDrive/Pro (*.sav)"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:242
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:259
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:267
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:281
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:296
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:229
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:246
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:254
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:268
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:283
 msgid "Dead Zone"
 msgstr "Zone morte"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:35
 msgid "Debug"
 msgstr "Débug"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:521
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534
 msgid "Debugging"
 msgstr "Débug"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:79
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:66
 msgid "Decimal"
 msgstr "Décimal"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:890
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:881
 msgid "Decompress ISO..."
 msgstr "Décompresser l'ISO"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:906
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:900
 msgid "Decompress selected ISOs..."
 msgstr "Décompresser les ISO sélectionnés..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1088
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1224
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1089
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1225
 msgid "Decompressing ISO"
 msgstr "Décompression de l'ISO"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:912
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:903
 msgid "Default"
 msgstr "Par défaut"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:835
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:816
 msgid "Default ISO:"
 msgstr "ISO par défaut :"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:114
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:107
 msgid "Default font"
 msgstr "Police par défaut"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:32
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:926
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:19
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917
 msgid "Delete"
 msgstr "Supprimer"
 
@@ -1546,21 +1574,21 @@ msgstr "Supprimer"
 msgid "Delete Save"
 msgstr "Supprimer la sauvegarde"
 
-#: Source/Core/VideoCommon/Src/AVIDump.cpp:77
+#: Source/Core/VideoCommon/Src/AVIDump.cpp:64
 #, c-format
 msgid "Delete the existing file '%s'?"
 msgstr "Supprimer le fichier '%s' ?"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:671
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:683
 msgid "Description"
 msgstr "Description"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:472
 msgid "Detect"
 msgstr "Détecter"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:233
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:328
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:220
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:315
 msgid ""
 "Detected attempt to read more data from the DVD than fit inside the out "
 "buffer. Clamp."
@@ -1568,29 +1596,29 @@ 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:127
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:898
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:114
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:889
 msgid "Device"
 msgstr "Appareil"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:798
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:731
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779
 msgid "Device Settings"
 msgstr "Paramètres de la console virtuelle"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:45
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:49
 msgid "Dial"
 msgstr "Appel"
 
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:146
+#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:135
 msgid "Direct3D11"
 msgstr "Direct3D11"
 
-#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:128
+#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:125
 msgid "Direct3D9"
 msgstr "Direct3D9"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:167
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:155
 msgid ""
 "Directory checksum failed\n"
 " and Directory backup checksum failed"
@@ -1598,16 +1626,20 @@ msgstr ""
 "La vérification de la somme de contrôle du dossier a échoué\n"
 " et la vérification de la somme de contrôle du dossier de sauvegarde a échoué"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:433
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:443
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485
 msgid "Disable"
 msgstr "Désactiver"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:491
-msgid "Disable Fog"
-msgstr "Désactiver la fumée"
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501
+msgid "Disable Destination Alpha"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:409
+msgid "Disable Fog"
+msgstr "Désactiver le brouillard"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108
 msgid ""
 "Disable any XFB emulation.\n"
 "Speeds up emulation a lot but causes heavy glitches in many games which rely "
@@ -1621,7 +1653,7 @@ msgstr ""
 "\n"
 "Dans le doute, cochez cette case."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95
 msgid ""
 "Disable emulation of EFB copies.\n"
 "These are often used for post-processing or render-to-texture effects, so "
@@ -1637,20 +1669,33 @@ msgstr ""
 "\n"
 "Dans le doute, décochez cette case."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:543
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101
+#, fuzzy
+msgid ""
+"Disables emulation of a hardware feature called destination alpha, which is "
+"used in many games for various graphical effects.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+"Saute la passe alpha de destination, utilisée dans beaucoup de jeux pour "
+"divers effets graphiques.\n"
+"\n"
+"Dans le doute, décochez cette case."
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:553
 msgid "Disc"
 msgstr "Disque"
 
-#: Source/Core/DiscIO/Src/DriveBlob.cpp:107
-#: Source/Core/DiscIO/Src/DriveBlob.cpp:126
+#: Source/Core/DiscIO/Src/DriveBlob.cpp:94
+#: Source/Core/DiscIO/Src/DriveBlob.cpp:113
 msgid "Disc Read Error"
 msgstr "Erreur de lecture du disque"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:312
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:320
 msgid "Display"
 msgstr "Vidéo"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104
 msgid ""
 "Display the inputs read by the emulator.\n"
 "\n"
@@ -1660,32 +1705,32 @@ msgstr ""
 "\n"
 "Dans le doute, décochez cette case."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:80
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:67
 msgid "Divide"
 msgstr "Diviser"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:987
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:990
 msgid "Do you want to stop the current emulation?"
 msgstr "Voulez-vous arrêter l'émulation en cours ?"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:663
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:644
 msgid "Dolby Pro Logic II decoder"
 msgstr "Décodeur Dolby Pro Logic II"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:864
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:856
 msgid "Dolphin"
 msgstr "Dolphin"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:183
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:188
 #, c-format
 msgid "Dolphin %s Graphics Configuration"
 msgstr "Configuration des graphismes %s pour Dolphin"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:292
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:298
 msgid "Dolphin &Web Site"
 msgstr "Site &web de Dolphin"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.h:37
+#: Source/Core/DolphinWX/Src/ConfigMain.h:24
 msgid "Dolphin Configuration"
 msgstr "Configuration de Dolphin"
 
@@ -1693,16 +1738,16 @@ msgstr "Configuration de Dolphin"
 msgid "Dolphin Emulated Wiimote Configuration"
 msgstr "Configuration de la Wiimote pour Dolphin"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:394
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:383
 msgid "Dolphin FIFO"
 msgstr "Dolphin FIFO"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1136
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1153
 msgid "Dolphin GCPad Configuration"
 msgstr "Configuration de la manette GC pour Dolphin"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:679
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1074
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:685
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1089
 msgid "Dolphin TAS Movies (*.dtm)"
 msgstr "Films TAS Dolphin (*.dtm)"
 
@@ -1710,11 +1755,11 @@ msgstr "Films TAS Dolphin (*.dtm)"
 msgid "Dolphin Wiimote Configuration"
 msgstr "Configuration de la Wiimote pour Dolphin"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:293
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:299
 msgid "Dolphin at &Google Code"
 msgstr "Dolphin dans &Google Code"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:364
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:351
 msgid ""
 "Dolphin could not find any GC/Wii ISOs.  Doubleclick here to browse for "
 "files..."
@@ -1722,7 +1767,7 @@ msgstr ""
 "Dolphin n'a pas trouvé d'ISO GC/Wii. Double-cliquez ici pour chercher des "
 "fichiers..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:368
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:355
 msgid ""
 "Dolphin is currently set to hide all games.  Doubleclick here to show all "
 "games..."
@@ -1730,50 +1775,59 @@ msgstr ""
 "Dolphin est paramétré pour cacher tous les jeux. Double-cliquez ici pour "
 "afficher tous les jeux..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1159
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1160
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1246
 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
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
+#, fuzzy
+msgid ""
+"Doubles the emulated GPU clock rate. May speed up some games (ON = Fast, OFF "
+"= Compatible)"
+msgstr ""
+"Activer l'accès disque rapide. Requis pour certains jeux. (MARCHE = Rapide, "
+"ARRÊT = Compatible)"
+
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:262
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:45
 msgid "Down"
 msgstr "Bas"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:54
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:44
 msgid "Download Codes (WiiRD Database)"
 msgstr "Télécharger des codes (sur WiiRD)"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:297
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:287
 #, c-format
 msgid "Downloaded %lu codes. (added %lu)"
 msgstr "%lu codes ont été téléchargés. (%lu ajoutés)"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:31
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:35
 msgid "Drums"
 msgstr "Percussions"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:105
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
 msgid "Dummy"
 msgstr "Factice"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:661
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:642
 msgid "Dump Audio"
 msgstr "Enregistrer le son"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:532
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545
 msgid "Dump EFB Target"
 msgstr "Copier l'EFB cible"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546
 msgid "Dump Frames"
 msgstr "Copier les images"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543
 msgid "Dump Textures"
 msgstr "Copier les textures"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114
 msgid ""
 "Dump all rendered frames to an AVI file in User/Dump/Frames/\n"
 "\n"
@@ -1784,7 +1838,7 @@ msgstr ""
 "\n"
 "Dans le doute, décochez cette case."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111
 msgid ""
 "Dump decoded game textures to User/Dump/Textures/<game_id>/\n"
 "\n"
@@ -1794,7 +1848,7 @@ msgstr ""
 "\n"
 "Dans le doute, décochez cette case."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113
 msgid ""
 "Dump the contents of EFB copies to User/Dump/Textures/\n"
 "\n"
@@ -1804,21 +1858,21 @@ msgstr ""
 "\n"
 "Dans le doute, décochez cette case."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:474
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292
 msgid "Dutch"
 msgstr "Néerlandais"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:112
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:113
 msgid "E&xit"
 msgstr "&Quitter"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:441
 msgid "EFB Copies"
 msgstr "Copies de l'EFB"
 
-#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:223
+#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:210
 #, c-format
 msgid ""
 "ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least "
@@ -1831,52 +1885,52 @@ msgstr ""
 "distribution de Dolphin, un redémarrage est probablement nécessaire pour que "
 "Windows charge le nouveau pilote."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:166
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:160
 msgid "EUROPE"
 msgstr "Europe"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:156
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:143
 msgid "Early Memory Updates"
 msgstr "Premières mises à jour de mémoire"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:447
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:453
 msgid "Edit"
 msgstr "Editer"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.h:30
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.h:17
 msgid "Edit ActionReplay Code"
 msgstr "Editer le code ActionReplay"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:285
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:286
 msgid "Edit Config"
 msgstr "Editer la configuration"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.h:30
+#: Source/Core/DolphinWX/Src/PatchAddEdit.h:17
 msgid "Edit Patch"
 msgstr "Editer le patch"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:447
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:453
 msgid "Edit current perspective"
 msgstr "Modifier la perspective actuelle"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:403
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:425
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:407
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:429
 msgid "Edit..."
 msgstr "Editer..."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:44
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:48
 msgid "Effect"
 msgstr "Effets"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:425
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435
 msgid "Embedded Frame Buffer"
 msgstr "Buffer d'image embarqué"
 
-#: Source/Core/Core/Src/Core.cpp:201
+#: Source/Core/Core/Src/Core.cpp:190
 msgid "Emu Thread already running"
 msgstr "Thread d'émulation déjà en cours d'exécution"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110
 msgid ""
 "Emulate XFBs accurately.\n"
 "Slows down emulation a lot and prohibits high-resolution rendering but is "
@@ -1890,7 +1944,7 @@ msgstr ""
 "\n"
 "Dans le doute, sélectionnez plutôt Virtuel."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109
 msgid ""
 "Emulate XFBs using GPU texture objects.\n"
 "Fixes many games which don't work without XFB emulation while not being as "
@@ -1910,7 +1964,7 @@ msgstr ""
 msgid "Emulated Wiimote"
 msgstr "Wiimote émulée"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346
 msgid "Emulation State: "
 msgstr "Etat de l'émulation :"
 
@@ -1918,7 +1972,7 @@ msgstr "Etat de l'émulation :"
 msgid "Enable"
 msgstr "Activer"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91
 msgid ""
 "Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's "
 "supported by your GPU.\n"
@@ -1934,72 +1988,71 @@ msgstr ""
 "\n"
 "Dans le doute, décochez cette case."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:111
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:98
 msgid "Enable AR Logging"
 msgstr "Activer la journalisation AR"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324
 msgid "Enable Block Merging"
 msgstr "Activer l'assemblage de blocs"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331
 msgid "Enable Bounding Box Calculation"
 msgstr "Active le calcul de la boîte liée."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:446
 msgid "Enable Cache"
 msgstr "Activer le cache"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:562
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542
 msgid "Enable Cheats"
 msgstr "Activer les Cheats"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310
 msgid "Enable Dual Core"
 msgstr "Activer le Dual Core"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
 msgid "Enable Dual Core (speedup)"
 msgstr "Activer le Dual Core (plus rapide)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:550
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:563
 msgid "Enable Hotkeys"
 msgstr "Activer les touches de raccourci"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311
 msgid "Enable Idle Skipping"
 msgstr "Activer le saut d'inactivité"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541
 msgid "Enable Idle Skipping (speedup)"
 msgstr "Activer le saut d'inactivité (plus rapide)"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312
 msgid "Enable MMU"
 msgstr "Activer le MMU"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:554
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:567
 msgid "Enable Progressive Scan"
 msgstr "Activer le Progressive Scan"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757
 msgid "Enable Screen Saver"
 msgstr "Activer l'économiseur d'écran"
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:75
-#, fuzzy
 msgid "Enable Speaker Data"
-msgstr "Activer les appels"
+msgstr "Activer les données du haut-parleur"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
 msgid "Enable WideScreen"
 msgstr "Activer l'écran large (16/9è)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:516
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529
 msgid "Enable Wireframe"
 msgstr "Activer le rendu en fil de fer"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85
 msgid ""
 "Enable anisotropic filtering.\n"
 "Enhances visual quality of textures that are at oblique viewing angles.\n"
@@ -2014,7 +2067,7 @@ msgstr ""
 "\n"
 "Dans le doute, sélectionnez 1x."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323
 msgid ""
 "Enable fast disc access.  Needed for a few games. (ON = Fast, OFF = "
 "Compatible)"
@@ -2026,7 +2079,7 @@ msgstr ""
 msgid "Enable pages"
 msgstr "Activer les appels"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76
 msgid ""
 "Enable this if you want the whole screen to be used for rendering.\n"
 "If this is disabled, a render window will be created instead.\n"
@@ -2039,7 +2092,7 @@ msgstr ""
 "\n"
 "Dans le doute, décochez cette case."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80
 msgid ""
 "Enable this if you want to use the main Dolphin window for rendering rather "
 "than a separate render window.\n"
@@ -2051,7 +2104,7 @@ msgstr ""
 "\n"
 "Dans le doute, décochez cette case."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:335
 msgid ""
 "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for "
 "ANY other game."
@@ -2059,11 +2112,11 @@ 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:337
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340
 msgid "Enables Custom Projection Hack"
 msgstr "Active un hack de projection personnalisé"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:528
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508
 msgid ""
 "Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on "
 "OSX."
@@ -2071,14 +2124,14 @@ 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:530
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510
 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:532
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:512
 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."
@@ -2087,19 +2140,20 @@ msgstr ""
 "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
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81
 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 ""
-"Active le scan progressif, s'il est pris en charge par le logiciel émulé.\n"
+"Active l'affichage progressif, s'il est pris en charge par le logiciel "
+"émulé.\n"
 "La plupart des jeux n'en tiennent pas compte.\n"
 "\n"
 "Dans le doute, décochez cette case."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313
 msgid ""
 "Enables the Memory Management Unit, needed for some games. (ON = Compatible, "
 "OFF = Fast)"
@@ -2107,7 +2161,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:111
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116
 msgid ""
 "Encode frame dumps using the FFV1 codec.\n"
 "\n"
@@ -2117,52 +2171,52 @@ msgstr ""
 "\n"
 "Dans le doute, décochez cette case."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:40
 msgid "End"
 msgstr "Fin"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:469
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:280
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:260
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293
 msgid "English"
 msgstr "Anglais"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:329
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:407
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:337
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:417
 msgid "Enhancements"
 msgstr "Améliorations"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:607
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:640
 msgid "Enter a name for the new perspective:"
 msgstr "Entrer un nom pour la nouvelle perspective :"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:191
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:178
 #, c-format
 msgid "Entry %d/%d"
 msgstr "Entrée %d/%d"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:85
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:72
 #, c-format
 msgid "Entry 1/%d"
 msgstr "Entrée 1/%d"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:204
 msgid "Equal"
 msgstr "Egal"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:45
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:156
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1242
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:32
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:150
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226
 msgid "Error"
 msgstr "Erreur"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:381
+#: Source/Core/DolphinWX/Src/Main.cpp:409
 msgid "Error loading selected language. Falling back to system default."
 msgstr ""
 "Erreur lors du chargement de la langue sélectionnée. Retour à la langue par "
 "défaut du système."
 
-#: Source/Core/Common/Src/ChunkFile.h:226
+#: Source/Core/Common/Src/ChunkFile.h:221
 #, c-format
 msgid ""
 "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). "
@@ -2171,7 +2225,7 @@ msgstr ""
 "Erreur : Après \"%s\", trouvé %d (0x%X) au lieu d'un marqueur de sauvegarde "
 "%d (0x%X). Abandon du chargement de la sauvegarde d'état."
 
-#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:342
+#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:329
 #, c-format
 msgid ""
 "Error: Trying to access %s fonts but they are not loaded. Games may not show "
@@ -2180,39 +2234,39 @@ msgstr ""
 "Erreur : essai d'accès aux polices %s mais elles ne sont pas chargées. Les "
 "jeux peuvent ne pas afficher les polices correctement, ou planter."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:30
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:17
 msgid "Escape"
 msgstr "Echap"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:26
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:30
 msgid "Euphoria"
 msgstr "Euphorie"
 
 #: Source/Core/Core/Src/ArmMemTools.cpp:78
-#: Source/Core/Core/Src/x64MemTools.cpp:217
+#: Source/Core/Core/Src/x64MemTools.cpp:206
 #, c-format
 msgid "Exception handler - access below memory space. %08llx%08llx"
 msgstr ""
 "Erreur d'exception : accès à un espace en-dessous de la mémoire. %08llx%08llx"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:61
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
 msgid "Execute"
 msgstr "Exécuter"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:459
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:446
 msgid "Export Failed"
 msgstr "Echec de l'exportation"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:639
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:649
 msgid "Export File"
 msgstr "Exporter un fichier"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:177
 msgid "Export Recording"
 msgstr "Exporter l'enregistrement..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:345
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:351
 msgid "Export Recording..."
 msgstr "Exporter l'enregistrement..."
 
@@ -2220,7 +2274,7 @@ msgstr "Exporter l'enregistrement..."
 msgid "Export Save"
 msgstr "Exporter une sauvegarde"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:874
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:865
 msgid "Export Wii save (Experimental)"
 msgstr "Exporter une sauvegarde Wii (expérimental)"
 
@@ -2228,100 +2282,100 @@ msgstr "Exporter une sauvegarde Wii (expérimental)"
 msgid "Export all saves"
 msgstr "Exporter toutes les sauvegardes"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:80
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:72
 msgid "Export failed, try again?"
 msgstr "L'exportation a échoué. Essayer de nouveau ?"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:559
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:552
 msgid "Export save as..."
 msgstr "Exporter l'enregistrement sous..."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:297
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:284
 msgid "Extension"
 msgstr "Extension"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483
 msgid "External Frame Buffer"
 msgstr "Buffer d'image externe"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:61
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:48
 msgid "Extra Parameter"
 msgstr "Paramètres supplémentaires"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:62
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:49
 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:614
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:624
 msgid "Extract All Files..."
 msgstr "Extraire tous les fichiers..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:616
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:626
 msgid "Extract Apploader..."
 msgstr "Extraire l'Apploader..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:617
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627
 msgid "Extract DOL..."
 msgstr "Extraire le DOL..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:610
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:620
 msgid "Extract Directory..."
 msgstr "Extraire un dossier..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:612
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:622
 msgid "Extract File..."
 msgstr "Extraire un fichier..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:608
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:618
 msgid "Extract Partition..."
 msgstr "Extraire une partition..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:724
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:738
 #, c-format
 msgid "Extracting %s"
 msgstr "Extraction de %s"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:707
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:721
 msgid "Extracting All Files"
 msgstr "Extraction de tous les fichiers"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:707
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:721
 msgid "Extracting Directory"
 msgstr "Extraction du dossier"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:710
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:724
 msgid "Extracting..."
 msgstr "Extraction..."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:892
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:893
 msgid "FIFO Byte"
 msgstr "Octet FIFO"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:45
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:32
 msgid "FIFO Player"
 msgstr "Lecteur FIFO"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:169
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:163
 msgid "FRANCE"
 msgstr "France"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472
 msgid "FST Size:"
 msgstr "Taille FST :"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:77
+#: Source/Core/Core/Src/NetPlayClient.cpp:81
 msgid "Failed to Connect!"
 msgstr "Connexion impossible !"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:225
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:228
 msgid "Failed to Listen!!"
 msgstr "Ecoute impossible !"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:307
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:300
 msgid "Failed to download codes."
 msgstr "Impossible de télécharger les codes."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:827
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:843
 #, c-format
 msgid "Failed to extract to %s!"
 msgstr "Impossible d'extraire vers %s !"
@@ -2348,26 +2402,30 @@ msgstr ""
 "d'extration de ROM.\n"
 "(Sélectionnez-le depuis l'onglet \"Audio\" dans la fenêtre de configuration.)"
 
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:116
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:139
+#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:108
+#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:131
 msgid "Failed to load bthprops.cpl"
 msgstr "Impossible de charger bthprops.cpl"
 
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:100
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:109
+#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:90
+#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:101
 msgid "Failed to load hid.dll"
 msgstr "Impossible de charger hid.dll"
 
-#: Source/Core/Core/Src/Movie.cpp:792
+#: Source/Core/Core/Src/Movie.cpp:783
 #, c-format
 msgid "Failed to read %s"
 msgstr "Impossible de lire %s"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:151
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:144
 msgid "Failed to read banner.bin"
 msgstr "Impossible de lire banner.bin"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:223
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:178
+msgid "Failed to read bk header"
+msgstr "Impossible de lire l'entête bk"
+
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:211
 #, c-format
 msgid ""
 "Failed to read block %d of the save data\n"
@@ -2378,7 +2436,7 @@ msgstr ""
 "La carte mémoire est peut-être tronquée\n"
 "Position du fichier : %llx"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:148
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:136
 msgid ""
 "Failed to read block allocation table backup correctly\n"
 "(0x8000-0x9FFF)"
@@ -2387,7 +2445,7 @@ msgstr ""
 "blocs\n"
 "(0x8000-0x9FFF)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:142
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:130
 msgid ""
 "Failed to read block allocation table correctly\n"
 "(0x6000-0x7FFF)"
@@ -2395,12 +2453,17 @@ msgstr ""
 "Impossible de lire correctement la table d'allocation des blocs\n"
 "(0x6000-0x7FFF)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:286
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:279
 #, c-format
 msgid "Failed to read data from file %d"
 msgstr "Impossible de lire les données du fichier %d"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:136
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:367
+#, c-format
+msgid "Failed to read data from file: %s"
+msgstr "Impossible de lire les données du fichier %s"
+
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:124
 msgid ""
 "Failed to read directory backup correctly\n"
 "(0x4000-0x5FFF)"
@@ -2408,7 +2471,7 @@ msgstr ""
 "Impossible de lire correctement la sauvegarde des dossiers\n"
 "(0x4000-0x5FFF)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:130
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:118
 msgid ""
 "Failed to read directory correctly\n"
 "(0x2000-0x3FFF)"
@@ -2416,7 +2479,11 @@ msgstr ""
 "Impossible de lire le dossier correctement\n"
 "(0x2000-0x3FFF)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:119
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:90
+msgid "Failed to read header"
+msgstr "Impossible de lire l'entête"
+
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:107
 msgid ""
 "Failed to read header correctly\n"
 "(0x0000-0x1FFF)"
@@ -2424,41 +2491,41 @@ msgstr ""
 "Impossible de lire l'entête correctement\n"
 "(0x0000-0x1FFF)"
 
-#: Source/Core/DiscIO/Src/VolumeGC.cpp:61
+#: Source/Core/DiscIO/Src/VolumeGC.cpp:48
 msgid "Failed to read unique ID from disc image"
 msgstr "Impossible de lire l'ID unique depuis l'image du disque"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:84
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:71
 msgid "Failed to write BT.DINF to SYSCONF"
 msgstr "Impossible d'écrire BT.DINF vers SYSCONF"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:228
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:221
 msgid "Failed to write bkhdr"
 msgstr "Impossible d'écrire bkhdr"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:164
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:157
 #, c-format
 msgid "Failed to write header for %s"
 msgstr "Impossible d'écrire l'entête de %s"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:258
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:251
 #, c-format
 msgid "Failed to write header for file %d"
 msgstr "Impossible d'écire l'entête du fichier %d"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294
 msgid "Farsi"
 msgstr "Perse"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477
 msgid "Fast"
 msgstr "Rapide"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315
 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:1046
+#: Source/Core/Core/Src/Movie.cpp:1037
 #, c-format
 msgid ""
 "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s"
@@ -2466,23 +2533,23 @@ msgstr ""
 "Désynchro fatale. Abandon de la lecure. (Erreur dans Play Wiimote : %u != "
 "%u, byte %u.)%s"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:199
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:202
 msgid "Fifo Player"
 msgstr "Lecteur FIFO"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:99
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:86
 msgid "File Info"
 msgstr "Infos du fichier"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:304
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:295
 msgid "File contained no codes."
 msgstr "Le fichier ne contient pas de code."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:413
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:400
 msgid "File converted to .gci"
 msgstr "Fichier converti en .gci"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:428
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:415
 msgid ""
 "File could not be opened\n"
 "or does not have a valid extension"
@@ -2490,7 +2557,7 @@ msgstr ""
 "Le fichier n'a pu être ouvert\n"
 "ou n'a pas d'extension valide"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:84
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:72
 #, c-format
 msgid ""
 "File has the extension \"%s\"\n"
@@ -2499,36 +2566,36 @@ msgstr ""
 "Le fichier a l'extension \"%s\"\n"
 "Les extensions valides sont (.raw/.gcp)"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:425
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:412
 msgid "File is not recognized as a memcard"
 msgstr "Le fichier n'est pas reconnu comme une carte mémoire"
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:294
+#: Source/Core/DiscIO/Src/CompressedBlob.cpp:281
 msgid "File not compressed"
 msgstr "Fichier non compressé"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:127
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:109
 #, c-format
 msgid "FileIO: Unknown open mode : 0x%02x"
 msgstr "FileIO : mode d'ouverture inconnu : 0x%02x"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:531
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:541
 msgid "Filesystem"
 msgstr "Système de fichiers"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1100
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1126
 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:265
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:252
 msgid "Find next"
 msgstr "Trouver le suivant"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:266
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:253
 msgid "Find previous"
 msgstr "Trouver le précédent"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:632
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626
 msgid "First Block"
 msgstr "Premier bloc"
 
@@ -2536,23 +2603,23 @@ msgstr "Premier bloc"
 msgid "Fix Checksums"
 msgstr "Corriger les sommes de contôle"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:275
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283
 msgid "Force 16:9"
 msgstr "Forcer 16/9è"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:275
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283
 msgid "Force 4:3"
 msgstr "Forcer 4/3"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:568
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548
 msgid "Force Console as NTSC-J"
 msgstr "Forcer la console comme NTSC-J"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406
 msgid "Force Texture Filtering"
 msgstr "Forcer le filtrage de texture"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90
 msgid ""
 "Force texture filtering even if the emulated game explicitly disabled it.\n"
 "Improves texture quality slightly but causes glitches in some games.\n"
@@ -2565,7 +2632,7 @@ msgstr ""
 "\n"
 "Dans le doute, décochez cette case."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83
 msgid ""
 "Force the game to output graphics for widescreen resolutions.\n"
 "Causes graphical glitches is some games.\n"
@@ -2578,7 +2645,7 @@ msgstr ""
 "\n"
 "Dans le doute, décochez cette case."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488
 msgid ""
 "Forces NTSC-J mode for using the Japanese ROM font.\n"
 "Left unchecked, dolphin defaults to NTSC-U and automatically enables this "
@@ -2588,7 +2655,7 @@ msgstr ""
 "Si cette case est décochée, Dolphin sera par défaut en NTSC-U et activera "
 "automatiquement cette option lorsque des jeux japonais seront lancés."
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:74
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:62
 msgid ""
 "Format as ascii (NTSC\\PAL)?\n"
 "Choose no for sjis (NTSC-J)"
@@ -2596,148 +2663,147 @@ msgstr ""
 "Formater comme ASCII (NTSC\\PAL)?\n"
 "Choisir Non pour sjis (NTSC-J)"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:278
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:265
 msgid "Forward"
 msgstr "Avant"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504
 #, c-format
 msgid "Found %d results for '"
 msgstr "Trouvé %d résultats pour '"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:857
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:925
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:858
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:926
 msgid "Frame"
 msgstr "Image"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:867
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:868
 msgid "Frame "
 msgstr "Image "
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:185
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:173
 msgid "Frame Advance"
 msgstr "Avancement d'image"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:536
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549
 msgid "Frame Dumps use FFV1"
 msgstr "L'enregistrement d'images utilise FFV1"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:227
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:214
 msgid "Frame Info"
 msgstr "Info image"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:116
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:103
 msgid "Frame Range"
 msgstr "Plage d'images :"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:138
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:139
 msgid "Frame S&kipping"
 msgstr "Saut d'&image :"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:572
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552
 msgid "Framelimit:"
 msgstr "Image/s max :"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:204
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:191
 msgid "Frames To Record"
 msgstr "Images à enregistrer :"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547
 msgid "Free Look"
 msgstr "Vue libre"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
 msgid "French"
 msgstr "Français"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:38
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:42
 msgid "Frets"
 msgstr "Frets"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:118
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:137
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:105
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:124
 msgid "From"
 msgstr "De"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:426
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:432
 msgid "FullScr"
 msgstr "Plein écran"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:256
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263
 msgid "Fullscreen resolution:"
 msgstr "Résolution en Plein écran :"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:534
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524
 msgid "GCI File(*.gci)"
 msgstr "Fichier GCI (*.gci)"
 
-#: Source/Core/DolphinWX/Src/GCMicDlg.h:44
+#: Source/Core/DolphinWX/Src/GCMicDlg.h:31
 msgid "GCMic Configuration"
 msgstr "Configuration du micro GC"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:432
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
 msgid "GCPad"
 msgstr "Manette GC"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:659
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:658
 msgid "GX_CMD_INVL_VC"
 msgstr "GX_CMD_INVL_VC"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:448
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:452
 msgid "Game ID:"
 msgstr "ID du jeu :"
 
-#: Source/Core/Core/Src/NetPlay.cpp:229
+#: Source/Core/Core/Src/NetPlay.cpp:216
 msgid "Game is already running!"
 msgstr "Le jeu est déjà en cours d'émulation !"
 
-#: Source/Core/Core/Src/NetPlay.cpp:259
+#: Source/Core/Core/Src/NetPlay.cpp:246
 msgid "Game isn't running!"
 msgstr "Le jeu n'est pas en cours d'émulation !"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:389
-#, fuzzy
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:393
 msgid "Game not found!"
-msgstr "Jeu non trouvé !!"
+msgstr "Jeu non trouvé !"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:385
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:389
 msgid "Game-Specific Settings"
 msgstr "Paramètres spécifiques au jeu"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:293
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:294
 msgid "GameConfig"
 msgstr "Config du Jeu"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:525
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:515
 msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)"
 msgstr "Fichiers de sauvegarde GameCube (*.gci;*.gcs;*.sav)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534
 msgid "Gamecube"
 msgstr "GameCube"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:178
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:181
 msgid "Gamecube &Pad Settings"
 msgstr "Paramètres de la &manette GameCube"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:218
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1069
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:205
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1052
 msgid "Gamecube Memory Cards (*.raw,*.gcp)"
 msgstr "Carte mémoires de GameCube (*.raw,*.gcp)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:432
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
 msgid "Gamecube Pad settings"
 msgstr "Paramètres de la manette GameCube"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:117
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302
 msgid "Gecko Codes"
 msgstr "Codes Gecko"
 
-#: Source/Core/Core/Src/GeckoCode.cpp:222
+#: Source/Core/Core/Src/GeckoCode.cpp:214
 #, c-format
 msgid ""
 "GeckoCode failed to run (CT%i CST%i) (%s)\n"
@@ -2750,10 +2816,10 @@ 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:172
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:172
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:197
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:160
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:160
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:202
 msgid "General"
 msgstr "Général"
 
@@ -2761,31 +2827,31 @@ msgstr "Général"
 msgid "General Settings"
 msgstr "Paramètres généraux"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:470
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:281
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:316
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:261
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
 msgid "German"
 msgstr "Allemand"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:449
+#: Source/Core/Core/Src/ActionReplay.cpp:439
 #, 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:430
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:436
 msgid "Graphics"
 msgstr "Graphismes"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:430
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:436
 msgid "Graphics settings"
 msgstr "Paramètres graphiques"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:205
 msgid "Greater Than"
 msgstr "Plus grand que"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87
 msgid ""
 "Greatly increases quality of textures generated using render to texture "
 "effects.\n"
@@ -2804,51 +2870,76 @@ msgstr ""
 "\n"
 "Dans le doute, cochez cette case."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:317
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
 msgid "Greek"
 msgstr "Grèque"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:22
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Green"
 msgstr "Vert"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:24
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Green Left"
 msgstr "Vert Gauche"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:25
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Green Right"
 msgstr "Vert Droite"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:35
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:39
 msgid "Guitar"
 msgstr "Guitare"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1259
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1250
 msgid "HCI_CMD_INQUIRY is called, please report!"
 msgstr "Appel de HCI_CMD_INQUIRY, veuillez nous le signaler !"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:421
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504
+msgid "Hacked Buffer Upload"
+msgstr "Hack de Transmission du Buffer"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431
 msgid "Hacks"
 msgstr "Hacks"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:158
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:146
 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:318
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298
 msgid "Hebrew"
 msgstr "Hébreu"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:313
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:300
 msgid "Height"
 msgstr "Hauteur"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:64
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:51
 msgid "Help"
 msgstr "Aide"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:209
+#: Source/Core/DolphinWX/Src/Main.cpp:229
+msgid ""
+"Hi,\n"
+"\n"
+"Dolphin requires Mac OS X 10.7 or greater.\n"
+"Unfortunately you're running an old version of OS X.\n"
+"The last Dolphin version to support OS X 10.6 is Dolphin 3.5\n"
+"Please upgrade to 10.7 or greater to use the newest Dolphin version.\n"
+"\n"
+"Sayonara!\n"
+msgstr ""
+"Bonjour,\n"
+"\n"
+"Dolphin requiert Mac OS X 10.7 ou plus récent.\n"
+"Malheureusement, vous exécutez une ancienne version d'OS X.\n"
+"La dernière version de Dolphin fonctionnant sur OS X 10.6 est Dolphin 3.5.\n"
+"Veuillez mettre à niveau OS X vers 10.7 ou plus récent pour utiliser les "
+"dernières versions de Dolphin.\n"
+"\n"
+"Sayonara !\n"
+
+#: Source/Core/DolphinWX/Src/Main.cpp:220
 msgid ""
 "Hi,\n"
 "\n"
@@ -2866,15 +2957,15 @@ msgstr ""
 "\n"
 "Sayonara !\n"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:309
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:296
 msgid "Hide"
 msgstr "Cacher"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:307
 msgid "Hide Mouse Cursor"
 msgstr "Masquer le curseur de la souris"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79
 msgid ""
 "Hides the mouse cursor if it's on top of the emulation window.\n"
 "\n"
@@ -2885,26 +2976,26 @@ msgstr ""
 "\n"
 "Dans le doute, cochez cette case."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:54
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41
 msgid "Home"
 msgstr "Home"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:85
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:138
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:76
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:141
 msgid "Host"
 msgstr "Hôte"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.h:44
+#: Source/Core/DolphinWX/Src/HotkeyDlg.h:31
 msgid "Hotkey Configuration"
 msgstr "Configuration des raccourcis clavier"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:272
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:272
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:594
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:260
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:260
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574
 msgid "Hotkeys"
 msgstr "Raccourcis clavier"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:319
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299
 msgid "Hungarian"
 msgstr "Hongrois"
 
@@ -2912,35 +3003,35 @@ msgstr "Hongrois"
 msgid "Hybrid Wiimote"
 msgstr "Wiimote hybride"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:532
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:519
 #, 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:786
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:773
 #, c-format
 msgid ""
-"IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available "
-"in your nand dump\n"
+"IOCTL_ES_LAUNCH: Game tried to reload an IOS or a title that is not "
+"available in your NAND dump\n"
 "TitleID %016llx.\n"
-" Dolphin will likely hang now"
+" Dolphin will likely hang now."
 msgstr ""
-"IOCTL_ES_LAUNCH : Le jeu a essayé de recharger ios ou un titre qui n'est pas "
-"disponible dans votre copie de la NAND\n"
+"IOCTL_ES_LAUNCH : Le jeu a essayé de recharger IOS ou un titre qui n'est pas "
+"disponible dans la copie de votre NAND.\n"
 "ID du titre : %016llx.\n"
-" Dolphin va probablement figer maintenant"
+"Dolphin va probablement se bloquer maintenant."
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:313
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:300
 msgid "IOCTL_ES_READCONTENT - bad destination"
 msgstr "IOCTL_ES_READCONTENT - mauvaise destination"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729
 msgid "IPL Settings"
 msgstr "Paramètres IPL"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269
 msgid "IR"
 msgstr "IR"
 
@@ -2952,23 +3043,23 @@ msgstr "Pointeur IR"
 msgid "IR Sensitivity:"
 msgstr "Sensibilité de l'IR"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:502
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:512
 msgid "ISO Details"
 msgstr "Détails de l'ISO"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:830
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:811
 msgid "ISO Directories"
 msgstr "Dossiers des ISO"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:172
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:166
 msgid "ITALY"
 msgstr "Italie"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:630
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:624
 msgid "Icon"
 msgstr "Icône"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332
 msgid ""
 "If checked, the bounding box registers will be updated. Used by the Paper "
 "Mario games."
@@ -2976,29 +3067,11 @@ 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:318
-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:505
-msgid ""
-"If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use "
-"Audio to throttle using the DSP (might fix audio clicks but can also cause "
-"constant noise depending on the game)."
-msgstr ""
-"Si vous définissez le limitateur de vitesse (Image /s max) à une valeur plus "
-"élevée que la vitesse du jeu (NTSC:60, PAL:50), activer le contrôle audio "
-"pour DSP (peut éliminer les clics audio mais peut causer un bruit constant "
-"selon les jeux)."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:428
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438
 msgid "Ignore Format Changes"
 msgstr "Ignorer les changements de formats"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94
 msgid ""
 "Ignore any changes to the EFB format.\n"
 "Improves performance in many games without any negative effect. Causes "
@@ -3012,7 +3085,7 @@ msgstr ""
 "\n"
 "Dans le doute, cochez cette case."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93
 msgid ""
 "Ignore any requests of the CPU to read from or write to the EFB.\n"
 "Improves performance in some games, but might disable some gameplay-related "
@@ -3030,11 +3103,11 @@ msgstr ""
 msgid "Import Save"
 msgstr "Importer une sauvegarde"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:59
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:48
 msgid "Import failed, try again?"
 msgstr "L'importation a échoué. Essayer de nouveau ?"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:454
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:441
 msgid ""
 "Imported file has gsc extension\n"
 "but does not have a correct header"
@@ -3042,11 +3115,11 @@ msgstr ""
 "Le fichier importé a l'extension GSC\n"
 "mais n'a pas une entête valide"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:442
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:429
 msgid "Imported file has invalid length"
 msgstr "Le fichier importé a une longueur non valide"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:451
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:438
 msgid ""
 "Imported file has sav extension\n"
 "but does not have a correct header"
@@ -3054,19 +3127,7 @@ msgstr ""
 "Le fichier importé a l'extension SAV\n"
 "mais n'a pas une entête valide"
 
-#: 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 ""
-"Améliore les performances mais peut causer de petits pépins dans les jeux "
-"s'appuyant sur une émulation de brouillard/fumée correcte.\n"
-"\n"
-"Dans le doute, décochez cette case."
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350
 msgid "In Game"
 msgstr "Dans le jeu"
 
@@ -3074,67 +3135,67 @@ msgstr "Dans le jeu"
 msgid "In-Game"
 msgstr "Dans le jeu"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:34
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305
 msgid "Info"
 msgstr "Info"
 
-#: Source/Core/Common/Src/MsgHandler.cpp:65
+#: Source/Core/Common/Src/MsgHandler.cpp:51
 msgid "Information"
 msgstr "Information"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:481
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:468
 msgid "Input"
 msgstr "Entrée"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:63
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:50
 msgid "Insert"
 msgstr "Insérer"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:176
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:166
 msgid "Insert Encrypted or Decrypted code here..."
 msgstr "Indiquer un code crypté ou décrypté ici..."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:763
 msgid "Insert SD Card"
 msgstr "Insérer une carte SD"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:34
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:21
 msgid "Insert name here.."
 msgstr "Indiquer un nom ici..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:196
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:199
 msgid "Install WAD"
 msgstr "Installer un WAD"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:895
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:888
 msgid "Install to Wii Menu"
 msgstr "Installer dans le menu Wii"
 
-#: Source/Core/Core/Src/x64MemTools.cpp:252
+#: Source/Core/Core/Src/x64MemTools.cpp:242
 msgid ""
 "InstallExceptionHandler called, but this platform does not yet support it."
 msgstr ""
 "InstallExceptionHandler a été appelé, mais cette plateforme ne le prend pas "
 "encore en charge."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1297
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
 msgid "Installing WAD..."
 msgstr "Installation du WAD..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:885
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:901
 msgid "Integrity Check Error"
 msgstr "Erreur lors de la vérification de l'intégrité"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:891
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:907
 msgid "Integrity check completed"
 msgstr "Vérification de l'intégrité terminée"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:890
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:906
 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:882
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:898
 #, c-format
 msgid ""
 "Integrity check for partition %d failed. Your dump is most likely corrupted "
@@ -3143,19 +3204,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:552
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532
 msgid "Interface"
 msgstr "Interface"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:646
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627
 msgid "Interface Settings"
 msgstr "Paramètres de l'interface"
 
-#: Source/Core/Core/Src/State.cpp:240
+#: Source/Core/Core/Src/State.cpp:228
 msgid "Internal LZO Error - compression failed"
 msgstr "Erreur interne LZO - échec de la compression"
 
-#: Source/Core/Core/Src/State.cpp:348
+#: Source/Core/Core/Src/State.cpp:336
 #, c-format
 msgid ""
 "Internal LZO Error - decompression failed (%d) (%li, %li) \n"
@@ -3164,41 +3225,45 @@ 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:485
+#: Source/Core/Core/Src/State.cpp:473
 msgid "Internal LZO Error - lzo_init() failed"
 msgstr "Erreur interne LZO -  échec de lzo_init()"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:344
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:352
 msgid "Internal Resolution:"
 msgstr "Résolution interne :"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:42
+msgid "Interpreter (VERY slow)"
+msgstr "Interpréteur (TRÈS lent)"
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349
 msgid "Intro"
 msgstr "Intro"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:194
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:187
 #, c-format
 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:600
 msgid "Invalid Value!"
 msgstr "Valeur non valide !"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:462
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:449
 msgid "Invalid bat.map or dir entry"
 msgstr "bar.map ou entrée dir non valide"
 
-#: Source/Core/Core/Src/CoreTiming.cpp:548
+#: Source/Core/Core/Src/CoreTiming.cpp:553
 #, c-format
 msgid "Invalid event type %i"
 msgstr "Type d'évènement non valide : %i"
 
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:326
+#: Source/Core/Core/Src/HW/DVDInterface.cpp:309
 msgid "Invalid file"
 msgstr "Fichier non valide"
 
-#: Source/Core/DiscIO/Src/BannerLoaderGC.cpp:41
+#: Source/Core/DiscIO/Src/BannerLoaderGC.cpp:28
 #, c-format
 msgid ""
 "Invalid opening.bnr found in gcm:\n"
@@ -3209,48 +3274,56 @@ msgstr ""
 "%s\n"
 "Vous devriez copier à nouveau ce jeu."
 
-#: Source/Core/Core/Src/Movie.cpp:735
+#: Source/Core/Core/Src/Movie.cpp:726
 msgid "Invalid recording file"
 msgstr "Fichier d'enregitrement non valide"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:473
+#: 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:456
+#: 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:444
+#: 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:513
+#: Source/Core/Core/Src/Core.cpp:511
 msgid "Invalid state"
 msgstr "Etat non valide"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:473
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:320
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300
 msgid "Italian"
 msgstr "Italien"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:183
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:177
 msgid "JAPAN"
 msgstr "Japon"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:321
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:46
+msgid "JIT Recompiler (recommended)"
+msgstr "Recompilateur JIT (recommandé)"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:47
+msgid "JITIL experimental recompiler"
+msgstr "Recompilateur expérimental JITIL"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:279
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
 msgid "Japanese"
 msgstr "Japonais"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:188
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:182
 msgid "KOREA"
 msgstr "Corée"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78
 msgid ""
 "Keep the game window on top of all other windows.\n"
 "\n"
@@ -3260,62 +3333,62 @@ msgstr ""
 "\n"
 "Dans le doute, décochez cette case."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:298
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:306
 msgid "Keep window on top"
 msgstr "Toujours au premier plan"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:241
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:241
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:229
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:229
 msgid "Key"
 msgstr "Touche"
 
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282
 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:322
 msgid "Korean"
 msgstr "Coréen"
 
 #. i18n:  Left
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:57
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:44
 msgid "L"
 msgstr "L"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:39
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:26
 msgid "L Button"
 msgstr "Bouton L"
 
 #. i18n:  Left-Analog
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:61
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:48
 msgid "L-Analog"
 msgstr "L Analog."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:585
 msgid "Language:"
 msgstr "Langue :"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:152
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:153
 msgid "Last Overwritten State"
 msgstr "Dernier état écrasé"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:159
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:161
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:160
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:162
 msgid "Last Saved State"
 msgstr "Dernier état sauvegardé"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:696
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:677
 msgid "Latency:"
 msgstr "Latence :"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:276
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:55
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:263
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:42
 msgid "Left"
 msgstr "Gauche"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:60
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:64
 msgid "Left Stick"
 msgstr "Stick Gauche"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:257
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:257
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:245
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:245
 msgid ""
 "Left click to detect hotkeys.\n"
 "Enter space to clear."
@@ -3323,7 +3396,7 @@ msgstr ""
 "Clic gauche pour détecter le raccourci clavier.\n"
 "Touche Espace pour effacer."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:689
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:678
 msgid ""
 "Left-click to detect input.\n"
 "Middle-click to clear.\n"
@@ -3333,7 +3406,7 @@ msgstr ""
 "Clic du milieu pour effacer.\n"
 "Clic droit pour plus d'options."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:694
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:683
 msgid ""
 "Left/Right-click for more options.\n"
 "Middle-click to clear."
@@ -3341,76 +3414,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:206
 msgid "Less Than"
 msgstr "Plus petit que"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:565
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545
 msgid "Limit by FPS"
 msgstr "Nb de FPS comme limite"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:924
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:915
 msgid "Load"
 msgstr "Charger"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544
 msgid "Load Custom Textures"
 msgstr "Charger textures personnalisées"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
 msgid "Load State Slot 1"
 msgstr "Charger l'état du Slot 1"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189
 msgid "Load State Slot 2"
 msgstr "Charger l'état du Slot 2"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:190
 msgid "Load State Slot 3"
 msgstr "Charger l'état du Slot 3"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:203
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:191
 msgid "Load State Slot 4"
 msgstr "Charger l'état du Slot 4"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192
 msgid "Load State Slot 5"
 msgstr "Charger l'état du Slot 5"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193
 msgid "Load State Slot 6"
 msgstr "Charger l'état du Slot 6"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:194
 msgid "Load State Slot 7"
 msgstr "Charger l'état du Slot 7"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:195
 msgid "Load State Slot 8"
 msgstr "Charger l'état du Slot 8"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:155
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:156
 msgid "Load State..."
 msgstr "Charger un état..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1332
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1359
 msgid "Load Wii System Menu"
 msgstr "Charger le Menu Système Wii"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1327
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1354
 #, c-format
 msgid "Load Wii System Menu %d%c"
 msgstr "Charger le Menu Système Wii %d%c"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112
 msgid ""
 "Load custom textures from User/Load/Textures/<game_id>/\n"
 "\n"
@@ -3420,7 +3493,7 @@ msgstr ""
 "\n"
 "Dans le doute, décochez cette case."
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:50
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:37
 msgid "Load preset values from hack patterns available."
 msgstr ""
 "Charger les valeurs de pré-réglage à partir de la palette de hack "
@@ -3430,23 +3503,23 @@ msgstr ""
 msgid "Local"
 msgstr "Local"
 
-#: Source/Core/DolphinWX/Src/LogWindow.h:51
+#: Source/Core/DolphinWX/Src/LogWindow.h:38
 msgid "Log"
 msgstr "Journal"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:26
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:13
 msgid "Log Configuration"
 msgstr "Configuration de la journalisation"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:296
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304
 msgid "Log FPS to file"
 msgstr "Enregistrer le nombre de FPS"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:96
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83
 msgid "Log Types"
 msgstr "Types de journaux"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103
 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"
@@ -3459,24 +3532,24 @@ msgstr ""
 "\n"
 "Dans le doute, décochez cette case."
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:81
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:68
 msgid "Logger Outputs"
 msgstr "Sorties des journalisations"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132
-#: Source/Core/DolphinWX/Src/Frame.cpp:328
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:119
+#: Source/Core/DolphinWX/Src/Frame.cpp:314
 msgid "Logging"
 msgstr "Journalisation"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:255
+#: Source/Core/Core/Src/NetPlayClient.cpp:259
 msgid "Lost connection to server!"
 msgstr "Connexion au serveur perdue !"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:42
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:29
 msgid "M Button"
 msgstr "Bouton M"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:119
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:112
 #, c-format
 msgid ""
 "MD5 mismatch\n"
@@ -3485,51 +3558,66 @@ msgstr ""
 "MD5 non concordant\n"
 " %016llx%016llx != %016llx%016llx"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314
 msgid "MMU Speed Hack"
 msgstr "Hack de vitesse pour le MMU"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:527
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:563
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:517
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:556
 msgid "MadCatz Gameshark files(*.gcs)"
 msgstr "Fichiers MadCatz Gameshark (*.gcs)"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:51
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:63
+#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:38
 msgid "Main Stick"
 msgstr "Stick principal"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460
 msgid "Maker ID:"
 msgstr "ID concepteur :"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487
 msgid "Maker:"
 msgstr "Concepteur :"
 
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100
+msgid ""
+"Makes distant objects more visible by removing fog, thus increasing the "
+"overall detail.\n"
+"Disabling fog will break some games which rely on proper fog emulation.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+"Rendre les objets lointains plus visibles en enlevant le brouillard, "
+"améliorant donc les détails.\n"
+"Faire ceci va empêcher certains jeux se basant sur une émulation correcte du "
+"brouillard de fonctionner correctement.\n"
+"\n"
+"Dans le doute, décochez cette case."
+
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:97
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:100
 msgid "Max"
 msgstr "Max"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:448
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:435
 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:291
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:278
 msgid "Memcard already opened"
 msgstr "Carte mémoire déjà chargée"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:912
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:913
 msgid "Memory Byte"
 msgstr "Octet mémoire"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:225
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:113
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:212
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:93
 msgid "Memory Card"
 msgstr "Carte mémoire"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.h:36
+#: Source/Core/DolphinWX/Src/MemcardManager.h:23
 msgid ""
 "Memory Card Manager WARNING-Make backups before using, should be fixed but "
 "could mangle stuff!"
@@ -3537,7 +3625,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:371
+#: Source/Core/Core/Src/CoreParameter.cpp:360
 #, c-format
 msgid ""
 "Memory Card filename in Slot %c is incorrect\n"
@@ -3554,17 +3642,17 @@ msgstr ""
 "%s\n"
 "Voulez-vous copier l'ancien fichier vers ce nouvel endroit ?\n"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:124
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:112
 msgid "Memorycard filesize does not match the header size"
 msgstr ""
 "La taille du fichier de la carte mémoire ne correspond pas à la taille de "
 "l'entête."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:50
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:37
 msgid "Menu"
 msgstr "Menu"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:114
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:94
 msgid "Mic"
 msgstr "Micro"
 
@@ -3573,20 +3661,20 @@ msgstr "Micro"
 msgid "Min"
 msgstr "Min"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:580
 msgid "Misc"
 msgstr "Divers"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:795
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776
 msgid "Misc Settings"
 msgstr "Paramètres divers"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:240
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:294
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:227
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:281
 msgid "Modifier"
 msgstr "Modif."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106
 msgid ""
 "Modify textures to show the format they're encoded in. Needs an emulation "
 "reset in most cases.\n"
@@ -3599,20 +3687,20 @@ msgstr ""
 "\n"
 "Dans le doute, décochez cette case."
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:115
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:108
 msgid "Monospaced font"
 msgstr "Police mono-espacée."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:305
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:292
 msgid "Motion Plus"
 msgstr "Motion Plus"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:309
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:86
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:296
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73
 msgid "Motor"
 msgstr "Vibreur"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:654
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:666
 msgid ""
 "Move the mouse pointer over an option to display a detailed description.\n"
 "\n"
@@ -3630,225 +3718,238 @@ msgstr ""
 "\n"
 "\n"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:75
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:62
 msgid "Multiply"
 msgstr "Multiplier"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:651
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:650
 msgid "NOP"
 msgstr "NOP"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:629
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:628
 msgid "NOTE: Stream size doesn't match actual data length\n"
 msgstr ""
 "Note : La taille du flux est différente de la longueur actuelle des données\n"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:129
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:116
 msgid "NP Add"
 msgstr "NP Ajout"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:124
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:111
 msgid "NP Begin"
 msgstr "NP Début"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:132
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:119
 msgid "NP Decimal"
 msgstr "NP Décimal"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:126
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:113
 msgid "NP Delete"
 msgstr "NP Supprimer"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:133
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:120
 msgid "NP Divide"
 msgstr "NP Diviser"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:120
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:107
 msgid "NP Down"
 msgstr "NP Bas"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:123
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:110
 msgid "NP End"
 msgstr "NP End"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:111
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:98
 msgid "NP Enter"
 msgstr "NP Entrée"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:127
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:114
 msgid "NP Equal"
 msgstr "NP Egal"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:116
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:103
 msgid "NP Home"
 msgstr "NP Début"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:125
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:112
 msgid "NP Insert"
 msgstr "NP Insérer"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:117
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:104
 msgid "NP Left"
 msgstr "NP Gauche"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:128
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:115
 msgid "NP Multiply"
 msgstr "NP Multiplier"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:122
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:109
 msgid "NP Page Down"
 msgstr "NP Page bas"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:121
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:108
 msgid "NP Page Up"
 msgstr "NP Page Haut"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:119
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:106
 msgid "NP Right"
 msgstr "NP Droite"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:130
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:117
 msgid "NP Separator"
 msgstr "NP Séparateur"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:109
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:96
 msgid "NP Space"
 msgstr "NP Espace"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:131
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:118
 msgid "NP Subtract"
 msgstr "NP Soustraire"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:110
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:97
 msgid "NP Tab"
 msgstr "NP Tabulation"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:118
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:105
 msgid "NP Up"
 msgstr "NP Haut"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:444
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:59
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:50
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:448
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:46
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:37
 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:25
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:72
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:282
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:553
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:15
 msgid "Name: "
 msgstr "Nom :"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:526
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:562
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:516
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:555
 msgid "Native GCI files(*.gci)"
 msgstr "Fichiers natifs GCI (*.gci)"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:161
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:148
 msgid "New Scan"
 msgstr "Nouvelle recherche"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:206
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:193
 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:801
 msgid "Next Page"
 msgstr "Page suivante"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:165
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:152
 msgid "Next Scan"
 msgstr "Recherche suivante"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:68
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:59
 msgid "Nickname :"
 msgstr "Pseudo :"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:196
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:190
 msgid "No Country (SDK)"
 msgstr "Pas de pays (SDK)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:370
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:357
 msgid "No ISOs or WADS found"
 msgstr "Aucun ISO ou WAD trouvé"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:508
+#: Source/Core/Core/Src/ConfigManager.h:17
+msgid "No audio output"
+msgstr "Pas de sortie audio"
+
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:501
 #, c-format
 msgid "No banner file found for title  %s"
 msgstr "Aucune bannière trouvée pour le titre  %s"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:761
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:768
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:760
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:767
 msgid "No description available"
 msgstr "Aucune description disponible"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:514
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:535
 msgid "No docking"
 msgstr "Pas d'attachement"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:859
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:860
 msgid "No file loaded"
 msgstr "Aucun fichier chargé"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:439
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:426
 msgid "No free dir index entries"
 msgstr "Aucune entrée de dossier d'index libre"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:895
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:896
 msgid "No recorded file"
 msgstr "Aucun fichier enregistré"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:501
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:494
 #, c-format
 msgid "No save folder found for title %s"
 msgstr "Aucun dossier de sauvegarde trouvé pour le titre %s"
 
+#: Source/Plugins/Plugin_VideoOGL/Src/main.cpp:132
+#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:111
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:23
 #: Source/Core/DolphinWX/Src/NetWindow.cpp:600
 msgid "None"
 msgstr "Aucune"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:323
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303
 msgid "Norwegian Bokmaal"
 msgstr "Norvégien Bokmål"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:203
 msgid "Not Equal"
 msgstr "Différent"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:804
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:794
 msgid "Not Set"
 msgstr "Non défini"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:626
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:101
+#, c-format
+msgid "Not a Wii save or read failure for file header size %x"
+msgstr ""
+"Ce n'est pas une sauvegarde Wii ou échec de le lecture de la taille de "
+"l'entête du fichier %x"
+
+#: Source/Core/DolphinWX/Src/Main.cpp:654
 msgid "Not connected"
 msgstr "Non connectée"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:309
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:296
 msgid "Notes"
 msgstr "Notes"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:16
 msgid "Notes: "
 msgstr "Notes :"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:71
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:74
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:580
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:621
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:629
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:59
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:64
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:613
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:659
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:667
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:31
 msgid "Notice"
 msgstr "Note"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:105
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:92
 msgid "Num Lock"
 msgstr "Verr. Num"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:88
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:75
 msgid "Number Of Codes: "
 msgstr "Nombre de codes :"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:30
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:34
 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26
 msgid "Nunchuk"
 msgstr "Nunchuck"
@@ -3857,97 +3958,98 @@ msgstr "Nunchuck"
 msgid "Nunchuk Acceleration"
 msgstr "Accéleration du Nunchuck"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:877
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:878
 msgid "Object"
 msgstr "Objet"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:135
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:122
 msgid "Object Range"
 msgstr "Plage d'objets :"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:243
 msgid "Off"
 msgstr "Arrêt"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:62
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:49
 msgid "Offset:"
 msgstr "Offset :"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:582
 msgid "On-Screen Display Messages"
 msgstr "Afficher les messages informatifs"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:436
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:423
 #, c-format
 msgid "Only %d blocks available"
 msgstr "%d blocs disponibles seulement"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:420
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:178
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:426
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:166
 msgid "Open"
 msgstr "Ouvrir"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:876
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:867
 msgid "Open &containing folder"
 msgstr "Ouvrir l'emplacement du fichier"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:873
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:864
 msgid "Open Wii &save folder"
 msgstr "Ouvrir le dossier de &sauvegarde Wii"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:420
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:426
 msgid "Open file..."
 msgstr "Ouvrir un fichier..."
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:61
+#: Source/Core/AudioCommon/Src/OpenALStream.cpp:48
 #, 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:72
+#: Source/Core/AudioCommon/Src/OpenALStream.cpp:59
 msgid "OpenAL: can't find sound devices"
 msgstr "OpenAL : impossible de trouver des périphériques audio"
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:66
+#: Source/Core/AudioCommon/Src/OpenALStream.cpp:53
 #, 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:493
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502
 msgid "OpenCL Texture Decoder"
 msgstr "Décodeur de texture OpenCL"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503
 msgid "OpenMP Texture Decoder"
 msgstr "Décodeur de texture OpenMP"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:317
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:94
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:304
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:81
 msgid "Options"
 msgstr "Options"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:22
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Orange"
 msgstr "Orange"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:468
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:455
+#, fuzzy
 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"
+"and import the saves to a new memcard\n"
 msgstr ""
 "L'ordre des fichiers dans le Dossier de fichiers ne correspond pas à l'ordre "
 "des blocs\n"
 "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:316
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:324
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:509
 msgid "Other"
 msgstr "Autres"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:206
+#: Source/Core/Core/Src/NetPlayClient.cpp:210
 msgid ""
 "Other client disconnected while game is running!! NetPlay is disabled. You "
 "manually stop the game."
@@ -3955,15 +4057,15 @@ 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:481
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:468
 msgid "Output"
 msgstr "Sortie"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:342
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:348
 msgid "P&lay Recording..."
 msgstr "Jouer l'enregistrement..."
 
-#: Source/Core/Core/Src/HW/GCPad.cpp:30
+#: Source/Core/Core/Src/HW/GCPad.cpp:18
 msgid "Pad"
 msgstr "Manette"
 
@@ -3971,160 +4073,160 @@ msgstr "Manette"
 msgid "Pad "
 msgstr "Manette "
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:34
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:38
 msgid "Pads"
 msgstr "Manettes"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:108
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:95
 msgid "Page Down"
 msgstr "Défil Bas"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:107
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:94
 msgid "Page Up"
 msgstr "Défil Haut"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:35
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:22
 msgid "Paragraph"
 msgstr "Paragraphe"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:64
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:51
 msgid "Parameters"
 msgstr "Paramètres"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:222
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:217
 #, c-format
 msgid "Partition %i"
 msgstr "Partition %i"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:296
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:297
 msgid "Patches"
 msgstr "Patchs"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:556
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536
 msgid "Paths"
 msgstr "Chemins"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1538
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1539
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:51
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1565
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1566
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:38
 msgid "Pause"
 msgstr "Pause"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:128
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:129
 msgid "Pause at end of movie"
 msgstr "Faire une pause à la fin du film"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:397
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405
 msgid "Per-Pixel Lighting"
 msgstr "Eclairage par pixel"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352
 msgid "Perfect"
 msgstr "Parfait"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:609
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:642
 #, c-format
 msgid "Perspective %d"
 msgstr "Perspective %d"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:165
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:424
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1547
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1548
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:152
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:430
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1574
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1575
 msgid "Play"
 msgstr "Démarrer"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176
 msgid "Play Recording"
 msgstr "Jouer l'enregistrement..."
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:170
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:170
 msgid "Play/Pause"
 msgstr "Démarrer/Arrêter"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351
 msgid "Playable"
 msgstr "Jouable"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:154
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:141
 msgid "Playback Options"
 msgstr "Options de lecture"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:301
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:304
 msgid "Players"
 msgstr "Joueurs"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:988
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:991
 msgid "Please confirm..."
 msgstr "Veuillez confirmer..."
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:579
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:612
 msgid "Please create a perspective before saving"
 msgstr "Merci de créer une perspective avant de sauvegarder"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:36
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:23
 msgid "Plus-Minus"
 msgstr "Plus-Moins"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:324
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304
 msgid "Polish"
 msgstr "Polonais"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:713
 msgid "Port 1"
 msgstr "Port 1"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714
 msgid "Port 2"
 msgstr "Port 2"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:734
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715
 msgid "Port 3"
 msgstr "Port 3"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716
 msgid "Port 4"
 msgstr "Port 4"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:97
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:130
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:88
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:133
 msgid "Port :"
 msgstr "Port :"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:325
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305
 msgid "Portuguese"
 msgstr "Portugais"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:326
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306
 msgid "Portuguese (Brazilian)"
 msgstr "Portugais (brésilien)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:391
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:399
 msgid "Post-Processing Effect:"
 msgstr "Effet de Post-processing :"
 
-#: Source/Core/Core/Src/Movie.cpp:936
+#: Source/Core/Core/Src/Movie.cpp:927
 #, 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:1055
+#: Source/Core/Core/Src/Movie.cpp:1046
 #, 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:1032
+#: Source/Core/Core/Src/Movie.cpp:1023
 #, c-format
 msgid "Premature movie end in PlayWiimote. %u > %u"
 msgstr "Fin de film prématurée dans Play Wiimote (%u > %u)"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:48
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:35
 msgid "Presets: "
 msgstr "Pré-réglages :"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:205
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:192
 msgid "Prev Page"
 msgstr "Page préc."
 
@@ -4132,67 +4234,67 @@ msgstr "Page préc."
 msgid "Previous Page"
 msgstr "Page précédente"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:183
 msgid "Previous Value"
 msgstr "Valeur précédente"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:60
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:47
 msgid "Print"
 msgstr "Imprimer"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:894
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:885
 msgid "Profile"
 msgstr "Profil"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.h:55
+#: Source/Core/DolphinWX/Src/ISOProperties.h:42
 msgid "Properties"
 msgstr "Propriétés"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:283
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:286
 msgid "Purge Cache"
 msgstr "Vider le cache"
 
-#: Source/Core/Common/Src/MsgHandler.cpp:66
+#: Source/Core/Common/Src/MsgHandler.cpp:52
 msgid "Question"
 msgstr "Question"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:159
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:316
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:162
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:319
 msgid "Quit"
 msgstr "Quitter"
 
 #. i18n:  Right
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:59
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:46
 msgid "R"
 msgstr "R"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:40
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:27
 msgid "R Button"
 msgstr "Bouton R"
 
 #. i18n:  Right-Analog
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:63
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
 msgid "R-Analog"
 msgstr "R Analog."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:445
 msgid "RAM"
 msgstr "RAM"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:175
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:169
 msgid "RUSSIA"
 msgstr "Russie"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:528
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:515
 msgid "Range"
 msgstr "Etendue"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:190
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:178
 msgid "Read-only mode"
 msgstr "Mode Lecture seule"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:487
 msgid "Real"
 msgstr "Réel"
 
@@ -4208,33 +4310,33 @@ msgstr "Wiimote physique"
 msgid "Reconnect Wiimote on State Loading"
 msgstr "Reconnecter la Wiimote lors du chargement d'un état"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:193
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:217
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:791
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:180
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:204
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:790
 msgid "Record"
 msgstr "Enregistrer"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:174
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:161
 msgid "Recording Info"
 msgstr "Infos sur l'enregistrement"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:202
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:189
 msgid "Recording Options"
 msgstr "Options d'enregistrement"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:21
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Red"
 msgstr "Rouge"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:24
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Red Left"
 msgstr "Rouge Gauche"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:25
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Red Right"
 msgstr "Rouge Droite"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86
 msgid ""
 "Reduces the amount of aliasing caused by rasterizing 3D graphics.\n"
 "This makes the rendered picture look less blocky.\n"
@@ -4250,28 +4352,28 @@ msgstr ""
 "Dans le doute, sélectionnez Aucune."
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:60
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:421
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:903
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:427
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:894
 msgid "Refresh"
 msgstr "Rafraîchir"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:180
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:168
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:168
 msgid "Refresh List"
 msgstr "Rafraîchir la liste"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:421
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:427
 msgid "Refresh game list"
 msgstr "Rafraîchir la liste des jeux"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:405
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:427
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:77
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:812
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:409
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:431
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:64
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:793
 msgid "Remove"
 msgstr "Retirer"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99
 msgid ""
 "Render the scene as a wireframe.\n"
 "\n"
@@ -4281,198 +4383,206 @@ msgstr ""
 "\n"
 "Dans le doute, décochez cette case."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:308
 msgid "Render to Main Window"
 msgstr "Rendu dans la fenêtre principale"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:915
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:172
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:906
 msgid "Reset"
 msgstr "Reset"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:190
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:177
 msgid "Results"
 msgstr "Résultats"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:29
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:16
 msgid "Return"
 msgstr "Entrée"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:277
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:57
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464
+msgid "Revision:"
+msgstr ""
+
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:264
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:44
 msgid "Right"
 msgstr "Droite"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:61
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:65
 msgid "Right Stick"
 msgstr "Stick Droit"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:85
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:295
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:72
 msgid "Rumble"
 msgstr "Rumble"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:518
-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:498
+msgid ""
+"Run DSP HLE and LLE on a dedicated thread (not recommended: might cause "
+"audio glitches with HLE and freezes with LLE)."
+msgstr ""
+"Exécute les DSP HLE et LLE sur un thread dédié (non recommandé : peut "
+"provoquer des pépins avec le HLE et des blocages avec le LLE)."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:327
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307
 msgid "Russian"
 msgstr "Russe"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:149
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:150
 msgid "Sa&ve State"
 msgstr "Sau&vegarder l'état"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:465
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475
 msgid "Safe"
 msgstr "Sûr "
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:196
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:446
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:925
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:183
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:452
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916
 msgid "Save"
 msgstr "Sauver"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:532
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:522
 msgid "Save GCI as..."
 msgstr "Enregistrer GCI sous..."
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
 msgid "Save State Slot 1"
 msgstr "Sauvegarder l'état vers le Slot 1"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:198
 msgid "Save State Slot 2"
 msgstr "Sauvegarder l'état vers le Slot 2"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:199
 msgid "Save State Slot 3"
 msgstr "Sauvegarder l'état vers le Slot 3"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:212
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:212
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200
 msgid "Save State Slot 4"
 msgstr "Sauvegarder l'état vers le Slot 4"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201
 msgid "Save State Slot 5"
 msgstr "Sauvegarder l'état vers le Slot 5"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202
 msgid "Save State Slot 6"
 msgstr "Sauvegarder l'état vers le Slot 6"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:203
 msgid "Save State Slot 7"
 msgstr "Sauvegarder l'état vers le Slot 7"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204
 msgid "Save State Slot 8"
 msgstr "Sauvegarder l'état vers le Slot 8"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:151
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:152
 msgid "Save State..."
 msgstr "Enregistrer l'état"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:582
 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:592
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:602
 msgid "Save as..."
 msgstr "Enregistrer sous..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1203
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1204
 msgid "Save compressed GCM/ISO"
 msgstr "Sauver le fichier compressé GCM/ISO"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:446
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:452
 msgid "Save current perspective"
 msgstr "Sauvegarder la perspective actuelle"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1192
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193
 msgid "Save decompressed GCM/ISO"
 msgstr "Sauvegarder le fichier GCM/ISO décompressé"
 
-#: Source/Core/Core/Src/Movie.cpp:801
+#: Source/Core/Core/Src/Movie.cpp:792
 #, 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:396
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:404
 msgid "Scaled EFB Copy"
 msgstr "Copie à l'échelle de l'EFB"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:556
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:543
 #, c-format
 msgid "Scanning %s"
 msgstr "Analyse de %s"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:539
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:526
 msgid "Scanning for ISOs"
 msgstr "Recherche d'ISO"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:540
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:527
 msgid "Scanning..."
 msgstr "Recherche..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:427
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
 msgid "ScrShot"
 msgstr "Capt écran"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:106
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:93
 msgid "Scroll Lock"
 msgstr "Arrêt défil."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:264
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:251
 msgid "Search"
 msgstr "Rechercher"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:227
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:214
 msgid "Search Filter"
 msgstr "Fitre de recherche"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:810
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:791
 msgid "Search Subfolders"
 msgstr "Chercher dans sous-dossiers"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:250
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:237
 msgid "Search current Object"
 msgstr "Rechercher l'objet actuel"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:254
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:241
 msgid "Search for hex Value:"
 msgstr "Rechercher une valeur Hexadécimale :"
 
-#: Source/Core/Common/Src/SysConf.h:103 Source/Core/Common/Src/SysConf.h:126
-#: Source/Core/Common/Src/SysConf.h:146 Source/Core/Common/Src/SysConf.h:167
+#: Source/Core/Common/Src/SysConf.h:90 Source/Core/Common/Src/SysConf.h:113
+#: Source/Core/Common/Src/SysConf.h:133 Source/Core/Common/Src/SysConf.h:154
 #, c-format
 msgid "Section %s not found in SYSCONF"
 msgstr "La section %s n'a pas été trouvée dans SYSCONF"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:59
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:490
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:46
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:477
 msgid "Select"
 msgstr "Select"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:677
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1072
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:683
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1087
 msgid "Select The Recording File"
 msgstr "Sélectionner le fichier d'enregistrement"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1285
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1312
 msgid "Select a Wii WAD file to install"
 msgstr "Sélectionner un fichier WAD de Wii à installer"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:70
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74
 msgid ""
 "Select a hardware adapter to use.\n"
 "\n"
@@ -4482,31 +4592,31 @@ msgstr ""
 "\n"
 "Dans le doute, sélectionnez la première."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:520
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:510
 msgid "Select a save file to import"
 msgstr "Sélectionner un fichier de sauvegarde à importer"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:363
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:366
 msgid "Select floating windows"
 msgstr "Sélectionner les fenêtres flottantes"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:582
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:585
 msgid "Select the file to load"
 msgstr "Sélectionner le fichier à charger"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1241
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1268
 msgid "Select the save file"
 msgstr "Sélectionner le fichier à enregistrer"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1388
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1415
 msgid "Select the state to load"
 msgstr "Sélectionner l'état à charger"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1429
 msgid "Select the state to save"
 msgstr "Sélectionner l'état à enregistrer"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82
 msgid ""
 "Select what aspect ratio to use when rendering:\n"
 "Auto: Use the native aspect ratio\n"
@@ -4525,15 +4635,15 @@ msgstr ""
 "\n"
 "Dans le doute, choisissez Auto."
 
-#: Source/Core/InputCommon/Src/InputConfig.cpp:61
+#: Source/Core/InputCommon/Src/InputConfig.cpp:48
 msgid "Selected controller profile does not exist"
 msgstr "Le profil de controleur sélectionné n'existe pas"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:116
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:109
 msgid "Selected font"
 msgstr "Police sélectionnée"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75
 msgid ""
 "Selects the display resolution used in fullscreen mode.\n"
 "This should always be bigger than or equal to the internal resolution. "
@@ -4550,23 +4660,39 @@ msgstr ""
 "Si vous ne savez toujours pas, sélectionnez la plus haute résolution "
 "affichée."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:69
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:70
 msgid ""
 "Selects what graphics API to use internally.\n"
 "Direct3D 9 usually is the fastest one. OpenGL is more accurate though. "
 "Direct3D 11 is somewhere between the two.\n"
 "Note that the Direct3D backends are only available on Windows.\n"
 "\n"
-"If unsure, use Direct3D 9."
+"If unsure, use Direct3D 11."
 msgstr ""
-"Sélectionne l'API graphique à utiliser.\n"
-"Direct3D 9 est généralement le plus rapide. OpenGL est cependant le plus "
-"précis. Direct3D 11 est quelque part entre les deux.\n"
+"Sélectionne quel moteur graphique doit être utilisé en interne.\n"
+"Direct3D 9 est généralement le plus rapide. OpenGL est le plus précis. "
+"Direct3D 11 est entre les deux.\n"
 "Les moteurs Direct3D ne sont disponibles que pour Windows.\n"
 "\n"
-"Dans le doute, sélectionnez Direct3D 9."
+"Dans le doute, sélectionnez Direct3D 11."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:288
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72
+msgid ""
+"Selects what graphics API to use internally.\n"
+"Direct3D 9 usually is the fastest one. OpenGL is more accurate though. "
+"Direct3D 11 is somewhere between the two.\n"
+"Note that the Direct3D backends are only available on Windows.\n"
+"\n"
+"If unsure, use OpenGL."
+msgstr ""
+"Sélectionne quel moteur graphique doit être utilisé en interne.\n"
+"Direct3D 9 est généralement le plus rapide. OpenGL est le plus précis. "
+"Direct3D 11 est entre les deux.\n"
+"Les moteurs Direct3D ne sont disponibles que pour Windows.\n"
+"\n"
+"Dans le doute, sélectionnez OpenGL."
+
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:291
 msgid "Send"
 msgstr "Envoyer"
 
@@ -4574,26 +4700,26 @@ msgstr "Envoyer"
 msgid "Sensor Bar Position:"
 msgstr "Position de la Sensor Bar :"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:77
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:64
 msgid "Separator"
 msgstr "Séparateur"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:328
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308
 msgid "Serbian"
 msgstr "Serbe"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:522
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502
 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:488
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:475
 msgid "Set"
 msgstr "Paramétrer"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:877
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:868
 msgid "Set as &default ISO"
 msgstr "Définir comme l'ISO par &défaut"
 
@@ -4602,14 +4728,14 @@ msgstr "Définir comme l'ISO par &défaut"
 msgid "Set as default Memcard %c"
 msgstr "Définir comme carte mémoire par défaut : %c"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:460
+#: Source/Core/Core/Src/ActionReplay.cpp:450
 #, 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/ConfigMain.cpp:535
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:515
 msgid ""
 "Sets the latency (in ms).  Higher values may reduce audio crackling. OpenAL "
 "backend only."
@@ -4617,123 +4743,123 @@ 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:338
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341
 msgid "Settings..."
 msgstr "Configurer..."
 
-#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:222
+#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:209
 msgid "SetupWiiMem: Cant find setting file"
 msgstr "SetupWiiMem: Impossible de trouver le fichier des paramètres"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:291
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:278
 msgid "Shake"
 msgstr "Secouement"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
 msgid "Short Name:"
 msgstr "Nom court :"
 
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:103
+#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:90
 msgid "Shoulder Buttons"
 msgstr "Boutons latéraux"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:217
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:220
 msgid "Show &Console"
 msgstr "Afficher la &Console"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:215
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:218
 msgid "Show &Log"
 msgstr "Afficher le &journal"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:212
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:215
 msgid "Show &Statusbar"
 msgstr "Afficher la barre d'&état"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:210
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:213
 msgid "Show &Toolbar"
 msgstr "Afficher la barre d'&outils"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:281
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:284
 msgid "Show Drives"
 msgstr "Afficher les lecteurs"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:517
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530
 msgid "Show EFB Copy Regions"
 msgstr "Afficher les régions copiées d'EFB"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:295
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303
 msgid "Show FPS"
 msgstr "Afficher les FPS"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:271
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:274
 msgid "Show France"
 msgstr "Afficher France"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:257
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:260
 msgid "Show GameCube"
 msgstr "Afficher GameCube"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561
 msgid "Show Input Display"
 msgstr "Afficher le graphisme en entrée"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:273
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:276
 msgid "Show Italy"
 msgstr "Afficher Italie"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:264
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:267
 msgid "Show JAP"
 msgstr "Afficher Japon"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:275
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:278
 msgid "Show Korea"
 msgstr "Afficher Corée"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476
 msgid "Show Language:"
 msgstr "Afficher la langue :"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:216
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:219
 msgid "Show Log &Configuration"
 msgstr "Afficher la config. de journalisation"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:266
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:269
 msgid "Show PAL"
 msgstr "Afficher PAL"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:254
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:257
 msgid "Show Platforms"
 msgstr "Afficher les plateformes"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:263
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:266
 msgid "Show Regions"
 msgstr "Afficher les régions"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:518
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531
 msgid "Show Statistics"
 msgstr "Afficher les statistiques"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:277
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:280
 msgid "Show Taiwan"
 msgstr "Afficher Taïwan"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:268
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:271
 msgid "Show USA"
 msgstr "Afficher USA"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:259
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:262
 msgid "Show Wad"
 msgstr "Afficher WAD"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:255
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:258
 msgid "Show Wii"
 msgstr "Afficher Wii"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491
 msgid "Show a confirmation box before stopping a game."
 msgstr "Demande confirmation avant d'arrêter le jeu."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:512
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492
 msgid ""
 "Show a message box when a potentially serious error has occurred.\n"
 "Disabling this may avoid annoying and non-fatal messages, but it may also "
@@ -4748,11 +4874,11 @@ msgstr ""
 msgid "Show first block"
 msgstr "Afficher le premier bloc"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:130
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:131
 msgid "Show lag counter"
 msgstr "Afficher le compteur de lag"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493
 msgid ""
 "Show messages on the emulation screen area.\n"
 "These messages include memory card writes, video backend and CPU "
@@ -4778,7 +4904,7 @@ msgstr "Afficher l'icône de la sauvegarde"
 msgid "Show save title"
 msgstr "Afficher le titre de sauvegarde"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102
 msgid ""
 "Show the number of frames rendered per second as a measure of emulation "
 "speed.\n"
@@ -4790,11 +4916,11 @@ msgstr ""
 "\n"
 "Dans le doute, décochez cette case."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:279
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:282
 msgid "Show unknown"
 msgstr "Afficher les inconnus"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105
 msgid ""
 "Show various statistics.\n"
 "\n"
@@ -4804,47 +4930,31 @@ msgstr ""
 "\n"
 "Dans le doute, décochez cette case."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:319
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:306
 msgid "Sideways Wiimote"
 msgstr "Wiimote à l'horizontale"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:280
 msgid "Simplified Chinese"
 msgstr "Chinois simplifié"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:311
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:298
 msgid "Size"
 msgstr "Taille"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:696
 msgid "Skip BIOS"
 msgstr "Ne pas exécuter le BIOS"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316
 msgid "Skip DCBZ clearing"
 msgstr "Ignorer le vidage DCBZ"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:492
-msgid "Skip Dest. Alpha Pass"
-msgstr "Ignorer Passe Alpha de dest."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:444
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:454
 msgid "Skip EFB Access from CPU"
 msgstr "Ignorer l'accès à l'EFB depuis le CPU"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96
-msgid ""
-"Skip the destination alpha pass used in many games for various graphical "
-"effects.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"Saute la passe alpha de destination, utilisée dans beaucoup de jeux pour "
-"divers effets graphiques.\n"
-"\n"
-"Dans le doute, décochez cette case."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125
 msgid ""
 "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n"
 "Sometimes also increases visual quality.\n"
@@ -4861,25 +4971,25 @@ msgstr ""
 "\n"
 "Dans le doute, décochez cette case."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:374
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:386
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:380
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:392
 #, c-format
 msgid "Slot %i"
 msgstr "Slot %i"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:700
 msgid "Slot A"
 msgstr "Slot A"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:701
 msgid "Slot B"
 msgstr "Slot B"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:62
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:49
 msgid "Snapshot"
 msgstr "Capture"
 
-#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:58
+#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:46
 msgid "Software Renderer"
 msgstr "Rendu logiciel"
 
@@ -4896,27 +5006,27 @@ msgstr ""
 "Êtes-vous certain d'activer le rendu logiciel ? Dans le doute, choisissez "
 "'Non'."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:683
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:664
 msgid "Sound Settings"
 msgstr "Paramètres audio"
 
-#: Source/Core/AudioCommon/Src/AudioCommon.cpp:77
+#: Source/Core/AudioCommon/Src/AudioCommon.cpp:64
 #, c-format
 msgid "Sound backend %s is not valid."
 msgstr "Le moteur audio %s n'est pas valide"
 
-#: Source/Core/AudioCommon/Src/DSoundStream.cpp:59
+#: Source/Core/AudioCommon/Src/DSoundStream.cpp:46
 #, c-format
 msgid "Sound buffer creation failed: %s"
 msgstr "Echec de la création du buffer audio : %s"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:31
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:18
 msgid "Space"
 msgstr "Espace"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:329
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309
 msgid "Spanish"
 msgstr "Espagnol"
 
@@ -4924,7 +5034,7 @@ msgstr "Espagnol"
 msgid "Speaker Volume:"
 msgstr "Volume du haut-parleur :"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92
 msgid ""
 "Specifies the resolution used to render at. A high resolution will improve "
 "visual quality a lot but is also quite heavy on performance and might cause "
@@ -4944,63 +5054,63 @@ msgstr ""
 "\n"
 "Dans le doute, sélectionnez 640x528."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322
 msgid "Speed up Disc Transfer Rate"
 msgstr "Accélerer le taux de transfert du disque"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:243
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:230
 msgid "Square Stick"
 msgstr "Stick carré"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:107
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87
 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:322
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:37
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:25
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:325
 msgid "Start"
 msgstr "Start"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:194
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:197
 msgid "Start &NetPlay"
 msgstr "Démarrer &NetPlay"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:339
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:345
 msgid "Start Re&cording"
 msgstr "Commencer l'enregistrement"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:175
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:175
 msgid "Start Recording"
 msgstr "Commencer l'enregistrement"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:312
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:299
 msgid "State"
 msgstr "Etat"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:173
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:161
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:161
 msgid "State Saves"
 msgstr "Etats"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:108
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88
 msgid "Steering Wheel"
 msgstr "Volant"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:53
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:57
 msgid "Stick"
 msgstr "Stick"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:420
-#: 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:325
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:419
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:431
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:171
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:171
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:328
 msgid "Stop"
 msgstr "Arrêter"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96
 msgid ""
 "Store EFB copies in GPU texture objects.\n"
 "This is not so accurate, but it works well enough for most games and gives a "
@@ -5014,107 +5124,119 @@ msgstr ""
 "\n"
 "Dans le doute, sélectionnez cette case."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:275
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283
 msgid "Stretch to Window"
 msgstr "Etirer à la fenêtre"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:43
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:47
 msgid "Strum"
 msgstr "Gratter"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:78
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:65
 msgid "Subtract"
 msgstr "Soustraire"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:77
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:67
 #, c-format
 msgid "Successfully exported file to %s"
 msgstr "Fichier exporté avec succès vers %s"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:56
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:43
 msgid "Successfully imported save files"
 msgstr "Fichiers de sauvegarde importés avec succès"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:285
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:272
 msgid "Swing"
 msgstr "Balancement"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:744
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:792
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320
+msgid "Synchronize GPU thread"
+msgstr "Synchroniser le thread du GPU"
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321
+msgid ""
+"Synchronizes the GPU and CPU threads to help prevent random freezes in Dual "
+"Core mode. (ON = Compatible, OFF = Fast)"
+msgstr ""
+"Synchronise les transferts entre le GPU et le CPU pour éviter des blocages "
+"aléatoires en mode Dual Core. (Coché = Compatible, Décoché = Rapide)"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773
 msgid "System Language:"
 msgstr "Langue du système :"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:191
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:185
 msgid "TAIWAN"
 msgstr "Taïwan"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:127
-#: Source/Core/DolphinWX/Src/TASInputDlg.h:32
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:128
+#: Source/Core/DolphinWX/Src/TASInputDlg.h:19
 msgid "TAS Input"
 msgstr "Entrée TAS"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:28
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:15
 msgid "Tab"
 msgstr "Tab"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:510
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:531
 msgid "Tab split"
 msgstr "Séparateur par tabulation"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:37
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:41
 msgid "Table Left"
 msgstr "Table Gauche"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:38
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:42
 msgid "Table Right"
 msgstr "Table Droite"
 
-#: 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
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:361
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:181
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:181
 msgid "Take Screenshot"
 msgstr "Capture d'écran"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:109
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89
 msgid "TaruKonga (Bongos)"
 msgstr "TaruKonga (Bongos)"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:472
 msgid "Test"
 msgstr "Test"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:444
 msgid "Texture"
 msgstr "Texture"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:451
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:461
 msgid "Texture Cache"
 msgstr "Cache de texture"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:519
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:532
 msgid "Texture Format Overlay"
 msgstr "Infos de format de texture"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:226
+#: Source/Core/Core/Src/CoreParameter.cpp:215
 msgid "The WAD has been installed successfully"
 msgstr "Le WAD a été installé avec succès"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:197
+#: Source/Core/Core/Src/ActionReplay.cpp:185
 msgid "The address is invalid"
 msgstr "L'adresse n'est pas valide"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:509
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:496
 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:1242
+#: 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:1117
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1216
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1118
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1146
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1217
 #, c-format
 msgid ""
 "The file %s already exists.\n"
@@ -5123,7 +5245,7 @@ msgstr ""
 "Le fichier %s existe déjà.\n"
 "Voulez-vous le remplacer ?"
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:51
+#: Source/Core/AudioCommon/Src/WaveFile.cpp:38
 #, c-format
 msgid ""
 "The file %s could not be opened for writing. Please check if it's already "
@@ -5132,29 +5254,29 @@ msgstr ""
 "Le fichier %s n'a pas pu être ouvert pour l'écriture. Vérifiez qu'il n'a pas "
 "été ouvert par un autre programme."
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:44
+#: Source/Core/AudioCommon/Src/WaveFile.cpp:31
 #, c-format
 msgid "The file %s was already open, the file header will not be written."
 msgstr "Le fichier %s a déjà été ouvert, son entête n'a pas pu être écrite."
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:332
+#: Source/Core/Core/Src/Boot/Boot.cpp:320
 #, c-format
 msgid "The file you specified (%s) does not exist"
 msgstr "Le fichier que vous avez spécifié (%s) n'existe pas"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:628
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:666
 msgid "The name can not be empty"
 msgstr "Le nom ne peut être vide"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:620
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:658
 msgid "The name can not contain the character ','"
 msgstr "Le nom ne peut contenir le caractère ','"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:142
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:129
 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:93
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98
 msgid ""
 "The safer you adjust this, the less likely the emulator will be missing any "
 "texture updates from RAM.\n"
@@ -5166,12 +5288,12 @@ msgstr ""
 "\n"
 "Dans le doute, utilisez la position la plus à droite."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:445
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:432
 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:388
+#: Source/Core/DolphinWX/Src/Main.cpp:416
 msgid ""
 "The selected language is not supported by your system. Falling back to "
 "system default."
@@ -5179,36 +5301,36 @@ msgstr ""
 "La langue sélectionnée n'est pas prise en charge par votre système. Retour à "
 "la langue par défaut du système."
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:43
+#: Source/Core/Core/Src/NetPlayClient.cpp:47
 msgid "The server and client's NetPlay versions are incompatible!"
 msgstr "Les versions NetPlay du serveur et du client sont incompatibles !"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:40
+#: Source/Core/Core/Src/NetPlayClient.cpp:44
 msgid "The server is full!"
 msgstr "Le serveur est plein !"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:46
+#: Source/Core/Core/Src/NetPlayClient.cpp:50
 msgid "The server responded: the game is currently running!"
 msgstr "Le serveur a répondu que le jeu est déjà en cours d'exécution !"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:49
+#: Source/Core/Core/Src/NetPlayClient.cpp:53
 msgid "The server sent an unknown error message!"
 msgstr "Le serveur a envoyé un message d'erreur inconnu !"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:119
+#: Source/Core/Core/Src/CoreParameter.cpp:108
 #, c-format
 msgid "The specified file \"%s\" does not exist"
 msgstr "Le fichier spécifié \"%s\" n'existe pas"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:198
+#: Source/Core/Core/Src/ActionReplay.cpp:186
 msgid "The value is invalid"
 msgstr "La valeur n'est pas valide"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:642
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:623
 msgid "Theme:"
 msgstr "Thème :"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:476
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:463
 msgid ""
 "There must be a ticket for 00000001/00000002. Your NAND dump is probably "
 "incomplete."
@@ -5216,7 +5338,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:307
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308
 msgid ""
 "These settings override core Dolphin settings.\n"
 "Undetermined means the game uses Dolphin's setting."
@@ -5224,7 +5346,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:355
+#: Source/Core/Core/Src/ActionReplay.cpp:345
 msgid ""
 "This action replay simulator does not support codes that modify Action "
 "Replay itself."
@@ -5232,11 +5354,11 @@ msgstr ""
 "Ce simulateur d'Action Replay ne prend pas en charge les codes qui modifient "
 "l'Action Replay lui-même."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505
 msgid "This could cause slow down in Wii Menu and some games."
 msgstr "Ceci peut ralentir le Menu Wii et quelques jeux."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118
 msgid ""
 "This feature allows you to change the game's camera.\n"
 "Move the mouse while holding the right mouse button to pan and while holding "
@@ -5257,7 +5379,20 @@ msgstr ""
 "\n"
 "Dans le doute, décochez cette case."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485
+#, fuzzy
+msgid ""
+"This limits the game speed to the specified number of frames per second "
+"(full speed is 60 for NTSC and 50 for PAL). Alternatively, use Audio to "
+"throttle using the DSP (might fix audio clicks but can also cause constant "
+"noise depending on the game)."
+msgstr ""
+"Si vous définissez le limitateur de vitesse (Image /s max) à une valeur plus "
+"élevée que la vitesse du jeu (NTSC:60, PAL:50), activer le contrôle audio "
+"pour DSP (peut éliminer les clics audio mais peut causer un bruit constant "
+"selon les jeux)."
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484
 msgid ""
 "This splits the Video and CPU threads, so they can be run on separate "
 "cores.\n"
@@ -5270,62 +5405,62 @@ msgstr ""
 "qui plus d'un coeur, mais peut occasionnellement causer des petits pépins ou "
 "des plantages."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:286
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:287
 msgid "This will let you Manually Edit the INI config file"
 msgstr ""
 "Ceci vous permettra de modifier manuellement le fichier de configuration INI"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:249
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:254
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:236
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:241
 msgid "Threshold"
 msgstr "Seuil"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:288
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:275
 msgid "Tilt"
 msgstr "Tilt"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:628
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:304
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:622
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:291
 msgid "Title"
 msgstr "Titre"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:125
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:144
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:112
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:131
 msgid "To"
 msgstr "A"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:72
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59
 msgid "Toggle All Log Types"
 msgstr "Activer tous les types de journaux"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:426
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:432
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:180
 msgid "Toggle Fullscreen"
 msgstr "Activer le plein écran"
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:87
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:271
 msgid "Top"
 msgstr "Haut"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:281
 msgid "Traditional Chinese"
 msgstr "Chinois traditionnel"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:426
+#: Source/Core/Core/Src/Boot/Boot.cpp:414
 msgid "Tried to load an unknown file type."
 msgstr "Echec de chargement d'un type de fichier inconnu."
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:80
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:67
 msgid "Triggers"
 msgstr "Déclencheurs"
 
-#: Source/Core/Common/Src/SysConf.h:91 Source/Core/Common/Src/SysConf.h:114
+#: Source/Core/Common/Src/SysConf.h:78 Source/Core/Common/Src/SysConf.h:101
 msgid "Trying to read from invalid SYSCONF"
 msgstr "Essai de lecture d'un fichier SYSCONF non valide"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:44
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:31
 msgid ""
 "Trying to read from invalid SYSCONF\n"
 "Wiimote bt ids are not available"
@@ -5333,15 +5468,15 @@ 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:330
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
 msgid "Turkish"
 msgstr "Turque"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:33
 msgid "Turntable"
 msgstr "Tourne-disque"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:71
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58
 msgid "Type"
 msgstr "Type"
 
@@ -5349,25 +5484,25 @@ msgstr "Type"
 msgid "UDP Port:"
 msgstr "Port UDP :"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:279
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:266
 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12
 msgid "UDP Wiimote"
 msgstr "Wiimote UDP :"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:199
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:193
 msgid "UNKNOWN"
 msgstr "Inconnu"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:756
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:755
 #, c-format
 msgid "UNKNOWN_%02X"
 msgstr "Inconnu_%02X"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:178
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:172
 msgid "USA"
 msgstr "USA"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:225
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:214
 msgid ""
 "Unable to create patch from given values.\n"
 "Entry not modified."
@@ -5375,7 +5510,7 @@ msgstr ""
 "Impossible de créer un patch à partir des valeurs données.\n"
 "L'entrée n'a pas été modifiée."
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:124
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:111
 #, c-format
 msgid ""
 "Unable to parse line %lu of the entered AR code as a valid encrypted or "
@@ -5386,75 +5521,94 @@ 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:391
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:397
 #, c-format
 msgid "Undefined %i"
 msgstr "%i non défini"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:163
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:164
 msgid "Undo Load State"
 msgstr "&Annuler le lancement d'état"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:718
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:717
 msgid "Unexpected 0x80 call? Aborting..."
 msgstr "Appel 0x80 inattendu. Abandon..."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:215
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:202
 msgid "Unknown"
 msgstr "Inconnu"
 
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:971
+#: Source/Core/Core/Src/HW/DVDInterface.cpp:965
 #, c-format
 msgid "Unknown DVD command %08x - fatal error"
 msgstr "Commande DVD inconnue %08x - erreur fatale"
 
-#: Source/Core/Common/Src/SysConf.cpp:145
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:444
+#, c-format
+msgid "Unknown command 0x%08x"
+msgstr "Commande 0x%08x inconnue"
+
+#: Source/Core/Common/Src/SysConf.cpp:132
 #, c-format
 msgid "Unknown entry type %i in SYSCONF (%s@%x)!"
 msgstr "Type d'entrée %i inconnue dans SYSCONF (%s@%x) !"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:228
+#: Source/Core/Core/Src/NetPlayClient.cpp:232
 #, c-format
 msgid "Unknown message received with id : %d"
 msgstr "Reception d'un message inconnu avec l'ID : %d"
 
-#: Source/Core/Core/Src/NetPlayServer.cpp:504
+#: Source/Core/Core/Src/NetPlayServer.cpp:508
 #, c-format
 msgid "Unknown message with id:%d received from player:%d Kicking player!"
 msgstr ""
 "Message inconnu avec l'ID %d reçue du lecteur %d. Banissement du lecteur !"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:274
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:56
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:261
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:43
 msgid "Up"
 msgstr "Haut"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:108
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:95
 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17
 msgid "Update"
 msgstr "Mettre à jour"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:320
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:307
 msgid "Upright Wiimote"
 msgstr "Wiimote debout"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:777
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758
 msgid "Use EuRGB60 Mode (PAL60)"
 msgstr "Utiliser le mode EuRGB60 (PAL60)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:294
 msgid "Use Fullscreen"
 msgstr "&Plein écran"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:575
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:563
 msgid "Use Hex"
 msgstr "Utiliser Hexa"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:600
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580
 msgid "Use Panic Handlers"
 msgstr "Utiliser les gestionnaires de panique"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89
+msgid ""
+"Use a hacked upload strategy to stream vertices.\n"
+"This usually speed up, but is forbidden by OpenGL specification and may "
+"causes heavy glitches.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+"Utiliser une stratégie hackée d'envoi pour transmettre les sommets.\n"
+"Cela permet d'accélérer le rendu, mais est interdit par les spécifications "
+"d'OpenGL et peut provoquer de gros bugs graphiques.\n"
+"\n"
+"Dans le doute, décochez cette case."
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122
 msgid ""
 "Use multiple threads to decode textures.\n"
 "Might result in a speedup (especially on CPUs with more than two cores).\n"
@@ -5467,7 +5621,7 @@ msgstr ""
 "\n"
 "Dans le doute, décochez cette case."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126
 msgid ""
 "Usually if shader compilation fails, an error message is displayed.\n"
 "However, one may skip the popups to allow interruption free gameplay by "
@@ -5482,53 +5636,58 @@ msgstr ""
 "\n"
 "Dans le doute, décochez cette case."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:539
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:552
 msgid "Utility"
 msgstr "Utilitaires"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:285
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:293
 msgid "V-Sync"
 msgstr "Synchro verticale"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:209
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318
+#, fuzzy
+msgid "VBeam Speed Hack"
+msgstr "Hack de vitesse pour le MMU"
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196
 msgid "Value"
 msgstr "Valeur"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:73
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:60
 msgid "Value:"
 msgstr "Valeur :"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:572
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:560
 msgid "Value: "
 msgstr "Valeur"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:51
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:38
 msgid "Verbosity"
 msgstr "Niveau de détail"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:377
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:381
 msgid "Video"
 msgstr "Vidéo"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:486
 msgid "Virtual"
 msgstr "Virtuel"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:689
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670
 msgid "Volume"
 msgstr "Volume"
 
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:498
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:527
+#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:488
+#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:517
 #, c-format
 msgid "WAD installation failed: error creating %s"
 msgstr "Echec de l'installation du WAD : erreur lors de la création de %s"
 
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:547
+#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:537
 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:80
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84
 msgid ""
 "Wait for vertical blanks in order to reduce tearing.\n"
 "Decreases performance if emulation speed is below 100%.\n"
@@ -5540,25 +5699,25 @@ msgstr ""
 "\n"
 "Dans le doute, décochez cette case."
 
-#: Source/Core/Common/Src/MsgHandler.cpp:67
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46
+#: Source/Core/Common/Src/MsgHandler.cpp:53
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:33
 #: Source/Core/DolphinWX/Src/VideoConfigDiag.h:85
 msgid "Warning"
 msgstr "Attention"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:291
+#: Source/Core/Core/Src/Boot/Boot.cpp:279
 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:341
+#: Source/Core/Core/Src/Boot/Boot.cpp:329
 msgid "Warning - starting ELF in wrong console mode!"
 msgstr "Attention : démarrage de l'ELF dans un mauvais mode de console !"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:221
+#: Source/Core/Core/Src/Boot/Boot.cpp:209
 msgid "Warning - starting ISO in wrong console mode!"
 msgstr "Attention : démarrage d\" l'ISO dans un mauvais mode de console !"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:519
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:512
 #, c-format
 msgid ""
 "Warning! it is advised to backup all files in the folder:\n"
@@ -5570,7 +5729,7 @@ msgstr ""
 "%s\n"
 "Voulez-vous continuer ?"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:585
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:578
 #, c-format
 msgid ""
 "Warning: This will overwrite any existing saves that are in the folder:\n"
@@ -5584,7 +5743,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:844
+#: Source/Core/Core/Src/Movie.cpp:835
 #, c-format
 msgid ""
 "Warning: You loaded a save that's after the end of the current movie. (byte "
@@ -5596,7 +5755,7 @@ msgstr ""
 "autre sauvegarde avant de continuer, ou charger cette sauvegarde en "
 "désactivant le mode Lecture seule."
 
-#: Source/Core/Core/Src/Movie.cpp:861
+#: Source/Core/Core/Src/Movie.cpp:852
 #, c-format
 msgid ""
 "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You "
@@ -5608,7 +5767,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:870
+#: Source/Core/Core/Src/Movie.cpp:861
 #, c-format
 msgid ""
 "Warning: You loaded a save whose movie mismatches on frame %d. You should "
@@ -5642,49 +5801,49 @@ msgstr ""
 "Start=%d, A=%d, B=%d, X=%d, Y=%d, Z=%d,DHaut=%d, DBas=%d, DGauche=%d, "
 "DDroite=%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d"
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:106
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:129
+#: Source/Core/AudioCommon/Src/WaveFile.cpp:93
+#: Source/Core/AudioCommon/Src/WaveFile.cpp:116
 msgid "WaveFileWriter - file not open."
 msgstr "WaveFileWriter - fichier non ouvert."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:56
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:60
 msgid "Whammy"
 msgstr "Whammy"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:404
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:408
 msgid "Widescreen Hack"
 msgstr "Hack écran large (16/9è)"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:312
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:299
 msgid "Width"
 msgstr "Largeur"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535
 msgid "Wii"
 msgstr "Wii"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:372
 msgid "Wii Console"
 msgstr "Console Wii"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:844
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:825
 msgid "Wii NAND Root:"
 msgstr "Racine de la NAND (Wii) :"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:191
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:194
 msgid "Wii Save Import"
 msgstr "Importer une sauvegarde Wii"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1243
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1270
 msgid "Wii save files (*.bin)|*.bin"
 msgstr "Fichiers de sauvegarde Wii (*.bin)|*.bin"
 
-#: Source/Core/DiscIO/Src/WiiWad.cpp:82
+#: Source/Core/DiscIO/Src/WiiWad.cpp:69
 msgid "WiiWAD: Could not read from file"
 msgstr "WiiWAD : impossible de lire le fichier"
 
-#: Source/Core/Core/Src/HW/Wiimote.cpp:17
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
+#: Source/Core/Core/Src/HW/Wiimote.cpp:20
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
 msgid "Wiimote"
 msgstr "Wiimote"
 
@@ -5693,7 +5852,7 @@ msgstr "Wiimote"
 msgid "Wiimote %i"
 msgstr "Wiimote %i"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:628
+#: Source/Core/DolphinWX/Src/Main.cpp:656
 msgid "Wiimote Connected"
 msgstr "Wiimote connectée"
 
@@ -5701,7 +5860,7 @@ msgstr "Wiimote connectée"
 msgid "Wiimote Motor"
 msgstr "Vibreur de la Wiimote"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
 msgid "Wiimote settings"
 msgstr "Paramètres de la Wiimote"
 
@@ -5709,102 +5868,127 @@ msgstr "Paramètres de la Wiimote"
 msgid "Wiimotes"
 msgstr "Wiimotes"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:134
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:121
 msgid "Windows Left"
 msgstr "Windows Gauche"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:136
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:123
 msgid "Windows Menu"
 msgstr "Windows Menu"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:135
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:122
 msgid "Windows Right"
 msgstr "Windows Droit"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:131
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:124
 msgid "Word Wrap"
 msgstr "Casse"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1298
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:864
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1089
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1225
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1325
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:880
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1090
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1226
 msgid "Working..."
 msgstr "Travail..."
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:338
+msgid "Write memcards (GC)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46
 msgid "Write to Console"
 msgstr "Ecrire dans la console"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:67
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:54
 msgid "Write to Debugger"
 msgstr "Ecrire dans le débugueur"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:57
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44
 msgid "Write to File"
 msgstr "Ecrire dans le fichier"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:61
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48
 msgid "Write to Window"
 msgstr "Ecrire dans la fenêtre"
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:60
+#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:47
 #, c-format
 msgid "XAudio2 CreateSourceVoice failed: %#X"
 msgstr "Echec de XAudio2 CreateSourceVoice : %#X"
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:114
+#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:101
 #, c-format
 msgid "XAudio2 init failed: %#X"
 msgstr "Echec de l'initialisation de XAudio2 : %#X"
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:124
+#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:111
 #, c-format
 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:766
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:765
 msgid "XF reg"
 msgstr "XF reg"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:21
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Yellow"
 msgstr "Jaune"
 
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:107
+#: Source/Core/Core/Src/DSP/DSPCore.cpp:120
 msgid ""
-"You are using free dsp roms made by Dolphin Team.\n"
-"Only Zelda ucode games will work correctly with them.\n"
+"You are using a free DSP ROM made by the Dolphin Team.\n"
+"All Wii games will work correctly, and most GC games should also work fine, "
+"but the GBA/IPL/CARD UCodes will not work.\n"
 msgstr ""
-"Vous utilisez des ROM de DSP gratuits créés par l'équipe de Dolphin.\n"
-"Seuls les jeux basés sur les ucodes de Zelda fonctionneront correctement "
-"avec ces ROM.\n"
+"Vous utilisez une ROM audio \"DSP\" gratuite conçue par l'équipe de "
+"Dolphin.\n"
+"Tous les jeux Wii fonctionneront correctement, et la plupart des jeux "
+"GameCube aussi, mais les UCodes GBA/IPL/CARD ne fonctionneront pas.\n"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:73
+#: Source/Core/Core/Src/DSP/DSPCore.cpp:116
+msgid ""
+"You are using an old free DSP ROM made by the Dolphin Team.\n"
+"Only games using the Zelda UCode will work correctly.\n"
+msgstr ""
+"Vous utilisez une ancienne ROM audio \"DSP\" conçue par l'équipe de "
+"Dolphin.\n"
+"Seuls les jeux utilisant les UCodes Zelda fonctionneront correctement.\n"
+
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:63
 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:207
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:210
 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:593
 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:438
 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:603
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:591
 msgid "You must enter a valid profile name."
 msgstr "Vous devez entrer un profil de nom valide."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:936
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:917
 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."
 
-#: Source/Core/Core/Src/CoreParameter.cpp:175
+#: Source/Core/Core/Src/DSP/DSPCore.cpp:109
+msgid ""
+"Your DSP ROMs have incorrect hashes.\n"
+"Would you like to stop now to fix the problem?\n"
+"If you select \"No\", audio might be garbled."
+msgstr ""
+"Vos ROM audio \"DSP\" ont des hashs incorrects.\n"
+"Voulez-vous arrêter l'émulation maintenant pour corriger le problème ?\n"
+"Si vous choisissez \"Non\", l'audio pourra être déformé."
+
+#: Source/Core/Core/Src/CoreParameter.cpp:164
 msgid ""
 "Your GCM/ISO file seems to be invalid (invalid country).\n"
 "Continue with PAL region?"
@@ -5812,7 +5996,7 @@ msgstr ""
 "Votre fichier GCM/ISO ne semble pas valide (pays non valide).\n"
 "Voulez-vous continuer en tant que région PAL ?"
 
-#: Source/Core/Common/Src/SysConf.cpp:58
+#: Source/Core/Common/Src/SysConf.cpp:45
 #, c-format
 msgid ""
 "Your SYSCONF file is the wrong size.\n"
@@ -5823,25 +6007,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:331
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:334
 msgid "ZTP hack"
 msgstr "ZTP hack"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:387
+#: Source/Core/Core/Src/ActionReplay.cpp:377
 msgid "Zero 3 code not supported"
 msgstr "Code Zero 3 non pris en charge"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:408
+#: Source/Core/Core/Src/ActionReplay.cpp:398
 #, c-format
 msgid "Zero code unknown to dolphin: %08x"
 msgstr "Zero code inconnu pour Dolphin : %08x"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:436
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:460
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:423
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:447
 msgid "[ waiting ]"
 msgstr "[ attente ]"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107
 msgid ""
 "[BROKEN]\n"
 "Highlight regions the EFB was copied from.\n"
@@ -5853,11 +6037,11 @@ msgstr ""
 "\n"
 "Dans le doute, décochez cette case."
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:91
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:78
 msgid "[Custom]"
 msgstr "[Personnalisé]"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120
 msgid ""
 "[EXPERIMENTAL]\n"
 "Aims to speed up emulation by offloading texture decoding to the GPU using "
@@ -5876,7 +6060,7 @@ msgstr ""
 "\n"
 "Dans le doute, décochez cette case."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121
 msgid ""
 "[EXPERIMENTAL]\n"
 "Speeds up emulation a bit by caching display lists.\n"
@@ -5890,99 +6074,47 @@ msgstr ""
 "\n"
 "Dans le doute, décochez cette case."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:508
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:495
 msgid "^ ADD"
 msgstr "^ ADD"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:820
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:801
 msgid "apploader (.img)"
 msgstr "apploader (.img)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:185
-msgid "failed to read bk header"
-msgstr "impossible de lire l'entête bk"
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:375
-#, c-format
-msgid "failed to read data from file: %s"
-msgstr "Impossible de lire les données du fichier %s"
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:97
-msgid "failed to read header"
-msgstr "Impossible de lire l'entête"
-
-#: Source/Core/Core/Src/PowerPC/JitInterface.cpp:285
+#: Source/Core/Core/Src/PowerPC/JitInterface.cpp:272
 #, c-format
 msgid "iCacheJIT: Reading Opcode from %x. Please report."
 msgstr "iCacheJIT : Lecture de l'Opcode depuis %x. Merci de nous le signaler."
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:108
-#, c-format
-msgid "not a wii save or read failure for file header size %x"
-msgstr ""
-"Ceci n'est pas une sauvegarde Wii, ou erreur de lecture de la taille de "
-"l'entête du fichier %x"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:935
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:936
 msgid "s"
 msgstr "s"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:457
-#, c-format
-msgid "unknown cmd 0x%08x"
-msgstr "Commande inconnue 0x%08x"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1110
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1136
 msgid "wxExecute returned -1 on application run!"
 msgstr "wxExecute a retourné -1 sur l'exécution de l'application !"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:56
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:43
 msgid "zFar Correction: "
 msgstr "Correction zFar :"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:51
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:38
 msgid "zNear Correction: "
 msgstr "Correction zNear :"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:493
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:480
 msgid "| OR"
 msgstr "| OR"
 
-#~ msgid "%i connected"
-#~ msgstr "%i connectée(s)"
-
-#~ msgid "Alternate Wiimote Timing"
-#~ msgstr "Délai alternatif de communication avec la Wiimote"
-
-#~ msgid "Interpreter (VERY slow)"
-#~ msgstr "Interpréteur (TRES lent)"
-
-#~ msgid "JIT Recompiler (recommended)"
-#~ msgstr "Recompilateur JIT (recommandé)           "
-
-#~ msgid "JITIL experimental recompiler"
-#~ msgstr "Recompilateur expérimental JIT"
+#~ msgid "Accurate VBeam emulation"
+#~ msgstr "Emulation fidèle VBeam"
 
 #~ msgid ""
-#~ "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. "
-#~ "No effect on emulated wiimotes."
+#~ "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)"
 #~ 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."
+#~ "Si les FPS ne sont pas corrects, cette option peut résoudre le souci. (ON "
+#~ "= Compatible, OFF = Vitesse)"
 
-#~ msgid "Pair Up"
-#~ msgstr "Jumeler"
-
-#~ msgid "Reconnect Wiimote Confirm"
-#~ msgstr "Confirmation de reconnexion de la Wiimote"
-
-#~ msgid ""
-#~ "Wiimote %i has been disconnected by system.\n"
-#~ "Maybe this game doesn't support multi-wiimote,\n"
-#~ "or maybe it is due to idle time out or other reason.\n"
-#~ "Do you want to reconnect immediately?"
-#~ msgstr ""
-#~ "La Wiimote %i a été déconnectée par le système.\n"
-#~ "Peut-être que ce jeu ne prend pas en charge plusieurs Wiimotes,\n"
-#~ "ou bien c'est dû à un temps d'attente trop long, ou encore autre chose.\n"
-#~ "Voulez-vous la reconnecter tout de suite ?"
+#~ msgid "Skip Dest. Alpha Pass"
+#~ msgstr "Ignorer Passe Alpha de dest."
diff --git a/Languages/po/he.po b/Languages/po/he.po
index 0f29560163..ee43341847 100644
--- a/Languages/po/he.po
+++ b/Languages/po/he.po
@@ -3,13 +3,13 @@
 # This file is distributed under the same license as the dolphin-emu package.
 #
 # Translators:
-# Ely <nakeee@gmail.com>, 2011.
+# nakee <nakeee@gmail.com>, 2011
 msgid ""
 msgstr ""
 "Project-Id-Version: Dolphin Emulator\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-10 08:56-0500\n"
-"PO-Revision-Date: 2013-02-02 08:31+0000\n"
+"POT-Creation-Date: 2013-04-18 23:00-0500\n"
+"PO-Revision-Date: 2013-04-04 08:13+0000\n"
 "Last-Translator: delroth <delroth@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: he\n"
@@ -18,113 +18,115 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:511
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:499
 msgid " (too many to display)"
 msgstr "(ארוך מידי)"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:270
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:273
 #: Source/Core/DolphinWX/Src/NetWindow.cpp:491
 #: Source/Core/DolphinWX/Src/NetWindow.cpp:530
 msgid " Game : "
 msgstr "משחק:"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:507
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494
 msgid "! NOT"
 msgstr "! לא"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:70
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:58
 #, c-format
 msgid ""
 "\"%s\" does not exist.\n"
 " Create a new 16MB Memcard?"
 msgstr ""
 
-#: Source/Core/Core/Src/CoreParameter.cpp:142
+#: Source/Core/Core/Src/CoreParameter.cpp:131
 #, c-format
 msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:722
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:721
 #, c-format
 msgid "%08X:  "
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:196
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:183
 #, c-format
 msgid "%1$sCopy%1$s"
 msgstr "%1$sהעתק%1$s"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:128
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:296
+#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:113
+#, c-format
+msgid "%d samples"
+msgstr ""
+
+#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:112
+#, c-format
+msgid "%d samples (quality level %d)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:121
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:289
 #, c-format
 msgid "%s already exists, overwrite?"
 msgstr ""
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:167
+#: Source/Core/DiscIO/Src/CompressedBlob.cpp:154
 #, c-format
 msgid "%s failed to be scrubbed. Probably the image is corrupt."
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:95
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:83
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
 " Card file size is invalid (0x%x bytes)"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:110
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:98
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
 " Card size is invalid (0x%x bytes)"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:90
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:78
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
 "file is not large enough to be a valid memory card file (0x%x bytes)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:367
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:359
 #, c-format
 msgid "%s failed to open"
 msgstr ""
 
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:97
-#, c-format
-msgid ""
-"%s has an incorrect hash.\n"
-"Would you like to stop now to fix the problem?\n"
-"If you select \"No\", audio will be garbled."
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:360
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:352
 #, c-format
 msgid "%s is a 0 byte file"
 msgstr ""
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:159
+#: Source/Core/DiscIO/Src/CompressedBlob.cpp:146
 #, c-format
 msgid "%s is already compressed! Cannot compress it further."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:345
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:337
 #, c-format
 msgid "%s is too long for the filename, max chars is 45"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:202
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:189
 #, c-format
 msgid "%sDelete%s"
 msgstr "%sמחק%s"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:200
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:187
 #, c-format
 msgid "%sExport GCI%s"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:198
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:185
 #, c-format
 msgid "%sImport GCI%s"
 msgstr ""
@@ -134,222 +136,246 @@ msgstr ""
 msgid "%u Free Blocks; %u Free Dir Entries"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:506
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:493
 msgid "&& AND"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:295
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:301
 msgid "&About..."
 msgstr "&אודות"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:99
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:100
 msgid "&Boot from DVD Drive..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:231
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:234
 msgid "&Breakpoints"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:110
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:111
 msgid "&Browse for ISOs..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:192
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:195
 msgid "&Cheats Manager"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:177
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:180
 msgid "&DSP Settings"
 msgstr "הגדרות קול"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:885
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:876
 msgid "&Delete ISO..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:903
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:897
 msgid "&Delete selected ISOs..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:170
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:173
 msgid "&Emulation"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:113
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:114
 msgid "&File"
 msgstr "&קובץ"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:335
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:341
 msgid "&Frame Advance"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:352
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:358
 msgid "&Fullscreen"
 msgstr "&מסך מלא"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:176
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:179
 msgid "&Graphics Settings"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:296
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:302
 msgid "&Help"
 msgstr "&עזרה"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:180
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:183
 msgid "&Hotkey Settings"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:233
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:236
 msgid "&JIT"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:148
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:149
 msgid "&Load State"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:190
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:193
 msgid "&Memcard Manager (GC)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:232
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:235
 msgid "&Memory"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:313
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:319
 msgid "&Open..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:186
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:189
 msgid "&Options"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:324
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:330
 msgid "&Pause"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:326
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:332
 msgid "&Play"
 msgstr "&שחק"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:867
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:858
 msgid "&Properties"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:348
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:354
 msgid "&Read-only mode"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:319
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:325
 msgid "&Refresh List"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:230
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:233
 msgid "&Registers"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:332
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:338
 msgid "&Reset"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:234
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:237
 msgid "&Sound"
 msgstr "&קול"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:329
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:335
 msgid "&Stop"
 msgstr "&עצור"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:207
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:210
 msgid "&Tools"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:235
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:238
 msgid "&Video"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:284
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:287
 msgid "&View"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:179
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:182
 msgid "&Wiimote Settings"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:868
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:859
 msgid "&Wiki"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504
 msgid "'"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:59
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:46
 msgid "(-)+zFar"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:54
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:41
 msgid "(-)+zNear"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:99
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:86
 msgid "(UNKNOWN)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:376
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:384
 msgid "(off)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:655
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:654
 msgid "0x44"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+msgid "1.5x Native (960x792)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:158
 msgid "16 bit"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+msgid "1x Native (640x528)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+msgid "2.5x Native (1600x1320)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+msgid "2x Native (1280x1056)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:159
 msgid "32 bit"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:412
 msgid "3D Vision"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+msgid "3x Native (1920x1584)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+msgid "4x Native (2560x2112)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:157
 msgid "8 bit"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:43
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:30
 msgid "<Insert name here>"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:255
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:262
 msgid "<No resolutions found>"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:104
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84
 msgid "<Nothing>"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:162
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:162
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:150
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:150
 msgid "<Press Key>"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286
 msgid "<System>"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695
 msgid "A"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:201
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:235
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:204
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:238
 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:353
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:387
 msgid "A game is not currently running."
 msgstr ""
 
@@ -359,36 +385,36 @@ msgid ""
 "You must manually connect your wiimotes."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:109
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:100
 msgid ""
 "ALERT:\n"
 "\n"
-"NetPlay will currently only work properly when using the following "
-"settings:\n"
-" - Dual Core [OFF]\n"
-" - Audio Throttle [OFF]\n"
-" - DSP-HLE with \"Null Audio\" or DSP-LLE\n"
-" - Manually set the exact number of controllers that will be used to "
-"[Standard Controller]\n"
+"Netplay will only work with the following settings:\n"
+" - Enable Dual Core [OFF]\n"
+" - DSP Emulator Engine Must be the same on all computers!\n"
+" - DSP on Dedicated Thread [OFF]\n"
+" - Framelimit NOT set to [Audio]\n"
+" - Manually set the exact number of controllers to be used to [Standard "
+"Controller]\n"
 "\n"
-"All players should try to use the same Dolphin version and settings.\n"
-"Disable all memory cards or send them to all players before starting.\n"
-"Wiimote support has not been implemented.\n"
+"All players should use the same Dolphin version and settings.\n"
+"All memory cards must be identical between players or disabled.\n"
+"Wiimote support has not been implemented!\n"
 "\n"
-"You must forward TCP port to host!!"
+"The host must have the chosen TCP port open/forwarded!\n"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:111
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:116
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96
 msgid "AM-Baseboard"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:299
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:115
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:300
 msgid "AR Codes"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/AboutDolphin.h:33
+#: Source/Core/DolphinWX/Src/AboutDolphin.h:21
 msgid "About Dolphin"
 msgstr ""
 
@@ -396,15 +422,11 @@ msgstr ""
 msgid "Acceleration"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:463
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473
 msgid "Accuracy:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317
-msgid "Accurate VBeam emulation"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97
 msgid ""
 "Accurately emulate EFB copies.\n"
 "Some games depend on this for certain graphical effects or gameplay "
@@ -413,12 +435,12 @@ msgid ""
 "If unsure, check EFB to Texture instead."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:239
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:239
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:227
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:227
 msgid "Action"
 msgstr ""
 
-#: Source/Core/Core/Src/ARDecrypt.cpp:481
+#: Source/Core/Core/Src/ARDecrypt.cpp:469
 #, c-format
 msgid ""
 "Action Replay Code Decryption Error:\n"
@@ -428,102 +450,102 @@ msgid ""
 "%s"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:667
+#: Source/Core/Core/Src/ActionReplay.cpp:657
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:755
+#: Source/Core/Core/Src/ActionReplay.cpp:745
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide "
 "(%s)"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:547
+#: Source/Core/Core/Src/ActionReplay.cpp:537
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And "
 "Fill (%s)"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:607
+#: Source/Core/Core/Src/ActionReplay.cpp:597
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Write To "
 "Pointer (%s)"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:802
+#: Source/Core/Core/Src/ActionReplay.cpp:792
 #, c-format
 msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:682
+#: Source/Core/Core/Src/ActionReplay.cpp:672
 #, c-format
 msgid ""
 "Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)\n"
 "Master codes are not needed. Do not use master codes."
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:196
+#: Source/Core/Core/Src/ActionReplay.cpp:184
 #, c-format
 msgid "Action Replay Error: invalid AR code line: %s"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:872
+#: Source/Core/Core/Src/ActionReplay.cpp:862
 #, c-format
 msgid "Action Replay: Conditional Code: Invalid Size %08x (%s)"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:945
+#: Source/Core/Core/Src/ActionReplay.cpp:935
 #, c-format
 msgid "Action Replay: Invalid Normal Code Type %08x (%s)"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:896
+#: Source/Core/Core/Src/ActionReplay.cpp:886
 #, c-format
 msgid "Action Replay: Normal Code %i: Invalid subtype %08x (%s)"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:838
+#: Source/Core/Core/Src/ActionReplay.cpp:828
 #, c-format
 msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:242
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:247
 msgid "Adapter:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:76
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:63
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:63
 msgid "Add"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1275
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1301
 msgid "Add ActionReplay Code"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1204
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1230
 msgid "Add Patch"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:507
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:528
 msgid "Add new pane"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:404
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:426
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:811
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:408
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:430
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:792
 msgid "Add..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:90
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:81
 msgid "Address :"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:58
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:45
 msgid ""
 "Adds the specified value to zFar Parameter.\n"
 "Two ways to express the floating point values.\n"
@@ -534,7 +556,7 @@ msgid ""
 "NOTE: Check LogWindow/Console for the acquired values."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:53
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:40
 msgid ""
 "Adds the specified value to zNear Parameter.\n"
 "Two ways to express the floating point values.\n"
@@ -545,48 +567,48 @@ msgid ""
 "NOTE: Check LogWindow/Console for the acquired values."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:755
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:744
 msgid "Adjust the analog control pressure required to activate buttons."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:509
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:522
 msgid "Advanced"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561
 msgid "Advanced Settings"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:584
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:587
 msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:816
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:797
 msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1189
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1190
 msgid "All Gamecube GCM files (gcm)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1390
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1404
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1417
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1431
 msgid "All Save States (sav, s##)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1187
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1188
 msgid "All Wii ISO files (iso)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1207
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1208
 msgid "All compressed GC/Wii ISO files (gcz)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:124
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:104
 msgid "All files (*.*)|*.*"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123
 msgid ""
 "Allows toggling certain options via the hotkeys 3 (Internal Resolution), 4 "
 "(Aspect Ratio), 5 (Copy EFB) and 6 (Fog) within the emulation window.\n"
@@ -594,50 +616,50 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:285
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:272
 msgid "Analyze"
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:298
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:285
 msgid "Angle"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:367
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:375
 msgid "Anisotropic Filtering:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:350
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:358
 msgid "Anti-Aliasing:"
 msgstr ""
 
-#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:308
+#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:299
 msgid "Apploader is the wrong size...is it really an apploader?"
 msgstr ""
 
-#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:302
+#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:293
 msgid "Apploader unable to load from file"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:841
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:822
 msgid "Apploader:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:135
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:122
 msgid "Apply"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124
 msgid ""
 "Apply a post-processing effect after finishing a frame.\n"
 "\n"
 "If unsure, select (off)."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287
 msgid "Arabic"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:614
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:603
 #, c-format
 msgid "Are you sure you want to delete \"%s\"?"
 msgstr ""
@@ -652,206 +674,210 @@ msgstr ""
 msgid "Are you sure you want to delete this file?  It will be gone forever!"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:789
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:277
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:44
+msgid "Arm JIT (experimental)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:285
 msgid "Aspect Ratio:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:70
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:58
 msgid "At least one pane must remain open."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:553
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533
 msgid "Audio"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:694
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675
 msgid "Audio Backend:"
 msgstr ""
 
-#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:41
+#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:28
 msgid "AudioCommon: Error opening AO device.\n"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:275
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283
 msgid "Auto"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:337
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345
 msgid "Auto (Multiple of 640x528)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:337
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345
 msgid "Auto (Window Size)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:297
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305
 msgid "Auto adjust Window Size"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77
 msgid ""
 "Automatically adjusts the window size to your internal resolution.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:697
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696
 msgid "B"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:755
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:754
 msgid "BP register "
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:27
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:14
 msgid "Back"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:698
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:679
 msgid "Backend Settings"
 msgstr ""
 
-#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:60
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:206
+#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:47
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:211
 msgid "Backend:"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:318
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:95
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:305
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:82
 msgid "Background Input"
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:279
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:266
 msgid "Backward"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:264
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:257
 msgid "Bad File Header"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:627
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:621
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:290
 msgid "Banner"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:519
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:529
 msgid "Banner Details"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491
 msgid "Banner:"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:57
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:61
 msgid "Bar"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:308
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:316
 msgid "Basic"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555
 msgid "Basic Settings"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:22
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Bass"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:186
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:174
 msgid "Block Allocation Table checksum failed"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:631
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625
 msgid "Blocks"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:21
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Blue"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:24
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Blue Left"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:25
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Blue Right"
 msgstr ""
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:87
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270
 msgid "Bottom"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:238
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:225
 #, c-format
 msgid "Bound Controls: %lu"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348
 msgid "Broken"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:422
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:428
 msgid "Browse"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:256
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:243
 msgid "Browse for a directory to add"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:422
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:428
 msgid "Browse for an ISO directory..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1079
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1080
 msgid "Browse for output directory"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:328
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:331
 msgid "Buffer:"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:58
 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:119
+#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:106
 msgid "Buttons"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317
 msgid ""
 "Bypass the clearing of the data cache by the DCBZ instruction. Usually leave "
 "this option disabled."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:698
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:697
 msgid "C"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:77
+#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:64
 msgid "C Stick"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:77
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:64
 msgid "C-Stick"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:764
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:763
 msgid "CP reg"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:567
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547
 msgid "CPU Emulator Engine"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:490
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500
 msgid "Cache Display Lists"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88
 msgid ""
 "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n"
 "Decreases emulation speed by some percent (depending on your GPU).\n"
@@ -860,23 +886,38 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1858
+#, c-format
+msgid "Can't find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x"
+msgstr ""
+
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1872
+#, c-format
+msgid "Can't find WiiMote by connection handle %02x"
+msgstr ""
+
+#: Source/Core/Core/Src/HW/DVDInterface.cpp:669
+#: Source/Core/Core/Src/HW/DVDInterface.cpp:679
+msgid "Can't read from DVD_Plugin - DVD-Interface: Fatal Error"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:124
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:28
 msgid "Cancel"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:91
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:178
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:240
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:84
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:171
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:233
 #, c-format
 msgid "Cannot open %s"
 msgstr ""
 
-#: Source/Core/Core/Src/CoreTiming.cpp:141
+#: Source/Core/Core/Src/CoreTiming.cpp:128
 msgid "Cannot unregister events with events pending"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1078
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1061
 #, c-format
 msgid ""
 "Cannot use that file as a memory card.\n"
@@ -884,36 +925,21 @@ msgid ""
 "is not a valid gamecube memory card file"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1108
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1091
 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:1867
-#, 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:1881
-#, c-format
-msgid "Cant find WiiMote by connection handle %02x"
-msgstr ""
-
-#: 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 ""
-
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:52
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:39
 msgid "Caps Lock"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288
 msgid "Catalan"
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:311
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:298
 msgid "Center"
 msgstr ""
 
@@ -921,12 +947,12 @@ msgstr ""
 msgid "Change"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:316
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:322
 msgid "Change &Disc..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:179
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:179
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:167
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:167
 msgid "Change Disc"
 msgstr ""
 
@@ -934,228 +960,228 @@ msgstr ""
 msgid "Change Game"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:515
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495
 msgid ""
 "Change the language of the user interface.\n"
 "Requires restart."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:60
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:47
 msgid "Changes sign to zFar Parameter (after correction)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:55
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:42
 msgid "Changes sign to zNear Parameter (after correction)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:519
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499
 msgid "Changing this will have no effect while the emulator is running!"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:295
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:298
 msgid "Chat"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:47
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:34
 msgid "Cheat Code"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:118
 msgid "Cheat Search"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:38
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:25
 msgid "Cheats Manager"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:633
 msgid "Check Partition Integrity"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:864
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:880
 msgid "Checking integrity..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289
 msgid "Chinese (Simplified)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290
 msgid "Chinese (Traditional)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:818
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:799
 msgid "Choose a DVD root directory:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:822
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803
 msgid "Choose a NAND root directory:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:815
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:796
 msgid "Choose a default ISO:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1236
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1219
 msgid "Choose a directory to add"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1065
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1048
 msgid "Choose a file to open"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:217
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:204
 msgid "Choose a memory card:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:819
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800
 msgid ""
 "Choose file to use as apploader: (applies to discs constructed from "
 "directories only)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:767
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:806
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:781
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:822
 msgid "Choose the folder to extract to"
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:297
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:284
 msgid "Circle Stick"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:52
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:56
 msgid "Classic"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:144
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:43
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:487
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:913
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:137
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:30
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:474
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:904
 msgid "Clear"
 msgstr ""
 
-#: Source/Core/Core/Src/NetPlayServer.cpp:259
+#: Source/Core/Core/Src/NetPlayServer.cpp:263
 msgid ""
 "Client disconnect while game is running!! NetPlay is disabled. You must "
 "manually stop the game."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:298
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:247
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:552
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:578
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:285
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:234
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:562
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:590
 msgid "Close"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:174
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:177
 msgid "Co&nfigure..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:86
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:73
 msgid "Code Info"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:568
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:556
 msgid "Code: "
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:35
 msgid "Command"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:629
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:623
 msgid "Comment"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489
 msgid "Comment:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:893
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:884
 msgid "Compress ISO..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:905
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:899
 msgid "Compress selected ISOs..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1088
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1224
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1089
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1225
 msgid "Compressing ISO"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:429
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:435
 msgid "Config"
 msgstr ""
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:37
-#: Source/Core/DolphinWX/Src/InputConfigDiag.h:135
-#: Source/Core/DolphinWX/Src/InputConfigDiag.h:154
+#: Source/Core/DolphinWX/Src/InputConfigDiag.h:122
+#: Source/Core/DolphinWX/Src/InputConfigDiag.h:141
 msgid "Configure"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:111
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:98
 msgid "Configure Control"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:306
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
 #: Source/Core/DolphinWX/Src/NetWindow.cpp:583
 msgid "Configure Pads"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:429
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:435
 msgid "Configure..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1119
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1147
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1217
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1120
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1218
 msgid "Confirm File Overwrite"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:597
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:577
 msgid "Confirm on Stop"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:83
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:105
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:74
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:96
 msgid "Connect"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:783
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:764
 msgid "Connect USB Keyboard"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:362
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:368
 #, c-format
 msgid "Connect Wiimote %i"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:195
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183
 msgid "Connect Wiimote 1"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184
 msgid "Connect Wiimote 2"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:185
 msgid "Connect Wiimote 3"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:198
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:186
 msgid "Connect Wiimote 4"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/Main.cpp:627
+#: Source/Core/DolphinWX/Src/Main.cpp:655
 msgid "Connecting..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:155
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:156
 msgid "Console"
 msgstr ""
 
@@ -1163,15 +1189,15 @@ msgstr ""
 msgid "Continuous Scanning"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:46
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:33
 msgid "Control"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:189
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:176
 msgid "Convert to GCI"
 msgstr ""
 
-#: Source/Core/Core/Src/CoreParameter.cpp:379
+#: Source/Core/Core/Src/CoreParameter.cpp:368
 msgid "Copy failed"
 msgstr ""
 
@@ -1180,21 +1206,21 @@ msgstr ""
 msgid "Copy to Memcard %c"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:359
 msgid "Core"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:154
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:148
 #, c-format
 msgid "Could not create %s"
 msgstr ""
 
-#: Source/Core/AudioCommon/Src/AudioCommon.cpp:75
+#: Source/Core/AudioCommon/Src/AudioCommon.cpp:62
 #, c-format
 msgid "Could not initialize backend %s."
 msgstr ""
 
-#: Source/Core/Core/Src/CoreParameter.cpp:137
+#: Source/Core/Core/Src/CoreParameter.cpp:126
 #, c-format
 msgid ""
 "Could not read \"%s\".  There is no disc in the drive, or it is not a GC/Wii "
@@ -1202,12 +1228,12 @@ msgid ""
 "most PC DVD drives."
 msgstr ""
 
-#: Source/Core/Core/Src/CoreParameter.cpp:292
+#: Source/Core/Core/Src/CoreParameter.cpp:281
 #, c-format
 msgid "Could not recognize ISO file %s"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:569
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:579
 #, c-format
 msgid "Could not save %s"
 msgstr ""
@@ -1218,197 +1244,201 @@ msgid ""
 "(setting pads while the game is running is not yet supported)"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:123
+#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119
 #, c-format
 msgid ""
 "Could not write memory card file %s.\n"
 "\n"
 "Are you running Dolphin from a CD/DVD, or is the save file maybe write "
-"protected?"
+"protected?\n"
+"\n"
+"Are you receiving this after moving the emulator directory?\n"
+"If so, then you may need to re-specify your memory card location in the "
+"options."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1107
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1133
 msgid "Couldn't find open command for extension 'ini'!"
 msgstr ""
 
-#: Source/Core/Core/Src/BootManager.cpp:146
+#: Source/Core/Core/Src/BootManager.cpp:137
 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:170
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:495
 msgid "Count:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:452
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456
 msgid "Country:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:186
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:562
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:173
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:550
 msgid "Create AR Code"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:543
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:608
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:569
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:641
 msgid "Create new perspective"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:17
 msgid "Creator: "
 msgstr ""
 
-#: Source/Core/Common/Src/MsgHandler.cpp:68
+#: Source/Core/Common/Src/MsgHandler.cpp:54
 msgid "Critical"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562
 msgid "Crop"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119
 msgid ""
 "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:48
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:52
 msgid "Crossfade"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:597
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:600
 #, c-format
-msgid "Current dir changed from %s to %s after wxFileSelector!"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336
-msgid "Custom Projection Hack"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/PHackSettings.h:30
-msgid "Custom Projection Hack Settings"
+msgid "Current directory changed from %s to %s after wxFileSelector!"
 msgstr ""
 
 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:339
+msgid "Custom Projection Hack"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/PHackSettings.h:17
+msgid "Custom Projection Hack Settings"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342
 msgid "Customize some Orthographic Projection parameters."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291
 msgid "Czech"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:698
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:697
 msgid "D"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:89
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
 msgid "D-Pad"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:431
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
 msgid "DSP"
 msgstr "קול"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:639
 msgid "DSP Emulator Engine"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:254
 msgid "DSP HLE emulation (fast)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:256
 msgid "DSP LLE interpreter (slow)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660
-msgid "DSP LLE on Thread"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:255
 msgid "DSP LLE recompiler"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:431
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:641
+msgid "DSP on Dedicated Thread"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
 msgid "DSP settings"
 msgstr "הגדרות קול"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:838
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:819
 msgid "DVD Root:"
 msgstr ""
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:239
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:226
 msgid "DVDLowRead - Fatal Error: failed to read from volume"
 msgstr ""
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:333
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:320
 msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:176
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:163
 msgid "Data Size"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468
 msgid "Date:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:528
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:564
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:518
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:557
 msgid "Datel MaxDrive/Pro files(*.sav)"
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:242
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:259
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:267
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:281
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:296
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:229
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:246
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:254
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:268
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:283
 msgid "Dead Zone"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:35
 msgid "Debug"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:521
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534
 msgid "Debugging"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:79
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:66
 msgid "Decimal"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:890
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:881
 msgid "Decompress ISO..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:906
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:900
 msgid "Decompress selected ISOs..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1088
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1224
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1089
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1225
 msgid "Decompressing ISO"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:912
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:903
 msgid "Default"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:835
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:816
 msgid "Default ISO:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:114
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:107
 msgid "Default font"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:32
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:926
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:19
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917
 msgid "Delete"
 msgstr ""
 
@@ -1416,64 +1446,68 @@ msgstr ""
 msgid "Delete Save"
 msgstr ""
 
-#: Source/Core/VideoCommon/Src/AVIDump.cpp:77
+#: Source/Core/VideoCommon/Src/AVIDump.cpp:64
 #, c-format
 msgid "Delete the existing file '%s'?"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:671
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:683
 msgid "Description"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:472
 msgid "Detect"
 msgstr ""
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:233
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:328
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:220
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:315
 msgid ""
 "Detected attempt to read more data from the DVD than fit inside the out "
 "buffer. Clamp."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:127
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:898
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:114
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:889
 msgid "Device"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:798
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:731
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779
 msgid "Device Settings"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:45
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:49
 msgid "Dial"
 msgstr ""
 
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:146
+#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:135
 msgid "Direct3D11"
 msgstr ""
 
-#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:128
+#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:125
 msgid "Direct3D9"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:167
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:155
 msgid ""
 "Directory checksum failed\n"
 " and Directory backup checksum failed"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:433
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:443
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485
 msgid "Disable"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:491
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501
+msgid "Disable Destination Alpha"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:409
 msgid "Disable Fog"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108
 msgid ""
 "Disable any XFB emulation.\n"
 "Speeds up emulation a lot but causes heavy glitches in many games which rely "
@@ -1482,7 +1516,7 @@ msgid ""
 "If unsure, leave this checked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95
 msgid ""
 "Disable emulation of EFB copies.\n"
 "These are often used for post-processing or render-to-texture effects, so "
@@ -1492,52 +1526,60 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:543
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101
+msgid ""
+"Disables emulation of a hardware feature called destination alpha, which is "
+"used in many games for various graphical effects.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:553
 msgid "Disc"
 msgstr ""
 
-#: Source/Core/DiscIO/Src/DriveBlob.cpp:107
-#: Source/Core/DiscIO/Src/DriveBlob.cpp:126
+#: Source/Core/DiscIO/Src/DriveBlob.cpp:94
+#: Source/Core/DiscIO/Src/DriveBlob.cpp:113
 msgid "Disc Read Error"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:312
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:320
 msgid "Display"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104
 msgid ""
 "Display the inputs read by the emulator.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:80
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:67
 msgid "Divide"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:987
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:990
 msgid "Do you want to stop the current emulation?"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:663
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:644
 msgid "Dolby Pro Logic II decoder"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:864
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:856
 msgid "Dolphin"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:183
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:188
 #, c-format
 msgid "Dolphin %s Graphics Configuration"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:292
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:298
 msgid "Dolphin &Web Site"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.h:37
+#: Source/Core/DolphinWX/Src/ConfigMain.h:24
 msgid "Dolphin Configuration"
 msgstr ""
 
@@ -1545,16 +1587,16 @@ msgstr ""
 msgid "Dolphin Emulated Wiimote Configuration"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:394
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:383
 msgid "Dolphin FIFO"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1136
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1153
 msgid "Dolphin GCPad Configuration"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:679
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1074
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:685
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1089
 msgid "Dolphin TAS Movies (*.dtm)"
 msgstr ""
 
@@ -1562,101 +1604,107 @@ msgstr ""
 msgid "Dolphin Wiimote Configuration"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:293
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:299
 msgid "Dolphin at &Google Code"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:364
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:351
 msgid ""
 "Dolphin could not find any GC/Wii ISOs.  Doubleclick here to browse for "
 "files..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:368
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:355
 msgid ""
 "Dolphin is currently set to hide all games.  Doubleclick here to show all "
 "games..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1159
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1160
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1246
 msgid "Dolphin was unable to complete the requested action."
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:275
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:58
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
+msgid ""
+"Doubles the emulated GPU clock rate. May speed up some games (ON = Fast, OFF "
+"= Compatible)"
+msgstr ""
+
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:262
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:45
 msgid "Down"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:54
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:44
 msgid "Download Codes (WiiRD Database)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:297
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:287
 #, c-format
 msgid "Downloaded %lu codes. (added %lu)"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:31
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:35
 msgid "Drums"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:105
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
 msgid "Dummy"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:661
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:642
 msgid "Dump Audio"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:532
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545
 msgid "Dump EFB Target"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546
 msgid "Dump Frames"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543
 msgid "Dump Textures"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114
 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:106
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111
 msgid ""
 "Dump decoded game textures to User/Dump/Textures/<game_id>/\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113
 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:474
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292
 msgid "Dutch"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:112
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:113
 msgid "E&xit"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:441
 msgid "EFB Copies"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:223
+#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:210
 #, c-format
 msgid ""
 "ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least "
@@ -1665,52 +1713,52 @@ msgid ""
 "driver."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:166
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:160
 msgid "EUROPE"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:156
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:143
 msgid "Early Memory Updates"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:447
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:453
 msgid "Edit"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.h:30
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.h:17
 msgid "Edit ActionReplay Code"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:285
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:286
 msgid "Edit Config"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.h:30
+#: Source/Core/DolphinWX/Src/PatchAddEdit.h:17
 msgid "Edit Patch"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:447
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:453
 msgid "Edit current perspective"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:403
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:425
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:407
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:429
 msgid "Edit..."
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:44
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:48
 msgid "Effect"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:425
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435
 msgid "Embedded Frame Buffer"
 msgstr ""
 
-#: Source/Core/Core/Src/Core.cpp:201
+#: Source/Core/Core/Src/Core.cpp:190
 msgid "Emu Thread already running"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110
 msgid ""
 "Emulate XFBs accurately.\n"
 "Slows down emulation a lot and prohibits high-resolution rendering but is "
@@ -1719,7 +1767,7 @@ msgid ""
 "If unsure, check virtual XFB emulation instead."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109
 msgid ""
 "Emulate XFBs using GPU texture objects.\n"
 "Fixes many games which don't work without XFB emulation while not being as "
@@ -1733,7 +1781,7 @@ msgstr ""
 msgid "Emulated Wiimote"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346
 msgid "Emulation State: "
 msgstr ""
 
@@ -1741,7 +1789,7 @@ msgstr ""
 msgid "Enable"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91
 msgid ""
 "Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's "
 "supported by your GPU.\n"
@@ -1751,55 +1799,55 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:111
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:98
 msgid "Enable AR Logging"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324
 msgid "Enable Block Merging"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331
 msgid "Enable Bounding Box Calculation"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:446
 msgid "Enable Cache"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:562
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542
 msgid "Enable Cheats"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310
 msgid "Enable Dual Core"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
 msgid "Enable Dual Core (speedup)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:550
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:563
 msgid "Enable Hotkeys"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311
 msgid "Enable Idle Skipping"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541
 msgid "Enable Idle Skipping (speedup)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312
 msgid "Enable MMU"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:554
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:567
 msgid "Enable Progressive Scan"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757
 msgid "Enable Screen Saver"
 msgstr ""
 
@@ -1807,15 +1855,15 @@ msgstr ""
 msgid "Enable Speaker Data"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
 msgid "Enable WideScreen"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:516
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529
 msgid "Enable Wireframe"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85
 msgid ""
 "Enable anisotropic filtering.\n"
 "Enhances visual quality of textures that are at oblique viewing angles.\n"
@@ -1824,7 +1872,7 @@ msgid ""
 "If unsure, select 1x."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323
 msgid ""
 "Enable fast disc access.  Needed for a few games. (ON = Fast, OFF = "
 "Compatible)"
@@ -1834,7 +1882,7 @@ msgstr ""
 msgid "Enable pages"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76
 msgid ""
 "Enable this if you want the whole screen to be used for rendering.\n"
 "If this is disabled, a render window will be created instead.\n"
@@ -1842,7 +1890,7 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80
 msgid ""
 "Enable this if you want to use the main Dolphin window for rendering rather "
 "than a separate render window.\n"
@@ -1850,34 +1898,34 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:335
 msgid ""
 "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for "
 "ANY other game."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340
 msgid "Enables Custom Projection Hack"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:528
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508
 msgid ""
 "Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on "
 "OSX."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510
 msgid ""
 "Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:512
 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
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81
 msgid ""
 "Enables progressive scan if supported by the emulated software.\n"
 "Most games don't care about this.\n"
@@ -1885,108 +1933,108 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313
 msgid ""
 "Enables the Memory Management Unit, needed for some games. (ON = Compatible, "
 "OFF = Fast)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116
 msgid ""
 "Encode frame dumps using the FFV1 codec.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:40
 msgid "End"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:469
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:280
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:260
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293
 msgid "English"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:329
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:407
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:337
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:417
 msgid "Enhancements"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:607
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:640
 msgid "Enter a name for the new perspective:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:191
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:178
 #, c-format
 msgid "Entry %d/%d"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:85
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:72
 #, c-format
 msgid "Entry 1/%d"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:204
 msgid "Equal"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:45
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:156
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1242
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:32
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:150
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226
 msgid "Error"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/Main.cpp:381
+#: Source/Core/DolphinWX/Src/Main.cpp:409
 msgid "Error loading selected language. Falling back to system default."
 msgstr ""
 
-#: Source/Core/Common/Src/ChunkFile.h:226
+#: Source/Core/Common/Src/ChunkFile.h:221
 #, c-format
 msgid ""
 "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). "
 "Aborting savestate load..."
 msgstr ""
 
-#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:342
+#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:329
 #, c-format
 msgid ""
 "Error: Trying to access %s fonts but they are not loaded. Games may not show "
 "fonts correctly, or crash."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:30
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:17
 msgid "Escape"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:26
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:30
 msgid "Euphoria"
 msgstr ""
 
 #: Source/Core/Core/Src/ArmMemTools.cpp:78
-#: Source/Core/Core/Src/x64MemTools.cpp:217
+#: Source/Core/Core/Src/x64MemTools.cpp:206
 #, c-format
 msgid "Exception handler - access below memory space. %08llx%08llx"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:61
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
 msgid "Execute"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:459
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:446
 msgid "Export Failed"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:639
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:649
 msgid "Export File"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:177
 msgid "Export Recording"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:345
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:351
 msgid "Export Recording..."
 msgstr ""
 
@@ -1994,7 +2042,7 @@ msgstr ""
 msgid "Export Save"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:874
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:865
 msgid "Export Wii save (Experimental)"
 msgstr ""
 
@@ -2002,100 +2050,100 @@ msgstr ""
 msgid "Export all saves"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:80
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:72
 msgid "Export failed, try again?"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:559
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:552
 msgid "Export save as..."
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:297
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:284
 msgid "Extension"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483
 msgid "External Frame Buffer"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:61
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:48
 msgid "Extra Parameter"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:62
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:49
 msgid "Extra Parameter useful in ''Metroid: Other M'' only."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:614
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:624
 msgid "Extract All Files..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:616
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:626
 msgid "Extract Apploader..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:617
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627
 msgid "Extract DOL..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:610
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:620
 msgid "Extract Directory..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:612
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:622
 msgid "Extract File..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:608
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:618
 msgid "Extract Partition..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:724
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:738
 #, c-format
 msgid "Extracting %s"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:707
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:721
 msgid "Extracting All Files"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:707
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:721
 msgid "Extracting Directory"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:710
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:724
 msgid "Extracting..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:892
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:893
 msgid "FIFO Byte"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:45
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:32
 msgid "FIFO Player"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:169
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:163
 msgid "FRANCE"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472
 msgid "FST Size:"
 msgstr ""
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:77
+#: Source/Core/Core/Src/NetPlayClient.cpp:81
 msgid "Failed to Connect!"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:225
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:228
 msgid "Failed to Listen!!"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:307
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:300
 msgid "Failed to download codes."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:827
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:843
 #, c-format
 msgid "Failed to extract to %s!"
 msgstr ""
@@ -2113,26 +2161,30 @@ msgid ""
 "(Choose it from the \"Audio\" tab of the configuration dialog.)"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:116
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:139
+#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:108
+#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:131
 msgid "Failed to load bthprops.cpl"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:100
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:109
+#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:90
+#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:101
 msgid "Failed to load hid.dll"
 msgstr ""
 
-#: Source/Core/Core/Src/Movie.cpp:792
+#: Source/Core/Core/Src/Movie.cpp:783
 #, c-format
 msgid "Failed to read %s"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:151
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:144
 msgid "Failed to read banner.bin"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:223
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:178
+msgid "Failed to read bk header"
+msgstr ""
+
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:211
 #, c-format
 msgid ""
 "Failed to read block %d of the save data\n"
@@ -2140,140 +2192,149 @@ msgid ""
 "FilePosition:%llx"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:148
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:136
 msgid ""
 "Failed to read block allocation table backup correctly\n"
 "(0x8000-0x9FFF)"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:142
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:130
 msgid ""
 "Failed to read block allocation table correctly\n"
 "(0x6000-0x7FFF)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:286
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:279
 #, c-format
 msgid "Failed to read data from file %d"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:136
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:367
+#, c-format
+msgid "Failed to read data from file: %s"
+msgstr ""
+
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:124
 msgid ""
 "Failed to read directory backup correctly\n"
 "(0x4000-0x5FFF)"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:130
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:118
 msgid ""
 "Failed to read directory correctly\n"
 "(0x2000-0x3FFF)"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:119
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:90
+msgid "Failed to read header"
+msgstr ""
+
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:107
 msgid ""
 "Failed to read header correctly\n"
 "(0x0000-0x1FFF)"
 msgstr ""
 
-#: Source/Core/DiscIO/Src/VolumeGC.cpp:61
+#: Source/Core/DiscIO/Src/VolumeGC.cpp:48
 msgid "Failed to read unique ID from disc image"
 msgstr ""
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:84
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:71
 msgid "Failed to write BT.DINF to SYSCONF"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:228
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:221
 msgid "Failed to write bkhdr"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:164
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:157
 #, c-format
 msgid "Failed to write header for %s"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:258
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:251
 #, c-format
 msgid "Failed to write header for file %d"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294
 msgid "Farsi"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477
 msgid "Fast"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315
 msgid "Fast version of the MMU.  Does not work for every game."
 msgstr ""
 
-#: Source/Core/Core/Src/Movie.cpp:1046
+#: Source/Core/Core/Src/Movie.cpp:1037
 #, c-format
 msgid ""
 "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:199
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:202
 msgid "Fifo Player"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:99
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:86
 msgid "File Info"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:304
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:295
 msgid "File contained no codes."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:413
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:400
 msgid "File converted to .gci"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:428
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:415
 msgid ""
 "File could not be opened\n"
 "or does not have a valid extension"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:84
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:72
 #, c-format
 msgid ""
 "File has the extension \"%s\"\n"
 "valid extensions are (.raw/.gcp)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:425
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:412
 msgid "File is not recognized as a memcard"
 msgstr ""
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:294
+#: Source/Core/DiscIO/Src/CompressedBlob.cpp:281
 msgid "File not compressed"
 msgstr ""
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:127
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:109
 #, c-format
 msgid "FileIO: Unknown open mode : 0x%02x"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:531
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:541
 msgid "Filesystem"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1100
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1126
 msgid "Filetype 'ini' is unknown! Will not open!"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:265
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:252
 msgid "Find next"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:266
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:253
 msgid "Find previous"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:632
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626
 msgid "First Block"
 msgstr ""
 
@@ -2281,23 +2342,23 @@ msgstr ""
 msgid "Fix Checksums"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:275
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283
 msgid "Force 16:9"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:275
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283
 msgid "Force 4:3"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:568
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548
 msgid "Force Console as NTSC-J"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406
 msgid "Force Texture Filtering"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90
 msgid ""
 "Force texture filtering even if the emulated game explicitly disabled it.\n"
 "Improves texture quality slightly but causes glitches in some games.\n"
@@ -2305,7 +2366,7 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83
 msgid ""
 "Force the game to output graphics for widescreen resolutions.\n"
 "Causes graphical glitches is some games.\n"
@@ -2313,160 +2374,160 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488
 msgid ""
 "Forces NTSC-J mode for using the Japanese ROM font.\n"
 "Left unchecked, dolphin defaults to NTSC-U and automatically enables this "
 "setting when playing Japanese games."
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:74
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:62
 msgid ""
 "Format as ascii (NTSC\\PAL)?\n"
 "Choose no for sjis (NTSC-J)"
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:278
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:265
 msgid "Forward"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504
 #, c-format
 msgid "Found %d results for '"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:857
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:925
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:858
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:926
 msgid "Frame"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:867
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:868
 msgid "Frame "
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:185
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:173
 msgid "Frame Advance"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:536
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549
 msgid "Frame Dumps use FFV1"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:227
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:214
 msgid "Frame Info"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:116
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:103
 msgid "Frame Range"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:138
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:139
 msgid "Frame S&kipping"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:572
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552
 msgid "Framelimit:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:204
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:191
 msgid "Frames To Record"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547
 msgid "Free Look"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
 msgid "French"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:38
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:42
 msgid "Frets"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:118
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:137
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:105
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:124
 msgid "From"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:426
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:432
 msgid "FullScr"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:256
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263
 msgid "Fullscreen resolution:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:534
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524
 msgid "GCI File(*.gci)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GCMicDlg.h:44
+#: Source/Core/DolphinWX/Src/GCMicDlg.h:31
 msgid "GCMic Configuration"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:432
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
 msgid "GCPad"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:659
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:658
 msgid "GX_CMD_INVL_VC"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:448
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:452
 msgid "Game ID:"
 msgstr ""
 
-#: Source/Core/Core/Src/NetPlay.cpp:229
+#: Source/Core/Core/Src/NetPlay.cpp:216
 msgid "Game is already running!"
 msgstr ""
 
-#: Source/Core/Core/Src/NetPlay.cpp:259
+#: Source/Core/Core/Src/NetPlay.cpp:246
 msgid "Game isn't running!"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:389
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:393
 msgid "Game not found!"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:385
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:389
 msgid "Game-Specific Settings"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:293
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:294
 msgid "GameConfig"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:525
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:515
 msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534
 msgid "Gamecube"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:178
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:181
 msgid "Gamecube &Pad Settings"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:218
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1069
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:205
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1052
 msgid "Gamecube Memory Cards (*.raw,*.gcp)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:432
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
 msgid "Gamecube Pad settings"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:117
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302
 msgid "Gecko Codes"
 msgstr ""
 
-#: Source/Core/Core/Src/GeckoCode.cpp:222
+#: Source/Core/Core/Src/GeckoCode.cpp:214
 #, c-format
 msgid ""
 "GeckoCode failed to run (CT%i CST%i) (%s)\n"
@@ -2475,10 +2536,10 @@ msgid ""
 "directory and restarting Dolphin.)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:172
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:197
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:160
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:160
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:202
 msgid "General"
 msgstr ""
 
@@ -2486,30 +2547,30 @@ msgstr ""
 msgid "General Settings"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:470
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:281
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:316
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:261
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
 msgid "German"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:449
+#: Source/Core/Core/Src/ActionReplay.cpp:439
 #, c-format
 msgid "GetARCode: Index is greater than ar code list size %lu"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:430
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:436
 msgid "Graphics"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:430
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:436
 msgid "Graphics settings"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:205
 msgid "Greater Than"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87
 msgid ""
 "Greatly increases quality of textures generated using render to texture "
 "effects.\n"
@@ -2520,51 +2581,67 @@ msgid ""
 "If unsure, leave this checked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:317
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
 msgid "Greek"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:22
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Green"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:24
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Green Left"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:25
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Green Right"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:35
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:39
 msgid "Guitar"
 msgstr ""
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1259
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1250
 msgid "HCI_CMD_INQUIRY is called, please report!"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:421
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504
+msgid "Hacked Buffer Upload"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431
 msgid "Hacks"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:158
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:146
 msgid "Header checksum failed"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:318
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298
 msgid "Hebrew"
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:313
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:300
 msgid "Height"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:64
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:51
 msgid "Help"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/Main.cpp:209
+#: Source/Core/DolphinWX/Src/Main.cpp:229
+msgid ""
+"Hi,\n"
+"\n"
+"Dolphin requires Mac OS X 10.7 or greater.\n"
+"Unfortunately you're running an old version of OS X.\n"
+"The last Dolphin version to support OS X 10.6 is Dolphin 3.5\n"
+"Please upgrade to 10.7 or greater to use the newest Dolphin version.\n"
+"\n"
+"Sayonara!\n"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/Main.cpp:220
 msgid ""
 "Hi,\n"
 "\n"
@@ -2574,41 +2651,41 @@ msgid ""
 "Sayonara!\n"
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:309
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:296
 msgid "Hide"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:307
 msgid "Hide Mouse Cursor"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79
 msgid ""
 "Hides the mouse cursor if it's on top of the emulation window.\n"
 "\n"
 "If unsure, leave this checked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:54
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41
 msgid "Home"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:85
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:138
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:76
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:141
 msgid "Host"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.h:44
+#: Source/Core/DolphinWX/Src/HotkeyDlg.h:31
 msgid "Hotkey Configuration"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:272
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:272
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:594
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:260
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:260
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574
 msgid "Hotkeys"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:319
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299
 msgid "Hungarian"
 msgstr ""
 
@@ -2616,29 +2693,29 @@ msgstr ""
 msgid "Hybrid Wiimote"
 msgstr ""
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:532
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:519
 #, 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:786
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:773
 #, c-format
 msgid ""
-"IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available "
-"in your nand dump\n"
+"IOCTL_ES_LAUNCH: Game tried to reload an IOS or a title that is not "
+"available in your NAND dump\n"
 "TitleID %016llx.\n"
-" Dolphin will likely hang now"
+" Dolphin will likely hang now."
 msgstr ""
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:313
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:300
 msgid "IOCTL_ES_READCONTENT - bad destination"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729
 msgid "IPL Settings"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269
 msgid "IR"
 msgstr ""
 
@@ -2650,45 +2727,33 @@ msgstr ""
 msgid "IR Sensitivity:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:502
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:512
 msgid "ISO Details"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:830
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:811
 msgid "ISO Directories"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:172
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:166
 msgid "ITALY"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:630
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:624
 msgid "Icon"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332
 msgid ""
 "If checked, the bounding box registers will be updated. Used by the Paper "
 "Mario games."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318
-msgid ""
-"If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505
-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:428
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438
 msgid "Ignore Format Changes"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94
 msgid ""
 "Ignore any changes to the EFB format.\n"
 "Improves performance in many games without any negative effect. Causes "
@@ -2697,7 +2762,7 @@ msgid ""
 "If unsure, leave this checked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93
 msgid ""
 "Ignore any requests of the CPU to read from or write to the EFB.\n"
 "Improves performance in some games, but might disable some gameplay-related "
@@ -2710,35 +2775,27 @@ msgstr ""
 msgid "Import Save"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:59
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:48
 msgid "Import failed, try again?"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:454
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:441
 msgid ""
 "Imported file has gsc extension\n"
 "but does not have a correct header"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:442
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:429
 msgid "Imported file has invalid length"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:451
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:438
 msgid ""
 "Imported file has sav extension\n"
 "but does not have a correct header"
 msgstr ""
 
-#: 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/ISOProperties.cpp:347
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350
 msgid "In Game"
 msgstr ""
 
@@ -2746,125 +2803,129 @@ msgstr ""
 msgid "In-Game"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:34
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305
 msgid "Info"
 msgstr ""
 
-#: Source/Core/Common/Src/MsgHandler.cpp:65
+#: Source/Core/Common/Src/MsgHandler.cpp:51
 msgid "Information"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:481
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:468
 msgid "Input"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:63
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:50
 msgid "Insert"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:176
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:166
 msgid "Insert Encrypted or Decrypted code here..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:763
 msgid "Insert SD Card"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:34
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:21
 msgid "Insert name here.."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:196
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:199
 msgid "Install WAD"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:895
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:888
 msgid "Install to Wii Menu"
 msgstr ""
 
-#: Source/Core/Core/Src/x64MemTools.cpp:252
+#: Source/Core/Core/Src/x64MemTools.cpp:242
 msgid ""
 "InstallExceptionHandler called, but this platform does not yet support it."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1297
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
 msgid "Installing WAD..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:885
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:901
 msgid "Integrity Check Error"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:891
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:907
 msgid "Integrity check completed"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:890
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:906
 msgid "Integrity check completed. No errors have been found."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:882
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:898
 #, 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:552
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532
 msgid "Interface"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:646
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627
 msgid "Interface Settings"
 msgstr ""
 
-#: Source/Core/Core/Src/State.cpp:240
+#: Source/Core/Core/Src/State.cpp:228
 msgid "Internal LZO Error - compression failed"
 msgstr ""
 
-#: Source/Core/Core/Src/State.cpp:348
+#: Source/Core/Core/Src/State.cpp:336
 #, c-format
 msgid ""
 "Internal LZO Error - decompression failed (%d) (%li, %li) \n"
 "Try loading the state again"
 msgstr ""
 
-#: Source/Core/Core/Src/State.cpp:485
+#: Source/Core/Core/Src/State.cpp:473
 msgid "Internal LZO Error - lzo_init() failed"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:344
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:352
 msgid "Internal Resolution:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:42
+msgid "Interpreter (VERY slow)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349
 msgid "Intro"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:194
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:187
 #, c-format
 msgid "Invalid Size(%x) or Magic word (%x)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:612
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:600
 msgid "Invalid Value!"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:462
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:449
 msgid "Invalid bat.map or dir entry"
 msgstr ""
 
-#: Source/Core/Core/Src/CoreTiming.cpp:548
+#: Source/Core/Core/Src/CoreTiming.cpp:553
 #, c-format
 msgid "Invalid event type %i"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:326
+#: Source/Core/Core/Src/HW/DVDInterface.cpp:309
 msgid "Invalid file"
 msgstr ""
 
-#: Source/Core/DiscIO/Src/BannerLoaderGC.cpp:41
+#: Source/Core/DiscIO/Src/BannerLoaderGC.cpp:28
 #, c-format
 msgid ""
 "Invalid opening.bnr found in gcm:\n"
@@ -2872,203 +2933,211 @@ msgid ""
 " You may need to redump this game."
 msgstr ""
 
-#: Source/Core/Core/Src/Movie.cpp:735
+#: Source/Core/Core/Src/Movie.cpp:726
 msgid "Invalid recording file"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:473
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:472
 msgid "Invalid search parameters (no object selected)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:456
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:455
 msgid "Invalid search string (couldn't convert to number)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:444
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:443
 msgid "Invalid search string (only even string lengths supported)"
 msgstr ""
 
-#: Source/Core/Core/Src/Core.cpp:513
+#: Source/Core/Core/Src/Core.cpp:511
 msgid "Invalid state"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:473
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:320
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300
 msgid "Italian"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:183
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:177
 msgid "JAPAN"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:321
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:46
+msgid "JIT Recompiler (recommended)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:47
+msgid "JITIL experimental recompiler"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:279
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
 msgid "Japanese"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:188
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:182
 msgid "KOREA"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78
 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:298
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:306
 msgid "Keep window on top"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:241
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:241
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:229
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:229
 msgid "Key"
 msgstr ""
 
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282
 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:322
 msgid "Korean"
 msgstr ""
 
 #. i18n:  Left
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:57
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:44
 msgid "L"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:39
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:26
 msgid "L Button"
 msgstr ""
 
 #. i18n:  Left-Analog
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:61
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:48
 msgid "L-Analog"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:585
 msgid "Language:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:152
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:153
 msgid "Last Overwritten State"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:159
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:161
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:160
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:162
 msgid "Last Saved State"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:696
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:677
 msgid "Latency:"
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:276
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:55
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:263
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:42
 msgid "Left"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:60
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:64
 msgid "Left Stick"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:257
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:257
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:245
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:245
 msgid ""
 "Left click to detect hotkeys.\n"
 "Enter space to clear."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:689
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:678
 msgid ""
 "Left-click to detect input.\n"
 "Middle-click to clear.\n"
 "Right-click for more options."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:694
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:683
 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:206
 msgid "Less Than"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:565
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545
 msgid "Limit by FPS"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:924
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:915
 msgid "Load"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544
 msgid "Load Custom Textures"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
 msgid "Load State Slot 1"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189
 msgid "Load State Slot 2"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:190
 msgid "Load State Slot 3"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:203
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:191
 msgid "Load State Slot 4"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192
 msgid "Load State Slot 5"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193
 msgid "Load State Slot 6"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:194
 msgid "Load State Slot 7"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:195
 msgid "Load State Slot 8"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:155
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:156
 msgid "Load State..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1332
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1359
 msgid "Load Wii System Menu"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1327
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1354
 #, c-format
 msgid "Load Wii System Menu %d%c"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112
 msgid ""
 "Load custom textures from User/Load/Textures/<game_id>/\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:50
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:37
 msgid "Load preset values from hack patterns available."
 msgstr ""
 
@@ -3076,23 +3145,23 @@ msgstr ""
 msgid "Local"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogWindow.h:51
+#: Source/Core/DolphinWX/Src/LogWindow.h:38
 msgid "Log"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:26
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:13
 msgid "Log Configuration"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:296
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304
 msgid "Log FPS to file"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:96
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83
 msgid "Log Types"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103
 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"
@@ -3100,81 +3169,90 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:81
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:68
 msgid "Logger Outputs"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132
-#: Source/Core/DolphinWX/Src/Frame.cpp:328
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:119
+#: Source/Core/DolphinWX/Src/Frame.cpp:314
 msgid "Logging"
 msgstr ""
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:255
+#: Source/Core/Core/Src/NetPlayClient.cpp:259
 msgid "Lost connection to server!"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:42
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:29
 msgid "M Button"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:119
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:112
 #, c-format
 msgid ""
 "MD5 mismatch\n"
 " %016llx%016llx != %016llx%016llx"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314
 msgid "MMU Speed Hack"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:527
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:563
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:517
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:556
 msgid "MadCatz Gameshark files(*.gcs)"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:51
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:63
+#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:38
 msgid "Main Stick"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460
 msgid "Maker ID:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487
 msgid "Maker:"
 msgstr ""
 
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100
+msgid ""
+"Makes distant objects more visible by removing fog, thus increasing the "
+"overall detail.\n"
+"Disabling fog will break some games which rely on proper fog emulation.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:97
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:100
 msgid "Max"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:448
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:435
 msgid "Memcard already has a save for this title"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:291
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:278
 msgid "Memcard already opened"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:912
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:913
 msgid "Memory Byte"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:225
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:113
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:212
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:93
 msgid "Memory Card"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.h:36
+#: Source/Core/DolphinWX/Src/MemcardManager.h:23
 msgid ""
 "Memory Card Manager WARNING-Make backups before using, should be fixed but "
 "could mangle stuff!"
 msgstr ""
 
-#: Source/Core/Core/Src/CoreParameter.cpp:371
+#: Source/Core/Core/Src/CoreParameter.cpp:360
 #, c-format
 msgid ""
 "Memory Card filename in Slot %c is incorrect\n"
@@ -3185,15 +3263,15 @@ msgid ""
 "Would you like to copy the old file to this new location?\n"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:124
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:112
 msgid "Memorycard filesize does not match the header size"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:50
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:37
 msgid "Menu"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:114
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:94
 msgid "Mic"
 msgstr ""
 
@@ -3202,20 +3280,20 @@ msgstr ""
 msgid "Min"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:580
 msgid "Misc"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:795
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776
 msgid "Misc Settings"
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:240
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:294
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:227
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:281
 msgid "Modifier"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106
 msgid ""
 "Modify textures to show the format they're encoded in. Needs an emulation "
 "reset in most cases.\n"
@@ -3223,20 +3301,20 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:115
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:108
 msgid "Monospaced font"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:305
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:292
 msgid "Motion Plus"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:309
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:86
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:296
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73
 msgid "Motor"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:654
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:666
 msgid ""
 "Move the mouse pointer over an option to display a detailed description.\n"
 "\n"
@@ -3247,224 +3325,235 @@ msgid ""
 "\n"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:75
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:62
 msgid "Multiply"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:651
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:650
 msgid "NOP"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:629
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:628
 msgid "NOTE: Stream size doesn't match actual data length\n"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:129
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:116
 msgid "NP Add"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:124
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:111
 msgid "NP Begin"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:132
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:119
 msgid "NP Decimal"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:126
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:113
 msgid "NP Delete"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:133
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:120
 msgid "NP Divide"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:120
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:107
 msgid "NP Down"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:123
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:110
 msgid "NP End"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:111
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:98
 msgid "NP Enter"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:127
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:114
 msgid "NP Equal"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:116
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:103
 msgid "NP Home"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:125
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:112
 msgid "NP Insert"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:117
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:104
 msgid "NP Left"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:128
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:115
 msgid "NP Multiply"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:122
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:109
 msgid "NP Page Down"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:121
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:108
 msgid "NP Page Up"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:119
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:106
 msgid "NP Right"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:130
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:117
 msgid "NP Separator"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:109
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:96
 msgid "NP Space"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:131
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:118
 msgid "NP Subtract"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:110
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:97
 msgid "NP Tab"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:118
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:105
 msgid "NP Up"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:444
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:59
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:50
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:448
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:46
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:37
 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:25
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:72
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:282
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:553
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:15
 msgid "Name: "
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:526
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:562
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:516
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:555
 msgid "Native GCI files(*.gci)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:161
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:148
 msgid "New Scan"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:206
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:193
 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:801
 msgid "Next Page"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:165
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:152
 msgid "Next Scan"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:68
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:59
 msgid "Nickname :"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:196
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:190
 msgid "No Country (SDK)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:370
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:357
 msgid "No ISOs or WADS found"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:508
-#, c-format
-msgid "No banner file found for title  %s"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:761
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:768
-msgid "No description available"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:514
-msgid "No docking"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:859
-msgid "No file loaded"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:439
-msgid "No free dir index entries"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:895
-msgid "No recorded file"
+#: Source/Core/Core/Src/ConfigManager.h:17
+msgid "No audio output"
 msgstr ""
 
 #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:501
 #, c-format
+msgid "No banner file found for title  %s"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:760
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:767
+msgid "No description available"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:535
+msgid "No docking"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:860
+msgid "No file loaded"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:426
+msgid "No free dir index entries"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:896
+msgid "No recorded file"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:494
+#, c-format
 msgid "No save folder found for title %s"
 msgstr ""
 
+#: Source/Plugins/Plugin_VideoOGL/Src/main.cpp:132
+#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:111
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:23
 #: Source/Core/DolphinWX/Src/NetWindow.cpp:600
 msgid "None"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:323
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303
 msgid "Norwegian Bokmaal"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:203
 msgid "Not Equal"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:804
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:794
 msgid "Not Set"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/Main.cpp:626
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:101
+#, c-format
+msgid "Not a Wii save or read failure for file header size %x"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/Main.cpp:654
 msgid "Not connected"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:309
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:296
 msgid "Notes"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:16
 msgid "Notes: "
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:71
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:74
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:580
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:621
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:629
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:59
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:64
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:613
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:659
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:667
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:31
 msgid "Notice"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:105
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:92
 msgid "Num Lock"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:88
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:75
 msgid "Number Of Codes: "
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:30
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:34
 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26
 msgid "Nunchuk"
 msgstr ""
@@ -3473,107 +3562,107 @@ msgstr ""
 msgid "Nunchuk Acceleration"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:877
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:878
 msgid "Object"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:135
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:122
 msgid "Object Range"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:243
 msgid "Off"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:62
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:49
 msgid "Offset:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:582
 msgid "On-Screen Display Messages"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:436
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:423
 #, c-format
 msgid "Only %d blocks available"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:420
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:178
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:426
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:166
 msgid "Open"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:876
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:867
 msgid "Open &containing folder"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:873
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:864
 msgid "Open Wii &save folder"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:420
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:426
 msgid "Open file..."
 msgstr ""
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:61
+#: Source/Core/AudioCommon/Src/OpenALStream.cpp:48
 #, c-format
 msgid "OpenAL: can't create context for device %s"
 msgstr ""
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:72
+#: Source/Core/AudioCommon/Src/OpenALStream.cpp:59
 msgid "OpenAL: can't find sound devices"
 msgstr ""
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:66
+#: Source/Core/AudioCommon/Src/OpenALStream.cpp:53
 #, c-format
 msgid "OpenAL: can't open device %s"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502
 msgid "OpenCL Texture Decoder"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503
 msgid "OpenMP Texture Decoder"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:317
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:94
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:304
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:81
 msgid "Options"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:22
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Orange"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:468
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:455
 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"
+"and import the saves to a new memcard\n"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:316
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:324
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:509
 msgid "Other"
 msgstr ""
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:206
+#: Source/Core/Core/Src/NetPlayClient.cpp:210
 msgid ""
 "Other client disconnected while game is running!! NetPlay is disabled. You "
 "manually stop the game."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:481
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:468
 msgid "Output"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:342
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:348
 msgid "P&lay Recording..."
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCPad.cpp:30
+#: Source/Core/Core/Src/HW/GCPad.cpp:18
 msgid "Pad"
 msgstr ""
 
@@ -3581,160 +3670,160 @@ msgstr ""
 msgid "Pad "
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:34
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:38
 msgid "Pads"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:108
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:95
 msgid "Page Down"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:107
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:94
 msgid "Page Up"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:35
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:22
 msgid "Paragraph"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:64
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:51
 msgid "Parameters"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:222
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:217
 #, c-format
 msgid "Partition %i"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:296
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:297
 msgid "Patches"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:556
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536
 msgid "Paths"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1538
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1539
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:51
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1565
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1566
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:38
 msgid "Pause"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:128
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:129
 msgid "Pause at end of movie"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:397
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405
 msgid "Per-Pixel Lighting"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352
 msgid "Perfect"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:609
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:642
 #, c-format
 msgid "Perspective %d"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:165
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:424
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1547
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1548
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:152
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:430
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1574
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1575
 msgid "Play"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176
 msgid "Play Recording"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:170
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:170
 msgid "Play/Pause"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351
 msgid "Playable"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:154
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:141
 msgid "Playback Options"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:301
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:304
 msgid "Players"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:988
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:991
 msgid "Please confirm..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:579
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:612
 msgid "Please create a perspective before saving"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:36
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:23
 msgid "Plus-Minus"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:324
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304
 msgid "Polish"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:713
 msgid "Port 1"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714
 msgid "Port 2"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:734
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715
 msgid "Port 3"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716
 msgid "Port 4"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:97
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:130
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:88
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:133
 msgid "Port :"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:325
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305
 msgid "Portuguese"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:326
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306
 msgid "Portuguese (Brazilian)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:391
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:399
 msgid "Post-Processing Effect:"
 msgstr ""
 
-#: Source/Core/Core/Src/Movie.cpp:936
+#: Source/Core/Core/Src/Movie.cpp:927
 #, c-format
 msgid "Premature movie end in PlayController. %u + 8 > %u"
 msgstr ""
 
-#: Source/Core/Core/Src/Movie.cpp:1055
+#: Source/Core/Core/Src/Movie.cpp:1046
 #, c-format
 msgid "Premature movie end in PlayWiimote. %u + %d > %u"
 msgstr ""
 
-#: Source/Core/Core/Src/Movie.cpp:1032
+#: Source/Core/Core/Src/Movie.cpp:1023
 #, c-format
 msgid "Premature movie end in PlayWiimote. %u > %u"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:48
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:35
 msgid "Presets: "
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:205
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:192
 msgid "Prev Page"
 msgstr ""
 
@@ -3742,67 +3831,67 @@ msgstr ""
 msgid "Previous Page"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:183
 msgid "Previous Value"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:60
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:47
 msgid "Print"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:894
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:885
 msgid "Profile"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.h:55
+#: Source/Core/DolphinWX/Src/ISOProperties.h:42
 msgid "Properties"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:283
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:286
 msgid "Purge Cache"
 msgstr ""
 
-#: Source/Core/Common/Src/MsgHandler.cpp:66
+#: Source/Core/Common/Src/MsgHandler.cpp:52
 msgid "Question"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:159
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:316
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:162
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:319
 msgid "Quit"
 msgstr ""
 
 #. i18n:  Right
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:59
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:46
 msgid "R"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:40
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:27
 msgid "R Button"
 msgstr ""
 
 #. i18n:  Right-Analog
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:63
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
 msgid "R-Analog"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:445
 msgid "RAM"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:175
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:169
 msgid "RUSSIA"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:528
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:515
 msgid "Range"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:190
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:178
 msgid "Read-only mode"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:487
 msgid "Real"
 msgstr ""
 
@@ -3818,33 +3907,33 @@ msgstr ""
 msgid "Reconnect Wiimote on State Loading"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:193
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:217
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:791
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:180
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:204
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:790
 msgid "Record"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:174
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:161
 msgid "Recording Info"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:202
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:189
 msgid "Recording Options"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:21
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Red"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:24
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Red Left"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:25
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Red Right"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86
 msgid ""
 "Reduces the amount of aliasing caused by rasterizing 3D graphics.\n"
 "This makes the rendered picture look less blocky.\n"
@@ -3854,255 +3943,261 @@ msgid ""
 msgstr ""
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:60
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:421
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:903
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:427
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:894
 msgid "Refresh"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:180
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:168
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:168
 msgid "Refresh List"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:421
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:427
 msgid "Refresh game list"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:405
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:427
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:77
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:812
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:409
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:431
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:64
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:793
 msgid "Remove"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99
 msgid ""
 "Render the scene as a wireframe.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:308
 msgid "Render to Main Window"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:915
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:172
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:906
 msgid "Reset"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:190
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:177
 msgid "Results"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:29
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:16
 msgid "Return"
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:277
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:57
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464
+msgid "Revision:"
+msgstr ""
+
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:264
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:44
 msgid "Right"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:61
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:65
 msgid "Right Stick"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:85
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:295
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:72
 msgid "Rumble"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:518
-msgid "Run DSP LLE on a dedicated thread (not recommended)."
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498
+msgid ""
+"Run DSP HLE and LLE on a dedicated thread (not recommended: might cause "
+"audio glitches with HLE and freezes with LLE)."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:327
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307
 msgid "Russian"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:149
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:150
 msgid "Sa&ve State"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:465
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475
 msgid "Safe"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:196
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:446
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:925
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:183
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:452
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916
 msgid "Save"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:532
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:522
 msgid "Save GCI as..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
 msgid "Save State Slot 1"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:198
 msgid "Save State Slot 2"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:199
 msgid "Save State Slot 3"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:212
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:212
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200
 msgid "Save State Slot 4"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201
 msgid "Save State Slot 5"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202
 msgid "Save State Slot 6"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:203
 msgid "Save State Slot 7"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204
 msgid "Save State Slot 8"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:151
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:152
 msgid "Save State..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:582
 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:592
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:602
 msgid "Save as..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1203
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1204
 msgid "Save compressed GCM/ISO"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:446
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:452
 msgid "Save current perspective"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1192
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193
 msgid "Save decompressed GCM/ISO"
 msgstr ""
 
-#: Source/Core/Core/Src/Movie.cpp:801
+#: Source/Core/Core/Src/Movie.cpp:792
 #, c-format
 msgid "Savestate movie %s is corrupted, movie recording stopping..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:396
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:404
 msgid "Scaled EFB Copy"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:556
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:543
 #, c-format
 msgid "Scanning %s"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:539
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:526
 msgid "Scanning for ISOs"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:540
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:527
 msgid "Scanning..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:427
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
 msgid "ScrShot"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:106
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:93
 msgid "Scroll Lock"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:264
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:251
 msgid "Search"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:227
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:214
 msgid "Search Filter"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:810
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:791
 msgid "Search Subfolders"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:250
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:237
 msgid "Search current Object"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:254
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:241
 msgid "Search for hex Value:"
 msgstr ""
 
-#: Source/Core/Common/Src/SysConf.h:103 Source/Core/Common/Src/SysConf.h:126
-#: Source/Core/Common/Src/SysConf.h:146 Source/Core/Common/Src/SysConf.h:167
+#: Source/Core/Common/Src/SysConf.h:90 Source/Core/Common/Src/SysConf.h:113
+#: Source/Core/Common/Src/SysConf.h:133 Source/Core/Common/Src/SysConf.h:154
 #, c-format
 msgid "Section %s not found in SYSCONF"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:59
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:490
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:46
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:477
 msgid "Select"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:677
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1072
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:683
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1087
 msgid "Select The Recording File"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1285
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1312
 msgid "Select a Wii WAD file to install"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:70
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74
 msgid ""
 "Select a hardware adapter to use.\n"
 "\n"
 "If unsure, use the first one."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:520
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:510
 msgid "Select a save file to import"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:363
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:366
 msgid "Select floating windows"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:582
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:585
 msgid "Select the file to load"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1241
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1268
 msgid "Select the save file"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1388
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1415
 msgid "Select the state to load"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1429
 msgid "Select the state to save"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82
 msgid ""
 "Select what aspect ratio to use when rendering:\n"
 "Auto: Use the native aspect ratio\n"
@@ -4113,15 +4208,15 @@ msgid ""
 "If unsure, select Auto."
 msgstr ""
 
-#: Source/Core/InputCommon/Src/InputConfig.cpp:61
+#: Source/Core/InputCommon/Src/InputConfig.cpp:48
 msgid "Selected controller profile does not exist"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:116
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:109
 msgid "Selected font"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75
 msgid ""
 "Selects the display resolution used in fullscreen mode.\n"
 "This should always be bigger than or equal to the internal resolution. "
@@ -4131,17 +4226,27 @@ msgid ""
 "If still unsure, use the highest resolution which works for you."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:69
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:70
 msgid ""
 "Selects what graphics API to use internally.\n"
 "Direct3D 9 usually is the fastest one. OpenGL is more accurate though. "
 "Direct3D 11 is somewhere between the two.\n"
 "Note that the Direct3D backends are only available on Windows.\n"
 "\n"
-"If unsure, use Direct3D 9."
+"If unsure, use Direct3D 11."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:288
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72
+msgid ""
+"Selects what graphics API to use internally.\n"
+"Direct3D 9 usually is the fastest one. OpenGL is more accurate though. "
+"Direct3D 11 is somewhere between the two.\n"
+"Note that the Direct3D backends are only available on Windows.\n"
+"\n"
+"If unsure, use OpenGL."
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:291
 msgid "Send"
 msgstr ""
 
@@ -4149,24 +4254,24 @@ msgstr ""
 msgid "Sensor Bar Position:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:77
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:64
 msgid "Separator"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:328
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308
 msgid "Serbian"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:522
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502
 msgid ""
 "Serial Port 1 - This is the port which devices such as the net adapter use"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:488
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:475
 msgid "Set"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:877
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:868
 msgid "Set as &default ISO"
 msgstr ""
 
@@ -4175,134 +4280,134 @@ msgstr ""
 msgid "Set as default Memcard %c"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:460
+#: Source/Core/Core/Src/ActionReplay.cpp:450
 #, c-format
 msgid "SetARCode_IsActive: Index is greater than ar code list size %lu"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:515
 msgid ""
 "Sets the latency (in ms).  Higher values may reduce audio crackling. OpenAL "
 "backend only."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341
 msgid "Settings..."
 msgstr ""
 
-#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:222
+#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:209
 msgid "SetupWiiMem: Cant find setting file"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:291
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:278
 msgid "Shake"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
 msgid "Short Name:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:103
+#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:90
 msgid "Shoulder Buttons"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:217
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:220
 msgid "Show &Console"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:215
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:218
 msgid "Show &Log"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:212
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:215
 msgid "Show &Statusbar"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:210
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:213
 msgid "Show &Toolbar"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:281
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:284
 msgid "Show Drives"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:517
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530
 msgid "Show EFB Copy Regions"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:295
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303
 msgid "Show FPS"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:271
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:274
 msgid "Show France"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:257
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:260
 msgid "Show GameCube"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561
 msgid "Show Input Display"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:273
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:276
 msgid "Show Italy"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:264
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:267
 msgid "Show JAP"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:275
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:278
 msgid "Show Korea"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476
 msgid "Show Language:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:216
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:219
 msgid "Show Log &Configuration"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:266
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:269
 msgid "Show PAL"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:254
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:257
 msgid "Show Platforms"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:263
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:266
 msgid "Show Regions"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:518
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531
 msgid "Show Statistics"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:277
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:280
 msgid "Show Taiwan"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:268
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:271
 msgid "Show USA"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:259
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:262
 msgid "Show Wad"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:255
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:258
 msgid "Show Wii"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491
 msgid "Show a confirmation box before stopping a game."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:512
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492
 msgid ""
 "Show a message box when a potentially serious error has occurred.\n"
 "Disabling this may avoid annoying and non-fatal messages, but it may also "
@@ -4313,11 +4418,11 @@ msgstr ""
 msgid "Show first block"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:130
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:131
 msgid "Show lag counter"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493
 msgid ""
 "Show messages on the emulation screen area.\n"
 "These messages include memory card writes, video backend and CPU "
@@ -4340,7 +4445,7 @@ msgstr ""
 msgid "Show save title"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102
 msgid ""
 "Show the number of frames rendered per second as a measure of emulation "
 "speed.\n"
@@ -4348,54 +4453,42 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:279
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:282
 msgid "Show unknown"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105
 msgid ""
 "Show various statistics.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:319
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:306
 msgid "Sideways Wiimote"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:280
 msgid "Simplified Chinese"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:311
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:298
 msgid "Size"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:696
 msgid "Skip BIOS"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316
 msgid "Skip DCBZ clearing"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:492
-msgid "Skip Dest. Alpha Pass"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:444
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:454
 msgid "Skip EFB Access from CPU"
 msgstr ""
 
-#: 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 ""
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125
 msgid ""
 "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n"
 "Sometimes also increases visual quality.\n"
@@ -4405,25 +4498,25 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:374
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:386
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:380
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:392
 #, c-format
 msgid "Slot %i"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:700
 msgid "Slot A"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:701
 msgid "Slot B"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:62
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:49
 msgid "Snapshot"
 msgstr ""
 
-#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:58
+#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:46
 msgid "Software Renderer"
 msgstr ""
 
@@ -4435,27 +4528,27 @@ msgid ""
 "Do you really want to enable software rendering? If unsure, select 'No'."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:683
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:664
 msgid "Sound Settings"
 msgstr ""
 
-#: Source/Core/AudioCommon/Src/AudioCommon.cpp:77
+#: Source/Core/AudioCommon/Src/AudioCommon.cpp:64
 #, c-format
 msgid "Sound backend %s is not valid."
 msgstr ""
 
-#: Source/Core/AudioCommon/Src/DSoundStream.cpp:59
+#: Source/Core/AudioCommon/Src/DSoundStream.cpp:46
 #, c-format
 msgid "Sound buffer creation failed: %s"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:31
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:18
 msgid "Space"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:329
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309
 msgid "Spanish"
 msgstr ""
 
@@ -4463,7 +4556,7 @@ msgstr ""
 msgid "Speaker Volume:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92
 msgid ""
 "Specifies the resolution used to render at. A high resolution will improve "
 "visual quality a lot but is also quite heavy on performance and might cause "
@@ -4475,63 +4568,63 @@ msgid ""
 "If unsure, select 640x528."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322
 msgid "Speed up Disc Transfer Rate"
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:243
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:230
 msgid "Square Stick"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:107
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87
 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:322
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:37
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:25
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:325
 msgid "Start"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:194
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:197
 msgid "Start &NetPlay"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:339
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:345
 msgid "Start Re&cording"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:175
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:175
 msgid "Start Recording"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:312
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:299
 msgid "State"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:173
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:161
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:161
 msgid "State Saves"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:108
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88
 msgid "Steering Wheel"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:53
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:57
 msgid "Stick"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:420
-#: 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:325
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:419
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:431
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:171
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:171
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:328
 msgid "Stop"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96
 msgid ""
 "Store EFB copies in GPU texture objects.\n"
 "This is not so accurate, but it works well enough for most games and gives a "
@@ -4540,143 +4633,153 @@ msgid ""
 "If unsure, leave this checked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:275
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283
 msgid "Stretch to Window"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:43
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:47
 msgid "Strum"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:78
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:65
 msgid "Subtract"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:77
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:67
 #, c-format
 msgid "Successfully exported file to %s"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:56
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:43
 msgid "Successfully imported save files"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:285
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:272
 msgid "Swing"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:744
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:792
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320
+msgid "Synchronize GPU thread"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321
+msgid ""
+"Synchronizes the GPU and CPU threads to help prevent random freezes in Dual "
+"Core mode. (ON = Compatible, OFF = Fast)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773
 msgid "System Language:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:191
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:185
 msgid "TAIWAN"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:127
-#: Source/Core/DolphinWX/Src/TASInputDlg.h:32
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:128
+#: Source/Core/DolphinWX/Src/TASInputDlg.h:19
 msgid "TAS Input"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:28
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:15
 msgid "Tab"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:510
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:531
 msgid "Tab split"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:37
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:41
 msgid "Table Left"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:38
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:42
 msgid "Table Right"
 msgstr ""
 
-#: 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
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:361
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:181
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:181
 msgid "Take Screenshot"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:109
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89
 msgid "TaruKonga (Bongos)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:472
 msgid "Test"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:444
 msgid "Texture"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:451
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:461
 msgid "Texture Cache"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:519
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:532
 msgid "Texture Format Overlay"
 msgstr ""
 
-#: Source/Core/Core/Src/CoreParameter.cpp:226
+#: Source/Core/Core/Src/CoreParameter.cpp:215
 msgid "The WAD has been installed successfully"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:197
+#: Source/Core/Core/Src/ActionReplay.cpp:185
 msgid "The address is invalid"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:509
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:496
 msgid "The checksum was successfully fixed"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1242
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226
 msgid "The chosen directory is already in the list"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1117
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1216
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1118
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1146
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1217
 #, c-format
 msgid ""
 "The file %s already exists.\n"
 "Do you wish to replace it?"
 msgstr ""
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:51
+#: Source/Core/AudioCommon/Src/WaveFile.cpp:38
 #, c-format
 msgid ""
 "The file %s could not be opened for writing. Please check if it's already "
 "opened by another program."
 msgstr ""
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:44
+#: Source/Core/AudioCommon/Src/WaveFile.cpp:31
 #, c-format
 msgid "The file %s was already open, the file header will not be written."
 msgstr ""
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:332
+#: Source/Core/Core/Src/Boot/Boot.cpp:320
 #, c-format
 msgid "The file you specified (%s) does not exist"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:628
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:666
 msgid "The name can not be empty"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:620
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:658
 msgid "The name can not contain the character ','"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:142
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:129
 msgid "The resulting decrypted AR code doesn't contain any lines."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98
 msgid ""
 "The safer you adjust this, the less likely the emulator will be missing any "
 "texture updates from RAM.\n"
@@ -4684,68 +4787,68 @@ msgid ""
 "If unsure, use the rightmost value."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:445
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:432
 msgid "The save you are trying to copy has an invalid file size"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/Main.cpp:388
+#: Source/Core/DolphinWX/Src/Main.cpp:416
 msgid ""
 "The selected language is not supported by your system. Falling back to "
 "system default."
 msgstr ""
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:43
+#: Source/Core/Core/Src/NetPlayClient.cpp:47
 msgid "The server and client's NetPlay versions are incompatible!"
 msgstr ""
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:40
+#: Source/Core/Core/Src/NetPlayClient.cpp:44
 msgid "The server is full!"
 msgstr ""
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:46
+#: Source/Core/Core/Src/NetPlayClient.cpp:50
 msgid "The server responded: the game is currently running!"
 msgstr ""
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:49
+#: Source/Core/Core/Src/NetPlayClient.cpp:53
 msgid "The server sent an unknown error message!"
 msgstr ""
 
-#: Source/Core/Core/Src/CoreParameter.cpp:119
+#: Source/Core/Core/Src/CoreParameter.cpp:108
 #, c-format
 msgid "The specified file \"%s\" does not exist"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:198
+#: Source/Core/Core/Src/ActionReplay.cpp:186
 msgid "The value is invalid"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:642
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:623
 msgid "Theme:"
 msgstr ""
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:476
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:463
 msgid ""
 "There must be a ticket for 00000001/00000002. Your NAND dump is probably "
 "incomplete."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308
 msgid ""
 "These settings override core Dolphin settings.\n"
 "Undetermined means the game uses Dolphin's setting."
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:355
+#: Source/Core/Core/Src/ActionReplay.cpp:345
 msgid ""
 "This action replay simulator does not support codes that modify Action "
 "Replay itself."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505
 msgid "This could cause slow down in Wii Menu and some games."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118
 msgid ""
 "This feature allows you to change the game's camera.\n"
 "Move the mouse while holding the right mouse button to pan and while holding "
@@ -4757,7 +4860,15 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485
+msgid ""
+"This limits the game speed to the specified number of frames per second "
+"(full speed is 60 for NTSC and 50 for PAL). Alternatively, 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/ConfigMain.cpp:484
 msgid ""
 "This splits the Video and CPU threads, so they can be run on separate "
 "cores.\n"
@@ -4765,75 +4876,75 @@ msgid ""
 "cause occasional crashes/glitches."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:286
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:287
 msgid "This will let you Manually Edit the INI config file"
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:249
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:254
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:236
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:241
 msgid "Threshold"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:288
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:275
 msgid "Tilt"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:628
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:304
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:622
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:291
 msgid "Title"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:125
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:144
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:112
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:131
 msgid "To"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:72
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59
 msgid "Toggle All Log Types"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:426
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:432
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:180
 msgid "Toggle Fullscreen"
 msgstr ""
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:87
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:271
 msgid "Top"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:281
 msgid "Traditional Chinese"
 msgstr ""
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:426
+#: Source/Core/Core/Src/Boot/Boot.cpp:414
 msgid "Tried to load an unknown file type."
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:80
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:67
 msgid "Triggers"
 msgstr ""
 
-#: Source/Core/Common/Src/SysConf.h:91 Source/Core/Common/Src/SysConf.h:114
+#: Source/Core/Common/Src/SysConf.h:78 Source/Core/Common/Src/SysConf.h:101
 msgid "Trying to read from invalid SYSCONF"
 msgstr ""
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:44
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:31
 msgid ""
 "Trying to read from invalid SYSCONF\n"
 "Wiimote bt ids are not available"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:330
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
 msgid "Turkish"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:33
 msgid "Turntable"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:71
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58
 msgid "Type"
 msgstr ""
 
@@ -4841,31 +4952,31 @@ msgstr ""
 msgid "UDP Port:"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:279
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:266
 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12
 msgid "UDP Wiimote"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:199
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:193
 msgid "UNKNOWN"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:756
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:755
 #, c-format
 msgid "UNKNOWN_%02X"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:178
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:172
 msgid "USA"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:225
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:214
 msgid ""
 "Unable to create patch from given values.\n"
 "Entry not modified."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:124
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:111
 #, c-format
 msgid ""
 "Unable to parse line %lu of the entered AR code as a valid encrypted or "
@@ -4873,74 +4984,88 @@ msgid ""
 "Would you like to ignore this line and continue parsing?"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:391
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:397
 #, c-format
 msgid "Undefined %i"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:163
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:164
 msgid "Undo Load State"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:718
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:717
 msgid "Unexpected 0x80 call? Aborting..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:215
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:202
 msgid "Unknown"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:971
+#: Source/Core/Core/Src/HW/DVDInterface.cpp:965
 #, c-format
 msgid "Unknown DVD command %08x - fatal error"
 msgstr ""
 
-#: Source/Core/Common/Src/SysConf.cpp:145
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:444
+#, c-format
+msgid "Unknown command 0x%08x"
+msgstr ""
+
+#: Source/Core/Common/Src/SysConf.cpp:132
 #, c-format
 msgid "Unknown entry type %i in SYSCONF (%s@%x)!"
 msgstr ""
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:228
+#: Source/Core/Core/Src/NetPlayClient.cpp:232
 #, c-format
 msgid "Unknown message received with id : %d"
 msgstr ""
 
-#: Source/Core/Core/Src/NetPlayServer.cpp:504
+#: Source/Core/Core/Src/NetPlayServer.cpp:508
 #, c-format
 msgid "Unknown message with id:%d received from player:%d Kicking player!"
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:274
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:56
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:261
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:43
 msgid "Up"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:108
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:95
 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17
 msgid "Update"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:320
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:307
 msgid "Upright Wiimote"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:777
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758
 msgid "Use EuRGB60 Mode (PAL60)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:294
 msgid "Use Fullscreen"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:575
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:563
 msgid "Use Hex"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:600
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580
 msgid "Use Panic Handlers"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89
+msgid ""
+"Use a hacked upload strategy to stream vertices.\n"
+"This usually speed up, but is forbidden by OpenGL specification and may "
+"causes heavy glitches.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122
 msgid ""
 "Use multiple threads to decode textures.\n"
 "Might result in a speedup (especially on CPUs with more than two cores).\n"
@@ -4948,7 +5073,7 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126
 msgid ""
 "Usually if shader compilation fails, an error message is displayed.\n"
 "However, one may skip the popups to allow interruption free gameplay by "
@@ -4957,53 +5082,57 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:539
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:552
 msgid "Utility"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:285
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:293
 msgid "V-Sync"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:209
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318
+msgid "VBeam Speed Hack"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196
 msgid "Value"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:73
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:60
 msgid "Value:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:572
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:560
 msgid "Value: "
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:51
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:38
 msgid "Verbosity"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:377
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:381
 msgid "Video"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:486
 msgid "Virtual"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:689
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670
 msgid "Volume"
 msgstr ""
 
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:498
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:527
+#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:488
+#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:517
 #, c-format
 msgid "WAD installation failed: error creating %s"
 msgstr ""
 
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:547
+#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:537
 msgid "WAD installation failed: error creating ticket"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84
 msgid ""
 "Wait for vertical blanks in order to reduce tearing.\n"
 "Decreases performance if emulation speed is below 100%.\n"
@@ -5011,25 +5140,25 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/Common/Src/MsgHandler.cpp:67
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46
+#: Source/Core/Common/Src/MsgHandler.cpp:53
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:33
 #: Source/Core/DolphinWX/Src/VideoConfigDiag.h:85
 msgid "Warning"
 msgstr ""
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:291
+#: Source/Core/Core/Src/Boot/Boot.cpp:279
 msgid "Warning - starting DOL in wrong console mode!"
 msgstr ""
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:341
+#: Source/Core/Core/Src/Boot/Boot.cpp:329
 msgid "Warning - starting ELF in wrong console mode!"
 msgstr ""
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:221
+#: Source/Core/Core/Src/Boot/Boot.cpp:209
 msgid "Warning - starting ISO in wrong console mode!"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:519
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:512
 #, c-format
 msgid ""
 "Warning! it is advised to backup all files in the folder:\n"
@@ -5037,7 +5166,7 @@ msgid ""
 "Do you wish to continue?"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:585
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:578
 #, c-format
 msgid ""
 "Warning: This will overwrite any existing saves that are in the folder:\n"
@@ -5046,7 +5175,7 @@ msgid ""
 "Continue?"
 msgstr ""
 
-#: Source/Core/Core/Src/Movie.cpp:844
+#: Source/Core/Core/Src/Movie.cpp:835
 #, c-format
 msgid ""
 "Warning: You loaded a save that's after the end of the current movie. (byte "
@@ -5054,7 +5183,7 @@ msgid ""
 "load this state with read-only mode off."
 msgstr ""
 
-#: Source/Core/Core/Src/Movie.cpp:861
+#: Source/Core/Core/Src/Movie.cpp:852
 #, c-format
 msgid ""
 "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You "
@@ -5062,7 +5191,7 @@ msgid ""
 "only mode off. Otherwise you'll probably get a desync."
 msgstr ""
 
-#: Source/Core/Core/Src/Movie.cpp:870
+#: Source/Core/Core/Src/Movie.cpp:861
 #, c-format
 msgid ""
 "Warning: You loaded a save whose movie mismatches on frame %d. You should "
@@ -5081,49 +5210,49 @@ msgid ""
 "%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d"
 msgstr ""
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:106
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:129
+#: Source/Core/AudioCommon/Src/WaveFile.cpp:93
+#: Source/Core/AudioCommon/Src/WaveFile.cpp:116
 msgid "WaveFileWriter - file not open."
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:56
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:60
 msgid "Whammy"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:404
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:408
 msgid "Widescreen Hack"
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:312
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:299
 msgid "Width"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535
 msgid "Wii"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:372
 msgid "Wii Console"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:844
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:825
 msgid "Wii NAND Root:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:191
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:194
 msgid "Wii Save Import"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1243
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1270
 msgid "Wii save files (*.bin)|*.bin"
 msgstr ""
 
-#: Source/Core/DiscIO/Src/WiiWad.cpp:82
+#: Source/Core/DiscIO/Src/WiiWad.cpp:69
 msgid "WiiWAD: Could not read from file"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/Wiimote.cpp:17
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
+#: Source/Core/Core/Src/HW/Wiimote.cpp:20
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
 msgid "Wiimote"
 msgstr ""
 
@@ -5132,7 +5261,7 @@ msgstr ""
 msgid "Wiimote %i"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/Main.cpp:628
+#: Source/Core/DolphinWX/Src/Main.cpp:656
 msgid "Wiimote Connected"
 msgstr ""
 
@@ -5140,7 +5269,7 @@ msgstr ""
 msgid "Wiimote Motor"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
 msgid "Wiimote settings"
 msgstr ""
 
@@ -5148,105 +5277,123 @@ msgstr ""
 msgid "Wiimotes"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:134
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:121
 msgid "Windows Left"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:136
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:123
 msgid "Windows Menu"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:135
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:122
 msgid "Windows Right"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:131
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:124
 msgid "Word Wrap"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1298
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:864
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1089
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1225
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1325
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:880
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1090
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1226
 msgid "Working..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:338
+msgid "Write memcards (GC)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46
 msgid "Write to Console"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:67
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:54
 msgid "Write to Debugger"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:57
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44
 msgid "Write to File"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:61
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48
 msgid "Write to Window"
 msgstr ""
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:60
+#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:47
 #, c-format
 msgid "XAudio2 CreateSourceVoice failed: %#X"
 msgstr ""
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:114
+#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:101
 #, c-format
 msgid "XAudio2 init failed: %#X"
 msgstr ""
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:124
+#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:111
 #, c-format
 msgid "XAudio2 master voice creation failed: %#X"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:766
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:765
 msgid "XF reg"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:21
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Yellow"
 msgstr ""
 
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:107
+#: Source/Core/Core/Src/DSP/DSPCore.cpp:120
 msgid ""
-"You are using free dsp roms made by Dolphin Team.\n"
-"Only Zelda ucode games will work correctly with them.\n"
+"You are using a free DSP ROM made by the Dolphin Team.\n"
+"All Wii games will work correctly, and most GC games should also work fine, "
+"but the GBA/IPL/CARD UCodes will not work.\n"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:73
+#: Source/Core/Core/Src/DSP/DSPCore.cpp:116
+msgid ""
+"You are using an old free DSP ROM made by the Dolphin Team.\n"
+"Only games using the Zelda UCode will work correctly.\n"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:63
 msgid "You can't close panes that have pages in them."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:207
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:210
 msgid "You must choose a game!!"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:605
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:593
 msgid "You must enter a name!"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:450
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:438
 msgid "You must enter a valid decimal, hexadecimal or octal value."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:603
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:591
 msgid "You must enter a valid profile name."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:936
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:917
 msgid "You must restart Dolphin in order for the change to take effect."
 msgstr ""
 
-#: Source/Core/Core/Src/CoreParameter.cpp:175
+#: Source/Core/Core/Src/DSP/DSPCore.cpp:109
+msgid ""
+"Your DSP ROMs have incorrect hashes.\n"
+"Would you like to stop now to fix the problem?\n"
+"If you select \"No\", audio might be garbled."
+msgstr ""
+
+#: Source/Core/Core/Src/CoreParameter.cpp:164
 msgid ""
 "Your GCM/ISO file seems to be invalid (invalid country).\n"
 "Continue with PAL region?"
 msgstr ""
 
-#: Source/Core/Common/Src/SysConf.cpp:58
+#: Source/Core/Common/Src/SysConf.cpp:45
 #, c-format
 msgid ""
 "Your SYSCONF file is the wrong size.\n"
@@ -5254,25 +5401,25 @@ msgid ""
 "Do you want to generate a new one?"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:334
 msgid "ZTP hack"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:387
+#: Source/Core/Core/Src/ActionReplay.cpp:377
 msgid "Zero 3 code not supported"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:408
+#: Source/Core/Core/Src/ActionReplay.cpp:398
 #, c-format
 msgid "Zero code unknown to dolphin: %08x"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:436
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:460
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:423
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:447
 msgid "[ waiting ]"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107
 msgid ""
 "[BROKEN]\n"
 "Highlight regions the EFB was copied from.\n"
@@ -5280,11 +5427,11 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:91
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:78
 msgid "[Custom]"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120
 msgid ""
 "[EXPERIMENTAL]\n"
 "Aims to speed up emulation by offloading texture decoding to the GPU using "
@@ -5295,7 +5442,7 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121
 msgid ""
 "[EXPERIMENTAL]\n"
 "Speeds up emulation a bit by caching display lists.\n"
@@ -5304,58 +5451,35 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:508
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:495
 msgid "^ ADD"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:820
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:801
 msgid "apploader (.img)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:185
-msgid "failed to read bk header"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:375
-#, c-format
-msgid "failed to read data from file: %s"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:97
-msgid "failed to read header"
-msgstr ""
-
-#: Source/Core/Core/Src/PowerPC/JitInterface.cpp:285
+#: Source/Core/Core/Src/PowerPC/JitInterface.cpp:272
 #, c-format
 msgid "iCacheJIT: Reading Opcode from %x. Please report."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:108
-#, c-format
-msgid "not a wii save or read failure for file header size %x"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:935
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:936
 msgid "s"
 msgstr ""
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:457
-#, c-format
-msgid "unknown cmd 0x%08x"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1110
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1136
 msgid "wxExecute returned -1 on application run!"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:56
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:43
 msgid "zFar Correction: "
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:51
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:38
 msgid "zNear Correction: "
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:493
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:480
 msgid "| OR"
 msgstr ""
diff --git a/Languages/po/hu.po b/Languages/po/hu.po
index addc5ec0f2..6aa0b790bc 100644
--- a/Languages/po/hu.po
+++ b/Languages/po/hu.po
@@ -3,36 +3,38 @@
 # This file is distributed under the same license as the dolphin-emu package.
 #
 # Translators:
-# Delirious <delirious@freemail.hu>, 2011.
+# Delirious <delirious@freemail.hu>, 2011
+# Delirious <delirious@freemail.hu>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: Dolphin Emulator\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-10 08:56-0500\n"
-"PO-Revision-Date: 2013-02-02 08:31+0000\n"
-"Last-Translator: delroth <delroth@gmail.com>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"POT-Creation-Date: 2013-04-18 23:00-0500\n"
+"PO-Revision-Date: 2013-04-04 08:13+0000\n"
+"Last-Translator: Delirious <delirious@freemail.hu>\n"
+"Language-Team: Hungarian (http://www.transifex.com/projects/p/dolphin-emu/"
+"language/hu/)\n"
 "Language: hu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:511
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:499
 msgid " (too many to display)"
 msgstr " (túl sok kijelző)"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:270
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:273
 #: Source/Core/DolphinWX/Src/NetWindow.cpp:491
 #: Source/Core/DolphinWX/Src/NetWindow.cpp:530
 msgid " Game : "
 msgstr "Játék:"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:507
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494
 msgid "! NOT"
 msgstr "! NEM"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:70
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:58
 #, c-format
 msgid ""
 "\"%s\" does not exist.\n"
@@ -41,33 +43,43 @@ msgstr ""
 "Nincs \"%s\".\n"
 " Létrehozol egy új 16 MB-os memóriakártyát?"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:142
+#: Source/Core/Core/Src/CoreParameter.cpp:131
 #, c-format
 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:722
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:721
 #, c-format
 msgid "%08X:  "
-msgstr ""
+msgstr "%08X:"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:196
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:183
 #, c-format
 msgid "%1$sCopy%1$s"
 msgstr "%1$sMásolás%1$s"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:128
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:296
+#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:113
+#, c-format
+msgid "%d samples"
+msgstr ""
+
+#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:112
+#, c-format
+msgid "%d samples (quality level %d)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:121
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:289
 #, c-format
 msgid "%s already exists, overwrite?"
 msgstr "%s már van, felülírod?"
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:167
+#: Source/Core/DiscIO/Src/CompressedBlob.cpp:154
 #, c-format
 msgid "%s failed to be scrubbed. Probably the image is corrupt."
 msgstr "%s tisztítása sikertelen. Valószínűleg a képfájl sérült."
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:95
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:83
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
@@ -76,7 +88,7 @@ msgstr ""
 "%s memóriakártyakénti betöltése sikertelen\n"
 " A kártya fájlmérete nem megfelelő (0x%x bájt)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:110
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:98
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
@@ -85,7 +97,7 @@ msgstr ""
 "%s memóriakártyakénti betöltése sikertelen\n"
 " A kártya mérete nem megfelelő (0x%x bájt)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:90
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:78
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
@@ -95,48 +107,37 @@ msgstr ""
 "a fájl nem elég nagy ahhoz, hogy megfelelő memóriakártya fájl lehessen (0x%x "
 "bájt)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:367
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:359
 #, c-format
 msgid "%s failed to open"
 msgstr "%s megnyitása sikertelen"
 
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:97
-#, c-format
-msgid ""
-"%s has an incorrect hash.\n"
-"Would you like to stop now to fix the problem?\n"
-"If you select \"No\", audio will be garbled."
-msgstr ""
-"%s érvénytelen hash értékkel rendelkezik.\n"
-"Leállítod most és javítod a problémát?\n"
-"Ha a \"Nem\" lehetőséget választod, akkor a hang hibás lesz."
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:360
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:352
 #, c-format
 msgid "%s is a 0 byte file"
 msgstr "%s egy 0 bájt méretű fájl"
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:159
+#: Source/Core/DiscIO/Src/CompressedBlob.cpp:146
 #, c-format
 msgid "%s is already compressed! Cannot compress it further."
 msgstr "%s már tömörítve van! Nem tömöríthető tovább."
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:345
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:337
 #, c-format
 msgid "%s is too long for the filename, max chars is 45"
 msgstr "%s túl hossz fájlnévnek, maximum 45 karakter"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:202
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:189
 #, c-format
 msgid "%sDelete%s"
 msgstr "%sTörlés%s"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:200
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:187
 #, c-format
 msgid "%sExport GCI%s"
 msgstr "%sGCI exportálás%s"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:198
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:185
 #, c-format
 msgid "%sImport GCI%s"
 msgstr "%sGCI importálás%s"
@@ -146,222 +147,246 @@ msgstr "%sGCI importálás%s"
 msgid "%u Free Blocks; %u Free Dir Entries"
 msgstr "%u szabad blokk; %u szabad könyvtár bejegyzés"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:506
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:493
 msgid "&& AND"
 msgstr "&& ÉS"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:295
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:301
 msgid "&About..."
 msgstr "&Névjegy..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:99
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:100
 msgid "&Boot from DVD Drive..."
 msgstr "&Bootolás DVD meghajtóról..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:231
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:234
 msgid "&Breakpoints"
 msgstr "&Töréspontok"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:110
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:111
 msgid "&Browse for ISOs..."
 msgstr "&ISO fájlok tallózása..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:192
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:195
 msgid "&Cheats Manager"
 msgstr "&Csalás kezelő"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:177
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:180
 msgid "&DSP Settings"
 msgstr "&Hang beállítások"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:885
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:876
 msgid "&Delete ISO..."
 msgstr "&ISO törlése..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:903
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:897
 msgid "&Delete selected ISOs..."
 msgstr "&A kiválasztott ISO fájlok törlése..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:170
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:173
 msgid "&Emulation"
 msgstr "&Emuláció"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:113
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:114
 msgid "&File"
 msgstr "&Fájl"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:335
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:341
 msgid "&Frame Advance"
 msgstr "&Képkocka léptetés"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:352
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:358
 msgid "&Fullscreen"
 msgstr "&Teljes nézet"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:176
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:179
 msgid "&Graphics Settings"
 msgstr "&Grafikai beállítások"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:296
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:302
 msgid "&Help"
 msgstr "&Súgó"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:180
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:183
 msgid "&Hotkey Settings"
 msgstr "&Gyorsbillentyű beállítások"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:233
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:236
 msgid "&JIT"
 msgstr "&JIT"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:148
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:149
 msgid "&Load State"
 msgstr "&Állás betöltése"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:190
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:193
 msgid "&Memcard Manager (GC)"
 msgstr "&Memóriakártya kezelő (GC)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:232
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:235
 msgid "&Memory"
 msgstr "&Memória"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:313
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:319
 msgid "&Open..."
 msgstr "&Megnyitás..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:186
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:189
 msgid "&Options"
 msgstr "&Beállítások"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:324
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:330
 msgid "&Pause"
 msgstr "&Szünet"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:326
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:332
 msgid "&Play"
 msgstr "&Indítás"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:867
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:858
 msgid "&Properties"
 msgstr "&Tulajdonságok"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:348
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:354
 msgid "&Read-only mode"
 msgstr "&Írásvédett mód"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:319
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:325
 msgid "&Refresh List"
 msgstr "&A lista frissítése"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:230
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:233
 msgid "&Registers"
 msgstr "&Regiszterek"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:332
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:338
 msgid "&Reset"
 msgstr "&Alapra állítás"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:234
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:237
 msgid "&Sound"
 msgstr "&Hang"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:329
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:335
 msgid "&Stop"
 msgstr "&Leállítás"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:207
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:210
 msgid "&Tools"
 msgstr "&Eszközök"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:235
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:238
 msgid "&Video"
 msgstr "&Kép"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:284
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:287
 msgid "&View"
 msgstr "&Nézet"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:179
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:182
 msgid "&Wiimote Settings"
 msgstr "&Wiimote beállítások"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:868
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:859
 msgid "&Wiki"
 msgstr "&Wiki"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504
 msgid "'"
-msgstr ""
+msgstr "'"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:59
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:46
 msgid "(-)+zFar"
 msgstr "(-)+zFar"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:54
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:41
 msgid "(-)+zNear"
 msgstr "(-)+zNear"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:99
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:86
 msgid "(UNKNOWN)"
 msgstr "(ISMERETLEN)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:376
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:384
 msgid "(off)"
 msgstr "(ki)"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:655
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:654
 msgid "0x44"
+msgstr "0x44"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+msgid "1.5x Native (960x792)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:158
 msgid "16 bit"
 msgstr "16 bit"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+msgid "1x Native (640x528)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+msgid "2.5x Native (1600x1320)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+msgid "2x Native (1280x1056)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:159
 msgid "32 bit"
 msgstr "32 bit"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:412
 msgid "3D Vision"
 msgstr "3D Vision"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+msgid "3x Native (1920x1584)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+msgid "4x Native (2560x2112)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:157
 msgid "8 bit"
 msgstr "8 bit"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:43
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:30
 msgid "<Insert name here>"
 msgstr "<Név beszúrása ide>"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:255
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:262
 msgid "<No resolutions found>"
 msgstr "<Nem található felbontás>"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:104
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84
 msgid "<Nothing>"
 msgstr "<Semmi>"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:162
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:162
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:150
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:150
 msgid "<Press Key>"
 msgstr "<Nyomj egy gombot>"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286
 msgid "<System>"
 msgstr "<Rendszer>"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695
 msgid "A"
-msgstr ""
+msgstr "A"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:201
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:235
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:204
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:238
 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:353
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:387
 msgid "A game is not currently running."
 msgstr "A játék jelenleg nem fut."
 
@@ -370,30 +395,33 @@ msgid ""
 "A supported bluetooth device could not be found.\n"
 "You must manually connect your wiimotes."
 msgstr ""
+"Nem található támogatott bluetooth eszköz.\n"
+"Kézileg kell csatlakoztatni a Wiimote irányítókat."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:109
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:100
+#, fuzzy
 msgid ""
 "ALERT:\n"
 "\n"
-"NetPlay will currently only work properly when using the following "
-"settings:\n"
-" - Dual Core [OFF]\n"
-" - Audio Throttle [OFF]\n"
-" - DSP-HLE with \"Null Audio\" or DSP-LLE\n"
-" - Manually set the exact number of controllers that will be used to "
-"[Standard Controller]\n"
+"Netplay will only work with the following settings:\n"
+" - Enable Dual Core [OFF]\n"
+" - DSP Emulator Engine Must be the same on all computers!\n"
+" - DSP on Dedicated Thread [OFF]\n"
+" - Framelimit NOT set to [Audio]\n"
+" - Manually set the exact number of controllers to be used to [Standard "
+"Controller]\n"
 "\n"
-"All players should try to use the same Dolphin version and settings.\n"
-"Disable all memory cards or send them to all players before starting.\n"
-"Wiimote support has not been implemented.\n"
+"All players should use the same Dolphin version and settings.\n"
+"All memory cards must be identical between players or disabled.\n"
+"Wiimote support has not been implemented!\n"
 "\n"
-"You must forward TCP port to host!!"
+"The host must have the chosen TCP port open/forwarded!\n"
 msgstr ""
 "FIGYELEM:\n"
 "\n"
 "A NetPlay jelenleg csak a következő beállítások használatával működik "
 "megfelelően:\n"
-" - Dual Core [KI]\n"
+" - Kétmagos mód [KI]\n"
 " - Hang szabályozás [KI]\n"
 " - DSP-HLE  \"Null Audio\" használatával vagy DSP-LLE\n"
 " - Kézileg legyen beállítva az irányítók pontos száma, amik használva "
@@ -406,17 +434,17 @@ msgstr ""
 "\n"
 "Továbbítani kell a TCP portot a host számára!!"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:111
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:116
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96
 msgid "AM-Baseboard"
 msgstr "AM alaplap"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:299
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:115
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:300
 msgid "AR Codes"
 msgstr "AR kódok"
 
-#: Source/Core/DolphinWX/Src/AboutDolphin.h:33
+#: Source/Core/DolphinWX/Src/AboutDolphin.h:21
 msgid "About Dolphin"
 msgstr "A Dolphin névjegye"
 
@@ -424,15 +452,11 @@ msgstr "A Dolphin névjegye"
 msgid "Acceleration"
 msgstr "Gyorsítás"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:463
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473
 msgid "Accuracy:"
 msgstr "Pontosság:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317
-msgid "Accurate VBeam emulation"
-msgstr "Pontos VBeam emuláció"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97
 msgid ""
 "Accurately emulate EFB copies.\n"
 "Some games depend on this for certain graphical effects or gameplay "
@@ -446,12 +470,12 @@ msgstr ""
 "\n"
 "Ha bizonytalan vagy, válaszd az EFB textúrába másolása lehetőséget."
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:239
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:239
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:227
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:227
 msgid "Action"
 msgstr "Művelet"
 
-#: Source/Core/Core/Src/ARDecrypt.cpp:481
+#: Source/Core/Core/Src/ARDecrypt.cpp:469
 #, c-format
 msgid ""
 "Action Replay Code Decryption Error:\n"
@@ -466,7 +490,7 @@ msgstr ""
 "Felelős kód:\n"
 "%s"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:667
+#: Source/Core/Core/Src/ActionReplay.cpp:657
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)"
@@ -474,7 +498,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:755
+#: Source/Core/Core/Src/ActionReplay.cpp:745
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide "
@@ -483,7 +507,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:547
+#: Source/Core/Core/Src/ActionReplay.cpp:537
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And "
@@ -492,7 +516,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:607
+#: Source/Core/Core/Src/ActionReplay.cpp:597
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Write To "
@@ -501,75 +525,77 @@ msgstr ""
 "Action Replay hiba: érvénytelen méret (%08x : address = %08x) a mutató "
 "írásában (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:802
+#: Source/Core/Core/Src/ActionReplay.cpp:792
 #, c-format
 msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)"
 msgstr "Action Replay hiba: érvénytelen érték (%08x) a memória másolásban (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:682
+#: Source/Core/Core/Src/ActionReplay.cpp:672
 #, c-format
 msgid ""
 "Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)\n"
 "Master codes are not needed. Do not use master codes."
 msgstr ""
+"Action Replay hiba: Mester kód és CCXXXXXX írása nincs beépítve (%s)\n"
+"Mester kódokra nincs szükség. Ne használj mester kódokat."
 
-#: Source/Core/Core/Src/ActionReplay.cpp:196
+#: Source/Core/Core/Src/ActionReplay.cpp:184
 #, c-format
 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:872
+#: Source/Core/Core/Src/ActionReplay.cpp:862
 #, 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:945
+#: Source/Core/Core/Src/ActionReplay.cpp:935
 #, 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:896
+#: Source/Core/Core/Src/ActionReplay.cpp:886
 #, 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:838
+#: Source/Core/Core/Src/ActionReplay.cpp:828
 #, 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:242
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:247
 msgid "Adapter:"
 msgstr "Adapter:"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:76
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:63
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:63
 msgid "Add"
 msgstr "Hozzáadás"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1275
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1301
 msgid "Add ActionReplay Code"
 msgstr "ActionReplay kód hozzáadása"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1204
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1230
 msgid "Add Patch"
 msgstr "Patch hozzáadása"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:507
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:528
 msgid "Add new pane"
 msgstr "Új mező hozzáadása"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:404
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:426
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:811
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:408
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:430
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:792
 msgid "Add..."
 msgstr "Hozzáadás..."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:90
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:81
 msgid "Address :"
 msgstr "Cím:"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:58
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:45
 msgid ""
 "Adds the specified value to zFar Parameter.\n"
 "Two ways to express the floating point values.\n"
@@ -587,7 +613,7 @@ msgstr ""
 "\n"
 "MEGJEGYZÉS: Ellenőrizd a napló ablakot/konzolt a kapott értékekhez."
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:53
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:40
 msgid ""
 "Adds the specified value to zNear Parameter.\n"
 "Two ways to express the floating point values.\n"
@@ -605,91 +631,95 @@ msgstr ""
 "\n"
 "MEGJEGYZÉS: Ellenőrizd a napló ablakot/konzolt a kapott értékekhez."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:755
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:744
 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:509
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:522
 msgid "Advanced"
 msgstr "Haladó"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561
 msgid "Advanced Settings"
 msgstr "Haladó beállítások"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:584
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:587
 msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)"
-msgstr ""
+msgstr "Minden GC/Wii fájl (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:816
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:797
 msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)"
-msgstr ""
+msgstr "Minden GC/Wii képfájl (gcm, iso, wbfs, ciso, gcz)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1189
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1190
 msgid "All Gamecube GCM files (gcm)"
 msgstr "Minden Gamecube GCM fájl (gcm)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1390
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1404
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1417
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1431
 msgid "All Save States (sav, s##)"
 msgstr "Minden állásmentés (sav, s##)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1187
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1188
 msgid "All Wii ISO files (iso)"
 msgstr "Minden Wii ISO fájl (iso)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1207
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1208
 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:124
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:104
 msgid "All files (*.*)|*.*"
 msgstr "Minden fájl (*.*)|*.*"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123
 msgid ""
 "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 ""
+"Bizonyos opciók elérhetővé válnak gyorsbillentyűkkel: 3. (Belső felbontás), "
+"4. (Képarány), 5. (EFB másolat) és 6. (Köd) a emulációs ablakon belül.\n"
+"\n"
+"Ha bizonytalan vagy, hagyd kijelöletlenül."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:285
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:272
 msgid "Analyze"
-msgstr ""
+msgstr "Elemzés"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:298
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:285
 msgid "Angle"
-msgstr ""
+msgstr "Szög"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:367
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:375
 msgid "Anisotropic Filtering:"
 msgstr "Anizotrópikus szűrés:"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:350
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:358
 msgid "Anti-Aliasing:"
 msgstr "Élsimítás:"
 
-#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:308
+#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:299
 msgid "Apploader is the wrong size...is it really an apploader?"
 msgstr ""
 "A betöltő program nem megfelelő méretű...ez tényleg egy betöltő program?"
 
-#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:302
+#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:293
 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:841
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:822
 msgid "Apploader:"
 msgstr "Betöltő program:"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:135
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:122
 msgid "Apply"
 msgstr "Alkalmaz"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124
 msgid ""
 "Apply a post-processing effect after finishing a frame.\n"
 "\n"
@@ -699,11 +729,11 @@ msgstr ""
 "\n"
 "Ha bizonytalan vagy, válaszd ezt: (ki)."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287
 msgid "Arabic"
 msgstr "Arab"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:614
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:603
 #, c-format
 msgid "Are you sure you want to delete \"%s\"?"
 msgstr "Biztos törlöd ezt: \"%s\"?"
@@ -720,46 +750,50 @@ msgstr ""
 msgid "Are you sure you want to delete this file?  It will be gone forever!"
 msgstr "Biztos törlöd ezt a fájlt? Végleg el fog veszni!"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:789
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:277
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:44
+msgid "Arm JIT (experimental)"
+msgstr "Arm JIT (kísérleti)"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:285
 msgid "Aspect Ratio:"
 msgstr "Képarány:"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:70
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:58
 msgid "At least one pane must remain open."
 msgstr "Legalább egy mezőnek megnyitva kell maradnia."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:553
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533
 msgid "Audio"
 msgstr "Hang"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:694
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675
 msgid "Audio Backend:"
 msgstr "Hang feldolgozó:"
 
-#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:41
+#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:28
 msgid "AudioCommon: Error opening AO device.\n"
 msgstr "AudioCommon: Hiba az AO eszköz megnyitásakor.\n"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:275
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283
 msgid "Auto"
 msgstr "Automatikus"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:337
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345
 msgid "Auto (Multiple of 640x528)"
 msgstr "Automatikus (640x528 többszöröse)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:337
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345
 msgid "Auto (Window Size)"
 msgstr "Automatikus (ablak méret)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:297
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305
 msgid "Auto adjust Window Size"
 msgstr "Ablak méret automatikus állítása"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77
 msgid ""
 "Automatically adjusts the window size to your internal resolution.\n"
 "\n"
@@ -769,160 +803,162 @@ msgstr ""
 "\n"
 "Ha bizonytalan vagy, hagyd kijelöletlenül."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:697
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696
 msgid "B"
-msgstr ""
+msgstr "B"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:755
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:754
 msgid "BP register "
-msgstr ""
+msgstr "BP regiszter "
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:27
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:14
 msgid "Back"
 msgstr "Hátra"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:698
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:679
 msgid "Backend Settings"
-msgstr "Hang feldolgozó beállításai"
+msgstr "Feldolgozó beállításai"
 
-#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:60
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:206
+#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:47
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:211
 msgid "Backend:"
 msgstr "Feldolgozó:"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:318
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:95
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:305
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:82
 msgid "Background Input"
 msgstr "Háttér bemenet"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:279
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:266
 msgid "Backward"
 msgstr "Vissza"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:264
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:257
 msgid "Bad File Header"
 msgstr "Rossz fájl fejléc"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:627
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:621
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:290
 msgid "Banner"
 msgstr "Játék kép"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:519
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:529
 msgid "Banner Details"
 msgstr "Játék kép részletek"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491
 msgid "Banner:"
 msgstr "Játék kép:"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:57
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:61
 msgid "Bar"
 msgstr "Vevő"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:308
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:316
 msgid "Basic"
 msgstr "Alap"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555
 msgid "Basic Settings"
 msgstr "Alap beállítások"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:22
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Bass"
 msgstr "Basszus"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:186
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:174
 msgid "Block Allocation Table checksum failed"
 msgstr "Block Allocation Table ellenőrző összege nem megfelelő"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:631
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625
 msgid "Blocks"
 msgstr "Blokk"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:21
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Blue"
 msgstr "Kék"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:24
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Blue Left"
 msgstr "Kék balra"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:25
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Blue Right"
 msgstr "Kék jobbra"
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:87
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270
 msgid "Bottom"
 msgstr "Gomb"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:238
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:225
 #, c-format
 msgid "Bound Controls: %lu"
 msgstr "Összekötött irányítások: %lu"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348
 msgid "Broken"
 msgstr "Hibás"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:422
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:428
 msgid "Browse"
 msgstr "Tallózás"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:256
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:243
 msgid "Browse for a directory to add"
 msgstr "Hozzáadandó könyvtár tallózása"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:422
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:428
 msgid "Browse for an ISO directory..."
 msgstr "Egy ISO könyvtár tallózása..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1079
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1080
 msgid "Browse for output directory"
 msgstr "Kimeneti könyvtár tallózása"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:328
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:331
 msgid "Buffer:"
 msgstr "Puffer:"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:58
 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:119
+#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:106
 msgid "Buttons"
 msgstr "Gombok"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317
 msgid ""
 "Bypass the clearing of the data cache by the DCBZ instruction. Usually leave "
 "this option disabled."
 msgstr ""
+"Az adatgyorsítótár törlésének kihagyása a DCBZ utasítás által. Ez a "
+"beállítás általában maradjon kikapcsolva."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:698
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:697
 msgid "C"
-msgstr ""
+msgstr "C"
 
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:77
+#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:64
 msgid "C Stick"
 msgstr "C kar"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:77
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:64
 msgid "C-Stick"
 msgstr "C-kar"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:764
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:763
 msgid "CP reg"
-msgstr ""
+msgstr "CP reg"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:567
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547
 msgid "CPU Emulator Engine"
 msgstr "Processzor emulátor motor"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:490
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500
 msgid "Cache Display Lists"
 msgstr "Kijelző listák gyorsítótárazása"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88
 msgid ""
 "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n"
 "Decreases emulation speed by some percent (depending on your GPU).\n"
@@ -937,23 +973,38 @@ msgstr ""
 "\n"
 "Ha bizonytalan vagy, hagyd kijelöletlenül."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1858
+#, c-format
+msgid "Can't find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x"
+msgstr ""
+
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1872
+#, c-format
+msgid "Can't find WiiMote by connection handle %02x"
+msgstr ""
+
+#: Source/Core/Core/Src/HW/DVDInterface.cpp:669
+#: Source/Core/Core/Src/HW/DVDInterface.cpp:679
+msgid "Can't read from DVD_Plugin - DVD-Interface: Fatal Error"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:124
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:28
 msgid "Cancel"
 msgstr "Mégse"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:91
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:178
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:240
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:84
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:171
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:233
 #, c-format
 msgid "Cannot open %s"
 msgstr "%s nem nyitható meg"
 
-#: Source/Core/Core/Src/CoreTiming.cpp:141
+#: Source/Core/Core/Src/CoreTiming.cpp:128
 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:1078
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1061
 #, c-format
 msgid ""
 "Cannot use that file as a memory card.\n"
@@ -964,7 +1015,7 @@ msgstr ""
 "%s\n"
 "fájl nem megfelelő GameCube memóriakártya fájl"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1108
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1091
 msgid ""
 "Cannot use that file as a memory card.\n"
 "Are you trying to use the same file in both slots?"
@@ -972,30 +1023,15 @@ 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:1867
-#, 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:1881
-#, 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: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"
-
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:52
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:39
 msgid "Caps Lock"
 msgstr "Caps Lock"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288
 msgid "Catalan"
 msgstr "Katalán"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:311
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:298
 msgid "Center"
 msgstr "Közép"
 
@@ -1003,12 +1039,12 @@ msgstr "Közép"
 msgid "Change"
 msgstr "Váltás"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:316
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:322
 msgid "Change &Disc..."
 msgstr "Lemez &váltás..."
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:179
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:179
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:167
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:167
 msgid "Change Disc"
 msgstr "Lemez váltás"
 
@@ -1016,7 +1052,7 @@ msgstr "Lemez váltás"
 msgid "Change Game"
 msgstr "Játék váltás"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:515
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495
 msgid ""
 "Change the language of the user interface.\n"
 "Requires restart."
@@ -1024,75 +1060,75 @@ msgstr ""
 "A program felület nyelvének változtatásához\n"
 "újraindítás szükséges."
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:60
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:47
 msgid "Changes sign to zFar Parameter (after correction)"
 msgstr "Megváltoztatja a zFar paraméterhez tartozó jegyet (javítás után)"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:55
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:42
 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:519
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499
 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:295
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:298
 msgid "Chat"
 msgstr "Csevegés"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:47
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:34
 msgid "Cheat Code"
 msgstr "Csalás kód"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:118
 msgid "Cheat Search"
 msgstr "Csalás keresés"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:38
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:25
 msgid "Cheats Manager"
 msgstr "Csalás kezelő"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:633
 msgid "Check Partition Integrity"
-msgstr ""
+msgstr "Partíció integritás ellenőrzés"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:864
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:880
 msgid "Checking integrity..."
-msgstr ""
+msgstr "Integritás ellenőrzés..."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289
 msgid "Chinese (Simplified)"
 msgstr "Kínai (egyszerűsített)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290
 msgid "Chinese (Traditional)"
 msgstr "Kínai (hagyományos)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:818
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:799
 msgid "Choose a DVD root directory:"
 msgstr "Válassz DVD gyökér könyvtárat:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:822
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803
 msgid "Choose a NAND root directory:"
 msgstr "Válassz NAND gyökér könyvtárat:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:815
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:796
 msgid "Choose a default ISO:"
 msgstr "Válassz alapértelmezett ISO fájlt:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1236
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1219
 msgid "Choose a directory to add"
 msgstr "Válassz hozzáadandó könyvtárat"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1065
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1048
 msgid "Choose a file to open"
 msgstr "Válasz megnyitandó fájl"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:217
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:204
 msgid "Choose a memory card:"
 msgstr "Válassz memóriakártyát:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:819
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800
 msgid ""
 "Choose file to use as apploader: (applies to discs constructed from "
 "directories only)"
@@ -1100,27 +1136,27 @@ 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:767
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:806
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:781
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:822
 msgid "Choose the folder to extract to"
 msgstr "Válassz mappát a kitömörítéshez"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:297
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:284
 msgid "Circle Stick"
 msgstr "Körös kar"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:52
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:56
 msgid "Classic"
 msgstr "Klasszikus"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:144
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:43
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:487
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:913
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:137
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:30
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:474
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:904
 msgid "Clear"
 msgstr "Törlés"
 
-#: Source/Core/Core/Src/NetPlayServer.cpp:259
+#: Source/Core/Core/Src/NetPlayServer.cpp:263
 msgid ""
 "Client disconnect while game is running!! NetPlay is disabled. You must "
 "manually stop the game."
@@ -1128,138 +1164,138 @@ 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:298
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:247
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:552
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:578
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:285
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:234
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:562
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:590
 msgid "Close"
 msgstr "Bezárás"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:174
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:177
 msgid "Co&nfigure..."
 msgstr "Be&állítások..."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:86
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:73
 msgid "Code Info"
 msgstr "Kód infó"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:568
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:556
 msgid "Code: "
 msgstr "Kód:"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:35
 msgid "Command"
 msgstr "Parancs"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:629
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:623
 msgid "Comment"
 msgstr "Megjegyzés"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489
 msgid "Comment:"
 msgstr "Megjegyzés:"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:893
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:884
 msgid "Compress ISO..."
 msgstr "ISO tömörítése..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:905
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:899
 msgid "Compress selected ISOs..."
 msgstr "Kiválasztott ISO tömörítése..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1088
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1224
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1089
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1225
 msgid "Compressing ISO"
 msgstr "ISO tömörítése"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:429
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:435
 msgid "Config"
 msgstr "Beállítások"
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:37
-#: Source/Core/DolphinWX/Src/InputConfigDiag.h:135
-#: Source/Core/DolphinWX/Src/InputConfigDiag.h:154
+#: Source/Core/DolphinWX/Src/InputConfigDiag.h:122
+#: Source/Core/DolphinWX/Src/InputConfigDiag.h:141
 msgid "Configure"
 msgstr "Beállítások"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:111
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:98
 msgid "Configure Control"
 msgstr "Irányítás beállítás"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:306
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
 #: Source/Core/DolphinWX/Src/NetWindow.cpp:583
 msgid "Configure Pads"
 msgstr "Irányítók beállítása"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:429
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:435
 msgid "Configure..."
 msgstr "Beállítások..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1119
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1147
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1217
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1120
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1218
 msgid "Confirm File Overwrite"
 msgstr "Fájl felülírás jóváhagyása"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:597
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:577
 msgid "Confirm on Stop"
 msgstr "Kilépéskor megerősítés"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:83
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:105
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:74
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:96
 msgid "Connect"
 msgstr "Csatlakozás"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:783
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:764
 msgid "Connect USB Keyboard"
 msgstr "USB billentyűzet csatlakoztatása"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:362
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:368
 #, c-format
 msgid "Connect Wiimote %i"
 msgstr "%i Wiimote csatlakoztatása"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:195
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183
 msgid "Connect Wiimote 1"
 msgstr "Wiimote 1 csatlakoztatása"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184
 msgid "Connect Wiimote 2"
 msgstr "Wiimote 2 csatlakoztatása"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:185
 msgid "Connect Wiimote 3"
 msgstr "Wiimote 3 csatlakoztatása"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:198
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:186
 msgid "Connect Wiimote 4"
 msgstr "Wiimote 4 csatlakoztatása"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:627
+#: Source/Core/DolphinWX/Src/Main.cpp:655
 msgid "Connecting..."
 msgstr "Csatlakozás..."
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:155
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:156
 msgid "Console"
 msgstr "Konzol"
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:71
 msgid "Continuous Scanning"
-msgstr ""
+msgstr "Folyamatos keresés"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:46
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:33
 msgid "Control"
 msgstr "Irányítás"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:189
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:176
 msgid "Convert to GCI"
 msgstr "Konvertálás: GCI"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:379
+#: Source/Core/Core/Src/CoreParameter.cpp:368
 msgid "Copy failed"
 msgstr "Másolás sikertelen"
 
@@ -1268,21 +1304,21 @@ msgstr "Másolás sikertelen"
 msgid "Copy to Memcard %c"
 msgstr "%c. memóriakártyára másolás"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:359
 msgid "Core"
 msgstr "Mag"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:154
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:148
 #, c-format
 msgid "Could not create %s"
 msgstr "%s nem hozható létre"
 
-#: Source/Core/AudioCommon/Src/AudioCommon.cpp:75
+#: Source/Core/AudioCommon/Src/AudioCommon.cpp:62
 #, c-format
 msgid "Could not initialize backend %s."
 msgstr "%s hang feldolgozó iniciálása sikertelen."
 
-#: Source/Core/Core/Src/CoreParameter.cpp:137
+#: Source/Core/Core/Src/CoreParameter.cpp:126
 #, c-format
 msgid ""
 "Could not read \"%s\".  There is no disc in the drive, or it is not a GC/Wii "
@@ -1293,12 +1329,12 @@ msgstr ""
 "biztonsági mentés.  Célszerű tudni, hogy az eredeti Gamecube és Wii "
 "lemezeket a legtöbb számítógépes DVD meghajtó nem képes olvasni."
 
-#: Source/Core/Core/Src/CoreParameter.cpp:292
+#: Source/Core/Core/Src/CoreParameter.cpp:281
 #, c-format
 msgid "Could not recognize ISO file %s"
 msgstr "%s ISO fájl nem ismerhető fel"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:569
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:579
 #, c-format
 msgid "Could not save %s"
 msgstr "%s nem menthető el"
@@ -1311,23 +1347,24 @@ 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:123
+#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119
 #, c-format
 msgid ""
 "Could not write memory card file %s.\n"
 "\n"
 "Are you running Dolphin from a CD/DVD, or is the save file maybe write "
-"protected?"
-msgstr ""
-"%s memóriakártya fájl nem írható.\n"
+"protected?\n"
 "\n"
-"CD/DVD lemezről futtatod a Dolphin emulátort, vagy a mentési fájl írásvédett?"
+"Are you receiving this after moving the emulator directory?\n"
+"If so, then you may need to re-specify your memory card location in the "
+"options."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1107
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1133
 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:146
+#: Source/Core/Core/Src/BootManager.cpp:137
 msgid ""
 "Couldn't init the core.\n"
 "Check your configuration."
@@ -1335,38 +1372,38 @@ 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:170
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:495
 msgid "Count:"
 msgstr "Számláló:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:452
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456
 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:173
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:550
 msgid "Create AR Code"
 msgstr "AR kód létrehozása"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:543
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:608
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:569
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:641
 msgid "Create new perspective"
 msgstr "Új perspektíva készítése"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:17
 msgid "Creator: "
 msgstr "Készítő:"
 
-#: Source/Core/Common/Src/MsgHandler.cpp:68
+#: Source/Core/Common/Src/MsgHandler.cpp:54
 msgid "Critical"
 msgstr "Kritikus"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562
 msgid "Crop"
 msgstr "Levágás"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119
 msgid ""
 "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n"
 "\n"
@@ -1376,140 +1413,140 @@ msgstr ""
 "\n"
 "Ha bizonytalan vagy, hagyd kijelöletlenül."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:48
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:52
 msgid "Crossfade"
 msgstr "Kereszthalkítás"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:597
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:600
 #, 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!"
+msgid "Current directory changed from %s to %s after wxFileSelector!"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339
 msgid "Custom Projection Hack"
 msgstr "Egyedi megjelenítési hack"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.h:30
+#: Source/Core/DolphinWX/Src/PHackSettings.h:17
 msgid "Custom Projection Hack Settings"
 msgstr "Egyedi megjelenítési hack beállítások"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342
 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:311
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291
 msgid "Czech"
 msgstr "Cseh"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:698
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:697
 msgid "D"
-msgstr ""
+msgstr "D"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:89
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
 msgid "D-Pad"
 msgstr "Digitális irányok"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:431
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
 msgid "DSP"
 msgstr "Hang"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:639
 msgid "DSP Emulator Engine"
 msgstr "DSP emulátor motor"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:254
 msgid "DSP HLE emulation (fast)"
 msgstr "DSP HLE emuláció (gyors)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:256
 msgid "DSP LLE interpreter (slow)"
 msgstr "DSP LLE interpreter (lassú)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660
-msgid "DSP LLE on Thread"
-msgstr "DSP LLE folyamatágon"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:255
 msgid "DSP LLE recompiler"
 msgstr "DSP LLE recompiler"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:431
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:641
+msgid "DSP on Dedicated Thread"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
 msgid "DSP settings"
 msgstr "Hang (DSP) beállítások"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:838
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:819
 msgid "DVD Root:"
 msgstr "DVD gyökér könyvtár:"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:239
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:226
 msgid "DVDLowRead - Fatal Error: failed to read from volume"
-msgstr ""
+msgstr "DVDLowRead - Végzetes hiba: kötetből kiolvasás sikertelen"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:333
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:320
 msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume"
-msgstr ""
+msgstr "DVDLowUnencryptedRead - Végzetes hiba: kötetből kiolvasás sikertelen"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:176
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:163
 msgid "Data Size"
 msgstr "Adatok mérete"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468
 msgid "Date:"
 msgstr "Dátum:"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:528
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:564
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:518
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:557
 msgid "Datel MaxDrive/Pro files(*.sav)"
 msgstr "Datel MaxDrive/Pro fájlok(*.sav)"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:242
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:259
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:267
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:281
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:296
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:229
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:246
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:254
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:268
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:283
 msgid "Dead Zone"
 msgstr "Holtsáv"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:35
 msgid "Debug"
 msgstr "Hibakereső"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:521
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534
 msgid "Debugging"
 msgstr "Hibakeresés"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:79
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:66
 msgid "Decimal"
 msgstr "Decimális"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:890
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:881
 msgid "Decompress ISO..."
 msgstr "ISO kitömörítése..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:906
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:900
 msgid "Decompress selected ISOs..."
 msgstr "A kiválasztott ISO fájlok kitömörítése..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1088
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1224
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1089
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1225
 msgid "Decompressing ISO"
 msgstr "ISO kitömörítés"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:912
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:903
 msgid "Default"
 msgstr "Alap"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:835
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:816
 msgid "Default ISO:"
 msgstr "Alapértelmezett ISO:"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:114
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:107
 msgid "Default font"
 msgstr "Alap betűtípus"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:32
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:926
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:19
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917
 msgid "Delete"
 msgstr "Törlés"
 
@@ -1517,21 +1554,21 @@ msgstr "Törlés"
 msgid "Delete Save"
 msgstr "Mentés törlése"
 
-#: Source/Core/VideoCommon/Src/AVIDump.cpp:77
+#: Source/Core/VideoCommon/Src/AVIDump.cpp:64
 #, c-format
 msgid "Delete the existing file '%s'?"
 msgstr "Törlöd a meglévő '%s' fájlt?"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:671
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:683
 msgid "Description"
 msgstr "Leírás"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:472
 msgid "Detect"
 msgstr "Észlelés"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:233
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:328
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:220
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:315
 msgid ""
 "Detected attempt to read more data from the DVD than fit inside the out "
 "buffer. Clamp."
@@ -1539,29 +1576,29 @@ 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:127
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:898
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:114
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:889
 msgid "Device"
 msgstr "Eszköz"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:798
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:731
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779
 msgid "Device Settings"
 msgstr "Eszköz beállítások"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:45
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:49
 msgid "Dial"
 msgstr "Tárcsa"
 
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:146
+#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:135
 msgid "Direct3D11"
 msgstr "Direct3D11"
 
-#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:128
+#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:125
 msgid "Direct3D9"
 msgstr "Direct3D9"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:167
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:155
 msgid ""
 "Directory checksum failed\n"
 " and Directory backup checksum failed"
@@ -1569,16 +1606,20 @@ msgstr ""
 "Könyvtár ellenőrző összeg hibás\n"
 " és a könyvtár biztonsági mentés ellenőrző összeg hibás"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:433
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:443
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485
 msgid "Disable"
 msgstr "Kikapcsolás"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:491
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501
+msgid "Disable Destination Alpha"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:409
 msgid "Disable Fog"
 msgstr "Köd kikapcsolása"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108
 msgid ""
 "Disable any XFB emulation.\n"
 "Speeds up emulation a lot but causes heavy glitches in many games which rely "
@@ -1593,7 +1634,7 @@ msgstr ""
 "\n"
 "Ha bizonytalan vagy, hagyd kijelölve."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95
 msgid ""
 "Disable emulation of EFB copies.\n"
 "These are often used for post-processing or render-to-texture effects, so "
@@ -1610,20 +1651,33 @@ msgstr ""
 "\n"
 "Ha bizonytalan vagy, hagyd kijelöletlenül."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:543
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101
+#, fuzzy
+msgid ""
+"Disables emulation of a hardware feature called destination alpha, which is "
+"used in many games for various graphical effects.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+"A sok játékban különféle grafikai effektusokhoz használt destination alpha "
+"pass figyelmen kívül hagyása.\n"
+"\n"
+"Ha bizonytalan vagy, hagyd kijelöletlenül."
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:553
 msgid "Disc"
 msgstr "Lemez"
 
-#: Source/Core/DiscIO/Src/DriveBlob.cpp:107
-#: Source/Core/DiscIO/Src/DriveBlob.cpp:126
+#: Source/Core/DiscIO/Src/DriveBlob.cpp:94
+#: Source/Core/DiscIO/Src/DriveBlob.cpp:113
 msgid "Disc Read Error"
 msgstr "Lemez olvasási hiba"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:312
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:320
 msgid "Display"
 msgstr "Kijelző"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104
 msgid ""
 "Display the inputs read by the emulator.\n"
 "\n"
@@ -1633,32 +1687,32 @@ msgstr ""
 "\n"
 "Ha bizonytalan vagy, hagyd kijelöletlenül."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:80
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:67
 msgid "Divide"
 msgstr "Megosztás"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:987
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:990
 msgid "Do you want to stop the current emulation?"
 msgstr "Le akarod állítani az éppen működő emulációt?"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:663
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:644
 msgid "Dolby Pro Logic II decoder"
-msgstr ""
+msgstr "Dolby Pro Logic II dekóder"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:864
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:856
 msgid "Dolphin"
 msgstr "Dolphin"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:183
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:188
 #, c-format
 msgid "Dolphin %s Graphics Configuration"
 msgstr "Dolphin %s grafikai beállítások"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:292
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:298
 msgid "Dolphin &Web Site"
 msgstr "Dolphin &weblap"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.h:37
+#: Source/Core/DolphinWX/Src/ConfigMain.h:24
 msgid "Dolphin Configuration"
 msgstr "Dolphin beállítások"
 
@@ -1666,16 +1720,16 @@ msgstr "Dolphin beállítások"
 msgid "Dolphin Emulated Wiimote Configuration"
 msgstr "Dolphin emulált Wiimote beállítások"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:394
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:383
 msgid "Dolphin FIFO"
 msgstr "Dolphin FIFO"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1136
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1153
 msgid "Dolphin GCPad Configuration"
 msgstr "Dolphin GCPad beállítások"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:679
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1074
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:685
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1089
 msgid "Dolphin TAS Movies (*.dtm)"
 msgstr "Dolphin TAS videók (*.dtm)"
 
@@ -1683,11 +1737,11 @@ msgstr "Dolphin TAS videók (*.dtm)"
 msgid "Dolphin Wiimote Configuration"
 msgstr "Dolphin Wiimote beállítások"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:293
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:299
 msgid "Dolphin at &Google Code"
 msgstr "Dolphin &Google Code oldal"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:364
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:351
 msgid ""
 "Dolphin could not find any GC/Wii ISOs.  Doubleclick here to browse for "
 "files..."
@@ -1695,7 +1749,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:368
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:355
 msgid ""
 "Dolphin is currently set to hide all games.  Doubleclick here to show all "
 "games..."
@@ -1703,50 +1757,59 @@ 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:1159
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1160
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1246
 msgid "Dolphin was unable to complete the requested action."
-msgstr ""
+msgstr "A Dolphin nem tudta elvégezni a kívánt műveletet."
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:275
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:58
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
+#, fuzzy
+msgid ""
+"Doubles the emulated GPU clock rate. May speed up some games (ON = Fast, OFF "
+"= Compatible)"
+msgstr ""
+"Gyors lemez hozzáférés használata. Szükséges néhány játékhoz. (BE = gyors, "
+"KI = kompatibilis)"
+
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:262
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:45
 msgid "Down"
 msgstr "Le"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:54
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:44
 msgid "Download Codes (WiiRD Database)"
 msgstr "Kódok letöltése (WiiRD adatbázis)"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:297
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:287
 #, c-format
 msgid "Downloaded %lu codes. (added %lu)"
 msgstr "Letöltve %lu kód. (hozzáadva %lu)"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:31
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:35
 msgid "Drums"
 msgstr "Dobok"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:105
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
 msgid "Dummy"
 msgstr "Utánzat"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:661
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:642
 msgid "Dump Audio"
 msgstr "Hang mentése"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:532
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545
 msgid "Dump EFB Target"
 msgstr "EFB cél letárolása"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546
 msgid "Dump Frames"
 msgstr "Képkockák letárolása"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543
 msgid "Dump Textures"
 msgstr "Textúrák letárolása"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114
 msgid ""
 "Dump all rendered frames to an AVI file in User/Dump/Frames/\n"
 "\n"
@@ -1757,7 +1820,7 @@ msgstr ""
 "\n"
 "Ha bizonytalan vagy, hagyd kijelöletlenül."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111
 msgid ""
 "Dump decoded game textures to User/Dump/Textures/<game_id>/\n"
 "\n"
@@ -1767,7 +1830,7 @@ msgstr ""
 "\n"
 "Ha bizonytalan vagy, hagyd kijelöletlenül."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113
 msgid ""
 "Dump the contents of EFB copies to User/Dump/Textures/\n"
 "\n"
@@ -1777,21 +1840,21 @@ msgstr ""
 "\n"
 "Ha bizonytalan vagy, hagyd kijelöletlenül."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:474
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292
 msgid "Dutch"
 msgstr "Holland"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:112
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:113
 msgid "E&xit"
 msgstr "K&ilépés"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:441
 msgid "EFB Copies"
 msgstr "EFB másolatok"
 
-#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:223
+#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:210
 #, c-format
 msgid ""
 "ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least "
@@ -1799,53 +1862,57 @@ msgid ""
 "reboot is probably required at this point to get Windows to see the new "
 "driver."
 msgstr ""
+"HIBA: A Dolphin ezen változatához szükséges a TAP-Win32 driver %d.%d "
+"verziója legalább -- Ha mostanában frissítetted a Dolphin emulátort, akkor "
+"valószínűleg újra kell indítanod a számítógépet, hogy a Windows felismerje "
+"az új illesztőprogramot."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:166
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:160
 msgid "EUROPE"
 msgstr "EURÓPA"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:156
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:143
 msgid "Early Memory Updates"
 msgstr "Korai memória frissítés"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:447
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:453
 msgid "Edit"
 msgstr "Szerkesztés"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.h:30
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.h:17
 msgid "Edit ActionReplay Code"
 msgstr "ActionReplay kód szerkesztése"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:285
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:286
 msgid "Edit Config"
 msgstr "Beállítások szerkesztése"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.h:30
+#: Source/Core/DolphinWX/Src/PatchAddEdit.h:17
 msgid "Edit Patch"
 msgstr "Patch szerkesztése"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:447
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:453
 msgid "Edit current perspective"
 msgstr "Jelenlegi perspektíva szerkesztése"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:403
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:425
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:407
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:429
 msgid "Edit..."
 msgstr "Szerkesztés..."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:44
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:48
 msgid "Effect"
 msgstr "Effektus"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:425
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435
 msgid "Embedded Frame Buffer"
 msgstr "Beágyazott képkocka puffer"
 
-#: Source/Core/Core/Src/Core.cpp:201
+#: Source/Core/Core/Src/Core.cpp:190
 msgid "Emu Thread already running"
 msgstr "Az emuláció már fut"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110
 msgid ""
 "Emulate XFBs accurately.\n"
 "Slows down emulation a lot and prohibits high-resolution rendering but is "
@@ -1859,7 +1926,7 @@ msgstr ""
 "\n"
 "Ha bizonytalan vagy, jelöld ki inkább az XFB emulációt."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109
 msgid ""
 "Emulate XFBs using GPU texture objects.\n"
 "Fixes many games which don't work without XFB emulation while not being as "
@@ -1879,7 +1946,7 @@ msgstr ""
 msgid "Emulated Wiimote"
 msgstr "Emulált Wiimote"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346
 msgid "Emulation State: "
 msgstr "Emuláció állapota:"
 
@@ -1887,7 +1954,7 @@ msgstr "Emuláció állapota:"
 msgid "Enable"
 msgstr "Használat"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91
 msgid ""
 "Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's "
 "supported by your GPU.\n"
@@ -1903,72 +1970,71 @@ msgstr ""
 "\n"
 "Ha bizonytalan vagy, hagyd kijelöletlenül."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:111
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:98
 msgid "Enable AR Logging"
 msgstr "AR naplózás bekapcsolása"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324
 msgid "Enable Block Merging"
 msgstr "Blokk csatlakozás használata"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331
 msgid "Enable Bounding Box Calculation"
 msgstr "Bounding Box kalkuláció használata"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:446
 msgid "Enable Cache"
 msgstr "Gyorsítótár használata"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:562
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542
 msgid "Enable Cheats"
 msgstr "Csalások használata"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310
 msgid "Enable Dual Core"
-msgstr "Dual Core használata"
+msgstr "Kétmagos mód használata"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
 msgid "Enable Dual Core (speedup)"
-msgstr "Dual Core használata (gyorsítás)"
+msgstr "Kétmagos mód használata (gyorsítás)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:550
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:563
 msgid "Enable Hotkeys"
 msgstr "Gyorsbillentyűk használata"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311
 msgid "Enable Idle Skipping"
 msgstr "Tétlen állapot mellőzése"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541
 msgid "Enable Idle Skipping (speedup)"
 msgstr "Tétlen állapot mellőzése (gyorsítás)"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312
 msgid "Enable MMU"
 msgstr "MMU használata"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:554
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:567
 msgid "Enable Progressive Scan"
 msgstr "Progresszív pásztázás használata"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757
 msgid "Enable Screen Saver"
 msgstr "Képernyővédő bekapcsolása"
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:75
-#, fuzzy
 msgid "Enable Speaker Data"
-msgstr "Oldalak bekapcsolása"
+msgstr "Hangszóró adatok bekapcsolása"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
 msgid "Enable WideScreen"
 msgstr "Széleskijelző bekapcsolása"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:516
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529
 msgid "Enable Wireframe"
 msgstr "Vonalháló bekapcsolása"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85
 msgid ""
 "Enable anisotropic filtering.\n"
 "Enhances visual quality of textures that are at oblique viewing angles.\n"
@@ -1982,7 +2048,7 @@ msgstr ""
 "\n"
 "Ha bizonytalan vagy, válaszd ezt: 1x."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323
 msgid ""
 "Enable fast disc access.  Needed for a few games. (ON = Fast, OFF = "
 "Compatible)"
@@ -1994,7 +2060,7 @@ msgstr ""
 msgid "Enable pages"
 msgstr "Oldalak bekapcsolása"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76
 msgid ""
 "Enable this if you want the whole screen to be used for rendering.\n"
 "If this is disabled, a render window will be created instead.\n"
@@ -2006,7 +2072,7 @@ msgstr ""
 "\n"
 "Ha bizonytalan vagy, hagyd kijelöletlenül."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80
 msgid ""
 "Enable this if you want to use the main Dolphin window for rendering rather "
 "than a separate render window.\n"
@@ -2018,7 +2084,7 @@ msgstr ""
 "\n"
 "Ha bizonytalan vagy, hagyd kijelöletlenül."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:335
 msgid ""
 "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for "
 "ANY other game."
@@ -2026,28 +2092,35 @@ 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:337
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340
 msgid "Enables Custom Projection Hack"
 msgstr "Egyedi megjelenítési hack használata"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:528
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508
 msgid ""
 "Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on "
 "OSX."
 msgstr ""
+"Dolby Pro Logic II emuláció bekapcsolása 5.1 surround hanggal. Nem működik "
+"OSX alatt."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510
 msgid ""
 "Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only."
 msgstr ""
+"Dolby Pro Logic II emuláció bekapcsolása 5.1 surround hanggal. Csak OpenAl "
+"feldolgozó esetén."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:512
 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 emuláció bekapcsolása 5.1 surround hanggal. Csak OpenAl "
+"feldolgozó esetén. Működéshez szükség lehet a soft_oal.dll átnevezésére "
+"OpenAL32.dll névre."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81
 msgid ""
 "Enables progressive scan if supported by the emulated software.\n"
 "Most games don't care about this.\n"
@@ -2060,7 +2133,7 @@ msgstr ""
 "\n"
 "Ha bizonytalan vagy, hagyd kijelöletlenül."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313
 msgid ""
 "Enables the Memory Management Unit, needed for some games. (ON = Compatible, "
 "OFF = Fast)"
@@ -2068,7 +2141,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:111
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116
 msgid ""
 "Encode frame dumps using the FFV1 codec.\n"
 "\n"
@@ -2078,52 +2151,52 @@ msgstr ""
 "\n"
 "Ha bizonytalan vagy, hagyd kijelöletlenül."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:40
 msgid "End"
 msgstr "Vége"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:469
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:280
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:260
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293
 msgid "English"
 msgstr "Angol"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:329
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:407
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:337
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:417
 msgid "Enhancements"
 msgstr "Kép javítások"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:607
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:640
 msgid "Enter a name for the new perspective:"
 msgstr "Írj be egy nevet az új perspektívának:"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:191
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:178
 #, c-format
 msgid "Entry %d/%d"
 msgstr "%d/%d bejegyzés"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:85
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:72
 #, c-format
 msgid "Entry 1/%d"
 msgstr "1/%d bejegyzés"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:204
 msgid "Equal"
 msgstr "Egyenlő"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:45
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:156
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1242
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:32
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:150
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226
 msgid "Error"
 msgstr "Hiba"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:381
+#: Source/Core/DolphinWX/Src/Main.cpp:409
 msgid "Error loading selected language. Falling back to system default."
 msgstr ""
 "Hiba a kiválasztott nyelv betöltése közben. Rendszer alapértelmezett "
 "visszaállítva."
 
-#: Source/Core/Common/Src/ChunkFile.h:226
+#: Source/Core/Common/Src/ChunkFile.h:221
 #, c-format
 msgid ""
 "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). "
@@ -2132,7 +2205,7 @@ msgstr ""
 "Hiba: \"%s\" után, %d (0x%X) található a mentési jelölő helyett %d (0x%X). "
 "Mentés betöltésének leállítása..."
 
-#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:342
+#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:329
 #, c-format
 msgid ""
 "Error: Trying to access %s fonts but they are not loaded. Games may not show "
@@ -2142,38 +2215,38 @@ msgstr ""
 "betöltésük sikertelen. A játékokban a betűk lehet nem jelennek meg "
 "megfelelően, vagy kifagynak."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:30
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:17
 msgid "Escape"
 msgstr "Escape"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:26
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:30
 msgid "Euphoria"
 msgstr "Eufória"
 
 #: Source/Core/Core/Src/ArmMemTools.cpp:78
-#: Source/Core/Core/Src/x64MemTools.cpp:217
+#: Source/Core/Core/Src/x64MemTools.cpp:206
 #, c-format
 msgid "Exception handler - access below memory space. %08llx%08llx"
 msgstr "Kivétel kezelő - memória terület alatti hozzáférés. %08llx%08llx"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:61
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
 msgid "Execute"
 msgstr "Végrehajtás"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:459
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:446
 msgid "Export Failed"
 msgstr "Exportálás sikertelen"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:639
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:649
 msgid "Export File"
 msgstr "Fájl exportálása"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:177
 msgid "Export Recording"
 msgstr "Felvétel exportálása"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:345
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:351
 msgid "Export Recording..."
 msgstr "Felvétel exportálása..."
 
@@ -2181,7 +2254,7 @@ msgstr "Felvétel exportálása..."
 msgid "Export Save"
 msgstr "Mentés exportálása"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:874
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:865
 msgid "Export Wii save (Experimental)"
 msgstr "Wii mentés exportálása (kísérleti)"
 
@@ -2189,100 +2262,100 @@ msgstr "Wii mentés exportálása (kísérleti)"
 msgid "Export all saves"
 msgstr "Minden mentés exportálása"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:80
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:72
 msgid "Export failed, try again?"
 msgstr "Exportálás sikertelen. Újra megpróbálod?"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:559
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:552
 msgid "Export save as..."
 msgstr "Exportálás mentése másként..."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:297
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:284
 msgid "Extension"
 msgstr "Kiegészítő"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483
 msgid "External Frame Buffer"
 msgstr "Külső képkocka puffer"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:61
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:48
 msgid "Extra Parameter"
 msgstr "Extra paraméter"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:62
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:49
 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:614
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:624
 msgid "Extract All Files..."
 msgstr "Minden fájl kitömörítése..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:616
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:626
 msgid "Extract Apploader..."
 msgstr "Betöltő program kitömörítése..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:617
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627
 msgid "Extract DOL..."
 msgstr "DOL kitömörítése..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:610
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:620
 msgid "Extract Directory..."
 msgstr "Könyvtár kitömörítése..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:612
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:622
 msgid "Extract File..."
 msgstr "Fájl kitömörítése..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:608
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:618
 msgid "Extract Partition..."
 msgstr "Partíció kitömörítése..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:724
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:738
 #, c-format
 msgid "Extracting %s"
 msgstr "%s kitömörítése"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:707
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:721
 msgid "Extracting All Files"
 msgstr "Minden fájl kitömörítése"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:707
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:721
 msgid "Extracting Directory"
 msgstr "Könyvtár kitömörítése"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:710
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:724
 msgid "Extracting..."
 msgstr "Kitömörítés..."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:892
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:893
 msgid "FIFO Byte"
 msgstr "FIFO bájt"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:45
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:32
 msgid "FIFO Player"
 msgstr "FIFO lejátszó"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:169
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:163
 msgid "FRANCE"
 msgstr "FRANCIAORSZÁG"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472
 msgid "FST Size:"
 msgstr "FST méret:"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:77
+#: Source/Core/Core/Src/NetPlayClient.cpp:81
 msgid "Failed to Connect!"
 msgstr "Csatlakozás sikertelen!"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:225
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:228
 msgid "Failed to Listen!!"
 msgstr "Meghallgatás sikertelen!"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:307
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:300
 msgid "Failed to download codes."
 msgstr "Kódok letöltése sikertelen."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:827
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:843
 #, c-format
 msgid "Failed to extract to %s!"
 msgstr "Kitömörítés nem sikerült ide: %s!"
@@ -2308,34 +2381,41 @@ msgstr ""
 "Használhatod a DSP HLE motort, amihez nem szükséges ROM mentés.\n"
 "(Kiválaszthatod a \"Hang\" fülnél a beállítások párbeszédablakban.)"
 
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:116
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:139
+#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:108
+#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:131
 msgid "Failed to load bthprops.cpl"
 msgstr "A bthprops.cpl betöltése sikertelen"
 
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:100
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:109
+#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:90
+#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:101
 msgid "Failed to load hid.dll"
 msgstr "A hid.dll betöltése sikertelen"
 
-#: Source/Core/Core/Src/Movie.cpp:792
+#: Source/Core/Core/Src/Movie.cpp:783
 #, c-format
 msgid "Failed to read %s"
-msgstr ""
+msgstr "%s olvasása sikertelen"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:151
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:144
 msgid "Failed to read banner.bin"
 msgstr "A banner.bin beolvasása sikertelen"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:223
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:178
+msgid "Failed to read bk header"
+msgstr ""
+
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:211
 #, c-format
 msgid ""
 "Failed to read block %d of the save data\n"
 "Memcard may be truncated\n"
 "FilePosition:%llx"
 msgstr ""
+"A mentett adatok %d blokkjának visszaolvasása sikertelen\n"
+"A memóriakártya sérülhetett\n"
+"FilePosition:%llx"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:148
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:136
 msgid ""
 "Failed to read block allocation table backup correctly\n"
 "(0x8000-0x9FFF)"
@@ -2344,7 +2424,7 @@ msgstr ""
 "sikertelen\n"
 "(0x8000-0x9FFF)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:142
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:130
 msgid ""
 "Failed to read block allocation table correctly\n"
 "(0x6000-0x7FFF)"
@@ -2352,12 +2432,17 @@ msgstr ""
 "A blokk kiosztási tábla pontos kiolvasása sikertelen\n"
 "(0x6000-0x7FFF)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:286
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:279
 #, c-format
 msgid "Failed to read data from file %d"
 msgstr "%d fájlból történő adatok kiolvasása nem sikerült"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:136
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:367
+#, c-format
+msgid "Failed to read data from file: %s"
+msgstr ""
+
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:124
 msgid ""
 "Failed to read directory backup correctly\n"
 "(0x4000-0x5FFF)"
@@ -2365,7 +2450,7 @@ msgstr ""
 "A könyvtár biztonsági mentés pontos visszaolvasása nem sikerült\n"
 "(0x4000-0x5FFF)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:130
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:118
 msgid ""
 "Failed to read directory correctly\n"
 "(0x2000-0x3FFF)"
@@ -2373,7 +2458,11 @@ msgstr ""
 "A könyvtár pontos kiolvasása nem sikerült\n"
 "(0x2000-0x3FFF)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:119
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:90
+msgid "Failed to read header"
+msgstr ""
+
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:107
 msgid ""
 "Failed to read header correctly\n"
 "(0x0000-0x1FFF)"
@@ -2381,63 +2470,65 @@ msgstr ""
 "A fejléc pontos kiolvasása nem sikerült\n"
 "(0x0000-0x1FFF)"
 
-#: Source/Core/DiscIO/Src/VolumeGC.cpp:61
+#: Source/Core/DiscIO/Src/VolumeGC.cpp:48
 msgid "Failed to read unique ID from disc image"
 msgstr "A lemezképfájl egyedi azonosítójának kiolvasása sikertelen"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:84
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:71
 msgid "Failed to write BT.DINF to SYSCONF"
 msgstr "A BT.DINF írása a SYSCONF fájlba sikertelen"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:228
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:221
 msgid "Failed to write bkhdr"
 msgstr "A bkhdr írása sikertelen"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:164
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:157
 #, c-format
 msgid "Failed to write header for %s"
 msgstr "Fejléc írása sikertelen a(z) %s számára"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:258
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:251
 #, c-format
 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:314
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294
 msgid "Farsi"
-msgstr ""
+msgstr "Farsi"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477
 msgid "Fast"
 msgstr "Gyors"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315
 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:1046
+#: Source/Core/Core/Src/Movie.cpp:1037
 #, c-format
 msgid ""
 "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s"
 msgstr ""
+"Végzetes deszinkronizáció. Visszajátszás leállítása. (PlayWiimote hiba: %u !"
+"= %u, byte %u.)%s"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:199
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:202
 msgid "Fifo Player"
 msgstr "Fifo lejátszó"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:99
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:86
 msgid "File Info"
 msgstr "Fájl infó"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:304
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:295
 msgid "File contained no codes."
 msgstr "A fájl nem tartalmazott kódokat."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:413
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:400
 msgid "File converted to .gci"
 msgstr "Fájl átkonvertálva .gci formátumba"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:428
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:415
 msgid ""
 "File could not be opened\n"
 "or does not have a valid extension"
@@ -2445,7 +2536,7 @@ msgstr ""
 "A fájl nem nyitható meg\n"
 "vagy a kiterjesztése nem megfelelő"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:84
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:72
 #, c-format
 msgid ""
 "File has the extension \"%s\"\n"
@@ -2454,36 +2545,36 @@ msgstr ""
 "A fájl \"%s\" kiterjesztésű\n"
 "az érvényes kiterjesztések (.raw/.gcp)"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:425
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:412
 msgid "File is not recognized as a memcard"
 msgstr "A fájl nem ismerhető fel memóriakártyaként"
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:294
+#: Source/Core/DiscIO/Src/CompressedBlob.cpp:281
 msgid "File not compressed"
 msgstr "A fájl nincs tömörítve"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:127
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:109
 #, c-format
 msgid "FileIO: Unknown open mode : 0x%02x"
 msgstr "FileIO: Ismeretlen megnyitási mód : 0x%02x"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:531
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:541
 msgid "Filesystem"
 msgstr "Fájlrendszer"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1100
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1126
 msgid "Filetype 'ini' is unknown! Will not open!"
 msgstr "Az 'ini' fájltípus ismeretlen! Nem lesz megnyitva!"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:265
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:252
 msgid "Find next"
-msgstr ""
+msgstr "Következő keresése"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:266
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:253
 msgid "Find previous"
-msgstr ""
+msgstr "Előző keresése"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:632
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626
 msgid "First Block"
 msgstr "Első blokk"
 
@@ -2491,23 +2582,23 @@ msgstr "Első blokk"
 msgid "Fix Checksums"
 msgstr "Állandó ellenőrzőösszeg"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:275
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283
 msgid "Force 16:9"
 msgstr "Kényszerített 16:9"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:275
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283
 msgid "Force 4:3"
 msgstr "Kényszerített 4:3"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:568
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548
 msgid "Force Console as NTSC-J"
 msgstr "Konzol kényszerítése NTSC-J típusra"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406
 msgid "Force Texture Filtering"
 msgstr "Textúra szűrés kényszerítése"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90
 msgid ""
 "Force texture filtering even if the emulated game explicitly disabled it.\n"
 "Improves texture quality slightly but causes glitches in some games.\n"
@@ -2520,7 +2611,7 @@ msgstr ""
 "\n"
 "Ha bizonytalan vagy, hagyd kijelöletlenül."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83
 msgid ""
 "Force the game to output graphics for widescreen resolutions.\n"
 "Causes graphical glitches is some games.\n"
@@ -2532,7 +2623,7 @@ msgstr ""
 "\n"
 "Ha bizonytalan vagy, hagyd kijelöletlenül."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488
 msgid ""
 "Forces NTSC-J mode for using the Japanese ROM font.\n"
 "Left unchecked, dolphin defaults to NTSC-U and automatically enables this "
@@ -2542,7 +2633,7 @@ msgstr ""
 "Hagyd kijelöletlenül, a Dolphin alapértelmezett az NTSC-U és automatikusan "
 "bekapcsolódik ez a beállítás japán játékok használatakor."
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:74
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:62
 msgid ""
 "Format as ascii (NTSC\\PAL)?\n"
 "Choose no for sjis (NTSC-J)"
@@ -2550,148 +2641,147 @@ msgstr ""
 "Formázás ascii kódra (NTSC\\PAL)?\n"
 "Válassz nemet sjis kódhoz (NTSC-J)"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:278
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:265
 msgid "Forward"
 msgstr "Előre"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504
 #, c-format
 msgid "Found %d results for '"
-msgstr ""
+msgstr "Találat: %d eredmény ehhez: '"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:857
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:925
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:858
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:926
 msgid "Frame"
 msgstr "Képkocka"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:867
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:868
 msgid "Frame "
 msgstr "Képkocka"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:185
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:173
 msgid "Frame Advance"
 msgstr "Képkocka léptetés"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:536
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549
 msgid "Frame Dumps use FFV1"
 msgstr "Képkocka mentések FFV1 használatával"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:227
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:214
 msgid "Frame Info"
-msgstr ""
+msgstr "Képkocka infó"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:116
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:103
 msgid "Frame Range"
 msgstr "Képkocka rendezés"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:138
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:139
 msgid "Frame S&kipping"
 msgstr "Képkocka k&ihagyás"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:572
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552
 msgid "Framelimit:"
 msgstr "Képkocka korlát:"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:204
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:191
 msgid "Frames To Record"
 msgstr "Rögzítendő képkockák"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547
 msgid "Free Look"
 msgstr "Szabad nézet"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
 msgid "French"
 msgstr "Francia"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:38
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:42
 msgid "Frets"
 msgstr "Frets"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:118
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:137
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:105
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:124
 msgid "From"
 msgstr "Ettől:"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:426
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:432
 msgid "FullScr"
 msgstr "Teljes méret"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:256
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263
 msgid "Fullscreen resolution:"
 msgstr "Teljes kijelzős felbontás:"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:534
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524
 msgid "GCI File(*.gci)"
 msgstr "GCI fájl(*.gci)"
 
-#: Source/Core/DolphinWX/Src/GCMicDlg.h:44
+#: Source/Core/DolphinWX/Src/GCMicDlg.h:31
 msgid "GCMic Configuration"
 msgstr "GCMic beállítások"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:432
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
 msgid "GCPad"
 msgstr "GC irányító"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:659
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:658
 msgid "GX_CMD_INVL_VC"
-msgstr ""
+msgstr "GX_CMD_INVL_VC"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:448
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:452
 msgid "Game ID:"
 msgstr "Játék azonosító:"
 
-#: Source/Core/Core/Src/NetPlay.cpp:229
+#: Source/Core/Core/Src/NetPlay.cpp:216
 msgid "Game is already running!"
 msgstr "A játék már fut!"
 
-#: Source/Core/Core/Src/NetPlay.cpp:259
+#: Source/Core/Core/Src/NetPlay.cpp:246
 msgid "Game isn't running!"
 msgstr "A játék nem fut!"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:389
-#, fuzzy
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:393
 msgid "Game not found!"
 msgstr "A játék nem található!"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:385
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:389
 msgid "Game-Specific Settings"
 msgstr "A játék sajátos beállításai"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:293
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:294
 msgid "GameConfig"
 msgstr "Játék konfig"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:525
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:515
 msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)"
-msgstr ""
+msgstr "GameCube állásmentés fájlok (*.gci;*.gcs;*.sav)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534
 msgid "Gamecube"
 msgstr "Gamecube"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:178
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:181
 msgid "Gamecube &Pad Settings"
 msgstr "Gamecube &irányító beállítások"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:218
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1069
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:205
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1052
 msgid "Gamecube Memory Cards (*.raw,*.gcp)"
 msgstr "Gamecube memóriakártyák (*.raw,*.gcp)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:432
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
 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:301
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:117
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302
 msgid "Gecko Codes"
 msgstr "Gecko kódok"
 
-#: Source/Core/Core/Src/GeckoCode.cpp:222
+#: Source/Core/Core/Src/GeckoCode.cpp:214
 #, c-format
 msgid ""
 "GeckoCode failed to run (CT%i CST%i) (%s)\n"
@@ -2699,11 +2789,15 @@ msgid ""
 "native code handler by placing the codehandler.bin file into the Sys "
 "directory and restarting Dolphin.)"
 msgstr ""
+"GeckoCode futtatása sikertelen (CT%i CST%i) (%s)\n"
+"(vagy rossz a kód vagy a kód típus még nem támogatott. Próbáld a natív "
+"kódkezelőt használni úgy, hogy kicseréled a codehandler.bin fájlt a Sys "
+"könyvtárban és újraindítod a Dolphin emulátort.) "
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:172
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:197
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:160
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:160
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:202
 msgid "General"
 msgstr "Általános"
 
@@ -2711,30 +2805,30 @@ msgstr "Általános"
 msgid "General Settings"
 msgstr "Általános beállítások"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:470
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:281
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:316
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:261
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
 msgid "German"
 msgstr "Német"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:449
+#: Source/Core/Core/Src/ActionReplay.cpp:439
 #, 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:430
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:436
 msgid "Graphics"
 msgstr "Grafika"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:430
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:436
 msgid "Graphics settings"
 msgstr "Grafikai beállítások"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:205
 msgid "Greater Than"
 msgstr "Nagyobb mint"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87
 msgid ""
 "Greatly increases quality of textures generated using render to texture "
 "effects.\n"
@@ -2752,51 +2846,67 @@ msgstr ""
 "\n"
 "Ha bizonytalan vagy, hagyd kijelölve."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:317
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
 msgid "Greek"
 msgstr "Görög"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:22
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Green"
 msgstr "Zöld"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:24
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Green Left"
 msgstr "Green Left"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:25
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Green Right"
 msgstr "Zöld jobbra"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:35
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:39
 msgid "Guitar"
 msgstr "Gitár"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1259
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1250
 msgid "HCI_CMD_INQUIRY is called, please report!"
 msgstr "HCI_CMD_INQUIRY kiadva, kérlek jelentsd!"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:421
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504
+msgid "Hacked Buffer Upload"
+msgstr "Hekkelt puffer feltöltés"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431
 msgid "Hacks"
 msgstr "Hackek"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:158
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:146
 msgid "Header checksum failed"
 msgstr "A fejléc ellenőrző összege hibás"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:318
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298
 msgid "Hebrew"
 msgstr "Héber"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:313
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:300
 msgid "Height"
 msgstr "Magasság"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:64
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:51
 msgid "Help"
 msgstr "Súgó"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:209
+#: Source/Core/DolphinWX/Src/Main.cpp:229
+msgid ""
+"Hi,\n"
+"\n"
+"Dolphin requires Mac OS X 10.7 or greater.\n"
+"Unfortunately you're running an old version of OS X.\n"
+"The last Dolphin version to support OS X 10.6 is Dolphin 3.5\n"
+"Please upgrade to 10.7 or greater to use the newest Dolphin version.\n"
+"\n"
+"Sayonara!\n"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/Main.cpp:220
 msgid ""
 "Hi,\n"
 "\n"
@@ -2813,15 +2923,15 @@ msgstr ""
 "\n"
 "Sayonara!\n"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:309
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:296
 msgid "Hide"
 msgstr "Elrejtés"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:307
 msgid "Hide Mouse Cursor"
 msgstr "Egérmutató elrejtése"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79
 msgid ""
 "Hides the mouse cursor if it's on top of the emulation window.\n"
 "\n"
@@ -2831,26 +2941,26 @@ msgstr ""
 "\n"
 "Ha bizonytalan vagy, hagyd kijelölve."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:54
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41
 msgid "Home"
 msgstr "Home"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:85
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:138
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:76
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:141
 msgid "Host"
 msgstr "Host"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.h:44
+#: Source/Core/DolphinWX/Src/HotkeyDlg.h:31
 msgid "Hotkey Configuration"
 msgstr "Gyorsbillentyű beállítások"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:272
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:272
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:594
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:260
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:260
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574
 msgid "Hotkeys"
 msgstr "Gyorsbill."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:319
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299
 msgid "Hungarian"
 msgstr "Magyar"
 
@@ -2858,35 +2968,31 @@ msgstr "Magyar"
 msgid "Hybrid Wiimote"
 msgstr "Hibrid Wiimote"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:532
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:519
 #, 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:786
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:773
 #, c-format
 msgid ""
-"IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available "
-"in your nand dump\n"
+"IOCTL_ES_LAUNCH: Game tried to reload an IOS or a title that is not "
+"available in your NAND dump\n"
 "TitleID %016llx.\n"
-" Dolphin will likely hang now"
+" Dolphin will likely hang now."
 msgstr ""
-"IOCTL_ES_LAUNCH: A játék megkísérelte az IOS újratöltését vagy egy olyan "
-"címét ami nem érhető el a NAND mentésedben\n"
-"TitleID %016llx.\n"
-" A Dolphin valószínűleg kifagy most"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:313
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:300
 msgid "IOCTL_ES_READCONTENT - bad destination"
 msgstr "IOCTL_ES_READCONTENT - rossz cél"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729
 msgid "IPL Settings"
 msgstr "IPL beállítások"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269
 msgid "IR"
 msgstr "IR"
 
@@ -2898,23 +3004,23 @@ msgstr "IR mutató"
 msgid "IR Sensitivity:"
 msgstr "IR érzékenysége:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:502
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:512
 msgid "ISO Details"
 msgstr "ISO részletek"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:830
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:811
 msgid "ISO Directories"
 msgstr "ISO könyvtárak"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:172
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:166
 msgid "ITALY"
 msgstr "OLASZORSZÁG"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:630
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:624
 msgid "Icon"
 msgstr "Ikon"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332
 msgid ""
 "If checked, the bounding box registers will be updated. Used by the Paper "
 "Mario games."
@@ -2922,25 +3028,11 @@ 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:318
-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:505
-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:428
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438
 msgid "Ignore Format Changes"
 msgstr "Formátum változások kihagyása"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94
 msgid ""
 "Ignore any changes to the EFB format.\n"
 "Improves performance in many games without any negative effect. Causes "
@@ -2954,7 +3046,7 @@ msgstr ""
 "\n"
 "Ha bizonytalan vagy, hagyd kijelölve."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93
 msgid ""
 "Ignore any requests of the CPU to read from or write to the EFB.\n"
 "Improves performance in some games, but might disable some gameplay-related "
@@ -2973,11 +3065,11 @@ msgstr ""
 msgid "Import Save"
 msgstr "Mentés importálása"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:59
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:48
 msgid "Import failed, try again?"
 msgstr "Importálás sikertelen, megpróbálod újra?"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:454
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:441
 msgid ""
 "Imported file has gsc extension\n"
 "but does not have a correct header"
@@ -2985,11 +3077,11 @@ msgstr ""
 "Az importált fájl gsc kiterjesztésű\n"
 "de nem rendelkezik megfelelő fejléccel"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:442
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:429
 msgid "Imported file has invalid length"
 msgstr "Az importált fájl hossza érvénytelen"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:451
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:438
 msgid ""
 "Imported file has sav extension\n"
 "but does not have a correct header"
@@ -2997,19 +3089,7 @@ msgstr ""
 "Az importált fájl sav kiterjesztésű\n"
 "de nem rendelkezik megfelelő fejléccel"
 
-#: 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 ""
-"Növeli a teljesítményt de képhibákat okoz azokban a játékban, amelykben "
-"fontos a megfelelő köd emuláció.\n"
-"\n"
-"Ha bizonytalan vagy, hagyd kijelöletlenül."
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350
 msgid "In Game"
 msgstr "Elindul"
 
@@ -3017,85 +3097,87 @@ msgstr "Elindul"
 msgid "In-Game"
 msgstr "Elindul"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:34
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305
 msgid "Info"
 msgstr "Infó"
 
-#: Source/Core/Common/Src/MsgHandler.cpp:65
+#: Source/Core/Common/Src/MsgHandler.cpp:51
 msgid "Information"
 msgstr "Információk"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:481
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:468
 msgid "Input"
 msgstr "Bemenet"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:63
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:50
 msgid "Insert"
 msgstr "Insert"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:176
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:166
 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:782
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:763
 msgid "Insert SD Card"
 msgstr "SD kártya behelyezése"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:34
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:21
 msgid "Insert name here.."
 msgstr "Írj be ide nevet..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:196
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:199
 msgid "Install WAD"
 msgstr "WAD telepítése"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:895
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:888
 msgid "Install to Wii Menu"
 msgstr "Telepítés a Wii menübe"
 
-#: Source/Core/Core/Src/x64MemTools.cpp:252
+#: Source/Core/Core/Src/x64MemTools.cpp:242
 msgid ""
 "InstallExceptionHandler called, but this platform does not yet support it."
 msgstr ""
 "InstallExceptionHandler előidézve, de ez a platform még nem támogatja azt."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1297
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
 msgid "Installing WAD..."
 msgstr "WAD telepítése..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:885
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:901
 msgid "Integrity Check Error"
-msgstr ""
+msgstr "Integritás ellenőrzési hiba"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:891
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:907
 msgid "Integrity check completed"
-msgstr ""
+msgstr "Integritás ellenőrzés befejeződött"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:890
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:906
 msgid "Integrity check completed. No errors have been found."
-msgstr ""
+msgstr "Integritás ellenőrzés befejeződött. Nem találhatóak hibák."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:882
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:898
 #, c-format
 msgid ""
 "Integrity check for partition %d failed. Your dump is most likely corrupted "
 "or has been patched incorrectly."
 msgstr ""
+"%d partíció integritás ellenőrzése sikertelen. A mentés valószínűleg sérült "
+"vagy helytelen hibajavítás történt rajta."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532
 msgid "Interface"
 msgstr "Felhasználói felület"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:646
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627
 msgid "Interface Settings"
 msgstr "Felület beállítások"
 
-#: Source/Core/Core/Src/State.cpp:240
+#: Source/Core/Core/Src/State.cpp:228
 msgid "Internal LZO Error - compression failed"
 msgstr "Belső LZO hiba - tömörítés sikertelen"
 
-#: Source/Core/Core/Src/State.cpp:348
+#: Source/Core/Core/Src/State.cpp:336
 #, c-format
 msgid ""
 "Internal LZO Error - decompression failed (%d) (%li, %li) \n"
@@ -3104,41 +3186,45 @@ 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:485
+#: Source/Core/Core/Src/State.cpp:473
 msgid "Internal LZO Error - lzo_init() failed"
 msgstr "Belső LZO hiba - lzo_init() sikertelen"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:344
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:352
 msgid "Internal Resolution:"
 msgstr "Belső felbontás:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:42
+msgid "Interpreter (VERY slow)"
+msgstr "Interpreter (NAGYON lassú)"
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349
 msgid "Intro"
 msgstr "Intró"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:194
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:187
 #, c-format
 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:600
 msgid "Invalid Value!"
 msgstr "Érvénytelen érték!"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:462
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:449
 msgid "Invalid bat.map or dir entry"
 msgstr "Érvénytelen bat.map vagy könyvtár bejegyzés"
 
-#: Source/Core/Core/Src/CoreTiming.cpp:548
+#: Source/Core/Core/Src/CoreTiming.cpp:553
 #, c-format
 msgid "Invalid event type %i"
 msgstr "Érvénytelen esemény fajta %i"
 
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:326
+#: Source/Core/Core/Src/HW/DVDInterface.cpp:309
 msgid "Invalid file"
 msgstr "Érvénytelen fájl"
 
-#: Source/Core/DiscIO/Src/BannerLoaderGC.cpp:41
+#: Source/Core/DiscIO/Src/BannerLoaderGC.cpp:28
 #, c-format
 msgid ""
 "Invalid opening.bnr found in gcm:\n"
@@ -3149,108 +3235,122 @@ msgstr ""
 "%s\n"
 " Valószínűleg újra le kell mentened a játékot."
 
-#: Source/Core/Core/Src/Movie.cpp:735
+#: Source/Core/Core/Src/Movie.cpp:726
 msgid "Invalid recording file"
 msgstr "Nem megfelelő rögzített fájl"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:473
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:472
 msgid "Invalid search parameters (no object selected)"
-msgstr ""
+msgstr "Érvénytelen keresési paraméterek (nincs kiválasztott elem)"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:456
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:455
 msgid "Invalid search string (couldn't convert to number)"
 msgstr ""
+"Érvénytelen keresési karakterlánc (számra töténő átalakítása sikertelen)"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:444
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:443
 msgid "Invalid search string (only even string lengths supported)"
 msgstr ""
+"Érvénytelen keresési karakterlánc (még csak a karakterlánc hosszúsága "
+"támogatott)"
 
-#: Source/Core/Core/Src/Core.cpp:513
+#: Source/Core/Core/Src/Core.cpp:511
 msgid "Invalid state"
 msgstr "Nem megfelelő mentés"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:473
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:320
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300
 msgid "Italian"
 msgstr "Olasz"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:183
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:177
 msgid "JAPAN"
 msgstr "JAPÁN"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:321
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:46
+msgid "JIT Recompiler (recommended)"
+msgstr "JIT Recompiler (ajánlott)"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:47
+msgid "JITIL experimental recompiler"
+msgstr "JITIL kísérleti recompiler"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:279
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
 msgid "Japanese"
 msgstr "Japán"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:188
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:182
 msgid "KOREA"
 msgstr "KOREA"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78
 msgid ""
 "Keep the game window on top of all other windows.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
+"A játék ablakot az összes többi ablak felett tartja.\n"
+"\n"
+"Ha bizonytalan vagy, hagyd kijelöletlenül."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:298
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:306
 msgid "Keep window on top"
-msgstr ""
+msgstr "Ablak legfelül tartása"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:241
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:241
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:229
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:229
 msgid "Key"
 msgstr "Bill."
 
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282
 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:322
 msgid "Korean"
 msgstr "Koreai"
 
 #. i18n:  Left
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:57
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:44
 msgid "L"
 msgstr "L"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:39
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:26
 msgid "L Button"
 msgstr "L gomb"
 
 #. i18n:  Left-Analog
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:61
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:48
 msgid "L-Analog"
 msgstr "Bal analóg"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:585
 msgid "Language:"
 msgstr "Nyelv:"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:152
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:153
 msgid "Last Overwritten State"
 msgstr "Az utolsó felülírt mentés"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:159
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:161
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:160
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:162
 msgid "Last Saved State"
 msgstr "Utolsó mentett állás"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:696
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:677
 msgid "Latency:"
-msgstr ""
+msgstr "Késleltetés:"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:276
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:55
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:263
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:42
 msgid "Left"
 msgstr "Balra"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:60
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:64
 msgid "Left Stick"
 msgstr "Bal kar"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:257
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:257
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:245
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:245
 msgid ""
 "Left click to detect hotkeys.\n"
 "Enter space to clear."
@@ -3258,7 +3358,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:689
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:678
 msgid ""
 "Left-click to detect input.\n"
 "Middle-click to clear.\n"
@@ -3268,7 +3368,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:694
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:683
 msgid ""
 "Left/Right-click for more options.\n"
 "Middle-click to clear."
@@ -3276,76 +3376,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:206
 msgid "Less Than"
 msgstr "Kevesebb mint"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:565
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545
 msgid "Limit by FPS"
 msgstr "FPS alapú korlátozás"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:924
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:915
 msgid "Load"
 msgstr "Betöltés"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544
 msgid "Load Custom Textures"
 msgstr "Egyedi textúrák betöltése"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
 msgid "Load State Slot 1"
 msgstr "Állás betöltése az 1. helyről"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189
 msgid "Load State Slot 2"
 msgstr "Állás betöltése a 2. helyről"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:190
 msgid "Load State Slot 3"
 msgstr "Állás betöltése a 3. helyről"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:203
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:191
 msgid "Load State Slot 4"
 msgstr "Állás betöltése a 4. helyről"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192
 msgid "Load State Slot 5"
 msgstr "Állás betöltése az 5. helyről"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193
 msgid "Load State Slot 6"
 msgstr "Állás betöltése a 6. helyről"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:194
 msgid "Load State Slot 7"
 msgstr "Állás betöltése a 7. helyről"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:195
 msgid "Load State Slot 8"
 msgstr "Állás betöltése a 8. helyről"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:155
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:156
 msgid "Load State..."
 msgstr "Állás betöltése..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1332
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1359
 msgid "Load Wii System Menu"
 msgstr "Wii rendszer menü betöltése"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1327
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1354
 #, c-format
 msgid "Load Wii System Menu %d%c"
 msgstr "Wii rendszer menü betöltése %d%c"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112
 msgid ""
 "Load custom textures from User/Load/Textures/<game_id>/\n"
 "\n"
@@ -3355,7 +3455,7 @@ msgstr ""
 "\n"
 "Ha bizonytalan vagy, hagyd kijelöletlenül."
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:50
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:37
 msgid "Load preset values from hack patterns available."
 msgstr "Gombkiosztási értékek betöltése a hack mintákból rendelkezésre áll."
 
@@ -3363,48 +3463,53 @@ msgstr "Gombkiosztási értékek betöltése a hack mintákból rendelkezésre 
 msgid "Local"
 msgstr "Helyi"
 
-#: Source/Core/DolphinWX/Src/LogWindow.h:51
+#: Source/Core/DolphinWX/Src/LogWindow.h:38
 msgid "Log"
 msgstr "Napló"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:26
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:13
 msgid "Log Configuration"
 msgstr "Napló beállítások"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:296
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304
 msgid "Log FPS to file"
-msgstr ""
+msgstr "FPS naplózás fájlba"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:96
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83
 msgid "Log Types"
 msgstr "Napló típus"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103
 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 naplózza a User/Logs/fps."
+"txt fájlba. Használd ezt a tulajdonságot a Dolphin teljesítményének "
+"méréséhez.\n"
+" \n"
+"Ha bizonytalan vagy, hagyd kijelöletlenül."
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:81
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:68
 msgid "Logger Outputs"
 msgstr "Napló kimenetek"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132
-#: Source/Core/DolphinWX/Src/Frame.cpp:328
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:119
+#: Source/Core/DolphinWX/Src/Frame.cpp:314
 msgid "Logging"
 msgstr "Naplózás"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:255
+#: Source/Core/Core/Src/NetPlayClient.cpp:259
 msgid "Lost connection to server!"
 msgstr "Kapcsolat elveszett a szerverrel!"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:42
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:29
 msgid "M Button"
 msgstr "M gomb"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:119
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:112
 #, c-format
 msgid ""
 "MD5 mismatch\n"
@@ -3413,51 +3518,66 @@ msgstr ""
 "MD5 eltérés\n"
 " %016llx%016llx != %016llx%016llx"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314
 msgid "MMU Speed Hack"
 msgstr "MMU sebesség növelő hack"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:527
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:563
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:517
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:556
 msgid "MadCatz Gameshark files(*.gcs)"
 msgstr "MadCatz Gameshark fájlok (*.gcs)"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:51
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:63
+#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:38
 msgid "Main Stick"
 msgstr "Főkar"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460
 msgid "Maker ID:"
 msgstr "Gyártó azonosító:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487
 msgid "Maker:"
 msgstr "Gyártó:"
 
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100
+msgid ""
+"Makes distant objects more visible by removing fog, thus increasing the "
+"overall detail.\n"
+"Disabling fog will break some games which rely on proper fog emulation.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+"A távoli tárgyak jobban láthatóvá válnak a köd kikapcsolásával, ezáltal "
+"növekszik a részletesség.\n"
+"A köd kikapcsolásával olyan játékok esetén problémák fognak jelentkezni, "
+"melyek számára fontos megfelelő köd emuláció.\n"
+"\n"
+"Ha bizonytalan vagy, hagyd kijelöletlenül."
+
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:97
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:100
 msgid "Max"
 msgstr "Max"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:448
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:435
 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:291
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:278
 msgid "Memcard already opened"
 msgstr "A memóriakártya már meg van nyitva"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:912
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:913
 msgid "Memory Byte"
 msgstr "Memória bájt"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:225
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:113
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:212
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:93
 msgid "Memory Card"
 msgstr "Memóriakártya"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.h:36
+#: Source/Core/DolphinWX/Src/MemcardManager.h:23
 msgid ""
 "Memory Card Manager WARNING-Make backups before using, should be fixed but "
 "could mangle stuff!"
@@ -3465,7 +3585,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:371
+#: Source/Core/Core/Src/CoreParameter.cpp:360
 #, c-format
 msgid ""
 "Memory Card filename in Slot %c is incorrect\n"
@@ -3482,15 +3602,15 @@ msgstr ""
 "%s\n"
 "Át akarod másolni a régi fájlt erre az új helyre?\n"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:124
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:112
 msgid "Memorycard filesize does not match the header size"
 msgstr "A memóriakártya fájlmérete nem egyezik a fejléc méretével"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:50
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:37
 msgid "Menu"
 msgstr "Menü"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:114
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:94
 msgid "Mic"
 msgstr "Mikrofon"
 
@@ -3499,20 +3619,20 @@ msgstr "Mikrofon"
 msgid "Min"
 msgstr "Min"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:580
 msgid "Misc"
 msgstr "Egyebek"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:795
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776
 msgid "Misc Settings"
 msgstr "Egyéb beállítások"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:240
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:294
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:227
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:281
 msgid "Modifier"
 msgstr "Változó"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106
 msgid ""
 "Modify textures to show the format they're encoded in. Needs an emulation "
 "reset in most cases.\n"
@@ -3524,20 +3644,20 @@ msgstr ""
 "\n"
 "Ha bizonytalan vagy, hagyd kijelöletlenül."
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:115
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:108
 msgid "Monospaced font"
 msgstr "Azonos szélességű betűtípus"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:305
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:292
 msgid "Motion Plus"
 msgstr "Motion Plus"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:309
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:86
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:296
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73
 msgid "Motor"
 msgstr "Motor"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:654
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:666
 msgid ""
 "Move the mouse pointer over an option to display a detailed description.\n"
 "\n"
@@ -3555,224 +3675,236 @@ msgstr ""
 "\n"
 "\n"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:75
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:62
 msgid "Multiply"
 msgstr "Multiply"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:651
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:650
 msgid "NOP"
-msgstr ""
+msgstr "NOP"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:629
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:628
 msgid "NOTE: Stream size doesn't match actual data length\n"
 msgstr ""
+"MEGJEGYZÉS: Az adatfolyam mérete nem egyezik az aktuális adat hosszúsággal\n"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:129
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:116
 msgid "NP Add"
 msgstr "NP Add"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:124
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:111
 msgid "NP Begin"
 msgstr "NP Begin"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:132
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:119
 msgid "NP Decimal"
 msgstr "NP Decimal"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:126
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:113
 msgid "NP Delete"
 msgstr "NP Delete"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:133
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:120
 msgid "NP Divide"
 msgstr "NP Divide"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:120
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:107
 msgid "NP Down"
 msgstr "NP Down"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:123
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:110
 msgid "NP End"
 msgstr "NP End"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:111
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:98
 msgid "NP Enter"
 msgstr "NP Enter"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:127
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:114
 msgid "NP Equal"
 msgstr "NP Equal"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:116
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:103
 msgid "NP Home"
 msgstr "NP Home"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:125
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:112
 msgid "NP Insert"
 msgstr "NP Insert"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:117
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:104
 msgid "NP Left"
 msgstr "NP Left"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:128
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:115
 msgid "NP Multiply"
 msgstr "NP Multiply"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:122
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:109
 msgid "NP Page Down"
 msgstr "NP Page Down"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:121
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:108
 msgid "NP Page Up"
 msgstr "NP Page Up"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:119
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:106
 msgid "NP Right"
 msgstr "NP Right"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:130
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:117
 msgid "NP Separator"
 msgstr "NP Separator"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:109
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:96
 msgid "NP Space"
 msgstr "NP Space"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:131
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:118
 msgid "NP Subtract"
 msgstr "NP Subtract"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:110
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:97
 msgid "NP Tab"
 msgstr "NP Tab"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:118
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:105
 msgid "NP Up"
 msgstr "NP Up"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:444
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:59
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:50
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:448
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:46
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:37
 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:25
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:72
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:282
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:553
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:15
 msgid "Name: "
 msgstr "Név:"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:526
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:562
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:516
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:555
 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:148
 msgid "New Scan"
 msgstr "Új keresés"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:206
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:193
 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:801
 msgid "Next Page"
 msgstr "Következő lap"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:165
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:152
 msgid "Next Scan"
 msgstr "Következő keresés"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:68
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:59
 msgid "Nickname :"
 msgstr "Becenév:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:196
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:190
 msgid "No Country (SDK)"
 msgstr "Nincs ország (SDK)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:370
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:357
 msgid "No ISOs or WADS found"
 msgstr "Nem találhatók sem ISO sem WAD fájlok"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:508
+#: Source/Core/Core/Src/ConfigManager.h:17
+msgid "No audio output"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:501
 #, c-format
 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:761
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:768
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:760
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:767
 msgid "No description available"
-msgstr ""
+msgstr "Nincs leírás"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:514
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:535
 msgid "No docking"
 msgstr "Nincs dokkolás"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:859
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:860
 msgid "No file loaded"
 msgstr "Nincs fájl betöltve"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:439
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:426
 msgid "No free dir index entries"
 msgstr "Nincs üres könyvtári jelzőszám bejegyzés"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:895
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:896
 msgid "No recorded file"
 msgstr "Nincs rögzített fájl"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:501
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:494
 #, c-format
 msgid "No save folder found for title %s"
 msgstr "%s játékhoz nem található mentési mappa"
 
+#: Source/Plugins/Plugin_VideoOGL/Src/main.cpp:132
+#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:111
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:23
 #: Source/Core/DolphinWX/Src/NetWindow.cpp:600
 msgid "None"
 msgstr "Nincs"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:323
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303
 msgid "Norwegian Bokmaal"
 msgstr "Norvég"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:203
 msgid "Not Equal"
 msgstr "Nem egyenlő"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:804
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:794
 msgid "Not Set"
 msgstr "Nincs beállítva"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:626
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:101
+#, c-format
+msgid "Not a Wii save or read failure for file header size %x"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/Main.cpp:654
 msgid "Not connected"
 msgstr "Nincs csatlakoztatva"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:309
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:296
 msgid "Notes"
 msgstr "Megjegyzés"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:16
 msgid "Notes: "
 msgstr "Megjegyzések:"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:71
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:74
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:580
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:621
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:629
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:59
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:64
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:613
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:659
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:667
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:31
 msgid "Notice"
 msgstr "Megjegyzés"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:105
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:92
 msgid "Num Lock"
 msgstr "Num Lock"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:88
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:75
 msgid "Number Of Codes: "
 msgstr "Kódok száma:"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:30
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:34
 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26
 msgid "Nunchuk"
 msgstr "Nunchuk"
@@ -3781,96 +3913,97 @@ msgstr "Nunchuk"
 msgid "Nunchuk Acceleration"
 msgstr "Nunchuk gyorsítás"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:877
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:878
 msgid "Object"
 msgstr "Elem"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:135
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:122
 msgid "Object Range"
 msgstr "Elem hatótáv"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:243
 msgid "Off"
 msgstr "Ki"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:62
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:49
 msgid "Offset:"
 msgstr "Eltolás:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:582
 msgid "On-Screen Display Messages"
-msgstr ""
+msgstr "Képernyőn megjelenő üzenetek"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:436
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:423
 #, c-format
 msgid "Only %d blocks available"
 msgstr "Csak %d blokk szabad"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:420
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:178
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:426
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:166
 msgid "Open"
 msgstr "Megnyitás"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:876
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:867
 msgid "Open &containing folder"
 msgstr "A játékot &tartalmazó mappa megnyitása"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:873
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:864
 msgid "Open Wii &save folder"
 msgstr "Wii &mentések mappa megnyitása"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:420
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:426
 msgid "Open file..."
 msgstr "Fájl megnyitása..."
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:61
+#: Source/Core/AudioCommon/Src/OpenALStream.cpp:48
 #, 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:72
+#: Source/Core/AudioCommon/Src/OpenALStream.cpp:59
 msgid "OpenAL: can't find sound devices"
 msgstr "OpenAL: nem található hang eszköz"
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:66
+#: Source/Core/AudioCommon/Src/OpenALStream.cpp:53
 #, c-format
 msgid "OpenAL: can't open device %s"
 msgstr "OpenAL: %s eszköz nem nyitható meg"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502
 msgid "OpenCL Texture Decoder"
 msgstr "OpenCL textúra dekódoló"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503
 msgid "OpenMP Texture Decoder"
 msgstr "OpenMP textúra dekódoló"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:317
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:94
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:304
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:81
 msgid "Options"
 msgstr "Lehetőségek"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:22
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Orange"
 msgstr "Narancs"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:468
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:455
+#, fuzzy
 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"
+"and import the saves to a new memcard\n"
 msgstr ""
 "A fájlok sorrendje a fájl könyvtárban nem azonos a blokkok sorrendjével\n"
 "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:316
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:324
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:509
 msgid "Other"
 msgstr "Egyéb"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:206
+#: Source/Core/Core/Src/NetPlayClient.cpp:210
 msgid ""
 "Other client disconnected while game is running!! NetPlay is disabled. You "
 "manually stop the game."
@@ -3878,15 +4011,15 @@ 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:481
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:468
 msgid "Output"
 msgstr "Kimenet"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:342
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:348
 msgid "P&lay Recording..."
 msgstr "F&elvétel visszajátszása..."
 
-#: Source/Core/Core/Src/HW/GCPad.cpp:30
+#: Source/Core/Core/Src/HW/GCPad.cpp:18
 msgid "Pad"
 msgstr "Irányító"
 
@@ -3894,160 +4027,160 @@ msgstr "Irányító"
 msgid "Pad "
 msgstr "Irányító"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:34
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:38
 msgid "Pads"
 msgstr "Irányítók"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:108
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:95
 msgid "Page Down"
 msgstr "Page Down"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:107
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:94
 msgid "Page Up"
 msgstr "Page Up"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:35
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:22
 msgid "Paragraph"
 msgstr "Paragraph"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:64
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:51
 msgid "Parameters"
 msgstr "Paraméterek"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:222
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:217
 #, c-format
 msgid "Partition %i"
 msgstr "%i partíció"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:296
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:297
 msgid "Patches"
 msgstr "Javítások"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:556
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536
 msgid "Paths"
 msgstr "Mappák"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1538
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1539
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:51
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1565
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1566
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:38
 msgid "Pause"
 msgstr "Szünet"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:128
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:129
 msgid "Pause at end of movie"
-msgstr ""
+msgstr "Szünet a videó végén"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:397
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405
 msgid "Per-Pixel Lighting"
 msgstr "Képpont alapú fényhatások"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352
 msgid "Perfect"
 msgstr "Tökéletes"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:609
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:642
 #, c-format
 msgid "Perspective %d"
 msgstr "%d perspektíva"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:165
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:424
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1547
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1548
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:152
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:430
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1574
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1575
 msgid "Play"
 msgstr "Indítás"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176
 msgid "Play Recording"
 msgstr "Felvétel visszajátszása"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:170
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:170
 msgid "Play/Pause"
 msgstr "Indítás/Szünet"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351
 msgid "Playable"
 msgstr "Játszható"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:154
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:141
 msgid "Playback Options"
 msgstr "Visszajátszási lehetőségek"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:301
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:304
 msgid "Players"
 msgstr "Játékosok"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:988
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:991
 msgid "Please confirm..."
 msgstr "Változtatás jóváhagyása..."
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:579
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:612
 msgid "Please create a perspective before saving"
 msgstr "Hozz először létre egy perspektívát mielőtt mentenél"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:36
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:23
 msgid "Plus-Minus"
 msgstr "Plusz - minusz"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:324
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304
 msgid "Polish"
 msgstr "Lengyel"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:713
 msgid "Port 1"
 msgstr "1. port"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714
 msgid "Port 2"
 msgstr "2. port"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:734
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715
 msgid "Port 3"
 msgstr "3. port"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716
 msgid "Port 4"
 msgstr "4. port"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:97
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:130
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:88
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:133
 msgid "Port :"
 msgstr "Port:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:325
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305
 msgid "Portuguese"
 msgstr "Portugál"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:326
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306
 msgid "Portuguese (Brazilian)"
 msgstr "Portugál (brazil)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:391
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:399
 msgid "Post-Processing Effect:"
 msgstr "Utófeldolgozási effektus:"
 
-#: Source/Core/Core/Src/Movie.cpp:936
+#: Source/Core/Core/Src/Movie.cpp:927
 #, 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:1055
+#: Source/Core/Core/Src/Movie.cpp:1046
 #, 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:1032
+#: Source/Core/Core/Src/Movie.cpp:1023
 #, c-format
 msgid "Premature movie end in PlayWiimote. %u > %u"
 msgstr "Túl korai PlayWiimote videó befejezés. %u > %u"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:48
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:35
 msgid "Presets: "
 msgstr "Gombkiosztás:"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:205
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:192
 msgid "Prev Page"
 msgstr "Előző lap"
 
@@ -4055,67 +4188,67 @@ msgstr "Előző lap"
 msgid "Previous Page"
 msgstr "Előző lap"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:183
 msgid "Previous Value"
 msgstr "Előző érték"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:60
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:47
 msgid "Print"
 msgstr "Nyomtatás"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:894
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:885
 msgid "Profile"
 msgstr "Profil"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.h:55
+#: Source/Core/DolphinWX/Src/ISOProperties.h:42
 msgid "Properties"
 msgstr "Tulajdonságok"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:283
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:286
 msgid "Purge Cache"
 msgstr "Gyorsítótár ürítése"
 
-#: Source/Core/Common/Src/MsgHandler.cpp:66
+#: Source/Core/Common/Src/MsgHandler.cpp:52
 msgid "Question"
 msgstr "Kérdés"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:159
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:316
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:162
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:319
 msgid "Quit"
 msgstr "Kilépés"
 
 #. i18n:  Right
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:59
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:46
 msgid "R"
 msgstr "R"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:40
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:27
 msgid "R Button"
 msgstr "R gomb"
 
 #. i18n:  Right-Analog
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:63
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
 msgid "R-Analog"
 msgstr "Jobb analóg"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:445
 msgid "RAM"
 msgstr "RAM"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:175
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:169
 msgid "RUSSIA"
 msgstr "OROSZORSZÁG"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:528
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:515
 msgid "Range"
 msgstr "Hatótáv"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:190
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:178
 msgid "Read-only mode"
 msgstr "Írásvédett mód"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:487
 msgid "Real"
 msgstr "Valódi"
 
@@ -4131,33 +4264,33 @@ msgstr "Valódi Wiimote-ok"
 msgid "Reconnect Wiimote on State Loading"
 msgstr "Wiimote újracsatlakoztatása állás betöltéskor"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:193
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:217
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:791
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:180
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:204
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:790
 msgid "Record"
 msgstr "Rögzítés"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:174
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:161
 msgid "Recording Info"
 msgstr "Rögzítési infó"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:202
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:189
 msgid "Recording Options"
 msgstr "Rögzítési beállítások"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:21
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Red"
 msgstr "Vörös"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:24
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Red Left"
 msgstr "Vörös balra"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:25
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Red Right"
 msgstr "Vörös jobbra"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86
 msgid ""
 "Reduces the amount of aliasing caused by rasterizing 3D graphics.\n"
 "This makes the rendered picture look less blocky.\n"
@@ -4172,28 +4305,28 @@ msgstr ""
 "Ha bizonytalan vagy, válaszd ezt: Nincs. "
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:60
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:421
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:903
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:427
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:894
 msgid "Refresh"
 msgstr "Frissítés"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:180
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:168
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:168
 msgid "Refresh List"
 msgstr "A lista frissítése"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:421
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:427
 msgid "Refresh game list"
 msgstr "Játéklista frissítése"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:405
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:427
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:77
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:812
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:409
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:431
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:64
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:793
 msgid "Remove"
 msgstr "Törlés"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99
 msgid ""
 "Render the scene as a wireframe.\n"
 "\n"
@@ -4203,196 +4336,202 @@ msgstr ""
 "\n"
 "Ha bizonytalan vagy, hagyd kijelöletlenül."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:308
 msgid "Render to Main Window"
 msgstr "Megjelenítés a főablakban"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:915
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:172
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:906
 msgid "Reset"
 msgstr "Alapra állítás"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:190
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:177
 msgid "Results"
 msgstr "Eredmények"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:29
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:16
 msgid "Return"
 msgstr "Return"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:277
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:57
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464
+msgid "Revision:"
+msgstr ""
+
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:264
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:44
 msgid "Right"
 msgstr "Jobbra"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:61
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:65
 msgid "Right Stick"
 msgstr "Jobb kar"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:85
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:295
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:72
 msgid "Rumble"
 msgstr "Rumble funkció"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:518
-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:498
+msgid ""
+"Run DSP HLE and LLE on a dedicated thread (not recommended: might cause "
+"audio glitches with HLE and freezes with LLE)."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:327
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307
 msgid "Russian"
 msgstr "Orosz"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:149
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:150
 msgid "Sa&ve State"
 msgstr "Ál&lás mentése"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:465
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475
 msgid "Safe"
 msgstr "Biztonságos"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:196
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:446
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:925
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:183
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:452
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916
 msgid "Save"
 msgstr "Mentés"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:532
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:522
 msgid "Save GCI as..."
 msgstr "GCI mentése másként..."
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
 msgid "Save State Slot 1"
 msgstr "Állás mentés az 1. helyre"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:198
 msgid "Save State Slot 2"
 msgstr "Állás mentés a 2. helyre"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:199
 msgid "Save State Slot 3"
 msgstr "Állás mentés a 3. helyre"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:212
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:212
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200
 msgid "Save State Slot 4"
 msgstr "Állás mentés a 4. helyre"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201
 msgid "Save State Slot 5"
 msgstr "Állás mentés az 5. helyre"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202
 msgid "Save State Slot 6"
 msgstr "Állás mentés a 6. helyre"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:203
 msgid "Save State Slot 7"
 msgstr "Állás mentés a 7. helyre"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204
 msgid "Save State Slot 8"
 msgstr "Állás mentés a 8. helyre"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:151
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:152
 msgid "Save State..."
 msgstr "Állás mentése..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:582
 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:592
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:602
 msgid "Save as..."
 msgstr "Mentés másként..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1203
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1204
 msgid "Save compressed GCM/ISO"
 msgstr "Tömörített GCM/ISO mentése"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:446
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:452
 msgid "Save current perspective"
 msgstr "Jelenlegi perspektíva mentése"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1192
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193
 msgid "Save decompressed GCM/ISO"
 msgstr "Kitömörített GCM/ISO mentése"
 
-#: Source/Core/Core/Src/Movie.cpp:801
+#: Source/Core/Core/Src/Movie.cpp:792
 #, 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:396
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:404
 msgid "Scaled EFB Copy"
 msgstr "Méretezett EFB másolat"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:556
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:543
 #, c-format
 msgid "Scanning %s"
 msgstr "Keresés %s"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:539
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:526
 msgid "Scanning for ISOs"
 msgstr "ISO fájlok keresése"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:540
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:527
 msgid "Scanning..."
 msgstr "Keresés..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:427
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
 msgid "ScrShot"
 msgstr "Pillanatkép"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:106
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:93
 msgid "Scroll Lock"
 msgstr "Scroll Lock"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:264
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:251
 msgid "Search"
-msgstr ""
+msgstr "Keresés"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:227
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:214
 msgid "Search Filter"
 msgstr "Keresési szűrő"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:810
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:791
 msgid "Search Subfolders"
 msgstr "Keresés az almappákban"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:250
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:237
 msgid "Search current Object"
-msgstr ""
+msgstr "Ennek az elemnek a keresése"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:254
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:241
 msgid "Search for hex Value:"
-msgstr ""
+msgstr "A következő hexa érték keresése:"
 
-#: Source/Core/Common/Src/SysConf.h:103 Source/Core/Common/Src/SysConf.h:126
-#: Source/Core/Common/Src/SysConf.h:146 Source/Core/Common/Src/SysConf.h:167
+#: Source/Core/Common/Src/SysConf.h:90 Source/Core/Common/Src/SysConf.h:113
+#: Source/Core/Common/Src/SysConf.h:133 Source/Core/Common/Src/SysConf.h:154
 #, c-format
 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:490
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:46
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:477
 msgid "Select"
 msgstr "Választás"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:677
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1072
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:683
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1087
 msgid "Select The Recording File"
 msgstr "Válassz rögzítendő fájlt"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1285
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1312
 msgid "Select a Wii WAD file to install"
 msgstr "Válassz telepítendő Wii WAD fájlt"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:70
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74
 msgid ""
 "Select a hardware adapter to use.\n"
 "\n"
@@ -4402,31 +4541,31 @@ msgstr ""
 "\n"
 "Ha bizonytalan vagy, használd az elsőt."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:520
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:510
 msgid "Select a save file to import"
 msgstr "Válassz importálandó mentési fájlt"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:363
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:366
 msgid "Select floating windows"
 msgstr "Válassz lebegő ablakokat"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:582
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:585
 msgid "Select the file to load"
 msgstr "Betöltendő fájl kiválasztása"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1241
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1268
 msgid "Select the save file"
 msgstr "Válassz mentési fájlt"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1388
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1415
 msgid "Select the state to load"
 msgstr "Válassz betöltendő állásmentést"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1429
 msgid "Select the state to save"
 msgstr "Válassz mentendő állást"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82
 msgid ""
 "Select what aspect ratio to use when rendering:\n"
 "Auto: Use the native aspect ratio\n"
@@ -4444,15 +4583,15 @@ msgstr ""
 "\n"
 "Ha bizonytalan vagy, válaszd ezt: Automatikus."
 
-#: Source/Core/InputCommon/Src/InputConfig.cpp:61
+#: Source/Core/InputCommon/Src/InputConfig.cpp:48
 msgid "Selected controller profile does not exist"
-msgstr ""
+msgstr "A megadott irányító profil nem létezik"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:116
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:109
 msgid "Selected font"
 msgstr "Kiválasztott betűtípus"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75
 msgid ""
 "Selects the display resolution used in fullscreen mode.\n"
 "This should always be bigger than or equal to the internal resolution. "
@@ -4468,24 +4607,39 @@ 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:69
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:70
 msgid ""
 "Selects what graphics API to use internally.\n"
 "Direct3D 9 usually is the fastest one. OpenGL is more accurate though. "
 "Direct3D 11 is somewhere between the two.\n"
 "Note that the Direct3D backends are only available on Windows.\n"
 "\n"
-"If unsure, use Direct3D 9."
+"If unsure, use Direct3D 11."
 msgstr ""
-"Kiválasztja melyik grafikus API legyen használva belsőleg.\n"
-"A Direct3D 9 többnyire a leggyorsabb. Az OpenGL azonban pontosabb. A "
-"Direct3D 11 valahol a kettő között van.\n"
-"Vedd figyelembe, hogy a Direct3D feldolgozók csak Windows esetén állnak "
-"rendelkezésre.\n"
+"A belsőleg használni kívánt grafikai API kiválasztása.\n"
+"Direct3D 9 többnyire a leggyorsabb. OpenGL viszont pontosabb. Direct3D 11 "
+"valahol a kettő közt van.\n"
+"Érdemes tudni, hogy a Direct3D leképzők csak Windows rendszereken működnek.\n"
 "\n"
-"Ha bizonytalan vagy, használd ezt: Direct3D 9."
+"Ha bizonytalan vagy, legyen a Direct3D 11."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:288
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72
+msgid ""
+"Selects what graphics API to use internally.\n"
+"Direct3D 9 usually is the fastest one. OpenGL is more accurate though. "
+"Direct3D 11 is somewhere between the two.\n"
+"Note that the Direct3D backends are only available on Windows.\n"
+"\n"
+"If unsure, use OpenGL."
+msgstr ""
+"A belsőleg használni kívánt grafikai API kiválasztása.\n"
+"Direct3D 9 többnyire a leggyorsabb. OpenGL viszont pontosabb. Direct3D 11 "
+"valahol a kettő közt van.\n"
+"Érdemes tudni, hogy a Direct3D leképzők csak Windows rendszereken működnek.\n"
+"\n"
+"Ha bizonytalan vagy, legyen az OpenGL."
+
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:291
 msgid "Send"
 msgstr "Küldés"
 
@@ -4493,25 +4647,25 @@ msgstr "Küldés"
 msgid "Sensor Bar Position:"
 msgstr "Érzékelő helyzete:"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:77
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:64
 msgid "Separator"
 msgstr "Elválasztó"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:328
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308
 msgid "Serbian"
 msgstr "Szerb"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:522
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502
 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:488
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:475
 msgid "Set"
 msgstr "Beáll."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:877
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:868
 msgid "Set as &default ISO"
 msgstr "Beállítás &alapértelmezett ISO fájlként"
 
@@ -4520,142 +4674,143 @@ msgstr "Beállítás &alapértelmezett ISO fájlként"
 msgid "Set as default Memcard %c"
 msgstr "Beállítás alapértelmezett %c. memóriakártyaként"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:460
+#: Source/Core/Core/Src/ActionReplay.cpp:450
 #, 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/ConfigMain.cpp:535
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:515
 msgid ""
 "Sets the latency (in ms).  Higher values may reduce audio crackling. OpenAL "
 "backend only."
 msgstr ""
+"Késleltetés beállítása (ms). Magasabb értékek csökkenthetik a hang "
+"recsegést. Csak OpenAL feldolgozó estén."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341
 msgid "Settings..."
 msgstr "Beállítások..."
 
-#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:222
+#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:209
 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:291
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:278
 msgid "Shake"
 msgstr "Rázás"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
 msgid "Short Name:"
 msgstr "Rövid cím:"
 
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:103
+#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:90
 msgid "Shoulder Buttons"
 msgstr "Oldalsó gombok"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:217
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:220
 msgid "Show &Console"
 msgstr "Konzol &mutatása"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:215
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:218
 msgid "Show &Log"
 msgstr "Napló &mutatása"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:212
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:215
 msgid "Show &Statusbar"
 msgstr "Állapotsor &mutatása"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:210
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:213
 msgid "Show &Toolbar"
 msgstr "Eszközsor &mutatása"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:281
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:284
 msgid "Show Drives"
 msgstr "Meghajtók mutatása"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:517
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530
 msgid "Show EFB Copy Regions"
 msgstr "EFB másolat régiók megjelenítése"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:295
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303
 msgid "Show FPS"
 msgstr "FPS kijelzése"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:271
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:274
 msgid "Show France"
 msgstr "Franciaország mutatása"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:257
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:260
 msgid "Show GameCube"
 msgstr "GameCube mutatása"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561
 msgid "Show Input Display"
 msgstr "Bemeneti kijelző megjelenítése"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:273
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:276
 msgid "Show Italy"
 msgstr "Olaszország mutatása"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:264
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:267
 msgid "Show JAP"
 msgstr "JAP mutatása"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:275
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:278
 msgid "Show Korea"
 msgstr "Korea mutatása"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476
 msgid "Show Language:"
 msgstr "A játék nyelve:"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:216
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:219
 msgid "Show Log &Configuration"
 msgstr "Napló &beállítások megjelenítése"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:266
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:269
 msgid "Show PAL"
 msgstr "PAL mutatása"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:254
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:257
 msgid "Show Platforms"
 msgstr "Platformok mutatása"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:263
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:266
 msgid "Show Regions"
 msgstr "Régiók mutatása"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:518
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531
 msgid "Show Statistics"
 msgstr "Statisztikák megjelenítése"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:277
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:280
 msgid "Show Taiwan"
 msgstr "Tajvan mutatása"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:268
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:271
 msgid "Show USA"
 msgstr "USA mutatása"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:259
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:262
 msgid "Show Wad"
 msgstr "Wad mutatása"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:255
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:258
 msgid "Show Wii"
 msgstr "Wii mutatása"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491
 msgid "Show a confirmation box before stopping a game."
 msgstr "A játék leállítása előtt megjelenik egy megerősítő ablak."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:512
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492
 msgid ""
 "Show a message box when a potentially serious error has occurred.\n"
 "Disabling this may avoid annoying and non-fatal messages, but it may also "
 "mean that Dolphin suddenly crashes without any explanation at all."
 msgstr ""
-"Figyelmeztető üzenet jelenik meg egy potenciálisan komoly hiba "
-"bekövetkezésekor.\n"
+"Üzenetablak jelenik meg egy potenciálisan komoly hiba bekövetkezésekor.\n"
 "Kikapcsolásával megszűntethetők a kellemetlen és nem végzetes üzenetek, de "
 "ezáltal a Dolphin hirtelen kifagyhat bármilyen magyarázat nélkül."
 
@@ -4663,16 +4818,19 @@ msgstr ""
 msgid "Show first block"
 msgstr "Az első blokk megjelenítése"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:130
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:131
 msgid "Show lag counter"
-msgstr ""
+msgstr "Késési idő számláló megjelenítése"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493
 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 ""
+"Üzenetek megjelenítése az emulációs képernyőn.\n"
+"Az üzenetek tartalma memória kártya írás, kép feldolgozó és processzor "
+"információ, valamint JIT gyorsítótár ürítés lehet."
 
 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:815
 msgid "Show save blocks"
@@ -4690,7 +4848,7 @@ msgstr "Mentendő ikonok megjelenítése"
 msgid "Show save title"
 msgstr "Mentendő címek megjelenítése"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102
 msgid ""
 "Show the number of frames rendered per second as a measure of emulation "
 "speed.\n"
@@ -4702,11 +4860,11 @@ msgstr ""
 "\n"
 "Ha bizonytalan vagy, hagyd kijelöletlenül."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:279
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:282
 msgid "Show unknown"
 msgstr "Ismeretlen mutatása"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105
 msgid ""
 "Show various statistics.\n"
 "\n"
@@ -4716,47 +4874,31 @@ msgstr ""
 "\n"
 "Ha bizonytalan vagy, hagyd kijelöletlenül."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:319
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:306
 msgid "Sideways Wiimote"
 msgstr "Oldalt tartott Wiimote"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:280
 msgid "Simplified Chinese"
 msgstr "Egyszerűsített kínai"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:311
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:298
 msgid "Size"
 msgstr "Méret"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:696
 msgid "Skip BIOS"
 msgstr "BIOS kihagyása"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316
 msgid "Skip DCBZ clearing"
-msgstr ""
+msgstr "DCBZ törlés kihagyása"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:492
-msgid "Skip Dest. Alpha Pass"
-msgstr "Dest. Alpha Pass kihagyása"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:444
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:454
 msgid "Skip EFB Access from CPU"
 msgstr "Az EFB processzor hozzáférésének átugrása"
 
-#: 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 ""
-"A sok játékban különféle grafikai effektusokhoz használt destination alpha "
-"pass figyelmen kívül hagyása.\n"
-"\n"
-"Ha bizonytalan vagy, hagyd kijelöletlenül."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125
 msgid ""
 "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n"
 "Sometimes also increases visual quality.\n"
@@ -4772,25 +4914,25 @@ msgstr ""
 "\n"
 "Ha bizonytalan vagy, hagyd kijelöletlenül."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:374
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:386
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:380
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:392
 #, c-format
 msgid "Slot %i"
 msgstr "%i hely"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:700
 msgid "Slot A"
 msgstr "A hely"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:701
 msgid "Slot B"
 msgstr "B hely"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:62
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:49
 msgid "Snapshot"
 msgstr "Pillanatkép"
 
-#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:58
+#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:46
 msgid "Software Renderer"
 msgstr "Szoftveres képalkotó"
 
@@ -4807,27 +4949,27 @@ 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:683
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:664
 msgid "Sound Settings"
 msgstr "Hang beállítások"
 
-#: Source/Core/AudioCommon/Src/AudioCommon.cpp:77
+#: Source/Core/AudioCommon/Src/AudioCommon.cpp:64
 #, c-format
 msgid "Sound backend %s is not valid."
 msgstr "Érvénytelen %s hang feldolgozó."
 
-#: Source/Core/AudioCommon/Src/DSoundStream.cpp:59
+#: Source/Core/AudioCommon/Src/DSoundStream.cpp:46
 #, c-format
 msgid "Sound buffer creation failed: %s"
 msgstr "Hang puffer létrehozása sikertelen: %s"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:31
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:18
 msgid "Space"
 msgstr "Szóköz"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:329
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309
 msgid "Spanish"
 msgstr "Spanyol"
 
@@ -4835,7 +4977,7 @@ msgstr "Spanyol"
 msgid "Speaker Volume:"
 msgstr "Hangszóró hangerő:"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92
 msgid ""
 "Specifies the resolution used to render at. A high resolution will improve "
 "visual quality a lot but is also quite heavy on performance and might cause "
@@ -4855,63 +4997,63 @@ msgstr ""
 "\n"
 "Ha bizonytalan vagy, válaszd ezt: 640x528."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322
 msgid "Speed up Disc Transfer Rate"
 msgstr "A lemez adatátviteli arány gyorsítása"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:243
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:230
 msgid "Square Stick"
 msgstr "Négyzetes kar"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:107
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87
 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:322
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:37
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:25
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:325
 msgid "Start"
 msgstr "Indítás"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:194
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:197
 msgid "Start &NetPlay"
 msgstr "&NetPlay indítása"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:339
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:345
 msgid "Start Re&cording"
 msgstr "Felvétel in&dítása"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:175
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:175
 msgid "Start Recording"
 msgstr "Felvétel indítása"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:312
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:299
 msgid "State"
 msgstr "Állap."
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:173
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:161
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:161
 msgid "State Saves"
 msgstr "Állás mentések"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:108
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88
 msgid "Steering Wheel"
-msgstr ""
+msgstr "Kormánykerék"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:53
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:57
 msgid "Stick"
 msgstr "Kar"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:420
-#: 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:325
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:419
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:431
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:171
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:171
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:328
 msgid "Stop"
 msgstr "Leállítás"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96
 msgid ""
 "Store EFB copies in GPU texture objects.\n"
 "This is not so accurate, but it works well enough for most games and gives a "
@@ -4926,107 +5068,120 @@ msgstr ""
 "\n"
 "Ha bizonytalan vagy, hagyd kijelölve."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:275
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283
 msgid "Stretch to Window"
 msgstr "Ablakhoz igazítás"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:43
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:47
 msgid "Strum"
 msgstr "Strum"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:78
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:65
 msgid "Subtract"
 msgstr "Kivonás"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:77
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:67
 #, c-format
 msgid "Successfully exported file to %s"
 msgstr "Fájl sikeresen exportálva a(z) %s helyre"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:56
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:43
 msgid "Successfully imported save files"
 msgstr "Mentés fájlok sikeresen importálva"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:285
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:272
 msgid "Swing"
 msgstr "Lengetés"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:744
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:792
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320
+msgid "Synchronize GPU thread"
+msgstr "VGA szál szinkronizálása"
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321
+msgid ""
+"Synchronizes the GPU and CPU threads to help prevent random freezes in Dual "
+"Core mode. (ON = Compatible, OFF = Fast)"
+msgstr ""
+"Szinkronizálja a VGA és a processzor folyamatokat, így segít elkerülni a "
+"véletlenszerű kifagyásokat kétmagos mód esetén. (BE = Kompatibilis, KI = "
+"Gyors)"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773
 msgid "System Language:"
 msgstr "Rendszer nyelv:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:191
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:185
 msgid "TAIWAN"
 msgstr "TAJVAN"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:127
-#: Source/Core/DolphinWX/Src/TASInputDlg.h:32
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:128
+#: Source/Core/DolphinWX/Src/TASInputDlg.h:19
 msgid "TAS Input"
 msgstr "TAS bemenet"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:28
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:15
 msgid "Tab"
 msgstr "Tab"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:510
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:531
 msgid "Tab split"
 msgstr "Tab split"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:37
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:41
 msgid "Table Left"
 msgstr "Tábla balra"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:38
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:42
 msgid "Table Right"
 msgstr "Tábla jobbra"
 
-#: 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
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:361
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:181
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:181
 msgid "Take Screenshot"
 msgstr "Pillanatkép készítése"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:109
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89
 msgid "TaruKonga (Bongos)"
 msgstr "TaruKonga (Bongos)"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:472
 msgid "Test"
 msgstr "Teszt"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:444
 msgid "Texture"
 msgstr "Textúra"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:451
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:461
 msgid "Texture Cache"
 msgstr "Textúra gyorsítótár"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:519
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:532
 msgid "Texture Format Overlay"
 msgstr "Textúra formátum átfedés"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:226
+#: Source/Core/Core/Src/CoreParameter.cpp:215
 msgid "The WAD has been installed successfully"
 msgstr "A WAD sikeresen telepítve"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:197
+#: Source/Core/Core/Src/ActionReplay.cpp:185
 msgid "The address is invalid"
 msgstr "A cím érvénytelen"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:509
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:496
 msgid "The checksum was successfully fixed"
 msgstr "Az ellenőrző összeg sikeresen javítva"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1242
+#: 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:1117
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1216
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1118
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1146
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1217
 #, c-format
 msgid ""
 "The file %s already exists.\n"
@@ -5035,7 +5190,7 @@ msgstr ""
 "%s fájl már van.\n"
 "Le akarod cserélni?"
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:51
+#: Source/Core/AudioCommon/Src/WaveFile.cpp:38
 #, c-format
 msgid ""
 "The file %s could not be opened for writing. Please check if it's already "
@@ -5044,41 +5199,45 @@ msgstr ""
 "%s fájl nem nyitható meg íráshoz. Ellenőrizd, hogy nincs-e megnyitva már "
 "másik program által."
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:44
+#: Source/Core/AudioCommon/Src/WaveFile.cpp:31
 #, c-format
 msgid "The file %s was already open, the file header will not be written."
 msgstr "%s fáj már meg van nyitva, a fájl fejléce nem írható."
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:332
+#: Source/Core/Core/Src/Boot/Boot.cpp:320
 #, c-format
 msgid "The file you specified (%s) does not exist"
 msgstr "Az általad megadott (%s) fájl nem létezik"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:628
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:666
 msgid "The name can not be empty"
 msgstr "A név mező nem lehet üres"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:620
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:658
 msgid "The name can not contain the character ','"
 msgstr "A név nem tartalmazhatja a ',' karaktert"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:142
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:129
 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:93
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98
 msgid ""
 "The safer you adjust this, the less likely the emulator will be missing any "
 "texture updates from RAM.\n"
 "\n"
 "If unsure, use the rightmost value."
 msgstr ""
+"Minél biztonságosabbra állítod, annál kevésbé valószínű, hogy az emulátor "
+"RAM-ból történő textúra frissítést fog hiányolni.\n"
+"\n"
+"Ha bizonytalan vagy, használd a jobbszélső értéket."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:445
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:432
 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:388
+#: Source/Core/DolphinWX/Src/Main.cpp:416
 msgid ""
 "The selected language is not supported by your system. Falling back to "
 "system default."
@@ -5086,36 +5245,36 @@ msgstr ""
 "A választott nyelvet nem támogatja az oprációs rendszer. Visszaállás a "
 "rendszer alapértelmezettre."
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:43
+#: Source/Core/Core/Src/NetPlayClient.cpp:47
 msgid "The server and client's NetPlay versions are incompatible!"
 msgstr "A szerver és kliens NetPlay verziói nem kompatibilisek!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:40
+#: Source/Core/Core/Src/NetPlayClient.cpp:44
 msgid "The server is full!"
 msgstr "A szerver megtelt!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:46
+#: Source/Core/Core/Src/NetPlayClient.cpp:50
 msgid "The server responded: the game is currently running!"
 msgstr "A szerver válasza: a játék már fut!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:49
+#: Source/Core/Core/Src/NetPlayClient.cpp:53
 msgid "The server sent an unknown error message!"
 msgstr "A szerver ismeretlen hibaüzenetet küldött!"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:119
+#: Source/Core/Core/Src/CoreParameter.cpp:108
 #, c-format
 msgid "The specified file \"%s\" does not exist"
 msgstr "A megadott \"%s\" fájl nem létezik"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:198
+#: Source/Core/Core/Src/ActionReplay.cpp:186
 msgid "The value is invalid"
 msgstr "Az érték érvénytelen"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:642
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:623
 msgid "Theme:"
-msgstr ""
+msgstr "Kinézet:"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:476
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:463
 msgid ""
 "There must be a ticket for 00000001/00000002. Your NAND dump is probably "
 "incomplete."
@@ -5123,7 +5282,7 @@ msgstr ""
 "Kell lennie egy jegynek itt: 00000001/00000002. A NAND mentésed valószínűleg "
 "befejezetlen."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308
 msgid ""
 "These settings override core Dolphin settings.\n"
 "Undetermined means the game uses Dolphin's setting."
@@ -5131,7 +5290,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:355
+#: Source/Core/Core/Src/ActionReplay.cpp:345
 msgid ""
 "This action replay simulator does not support codes that modify Action "
 "Replay itself."
@@ -5139,11 +5298,11 @@ msgstr ""
 "Az action replay szimulátor nem támogat olyan kódokat, amelyek módosítját "
 "magát az Action Replay-t."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505
 msgid "This could cause slow down in Wii Menu and some games."
 msgstr "Ez lassulást okozhat a Wii menüben és néhány játékban."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118
 msgid ""
 "This feature allows you to change the game's camera.\n"
 "Move the mouse while holding the right mouse button to pan and while holding "
@@ -5154,8 +5313,30 @@ msgid ""
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
+"Ez a funkció lehetővé teszi a játék kamera változtatását.\n"
+"Pásztázáshoz tartsd lenyomva a jobb egér gombot és mozgasd az egeret, a "
+"mozgáshoz pedig tartsd lenyomva a középső egér gombot.\n"
+"Tartsd lenyomva a SHIFT billentyűt és a WASD billentyűk valamelyikével "
+"mozgasd a kamerát léptékenként (SHIFT+0 a gyorsabb mozgatáshoz, a SHIFT+9 "
+"pedig a lassabbhoz). Nyomd le a SHIFT+R kombinációt a kamera "
+"visszaállításához.\n"
+"\n"
+"Ha bizonytalan vagy, hagyd kijelöletlenül."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485
+#, fuzzy
+msgid ""
+"This limits the game speed to the specified number of frames per second "
+"(full speed is 60 for NTSC and 50 for PAL). Alternatively, use Audio to "
+"throttle using the DSP (might fix audio clicks but can also cause constant "
+"noise depending on the game)."
+msgstr ""
+"Ha a képkocka korlátozást magasabbra állítottad a játék teljes sebességénél "
+"(NTSC: 60, PAL: 50), akkor válaszd a Hang lehetőséget a lassításhoz a DSP "
+"használatával (javíthatja a hang kattogást, de ugyanakkor folyamatos zajt is "
+"okozhat játékfüggően).  "
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484
 msgid ""
 "This splits the Video and CPU threads, so they can be run on separate "
 "cores.\n"
@@ -5167,61 +5348,61 @@ 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:286
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:287
 msgid "This will let you Manually Edit the INI config file"
 msgstr "Ez által kézileg szerkesztheted az INI konfigurációs fájlt"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:249
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:254
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:236
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:241
 msgid "Threshold"
 msgstr "Küszöbérték"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:288
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:275
 msgid "Tilt"
 msgstr "Billentés"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:628
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:304
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:622
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:291
 msgid "Title"
 msgstr "Cím"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:125
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:144
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:112
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:131
 msgid "To"
 msgstr "eddig:"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:72
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59
 msgid "Toggle All Log Types"
 msgstr "Minden napló típus kijelölése"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:426
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:432
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:180
 msgid "Toggle Fullscreen"
 msgstr "Váltás teljes nézetre"
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:87
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:271
 msgid "Top"
 msgstr "Fent"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:281
 msgid "Traditional Chinese"
 msgstr "Hagyományos kínai"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:426
+#: Source/Core/Core/Src/Boot/Boot.cpp:414
 msgid "Tried to load an unknown file type."
 msgstr "Próbálkozás egy ismeretlen fájltípus betöltésével. "
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:80
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:67
 msgid "Triggers"
 msgstr "Kioldó gombok"
 
-#: Source/Core/Common/Src/SysConf.h:91 Source/Core/Common/Src/SysConf.h:114
+#: Source/Core/Common/Src/SysConf.h:78 Source/Core/Common/Src/SysConf.h:101
 msgid "Trying to read from invalid SYSCONF"
 msgstr "Olvasási próbálkozás az érvénytelen SYSCONF fájlból"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:44
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:31
 msgid ""
 "Trying to read from invalid SYSCONF\n"
 "Wiimote bt ids are not available"
@@ -5229,15 +5410,15 @@ 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:330
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
 msgid "Turkish"
 msgstr "Török"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:33
 msgid "Turntable"
 msgstr "Lemezjátszó"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:71
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58
 msgid "Type"
 msgstr "Típus"
 
@@ -5245,25 +5426,25 @@ msgstr "Típus"
 msgid "UDP Port:"
 msgstr "UDP port:"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:279
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:266
 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12
 msgid "UDP Wiimote"
 msgstr "UDP Wiimote"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:199
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:193
 msgid "UNKNOWN"
 msgstr "ISMERETLEN"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:756
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:755
 #, c-format
 msgid "UNKNOWN_%02X"
-msgstr ""
+msgstr "ISMERETLEN_%02X"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:178
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:172
 msgid "USA"
 msgstr "USA"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:225
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:214
 msgid ""
 "Unable to create patch from given values.\n"
 "Entry not modified."
@@ -5271,7 +5452,7 @@ msgstr ""
 "A megadott értékek alapján nem sikerült a patch létrehozása.\n"
 "Bejegyzés módosítás nem történt."
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:124
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:111
 #, c-format
 msgid ""
 "Unable to parse line %lu of the entered AR code as a valid encrypted or "
@@ -5282,76 +5463,95 @@ 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:391
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:397
 #, c-format
 msgid "Undefined %i"
 msgstr "Meghatározatlan %i"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:163
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:164
 msgid "Undo Load State"
 msgstr "Állás betöltés törlése"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:718
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:717
 msgid "Unexpected 0x80 call? Aborting..."
-msgstr ""
+msgstr "Váratlan 0x80 hivás? Megszakítás..."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:215
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:202
 msgid "Unknown"
 msgstr "Ismeretlen"
 
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:971
+#: Source/Core/Core/Src/HW/DVDInterface.cpp:965
 #, c-format
 msgid "Unknown DVD command %08x - fatal error"
 msgstr "Ismeretlen DVD parancs: %08x - végzetes hiba"
 
-#: Source/Core/Common/Src/SysConf.cpp:145
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:444
+#, c-format
+msgid "Unknown command 0x%08x"
+msgstr ""
+
+#: Source/Core/Common/Src/SysConf.cpp:132
 #, c-format
 msgid "Unknown entry type %i in SYSCONF (%s@%x)!"
 msgstr "Ismeretlen bejegyzés típus %i a SYSCONF fájlban (%s@%x)!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:228
+#: Source/Core/Core/Src/NetPlayClient.cpp:232
 #, c-format
 msgid "Unknown message received with id : %d"
 msgstr "Ismeretlen üzenet érkezett ezzel az azonosítóval : %d"
 
-#: Source/Core/Core/Src/NetPlayServer.cpp:504
+#: Source/Core/Core/Src/NetPlayServer.cpp:508
 #, c-format
 msgid "Unknown message with id:%d received from player:%d Kicking player!"
 msgstr ""
 "Ismeretlen üzenet érkezett ezzel az azonosítóval:%d ettől a játékostól:%d "
 "Játékos kirúgása!"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:274
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:56
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:261
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:43
 msgid "Up"
 msgstr "Fel"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:108
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:95
 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17
 msgid "Update"
 msgstr "Frissítés"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:320
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:307
 msgid "Upright Wiimote"
 msgstr "Előre tartott Wiimote"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:777
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758
 msgid "Use EuRGB60 Mode (PAL60)"
 msgstr "EuRGB60 mód (PAL60) használata"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:294
 msgid "Use Fullscreen"
 msgstr "Teljes nézet használata"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:575
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:563
 msgid "Use Hex"
 msgstr "Hexa használat"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:600
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580
 msgid "Use Panic Handlers"
 msgstr "Hibakezelők használata"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89
+msgid ""
+"Use a hacked upload strategy to stream vertices.\n"
+"This usually speed up, but is forbidden by OpenGL specification and may "
+"causes heavy glitches.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+"Egy hekkelt feltöltési stratégiát használ az adatfolyam tetőpontokhoz.\n"
+"Ez többnyire gyorsítás, de nem engedélyezett az OpenGL kikötések által és "
+"komoly hibákat okozhat.\n"
+"\n"
+"Ha bizonytalan vagy, hagyd kijelöletlenül."
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122
 msgid ""
 "Use multiple threads to decode textures.\n"
 "Might result in a speedup (especially on CPUs with more than two cores).\n"
@@ -5364,7 +5564,7 @@ msgstr ""
 "\n"
 "Ha bizonytalan vagy, hagyd kijelöletlenül."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126
 msgid ""
 "Usually if shader compilation fails, an error message is displayed.\n"
 "However, one may skip the popups to allow interruption free gameplay by "
@@ -5379,53 +5579,58 @@ msgstr ""
 "\n"
 "Ha bizonytalan vagy, hagyd kijelöletlenül."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:539
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:552
 msgid "Utility"
 msgstr "Kellékek"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:285
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:293
 msgid "V-Sync"
 msgstr "V-Sync"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:209
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318
+#, fuzzy
+msgid "VBeam Speed Hack"
+msgstr "MMU sebesség növelő hack"
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196
 msgid "Value"
 msgstr "Érték"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:73
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:60
 msgid "Value:"
 msgstr "Érték:"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:572
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:560
 msgid "Value: "
 msgstr "Érték:"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:51
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:38
 msgid "Verbosity"
 msgstr "Verbosity"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:377
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:381
 msgid "Video"
 msgstr "Kép"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:486
 msgid "Virtual"
 msgstr "Virtuális"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:689
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670
 msgid "Volume"
 msgstr "Hangerő"
 
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:498
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:527
+#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:488
+#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:517
 #, c-format
 msgid "WAD installation failed: error creating %s"
 msgstr "WAD telepítési hiba: hiba a(z) %s létrehozása közben"
 
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:547
+#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:537
 msgid "WAD installation failed: error creating ticket"
-msgstr ""
+msgstr "WAD telepítési hiba: hiba a cimke létrehozásakor"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84
 msgid ""
 "Wait for vertical blanks in order to reduce tearing.\n"
 "Decreases performance if emulation speed is below 100%.\n"
@@ -5437,25 +5642,25 @@ msgstr ""
 "\n"
 "Ha bizonytalan vagy, hagyd kijelöletlenül."
 
-#: Source/Core/Common/Src/MsgHandler.cpp:67
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46
+#: Source/Core/Common/Src/MsgHandler.cpp:53
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:33
 #: Source/Core/DolphinWX/Src/VideoConfigDiag.h:85
 msgid "Warning"
 msgstr "Figyelem"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:291
+#: Source/Core/Core/Src/Boot/Boot.cpp:279
 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:341
+#: Source/Core/Core/Src/Boot/Boot.cpp:329
 msgid "Warning - starting ELF in wrong console mode!"
 msgstr "Figyelem - ELF indítása nem megfelelő konzol módban!"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:221
+#: Source/Core/Core/Src/Boot/Boot.cpp:209
 msgid "Warning - starting ISO in wrong console mode!"
 msgstr "Figyelem - ISO indítása nem megfelelő konzol módban!"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:519
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:512
 #, c-format
 msgid ""
 "Warning! it is advised to backup all files in the folder:\n"
@@ -5466,7 +5671,7 @@ msgstr ""
 "%s\n"
 "Akarod folytatni?"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:585
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:578
 #, c-format
 msgid ""
 "Warning: This will overwrite any existing saves that are in the folder:\n"
@@ -5479,7 +5684,7 @@ msgstr ""
 "és azonos néven fog szerepelni a memóriakártyán lévőkkel\n"
 "Folytatod?"
 
-#: Source/Core/Core/Src/Movie.cpp:844
+#: Source/Core/Core/Src/Movie.cpp:835
 #, c-format
 msgid ""
 "Warning: You loaded a save that's after the end of the current movie. (byte "
@@ -5491,7 +5696,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:861
+#: Source/Core/Core/Src/Movie.cpp:852
 #, c-format
 msgid ""
 "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You "
@@ -5503,7 +5708,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:870
+#: Source/Core/Core/Src/Movie.cpp:861
 #, c-format
 msgid ""
 "Warning: You loaded a save whose movie mismatches on frame %d. You should "
@@ -5537,49 +5742,49 @@ msgstr ""
 "Start=%d, A=%d, B=%d, X=%d, Y=%d, Z=%d, DUp=%d, DDown=%d, DLeft=%d, DRight="
 "%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d"
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:106
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:129
+#: Source/Core/AudioCommon/Src/WaveFile.cpp:93
+#: Source/Core/AudioCommon/Src/WaveFile.cpp:116
 msgid "WaveFileWriter - file not open."
 msgstr "WaveFileWriter - fájl nincs megnyitva."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:56
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:60
 msgid "Whammy"
 msgstr "Whammy"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:404
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:408
 msgid "Widescreen Hack"
 msgstr "Szélesvásznú hack"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:312
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:299
 msgid "Width"
 msgstr "Szélesség"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535
 msgid "Wii"
 msgstr "Wii"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:372
 msgid "Wii Console"
 msgstr "Wii konzol"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:844
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:825
 msgid "Wii NAND Root:"
 msgstr "Wii NAND gyökér könyvtár:"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:191
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:194
 msgid "Wii Save Import"
 msgstr "Wii mentés importálása"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1243
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1270
 msgid "Wii save files (*.bin)|*.bin"
 msgstr "Wii mentés fájlok (*.bin)|*.bin"
 
-#: Source/Core/DiscIO/Src/WiiWad.cpp:82
+#: Source/Core/DiscIO/Src/WiiWad.cpp:69
 msgid "WiiWAD: Could not read from file"
 msgstr "WiiWAD: Fájlból olvasás nem sikerült"
 
-#: Source/Core/Core/Src/HW/Wiimote.cpp:17
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
+#: Source/Core/Core/Src/HW/Wiimote.cpp:20
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
 msgid "Wiimote"
 msgstr "Wiimote"
 
@@ -5588,7 +5793,7 @@ msgstr "Wiimote"
 msgid "Wiimote %i"
 msgstr "Wiimote %i"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:628
+#: Source/Core/DolphinWX/Src/Main.cpp:656
 msgid "Wiimote Connected"
 msgstr "Wiimote csatlakoztatva"
 
@@ -5596,7 +5801,7 @@ msgstr "Wiimote csatlakoztatva"
 msgid "Wiimote Motor"
 msgstr "Wiimote motor"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
 msgid "Wiimote settings"
 msgstr "Wiimote beállítások"
 
@@ -5604,103 +5809,129 @@ msgstr "Wiimote beállítások"
 msgid "Wiimotes"
 msgstr "Wiimote"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:134
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:121
 msgid "Windows Left"
 msgstr "Bal Windows"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:136
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:123
 msgid "Windows Menu"
 msgstr "Windows menü"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:135
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:122
 msgid "Windows Right"
 msgstr "Jobb Windows"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:131
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:124
 msgid "Word Wrap"
 msgstr "Word Wrap"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1298
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:864
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1089
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1225
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1325
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:880
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1090
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1226
 msgid "Working..."
 msgstr "Folyamatban..."
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:338
+msgid "Write memcards (GC)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46
 msgid "Write to Console"
 msgstr "Írás a konzolba"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:67
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:54
 msgid "Write to Debugger"
-msgstr ""
+msgstr "Írás a hibakeresőbe"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:57
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44
 msgid "Write to File"
 msgstr "Írás fájlba"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:61
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48
 msgid "Write to Window"
 msgstr "Írás az ablakba"
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:60
+#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:47
 #, c-format
 msgid "XAudio2 CreateSourceVoice failed: %#X"
 msgstr "XAudio2 CreateSourceVoice hiba: %#X"
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:114
+#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:101
 #, c-format
 msgid "XAudio2 init failed: %#X"
 msgstr "XAudio2 iniciálási hiba: %#X"
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:124
+#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:111
 #, c-format
 msgid "XAudio2 master voice creation failed: %#X"
 msgstr "XAudio2 fő hang létrehozási hiba: %#X"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:766
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:765
 msgid "XF reg"
-msgstr ""
+msgstr "XF reg"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:21
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Yellow"
 msgstr "Sárga"
 
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:107
+#: Source/Core/Core/Src/DSP/DSPCore.cpp:120
 msgid ""
-"You are using free dsp roms made by Dolphin Team.\n"
-"Only Zelda ucode games will work correctly with them.\n"
+"You are using a free DSP ROM made by the Dolphin Team.\n"
+"All Wii games will work correctly, and most GC games should also work fine, "
+"but the GBA/IPL/CARD UCodes will not work.\n"
 msgstr ""
-"A Dolphin Team által készített szabadon használható dsp romokat használsz.\n"
-"Csak a Zelda ucode játékok működnek megfelelően a használatával.\n"
+"Egy szabadon használható, a Dolphin csapat által készített DSP ROM amit "
+"használsz.\n"
+"Minden Wii játék hibátlanul fog működni, a legtöbb GC játéknak is "
+"megfelelően kell működnie, azonban a GBA/IPL/CARD UCodes nem fog működni.\n"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:73
+#: Source/Core/Core/Src/DSP/DSPCore.cpp:116
+msgid ""
+"You are using an old free DSP ROM made by the Dolphin Team.\n"
+"Only games using the Zelda UCode will work correctly.\n"
+msgstr ""
+"Egy régebbi szabadon használható, a Dolphin csapat által készített DSP ROM "
+"amit használsz.\n"
+"Csak a Zelda UCode-ot alkalmazó játékok fognak megfelelően működni.\n"
+
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:63
 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:207
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:210
 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:593
 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:438
 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:603
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:591
 msgid "You must enter a valid profile name."
 msgstr "Meg kell adnod egy érvényes profil nevet."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:936
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:917
 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."
 
-#: Source/Core/Core/Src/CoreParameter.cpp:175
+#: Source/Core/Core/Src/DSP/DSPCore.cpp:109
+msgid ""
+"Your DSP ROMs have incorrect hashes.\n"
+"Would you like to stop now to fix the problem?\n"
+"If you select \"No\", audio might be garbled."
+msgstr ""
+"A DSP ROM-ok hash értéke nem megfelelő.\n"
+"Le kívánod állítani a probléma javítást most?\n"
+"Ha a választásod \"Nem\", akkor a hang torz lehet."
+
+#: Source/Core/Core/Src/CoreParameter.cpp:164
 msgid ""
 "Your GCM/ISO file seems to be invalid (invalid country).\n"
 "Continue with PAL region?"
@@ -5708,7 +5939,7 @@ msgstr ""
 "A GCM/ISO érvénytelennek tűnik (érvénytelen ország).\n"
 "Folytatod a PAL régióval?"
 
-#: Source/Core/Common/Src/SysConf.cpp:58
+#: Source/Core/Common/Src/SysConf.cpp:45
 #, c-format
 msgid ""
 "Your SYSCONF file is the wrong size.\n"
@@ -5719,25 +5950,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:331
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:334
 msgid "ZTP hack"
 msgstr "ZTP hack"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:387
+#: Source/Core/Core/Src/ActionReplay.cpp:377
 msgid "Zero 3 code not supported"
 msgstr "Zero 3 kód nem támogatott"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:408
+#: Source/Core/Core/Src/ActionReplay.cpp:398
 #, 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:436
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:460
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:423
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:447
 msgid "[ waiting ]"
 msgstr "[ várakozás ]"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107
 msgid ""
 "[BROKEN]\n"
 "Highlight regions the EFB was copied from.\n"
@@ -5749,11 +5980,11 @@ msgstr ""
 "\n"
 "Ha bizonytalan vagy, hagyd kijelöletlenül."
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:91
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:78
 msgid "[Custom]"
 msgstr "[Egyedi]"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120
 msgid ""
 "[EXPERIMENTAL]\n"
 "Aims to speed up emulation by offloading texture decoding to the GPU using "
@@ -5772,7 +6003,7 @@ msgstr ""
 "\n"
 "Ha bizonytalan vagy, hagyd kijelöletlenül."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121
 msgid ""
 "[EXPERIMENTAL]\n"
 "Speeds up emulation a bit by caching display lists.\n"
@@ -5786,98 +6017,47 @@ msgstr ""
 "\n"
 "Ha bizonytalan vagy, hagyd kijelöletlenül."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:508
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:495
 msgid "^ ADD"
 msgstr "^ HOZZÁADÁS"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:820
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:801
 msgid "apploader (.img)"
 msgstr "betöltő program (.img)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:185
-msgid "failed to read bk header"
-msgstr "a bk fejléc olvasása sikertelen"
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:375
-#, c-format
-msgid "failed to read data from file: %s"
-msgstr "adatok olvasása a következő fájlból sikertelen: %s"
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:97
-msgid "failed to read header"
-msgstr "a fejléc olvasása sikertelen"
-
-#: Source/Core/Core/Src/PowerPC/JitInterface.cpp:285
+#: Source/Core/Core/Src/PowerPC/JitInterface.cpp:272
 #, c-format
 msgid "iCacheJIT: Reading Opcode from %x. Please report."
 msgstr "iCacheJIT: Opcode olvasása innen %x. Kérlek jelentsd."
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:108
-#, c-format
-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:935
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:936
 msgid "s"
 msgstr "s"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:457
-#, c-format
-msgid "unknown cmd 0x%08x"
-msgstr "ismeretlen parancs 0x%08x"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1110
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1136
 msgid "wxExecute returned -1 on application run!"
 msgstr "wxExecute visszatért -1 alkalmazás fut!"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:56
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:43
 msgid "zFar Correction: "
 msgstr "zFar javítás:"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:51
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:38
 msgid "zNear Correction: "
 msgstr "zNear javítás: "
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:493
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:480
 msgid "| OR"
 msgstr "| VAGY"
 
-#~ msgid "%i connected"
-#~ msgstr "%i csatlakoztatva"
-
-#~ msgid "Alternate Wiimote Timing"
-#~ msgstr "Változtatható Wiimote időzítés"
-
-#~ msgid "Interpreter (VERY slow)"
-#~ msgstr "Interpreter (NAGYON lassú)"
-
-#~ msgid "JIT Recompiler (recommended)"
-#~ msgstr "JIT Recompiler (ajánlott)"
-
-#~ msgid "JITIL experimental recompiler"
-#~ msgstr "JITIL Recompiler (kísérleti)"
+#~ msgid "Accurate VBeam emulation"
+#~ msgstr "Pontos VBeam emuláció"
 
 #~ msgid ""
-#~ "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. "
-#~ "No effect on emulated wiimotes."
+#~ "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)"
 #~ 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."
+#~ "Ha az FPS értéke szabálytalan, akkor ez a beállítás segíthet. (BE = "
+#~ "kompatibilis, KI = gyors)"
 
-#~ msgid "Pair Up"
-#~ msgstr "Társítás"
-
-#~ msgid "Reconnect Wiimote Confirm"
-#~ msgstr "Wiimote újracsatlakoztatás megerősítés"
-
-#~ msgid ""
-#~ "Wiimote %i has been disconnected by system.\n"
-#~ "Maybe this game doesn't support multi-wiimote,\n"
-#~ "or maybe it is due to idle time out or other reason.\n"
-#~ "Do you want to reconnect immediately?"
-#~ msgstr ""
-#~ "Wiimote %i irányítót kikapcsolta a rendszer.\n"
-#~ "Talán ez a játék nem támogat több Wiimote irányítót,\n"
-#~ "esetleg az üresjárati időkorlát letelt vagy egyéb ok miatt történt.\n"
-#~ "Újra akarod csatlakoztatni most?"
+#~ msgid "Skip Dest. Alpha Pass"
+#~ msgstr "Dest. Alpha Pass kihagyása"
diff --git a/Languages/po/it.po b/Languages/po/it.po
index 2484d57920..047513aca1 100644
--- a/Languages/po/it.po
+++ b/Languages/po/it.po
@@ -3,135 +3,142 @@
 # This file is distributed under the same license as the dolphin-emu package.
 #
 # Translators:
-# RebuMan, 2011.
+# Mewster <mewster@libero.it>, 2013
+# RebuMan, 2011
 msgid ""
 msgstr ""
 "Project-Id-Version: Dolphin Emulator\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-10 08:56-0500\n"
-"PO-Revision-Date: 2013-02-02 08:31+0000\n"
-"Last-Translator: delroth <delroth@gmail.com>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"POT-Creation-Date: 2013-04-18 23:00-0500\n"
+"PO-Revision-Date: 2013-04-16 08:31+0000\n"
+"Last-Translator: Mewster <mewster@libero.it>\n"
+"Language-Team: Italian (http://www.transifex.com/projects/p/dolphin-emu/"
+"language/it/)\n"
 "Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:511
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:499
 msgid " (too many to display)"
 msgstr " (troppi per la visualizzazione)"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:270
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:273
 #: Source/Core/DolphinWX/Src/NetWindow.cpp:491
 #: Source/Core/DolphinWX/Src/NetWindow.cpp:530
 msgid " Game : "
 msgstr " Gioco : "
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:507
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494
 msgid "! NOT"
 msgstr "! NOT"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:70
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:58
 #, c-format
 msgid ""
 "\"%s\" does not exist.\n"
 " Create a new 16MB Memcard?"
 msgstr ""
 "\"%s\" non esiste.\n"
-" Creare una nuova Memcard da 16MB?"
+" Creare una nuova Memory Card da 16MB?"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:142
+#: Source/Core/Core/Src/CoreParameter.cpp:131
 #, c-format
 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."
+msgstr "\"%s\" è un file GCM/ISO non valido, oppure non è un ISO GC/Wii."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:722
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:721
 #, c-format
 msgid "%08X:  "
-msgstr ""
+msgstr "%08X:  "
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:196
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:183
 #, c-format
 msgid "%1$sCopy%1$s"
 msgstr "%1$sCopia%1$s"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:128
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:296
+#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:113
+#, c-format
+msgid "%d samples"
+msgstr "%d stadi"
+
+#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:112
+#, c-format
+msgid "%d samples (quality level %d)"
+msgstr "%d stadi (livello di qualità %d)"
+
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:121
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:289
 #, c-format
 msgid "%s already exists, overwrite?"
 msgstr "%s esiste già, vuoi sovrascrivere?"
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:167
+#: Source/Core/DiscIO/Src/CompressedBlob.cpp:154
 #, c-format
 msgid "%s failed to be scrubbed. Probably the image is corrupt."
 msgstr ""
-"Fallito il tentativio di ripulire %s. E' possibile che l'immagine sia "
-"corrotta."
+"Fallito il tentativo di ripulire %s. È possibile che l'immagine sia corrotta."
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:95
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:83
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
 " Card file size is invalid (0x%x bytes)"
 msgstr ""
+"Fallito il tentativo di caricare %s come memory card\n"
+"La dimensione del file non è valida (0x%x bytes)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:110
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:98
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
 " Card size is invalid (0x%x bytes)"
 msgstr ""
+"Fallito il tentativo di caricare %s come memory card\n"
+"La dimensione della card non è valida (0x%x bytes)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:90
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:78
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
 "file is not large enough to be a valid memory card file (0x%x bytes)"
 msgstr ""
+"Fallito il tentativo di caricare %s come memory card\n"
+"Il file non è abbastanza largo per essere un valido file memory card (0x%x "
+"bytes)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:367
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:359
 #, c-format
 msgid "%s failed to open"
 msgstr "Fallito il tentativo di aprire %s"
 
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:97
-#, c-format
-msgid ""
-"%s has an incorrect hash.\n"
-"Would you like to stop now to fix the problem?\n"
-"If you select \"No\", audio will be garbled."
-msgstr ""
-"%s possiede un hash non corretto.\n"
-"Vorresti interrompere adesso per tentare di risolvere il problema?\n"
-"Se si seleziona \"No\", l'audio potrebbe risultare confuso e incomprensibile."
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:360
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:352
 #, c-format
 msgid "%s is a 0 byte file"
 msgstr "Il file %s possiede una dimensione di 0 bytes"
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:159
+#: Source/Core/DiscIO/Src/CompressedBlob.cpp:146
 #, c-format
 msgid "%s is already compressed! Cannot compress it further."
 msgstr "%s è già compresso! Impossibile comprimere ulteriormente."
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:345
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:337
 #, c-format
 msgid "%s is too long for the filename, max chars is 45"
 msgstr "%s è un nome troppo lungo per il file; massimo 45 caratteri"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:202
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:189
 #, c-format
 msgid "%sDelete%s"
 msgstr "%sElimina%s"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:200
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:187
 #, c-format
 msgid "%sExport GCI%s"
 msgstr "%sEsporta GCI%s"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:198
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:185
 #, c-format
 msgid "%sImport GCI%s"
 msgstr "%sImporta GCI%s"
@@ -141,222 +148,246 @@ msgstr "%sImporta GCI%s"
 msgid "%u Free Blocks; %u Free Dir Entries"
 msgstr "%u Blocchi Liberi; %u Voci Directory Libere"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:506
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:493
 msgid "&& AND"
 msgstr "&& AND"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:295
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:301
 msgid "&About..."
 msgstr "&A proposito di..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:99
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:100
 msgid "&Boot from DVD Drive..."
-msgstr "&Avvia da Unità DVD..."
+msgstr "Avvia da &Unità DVD..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:231
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:234
 msgid "&Breakpoints"
 msgstr "&Punti di interruzione"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:110
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:111
 msgid "&Browse for ISOs..."
-msgstr "&Cerca ISO..."
+msgstr "&Sfoglia ISO..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:192
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:195
 msgid "&Cheats Manager"
 msgstr "Gestore &Trucchi"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:177
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:180
 msgid "&DSP Settings"
-msgstr "&Impostazioni DSP"
+msgstr "Impostazioni &DSP"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:885
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:876
 msgid "&Delete ISO..."
 msgstr "&Elimina ISO..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:903
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:897
 msgid "&Delete selected ISOs..."
 msgstr "&Elimina ISO selezionate..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:170
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:173
 msgid "&Emulation"
 msgstr "&Emulazione"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:113
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:114
 msgid "&File"
 msgstr "&File"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:335
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:341
 msgid "&Frame Advance"
 msgstr "&Fotogramma per Fotogramma"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:352
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:358
 msgid "&Fullscreen"
 msgstr "&Schermo Intero"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:176
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:179
 msgid "&Graphics Settings"
 msgstr "Impostazioni &Video"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:296
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:302
 msgid "&Help"
 msgstr "&Aiuto"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:180
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:183
 msgid "&Hotkey Settings"
 msgstr "Impostazioni &Tasti di Scelta Rapida"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:233
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:236
 msgid "&JIT"
 msgstr "&JIT"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:148
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:149
 msgid "&Load State"
 msgstr "&Carica Stato di Gioco"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:190
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:193
 msgid "&Memcard Manager (GC)"
-msgstr "&Gestore Memcard (GC)"
+msgstr "Gestore &Memory Card (GC)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:232
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:235
 msgid "&Memory"
 msgstr "&Memoria"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:313
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:319
 msgid "&Open..."
 msgstr "&Apri..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:186
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:189
 msgid "&Options"
 msgstr "&Opzioni"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:324
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:330
 msgid "&Pause"
 msgstr "&Pausa"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:326
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:332
 msgid "&Play"
 msgstr "&Gioca"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:867
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:858
 msgid "&Properties"
 msgstr "&Proprietà"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:348
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:354
 msgid "&Read-only mode"
 msgstr "Modalità in &Sola-lettura"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:319
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:325
 msgid "&Refresh List"
 msgstr "&Aggiorna Elenco"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:230
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:233
 msgid "&Registers"
 msgstr "&Registri"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:332
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:338
 msgid "&Reset"
 msgstr "&Resetta"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:234
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:237
 msgid "&Sound"
 msgstr "&Suono"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:329
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:335
 msgid "&Stop"
 msgstr "&Arresta"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:207
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:210
 msgid "&Tools"
 msgstr "&Strumenti"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:235
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:238
 msgid "&Video"
 msgstr "&Video"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:284
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:287
 msgid "&View"
 msgstr "&Visualizza"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:179
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:182
 msgid "&Wiimote Settings"
 msgstr "Impostazioni &Wiimote"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:868
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:859
 msgid "&Wiki"
 msgstr "&Wiki"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504
 msgid "'"
-msgstr ""
+msgstr "'"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:59
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:46
 msgid "(-)+zFar"
 msgstr "(-)+zFar"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:54
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:41
 msgid "(-)+zNear"
 msgstr "(-)+zNear"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:99
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:86
 msgid "(UNKNOWN)"
 msgstr "(SCONOSCIUTO)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:376
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:384
 msgid "(off)"
 msgstr "(nessuno)"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:655
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:654
 msgid "0x44"
-msgstr ""
+msgstr "0x44"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+msgid "1.5x Native (960x792)"
+msgstr "1.5x Nativo (960x792)"
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:158
 msgid "16 bit"
 msgstr "16 bit"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+msgid "1x Native (640x528)"
+msgstr "1x Nativo (640x528)"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+msgid "2.5x Native (1600x1320)"
+msgstr "2.5x Nativo (1600x1320)"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+msgid "2x Native (1280x1056)"
+msgstr "2x Nativo (1280x1056)"
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:159
 msgid "32 bit"
 msgstr "32 bit"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:412
 msgid "3D Vision"
-msgstr ""
+msgstr "3D Vision"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+msgid "3x Native (1920x1584)"
+msgstr "3x Nativo (1920x1584)"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+msgid "4x Native (2560x2112)"
+msgstr "4x Nativo (2560x2112)"
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:157
 msgid "8 bit"
 msgstr "8 bit"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:43
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:30
 msgid "<Insert name here>"
-msgstr "<Inserisci qui il nome>"
+msgstr "<Inserisci il nome>"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:255
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:262
 msgid "<No resolutions found>"
-msgstr "<Risoluzione non trovata>"
+msgstr "<Nessuna risoluzione trovata>"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:104
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84
 msgid "<Nothing>"
-msgstr "<Nessuno>"
+msgstr "<Nulla>"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:162
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:162
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:150
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:150
 msgid "<Press Key>"
 msgstr "<Premi Tasto>"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286
 msgid "<System>"
 msgstr "<Sistema>"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695
 msgid "A"
 msgstr "A"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:201
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:235
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:204
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:238
 msgid "A NetPlay window is already open!!"
-msgstr "Una finestra di Gioco-Online risulta già aperta!!"
+msgstr "Una finestra di NetPlay risulta già aperta!!"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:365
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:399
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:353
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:387
 msgid "A game is not currently running."
 msgstr "Al momento non c'è alcun gioco in esecuzione."
 
@@ -365,32 +396,34 @@ msgid ""
 "A supported bluetooth device could not be found.\n"
 "You must manually connect your wiimotes."
 msgstr ""
+"Non è stato trovato un dispositivo bluetooth supportato.\n"
+"Devi connettere manualmente i tuoi wiimote."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:109
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:100
+#, fuzzy
 msgid ""
 "ALERT:\n"
 "\n"
-"NetPlay will currently only work properly when using the following "
-"settings:\n"
-" - Dual Core [OFF]\n"
-" - Audio Throttle [OFF]\n"
-" - DSP-HLE with \"Null Audio\" or DSP-LLE\n"
-" - Manually set the exact number of controllers that will be used to "
-"[Standard Controller]\n"
+"Netplay will only work with the following settings:\n"
+" - Enable Dual Core [OFF]\n"
+" - DSP Emulator Engine Must be the same on all computers!\n"
+" - DSP on Dedicated Thread [OFF]\n"
+" - Framelimit NOT set to [Audio]\n"
+" - Manually set the exact number of controllers to be used to [Standard "
+"Controller]\n"
 "\n"
-"All players should try to use the same Dolphin version and settings.\n"
-"Disable all memory cards or send them to all players before starting.\n"
-"Wiimote support has not been implemented.\n"
+"All players should use the same Dolphin version and settings.\n"
+"All memory cards must be identical between players or disabled.\n"
+"Wiimote support has not been implemented!\n"
 "\n"
-"You must forward TCP port to host!!"
+"The host must have the chosen TCP port open/forwarded!\n"
 msgstr ""
 "ATTENZIONE:\n"
 "\n"
-"La modalità di Gioco-Online funzionerà correttamente solo quando verranno "
-"utilizzate le seguenti impostazioni:\n"
-" - Dual Core [SPENTO]\n"
-" - Autoregolazione Audio [SPENTO]\n"
-" - DSP-HLE con l'opzione \"Nessun Audio\" oppure in DSP-LLE\n"
+"La modalità NetPlay funzionerà correttamente solo quando verranno utilizzate "
+"le seguenti impostazioni:\n"
+" - Dual Core [OFF]\n"
+" - DSP-HLE impostato su \"Null Audio\" oppure DSP-LLE\n"
 " - Impostare manualmente il numero esatto dei controller che verranno "
 "utilizzati come [Controller Standard]\n"
 "\n"
@@ -402,17 +435,17 @@ msgstr ""
 "\n"
 "E' necessario inoltrare la porta TCP all'host!!"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:111
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:116
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96
 msgid "AM-Baseboard"
-msgstr "Scheda basata su AM"
+msgstr "Baseboard AM"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:299
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:115
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:300
 msgid "AR Codes"
 msgstr "Codici AR"
 
-#: Source/Core/DolphinWX/Src/AboutDolphin.h:33
+#: Source/Core/DolphinWX/Src/AboutDolphin.h:21
 msgid "About Dolphin"
 msgstr "A proposito di Dolphin"
 
@@ -420,15 +453,11 @@ msgstr "A proposito di Dolphin"
 msgid "Acceleration"
 msgstr "Accellerazione"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:463
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473
 msgid "Accuracy:"
-msgstr ""
+msgstr "Precisione:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317
-msgid "Accurate VBeam emulation"
-msgstr "Emulazione VBeam accurata"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97
 msgid ""
 "Accurately emulate EFB copies.\n"
 "Some games depend on this for certain graphical effects or gameplay "
@@ -436,13 +465,18 @@ msgid ""
 "\n"
 "If unsure, check EFB to Texture instead."
 msgstr ""
+"Emula accuratamente le copie dell'EFB.\n"
+"Alcuni giochi dipendono da questa opzione per particolari effetti grafici o "
+"funzionalità di gameplay.\n"
+"\n"
+"Nel dubbio, lascia EFB su Texture."
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:239
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:239
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:227
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:227
 msgid "Action"
 msgstr "Azione"
 
-#: Source/Core/Core/Src/ARDecrypt.cpp:481
+#: Source/Core/Core/Src/ARDecrypt.cpp:469
 #, c-format
 msgid ""
 "Action Replay Code Decryption Error:\n"
@@ -457,112 +491,114 @@ msgstr ""
 "Codice Incriminato:\n"
 "%s"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:667
+#: Source/Core/Core/Src/ActionReplay.cpp:657
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)"
 msgstr ""
 "Errore Action Replay: Dimensioni non valide (%08x : indirizzo = %08x) in "
-"operazioni di Aggiunta Codice (%s)"
+"Aggiungi Codice (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:755
+#: Source/Core/Core/Src/ActionReplay.cpp:745
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide "
 "(%s)"
 msgstr ""
-"Errore Action Replay: Dimensioni non valide (%08x : indirizzo = %08x) in "
-"operazioni di Riempimento e Scorrimento (%s)"
+"Errore Action Replay: Dimensioni non valide (%08x : indirizzo = %08x) nelle "
+"istruzioni Fill e Slide (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:547
+#: Source/Core/Core/Src/ActionReplay.cpp:537
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And "
 "Fill (%s)"
 msgstr ""
-"Errore Action Replay: Dimensioni non valide (%08x : indirizzo = %08x) in "
-"operazioni di Scrittura Ram e Riempimento (%s)"
+"Errore Action Replay: Dimensioni non valide (%08x : indirizzo = %08x) nelle "
+"istruzioni Ram Write e Fill (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:607
+#: Source/Core/Core/Src/ActionReplay.cpp:597
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Write To "
 "Pointer (%s)"
 msgstr ""
-"Errore Action Replay: Dimensioni non valide (%08x : indirizzo = %08x) in "
-"operazioni di Scrittura Al Puntatore (%s)"
+"Errore Action Replay: Dimensioni non valide (%08x : indirizzo = %08x) "
+"nell'istruzione Write To Pointer (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:802
+#: Source/Core/Core/Src/ActionReplay.cpp:792
 #, 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)"
+"Errore Action Replay: Valore non valido (%08x) nell'istruzione Memory Copy "
+"(%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:682
+#: Source/Core/Core/Src/ActionReplay.cpp:672
 #, c-format
 msgid ""
 "Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)\n"
 "Master codes are not needed. Do not use master codes."
 msgstr ""
+"Errore Action Replay: Master Code e Write To CCXXXXXX non implementati (%s)\n"
+"I Master Code non sono necessari. Non usarli."
 
-#: Source/Core/Core/Src/ActionReplay.cpp:196
+#: Source/Core/Core/Src/ActionReplay.cpp:184
 #, c-format
 msgid "Action Replay Error: invalid AR code line: %s"
-msgstr "Errore Action Replay: linea codice AR non valida: %s"
+msgstr "Errore Action Replay: codice AR non valido in riga: %s"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:872
+#: Source/Core/Core/Src/ActionReplay.cpp:862
 #, c-format
 msgid "Action Replay: Conditional Code: Invalid Size %08x (%s)"
-msgstr "Action Replay - Codice Condizionale: Dimensioni non Valide %08x (%s)"
+msgstr "Action Replay: Conditional Code: Dimensioni non valide %08x (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:945
+#: Source/Core/Core/Src/ActionReplay.cpp:935
 #, c-format
 msgid "Action Replay: Invalid Normal Code Type %08x (%s)"
-msgstr "Action Replay: Tipo Codice Regolare %08x (%s) non valido"
+msgstr "Action Replay: Normal Code Type %08x (%s) non valido"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:896
+#: Source/Core/Core/Src/ActionReplay.cpp:886
 #, c-format
 msgid "Action Replay: Normal Code %i: Invalid subtype %08x (%s)"
-msgstr "Action Replay - Codice Regolare %i: Sottotipo %08x (%s) non valido"
+msgstr "Action Replay: Normal Code %i: Sottotipo %08x (%s) non valido"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:838
+#: Source/Core/Core/Src/ActionReplay.cpp:828
 #, c-format
 msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)"
-msgstr "Action Replay - Codice Regolare 0: Sottotipo %08x (%s) non valido"
+msgstr "Action Replay: Normal Code 0: Sottotipo %08x (%s) non valido"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:242
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:247
 msgid "Adapter:"
 msgstr "Adattatore:"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:76
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:63
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:63
 msgid "Add"
 msgstr "Aggiungi"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1275
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1301
 msgid "Add ActionReplay Code"
-msgstr "Aggiungi codice ActionReplay"
+msgstr "Aggiungi Codice ActionReplay"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1204
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1230
 msgid "Add Patch"
 msgstr "Aggiungi Patch"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:507
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:528
 msgid "Add new pane"
 msgstr "Aggiungi nuovo riquadro"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:404
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:426
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:811
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:408
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:430
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:792
 msgid "Add..."
 msgstr "Aggiungi..."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:90
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:81
 msgid "Address :"
 msgstr "Indirizzo:"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:58
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:45
 msgid ""
 "Adds the specified value to zFar Parameter.\n"
 "Two ways to express the floating point values.\n"
@@ -581,7 +617,7 @@ msgstr ""
 "\n"
 "NOTA: Controlla la Finestra di Log o la Console per i valori acquisiti."
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:53
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:40
 msgid ""
 "Adds the specified value to zNear Parameter.\n"
 "Two ways to express the floating point values.\n"
@@ -600,103 +636,109 @@ msgstr ""
 "\n"
 "NOTA: Controlla la Finestra di Log o la Console per i valori acquisiti."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:755
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:744
 msgid "Adjust the analog control pressure required to activate buttons."
 msgstr ""
-"Regolare la pressione del comando analogico necessaria per attivare i "
+"Imposta la pressione del comando analogico necessaria per attivare i "
 "pulsanti."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:509
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:522
 msgid "Advanced"
 msgstr "Avanzate"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561
 msgid "Advanced Settings"
 msgstr "Impostazioni Avanzate"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:584
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:587
 msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)"
-msgstr ""
+msgstr "Tutti i file GC/Wii (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:816
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:797
 msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)"
-msgstr ""
+msgstr "Tutti i file immagine GC/Wii (gcm, iso, wbfs, ciso, gcz)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1189
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1190
 msgid "All Gamecube GCM files (gcm)"
-msgstr "Tutti i file GCM GameCube (gcm)"
+msgstr "Tutti i file Gamecube GCM (gcm)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1390
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1404
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1417
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1431
 msgid "All Save States (sav, s##)"
-msgstr "Tutti gli Stati di Gioco Salvati (sav, s##)"
+msgstr "Tutti i Salvataggi di Stati di Gioco (sav, s##)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1187
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1188
 msgid "All Wii ISO files (iso)"
 msgstr "Tutti i file ISO Wii (iso)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1207
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1208
 msgid "All compressed GC/Wii ISO files (gcz)"
-msgstr "Tutti i file compressi GC/Wii (gcz)"
+msgstr "Tutti i file GC/Wii ISO compressi (gcz)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:124
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:104
 msgid "All files (*.*)|*.*"
 msgstr "Tutti i file (*.*)|*.*"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123
 msgid ""
 "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 ""
+"Permettere l'attivazione di alcune impostazioni internamente alla finestra "
+"d'emulazione tramite i tasti rapidi 3 (Risoluzione Interna), 4 (Rapporto "
+"d'Aspetto), 5 (Copia EFB) e 6 (Nebbia).\n"
+"\n"
+"Nel dubbio, lascia deselezionato."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:285
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:272
 msgid "Analyze"
-msgstr ""
+msgstr "Analizza"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:298
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:285
 msgid "Angle"
-msgstr ""
+msgstr "Angolo"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:367
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:375
 msgid "Anisotropic Filtering:"
-msgstr "Filtro Anisotropico:"
+msgstr "Filtraggio Anisotropico:"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:350
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:358
 msgid "Anti-Aliasing:"
 msgstr "Anti-Aliasing:"
 
-#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:308
+#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:299
 msgid "Apploader is the wrong size...is it really an apploader?"
-msgstr ""
-"L'Apploader possiede una dimensione errata... è davvero un programma di "
-"caricamento?"
+msgstr "L'apploader possiede dimensioni errate... è davvero un apploader?"
 
-#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:302
+#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:293
 msgid "Apploader unable to load from file"
-msgstr "Impossibile caricare l'Apploader dal file"
+msgstr "L'Apploader non riesce a caricare dal file"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:841
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:822
 msgid "Apploader:"
-msgstr "Programma di Caricamento (Apploader):"
+msgstr "Apploader:"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:135
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:122
 msgid "Apply"
 msgstr "Applica"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124
 msgid ""
 "Apply a post-processing effect after finishing a frame.\n"
 "\n"
 "If unsure, select (off)."
 msgstr ""
+"Applica un effetto di post-processing dopo aver disegnato un frame.\n"
+"\n"
+"Nel dubbio, seleziona (nessuno)."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287
 msgid "Arabic"
 msgstr "Arabo"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:614
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:603
 #, c-format
 msgid "Are you sure you want to delete \"%s\"?"
 msgstr "Sei sicuro di voler eliminare \"%s\"?"
@@ -714,207 +756,216 @@ 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:789
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:277
-msgid "Aspect Ratio:"
-msgstr "Aspetto:"
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:44
+msgid "Arm JIT (experimental)"
+msgstr "Arm JIT (sperimentale)"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:70
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:285
+msgid "Aspect Ratio:"
+msgstr "Rapporto d'Aspetto:"
+
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:58
 msgid "At least one pane must remain open."
 msgstr "Almeno un riquadro deve rimanere aperto."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:553
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533
 msgid "Audio"
 msgstr "Audio"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:694
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675
 msgid "Audio Backend:"
-msgstr "Interfaccia Audio:"
+msgstr "Motore Audio:"
 
-#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:41
+#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:28
 msgid "AudioCommon: Error opening AO device.\n"
-msgstr "Audiocommon: Errore nell'apertura della periferica AO.\n"
+msgstr "AudioCommon: Errore nell'apertura della periferica AO.\n"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:275
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283
 msgid "Auto"
 msgstr "Auto"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:337
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345
 msgid "Auto (Multiple of 640x528)"
-msgstr ""
+msgstr "Auto (Multiplo di 640x528)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:337
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345
 msgid "Auto (Window Size)"
-msgstr ""
+msgstr "Auto (Dimensione Finestra)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:297
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305
 msgid "Auto adjust Window Size"
-msgstr ""
+msgstr "Autoridimensiona la Finestra"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77
 msgid ""
 "Automatically adjusts the window size to your internal resolution.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
+"Ridimensiona automaticamente la dimensione della finestra alla risoluzione "
+"interna.\n"
+"\n"
+"Nel dubbio, lascia deselezionato."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:697
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696
 msgid "B"
-msgstr ""
+msgstr "B"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:755
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:754
 msgid "BP register "
-msgstr ""
+msgstr "Registro BP"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:27
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:14
 msgid "Back"
 msgstr "Indietro"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:698
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:679
 msgid "Backend Settings"
-msgstr "Impostazioni Interfaccia"
+msgstr "Impostazioni Motore"
 
-#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:60
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:206
+#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:47
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:211
 msgid "Backend:"
-msgstr ""
+msgstr "Motore:"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:318
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:95
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:305
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:82
 msgid "Background Input"
 msgstr "Input in Background"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:279
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:266
 msgid "Backward"
 msgstr "all'Indietro"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:264
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:257
 msgid "Bad File Header"
-msgstr "File di Intestazione (Header) difettoso"
+msgstr "File Header corrotto"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:627
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:621
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:290
 msgid "Banner"
 msgstr "Banner"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:519
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:529
 msgid "Banner Details"
 msgstr "Dettagli Banner"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491
 msgid "Banner:"
 msgstr "Banner:"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:57
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:61
 msgid "Bar"
-msgstr "Barra"
+msgstr "Leva"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:308
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:316
 msgid "Basic"
 msgstr "Impostazioni di Base"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555
 msgid "Basic Settings"
 msgstr "Impostazioni di Base"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:22
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Bass"
-msgstr "Bass"
+msgstr "Basso"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:186
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:174
 msgid "Block Allocation Table checksum failed"
-msgstr ""
-"Verifica somma di controllo della Tabella di Allocazione Blocchi non riuscita"
+msgstr "Fallita verifica checksum della Tabella di Allocazione Blocchi"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:631
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625
 msgid "Blocks"
 msgstr "Blocchi"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:21
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Blue"
 msgstr "Blu"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:24
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Blue Left"
 msgstr "Blu Sinistro"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:25
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Blue Right"
 msgstr "Blu Destro"
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:87
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270
 msgid "Bottom"
 msgstr "Sotto"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:238
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:225
 #, c-format
 msgid "Bound Controls: %lu"
 msgstr "Controlli Associati: %lu"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348
 msgid "Broken"
 msgstr "Corrotto"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:422
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:428
 msgid "Browse"
 msgstr "Sfoglia"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:256
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:243
 msgid "Browse for a directory to add"
 msgstr "Cerca una directory da aggiungere"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:422
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:428
 msgid "Browse for an ISO directory..."
-msgstr "Cerca una directory per le ISO..."
+msgstr "Seleziona una directory per le ISO..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1079
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1080
 msgid "Browse for output directory"
-msgstr "Cerca una directory di destinazione"
+msgstr "Seleziona la directory di destinazione"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:328
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:331
 msgid "Buffer:"
 msgstr "Buffer:"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:58
 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:119
+#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:106
 msgid "Buttons"
 msgstr "Pulsanti"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317
 msgid ""
 "Bypass the clearing of the data cache by the DCBZ instruction. Usually leave "
 "this option disabled."
 msgstr ""
+"Bypassa la ripulitura della cache dei dati da parte dell'istruzione DCBZ. Di "
+"solito l'opzione è disabilitata."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:698
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:697
 msgid "C"
-msgstr ""
+msgstr "C"
 
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:77
+#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:64
 msgid "C Stick"
-msgstr ""
+msgstr "C Stick"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:77
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:64
 msgid "C-Stick"
-msgstr "Levetta di Controllo"
+msgstr "C-Stick"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:764
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:763
 msgid "CP reg"
-msgstr ""
+msgstr "CP reg"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:567
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547
 msgid "CPU Emulator Engine"
-msgstr "Motore di Emulazione CPU"
+msgstr "CPU Emulator Engine"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:490
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500
 msgid "Cache Display Lists"
-msgstr ""
+msgstr "Cache della Display List"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88
 msgid ""
 "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n"
 "Decreases emulation speed by some percent (depending on your GPU).\n"
@@ -922,64 +973,73 @@ msgid ""
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
+"Calcola l'illuminazione dei modelli 3D tramite algoritmo per-pixel anziché "
+"per-vertex.\n"
+"Diminuisce leggermente la velocità di emulazione (a seconda della tua GPU).\n"
+"È generalmente un'opzione stabile, ma a volte potrebbe causare dei "
+"problemi.\n"
+"\n"
+"Nel dubbio, lascia deselezionato."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1858
+#, c-format
+msgid "Can't find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x"
+msgstr "Impossibile trovare il WiiMote sul bd: %02x:%02x:%02x:%02x:%02x:%02x"
+
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1872
+#, c-format
+msgid "Can't find WiiMote by connection handle %02x"
+msgstr "Impossibile trovare il WiiMote sull'handler di connessione %02x"
+
+#: Source/Core/Core/Src/HW/DVDInterface.cpp:669
+#: Source/Core/Core/Src/HW/DVDInterface.cpp:679
+msgid "Can't read from DVD_Plugin - DVD-Interface: Fatal Error"
+msgstr "Impossibile leggere da DVD_Plugin - DVD-Interface: Errore Fatale"
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:124
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:28
 msgid "Cancel"
 msgstr "Annulla"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:91
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:178
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:240
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:84
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:171
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:233
 #, c-format
 msgid "Cannot open %s"
 msgstr "Impossibile aprire %s"
 
-#: Source/Core/Core/Src/CoreTiming.cpp:141
+#: Source/Core/Core/Src/CoreTiming.cpp:128
 msgid "Cannot unregister events with events pending"
-msgstr "Impossibile non registrare gli eventi in sospeso"
+msgstr "Impossibile annullare con eventi in sospeso"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1078
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1061
 #, c-format
 msgid ""
 "Cannot use that file as a memory card.\n"
 "%s\n"
 "is not a valid gamecube memory card file"
 msgstr ""
+"Impossibile usare questo file come memory card.\n"
+"%s\n"
+"non è un file memory card per gamecube valido"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1108
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1091
 msgid ""
 "Cannot use that file as a memory card.\n"
 "Are you trying to use the same file in both slots?"
 msgstr ""
-"Impossibile utilizzare il file come una scheda di memoria.\n"
-"Stai tentando di utilizzare lo stesso file su ambedue gli ingressi (slots)?"
+"Impossibile utilizzare il file come memory card.\n"
+"Stai tentando di utilizzare lo stesso file in entrambi gli slot di ingresso?"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1867
-#, 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:1881
-#, 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: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"
-
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:52
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:39
 msgid "Caps Lock"
 msgstr "Bloc Maiusc"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288
 msgid "Catalan"
-msgstr ""
+msgstr "Catalano"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:311
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:298
 msgid "Center"
 msgstr "Area Centrale"
 
@@ -987,12 +1047,12 @@ msgstr "Area Centrale"
 msgid "Change"
 msgstr "Cambia"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:316
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:322
 msgid "Change &Disc..."
 msgstr "Cambia &Disco..."
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:179
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:179
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:167
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:167
 msgid "Change Disc"
 msgstr "Cambia Disco"
 
@@ -1000,291 +1060,291 @@ msgstr "Cambia Disco"
 msgid "Change Game"
 msgstr "Cambia Gioco"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:515
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495
 msgid ""
 "Change the language of the user interface.\n"
 "Requires restart."
 msgstr ""
 "Modifica la lingua dell'interfaccia utente.\n"
-"Richiesto il riavvio."
+"Richiede il riavvio."
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:60
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:47
 msgid "Changes sign to zFar Parameter (after correction)"
 msgstr "Cambia segno al Parametro zFar (dopo la correzione)"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:55
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:42
 msgid "Changes sign to zNear Parameter (after correction)"
 msgstr "Cambia segno al Parametro zNear (dopo la correzione)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:519
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499
 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!"
+"La modifica di quest'opzione non avrà alcun effetto finché l'emulatore è in "
+"esecuzione!"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:295
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:298
 msgid "Chat"
 msgstr "Chat"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:47
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:34
 msgid "Cheat Code"
 msgstr "Codice Trucco"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:118
 msgid "Cheat Search"
 msgstr "Cerca Trucco"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:38
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:25
 msgid "Cheats Manager"
 msgstr "Gestore Trucchi"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:633
 msgid "Check Partition Integrity"
-msgstr ""
+msgstr "Verifica l'Integrità della Partizione"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:864
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:880
 msgid "Checking integrity..."
-msgstr ""
+msgstr "Sto verificando l'integrità..."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289
 msgid "Chinese (Simplified)"
 msgstr "Cinese (Semplificato)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290
 msgid "Chinese (Traditional)"
 msgstr "Cinese (Tradizionale)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:818
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:799
 msgid "Choose a DVD root directory:"
-msgstr "Scegli una directory principale per i DVD:"
+msgstr "Imposta la directory principale per i DVD:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:822
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803
 msgid "Choose a NAND root directory:"
-msgstr ""
+msgstr "Imposta la directory principale della NAND:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:815
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:796
 msgid "Choose a default ISO:"
 msgstr "Scegli una ISO predefinita:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1236
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1219
 msgid "Choose a directory to add"
 msgstr "Scegli una directory da aggiungere"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1065
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1048
 msgid "Choose a file to open"
 msgstr "Scegli un file da aprire"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:217
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:204
 msgid "Choose a memory card:"
-msgstr "Scegli una scheda di memoria:"
+msgstr "Scegli una memory card:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:819
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800
 msgid ""
 "Choose file to use as apploader: (applies to discs constructed from "
 "directories only)"
 msgstr ""
-"Scegli il file da utilizzare come apploader: (vale per i dischi costruiti "
-"solo da directory)"
+"Scegli il file da utilizzare come apploader: (vale solo per i dischi "
+"costituiti da directory)"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:767
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:806
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:781
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:822
 msgid "Choose the folder to extract to"
-msgstr "Scegli la cartella in cui 'estrarre in'"
+msgstr "Scegli la cartella in cui estrarre"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:297
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:284
 msgid "Circle Stick"
-msgstr "Levetta Circolare"
+msgstr "Stick Circolare"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:52
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:56
 msgid "Classic"
-msgstr "Controller Classico"
+msgstr "Classic Controller"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:144
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:43
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:487
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:913
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:137
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:30
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:474
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:904
 msgid "Clear"
-msgstr "Cancella"
+msgstr "Pulisci"
 
-#: Source/Core/Core/Src/NetPlayServer.cpp:259
+#: Source/Core/Core/Src/NetPlayServer.cpp:263
 msgid ""
 "Client disconnect while game is running!! NetPlay is disabled. You must "
 "manually stop the game."
 msgstr ""
-"Client disconnesso durante l'esecuzione del gioco!! La modalità di Gioco-"
-"Online  è disabilitata. E' necessario arrestare il gioco manualmente."
+"Client disconnesso durante l'esecuzione del gioco!! La modalità NetPlay è "
+"disabilitata. È necessario arrestare il gioco manualmente."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:298
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:247
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:552
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:578
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:285
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:234
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:562
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:590
 msgid "Close"
 msgstr "Chiudi"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:174
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:177
 msgid "Co&nfigure..."
 msgstr "Co&nfigura..."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:86
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:73
 msgid "Code Info"
 msgstr "Codice Info"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:568
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:556
 msgid "Code: "
 msgstr "Codice: "
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:35
 msgid "Command"
 msgstr "Comando"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:629
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:623
 msgid "Comment"
 msgstr "Note"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489
 msgid "Comment:"
 msgstr "Note:"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:893
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:884
 msgid "Compress ISO..."
 msgstr "Comprimi ISO..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:905
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:899
 msgid "Compress selected ISOs..."
 msgstr "Comprimi le ISO selezionate..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1088
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1224
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1089
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1225
 msgid "Compressing ISO"
 msgstr "Compressione ISO"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:429
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:435
 msgid "Config"
 msgstr "Configurazione"
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:37
-#: Source/Core/DolphinWX/Src/InputConfigDiag.h:135
-#: Source/Core/DolphinWX/Src/InputConfigDiag.h:154
+#: Source/Core/DolphinWX/Src/InputConfigDiag.h:122
+#: Source/Core/DolphinWX/Src/InputConfigDiag.h:141
 msgid "Configure"
 msgstr "Configura"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:111
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:98
 msgid "Configure Control"
 msgstr "Configura Controllo"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:306
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
 #: Source/Core/DolphinWX/Src/NetWindow.cpp:583
 msgid "Configure Pads"
-msgstr "Configura Pads"
+msgstr "Configura i Pad"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:429
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:435
 msgid "Configure..."
 msgstr "Configura..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1119
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1147
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1217
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1120
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1218
 msgid "Confirm File Overwrite"
 msgstr "Conferma la Sovrascrittura del File"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:597
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:577
 msgid "Confirm on Stop"
-msgstr ""
+msgstr "Arresto su Conferma"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:83
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:105
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:74
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:96
 msgid "Connect"
-msgstr "Connetti"
+msgstr "Collega"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:783
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:764
 msgid "Connect USB Keyboard"
 msgstr "Collega Tastiera USB"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:362
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:368
 #, c-format
 msgid "Connect Wiimote %i"
 msgstr "Collega Wiimote %i"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:195
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183
 msgid "Connect Wiimote 1"
 msgstr "Collega Wiimote 1"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184
 msgid "Connect Wiimote 2"
 msgstr "Collega Wiimote 2"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:185
 msgid "Connect Wiimote 3"
 msgstr "Collega Wiimote 3"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:198
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:186
 msgid "Connect Wiimote 4"
 msgstr "Collega Wiimote 4"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:627
+#: Source/Core/DolphinWX/Src/Main.cpp:655
 msgid "Connecting..."
 msgstr "Connessione in corso..."
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:155
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:156
 msgid "Console"
 msgstr "Console"
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:71
 msgid "Continuous Scanning"
-msgstr ""
+msgstr "Scansione Continua"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:46
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:33
 msgid "Control"
 msgstr "Control"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:189
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:176
 msgid "Convert to GCI"
-msgstr "Converti a GCI"
+msgstr "Converti in GCI"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:379
+#: Source/Core/Core/Src/CoreParameter.cpp:368
 msgid "Copy failed"
 msgstr "Copia non riuscita"
 
 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:789
 #, c-format
 msgid "Copy to Memcard %c"
-msgstr "Copia nella Memcard %c"
+msgstr "Copia nella Memory Card %c"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:359
 msgid "Core"
 msgstr "Core"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:154
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:148
 #, c-format
 msgid "Could not create %s"
 msgstr "Impossibile creare %s"
 
-#: Source/Core/AudioCommon/Src/AudioCommon.cpp:75
+#: Source/Core/AudioCommon/Src/AudioCommon.cpp:62
 #, c-format
 msgid "Could not initialize backend %s."
-msgstr "Impossibile inizializzare l'interfaccia %s."
+msgstr "Impossibile inizializzare il motore %s."
 
-#: Source/Core/Core/Src/CoreParameter.cpp:137
+#: Source/Core/Core/Src/CoreParameter.cpp:126
 #, c-format
 msgid ""
 "Could not read \"%s\".  There is no disc in the drive, or it is not a GC/Wii "
 "backup.  Please note that original Gamecube and Wii discs cannot be read by "
 "most PC DVD drives."
 msgstr ""
-"Impossibile leggere \"%s\". Nessun disco trovato nell'unità, oppure non è "
-"una copia di sicurezza GC/Wii. Tieni presente che la maggior parte delle "
-"unità a DVD nei PC non riesce a leggere i dischi originali GameCube/Wii."
+"Impossibile leggere \"%s\". Nessun disco trovato nell'unità, oppure non è un "
+"backup GC/Wii. Tieni presente che la maggior parte delle unità DVD nei PC "
+"non riesce a leggere i dischi originali GameCube/Wii."
 
-#: Source/Core/Core/Src/CoreParameter.cpp:292
+#: Source/Core/Core/Src/CoreParameter.cpp:281
 #, c-format
 msgid "Could not recognize ISO file %s"
 msgstr "Impossibile riconoscere il file ISO %s"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:569
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:579
 #, c-format
 msgid "Could not save %s"
 msgstr "Impossibile salvare %s"
@@ -1294,277 +1354,292 @@ 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 ""
-"Impossibile impostare i pads. Il giocatore è uscito oppure il gioco è "
+"Impossibile impostare i pad. Il giocatore è uscito oppure il gioco è "
 "attualmente in esecuzione!\n"
-"(l'impostazione dei pads mentre il gioco è in esecuzione è una funzione al "
+"(l'impostazione dei pads durante l'esecuzione del gioco è una funzione al "
 "momento non supportata)"
 
-#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:123
+#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119
 #, c-format
 msgid ""
 "Could not write memory card file %s.\n"
 "\n"
 "Are you running Dolphin from a CD/DVD, or is the save file maybe write "
-"protected?"
-msgstr ""
-"Impossibile scrivere il file %s della scheda di memoria.\n"
+"protected?\n"
 "\n"
-"Stai eseguendo Dolphin da CD/DVD, o il file di salvataggio è protetto in "
-"scrittura?"
+"Are you receiving this after moving the emulator directory?\n"
+"If so, then you may need to re-specify your memory card location in the "
+"options."
+msgstr ""
+"Impossibile scrivere sul file memory card %s.\n"
+"\n"
+"Stai avviando Dolphin da un CD o da un DVD, o il file di salvataggio è "
+"protetto da scrittura?\n"
+"\n"
+"Stai ricevendo questo errore dopo aver spostato la cartella dell'emulatore?\n"
+"Se è così, allora potresti dover reimpostare la posizione della memory card "
+"nelle opzioni."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1107
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1133
 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:146
+#: Source/Core/Core/Src/BootManager.cpp:137
 msgid ""
 "Couldn't init the core.\n"
 "Check your configuration."
 msgstr ""
-"Impossibile inizializzare il core.\n"
+"Impossibile inizializzare i componenti di base.\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:170
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:495
 msgid "Count:"
 msgstr "Conteggio:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:452
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456
 msgid "Country:"
 msgstr "Paese:"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:186
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:562
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:173
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:550
 msgid "Create AR Code"
-msgstr "Crea codice AR"
+msgstr "Crea Codice AR"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:543
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:608
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:569
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:641
 msgid "Create new perspective"
 msgstr "Crea nuova prospettiva"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:17
 msgid "Creator: "
-msgstr "Creatore: "
+msgstr "Autore: "
 
-#: Source/Core/Common/Src/MsgHandler.cpp:68
+#: Source/Core/Common/Src/MsgHandler.cpp:54
 msgid "Critical"
-msgstr ""
+msgstr "Critico"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562
 msgid "Crop"
 msgstr "Taglia Immagine lungo i Bordi"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119
 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 ""
+"Ritaglia l'immagine da 4:3 a 5:4 o da 16:9 a 16:10.\n"
+"\n"
+"Nel dubbio, lascia deselezionato."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:48
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:52
 msgid "Crossfade"
-msgstr "Dissolvenza Incrociata"
+msgstr "Crossfade"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:597
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:600
 #, 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:336
-msgid "Custom Projection Hack"
-msgstr "Hack Proiezione Personalizzato"
-
-#: Source/Core/DolphinWX/Src/PHackSettings.h:30
-msgid "Custom Projection Hack Settings"
-msgstr "Impostazioni Hack Proiezione Personalizzato"
+msgid "Current directory changed from %s to %s after wxFileSelector!"
+msgstr "Directory attuale cambiata da %s a %s dopo wxFileSelector!"
 
 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:339
-msgid "Customize some Orthographic Projection parameters."
-msgstr "Personalizza alcuni parametri di Proiezione Ortografica"
+msgid "Custom Projection Hack"
+msgstr "Projection Hack Personalizzato"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311
+#: Source/Core/DolphinWX/Src/PHackSettings.h:17
+msgid "Custom Projection Hack Settings"
+msgstr "Impostazioni Personalizzate Projection Hack"
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342
+msgid "Customize some Orthographic Projection parameters."
+msgstr "Personalizza alcuni parametri di Orthographic Projection"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291
 msgid "Czech"
 msgstr "Ceco"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:698
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:697
 msgid "D"
-msgstr ""
+msgstr "D"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:89
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
 msgid "D-Pad"
-msgstr "Croce Direzionale"
+msgstr "D-Pad"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:431
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
 msgid "DSP"
 msgstr "DSP"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:639
 msgid "DSP Emulator Engine"
-msgstr "Motore di Emulazione DSP"
+msgstr "DSP Emulator Engine"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:254
 msgid "DSP HLE emulation (fast)"
 msgstr "Emulazione DSP HLE (veloce)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:256
 msgid "DSP LLE interpreter (slow)"
 msgstr "Interprete DSP LLE (lento)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660
-msgid "DSP LLE on Thread"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:255
 msgid "DSP LLE recompiler"
 msgstr "Ricompilatore DSP LLE"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:431
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:641
+msgid "DSP on Dedicated Thread"
+msgstr "DSP su Thread Dedicato"
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
 msgid "DSP settings"
 msgstr "Impostazioni DSP"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:838
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:819
 msgid "DVD Root:"
-msgstr "Origine DVD:"
+msgstr "DVD Root:"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:239
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:226
 msgid "DVDLowRead - Fatal Error: failed to read from volume"
-msgstr ""
+msgstr "DVDLowRead - Errore Fatale: fallita lettura dal volume"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:333
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:320
 msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume"
-msgstr ""
+msgstr "DVDLowUnencryptedRead - Errore Fatale: fallita lettura dal volume"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:176
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:163
 msgid "Data Size"
 msgstr "Dimensione Dati"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468
 msgid "Date:"
 msgstr "Data:"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:528
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:564
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:518
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:557
 msgid "Datel MaxDrive/Pro files(*.sav)"
 msgstr "File Datel MaxDrive/Pro(*.sav)"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:242
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:259
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:267
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:281
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:296
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:229
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:246
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:254
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:268
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:283
 msgid "Dead Zone"
 msgstr "Zona Morta"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:35
 msgid "Debug"
 msgstr "Debug"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:521
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534
 msgid "Debugging"
-msgstr ""
+msgstr "Debugging"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:79
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:66
 msgid "Decimal"
 msgstr "."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:890
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:881
 msgid "Decompress ISO..."
 msgstr "Decomprimi ISO..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:906
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:900
 msgid "Decompress selected ISOs..."
 msgstr "Decomprimi ISO selezionate..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1088
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1224
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1089
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1225
 msgid "Decompressing ISO"
 msgstr "Decompressione ISO"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:912
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:903
 msgid "Default"
-msgstr "Predef."
+msgstr "Default"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:835
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:816
 msgid "Default ISO:"
 msgstr "ISO Predefinita:"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:114
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:107
 msgid "Default font"
-msgstr "Carattere predefinito"
+msgstr "Font predefinito"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:32
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:926
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:19
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917
 msgid "Delete"
 msgstr "Elimina"
 
 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:790
 msgid "Delete Save"
-msgstr "Elimina Save"
+msgstr "Elimina Salvataggio"
 
-#: Source/Core/VideoCommon/Src/AVIDump.cpp:77
+#: Source/Core/VideoCommon/Src/AVIDump.cpp:64
 #, c-format
 msgid "Delete the existing file '%s'?"
-msgstr "Elimina l'esistente file di salvataggio '%s'"
+msgstr "Eliminare il file esistente '%s'?"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:671
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:683
 msgid "Description"
-msgstr ""
+msgstr "Descrizione"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:472
 msgid "Detect"
 msgstr "Rileva"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:233
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:328
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:220
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:315
 msgid ""
 "Detected attempt to read more data from the DVD than fit inside the out "
 "buffer. Clamp."
 msgstr ""
-"Individuato tentativo di leggere dal DVD più dati rispetto a quanti il "
-"buffer in uscita è capace di ospitarne. Bloccato."
+"Rilevato tentativo di leggere dal DVD più dati rispetto a quanti il buffer "
+"in uscita è capace di ospitarne. Corretto."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:127
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:898
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:114
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:889
 msgid "Device"
 msgstr "Periferica"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:798
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:731
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779
 msgid "Device Settings"
 msgstr "Impostazioni Periferica"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:45
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:49
 msgid "Dial"
-msgstr "Disco/Piatto"
+msgstr "Manopola"
 
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:146
+#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:135
 msgid "Direct3D11"
 msgstr "Direct3D11"
 
-#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:128
+#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:125
 msgid "Direct3D9"
 msgstr "Direct3D9"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:167
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:155
 msgid ""
 "Directory checksum failed\n"
 " and Directory backup checksum failed"
 msgstr ""
-"Falliti 'checksum' Directory\n"
-" e 'checksum' Directory di backup"
+"Falliti i checksum della Directory\n"
+"e del backup della Directory"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:433
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:443
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485
 msgid "Disable"
+msgstr "Disabilita"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501
+msgid "Disable Destination Alpha"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:491
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:409
 msgid "Disable Fog"
 msgstr "Disabilita Nebbia"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108
 msgid ""
 "Disable any XFB emulation.\n"
 "Speeds up emulation a lot but causes heavy glitches in many games which rely "
@@ -1572,8 +1647,13 @@ msgid ""
 "\n"
 "If unsure, leave this checked."
 msgstr ""
+"Disabilita qualunque emulazione XFB.\n"
+"Velocizza di molto l'emulazione ma causa pesanti glitch in molti giochi che "
+"vi fanno affidamento (soprattutto applicazioni homebrew).\n"
+"\n"
+"Nel dubbio, lascia selezionato."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95
 msgid ""
 "Disable emulation of EFB copies.\n"
 "These are often used for post-processing or render-to-texture effects, so "
@@ -1582,53 +1662,75 @@ msgid ""
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
+"Disabilita l'emulazione delle copie dell'EFB.\n"
+"Vengono usate spesso negli effetti di post-processing o di render-to-"
+"texture, per cui anche se la selezione di questa impostazione fornirà "
+"maggiore velocità d'emulazione, causerà quasi sempre dei problemi.\n"
+"\n"
+"Nel dubbio, lascia deselezionato."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:543
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101
+#, fuzzy
+msgid ""
+"Disables emulation of a hardware feature called destination alpha, which is "
+"used in many games for various graphical effects.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+"Disabilita l'emulazione di una caratteristica hardware chiamata destination "
+"alpha, usata da molti giochi per visualizzare diversi effetti grafici.\n"
+"\n"
+"Nel dubbio, lascia deselezionato."
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:553
 msgid "Disc"
 msgstr "Disco"
 
-#: Source/Core/DiscIO/Src/DriveBlob.cpp:107
-#: Source/Core/DiscIO/Src/DriveBlob.cpp:126
+#: Source/Core/DiscIO/Src/DriveBlob.cpp:94
+#: Source/Core/DiscIO/Src/DriveBlob.cpp:113
 msgid "Disc Read Error"
 msgstr "Errore Lettura Disco"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:312
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:320
 msgid "Display"
 msgstr "Aspetto"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104
 msgid ""
 "Display the inputs read by the emulator.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
+"Visualizza gli input percepiti dall'emulatore.\n"
+"\n"
+"Nel dubbio, lascia deselezionato."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:80
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:67
 msgid "Divide"
 msgstr "/"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:987
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:990
 msgid "Do you want to stop the current emulation?"
 msgstr "Vuoi interrompere l'emulazione in corso?"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:663
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:644
 msgid "Dolby Pro Logic II decoder"
-msgstr ""
+msgstr "Decoder Dolby Pro Logic II"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:864
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:856
 msgid "Dolphin"
 msgstr "Dolphin"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:183
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:188
 #, c-format
 msgid "Dolphin %s Graphics Configuration"
 msgstr "Dolphin - Configurazione Video %s"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:292
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:298
 msgid "Dolphin &Web Site"
 msgstr "Sito &Web Dolphin"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.h:37
+#: Source/Core/DolphinWX/Src/ConfigMain.h:24
 msgid "Dolphin Configuration"
 msgstr "Configurazione Dolphin"
 
@@ -1636,16 +1738,16 @@ msgstr "Configurazione Dolphin"
 msgid "Dolphin Emulated Wiimote Configuration"
 msgstr "Dolphin - Configurazione Wiimote Emulato"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:394
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:383
 msgid "Dolphin FIFO"
 msgstr "Dolphin FIFO"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1136
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1153
 msgid "Dolphin GCPad Configuration"
-msgstr "Dolphin - Configurazione Controlli GC"
+msgstr "Dolphin - Configurazione Controller GC"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:679
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1074
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:685
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1089
 msgid "Dolphin TAS Movies (*.dtm)"
 msgstr "Filmati TAS Dolphin (*.dtm)"
 
@@ -1653,104 +1755,122 @@ msgstr "Filmati TAS Dolphin (*.dtm)"
 msgid "Dolphin Wiimote Configuration"
 msgstr "Dolphin - Configurazione Wiimote"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:293
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:299
 msgid "Dolphin at &Google Code"
 msgstr "Dolphin in &Google Code"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:364
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:351
 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..."
+"Dolphin non trova nessuna ISO GC/Wii. Doppioclicca qui per cercare i file..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:368
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:355
 msgid ""
 "Dolphin is currently set to hide all games.  Doubleclick here to show all "
 "games..."
 msgstr ""
-"Dolphin è attualmente impostato per nascondere tutti i giochi. Doppio click "
+"Dolphin è attualmente impostato per nascondere tutti i giochi. Doppioclicca "
 "qui per mostrare tutti i giochi..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1159
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1160
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1246
 msgid "Dolphin was unable to complete the requested action."
-msgstr ""
+msgstr "Dolphin è impossibilitato a completare l'azione richiesta."
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:275
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:58
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
+#, fuzzy
+msgid ""
+"Doubles the emulated GPU clock rate. May speed up some games (ON = Fast, OFF "
+"= Compatible)"
+msgstr ""
+"Abilita l'accesso rapido al disco. Necessario per alcuni giochi. (ON = "
+"Velocità, OFF = Compatibilità)"
+
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:262
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:45
 msgid "Down"
 msgstr "Giù"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:54
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:44
 msgid "Download Codes (WiiRD Database)"
 msgstr "Scarica Codici (Database WiiRD)"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:297
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:287
 #, c-format
 msgid "Downloaded %lu codes. (added %lu)"
-msgstr "Codici %lu scaricati. (%lu aggiunti)"
+msgstr "Scaricati codici %lu. (%lu aggiunti)"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:31
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:35
 msgid "Drums"
 msgstr "Percussioni/Batteria"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:105
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
 msgid "Dummy"
-msgstr "Fittizio/a"
+msgstr "Fittizio"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:661
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:642
 msgid "Dump Audio"
-msgstr "Immagazzina Audio su disco"
+msgstr "Salva l'Audio"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:532
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545
 msgid "Dump EFB Target"
-msgstr "Immagazzina Oggetti EFB su disco"
+msgstr "Salva il Target EFB"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546
 msgid "Dump Frames"
-msgstr "Immagazzina Fotogrammi su disco"
+msgstr "Salva i Frame"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543
 msgid "Dump Textures"
-msgstr "Immagazzina Trame su disco"
+msgstr "Salva le Texture"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114
 msgid ""
 "Dump all rendered frames to an AVI file in User/Dump/Frames/\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
+"Salva tutti i frame renderizzati in un file AVI in User/Dump/Frames/\n"
+"\n"
+"Nel dubbio, lascia deselezionato."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111
 msgid ""
 "Dump decoded game textures to User/Dump/Textures/<game_id>/\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
+"Salva tutte le texture decodificate in User/Dump/Texture/<game_id>/\n"
+"\n"
+"Nel dubbio, lascia deselezionato."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113
 msgid ""
 "Dump the contents of EFB copies to User/Dump/Textures/\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
+"Salva il contenuto delle copie dell'EFB in User/Dump/Textures/\n"
+"\n"
+"Nel dubbio, lascia deselezionato."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:474
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292
 msgid "Dutch"
 msgstr "Olandese"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:112
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:113
 msgid "E&xit"
 msgstr "&Esci"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:441
 msgid "EFB Copies"
-msgstr ""
+msgstr "Copie EFB"
 
-#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:223
+#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:210
 #, c-format
 msgid ""
 "ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least "
@@ -1758,53 +1878,57 @@ msgid ""
 "reboot is probably required at this point to get Windows to see the new "
 "driver."
 msgstr ""
+"ERRORE: Questa versione di Dolphin richiede un driver TAP-Win32 di versione "
+"almeno %d.%d -- Se hai recentemente aggiornato la tua versione di Dolphin, "
+"potrebbe essere necessario un riavvio per permettere a Windows di "
+"riconoscere il nuovo driver."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:166
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:160
 msgid "EUROPE"
 msgstr "EUROPA"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:156
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:143
 msgid "Early Memory Updates"
 msgstr "Aggiornamenti di Memoria Preliminari"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:447
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:453
 msgid "Edit"
 msgstr "Modifica"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.h:30
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.h:17
 msgid "Edit ActionReplay Code"
 msgstr "Modifica Codice ActionReplay"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:285
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:286
 msgid "Edit Config"
 msgstr "Modifica Configurazione"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.h:30
+#: Source/Core/DolphinWX/Src/PatchAddEdit.h:17
 msgid "Edit Patch"
-msgstr "Modifica Pacth"
+msgstr "Modifica Patch"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:447
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:453
 msgid "Edit current perspective"
 msgstr "Modifica prospettiva corrente"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:403
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:425
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:407
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:429
 msgid "Edit..."
 msgstr "Modifica..."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:44
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:48
 msgid "Effect"
 msgstr "Effetto"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:425
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435
 msgid "Embedded Frame Buffer"
-msgstr ""
+msgstr "Embedded Frame Buffer"
 
-#: Source/Core/Core/Src/Core.cpp:201
+#: Source/Core/Core/Src/Core.cpp:190
 msgid "Emu Thread already running"
-msgstr "Processo dell'Emulatore già in esecuzione"
+msgstr "Thread dell'Emulatore già in esecuzione"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110
 msgid ""
 "Emulate XFBs accurately.\n"
 "Slows down emulation a lot and prohibits high-resolution rendering but is "
@@ -1812,8 +1936,13 @@ msgid ""
 "\n"
 "If unsure, check virtual XFB emulation instead."
 msgstr ""
+"Emula accuratamente l'XFB.\n"
+"Rallenta l'emulazione di molto e impedisce utilizzo di un rendering ad alta "
+"risoluzione, ma è necessario per emulare correttamente numerosi giochi.\n"
+"\n"
+"Nel dubbio, seleziona invece Virtuale."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109
 msgid ""
 "Emulate XFBs using GPU texture objects.\n"
 "Fixes many games which don't work without XFB emulation while not being as "
@@ -1822,12 +1951,19 @@ msgid ""
 "\n"
 "If unsure, leave this checked."
 msgstr ""
+"Emula l'XFB utilizzato oggetti texture della GPU.\n"
+"Corregge molti giochi non funzionanti sena l'emulazione XFB senza causare "
+"gli stessi rallentamenti dell'emulazione di un XFB reale. Tuttavia, potrebbe "
+"essere incompatibile con molti altri giochi (specialmente applicazioni "
+"homebrew).\n"
+"\n"
+"Nel dubbio, lascia selezionato."
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:24
 msgid "Emulated Wiimote"
 msgstr "Wiimote Emulato"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346
 msgid "Emulation State: "
 msgstr "Stato dell'Emulazione: "
 
@@ -1835,7 +1971,7 @@ msgstr "Stato dell'Emulazione: "
 msgid "Enable"
 msgstr "Attiva"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91
 msgid ""
 "Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's "
 "supported by your GPU.\n"
@@ -1844,73 +1980,78 @@ msgid ""
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
+"Abilita la visualizzazione 3D stereoscopica utilizzando la tecnologia Nvidia "
+"3D Vision se supportata dalla tua GPU.\n"
+"Potrebbe causare problemi.\n"
+"Richiede lo schermo intero per funzionare.\n"
+"\n"
+"Nel dubbio, lascia deselezionato."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:111
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:98
 msgid "Enable AR Logging"
-msgstr "Attiva Registrazione Eventi AR"
+msgstr "Abilita Logging AR"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324
 msgid "Enable Block Merging"
 msgstr "Attiva Unione Blocchi"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331
 msgid "Enable Bounding Box Calculation"
-msgstr ""
+msgstr "Abilita Calcolo delle Bounding Box"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:446
 msgid "Enable Cache"
-msgstr ""
+msgstr "Abilita Cache"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:562
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542
 msgid "Enable Cheats"
 msgstr "Abilita Trucchi"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309
-msgid "Enable Dual Core"
-msgstr "Attiva Dual Core"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560
-msgid "Enable Dual Core (speedup)"
-msgstr "Attiva Dual Core (aumenta la velocità)"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:550
-msgid "Enable Hotkeys"
-msgstr "Attiva Tasti di Scelta Rapida"
-
 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:310
-msgid "Enable Idle Skipping"
-msgstr "Salta pause dovute a inattività"
+msgid "Enable Dual Core"
+msgstr "Abilita Dual Core"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561
-msgid "Enable Idle Skipping (speedup)"
-msgstr "Salta pause dovute a inattività (aumenta la velocità)"
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
+msgid "Enable Dual Core (speedup)"
+msgstr "Abilita Dual Core (aumenta la velocità)"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:563
+msgid "Enable Hotkeys"
+msgstr "Abilita Tasti di Scelta Rapida"
 
 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:311
+msgid "Enable Idle Skipping"
+msgstr "Abilita Idle Skipping"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541
+msgid "Enable Idle Skipping (speedup)"
+msgstr "Abilita Idle Skipping (aumenta la velocità)"
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312
 msgid "Enable MMU"
-msgstr "Attiva MMU"
+msgstr "Abilita MMU"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:554
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:567
 msgid "Enable Progressive Scan"
-msgstr "Attiva Scansione Progressiva"
+msgstr "Abilita Scansione Progressiva"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757
 msgid "Enable Screen Saver"
-msgstr ""
+msgstr "Abilita Screen Saver"
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:75
-#, fuzzy
 msgid "Enable Speaker Data"
-msgstr "Attiva pagine"
+msgstr "Abilita Dati Altoparlante"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
 msgid "Enable WideScreen"
-msgstr "Attiva WideScreen"
+msgstr "Abilita WideScreen"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:516
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529
 msgid "Enable Wireframe"
-msgstr "Attiva Rappres. Vettoriale"
+msgstr "Abilita Wireframe"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85
 msgid ""
 "Enable anisotropic filtering.\n"
 "Enhances visual quality of textures that are at oblique viewing angles.\n"
@@ -1918,182 +2059,213 @@ msgid ""
 "\n"
 "If unsure, select 1x."
 msgstr ""
+"Abilita il filtraggio anisotropico.\n"
+"Migliora la qualità visiva delle texture visualizzate ad angolazioni "
+"inclinate.\n"
+"Potrebbe causare problemi in una minoranza di titoli.\n"
+"\n"
+"Nel dubbio, seleziona 1x."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323
 msgid ""
 "Enable fast disc access.  Needed for a few games. (ON = Fast, OFF = "
 "Compatible)"
 msgstr ""
-"Attivare l'accesso veloce del disco. Necessario per alcuni giochi. "
-"(Abilitato = Veloce, Disabilitato = Compatibile)"
+"Abilita l'accesso rapido al disco. Necessario per alcuni giochi. (ON = "
+"Velocità, OFF = Compatibilità)"
 
 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:803
 msgid "Enable pages"
 msgstr "Attiva pagine"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76
 msgid ""
 "Enable this if you want the whole screen to be used for rendering.\n"
 "If this is disabled, a render window will be created instead.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
+"Abilita quest'opzione se vuoi che l'intero schermo venga usato per il "
+"rendering.\n"
+"Se è disabilitata, verrà invece creata invece una finestra di rendering.\n"
+"\n"
+"Nel dubbio, lascia deselezionato."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80
 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 ""
+"Abilita questa opzione se vuoi usare la finestra principale di Dolphin per "
+"il rendering grafico, invece di utilizzare una finestra separata.\n"
+"\n"
+"Nel dubbio, lascia deselezionato."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:335
 msgid ""
 "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for "
 "ANY other game."
 msgstr ""
-"Se attivato velocizza The Legend of Zelda: Twilight Princess. Disattiva per "
-"qualsiasi altro gioco"
+"Se attivato, velocizza The Legend of Zelda: Twilight Princess. Da "
+"disattivare per qualsiasi altro gioco."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340
 msgid "Enables Custom Projection Hack"
-msgstr "Abilita Hack Proiezione Personalizzato"
+msgstr "Abilita Projection Hack Personalizzato"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:528
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508
 msgid ""
 "Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on "
 "OSX."
 msgstr ""
+"Abilita l'emulazione Dolby Pro Logic II utilizzando il surround 5.1. Non "
+"disponibile su OSX."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510
 msgid ""
 "Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only."
 msgstr ""
+"Abilita l'emulazione Dolby Pro Logic II utilizzando il surround 5.1. Solo "
+"con motore OpenAL."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:512
 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 ""
+"Abilita l'emulazione Dolby Pro Logic II utilizzando il surround 5.1. Solo "
+"con motore OpenAL. Potrebbe essere necessario rinominare soft_oal.dll in "
+"OpenAL32.dll perché funzioni."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81
 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 ""
+"Abilita la scansione progressiva, se supportata dal software emulato.\n"
+"La maggior parte dei giochi non ne vengono influenzati.\n"
+"\n"
+"Nel dubbio, lascia deselezionato."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313
 msgid ""
 "Enables the Memory Management Unit, needed for some games. (ON = Compatible, "
 "OFF = Fast)"
 msgstr ""
-"Attiva l'Unità di Gestione della Memoria (MMU), necessaria per alcuni "
-"giochi. (Attivo = Compatibile, Disabilitato = Veloce)"
+"Abilita l'Unità di Gestione della Memoria (MMU), necessaria per alcuni "
+"giochi. (ON = Compatibilità, OFF = Velocità)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116
 msgid ""
 "Encode frame dumps using the FFV1 codec.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
+"Codifica il dump dei frame utilizzando il codec FFV1.\n"
+"\n"
+"Nel dubbio, lascia deselezionato."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:40
 msgid "End"
 msgstr "Fine"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:469
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:280
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:260
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293
 msgid "English"
 msgstr "Inglese"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:329
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:407
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:337
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:417
 msgid "Enhancements"
 msgstr "Miglioramenti"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:607
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:640
 msgid "Enter a name for the new perspective:"
 msgstr "Inserire un nome per la nuova prospettiva"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:191
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:178
 #, c-format
 msgid "Entry %d/%d"
 msgstr "Voce %d/%d"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:85
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:72
 #, c-format
 msgid "Entry 1/%d"
 msgstr "Voce 1/%d"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:204
 msgid "Equal"
 msgstr "Uguale"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:45
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:156
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1242
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:32
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:150
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226
 msgid "Error"
 msgstr "Errore/i"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:381
+#: Source/Core/DolphinWX/Src/Main.cpp:409
 msgid "Error loading selected language. Falling back to system default."
 msgstr ""
-"Errore caricamento della lingua selezionata. Ritorno alla predefinita di "
+"Errore nel caricamento della lingua selezionata. Ritorno alla lingua di "
 "sistema."
 
-#: Source/Core/Common/Src/ChunkFile.h:226
+#: Source/Core/Common/Src/ChunkFile.h:221
 #, c-format
 msgid ""
 "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). "
 "Aborting savestate load..."
 msgstr ""
+"Errore: Dopo \"%s\", trovato %d (0x%X) invece del save marker %d (0x%X). "
+"Interruzione del caricamento dello stato di gioco..."
 
-#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:342
+#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:329
 #, c-format
 msgid ""
 "Error: Trying to access %s fonts but they are not loaded. Games may not show "
 "fonts correctly, or crash."
 msgstr ""
-"Errore: Tentativo di accesso a %s caratteri i quali non risultano caricati. "
-"I giochi potrebbero non mostrare correttamente i caratteri, o crashare."
+"Errore: Tentativo di accesso ai font %s, che non risultano caricati. I "
+"giochi potrebbero non mostrare correttamente i caratteri, o crashare."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:30
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:17
 msgid "Escape"
 msgstr "Esc"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:26
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:30
 msgid "Euphoria"
-msgstr "Euphoria"
+msgstr "Euforia"
 
 #: Source/Core/Core/Src/ArmMemTools.cpp:78
-#: Source/Core/Core/Src/x64MemTools.cpp:217
+#: Source/Core/Core/Src/x64MemTools.cpp:206
 #, c-format
 msgid "Exception handler - access below memory space. %08llx%08llx"
 msgstr ""
-"Gestione eccezione - accesso al di sotto dello spazio in memoria. %08llx"
+"Gestione eccezione - accesso al di fuori dello spazio in memoria. %08llx"
 "%08llx"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:61
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
 msgid "Execute"
 msgstr "Esegui"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:459
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:446
 msgid "Export Failed"
-msgstr "Esportazione non riuscita"
+msgstr "Esportazione non Riuscita"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:639
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:649
 msgid "Export File"
 msgstr "Esporta File"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:177
 msgid "Export Recording"
 msgstr "Esporta Registrazione"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:345
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:351
 msgid "Export Recording..."
 msgstr "Esporta Registrazione..."
 
@@ -2101,108 +2273,108 @@ msgstr "Esporta Registrazione..."
 msgid "Export Save"
 msgstr "Esporta Salvataggio"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:874
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:865
 msgid "Export Wii save (Experimental)"
-msgstr "Esporta salvataggi Wii (sperimentale)"
+msgstr "Esporta salvataggio Wii (Sperimentale)"
 
 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:793
 msgid "Export all saves"
 msgstr "Esporta tutti i salvataggi"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:80
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:72
 msgid "Export failed, try again?"
 msgstr "Esportazione non riuscita, riprovare?"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:559
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:552
 msgid "Export save as..."
 msgstr "Esporta salvataggio come..."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:297
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:284
 msgid "Extension"
 msgstr "Estensione"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483
 msgid "External Frame Buffer"
-msgstr ""
+msgstr "External Frame Buffer"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:61
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:48
 msgid "Extra Parameter"
 msgstr "Parametro Extra"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:62
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:49
 msgid "Extra Parameter useful in ''Metroid: Other M'' only."
-msgstr "Parametro Extra utile solo in ''Metroid: Other M''."
+msgstr "Il Parametro Extra è utile solo in ''Metroid: Other M''."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:614
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:624
 msgid "Extract All Files..."
 msgstr "Estrai Tutti i File..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:616
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:626
 msgid "Extract Apploader..."
 msgstr "Estrai Apploader..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:617
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627
 msgid "Extract DOL..."
 msgstr "Estrai DOL..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:610
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:620
 msgid "Extract Directory..."
 msgstr "Estrai Directory..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:612
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:622
 msgid "Extract File..."
 msgstr "Estrai File..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:608
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:618
 msgid "Extract Partition..."
 msgstr "Estrai Partizione..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:724
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:738
 #, c-format
 msgid "Extracting %s"
 msgstr "Estrazione %s"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:707
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:721
 msgid "Extracting All Files"
 msgstr "Estrazione di Tutti i File"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:707
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:721
 msgid "Extracting Directory"
 msgstr "Estrazione Directory"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:710
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:724
 msgid "Extracting..."
 msgstr "Estrazione..."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:892
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:893
 msgid "FIFO Byte"
 msgstr "Byte FIFO"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:45
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:32
 msgid "FIFO Player"
 msgstr "Lettore FIFO"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:169
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:163
 msgid "FRANCE"
 msgstr "FRANCIA"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472
 msgid "FST Size:"
 msgstr "Dimensione FST:"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:77
+#: Source/Core/Core/Src/NetPlayClient.cpp:81
 msgid "Failed to Connect!"
 msgstr "Connessione non riuscita!"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:225
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:228
 msgid "Failed to Listen!!"
-msgstr "Impossibile 'rimanere in ascolto'!!"
+msgstr "Fallita operazione di Ascolto!!"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:307
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:300
 msgid "Failed to download codes."
-msgstr "Download dei codici non riuscito"
+msgstr "Download dei codici non riuscito."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:827
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:843
 #, c-format
 msgid "Failed to extract to %s!"
 msgstr "Estrazione in %s non riuscita!"
@@ -2219,67 +2391,78 @@ 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 ""
-"Impossibile caricare la ROM DSP:\t%s\n"
+"Impossibile caricare la ROM DSP::»%s\n"
 "\n"
-"Questo file è richiesto per utilizzare DSP LLE.\n"
-"Non è distribuito insieme a Dolphin per ragioni di Copyright.\n"
-"Utilizza DSPSpy per estrarre e trasferire il file dalla tua console.\n"
+"Questo file è necessario per utilizzare DSP LLE.\n"
+"Non è distribuito insieme a Dolphin perché contiene del materiale protetto "
+"da copyright.\n"
+"Utilizza DSPSpy per estrarre il file dalla tua console.\n"
 "\n"
-"Puoi utilizzare il motore DSP HLE, il quale non richiede alcun file ROM "
-"aggiuntivo.\n"
-"(Selezionalo dalla scheda, o linguetta, \"Audio\" della finestra di "
-"configurazione.)"
+"Puoi anche utilizzare il motore DSP HLE, che non richiede alcuna ROM "
+"aggiuntiva.\n"
+"(Selezionalo dalla scheda, \"Audio\" della finestra di configurazione.)"
 
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:116
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:139
+#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:108
+#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:131
 msgid "Failed to load bthprops.cpl"
-msgstr ""
+msgstr "Caricamento bthprops.cpl non riuscito"
 
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:100
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:109
+#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:90
+#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:101
 msgid "Failed to load hid.dll"
 msgstr "Caricamento hid.dll non riuscito"
 
-#: Source/Core/Core/Src/Movie.cpp:792
+#: Source/Core/Core/Src/Movie.cpp:783
 #, c-format
 msgid "Failed to read %s"
-msgstr ""
+msgstr "Fallita lettura di %s"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:151
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:144
 msgid "Failed to read banner.bin"
-msgstr "Accesso al banner.bin non riuscito"
+msgstr "Accesso a banner.bin non riuscito"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:223
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:178
+msgid "Failed to read bk header"
+msgstr "Fallita lettura dell'header bk"
+
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:211
 #, c-format
 msgid ""
 "Failed to read block %d of the save data\n"
 "Memcard may be truncated\n"
 "FilePosition:%llx"
 msgstr ""
+"Fallita lettura del blocco %d dei dati di salvataggio\n"
+"La Memory Card potrebbe essere incompleta\n"
+"FilePosition:%llx"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:148
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:136
 msgid ""
 "Failed to read block allocation table backup correctly\n"
 "(0x8000-0x9FFF)"
 msgstr ""
-"Accesso alla copia di sicurezza della tavola di allocazione dei blocchi non "
-"riuscito\n"
+"Fallita lettura del backup della tabella di allocazione blocchi\n"
 "(0x8000-0x9FFF)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:142
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:130
 msgid ""
 "Failed to read block allocation table correctly\n"
 "(0x6000-0x7FFF)"
 msgstr ""
-"Accesso alla tavola di allocazione dei blocchi non riuscito\n"
+"Fallita lettura della tabella di allocazione blocchi\n"
 "(0x6000-0x7FFF)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:286
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:279
 #, c-format
 msgid "Failed to read data from file %d"
-msgstr "Accesso ai dati dal file %d non riuscito"
+msgstr "Fallita la lettura del file %d"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:136
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:367
+#, c-format
+msgid "Failed to read data from file: %s"
+msgstr "Fallita lettura dei dati dal file: %s"
+
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:124
 msgid ""
 "Failed to read directory backup correctly\n"
 "(0x4000-0x5FFF)"
@@ -2287,7 +2470,7 @@ msgstr ""
 "Accesso alla directory di backup non riuscito\n"
 "(0x4000-0x5FFF)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:130
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:118
 msgid ""
 "Failed to read directory correctly\n"
 "(0x2000-0x3FFF)"
@@ -2295,79 +2478,85 @@ msgstr ""
 "Accesso alla directory non riuscito\n"
 "(0x2000-0x3FFF)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:119
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:90
+msgid "Failed to read header"
+msgstr "Fallita lettura dell'header"
+
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:107
 msgid ""
 "Failed to read header correctly\n"
 "(0x0000-0x1FFF)"
 msgstr ""
-"Accesso all'intestazione non riuscito\n"
+"Fallita lettura dell'header\n"
 "(0x0000-0x1FFF)"
 
-#: Source/Core/DiscIO/Src/VolumeGC.cpp:61
+#: Source/Core/DiscIO/Src/VolumeGC.cpp:48
 msgid "Failed to read unique ID from disc image"
-msgstr "Accesso all'ID univoco dall'immagine del disco non riuscito"
+msgstr "Lettura dell'ID univoco dall'immagine del disco non riuscita"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:84
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:71
 msgid "Failed to write BT.DINF to SYSCONF"
-msgstr "Scrittura da BT.DINF a SYSCONF non riuscita"
+msgstr "Scrittura di BT.DINF su SYSCONF non riuscita"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:228
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:221
 msgid "Failed to write bkhdr"
 msgstr "Scrittura bkhdr non riuscita"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:164
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:157
 #, c-format
 msgid "Failed to write header for %s"
-msgstr "Scrittura intestazione per %s non riuscita"
+msgstr "Fallita la scrittura dell'intestazione di %s"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:258
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:251
 #, c-format
 msgid "Failed to write header for file %d"
-msgstr "Scrittura intestazione per il file %d non riuscita"
+msgstr "Fallita la scrittura dell'intestazione del file %d"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294
 msgid "Farsi"
-msgstr ""
+msgstr "Farsi"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477
 msgid "Fast"
-msgstr "Veloce"
+msgstr "Rapida"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315
 msgid "Fast version of the MMU.  Does not work for every game."
-msgstr "Versione veloce della MMU. Non funziona con qualsiasi gioco."
+msgstr "Versione velocizzata della MMU. Non funziona per tutti i giochi."
 
-#: Source/Core/Core/Src/Movie.cpp:1046
+#: Source/Core/Core/Src/Movie.cpp:1037
 #, c-format
 msgid ""
 "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s"
 msgstr ""
+"Desincronizzazione fatale. Interruzione della riproduzione. (Errore in "
+"PlayWiimote: %u != %u, byte %u.)%s"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:199
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:202
 msgid "Fifo Player"
 msgstr "Lettore Fifo"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:99
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:86
 msgid "File Info"
 msgstr "Info File"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:304
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:295
 msgid "File contained no codes."
-msgstr "Il file non conteneva codici."
+msgstr "Il file non contiene codici."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:413
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:400
 msgid "File converted to .gci"
-msgstr "File converito in .gci"
+msgstr "File convertito in .gci"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:428
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:415
 msgid ""
 "File could not be opened\n"
 "or does not have a valid extension"
 msgstr ""
-"Il file non puo' essere aperto\n"
+"Il file non può essere aperto\n"
 "o non possiede un'estensione valida"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:84
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:72
 #, c-format
 msgid ""
 "File has the extension \"%s\"\n"
@@ -2376,232 +2565,245 @@ msgstr ""
 "Il file possiede l'estensione \"%s\"\n"
 "le estensioni valide sono (.raw/.gcp)"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:425
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:412
 msgid "File is not recognized as a memcard"
-msgstr "Il file non è riconosciuto come una memcard"
+msgstr "Il file non è riconosciuto come una memory card"
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:294
+#: Source/Core/DiscIO/Src/CompressedBlob.cpp:281
 msgid "File not compressed"
 msgstr "File non compresso"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:127
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:109
 #, c-format
 msgid "FileIO: Unknown open mode : 0x%02x"
-msgstr "File I/O: Modalità di apertura sconosciuta : 0x%02x"
+msgstr "FileIO: Modalità di apertura sconosciuta : 0x%02x"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:531
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:541
 msgid "Filesystem"
 msgstr "Filesystem"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1100
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1126
 msgid "Filetype 'ini' is unknown! Will not open!"
 msgstr "Il tipo 'ini' è sconosciuto! Il file non verrà aperto!"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:265
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:252
 msgid "Find next"
-msgstr ""
+msgstr "Trova successivo"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:266
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:253
 msgid "Find previous"
-msgstr ""
+msgstr "Trova precedente"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:632
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626
 msgid "First Block"
 msgstr "Primo Blocco"
 
 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:799
 msgid "Fix Checksums"
-msgstr "Ripara Somme di Controllo (Checksums)"
+msgstr "Ripara Checksum"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:275
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283
 msgid "Force 16:9"
 msgstr "Forza 16:9"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:275
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283
 msgid "Force 4:3"
 msgstr "Forza 4:3"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:568
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548
 msgid "Force Console as NTSC-J"
-msgstr ""
+msgstr "Forza Console a NTSC-J"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406
 msgid "Force Texture Filtering"
-msgstr ""
+msgstr "Forza Filtraggio Texture"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90
 msgid ""
 "Force texture filtering even if the emulated game explicitly disabled it.\n"
 "Improves texture quality slightly but causes glitches in some games.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
+"Forza il filtraggio delle texture anche se il gioco lo disabilita "
+"esplicitamente.\n"
+"Migliora leggermente la qualità delle texture ma causa artefatti in alcuni "
+"giochi.\n"
+"\n"
+"Nel dubbio, lascia deselezionato."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83
 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 ""
+"Forza il gioco a output di risoluzioni widescreen.\n"
+"Causa problemi di visualizzazione in alcuni giochi.\n"
+"\n"
+"Nel dubbio, lascia deselezionato."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488
 msgid ""
 "Forces NTSC-J mode for using the Japanese ROM font.\n"
 "Left unchecked, dolphin defaults to NTSC-U and automatically enables this "
 "setting when playing Japanese games."
 msgstr ""
+"Forza la modalità NTSC-J per utilizzare la ROM font giapponese.\n"
+"Se deselezionato, Dolphin utilizza per default la modalità NTSC-U,  ma "
+"abilita automaticamente questa impostazione durante l'utilizzo dei giochi "
+"giapponesi."
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:74
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:62
 msgid ""
 "Format as ascii (NTSC\\PAL)?\n"
 "Choose no for sjis (NTSC-J)"
 msgstr ""
-"Formato tipo ascii (NTSC\\PAL)?\n"
+"Formattare come ascii (NTSC\\PAL)?\n"
 "Scegli 'no' per sjis (NTSC-J)"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:278
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:265
 msgid "Forward"
 msgstr "in Avanti"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504
 #, c-format
 msgid "Found %d results for '"
-msgstr ""
+msgstr "Trovati %d risultati per '"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:857
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:925
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:858
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:926
 msgid "Frame"
 msgstr "Fotogramma"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:867
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:868
 msgid "Frame "
 msgstr "Fotogramma "
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:185
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:173
 msgid "Frame Advance"
-msgstr "Fotogramma per Fotogramma"
+msgstr "Avanza di un Fotogramma"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:536
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549
 msgid "Frame Dumps use FFV1"
-msgstr ""
+msgstr "Dump dei Frame con FFV1"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:227
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:214
 msgid "Frame Info"
-msgstr ""
+msgstr "Informazioni Frame"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:116
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:103
 msgid "Frame Range"
 msgstr "Intervallo Fotogramma"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:138
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:139
 msgid "Frame S&kipping"
-msgstr "Salta &Fotogramma"
+msgstr "Salta &Fotogrammi"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:572
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552
 msgid "Framelimit:"
-msgstr "Limite FPS:"
+msgstr "Framelimiter:"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:204
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:191
 msgid "Frames To Record"
 msgstr "Fotogrammi da Registrare:"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547
 msgid "Free Look"
 msgstr "Visuale Libera"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
 msgid "French"
 msgstr "Francese"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:38
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:42
 msgid "Frets"
 msgstr "Tasti"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:118
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:137
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:105
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:124
 msgid "From"
 msgstr "Da"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:426
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:432
 msgid "FullScr"
 msgstr "Schermo Intero"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:256
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263
 msgid "Fullscreen resolution:"
-msgstr ""
+msgstr "Risoluzione a Schermo Intero"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:534
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524
 msgid "GCI File(*.gci)"
 msgstr "File GCI(*.gci)"
 
-#: Source/Core/DolphinWX/Src/GCMicDlg.h:44
+#: Source/Core/DolphinWX/Src/GCMicDlg.h:31
 msgid "GCMic Configuration"
-msgstr ""
+msgstr "Configurazione GCMic"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:432
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
 msgid "GCPad"
-msgstr "Controlli GC"
+msgstr "Pad GC"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:659
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:658
 msgid "GX_CMD_INVL_VC"
-msgstr ""
+msgstr "GX_CMD_INVL_VC"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:448
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:452
 msgid "Game ID:"
 msgstr "ID Gioco:"
 
-#: Source/Core/Core/Src/NetPlay.cpp:229
+#: Source/Core/Core/Src/NetPlay.cpp:216
 msgid "Game is already running!"
-msgstr "Il gioco è già in esecuzione!"
+msgstr "Il Gioco è già in esecuzione!"
 
-#: Source/Core/Core/Src/NetPlay.cpp:259
+#: Source/Core/Core/Src/NetPlay.cpp:246
 msgid "Game isn't running!"
-msgstr "Il gioco non è avviato"
+msgstr "Il Gioco non è in esecuzione!"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:389
-#, fuzzy
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:393
 msgid "Game not found!"
-msgstr "Gioco non trovato!!"
+msgstr "Gioco non trovato!"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:385
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:389
 msgid "Game-Specific Settings"
-msgstr "Impostazioni di Gioco Specifiche"
+msgstr "Impostazioni Specifiche del Gioco"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:293
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:294
 msgid "GameConfig"
 msgstr "Configurazione di Gioco"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:525
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:515
 msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)"
-msgstr ""
+msgstr "File Salvataggio GameCube (*.gci;*.gcs;*.sav)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534
 msgid "Gamecube"
 msgstr "GameCube"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:178
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:181
 msgid "Gamecube &Pad Settings"
 msgstr "Impostazioni &Controlli GameCube"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:218
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1069
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:205
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1052
 msgid "Gamecube Memory Cards (*.raw,*.gcp)"
 msgstr "Schede di Memoria GameCube (*.raw,*.gcp)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:432
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
 msgid "Gamecube Pad settings"
 msgstr "Impostazioni Controlli GameCube"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:117
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302
 msgid "Gecko Codes"
 msgstr "Codici Gecko"
 
-#: Source/Core/Core/Src/GeckoCode.cpp:222
+#: Source/Core/Core/Src/GeckoCode.cpp:214
 #, c-format
 msgid ""
 "GeckoCode failed to run (CT%i CST%i) (%s)\n"
@@ -2609,44 +2811,48 @@ msgid ""
 "native code handler by placing the codehandler.bin file into the Sys "
 "directory and restarting Dolphin.)"
 msgstr ""
+"Fallito l'avvio del GeckoCode (CT%i CST%i) (%s)\n"
+"(o è un codice non valido o è di un tipo non ancora supportato. Prova a "
+"utilizzare il gestore codici nativo spostando il file codehandler.bin nella "
+"cartella Sys e riavviando Dolphin.)"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:172
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:197
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:160
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:160
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:202
 msgid "General"
 msgstr "Generale"
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:139
 msgid "General Settings"
-msgstr ""
+msgstr "Impostazioni Generali"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:470
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:281
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:316
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:261
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
 msgid "German"
 msgstr "Tedesco"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:449
+#: Source/Core/Core/Src/ActionReplay.cpp:439
 #, 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:430
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:436
 msgid "Graphics"
 msgstr "Video"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:430
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:436
 msgid "Graphics settings"
-msgstr "Impostazioni Video"
+msgstr "Impostazioni Grafiche"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:205
 msgid "Greater Than"
 msgstr "Maggiore di"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87
 msgid ""
 "Greatly increases quality of textures generated using render to texture "
 "effects.\n"
@@ -2656,52 +2862,85 @@ msgid ""
 "\n"
 "If unsure, leave this checked."
 msgstr ""
+"Aumenta di molto la qualità delle texture generate utilizzando gli effetti "
+"di rendering in texture.\n"
+"Aumentare la risoluzione interna aumenta gli effetti di questa "
+"impostazione.\n"
+"Riduce leggermente le performance e potrebbe causare problemi (anche se poco "
+"probabile).\n"
+"\n"
+"Nel dubbio, lascia selezionato."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:317
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
 msgid "Greek"
 msgstr "Greco"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:22
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Green"
 msgstr "Verde"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:24
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Green Left"
 msgstr "Verde Sinistro"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:25
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Green Right"
 msgstr "Verde Destro"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:35
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:39
 msgid "Guitar"
 msgstr "Chitarra"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1259
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1250
 msgid "HCI_CMD_INQUIRY is called, please report!"
-msgstr "Chiamata a HCI_CMD_INQUIRY, per favore segnalare!"
+msgstr "Chiamata a HCI_CMD_INQUIRY, si prega di segnalarlo!"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:421
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504
+msgid "Hacked Buffer Upload"
+msgstr " Upload Modificato del Buffer"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431
 msgid "Hacks"
-msgstr ""
+msgstr "Hacks"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:158
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:146
 msgid "Header checksum failed"
 msgstr "Somma di controllo dell'intestazione non riuscita"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:318
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298
 msgid "Hebrew"
-msgstr "Ebreo"
+msgstr "Ebreaico"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:313
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:300
 msgid "Height"
 msgstr "Altezza"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:64
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:51
 msgid "Help"
 msgstr "Aiuto"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:209
+#: Source/Core/DolphinWX/Src/Main.cpp:229
+msgid ""
+"Hi,\n"
+"\n"
+"Dolphin requires Mac OS X 10.7 or greater.\n"
+"Unfortunately you're running an old version of OS X.\n"
+"The last Dolphin version to support OS X 10.6 is Dolphin 3.5\n"
+"Please upgrade to 10.7 or greater to use the newest Dolphin version.\n"
+"\n"
+"Sayonara!\n"
+msgstr ""
+"Ciao,\n"
+"\n"
+"Dolphin richiede Mac OS X 10.7 o superiori.\n"
+"Sfortunatamente, stai utilizzando una versione più vecchia di OS X.\n"
+"L'ultima versione di Dolphin che supporta OS X 10.6 è Dolphin 3.5\n"
+"Per poter utilizzare le versioni di Dolphin più recenti dovresti aggiornare "
+"a 10.7.\n"
+"\n"
+"Sayonara!\n"
+
+#: Source/Core/DolphinWX/Src/Main.cpp:220
 msgid ""
 "Hi,\n"
 "\n"
@@ -2718,41 +2957,44 @@ msgstr ""
 "\n"
 "Sayonara!\n"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:309
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:296
 msgid "Hide"
 msgstr "Nascondi"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:307
 msgid "Hide Mouse Cursor"
 msgstr "Nascondi il Cursore del Mouse"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79
 msgid ""
 "Hides the mouse cursor if it's on top of the emulation window.\n"
 "\n"
 "If unsure, leave this checked."
 msgstr ""
+"Nasconde il cursore se sopra la finestra d'emulazione.\n"
+"\n"
+"Nel dubbio, lascia selezionato."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:54
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41
 msgid "Home"
 msgstr "Home"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:85
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:138
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:76
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:141
 msgid "Host"
 msgstr "Host"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.h:44
+#: Source/Core/DolphinWX/Src/HotkeyDlg.h:31
 msgid "Hotkey Configuration"
 msgstr "Configurazione Tasti di Scelta Rapida"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:272
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:272
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:594
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:260
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:260
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574
 msgid "Hotkeys"
 msgstr "Tasti di Scelta Rapida"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:319
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299
 msgid "Hungarian"
 msgstr "Ungherese"
 
@@ -2760,87 +3002,75 @@ msgstr "Ungherese"
 msgid "Hybrid Wiimote"
 msgstr "Wiimote Ibrido"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:532
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:519
 #, 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"
+"IOCTL_ES_GETVIEWS: Tentativo di ottenere dati da un ticket sconosciuto: %08x/"
+"%08x"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:786
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:773
 #, c-format
 msgid ""
-"IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available "
-"in your nand dump\n"
+"IOCTL_ES_LAUNCH: Game tried to reload an IOS or a title that is not "
+"available in your NAND dump\n"
 "TitleID %016llx.\n"
-" Dolphin will likely hang now"
+" Dolphin will likely hang now."
 msgstr ""
-"IOCTL_ES_LAUNCH: Tentativo del gioco di ricaricare l'iso, oppure un titolo "
-"il quale risulta non essere disponibile nella tua estrazione (dumping) nand\n"
-"IDTitolo %016llx.\n"
-" Dolphin, adesso, probabile vada in blocco"
+"IOCTL_ES_LAUNCH: Il gioco ha tentato di ricaricare un iOS o un titolo non "
+"disponibile nel tuo dump della NAND\n"
+"TitleID %016llx.\n"
+"Ora Dolphin probabilmente si bloccherà."
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:313
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:300
 msgid "IOCTL_ES_READCONTENT - bad destination"
-msgstr "IOCTL_ES_READCONTENT - destinazione corrotta"
+msgstr "IOCTL_ES_READCONTENT - Destinazione invalida"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729
 msgid "IPL Settings"
 msgstr "Impostazioni IPL"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269
 msgid "IR"
 msgstr "Puntamento IR"
 
 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25
 msgid "IR Pointer"
-msgstr "Puntatore a raggi infrarossi (IR)"
+msgstr "Puntatore a infrarossi (IR)"
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:95
 msgid "IR Sensitivity:"
 msgstr "Sensibilità IR:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:502
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:512
 msgid "ISO Details"
 msgstr "Dettagli ISO"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:830
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:811
 msgid "ISO Directories"
 msgstr "Directory ISO"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:172
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:166
 msgid "ITALY"
 msgstr "ITALIA"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:630
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:624
 msgid "Icon"
 msgstr "Icona"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332
 msgid ""
 "If checked, the bounding box registers will be updated. Used by the Paper "
 "Mario games."
 msgstr ""
+"Se abilitato, il registro delle bounding box sarà aggiornato. Usato dai "
+"giochi della serie Paper Mario."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318
-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:505
-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:428
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438
 msgid "Ignore Format Changes"
-msgstr ""
+msgstr "Ignora Cambiamenti di Formato"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94
 msgid ""
 "Ignore any changes to the EFB format.\n"
 "Improves performance in many games without any negative effect. Causes "
@@ -2848,8 +3078,13 @@ msgid ""
 "\n"
 "If unsure, leave this checked."
 msgstr ""
+"Ignora qualunque cambiamento al formato dell'EFB.\n"
+"Migliora le prestazioni in molti giochi senza effetti collaterali. Causa "
+"però difetti grafici in una minoranza di titoli.\n"
+"\n"
+"Nel dubbio, lascia selezionato."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93
 msgid ""
 "Ignore any requests of the CPU to read from or write to the EFB.\n"
 "Improves performance in some games, but might disable some gameplay-related "
@@ -2857,44 +3092,42 @@ msgid ""
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
+"Ignora tutte le richieste da parte della CPU di leggere da o scrivere "
+"sull'EFB.\n"
+"Migliora le prestazioni in alcuni giochi, ma potrebbe disabilitare alcune "
+"funzionalità nel gameplay o alcuni effetti grafici.\n"
+"\n"
+"Nel dubbio, lascia deselezionato."
 
 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:791
 msgid "Import Save"
-msgstr "Salva Importazione"
+msgstr "Importa Salvataggio"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:59
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:48
 msgid "Import failed, try again?"
 msgstr "Importazione non riuscita, riprovare?"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:454
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:441
 msgid ""
 "Imported file has gsc extension\n"
 "but does not have a correct header"
 msgstr ""
-"Il file importato possiede l'estensione .gsc\n"
-"ma non una corretta intestazione"
+"Il file importato ha estensione .gsc\n"
+"ma non ha un'intestazione corretta"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:442
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:429
 msgid "Imported file has invalid length"
-msgstr "Il file importato ha una dimensione non valida"
+msgstr "Il file importato ha dimensioni non valide"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:451
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:438
 msgid ""
 "Imported file has sav extension\n"
 "but does not have a correct header"
 msgstr ""
-"Il file importato possiede l'estensione .sav\n"
-"ma non una corretta intestazione"
+"Il file importato ha estensione .sav\n"
+"ma non ha un'intestazione corretta"
 
-#: 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/ISOProperties.cpp:347
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350
 msgid "In Game"
 msgstr "In Game"
 
@@ -2902,241 +3135,260 @@ msgstr "In Game"
 msgid "In-Game"
 msgstr "In-Game"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:34
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305
 msgid "Info"
 msgstr "Info"
 
-#: Source/Core/Common/Src/MsgHandler.cpp:65
+#: Source/Core/Common/Src/MsgHandler.cpp:51
 msgid "Information"
 msgstr "Informazioni"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:481
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:468
 msgid "Input"
 msgstr "Input"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:63
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:50
 msgid "Insert"
 msgstr "Ins"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:176
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:166
 msgid "Insert Encrypted or Decrypted code here..."
-msgstr "Inserisci il codice criptato o decriptato qui..."
+msgstr "Inserisci qui il codice Criptato o Decriptato..."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:763
 msgid "Insert SD Card"
 msgstr "Inserisci SD Card"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:34
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:21
 msgid "Insert name here.."
-msgstr "Inserire il nome qui..."
+msgstr "Inserire qui il nome..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:196
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:199
 msgid "Install WAD"
 msgstr "Installa WAD"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:895
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:888
 msgid "Install to Wii Menu"
-msgstr "Installa in Menu Wii"
+msgstr "Installa nel Menu Wii"
 
-#: Source/Core/Core/Src/x64MemTools.cpp:252
+#: Source/Core/Core/Src/x64MemTools.cpp:242
 msgid ""
 "InstallExceptionHandler called, but this platform does not yet support it."
 msgstr ""
-"E' stata sollevata un'Eccezione all'Installazione, tuttavia questa "
-"piattaforma non la supporta ancora."
+"Chiamata di InstallExceptionHandler avvenuta, tuttavia questa piattaforma "
+"non la supporta ancora."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1297
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
 msgid "Installing WAD..."
 msgstr "Installazione WAD..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:885
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:901
 msgid "Integrity Check Error"
-msgstr ""
+msgstr "Errore di Controllo d'Integrità"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:891
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:907
 msgid "Integrity check completed"
-msgstr ""
+msgstr "Controllo d'integrità completato"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:890
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:906
 msgid "Integrity check completed. No errors have been found."
-msgstr ""
+msgstr "Controllo d'integrità completato. Non sono stati trovati errori."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:882
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:898
 #, c-format
 msgid ""
 "Integrity check for partition %d failed. Your dump is most likely corrupted "
 "or has been patched incorrectly."
 msgstr ""
+"Fallito il controllo d'integrità per la partizione %d. Il tuo dump è "
+"probabilmente corrotto o è stata applicata scorrettamente una patch."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532
 msgid "Interface"
-msgstr ""
+msgstr "Interfaccia"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:646
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627
 msgid "Interface Settings"
 msgstr "Impostazioni Interfaccia"
 
-#: Source/Core/Core/Src/State.cpp:240
+#: Source/Core/Core/Src/State.cpp:228
 msgid "Internal LZO Error - compression failed"
 msgstr "Errore Interno LZO - compressione non riuscita"
 
-#: Source/Core/Core/Src/State.cpp:348
+#: Source/Core/Core/Src/State.cpp:336
 #, c-format
 msgid ""
 "Internal LZO Error - decompression failed (%d) (%li, %li) \n"
 "Try loading the state again"
 msgstr ""
 "Errore Interno LZO - decompressione non riuscita (%d) (%li, %li) \n"
-"Riprovare a verificare lo stato"
+"Prova a caricare di nuovo lo stato di salvataggio"
 
-#: Source/Core/Core/Src/State.cpp:485
+#: Source/Core/Core/Src/State.cpp:473
 msgid "Internal LZO Error - lzo_init() failed"
-msgstr "Errore Interno LZO - lzo_init() non riuscita"
+msgstr "Errore Interno LZO - lzo_init() fallito"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:344
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:352
 msgid "Internal Resolution:"
-msgstr ""
+msgstr "Risoluzione Interna:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:42
+msgid "Interpreter (VERY slow)"
+msgstr "Interprete (MOLTO lento)"
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349
 msgid "Intro"
 msgstr "Intro"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:194
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:187
 #, c-format
 msgid "Invalid Size(%x) or Magic word (%x)"
-msgstr "Dimensione non Valida(%x) o Password (%x)"
+msgstr "Dimensione (%x) o Magic word (%x) non valida"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:612
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:600
 msgid "Invalid Value!"
 msgstr "Valore non Valido!"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:462
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:449
 msgid "Invalid bat.map or dir entry"
 msgstr "bat.map o voce directory non valide"
 
-#: Source/Core/Core/Src/CoreTiming.cpp:548
+#: Source/Core/Core/Src/CoreTiming.cpp:553
 #, c-format
 msgid "Invalid event type %i"
 msgstr "Tipo di evento %i non valido"
 
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:326
+#: Source/Core/Core/Src/HW/DVDInterface.cpp:309
 msgid "Invalid file"
 msgstr "File non valido"
 
-#: Source/Core/DiscIO/Src/BannerLoaderGC.cpp:41
+#: Source/Core/DiscIO/Src/BannerLoaderGC.cpp:28
 #, c-format
 msgid ""
 "Invalid opening.bnr found in gcm:\n"
 "%s\n"
 " You may need to redump this game."
 msgstr ""
-"opening.bnr non valido trovato in gcm:\n"
+"Trovato nel gcm un opening.bnr non valido:\n"
 "%s\n"
-" E' possibile che sia necessario il redumping del gioco."
+"È possibile che sia necessario il redumping del gioco."
 
-#: Source/Core/Core/Src/Movie.cpp:735
+#: Source/Core/Core/Src/Movie.cpp:726
 msgid "Invalid recording file"
 msgstr "File di registrazione non valido"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:473
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:472
 msgid "Invalid search parameters (no object selected)"
-msgstr ""
+msgstr "Parametri di ricerca non validi (nessun oggetto selezionato)"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:456
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:455
 msgid "Invalid search string (couldn't convert to number)"
-msgstr ""
+msgstr "Stringa di ricerca non valida (impossibile convertire in numero)"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:444
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:443
 msgid "Invalid search string (only even string lengths supported)"
 msgstr ""
+"Stringa di ricerca non valida (solo stringhe di lunghezza pari sono "
+"supportate)"
 
-#: Source/Core/Core/Src/Core.cpp:513
+#: Source/Core/Core/Src/Core.cpp:511
 msgid "Invalid state"
 msgstr "Stato non valido"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:473
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:320
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300
 msgid "Italian"
 msgstr "Italiano"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:183
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:177
 msgid "JAPAN"
 msgstr "GIAPPONE"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:321
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:46
+msgid "JIT Recompiler (recommended)"
+msgstr "Ricompilatore JIT (consigliato)"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:47
+msgid "JITIL experimental recompiler"
+msgstr "Ricompilatore sperimentale JITIL"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:279
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
 msgid "Japanese"
 msgstr "Giapponese"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:188
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:182
 msgid "KOREA"
 msgstr "KOREA"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78
 msgid ""
 "Keep the game window on top of all other windows.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
+"Mantiene la finestra di gioco in cima a tutte le altre.\n"
+"\n"
+"Nel dubbio, lascia deselezionato."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:298
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:306
 msgid "Keep window on top"
-msgstr ""
+msgstr "Finestra sempre in cima"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:241
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:241
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:229
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:229
 msgid "Key"
-msgstr "Combinaz. Tasti"
+msgstr "Combinazione Tasti"
 
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282
 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:322
 msgid "Korean"
 msgstr "Coreano"
 
 #. i18n:  Left
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:57
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:44
 msgid "L"
 msgstr "L"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:39
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:26
 msgid "L Button"
 msgstr "Pulsante L"
 
 #. i18n:  Left-Analog
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:61
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:48
 msgid "L-Analog"
 msgstr "L-Analogico"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:585
 msgid "Language:"
 msgstr "Lingua:"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:152
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:153
 msgid "Last Overwritten State"
-msgstr "Ultimo stato di gioco sovrascritto"
+msgstr "Ultimo Stato di Gioco Sovrascritto"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:159
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:161
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:160
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:162
 msgid "Last Saved State"
-msgstr "Ultimo stato di gioco salvato"
+msgstr "Ultimo Stato di Gioco Salvato"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:696
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:677
 msgid "Latency:"
-msgstr ""
+msgstr "Latenza:"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:276
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:55
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:263
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:42
 msgid "Left"
 msgstr "Sinistra"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:60
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:64
 msgid "Left Stick"
 msgstr "Levetta Sinistra"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:257
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:257
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:245
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:245
 msgid ""
 "Left click to detect hotkeys.\n"
 "Enter space to clear."
@@ -3144,7 +3396,7 @@ msgstr ""
 "Click sinistro del mouse per rilevare l'identità del tasto premuto.\n"
 "Premi 'spazio' per cancellare."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:689
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:678
 msgid ""
 "Left-click to detect input.\n"
 "Middle-click to clear.\n"
@@ -3154,91 +3406,94 @@ msgstr ""
 "Click centrale del mouse per cancellare.\n"
 "Click destro del mouse per altre opzioni."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:694
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:683
 msgid ""
 "Left/Right-click for more options.\n"
 "Middle-click to clear."
 msgstr ""
 "Click sinistro/destro per altre opzioni.\n"
-"Click Centrale del mouse per cancellare."
+"Click centrale del mouse per cancellare."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:219
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:206
 msgid "Less Than"
 msgstr "Minore di"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:565
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545
 msgid "Limit by FPS"
-msgstr ""
+msgstr "Limita per FPS"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:924
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:915
 msgid "Load"
 msgstr "Carica"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544
 msgid "Load Custom Textures"
-msgstr ""
+msgstr "Carica Texture Personalizzate"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
 msgid "Load State Slot 1"
-msgstr "Carica Stato di Gioco dall'Ingresso 1"
+msgstr "Carica Stato di Gioco da Slot 1"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189
 msgid "Load State Slot 2"
-msgstr "Carica Stato di Gioco dall'Ingresso 2"
+msgstr "Carica Stato di Gioco da Slot 2"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:190
 msgid "Load State Slot 3"
-msgstr "Carica Stato di Gioco dall'Ingresso 3"
+msgstr "Carica Stato di Gioco da Slot 3"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:203
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:191
 msgid "Load State Slot 4"
-msgstr "Carica Stato di Gioco dall'Ingresso 4"
+msgstr "Carica Stato di Gioco da Slot 4"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192
 msgid "Load State Slot 5"
-msgstr "Carica Stato di Gioco dall'Ingresso 5"
+msgstr "Carica Stato di Gioco da Slot 5"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193
 msgid "Load State Slot 6"
-msgstr "Carica Stato di Gioco dall'Ingresso 6"
+msgstr "Carica Stato di Gioco da Slot 6"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:194
 msgid "Load State Slot 7"
-msgstr "Carica Stato di Gioco dall'Ingresso 7"
+msgstr "Carica Stato di Gioco da Slot 7"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:195
 msgid "Load State Slot 8"
-msgstr "Carica Stato di Gioco dall'Ingresso 8"
+msgstr "Carica Stato di Gioco da Slot 8"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:155
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:156
 msgid "Load State..."
 msgstr "Carica Stato di Gioco..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1332
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1359
 msgid "Load Wii System Menu"
-msgstr ""
+msgstr "Carica Menu di Sistema Wii"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1327
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1354
 #, c-format
 msgid "Load Wii System Menu %d%c"
 msgstr "Carica il Menu di Sistema Wii %d%c"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112
 msgid ""
 "Load custom textures from User/Load/Textures/<game_id>/\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
+"Carica le texture da User/Load/Textures/<game_id>/\n"
+"\n"
+"Nel dubbio, lascia deselezionato."
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:50
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:37
 msgid "Load preset values from hack patterns available."
 msgstr "Carica valori preimpostati dai modelli hack disponibili."
 
@@ -3246,48 +3501,52 @@ msgstr "Carica valori preimpostati dai modelli hack disponibili."
 msgid "Local"
 msgstr "Locale"
 
-#: Source/Core/DolphinWX/Src/LogWindow.h:51
+#: Source/Core/DolphinWX/Src/LogWindow.h:38
 msgid "Log"
 msgstr "Log"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:26
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:13
 msgid "Log Configuration"
 msgstr "Configurazione Log"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:296
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304
 msgid "Log FPS to file"
-msgstr ""
+msgstr "Log FPS su file"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:96
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83
 msgid "Log Types"
 msgstr "Tipi di Log"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103
 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 il numero di frame renderizzati ogni secondo in User/Logs/fps.txt. "
+"Usa questa funzione per misurare le performance di Dolphin.\n"
+"\n"
+"Nel dubbio, lascia deselezionato."
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:81
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:68
 msgid "Logger Outputs"
 msgstr "Destinazione Logger"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132
-#: Source/Core/DolphinWX/Src/Frame.cpp:328
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:119
+#: Source/Core/DolphinWX/Src/Frame.cpp:314
 msgid "Logging"
 msgstr "Registrazione Eventi"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:255
+#: Source/Core/Core/Src/NetPlayClient.cpp:259
 msgid "Lost connection to server!"
-msgstr "Connessione al server persa!"
+msgstr "Persa connessione al server!"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:42
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:29
 msgid "M Button"
 msgstr "Pulsante M"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:119
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:112
 #, c-format
 msgid ""
 "MD5 mismatch\n"
@@ -3296,51 +3555,66 @@ msgstr ""
 "L'MD5 non corrisponde\n"
 " %016llx%016llx != %016llx%016llx"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314
 msgid "MMU Speed Hack"
 msgstr "Hack Velocità MMU"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:527
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:563
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:517
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:556
 msgid "MadCatz Gameshark files(*.gcs)"
-msgstr "File MadCatz Gameshark(*.gcs)"
+msgstr "File Gameshark MadCatz(*.gcs)"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:51
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:63
+#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:38
 msgid "Main Stick"
 msgstr "Levetta Principale"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460
 msgid "Maker ID:"
 msgstr "ID Produttore:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487
 msgid "Maker:"
 msgstr "Produttore:"
 
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100
+msgid ""
+"Makes distant objects more visible by removing fog, thus increasing the "
+"overall detail.\n"
+"Disabling fog will break some games which rely on proper fog emulation.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+"Rende gli oggetti distanti più visibili rimuovendo la nebbia, aumentando "
+"così la quantità di dettagli disponibili.\n"
+"Disabilitarla tuttavia corromperà i giochi che si basano su una corretta "
+"emulazione della nebbia.\n"
+"\n"
+"Nel dubbio, lascia deselezionato."
+
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:97
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:100
 msgid "Max"
-msgstr ""
+msgstr "Max"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:448
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:435
 msgid "Memcard already has a save for this title"
-msgstr "La Memcard possiede già un salvataggio per questo titolo"
+msgstr "La Memory Card possiede già un salvataggio per questo titolo"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:291
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:278
 msgid "Memcard already opened"
-msgstr "La Memcard è già aperta"
+msgstr "La Memory Card è già aperta"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:912
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:913
 msgid "Memory Byte"
 msgstr "Byte"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:225
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:113
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:212
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:93
 msgid "Memory Card"
 msgstr "Scheda di Memoria"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.h:36
+#: Source/Core/DolphinWX/Src/MemcardManager.h:23
 msgid ""
 "Memory Card Manager WARNING-Make backups before using, should be fixed but "
 "could mangle stuff!"
@@ -3348,7 +3622,7 @@ msgstr ""
 "Gestore Scheda di Memoria - AVVISO: Eseguire una copia di sicurezza prima "
 "dell'uso!"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:371
+#: Source/Core/Core/Src/CoreParameter.cpp:360
 #, c-format
 msgid ""
 "Memory Card filename in Slot %c is incorrect\n"
@@ -3365,58 +3639,64 @@ msgstr ""
 "%s\n"
 "Si desidera copiare il precedente file in questa nuova locazione?\n"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:124
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:112
 msgid "Memorycard filesize does not match the header size"
 msgstr ""
+"La dimensione della Memory Card non coincide con la dimensione "
+"dell'intestazione"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:50
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:37
 msgid "Menu"
 msgstr "Menu"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:114
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:94
 msgid "Mic"
 msgstr "Mic"
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:96
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:99
 msgid "Min"
-msgstr ""
+msgstr "Min"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:580
 msgid "Misc"
 msgstr "Varie"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:795
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776
 msgid "Misc Settings"
 msgstr "Impostazioni Varie"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:240
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:294
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:227
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:281
 msgid "Modifier"
-msgstr "Modificatore"
+msgstr "Mezza Incl."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106
 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 ""
+"Modifica le texture perché mostrino il formato in cui sono codificate. "
+"Richiede un reset dell'emulazione nella maggior parte dei casi.\n"
+"\n"
+"Nel dubbio, lascia deselezionato."
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:115
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:108
 msgid "Monospaced font"
 msgstr "Carattere a spaziatura fissa"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:305
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:292
 msgid "Motion Plus"
 msgstr "Motion Plus"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:309
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:86
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:296
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73
 msgid "Motor"
 msgstr "Motore"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:654
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:666
 msgid ""
 "Move the mouse pointer over an option to display a detailed description.\n"
 "\n"
@@ -3426,225 +3706,246 @@ msgid ""
 "\n"
 "\n"
 msgstr ""
+"Muovi il puntatore sopra un opzione per visualizzarne una descrizione "
+"dettagliata.\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:75
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:62
 msgid "Multiply"
 msgstr "*"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:651
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:650
 msgid "NOP"
-msgstr ""
+msgstr "NOP"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:629
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:628
 msgid "NOTE: Stream size doesn't match actual data length\n"
 msgstr ""
+"NOTA: La dimensione dello stream non coincide con la dimensione dei dati\n"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:129
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:116
 msgid "NP Add"
 msgstr "TN +"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:124
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:111
 msgid "NP Begin"
 msgstr "TN Inizio"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:132
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:119
 msgid "NP Decimal"
 msgstr "TN ."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:126
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:113
 msgid "NP Delete"
 msgstr "TN Canc"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:133
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:120
 msgid "NP Divide"
 msgstr "TN /"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:120
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:107
 msgid "NP Down"
 msgstr "TN Giù"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:123
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:110
 msgid "NP End"
 msgstr "TN Fine"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:111
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:98
 msgid "NP Enter"
 msgstr "TN Invio"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:127
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:114
 msgid "NP Equal"
 msgstr "TN ="
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:116
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:103
 msgid "NP Home"
 msgstr "TN Inizio"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:125
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:112
 msgid "NP Insert"
 msgstr "TN Ins"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:117
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:104
 msgid "NP Left"
 msgstr "TN Sinistra"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:128
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:115
 msgid "NP Multiply"
 msgstr "TN *"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:122
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:109
 msgid "NP Page Down"
 msgstr "TN Pag Giù"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:121
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:108
 msgid "NP Page Up"
 msgstr "TN Pag Su"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:119
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:106
 msgid "NP Right"
 msgstr "TN Destra"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:130
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:117
 msgid "NP Separator"
 msgstr "TN Separatore"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:109
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:96
 msgid "NP Space"
 msgstr "TN Spazio"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:131
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:118
 msgid "NP Subtract"
 msgstr "TN -"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:110
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:97
 msgid "NP Tab"
 msgstr "TN Tab"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:118
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:105
 msgid "NP Up"
 msgstr "TN Su"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:444
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:59
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:50
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:448
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:46
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:37
 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:25
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:72
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:282
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:553
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:15
 msgid "Name: "
 msgstr "Nome: "
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:526
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:562
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:516
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:555
 msgid "Native GCI files(*.gci)"
 msgstr "File GCI nativi(*.gci)"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:161
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:148
 msgid "New Scan"
 msgstr "Nuova Ricerca"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:206
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:193
 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:801
 msgid "Next Page"
 msgstr "Pagina Successiva"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:165
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:152
 msgid "Next Scan"
 msgstr "Ricerca Successiva"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:68
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:59
 msgid "Nickname :"
-msgstr "Pseudonimo:"
+msgstr "Nickname:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:196
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:190
 msgid "No Country (SDK)"
 msgstr "Nessun Paese (SDK)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:370
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:357
 msgid "No ISOs or WADS found"
-msgstr "Nessun ISO o WAD trovata"
+msgstr "Nessun ISO o WAD trovati"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:508
+#: Source/Core/Core/Src/ConfigManager.h:17
+msgid "No audio output"
+msgstr "Nessun output audio"
+
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:501
 #, c-format
 msgid "No banner file found for title  %s"
-msgstr "Nessun file di banner trovato per il titolo %s"
+msgstr "Nessun file banner trovato per il titolo %s"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:761
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:768
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:760
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:767
 msgid "No description available"
-msgstr ""
+msgstr "Non è disponibile una descrizione"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:514
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:535
 msgid "No docking"
 msgstr "Nessun aggancio"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:859
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:860
 msgid "No file loaded"
 msgstr "Nessun file caricato"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:439
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:426
 msgid "No free dir index entries"
 msgstr "Nessuna voce di directory libera"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:895
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:896
 msgid "No recorded file"
 msgstr "Nessun file registrato"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:501
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:494
 #, c-format
 msgid "No save folder found for title %s"
 msgstr "Nessuna cartella di salvataggio trovata per il titolo %s"
 
+#: Source/Plugins/Plugin_VideoOGL/Src/main.cpp:132
+#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:111
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:23
 #: Source/Core/DolphinWX/Src/NetWindow.cpp:600
 msgid "None"
-msgstr "Nessuno/a"
+msgstr "Nessuno"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:323
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303
 msgid "Norwegian Bokmaal"
 msgstr "Norvegese"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:203
 msgid "Not Equal"
 msgstr "Diverso"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:804
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:794
 msgid "Not Set"
 msgstr "Non Impostato"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:626
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:101
+#, c-format
+msgid "Not a Wii save or read failure for file header size %x"
+msgstr ""
+"Non è un file di salvataggio Wii o fallita lettura a causa della dimensione "
+"%x dell'intestazione del file"
+
+#: Source/Core/DolphinWX/Src/Main.cpp:654
 msgid "Not connected"
 msgstr "Non collegato"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:309
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:296
 msgid "Notes"
 msgstr "Note"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:16
 msgid "Notes: "
 msgstr "Note: "
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:71
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:74
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:580
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:621
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:629
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:59
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:64
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:613
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:659
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:667
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:31
 msgid "Notice"
 msgstr "Avviso/i"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:105
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:92
 msgid "Num Lock"
 msgstr "Bloc Num"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:88
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:75
 msgid "Number Of Codes: "
 msgstr "Numero Di Codici:"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:30
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:34
 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26
 msgid "Nunchuk"
 msgstr "Nunchuk"
@@ -3653,98 +3954,99 @@ msgstr "Nunchuk"
 msgid "Nunchuk Acceleration"
 msgstr "Accelerazione Nunchuk"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:877
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:878
 msgid "Object"
 msgstr "Oggetto"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:135
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:122
 msgid "Object Range"
 msgstr "Intervallo Oggetto"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:243
 msgid "Off"
-msgstr "Spento"
+msgstr "Off"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:62
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:49
 msgid "Offset:"
 msgstr "Offset:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:582
 msgid "On-Screen Display Messages"
-msgstr ""
+msgstr "Mostra Messaggi su Schermo"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:436
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:423
 #, c-format
 msgid "Only %d blocks available"
 msgstr "Solo %d blocchi disponibili"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:420
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:178
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:426
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:166
 msgid "Open"
 msgstr "Apri"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:876
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:867
 msgid "Open &containing folder"
 msgstr "Apri &percorso file"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:873
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:864
 msgid "Open Wii &save folder"
-msgstr "Apri cartella &salvataggi Wii"
+msgstr "Apri cartella dei &salvataggi"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:420
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:426
 msgid "Open file..."
 msgstr "Apri file..."
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:61
+#: Source/Core/AudioCommon/Src/OpenALStream.cpp:48
 #, 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:72
+#: Source/Core/AudioCommon/Src/OpenALStream.cpp:59
 msgid "OpenAL: can't find sound devices"
 msgstr "OpenAL: impossibile trovare la periferica audio"
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:66
+#: Source/Core/AudioCommon/Src/OpenALStream.cpp:53
 #, c-format
 msgid "OpenAL: can't open device %s"
 msgstr "OpenAL: impossibile aprire il dispositivo %s"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502
 msgid "OpenCL Texture Decoder"
-msgstr ""
+msgstr "Decoder Texture OpenCL"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503
 msgid "OpenMP Texture Decoder"
-msgstr "Decodificatore Trama OpenMP"
+msgstr "Decoder Texture OpenMP"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:317
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:94
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:304
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:81
 msgid "Options"
 msgstr "Opzioni"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:22
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Orange"
 msgstr "Arancione"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:468
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:455
+#, fuzzy
 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"
+"and import the saves to a new memcard\n"
 msgstr ""
 "L'ordine dei file nella File Directory non corrisponde con l'ordine dei "
 "blocchi\n"
 "Clicca col tasto destro del mouse ed esporta tutti i salvataggi,\n"
-"successivamente eseguire l'importazione di questi ultimi in una nuova "
-"memcard\n"
+"successivamente eseguire l'importazione di questi ultimi in una nuova memory "
+"card\n"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:316
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:324
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:509
 msgid "Other"
-msgstr ""
+msgstr "Altro"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:206
+#: Source/Core/Core/Src/NetPlayClient.cpp:210
 msgid ""
 "Other client disconnected while game is running!! NetPlay is disabled. You "
 "manually stop the game."
@@ -3752,15 +4054,15 @@ 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:481
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:468
 msgid "Output"
 msgstr "Output"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:342
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:348
 msgid "P&lay Recording..."
-msgstr "&Avvia Riproduzione Registrazione..."
+msgstr "&Riproduci Registrazione..."
 
-#: Source/Core/Core/Src/HW/GCPad.cpp:30
+#: Source/Core/Core/Src/HW/GCPad.cpp:18
 msgid "Pad"
 msgstr "Pad"
 
@@ -3768,228 +4070,228 @@ msgstr "Pad"
 msgid "Pad "
 msgstr "Pad "
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:34
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:38
 msgid "Pads"
-msgstr "Pads"
+msgstr "Pad"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:108
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:95
 msgid "Page Down"
 msgstr "Pag Giù"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:107
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:94
 msgid "Page Up"
 msgstr "Pag Su"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:35
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:22
 msgid "Paragraph"
 msgstr "Paragrafo"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:64
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:51
 msgid "Parameters"
 msgstr "Parametri"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:222
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:217
 #, c-format
 msgid "Partition %i"
 msgstr "Partizione %i"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:296
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:297
 msgid "Patches"
-msgstr "Patches"
+msgstr "Patch"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:556
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536
 msgid "Paths"
 msgstr "Percorsi"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1538
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1539
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:51
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1565
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1566
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:38
 msgid "Pause"
 msgstr "Pausa"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:128
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:129
 msgid "Pause at end of movie"
-msgstr ""
+msgstr "Pausa al termine del filmato"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:397
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405
 msgid "Per-Pixel Lighting"
-msgstr ""
+msgstr "Illuminazione Per-Pixel"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352
 msgid "Perfect"
 msgstr "Perfetto"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:609
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:642
 #, c-format
 msgid "Perspective %d"
 msgstr "Prospettiva %d"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:165
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:424
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1547
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1548
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:152
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:430
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1574
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1575
 msgid "Play"
 msgstr "Gioca"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176
 msgid "Play Recording"
-msgstr "Avvia Riproduzione Registrazione"
+msgstr "Riproduci Registrazione"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:170
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:170
 msgid "Play/Pause"
 msgstr "Gioca/Pausa"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351
 msgid "Playable"
 msgstr "Giocabile"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:154
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:141
 msgid "Playback Options"
 msgstr "Opzioni di Riproduzione"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:301
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:304
 msgid "Players"
 msgstr "Giocatori"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:988
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:991
 msgid "Please confirm..."
 msgstr "Per favore confermare..."
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:579
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:612
 msgid "Please create a perspective before saving"
 msgstr "Si prega di creare un prospettiva prima di salvare"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:36
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:23
 msgid "Plus-Minus"
 msgstr "Più-Meno"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:324
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304
 msgid "Polish"
 msgstr "Polacco"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:713
 msgid "Port 1"
 msgstr "Porta 1:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714
 msgid "Port 2"
 msgstr "Porta 2:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:734
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715
 msgid "Port 3"
 msgstr "Porta 3:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716
 msgid "Port 4"
 msgstr "Porta 4:"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:97
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:130
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:88
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:133
 msgid "Port :"
 msgstr "Porta:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:325
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305
 msgid "Portuguese"
 msgstr "Portoghese"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:326
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306
 msgid "Portuguese (Brazilian)"
 msgstr "Portoghese (Brasiliano)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:391
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:399
 msgid "Post-Processing Effect:"
-msgstr ""
+msgstr "Effetto di Post-Processing:"
 
-#: Source/Core/Core/Src/Movie.cpp:936
+#: Source/Core/Core/Src/Movie.cpp:927
 #, c-format
 msgid "Premature movie end in PlayController. %u + 8 > %u"
-msgstr ""
+msgstr "Termine prematuro del filmato in PlayController.  %u + 8 > %u"
 
-#: Source/Core/Core/Src/Movie.cpp:1055
+#: Source/Core/Core/Src/Movie.cpp:1046
 #, c-format
 msgid "Premature movie end in PlayWiimote. %u + %d > %u"
-msgstr ""
+msgstr "Termine prematuro del filmato in PlayWiimote. %u + %d > %u"
 
-#: Source/Core/Core/Src/Movie.cpp:1032
+#: Source/Core/Core/Src/Movie.cpp:1023
 #, c-format
 msgid "Premature movie end in PlayWiimote. %u > %u"
-msgstr ""
+msgstr "Termine prematuro del filmato in PlayWiimote. %u > %u"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:48
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:35
 msgid "Presets: "
 msgstr "Preimpostazioni: "
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:205
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:192
 msgid "Prev Page"
-msgstr "Pagina Precedente"
+msgstr "Pag. Precedente"
 
 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:800
 msgid "Previous Page"
 msgstr "Pagina Precedente"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:183
 msgid "Previous Value"
 msgstr "Valore Precedente"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:60
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:47
 msgid "Print"
 msgstr "Stamp"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:894
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:885
 msgid "Profile"
 msgstr "Profilo"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.h:55
+#: Source/Core/DolphinWX/Src/ISOProperties.h:42
 msgid "Properties"
 msgstr "Proprietà"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:283
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:286
 msgid "Purge Cache"
-msgstr "Pulisci Cache"
+msgstr "Ripulisci Cache"
 
-#: Source/Core/Common/Src/MsgHandler.cpp:66
+#: Source/Core/Common/Src/MsgHandler.cpp:52
 msgid "Question"
 msgstr "Conferma"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:159
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:316
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:162
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:319
 msgid "Quit"
 msgstr "Esci"
 
 #. i18n:  Right
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:59
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:46
 msgid "R"
 msgstr "R"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:40
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:27
 msgid "R Button"
 msgstr "Pulsante R"
 
 #. i18n:  Right-Analog
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:63
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
 msgid "R-Analog"
 msgstr "R-Analogico"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:445
 msgid "RAM"
 msgstr "RAM"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:175
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:169
 msgid "RUSSIA"
 msgstr "RUSSIA"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:528
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:515
 msgid "Range"
 msgstr "Gamma"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:190
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:178
 msgid "Read-only mode"
 msgstr "Modalità in Sola-lettura"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:487
 msgid "Real"
 msgstr "Reale"
 
@@ -3999,39 +4301,39 @@ msgstr "Wiimote Reale"
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:63
 msgid "Real Wiimotes"
-msgstr ""
+msgstr "Wiimote Reali"
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
 msgid "Reconnect Wiimote on State Loading"
-msgstr ""
+msgstr "Riconnetti il Wiimote al Caricamento di uno Stato di Gioco"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:193
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:217
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:791
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:180
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:204
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:790
 msgid "Record"
 msgstr "Registra"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:174
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:161
 msgid "Recording Info"
 msgstr "Info di Registrazione"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:202
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:189
 msgid "Recording Options"
 msgstr "Opzioni di Registrazione"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:21
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Red"
 msgstr "Rosso"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:24
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Red Left"
 msgstr "Rosso Sinistro"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:25
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Red Right"
 msgstr "Rosso Destro"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86
 msgid ""
 "Reduces the amount of aliasing caused by rasterizing 3D graphics.\n"
 "This makes the rendered picture look less blocky.\n"
@@ -4039,257 +4341,276 @@ msgid ""
 "\n"
 "If unsure, select None."
 msgstr ""
+"Riduce l'aliasing causato dalla rasterizzazione della grafica 3D.\n"
+"Rende l'immagine renderizzata meno cubettosa.\n"
+"Riduce pesantemente la velocità d'emulazione e a volte causa problemi.\n"
+"\n"
+"Nel dubbio, seleziona Nessuno."
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:60
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:421
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:903
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:427
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:894
 msgid "Refresh"
 msgstr "Aggiorna"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:180
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:168
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:168
 msgid "Refresh List"
 msgstr "Aggiorna Elenco"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:421
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:427
 msgid "Refresh game list"
-msgstr "Aggiorna elenco giochi"
+msgstr "Aggiorna l'elenco dei giochi"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:405
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:427
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:77
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:812
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:409
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:431
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:64
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:793
 msgid "Remove"
 msgstr "Rimuovi"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99
 msgid ""
 "Render the scene as a wireframe.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
+"Renderizza la scena in wireframe.\n"
+"\n"
+"Nel dubbio, lascia deselezionato."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:308
 msgid "Render to Main Window"
-msgstr "Rendering nella finestra Principale"
+msgstr "Renderizza nella Finestra Principale"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:915
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:172
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:906
 msgid "Reset"
 msgstr "Resetta"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:190
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:177
 msgid "Results"
 msgstr "Risultati"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:29
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:16
 msgid "Return"
 msgstr "Invio"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:277
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:57
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464
+msgid "Revision:"
+msgstr ""
+
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:264
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:44
 msgid "Right"
 msgstr "Destra"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:61
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:65
 msgid "Right Stick"
 msgstr "Levetta Destra"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:85
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:295
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:72
 msgid "Rumble"
 msgstr "Vibrazione"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:518
-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:498
+msgid ""
+"Run DSP HLE and LLE on a dedicated thread (not recommended: might cause "
+"audio glitches with HLE and freezes with LLE)."
+msgstr ""
+"Avvia DSP HLE e LLE su un thread dedicato (non consigliato: potrebbe causare "
+"glitch al sonoro con HLE e bloccarsi con LLE)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:327
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307
 msgid "Russian"
 msgstr "Russo"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:149
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:150
 msgid "Sa&ve State"
-msgstr "Sa&lva Stato di Gioco"
+msgstr "Sal&va Stato di Gioco"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:465
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475
 msgid "Safe"
-msgstr "Accurata"
+msgstr "Sicura"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:196
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:446
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:925
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:183
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:452
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916
 msgid "Save"
 msgstr "Salva"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:532
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:522
 msgid "Save GCI as..."
 msgstr "Salva GCI come.."
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
 msgid "Save State Slot 1"
-msgstr "Salva Stato di Gioco nell'Ingresso 1"
+msgstr "Salva Stato di Gioco nello Slot 1"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:198
 msgid "Save State Slot 2"
-msgstr "Salva Stato di Gioco nell'Ingresso 2"
+msgstr "Salva Stato di Gioco nello Slot 2"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:199
 msgid "Save State Slot 3"
-msgstr "Salva Stato di Gioco nell'Ingresso 3"
+msgstr "Salva Stato di Gioco nello Slot 3"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:212
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:212
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200
 msgid "Save State Slot 4"
-msgstr "Salva Stato di Gioco nell'Ingresso 4"
+msgstr "Salva Stato di Gioco nello Slot 4"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201
 msgid "Save State Slot 5"
-msgstr "Salva Stato di Gioco nell'Ingresso 5"
+msgstr "Salva Stato di Gioco nello Slot 5"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202
 msgid "Save State Slot 6"
-msgstr "Salva Stato di Gioco nell'Ingresso 6"
+msgstr "Salva Stato di Gioco nello Slot 6"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:203
 msgid "Save State Slot 7"
-msgstr "Salva Stato di Gioco nell'Ingresso 7"
+msgstr "Salva Stato di Gioco nello Slot 7"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204
 msgid "Save State Slot 8"
-msgstr "Salva Stato di Gioco nell'Ingresso 8"
+msgstr "Salva Stato di Gioco nello Slot 8"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:151
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:152
 msgid "Save State..."
 msgstr "Salva Stato di Gioco..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:582
 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:592
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:602
 msgid "Save as..."
 msgstr "Salva come..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1203
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1204
 msgid "Save compressed GCM/ISO"
-msgstr "Salva GCM/ISO compressi"
+msgstr "Salva GCM/ISO compressa"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:446
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:452
 msgid "Save current perspective"
 msgstr "Salva prospettiva corrente"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1192
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193
 msgid "Save decompressed GCM/ISO"
-msgstr "Salva GCM/ISO decompressi"
+msgstr "Salva GCM/ISO decompressa"
 
-#: Source/Core/Core/Src/Movie.cpp:801
+#: Source/Core/Core/Src/Movie.cpp:792
 #, 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:396
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:404
 msgid "Scaled EFB Copy"
-msgstr ""
+msgstr "Copia EFB in scala"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:556
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:543
 #, c-format
 msgid "Scanning %s"
-msgstr ""
+msgstr "Analizzo %s"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:539
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:526
 msgid "Scanning for ISOs"
 msgstr "Ricerca ISO"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:540
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:527
 msgid "Scanning..."
 msgstr "Ricerca..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:427
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
 msgid "ScrShot"
-msgstr "Istantanea"
+msgstr "Screenshot"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:106
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:93
 msgid "Scroll Lock"
 msgstr "Bloc Scroll"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:264
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:251
 msgid "Search"
 msgstr "Cerca"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:227
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:214
 msgid "Search Filter"
 msgstr "Filtro di Ricerca"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:810
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:791
 msgid "Search Subfolders"
 msgstr "Cerca nelle Sottocartelle"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:250
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:237
 msgid "Search current Object"
-msgstr ""
+msgstr "Cerca Oggetto corrente"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:254
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:241
 msgid "Search for hex Value:"
-msgstr ""
+msgstr "Cerca Valore esadecimale"
 
-#: Source/Core/Common/Src/SysConf.h:103 Source/Core/Common/Src/SysConf.h:126
-#: Source/Core/Common/Src/SysConf.h:146 Source/Core/Common/Src/SysConf.h:167
+#: Source/Core/Common/Src/SysConf.h:90 Source/Core/Common/Src/SysConf.h:113
+#: Source/Core/Common/Src/SysConf.h:133 Source/Core/Common/Src/SysConf.h:154
 #, c-format
 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:490
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:46
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:477
 msgid "Select"
 msgstr "Seleziona"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:677
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1072
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:683
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1087
 msgid "Select The Recording File"
-msgstr "Seleziona il File di Registrazione"
+msgstr "Seleziona la Registrazione"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1285
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1312
 msgid "Select a Wii WAD file to install"
 msgstr "Seleziona un file WAD Wii da installare"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:70
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74
 msgid ""
 "Select a hardware adapter to use.\n"
 "\n"
 "If unsure, use the first one."
 msgstr ""
+"Seleziona l'adattatore hardware da utilizzare.\n"
+"\n"
+"Nel dubbio, usa il primo."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:520
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:510
 msgid "Select a save file to import"
-msgstr "Seleziona un file da importare"
+msgstr "Seleziona un file di salvataggio da importare"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:363
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:366
 msgid "Select floating windows"
 msgstr "Seleziona finestre libere/mobili"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:582
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:585
 msgid "Select the file to load"
 msgstr "Seleziona il file da caricare"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1241
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1268
 msgid "Select the save file"
 msgstr "Seleziona il file di salvataggio"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1388
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1415
 msgid "Select the state to load"
 msgstr "Seleziona lo stato di gioco da caricare"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1429
 msgid "Select the state to save"
 msgstr "Seleziona lo stato di gioco da salvare"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82
 msgid ""
 "Select what aspect ratio to use when rendering:\n"
 "Auto: Use the native aspect ratio\n"
@@ -4299,16 +4620,24 @@ msgid ""
 "\n"
 "If unsure, select Auto."
 msgstr ""
+"Seleziona il rapporto d'aspetto da utilizzare in fase di rendering:\n"
+"Auto: utilizza il rapporto d'aspetto nativo\n"
+"Forza 16:9: Allarga l'immagine per ottenere un rapporto d'aspetto di 16:9.\n"
+"Forza 4:3: Allarga l'immagine per ottenere un rapporto d'aspetto di 4:3.\n"
+"Adatta a Finestra: Allarga l'immagine perché si adatti alle dimensioni della "
+"finestra.\n"
+"\n"
+"Nel dubbio, seleziona Auto."
 
-#: Source/Core/InputCommon/Src/InputConfig.cpp:61
+#: Source/Core/InputCommon/Src/InputConfig.cpp:48
 msgid "Selected controller profile does not exist"
-msgstr ""
+msgstr "Il profilo controller selezionato non esiste"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:116
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:109
 msgid "Selected font"
-msgstr "Carattere selezionato"
+msgstr "Font selezionato"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75
 msgid ""
 "Selects the display resolution used in fullscreen mode.\n"
 "This should always be bigger than or equal to the internal resolution. "
@@ -4317,183 +4646,213 @@ msgid ""
 "If unsure, use your desktop resolution.\n"
 "If still unsure, use the highest resolution which works for you."
 msgstr ""
+"Seleziona la risoluzione da utilizzare in modalità a schermo intero.\n"
+"Dovrebbe essere sempre maggiore o uguale alla risoluzione interna. L'impatto "
+"sulle prestazioni è trascurabile.\n"
+"\n"
+"Nel dubbio, usa la stessa risoluzione del desktop.\n"
+"Se sei ancora incerto, usa la più alta risoluzione funzionante."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:69
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:70
 msgid ""
 "Selects what graphics API to use internally.\n"
 "Direct3D 9 usually is the fastest one. OpenGL is more accurate though. "
 "Direct3D 11 is somewhere between the two.\n"
 "Note that the Direct3D backends are only available on Windows.\n"
 "\n"
-"If unsure, use Direct3D 9."
+"If unsure, use Direct3D 11."
 msgstr ""
+"Scegli quale API grafica usare internamente.\n"
+"Direct3D 9 è di solito la più rapida. OpenGL è la più precisa. Direct3D 11 "
+"si posiziona tra le due.\n"
+"Tieni presente che i motori Direct3D sono disponibili soltanto su Windows.\n"
+"\n"
+"Nel dubbio, usa Direct3D 11."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:288
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72
+msgid ""
+"Selects what graphics API to use internally.\n"
+"Direct3D 9 usually is the fastest one. OpenGL is more accurate though. "
+"Direct3D 11 is somewhere between the two.\n"
+"Note that the Direct3D backends are only available on Windows.\n"
+"\n"
+"If unsure, use OpenGL."
+msgstr ""
+"Scegli quale API grafica usare internamente.\n"
+"Direct3D 9 è di solito la più rapida. OpenGL è la più precisa. Direct3D 11 "
+"si posiziona tra le due.\n"
+"Tieni presente che i motori Direct3D sono disponibili soltanto su Windows.\n"
+"\n"
+"Nel dubbio, usa Direct3D 11."
+
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:291
 msgid "Send"
 msgstr "Invia"
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:94
 msgid "Sensor Bar Position:"
-msgstr "Posizione della Barra a Sensori: "
+msgstr "Posizione della Sensor Bar: "
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:77
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:64
 msgid "Separator"
 msgstr "Separatore"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:328
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308
 msgid "Serbian"
 msgstr "Serbo"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:522
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502
 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"
+"Porta Seriale 1 - Questa porta viene utilizzata da dispositivi come "
+"l'adattatore di rete"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:488
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:475
 msgid "Set"
 msgstr "Imposta"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:877
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:868
 msgid "Set as &default ISO"
 msgstr "Imposta come ISO &predefinita"
 
 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:802
 #, c-format
 msgid "Set as default Memcard %c"
-msgstr "Imposta %c come Memcard predefinita"
+msgstr "Imposta %c come Memory Card predefinita"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:460
+#: Source/Core/Core/Src/ActionReplay.cpp:450
 #, 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/ConfigMain.cpp:535
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:515
 msgid ""
 "Sets the latency (in ms).  Higher values may reduce audio crackling. OpenAL "
 "backend only."
 msgstr ""
+"Imposta la latenza (in ms). Valori maggiori possono ridurre la scattosità "
+"dell'audio. Solo con motore OpenAL."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341
 msgid "Settings..."
 msgstr "Impostazioni..."
 
-#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:222
+#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:209
 msgid "SetupWiiMem: Cant find setting file"
-msgstr "SetupWiiMem: Impossible trovare il file per le impostazioni"
+msgstr "SetupWiiMem: Impossible trovare il file di configurazione"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:291
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:278
 msgid "Shake"
 msgstr "Scuoti"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
 msgid "Short Name:"
 msgstr "Nome breve:"
 
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:103
+#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:90
 msgid "Shoulder Buttons"
-msgstr ""
+msgstr "Tasti Dorsali"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:217
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:220
 msgid "Show &Console"
 msgstr "Mostra &Console"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:215
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:218
 msgid "Show &Log"
 msgstr "Mostra Finestra di &Log"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:212
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:215
 msgid "Show &Statusbar"
 msgstr "Mostra Barra di &Stato"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:210
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:213
 msgid "Show &Toolbar"
 msgstr "Mostra Barra degli St&rumenti"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:281
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:284
 msgid "Show Drives"
 msgstr "Mostra Unità a Disco"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:517
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530
 msgid "Show EFB Copy Regions"
-msgstr ""
+msgstr "Mostra le Regioni di Copia dell'EFB"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:295
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303
 msgid "Show FPS"
 msgstr "Mostra FPS"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:271
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:274
 msgid "Show France"
 msgstr "Mostra Francia"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:257
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:260
 msgid "Show GameCube"
 msgstr "Mostra GameCube"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561
 msgid "Show Input Display"
 msgstr "Mostra Tasti di Input"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:273
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:276
 msgid "Show Italy"
 msgstr "Mostra Italia"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:264
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:267
 msgid "Show JAP"
 msgstr "Mostra JAP"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:275
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:278
 msgid "Show Korea"
 msgstr "Mostra Corea"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476
 msgid "Show Language:"
 msgstr "Mostra Lingua:"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:216
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:219
 msgid "Show Log &Configuration"
 msgstr "Mostra &Configurazione Log"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:266
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:269
 msgid "Show PAL"
 msgstr "Mostra PAL"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:254
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:257
 msgid "Show Platforms"
 msgstr "Mostra Piattaforme"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:263
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:266
 msgid "Show Regions"
 msgstr "Mostra Regioni"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:518
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531
 msgid "Show Statistics"
-msgstr ""
+msgstr "Mostra Informazioni"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:277
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:280
 msgid "Show Taiwan"
 msgstr "Mostra Taiwan"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:268
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:271
 msgid "Show USA"
 msgstr "Mostra USA"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:259
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:262
 msgid "Show Wad"
 msgstr "Mostra Wad"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:255
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:258
 msgid "Show Wii"
 msgstr "Mostra Wii"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491
 msgid "Show a confirmation box before stopping a game."
 msgstr "Mostra una messaggio di conferma prima di arrestare un gioco."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:512
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492
 msgid ""
 "Show a message box when a potentially serious error has occurred.\n"
 "Disabling this may avoid annoying and non-fatal messages, but it may also "
@@ -4501,24 +4860,26 @@ msgid ""
 msgstr ""
 "Mostra un avviso quando si verifica un potenziale grave errore.\n"
 "Disabilitando questa funzione si evita la comparsa di fastidiosi messaggi "
-"non-fatali, tuttavia\n"
-"potrà accadere che Dolphin improvvisamente incorra in un crash senza nessuna "
-"apparente spiegazione."
+"non rilevanti, tuttavia potrà accadere che Dolphin improvvisamente incorra "
+"in un crash senza alcuna apparente spiegazione."
 
 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:816
 msgid "Show first block"
 msgstr "Mostra primo blocco"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:130
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:131
 msgid "Show lag counter"
-msgstr ""
+msgstr "Mostra contatore lag"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493
 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 messaggi nell'area di emulazione.\n"
+"Questi messaggi includono scritture su memory card, informazioni sui motori "
+"video e CPU, e ripulitura della cache JIT."
 
 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:815
 msgid "Show save blocks"
@@ -4530,68 +4891,63 @@ msgstr "Mostra commento salvato"
 
 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:814
 msgid "Show save icon"
-msgstr "Mostra icona salvata"
+msgstr "Mostra icona di salvataggio"
 
 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:812
 msgid "Show save title"
-msgstr "Mostra titolo salvato"
+msgstr "Mostra titolo del salvataggio"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102
 msgid ""
 "Show the number of frames rendered per second as a measure of emulation "
 "speed.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
+"Mostra il numero di frame renderizzati ogni secondo come metro di misura "
+"della velocità di emulazione.\n"
+"\n"
+"Nel dubbio, lascia deselezionato."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:279
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:282
 msgid "Show unknown"
 msgstr "Mostra sconosciuto"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105
 msgid ""
 "Show various statistics.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
+"Mostra diverse informazioni.\n"
+"\n"
+"Nel dubbio, lascia deselezionato."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:319
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:306
 msgid "Sideways Wiimote"
 msgstr "Wiimote in posizione di traverso"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:280
 msgid "Simplified Chinese"
 msgstr "Cinese Semplificato"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:311
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:298
 msgid "Size"
 msgstr "Dimensioni"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:696
 msgid "Skip BIOS"
-msgstr ""
+msgstr "Salta BIOS"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316
 msgid "Skip DCBZ clearing"
-msgstr ""
+msgstr "Salta ripulitura DCBZ"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:492
-msgid "Skip Dest. Alpha Pass"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:444
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:454
 msgid "Skip EFB Access from CPU"
-msgstr ""
+msgstr "Salta Accesso della CPU all'EFB"
 
-#: 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 ""
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125
 msgid ""
 "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n"
 "Sometimes also increases visual quality.\n"
@@ -4600,28 +4956,34 @@ msgid ""
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
+"Velocizza leggermente le copie dell'EFB nella RAM al prezzo dell'accuratezza "
+"d'emulazione.\n"
+"Se stai riscontrando problemi, prova ad aumentare l'accuratezza della cache "
+"delle texture o a disabilitare questa opzione.\n"
+"\n"
+"Nel dubbio, lascia deselezionato."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:374
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:386
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:380
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:392
 #, c-format
 msgid "Slot %i"
 msgstr "Ingresso %i"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:700
 msgid "Slot A"
 msgstr "Ingresso A"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:701
 msgid "Slot B"
 msgstr "Ingresso B"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:62
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:49
 msgid "Snapshot"
 msgstr "Stamp"
 
-#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:58
+#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:46
 msgid "Software Renderer"
-msgstr ""
+msgstr "Renderer Software"
 
 #: Source/Core/DolphinWX/Src/VideoConfigDiag.h:84
 msgid ""
@@ -4630,28 +4992,32 @@ msgid ""
 "It's only useful for debugging purposes.\n"
 "Do you really want to enable software rendering? If unsure, select 'No'."
 msgstr ""
+"Il rendering software è a un ordine di grandezza più lento rispetto "
+"l'utilizzo degli altri motori.\n"
+"È utile solamente ai fini di debugging.\n"
+"Vuoi davvero abilitare il rendering software? Nel dubbio, seleziona 'No'."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:683
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:664
 msgid "Sound Settings"
 msgstr "Impostazioni Audio"
 
-#: Source/Core/AudioCommon/Src/AudioCommon.cpp:77
+#: Source/Core/AudioCommon/Src/AudioCommon.cpp:64
 #, c-format
 msgid "Sound backend %s is not valid."
-msgstr "L'interfaccia audio %s non è valida."
+msgstr "Il motore audio %s non è valido."
 
-#: Source/Core/AudioCommon/Src/DSoundStream.cpp:59
+#: Source/Core/AudioCommon/Src/DSoundStream.cpp:46
 #, c-format
 msgid "Sound buffer creation failed: %s"
-msgstr "Creazione buffer audio non riuscita: %s"
+msgstr "Creazione del buffer audio non riuscita: %s"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:31
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:18
 msgid "Space"
 msgstr "Spazio"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:329
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309
 msgid "Spanish"
 msgstr "Spagnolo"
 
@@ -4659,7 +5025,7 @@ msgstr "Spagnolo"
 msgid "Speaker Volume:"
 msgstr "Volume Altoparlante:"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92
 msgid ""
 "Specifies the resolution used to render at. A high resolution will improve "
 "visual quality a lot but is also quite heavy on performance and might cause "
@@ -4670,64 +5036,72 @@ msgid ""
 "\n"
 "If unsure, select 640x528."
 msgstr ""
+"Indica la risoluzione a cui bisogna renderizzare le immagini. Un'alta "
+"risoluzione aumenterà di molto la qualità visiva ma avrà un grande impatto "
+"sulle prestazioni, e potrebbe anche causare artefatti in alcuni giochi.\n"
+"\"Multiplo di 640x528\" è leggermente più lento di \"Dimensione Finestra\" "
+"ma causa meno problemi. In generale, minore è la risoluzione interna, "
+"migliori saranno le prestazioni.\n"
+"\n"
+"Nel dubbio, seleziona 640x528."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322
 msgid "Speed up Disc Transfer Rate"
 msgstr "Aumenta la velocità di trasferimento del Disco"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:243
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:230
 msgid "Square Stick"
-msgstr "Levetta Quadrata"
+msgstr "Squadratura"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:107
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87
 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:322
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:37
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:25
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:325
 msgid "Start"
 msgstr "Start"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:194
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:197
 msgid "Start &NetPlay"
-msgstr "Avvia Gioco-&Online"
+msgstr "Avvia &NetPlay"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:339
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:345
 msgid "Start Re&cording"
 msgstr "Avvia Re&gistrazione"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:175
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:175
 msgid "Start Recording"
 msgstr "Avvia Registrazione"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:312
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:299
 msgid "State"
 msgstr "Stato"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:173
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:161
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:161
 msgid "State Saves"
 msgstr "Stati di Gioco"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:108
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88
 msgid "Steering Wheel"
-msgstr ""
+msgstr "Volante"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:53
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:57
 msgid "Stick"
 msgstr "Levetta"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:420
-#: 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:325
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:419
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:431
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:171
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:171
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:328
 msgid "Stop"
 msgstr "Arresta"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96
 msgid ""
 "Store EFB copies in GPU texture objects.\n"
 "This is not so accurate, but it works well enough for most games and gives a "
@@ -4735,161 +5109,181 @@ msgid ""
 "\n"
 "If unsure, leave this checked."
 msgstr ""
+"Salva le copie dell'EFB in oggetti texture della GPU.\n"
+"Non è molto preciso, ma funziona abbastanza bene nella maggior parte dei "
+"titoli, e fornisce maggiore velocità rispetto l'EFB su RAM.\n"
+"\n"
+"Nel dubbio, lascia selezionato."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:275
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283
 msgid "Stretch to Window"
 msgstr "Adatta a Finestra"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:43
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:47
 msgid "Strum"
 msgstr "Strimpellata"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:78
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:65
 msgid "Subtract"
 msgstr "-"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:77
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:67
 #, c-format
 msgid "Successfully exported file to %s"
-msgstr "Esportazione file in %s riuscita"
+msgstr "Il file è stato esportato in %s con successo"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:56
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:43
 msgid "Successfully imported save files"
-msgstr "Seleziona il file di salvataggio"
+msgstr "I file di salvataggio sono stati importati con successo."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:285
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:272
 msgid "Swing"
 msgstr "Ruota/Oscilla"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:744
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:792
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320
+msgid "Synchronize GPU thread"
+msgstr "Sincronizza thread GPU"
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321
+msgid ""
+"Synchronizes the GPU and CPU threads to help prevent random freezes in Dual "
+"Core mode. (ON = Compatible, OFF = Fast)"
+msgstr ""
+"Sincronizza i thread della GPU e della CPU per prevenire alcuni blocchi "
+"casuali in modalità Dual Core. (ON = Compatibilità, OFF = Velocità)"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773
 msgid "System Language:"
 msgstr "Lingua di Sistema:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:191
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:185
 msgid "TAIWAN"
 msgstr "TAIWAN"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:127
-#: Source/Core/DolphinWX/Src/TASInputDlg.h:32
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:128
+#: Source/Core/DolphinWX/Src/TASInputDlg.h:19
 msgid "TAS Input"
-msgstr ""
+msgstr "Input TAS"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:28
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:15
 msgid "Tab"
 msgstr "Tab"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:510
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:531
 msgid "Tab split"
 msgstr "Separatore Scheda (Tab)"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:37
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:41
 msgid "Table Left"
 msgstr "Semipiano sinistro"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:38
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:42
 msgid "Table Right"
 msgstr "Semipiano destro"
 
-#: 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
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:361
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:181
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:181
 msgid "Take Screenshot"
-msgstr "Genera un'Istantanea di Gioco"
+msgstr "Cattura uno Screenshot"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:109
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89
 msgid "TaruKonga (Bongos)"
-msgstr ""
+msgstr "TaruKonga (Bongo)"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:472
 msgid "Test"
 msgstr "Prova"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:444
 msgid "Texture"
-msgstr "Trama"
+msgstr "Texture"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:451
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:461
 msgid "Texture Cache"
-msgstr ""
+msgstr "Cache Texture"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:519
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:532
 msgid "Texture Format Overlay"
-msgstr ""
+msgstr "Overlay Formato Texture"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:226
+#: Source/Core/Core/Src/CoreParameter.cpp:215
 msgid "The WAD has been installed successfully"
-msgstr "Installazione WAD riuscita"
+msgstr "Il WAD è stato installato con successo"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:197
+#: Source/Core/Core/Src/ActionReplay.cpp:185
 msgid "The address is invalid"
 msgstr "L'indirizzo non è valido"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:509
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:496
 msgid "The checksum was successfully fixed"
-msgstr "Tentativo di ripristino della somma di controllo riuscito"
+msgstr "Il checksum è stato corretto con successo"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1242
+#: 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:1117
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1216
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1118
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1146
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1217
 #, c-format
 msgid ""
 "The file %s already exists.\n"
 "Do you wish to replace it?"
 msgstr ""
-"%s esiste già.\n"
+"Il file %s esiste già.\n"
 "Vuoi sostituirlo?"
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:51
+#: Source/Core/AudioCommon/Src/WaveFile.cpp:38
 #, c-format
 msgid ""
 "The file %s could not be opened for writing. Please check if it's already "
 "opened by another program."
 msgstr ""
+"Impossibile aprire il file %s in scrittura. Verificare che non sia già "
+"aperto in un altro programma."
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:44
+#: Source/Core/AudioCommon/Src/WaveFile.cpp:31
 #, c-format
 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."
+msgstr "Il file %s è già stato aperto, l'intestazione non verrà scritta."
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:332
+#: Source/Core/Core/Src/Boot/Boot.cpp:320
 #, c-format
 msgid "The file you specified (%s) does not exist"
-msgstr "Il file %s specificato non esiste"
+msgstr "Il file specificato (%s) non esiste"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:628
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:666
 msgid "The name can not be empty"
-msgstr "il nome non puo' essere nullo"
+msgstr "il nome non può essere vuoto"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:620
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:658
 msgid "The name can not contain the character ','"
 msgstr "Il nome non può contenere il carattere ','"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:142
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:129
 msgid "The resulting decrypted AR code doesn't contain any lines."
-msgstr ""
+msgstr "Il codice AR decriptato risultante non contiene alcuna riga."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98
 msgid ""
 "The safer you adjust this, the less likely the emulator will be missing any "
 "texture updates from RAM.\n"
 "\n"
 "If unsure, use the rightmost value."
 msgstr ""
+"Più questo settaggio è settato verso \"Sicura\", meno saranno le probabilità "
+"che l'emulatore salti l'aggiornamento di una texture dalla RAM"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:445
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:432
 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:388
+#: Source/Core/DolphinWX/Src/Main.cpp:416
 msgid ""
 "The selected language is not supported by your system. Falling back to "
 "system default."
@@ -4897,44 +5291,44 @@ msgstr ""
 "La lingua selezionata non è supportata dal tuo sistema. Ritorno alla "
 "predefinita di sistema."
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:43
+#: Source/Core/Core/Src/NetPlayClient.cpp:47
 msgid "The server and client's NetPlay versions are incompatible!"
-msgstr "Le versioni del server e del client Gioco-Online non sono compatibili!"
+msgstr "Le versioni di NetPlay del server e del client non sono compatibili!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:40
+#: Source/Core/Core/Src/NetPlayClient.cpp:44
 msgid "The server is full!"
 msgstr "Il server è pieno!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:46
+#: Source/Core/Core/Src/NetPlayClient.cpp:50
 msgid "The server responded: the game is currently running!"
 msgstr "Il server ha risposto: il gioco è correntemente in esecuzione!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:49
+#: Source/Core/Core/Src/NetPlayClient.cpp:53
 msgid "The server sent an unknown error message!"
 msgstr "Il server invia un messaggio d'errore sconosciuto!"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:119
+#: Source/Core/Core/Src/CoreParameter.cpp:108
 #, c-format
 msgid "The specified file \"%s\" does not exist"
-msgstr "il file \"%s\" specificato non esiste"
+msgstr "il file specificato \"%s\" non esiste"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:198
+#: Source/Core/Core/Src/ActionReplay.cpp:186
 msgid "The value is invalid"
 msgstr "Il valore non è valido"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:642
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:623
 msgid "Theme:"
-msgstr ""
+msgstr "Tema:"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:476
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:463
 msgid ""
 "There must be a ticket for 00000001/00000002. Your NAND dump is probably "
 "incomplete."
 msgstr ""
-"Un punto di ingresso in 00000001/00000002 deve essere presente. Dumping NAND "
+"Deve esistere un ticket per 00000001/00000002. Il dump della tua NAND è "
 "probabilmente incompleto."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308
 msgid ""
 "These settings override core Dolphin settings.\n"
 "Undetermined means the game uses Dolphin's setting."
@@ -4943,20 +5337,20 @@ msgstr ""
 "Per impostazione 'indeterminata' si intende che il gioco utilizza "
 "l'impostazione di Dolphin."
 
-#: Source/Core/Core/Src/ActionReplay.cpp:355
+#: Source/Core/Core/Src/ActionReplay.cpp:345
 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:525
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505
 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:113
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118
 msgid ""
 "This feature allows you to change the game's camera.\n"
 "Move the mouse while holding the right mouse button to pan and while holding "
@@ -4967,8 +5361,27 @@ msgid ""
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
+"Questa impostazione ti permette di muovere la telecamera di gioco.\n"
+"Muovi il mouse tenendo premuto il tasto destro per ruotarla e tenendo "
+"premuto il tasto centrale del mouse per spostarla.\n"
+"Tieni premuto SHIFT e premi W, A, S o D per muovere la telecamera di una "
+"distanza fissa (SHIFT+0 muove la telecamera più velocemente e SHIFT+9 più "
+"lentamente). Premi SHIFT+R per resettare la telecamera.\n"
+"\n"
+"Nel dubbio, lascia deselezionato."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485
+#, fuzzy
+msgid ""
+"This limits the game speed to the specified number of frames per second "
+"(full speed is 60 for NTSC and 50 for PAL). Alternatively, use Audio to "
+"throttle using the DSP (might fix audio clicks but can also cause constant "
+"noise depending on the game)."
+msgstr ""
+"Imposta un limite ai frame disegnati ogni secondo diverso dal valore "
+"standard (NTSC:60, PAL:50)"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484
 msgid ""
 "This splits the Video and CPU threads, so they can be run on separate "
 "cores.\n"
@@ -4982,78 +5395,78 @@ 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:286
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:287
 msgid "This will let you Manually Edit the INI config file"
 msgstr ""
 "Questo vi permetterà di modificare manualmente il file di configurazione INI"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:249
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:254
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:236
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:241
 msgid "Threshold"
 msgstr "Sensibilità"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:288
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:275
 msgid "Tilt"
 msgstr "Inclina"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:628
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:304
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:622
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:291
 msgid "Title"
 msgstr "Titolo"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:125
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:144
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:112
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:131
 msgid "To"
 msgstr "a"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:72
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59
 msgid "Toggle All Log Types"
 msgstr "Seleziona/Deseleziona tutti i Tipi di Log"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:426
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:432
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:180
 msgid "Toggle Fullscreen"
-msgstr "Commuta a Schermo Intero"
+msgstr "Visualizza a Schermo Intero"
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:87
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:271
 msgid "Top"
 msgstr "Sopra"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:281
 msgid "Traditional Chinese"
 msgstr "Cinese Tradizionale"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:426
+#: Source/Core/Core/Src/Boot/Boot.cpp:414
 msgid "Tried to load an unknown file type."
 msgstr "Tentativo di caricamento di un tipo di file sconosciuto."
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:80
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:67
 msgid "Triggers"
 msgstr "Grilletti"
 
-#: Source/Core/Common/Src/SysConf.h:91 Source/Core/Common/Src/SysConf.h:114
+#: Source/Core/Common/Src/SysConf.h:78 Source/Core/Common/Src/SysConf.h:101
 msgid "Trying to read from invalid SYSCONF"
 msgstr "Tentativo di accesso da una SYSCONF non valida"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:44
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:31
 msgid ""
 "Trying to read from invalid SYSCONF\n"
 "Wiimote bt ids are not available"
 msgstr ""
-"Tentativo di accesso da una SYSCONF non valida\n"
+"Tentativo di lettura da una SYSCONF non valida\n"
 "Gli identificativi Wiimote bt non sono disponibili"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:330
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
 msgid "Turkish"
 msgstr "Turco"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:33
 msgid "Turntable"
-msgstr "Giradischi da DJ"
+msgstr "Mixer"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:71
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58
 msgid "Type"
 msgstr "Tipo"
 
@@ -5061,116 +5474,145 @@ msgstr "Tipo"
 msgid "UDP Port:"
 msgstr "Porta UDP:"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:279
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:266
 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12
 msgid "UDP Wiimote"
 msgstr "Wiimote UDP"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:199
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:193
 msgid "UNKNOWN"
 msgstr "SCONOSCIUTO"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:756
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:755
 #, c-format
 msgid "UNKNOWN_%02X"
-msgstr ""
+msgstr "UNKNOWN_%02X"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:178
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:172
 msgid "USA"
 msgstr "USA"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:225
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:214
 msgid ""
 "Unable to create patch from given values.\n"
 "Entry not modified."
 msgstr ""
+"Impossibile creare la patch a partire dai valori forniti.\n"
+"Voce non modificata."
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:124
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:111
 #, c-format
 msgid ""
 "Unable to parse line %lu of the entered AR code as a valid encrypted or "
 "decrypted code.  Make sure you typed it correctly.\n"
 "Would you like to ignore this line and continue parsing?"
 msgstr ""
+"Impossibile analizzare come un codice criptato o decriptato valido la riga "
+"%lu del codice AR inserito. Assicurati di averlo inserito correttamente.\n"
+"Vuoi ignorare questa riga e continuare l'analisi?"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:391
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:397
 #, c-format
 msgid "Undefined %i"
 msgstr "%i non definito"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:163
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:164
 msgid "Undo Load State"
 msgstr "Annulla Caricamento Stato di Gioco"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:718
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:717
 msgid "Unexpected 0x80 call? Aborting..."
-msgstr ""
+msgstr "Chiamata 0x80 inaspettata? Interruzione..."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:215
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:202
 msgid "Unknown"
 msgstr "Sconosciuto"
 
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:971
+#: Source/Core/Core/Src/HW/DVDInterface.cpp:965
 #, c-format
 msgid "Unknown DVD command %08x - fatal error"
 msgstr "Comando DVD %08x sconosciuto - errore fatale"
 
-#: Source/Core/Common/Src/SysConf.cpp:145
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:444
+#, c-format
+msgid "Unknown command 0x%08x"
+msgstr "Comando 0x%08x sconosciuto"
+
+#: Source/Core/Common/Src/SysConf.cpp:132
 #, c-format
 msgid "Unknown entry type %i in SYSCONF (%s@%x)!"
 msgstr "Voce %i sconosciuta in SYSCONF (%s@%x)!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:228
+#: Source/Core/Core/Src/NetPlayClient.cpp:232
 #, c-format
 msgid "Unknown message received with id : %d"
 msgstr "Messaggio ricevuto sconosciuto avente id : %d"
 
-#: Source/Core/Core/Src/NetPlayServer.cpp:504
+#: Source/Core/Core/Src/NetPlayServer.cpp:508
 #, c-format
 msgid "Unknown message with id:%d received from player:%d Kicking player!"
 msgstr ""
 "Messaggio sconosciuto avente id:%d ricevuto dal giocatore:%d Giocatore "
 "espluso!!"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:274
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:56
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:261
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:43
 msgid "Up"
 msgstr "Su"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:108
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:95
 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17
 msgid "Update"
 msgstr "Aggiorna"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:320
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:307
 msgid "Upright Wiimote"
 msgstr "Wiimote in posizione verticale"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:777
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758
 msgid "Use EuRGB60 Mode (PAL60)"
 msgstr "Utilizza Modalità EuRGB60 (PAL60)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:294
 msgid "Use Fullscreen"
-msgstr ""
+msgstr "Usa Schermo Intero"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:575
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:563
 msgid "Use Hex"
 msgstr "Usa Hex"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:600
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580
 msgid "Use Panic Handlers"
 msgstr "Avvisi di Errore"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89
+msgid ""
+"Use a hacked upload strategy to stream vertices.\n"
+"This usually speed up, but is forbidden by OpenGL specification and may "
+"causes heavy glitches.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+"Utilizza una strategia particolare di uploading per il vertex stream.\n"
+"Di solito velocizza l'emulazione, ma è vietato dalle specifiche OpenGL e "
+"potrebbe causare pesanti artefatti.\n"
+"\n"
+"Nel dubbio, lascia deselezionato."
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122
 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 ""
+"Utilizza più thread per decodificare le texture.\n"
+"Potrebbe fornire un incremento nella velocità d'emulazione (soprattutto "
+"nelle CPU con più di due core).\n"
+"\n"
+"Nel dubbio, lascia deselezionato."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126
 msgid ""
 "Usually if shader compilation fails, an error message is displayed.\n"
 "However, one may skip the popups to allow interruption free gameplay by "
@@ -5178,80 +5620,95 @@ msgid ""
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
+"Di solito viene visualizzato un messaggio di errore in caso di fallimento di "
+"compilazione di uno shader.\n"
+"Comunque, selezionando questa opzione si può decidere di nascondere i popup "
+"per giocare senza interruzioni.\n"
+"\n"
+"Nel dubbio, lascia deselezionato."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:539
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:552
 msgid "Utility"
 msgstr "Utilità"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:285
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:293
 msgid "V-Sync"
 msgstr "V-Sync"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:209
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318
+#, fuzzy
+msgid "VBeam Speed Hack"
+msgstr "Hack Velocità MMU"
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196
 msgid "Value"
 msgstr "Valore"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:73
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:60
 msgid "Value:"
 msgstr "Valore:"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:572
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:560
 msgid "Value: "
 msgstr "Valore: "
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:51
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:38
 msgid "Verbosity"
 msgstr "Verboso"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:377
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:381
 msgid "Video"
 msgstr "Video"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:486
 msgid "Virtual"
 msgstr "Virtuale"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:689
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670
 msgid "Volume"
 msgstr "Volume"
 
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:498
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:527
+#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:488
+#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:517
 #, c-format
 msgid "WAD installation failed: error creating %s"
 msgstr "Installazione WAD non riuscita: errore nella creazione di %s"
 
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:547
+#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:537
 msgid "WAD installation failed: error creating ticket"
-msgstr ""
+msgstr "Fallita installazione del WAD: errore durante la creazione del ticket"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84
 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 ""
+"Attende il disegno completo dei frame per ridurre i fenomeni di tearing.\n"
+"Riduce le performance se la velocità d'emulazione è inferiore al 100%.\n"
+"\n"
+"Nel dubbio, lascia deselezionato."
 
-#: Source/Core/Common/Src/MsgHandler.cpp:67
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46
+#: Source/Core/Common/Src/MsgHandler.cpp:53
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:33
 #: Source/Core/DolphinWX/Src/VideoConfigDiag.h:85
 msgid "Warning"
-msgstr "Allarme/i"
+msgstr "Attenzione"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:291
+#: Source/Core/Core/Src/Boot/Boot.cpp:279
 msgid "Warning - starting DOL in wrong console mode!"
 msgstr "Attenzione - avvio DOL in modalità console errata!"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:341
+#: Source/Core/Core/Src/Boot/Boot.cpp:329
 msgid "Warning - starting ELF in wrong console mode!"
 msgstr "Attenzione - avvio ELF in modalità console errata!"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:221
+#: Source/Core/Core/Src/Boot/Boot.cpp:209
 msgid "Warning - starting ISO in wrong console mode!"
 msgstr "Attenzione - avvio ISO in modalità console errata!"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:519
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:512
 #, c-format
 msgid ""
 "Warning! it is advised to backup all files in the folder:\n"
@@ -5263,7 +5720,7 @@ msgstr ""
 "%s\n"
 "Vuoi proseguire?"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:585
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:578
 #, c-format
 msgid ""
 "Warning: This will overwrite any existing saves that are in the folder:\n"
@@ -5271,29 +5728,37 @@ msgid ""
 "and have the same name as a file on your memcard\n"
 "Continue?"
 msgstr ""
-"Avviso: Questo sovrascriverà qualsiasi salvataggio esistente nella "
+"Attenzione: Questo sovrascriverà qualunque salvataggio già esistente nella "
 "cartella:\n"
 "%s\n"
-"la quale presenta un nome uguale ai file sulla tua memcard\n"
+"dal nome uguale a quello dei file sulla tua memory card\n"
 "Continuare?"
 
-#: Source/Core/Core/Src/Movie.cpp:844
+#: Source/Core/Core/Src/Movie.cpp:835
 #, 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 ""
+"Attenzione: Hai caricato un salvataggio situato oltre il termine del filmato "
+"corrente. (byte %u > %u) (frame %u > %u). Dovresti caricare un'altro "
+"salvataggio prima di continuare, o caricare questo stesso stato con modalità "
+"sola-lettura off."
 
-#: Source/Core/Core/Src/Movie.cpp:861
+#: Source/Core/Core/Src/Movie.cpp:852
 #, 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 ""
+"Attenzione: Hai caricato un salvataggio il cui filmato discorda al byte %d "
+"(0x%X). Dovresti caricare un altro salvataggio prima di continuare, o "
+"caricare questo stato in modalità sola-lettura off. Altrimenti probabilmente "
+"riscontrerai una desincronizzazione."
 
-#: Source/Core/Core/Src/Movie.cpp:870
+#: Source/Core/Core/Src/Movie.cpp:861
 #, c-format
 msgid ""
 "Warning: You loaded a save whose movie mismatches on frame %d. You should "
@@ -5311,59 +5776,74 @@ 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 ""
+"Attenzione: hai caricato un salvataggio il cui filmato discorda al frame %d. "
+"Dovresti caricare un altro salvataggio prima di continuare, o caricare "
+"questo stato in modalità sola-lettura off. Altrimenti riscontrerai "
+"probabilmente una descincronizzazione.\n"
+"\n"
+"Maggiori informazioni: Il filmato attuale è lungo %d frames e il filmato "
+"dello stato di gioco è lungo %d frames.\n"
+"\n"
+"Al frame %d, il filmato attuale preme: Start=%d, A=%d, B=%d, X=%d, Y=%d, Z="
+"%d, DUp=%d, DDown=%d, DLeft=%d, DRight=%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX="
+"%d, AnalogY=%d, CX=%d, CY=%d⏎\n"
+"⏎\n"
+"Al frame %d, il filmato del salvataggio dello stato di gioco preme:⏎\n"
+"Start=%d, A=%d, B=%d, X=%d, Y=%d, Z=%d, DUp=%d, DDown=%d, DLeft=%d, DRight="
+"%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d"
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:106
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:129
+#: Source/Core/AudioCommon/Src/WaveFile.cpp:93
+#: Source/Core/AudioCommon/Src/WaveFile.cpp:116
 msgid "WaveFileWriter - file not open."
 msgstr "WaweFileWriter - file non aperto."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:56
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:60
 msgid "Whammy"
 msgstr "Tremolo"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:404
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:408
 msgid "Widescreen Hack"
 msgstr "Hack Widescreen"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:312
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:299
 msgid "Width"
 msgstr "Larghezza"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535
 msgid "Wii"
 msgstr "Wii"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:372
 msgid "Wii Console"
 msgstr "Console Wii"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:844
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:825
 msgid "Wii NAND Root:"
-msgstr ""
+msgstr "Root NAND Wii:"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:191
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:194
 msgid "Wii Save Import"
 msgstr "Importa Salvataggi Wii"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1243
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1270
 msgid "Wii save files (*.bin)|*.bin"
-msgstr "Salva i file Wii (*.bin)|*.bin"
+msgstr "File di Salvataggio Wii (*.bin)|*.bin"
 
-#: Source/Core/DiscIO/Src/WiiWad.cpp:82
+#: Source/Core/DiscIO/Src/WiiWad.cpp:69
 msgid "WiiWAD: Could not read from file"
 msgstr "WiiWAD: Impossibile leggere dal file"
 
-#: Source/Core/Core/Src/HW/Wiimote.cpp:17
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
+#: Source/Core/Core/Src/HW/Wiimote.cpp:20
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
 msgid "Wiimote"
 msgstr "Wiimote"
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:21
 #, c-format
 msgid "Wiimote %i"
-msgstr ""
+msgstr "Wiimote %i"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:628
+#: Source/Core/DolphinWX/Src/Main.cpp:656
 msgid "Wiimote Connected"
 msgstr "Wiimote Collegato"
 
@@ -5371,108 +5851,134 @@ msgstr "Wiimote Collegato"
 msgid "Wiimote Motor"
 msgstr "Vibrazione Wiimote"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
 msgid "Wiimote settings"
 msgstr "Impostazioni Wiimote"
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:48
 msgid "Wiimotes"
-msgstr ""
+msgstr "Wiimote"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:134
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:121
 msgid "Windows Left"
 msgstr "Windows Sinistro"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:136
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:123
 msgid "Windows Menu"
 msgstr "Menù Windows"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:135
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:122
 msgid "Windows Right"
 msgstr "Windows Destro"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:131
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:124
 msgid "Word Wrap"
 msgstr "Adatta Testo"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1298
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:864
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1089
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1225
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1325
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:880
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1090
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1226
 msgid "Working..."
 msgstr "Attività in corso..."
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:338
+msgid "Write memcards (GC)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46
 msgid "Write to Console"
 msgstr "Scrivi nella Console"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:67
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:54
 msgid "Write to Debugger"
-msgstr ""
+msgstr "Scrivi sul Debugger"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:57
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44
 msgid "Write to File"
 msgstr "Scrivi su File"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:61
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48
 msgid "Write to Window"
 msgstr "Scrivi in Finestra"
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:60
+#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:47
 #, c-format
 msgid "XAudio2 CreateSourceVoice failed: %#X"
 msgstr "CreateSourceVoice XAudio2 non riuscita: %#X"
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:114
+#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:101
 #, c-format
 msgid "XAudio2 init failed: %#X"
 msgstr "Inizializzazione XAudio2 non riuscita: %#X"
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:124
+#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:111
 #, c-format
 msgid "XAudio2 master voice creation failed: %#X"
-msgstr "Creazione voce principale XAudio2 non riuscita: %#X"
+msgstr "Creazione master voice XAudio2 non riuscita: %#X"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:766
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:765
 msgid "XF reg"
-msgstr ""
+msgstr "XF reg"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:21
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Yellow"
 msgstr "Giallo"
 
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:107
+#: Source/Core/Core/Src/DSP/DSPCore.cpp:120
 msgid ""
-"You are using free dsp roms made by Dolphin Team.\n"
-"Only Zelda ucode games will work correctly with them.\n"
+"You are using a free DSP ROM made by the Dolphin Team.\n"
+"All Wii games will work correctly, and most GC games should also work fine, "
+"but the GBA/IPL/CARD UCodes will not work.\n"
 msgstr ""
+"Stai utilizzando una ROM DSP gratuita creata dal Dolphin Team.\n"
+"Tutti i giochi Wii e la maggior parte dei giochi GC funzioneranno "
+"correttamente, ma gli UCodes GBA/IPL/CARD invece no.\n"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:73
+#: Source/Core/Core/Src/DSP/DSPCore.cpp:116
+msgid ""
+"You are using an old free DSP ROM made by the Dolphin Team.\n"
+"Only games using the Zelda UCode will work correctly.\n"
+msgstr ""
+"Stai utilizzando una vecchia ROM DSP gratuita creata dal Dolphin Team.\n"
+"Soltanto i giochi che utilizzano lo Zelda Ucode funzioneranno "
+"correttamente.\n"
+
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:63
 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:207
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:210
 msgid "You must choose a game!!"
-msgstr "E' necessario selezionare un gioco!!"
+msgstr "È necessario selezionare un gioco!!"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:605
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:593
 msgid "You must enter a name!"
-msgstr "E' richiesto l'inserimento di un nome!"
+msgstr "Devi inserire un nome!"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:450
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:438
 msgid "You must enter a valid decimal, hexadecimal or octal value."
-msgstr "E' necessario inserire un valore decimale, esadecimale o ottale."
+msgstr "È necessario inserire un valore decimale, esadecimale o ottale."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:603
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:591
 msgid "You must enter a valid profile name."
-msgstr "E' necessario inserie un nome valido per il profilo."
+msgstr "Devi inserire un nome valido per il profilo."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:936
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:917
 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."
+msgstr "È necessario riavviare Dolphin affinché le modifiche abbiano effetto."
 
-#: Source/Core/Core/Src/CoreParameter.cpp:175
+#: Source/Core/Core/Src/DSP/DSPCore.cpp:109
+msgid ""
+"Your DSP ROMs have incorrect hashes.\n"
+"Would you like to stop now to fix the problem?\n"
+"If you select \"No\", audio might be garbled."
+msgstr ""
+"Le tue ROM DSP hanno hash errati.\n"
+"Vuoi interrompere ora l'emulazione per correggere il problema?\n"
+"Se scegli \"No\", l'audio potrebbe essere disturbato."
+
+#: Source/Core/Core/Src/CoreParameter.cpp:164
 msgid ""
 "Your GCM/ISO file seems to be invalid (invalid country).\n"
 "Continue with PAL region?"
@@ -5480,7 +5986,7 @@ msgstr ""
 "Il file GCM/ISO sembra non valido (paese non valido).\n"
 "Procedere con la zona PAL?"
 
-#: Source/Core/Common/Src/SysConf.cpp:58
+#: Source/Core/Common/Src/SysConf.cpp:45
 #, c-format
 msgid ""
 "Your SYSCONF file is the wrong size.\n"
@@ -5491,37 +5997,41 @@ msgstr ""
 "Dovrebbe essere 0x%04x (invece di 0x%04llx)\n"
 "Desideri generarne uno nuovo?"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:334
 msgid "ZTP hack"
 msgstr "Hack ZTP"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:387
+#: Source/Core/Core/Src/ActionReplay.cpp:377
 msgid "Zero 3 code not supported"
 msgstr "Zero 3 codice non supportato"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:408
+#: Source/Core/Core/Src/ActionReplay.cpp:398
 #, c-format
 msgid "Zero code unknown to dolphin: %08x"
 msgstr "Zero codice sconosciuto per dolphin: %08x"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:436
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:460
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:423
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:447
 msgid "[ waiting ]"
-msgstr "[ attesa ]"
+msgstr "[ in attesa ]"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107
 msgid ""
 "[BROKEN]\n"
 "Highlight regions the EFB was copied from.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
+"[NON FUNZIONANTE]\n"
+"Evidenzia le regioni da cui l'EFB è stato copiato.\n"
+"\n"
+"Nel dubbio, lascia deselezionato."
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:91
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:78
 msgid "[Custom]"
 msgstr "[Personalizzata]"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120
 msgid ""
 "[EXPERIMENTAL]\n"
 "Aims to speed up emulation by offloading texture decoding to the GPU using "
@@ -5531,8 +6041,16 @@ msgid ""
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
+"[SPERIMENTALE]\n"
+"Punta a velocizzare l'emulazione relegando il compito di decoding delle "
+"texture alla GPU utilizzando il framework OpenCL.\n"
+"Comunque, al momento è causa di difetti noti alle texture in diversi giochi. "
+"Inoltre è più lento nella maggior parte dei casi rispetto alla decodifica "
+"delle texture effettuata dalla CPU.\n"
+"\n"
+"Nel dubbio, lascia deselezionato."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121
 msgid ""
 "[EXPERIMENTAL]\n"
 "Speeds up emulation a bit by caching display lists.\n"
@@ -5540,87 +6058,53 @@ msgid ""
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
+"[SPERIMENTALE]\n"
+"Velocizza leggermente l'emulazione salvando in cache la display list.\n"
+"Potrebbe causare dei problemi.\n"
+"\n"
+"Nel dubbio, lascia deselezionato."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:508
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:495
 msgid "^ ADD"
 msgstr "^ ADD"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:820
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:801
 msgid "apploader (.img)"
 msgstr "apploader (.img)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:185
-msgid "failed to read bk header"
-msgstr "accesso all'intestazione bk non riuscito"
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:375
-#, c-format
-msgid "failed to read data from file: %s"
-msgstr "accesso non riuscito ai dati dal file: %s"
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:97
-msgid "failed to read header"
-msgstr "accesso all'intestazione non riuscito"
-
-#: Source/Core/Core/Src/PowerPC/JitInterface.cpp:285
+#: Source/Core/Core/Src/PowerPC/JitInterface.cpp:272
 #, c-format
 msgid "iCacheJIT: Reading Opcode from %x. Please report."
-msgstr "iCacheJIT: Lettura Opcode da %x. Per favore segnalare."
+msgstr "iCacheJIT: Lettura Opcode da %x. Si prega di segnalarlo."
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:108
-#, c-format
-msgid "not a wii save or read failure for file header size %x"
-msgstr ""
-"non un salvataggio wii oppure accesso non riuscito al file con dimensione "
-"intestazione %x"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:935
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:936
 msgid "s"
 msgstr "s"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:457
-#, c-format
-msgid "unknown cmd 0x%08x"
-msgstr "cmd 0x%08x sconosciuto"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1110
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1136
 msgid "wxExecute returned -1 on application run!"
 msgstr "valore wxExecute ritornato -1 su applicazione in esecuzione!"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:56
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:43
 msgid "zFar Correction: "
 msgstr "Correzione zFar: "
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:51
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:38
 msgid "zNear Correction: "
 msgstr "Correzione zNear: "
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:493
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:480
 msgid "| OR"
 msgstr "| OR"
 
-#~ msgid "Interpreter (VERY slow)"
-#~ msgstr "Interprete (molto lento)"
-
-#~ msgid "JIT Recompiler (recommended)"
-#~ msgstr "Ricompilatore JIT (consigliato)"
-
-#~ msgid "JITIL experimental recompiler"
-#~ msgstr "Ricompilatore JITIL sperimentale"
-
-#~ msgid "Pair Up"
-#~ msgstr "Abbina"
-
-#~ msgid "Reconnect Wiimote Confirm"
-#~ msgstr "Conferma Ricollegamento Wiimote"
+#~ msgid "Accurate VBeam emulation"
+#~ msgstr "Emulazione VBeam accurata"
 
 #~ msgid ""
-#~ "Wiimote %i has been disconnected by system.\n"
-#~ "Maybe this game doesn't support multi-wiimote,\n"
-#~ "or maybe it is due to idle time out or other reason.\n"
-#~ "Do you want to reconnect immediately?"
+#~ "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)"
 #~ msgstr ""
-#~ "Wiimote %i è stato disconnesso dal sistema. \n"
-#~ " Forse questo gioco non supporta il multi-wiimote, \n"
-#~ " o forse è dovuto ad altri motivi. \n"
-#~ "Vuoi riconnettersi immediatamente?"
+#~ "Se il framerate risulta incoerente o incostante, questa opzione potrebbe "
+#~ "porvi rimedio. (ON = Compatibilità, OFF = Velocità)"
+
+#~ msgid "Skip Dest. Alpha Pass"
+#~ msgstr "Salta Destination Alpha"
diff --git a/Languages/po/ja.po b/Languages/po/ja.po
index 1f81994ea5..6b6c0bbfd6 100644
--- a/Languages/po/ja.po
+++ b/Languages/po/ja.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the dolphin-emu package.
 #
 # Translators:
-# Danbsky, 2011.
+# Danbsky, 2011
+# DanbSky <smariojp@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: Dolphin Emulator\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-10 08:56-0500\n"
-"PO-Revision-Date: 2013-02-02 17:47+0000\n"
-"Last-Translator: glennricster <glennricster@gmail.com>\n"
+"POT-Creation-Date: 2013-04-18 23:00-0500\n"
+"PO-Revision-Date: 2013-04-16 23:40+0000\n"
+"Last-Translator: DanbSky <smariojp@gmail.com>\n"
 "Language-Team: Japanese (http://www.transifex.com/projects/p/dolphin-emu/"
 "language/ja/)\n"
 "Language: ja\n"
@@ -19,21 +20,21 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:511
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:499
 msgid " (too many to display)"
 msgstr "(該当数が多すぎます)"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:270
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:273
 #: Source/Core/DolphinWX/Src/NetWindow.cpp:491
 #: Source/Core/DolphinWX/Src/NetWindow.cpp:530
 msgid " Game : "
 msgstr "タイトル："
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:507
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494
 msgid "! NOT"
 msgstr "! (...で無い)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:70
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:58
 #, c-format
 msgid ""
 "\"%s\" does not exist.\n"
@@ -42,33 +43,43 @@ msgstr ""
 "メモリーカードファイル \"%s\" は存在しません。\n"
 " 容量16MBで新たに作成しますか ?"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:142
+#: Source/Core/Core/Src/CoreParameter.cpp:131
 #, 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:722
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:721
 #, c-format
 msgid "%08X:  "
 msgstr "%08X:  "
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:196
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:183
 #, c-format
 msgid "%1$sCopy%1$s"
 msgstr "%1$s コピー %1$s"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:128
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:296
+#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:113
+#, c-format
+msgid "%d samples"
+msgstr "%d x"
+
+#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:112
+#, c-format
+msgid "%d samples (quality level %d)"
+msgstr "%d x (品質 %d)"
+
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:121
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:289
 #, c-format
 msgid "%s already exists, overwrite?"
 msgstr "%s はすでに存在します。上書きしますか？"
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:167
+#: Source/Core/DiscIO/Src/CompressedBlob.cpp:154
 #, c-format
 msgid "%s failed to be scrubbed. Probably the image is corrupt."
 msgstr "%s のスクラビングに失敗しました。おそらく壊れています。"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:95
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:83
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
@@ -77,7 +88,7 @@ msgstr ""
 "%s メモリーカードの読み込みに失敗\n"
 " 不正なカードファイルサイズです (0x%x バイト)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:110
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:98
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
@@ -86,7 +97,7 @@ msgstr ""
 "%s メモリーカードの読み込みに失敗\n"
 " 不正なカード容量です (0x%x バイト)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:90
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:78
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
@@ -96,48 +107,37 @@ msgstr ""
 "このファイルのサイズは小さすぎます。正しいファイルではありません (0x%x バイ"
 "ト)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:367
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:359
 #, c-format
 msgid "%s failed to open"
 msgstr "%s を開くのに失敗"
 
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:97
-#, c-format
-msgid ""
-"%s has an incorrect hash.\n"
-"Would you like to stop now to fix the problem?\n"
-"If you select \"No\", audio will be garbled."
-msgstr ""
-"ファイル %s のハッシュは不完全です\n"
-"この問題を修正するために動作を停止しますか？\n"
-"\"いいえ\"を選択した場合、歪んだ音のままゲームが始まるでしょう"
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:360
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:352
 #, c-format
 msgid "%s is a 0 byte file"
 msgstr "%s は0バイトのファイルです"
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:159
+#: Source/Core/DiscIO/Src/CompressedBlob.cpp:146
 #, c-format
 msgid "%s is already compressed! Cannot compress it further."
 msgstr "%s は圧縮済みです！これ以上圧縮することはできません。"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:345
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:337
 #, c-format
 msgid "%s is too long for the filename, max chars is 45"
 msgstr "%s はファイル名が長すぎます、45文字までに収めてください"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:202
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:189
 #, c-format
 msgid "%sDelete%s"
 msgstr "%s 削除 %s"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:200
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:187
 #, c-format
 msgid "%sExport GCI%s"
 msgstr "%s エクスポート GCI %s"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:198
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:185
 #, c-format
 msgid "%sImport GCI%s"
 msgstr "%s インポート GCI %s"
@@ -147,252 +147,275 @@ msgstr "%s インポート GCI %s"
 msgid "%u Free Blocks; %u Free Dir Entries"
 msgstr "%u ブロック空き | %u エントリ空き"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:506
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:493
 msgid "&& AND"
 msgstr "&& (...と...)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:295
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:301
 msgid "&About..."
 msgstr "Dolphinについて(&A)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:99
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:100
 msgid "&Boot from DVD Drive..."
 msgstr "DVDドライブから起動(&B)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:231
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:234
 msgid "&Breakpoints"
 msgstr "ブレークポイント(&B)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:110
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:111
 msgid "&Browse for ISOs..."
 msgstr "ISOファイルのあるフォルダを選択(&B)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:192
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:195
 msgid "&Cheats Manager"
 msgstr "チートコード編集ツール(&C)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:177
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:180
 msgid "&DSP Settings"
 msgstr "サウンド設定(&D)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:885
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:876
 msgid "&Delete ISO..."
 msgstr "このタイトルの実体を削除(&D)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:903
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:897
 msgid "&Delete selected ISOs..."
 msgstr "選択したタイトルの実体を全て削除(&D)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:170
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:173
 msgid "&Emulation"
 msgstr "エミュレーション(&E)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:113
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:114
 msgid "&File"
 msgstr "ファイル(&F)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:335
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:341
 msgid "&Frame Advance"
 msgstr "Frame Advance(&F)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:352
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:358
 msgid "&Fullscreen"
 msgstr "全画面表示(&F)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:176
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:179
 msgid "&Graphics Settings"
 msgstr "グラフィック設定(&G)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:296
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:302
 msgid "&Help"
 msgstr "ヘルプ(&H)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:180
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:183
 msgid "&Hotkey Settings"
 msgstr "ホットキーのカスタマイズ(&H)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:233
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:236
 msgid "&JIT"
 msgstr "&JIT"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:148
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:149
 msgid "&Load State"
 msgstr "ステートロード(&L)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:190
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:193
 msgid "&Memcard Manager (GC)"
 msgstr "GCメモリーカードマネージャ(&M)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:232
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:235
 msgid "&Memory"
 msgstr "&Memory"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:313
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:319
 msgid "&Open..."
 msgstr "開く(&O)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:186
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:189
 msgid "&Options"
 msgstr "設定(&O)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:324
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:330
 msgid "&Pause"
 msgstr "一時停止(&P)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:326
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:332
 msgid "&Play"
 msgstr "開始(&P)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:867
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:858
 msgid "&Properties"
 msgstr "プロパティ(&P)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:348
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:354
 msgid "&Read-only mode"
 msgstr "読み込み専用 (&R)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:319
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:325
 msgid "&Refresh List"
 msgstr "ゲームリストを再更新(&R)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:230
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:233
 msgid "&Registers"
 msgstr "レジスタ(&R)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:332
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:338
 msgid "&Reset"
 msgstr "リセット(&R)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:234
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:237
 msgid "&Sound"
 msgstr "サウンド(&S)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:329
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:335
 msgid "&Stop"
 msgstr "停止(&S)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:207
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:210
 msgid "&Tools"
 msgstr "ツール(&T)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:235
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:238
 msgid "&Video"
 msgstr "描画(&V)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:284
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:287
 msgid "&View"
 msgstr "表示(&V)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:179
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:182
 msgid "&Wiimote Settings"
 msgstr "Wii入力設定(&W)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:868
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:859
 msgid "&Wiki"
 msgstr "公式Wiki(英語)で動作状況を確認(&W)"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504
 msgid "'"
 msgstr "'"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:59
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:46
 msgid "(-)+zFar"
 msgstr "補正有効"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:54
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:41
 msgid "(-)+zNear"
 msgstr "補正有効"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:99
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:86
 msgid "(UNKNOWN)"
 msgstr "(不明)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:376
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:384
 msgid "(off)"
 msgstr "オフ"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:655
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:654
 msgid "0x44"
 msgstr "0x44"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+msgid "1.5x Native (960x792)"
+msgstr "1.5x Native (960x792)"
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:158
 msgid "16 bit"
 msgstr "16 ビット"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+msgid "1x Native (640x528)"
+msgstr "1x Native (640x528)"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+msgid "2.5x Native (1600x1320)"
+msgstr "2.5x Native (1600x1320)"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+msgid "2x Native (1280x1056)"
+msgstr "2x Native (1280x1056)"
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:159
 msgid "32 bit"
 msgstr "32 ビット"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:412
 msgid "3D Vision"
 msgstr "3D Vision"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+msgid "3x Native (1920x1584)"
+msgstr "3x Native (1920x1584)"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+msgid "4x Native (2560x2112)"
+msgstr "4x Native (2560x2112)"
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:157
 msgid "8 bit"
 msgstr "8 ビット"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:43
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:30
 msgid "<Insert name here>"
 msgstr "コード名を入力してください"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:255
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:262
 msgid "<No resolutions found>"
 msgstr "<対応できる解像度が見つかりません>"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:104
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84
 msgid "<Nothing>"
 msgstr "なし"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:162
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:162
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:150
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:150
 msgid "<Press Key>"
 msgstr "入力を待機..."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286
 msgid "<System>"
 msgstr "＜システムの言語＞"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695
 msgid "A"
 msgstr "A"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:201
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:235
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:204
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:238
 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:353
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:387
 msgid "A game is not currently running."
 msgstr "ゲームは現在、起動されていません"
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:68
-#, fuzzy
 msgid ""
 "A supported bluetooth device could not be found.\n"
 "You must manually connect your wiimotes."
 msgstr ""
-"サポートしているBluetoothデバイスが見つかりませんでした\n"
-"Microsoft製以外のBluetoothスタックを使っている場合は、手動でペアリングを行"
-"い、『更新』ボタンのみ使用してください。"
+"サポートしているBluetoothデバイスが見つかりませんでした。\n"
+"手動でWii リモコンを接続する必要があります。"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:109
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:100
+#, fuzzy
 msgid ""
 "ALERT:\n"
 "\n"
-"NetPlay will currently only work properly when using the following "
-"settings:\n"
-" - Dual Core [OFF]\n"
-" - Audio Throttle [OFF]\n"
-" - DSP-HLE with \"Null Audio\" or DSP-LLE\n"
-" - Manually set the exact number of controllers that will be used to "
-"[Standard Controller]\n"
+"Netplay will only work with the following settings:\n"
+" - Enable Dual Core [OFF]\n"
+" - DSP Emulator Engine Must be the same on all computers!\n"
+" - DSP on Dedicated Thread [OFF]\n"
+" - Framelimit NOT set to [Audio]\n"
+" - Manually set the exact number of controllers to be used to [Standard "
+"Controller]\n"
 "\n"
-"All players should try to use the same Dolphin version and settings.\n"
-"Disable all memory cards or send them to all players before starting.\n"
-"Wiimote support has not been implemented.\n"
+"All players should use the same Dolphin version and settings.\n"
+"All memory cards must be identical between players or disabled.\n"
+"Wiimote support has not been implemented!\n"
 "\n"
-"You must forward TCP port to host!!"
+"The host must have the chosen TCP port open/forwarded!\n"
 msgstr ""
 "～ネットプレイに関しての注意事項～\n"
 "\n"
@@ -409,17 +432,17 @@ msgstr ""
 "\n"
 "TCPポートの開放を忘れずに！"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:111
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:116
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96
 msgid "AM-Baseboard"
 msgstr "Triforce基板"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:299
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:115
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:300
 msgid "AR Codes"
 msgstr "アクションリプレイコード"
 
-#: Source/Core/DolphinWX/Src/AboutDolphin.h:33
+#: Source/Core/DolphinWX/Src/AboutDolphin.h:21
 msgid "About Dolphin"
 msgstr "Dolphinについて"
 
@@ -427,15 +450,11 @@ msgstr "Dolphinについて"
 msgid "Acceleration"
 msgstr "加速度"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:463
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473
 msgid "Accuracy:"
 msgstr "精度："
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317
-msgid "Accurate VBeam emulation"
-msgstr "Accurate VBeam emulation"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97
 msgid ""
 "Accurately emulate EFB copies.\n"
 "Some games depend on this for certain graphical effects or gameplay "
@@ -448,12 +467,12 @@ msgstr ""
 "\n"
 "よく分からなければ、【Texture】を選択したままにしてください。"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:239
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:239
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:227
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:227
 msgid "Action"
 msgstr "動作"
 
-#: Source/Core/Core/Src/ARDecrypt.cpp:481
+#: Source/Core/Core/Src/ARDecrypt.cpp:469
 #, c-format
 msgid ""
 "Action Replay Code Decryption Error:\n"
@@ -468,14 +487,14 @@ msgstr ""
 "問題のあるコード：\n"
 "%s"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:667
+#: Source/Core/Core/Src/ActionReplay.cpp:657
 #, 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:755
+#: Source/Core/Core/Src/ActionReplay.cpp:745
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide "
@@ -484,7 +503,7 @@ msgstr ""
 "Action Replay エラー: 不正なサイズ (%08x : address = %08x) in Fill and Slide "
 "(%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:547
+#: Source/Core/Core/Src/ActionReplay.cpp:537
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And "
@@ -493,7 +512,7 @@ msgstr ""
 "Action Replay エラー: 不正なサイズ (%08x : address = %08x) in Ram Write And "
 "Fill (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:607
+#: Source/Core/Core/Src/ActionReplay.cpp:597
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Write To "
@@ -502,12 +521,12 @@ msgstr ""
 "Action Replay エラー: 不正なサイズ (%08x : address = %08x) in Write To "
 "Pointer (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:802
+#: Source/Core/Core/Src/ActionReplay.cpp:792
 #, c-format
 msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)"
 msgstr "Action Replay エラー: 不正な値 (%08x) in Memory Copy (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:682
+#: Source/Core/Core/Src/ActionReplay.cpp:672
 #, c-format
 msgid ""
 "Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)\n"
@@ -517,63 +536,63 @@ msgstr ""
 "(%s)\n"
 "マスターコードは必要ありません。使用しないでください。"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:196
+#: Source/Core/Core/Src/ActionReplay.cpp:184
 #, c-format
 msgid "Action Replay Error: invalid AR code line: %s"
 msgstr "エラー: 無効なコード ライン： %s"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:872
+#: Source/Core/Core/Src/ActionReplay.cpp:862
 #, c-format
 msgid "Action Replay: Conditional Code: Invalid Size %08x (%s)"
 msgstr "Action Replay: 条件付きコード: 不正なサイズ %08x (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:945
+#: Source/Core/Core/Src/ActionReplay.cpp:935
 #, c-format
 msgid "Action Replay: Invalid Normal Code Type %08x (%s)"
 msgstr "Action Replay: 不正な種類の通常コード %08x (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:896
+#: Source/Core/Core/Src/ActionReplay.cpp:886
 #, c-format
 msgid "Action Replay: Normal Code %i: Invalid subtype %08x (%s)"
 msgstr "Action Replay: 通常コード %i: 不正なサブタイプ %08x (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:838
+#: Source/Core/Core/Src/ActionReplay.cpp:828
 #, c-format
 msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)"
 msgstr "Action Replay: 通常コード 0: 不正なサブタイプ %08x (%s)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:242
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:247
 msgid "Adapter:"
 msgstr "ビデオカード："
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:76
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:63
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:63
 msgid "Add"
-msgstr ""
+msgstr "追加"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1275
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1301
 msgid "Add ActionReplay Code"
 msgstr "コードを追加"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1204
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1230
 msgid "Add Patch"
 msgstr "パッチを追加"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:507
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:528
 msgid "Add new pane"
-msgstr ""
+msgstr "Add new pane"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:404
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:426
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:811
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:408
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:430
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:792
 msgid "Add..."
 msgstr "追加"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:90
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:81
 msgid "Address :"
 msgstr "接続先："
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:58
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:45
 msgid ""
 "Adds the specified value to zFar Parameter.\n"
 "Two ways to express the floating point values.\n"
@@ -590,7 +609,7 @@ msgstr ""
 "\n"
 "補足：取得値はログウィンドウ／コンソールで確認します"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:53
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:40
 msgid ""
 "Adds the specified value to zNear Parameter.\n"
 "Two ways to express the floating point values.\n"
@@ -607,89 +626,98 @@ msgstr ""
 "\n"
 "補足：取得値はログウィンドウ／コンソールで確認します"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:755
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:744
 msgid "Adjust the analog control pressure required to activate buttons."
 msgstr "ボタンが反応する感度を調整します"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:509
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:522
 msgid "Advanced"
 msgstr "高度な設定"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561
 msgid "Advanced Settings"
 msgstr "高度な設定"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:584
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:587
 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:816
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:797
 msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)"
 msgstr "全ての GC/Wii イメージ (gcm, iso, wbfs, ciso, gcz)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1189
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1190
 msgid "All Gamecube GCM files (gcm)"
 msgstr "GC GCMファイル (gcm)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1390
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1404
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1417
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1431
 msgid "All Save States (sav, s##)"
 msgstr "全てのステートセーブファイル (sav, s##)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1187
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1188
 msgid "All Wii ISO files (iso)"
 msgstr "Wii ISOファイル (iso)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1207
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1208
 msgid "All compressed GC/Wii ISO files (gcz)"
 msgstr "圧縮されたGC/Wii ISOファイル (gcz)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:124
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:104
 msgid "All files (*.*)|*.*"
 msgstr "全てのファイル (*.*)|*.*"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123
 msgid ""
 "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"
+"3-内部解像度\n"
+"4-アスペクト比\n"
+"5-EFB\n"
+"6-Fog\n"
+"\n"
+"よく分からなければ、チェックを入れないでください。"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:285
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:272
 msgid "Analyze"
 msgstr "分析"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:298
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:285
 msgid "Angle"
-msgstr ""
+msgstr "角度"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:367
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:375
 msgid "Anisotropic Filtering:"
 msgstr "異方性フィルタリング："
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:350
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:358
 msgid "Anti-Aliasing:"
 msgstr "アンチエイリアス："
 
-#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:308
+#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:299
 msgid "Apploader is the wrong size...is it really an apploader?"
 msgstr ""
 "Apploader のサイズが間違っています。このファイルは本当にApploaderですか？"
 
-#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:302
+#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:293
 msgid "Apploader unable to load from file"
 msgstr "Apploader ファイルから読み込むことができません"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:841
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:822
 msgid "Apploader:"
 msgstr "Apploader"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:135
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:122
 msgid "Apply"
 msgstr "適用"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124
 msgid ""
 "Apply a post-processing effect after finishing a frame.\n"
 "\n"
@@ -699,11 +727,11 @@ msgstr ""
 "\n"
 "よく分からなければ、【オフ】を選択してください。"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287
 msgid "Arabic"
 msgstr "アラビア語"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:614
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:603
 #, c-format
 msgid "Are you sure you want to delete \"%s\"?"
 msgstr "\"%s\" このプロファイルを削除しますか？"
@@ -720,46 +748,50 @@ msgstr ""
 msgid "Are you sure you want to delete this file?  It will be gone forever!"
 msgstr "このタイトルの実体ファイルを削除しますか？元に戻すことはできません！"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:789
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:277
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:44
+msgid "Arm JIT (experimental)"
+msgstr "Arm JIT (実験的)"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:285
 msgid "Aspect Ratio:"
 msgstr "アスペクト比："
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:70
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:58
 msgid "At least one pane must remain open."
 msgstr "At least one pane must remain open."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:553
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533
 msgid "Audio"
 msgstr "サウンド"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:694
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675
 msgid "Audio Backend:"
 msgstr "出力API (Audio Backend)"
 
-#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:41
+#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:28
 msgid "AudioCommon: Error opening AO device.\n"
 msgstr "AudioCommon: Error opening AO device.\n"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:275
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283
 msgid "Auto"
 msgstr "自動"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:337
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345
 msgid "Auto (Multiple of 640x528)"
 msgstr "自動 (ゲーム解像度の倍数)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:337
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345
 msgid "Auto (Window Size)"
 msgstr "自動 (ウィンドウサイズに拡大)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:297
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305
 msgid "Auto adjust Window Size"
 msgstr "ウィンドウサイズを自動調整"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77
 msgid ""
 "Automatically adjusts the window size to your internal resolution.\n"
 "\n"
@@ -769,160 +801,163 @@ msgstr ""
 "\n"
 "よく分からなければ、チェックを入れないでください。"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:697
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696
 msgid "B"
 msgstr "B"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:755
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:754
 msgid "BP register "
 msgstr "BP register "
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:27
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:14
 msgid "Back"
 msgstr "Back"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:698
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:679
 msgid "Backend Settings"
 msgstr "出力設定"
 
-#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:60
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:206
+#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:47
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:211
 msgid "Backend:"
 msgstr "描画API："
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:318
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:95
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:305
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:82
 msgid "Background Input"
 msgstr "バックグラウンド入力を許可"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:279
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:266
 msgid "Backward"
 msgstr "後方"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:264
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:257
 msgid "Bad File Header"
 msgstr "ファイルヘッダの不良"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:627
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:621
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:290
 msgid "Banner"
 msgstr "バナー"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:519
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:529
 msgid "Banner Details"
 msgstr "バナーの詳細"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491
 msgid "Banner:"
 msgstr "バナー表示"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:57
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:61
 msgid "Bar"
 msgstr "バー"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:308
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:316
 msgid "Basic"
 msgstr "基本設定"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555
 msgid "Basic Settings"
 msgstr "基本設定"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:22
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Bass"
 msgstr "バスドラ"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:186
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:174
 msgid "Block Allocation Table checksum failed"
 msgstr "Block Allocation Table checksum failed"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:631
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625
 msgid "Blocks"
 msgstr "ブロック数"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:21
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Blue"
 msgstr "青"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:24
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Blue Left"
 msgstr "青 - 左"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:25
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Blue Right"
 msgstr "青 - 右"
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:87
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270
 msgid "Bottom"
 msgstr "下部"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:238
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:225
 #, c-format
 msgid "Bound Controls: %lu"
 msgstr "コマンド数: %lu"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348
 msgid "Broken"
 msgstr "ダメダメ"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:422
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:428
 msgid "Browse"
 msgstr "選択"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:256
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:243
 msgid "Browse for a directory to add"
 msgstr "ゲームリストに追加するフォルダを選択してください"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:422
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:428
 msgid "Browse for an ISO directory..."
 msgstr "ISOのあるフォルダをブラウズ"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1079
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1080
 msgid "Browse for output directory"
 msgstr "出力先を選択"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:328
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:331
 msgid "Buffer:"
 msgstr "バッファ："
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:58
 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:119
+#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:106
 msgid "Buttons"
 msgstr "ボタン"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317
 msgid ""
 "Bypass the clearing of the data cache by the DCBZ instruction. Usually leave "
 "this option disabled."
 msgstr ""
+"DCBZ命令によるキャッシュデータのクリア処理を 無視するようにします。\n"
+"\n"
+"よく分からなければ、チェックを入れないでください。"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:698
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:697
 msgid "C"
 msgstr "C"
 
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:77
+#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:64
 msgid "C Stick"
 msgstr "C-スティック"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:77
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:64
 msgid "C-Stick"
 msgstr "C-スティック"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:764
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:763
 msgid "CP reg"
 msgstr "CP reg"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:567
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547
 msgid "CPU Emulator Engine"
 msgstr "CPUエミュレーション方式"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:490
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500
 msgid "Cache Display Lists"
 msgstr "Cache Display Lists"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88
 msgid ""
 "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n"
 "Decreases emulation speed by some percent (depending on your GPU).\n"
@@ -932,27 +967,42 @@ msgid ""
 msgstr ""
 "ピクセル単位での光源処理を行います。\n"
 "GPUの性能にもよりますが、数パーセント程度、動作速度が低下します。\n"
-"このオプションは通常安全ですが、時に描画バグを引き起こすこともありま す。\n"
+"このオプションは通常安全ですが、時に描画バグを引き起こすことも あります。\n"
 "\n"
 "よく分からなければ、チェックを入れないでください。"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1858
+#, c-format
+msgid "Can't find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x"
+msgstr "Can't find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x"
+
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1872
+#, c-format
+msgid "Can't find WiiMote by connection handle %02x"
+msgstr "Can't find WiiMote by connection handle %02x"
+
+#: Source/Core/Core/Src/HW/DVDInterface.cpp:669
+#: Source/Core/Core/Src/HW/DVDInterface.cpp:679
+msgid "Can't read from DVD_Plugin - DVD-Interface: Fatal Error"
+msgstr "Can't read from DVD_Plugin - DVD-Interface: Fatal Error"
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:124
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:28
 msgid "Cancel"
 msgstr "キャンセル"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:91
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:178
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:240
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:84
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:171
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:233
 #, c-format
 msgid "Cannot open %s"
 msgstr "%s を開くことができません"
 
-#: Source/Core/Core/Src/CoreTiming.cpp:141
+#: Source/Core/Core/Src/CoreTiming.cpp:128
 msgid "Cannot unregister events with events pending"
 msgstr "Cannot unregister events with events pending"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1078
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1061
 #, c-format
 msgid ""
 "Cannot use that file as a memory card.\n"
@@ -963,7 +1013,7 @@ msgstr ""
 "%s\n"
 "これは不正なメモリーカードデータです"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1108
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1091
 msgid ""
 "Cannot use that file as a memory card.\n"
 "Are you trying to use the same file in both slots?"
@@ -971,30 +1021,15 @@ msgstr ""
 "そのファイルはメモリーカードデータとして使用できません。\n"
 "両方のスロットで同じファイルを使用しようとしていませんか？"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1867
-#, 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:1881
-#, 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:679
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:689
-msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error"
-msgstr "Cant read from DVD_Plugin - DVD-Interface: Fatal Error"
-
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:52
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:39
 msgid "Caps Lock"
 msgstr "Caps Lock"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288
 msgid "Catalan"
 msgstr "カタルーニャ語"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:311
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:298
 msgid "Center"
 msgstr "Center"
 
@@ -1002,12 +1037,12 @@ msgstr "Center"
 msgid "Change"
 msgstr "変更"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:316
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:322
 msgid "Change &Disc..."
 msgstr "ディスクの入れ替え(&D)"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:179
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:179
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:167
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:167
 msgid "Change Disc"
 msgstr "ディスクの入れ替え"
 
@@ -1015,7 +1050,7 @@ msgstr "ディスクの入れ替え"
 msgid "Change Game"
 msgstr "ゲームを変更"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:515
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495
 msgid ""
 "Change the language of the user interface.\n"
 "Requires restart."
@@ -1023,75 +1058,75 @@ msgstr ""
 "Dolphin本体の表示言語を変更します\n"
 "変更のために再起動が必要です"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:60
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:47
 msgid "Changes sign to zFar Parameter (after correction)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:55
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:42
 msgid "Changes sign to zNear Parameter (after correction)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:519
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499
 msgid "Changing this will have no effect while the emulator is running!"
 msgstr "この設定は次回のゲーム開始時に反映されます！"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:295
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:298
 msgid "Chat"
 msgstr "チャット欄"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:47
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:34
 msgid "Cheat Code"
 msgstr "チートコード"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:118
 msgid "Cheat Search"
 msgstr "コードサーチ"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:38
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:25
 msgid "Cheats Manager"
 msgstr "チートコード編集ツール"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:633
 msgid "Check Partition Integrity"
 msgstr "パーティションの整合性をチェック"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:864
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:880
 msgid "Checking integrity..."
 msgstr "チェックしています..."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289
 msgid "Chinese (Simplified)"
 msgstr "簡体字中国語"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290
 msgid "Chinese (Traditional)"
 msgstr "繁体字中国語"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:818
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:799
 msgid "Choose a DVD root directory:"
 msgstr "DVDルートフォルダを選択してください"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:822
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803
 msgid "Choose a NAND root directory:"
 msgstr "NANDのあるルートフォルダを選択してください"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:815
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:796
 msgid "Choose a default ISO:"
 msgstr "ディスクチャンネルに表示するタイトルを選択"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1236
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1219
 msgid "Choose a directory to add"
 msgstr "追加したいフォルダを選択"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1065
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1048
 msgid "Choose a file to open"
 msgstr "メモリーカードを選択"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:217
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:204
 msgid "Choose a memory card:"
 msgstr "メモリーカードを選択"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:819
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800
 msgid ""
 "Choose file to use as apploader: (applies to discs constructed from "
 "directories only)"
@@ -1099,27 +1134,27 @@ msgstr ""
 "apploaderとして使用するファイルを選択：(フォルダからのみ構築されたディスクに"
 "適用されます)"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:767
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:806
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:781
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:822
 msgid "Choose the folder to extract to"
 msgstr "保存先のフォルダを選択してください"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:297
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:284
 msgid "Circle Stick"
 msgstr "丸み"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:52
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:56
 msgid "Classic"
 msgstr "クラシックコントローラ"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:144
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:43
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:487
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:913
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:137
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:30
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:474
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:904
 msgid "Clear"
 msgstr "全消去"
 
-#: Source/Core/Core/Src/NetPlayServer.cpp:259
+#: Source/Core/Core/Src/NetPlayServer.cpp:263
 msgid ""
 "Client disconnect while game is running!! NetPlay is disabled. You must "
 "manually stop the game."
@@ -1127,138 +1162,138 @@ msgstr ""
 "クライアントとの接続が切断されました！ネットプレイは現在無効です。ゲームを停"
 "止してください。"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:298
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:247
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:552
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:578
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:285
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:234
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:562
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:590
 msgid "Close"
 msgstr "閉じる"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:174
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:177
 msgid "Co&nfigure..."
 msgstr "Dolphin本体の設定(&N)"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:86
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:73
 msgid "Code Info"
 msgstr "コードの情報"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:568
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:556
 msgid "Code: "
 msgstr "コード："
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:35
 msgid "Command"
 msgstr "Command"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:629
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:623
 msgid "Comment"
 msgstr "コメント"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489
 msgid "Comment:"
 msgstr "ゲーム紹介"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:893
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:884
 msgid "Compress ISO..."
 msgstr "このタイトルを圧縮"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:905
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:899
 msgid "Compress selected ISOs..."
 msgstr "選択したISOファイルを全て圧縮"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1088
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1224
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1089
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1225
 msgid "Compressing ISO"
 msgstr "圧縮しています..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:429
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:435
 msgid "Config"
 msgstr "本体設定"
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:37
-#: Source/Core/DolphinWX/Src/InputConfigDiag.h:135
-#: Source/Core/DolphinWX/Src/InputConfigDiag.h:154
+#: Source/Core/DolphinWX/Src/InputConfigDiag.h:122
+#: Source/Core/DolphinWX/Src/InputConfigDiag.h:141
 msgid "Configure"
 msgstr "設定"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:111
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:98
 msgid "Configure Control"
 msgstr "コントロールの設定"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:306
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
 #: Source/Core/DolphinWX/Src/NetWindow.cpp:583
 msgid "Configure Pads"
 msgstr "パッド設定"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:429
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:435
 msgid "Configure..."
 msgstr "Dolphin本体の設定を行います"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1119
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1147
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1217
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1120
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1218
 msgid "Confirm File Overwrite"
 msgstr "ファイルの上書きを確認"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:597
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:577
 msgid "Confirm on Stop"
 msgstr "動作停止時に確認"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:83
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:105
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:74
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:96
 msgid "Connect"
 msgstr "接続"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:783
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:764
 msgid "Connect USB Keyboard"
 msgstr "USBキーボードの接続をエミュレート"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:362
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:368
 #, c-format
 msgid "Connect Wiimote %i"
 msgstr "%iPのWii リモコンを接続"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:195
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183
 msgid "Connect Wiimote 1"
 msgstr "1PのWii リモコンを接続"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184
 msgid "Connect Wiimote 2"
 msgstr "2PのWii リモコンを接続"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:185
 msgid "Connect Wiimote 3"
 msgstr "3PのWii リモコンを接続"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:198
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:186
 msgid "Connect Wiimote 4"
 msgstr "4PのWii リモコンを接続"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:627
+#: Source/Core/DolphinWX/Src/Main.cpp:655
 msgid "Connecting..."
 msgstr "接続中..."
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:155
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:156
 msgid "Console"
 msgstr "コンソール"
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:71
 msgid "Continuous Scanning"
-msgstr ""
+msgstr "接続状態を継続して監視する"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:46
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:33
 msgid "Control"
 msgstr "Control"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:189
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:176
 msgid "Convert to GCI"
 msgstr "GCIファイルに変換"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:379
+#: Source/Core/Core/Src/CoreParameter.cpp:368
 msgid "Copy failed"
 msgstr "コピーに失敗"
 
@@ -1267,21 +1302,21 @@ msgstr "コピーに失敗"
 msgid "Copy to Memcard %c"
 msgstr "メモリーカード%cにコピー"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:359
 msgid "Core"
 msgstr "コア"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:154
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:148
 #, c-format
 msgid "Could not create %s"
 msgstr "%s を作成することができませんでした"
 
-#: Source/Core/AudioCommon/Src/AudioCommon.cpp:75
+#: Source/Core/AudioCommon/Src/AudioCommon.cpp:62
 #, c-format
 msgid "Could not initialize backend %s."
 msgstr "Could not initialize backend %s."
 
-#: Source/Core/Core/Src/CoreParameter.cpp:137
+#: Source/Core/Core/Src/CoreParameter.cpp:126
 #, c-format
 msgid ""
 "Could not read \"%s\".  There is no disc in the drive, or it is not a GC/Wii "
@@ -1292,12 +1327,12 @@ msgstr ""
 "プディスクではありません。オリジナルのGC/Wii のディスクはほとんどのPC用DVDド"
 "ライブでは読み込めない点に留意してください"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:292
+#: Source/Core/Core/Src/CoreParameter.cpp:281
 #, c-format
 msgid "Could not recognize ISO file %s"
 msgstr "ISOファイル %s を認識できませんでした"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:569
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:579
 #, c-format
 msgid "Could not save %s"
 msgstr "%s をセーブできませんでした"
@@ -1310,24 +1345,31 @@ msgstr ""
 "現在パッド設定を行えません。 プレーヤーが残っているかゲームが起動中です！\n"
 "(ゲーム中の設定変更は現在サポートされていません)"
 
-#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:123
+#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119
 #, c-format
 msgid ""
 "Could not write memory card file %s.\n"
 "\n"
 "Are you running Dolphin from a CD/DVD, or is the save file maybe write "
-"protected?"
+"protected?\n"
+"\n"
+"Are you receiving this after moving the emulator directory?\n"
+"If so, then you may need to re-specify your memory card location in the "
+"options."
 msgstr ""
 "%s をメモリーカードへ書き込みすることができませんでした\n"
 "\n"
 "DolphinをCD/DVDから起動しているか、セーブファイルが読み取り専用になっていませ"
-"んか？"
+"んか？\n"
+"\n"
+"メモリーカードファイルをデフォルトの場所から移動した場合は、本体設定よりその"
+"場所を再指定してください"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1107
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1133
 msgid "Couldn't find open command for extension 'ini'!"
 msgstr "拡張子'ini'に対して関連付けられているプログラムが見つかりません！"
 
-#: Source/Core/Core/Src/BootManager.cpp:146
+#: Source/Core/Core/Src/BootManager.cpp:137
 msgid ""
 "Couldn't init the core.\n"
 "Check your configuration."
@@ -1335,38 +1377,38 @@ msgstr ""
 "コアを初期化できませんでした。\n"
 "設定を確認してください。"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:183
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:507
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:495
 msgid "Count:"
 msgstr "該当："
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:452
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456
 msgid "Country:"
 msgstr "発売国"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:186
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:562
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:173
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:550
 msgid "Create AR Code"
 msgstr "アクションリプレイコードを作成"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:543
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:608
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:569
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:641
 msgid "Create new perspective"
-msgstr ""
+msgstr "Create new perspective"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:17
 msgid "Creator: "
 msgstr "制作者： "
 
-#: Source/Core/Common/Src/MsgHandler.cpp:68
+#: Source/Core/Common/Src/MsgHandler.cpp:54
 msgid "Critical"
 msgstr "致命的なエラー"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562
 msgid "Crop"
 msgstr "クロッピング"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119
 msgid ""
 "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n"
 "\n"
@@ -1377,140 +1419,140 @@ msgstr ""
 "\n"
 "よく分からなければ、チェックを入れないでください。"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:48
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:52
 msgid "Crossfade"
 msgstr "クロスフェーダー"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:597
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:600
 #, c-format
-msgid "Current dir changed from %s to %s after wxFileSelector!"
-msgstr "Current dir changed from %s to %s after wxFileSelector!"
+msgid "Current directory changed from %s to %s after wxFileSelector!"
+msgstr "Current directory changed from %s to %s after wxFileSelector!"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339
 msgid "Custom Projection Hack"
 msgstr "Custom Projection Hack"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.h:30
+#: Source/Core/DolphinWX/Src/PHackSettings.h:17
 msgid "Custom Projection Hack Settings"
 msgstr "Custom Projection Hackの設定"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342
 msgid "Customize some Orthographic Projection parameters."
 msgstr "設定画面に入ります"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291
 msgid "Czech"
 msgstr "チェコ語"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:698
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:697
 msgid "D"
 msgstr "D"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:89
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
 msgid "D-Pad"
 msgstr "十字キー"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:431
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
 msgid "DSP"
 msgstr "サウンド"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:639
 msgid "DSP Emulator Engine"
 msgstr "DSPエミュレーション方式"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:254
 msgid "DSP HLE emulation (fast)"
 msgstr "DSP-HLE エミュレーション (高速)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:256
 msgid "DSP LLE interpreter (slow)"
 msgstr "DSP-LLE インタプリタ (低速)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660
-msgid "DSP LLE on Thread"
-msgstr "DSP-LLEを別スレッドで実行"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:255
 msgid "DSP LLE recompiler"
 msgstr "DSP-LLE リコンパイラ"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:431
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:641
+msgid "DSP on Dedicated Thread"
+msgstr "DSP on Dedicated Thread"
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
 msgid "DSP settings"
 msgstr "サウンドに関する設定を行います"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:838
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:819
 msgid "DVD Root:"
 msgstr "DVDルート"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:239
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:226
 msgid "DVDLowRead - Fatal Error: failed to read from volume"
 msgstr "DVDLowRead - Fatal Error: failed to read from volume"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:333
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:320
 msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume"
 msgstr "DVDLowUnencryptedRead - Fatal Error: failed to read from volume"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:176
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:163
 msgid "Data Size"
 msgstr "データサイズ"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468
 msgid "Date:"
 msgstr "発売日"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:528
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:564
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:518
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:557
 msgid "Datel MaxDrive/Pro files(*.sav)"
 msgstr "Datel MaxDrive/Pro セーブファイル(*.sav)"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:242
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:259
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:267
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:281
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:296
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:229
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:246
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:254
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:268
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:283
 msgid "Dead Zone"
 msgstr "'遊び'の調整"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:35
 msgid "Debug"
 msgstr "デバッグ"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:521
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534
 msgid "Debugging"
 msgstr "デバッグ用項目"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:79
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:66
 msgid "Decimal"
 msgstr "Decimal"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:890
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:881
 msgid "Decompress ISO..."
 msgstr "ISOファイルへ復元"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:906
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:900
 msgid "Decompress selected ISOs..."
 msgstr "選択したファイルを全てISOファイルへ復元"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1088
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1224
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1089
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1225
 msgid "Decompressing ISO"
 msgstr "復元中..."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:912
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:903
 msgid "Default"
 msgstr "既定"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:835
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:816
 msgid "Default ISO:"
 msgstr "デフォルトISO"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:114
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:107
 msgid "Default font"
 msgstr "既定のフォント"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:32
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:926
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:19
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917
 msgid "Delete"
 msgstr "削除"
 
@@ -1518,49 +1560,51 @@ msgstr "削除"
 msgid "Delete Save"
 msgstr "このセーブデータを削除"
 
-#: Source/Core/VideoCommon/Src/AVIDump.cpp:77
+#: Source/Core/VideoCommon/Src/AVIDump.cpp:64
 #, c-format
 msgid "Delete the existing file '%s'?"
 msgstr "既存ファイル '%s' を削除しますか？"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:671
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:683
 msgid "Description"
 msgstr "説明"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:472
 msgid "Detect"
 msgstr "検出"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:233
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:328
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:220
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:315
 msgid ""
 "Detected attempt to read more data from the DVD than fit inside the out "
 "buffer. Clamp."
 msgstr ""
+"Detected attempt to read more data from the DVD than fit inside the out "
+"buffer. Clamp."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:127
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:898
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:114
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:889
 msgid "Device"
 msgstr "デバイス"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:798
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:731
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779
 msgid "Device Settings"
 msgstr "デバイス設定"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:45
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:49
 msgid "Dial"
 msgstr "ダイアル"
 
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:146
+#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:135
 msgid "Direct3D11"
 msgstr "Direct3D11"
 
-#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:128
+#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:125
 msgid "Direct3D9"
 msgstr "Direct3D9"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:167
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:155
 msgid ""
 "Directory checksum failed\n"
 " and Directory backup checksum failed"
@@ -1568,16 +1612,20 @@ msgstr ""
 "ディレクトリのチェックサムに失敗\n"
 "ディレクトリバックアップのチェックサムにも失敗"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:433
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:443
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485
 msgid "Disable"
 msgstr "無効化"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:491
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501
+msgid "Disable Destination Alpha"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:409
 msgid "Disable Fog"
 msgstr "Disable Fog"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108
 msgid ""
 "Disable any XFB emulation.\n"
 "Speeds up emulation a lot but causes heavy glitches in many games which rely "
@@ -1591,7 +1639,7 @@ msgstr ""
 "\n"
 "よく分からなければ、チェックを外さないでください。"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95
 msgid ""
 "Disable emulation of EFB copies.\n"
 "These are often used for post-processing or render-to-texture effects, so "
@@ -1606,20 +1654,33 @@ msgstr ""
 "\n"
 "よく分からなければ、チェックを入れないでください。"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:543
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101
+#, fuzzy
+msgid ""
+"Disables emulation of a hardware feature called destination alpha, which is "
+"used in many games for various graphical effects.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+"多くのタイトルで画面効果に使用されている、アルファ透過処理をスキップ しま"
+"す。\n"
+"\n"
+"よく分からなければ、チェックを入れないでください。"
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:553
 msgid "Disc"
 msgstr "ディスク"
 
-#: Source/Core/DiscIO/Src/DriveBlob.cpp:107
-#: Source/Core/DiscIO/Src/DriveBlob.cpp:126
+#: Source/Core/DiscIO/Src/DriveBlob.cpp:94
+#: Source/Core/DiscIO/Src/DriveBlob.cpp:113
 msgid "Disc Read Error"
 msgstr "ディスク読み取りエラー"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:312
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:320
 msgid "Display"
 msgstr "表示設定"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104
 msgid ""
 "Display the inputs read by the emulator.\n"
 "\n"
@@ -1629,32 +1690,32 @@ msgstr ""
 "\n"
 "よく分からなければ、チェックを入れないでください。"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:80
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:67
 msgid "Divide"
 msgstr "Divide"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:987
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:990
 msgid "Do you want to stop the current emulation?"
 msgstr "動作中のゲームを停止しますか？"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:663
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:644
 msgid "Dolby Pro Logic II decoder"
 msgstr "Dolby Pro Logic II decoder"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:864
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:856
 msgid "Dolphin"
 msgstr "Dolphin"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:183
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:188
 #, c-format
 msgid "Dolphin %s Graphics Configuration"
 msgstr "Dolphin %s グラフィック設定"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:292
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:298
 msgid "Dolphin &Web Site"
 msgstr "Dolphin Webサイト(&W)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.h:37
+#: Source/Core/DolphinWX/Src/ConfigMain.h:24
 msgid "Dolphin Configuration"
 msgstr "Dolphinの設定"
 
@@ -1662,16 +1723,16 @@ msgstr "Dolphinの設定"
 msgid "Dolphin Emulated Wiimote Configuration"
 msgstr "Wii リモコンのエミュレーション設定"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:394
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:383
 msgid "Dolphin FIFO"
 msgstr "Dolphin FIFO"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1136
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1153
 msgid "Dolphin GCPad Configuration"
 msgstr "GCコントローラ設定"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:679
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1074
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:685
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1089
 msgid "Dolphin TAS Movies (*.dtm)"
 msgstr "Dolphin TAS ムービー (*.dtm)"
 
@@ -1679,11 +1740,11 @@ msgstr "Dolphin TAS ムービー (*.dtm)"
 msgid "Dolphin Wiimote Configuration"
 msgstr "Wiiリモコンの設定"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:293
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:299
 msgid "Dolphin at &Google Code"
 msgstr "Dolphin 開発状況(&G)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:364
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:351
 msgid ""
 "Dolphin could not find any GC/Wii ISOs.  Doubleclick here to browse for "
 "files..."
@@ -1691,7 +1752,7 @@ msgstr ""
 "ゲームリストは空です。この文章をダブルクリックして GC/Wii のISO または WBFS "
 "もしくは WADファイルのあるフォルダを選択してください。"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:368
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:355
 msgid ""
 "Dolphin is currently set to hide all games.  Doubleclick here to show all "
 "games..."
@@ -1699,50 +1760,59 @@ msgstr ""
 "リスト中の全てのゲームが設定により表示されていません。この文章をダブルクリッ"
 "クすると表示されるようになります"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1159
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1160
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1246
 msgid "Dolphin was unable to complete the requested action."
 msgstr "要求された操作を完了することができませんでした。"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:275
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:58
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
+#, fuzzy
+msgid ""
+"Doubles the emulated GPU clock rate. May speed up some games (ON = Fast, OFF "
+"= Compatible)"
+msgstr ""
+"ディスクの読み取り速度を向上させます。必要になるタイトルはわずかです [有効＝"
+"ロード時間短縮／無効＝互換性・安定性重視]"
+
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:262
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:45
 msgid "Down"
 msgstr "下"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:54
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:44
 msgid "Download Codes (WiiRD Database)"
 msgstr "Webからコードを入手 (WiiRD Database)"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:297
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:287
 #, c-format
 msgid "Downloaded %lu codes. (added %lu)"
 msgstr "%lu個のコードが見つかりました。( 新規追加： %lu個 )"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:31
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:35
 msgid "Drums"
 msgstr "ドラムコントローラ"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:105
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
 msgid "Dummy"
 msgstr "ダミーデバイス"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:661
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:642
 msgid "Dump Audio"
 msgstr "サウンドのダンプ"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:532
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545
 msgid "Dump EFB Target"
 msgstr "EFBターゲットをダンプ"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546
 msgid "Dump Frames"
 msgstr "フレームをダンプ"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543
 msgid "Dump Textures"
 msgstr "テクスチャをダンプ"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114
 msgid ""
 "Dump all rendered frames to an AVI file in User/Dump/Frames/\n"
 "\n"
@@ -1753,7 +1823,7 @@ msgstr ""
 "\n"
 "よく分からなければ、チェックを入れないでください。"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111
 msgid ""
 "Dump decoded game textures to User/Dump/Textures/<game_id>/\n"
 "\n"
@@ -1763,7 +1833,7 @@ msgstr ""
 "\n"
 "よく分からなければ、チェックを入れないでください。"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113
 msgid ""
 "Dump the contents of EFB copies to User/Dump/Textures/\n"
 "\n"
@@ -1773,21 +1843,21 @@ msgstr ""
 "\n"
 "よく分からなければ、チェックを入れないでください。"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:474
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292
 msgid "Dutch"
 msgstr "オランダ語"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:112
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:113
 msgid "E&xit"
 msgstr "終了"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:441
 msgid "EFB Copies"
 msgstr "EFB Copies"
 
-#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:223
+#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:210
 #, c-format
 msgid ""
 "ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least "
@@ -1799,52 +1869,52 @@ msgstr ""
 "Dolphinのバージョンを更新した場合は、ドライバを認識させるためにWindowsの再起"
 "動が必要になるかもしれません。"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:166
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:160
 msgid "EUROPE"
 msgstr "欧州"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:156
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:143
 msgid "Early Memory Updates"
 msgstr "Early Memory Updates"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:447
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:453
 msgid "Edit"
 msgstr "編集"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.h:30
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.h:17
 msgid "Edit ActionReplay Code"
 msgstr "コードを編集"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:285
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:286
 msgid "Edit Config"
 msgstr "iniを編集"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.h:30
+#: Source/Core/DolphinWX/Src/PatchAddEdit.h:17
 msgid "Edit Patch"
 msgstr "パッチを編集"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:447
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:453
 msgid "Edit current perspective"
-msgstr ""
+msgstr "Edit current perspective"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:403
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:425
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:407
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:429
 msgid "Edit..."
 msgstr "編集"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:44
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:48
 msgid "Effect"
 msgstr "エフェクト"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:425
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435
 msgid "Embedded Frame Buffer"
 msgstr "Embedded Frame Buffer (内蔵フレームバッファ)"
 
-#: Source/Core/Core/Src/Core.cpp:201
+#: Source/Core/Core/Src/Core.cpp:190
 msgid "Emu Thread already running"
 msgstr "エミュレーションスレッドはすでに稼働中です"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110
 msgid ""
 "Emulate XFBs accurately.\n"
 "Slows down emulation a lot and prohibits high-resolution rendering but is "
@@ -1858,7 +1928,7 @@ msgstr ""
 "\n"
 "よく分からなければ、【Virtual】を選択したままにしておいてください。"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109
 msgid ""
 "Emulate XFBs using GPU texture objects.\n"
 "Fixes many games which don't work without XFB emulation while not being as "
@@ -1879,7 +1949,7 @@ msgstr ""
 msgid "Emulated Wiimote"
 msgstr "Wii リモコンをエミュレート"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346
 msgid "Emulation State: "
 msgstr "動作状況："
 
@@ -1887,7 +1957,7 @@ msgstr "動作状況："
 msgid "Enable"
 msgstr "有効"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91
 msgid ""
 "Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's "
 "supported by your GPU.\n"
@@ -1903,72 +1973,71 @@ msgstr ""
 "\n"
 "よく分からなければ、チェックを入れないでください。"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:111
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:98
 msgid "Enable AR Logging"
 msgstr "アクションリプレイコードのログを取得する"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324
 msgid "Enable Block Merging"
 msgstr "Enable Block Merging"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331
 msgid "Enable Bounding Box Calculation"
 msgstr "Enable Bounding Box Calculation"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:446
 msgid "Enable Cache"
 msgstr "Enable Cache"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:562
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542
 msgid "Enable Cheats"
 msgstr "チートコードを有効化"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310
 msgid "Enable Dual Core"
 msgstr "Enable Dual Core"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
 msgid "Enable Dual Core (speedup)"
 msgstr "デュアルコア動作を行う (速度向上)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:550
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:563
 msgid "Enable Hotkeys"
 msgstr "ホットキーを使用"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311
 msgid "Enable Idle Skipping"
 msgstr "Enable Idle Skipping"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541
 msgid "Enable Idle Skipping (speedup)"
 msgstr "アイドルスキップ処理を行う (速度向上)"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312
 msgid "Enable MMU"
 msgstr "Enable MMU"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:554
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:567
 msgid "Enable Progressive Scan"
 msgstr "プログレッシブ表示を有効化"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757
 msgid "Enable Screen Saver"
 msgstr "スクリーンセーバーを有効化"
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:75
-#, fuzzy
 msgid "Enable Speaker Data"
-msgstr "ページ分けして表示"
+msgstr "スピーカー出力の有効化"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
 msgid "Enable WideScreen"
 msgstr "Enable WideScreen"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:516
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529
 msgid "Enable Wireframe"
 msgstr "ワイヤーフレーム有効化"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85
 msgid ""
 "Enable anisotropic filtering.\n"
 "Enhances visual quality of textures that are at oblique viewing angles.\n"
@@ -1982,7 +2051,7 @@ msgstr ""
 "\n"
 "よく分からなければ、【1x】を選択してください。"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323
 msgid ""
 "Enable fast disc access.  Needed for a few games. (ON = Fast, OFF = "
 "Compatible)"
@@ -1994,7 +2063,7 @@ msgstr ""
 msgid "Enable pages"
 msgstr "ページ分けして表示"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76
 msgid ""
 "Enable this if you want the whole screen to be used for rendering.\n"
 "If this is disabled, a render window will be created instead.\n"
@@ -2006,7 +2075,7 @@ msgstr ""
 "\n"
 "よく分からなければ、チェックを入れないでください。"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80
 msgid ""
 "Enable this if you want to use the main Dolphin window for rendering rather "
 "than a separate render window.\n"
@@ -2017,7 +2086,7 @@ msgstr ""
 "\n"
 "よく分からなければ、チェックを入れないでください。"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:335
 msgid ""
 "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for "
 "ANY other game."
@@ -2025,11 +2094,11 @@ msgstr ""
 "トワイライトプリンセスにおいて、広大なエリアで発生するFPS低下を抑えます。他の"
 "タイトルでは無効にしてください"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340
 msgid "Enables Custom Projection Hack"
 msgstr "Enables Custom Projection Hack"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:528
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508
 msgid ""
 "Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on "
 "OSX."
@@ -2037,14 +2106,14 @@ msgstr ""
 "Dolby Pro Logic II を使用した5.1サラウンドのエミュレーションを行います。OSX "
 "には現在未対応です"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510
 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:532
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:512
 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."
@@ -2053,7 +2122,7 @@ msgstr ""
 "OpenALのみ対応。『soft_oal.dll』を『OenAL32.dll』にリネームすることで動作しま"
 "す"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81
 msgid ""
 "Enables progressive scan if supported by the emulated software.\n"
 "Most games don't care about this.\n"
@@ -2065,7 +2134,7 @@ msgstr ""
 "\n"
 "よく分からなければ、チェックを入れないでください。"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313
 msgid ""
 "Enables the Memory Management Unit, needed for some games. (ON = Compatible, "
 "OFF = Fast)"
@@ -2073,7 +2142,7 @@ msgstr ""
 "メモリ管理機構を有効にします。いくつかのゲームで必要です [有効＝互換性・安定"
 "性重視／無効＝動作速度向上]"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116
 msgid ""
 "Encode frame dumps using the FFV1 codec.\n"
 "\n"
@@ -2083,58 +2152,58 @@ msgstr ""
 "\n"
 "よく分からなければ、チェックを入れないでください。"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:40
 msgid "End"
 msgstr "End"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:469
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:280
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:260
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293
 msgid "English"
 msgstr "英語"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:329
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:407
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:337
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:417
 msgid "Enhancements"
 msgstr "画質向上の設定"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:607
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:640
 msgid "Enter a name for the new perspective:"
-msgstr ""
+msgstr "Enter a name for the new perspective:"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:191
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:178
 #, c-format
 msgid "Entry %d/%d"
 msgstr "エントリ %d/%d"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:85
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:72
 #, c-format
 msgid "Entry 1/%d"
 msgstr "エントリ 1/%d"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:204
 msgid "Equal"
 msgstr "に一致する"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:45
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:156
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1242
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:32
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:150
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226
 msgid "Error"
 msgstr "エラー"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:381
+#: Source/Core/DolphinWX/Src/Main.cpp:409
 msgid "Error loading selected language. Falling back to system default."
 msgstr ""
 "選択した言語の読み込みに失敗しました。＜システムの言語＞に設定を戻します"
 
-#: Source/Core/Common/Src/ChunkFile.h:226
+#: Source/Core/Common/Src/ChunkFile.h:221
 #, c-format
 msgid ""
 "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). "
 "Aborting savestate load..."
 msgstr ""
 
-#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:342
+#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:329
 #, c-format
 msgid ""
 "Error: Trying to access %s fonts but they are not loaded. Games may not show "
@@ -2143,38 +2212,38 @@ msgstr ""
 "エラー： フォント群 %s にアクセスを試みましたが読み込めませんでした。ゲームは"
 "フォントを正しく表示できないか、クラッシュするでしょう"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:30
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:17
 msgid "Escape"
 msgstr "Escape"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:26
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:30
 msgid "Euphoria"
 msgstr "Euphoria"
 
 #: Source/Core/Core/Src/ArmMemTools.cpp:78
-#: Source/Core/Core/Src/x64MemTools.cpp:217
+#: Source/Core/Core/Src/x64MemTools.cpp:206
 #, c-format
 msgid "Exception handler - access below memory space. %08llx%08llx"
 msgstr "Exception handler - access below memory space. %08llx%08llx"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:61
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
 msgid "Execute"
 msgstr "Execute"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:459
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:446
 msgid "Export Failed"
 msgstr "エクスポートに失敗"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:639
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:649
 msgid "Export File"
 msgstr "ファイルを抽出"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:177
 msgid "Export Recording"
 msgstr "録画ファイルのエクスポート"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:345
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:351
 msgid "Export Recording..."
 msgstr "録画ファイルのエクスポート"
 
@@ -2182,7 +2251,7 @@ msgstr "録画ファイルのエクスポート"
 msgid "Export Save"
 msgstr "セーブデータをエクスポート"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:874
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:865
 msgid "Export Wii save (Experimental)"
 msgstr "セーブデータをエクスポート (実験的)"
 
@@ -2190,100 +2259,100 @@ msgstr "セーブデータをエクスポート (実験的)"
 msgid "Export all saves"
 msgstr "全てのセーブデータをエクスポート"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:80
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:72
 msgid "Export failed, try again?"
 msgstr "エクスポートに失敗しました。リトライしますか？"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:559
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:552
 msgid "Export save as..."
 msgstr "セーブデータのエクスポート先を選択"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:297
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:284
 msgid "Extension"
 msgstr "拡張コントローラ"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483
 msgid "External Frame Buffer"
 msgstr "External Frame Buffer (外部フレームバッファ)"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:61
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:48
 msgid "Extra Parameter"
 msgstr "特殊パラメータ"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:62
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:49
 msgid "Extra Parameter useful in ''Metroid: Other M'' only."
 msgstr "『メトロイド Other M』のみに有用な設定です"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:614
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:624
 msgid "Extract All Files..."
 msgstr "全てのファイルを抽出"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:616
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:626
 msgid "Extract Apploader..."
 msgstr "Apploaderを抽出"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:617
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627
 msgid "Extract DOL..."
 msgstr "DOLを抽出"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:610
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:620
 msgid "Extract Directory..."
 msgstr "このフォルダを抽出"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:612
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:622
 msgid "Extract File..."
 msgstr "このファイルを抽出"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:608
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:618
 msgid "Extract Partition..."
 msgstr "このパーティションを抽出"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:724
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:738
 #, c-format
 msgid "Extracting %s"
 msgstr "%s を抽出"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:707
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:721
 msgid "Extracting All Files"
 msgstr "全てのファイルをエクスポート"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:707
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:721
 msgid "Extracting Directory"
 msgstr "フォルダをエクスポート"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:710
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:724
 msgid "Extracting..."
 msgstr "抽出しています..."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:892
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:893
 msgid "FIFO Byte"
 msgstr "FIFO バイト"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:45
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:32
 msgid "FIFO Player"
 msgstr "FIFO プレーヤー"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:169
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:163
 msgid "FRANCE"
 msgstr "フランス"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472
 msgid "FST Size:"
 msgstr "FSTサイズ"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:77
+#: Source/Core/Core/Src/NetPlayClient.cpp:81
 msgid "Failed to Connect!"
 msgstr "接続に失敗！"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:225
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:228
 msgid "Failed to Listen!!"
 msgstr "Listenに失敗！"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:307
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:300
 msgid "Failed to download codes."
 msgstr "コードの取得に失敗しました"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:827
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:843
 #, c-format
 msgid "Failed to extract to %s!"
 msgstr "%s への抽出に失敗"
@@ -2309,26 +2378,30 @@ msgstr ""
 "ダンプが難しい環境ではこのファイルが不要なDSP-HLEエンジンを使用してください\n"
 "(本体設定→\"サウンド\"で選択できます)"
 
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:116
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:139
+#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:108
+#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:131
 msgid "Failed to load bthprops.cpl"
 msgstr "Failed to load bthprops.cpl"
 
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:100
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:109
+#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:90
+#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:101
 msgid "Failed to load hid.dll"
 msgstr "Failed to load hid.dll"
 
-#: Source/Core/Core/Src/Movie.cpp:792
+#: Source/Core/Core/Src/Movie.cpp:783
 #, c-format
 msgid "Failed to read %s"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:151
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:144
 msgid "Failed to read banner.bin"
 msgstr "Failed to read banner.bin"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:223
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:178
+msgid "Failed to read bk header"
+msgstr "Failed to read bk header"
+
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:211
 #, c-format
 msgid ""
 "Failed to read block %d of the save data\n"
@@ -2339,7 +2412,7 @@ msgstr ""
 "Memcard may be truncated\n"
 "FilePosition:%llx"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:148
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:136
 msgid ""
 "Failed to read block allocation table backup correctly\n"
 "(0x8000-0x9FFF)"
@@ -2347,7 +2420,7 @@ msgstr ""
 "Failed to read block allocation table backup correctly\n"
 "(0x8000-0x9FFF)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:142
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:130
 msgid ""
 "Failed to read block allocation table correctly\n"
 "(0x6000-0x7FFF)"
@@ -2355,12 +2428,17 @@ msgstr ""
 "Failed to read block allocation table correctly\n"
 "(0x6000-0x7FFF)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:286
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:279
 #, c-format
 msgid "Failed to read data from file %d"
 msgstr "Failed to read data from file %d"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:136
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:367
+#, c-format
+msgid "Failed to read data from file: %s"
+msgstr "Failed to read data from file: %s"
+
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:124
 msgid ""
 "Failed to read directory backup correctly\n"
 "(0x4000-0x5FFF)"
@@ -2368,7 +2446,7 @@ msgstr ""
 "Failed to read directory backup correctly\n"
 "(0x4000-0x5FFF)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:130
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:118
 msgid ""
 "Failed to read directory correctly\n"
 "(0x2000-0x3FFF)"
@@ -2376,7 +2454,11 @@ msgstr ""
 "Failed to read directory correctly\n"
 "(0x2000-0x3FFF)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:119
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:90
+msgid "Failed to read header"
+msgstr "Failed to read header"
+
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:107
 msgid ""
 "Failed to read header correctly\n"
 "(0x0000-0x1FFF)"
@@ -2384,41 +2466,41 @@ msgstr ""
 "Failed to read header correctly\n"
 "(0x0000-0x1FFF)"
 
-#: Source/Core/DiscIO/Src/VolumeGC.cpp:61
+#: Source/Core/DiscIO/Src/VolumeGC.cpp:48
 msgid "Failed to read unique ID from disc image"
 msgstr "Failed to read unique ID from disc image"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:84
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:71
 msgid "Failed to write BT.DINF to SYSCONF"
 msgstr "Failed to write BT.DINF to SYSCONF"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:228
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:221
 msgid "Failed to write bkhdr"
 msgstr "Failed to write bkhdr"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:164
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:157
 #, c-format
 msgid "Failed to write header for %s"
 msgstr "Failed to write header for %s"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:258
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:251
 #, c-format
 msgid "Failed to write header for file %d"
 msgstr "Failed to write header for file %d"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294
 msgid "Farsi"
 msgstr "ペルシア語"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477
 msgid "Fast"
 msgstr "Fast"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315
 msgid "Fast version of the MMU.  Does not work for every game."
 msgstr "高速なMMUを使用します。全てのゲームでうまく動くわけではありません"
 
-#: Source/Core/Core/Src/Movie.cpp:1046
+#: Source/Core/Core/Src/Movie.cpp:1037
 #, c-format
 msgid ""
 "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s"
@@ -2426,23 +2508,23 @@ msgstr ""
 "致命的なdesyncが発生したため再生を中止します。 (Error in PlayWiimote: %u != "
 "%u, byte %u.)%s"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:199
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:202
 msgid "Fifo Player"
 msgstr "FIFO プレーヤー"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:99
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:86
 msgid "File Info"
 msgstr "ファイル情報"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:304
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:295
 msgid "File contained no codes."
 msgstr "コードを含まないファイルです"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:413
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:400
 msgid "File converted to .gci"
 msgstr "ファイルはGCIへ変換されました"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:428
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:415
 msgid ""
 "File could not be opened\n"
 "or does not have a valid extension"
@@ -2450,7 +2532,7 @@ msgstr ""
 "ファイルを開くことができませんでした\n"
 "もしくは有効な拡張子ではありません"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:84
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:72
 #, c-format
 msgid ""
 "File has the extension \"%s\"\n"
@@ -2459,36 +2541,36 @@ msgstr ""
 "このファイルの拡張子は \"%s\" です\n"
 "有効な拡張子は .raw/.gcp です"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:425
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:412
 msgid "File is not recognized as a memcard"
 msgstr "このファイルはメモリーカードとして認識されませんでした"
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:294
+#: Source/Core/DiscIO/Src/CompressedBlob.cpp:281
 msgid "File not compressed"
 msgstr "圧縮されていないファイル"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:127
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:109
 #, c-format
 msgid "FileIO: Unknown open mode : 0x%02x"
 msgstr "FileIO: Unknown open mode : 0x%02x"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:531
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:541
 msgid "Filesystem"
 msgstr "構造"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1100
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1126
 msgid "Filetype 'ini' is unknown! Will not open!"
 msgstr " 'ini' は不明な拡張子です。開くことができません！"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:265
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:252
 msgid "Find next"
 msgstr "次へ"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:266
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:253
 msgid "Find previous"
 msgstr "前へ"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:632
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626
 msgid "First Block"
 msgstr "ブロック開始位置"
 
@@ -2496,23 +2578,23 @@ msgstr "ブロック開始位置"
 msgid "Fix Checksums"
 msgstr "チェックサムを修正"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:275
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283
 msgid "Force 16:9"
 msgstr "強制的に 16:9 にする"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:275
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283
 msgid "Force 4:3"
 msgstr "強制的に 4:3 にする"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:568
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548
 msgid "Force Console as NTSC-J"
 msgstr "コンソールを日本向け (NTSC-J) に設定"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406
 msgid "Force Texture Filtering"
 msgstr "Force Texture Filtering"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90
 msgid ""
 "Force texture filtering even if the emulated game explicitly disabled it.\n"
 "Improves texture quality slightly but causes glitches in some games.\n"
@@ -2526,7 +2608,7 @@ msgstr ""
 "\n"
 "よく分からなければ、チェックを入れないでください。"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83
 msgid ""
 "Force the game to output graphics for widescreen resolutions.\n"
 "Causes graphical glitches is some games.\n"
@@ -2538,7 +2620,7 @@ msgstr ""
 "\n"
 "よく分からなければ、チェックを入れないでください。"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488
 msgid ""
 "Forces NTSC-J mode for using the Japanese ROM font.\n"
 "Left unchecked, dolphin defaults to NTSC-U and automatically enables this "
@@ -2549,7 +2631,7 @@ msgstr ""
 "チェックを外した状態ではDolphinは NTSC-U を使用しますが、日本のタイトルをプレ"
 "イ時には自動的にこの設定は有効になります"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:74
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:62
 msgid ""
 "Format as ascii (NTSC\\PAL)?\n"
 "Choose no for sjis (NTSC-J)"
@@ -2557,148 +2639,147 @@ msgstr ""
 "ASCII コードでフォーマットしますか？ (NTSC もしくは PAL)\n"
 "Shift_JIS (NTSC-J) ではフォーマットできません"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:278
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:265
 msgid "Forward"
 msgstr "前方"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504
 #, c-format
 msgid "Found %d results for '"
 msgstr "検索結果：%d 件 '"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:857
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:925
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:858
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:926
 msgid "Frame"
 msgstr "フレーム"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:867
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:868
 msgid "Frame "
 msgstr "フレーム"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:185
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:173
 msgid "Frame Advance"
 msgstr "Frame Advance"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:536
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549
 msgid "Frame Dumps use FFV1"
 msgstr "FFV1を使用してフレームをダンプ"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:227
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:214
 msgid "Frame Info"
 msgstr "フレームの情報"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:116
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:103
 msgid "Frame Range"
 msgstr "フレームの範囲"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:138
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:139
 msgid "Frame S&kipping"
 msgstr "フレームスキップ(&K)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:572
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552
 msgid "Framelimit:"
 msgstr "フレームリミット："
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:204
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:191
 msgid "Frames To Record"
 msgstr "録画フレーム数設定"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547
 msgid "Free Look"
 msgstr "フリールック"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
 msgid "French"
 msgstr "フランス語"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:38
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:42
 msgid "Frets"
 msgstr "フレットボタン"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:118
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:137
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:105
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:124
 msgid "From"
 msgstr "開始"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:426
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:432
 msgid "FullScr"
 msgstr "全画面"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:256
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263
 msgid "Fullscreen resolution:"
 msgstr "全画面表示時の解像度："
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:534
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524
 msgid "GCI File(*.gci)"
 msgstr "GCI ファイル (*.gci)"
 
-#: Source/Core/DolphinWX/Src/GCMicDlg.h:44
+#: Source/Core/DolphinWX/Src/GCMicDlg.h:31
 msgid "GCMic Configuration"
 msgstr "マイクの設定"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:432
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
 msgid "GCPad"
 msgstr "入力(GC)"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:659
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:658
 msgid "GX_CMD_INVL_VC"
 msgstr "GX_CMD_INVL_VC"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:448
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:452
 msgid "Game ID:"
 msgstr "ゲームID"
 
-#: Source/Core/Core/Src/NetPlay.cpp:229
+#: Source/Core/Core/Src/NetPlay.cpp:216
 msgid "Game is already running!"
 msgstr "すでに起動しています！"
 
-#: Source/Core/Core/Src/NetPlay.cpp:259
+#: Source/Core/Core/Src/NetPlay.cpp:246
 msgid "Game isn't running!"
 msgstr "ゲームが起動していません！"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:389
-#, fuzzy
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:393
 msgid "Game not found!"
 msgstr "ゲームが見つかりません！"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:385
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:389
 msgid "Game-Specific Settings"
 msgstr "固有設定"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:293
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:294
 msgid "GameConfig"
 msgstr "ゲーム設定"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:525
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:515
 msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)"
 msgstr "GCセーブファイル(*.gci;*.gcs;*.sav)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534
 msgid "Gamecube"
 msgstr "ゲームキューブ"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:178
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:181
 msgid "Gamecube &Pad Settings"
 msgstr "ゲームキューブ入力設定(&P)"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:218
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1069
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:205
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1052
 msgid "Gamecube Memory Cards (*.raw,*.gcp)"
 msgstr "メモリーカードファイル (*.raw,*.gcp)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:432
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
 msgid "Gamecube Pad settings"
 msgstr "ゲームキューブの入力設定を行います"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:117
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302
 msgid "Gecko Codes"
 msgstr "Geckoコード"
 
-#: Source/Core/Core/Src/GeckoCode.cpp:222
+#: Source/Core/Core/Src/GeckoCode.cpp:214
 #, c-format
 msgid ""
 "GeckoCode failed to run (CT%i CST%i) (%s)\n"
@@ -2711,10 +2792,10 @@ msgstr ""
 "ネイティブコードハンドラを試してみてください。Sys フォルダに codehandler.bin "
 "を置き、Dolphinを再起動することで利用できます)"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:172
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:197
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:160
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:160
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:202
 msgid "General"
 msgstr "一般"
 
@@ -2722,31 +2803,31 @@ msgstr "一般"
 msgid "General Settings"
 msgstr "一般"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:470
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:281
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:316
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:261
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
 msgid "German"
 msgstr "ドイツ語"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:449
+#: Source/Core/Core/Src/ActionReplay.cpp:439
 #, c-format
 msgid "GetARCode: Index is greater than ar code list size %lu"
 msgstr ""
 "GetARCode: インデックスのサイズがコードリストのサイズを上回っています %lu"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:430
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:436
 msgid "Graphics"
 msgstr "ビデオ"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:430
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:436
 msgid "Graphics settings"
 msgstr "描画に関する設定を行います"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:205
 msgid "Greater Than"
 msgstr "より大きい"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87
 msgid ""
 "Greatly increases quality of textures generated using render to texture "
 "effects.\n"
@@ -2762,51 +2843,76 @@ msgstr ""
 "動作速度は少々低下し、まれに描画バグの原因にもなることもあります。\n"
 "よく分からなければ、チェックを外さないでください。"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:317
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
 msgid "Greek"
 msgstr "ギリシア語"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:22
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Green"
 msgstr "緑"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:24
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Green Left"
 msgstr "緑 - 左"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:25
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Green Right"
 msgstr "緑 - 右"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:35
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:39
 msgid "Guitar"
 msgstr "ギターコントローラ"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1259
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1250
 msgid "HCI_CMD_INQUIRY is called, please report!"
 msgstr "HCI_CMD_INQUIRY is called, please report!"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:421
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504
+msgid "Hacked Buffer Upload"
+msgstr "Hacked Buffer Upload"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431
 msgid "Hacks"
 msgstr "高速化(Hacks)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:158
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:146
 msgid "Header checksum failed"
 msgstr "Header checksum failed"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:318
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298
 msgid "Hebrew"
 msgstr "ヘブライ語"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:313
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:300
 msgid "Height"
 msgstr "範囲(縦)"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:64
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:51
 msgid "Help"
 msgstr "ヘルプ"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:209
+#: Source/Core/DolphinWX/Src/Main.cpp:229
+msgid ""
+"Hi,\n"
+"\n"
+"Dolphin requires Mac OS X 10.7 or greater.\n"
+"Unfortunately you're running an old version of OS X.\n"
+"The last Dolphin version to support OS X 10.6 is Dolphin 3.5\n"
+"Please upgrade to 10.7 or greater to use the newest Dolphin version.\n"
+"\n"
+"Sayonara!\n"
+msgstr ""
+"こんにちはこんにちは！\n"
+"\n"
+"このバージョンのDolphinの動作には Mac OS X 10.7 以上が必要なんだ。\n"
+"残念ながら君の使っているOSはこれより古いから、起動することができないみた"
+"い・・・\n"
+"Dolphin 3.5 なら Mac OS X 10.6 でも動作するけど、もっと新しいバージョンを使い"
+"たいならOSをアップグレードしてね。\n"
+"\n"
+"さよなら！\n"
+
+#: Source/Core/DolphinWX/Src/Main.cpp:220
 msgid ""
 "Hi,\n"
 "\n"
@@ -2823,15 +2929,15 @@ msgstr ""
 "\n"
 "さよなら！\n"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:309
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:296
 msgid "Hide"
 msgstr "隠す"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:307
 msgid "Hide Mouse Cursor"
 msgstr "マウスカーソルを隠す"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79
 msgid ""
 "Hides the mouse cursor if it's on top of the emulation window.\n"
 "\n"
@@ -2842,26 +2948,26 @@ msgstr ""
 "\n"
 "よく分からなければ、チェックを入れないでください。"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:54
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41
 msgid "Home"
 msgstr "Home"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:85
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:138
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:76
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:141
 msgid "Host"
 msgstr "ホスト"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.h:44
+#: Source/Core/DolphinWX/Src/HotkeyDlg.h:31
 msgid "Hotkey Configuration"
 msgstr "ホットキーの設定"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:272
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:272
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:594
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:260
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:260
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574
 msgid "Hotkeys"
 msgstr "ホットキー"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:319
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299
 msgid "Hungarian"
 msgstr "ハンガリー語"
 
@@ -2869,33 +2975,33 @@ msgstr "ハンガリー語"
 msgid "Hybrid Wiimote"
 msgstr "Hybrid Wiimote"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:532
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:519
 #, 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:786
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:773
 #, c-format
 msgid ""
-"IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available "
-"in your nand dump\n"
+"IOCTL_ES_LAUNCH: Game tried to reload an IOS or a title that is not "
+"available in your NAND dump\n"
 "TitleID %016llx.\n"
-" Dolphin will likely hang now"
+" Dolphin will likely hang now."
 msgstr ""
-"IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available "
-"in your nand dump\n"
+"IOCTL_ES_LAUNCH: あなたの NAND ダンプに含まれていない IOS やファイルを読み込"
+"もうとしました\n"
 "TitleID %016llx.\n"
-" Dolphin will likely hang now"
+" Dolphin を停止します"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:313
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:300
 msgid "IOCTL_ES_READCONTENT - bad destination"
 msgstr "IOCTL_ES_READCONTENT - bad destination"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729
 msgid "IPL Settings"
 msgstr "IPL設定"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269
 msgid "IR"
 msgstr "ポインタ"
 
@@ -2907,47 +3013,34 @@ msgstr "IR ポインタ"
 msgid "IR Sensitivity:"
 msgstr "感度"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:502
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:512
 msgid "ISO Details"
 msgstr "ゲームの詳細"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:830
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:811
 msgid "ISO Directories"
 msgstr "フォルダ一覧"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:172
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:166
 msgid "ITALY"
 msgstr "イタリア"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:630
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:624
 msgid "Icon"
 msgstr "アイコン"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332
 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:318
-msgid ""
-"If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)"
-msgstr ""
-"FPSが安定しないゲームで効果があります [有効＝互換性向上／無効＝動作速度向上]"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505
-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:428
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438
 msgid "Ignore Format Changes"
 msgstr "Ignore Format Changes"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94
 msgid ""
 "Ignore any changes to the EFB format.\n"
 "Improves performance in many games without any negative effect. Causes "
@@ -2961,7 +3054,7 @@ msgstr ""
 "\n"
 "よく分からなければ、チェックを外さないでください。"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93
 msgid ""
 "Ignore any requests of the CPU to read from or write to the EFB.\n"
 "Improves performance in some games, but might disable some gameplay-related "
@@ -2979,11 +3072,11 @@ msgstr ""
 msgid "Import Save"
 msgstr "セーブデータをインポート"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:59
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:48
 msgid "Import failed, try again?"
 msgstr "インポートに失敗しました。リトライしますか？"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:454
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:441
 msgid ""
 "Imported file has gsc extension\n"
 "but does not have a correct header"
@@ -2991,11 +3084,11 @@ msgstr ""
 "インポートされたのは'gsc'ファイルのようです\n"
 "しかし正しいヘッダではありません"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:442
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:429
 msgid "Imported file has invalid length"
 msgstr "インポートしたファイルの長さが正しくありません"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:451
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:438
 msgid ""
 "Imported file has sav extension\n"
 "but does not have a correct header"
@@ -3003,20 +3096,7 @@ msgstr ""
 "インポートされたのは'sav'ファイルのようです\n"
 "しかし正しいヘッダではありません"
 
-#: 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 ""
-"フォグ(霧)処理を無効化します。\n"
-"動作速度が改善されますが、フォグ処理に頼った画面効果が正しく表示 されなくなり"
-"ます。\n"
-"\n"
-"よく分からなければ、チェックを入れないでください。"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350
 msgid "In Game"
 msgstr "ソコソコ"
 
@@ -3024,67 +3104,67 @@ msgstr "ソコソコ"
 msgid "In-Game"
 msgstr "ゲーム内"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:34
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305
 msgid "Info"
 msgstr "情報"
 
-#: Source/Core/Common/Src/MsgHandler.cpp:65
+#: Source/Core/Common/Src/MsgHandler.cpp:51
 msgid "Information"
 msgstr "情報"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:481
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:468
 msgid "Input"
 msgstr "入力"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:63
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:50
 msgid "Insert"
 msgstr "Insert"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:176
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:166
 msgid "Insert Encrypted or Decrypted code here..."
 msgstr "ここに暗号化or復号化されたコードを貼り付けてください"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:763
 msgid "Insert SD Card"
 msgstr "SDカードの挿入をエミュレート"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:34
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:21
 msgid "Insert name here.."
 msgstr "コード名を入力してください"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:196
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:199
 msgid "Install WAD"
 msgstr "WiiメニューにWADファイルを追加"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:895
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:888
 msgid "Install to Wii Menu"
 msgstr "Wiiメニューへインストール"
 
-#: Source/Core/Core/Src/x64MemTools.cpp:252
+#: Source/Core/Core/Src/x64MemTools.cpp:242
 msgid ""
 "InstallExceptionHandler called, but this platform does not yet support it."
 msgstr ""
 "InstallExceptionHandler が呼び出されましたが、このプラットフォームはまだサ"
 "ポートされていません"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1297
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
 msgid "Installing WAD..."
 msgstr "追加しています..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:885
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:901
 msgid "Integrity Check Error"
 msgstr "エラーが確認されました！"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:891
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:907
 msgid "Integrity check completed"
 msgstr "完了"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:890
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:906
 msgid "Integrity check completed. No errors have been found."
 msgstr "チェック終了。整合性に問題はありませんでした。"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:882
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:898
 #, c-format
 msgid ""
 "Integrity check for partition %d failed. Your dump is most likely corrupted "
@@ -3093,19 +3173,19 @@ msgstr ""
 "パーティション %d に問題が見つかりました。 データが破損しているか、正しくパッ"
 "チが当てられていない可能性があります。"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532
 msgid "Interface"
 msgstr "表示"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:646
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627
 msgid "Interface Settings"
 msgstr "Dolphinの表示に関する設定"
 
-#: Source/Core/Core/Src/State.cpp:240
+#: Source/Core/Core/Src/State.cpp:228
 msgid "Internal LZO Error - compression failed"
 msgstr "Internal LZO Error - compression failed"
 
-#: Source/Core/Core/Src/State.cpp:348
+#: Source/Core/Core/Src/State.cpp:336
 #, c-format
 msgid ""
 "Internal LZO Error - decompression failed (%d) (%li, %li) \n"
@@ -3114,41 +3194,45 @@ msgstr ""
 "Internal LZO Error - decompression failed (%d) (%li, %li) \n"
 "もう一度ロードを試してみてください"
 
-#: Source/Core/Core/Src/State.cpp:485
+#: Source/Core/Core/Src/State.cpp:473
 msgid "Internal LZO Error - lzo_init() failed"
 msgstr "Internal LZO Error - lzo_init() failed"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:344
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:352
 msgid "Internal Resolution:"
 msgstr "内部解像度の変更："
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:42
+msgid "Interpreter (VERY slow)"
+msgstr "Interpreter (非常に低速)"
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349
 msgid "Intro"
 msgstr "イントロ"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:194
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:187
 #, c-format
 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:600
 msgid "Invalid Value!"
 msgstr "無効な値です！"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:462
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:449
 msgid "Invalid bat.map or dir entry"
 msgstr "Invalid bat.map or dir entry"
 
-#: Source/Core/Core/Src/CoreTiming.cpp:548
+#: Source/Core/Core/Src/CoreTiming.cpp:553
 #, c-format
 msgid "Invalid event type %i"
 msgstr "Invalid event type %i"
 
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:326
+#: Source/Core/Core/Src/HW/DVDInterface.cpp:309
 msgid "Invalid file"
 msgstr "不正なファイル"
 
-#: Source/Core/DiscIO/Src/BannerLoaderGC.cpp:41
+#: Source/Core/DiscIO/Src/BannerLoaderGC.cpp:28
 #, c-format
 msgid ""
 "Invalid opening.bnr found in gcm:\n"
@@ -3159,46 +3243,54 @@ msgstr ""
 "%s\n"
 " このゲームをダンプしなおしてください"
 
-#: Source/Core/Core/Src/Movie.cpp:735
+#: Source/Core/Core/Src/Movie.cpp:726
 msgid "Invalid recording file"
 msgstr "不正な録画ファイル"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:473
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:472
 msgid "Invalid search parameters (no object selected)"
 msgstr "エラー：オブジェクトを選択してください"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:456
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:455
 msgid "Invalid search string (couldn't convert to number)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:444
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:443
 msgid "Invalid search string (only even string lengths supported)"
 msgstr ""
 
-#: Source/Core/Core/Src/Core.cpp:513
+#: Source/Core/Core/Src/Core.cpp:511
 msgid "Invalid state"
 msgstr "不正なステートファイル"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:473
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:320
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300
 msgid "Italian"
 msgstr "イタリア語"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:183
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:177
 msgid "JAPAN"
 msgstr "日本"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:321
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:46
+msgid "JIT Recompiler (recommended)"
+msgstr "JIT Recompiler (推奨)"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:47
+msgid "JITIL experimental recompiler"
+msgstr "JITIL experimental recompiler (実験的)"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:279
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
 msgid "Japanese"
 msgstr "日本語"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:188
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:182
 msgid "KOREA"
 msgstr "韓国"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78
 msgid ""
 "Keep the game window on top of all other windows.\n"
 "\n"
@@ -3209,62 +3301,62 @@ msgstr ""
 "\n"
 "よく分からなければ、チェックを入れないでください。"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:298
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:306
 msgid "Keep window on top"
 msgstr "最前面に表示"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:241
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:241
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:229
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:229
 msgid "Key"
 msgstr "キー設定"
 
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282
 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:322
 msgid "Korean"
 msgstr "韓国語"
 
 #. i18n:  Left
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:57
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:44
 msgid "L"
 msgstr "L"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:39
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:26
 msgid "L Button"
 msgstr "Lボタン"
 
 #. i18n:  Left-Analog
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:61
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:48
 msgid "L-Analog"
 msgstr "L (アナログ)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:585
 msgid "Language:"
 msgstr "GUI言語："
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:152
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:153
 msgid "Last Overwritten State"
 msgstr "最後に上書きしたステートセーブ"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:159
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:161
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:160
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:162
 msgid "Last Saved State"
 msgstr "最新のステートセーブ"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:696
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:677
 msgid "Latency:"
 msgstr "レイテンシー："
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:276
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:55
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:263
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:42
 msgid "Left"
 msgstr "左"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:60
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:64
 msgid "Left Stick"
 msgstr "左スティック"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:257
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:257
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:245
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:245
 msgid ""
 "Left click to detect hotkeys.\n"
 "Enter space to clear."
@@ -3272,7 +3364,7 @@ msgstr ""
 "左クリックでキーの入力待ち\n"
 "スペースキーを入力で消去します"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:689
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:678
 msgid ""
 "Left-click to detect input.\n"
 "Middle-click to clear.\n"
@@ -3282,7 +3374,7 @@ msgstr ""
 "中クリックで消去\n"
 "右クリックで詳細設定に入ります"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:694
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:683
 msgid ""
 "Left/Right-click for more options.\n"
 "Middle-click to clear."
@@ -3290,76 +3382,76 @@ msgstr ""
 "左or右クリックで設定画面に入ります\n"
 "中クリックで消去します"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:219
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:206
 msgid "Less Than"
 msgstr "より小さい"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:565
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545
 msgid "Limit by FPS"
 msgstr "FPSによる制限を有効化"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:924
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:915
 msgid "Load"
 msgstr "読込"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544
 msgid "Load Custom Textures"
 msgstr "カスタムテクスチャを読み込む"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
 msgid "Load State Slot 1"
 msgstr "ステートロード - スロット 1"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189
 msgid "Load State Slot 2"
 msgstr "ステートロード - スロット 2"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:190
 msgid "Load State Slot 3"
 msgstr "ステートロード - スロット 3"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:203
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:191
 msgid "Load State Slot 4"
 msgstr "ステートロード - スロット 4"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192
 msgid "Load State Slot 5"
 msgstr "ステートロード - スロット 5"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193
 msgid "Load State Slot 6"
 msgstr "ステートロード - スロット 6"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:194
 msgid "Load State Slot 7"
 msgstr "ステートロード - スロット 7"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:195
 msgid "Load State Slot 8"
 msgstr "ステートロード - スロット 8"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:155
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:156
 msgid "Load State..."
 msgstr "ファイルからロード"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1332
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1359
 msgid "Load Wii System Menu"
 msgstr "Wiiメニューを起動"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1327
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1354
 #, c-format
 msgid "Load Wii System Menu %d%c"
 msgstr "Wiiメニューを起動 ( バージョン：%d %c )"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112
 msgid ""
 "Load custom textures from User/Load/Textures/<game_id>/\n"
 "\n"
@@ -3370,7 +3462,7 @@ msgstr ""
 "\n"
 "よく分からなければ、チェックを入れないでください。"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:50
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:37
 msgid "Load preset values from hack patterns available."
 msgstr "特定のゲーム向けの設定値を読み込みます"
 
@@ -3378,23 +3470,23 @@ msgstr "特定のゲーム向けの設定値を読み込みます"
 msgid "Local"
 msgstr "ローカル"
 
-#: Source/Core/DolphinWX/Src/LogWindow.h:51
+#: Source/Core/DolphinWX/Src/LogWindow.h:38
 msgid "Log"
 msgstr "ログ"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:26
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:13
 msgid "Log Configuration"
 msgstr "ログの設定"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:296
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304
 msgid "Log FPS to file"
 msgstr "FPSのログを保存"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:96
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83
 msgid "Log Types"
 msgstr "表示するログ情報"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103
 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"
@@ -3405,24 +3497,24 @@ msgstr ""
 "\n"
 "よく分からなければ、チェックを入れないでください。"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:81
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:68
 msgid "Logger Outputs"
 msgstr "ログ出力先"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132
-#: Source/Core/DolphinWX/Src/Frame.cpp:328
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:119
+#: Source/Core/DolphinWX/Src/Frame.cpp:314
 msgid "Logging"
 msgstr "ログ"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:255
+#: Source/Core/Core/Src/NetPlayClient.cpp:259
 msgid "Lost connection to server!"
 msgstr "サーバーとの接続が切断されました！"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:42
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:29
 msgid "M Button"
 msgstr "M Button"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:119
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:112
 #, c-format
 msgid ""
 "MD5 mismatch\n"
@@ -3431,57 +3523,71 @@ msgstr ""
 "MD5の不整合\n"
 " %016llx%016llx != %016llx%016llx"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314
 msgid "MMU Speed Hack"
 msgstr "MMU Speed Hack"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:527
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:563
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:517
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:556
 msgid "MadCatz Gameshark files(*.gcs)"
 msgstr "MadCatz Gameshark セーブファイル(*.gcs)"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:51
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:63
+#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:38
 msgid "Main Stick"
 msgstr "コントロールスティック"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460
 msgid "Maker ID:"
 msgstr "メーカーID"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487
 msgid "Maker:"
 msgstr "メーカー"
 
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100
+msgid ""
+"Makes distant objects more visible by removing fog, thus increasing the "
+"overall detail.\n"
+"Disabling fog will break some games which rely on proper fog emulation.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+"フォグ処理を無効化します。これにより遠景の高精細化が期待できます。\n"
+"いくつかのタイトルではフォグ処理に頼った画面効果が正しく表示 されなくなりま"
+"す。\n"
+"\n"
+"よく分からなければ、チェックを入れないでください。"
+
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:97
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:100
 msgid "Max"
 msgstr "最大"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:448
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:435
 msgid "Memcard already has a save for this title"
 msgstr "このタイトルのセーブデータはすでに存在します"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:291
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:278
 msgid "Memcard already opened"
 msgstr "すでに開いています"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:912
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:913
 msgid "Memory Byte"
 msgstr "メモリバイト"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:225
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:113
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:212
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:93
 msgid "Memory Card"
 msgstr "メモリーカード"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.h:36
+#: Source/Core/DolphinWX/Src/MemcardManager.h:23
 msgid ""
 "Memory Card Manager WARNING-Make backups before using, should be fixed but "
 "could mangle stuff!"
 msgstr "メモリーカードマネージャ　～使用前にはバックアップを！"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:371
+#: Source/Core/Core/Src/CoreParameter.cpp:360
 #, c-format
 msgid ""
 "Memory Card filename in Slot %c is incorrect\n"
@@ -3498,15 +3604,15 @@ msgstr ""
 "%s\n"
 "この場所に古いファイルをコピーしますか？\n"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:124
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:112
 msgid "Memorycard filesize does not match the header size"
 msgstr "メモリカードのファイルサイズが、ヘッダのサイズに一致していません"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:50
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:37
 msgid "Menu"
 msgstr "メニュー"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:114
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:94
 msgid "Mic"
 msgstr "マイク"
 
@@ -3515,20 +3621,20 @@ msgstr "マイク"
 msgid "Min"
 msgstr "最小"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:580
 msgid "Misc"
 msgstr "その他"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:795
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776
 msgid "Misc Settings"
 msgstr "その他の設定"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:240
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:294
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:227
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:281
 msgid "Modifier"
 msgstr "感度変更"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106
 msgid ""
 "Modify textures to show the format they're encoded in. Needs an emulation "
 "reset in most cases.\n"
@@ -3540,20 +3646,20 @@ msgstr ""
 "\n"
 "よく分からなければ、チェックを入れないでください。"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:115
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:108
 msgid "Monospaced font"
 msgstr "等幅フォント"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:305
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:292
 msgid "Motion Plus"
 msgstr "モーションプラス"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:309
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:86
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:296
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73
 msgid "Motor"
 msgstr "モーター"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:654
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:666
 msgid ""
 "Move the mouse pointer over an option to display a detailed description.\n"
 "\n"
@@ -3571,224 +3677,235 @@ msgstr ""
 "\n"
 "\n"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:75
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:62
 msgid "Multiply"
 msgstr "Multiply"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:651
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:650
 msgid "NOP"
-msgstr ""
+msgstr "NOP"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:629
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:628
 msgid "NOTE: Stream size doesn't match actual data length\n"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:129
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:116
 msgid "NP Add"
 msgstr "NP Add"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:124
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:111
 msgid "NP Begin"
 msgstr "NP Begin"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:132
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:119
 msgid "NP Decimal"
 msgstr "NP Decimal"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:126
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:113
 msgid "NP Delete"
 msgstr "NP Delete"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:133
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:120
 msgid "NP Divide"
 msgstr "NP Divide"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:120
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:107
 msgid "NP Down"
 msgstr "NP Down"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:123
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:110
 msgid "NP End"
 msgstr "NP End"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:111
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:98
 msgid "NP Enter"
 msgstr "NP Enter"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:127
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:114
 msgid "NP Equal"
 msgstr "NP Equal"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:116
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:103
 msgid "NP Home"
 msgstr "NP Home"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:125
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:112
 msgid "NP Insert"
 msgstr "NP Insert"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:117
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:104
 msgid "NP Left"
 msgstr "NP Left"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:128
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:115
 msgid "NP Multiply"
 msgstr "NP Multiply"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:122
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:109
 msgid "NP Page Down"
 msgstr "NP Page Down"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:121
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:108
 msgid "NP Page Up"
 msgstr "NP Page Up"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:119
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:106
 msgid "NP Right"
 msgstr "NP Right"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:130
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:117
 msgid "NP Separator"
 msgstr "NP Separator"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:109
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:96
 msgid "NP Space"
 msgstr "NP Space"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:131
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:118
 msgid "NP Subtract"
 msgstr "NP Subtract"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:110
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:97
 msgid "NP Tab"
 msgstr "NP Tab"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:118
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:105
 msgid "NP Up"
 msgstr "NP Up"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:444
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:59
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:50
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:448
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:46
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:37
 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:25
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:72
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:282
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:553
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:15
 msgid "Name: "
 msgstr "名前： "
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:526
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:562
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:516
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:555
 msgid "Native GCI files(*.gci)"
 msgstr "ネイティブ GCI ファイル(*.gci)"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:161
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:148
 msgid "New Scan"
 msgstr "新規検索"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:206
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:193
 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:801
 msgid "Next Page"
 msgstr "次のページ"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:165
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:152
 msgid "Next Scan"
 msgstr "続けて検索"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:68
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:59
 msgid "Nickname :"
 msgstr "ニックネーム："
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:196
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:190
 msgid "No Country (SDK)"
 msgstr "No Country (SDK)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:370
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:357
 msgid "No ISOs or WADS found"
 msgstr "リストに項目がありません！"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:508
+#: Source/Core/Core/Src/ConfigManager.h:17
+msgid "No audio output"
+msgstr "出力しない"
+
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:501
 #, c-format
 msgid "No banner file found for title  %s"
 msgstr "%s のバナーファイルはありません"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:761
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:768
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:760
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:767
 msgid "No description available"
 msgstr "説明なし"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:514
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:535
 msgid "No docking"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:859
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:860
 msgid "No file loaded"
 msgstr "読み込みファイルなし"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:439
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:426
 msgid "No free dir index entries"
 msgstr "空きエントリがありません"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:895
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:896
 msgid "No recorded file"
 msgstr "録画ファイルなし"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:501
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:494
 #, c-format
 msgid "No save folder found for title %s"
 msgstr "%s のセーブフォルダがありません"
 
+#: Source/Plugins/Plugin_VideoOGL/Src/main.cpp:132
+#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:111
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:23
 #: Source/Core/DolphinWX/Src/NetWindow.cpp:600
 msgid "None"
 msgstr "なし"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:323
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303
 msgid "Norwegian Bokmaal"
 msgstr "ノルウェー語"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:203
 msgid "Not Equal"
 msgstr "に一致しない"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:804
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:794
 msgid "Not Set"
 msgstr "未確認"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:626
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:101
+#, c-format
+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/Main.cpp:654
 msgid "Not connected"
 msgstr "未接続"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:309
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:296
 msgid "Notes"
 msgstr "ノート"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:16
 msgid "Notes: "
 msgstr "補足： "
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:71
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:74
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:580
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:621
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:629
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:59
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:64
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:613
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:659
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:667
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:31
 msgid "Notice"
 msgstr "注意"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:105
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:92
 msgid "Num Lock"
 msgstr "Num Lock"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:88
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:75
 msgid "Number Of Codes: "
 msgstr "行数："
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:30
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:34
 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26
 msgid "Nunchuk"
 msgstr "ヌンチャク"
@@ -3797,96 +3914,97 @@ msgstr "ヌンチャク"
 msgid "Nunchuk Acceleration"
 msgstr "ヌンチャクの加速度"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:877
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:878
 msgid "Object"
 msgstr "オブジェクト"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:135
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:122
 msgid "Object Range"
 msgstr "オブジェクトの範囲"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:243
 msgid "Off"
 msgstr "オフ"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:62
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:49
 msgid "Offset:"
 msgstr "オフセット値："
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:582
 msgid "On-Screen Display Messages"
 msgstr "オンスクリーンメッセージを表示"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:436
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:423
 #, c-format
 msgid "Only %d blocks available"
 msgstr "残り %d ブロックしかありません！"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:420
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:178
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:426
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:166
 msgid "Open"
 msgstr "開く"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:876
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:867
 msgid "Open &containing folder"
 msgstr "実体のあるフォルダを開く(&C)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:873
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:864
 msgid "Open Wii &save folder"
 msgstr "セーブデータのあるフォルダを開く(&S)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:420
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:426
 msgid "Open file..."
 msgstr "起動するファイルを選択"
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:61
+#: Source/Core/AudioCommon/Src/OpenALStream.cpp:48
 #, 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:72
+#: Source/Core/AudioCommon/Src/OpenALStream.cpp:59
 msgid "OpenAL: can't find sound devices"
 msgstr "OpenAL: can't find sound devices"
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:66
+#: Source/Core/AudioCommon/Src/OpenALStream.cpp:53
 #, c-format
 msgid "OpenAL: can't open device %s"
 msgstr "OpenAL: can't open device %s"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502
 msgid "OpenCL Texture Decoder"
 msgstr "OpenCL Texture Decoder"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503
 msgid "OpenMP Texture Decoder"
 msgstr "OpenMP Texture Decoder"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:317
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:94
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:304
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:81
 msgid "Options"
 msgstr "設定"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:22
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Orange"
 msgstr "オレンジ"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:468
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:455
+#, fuzzy
 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"
+"and import the saves to a new memcard\n"
 msgstr ""
 "ディレクトリ内のファイル順序が、ブロックの順序と一致していません\n"
 "右クリックから『全てのセーブデータをエクスポート』を実行して、\n"
 "新しいメモリーカードにセーブデータを移行してください\n"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:316
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:324
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:509
 msgid "Other"
 msgstr "その他"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:206
+#: Source/Core/Core/Src/NetPlayClient.cpp:210
 msgid ""
 "Other client disconnected while game is running!! NetPlay is disabled. You "
 "manually stop the game."
@@ -3894,15 +4012,15 @@ msgstr ""
 "ゲーム中に他のプレーヤーが切断されてしまいました！手動でゲームを停止させてく"
 "ださい"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:481
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:468
 msgid "Output"
 msgstr "出力"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:342
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:348
 msgid "P&lay Recording..."
 msgstr "録画ファイルを再生(&L)"
 
-#: Source/Core/Core/Src/HW/GCPad.cpp:30
+#: Source/Core/Core/Src/HW/GCPad.cpp:18
 msgid "Pad"
 msgstr "パッド"
 
@@ -3910,160 +4028,160 @@ msgstr "パッド"
 msgid "Pad "
 msgstr "Pad "
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:34
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:38
 msgid "Pads"
 msgstr "パッド"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:108
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:95
 msgid "Page Down"
 msgstr "Page Down"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:107
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:94
 msgid "Page Up"
 msgstr "Page Up"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:35
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:22
 msgid "Paragraph"
 msgstr "Paragraph"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:64
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:51
 msgid "Parameters"
 msgstr "パラメータ"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:222
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:217
 #, c-format
 msgid "Partition %i"
 msgstr "パーティション %i"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:296
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:297
 msgid "Patches"
 msgstr "パッチ"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:556
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536
 msgid "Paths"
 msgstr "フォルダ"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1538
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1539
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:51
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1565
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1566
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:38
 msgid "Pause"
 msgstr "一時停止"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:128
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:129
 msgid "Pause at end of movie"
 msgstr "再生終了時に一時停止"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:397
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405
 msgid "Per-Pixel Lighting"
 msgstr "Per-Pixel Lighting"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352
 msgid "Perfect"
 msgstr "カンペキ！"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:609
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:642
 #, c-format
 msgid "Perspective %d"
-msgstr ""
+msgstr "Perspective %d"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:165
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:424
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1547
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1548
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:152
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:430
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1574
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1575
 msgid "Play"
 msgstr "開始"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176
 msgid "Play Recording"
 msgstr "録画ファイルを再生"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:170
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:170
 msgid "Play/Pause"
 msgstr "開始／一時停止"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351
 msgid "Playable"
 msgstr "サクサク"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:154
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:141
 msgid "Playback Options"
 msgstr "再生オプション"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:301
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:304
 msgid "Players"
 msgstr "プレイヤー一覧"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:988
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:991
 msgid "Please confirm..."
 msgstr "確認"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:579
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:612
 msgid "Please create a perspective before saving"
-msgstr ""
+msgstr "Please create a perspective before saving"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:36
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:23
 msgid "Plus-Minus"
 msgstr "Plus-Minus"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:324
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304
 msgid "Polish"
 msgstr "ポーランド語"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:713
 msgid "Port 1"
 msgstr "ポート 1"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714
 msgid "Port 2"
 msgstr "ポート 2"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:734
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715
 msgid "Port 3"
 msgstr "ポート 3"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716
 msgid "Port 4"
 msgstr "ポート 4"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:97
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:130
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:88
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:133
 msgid "Port :"
 msgstr "ポート:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:325
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305
 msgid "Portuguese"
 msgstr "ポルトガル語"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:326
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306
 msgid "Portuguese (Brazilian)"
 msgstr "ブラジル語"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:391
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:399
 msgid "Post-Processing Effect:"
 msgstr "Post-Processing Effect:"
 
-#: Source/Core/Core/Src/Movie.cpp:936
+#: Source/Core/Core/Src/Movie.cpp:927
 #, c-format
 msgid "Premature movie end in PlayController. %u + 8 > %u"
 msgstr ""
 
-#: Source/Core/Core/Src/Movie.cpp:1055
+#: Source/Core/Core/Src/Movie.cpp:1046
 #, c-format
 msgid "Premature movie end in PlayWiimote. %u + %d > %u"
 msgstr ""
 
-#: Source/Core/Core/Src/Movie.cpp:1032
+#: Source/Core/Core/Src/Movie.cpp:1023
 #, c-format
 msgid "Premature movie end in PlayWiimote. %u > %u"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:48
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:35
 msgid "Presets: "
 msgstr "プリセット："
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:205
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:192
 msgid "Prev Page"
 msgstr "前のページ"
 
@@ -4071,67 +4189,67 @@ msgstr "前のページ"
 msgid "Previous Page"
 msgstr "前のページ"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:183
 msgid "Previous Value"
 msgstr "ここより前"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:60
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:47
 msgid "Print"
 msgstr "Print"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:894
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:885
 msgid "Profile"
 msgstr "プロファイル"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.h:55
+#: Source/Core/DolphinWX/Src/ISOProperties.h:42
 msgid "Properties"
 msgstr "プロパティ"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:283
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:286
 msgid "Purge Cache"
 msgstr "キャッシュの整頓を実行"
 
-#: Source/Core/Common/Src/MsgHandler.cpp:66
+#: Source/Core/Common/Src/MsgHandler.cpp:52
 msgid "Question"
 msgstr "確認"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:159
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:316
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:162
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:319
 msgid "Quit"
 msgstr "終了"
 
 #. i18n:  Right
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:59
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:46
 msgid "R"
 msgstr "R"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:40
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:27
 msgid "R Button"
 msgstr "Rボタン"
 
 #. i18n:  Right-Analog
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:63
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
 msgid "R-Analog"
 msgstr "R (アナログ)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:445
 msgid "RAM"
 msgstr "RAM"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:175
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:169
 msgid "RUSSIA"
 msgstr "ロシア"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:528
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:515
 msgid "Range"
 msgstr "範囲／強さ"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:190
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:178
 msgid "Read-only mode"
 msgstr "読み込み専用 有効／無効"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:487
 msgid "Real"
 msgstr "Real"
 
@@ -4147,33 +4265,33 @@ msgstr "実機Wii リモコンの設定"
 msgid "Reconnect Wiimote on State Loading"
 msgstr "ステートロード時にWii リモコンを再接続"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:193
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:217
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:791
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:180
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:204
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:790
 msgid "Record"
 msgstr "録画"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:174
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:161
 msgid "Recording Info"
 msgstr "録画情報"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:202
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:189
 msgid "Recording Options"
 msgstr "録画オプション"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:21
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Red"
 msgstr "赤"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:24
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Red Left"
 msgstr "赤 - 左"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:25
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Red Right"
 msgstr "赤 - 右"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86
 msgid ""
 "Reduces the amount of aliasing caused by rasterizing 3D graphics.\n"
 "This makes the rendered picture look less blocky.\n"
@@ -4189,28 +4307,28 @@ msgstr ""
 "よく分からなければ、【なし】のままにしておいてください。"
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:60
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:421
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:903
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:427
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:894
 msgid "Refresh"
 msgstr "再更新"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:180
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:168
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:168
 msgid "Refresh List"
 msgstr "ゲームリストを再更新"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:421
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:427
 msgid "Refresh game list"
 msgstr "ゲームリストを再更新します"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:405
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:427
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:77
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:812
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:409
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:431
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:64
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:793
 msgid "Remove"
 msgstr "削除"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99
 msgid ""
 "Render the scene as a wireframe.\n"
 "\n"
@@ -4220,196 +4338,204 @@ msgstr ""
 "\n"
 "よく分からなければ、チェックを入れないでください。"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:308
 msgid "Render to Main Window"
 msgstr "メインウィンドウ部分に描画"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:915
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:172
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:906
 msgid "Reset"
 msgstr "初期化"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:190
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:177
 msgid "Results"
 msgstr "結果表示欄"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:29
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:16
 msgid "Return"
 msgstr "Return"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:277
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:57
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464
+msgid "Revision:"
+msgstr ""
+
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:264
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:44
 msgid "Right"
 msgstr "右"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:61
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:65
 msgid "Right Stick"
 msgstr "右スティック"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:85
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:295
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:72
 msgid "Rumble"
 msgstr "振動"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:518
-msgid "Run DSP LLE on a dedicated thread (not recommended)."
-msgstr "DSP-LLEの処理を別スレッドに分離して行います (非推奨)"
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498
+msgid ""
+"Run DSP HLE and LLE on a dedicated thread (not recommended: might cause "
+"audio glitches with HLE and freezes with LLE)."
+msgstr ""
+"DSPの処理を別スレッドに分離して行います (非推奨:音の問題やフリーズ等のリスク"
+"有)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:327
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307
 msgid "Russian"
 msgstr "ロシア語"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:149
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:150
 msgid "Sa&ve State"
 msgstr "ステートセーブ(&V)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:465
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475
 msgid "Safe"
 msgstr "Safe"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:196
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:446
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:925
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:183
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:452
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916
 msgid "Save"
 msgstr "保存"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:532
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:522
 msgid "Save GCI as..."
 msgstr "セーブデータの保存先を選択"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
 msgid "Save State Slot 1"
 msgstr "ステートセーブ - スロット 1"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:198
 msgid "Save State Slot 2"
 msgstr "ステートセーブ - スロット 2"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:199
 msgid "Save State Slot 3"
 msgstr "ステートセーブ - スロット 3"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:212
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:212
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200
 msgid "Save State Slot 4"
 msgstr "ステートセーブ - スロット 4"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201
 msgid "Save State Slot 5"
 msgstr "ステートセーブ - スロット 5"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202
 msgid "Save State Slot 6"
 msgstr "ステートセーブ - スロット 6"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:203
 msgid "Save State Slot 7"
 msgstr "ステートセーブ - スロット 7"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204
 msgid "Save State Slot 8"
 msgstr "ステートセーブ - スロット 8"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:151
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:152
 msgid "Save State..."
 msgstr "ファイルとして保存"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:582
 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:592
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:602
 msgid "Save as..."
 msgstr "ファイルとして保存"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1203
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1204
 msgid "Save compressed GCM/ISO"
 msgstr "圧縮するタイトルの保存先を選択"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:446
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:452
 msgid "Save current perspective"
-msgstr ""
+msgstr "Save current perspective"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1192
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193
 msgid "Save decompressed GCM/ISO"
 msgstr "復元するタイトルの保存先を選択"
 
-#: Source/Core/Core/Src/Movie.cpp:801
+#: Source/Core/Core/Src/Movie.cpp:792
 #, c-format
 msgid "Savestate movie %s is corrupted, movie recording stopping..."
 msgstr "Savestate movie %s の破損を確認しました。録画を中止しています..."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:396
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:404
 msgid "Scaled EFB Copy"
 msgstr "Scaled EFB Copy"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:556
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:543
 #, c-format
 msgid "Scanning %s"
 msgstr "確認しています... .%s"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:539
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:526
 msgid "Scanning for ISOs"
 msgstr "確認中..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:540
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:527
 msgid "Scanning..."
 msgstr "確認中..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:427
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
 msgid "ScrShot"
 msgstr "画面撮影"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:106
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:93
 msgid "Scroll Lock"
 msgstr "Scroll Lock"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:264
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:251
 msgid "Search"
 msgstr "検索"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:227
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:214
 msgid "Search Filter"
 msgstr "フィルタリング"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:810
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:791
 msgid "Search Subfolders"
 msgstr "サブフォルダも検索"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:250
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:237
 msgid "Search current Object"
 msgstr "現在のオブジェクトを検索"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:254
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:241
 msgid "Search for hex Value:"
 msgstr "値を検索"
 
-#: Source/Core/Common/Src/SysConf.h:103 Source/Core/Common/Src/SysConf.h:126
-#: Source/Core/Common/Src/SysConf.h:146 Source/Core/Common/Src/SysConf.h:167
+#: Source/Core/Common/Src/SysConf.h:90 Source/Core/Common/Src/SysConf.h:113
+#: Source/Core/Common/Src/SysConf.h:133 Source/Core/Common/Src/SysConf.h:154
 #, c-format
 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:490
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:46
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:477
 msgid "Select"
 msgstr "選択"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:677
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1072
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:683
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1087
 msgid "Select The Recording File"
 msgstr "録画ファイルを選択"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1285
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1312
 msgid "Select a Wii WAD file to install"
 msgstr "追加するWADファイルを選択"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:70
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74
 msgid ""
 "Select a hardware adapter to use.\n"
 "\n"
@@ -4419,31 +4545,31 @@ msgstr ""
 "\n"
 "よく分からなければ、一番上のものを選択してください。"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:520
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:510
 msgid "Select a save file to import"
 msgstr "インポートするセーブファイルを選択"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:363
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:366
 msgid "Select floating windows"
-msgstr ""
+msgstr "Select floating windows"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:582
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:585
 msgid "Select the file to load"
 msgstr "ロードするファイルを選択"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1241
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1268
 msgid "Select the save file"
 msgstr "セーブファイルを選択"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1388
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1415
 msgid "Select the state to load"
 msgstr "ロードするステートセーブファイルを選択"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1429
 msgid "Select the state to save"
 msgstr "ステートセーブの保存先を選択"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82
 msgid ""
 "Select what aspect ratio to use when rendering:\n"
 "Auto: Use the native aspect ratio\n"
@@ -4459,15 +4585,15 @@ msgstr ""
 "\n"
 "よく分からなければ、【自動】を選択してください。"
 
-#: Source/Core/InputCommon/Src/InputConfig.cpp:61
+#: Source/Core/InputCommon/Src/InputConfig.cpp:48
 msgid "Selected controller profile does not exist"
 msgstr "選択されたプロファイルは存在しません"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:116
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:109
 msgid "Selected font"
 msgstr "選択したフォント"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75
 msgid ""
 "Selects the display resolution used in fullscreen mode.\n"
 "This should always be bigger than or equal to the internal resolution. "
@@ -4483,23 +4609,39 @@ msgstr ""
 "よく分からなければ、デスクトップの解像度と同じものを、\n"
 "もしくは、正常に動作する一番高い解像度を選択してください。"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:69
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:70
 msgid ""
 "Selects what graphics API to use internally.\n"
 "Direct3D 9 usually is the fastest one. OpenGL is more accurate though. "
 "Direct3D 11 is somewhere between the two.\n"
 "Note that the Direct3D backends are only available on Windows.\n"
 "\n"
-"If unsure, use Direct3D 9."
+"If unsure, use Direct3D 11."
 msgstr ""
 "描画に使用するグラフィックスAPIを選択します。\n"
 "通常【Direct3D9】が最も高速ですが、【OpenGL】はより正確です。\n"
 "【Direct3D11】は2つの間のような動作になります。\n"
 "Direct3D9/Direct3D11 は Windows のみ使用可能です。\n"
 "\n"
-"よく分からなければ、【Direct3D9】を選択してください。"
+"よく分からなければ、【Direct3D11】を選択してください。"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:288
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72
+msgid ""
+"Selects what graphics API to use internally.\n"
+"Direct3D 9 usually is the fastest one. OpenGL is more accurate though. "
+"Direct3D 11 is somewhere between the two.\n"
+"Note that the Direct3D backends are only available on Windows.\n"
+"\n"
+"If unsure, use OpenGL."
+msgstr ""
+"描画に使用するグラフィックスAPIを選択します。\n"
+"通常【Direct3D9】が最も高速ですが、【OpenGL】はより正確です。\n"
+"【Direct3D11】は2つの間のような動作になります。\n"
+"Direct3D9/Direct3D11 は Windows のみ使用可能です。\n"
+"\n"
+"よく分からなければ、【OpenGL】を選択してください。"
+
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:291
 msgid "Send"
 msgstr "送信"
 
@@ -4507,24 +4649,24 @@ msgstr "送信"
 msgid "Sensor Bar Position:"
 msgstr "センサーバーの位置"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:77
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:64
 msgid "Separator"
 msgstr "Separator"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:328
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308
 msgid "Serbian"
 msgstr "セルビア語"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:522
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502
 msgid ""
 "Serial Port 1 - This is the port which devices such as the net adapter use"
 msgstr "シリアルポート：ブロードバンドアダプタなどのデバイスが接続できます"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:488
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:475
 msgid "Set"
 msgstr "適用"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:877
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:868
 msgid "Set as &default ISO"
 msgstr "Wiiメニュー(ディスクチャンネル)に表示(&D)"
 
@@ -4533,14 +4675,14 @@ msgstr "Wiiメニュー(ディスクチャンネル)に表示(&D)"
 msgid "Set as default Memcard %c"
 msgstr "メモリーカード%cを既定として設定"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:460
+#: Source/Core/Core/Src/ActionReplay.cpp:450
 #, c-format
 msgid "SetARCode_IsActive: Index is greater than ar code list size %lu"
 msgstr ""
 "SetARCode_IsActive: インデックスのサイズがコードリストのサイズを上回っていま"
 "す %lu"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:515
 msgid ""
 "Sets the latency (in ms).  Higher values may reduce audio crackling. OpenAL "
 "backend only."
@@ -4548,123 +4690,123 @@ msgstr ""
 "レイテンシーを調整します（単位：ms）。高くすることで音の問題を軽減できます。"
 "OpenALのみ"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341
 msgid "Settings..."
 msgstr "設定"
 
-#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:222
+#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:209
 msgid "SetupWiiMem: Cant find setting file"
 msgstr "SetupWiiMem: Cant find setting file"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:291
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:278
 msgid "Shake"
 msgstr "シェイク"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
 msgid "Short Name:"
 msgstr "通称"
 
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:103
+#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:90
 msgid "Shoulder Buttons"
 msgstr "LRトリガー"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:217
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:220
 msgid "Show &Console"
 msgstr "コンソール(&C)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:215
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:218
 msgid "Show &Log"
 msgstr "ログを表示(&L)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:212
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:215
 msgid "Show &Statusbar"
 msgstr "ステータスバー(&S)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:210
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:213
 msgid "Show &Toolbar"
 msgstr "ツールバー(&T)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:281
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:284
 msgid "Show Drives"
 msgstr "DVDドライブ内のソフトを表示"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:517
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530
 msgid "Show EFB Copy Regions"
 msgstr "Show EFB Copy Regions"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:295
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303
 msgid "Show FPS"
 msgstr "FPSを表示"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:271
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:274
 msgid "Show France"
 msgstr "フランス"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:257
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:260
 msgid "Show GameCube"
 msgstr "ゲームキューブ"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561
 msgid "Show Input Display"
 msgstr "キー入力を表示"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:273
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:276
 msgid "Show Italy"
 msgstr "イタリア"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:264
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:267
 msgid "Show JAP"
 msgstr "日本"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:275
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:278
 msgid "Show Korea"
 msgstr "韓国"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476
 msgid "Show Language:"
 msgstr "次の言語で表示"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:216
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:219
 msgid "Show Log &Configuration"
 msgstr "ログの設定を表示(&C)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:266
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:269
 msgid "Show PAL"
 msgstr "PAL規格"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:254
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:257
 msgid "Show Platforms"
 msgstr "特定機種のソフトだけを表示"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:263
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:266
 msgid "Show Regions"
 msgstr "特定リージョンのソフトだけを表示"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:518
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531
 msgid "Show Statistics"
 msgstr "統計情報を表示"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:277
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:280
 msgid "Show Taiwan"
 msgstr "台湾"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:268
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:271
 msgid "Show USA"
 msgstr "アメリカ合衆国"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:259
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:262
 msgid "Show Wad"
 msgstr "WAD(Wiiウェア/VC/チャンネル)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:255
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:258
 msgid "Show Wii"
 msgstr "Wii"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491
 msgid "Show a confirmation box before stopping a game."
 msgstr "ゲーム停止前に確認ウィンドウが表示されるようになります"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:512
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492
 msgid ""
 "Show a message box when a potentially serious error has occurred.\n"
 "Disabling this may avoid annoying and non-fatal messages, but it may also "
@@ -4678,11 +4820,11 @@ msgstr ""
 msgid "Show first block"
 msgstr "ブロック開始位置を表示"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:130
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:131
 msgid "Show lag counter"
 msgstr "ラグカウンターを表示"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493
 msgid ""
 "Show messages on the emulation screen area.\n"
 "These messages include memory card writes, video backend and CPU "
@@ -4708,7 +4850,7 @@ msgstr "アイコンを表示"
 msgid "Show save title"
 msgstr "タイトルを表示"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102
 msgid ""
 "Show the number of frames rendered per second as a measure of emulation "
 "speed.\n"
@@ -4720,11 +4862,11 @@ msgstr ""
 "\n"
 "よく分からなければ、チェックを入れないでください。"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:279
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:282
 msgid "Show unknown"
 msgstr "不明"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105
 msgid ""
 "Show various statistics.\n"
 "\n"
@@ -4734,47 +4876,31 @@ msgstr ""
 "\n"
 "よく分からなければ、チェックを入れないでください。"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:319
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:306
 msgid "Sideways Wiimote"
 msgstr "横持ち(Sideways)で使用"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:280
 msgid "Simplified Chinese"
 msgstr "簡体字中国語"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:311
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:298
 msgid "Size"
 msgstr "サイズ"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:696
 msgid "Skip BIOS"
 msgstr "BIOSをスキップ"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316
 msgid "Skip DCBZ clearing"
-msgstr ""
+msgstr "Skip DCBZ clearing"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:492
-msgid "Skip Dest. Alpha Pass"
-msgstr "Skip Dest. Alpha Pass"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:444
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:454
 msgid "Skip EFB Access from CPU"
 msgstr "Skip EFB Access from CPU"
 
-#: 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:120
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125
 msgid ""
 "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n"
 "Sometimes also increases visual quality.\n"
@@ -4783,7 +4909,7 @@ msgid ""
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"RAM設定時、エミュレーション精度を少し犠牲に、動作速度向上を 行うオプションで"
+"RAM設定時、エミュレーション精度を少し犠牲にして、速度向上を 行うオプションで"
 "す。\n"
 "時に画質を向上させることもあるようです。\n"
 "何か不具合が発生した場合はこのオプションを無効にするか、 『Texture Cache』を"
@@ -4791,25 +4917,25 @@ msgstr ""
 "\n"
 "よく分からなければ、チェックを入れないでください。"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:374
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:386
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:380
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:392
 #, c-format
 msgid "Slot %i"
 msgstr "スロット %i"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:700
 msgid "Slot A"
 msgstr "スロットA"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:701
 msgid "Slot B"
 msgstr "スロットB"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:62
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:49
 msgid "Snapshot"
 msgstr "スクリーンショット"
 
-#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:58
+#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:46
 msgid "Software Renderer"
 msgstr "Software Renderer"
 
@@ -4824,27 +4950,27 @@ msgstr ""
 "デバッグ用途としてのみ有用なものです。\n"
 "それでも使用しますか？よく分からなければ、選択しないでください。"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:683
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:664
 msgid "Sound Settings"
 msgstr "サウンド設定"
 
-#: Source/Core/AudioCommon/Src/AudioCommon.cpp:77
+#: Source/Core/AudioCommon/Src/AudioCommon.cpp:64
 #, c-format
 msgid "Sound backend %s is not valid."
 msgstr "Sound backend %s is not valid."
 
-#: Source/Core/AudioCommon/Src/DSoundStream.cpp:59
+#: Source/Core/AudioCommon/Src/DSoundStream.cpp:46
 #, c-format
 msgid "Sound buffer creation failed: %s"
 msgstr "Sound buffer creation failed: %s"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:31
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:18
 msgid "Space"
 msgstr "Space"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:329
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309
 msgid "Spanish"
 msgstr "スペイン語"
 
@@ -4852,7 +4978,7 @@ msgstr "スペイン語"
 msgid "Speaker Volume:"
 msgstr "リモコンスピーカーの音量"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92
 msgid ""
 "Specifies the resolution used to render at. A high resolution will improve "
 "visual quality a lot but is also quite heavy on performance and might cause "
@@ -4872,63 +4998,63 @@ msgstr ""
 "\n"
 "よく分からなければ、【1x Native】を選択してください。"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322
 msgid "Speed up Disc Transfer Rate"
 msgstr "Speed up Disc Transfer Rate"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:243
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:230
 msgid "Square Stick"
 msgstr "丸み"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:107
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87
 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:322
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:37
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:25
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:325
 msgid "Start"
 msgstr "スタート"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:194
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:197
 msgid "Start &NetPlay"
 msgstr "ネットプレイを開始(&N)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:339
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:345
 msgid "Start Re&cording"
 msgstr "録画を開始(&C)"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:175
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:175
 msgid "Start Recording"
 msgstr "録画を開始"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:312
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:299
 msgid "State"
 msgstr "動作率"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:173
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:161
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:161
 msgid "State Saves"
 msgstr "ステートセーブ／ロード"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:108
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88
 msgid "Steering Wheel"
 msgstr "SPEED FORCE"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:53
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:57
 msgid "Stick"
 msgstr "スティック"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:420
-#: 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:325
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:419
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:431
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:171
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:171
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:328
 msgid "Stop"
 msgstr "停止"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96
 msgid ""
 "Store EFB copies in GPU texture objects.\n"
 "This is not so accurate, but it works well enough for most games and gives a "
@@ -4940,109 +5066,121 @@ msgstr ""
 "これは不正確な処理ですが、ほとんどのゲームで上手く働き、 また【RAM】設定より"
 "も高速に動作します。\n"
 "\n"
-"よく分からなければ、こちらを選択しておいてください"
+"よく分からなければ、こちらを選択しておいてください。"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:275
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283
 msgid "Stretch to Window"
 msgstr "ウィンドウに合わせる"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:43
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:47
 msgid "Strum"
 msgstr "ストラム"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:78
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:65
 msgid "Subtract"
 msgstr "Subtract"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:77
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:67
 #, c-format
 msgid "Successfully exported file to %s"
 msgstr "%s へのエクスポートに成功しました"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:56
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:43
 msgid "Successfully imported save files"
 msgstr "セーブファイルのインポートに成功"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:285
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:272
 msgid "Swing"
 msgstr "動き"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:744
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:792
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320
+msgid "Synchronize GPU thread"
+msgstr "Synchronize GPU thread"
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321
+msgid ""
+"Synchronizes the GPU and CPU threads to help prevent random freezes in Dual "
+"Core mode. (ON = Compatible, OFF = Fast)"
+msgstr ""
+"CPU／GPUスレッドを同期させることでデュアルコア動作時のフリーズを抑制します "
+"[有効＝互換性・安定性重視／無効＝動作速度向上]"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773
 msgid "System Language:"
 msgstr "システムの言語："
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:191
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:185
 msgid "TAIWAN"
 msgstr "台湾"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:127
-#: Source/Core/DolphinWX/Src/TASInputDlg.h:32
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:128
+#: Source/Core/DolphinWX/Src/TASInputDlg.h:19
 msgid "TAS Input"
 msgstr "TAS Input"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:28
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:15
 msgid "Tab"
 msgstr "Tab"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:510
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:531
 msgid "Tab split"
-msgstr ""
+msgstr "Tab split"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:37
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:41
 msgid "Table Left"
 msgstr "左テーブル"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:38
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:42
 msgid "Table Right"
 msgstr "右テーブル"
 
-#: 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
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:361
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:181
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:181
 msgid "Take Screenshot"
 msgstr "画面撮影"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:109
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89
 msgid "TaruKonga (Bongos)"
 msgstr "タルコンガ"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:472
 msgid "Test"
 msgstr "テスト"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:444
 msgid "Texture"
 msgstr "Texture"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:451
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:461
 msgid "Texture Cache"
 msgstr "Texture Cache"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:519
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:532
 msgid "Texture Format Overlay"
 msgstr "テクスチャフォーマット情報表示"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:226
+#: Source/Core/Core/Src/CoreParameter.cpp:215
 msgid "The WAD has been installed successfully"
 msgstr "WADファイルの追加に成功"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:197
+#: Source/Core/Core/Src/ActionReplay.cpp:185
 msgid "The address is invalid"
 msgstr "無効なアドレスです"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:509
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:496
 msgid "The checksum was successfully fixed"
 msgstr "チェックサムの修正に成功しました"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1242
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226
 msgid "The chosen directory is already in the list"
 msgstr "選択したフォルダはすでにリストに存在します！"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1117
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1216
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1118
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1146
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1217
 #, c-format
 msgid ""
 "The file %s already exists.\n"
@@ -5051,7 +5189,7 @@ msgstr ""
 "%s はすでに存在します\n"
 "上書きしますか？"
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:51
+#: Source/Core/AudioCommon/Src/WaveFile.cpp:38
 #, c-format
 msgid ""
 "The file %s could not be opened for writing. Please check if it's already "
@@ -5060,30 +5198,30 @@ msgstr ""
 "ファイル %s に書き込むことができませんでした。他のプログラムによって使用され"
 "ていないか確認してください。"
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:44
+#: Source/Core/AudioCommon/Src/WaveFile.cpp:31
 #, c-format
 msgid "The file %s was already open, the file header will not be written."
 msgstr ""
 "ファイル %s は既に開かれているため、ファイルヘッダーは書き込まれません。"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:332
+#: Source/Core/Core/Src/Boot/Boot.cpp:320
 #, c-format
 msgid "The file you specified (%s) does not exist"
 msgstr "指定したファイル (%s) は存在しません"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:628
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:666
 msgid "The name can not be empty"
 msgstr "空の名前は使用できません"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:620
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:658
 msgid "The name can not contain the character ','"
 msgstr "',' を含む名前は使用できません"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:142
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:129
 msgid "The resulting decrypted AR code doesn't contain any lines."
 msgstr "復号化しましたが、このコードには一つも行が含まれていません。"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98
 msgid ""
 "The safer you adjust this, the less likely the emulator will be missing any "
 "texture updates from RAM.\n"
@@ -5095,11 +5233,11 @@ msgstr ""
 "\n"
 "よく分からなければ、右端に合わせておいてください。"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:445
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:432
 msgid "The save you are trying to copy has an invalid file size"
 msgstr "コピーしようとしているセーブファイルのサイズが正しくありません"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:388
+#: Source/Core/DolphinWX/Src/Main.cpp:416
 msgid ""
 "The selected language is not supported by your system. Falling back to "
 "system default."
@@ -5107,43 +5245,43 @@ msgstr ""
 "選択した言語はこのシステムではサポートされていません。デフォルト設定を使用し"
 "ます"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:43
+#: Source/Core/Core/Src/NetPlayClient.cpp:47
 msgid "The server and client's NetPlay versions are incompatible!"
 msgstr "サーバーとクライアントでネットプレイのバージョンに互換性がありません！"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:40
+#: Source/Core/Core/Src/NetPlayClient.cpp:44
 msgid "The server is full!"
 msgstr "このサーバーは満員です！"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:46
+#: Source/Core/Core/Src/NetPlayClient.cpp:50
 msgid "The server responded: the game is currently running!"
 msgstr "サーバーより：このゲームは、現在実行中です！"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:49
+#: Source/Core/Core/Src/NetPlayClient.cpp:53
 msgid "The server sent an unknown error message!"
 msgstr "サーバーは、不明なエラーメッセージを送信しました！"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:119
+#: Source/Core/Core/Src/CoreParameter.cpp:108
 #, c-format
 msgid "The specified file \"%s\" does not exist"
 msgstr "指定されたファイル \"%s\" は存在しません"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:198
+#: Source/Core/Core/Src/ActionReplay.cpp:186
 msgid "The value is invalid"
 msgstr "無効な値です"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:642
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:623
 msgid "Theme:"
 msgstr "テーマ："
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:476
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:463
 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:307
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308
 msgid ""
 "These settings override core Dolphin settings.\n"
 "Undetermined means the game uses Dolphin's setting."
@@ -5153,7 +5291,7 @@ msgstr ""
 "　　 本体設定でデュアルコア処理を有効化している場合でも、このゲームのみシング"
 "ルコア動作が可能"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:355
+#: Source/Core/Core/Src/ActionReplay.cpp:345
 msgid ""
 "This action replay simulator does not support codes that modify Action "
 "Replay itself."
@@ -5161,13 +5299,13 @@ msgstr ""
 "このアクションリプレイシミュレータは、アクションリプレイそのものを変更する"
 "コードはサポートしていません。"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505
 msgid "This could cause slow down in Wii Menu and some games."
 msgstr ""
 "有効にしているとWiiメニューやいくつかのタイトルで動作速度が低下する場合があり"
 "ます"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118
 msgid ""
 "This feature allows you to change the game's camera.\n"
 "Move the mouse while holding the right mouse button to pan and while holding "
@@ -5178,8 +5316,24 @@ msgid ""
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
+"ゲーム内のカメラに干渉することが出来るようになる機能です。\n"
+"\n"
+"・右クリックを押しながらマウスを移動 - カメラを振る\n"
+"・Shiftキーを押しながらW/A/S/Dキー - カメラの移動\n"
+"　　(Shift+0キーを押すごとに移動距離2倍、Shift+9キーで2分の1)\n"
+"・Shift+Rキー - カメラのリセット\n"
+"\n"
+"よく分からなければ、チェックを入れないでください。"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485
+msgid ""
+"This limits the game speed to the specified number of frames per second "
+"(full speed is 60 for NTSC and 50 for PAL). Alternatively, 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/ConfigMain.cpp:484
 msgid ""
 "This splits the Video and CPU threads, so they can be run on separate "
 "cores.\n"
@@ -5190,61 +5344,61 @@ msgstr ""
 "有効にすると動作速度が大きく向上しますが、クラッシュやバグの原因になる場合も"
 "あります"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:286
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:287
 msgid "This will let you Manually Edit the INI config file"
 msgstr "このゲームの設定をテキストで編集します"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:249
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:254
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:236
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:241
 msgid "Threshold"
 msgstr "しきい値"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:288
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:275
 msgid "Tilt"
 msgstr "傾き"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:628
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:304
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:622
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:291
 msgid "Title"
 msgstr "タイトル"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:125
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:144
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:112
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:131
 msgid "To"
 msgstr "終了"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:72
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59
 msgid "Toggle All Log Types"
 msgstr "全てのログ情報を選択／解除"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:426
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:432
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:180
 msgid "Toggle Fullscreen"
 msgstr "フルスクリーン表示切り替え"
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:87
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:271
 msgid "Top"
 msgstr "上部"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:281
 msgid "Traditional Chinese"
 msgstr "繁体字中国語"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:426
+#: Source/Core/Core/Src/Boot/Boot.cpp:414
 msgid "Tried to load an unknown file type."
 msgstr "不明なファイルタイプを読み込もうとしました"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:80
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:67
 msgid "Triggers"
 msgstr "トリガー"
 
-#: Source/Core/Common/Src/SysConf.h:91 Source/Core/Common/Src/SysConf.h:114
+#: Source/Core/Common/Src/SysConf.h:78 Source/Core/Common/Src/SysConf.h:101
 msgid "Trying to read from invalid SYSCONF"
 msgstr "Trying to read from invalid SYSCONF"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:44
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:31
 msgid ""
 "Trying to read from invalid SYSCONF\n"
 "Wiimote bt ids are not available"
@@ -5252,15 +5406,15 @@ msgstr ""
 "Trying to read from invalid SYSCONF\n"
 "Wiimote bt ids are not available"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:330
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
 msgid "Turkish"
 msgstr "トルコ語"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:33
 msgid "Turntable"
 msgstr "ターンテーブル"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:71
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58
 msgid "Type"
 msgstr "形式"
 
@@ -5268,25 +5422,25 @@ msgstr "形式"
 msgid "UDP Port:"
 msgstr "UDPポート:"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:279
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:266
 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12
 msgid "UDP Wiimote"
 msgstr "UDPで接続"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:199
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:193
 msgid "UNKNOWN"
 msgstr "不明"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:756
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:755
 #, c-format
 msgid "UNKNOWN_%02X"
 msgstr "UNKNOWN_%02X"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:178
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:172
 msgid "USA"
 msgstr "アメリカ合衆国"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:225
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:214
 msgid ""
 "Unable to create patch from given values.\n"
 "Entry not modified."
@@ -5294,7 +5448,7 @@ msgstr ""
 "この値ではパッチを作成できません。\n"
 "入力された値が不正です。"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:124
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:111
 #, c-format
 msgid ""
 "Unable to parse line %lu of the entered AR code as a valid encrypted or "
@@ -5305,74 +5459,93 @@ msgstr ""
 "認して下さい。\n"
 "この行を無視して解析を続けますか？"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:391
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:397
 #, c-format
 msgid "Undefined %i"
 msgstr "未定義 %i"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:163
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:164
 msgid "Undo Load State"
 msgstr "ステートロード前の状態に戻す"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:718
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:717
 msgid "Unexpected 0x80 call? Aborting..."
 msgstr "Unexpected 0x80 call? Aborting..."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:215
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:202
 msgid "Unknown"
 msgstr "フィルタ無し"
 
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:971
+#: Source/Core/Core/Src/HW/DVDInterface.cpp:965
 #, c-format
 msgid "Unknown DVD command %08x - fatal error"
 msgstr "Unknown DVD command %08x - fatal error"
 
-#: Source/Core/Common/Src/SysConf.cpp:145
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:444
+#, c-format
+msgid "Unknown command 0x%08x"
+msgstr "Unknown command 0x%08x"
+
+#: Source/Core/Common/Src/SysConf.cpp:132
 #, c-format
 msgid "Unknown entry type %i in SYSCONF (%s@%x)!"
 msgstr "Unknown entry type %i in SYSCONF (%s@%x)!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:228
+#: Source/Core/Core/Src/NetPlayClient.cpp:232
 #, c-format
 msgid "Unknown message received with id : %d"
 msgstr "次のIDから不明なメッセージを受信 : %d"
 
-#: Source/Core/Core/Src/NetPlayServer.cpp:504
+#: Source/Core/Core/Src/NetPlayServer.cpp:508
 #, c-format
 msgid "Unknown message with id:%d received from player:%d Kicking player!"
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:274
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:56
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:261
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:43
 msgid "Up"
 msgstr "上"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:108
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:95
 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17
 msgid "Update"
 msgstr "再取得"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:320
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:307
 msgid "Upright Wiimote"
 msgstr "直立状態(Upright)で使用"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:777
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758
 msgid "Use EuRGB60 Mode (PAL60)"
 msgstr "EuRGB60 (PAL60) モードを使用"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:294
 msgid "Use Fullscreen"
 msgstr "フルスクリーンで表示"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:575
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:563
 msgid "Use Hex"
 msgstr "16進"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:600
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580
 msgid "Use Panic Handlers"
 msgstr "パニックハンドラを使用"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89
+msgid ""
+"Use a hacked upload strategy to stream vertices.\n"
+"This usually speed up, but is forbidden by OpenGL specification and may "
+"causes heavy glitches.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+"頂点ストリームのアップロード方法を工夫し、速度を向上させます。\n"
+"ただしOpenGLの仕様から外れているので、大きなバグの 原因になる可能性もありま"
+"す。\n"
+"\n"
+"よく分からなければ、チェックを入れないでください。"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122
 msgid ""
 "Use multiple threads to decode textures.\n"
 "Might result in a speedup (especially on CPUs with more than two cores).\n"
@@ -5384,7 +5557,7 @@ msgstr ""
 "\n"
 "よく分からなければ、チェックを入れないでください。"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126
 msgid ""
 "Usually if shader compilation fails, an error message is displayed.\n"
 "However, one may skip the popups to allow interruption free gameplay by "
@@ -5399,53 +5572,58 @@ msgstr ""
 "\n"
 "よく分からなければ、チェックを入れないでください。"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:539
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:552
 msgid "Utility"
 msgstr "ユーティリティ"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:285
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:293
 msgid "V-Sync"
 msgstr "垂直同期 (V-Sync)"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:209
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318
+#, fuzzy
+msgid "VBeam Speed Hack"
+msgstr "MMU Speed Hack"
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196
 msgid "Value"
 msgstr "値"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:73
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:60
 msgid "Value:"
 msgstr "値："
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:572
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:560
 msgid "Value: "
 msgstr "値："
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:51
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:38
 msgid "Verbosity"
 msgstr "Verbosityモード"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:377
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:381
 msgid "Video"
 msgstr "描画"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:486
 msgid "Virtual"
 msgstr "Virtual"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:689
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670
 msgid "Volume"
 msgstr "音量"
 
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:498
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:527
+#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:488
+#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:517
 #, c-format
 msgid "WAD installation failed: error creating %s"
 msgstr "WAD installation failed: error creating %s"
 
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:547
+#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:537
 msgid "WAD installation failed: error creating ticket"
 msgstr "WAD installation failed: error creating ticket"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84
 msgid ""
 "Wait for vertical blanks in order to reduce tearing.\n"
 "Decreases performance if emulation speed is below 100%.\n"
@@ -5453,30 +5631,29 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 "画面のちらつきを防ぐため、垂直同期を待つようにします。\n"
-"フルスピードで動作できていないタイトルでは、このオプションは動作速度の 低下を"
-"招きます。\n"
+"フルスピードで動作できていない場合、この機能は動作速度の低下 を招きます。\n"
 "\n"
 "よく分からなければ、チェックを入れないでください。"
 
-#: Source/Core/Common/Src/MsgHandler.cpp:67
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46
+#: Source/Core/Common/Src/MsgHandler.cpp:53
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:33
 #: Source/Core/DolphinWX/Src/VideoConfigDiag.h:85
 msgid "Warning"
 msgstr "警告"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:291
+#: Source/Core/Core/Src/Boot/Boot.cpp:279
 msgid "Warning - starting DOL in wrong console mode!"
 msgstr "Warning - starting DOL in wrong console mode!"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:341
+#: Source/Core/Core/Src/Boot/Boot.cpp:329
 msgid "Warning - starting ELF in wrong console mode!"
 msgstr "Warning - starting ELF in wrong console mode!"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:221
+#: Source/Core/Core/Src/Boot/Boot.cpp:209
 msgid "Warning - starting ISO in wrong console mode!"
 msgstr "Warning - starting ISO in wrong console mode!"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:519
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:512
 #, c-format
 msgid ""
 "Warning! it is advised to backup all files in the folder:\n"
@@ -5487,7 +5664,7 @@ msgstr ""
 "%s\n"
 "続けますか？"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:585
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:578
 #, c-format
 msgid ""
 "Warning: This will overwrite any existing saves that are in the folder:\n"
@@ -5501,7 +5678,7 @@ msgstr ""
 "\n"
 "続けますか？"
 
-#: Source/Core/Core/Src/Movie.cpp:844
+#: Source/Core/Core/Src/Movie.cpp:835
 #, c-format
 msgid ""
 "Warning: You loaded a save that's after the end of the current movie. (byte "
@@ -5509,7 +5686,7 @@ msgid ""
 "load this state with read-only mode off."
 msgstr ""
 
-#: Source/Core/Core/Src/Movie.cpp:861
+#: Source/Core/Core/Src/Movie.cpp:852
 #, c-format
 msgid ""
 "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You "
@@ -5517,7 +5694,7 @@ msgid ""
 "only mode off. Otherwise you'll probably get a desync."
 msgstr ""
 
-#: Source/Core/Core/Src/Movie.cpp:870
+#: Source/Core/Core/Src/Movie.cpp:861
 #, c-format
 msgid ""
 "Warning: You loaded a save whose movie mismatches on frame %d. You should "
@@ -5536,49 +5713,49 @@ msgid ""
 "%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d"
 msgstr ""
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:106
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:129
+#: Source/Core/AudioCommon/Src/WaveFile.cpp:93
+#: Source/Core/AudioCommon/Src/WaveFile.cpp:116
 msgid "WaveFileWriter - file not open."
 msgstr "WaveFileWriter - file not open."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:56
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:60
 msgid "Whammy"
 msgstr "ワーミー"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:404
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:408
 msgid "Widescreen Hack"
 msgstr "疑似ワイドスクリーン化"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:312
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:299
 msgid "Width"
 msgstr "範囲(横)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535
 msgid "Wii"
 msgstr "Wii"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:372
 msgid "Wii Console"
 msgstr "Wii コンソール"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:844
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:825
 msgid "Wii NAND Root:"
 msgstr "Wii NANDルート"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:191
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:194
 msgid "Wii Save Import"
 msgstr "Wiiのセーブデータをインポート"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1243
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1270
 msgid "Wii save files (*.bin)|*.bin"
 msgstr "Wiiセーブデータ (*.bin)|*.bin"
 
-#: Source/Core/DiscIO/Src/WiiWad.cpp:82
+#: Source/Core/DiscIO/Src/WiiWad.cpp:69
 msgid "WiiWAD: Could not read from file"
 msgstr "WiiWAD: ファイルからの読み込みができませんでした"
 
-#: Source/Core/Core/Src/HW/Wiimote.cpp:17
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
+#: Source/Core/Core/Src/HW/Wiimote.cpp:20
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
 msgid "Wiimote"
 msgstr "入力(Wii)"
 
@@ -5587,7 +5764,7 @@ msgstr "入力(Wii)"
 msgid "Wiimote %i"
 msgstr "Wii リモコン %i"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:628
+#: Source/Core/DolphinWX/Src/Main.cpp:656
 msgid "Wiimote Connected"
 msgstr "Wii リモコン接続中"
 
@@ -5595,7 +5772,7 @@ msgstr "Wii リモコン接続中"
 msgid "Wiimote Motor"
 msgstr "Wii リモコンの振動を有効化"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
 msgid "Wiimote settings"
 msgstr "Wii リモコンの設定を行います"
 
@@ -5603,102 +5780,126 @@ msgstr "Wii リモコンの設定を行います"
 msgid "Wiimotes"
 msgstr "デバイス設定"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:134
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:121
 msgid "Windows Left"
 msgstr "Windows Left"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:136
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:123
 msgid "Windows Menu"
 msgstr "Windows Menu"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:135
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:122
 msgid "Windows Right"
 msgstr "Windows Right"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:131
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:124
 msgid "Word Wrap"
 msgstr "ワードラップ"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1298
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:864
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1089
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1225
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1325
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:880
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1090
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1226
 msgid "Working..."
 msgstr "動作中..."
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:338
+msgid "Write memcards (GC)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46
 msgid "Write to Console"
 msgstr "コンソールに出力"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:67
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:54
 msgid "Write to Debugger"
 msgstr "デバッガに書込"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:57
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44
 msgid "Write to File"
 msgstr "ファイルに出力"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:61
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48
 msgid "Write to Window"
 msgstr "ウィンドウに出力"
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:60
+#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:47
 #, c-format
 msgid "XAudio2 CreateSourceVoice failed: %#X"
 msgstr "XAudio2 CreateSourceVoice failed: %#X"
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:114
+#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:101
 #, c-format
 msgid "XAudio2 init failed: %#X"
 msgstr "XAudio2 init failed: %#X"
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:124
+#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:111
 #, c-format
 msgid "XAudio2 master voice creation failed: %#X"
 msgstr "XAudio2 master voice creation failed: %#X"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:766
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:765
 msgid "XF reg"
 msgstr "XF reg"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:21
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Yellow"
 msgstr "黄"
 
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:107
+#: Source/Core/Core/Src/DSP/DSPCore.cpp:120
 msgid ""
-"You are using free dsp roms made by Dolphin Team.\n"
-"Only Zelda ucode games will work correctly with them.\n"
+"You are using a free DSP ROM made by the Dolphin Team.\n"
+"All Wii games will work correctly, and most GC games should also work fine, "
+"but the GBA/IPL/CARD UCodes will not work.\n"
 msgstr ""
-"DSP-LLEの代わりに、開発中の合法DSPロムを使用します。\n"
-"しかし、現在はZelda ucode型タイトルしか対応していません！\n"
-"実機よりDSP-LLEをダンプして置き換えることをオススメします。\n"
+"DSP-LLEの代わりに、開発中の合法DSP ROMを使用します。\n"
+"全てのWiiタイトルとほとんどのゲームキューブタイトルで正常に動作しますが、GBA/"
+"IPL/CARD Ucode型のものには対応していません。\n"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:73
+#: Source/Core/Core/Src/DSP/DSPCore.cpp:116
+msgid ""
+"You are using an old free DSP ROM made by the Dolphin Team.\n"
+"Only games using the Zelda UCode will work correctly.\n"
+msgstr ""
+"DSP-LLEの代わりに、開発中の合法DSP ROMを使用します。このROMは古いバージョンで"
+"す。\n"
+"Zelda ucode型のタイトルでしか上手く動作しません\n"
+
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:63
 msgid "You can't close panes that have pages in them."
-msgstr ""
+msgstr "You can't close panes that have pages in them."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:207
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:210
 msgid "You must choose a game!!"
 msgstr "ソフトが選ばれていません"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:605
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:593
 msgid "You must enter a name!"
 msgstr "名前が入力されていません！"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:450
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:438
 msgid "You must enter a valid decimal, hexadecimal or octal value."
 msgstr "10進数・16進数・8進数いずれかの有効な値を入力してください。"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:603
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:591
 msgid "You must enter a valid profile name."
 msgstr "有効なプロファイル名を入力してください"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:936
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:917
 msgid "You must restart Dolphin in order for the change to take effect."
 msgstr "変更を有効にするにはDolphinを再起動してください"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:175
+#: Source/Core/Core/Src/DSP/DSPCore.cpp:109
+msgid ""
+"Your DSP ROMs have incorrect hashes.\n"
+"Would you like to stop now to fix the problem?\n"
+"If you select \"No\", audio might be garbled."
+msgstr ""
+"ダンプしたDSP ROMのハッシュが不完全です\n"
+"この問題を修正するために動作を停止しますか？\n"
+"\"いいえ\"を選択した場合、歪んだ音のままゲームが始まるでしょう"
+
+#: Source/Core/Core/Src/CoreParameter.cpp:164
 msgid ""
 "Your GCM/ISO file seems to be invalid (invalid country).\n"
 "Continue with PAL region?"
@@ -5706,7 +5907,7 @@ msgstr ""
 "この GCM/ISO ファイルは不正と思われます (国情報が無効)\n"
 "PAL規格と仮定して続けますか？"
 
-#: Source/Core/Common/Src/SysConf.cpp:58
+#: Source/Core/Common/Src/SysConf.cpp:45
 #, c-format
 msgid ""
 "Your SYSCONF file is the wrong size.\n"
@@ -5717,25 +5918,25 @@ msgstr ""
 "正しくは 0x%04x (このファイルは 0x%04llx)\n"
 "新しく作成しますか？"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:334
 msgid "ZTP hack"
 msgstr "ZTP hack"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:387
+#: Source/Core/Core/Src/ActionReplay.cpp:377
 msgid "Zero 3 code not supported"
 msgstr "03コードはサポートされていません"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:408
+#: Source/Core/Core/Src/ActionReplay.cpp:398
 #, c-format
 msgid "Zero code unknown to dolphin: %08x"
 msgstr "Zero code unknown to dolphin: %08x"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:436
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:460
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:423
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:447
 msgid "[ waiting ]"
 msgstr "[ 入力を待機... ]"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107
 msgid ""
 "[BROKEN]\n"
 "Highlight regions the EFB was copied from.\n"
@@ -5747,11 +5948,11 @@ msgstr ""
 "\n"
 "よく分からなければ、チェックを入れないでください。"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:91
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:78
 msgid "[Custom]"
 msgstr "[ カスタム設定 ]"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120
 msgid ""
 "[EXPERIMENTAL]\n"
 "Aims to speed up emulation by offloading texture decoding to the GPU using "
@@ -5769,7 +5970,7 @@ msgstr ""
 "\n"
 "よく分からなければ、チェックを入れないでください。"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121
 msgid ""
 "[EXPERIMENTAL]\n"
 "Speeds up emulation a bit by caching display lists.\n"
@@ -5783,97 +5984,47 @@ msgstr ""
 "\n"
 "よく分からなければ、チェックを入れないでください。"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:508
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:495
 msgid "^ ADD"
 msgstr "^ (...に加えて)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:820
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:801
 msgid "apploader (.img)"
 msgstr "apploader (.img)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:185
-msgid "failed to read bk header"
-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 "failed to read data from file: %s"
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:97
-msgid "failed to read header"
-msgstr "failed to read header"
-
-#: Source/Core/Core/Src/PowerPC/JitInterface.cpp:285
+#: Source/Core/Core/Src/PowerPC/JitInterface.cpp:272
 #, c-format
 msgid "iCacheJIT: Reading Opcode from %x. Please report."
 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 "not a wii save or read failure for file header size %x"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:935
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:936
 msgid "s"
 msgstr "　"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:457
-#, c-format
-msgid "unknown cmd 0x%08x"
-msgstr "unknown cmd 0x%08x"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1110
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1136
 msgid "wxExecute returned -1 on application run!"
 msgstr "wxExecute returned -1 on application run!"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:56
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:43
 msgid "zFar Correction: "
 msgstr "zFar 補正値："
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:51
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:38
 msgid "zNear Correction: "
 msgstr "zNear 補正値："
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:493
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:480
 msgid "| OR"
 msgstr "| (...もしくは)"
 
-#~ msgid "%i connected"
-#~ msgstr "接続数 %i 個"
-
-#~ msgid "Alternate Wiimote Timing"
-#~ msgstr "Wii リモコンの同期調整"
-
-#~ msgid "Interpreter (VERY slow)"
-#~ msgstr "インタプリタ (非推奨)"
-
-#~ msgid "JIT Recompiler (recommended)"
-#~ msgstr "JIT リコンパイラ (推奨)"
-
-#~ msgid "JITIL experimental recompiler"
-#~ msgstr "JITIL リコンパイラ (実験的)"
+#~ msgid "Accurate VBeam emulation"
+#~ msgstr "Accurate VBeam emulation"
 
 #~ msgid ""
-#~ "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. "
-#~ "No effect on emulated wiimotes."
+#~ "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)"
 #~ msgstr ""
-#~ "Wii リモコン内蔵のスピーカーを無効化します。実機Wii リモコン使用中ランダム"
-#~ "に切断される問題を解消します"
+#~ "FPSが安定しないゲームで効果があります [有効＝互換性向上／無効＝動作速度向"
+#~ "上]"
 
-#~ msgid "Pair Up"
-#~ msgstr "ペアリング"
-
-#~ msgid "Reconnect Wiimote Confirm"
-#~ msgstr "Wii リモコンの再接続"
-
-#~ msgid ""
-#~ "Wiimote %i has been disconnected by system.\n"
-#~ "Maybe this game doesn't support multi-wiimote,\n"
-#~ "or maybe it is due to idle time out or other reason.\n"
-#~ "Do you want to reconnect immediately?"
-#~ msgstr ""
-#~ "%iP のWii リモコンが切断されました\n"
-#~ "このゲームは複数のWii リモコンをサポートしていない、\n"
-#~ "またはしばらく入力がなかったため省電力モードに入ったのかもしれません\n"
-#~ "再接続しますか？"
+#~ msgid "Skip Dest. Alpha Pass"
+#~ msgstr "Skip Dest. Alpha Pass"
diff --git a/Languages/po/ko.po b/Languages/po/ko.po
index 8cef19ec2c..e0932c14cf 100644
--- a/Languages/po/ko.po
+++ b/Languages/po/ko.po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the dolphin-emu package.
 #
 # Translators:
-#  <iori3000@hanafos.com>, 2013.
-# Siegfried <iori3000@hanafos.com>, 2011.
+# Siegfried <iori3000@hanafos.com>, 2013
+# Siegfried <iori3000@hanafos.com>, 2011
 msgid ""
 msgstr ""
 "Project-Id-Version: Dolphin Emulator\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-10 08:56-0500\n"
-"PO-Revision-Date: 2013-02-03 22:12+0000\n"
+"POT-Creation-Date: 2013-04-18 23:00-0500\n"
+"PO-Revision-Date: 2013-04-11 01:47+0000\n"
 "Last-Translator: Siegfried <iori3000@hanafos.com>\n"
 "Language-Team: Korean (http://www.transifex.com/projects/p/dolphin-emu/"
 "language/ko/)\n"
@@ -20,21 +20,21 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:511
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:499
 msgid " (too many to display)"
 msgstr " (표시하기에 너무 많은)"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:270
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:273
 #: Source/Core/DolphinWX/Src/NetWindow.cpp:491
 #: Source/Core/DolphinWX/Src/NetWindow.cpp:530
 msgid " Game : "
 msgstr "게임 :"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:507
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494
 msgid "! NOT"
 msgstr "! NOT"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:70
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:58
 #, c-format
 msgid ""
 "\"%s\" does not exist.\n"
@@ -43,33 +43,43 @@ msgstr ""
 "\"%s\"가 존재하지 않습니다.\n"
 " 새로운 16MB 메모리카드를 생성해요?"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:142
+#: Source/Core/Core/Src/CoreParameter.cpp:131
 #, c-format
 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:722
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:721
 #, c-format
 msgid "%08X:  "
 msgstr "%08X:  "
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:196
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:183
 #, c-format
 msgid "%1$sCopy%1$s"
 msgstr "%1$s복사%1$s"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:128
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:296
+#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:113
+#, c-format
+msgid "%d samples"
+msgstr "%d 샘플들"
+
+#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:112
+#, c-format
+msgid "%d samples (quality level %d)"
+msgstr "%d 샘플들 (품질 수준 %d)"
+
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:121
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:289
 #, c-format
 msgid "%s already exists, overwrite?"
 msgstr "%s가 이미 존재함, 덮어씁니까?"
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:167
+#: Source/Core/DiscIO/Src/CompressedBlob.cpp:154
 #, c-format
 msgid "%s failed to be scrubbed. Probably the image is corrupt."
 msgstr "%s 가 실패해서 취소되었습니다. 이미지가 손상된 것 같습니다."
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:95
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:83
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
@@ -78,7 +88,7 @@ msgstr ""
 "%s 는 메모리카드로써 불러오기에 실패했습니다 \n"
 " 카드 파일 크기가 유효하지 않습니다 (0x%x bytes)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:110
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:98
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
@@ -87,7 +97,7 @@ msgstr ""
 "%s 는 메모리카드로써 로드하는데에 실패했습니다 \n"
 " 카드 크기가 유효하지 않습니다 (0x%x bytes)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:90
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:78
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
@@ -96,48 +106,37 @@ msgstr ""
 "%s 는 메모리카드로써 불러오기에 실패했습니다 \n"
 "파일이 유효한 메모리 카드 파일이 될 만큼 충분히 크지 않습니다. (0x%x bytes)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:367
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:359
 #, c-format
 msgid "%s failed to open"
 msgstr "%s가 열기에 실패했습니다"
 
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:97
-#, c-format
-msgid ""
-"%s has an incorrect hash.\n"
-"Would you like to stop now to fix the problem?\n"
-"If you select \"No\", audio will be garbled."
-msgstr ""
-"%s가 잘못된 해쉬를 지녔습니다.\n"
-"문제를 고치기위해 지금 중단하시겠습니까?\n"
-"\"아니오\"를 선택하면, 오디오가 알아듣기 힘들겁니다."
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:360
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:352
 #, c-format
 msgid "%s is a 0 byte file"
 msgstr "%s 는 0 바이트 파일임"
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:159
+#: Source/Core/DiscIO/Src/CompressedBlob.cpp:146
 #, c-format
 msgid "%s is already compressed! Cannot compress it further."
 msgstr "%s 는 이미 압축됨! 그것을 더이상 압축할 수 없습니다."
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:345
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:337
 #, c-format
 msgid "%s is too long for the filename, max chars is 45"
 msgstr "%s 는 너무 긴 파일이름 입니다, 최대 글자수는 45 입니다."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:202
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:189
 #, c-format
 msgid "%sDelete%s"
 msgstr "%s삭제%s"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:200
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:187
 #, c-format
 msgid "%sExport GCI%s"
 msgstr "%sGCI 내보내기%s"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:198
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:185
 #, c-format
 msgid "%sImport GCI%s"
 msgstr "%sGCI 가져오기%s"
@@ -147,252 +146,275 @@ msgstr "%sGCI 가져오기%s"
 msgid "%u Free Blocks; %u Free Dir Entries"
 msgstr "%u 빈 블럭; %u 빈 디렉토리 엔트리"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:506
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:493
 msgid "&& AND"
 msgstr "&& AND"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:295
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:301
 msgid "&About..."
 msgstr "돌핀에 대해(&A)..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:99
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:100
 msgid "&Boot from DVD Drive..."
 msgstr "DVD 드라이브에서 부트(&B)..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:231
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:234
 msgid "&Breakpoints"
 msgstr "브레이크포인트(&B)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:110
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:111
 msgid "&Browse for ISOs..."
 msgstr "ISO 폴더탐색(&B)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:192
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:195
 msgid "&Cheats Manager"
 msgstr "치트 매니저(&C)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:177
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:180
 msgid "&DSP Settings"
 msgstr "오디오 설정(&D)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:885
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:876
 msgid "&Delete ISO..."
 msgstr "ISO 삭제(&D)..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:903
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:897
 msgid "&Delete selected ISOs..."
 msgstr "선택된 ISO들 삭제(&D)..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:170
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:173
 msgid "&Emulation"
 msgstr "에뮬레이션(&E)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:113
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:114
 msgid "&File"
 msgstr "파일(&F)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:335
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:341
 msgid "&Frame Advance"
 msgstr "프레임 진행(&F)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:352
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:358
 msgid "&Fullscreen"
 msgstr "전체화면(&F)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:176
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:179
 msgid "&Graphics Settings"
 msgstr "그래픽 설정(&G)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:296
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:302
 msgid "&Help"
 msgstr "도움(&H)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:180
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:183
 msgid "&Hotkey Settings"
 msgstr "단축키 설정(&H)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:233
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:236
 msgid "&JIT"
 msgstr "&JIT"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:148
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:149
 msgid "&Load State"
 msgstr "상태 로드(&L)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:190
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:193
 msgid "&Memcard Manager (GC)"
 msgstr "메모리 카드 매니저(GC) (&M)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:232
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:235
 msgid "&Memory"
 msgstr "메모리(&M)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:313
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:319
 msgid "&Open..."
 msgstr "열기(&O)..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:186
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:189
 msgid "&Options"
 msgstr "옵션(&O)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:324
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:330
 msgid "&Pause"
 msgstr "일시정지(&P)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:326
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:332
 msgid "&Play"
 msgstr "실행(&P)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:867
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:858
 msgid "&Properties"
 msgstr "속성(&P)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:348
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:354
 msgid "&Read-only mode"
 msgstr "읽기-전용 모드(&R)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:319
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:325
 msgid "&Refresh List"
 msgstr "게임목록 새로 고침(&R)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:230
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:233
 msgid "&Registers"
 msgstr "레지스터들(&R)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:332
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:338
 msgid "&Reset"
 msgstr "리셋(&R)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:234
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:237
 msgid "&Sound"
 msgstr "사운드(&S)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:329
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:335
 msgid "&Stop"
 msgstr "중지(&S)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:207
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:210
 msgid "&Tools"
 msgstr "도구(&T)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:235
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:238
 msgid "&Video"
 msgstr "비디오(&V)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:284
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:287
 msgid "&View"
 msgstr "보기(&V)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:179
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:182
 msgid "&Wiimote Settings"
 msgstr "위모트 설정(&W)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:868
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:859
 msgid "&Wiki"
 msgstr "위키(&W)"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504
 msgid "'"
 msgstr "'"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:59
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:46
 msgid "(-)+zFar"
 msgstr "(-)+z원거리"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:54
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:41
 msgid "(-)+zNear"
 msgstr "(-)+z근거리"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:99
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:86
 msgid "(UNKNOWN)"
 msgstr "(알려지지 않음)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:376
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:384
 msgid "(off)"
 msgstr "(끔)"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:655
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:654
 msgid "0x44"
 msgstr "0x44"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+msgid "1.5x Native (960x792)"
+msgstr "1.5x 원본 (960x792)"
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:158
 msgid "16 bit"
 msgstr "16 비트"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+msgid "1x Native (640x528)"
+msgstr "1x 원본 (640x528)"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+msgid "2.5x Native (1600x1320)"
+msgstr "2.5x 원본 (1600x1320)"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+msgid "2x Native (1280x1056)"
+msgstr "2x 원본 (1280x1056)"
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:159
 msgid "32 bit"
 msgstr "32 비트"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:412
 msgid "3D Vision"
 msgstr "3D 비전"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+msgid "3x Native (1920x1584)"
+msgstr "3x 원본 (1920x1584)"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+msgid "4x Native (2560x2112)"
+msgstr "4x 원본 (2560x2112)"
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:157
 msgid "8 bit"
 msgstr "8 비트"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:43
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:30
 msgid "<Insert name here>"
 msgstr "<여기에 이름을 넣으세요>"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:255
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:262
 msgid "<No resolutions found>"
 msgstr "<발견된 해상도가 없음>"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:104
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84
 msgid "<Nothing>"
 msgstr "<없음>"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:162
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:162
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:150
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:150
 msgid "<Press Key>"
 msgstr "<키를 누르세요>"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286
 msgid "<System>"
 msgstr "<시스템>"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695
 msgid "A"
 msgstr "A"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:201
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:235
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:204
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:238
 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:353
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:387
 msgid "A game is not currently running."
 msgstr "현재 게임이 구동되고 있지 않습니다."
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:68
-#, fuzzy
 msgid ""
 "A supported bluetooth device could not be found.\n"
 "You must manually connect your wiimotes."
 msgstr ""
-"지원되는 블루투스 장치를 찾을 수 없습니다!\n"
-"마이크로소프트 블루투스 스택을 사용하고 있지 않다면 위모트들과 수동으로 짝을 "
-"지으셔야하고 \"갱신\" 버튼 만을 이용하세요."
+"지원되는 블루투스 장치를 찾을 수 없습니다.\n"
+"위모트를 수동으로 연결해야합니다."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:109
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:100
+#, fuzzy
 msgid ""
 "ALERT:\n"
 "\n"
-"NetPlay will currently only work properly when using the following "
-"settings:\n"
-" - Dual Core [OFF]\n"
-" - Audio Throttle [OFF]\n"
-" - DSP-HLE with \"Null Audio\" or DSP-LLE\n"
-" - Manually set the exact number of controllers that will be used to "
-"[Standard Controller]\n"
+"Netplay will only work with the following settings:\n"
+" - Enable Dual Core [OFF]\n"
+" - DSP Emulator Engine Must be the same on all computers!\n"
+" - DSP on Dedicated Thread [OFF]\n"
+" - Framelimit NOT set to [Audio]\n"
+" - Manually set the exact number of controllers to be used to [Standard "
+"Controller]\n"
 "\n"
-"All players should try to use the same Dolphin version and settings.\n"
-"Disable all memory cards or send them to all players before starting.\n"
-"Wiimote support has not been implemented.\n"
+"All players should use the same Dolphin version and settings.\n"
+"All memory cards must be identical between players or disabled.\n"
+"Wiimote support has not been implemented!\n"
 "\n"
-"You must forward TCP port to host!!"
+"The host must have the chosen TCP port open/forwarded!\n"
 msgstr ""
 "알림:\n"
 "\n"
@@ -410,17 +432,17 @@ msgstr ""
 "\n"
 "TCP 포트를 호스트에 전달해야합니다!!"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:111
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:116
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96
 msgid "AM-Baseboard"
 msgstr "AM-기반보드"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:299
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:115
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:300
 msgid "AR Codes"
 msgstr "AR 코드"
 
-#: Source/Core/DolphinWX/Src/AboutDolphin.h:33
+#: Source/Core/DolphinWX/Src/AboutDolphin.h:21
 msgid "About Dolphin"
 msgstr "돌핀에 대해"
 
@@ -428,15 +450,11 @@ msgstr "돌핀에 대해"
 msgid "Acceleration"
 msgstr "가속"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:463
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473
 msgid "Accuracy:"
 msgstr "정확성:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317
-msgid "Accurate VBeam emulation"
-msgstr "정확한 VBeam 에뮬레이션"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97
 msgid ""
 "Accurately emulate EFB copies.\n"
 "Some games depend on this for certain graphical effects or gameplay "
@@ -447,14 +465,14 @@ msgstr ""
 "정확하게 EFB 복사를 에뮬합니다.\n"
 "일부 게임들은 그래픽 효과나 게임플레이 기능을 이것에 의존합니다.\n"
 "\n"
-"확신 없으면, 텍스처에 EFB를 체크로 두세요."
+"모르겠으면, 텍스처에 EFB를 체크로 두세요."
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:239
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:239
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:227
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:227
 msgid "Action"
 msgstr "   [ 액션 ]"
 
-#: Source/Core/Core/Src/ARDecrypt.cpp:481
+#: Source/Core/Core/Src/ARDecrypt.cpp:469
 #, c-format
 msgid ""
 "Action Replay Code Decryption Error:\n"
@@ -469,14 +487,14 @@ msgstr ""
 "범인 코드:\n"
 "%s"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:667
+#: Source/Core/Core/Src/ActionReplay.cpp:657
 #, 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:755
+#: Source/Core/Core/Src/ActionReplay.cpp:745
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide "
@@ -485,7 +503,7 @@ msgstr ""
 "액션 리플레이 에러: 비적합 크기 (%08x : address = %08x) 채우기와 슬라이드(%s)"
 "에"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:547
+#: Source/Core/Core/Src/ActionReplay.cpp:537
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And "
@@ -494,7 +512,7 @@ msgstr ""
 "액션 리플레이 에러: 비적합 크기 (%08x : address = %08x) 램 쓰기와 채우기 (%s)"
 "에"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:607
+#: Source/Core/Core/Src/ActionReplay.cpp:597
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Write To "
@@ -502,12 +520,12 @@ msgid ""
 msgstr ""
 "액션 리플레이 에러: 비적합 크기 (%08x : address = %08x) 포인터 (%s)에 쓰기에"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:802
+#: Source/Core/Core/Src/ActionReplay.cpp:792
 #, c-format
 msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)"
 msgstr "액션 리플레이 에러: 비적합 크기 (%08x), 메모리 복사 (%s)에"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:682
+#: Source/Core/Core/Src/ActionReplay.cpp:672
 #, c-format
 msgid ""
 "Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)\n"
@@ -517,63 +535,63 @@ msgstr ""
 "(%s)\n"
 "마스터 코드가 필요하지 않습니다. 마스터 코드를 사용하지 마세요."
 
-#: Source/Core/Core/Src/ActionReplay.cpp:196
+#: Source/Core/Core/Src/ActionReplay.cpp:184
 #, c-format
 msgid "Action Replay Error: invalid AR code line: %s"
 msgstr "액션 리플레이 에러: 비적합 AR 코드 라인: %s"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:872
+#: Source/Core/Core/Src/ActionReplay.cpp:862
 #, c-format
 msgid "Action Replay: Conditional Code: Invalid Size %08x (%s)"
 msgstr "액션 리플레이: 조건적 코드: 비적합 크기 %08x (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:945
+#: Source/Core/Core/Src/ActionReplay.cpp:935
 #, c-format
 msgid "Action Replay: Invalid Normal Code Type %08x (%s)"
 msgstr "액션 리플레이: 비적합 일반 코드 타입 %08x (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:896
+#: Source/Core/Core/Src/ActionReplay.cpp:886
 #, c-format
 msgid "Action Replay: Normal Code %i: Invalid subtype %08x (%s)"
 msgstr "액션 리플레이: 일반 코드 %i: 비적합 서브타입 %08x (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:838
+#: Source/Core/Core/Src/ActionReplay.cpp:828
 #, c-format
 msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)"
 msgstr "액션 리플레이: 일반 코드 0: 비적합 서브타입 %08x (%s)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:242
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:247
 msgid "Adapter:"
 msgstr "어댑터:"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:76
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:63
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:63
 msgid "Add"
 msgstr "추가"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1275
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1301
 msgid "Add ActionReplay Code"
 msgstr "액션리플레이 코드 추가"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1204
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1230
 msgid "Add Patch"
 msgstr "패치 추가"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:507
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:528
 msgid "Add new pane"
 msgstr "새로운 창 추가"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:404
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:426
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:811
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:408
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:430
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:792
 msgid "Add..."
 msgstr "추가..."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:90
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:81
 msgid "Address :"
 msgstr "주소 :"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:58
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:45
 msgid ""
 "Adds the specified value to zFar Parameter.\n"
 "Two ways to express the floating point values.\n"
@@ -591,7 +609,7 @@ msgstr ""
 "\n"
 "알아두기: 얻어진 값들에 대해 로그윈도우/콘솔을 체크하세요."
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:53
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:40
 msgid ""
 "Adds the specified value to zNear Parameter.\n"
 "Two ways to express the floating point values.\n"
@@ -609,48 +627,48 @@ msgstr ""
 "\n"
 "알아두기: 얻어진 값들에 대해 로그윈도우/콘솔을 체크하세요."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:755
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:744
 msgid "Adjust the analog control pressure required to activate buttons."
 msgstr "버튼들 활성화에 필요한 아날로그 컨트롤 압력을 조정하세요."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:509
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:522
 msgid "Advanced"
 msgstr "고급"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561
 msgid "Advanced Settings"
 msgstr "고급 설정"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:584
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:587
 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:816
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:797
 msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)"
 msgstr "모든 GC/Wii 이미지들 (gcm, iso, wbfs, ciso, gcz)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1189
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1190
 msgid "All Gamecube GCM files (gcm)"
 msgstr "모든 게임큐브 GCM 파일들 (gcm)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1390
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1404
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1417
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1431
 msgid "All Save States (sav, s##)"
 msgstr "모든 상태들 저장 (sav, s##)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1187
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1188
 msgid "All Wii ISO files (iso)"
 msgstr "모든 Wii ISO 파일들 (iso)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1207
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1208
 msgid "All compressed GC/Wii ISO files (gcz)"
 msgstr "모든 압축된 GC/Wii ISO 파일들 (gcz)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:124
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:104
 msgid "All files (*.*)|*.*"
 msgstr "모든 파일 (*.*)|*.*"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123
 msgid ""
 "Allows toggling certain options via the hotkeys 3 (Internal Resolution), 4 "
 "(Aspect Ratio), 5 (Copy EFB) and 6 (Fog) within the emulation window.\n"
@@ -662,39 +680,39 @@ msgstr ""
 "\\n\n"
 "모르겠으면, 이것을 언체크로 두세요."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:285
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:272
 msgid "Analyze"
 msgstr "분석"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:298
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:285
 msgid "Angle"
 msgstr "각도"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:367
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:375
 msgid "Anisotropic Filtering:"
 msgstr "비등방성 필터링:"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:350
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:358
 msgid "Anti-Aliasing:"
 msgstr "안티-앨리어싱:"
 
-#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:308
+#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:299
 msgid "Apploader is the wrong size...is it really an apploader?"
 msgstr "앱로더가 잘못된 크기임... 정말 앱로더입니까?"
 
-#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:302
+#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:293
 msgid "Apploader unable to load from file"
 msgstr "앱로더가 파일로 부터 로드할 수 없음"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:841
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:822
 msgid "Apploader:"
 msgstr "앱로더:"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:135
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:122
 msgid "Apply"
 msgstr "적용"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124
 msgid ""
 "Apply a post-processing effect after finishing a frame.\n"
 "\n"
@@ -702,13 +720,13 @@ msgid ""
 msgstr ""
 "프레임을 마친후 후처리 효과를 적용합니다.\n"
 "\n"
-"확신 없으면, (끄기)를 선택하세요."
+"모르겠으면, (끄기)를 선택하세요."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287
 msgid "Arabic"
 msgstr "아랍어"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:614
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:603
 #, c-format
 msgid "Are you sure you want to delete \"%s\"?"
 msgstr "\"%s\" 를 정말로 지우고 싶습니까?"
@@ -725,46 +743,50 @@ msgstr ""
 msgid "Are you sure you want to delete this file?  It will be gone forever!"
 msgstr "이 파일을 정말로 지우고 싶습니까? 그것은 영원히 사라집니다!"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:789
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:277
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:44
+msgid "Arm JIT (experimental)"
+msgstr "Arm JIT (실험적)"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:285
 msgid "Aspect Ratio:"
 msgstr "종횡비:"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:70
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:58
 msgid "At least one pane must remain open."
 msgstr "적어도 하나의 창이 열려 있어야합니다."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:553
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533
 msgid "Audio"
 msgstr "오디오"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:694
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675
 msgid "Audio Backend:"
 msgstr "오디오 백엔드:"
 
-#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:41
+#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:28
 msgid "AudioCommon: Error opening AO device.\n"
 msgstr "AudioCommon: AO 장치를 열기 에러.\n"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:275
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283
 msgid "Auto"
 msgstr "자동"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:337
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345
 msgid "Auto (Multiple of 640x528)"
 msgstr "자동 (640x528의 배수)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:337
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345
 msgid "Auto (Window Size)"
 msgstr "자동 (윈도우 크기)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:297
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305
 msgid "Auto adjust Window Size"
 msgstr "윈도우 크기 자동 조정"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77
 msgid ""
 "Automatically adjusts the window size to your internal resolution.\n"
 "\n"
@@ -774,161 +796,161 @@ msgstr ""
 "\n"
 "모르겠으면, 이것을 언체크로 두세요."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:697
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696
 msgid "B"
 msgstr "B"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:755
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:754
 msgid "BP register "
 msgstr "BP 레지스터"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:27
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:14
 msgid "Back"
 msgstr "뒤로"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:698
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:679
 msgid "Backend Settings"
 msgstr "백엔드 설정"
 
-#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:60
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:206
+#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:47
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:211
 msgid "Backend:"
 msgstr "백엔드:"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:318
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:95
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:305
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:82
 msgid "Background Input"
 msgstr "백그라운드 입력"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:279
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:266
 msgid "Backward"
 msgstr "뒤로"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:264
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:257
 msgid "Bad File Header"
 msgstr "배드 파일 헤더"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:627
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:621
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:290
 msgid "Banner"
 msgstr "       배너"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:519
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:529
 msgid "Banner Details"
 msgstr "배너 세부사항"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491
 msgid "Banner:"
 msgstr "배너:"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:57
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:61
 msgid "Bar"
 msgstr "바"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:308
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:316
 msgid "Basic"
 msgstr "기본"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555
 msgid "Basic Settings"
 msgstr "기본 설정"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:22
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Bass"
 msgstr "베이스"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:186
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:174
 msgid "Block Allocation Table checksum failed"
 msgstr "블럭 할당 테이블 체크섬을 실패했습니다"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:631
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625
 msgid "Blocks"
 msgstr "블럭들"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:21
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Blue"
 msgstr "파랑"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:24
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Blue Left"
 msgstr "파랑 왼쪽"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:25
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Blue Right"
 msgstr "파랑 오른쪽"
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:87
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270
 msgid "Bottom"
 msgstr "아래"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:238
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:225
 #, c-format
 msgid "Bound Controls: %lu"
 msgstr "바운드 컨트롤들: %lu"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348
 msgid "Broken"
 msgstr "고장남"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:422
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:428
 msgid "Browse"
 msgstr "폴더탐색"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:256
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:243
 msgid "Browse for a directory to add"
 msgstr "추가할 디렉토리 둘러보기"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:422
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:428
 msgid "Browse for an ISO directory..."
 msgstr "ISO 디렉토리 불러오기..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1079
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1080
 msgid "Browse for output directory"
 msgstr "출력 디렉토리 둘러보기"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:328
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:331
 msgid "Buffer:"
 msgstr "버퍼:"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:58
 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:119
+#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:106
 msgid "Buttons"
 msgstr "버튼"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317
 msgid ""
 "Bypass the clearing of the data cache by the DCBZ instruction. Usually leave "
 "this option disabled."
 msgstr ""
 "DCBZ 명령에 의해 데이터 캐쉬 청소를 우회합니다. 보통은 이 옵션을 꺼둡니다."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:698
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:697
 msgid "C"
 msgstr "C"
 
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:77
+#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:64
 msgid "C Stick"
 msgstr "C 스틱"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:77
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:64
 msgid "C-Stick"
 msgstr "C-스틱"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:764
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:763
 msgid "CP reg"
 msgstr "CP 레지"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:567
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547
 msgid "CPU Emulator Engine"
 msgstr "CPU 에뮬레이터 엔진"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:490
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500
 msgid "Cache Display Lists"
 msgstr "화면표시 목록 캐쉬"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88
 msgid ""
 "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n"
 "Decreases emulation speed by some percent (depending on your GPU).\n"
@@ -942,23 +964,38 @@ msgstr ""
 "\n"
 "모르겠으면, 언체크 상태로 두세요."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1858
+#, c-format
+msgid "Can't 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:1872
+#, c-format
+msgid "Can't find WiiMote by connection handle %02x"
+msgstr "%02x 연결핸들에 의해 위모트를 찾을 수 없음"
+
+#: Source/Core/Core/Src/HW/DVDInterface.cpp:669
+#: Source/Core/Core/Src/HW/DVDInterface.cpp:679
+msgid "Can't read from DVD_Plugin - DVD-Interface: Fatal Error"
+msgstr "DVD_플러그인 - DVD-인터페이스에서 읽을 수 없음: 치명적 에러"
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:124
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:28
 msgid "Cancel"
 msgstr "취소"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:91
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:178
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:240
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:84
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:171
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:233
 #, c-format
 msgid "Cannot open %s"
 msgstr "%s를 열수 없음"
 
-#: Source/Core/Core/Src/CoreTiming.cpp:141
+#: Source/Core/Core/Src/CoreTiming.cpp:128
 msgid "Cannot unregister events with events pending"
 msgstr "이벤트들 미해결을 지닌 이벤트들을 등록하지 않을 수 없음"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1078
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1061
 #, c-format
 msgid ""
 "Cannot use that file as a memory card.\n"
@@ -969,7 +1006,7 @@ msgstr ""
 "%s\n"
 "는 유효한 게임큐브 메모리 카드 파일이 아닙니다"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1108
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1091
 msgid ""
 "Cannot use that file as a memory card.\n"
 "Are you trying to use the same file in both slots?"
@@ -977,30 +1014,15 @@ msgstr ""
 "그 파일을 메모리 카드로 사용할 수 없음.\n"
 "둘다의 슬롯들에 같은 파일을 사용하려 합니까?"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1867
-#, 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:1881
-#, c-format
-msgid "Cant find WiiMote by connection handle %02x"
-msgstr "%02x 연결핸들에 의해 위모트를 찾을 수 없음."
-
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:679
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:689
-msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error"
-msgstr "DVD_플러그인에서 읽을 수 없음 - DVD-인터페이스: 치명적 에러"
-
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:52
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:39
 msgid "Caps Lock"
 msgstr "Caps Lock"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288
 msgid "Catalan"
 msgstr "카탈로니아어"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:311
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:298
 msgid "Center"
 msgstr "중앙"
 
@@ -1008,12 +1030,12 @@ msgstr "중앙"
 msgid "Change"
 msgstr "변경"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:316
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:322
 msgid "Change &Disc..."
 msgstr "디스크 변경(&D)..."
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:179
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:179
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:167
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:167
 msgid "Change Disc"
 msgstr "디스크 변경"
 
@@ -1021,7 +1043,7 @@ msgstr "디스크 변경"
 msgid "Change Game"
 msgstr "게임 변경"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:515
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495
 msgid ""
 "Change the language of the user interface.\n"
 "Requires restart."
@@ -1029,102 +1051,102 @@ msgstr ""
 "유저 인터페이스의 언어를 변경.\n"
 "재시작이 요구됨."
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:60
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:47
 msgid "Changes sign to zFar Parameter (after correction)"
 msgstr "표시를 z원거리 파라미터로 변경 (정정 후에)"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:55
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:42
 msgid "Changes sign to zNear Parameter (after correction)"
 msgstr "표시를 z근거리 파라미터로 변경 (정정 후에)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:519
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499
 msgid "Changing this will have no effect while the emulator is running!"
 msgstr "에뮬레이터가 작동하고 있는 동안에 이 변경은 효과가 없을 겁니다!"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:295
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:298
 msgid "Chat"
 msgstr "채팅"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:47
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:34
 msgid "Cheat Code"
 msgstr "치트 코드"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:118
 msgid "Cheat Search"
 msgstr "치트 찾기"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:38
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:25
 msgid "Cheats Manager"
 msgstr "치트들 관리자"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:633
 msgid "Check Partition Integrity"
 msgstr "파티션 완전성 체크"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:864
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:880
 msgid "Checking integrity..."
 msgstr "파티션 완전성 체크중..."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289
 msgid "Chinese (Simplified)"
 msgstr "중국어 (간소화)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290
 msgid "Chinese (Traditional)"
 msgstr "중국어 (전통)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:818
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:799
 msgid "Choose a DVD root directory:"
 msgstr "DVD 루트 디렉토리 선택:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:822
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803
 msgid "Choose a NAND root directory:"
 msgstr "NAND 루트 디렉토리 선택:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:815
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:796
 msgid "Choose a default ISO:"
 msgstr "디폴트 ISO 선택:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1236
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1219
 msgid "Choose a directory to add"
 msgstr "추가할 디렉토리 선택"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1065
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1048
 msgid "Choose a file to open"
 msgstr "열려는 파일 선택"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:217
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:204
 msgid "Choose a memory card:"
 msgstr "메모리 카드 선택:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:819
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800
 msgid ""
 "Choose file to use as apploader: (applies to discs constructed from "
 "directories only)"
 msgstr ""
 "앱로더로 사용할 파일을 선택: (디렉토리들로만 구성된 디스크들에게만 적용됨)"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:767
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:806
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:781
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:822
 msgid "Choose the folder to extract to"
 msgstr "압축해제할 폴더를 선택"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:297
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:284
 msgid "Circle Stick"
 msgstr "서클 스틱"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:52
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:56
 msgid "Classic"
 msgstr "클래식"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:144
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:43
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:487
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:913
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:137
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:30
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:474
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:904
 msgid "Clear"
 msgstr "깨끗이"
 
-#: Source/Core/Core/Src/NetPlayServer.cpp:259
+#: Source/Core/Core/Src/NetPlayServer.cpp:263
 msgid ""
 "Client disconnect while game is running!! NetPlay is disabled. You must "
 "manually stop the game."
@@ -1132,138 +1154,138 @@ msgstr ""
 "게임이 구동되는 중에 클라이언트 연결해제됨!! 넷플레이 불가능. 수동으로 게임"
 "을 중지해야합니다."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:298
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:247
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:552
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:578
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:285
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:234
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:562
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:590
 msgid "Close"
 msgstr "닫기"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:174
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:177
 msgid "Co&nfigure..."
 msgstr "환경설정(&n)..."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:86
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:73
 msgid "Code Info"
 msgstr "코드 정보"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:568
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:556
 msgid "Code: "
 msgstr "코드:"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:35
 msgid "Command"
 msgstr "명령"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:629
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:623
 msgid "Comment"
 msgstr "주석"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489
 msgid "Comment:"
 msgstr "주석:"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:893
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:884
 msgid "Compress ISO..."
 msgstr "ISO 압축..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:905
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:899
 msgid "Compress selected ISOs..."
 msgstr "선택된 ISO들 압축..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1088
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1224
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1089
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1225
 msgid "Compressing ISO"
 msgstr "ISO 압축하기"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:429
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:435
 msgid "Config"
 msgstr " 환경  "
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:37
-#: Source/Core/DolphinWX/Src/InputConfigDiag.h:135
-#: Source/Core/DolphinWX/Src/InputConfigDiag.h:154
+#: Source/Core/DolphinWX/Src/InputConfigDiag.h:122
+#: Source/Core/DolphinWX/Src/InputConfigDiag.h:141
 msgid "Configure"
 msgstr "환경설정"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:111
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:98
 msgid "Configure Control"
 msgstr "컨트롤 설정"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:306
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
 #: Source/Core/DolphinWX/Src/NetWindow.cpp:583
 msgid "Configure Pads"
 msgstr "패드들 설정"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:429
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:435
 msgid "Configure..."
 msgstr "환경설정..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1119
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1147
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1217
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1120
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1218
 msgid "Confirm File Overwrite"
 msgstr "파일 덮어쓰기 확정"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:597
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:577
 msgid "Confirm on Stop"
 msgstr "중지시 확인"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:83
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:105
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:74
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:96
 msgid "Connect"
 msgstr "연결"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:783
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:764
 msgid "Connect USB Keyboard"
 msgstr "USB 키보드 연결"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:362
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:368
 #, c-format
 msgid "Connect Wiimote %i"
 msgstr "위모트 %i 연결"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:195
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183
 msgid "Connect Wiimote 1"
 msgstr "위모트 1 연결"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184
 msgid "Connect Wiimote 2"
 msgstr "위모트 2 연결"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:185
 msgid "Connect Wiimote 3"
 msgstr "위모트 3 연결"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:198
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:186
 msgid "Connect Wiimote 4"
 msgstr "위모트 4 연결"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:627
+#: Source/Core/DolphinWX/Src/Main.cpp:655
 msgid "Connecting..."
 msgstr "연결중..."
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:155
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:156
 msgid "Console"
 msgstr "콘솔"
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:71
 msgid "Continuous Scanning"
-msgstr ""
+msgstr "반복 스캔하기"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:46
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:33
 msgid "Control"
 msgstr "컨트롤"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:189
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:176
 msgid "Convert to GCI"
 msgstr "GCI 로 변환"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:379
+#: Source/Core/Core/Src/CoreParameter.cpp:368
 msgid "Copy failed"
 msgstr "복사 실패했습니다"
 
@@ -1272,21 +1294,21 @@ msgstr "복사 실패했습니다"
 msgid "Copy to Memcard %c"
 msgstr "메모리카드 %c 에 복사"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:359
 msgid "Core"
 msgstr "코어"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:154
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:148
 #, c-format
 msgid "Could not create %s"
 msgstr "%s 를 생성할 수 없었습니다"
 
-#: Source/Core/AudioCommon/Src/AudioCommon.cpp:75
+#: Source/Core/AudioCommon/Src/AudioCommon.cpp:62
 #, c-format
 msgid "Could not initialize backend %s."
 msgstr "백엔드 %s 를 초기화할 수 없었습니다"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:137
+#: Source/Core/Core/Src/CoreParameter.cpp:126
 #, c-format
 msgid ""
 "Could not read \"%s\".  There is no disc in the drive, or it is not a GC/Wii "
@@ -1297,12 +1319,12 @@ msgstr ""
 "백업이 아님. 본래의 게임큐브와 Wii 디스크들은 대부분의 PC DVD 드라이브들에서 "
 "읽어질 수 없음을 아세요."
 
-#: Source/Core/Core/Src/CoreParameter.cpp:292
+#: Source/Core/Core/Src/CoreParameter.cpp:281
 #, c-format
 msgid "Could not recognize ISO file %s"
 msgstr "%s ISO 파일을 인식할 수 없었습니다"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:569
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:579
 #, c-format
 msgid "Could not save %s"
 msgstr "%s 를 저장할 수 없었습니다"
@@ -1315,23 +1337,30 @@ msgstr ""
 "패드들을 설정할 수 없었습니다. 플레이어가 떠났거나 게임이 현재 구동중!\n"
 "(게임이 구동중일 때 패드들을 설정하기는 아직 지원되지 않습니다)"
 
-#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:123
+#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119
 #, c-format
 msgid ""
 "Could not write memory card file %s.\n"
 "\n"
 "Are you running Dolphin from a CD/DVD, or is the save file maybe write "
-"protected?"
+"protected?\n"
+"\n"
+"Are you receiving this after moving the emulator directory?\n"
+"If so, then you may need to re-specify your memory card location in the "
+"options."
 msgstr ""
 "메모리 카드 파일 %s를 쓸 수 없었습니다.\n"
 "\n"
-"CD/DVD에서 돌핀을 구동하나요, 아니면 저장 파일이 쓰기 보호일지도?"
+"CD/DVD에서 돌핀을 구동하고 있나요, 아니면 저장 파일이 쓰기 보호일지도?\n"
+"\n"
+"에뮬레이터 디렉토리를 이동한 후에 이 메시지를 받고 있나요?\n"
+"그렇다면, 옵션에서 메모리카드 위치를 재지정해야 할겁니다."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1107
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1133
 msgid "Couldn't find open command for extension 'ini'!"
 msgstr "확장자 'ini'에 대한 열린 명령을 발견할 수 없었습니다!"
 
-#: Source/Core/Core/Src/BootManager.cpp:146
+#: Source/Core/Core/Src/BootManager.cpp:137
 msgid ""
 "Couldn't init the core.\n"
 "Check your configuration."
@@ -1339,38 +1368,38 @@ msgstr ""
 "코어를 초기화할 수 없었습니다\n"
 "당신의 환경설정을 체크하세요."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:183
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:507
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:495
 msgid "Count:"
 msgstr "카운트:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:452
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456
 msgid "Country:"
 msgstr "국가:"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:186
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:562
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:173
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:550
 msgid "Create AR Code"
 msgstr "AR 코드 생성"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:543
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:608
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:569
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:641
 msgid "Create new perspective"
 msgstr "새로운 관점 생성"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:17
 msgid "Creator: "
 msgstr "만든이:"
 
-#: Source/Core/Common/Src/MsgHandler.cpp:68
+#: Source/Core/Common/Src/MsgHandler.cpp:54
 msgid "Critical"
 msgstr "치명적"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562
 msgid "Crop"
 msgstr "자르기"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119
 msgid ""
 "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n"
 "\n"
@@ -1380,140 +1409,140 @@ msgstr ""
 "\n"
 "모르겠으면, 이것을 언체크로 두세요."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:48
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:52
 msgid "Crossfade"
 msgstr "크로스페이드"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:597
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:600
 #, c-format
-msgid "Current dir changed from %s to %s after wxFileSelector!"
-msgstr "현재 디렉토리가 %s에서 wxFileSelector뒤에 %s로 변경됨!"
+msgid "Current directory changed from %s to %s after wxFileSelector!"
+msgstr "wxFileSelector후에 현재 디렉토리가 %s에서 %s로 변경됨!"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339
 msgid "Custom Projection Hack"
 msgstr "사용자 지정 프로젝션 핵:"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.h:30
+#: Source/Core/DolphinWX/Src/PHackSettings.h:17
 msgid "Custom Projection Hack Settings"
 msgstr "사용자 지정 프로젝션 핵 설정"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342
 msgid "Customize some Orthographic Projection parameters."
 msgstr "일부 정 투영 파라미터들을 커스터마이즈."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291
 msgid "Czech"
 msgstr "체코"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:698
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:697
 msgid "D"
 msgstr "D"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:89
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
 msgid "D-Pad"
 msgstr "D-패드"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:431
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
 msgid "DSP"
 msgstr "오디오"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:639
 msgid "DSP Emulator Engine"
 msgstr "DSP 에뮬레이터 엔진"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:254
 msgid "DSP HLE emulation (fast)"
 msgstr "DSP HLE 에뮬레이션 (빠름)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:256
 msgid "DSP LLE interpreter (slow)"
 msgstr "DSP LLE 인터프리터 (느림)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660
-msgid "DSP LLE on Thread"
-msgstr "DSP LLE를 쓰레드상에"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:255
 msgid "DSP LLE recompiler"
 msgstr "DSP LLE 리컴파일러"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:431
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:641
+msgid "DSP on Dedicated Thread"
+msgstr "전용 쓰레드상에 DSP"
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
 msgid "DSP settings"
 msgstr "DSP 설정"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:838
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:819
 msgid "DVD Root:"
 msgstr "DVD 루트:"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:239
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:226
 msgid "DVDLowRead - Fatal Error: failed to read from volume"
 msgstr "DVD저수준읽기 - 치명적 에러: 볼륨에서 읽기를 실패했습니다"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:333
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:320
 msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume"
 msgstr "DVD저수준비암호화읽기 - 치명적 에러: 볼륨에서 읽기를 실패했습니다."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:176
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:163
 msgid "Data Size"
 msgstr "데이터 크기"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468
 msgid "Date:"
 msgstr "날짜:"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:528
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:564
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:518
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:557
 msgid "Datel MaxDrive/Pro files(*.sav)"
 msgstr "Datel MaxDrive/Pro 파일들(*.sav)"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:242
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:259
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:267
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:281
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:296
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:229
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:246
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:254
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:268
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:283
 msgid "Dead Zone"
 msgstr "데드 존"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:35
 msgid "Debug"
 msgstr "디버그"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:521
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534
 msgid "Debugging"
 msgstr "디버깅"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:79
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:66
 msgid "Decimal"
 msgstr "10진수의"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:890
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:881
 msgid "Decompress ISO..."
 msgstr "ISO 압축해제..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:906
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:900
 msgid "Decompress selected ISOs..."
 msgstr "선택된 ISO들 압축해제..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1088
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1224
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1089
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1225
 msgid "Decompressing ISO"
 msgstr "ISO 압축해제하기"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:912
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:903
 msgid "Default"
 msgstr "기본"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:835
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:816
 msgid "Default ISO:"
 msgstr "기본 ISO:"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:114
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:107
 msgid "Default font"
 msgstr "기본 폰트"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:32
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:926
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:19
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917
 msgid "Delete"
 msgstr "삭제"
 
@@ -1521,21 +1550,21 @@ msgstr "삭제"
 msgid "Delete Save"
 msgstr "저장 지우기"
 
-#: Source/Core/VideoCommon/Src/AVIDump.cpp:77
+#: Source/Core/VideoCommon/Src/AVIDump.cpp:64
 #, c-format
 msgid "Delete the existing file '%s'?"
 msgstr "기존 '%s'파일을 삭제합니까?"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:671
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:683
 msgid "Description"
 msgstr "설명"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:472
 msgid "Detect"
 msgstr "감지"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:233
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:328
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:220
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:315
 msgid ""
 "Detected attempt to read more data from the DVD than fit inside the out "
 "buffer. Clamp."
@@ -1543,29 +1572,29 @@ msgstr ""
 "출력 버퍼 안에 적합한 것보다 더 많은 데이터 읽기 시도가 감지되었습니다. 고정"
 "(Clamp)."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:127
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:898
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:114
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:889
 msgid "Device"
 msgstr "장비"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:798
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:731
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779
 msgid "Device Settings"
 msgstr "장비 설정"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:45
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:49
 msgid "Dial"
 msgstr "다이얼"
 
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:146
+#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:135
 msgid "Direct3D11"
 msgstr "Direct3D11"
 
-#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:128
+#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:125
 msgid "Direct3D9"
 msgstr "Direct3D9"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:167
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:155
 msgid ""
 "Directory checksum failed\n"
 " and Directory backup checksum failed"
@@ -1573,16 +1602,20 @@ msgstr ""
 "디렉토리 체크섬이 실패했습니다\n"
 " 그리고 디렉토리 백업 체크섬이 실패했습니다"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:433
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:443
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485
 msgid "Disable"
 msgstr "비활성"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:491
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501
+msgid "Disable Destination Alpha"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:409
 msgid "Disable Fog"
 msgstr "안개 끔"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108
 msgid ""
 "Disable any XFB emulation.\n"
 "Speeds up emulation a lot but causes heavy glitches in many games which rely "
@@ -1596,7 +1629,7 @@ msgstr ""
 "\n"
 "모르겠으면, 이것을 체크로 두세요."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95
 msgid ""
 "Disable emulation of EFB copies.\n"
 "These are often used for post-processing or render-to-texture effects, so "
@@ -1610,20 +1643,33 @@ msgstr ""
 "크하면 대단한 속도향상을 가져오지만 그것은 거의 항상 이슈들도 유발합니다.\n"
 "모르겠으면, 이것을 언체크로 두세요."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:543
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101
+#, fuzzy
+msgid ""
+"Disables emulation of a hardware feature called destination alpha, which is "
+"used in many games for various graphical effects.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+"다양한 그래픽 효과들을 위해 많은 게임들에서 사용되는 \"목표 알파 패스\"를 스"
+"킵합니다.\n"
+"\n"
+"모르겠으면, 이것을 언체크로 두세요."
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:553
 msgid "Disc"
 msgstr "디스크"
 
-#: Source/Core/DiscIO/Src/DriveBlob.cpp:107
-#: Source/Core/DiscIO/Src/DriveBlob.cpp:126
+#: Source/Core/DiscIO/Src/DriveBlob.cpp:94
+#: Source/Core/DiscIO/Src/DriveBlob.cpp:113
 msgid "Disc Read Error"
 msgstr "디스크 읽기 에러"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:312
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:320
 msgid "Display"
 msgstr "화면표시"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104
 msgid ""
 "Display the inputs read by the emulator.\n"
 "\n"
@@ -1633,32 +1679,32 @@ msgstr ""
 "\n"
 "모르겠으면, 이것을 언체크로 두세요."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:80
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:67
 msgid "Divide"
 msgstr "나누기"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:987
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:990
 msgid "Do you want to stop the current emulation?"
 msgstr "현재 에뮬레이션을 중단하고 싶습니까?"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:663
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:644
 msgid "Dolby Pro Logic II decoder"
 msgstr "돌비 프로 로직 II 디코더"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:864
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:856
 msgid "Dolphin"
 msgstr "돌핀"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:183
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:188
 #, c-format
 msgid "Dolphin %s Graphics Configuration"
 msgstr "돌핀 %s 그래픽 환경설정"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:292
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:298
 msgid "Dolphin &Web Site"
 msgstr "돌핀 웹 사이트(&W)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.h:37
+#: Source/Core/DolphinWX/Src/ConfigMain.h:24
 msgid "Dolphin Configuration"
 msgstr "돌핀 환경설정"
 
@@ -1666,16 +1712,16 @@ msgstr "돌핀 환경설정"
 msgid "Dolphin Emulated Wiimote Configuration"
 msgstr "돌핀 에뮬된 위모트 환경설정"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:394
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:383
 msgid "Dolphin FIFO"
 msgstr "돌핀 FIFO"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1136
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1153
 msgid "Dolphin GCPad Configuration"
 msgstr "돌핀 GC패드 환경설정"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:679
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1074
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:685
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1089
 msgid "Dolphin TAS Movies (*.dtm)"
 msgstr "돌핀 TAS 동영상 (*.dtm)"
 
@@ -1683,11 +1729,11 @@ msgstr "돌핀 TAS 동영상 (*.dtm)"
 msgid "Dolphin Wiimote Configuration"
 msgstr "돌핀 위모트 환경설정"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:293
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:299
 msgid "Dolphin at &Google Code"
 msgstr "돌핀 구글 코드(&G)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:364
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:351
 msgid ""
 "Dolphin could not find any GC/Wii ISOs.  Doubleclick here to browse for "
 "files..."
@@ -1695,7 +1741,7 @@ msgstr ""
 "돌핀이 어느 GC/Wii ISO도 찾을 수 없었습니다. 파일을 둘러보려면 여기를 더블클"
 "릭하세요..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:368
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:355
 msgid ""
 "Dolphin is currently set to hide all games.  Doubleclick here to show all "
 "games..."
@@ -1703,50 +1749,58 @@ msgstr ""
 "돌핀이 현재 모든 게임들을 숨기게 설정됨. 모든 게임들을 보려면 여기를 더블클"
 "릭..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1159
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1160
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1246
 msgid "Dolphin was unable to complete the requested action."
 msgstr "돌핀이 요청된 액션을 완수할 수 없었습니다."
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:275
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:58
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
+#, fuzzy
+msgid ""
+"Doubles the emulated GPU clock rate. May speed up some games (ON = Fast, OFF "
+"= Compatible)"
+msgstr ""
+"빠른 디스크 엑세스 활성. 일부 게임들에서 요구됨. (켬 = 빠른, 끔 = 호환성)"
+
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:262
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:45
 msgid "Down"
 msgstr "아래"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:54
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:44
 msgid "Download Codes (WiiRD Database)"
 msgstr "코드(WiiRD 데이터베이스) 다운로드"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:297
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:287
 #, c-format
 msgid "Downloaded %lu codes. (added %lu)"
 msgstr "%lu 코드들이 다운로드됨. (추가된 %lu)"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:31
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:35
 msgid "Drums"
 msgstr "드럼"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:105
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
 msgid "Dummy"
 msgstr "더미"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:661
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:642
 msgid "Dump Audio"
 msgstr "오디오 덤프"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:532
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545
 msgid "Dump EFB Target"
 msgstr "EFB 타겟 덤프"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546
 msgid "Dump Frames"
 msgstr "프레임들 덤프"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543
 msgid "Dump Textures"
 msgstr "텍스처들 덤프"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114
 msgid ""
 "Dump all rendered frames to an AVI file in User/Dump/Frames/\n"
 "\n"
@@ -1756,7 +1810,7 @@ msgstr ""
 "\n"
 "모르겠으면, 이것을 언체크로 두세요."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111
 msgid ""
 "Dump decoded game textures to User/Dump/Textures/<game_id>/\n"
 "\n"
@@ -1766,7 +1820,7 @@ msgstr ""
 "\n"
 "모르겠으면, 이것을 언체크로 두세요."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113
 msgid ""
 "Dump the contents of EFB copies to User/Dump/Textures/\n"
 "\n"
@@ -1776,21 +1830,21 @@ msgstr ""
 "\n"
 "모르겠으면, 이것을 언체크로 두세요."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:474
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292
 msgid "Dutch"
 msgstr "네덜란드어"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:112
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:113
 msgid "E&xit"
 msgstr "종료(&x)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:441
 msgid "EFB Copies"
 msgstr "EFB 복사"
 
-#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:223
+#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:210
 #, c-format
 msgid ""
 "ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least "
@@ -1802,52 +1856,52 @@ msgstr ""
 "-- 최근에 돌핀 배포를 업그레이드했다면, 윈도우즈가 새로운 드라이버를 인식하"
 "는 관점에서 재부팅이 필요할 겁니다."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:166
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:160
 msgid "EUROPE"
 msgstr "유럽"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:156
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:143
 msgid "Early Memory Updates"
 msgstr "빠른 메모리 업데이트"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:447
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:453
 msgid "Edit"
 msgstr "편집"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.h:30
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.h:17
 msgid "Edit ActionReplay Code"
 msgstr "액션리플레이 코드 편집"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:285
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:286
 msgid "Edit Config"
 msgstr "환경 편집"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.h:30
+#: Source/Core/DolphinWX/Src/PatchAddEdit.h:17
 msgid "Edit Patch"
 msgstr "패치 편집"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:447
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:453
 msgid "Edit current perspective"
 msgstr "현재 관점 편집"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:403
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:425
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:407
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:429
 msgid "Edit..."
 msgstr "편집..."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:44
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:48
 msgid "Effect"
 msgstr "효과"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:425
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435
 msgid "Embedded Frame Buffer"
 msgstr "내장형 프레임 버퍼"
 
-#: Source/Core/Core/Src/Core.cpp:201
+#: Source/Core/Core/Src/Core.cpp:190
 msgid "Emu Thread already running"
 msgstr "에뮬 쓰레드가 이미 구동중임"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110
 msgid ""
 "Emulate XFBs accurately.\n"
 "Slows down emulation a lot and prohibits high-resolution rendering but is "
@@ -1861,7 +1915,7 @@ msgstr ""
 "\n"
 "모르겠으면, 대신에 \"가상 XFB 에뮬레이션\"을 체크하세요."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109
 msgid ""
 "Emulate XFBs using GPU texture objects.\n"
 "Fixes many games which don't work without XFB emulation while not being as "
@@ -1881,7 +1935,7 @@ msgstr ""
 msgid "Emulated Wiimote"
 msgstr "에뮬된 위모트"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346
 msgid "Emulation State: "
 msgstr "에뮬레이션 상태:"
 
@@ -1889,7 +1943,7 @@ msgstr "에뮬레이션 상태:"
 msgid "Enable"
 msgstr "활성"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91
 msgid ""
 "Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's "
 "supported by your GPU.\n"
@@ -1905,72 +1959,71 @@ msgstr ""
 "\n"
 "모르겠으면, 이것을 언체크로 두세요."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:111
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:98
 msgid "Enable AR Logging"
 msgstr "AR 로깅 활성"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324
 msgid "Enable Block Merging"
 msgstr "블록 합치기 활성"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331
 msgid "Enable Bounding Box Calculation"
 msgstr "바운딩 박스 계산 켜기"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:446
 msgid "Enable Cache"
 msgstr "캐쉬 활성"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:562
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542
 msgid "Enable Cheats"
 msgstr "치트 활성"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310
 msgid "Enable Dual Core"
 msgstr "듀얼 코어 활성"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
 msgid "Enable Dual Core (speedup)"
 msgstr "듀얼 코어 활성 (속도상승)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:550
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:563
 msgid "Enable Hotkeys"
 msgstr "단축키 활성(그래픽 컨트롤)"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311
 msgid "Enable Idle Skipping"
 msgstr "아이들 스킵 활성"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541
 msgid "Enable Idle Skipping (speedup)"
 msgstr "아이들 스킵 활성 (속도상승)"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312
 msgid "Enable MMU"
 msgstr "MMU 활성"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:554
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:567
 msgid "Enable Progressive Scan"
 msgstr "프로그레시브 스캔 활성"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757
 msgid "Enable Screen Saver"
 msgstr "스크린 세이버 활성"
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:75
-#, fuzzy
 msgid "Enable Speaker Data"
-msgstr "페이지 활성"
+msgstr "스피커 데이터를 켭니다"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
 msgid "Enable WideScreen"
 msgstr "와이드스크린 활성"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:516
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529
 msgid "Enable Wireframe"
 msgstr "와이어프레임 활성"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85
 msgid ""
 "Enable anisotropic filtering.\n"
 "Enhances visual quality of textures that are at oblique viewing angles.\n"
@@ -1984,7 +2037,7 @@ msgstr ""
 "\n"
 "모르겠으면, 1x를 선택하세요."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323
 msgid ""
 "Enable fast disc access.  Needed for a few games. (ON = Fast, OFF = "
 "Compatible)"
@@ -1995,7 +2048,7 @@ msgstr ""
 msgid "Enable pages"
 msgstr "페이지 활성"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76
 msgid ""
 "Enable this if you want the whole screen to be used for rendering.\n"
 "If this is disabled, a render window will be created instead.\n"
@@ -2007,7 +2060,7 @@ msgstr ""
 "\n"
 "모르겠으면, 이것을 언체크로 두세요."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80
 msgid ""
 "Enable this if you want to use the main Dolphin window for rendering rather "
 "than a separate render window.\n"
@@ -2019,7 +2072,7 @@ msgstr ""
 "\n"
 "모르겠으면, 이것을 언체크로 두세요."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:335
 msgid ""
 "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for "
 "ANY other game."
@@ -2027,25 +2080,25 @@ msgstr ""
 "The Legend of Zelda: Twilight Princess를 속도를 올리려면 켬. 다른 게임을 위해"
 "서는 끔."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340
 msgid "Enables Custom Projection Hack"
 msgstr "사용자 지정 프로젝션 핵 활성화"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:528
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508
 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:530
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510
 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:532
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:512
 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."
@@ -2053,7 +2106,7 @@ msgstr ""
 "5.1 서라운드를 이용한 돌비 프로 로직 II 에뮬레이션을 켭니다. OpenAL 백엔드 전"
 "용. 작동시키려면 soft_oal.dll 을 OpenAL32.dll 로 이름바꾸기가 필요할 지도."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81
 msgid ""
 "Enables progressive scan if supported by the emulated software.\n"
 "Most games don't care about this.\n"
@@ -2065,13 +2118,13 @@ msgstr ""
 "\n"
 "모르겠으면, 이것을 언체크로 두세요."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313
 msgid ""
 "Enables the Memory Management Unit, needed for some games. (ON = Compatible, "
 "OFF = Fast)"
 msgstr "일부 게임들에 필요한 메모리 관리 유닛 활성. (켬 = 호환성, 끔 = 빠름)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116
 msgid ""
 "Encode frame dumps using the FFV1 codec.\n"
 "\n"
@@ -2081,50 +2134,50 @@ msgstr ""
 "\n"
 "모르겠으면, 이것을 언체크로 두세요."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:40
 msgid "End"
 msgstr "끝"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:469
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:280
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:260
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293
 msgid "English"
 msgstr "영어"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:329
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:407
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:337
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:417
 msgid "Enhancements"
 msgstr "향상"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:607
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:640
 msgid "Enter a name for the new perspective:"
 msgstr "새로운 관점을 위한 이름을 입력하세요:"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:191
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:178
 #, c-format
 msgid "Entry %d/%d"
 msgstr "엔트리 %d/%d"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:85
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:72
 #, c-format
 msgid "Entry 1/%d"
 msgstr "엔트리 1/%d"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:204
 msgid "Equal"
 msgstr "같음"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:45
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:156
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1242
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:32
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:150
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226
 msgid "Error"
 msgstr "에러"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:381
+#: Source/Core/DolphinWX/Src/Main.cpp:409
 msgid "Error loading selected language. Falling back to system default."
 msgstr "선택된 언어 로딩 에러. 시스템 기본으로 돌아갑니다."
 
-#: Source/Core/Common/Src/ChunkFile.h:226
+#: Source/Core/Common/Src/ChunkFile.h:221
 #, c-format
 msgid ""
 "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). "
@@ -2133,7 +2186,7 @@ msgstr ""
 "에러: \"%s\" 뒤에, %d (0x%X)를 발견 %d (0x%X) 세이브 표시 대신에. 상태저장 로"
 "드를 취소합니다..."
 
-#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:342
+#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:329
 #, c-format
 msgid ""
 "Error: Trying to access %s fonts but they are not loaded. Games may not show "
@@ -2142,38 +2195,38 @@ msgstr ""
 "에러: %s 폰트들을 접근 시도함 하지만 그것들은 로드되지 않습니다. 게임들이 올"
 "바르게 폰트들을 보여주지 않을 수 있다, 혹은 깨짐."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:30
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:17
 msgid "Escape"
 msgstr "Escape"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:26
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:30
 msgid "Euphoria"
 msgstr "유포리아"
 
 #: Source/Core/Core/Src/ArmMemTools.cpp:78
-#: Source/Core/Core/Src/x64MemTools.cpp:217
+#: Source/Core/Core/Src/x64MemTools.cpp:206
 #, c-format
 msgid "Exception handler - access below memory space. %08llx%08llx"
 msgstr "예외 핸들러 - 메모리 공간 아래를 접근. %08llx%08llx"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:61
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
 msgid "Execute"
 msgstr "실행"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:459
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:446
 msgid "Export Failed"
 msgstr "내보내기 실패했습니다"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:639
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:649
 msgid "Export File"
 msgstr "파일 내보내기"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:177
 msgid "Export Recording"
 msgstr "(입력) 기록 내보내기"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:345
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:351
 msgid "Export Recording..."
 msgstr "(입력) 기록 내보내기..."
 
@@ -2181,7 +2234,7 @@ msgstr "(입력) 기록 내보내기..."
 msgid "Export Save"
 msgstr "저장 내보내기"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:874
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:865
 msgid "Export Wii save (Experimental)"
 msgstr "Wii 저장 내보내기 (실험적)"
 
@@ -2189,100 +2242,100 @@ msgstr "Wii 저장 내보내기 (실험적)"
 msgid "Export all saves"
 msgstr "모든 저장들을 내보내기"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:80
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:72
 msgid "Export failed, try again?"
 msgstr "내보내기 실패했습니다, 다시 시도?"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:559
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:552
 msgid "Export save as..."
 msgstr "저장을 다른 이름으로 내보내기..."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:297
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:284
 msgid "Extension"
 msgstr "확장"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483
 msgid "External Frame Buffer"
 msgstr "외부 프레임 버퍼"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:61
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:48
 msgid "Extra Parameter"
 msgstr "추가 매개변수"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:62
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:49
 msgid "Extra Parameter useful in ''Metroid: Other M'' only."
 msgstr "추가 매개변수는 ''Metroid: Other M''에서만 유용합니다."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:614
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:624
 msgid "Extract All Files..."
 msgstr "모든 파일들 압축풀기..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:616
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:626
 msgid "Extract Apploader..."
 msgstr "앱로더 압축풀기..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:617
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627
 msgid "Extract DOL..."
 msgstr "DOL 압축풀기..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:610
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:620
 msgid "Extract Directory..."
 msgstr "디렉토리 압축풀기..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:612
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:622
 msgid "Extract File..."
 msgstr "파일 압축 풀기..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:608
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:618
 msgid "Extract Partition..."
 msgstr "파티션 압축풀기..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:724
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:738
 #, c-format
 msgid "Extracting %s"
 msgstr "%s 압축풀기"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:707
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:721
 msgid "Extracting All Files"
 msgstr "모든 파일들 압축풀기"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:707
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:721
 msgid "Extracting Directory"
 msgstr "디렉토리 압축풀기"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:710
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:724
 msgid "Extracting..."
 msgstr "압축풀기..."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:892
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:893
 msgid "FIFO Byte"
 msgstr "FIFO 바이트"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:45
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:32
 msgid "FIFO Player"
 msgstr "FIFO 플레이어"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:169
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:163
 msgid "FRANCE"
 msgstr "프랑스"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472
 msgid "FST Size:"
 msgstr "FST 크기:"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:77
+#: Source/Core/Core/Src/NetPlayClient.cpp:81
 msgid "Failed to Connect!"
 msgstr "연결에 실패했습니다!"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:225
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:228
 msgid "Failed to Listen!!"
 msgstr "듣기에 실패했습니다!!"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:307
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:300
 msgid "Failed to download codes."
 msgstr "코드들 다운로드에 실패했습니다."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:827
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:843
 #, c-format
 msgid "Failed to extract to %s!"
 msgstr "%s로 압축풀기 실패했습니다!"
@@ -2308,26 +2361,30 @@ msgstr ""
 "롬 덤프들을 요구하지 않는 DSP HLE 엔진을 사용할 수도 있습니다.\n"
 "(환경설정의 \"오디오\" 탭에서 그것을 선택하세요.)"
 
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:116
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:139
+#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:108
+#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:131
 msgid "Failed to load bthprops.cpl"
 msgstr "bthprops.cpl 로드에 실패했습니다."
 
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:100
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:109
+#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:90
+#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:101
 msgid "Failed to load hid.dll"
 msgstr "hid.dll 로드에 실패했습니다"
 
-#: Source/Core/Core/Src/Movie.cpp:792
+#: Source/Core/Core/Src/Movie.cpp:783
 #, c-format
 msgid "Failed to read %s"
 msgstr "%s 읽기에 실패"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:151
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:144
 msgid "Failed to read banner.bin"
 msgstr "banner.bin 읽기에 실패했습니다"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:223
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:178
+msgid "Failed to read bk header"
+msgstr "bk 헤더 읽기에 실패했습니다"
+
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:211
 #, c-format
 msgid ""
 "Failed to read block %d of the save data\n"
@@ -2338,7 +2395,7 @@ msgstr ""
 "메모리카드가 잘렸을 지도\n"
 "파일위치:%llx"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:148
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:136
 msgid ""
 "Failed to read block allocation table backup correctly\n"
 "(0x8000-0x9FFF)"
@@ -2346,7 +2403,7 @@ msgstr ""
 "블럭 할당 테이블 백업을 올바르게 읽기에 실패했습니다\n"
 "(0x8000-0x9FFF)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:142
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:130
 msgid ""
 "Failed to read block allocation table correctly\n"
 "(0x6000-0x7FFF)"
@@ -2354,12 +2411,17 @@ msgstr ""
 "블럭 할당 테이블을 올바르게 읽기에 실패했습니다\n"
 "(0x6000-0x7FFF)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:286
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:279
 #, c-format
 msgid "Failed to read data from file %d"
 msgstr "%d 파일로 부터 데이터 읽기 실패"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:136
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:367
+#, c-format
+msgid "Failed to read data from file: %s"
+msgstr "파일: %s 에서 데이터 읽기에 실패했습니다"
+
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:124
 msgid ""
 "Failed to read directory backup correctly\n"
 "(0x4000-0x5FFF)"
@@ -2367,7 +2429,7 @@ msgstr ""
 "디렉토리 백업을 올바르게 읽기에 실패했습니다\n"
 "(0x4000-0x5FFF)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:130
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:118
 msgid ""
 "Failed to read directory correctly\n"
 "(0x2000-0x3FFF)"
@@ -2375,7 +2437,11 @@ msgstr ""
 "디렉토리를 올바르게 읽기에 실패했습니다\n"
 "(0x2000-0x3FFF)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:119
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:90
+msgid "Failed to read header"
+msgstr "헤더 읽기에 실패했습니다"
+
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:107
 msgid ""
 "Failed to read header correctly\n"
 "(0x0000-0x1FFF)"
@@ -2383,41 +2449,41 @@ msgstr ""
 "해더를 올바르게 읽기에 실패했습니다\n"
 "(0x0000-0x1FFF)"
 
-#: Source/Core/DiscIO/Src/VolumeGC.cpp:61
+#: Source/Core/DiscIO/Src/VolumeGC.cpp:48
 msgid "Failed to read unique ID from disc image"
 msgstr "디스크 이미지로 부터 유일한 ID를 읽기에 실패했습니다"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:84
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:71
 msgid "Failed to write BT.DINF to SYSCONF"
 msgstr "BT.DINF를 SYSCONF로 쓰기에 실패했습니다"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:228
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:221
 msgid "Failed to write bkhdr"
 msgstr "bkhdr를 쓰기에 실패"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:164
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:157
 #, c-format
 msgid "Failed to write header for %s"
 msgstr "%s 에 대한 헤더 쓰기에 실패"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:258
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:251
 #, c-format
 msgid "Failed to write header for file %d"
 msgstr "%d 파일에 대한 헤더 쓰기에 실패했습니다"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294
 msgid "Farsi"
 msgstr "페르시아어"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477
 msgid "Fast"
 msgstr "빠름"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315
 msgid "Fast version of the MMU.  Does not work for every game."
 msgstr "MMU의 빠른 버전. 모든 게임에 대해 작동하지는 않는다."
 
-#: Source/Core/Core/Src/Movie.cpp:1046
+#: Source/Core/Core/Src/Movie.cpp:1037
 #, c-format
 msgid ""
 "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s"
@@ -2425,23 +2491,23 @@ msgstr ""
 "치명적 비동기. 재생을 중단합니다. (PlayWiimote에서 에러: %u != %u, byte "
 "%u.)%s"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:199
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:202
 msgid "Fifo Player"
 msgstr "FIFO 플레이어"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:99
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:86
 msgid "File Info"
 msgstr "파일 정보"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:304
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:295
 msgid "File contained no codes."
 msgstr "파일이 코드를 지니지 않었습니다."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:413
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:400
 msgid "File converted to .gci"
 msgstr "파일이 .gci 로 변환되었습니다"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:428
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:415
 msgid ""
 "File could not be opened\n"
 "or does not have a valid extension"
@@ -2449,7 +2515,7 @@ msgstr ""
 "파일을 열 수 없었습니다\n"
 "혹은 적합한 확장자가 아닙니다"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:84
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:72
 #, c-format
 msgid ""
 "File has the extension \"%s\"\n"
@@ -2458,36 +2524,36 @@ msgstr ""
 "파일이 확장자 \"%s\"를 가집니다\n"
 "적합한 확장자들은 (.raw/.gcp)"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:425
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:412
 msgid "File is not recognized as a memcard"
 msgstr "파일이 메모리카드로 인식되지 않는다"
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:294
+#: Source/Core/DiscIO/Src/CompressedBlob.cpp:281
 msgid "File not compressed"
 msgstr "파일이 압축되지 않었습니다"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:127
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:109
 #, c-format
 msgid "FileIO: Unknown open mode : 0x%02x"
 msgstr "FileIO: 알려지지 않은 열기 모드: 0x%02x"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:531
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:541
 msgid "Filesystem"
 msgstr "파일시스템"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1100
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1126
 msgid "Filetype 'ini' is unknown! Will not open!"
 msgstr "'ini'파일타입은 알려지지 않음! 열지 않겠습니다!"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:265
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:252
 msgid "Find next"
 msgstr "다음 찾기"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:266
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:253
 msgid "Find previous"
 msgstr "이전 찾기"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:632
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626
 msgid "First Block"
 msgstr "첫번째 블럭"
 
@@ -2495,23 +2561,23 @@ msgstr "첫번째 블럭"
 msgid "Fix Checksums"
 msgstr "체크섬들 고침"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:275
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283
 msgid "Force 16:9"
 msgstr "강제 16:9"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:275
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283
 msgid "Force 4:3"
 msgstr "강제 4:3"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:568
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548
 msgid "Force Console as NTSC-J"
 msgstr "콘솔을 NTSC-J로 강제시킴"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406
 msgid "Force Texture Filtering"
 msgstr "강제 텍스처 필터링"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90
 msgid ""
 "Force texture filtering even if the emulated game explicitly disabled it.\n"
 "Improves texture quality slightly but causes glitches in some games.\n"
@@ -2523,7 +2589,7 @@ msgstr ""
 "\n"
 "모르겠으면, 이것을 언체크로 두세요."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83
 msgid ""
 "Force the game to output graphics for widescreen resolutions.\n"
 "Causes graphical glitches is some games.\n"
@@ -2535,7 +2601,7 @@ msgstr ""
 "\n"
 "모르겠으면, 이것을 언체크로 두세요."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488
 msgid ""
 "Forces NTSC-J mode for using the Japanese ROM font.\n"
 "Left unchecked, dolphin defaults to NTSC-U and automatically enables this "
@@ -2545,7 +2611,7 @@ msgstr ""
 "언체크로 두면, 돌핀 기본은 NTSC-U 이고 일본 게임들을 플레이할 때 자동적으로 "
 "이 세팅이 활성화됩니다."
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:74
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:62
 msgid ""
 "Format as ascii (NTSC\\PAL)?\n"
 "Choose no for sjis (NTSC-J)"
@@ -2553,148 +2619,147 @@ msgstr ""
 "ascii (NTSC\\PAL)로 포멧?\n"
 "sjis (NTSC-J)에 대해서 선택하지 마세요"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:278
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:265
 msgid "Forward"
 msgstr "앞으로"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504
 #, c-format
 msgid "Found %d results for '"
 msgstr "%d 개 찾았습니다 '"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:857
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:925
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:858
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:926
 msgid "Frame"
 msgstr "프레임"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:867
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:868
 msgid "Frame "
 msgstr "프레임"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:185
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:173
 msgid "Frame Advance"
 msgstr "프레임 진행"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:536
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549
 msgid "Frame Dumps use FFV1"
 msgstr "프레임 덤프가 FFV1를 사용"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:227
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:214
 msgid "Frame Info"
 msgstr "프레임 정보"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:116
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:103
 msgid "Frame Range"
 msgstr "프레임 범위"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:138
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:139
 msgid "Frame S&kipping"
 msgstr "프레임 스킵(&k)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:572
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552
 msgid "Framelimit:"
 msgstr "프레임제한:"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:204
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:191
 msgid "Frames To Record"
 msgstr "녹화할 프레임"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547
 msgid "Free Look"
 msgstr "자유로운 보기"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
 msgid "French"
 msgstr "프랑스어"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:38
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:42
 msgid "Frets"
 msgstr "프렛들"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:118
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:137
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:105
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:124
 msgid "From"
 msgstr "From"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:426
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:432
 msgid "FullScr"
 msgstr "전체화면"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:256
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263
 msgid "Fullscreen resolution:"
 msgstr "전체화면 해상도:"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:534
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524
 msgid "GCI File(*.gci)"
 msgstr "GCI 파일(*.gci)"
 
-#: Source/Core/DolphinWX/Src/GCMicDlg.h:44
+#: Source/Core/DolphinWX/Src/GCMicDlg.h:31
 msgid "GCMic Configuration"
 msgstr "GCMic 환경설정"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:432
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
 msgid "GCPad"
 msgstr "GC패드"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:659
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:658
 msgid "GX_CMD_INVL_VC"
 msgstr "GX_CMD_INVL_VC"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:448
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:452
 msgid "Game ID:"
 msgstr "게임 ID:"
 
-#: Source/Core/Core/Src/NetPlay.cpp:229
+#: Source/Core/Core/Src/NetPlay.cpp:216
 msgid "Game is already running!"
 msgstr "게임이 이미 구동중입니다!"
 
-#: Source/Core/Core/Src/NetPlay.cpp:259
+#: Source/Core/Core/Src/NetPlay.cpp:246
 msgid "Game isn't running!"
 msgstr "게임이 구동중이지 않습니다!"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:389
-#, fuzzy
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:393
 msgid "Game not found!"
-msgstr "게임이 찾을 수 없습니다!!"
+msgstr "게임이 없습니다!"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:385
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:389
 msgid "Game-Specific Settings"
 msgstr "게임-상세 설정"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:293
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:294
 msgid "GameConfig"
 msgstr "게임환경"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:525
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:515
 msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)"
 msgstr "게임큐브 게임저장 파일(*.gci;*.gcs;*.sav)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534
 msgid "Gamecube"
 msgstr "게임큐브"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:178
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:181
 msgid "Gamecube &Pad Settings"
 msgstr "게임큐브 패드 설정(&P)"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:218
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1069
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:205
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1052
 msgid "Gamecube Memory Cards (*.raw,*.gcp)"
 msgstr "게임큐브 메모리 카드들 (*.raw,*.gcp)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:432
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
 msgid "Gamecube Pad settings"
 msgstr "게임큐브 패드 설정"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:117
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302
 msgid "Gecko Codes"
 msgstr "Gecko 코드"
 
-#: Source/Core/Core/Src/GeckoCode.cpp:222
+#: Source/Core/Core/Src/GeckoCode.cpp:214
 #, c-format
 msgid ""
 "GeckoCode failed to run (CT%i CST%i) (%s)\n"
@@ -2706,10 +2771,10 @@ msgstr ""
 "(잘못된 코드이거나 코드 타입이 아직 지원되지 않습니다. codehandler.bin 파일"
 "을  Sys 폴더에 위치시키고 돌핀을 재시작해서 원본 코드 핸들러를 사용해보세요.)"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:172
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:197
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:160
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:160
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:202
 msgid "General"
 msgstr "일반"
 
@@ -2717,30 +2782,30 @@ msgstr "일반"
 msgid "General Settings"
 msgstr "일반 설정"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:470
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:281
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:316
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:261
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
 msgid "German"
 msgstr "독일어"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:449
+#: Source/Core/Core/Src/ActionReplay.cpp:439
 #, c-format
 msgid "GetARCode: Index is greater than ar code list size %lu"
 msgstr "GetARCode: 인덱스가 ar 코드 리스트 크기 %lu 보다 더 큽니다 "
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:430
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:436
 msgid "Graphics"
 msgstr "그래픽"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:430
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:436
 msgid "Graphics settings"
 msgstr "그래픽 설정"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:205
 msgid "Greater Than"
 msgstr "보다 큰"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87
 msgid ""
 "Greatly increases quality of textures generated using render to texture "
 "effects.\n"
@@ -2757,51 +2822,75 @@ msgstr ""
 "\n"
 "모르겠으면, 이것을 체크로 두세요."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:317
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
 msgid "Greek"
 msgstr "그리스어"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:22
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Green"
 msgstr "초록"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:24
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Green Left"
 msgstr "초록 왼쪽"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:25
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Green Right"
 msgstr "초록 오른쪽"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:35
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:39
 msgid "Guitar"
 msgstr "기타"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1259
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1250
 msgid "HCI_CMD_INQUIRY is called, please report!"
 msgstr "HCI_CMD_INQUIRY가 호출됨, 보고해주세요!"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:421
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504
+msgid "Hacked Buffer Upload"
+msgstr "핵 버퍼 업로드"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431
 msgid "Hacks"
 msgstr "핵"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:158
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:146
 msgid "Header checksum failed"
 msgstr "헤더 체크섬 실패했습니다"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:318
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298
 msgid "Hebrew"
 msgstr "히브리어"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:313
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:300
 msgid "Height"
 msgstr "높이"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:64
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:51
 msgid "Help"
 msgstr "도움"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:209
+#: Source/Core/DolphinWX/Src/Main.cpp:229
+msgid ""
+"Hi,\n"
+"\n"
+"Dolphin requires Mac OS X 10.7 or greater.\n"
+"Unfortunately you're running an old version of OS X.\n"
+"The last Dolphin version to support OS X 10.6 is Dolphin 3.5\n"
+"Please upgrade to 10.7 or greater to use the newest Dolphin version.\n"
+"\n"
+"Sayonara!\n"
+msgstr ""
+"하이,\n"
+"\n"
+"돌핀은 맥 OS X 10.7나 이상이 필요합니다.\n"
+"불행하게도 당신은 OS X의 옛 버전을 구동하고 계십니다.\n"
+"OS X 10.6을 지원하는 최종 돌핀 버전은 돌핀3.5 입니다\n"
+"최신 돌핀 버전을 사용하시려면 10.7이나 이상으로 업그레이드해주세요.\n"
+"\n"
+"사요나라!\n"
+
+#: Source/Core/DolphinWX/Src/Main.cpp:220
 msgid ""
 "Hi,\n"
 "\n"
@@ -2818,15 +2907,15 @@ msgstr ""
 "\n"
 "사요나라!\n"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:309
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:296
 msgid "Hide"
 msgstr "숨김"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:307
 msgid "Hide Mouse Cursor"
 msgstr "마우스 커서 숨김"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79
 msgid ""
 "Hides the mouse cursor if it's on top of the emulation window.\n"
 "\n"
@@ -2836,26 +2925,26 @@ msgstr ""
 "\n"
 "모르겠으면, 이것을 체크로 두세요."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:54
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41
 msgid "Home"
 msgstr "홈"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:85
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:138
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:76
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:141
 msgid "Host"
 msgstr "호스트"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.h:44
+#: Source/Core/DolphinWX/Src/HotkeyDlg.h:31
 msgid "Hotkey Configuration"
 msgstr "단축키 설정"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:272
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:272
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:594
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:260
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:260
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574
 msgid "Hotkeys"
 msgstr "단축키들"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:319
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299
 msgid "Hungarian"
 msgstr "헝가리어"
 
@@ -2863,35 +2952,35 @@ msgstr "헝가리어"
 msgid "Hybrid Wiimote"
 msgstr "하이브리드 위모트"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:532
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:519
 #, 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:786
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:773
 #, c-format
 msgid ""
-"IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available "
-"in your nand dump\n"
+"IOCTL_ES_LAUNCH: Game tried to reload an IOS or a title that is not "
+"available in your NAND dump\n"
 "TitleID %016llx.\n"
-" Dolphin will likely hang now"
+" Dolphin will likely hang now."
 msgstr ""
-"IOCTL_ES_LAUNCH: 게임이 ios를 리로드 하려고 했거나 당신의 낸드 덤프에 적합하"
-"지 않은 것이 조금 있음\n"
+"IOCTL_ES_LAUNCH: 게임이 IOS나 낸드 덤프에 적합하지 않은 타이틀을  리로드 시도"
+"했습니다\n"
 "TitleID %016llx.\n"
-" 돌핀은 이제 멈추려할 것이다"
+"돌핀은 이제 멈추려할 것입니다."
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:313
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:300
 msgid "IOCTL_ES_READCONTENT - bad destination"
 msgstr "IOCTL_ES_READCONTENT - 잘못된 대상"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729
 msgid "IPL Settings"
 msgstr "IPL 설정"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269
 msgid "IR"
 msgstr "IR"
 
@@ -2903,23 +2992,23 @@ msgstr "IR 포인터"
 msgid "IR Sensitivity:"
 msgstr "IR 감도:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:502
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:512
 msgid "ISO Details"
 msgstr "ISO 세부사항"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:830
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:811
 msgid "ISO Directories"
 msgstr "ISO 디렉토리들"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:172
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:166
 msgid "ITALY"
 msgstr "이탈리아"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:630
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:624
 msgid "Icon"
 msgstr "아이콘"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332
 msgid ""
 "If checked, the bounding box registers will be updated. Used by the Paper "
 "Mario games."
@@ -2927,28 +3016,11 @@ msgstr ""
 "체크하면, 바운딩 박스 레지스터들이 업데이트될 것입니다. Paper Mario 게임들에"
 "서 사용됩니다."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318
-msgid ""
-"If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)"
-msgstr ""
-"FPS가 불규칙적이면, 이 옵션이 도움이 될 수도 있습니다. (켬 = 호환성, 끔 = 빠"
-"름)"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505
-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를 "
-"이용해 오디오 병목을 사용하세요 (게임에 따라서는 소리 끊김들을 고칠지 모르지"
-"만 또한 지속적인 잡음을 유발할 수도 있습니다)."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:428
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438
 msgid "Ignore Format Changes"
 msgstr "포멧 변경들을 무시"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94
 msgid ""
 "Ignore any changes to the EFB format.\n"
 "Improves performance in many games without any negative effect. Causes "
@@ -2962,7 +3034,7 @@ msgstr ""
 "\n"
 "모르겠으면, 이것을 체크로 두세요."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93
 msgid ""
 "Ignore any requests of the CPU to read from or write to the EFB.\n"
 "Improves performance in some games, but might disable some gameplay-related "
@@ -2980,11 +3052,11 @@ msgstr ""
 msgid "Import Save"
 msgstr "저장을 가져오기"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:59
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:48
 msgid "Import failed, try again?"
 msgstr "가져오기 실패했습니다, 재시도?"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:454
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:441
 msgid ""
 "Imported file has gsc extension\n"
 "but does not have a correct header"
@@ -2992,11 +3064,11 @@ msgstr ""
 "가져온 파일은 gsc 확장자를 가진다\n"
 "하지만 올바른 헤더를 가지고 있지 않습니다"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:442
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:429
 msgid "Imported file has invalid length"
 msgstr "가져온 파일이 비적합 길이를 가지고 있습니다"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:451
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:438
 msgid ""
 "Imported file has sav extension\n"
 "but does not have a correct header"
@@ -3004,18 +3076,7 @@ msgstr ""
 "가져온 파일이 sav 확장자를 지닌다\n"
 "하지만 올바른 해더를 지니지 않는다"
 
-#: 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 ""
-"성능이 향상되지만 올바른 안개 에뮬레이션에 의존한 대부분의 게임에서 결함을 유"
-"발합니다.\n"
-"모르겠으면, 이것을 언체크로 두세요."
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350
 msgid "In Game"
 msgstr "게임안"
 
@@ -3023,67 +3084,67 @@ msgstr "게임안"
 msgid "In-Game"
 msgstr "게임-안"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:34
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305
 msgid "Info"
 msgstr "정보"
 
-#: Source/Core/Common/Src/MsgHandler.cpp:65
+#: Source/Core/Common/Src/MsgHandler.cpp:51
 msgid "Information"
 msgstr "정보"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:481
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:468
 msgid "Input"
 msgstr "입력"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:63
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:50
 msgid "Insert"
 msgstr "삽입"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:176
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:166
 msgid "Insert Encrypted or Decrypted code here..."
 msgstr "암호화되거나 암호해독된 코드를 여기에 삽입하세요..."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:763
 msgid "Insert SD Card"
 msgstr "SD 카드 삽입"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:34
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:21
 msgid "Insert name here.."
 msgstr "이름을 여기에 넣으시오..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:196
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:199
 msgid "Install WAD"
 msgstr "WAD 설치"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:895
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:888
 msgid "Install to Wii Menu"
 msgstr "Wii 메뉴에 설치"
 
-#: Source/Core/Core/Src/x64MemTools.cpp:252
+#: Source/Core/Core/Src/x64MemTools.cpp:242
 msgid ""
 "InstallExceptionHandler called, but this platform does not yet support it."
 msgstr ""
 "InstallExceptionHandler 호출됨, 하지만 이 플랫폼은 아직 그것을 지원하지 않습"
 "니다."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1297
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
 msgid "Installing WAD..."
 msgstr "WAD 설치하기..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:885
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:901
 msgid "Integrity Check Error"
 msgstr "완전성 체크 에러"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:891
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:907
 msgid "Integrity check completed"
 msgstr "완전성 체크 완료됨"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:890
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:906
 msgid "Integrity check completed. No errors have been found."
 msgstr "완전성 체크가 완료되었습니다. 에러가 발견되지 않었습니다."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:882
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:898
 #, c-format
 msgid ""
 "Integrity check for partition %d failed. Your dump is most likely corrupted "
@@ -3092,19 +3153,19 @@ msgstr ""
 "파티션 %d 에 대한 완전성 체크가 실패하였습니다. 당신의 덤프가 오염되었거나 잘"
 "못 패치된 것 같습니다."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532
 msgid "Interface"
 msgstr "인터페이스"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:646
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627
 msgid "Interface Settings"
 msgstr "인터페이스 설정"
 
-#: Source/Core/Core/Src/State.cpp:240
+#: Source/Core/Core/Src/State.cpp:228
 msgid "Internal LZO Error - compression failed"
 msgstr "내부 LZO 에러 - 압축 실패했습니다"
 
-#: Source/Core/Core/Src/State.cpp:348
+#: Source/Core/Core/Src/State.cpp:336
 #, c-format
 msgid ""
 "Internal LZO Error - decompression failed (%d) (%li, %li) \n"
@@ -3113,41 +3174,45 @@ msgstr ""
 "내부 LZO 에러 - 압축해제 실패했습니다 (%d) (%li, %li) \n"
 "상태 로딩을 다시 해보세요"
 
-#: Source/Core/Core/Src/State.cpp:485
+#: Source/Core/Core/Src/State.cpp:473
 msgid "Internal LZO Error - lzo_init() failed"
 msgstr "내부 LZO 에러 -  lzo_init() 실패했습니다"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:344
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:352
 msgid "Internal Resolution:"
 msgstr "내부 해상도:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:42
+msgid "Interpreter (VERY slow)"
+msgstr "인터프리터 (매우 느림)"
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349
 msgid "Intro"
 msgstr "소개화면"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:194
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:187
 #, c-format
 msgid "Invalid Size(%x) or Magic word (%x)"
 msgstr "비적합 크기(%x) 혹은 마법 낱말 (%x)"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:612
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:600
 msgid "Invalid Value!"
 msgstr "비적합 값!"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:462
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:449
 msgid "Invalid bat.map or dir entry"
 msgstr "비적합 bat.map 혹은 디렉토리 엔트리"
 
-#: Source/Core/Core/Src/CoreTiming.cpp:548
+#: Source/Core/Core/Src/CoreTiming.cpp:553
 #, c-format
 msgid "Invalid event type %i"
 msgstr "비적합 이벤트 타입 %i"
 
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:326
+#: Source/Core/Core/Src/HW/DVDInterface.cpp:309
 msgid "Invalid file"
 msgstr "비적합 파일"
 
-#: Source/Core/DiscIO/Src/BannerLoaderGC.cpp:41
+#: Source/Core/DiscIO/Src/BannerLoaderGC.cpp:28
 #, c-format
 msgid ""
 "Invalid opening.bnr found in gcm:\n"
@@ -3158,46 +3223,54 @@ msgstr ""
 "%s\n"
 " 당신은 이 게임을 리덤프해야할 지도."
 
-#: Source/Core/Core/Src/Movie.cpp:735
+#: Source/Core/Core/Src/Movie.cpp:726
 msgid "Invalid recording file"
 msgstr "비적합 기록 파일"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:473
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:472
 msgid "Invalid search parameters (no object selected)"
 msgstr "비적합 찾기 파라미터 (선택된 오브젝트 없음)"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:456
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:455
 msgid "Invalid search string (couldn't convert to number)"
 msgstr "비적합 찾기 스트링 (숫자로 변환될 수 없었습니다)"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:444
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:443
 msgid "Invalid search string (only even string lengths supported)"
 msgstr "비적합 찾기 스트링 (짝수 길이 스트링만 지원됩니다)"
 
-#: Source/Core/Core/Src/Core.cpp:513
+#: Source/Core/Core/Src/Core.cpp:511
 msgid "Invalid state"
 msgstr "비적합 상태"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:473
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:320
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300
 msgid "Italian"
 msgstr "이탈리아어"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:183
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:177
 msgid "JAPAN"
 msgstr "일본"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:321
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:46
+msgid "JIT Recompiler (recommended)"
+msgstr "JIT 리컴파일러 (권장)"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:47
+msgid "JITIL experimental recompiler"
+msgstr "JITIL 실험적 리컴파일러"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:279
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
 msgid "Japanese"
 msgstr "일본어"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:188
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:182
 msgid "KOREA"
 msgstr "한국"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78
 msgid ""
 "Keep the game window on top of all other windows.\n"
 "\n"
@@ -3207,62 +3280,62 @@ msgstr ""
 "\n"
 "모르겠으면, 이것을 언체크로 두세요."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:298
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:306
 msgid "Keep window on top"
 msgstr "윈도우를 맨위로 유지"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:241
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:241
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:229
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:229
 msgid "Key"
 msgstr "        [ 키 ]"
 
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282
 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:322
 msgid "Korean"
 msgstr "한국어"
 
 #. i18n:  Left
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:57
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:44
 msgid "L"
 msgstr "L"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:39
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:26
 msgid "L Button"
 msgstr "L 버튼"
 
 #. i18n:  Left-Analog
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:61
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:48
 msgid "L-Analog"
 msgstr "L-아날로그"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:585
 msgid "Language:"
 msgstr "언어:"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:152
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:153
 msgid "Last Overwritten State"
 msgstr "마지막 덮어써진 상태"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:159
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:161
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:160
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:162
 msgid "Last Saved State"
 msgstr "마지막 저장된 상태"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:696
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:677
 msgid "Latency:"
 msgstr "지연:"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:276
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:55
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:263
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:42
 msgid "Left"
 msgstr "왼쪽"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:60
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:64
 msgid "Left Stick"
 msgstr "왼쪽 스틱"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:257
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:257
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:245
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:245
 msgid ""
 "Left click to detect hotkeys.\n"
 "Enter space to clear."
@@ -3270,7 +3343,7 @@ msgstr ""
 "단축키를 감지하려면 좌 클릭하세요.\n"
 "지우려면 스페이스를 입력하세요."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:689
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:678
 msgid ""
 "Left-click to detect input.\n"
 "Middle-click to clear.\n"
@@ -3280,7 +3353,7 @@ msgstr ""
 "중-클릭 지우기.\n"
 "우-클릭 더 많은 옵션들."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:694
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:683
 msgid ""
 "Left/Right-click for more options.\n"
 "Middle-click to clear."
@@ -3288,76 +3361,76 @@ msgstr ""
 "좌/우-클릭 옵션들 더.\n"
 "중-클릭 지우기."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:219
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:206
 msgid "Less Than"
 msgstr "보다 더 적은"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:565
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545
 msgid "Limit by FPS"
 msgstr "FPS로 제한"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:924
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:915
 msgid "Load"
 msgstr "로드"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544
 msgid "Load Custom Textures"
 msgstr "커스텀 텍스처 로드"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
 msgid "Load State Slot 1"
 msgstr "슬롯1 상태 로드"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189
 msgid "Load State Slot 2"
 msgstr "슬롯2 상태 로드"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:190
 msgid "Load State Slot 3"
 msgstr "슬롯3 상태 로드"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:203
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:191
 msgid "Load State Slot 4"
 msgstr "슬롯4 상태 로드"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192
 msgid "Load State Slot 5"
 msgstr "슬롯5 상태 로드"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193
 msgid "Load State Slot 6"
 msgstr "슬롯6 상태 로드"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:194
 msgid "Load State Slot 7"
 msgstr "슬롯7 상태 로드"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:195
 msgid "Load State Slot 8"
 msgstr "슬롯8 상태 로드"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:155
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:156
 msgid "Load State..."
 msgstr "상태 로드..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1332
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1359
 msgid "Load Wii System Menu"
 msgstr "Wii 시스템 메뉴 로드"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1327
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1354
 #, c-format
 msgid "Load Wii System Menu %d%c"
 msgstr "Wii 시스템 메뉴 %d %c 로드"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112
 msgid ""
 "Load custom textures from User/Load/Textures/<game_id>/\n"
 "\n"
@@ -3367,7 +3440,7 @@ msgstr ""
 "\n"
 "모르겠으면, 이것을 언체크로 두세요."
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:50
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:37
 msgid "Load preset values from hack patterns available."
 msgstr "핵 패턴들로 부터 사용 가능한 사전설정 값을 로드합니다."
 
@@ -3375,23 +3448,23 @@ msgstr "핵 패턴들로 부터 사용 가능한 사전설정 값을 로드합
 msgid "Local"
 msgstr "지역"
 
-#: Source/Core/DolphinWX/Src/LogWindow.h:51
+#: Source/Core/DolphinWX/Src/LogWindow.h:38
 msgid "Log"
 msgstr "로그"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:26
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:13
 msgid "Log Configuration"
 msgstr "로그 환경설정"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:296
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304
 msgid "Log FPS to file"
 msgstr "FPS를 파일에 기록"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:96
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83
 msgid "Log Types"
 msgstr "로그 타입"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103
 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"
@@ -3403,24 +3476,24 @@ msgstr ""
 "\n"
 "모르겠으면, 이것을 언체크로 두세요."
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:81
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:68
 msgid "Logger Outputs"
 msgstr "로거 출력"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132
-#: Source/Core/DolphinWX/Src/Frame.cpp:328
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:119
+#: Source/Core/DolphinWX/Src/Frame.cpp:314
 msgid "Logging"
 msgstr "로깅"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:255
+#: Source/Core/Core/Src/NetPlayClient.cpp:259
 msgid "Lost connection to server!"
 msgstr "서버에 연결을 잃어버림!"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:42
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:29
 msgid "M Button"
 msgstr "M 버튼"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:119
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:112
 #, c-format
 msgid ""
 "MD5 mismatch\n"
@@ -3429,51 +3502,66 @@ msgstr ""
 "MD5 미스매치\n"
 " %016llx%016llx != %016llx%016llx"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314
 msgid "MMU Speed Hack"
 msgstr "MMU 스피드 핵"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:527
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:563
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:517
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:556
 msgid "MadCatz Gameshark files(*.gcs)"
 msgstr "MadCatz 게임샤크 파일들(*.gcs)"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:51
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:63
+#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:38
 msgid "Main Stick"
 msgstr "메인 스틱"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460
 msgid "Maker ID:"
 msgstr "제작사 ID:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487
 msgid "Maker:"
 msgstr "제작사:"
 
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100
+msgid ""
+"Makes distant objects more visible by removing fog, thus increasing the "
+"overall detail.\n"
+"Disabling fog will break some games which rely on proper fog emulation.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+"안개를 제거해서 멀리 있는 물체들을 더 잘보이게 만듭니다, 그리하여 전반적인 디"
+"테일을 향상시킵니다.\n"
+"안개 끄기는 적절한 안개 에뮬레이션과 관련된 일부 게임들을 망가뜨릴 것입니"
+"다.\n"
+"\n"
+"모르겠으면, 이것을 언체크로 두세요."
+
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:97
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:100
 msgid "Max"
 msgstr "최대값"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:448
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:435
 msgid "Memcard already has a save for this title"
 msgstr "메모리카드가 이 타이틀에 대해 저장을 이미 가짐"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:291
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:278
 msgid "Memcard already opened"
 msgstr "메모리카드가 이미 열려짐"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:912
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:913
 msgid "Memory Byte"
 msgstr "메모리 바이트"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:225
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:113
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:212
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:93
 msgid "Memory Card"
 msgstr "메모리 카드"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.h:36
+#: Source/Core/DolphinWX/Src/MemcardManager.h:23
 msgid ""
 "Memory Card Manager WARNING-Make backups before using, should be fixed but "
 "could mangle stuff!"
@@ -3481,7 +3569,7 @@ msgstr ""
 "메모리 카드 메니저 경고-사용하기 전에 백업을 만드세요, 고쳐져야 겠지만 훼손"
 "될 수 있습니다."
 
-#: Source/Core/Core/Src/CoreParameter.cpp:371
+#: Source/Core/Core/Src/CoreParameter.cpp:360
 #, c-format
 msgid ""
 "Memory Card filename in Slot %c is incorrect\n"
@@ -3498,15 +3586,15 @@ msgstr ""
 "%s로\n"
 "오래된 파일을 이 새로운 위치로 복사하고 싶습니까?\n"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:124
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:112
 msgid "Memorycard filesize does not match the header size"
 msgstr "메모리카드 파일크기가 헤더 크기와 불일치합니다"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:50
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:37
 msgid "Menu"
 msgstr "메뉴"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:114
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:94
 msgid "Mic"
 msgstr "마이크"
 
@@ -3515,20 +3603,20 @@ msgstr "마이크"
 msgid "Min"
 msgstr "최소값"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:580
 msgid "Misc"
 msgstr "기타"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:795
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776
 msgid "Misc Settings"
 msgstr "기타 설정"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:240
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:294
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:227
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:281
 msgid "Modifier"
 msgstr "수정자"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106
 msgid ""
 "Modify textures to show the format they're encoded in. Needs an emulation "
 "reset in most cases.\n"
@@ -3540,20 +3628,20 @@ msgstr ""
 "\n"
 "모르겠으면, 이것을 언체크로 두세요."
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:115
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:108
 msgid "Monospaced font"
 msgstr "단일띄어쓰기 폰트"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:305
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:292
 msgid "Motion Plus"
 msgstr "모션 플러스"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:309
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:86
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:296
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73
 msgid "Motor"
 msgstr "모터"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:654
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:666
 msgid ""
 "Move the mouse pointer over an option to display a detailed description.\n"
 "\n"
@@ -3571,224 +3659,235 @@ msgstr ""
 "\n"
 "\n"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:75
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:62
 msgid "Multiply"
 msgstr "곱하기"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:651
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:650
 msgid "NOP"
 msgstr "NOP"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:629
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:628
 msgid "NOTE: Stream size doesn't match actual data length\n"
 msgstr "알림: 스트림 사이즈가 실제 데이터 길이와 매치되지 않습니다\n"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:129
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:116
 msgid "NP Add"
 msgstr "NP 덧셈"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:124
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:111
 msgid "NP Begin"
 msgstr "NP 시작"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:132
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:119
 msgid "NP Decimal"
 msgstr "NP 10진수"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:126
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:113
 msgid "NP Delete"
 msgstr "NP 삭제"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:133
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:120
 msgid "NP Divide"
 msgstr "NP 나누기"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:120
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:107
 msgid "NP Down"
 msgstr "NP 아래"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:123
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:110
 msgid "NP End"
 msgstr "NP 끝"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:111
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:98
 msgid "NP Enter"
 msgstr "NP 엔터"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:127
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:114
 msgid "NP Equal"
 msgstr "NP 같은"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:116
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:103
 msgid "NP Home"
 msgstr "NP 홈"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:125
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:112
 msgid "NP Insert"
 msgstr "NP 삽입"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:117
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:104
 msgid "NP Left"
 msgstr "NP 왼쪽"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:128
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:115
 msgid "NP Multiply"
 msgstr "NP 곱셈"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:122
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:109
 msgid "NP Page Down"
 msgstr "NP 페이지 다운"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:121
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:108
 msgid "NP Page Up"
 msgstr "NP 페이지 업"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:119
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:106
 msgid "NP Right"
 msgstr "NP 오른쪽"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:130
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:117
 msgid "NP Separator"
 msgstr "NP 분리기"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:109
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:96
 msgid "NP Space"
 msgstr "NP 스페이스"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:131
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:118
 msgid "NP Subtract"
 msgstr "NP 뺄셈"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:110
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:97
 msgid "NP Tab"
 msgstr "NP 탭"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:118
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:105
 msgid "NP Up"
 msgstr "NP 위"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:444
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:59
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:50
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:448
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:46
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:37
 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:25
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:72
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:282
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:553
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:15
 msgid "Name: "
 msgstr "이름:"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:526
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:562
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:516
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:555
 msgid "Native GCI files(*.gci)"
 msgstr "원본 GCI 파일들(*.gci)"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:161
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:148
 msgid "New Scan"
 msgstr "새로운 스캔"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:206
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:193
 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:801
 msgid "Next Page"
 msgstr "다음 페이지"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:165
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:152
 msgid "Next Scan"
 msgstr "다음 스캔"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:68
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:59
 msgid "Nickname :"
 msgstr "별명 :"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:196
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:190
 msgid "No Country (SDK)"
 msgstr "국가 없음 (SDK)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:370
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:357
 msgid "No ISOs or WADS found"
 msgstr "ISO나 WADS가 없음"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:508
+#: Source/Core/Core/Src/ConfigManager.h:17
+msgid "No audio output"
+msgstr "오디오 출력이 없습니다"
+
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:501
 #, c-format
 msgid "No banner file found for title  %s"
 msgstr "%s 타이틀에 대한 배너 파일이 없음"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:761
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:768
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:760
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:767
 msgid "No description available"
 msgstr "적합한 상세설명 없음"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:514
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:535
 msgid "No docking"
 msgstr "도킹 없음"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:859
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:860
 msgid "No file loaded"
 msgstr "로드된 파일이 없음"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:439
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:426
 msgid "No free dir index entries"
 msgstr "빈 디렉토리 목록 엔트리들이 없음"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:895
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:896
 msgid "No recorded file"
 msgstr "녹화된 파일이 없음"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:501
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:494
 #, c-format
 msgid "No save folder found for title %s"
 msgstr "%s 타이틀에 대한 저장 폴더가 없음"
 
+#: Source/Plugins/Plugin_VideoOGL/Src/main.cpp:132
+#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:111
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:23
 #: Source/Core/DolphinWX/Src/NetWindow.cpp:600
 msgid "None"
 msgstr "없음"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:323
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303
 msgid "Norwegian Bokmaal"
 msgstr "노르웨이 북몰어"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:203
 msgid "Not Equal"
 msgstr "같지 않음"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:804
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:794
 msgid "Not Set"
 msgstr "설정 안함"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:626
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:101
+#, c-format
+msgid "Not a Wii save or read failure for file header size %x"
+msgstr "Wii 저장이 아니거나 파일 헤더 크기 %x 에 대한 읽기 실패 "
+
+#: Source/Core/DolphinWX/Src/Main.cpp:654
 msgid "Not connected"
 msgstr "연결되지 않음"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:309
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:296
 msgid "Notes"
 msgstr "참고 사항"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:16
 msgid "Notes: "
 msgstr "참고:"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:71
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:74
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:580
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:621
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:629
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:59
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:64
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:613
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:659
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:667
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:31
 msgid "Notice"
 msgstr "알림"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:105
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:92
 msgid "Num Lock"
 msgstr "Num Lock"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:88
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:75
 msgid "Number Of Codes: "
 msgstr "코드 번호:"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:30
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:34
 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26
 msgid "Nunchuk"
 msgstr "눈처크"
@@ -3797,93 +3896,94 @@ msgstr "눈처크"
 msgid "Nunchuk Acceleration"
 msgstr "눈처크 가속"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:877
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:878
 msgid "Object"
 msgstr "오브젝트"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:135
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:122
 msgid "Object Range"
 msgstr "오브젝트 범위"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:243
 msgid "Off"
 msgstr "끔"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:62
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:49
 msgid "Offset:"
 msgstr "오프셋:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:582
 msgid "On-Screen Display Messages"
 msgstr "온-스크린 메시지 보여주기"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:436
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:423
 #, c-format
 msgid "Only %d blocks available"
 msgstr "%d 블럭들만 유용한"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:420
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:178
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:426
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:166
 msgid "Open"
 msgstr "열기"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:876
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:867
 msgid "Open &containing folder"
 msgstr "담고 있는 폴더 열기(&c)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:873
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:864
 msgid "Open Wii &save folder"
 msgstr "Wii 저장 폴더 열기(&s)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:420
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:426
 msgid "Open file..."
 msgstr "파일 열기..."
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:61
+#: Source/Core/AudioCommon/Src/OpenALStream.cpp:48
 #, c-format
 msgid "OpenAL: can't create context for device %s"
 msgstr "OpenAL: %s 장치에 대한 맥락(context)을 만들 수 없음"
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:72
+#: Source/Core/AudioCommon/Src/OpenALStream.cpp:59
 msgid "OpenAL: can't find sound devices"
 msgstr "OpenAL: 사운드 장치들을 찾을 수 없음"
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:66
+#: Source/Core/AudioCommon/Src/OpenALStream.cpp:53
 #, c-format
 msgid "OpenAL: can't open device %s"
 msgstr "OpenAL: %s 장치를 열 수 없음"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502
 msgid "OpenCL Texture Decoder"
 msgstr "OpenCL 텍스처 디코더"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503
 msgid "OpenMP Texture Decoder"
 msgstr "OpenMP 텍스처 디코더"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:317
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:94
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:304
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:81
 msgid "Options"
 msgstr "옵션"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:22
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Orange"
 msgstr "주황"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:468
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:455
+#, fuzzy
 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"
+"and import the saves to a new memcard\n"
 msgstr "파일 디렉토리안에 파일의 순서가 블럭 순서와 맞지 않습니다\n"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:316
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:324
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:509
 msgid "Other"
 msgstr "다른 것들"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:206
+#: Source/Core/Core/Src/NetPlayClient.cpp:210
 msgid ""
 "Other client disconnected while game is running!! NetPlay is disabled. You "
 "manually stop the game."
@@ -3891,15 +3991,15 @@ msgstr ""
 "게임이 구동되는 중에 다른 클라이언트가 연결해제됨!! 넷플레이 불가능됨. 수동으"
 "로 게임을 중지하라."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:481
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:468
 msgid "Output"
 msgstr "출력"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:342
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:348
 msgid "P&lay Recording..."
 msgstr "(입력) 기록 재생(&l)..."
 
-#: Source/Core/Core/Src/HW/GCPad.cpp:30
+#: Source/Core/Core/Src/HW/GCPad.cpp:18
 msgid "Pad"
 msgstr "패드"
 
@@ -3907,160 +4007,160 @@ msgstr "패드"
 msgid "Pad "
 msgstr "패드"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:34
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:38
 msgid "Pads"
 msgstr "패드들"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:108
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:95
 msgid "Page Down"
 msgstr "페이지 다운"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:107
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:94
 msgid "Page Up"
 msgstr "페이지 업"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:35
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:22
 msgid "Paragraph"
 msgstr "단락"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:64
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:51
 msgid "Parameters"
 msgstr "매개변수들"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:222
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:217
 #, c-format
 msgid "Partition %i"
 msgstr "파티션 %i"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:296
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:297
 msgid "Patches"
 msgstr "패치"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:556
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536
 msgid "Paths"
 msgstr "경로"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1538
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1539
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:51
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1565
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1566
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:38
 msgid "Pause"
 msgstr "일시정지"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:128
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:129
 msgid "Pause at end of movie"
 msgstr "무비의 끝에서 멈추기"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:397
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405
 msgid "Per-Pixel Lighting"
 msgstr "픽셀단위 광원"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352
 msgid "Perfect"
 msgstr "완벽한"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:609
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:642
 #, c-format
 msgid "Perspective %d"
 msgstr "관점 %d"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:165
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:424
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1547
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1548
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:152
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:430
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1574
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1575
 msgid "Play"
 msgstr " 실행  "
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176
 msgid "Play Recording"
 msgstr "(입력) 기록 재생"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:170
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:170
 msgid "Play/Pause"
 msgstr "실행/일시정지"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351
 msgid "Playable"
 msgstr "플레이가능"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:154
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:141
 msgid "Playback Options"
 msgstr "재생 옵션"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:301
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:304
 msgid "Players"
 msgstr "플레이어"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:988
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:991
 msgid "Please confirm..."
 msgstr "확인해주세요..."
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:579
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:612
 msgid "Please create a perspective before saving"
 msgstr "저장하기전에 관점을 생성해 주세요."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:36
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:23
 msgid "Plus-Minus"
 msgstr "플러스-마이너스"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:324
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304
 msgid "Polish"
 msgstr "폴란드어"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:713
 msgid "Port 1"
 msgstr "포트 1"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714
 msgid "Port 2"
 msgstr "포트 2"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:734
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715
 msgid "Port 3"
 msgstr "포트 3"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716
 msgid "Port 4"
 msgstr "포트 4"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:97
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:130
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:88
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:133
 msgid "Port :"
 msgstr "포트:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:325
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305
 msgid "Portuguese"
 msgstr "포르투갈어"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:326
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306
 msgid "Portuguese (Brazilian)"
 msgstr "포르투갈어 (브라질)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:391
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:399
 msgid "Post-Processing Effect:"
 msgstr "후-처리 효과:"
 
-#: Source/Core/Core/Src/Movie.cpp:936
+#: Source/Core/Core/Src/Movie.cpp:927
 #, c-format
 msgid "Premature movie end in PlayController. %u + 8 > %u"
 msgstr "PlayController에 영상마무리가 미완성되었습니다. %u + 8 > %u"
 
-#: Source/Core/Core/Src/Movie.cpp:1055
+#: Source/Core/Core/Src/Movie.cpp:1046
 #, c-format
 msgid "Premature movie end in PlayWiimote. %u + %d > %u"
 msgstr "PlayWiimote에 영상 마무리가 미완성되었습니다. %u + %d > %u"
 
-#: Source/Core/Core/Src/Movie.cpp:1032
+#: Source/Core/Core/Src/Movie.cpp:1023
 #, c-format
 msgid "Premature movie end in PlayWiimote. %u > %u"
 msgstr "PlayWiimote에 영상 마무리가 미완성되었습니다. %u > %u"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:48
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:35
 msgid "Presets: "
 msgstr "사전설정:"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:205
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:192
 msgid "Prev Page"
 msgstr "이전 페이지"
 
@@ -4068,67 +4168,67 @@ msgstr "이전 페이지"
 msgid "Previous Page"
 msgstr "이전 페이지"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:183
 msgid "Previous Value"
 msgstr "이전 값"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:60
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:47
 msgid "Print"
 msgstr "프린트"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:894
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:885
 msgid "Profile"
 msgstr "프로파일"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.h:55
+#: Source/Core/DolphinWX/Src/ISOProperties.h:42
 msgid "Properties"
 msgstr "속성"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:283
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:286
 msgid "Purge Cache"
 msgstr "캐쉬 제거(Purge)"
 
-#: Source/Core/Common/Src/MsgHandler.cpp:66
+#: Source/Core/Common/Src/MsgHandler.cpp:52
 msgid "Question"
 msgstr "질문"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:159
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:316
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:162
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:319
 msgid "Quit"
 msgstr "종료"
 
 #. i18n:  Right
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:59
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:46
 msgid "R"
 msgstr "R"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:40
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:27
 msgid "R Button"
 msgstr "R 버튼"
 
 #. i18n:  Right-Analog
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:63
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
 msgid "R-Analog"
 msgstr "R-아날로그"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:445
 msgid "RAM"
 msgstr "램"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:175
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:169
 msgid "RUSSIA"
 msgstr "러시아"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:528
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:515
 msgid "Range"
 msgstr "범위"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:190
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:178
 msgid "Read-only mode"
 msgstr "읽기-전용 모드"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:487
 msgid "Real"
 msgstr "실제"
 
@@ -4144,33 +4244,33 @@ msgstr "리얼 위모트"
 msgid "Reconnect Wiimote on State Loading"
 msgstr "상태 로딩시 위모트 재연결"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:193
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:217
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:791
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:180
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:204
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:790
 msgid "Record"
 msgstr "녹화"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:174
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:161
 msgid "Recording Info"
 msgstr "녹화 정보"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:202
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:189
 msgid "Recording Options"
 msgstr "녹화 옵션"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:21
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Red"
 msgstr "빨강"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:24
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Red Left"
 msgstr "빨강 왼쪽"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:25
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Red Right"
 msgstr "빨강 오른쪽"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86
 msgid ""
 "Reduces the amount of aliasing caused by rasterizing 3D graphics.\n"
 "This makes the rendered picture look less blocky.\n"
@@ -4185,28 +4285,28 @@ msgstr ""
 "모르겠으면, 없음을 선택하세요."
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:60
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:421
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:903
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:427
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:894
 msgid "Refresh"
 msgstr "갱신"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:180
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:168
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:168
 msgid "Refresh List"
 msgstr "목록 새로 고침"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:421
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:427
 msgid "Refresh game list"
 msgstr "게임 목록 새로 고침"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:405
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:427
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:77
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:812
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:409
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:431
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:64
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:793
 msgid "Remove"
 msgstr "제거"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99
 msgid ""
 "Render the scene as a wireframe.\n"
 "\n"
@@ -4216,196 +4316,204 @@ msgstr ""
 "\n"
 "모르겠으면, 이것을 언체크로 두세요."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:308
 msgid "Render to Main Window"
 msgstr "메인 윈도우에 렌더"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:915
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:172
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:906
 msgid "Reset"
 msgstr "리셋"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:190
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:177
 msgid "Results"
 msgstr "결과"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:29
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:16
 msgid "Return"
 msgstr "Enter"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:277
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:57
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464
+msgid "Revision:"
+msgstr ""
+
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:264
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:44
 msgid "Right"
 msgstr "오른쪽"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:61
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:65
 msgid "Right Stick"
 msgstr "오른쪽 스틱"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:85
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:295
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:72
 msgid "Rumble"
 msgstr "진동"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:518
-msgid "Run DSP LLE on a dedicated thread (not recommended)."
-msgstr "DSP LLE를 전용 쓰레드상에서 구동하기 (권장 안함)"
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498
+msgid ""
+"Run DSP HLE and LLE on a dedicated thread (not recommended: might cause "
+"audio glitches with HLE and freezes with LLE)."
+msgstr ""
+"DSP HLE와 LLE를 전용 쓰레드상에서 구동합니다 (권장되지 않습니다: HLE로는 오디"
+"오 결함들을 유발하고 LLE로는 얼어버릴지 모릅니다)."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:327
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307
 msgid "Russian"
 msgstr "러시아어"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:149
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:150
 msgid "Sa&ve State"
 msgstr "상태 저장(&v) "
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:465
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475
 msgid "Safe"
 msgstr "안전"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:196
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:446
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:925
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:183
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:452
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916
 msgid "Save"
 msgstr "저장"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:532
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:522
 msgid "Save GCI as..."
 msgstr "다른 이름으로 GCI 저장..."
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
 msgid "Save State Slot 1"
 msgstr "슬롯1 상태 저장"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:198
 msgid "Save State Slot 2"
 msgstr "슬롯2 상태 저장"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:199
 msgid "Save State Slot 3"
 msgstr "슬롯3 상태 저장"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:212
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:212
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200
 msgid "Save State Slot 4"
 msgstr "슬롯4 상태 저장"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201
 msgid "Save State Slot 5"
 msgstr "슬롯5 상태 저장"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202
 msgid "Save State Slot 6"
 msgstr "슬롯6 상태 저장 "
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:203
 msgid "Save State Slot 7"
 msgstr "슬롯7 상태 저장"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204
 msgid "Save State Slot 8"
 msgstr "슬롯8 상태 저장"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:151
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:152
 msgid "Save State..."
 msgstr "상태 저장..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:582
 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:592
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:602
 msgid "Save as..."
 msgstr "다른 이름으로 저장..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1203
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1204
 msgid "Save compressed GCM/ISO"
 msgstr "압축된 GCM/ISO를 저장"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:446
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:452
 msgid "Save current perspective"
 msgstr "현재 관점을 저장"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1192
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193
 msgid "Save decompressed GCM/ISO"
 msgstr "압축풀린 GCM/ISO를 저장"
 
-#: Source/Core/Core/Src/Movie.cpp:801
+#: Source/Core/Core/Src/Movie.cpp:792
 #, c-format
 msgid "Savestate movie %s is corrupted, movie recording stopping..."
 msgstr "%s 영상 상태저장이 손상되었습니다, 영상 기록 중지..."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:396
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:404
 msgid "Scaled EFB Copy"
 msgstr "스케일된 EFB 복사"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:556
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:543
 #, c-format
 msgid "Scanning %s"
 msgstr "스캐닝 %s"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:539
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:526
 msgid "Scanning for ISOs"
 msgstr "ISO들을 검사하기"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:540
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:527
 msgid "Scanning..."
 msgstr "스캐닝..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:427
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
 msgid "ScrShot"
 msgstr "스크린샷"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:106
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:93
 msgid "Scroll Lock"
 msgstr "스크롤 락"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:264
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:251
 msgid "Search"
 msgstr "찾기"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:227
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:214
 msgid "Search Filter"
 msgstr "필터 찾기"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:810
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:791
 msgid "Search Subfolders"
 msgstr "하위폴더들 찾기"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:250
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:237
 msgid "Search current Object"
 msgstr "최근 오브젝트 찾기"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:254
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:241
 msgid "Search for hex Value:"
 msgstr "헥스 값 찾기:"
 
-#: Source/Core/Common/Src/SysConf.h:103 Source/Core/Common/Src/SysConf.h:126
-#: Source/Core/Common/Src/SysConf.h:146 Source/Core/Common/Src/SysConf.h:167
+#: Source/Core/Common/Src/SysConf.h:90 Source/Core/Common/Src/SysConf.h:113
+#: Source/Core/Common/Src/SysConf.h:133 Source/Core/Common/Src/SysConf.h:154
 #, c-format
 msgid "Section %s not found in SYSCONF"
 msgstr "섹션 %s를 SYSCONF에서 찾을 수 없음"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:59
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:490
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:46
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:477
 msgid "Select"
 msgstr "선택"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:677
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1072
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:683
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1087
 msgid "Select The Recording File"
 msgstr "기록 파일 선택"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1285
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1312
 msgid "Select a Wii WAD file to install"
 msgstr "설치할 Wii WAD 파일 선택"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:70
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74
 msgid ""
 "Select a hardware adapter to use.\n"
 "\n"
@@ -4415,31 +4523,31 @@ msgstr ""
 "\n"
 "의심 스러울 때는, 처음 것을 사용하세요."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:520
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:510
 msgid "Select a save file to import"
 msgstr "가져올 저장 파일을 선택"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:363
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:366
 msgid "Select floating windows"
 msgstr "유동적인 윈도우즈 선택"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:582
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:585
 msgid "Select the file to load"
 msgstr "로드할 파일 선택"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1241
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1268
 msgid "Select the save file"
 msgstr "저장 파일을 선택"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1388
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1415
 msgid "Select the state to load"
 msgstr "로드할 상태 선택"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1429
 msgid "Select the state to save"
 msgstr "저장할 상태 선택"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82
 msgid ""
 "Select what aspect ratio to use when rendering:\n"
 "Auto: Use the native aspect ratio\n"
@@ -4457,15 +4565,15 @@ msgstr ""
 "\n"
 "모르겠으면, 자동을 선택하세요."
 
-#: Source/Core/InputCommon/Src/InputConfig.cpp:61
+#: Source/Core/InputCommon/Src/InputConfig.cpp:48
 msgid "Selected controller profile does not exist"
 msgstr "선택된 컨트롤러 프로파일이 존재하지 않습니다"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:116
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:109
 msgid "Selected font"
 msgstr "선택된 폰트"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75
 msgid ""
 "Selects the display resolution used in fullscreen mode.\n"
 "This should always be bigger than or equal to the internal resolution. "
@@ -4481,23 +4589,39 @@ msgstr ""
 "모르겠으면, 데스크탑 해상도를 사용하세요.\n"
 "그래도 모르겠으면, 작동하는 최고 해상도를 사용하세요."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:69
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:70
 msgid ""
 "Selects what graphics API to use internally.\n"
 "Direct3D 9 usually is the fastest one. OpenGL is more accurate though. "
 "Direct3D 11 is somewhere between the two.\n"
 "Note that the Direct3D backends are only available on Windows.\n"
 "\n"
-"If unsure, use Direct3D 9."
+"If unsure, use Direct3D 11."
 msgstr ""
-"내부적으로 어떤 그래픽 API를 사용할지 선택하세요.\n"
+"내부적으로 사용할 그래픽 API를 선택합니다.\n"
+"Direct3D 9은 보통 가장 빠릅니다. OpenGL이 더 정확하긴합니다. Direct3D 11은 "
+"둘 사이쯤 입니다.\n"
+"Direct3D 백엔드들은 윈도우즈들에서만 이용할 수 있다는 것을 알아두세요.\n"
+"\n"
+"모르겠으면, Direct3D 11을 사용하세요."
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72
+msgid ""
+"Selects what graphics API to use internally.\n"
+"Direct3D 9 usually is the fastest one. OpenGL is more accurate though. "
+"Direct3D 11 is somewhere between the two.\n"
+"Note that the Direct3D backends are only available on Windows.\n"
+"\n"
+"If unsure, use OpenGL."
+msgstr ""
+"내부적으로 어떤 그래픽 API를 사용할지 선택합니다.\n"
 "Direct3D 9은 보통 가장 빠릅니다. OpenGL은 더 정확하긴 합니다. Dirct3D 11은 "
 "둘 사이 어딘가입니다.\n"
-"Direct3D 백엔드들은 윈도우즈 상에서만 사용할 수 있다는 것을 알아두세요.\n"
+"Direct3D 백엔드들은 윈도우즈들에서만 이용할 수 있다는 것을 알아두세요.\n"
 "\n"
 "모르겠으면, Direct3D 9을 사용하세요."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:288
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:291
 msgid "Send"
 msgstr "보내기"
 
@@ -4505,24 +4629,24 @@ msgstr "보내기"
 msgid "Sensor Bar Position:"
 msgstr "센서 바 위치:"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:77
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:64
 msgid "Separator"
 msgstr "분리자"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:328
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308
 msgid "Serbian"
 msgstr "세르비아어"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:522
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502
 msgid ""
 "Serial Port 1 - This is the port which devices such as the net adapter use"
 msgstr "시리얼 포트 1 - 이것은 넷 어댑터같은 디바이스가 사용하는 포트이다"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:488
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:475
 msgid "Set"
 msgstr "설정"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:877
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:868
 msgid "Set as &default ISO"
 msgstr "디폴트 ISO로 설정(&d)"
 
@@ -4531,12 +4655,12 @@ msgstr "디폴트 ISO로 설정(&d)"
 msgid "Set as default Memcard %c"
 msgstr "기본 메모리카드 %c 로 설정"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:460
+#: Source/Core/Core/Src/ActionReplay.cpp:450
 #, c-format
 msgid "SetARCode_IsActive: Index is greater than ar code list size %lu"
 msgstr "SetARCode_IsActive: 목록이 ar 코드 목록 크기 %lu 보다 더 큽니다"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:515
 msgid ""
 "Sets the latency (in ms).  Higher values may reduce audio crackling. OpenAL "
 "backend only."
@@ -4544,123 +4668,123 @@ msgstr ""
 "지연(ms 단위로)을 설정합니다. 더 높은 값은 오디오 튐을 줄일 지도 모릅니다. "
 "OpenAL 백엔드 전용."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341
 msgid "Settings..."
 msgstr "설정..."
 
-#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:222
+#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:209
 msgid "SetupWiiMem: Cant find setting file"
 msgstr "SetupWiiMem: 설정 파일을 찾을 수 없음"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:291
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:278
 msgid "Shake"
 msgstr "흔들기"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
 msgid "Short Name:"
 msgstr "단축 이름:"
 
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:103
+#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:90
 msgid "Shoulder Buttons"
 msgstr "숄더 버튼"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:217
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:220
 msgid "Show &Console"
 msgstr "콘솔 보기(&C)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:215
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:218
 msgid "Show &Log"
 msgstr "로그 보기(&L)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:212
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:215
 msgid "Show &Statusbar"
 msgstr "상태바 표시(&S)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:210
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:213
 msgid "Show &Toolbar"
 msgstr "툴바 표시(&T)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:281
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:284
 msgid "Show Drives"
 msgstr "드라이브 표시"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:517
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530
 msgid "Show EFB Copy Regions"
 msgstr "EFB 복사 영역"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:295
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303
 msgid "Show FPS"
 msgstr "FPS 보기"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:271
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:274
 msgid "Show France"
 msgstr "프랑스"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:257
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:260
 msgid "Show GameCube"
 msgstr "게임큐브"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561
 msgid "Show Input Display"
 msgstr "입력 표시 보기"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:273
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:276
 msgid "Show Italy"
 msgstr "이탈리아"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:264
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:267
 msgid "Show JAP"
 msgstr "JAP (일본 방식)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:275
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:278
 msgid "Show Korea"
 msgstr "한국"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476
 msgid "Show Language:"
 msgstr "언어 보기:"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:216
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:219
 msgid "Show Log &Configuration"
 msgstr "로그 환경설정(&C)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:266
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:269
 msgid "Show PAL"
 msgstr "PAL (유럽 방식)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:254
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:257
 msgid "Show Platforms"
 msgstr "플랫폼 표시"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:263
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:266
 msgid "Show Regions"
 msgstr "지역 표시"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:518
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531
 msgid "Show Statistics"
 msgstr "통계들"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:277
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:280
 msgid "Show Taiwan"
 msgstr "타이완"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:268
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:271
 msgid "Show USA"
 msgstr "USA (미국 방식)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:259
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:262
 msgid "Show Wad"
 msgstr "Wad"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:255
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:258
 msgid "Show Wii"
 msgstr "Wii"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491
 msgid "Show a confirmation box before stopping a game."
 msgstr "게임을 멈추기 전에 확인 상자 보여주기."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:512
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492
 msgid ""
 "Show a message box when a potentially serious error has occurred.\n"
 "Disabling this may avoid annoying and non-fatal messages, but it may also "
@@ -4674,11 +4798,11 @@ msgstr ""
 msgid "Show first block"
 msgstr "첫번째 블럭 보기"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:130
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:131
 msgid "Show lag counter"
 msgstr "랙 계측기 보여주기"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493
 msgid ""
 "Show messages on the emulation screen area.\n"
 "These messages include memory card writes, video backend and CPU "
@@ -4704,7 +4828,7 @@ msgstr "저장 아이콘 보기"
 msgid "Show save title"
 msgstr "저장 타이틀 보기"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102
 msgid ""
 "Show the number of frames rendered per second as a measure of emulation "
 "speed.\n"
@@ -4715,11 +4839,11 @@ msgstr ""
 "\n"
 "모르겠으면, 이것을 언체크로 두세요."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:279
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:282
 msgid "Show unknown"
 msgstr "알려지지 않음"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105
 msgid ""
 "Show various statistics.\n"
 "\n"
@@ -4729,47 +4853,31 @@ msgstr ""
 "\n"
 "모르겠으면, 이것을 언체크로 두세요."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:319
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:306
 msgid "Sideways Wiimote"
 msgstr "사이드웨이 위모트"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:280
 msgid "Simplified Chinese"
 msgstr "간소화 중국어"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:311
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:298
 msgid "Size"
 msgstr "크기"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:696
 msgid "Skip BIOS"
 msgstr "바이오스 스킵"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316
 msgid "Skip DCBZ clearing"
 msgstr "DCBZ 청소 건너뛰기"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:492
-msgid "Skip Dest. Alpha Pass"
-msgstr "목적지. 알파 패스 스킵"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:444
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:454
 msgid "Skip EFB Access from CPU"
 msgstr "CPU로 부터 EFB 엑세스를 스킵"
 
-#: 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:120
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125
 msgid ""
 "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n"
 "Sometimes also increases visual quality.\n"
@@ -4785,25 +4893,25 @@ msgstr ""
 "\n"
 "모르겠으면, 이것을 언체크로 두세요."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:374
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:386
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:380
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:392
 #, c-format
 msgid "Slot %i"
 msgstr "슬롯 %i"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:700
 msgid "Slot A"
 msgstr "슬롯 A"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:701
 msgid "Slot B"
 msgstr "슬롯 B"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:62
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:49
 msgid "Snapshot"
 msgstr "스냅샷"
 
-#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:58
+#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:46
 msgid "Software Renderer"
 msgstr "소프트웨어 렌더러"
 
@@ -4818,27 +4926,27 @@ msgstr ""
 "디버깅 목적으로만 유용합니다.\n"
 "소프트웨어 렌더링을 활성을 정말 원합니까? 모르겠으면, '아니오'를 선택하세요."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:683
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:664
 msgid "Sound Settings"
 msgstr "사운드 설정"
 
-#: Source/Core/AudioCommon/Src/AudioCommon.cpp:77
+#: Source/Core/AudioCommon/Src/AudioCommon.cpp:64
 #, c-format
 msgid "Sound backend %s is not valid."
 msgstr "사운드 백엔드 %s는 적합하지 않습니다."
 
-#: Source/Core/AudioCommon/Src/DSoundStream.cpp:59
+#: Source/Core/AudioCommon/Src/DSoundStream.cpp:46
 #, c-format
 msgid "Sound buffer creation failed: %s"
 msgstr "사운드 버퍼 생성 실패했습니다: %s"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:31
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:18
 msgid "Space"
 msgstr "스페이스"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:329
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309
 msgid "Spanish"
 msgstr "스페인어"
 
@@ -4846,7 +4954,7 @@ msgstr "스페인어"
 msgid "Speaker Volume:"
 msgstr "스피커 볼륨:"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92
 msgid ""
 "Specifies the resolution used to render at. A high resolution will improve "
 "visual quality a lot but is also quite heavy on performance and might cause "
@@ -4866,63 +4974,63 @@ msgstr ""
 "\n"
 "모르겠으면, 640x528를 선택하세요."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322
 msgid "Speed up Disc Transfer Rate"
 msgstr "디스크 전송율 속도 상승"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:243
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:230
 msgid "Square Stick"
 msgstr "스퀘어 스틱"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:107
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87
 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:322
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:37
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:25
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:325
 msgid "Start"
 msgstr "시작"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:194
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:197
 msgid "Start &NetPlay"
 msgstr "넷플레이 시작(&N)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:339
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:345
 msgid "Start Re&cording"
 msgstr "(입력) 기록 시작(&c)"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:175
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:175
 msgid "Start Recording"
 msgstr "(입력) 기록 시작"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:312
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:299
 msgid "State"
 msgstr "상태"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:173
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:161
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:161
 msgid "State Saves"
 msgstr "상태 저장"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:108
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88
 msgid "Steering Wheel"
 msgstr "운전대"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:53
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:57
 msgid "Stick"
 msgstr "스틱"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:420
-#: 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:325
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:419
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:431
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:171
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:171
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:328
 msgid "Stop"
 msgstr "중지"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96
 msgid ""
 "Store EFB copies in GPU texture objects.\n"
 "This is not so accurate, but it works well enough for most games and gives a "
@@ -4935,107 +5043,119 @@ msgstr ""
 "고 \"램에 EFB\"를 넘는 대단한 속도향상을 줍니다.\n"
 "모르겠으면, 이것을 체크로 두세요."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:275
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283
 msgid "Stretch to Window"
 msgstr "윈도우로 늘림"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:43
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:47
 msgid "Strum"
 msgstr "스트럼"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:78
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:65
 msgid "Subtract"
 msgstr "빼기"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:77
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:67
 #, c-format
 msgid "Successfully exported file to %s"
 msgstr "성공적으로 파일을 %s로 내보냈음"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:56
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:43
 msgid "Successfully imported save files"
 msgstr "세이브 파일들을 성공적으로 가져왔음"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:285
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:272
 msgid "Swing"
 msgstr "스윙"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:744
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:792
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320
+msgid "Synchronize GPU thread"
+msgstr "GPU 쓰레드 동기화"
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321
+msgid ""
+"Synchronizes the GPU and CPU threads to help prevent random freezes in Dual "
+"Core mode. (ON = Compatible, OFF = Fast)"
+msgstr ""
+"듀얼 코어 모드에서 랜덤 프리징들 막기를 돕기위해 GPU와 CPU 쓰레드들을 동기화"
+"합니다. (켬 = 호환성, 끔 = 빠름)"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773
 msgid "System Language:"
 msgstr "시스템 언어:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:191
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:185
 msgid "TAIWAN"
 msgstr "타이완"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:127
-#: Source/Core/DolphinWX/Src/TASInputDlg.h:32
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:128
+#: Source/Core/DolphinWX/Src/TASInputDlg.h:19
 msgid "TAS Input"
 msgstr "TAS 입력"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:28
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:15
 msgid "Tab"
 msgstr "탭"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:510
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:531
 msgid "Tab split"
 msgstr "탭 분리"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:37
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:41
 msgid "Table Left"
 msgstr "테이블 왼쪽"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:38
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:42
 msgid "Table Right"
 msgstr "테이블 오른쪽"
 
-#: 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
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:361
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:181
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:181
 msgid "Take Screenshot"
 msgstr "스크린샷 찍기"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:109
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89
 msgid "TaruKonga (Bongos)"
 msgstr "타루콩가 (봉고스)"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:472
 msgid "Test"
 msgstr "테스트"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:444
 msgid "Texture"
 msgstr "텍스처"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:451
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:461
 msgid "Texture Cache"
 msgstr "텍스처 캐쉬"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:519
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:532
 msgid "Texture Format Overlay"
 msgstr "텍스처 포멧 오버레이"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:226
+#: Source/Core/Core/Src/CoreParameter.cpp:215
 msgid "The WAD has been installed successfully"
 msgstr "WAD가 성공적으로 설치되었습니다"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:197
+#: Source/Core/Core/Src/ActionReplay.cpp:185
 msgid "The address is invalid"
 msgstr "그 주소는 비적합 입니다"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:509
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:496
 msgid "The checksum was successfully fixed"
 msgstr "체크섬이 성공적으로 고쳐졌습니다"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1242
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226
 msgid "The chosen directory is already in the list"
 msgstr "선택된 디렉토리는 이미 리스트에 있다"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1117
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1216
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1118
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1146
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1217
 #, c-format
 msgid ""
 "The file %s already exists.\n"
@@ -5044,7 +5164,7 @@ msgstr ""
 "%s 파일이 이미 존재합니다.\n"
 "그것을 바꾸시겠습니까?"
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:51
+#: Source/Core/AudioCommon/Src/WaveFile.cpp:38
 #, c-format
 msgid ""
 "The file %s could not be opened for writing. Please check if it's already "
@@ -5053,29 +5173,29 @@ msgstr ""
 "%s 파일은 쓰기위해 열릴 수 없었습니다. 다른 프로그램에 의해 이미 열려져있는"
 "지 체크해주세요."
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:44
+#: Source/Core/AudioCommon/Src/WaveFile.cpp:31
 #, c-format
 msgid "The file %s was already open, the file header will not be written."
 msgstr "%s 파일이 이미 열려 있었습니다, 파일 헤더는 기록되지 않을 것입니다."
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:332
+#: Source/Core/Core/Src/Boot/Boot.cpp:320
 #, c-format
 msgid "The file you specified (%s) does not exist"
 msgstr "당신이 기술한 파일 (%s)는 존재하지 않습니다"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:628
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:666
 msgid "The name can not be empty"
 msgstr "이름은 비워둘 수 없습니다"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:620
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:658
 msgid "The name can not contain the character ','"
 msgstr "이른은 ',' 문자를 포함할 수 없습니다"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:142
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:129
 msgid "The resulting decrypted AR code doesn't contain any lines."
 msgstr "해독된 AR 코드 결과가 없습니다."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98
 msgid ""
 "The safer you adjust this, the less likely the emulator will be missing any "
 "texture updates from RAM.\n"
@@ -5086,11 +5206,11 @@ msgstr ""
 "치는 경향이 있습니다.\n"
 "모르겠으면, 가장 오른쪽 값을 사용하세요."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:445
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:432
 msgid "The save you are trying to copy has an invalid file size"
 msgstr "당신이 복사하려는 저장은 비적합 파일 크기입니다."
 
-#: Source/Core/DolphinWX/Src/Main.cpp:388
+#: Source/Core/DolphinWX/Src/Main.cpp:416
 msgid ""
 "The selected language is not supported by your system. Falling back to "
 "system default."
@@ -5098,36 +5218,36 @@ msgstr ""
 "선택된 언어는 당신의 시스템에서 지원되지 않습니다. 시스템 디폴트로 돌아갑니"
 "다."
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:43
+#: Source/Core/Core/Src/NetPlayClient.cpp:47
 msgid "The server and client's NetPlay versions are incompatible!"
 msgstr "서버와 클라이언트의 넷플레이 버전들이 호환되지 않는다!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:40
+#: Source/Core/Core/Src/NetPlayClient.cpp:44
 msgid "The server is full!"
 msgstr "서버가 가득참!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:46
+#: Source/Core/Core/Src/NetPlayClient.cpp:50
 msgid "The server responded: the game is currently running!"
 msgstr "서버가 응답했습니다: 그 게임은 현재 구동중이다!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:49
+#: Source/Core/Core/Src/NetPlayClient.cpp:53
 msgid "The server sent an unknown error message!"
 msgstr "서버가 알려지지 않은 에러 메시지를 보냈음!"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:119
+#: Source/Core/Core/Src/CoreParameter.cpp:108
 #, c-format
 msgid "The specified file \"%s\" does not exist"
 msgstr "기술된 \"%s\" 파일은 존재하지 않는다"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:198
+#: Source/Core/Core/Src/ActionReplay.cpp:186
 msgid "The value is invalid"
 msgstr "값이 비적합 합니다"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:642
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:623
 msgid "Theme:"
 msgstr "테마:"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:476
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:463
 msgid ""
 "There must be a ticket for 00000001/00000002. Your NAND dump is probably "
 "incomplete."
@@ -5135,7 +5255,7 @@ msgstr ""
 "00000001/00000002에 대한 티켓이 있어야한다. 당신의 NAND 덤프는 아마도 미완성"
 "이다."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308
 msgid ""
 "These settings override core Dolphin settings.\n"
 "Undetermined means the game uses Dolphin's setting."
@@ -5143,7 +5263,7 @@ msgstr ""
 "이 설정들은 핵심 돌핀 설정들을 덮어씁니다.\n"
 "결정되지않은 것은 게임이 돌핀의 설정을 사용함을 뜻합니다."
 
-#: Source/Core/Core/Src/ActionReplay.cpp:355
+#: Source/Core/Core/Src/ActionReplay.cpp:345
 msgid ""
 "This action replay simulator does not support codes that modify Action "
 "Replay itself."
@@ -5151,11 +5271,11 @@ msgstr ""
 "이 액션 리플레이 시뮬레이터는 액션 리플레이 스스로 수정한 코드를 지원하지 않"
 "는다."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505
 msgid "This could cause slow down in Wii Menu and some games."
 msgstr "이것은 Wii 메뉴와 일부 게임들에서 느려짐을 유발할 수 있다."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118
 msgid ""
 "This feature allows you to change the game's camera.\n"
 "Move the mouse while holding the right mouse button to pan and while holding "
@@ -5175,7 +5295,19 @@ msgstr ""
 "\\n\n"
 "모르겠으면. 이것을 언체크로 두세요."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485
+#, fuzzy
+msgid ""
+"This limits the game speed to the specified number of frames per second "
+"(full speed is 60 for NTSC and 50 for PAL). Alternatively, 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를 "
+"이용해 오디오 병목을 사용하세요 (게임에 따라서는 소리 끊김들을 고칠지 모르지"
+"만 또한 지속적인 잡음을 유발할 수도 있습니다)."
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484
 msgid ""
 "This splits the Video and CPU threads, so they can be run on separate "
 "cores.\n"
@@ -5187,61 +5319,61 @@ msgstr ""
 "두개 이상의 코어를 가진 PC들 상에서 주요 속도 향상들을 유발한다, 하지만 갑작"
 "스런 깨짐/결함들을 일으킬 수도 있다."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:286
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:287
 msgid "This will let you Manually Edit the INI config file"
 msgstr "이것은 수동으로 INI 환경파일을 수정하게 해줄겁니다"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:249
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:254
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:236
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:241
 msgid "Threshold"
 msgstr "한계점"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:288
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:275
 msgid "Tilt"
 msgstr "기울기"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:628
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:304
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:622
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:291
 msgid "Title"
 msgstr "    제목"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:125
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:144
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:112
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:131
 msgid "To"
 msgstr "To"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:72
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59
 msgid "Toggle All Log Types"
 msgstr "모든 로그 타입 토글"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:426
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:432
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:180
 msgid "Toggle Fullscreen"
 msgstr "전체화면 토글"
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:87
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:271
 msgid "Top"
 msgstr "위"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:281
 msgid "Traditional Chinese"
 msgstr "전통 중국어"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:426
+#: Source/Core/Core/Src/Boot/Boot.cpp:414
 msgid "Tried to load an unknown file type."
 msgstr "알려지지 않은 파일 타입을 로드시도했다."
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:80
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:67
 msgid "Triggers"
 msgstr "트리거"
 
-#: Source/Core/Common/Src/SysConf.h:91 Source/Core/Common/Src/SysConf.h:114
+#: Source/Core/Common/Src/SysConf.h:78 Source/Core/Common/Src/SysConf.h:101
 msgid "Trying to read from invalid SYSCONF"
 msgstr "비적합 SYSCONF로 부터 읽기 시도"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:44
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:31
 msgid ""
 "Trying to read from invalid SYSCONF\n"
 "Wiimote bt ids are not available"
@@ -5249,15 +5381,15 @@ msgstr ""
 "효한 SYSCONF에서 읽기 시도\n"
 "위모트 bt id들은 유용하지 않습니다"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:330
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
 msgid "Turkish"
 msgstr "터키어"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:33
 msgid "Turntable"
 msgstr "턴테이블"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:71
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58
 msgid "Type"
 msgstr "타입"
 
@@ -5265,25 +5397,25 @@ msgstr "타입"
 msgid "UDP Port:"
 msgstr "UDP 포트:"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:279
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:266
 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12
 msgid "UDP Wiimote"
 msgstr "UDP 위모트"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:199
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:193
 msgid "UNKNOWN"
 msgstr "알려지지 않음"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:756
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:755
 #, c-format
 msgid "UNKNOWN_%02X"
 msgstr "알려지지않은_%02X"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:178
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:172
 msgid "USA"
 msgstr "미국"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:225
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:214
 msgid ""
 "Unable to create patch from given values.\n"
 "Entry not modified."
@@ -5291,7 +5423,7 @@ msgstr ""
 "주어진 값들에서 패치를 생성할 수 없습니다.\n"
 "항목이 수정되지 않았습니다."
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:124
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:111
 #, c-format
 msgid ""
 "Unable to parse line %lu of the entered AR code as a valid encrypted or "
@@ -5302,75 +5434,94 @@ msgstr ""
 "니다. 올바로 타이핑했는지 확인하세요\n"
 "이 라인을 무시하고 분석을 계속하겠습니까?"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:391
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:397
 #, c-format
 msgid "Undefined %i"
 msgstr "정의되지 않은 %i"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:163
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:164
 msgid "Undo Load State"
 msgstr "상태 로드 되돌림"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:718
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:717
 msgid "Unexpected 0x80 call? Aborting..."
 msgstr "예상하지 못한 0x80 콜? 중단시킴..."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:215
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:202
 msgid "Unknown"
 msgstr "알려지지 않은"
 
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:971
+#: Source/Core/Core/Src/HW/DVDInterface.cpp:965
 #, c-format
 msgid "Unknown DVD command %08x - fatal error"
 msgstr "알려지지 않은 DVD 명령 %08x - 치명적 에러"
 
-#: Source/Core/Common/Src/SysConf.cpp:145
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:444
+#, c-format
+msgid "Unknown command 0x%08x"
+msgstr "알려지지 않은 명령 0x%08x"
+
+#: Source/Core/Common/Src/SysConf.cpp:132
 #, c-format
 msgid "Unknown entry type %i in SYSCONF (%s@%x)!"
 msgstr "알려지지 않은 엔트리 타입 %i SYSCONF (%s@%x)안에!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:228
+#: Source/Core/Core/Src/NetPlayClient.cpp:232
 #, c-format
 msgid "Unknown message received with id : %d"
 msgstr "id : %d의 알려지지 않은 메시지를 받었다"
 
-#: Source/Core/Core/Src/NetPlayServer.cpp:504
+#: Source/Core/Core/Src/NetPlayServer.cpp:508
 #, c-format
 msgid "Unknown message with id:%d received from player:%d Kicking player!"
 msgstr ""
 "id:%d의 알려지지 않은 메시지, 플레이어:%d 플레이어 킥킹으로 부터 전달된!"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:274
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:56
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:261
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:43
 msgid "Up"
 msgstr "위"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:108
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:95
 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17
 msgid "Update"
 msgstr "업데이트"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:320
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:307
 msgid "Upright Wiimote"
 msgstr "업라이트 위모트"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:777
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758
 msgid "Use EuRGB60 Mode (PAL60)"
 msgstr "EuRGB60 모드 (PAL60) 사용"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:294
 msgid "Use Fullscreen"
 msgstr "전체화면 사용"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:575
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:563
 msgid "Use Hex"
 msgstr "16진수 사용"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:600
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580
 msgid "Use Panic Handlers"
 msgstr "패닉 핸들러 사용"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89
+msgid ""
+"Use a hacked upload strategy to stream vertices.\n"
+"This usually speed up, but is forbidden by OpenGL specification and may "
+"causes heavy glitches.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+"버텍스들을 스트림하기 위해 핵 업로드를 사용합니다.\n"
+"이것은 보통 스피드가 올라갑니다, 하지만 OpenGL 사양에 의해 금지되고 엄청난 결"
+"함들을 유발할지도 모릅니다.\n"
+"\n"
+"모르겠으면, 이것을 언체크로 두세요."
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122
 msgid ""
 "Use multiple threads to decode textures.\n"
 "Might result in a speedup (especially on CPUs with more than two cores).\n"
@@ -5382,7 +5533,7 @@ msgstr ""
 "\n"
 "모르겠으면, 이것을 언체크로 두세요."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126
 msgid ""
 "Usually if shader compilation fails, an error message is displayed.\n"
 "However, one may skip the popups to allow interruption free gameplay by "
@@ -5396,53 +5547,58 @@ msgstr ""
 "\n"
 "모르겠으면, 이것을 언체크로 두세요."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:539
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:552
 msgid "Utility"
 msgstr "유틸리티"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:285
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:293
 msgid "V-Sync"
 msgstr "수직-동기화"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:209
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318
+#, fuzzy
+msgid "VBeam Speed Hack"
+msgstr "MMU 스피드 핵"
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196
 msgid "Value"
 msgstr "값"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:73
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:60
 msgid "Value:"
 msgstr "값:"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:572
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:560
 msgid "Value: "
 msgstr "값:"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:51
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:38
 msgid "Verbosity"
 msgstr "상세설명"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:377
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:381
 msgid "Video"
 msgstr "비디오"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:486
 msgid "Virtual"
 msgstr "가상"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:689
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670
 msgid "Volume"
 msgstr "볼륨"
 
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:498
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:527
+#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:488
+#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:517
 #, c-format
 msgid "WAD installation failed: error creating %s"
 msgstr "WAD 설치 실패했습니다: 에러 생성 %s"
 
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:547
+#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:537
 msgid "WAD installation failed: error creating ticket"
 msgstr "WAD 설치 실패했습니다: 에러 생성 티켓"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84
 msgid ""
 "Wait for vertical blanks in order to reduce tearing.\n"
 "Decreases performance if emulation speed is below 100%.\n"
@@ -5454,25 +5610,25 @@ msgstr ""
 "\n"
 "모르겠으면, 이것을 언체크로 두세요."
 
-#: Source/Core/Common/Src/MsgHandler.cpp:67
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46
+#: Source/Core/Common/Src/MsgHandler.cpp:53
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:33
 #: Source/Core/DolphinWX/Src/VideoConfigDiag.h:85
 msgid "Warning"
 msgstr "경고"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:291
+#: Source/Core/Core/Src/Boot/Boot.cpp:279
 msgid "Warning - starting DOL in wrong console mode!"
 msgstr "경고 - 잘못된 콘솔 모드에서 DOL을 시작!"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:341
+#: Source/Core/Core/Src/Boot/Boot.cpp:329
 msgid "Warning - starting ELF in wrong console mode!"
 msgstr "경고 - 잘못된 콘솔 모드에서 ELF 시작!"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:221
+#: Source/Core/Core/Src/Boot/Boot.cpp:209
 msgid "Warning - starting ISO in wrong console mode!"
 msgstr "경고 - 잘못된 콘솔 모드에서 ISO 시작!"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:519
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:512
 #, c-format
 msgid ""
 "Warning! it is advised to backup all files in the folder:\n"
@@ -5483,7 +5639,7 @@ msgstr ""
 "%s\n"
 "계속하고 싶습니까?"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:585
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:578
 #, c-format
 msgid ""
 "Warning: This will overwrite any existing saves that are in the folder:\n"
@@ -5496,7 +5652,7 @@ msgstr ""
 "그리고 당신의 메모리카드에 파일로 같은 이름을 가집니다\n"
 "계속합니까?"
 
-#: Source/Core/Core/Src/Movie.cpp:844
+#: Source/Core/Core/Src/Movie.cpp:835
 #, c-format
 msgid ""
 "Warning: You loaded a save that's after the end of the current movie. (byte "
@@ -5507,7 +5663,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:861
+#: Source/Core/Core/Src/Movie.cpp:852
 #, c-format
 msgid ""
 "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You "
@@ -5518,7 +5674,7 @@ msgstr ""
 "전에 다른 세이브를 로드해야합니다, 혹은 읽기-전용 모드를 끄고 로드하세요. 그"
 "렇지 않으면 아마도 싱크 어긋남이 생길겁니다."
 
-#: Source/Core/Core/Src/Movie.cpp:870
+#: Source/Core/Core/Src/Movie.cpp:861
 #, c-format
 msgid ""
 "Warning: You loaded a save whose movie mismatches on frame %d. You should "
@@ -5551,49 +5707,49 @@ msgstr ""
 "Start=%d, A=%d, B=%d, X=%d, Y=%d, Z=%d, DUp=%d, DDown=%d, DLeft=%d, DRight="
 "%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d"
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:106
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:129
+#: Source/Core/AudioCommon/Src/WaveFile.cpp:93
+#: Source/Core/AudioCommon/Src/WaveFile.cpp:116
 msgid "WaveFileWriter - file not open."
 msgstr "WaveFileWriter - 파일이 열리지 않습니다."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:56
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:60
 msgid "Whammy"
 msgstr "훼미"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:404
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:408
 msgid "Widescreen Hack"
 msgstr "와이드스크린 핵"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:312
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:299
 msgid "Width"
 msgstr "너비"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535
 msgid "Wii"
 msgstr "Wii"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:372
 msgid "Wii Console"
 msgstr "Wii 콘솔"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:844
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:825
 msgid "Wii NAND Root:"
 msgstr "Wii NAND 루트:"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:191
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:194
 msgid "Wii Save Import"
 msgstr "Wii 저장 가져오기"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1243
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1270
 msgid "Wii save files (*.bin)|*.bin"
 msgstr "Wii 저장 파일들 (*.bin)|*.bin"
 
-#: Source/Core/DiscIO/Src/WiiWad.cpp:82
+#: Source/Core/DiscIO/Src/WiiWad.cpp:69
 msgid "WiiWAD: Could not read from file"
 msgstr "WiiWAD: 파일로 부터 읽을 수 없었습니다"
 
-#: Source/Core/Core/Src/HW/Wiimote.cpp:17
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
+#: Source/Core/Core/Src/HW/Wiimote.cpp:20
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
 msgid "Wiimote"
 msgstr "위모트"
 
@@ -5602,7 +5758,7 @@ msgstr "위모트"
 msgid "Wiimote %i"
 msgstr "위모트 %i"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:628
+#: Source/Core/DolphinWX/Src/Main.cpp:656
 msgid "Wiimote Connected"
 msgstr "위모트가 연결됨"
 
@@ -5610,7 +5766,7 @@ msgstr "위모트가 연결됨"
 msgid "Wiimote Motor"
 msgstr "위모트 모터"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
 msgid "Wiimote settings"
 msgstr "위모트 설정"
 
@@ -5618,101 +5774,125 @@ msgstr "위모트 설정"
 msgid "Wiimotes"
 msgstr "위모트"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:134
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:121
 msgid "Windows Left"
 msgstr "윈도우즈 왼쪽"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:136
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:123
 msgid "Windows Menu"
 msgstr "윈도우즈 메뉴"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:135
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:122
 msgid "Windows Right"
 msgstr "윈도우즈 오른쪽"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:131
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:124
 msgid "Word Wrap"
 msgstr "자동 줄바꿈"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1298
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:864
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1089
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1225
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1325
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:880
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1090
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1226
 msgid "Working..."
 msgstr "작동중..."
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:338
+msgid "Write memcards (GC)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46
 msgid "Write to Console"
 msgstr "콘솔에 쓰기"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:67
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:54
 msgid "Write to Debugger"
 msgstr "디버거에 기록"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:57
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44
 msgid "Write to File"
 msgstr "파일에 쓰기"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:61
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48
 msgid "Write to Window"
 msgstr "윈도우에 쓰기"
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:60
+#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:47
 #, c-format
 msgid "XAudio2 CreateSourceVoice failed: %#X"
 msgstr "XAudio2 CreateSourceVoice 실패: %#X"
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:114
+#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:101
 #, c-format
 msgid "XAudio2 init failed: %#X"
 msgstr "XAudio2 초기화 실패: %#X"
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:124
+#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:111
 #, c-format
 msgid "XAudio2 master voice creation failed: %#X"
 msgstr "XAudio2 매스터 보이스 생성 실패: %#X"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:766
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:765
 msgid "XF reg"
 msgstr "XF 레지"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:21
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Yellow"
 msgstr "노랑"
 
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:107
+#: Source/Core/Core/Src/DSP/DSPCore.cpp:120
 msgid ""
-"You are using free dsp roms made by Dolphin Team.\n"
-"Only Zelda ucode games will work correctly with them.\n"
+"You are using a free DSP ROM made by the Dolphin Team.\n"
+"All Wii games will work correctly, and most GC games should also work fine, "
+"but the GBA/IPL/CARD UCodes will not work.\n"
 msgstr ""
-"당신은 돌핀 팀에 의해 만들어진 공짜 dsp 롬들을 사용하고 있습니다.\n"
-"Zelda ucode 게임들만이 그것들로 올바르게 작동할 것입니다.\n"
+"당신은 돌핀팀에 의해 만들어진 무료 DSP 롬을 사용하고 있습니다.\n"
+"모든 Wii 게임들은 올바르게 작동할 것입니다, 그리고 대부분의 GC 게임들도 잘 작"
+"동할 겁니다, 하지만 GBA/IPL/CARD UCode들은 작동하지 않을 겁니다.\n"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:73
+#: Source/Core/Core/Src/DSP/DSPCore.cpp:116
+msgid ""
+"You are using an old free DSP ROM made by the Dolphin Team.\n"
+"Only games using the Zelda UCode will work correctly.\n"
+msgstr ""
+"당신은 돌핀 팀에 의해 만들어진 무료 dsp 롬을 사용하고 있습니다.\n"
+"Zelda Ucode를 사용하는 게임들만이 올바르게 작동할 것입니다.\n"
+
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:63
 msgid "You can't close panes that have pages in them."
 msgstr "당신은 페이지들을 가진 창을 닫을 수 없습니다."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:207
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:210
 msgid "You must choose a game!!"
 msgstr "게임을 선택해야 합니다!!"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:605
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:593
 msgid "You must enter a name!"
 msgstr "이름을 넣어야 합니다!"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:450
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:438
 msgid "You must enter a valid decimal, hexadecimal or octal value."
 msgstr "적합한 10진수나 16진수나 8진수 값을 넣어야 합니다."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:603
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:591
 msgid "You must enter a valid profile name."
 msgstr "적합한 프로파일 이름을 넣어야 합니다."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:936
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:917
 msgid "You must restart Dolphin in order for the change to take effect."
 msgstr "변경이 적용되려면 돌핀을 재시작 해야 합니다."
 
-#: Source/Core/Core/Src/CoreParameter.cpp:175
+#: Source/Core/Core/Src/DSP/DSPCore.cpp:109
+msgid ""
+"Your DSP ROMs have incorrect hashes.\n"
+"Would you like to stop now to fix the problem?\n"
+"If you select \"No\", audio might be garbled."
+msgstr ""
+"당신의 DSP 롬들이 잘못된 해쉬를 지녔습니다.\n"
+"문제를 고치기위해 지금 중단하시겠습니까?\n"
+"\"아니오\"를 선택하면, 오디오가 왜곡될 지도 모릅니다."
+
+#: Source/Core/Core/Src/CoreParameter.cpp:164
 msgid ""
 "Your GCM/ISO file seems to be invalid (invalid country).\n"
 "Continue with PAL region?"
@@ -5720,7 +5900,7 @@ msgstr ""
 "당신의 GCM/ISO 파일이 비적합(비적합 국가)인 것 같습니다.\n"
 "PAL 지역으로 계속합니까?"
 
-#: Source/Core/Common/Src/SysConf.cpp:58
+#: Source/Core/Common/Src/SysConf.cpp:45
 #, c-format
 msgid ""
 "Your SYSCONF file is the wrong size.\n"
@@ -5731,25 +5911,25 @@ msgstr ""
 "0x%04x 이어야합니다 (하지만 0x%04llx 임) \n"
 "새로 생성하시겠습니까?"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:334
 msgid "ZTP hack"
 msgstr "ZTP 핵"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:387
+#: Source/Core/Core/Src/ActionReplay.cpp:377
 msgid "Zero 3 code not supported"
 msgstr "Zero 3 코드는 지원되지 않습니다"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:408
+#: Source/Core/Core/Src/ActionReplay.cpp:398
 #, c-format
 msgid "Zero code unknown to dolphin: %08x"
 msgstr "돌핀에 알려지지 않은 Zero 코드: %08x"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:436
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:460
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:423
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:447
 msgid "[ waiting ]"
 msgstr "[ 대기 ]"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107
 msgid ""
 "[BROKEN]\n"
 "Highlight regions the EFB was copied from.\n"
@@ -5761,11 +5941,11 @@ msgstr ""
 "\n"
 "모르겠으면, 이것을 언체크로 두세요."
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:91
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:78
 msgid "[Custom]"
 msgstr "[사용자 지정]"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120
 msgid ""
 "[EXPERIMENTAL]\n"
 "Aims to speed up emulation by offloading texture decoding to the GPU using "
@@ -5783,7 +5963,7 @@ msgstr ""
 "\n"
 "모르겠으면, 이것을 언체크로 두세요."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121
 msgid ""
 "[EXPERIMENTAL]\n"
 "Speeds up emulation a bit by caching display lists.\n"
@@ -5797,97 +5977,47 @@ msgstr ""
 "\n"
 "모르겠으면, 이것을 언체크로 두세요."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:508
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:495
 msgid "^ ADD"
 msgstr "^ ADD"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:820
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:801
 msgid "apploader (.img)"
 msgstr "앱로더 (.img)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:185
-msgid "failed to read bk header"
-msgstr "bk 헤더 읽기에 실패했습니다"
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:375
-#, c-format
-msgid "failed to read data from file: %s"
-msgstr "파일: %s 에서 데이터 읽기에 실패"
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:97
-msgid "failed to read header"
-msgstr "헤더 읽기에 실패했습니다"
-
-#: Source/Core/Core/Src/PowerPC/JitInterface.cpp:285
+#: Source/Core/Core/Src/PowerPC/JitInterface.cpp:272
 #, c-format
 msgid "iCacheJIT: Reading Opcode from %x. Please report."
 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 "wii 저장이 아니거나 파일 헤더 크기 %x에 대한 읽기 실패 "
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:935
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:936
 msgid "s"
 msgstr "들"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:457
-#, c-format
-msgid "unknown cmd 0x%08x"
-msgstr "알려지지 않은 명령 0x%08x"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1110
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1136
 msgid "wxExecute returned -1 on application run!"
 msgstr "애플리케이션 구동상에서 wxExecute가 -1을 반환했습니다!"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:56
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:43
 msgid "zFar Correction: "
 msgstr "z원거리 정정:"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:51
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:38
 msgid "zNear Correction: "
 msgstr "z근거리 정정:"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:493
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:480
 msgid "| OR"
 msgstr "| OR"
 
-#~ msgid "%i connected"
-#~ msgstr "%i 연결되었습니다"
-
-#~ msgid "Alternate Wiimote Timing"
-#~ msgstr "위모트 타이밍 대안"
-
-#~ msgid "Interpreter (VERY slow)"
-#~ msgstr "인터프리터 (매우 느림)"
-
-#~ msgid "JIT Recompiler (recommended)"
-#~ msgstr "JIT 리컴파일러 (권장)"
-
-#~ msgid "JITIL experimental recompiler"
-#~ msgstr "JITIL 실험적 리컴파일러"
+#~ msgid "Accurate VBeam emulation"
+#~ msgstr "정확한 VBeam 에뮬레이션"
 
 #~ msgid ""
-#~ "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. "
-#~ "No effect on emulated wiimotes."
+#~ "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)"
 #~ msgstr ""
-#~ "위모트 스피커를 음소거합니다. 실제 위모트 상에서 랜덤 연결해제들을 고칩니"
-#~ "다. 에뮬된 위모트 상에서는 효과 없음."
+#~ "FPS가 불규칙적이면, 이 옵션이 도움이 될 수도 있습니다. (켬 = 호환성, 끔 = "
+#~ "빠름)"
 
-#~ msgid "Pair Up"
-#~ msgstr "연결하기"
-
-#~ msgid "Reconnect Wiimote Confirm"
-#~ msgstr "위모트 재연결 확인"
-
-#~ msgid ""
-#~ "Wiimote %i has been disconnected by system.\n"
-#~ "Maybe this game doesn't support multi-wiimote,\n"
-#~ "or maybe it is due to idle time out or other reason.\n"
-#~ "Do you want to reconnect immediately?"
-#~ msgstr ""
-#~ "위모트 %i 가 시스템에 의해 연결해제되었습니다.\n"
-#~ "아마도 이 게임은 멀티-위모트를 지원하지 않습니다.\n"
-#~ "혹은 아마도 아이들 타임 아웃이거나 다른 원인 때문인 것 같습니다.\n"
-#~ "당신은 즉시 재연결 하고 싶습니까?"
+#~ msgid "Skip Dest. Alpha Pass"
+#~ msgstr "목적지. 알파 패스 스킵"
diff --git a/Languages/po/nb.po b/Languages/po/nb.po
index c829678ab6..146645009d 100644
--- a/Languages/po/nb.po
+++ b/Languages/po/nb.po
@@ -3,36 +3,38 @@
 # This file is distributed under the same license as the dolphin-emu package.
 #
 # Translators:
-# Knut <e-k-nut@hotmail.com>, 2011.
+# KHRZ <e-k-nut@hotmail.com>, 2013
+# Knut <e-k-nut@hotmail.com>, 2011
 msgid ""
 msgstr ""
 "Project-Id-Version: Dolphin Emulator\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-10 08:56-0500\n"
-"PO-Revision-Date: 2013-02-02 08:31+0000\n"
-"Last-Translator: delroth <delroth@gmail.com>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"POT-Creation-Date: 2013-04-18 23:00-0500\n"
+"PO-Revision-Date: 2013-04-18 22:56-0500\n"
+"Last-Translator: KHRZ <e-k-nut@hotmail.com>\n"
+"Language-Team: Norwegian Bokmål (http://www.transifex.com/projects/p/dolphin-"
+"emu/language/nb/)\n"
 "Language: nb\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:511
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:499
 msgid " (too many to display)"
 msgstr "(for mange til til å vises)"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:270
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:273
 #: Source/Core/DolphinWX/Src/NetWindow.cpp:491
 #: Source/Core/DolphinWX/Src/NetWindow.cpp:530
 msgid " Game : "
 msgstr "Spill :"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:507
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494
 msgid "! NOT"
 msgstr "! IKKE"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:70
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:58
 #, c-format
 msgid ""
 "\"%s\" does not exist.\n"
@@ -41,95 +43,100 @@ msgstr ""
 "\"%s\" eksisterer ikke.\n"
 " Lag et nytt 16MB Minnekort?"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:142
+#: Source/Core/Core/Src/CoreParameter.cpp:131
 #, c-format
 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:722
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:721
 #, c-format
 msgid "%08X:  "
-msgstr ""
+msgstr "%08X:  "
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:196
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:183
 #, c-format
 msgid "%1$sCopy%1$s"
 msgstr "%1$sKopier%1$s"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:128
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:296
+#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:113
+#, c-format
+msgid "%d samples"
+msgstr "%d samples"
+
+#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:112
+#, c-format
+msgid "%d samples (quality level %d)"
+msgstr "%d samples (kvalitetsnivå %d)"
+
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:121
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:289
 #, c-format
 msgid "%s already exists, overwrite?"
 msgstr "%s eksisterer allerede. Overskriv?"
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:167
+#: Source/Core/DiscIO/Src/CompressedBlob.cpp:154
 #, c-format
 msgid "%s failed to be scrubbed. Probably the image is corrupt."
 msgstr "%s mislykket i å skrubbe. Sannsynligvis er bildefilen korrupt."
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:95
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:83
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
 " Card file size is invalid (0x%x bytes)"
 msgstr ""
+"%s mislyktes i å laste som et minnekort \n"
+" Minnekortstørrelse er ugyldig (0x%x byte)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:110
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:98
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
 " Card size is invalid (0x%x bytes)"
 msgstr ""
+"%s mislyktes i å laste som et minnekort \n"
+" Minnekortstørrelse ugyldig (0x%x byte)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:90
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:78
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
 "file is not large enough to be a valid memory card file (0x%x bytes)"
 msgstr ""
+"%s mislyktes i å laste som et minnekort \n"
+" Minnekortstørrelse er for liten til å være et gyldig minnekort (0x%x byte)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:367
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:359
 #, c-format
 msgid "%s failed to open"
 msgstr "%s kunne ikke åpne"
 
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:97
-#, c-format
-msgid ""
-"%s has an incorrect hash.\n"
-"Would you like to stop now to fix the problem?\n"
-"If you select \"No\", audio will be garbled."
-msgstr ""
-"%s har gal hash-sjekksum.\n"
-"Vil du stoppe nå og fikse problemet?\n"
-"Velger du \"Nei\", vil audio ha forstyrrelser."
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:360
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:352
 #, c-format
 msgid "%s is a 0 byte file"
 msgstr "%s er en 0-byte fil"
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:159
+#: Source/Core/DiscIO/Src/CompressedBlob.cpp:146
 #, c-format
 msgid "%s is already compressed! Cannot compress it further."
 msgstr "%s er allerede komprimert! Kan ikke komprimere videre."
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:345
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:337
 #, c-format
 msgid "%s is too long for the filename, max chars is 45"
 msgstr "%s er for langt for et filnavn, maks antall tegn er 45"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:202
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:189
 #, c-format
 msgid "%sDelete%s"
 msgstr "%sSlett%s"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:200
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:187
 #, c-format
 msgid "%sExport GCI%s"
 msgstr "%sEksporter GCI%s"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:198
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:185
 #, c-format
 msgid "%sImport GCI%s"
 msgstr "%sImporter GCI%s"
@@ -139,222 +146,246 @@ msgstr "%sImporter GCI%s"
 msgid "%u Free Blocks; %u Free Dir Entries"
 msgstr "%u Ledige Blokker; %u Ledige Dir Entries"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:506
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:493
 msgid "&& AND"
 msgstr "&& OG"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:295
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:301
 msgid "&About..."
 msgstr "&Om..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:99
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:100
 msgid "&Boot from DVD Drive..."
 msgstr "&Start fra DVD-stasjon..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:231
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:234
 msgid "&Breakpoints"
 msgstr "&Breakpoints"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:110
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:111
 msgid "&Browse for ISOs..."
 msgstr "&Bla etter ISO-filer..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:192
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:195
 msgid "&Cheats Manager"
 msgstr "Jukse&kode-manager"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:177
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:180
 msgid "&DSP Settings"
 msgstr "Innstillinger for &DSP"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:885
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:876
 msgid "&Delete ISO..."
 msgstr "&Slett ISO..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:903
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:897
 msgid "&Delete selected ISOs..."
 msgstr "&Slett valgte ISO-filer..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:170
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:173
 msgid "&Emulation"
 msgstr "&Emulasjon"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:113
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:114
 msgid "&File"
 msgstr "&Fil"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:335
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:341
 msgid "&Frame Advance"
 msgstr "&Bilde Forover"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:352
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:358
 msgid "&Fullscreen"
 msgstr "&Fullskjerm"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:176
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:179
 msgid "&Graphics Settings"
 msgstr "&Konfigurer Grafikk"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:296
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:302
 msgid "&Help"
 msgstr "&Hjelp"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:180
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:183
 msgid "&Hotkey Settings"
 msgstr "Innstillinger for &Hot-tast"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:233
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:236
 msgid "&JIT"
 msgstr "&JIT"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:148
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:149
 msgid "&Load State"
 msgstr "Last &inn Save State"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:190
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:193
 msgid "&Memcard Manager (GC)"
 msgstr "&Minnekort Manager (GC)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:232
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:235
 msgid "&Memory"
 msgstr "&Minne"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:313
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:319
 msgid "&Open..."
 msgstr "&Åpne..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:186
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:189
 msgid "&Options"
 msgstr "&Innstillinger"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:324
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:330
 msgid "&Pause"
 msgstr "&Pause"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:326
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:332
 msgid "&Play"
 msgstr "&Spill"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:867
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:858
 msgid "&Properties"
 msgstr "&Egenskaper"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:348
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:354
 msgid "&Read-only mode"
 msgstr "Les-kun &modus"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:319
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:325
 msgid "&Refresh List"
 msgstr "&Oppdater liste"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:230
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:233
 msgid "&Registers"
 msgstr "&Registre"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:332
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:338
 msgid "&Reset"
 msgstr "&Restart"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:234
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:237
 msgid "&Sound"
 msgstr "&Lyd"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:329
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:335
 msgid "&Stop"
 msgstr "S&topp"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:207
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:210
 msgid "&Tools"
 msgstr "&Verktøy"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:235
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:238
 msgid "&Video"
 msgstr "&Video"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:284
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:287
 msgid "&View"
 msgstr "Vi&s"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:179
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:182
 msgid "&Wiimote Settings"
-msgstr "Innstillinger for Wiimote"
+msgstr "Innstillinger for &Wiimote"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:868
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:859
 msgid "&Wiki"
 msgstr "&Wiki"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504
 msgid "'"
-msgstr ""
+msgstr "'"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:59
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:46
 msgid "(-)+zFar"
 msgstr "(-)+zFar"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:54
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:41
 msgid "(-)+zNear"
 msgstr "(-)+zNear"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:99
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:86
 msgid "(UNKNOWN)"
 msgstr "(UKJENT)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:376
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:384
 msgid "(off)"
 msgstr "(av)"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:655
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:654
 msgid "0x44"
-msgstr ""
+msgstr "0x44"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+msgid "1.5x Native (960x792)"
+msgstr "1.5x Innfødt (960x792)"
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:158
 msgid "16 bit"
 msgstr "16-bit"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+msgid "1x Native (640x528)"
+msgstr "1x Innfødt (640x528)"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+msgid "2.5x Native (1600x1320)"
+msgstr "2.5x Innfødt (1600x1320)"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+msgid "2x Native (1280x1056)"
+msgstr "2x Innfødt (1280x1056)"
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:159
 msgid "32 bit"
 msgstr "32-bit"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:412
 msgid "3D Vision"
 msgstr "3D Vision"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+msgid "3x Native (1920x1584)"
+msgstr "3x Innfødt (1920x1584)"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+msgid "4x Native (2560x2112)"
+msgstr "4x Innfødt (2560x2112)"
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:157
 msgid "8 bit"
 msgstr "8-bit"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:43
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:30
 msgid "<Insert name here>"
 msgstr "<Sett inn navn her>"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:255
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:262
 msgid "<No resolutions found>"
 msgstr "<Ingen oppløsning funnet>"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:104
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84
 msgid "<Nothing>"
 msgstr "<Ingenting>"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:162
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:162
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:150
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:150
 msgid "<Press Key>"
 msgstr "<Trykk Knapp>"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286
 msgid "<System>"
 msgstr "<System>"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695
 msgid "A"
-msgstr ""
+msgstr "A"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:201
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:235
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:204
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:238
 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:353
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:387
 msgid "A game is not currently running."
 msgstr "Det kjøres ingen spill nå."
 
@@ -363,24 +394,27 @@ msgid ""
 "A supported bluetooth device could not be found.\n"
 "You must manually connect your wiimotes."
 msgstr ""
+"En støttet bluetooth-enhet kunne ikke finnes.\n"
+" Du må manuelt koble til dine WiiMote-er."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:109
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:100
+#, fuzzy
 msgid ""
 "ALERT:\n"
 "\n"
-"NetPlay will currently only work properly when using the following "
-"settings:\n"
-" - Dual Core [OFF]\n"
-" - Audio Throttle [OFF]\n"
-" - DSP-HLE with \"Null Audio\" or DSP-LLE\n"
-" - Manually set the exact number of controllers that will be used to "
-"[Standard Controller]\n"
+"Netplay will only work with the following settings:\n"
+" - Enable Dual Core [OFF]\n"
+" - DSP Emulator Engine Must be the same on all computers!\n"
+" - DSP on Dedicated Thread [OFF]\n"
+" - Framelimit NOT set to [Audio]\n"
+" - Manually set the exact number of controllers to be used to [Standard "
+"Controller]\n"
 "\n"
-"All players should try to use the same Dolphin version and settings.\n"
-"Disable all memory cards or send them to all players before starting.\n"
-"Wiimote support has not been implemented.\n"
+"All players should use the same Dolphin version and settings.\n"
+"All memory cards must be identical between players or disabled.\n"
+"Wiimote support has not been implemented!\n"
 "\n"
-"You must forward TCP port to host!!"
+"The host must have the chosen TCP port open/forwarded!\n"
 msgstr ""
 "ADVARSEL:\n"
 "\n"
@@ -399,17 +433,17 @@ msgstr ""
 "\n"
 "Du må fremme TCP-porten til verten!!"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:111
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:116
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96
 msgid "AM-Baseboard"
 msgstr "AM-Baseboard"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:299
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:115
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:300
 msgid "AR Codes"
 msgstr "<AR-koder>"
 
-#: Source/Core/DolphinWX/Src/AboutDolphin.h:33
+#: Source/Core/DolphinWX/Src/AboutDolphin.h:21
 msgid "About Dolphin"
 msgstr "Om Dolphin"
 
@@ -417,15 +451,11 @@ msgstr "Om Dolphin"
 msgid "Acceleration"
 msgstr "Aksellerasjon"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:463
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473
 msgid "Accuracy:"
 msgstr "Nøyaktighet:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317
-msgid "Accurate VBeam emulation"
-msgstr "Nøyaktig VBeam-emulering"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97
 msgid ""
 "Accurately emulate EFB copies.\n"
 "Some games depend on this for certain graphical effects or gameplay "
@@ -433,13 +463,18 @@ msgid ""
 "\n"
 "If unsure, check EFB to Texture instead."
 msgstr ""
+"Emuler EFB-kopier nøyaktig.\n"
+" Noen spill avhenger av dette for visse grafiske effekter eller gameplay-"
+"funksjonaliteter.\n"
+" \n"
+" Hvis usikker, velg EFB-til-tekstur isteden."
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:239
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:239
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:227
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:227
 msgid "Action"
 msgstr "Aksjon"
 
-#: Source/Core/Core/Src/ARDecrypt.cpp:481
+#: Source/Core/Core/Src/ARDecrypt.cpp:469
 #, c-format
 msgid ""
 "Action Replay Code Decryption Error:\n"
@@ -454,7 +489,7 @@ msgstr ""
 "Skyldig-kode:\n"
 "%s"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:667
+#: Source/Core/Core/Src/ActionReplay.cpp:657
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)"
@@ -462,7 +497,7 @@ msgstr ""
 "Action Replay Feil: Ugyldig størrelse (%08x : addresse = %08x) i Legg Til "
 "Kode (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:755
+#: Source/Core/Core/Src/ActionReplay.cpp:745
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide "
@@ -471,7 +506,7 @@ msgstr ""
 "Action Replay Feil: Ugyldig størrelse (%08x : addresse = %08x) in Fyll Og "
 "Skli (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:547
+#: Source/Core/Core/Src/ActionReplay.cpp:537
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And "
@@ -480,7 +515,7 @@ msgstr ""
 "Action Replay Feil: Ugyldig størrelse (%08x : addresse = %08x) i Ram-skriv "
 "Og Fyll (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:607
+#: Source/Core/Core/Src/ActionReplay.cpp:597
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Write To "
@@ -489,75 +524,78 @@ msgstr ""
 "Action Replay Feil: Ugyldig størrelse (%08x : addresse = %08x) i Skriv Til "
 "Peker (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:802
+#: Source/Core/Core/Src/ActionReplay.cpp:792
 #, c-format
 msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)"
 msgstr "Action Replay Feil: Ugyldig verdi (%08x) i Minnekopi (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:682
+#: Source/Core/Core/Src/ActionReplay.cpp:672
 #, c-format
 msgid ""
 "Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)\n"
 "Master codes are not needed. Do not use master codes."
 msgstr ""
+"Action Replay feil: Master koder og skriving til CCXXXXXX ikke implementert "
+"(%s)\n"
+" Master koder behøves ikke. Ikke bruk master koder."
 
-#: Source/Core/Core/Src/ActionReplay.cpp:196
+#: Source/Core/Core/Src/ActionReplay.cpp:184
 #, c-format
 msgid "Action Replay Error: invalid AR code line: %s"
 msgstr "Action Replay Feil: Ugyldig AR-kode linje: %s"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:872
+#: Source/Core/Core/Src/ActionReplay.cpp:862
 #, 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:945
+#: Source/Core/Core/Src/ActionReplay.cpp:935
 #, 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:896
+#: Source/Core/Core/Src/ActionReplay.cpp:886
 #, 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:838
+#: Source/Core/Core/Src/ActionReplay.cpp:828
 #, 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:242
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:247
 msgid "Adapter:"
 msgstr "Adapter:"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:76
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:63
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:63
 msgid "Add"
 msgstr "Legg Til"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1275
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1301
 msgid "Add ActionReplay Code"
 msgstr "Legg til Action Replay Kode"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1204
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1230
 msgid "Add Patch"
 msgstr "Legg til Patch"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:507
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:528
 msgid "Add new pane"
 msgstr "Legg til ny rute"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:404
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:426
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:811
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:408
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:430
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:792
 msgid "Add..."
 msgstr "Legg til..."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:90
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:81
 msgid "Address :"
 msgstr "Adresse :"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:58
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:45
 msgid ""
 "Adds the specified value to zFar Parameter.\n"
 "Two ways to express the floating point values.\n"
@@ -575,7 +613,7 @@ msgstr ""
 "\n"
 "MERKNAD: Sjekk Loggvindu/Konsoll for de oppnådde verdier."
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:53
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:40
 msgid ""
 "Adds the specified value to zNear Parameter.\n"
 "Two ways to express the floating point values.\n"
@@ -593,90 +631,95 @@ msgstr ""
 "\n"
 "MERKNAD: Sjekk Loggvindu/Konsoll for de oppnådde verdier."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:755
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:744
 msgid "Adjust the analog control pressure required to activate buttons."
 msgstr "Juster analogkontrolltrykket som kreves for å aktivere knapper."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:509
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:522
 msgid "Advanced"
 msgstr "Avansert"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561
 msgid "Advanced Settings"
 msgstr "Avanserte Innstillinger"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:584
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:587
 msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)"
-msgstr ""
+msgstr "Alle GameCube/Wii filer (elf, dol, gcm, wbfs, ciso, gcz, wad)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:816
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:797
 msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)"
-msgstr ""
+msgstr "Alle GameCube/Wii avbildningsfiler/rip (gcm, iso, wbfs, ciso, gcz)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1189
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1190
 msgid "All Gamecube GCM files (gcm)"
 msgstr "Alle GameCube GCM-filer (gcm)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1390
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1404
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1417
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1431
 msgid "All Save States (sav, s##)"
 msgstr "Alle Save States (sav, s##)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1187
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1188
 msgid "All Wii ISO files (iso)"
 msgstr "Alle Wii ISO-filer (iso)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1207
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1208
 msgid "All compressed GC/Wii ISO files (gcz)"
 msgstr "Alle komprimerte GC/Wii-filer (gcz)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:124
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:104
 msgid "All files (*.*)|*.*"
 msgstr "Alle filer (*.*)|*.*"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123
 msgid ""
 "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 ""
+"Tillater bytting mellom visse innstilliner via snarveistastene 3 (intern "
+"oppløsning), 4 (Aspekt ratio), 5 (Kopier EFB) og 6 (Tåke) i "
+"emuleringsvinduet.\n"
+" \n"
+" Hvis usikker, la stå uaktivert."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:285
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:272
 msgid "Analyze"
-msgstr ""
+msgstr "Analyser"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:298
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:285
 msgid "Angle"
-msgstr ""
+msgstr "Vinkel"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:367
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:375
 msgid "Anisotropic Filtering:"
 msgstr "Anisotropisk Filtrering:"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:350
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:358
 msgid "Anti-Aliasing:"
 msgstr "Kantutjevning:"
 
-#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:308
+#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:299
 msgid "Apploader is the wrong size...is it really an apploader?"
 msgstr ""
 "Applikasjonslasteren er i feil størrelse... er dette virkelig en "
 "applikasjonslaster?"
 
-#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:302
+#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:293
 msgid "Apploader unable to load from file"
 msgstr "Applikasjonlaster klarte ikke å laste fra fil"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:841
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:822
 msgid "Apploader:"
 msgstr "Applikasjonslaster:"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:135
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:122
 msgid "Apply"
 msgstr "Bruk"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124
 msgid ""
 "Apply a post-processing effect after finishing a frame.\n"
 "\n"
@@ -686,11 +729,11 @@ msgstr ""
 "\n"
 "Hvis usikker, la stå avslått."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287
 msgid "Arabic"
 msgstr "Arabisk"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:614
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:603
 #, c-format
 msgid "Are you sure you want to delete \"%s\"?"
 msgstr "Er du sikker på at du vil slette \"%s\"?"
@@ -709,46 +752,50 @@ msgstr ""
 "Er du sikker på at du vil slette denne filen?\n"
 "Den vil bli borte for alltid!"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:789
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:277
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:44
+msgid "Arm JIT (experimental)"
+msgstr "Arm JIT (eksperimentell)"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:285
 msgid "Aspect Ratio:"
 msgstr "Aspektforhold:"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:70
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:58
 msgid "At least one pane must remain open."
 msgstr "Minst en rute må stå åpen."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:553
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533
 msgid "Audio"
 msgstr "Audio"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:694
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675
 msgid "Audio Backend:"
 msgstr "Audio Backend:"
 
-#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:41
+#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:28
 msgid "AudioCommon: Error opening AO device.\n"
 msgstr "AudioCommon: Feil ved åpning av AO-device.\n"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:275
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283
 msgid "Auto"
 msgstr "Automatisk"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:337
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345
 msgid "Auto (Multiple of 640x528)"
 msgstr "Auto (Multiplum av 640x528)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:337
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345
 msgid "Auto (Window Size)"
 msgstr "Automatisk (Vindusstørrelse):"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:297
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305
 msgid "Auto adjust Window Size"
 msgstr "Automatisk juster Vindusstørrelse"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77
 msgid ""
 "Automatically adjusts the window size to your internal resolution.\n"
 "\n"
@@ -758,160 +805,162 @@ msgstr ""
 "\n"
 "Hvis usikker, la stå avslått."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:697
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696
 msgid "B"
-msgstr ""
+msgstr "B"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:755
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:754
 msgid "BP register "
-msgstr ""
+msgstr "BP-register"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:27
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:14
 msgid "Back"
 msgstr "Tilbake"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:698
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:679
 msgid "Backend Settings"
 msgstr "Backend-innstillinger"
 
-#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:60
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:206
+#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:47
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:211
 msgid "Backend:"
 msgstr "Backend:"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:318
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:95
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:305
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:82
 msgid "Background Input"
 msgstr "Bakgrunnsinndata"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:279
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:266
 msgid "Backward"
 msgstr "Bakover"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:264
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:257
 msgid "Bad File Header"
 msgstr "Dårlig Fil-header"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:627
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:621
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:290
 msgid "Banner"
 msgstr "Banner"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:519
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:529
 msgid "Banner Details"
 msgstr "Bannerdetaljer"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491
 msgid "Banner:"
 msgstr "Banner:"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:57
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:61
 msgid "Bar"
 msgstr "Bar"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:308
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:316
 msgid "Basic"
 msgstr "Grunnleggende"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555
 msgid "Basic Settings"
 msgstr "Grunnleggende Innstillinger"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:22
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Bass"
 msgstr "Bass"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:186
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:174
 msgid "Block Allocation Table checksum failed"
 msgstr "Blokkallokasjontabellsjekksum feilet"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:631
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625
 msgid "Blocks"
 msgstr "Blokker"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:21
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Blue"
 msgstr "Blå"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:24
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Blue Left"
 msgstr "Blå Venstre"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:25
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Blue Right"
 msgstr "Blå Høyre"
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:87
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270
 msgid "Bottom"
 msgstr "Bunn"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:238
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:225
 #, c-format
 msgid "Bound Controls: %lu"
 msgstr "Bundede Kontroller: %lu"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348
 msgid "Broken"
 msgstr "Ødelagt"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:422
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:428
 msgid "Browse"
 msgstr "Bla i"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:256
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:243
 msgid "Browse for a directory to add"
 msgstr "Bla etter en mappe å legge til"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:422
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:428
 msgid "Browse for an ISO directory..."
 msgstr "Bla etter en ISO-mappe..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1079
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1080
 msgid "Browse for output directory"
 msgstr "Bla etter lagringssted"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:328
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:331
 msgid "Buffer:"
 msgstr "Buffer:"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:58
 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:119
+#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:106
 msgid "Buttons"
 msgstr "Knapper"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317
 msgid ""
 "Bypass the clearing of the data cache by the DCBZ instruction. Usually leave "
 "this option disabled."
 msgstr ""
+"Overstyr tømmingen av data-cache-en av DCBZ-instruksjonen. Vanligvis bør "
+"denne innstillingen stå uaktivert."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:698
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:697
 msgid "C"
-msgstr ""
+msgstr "C"
 
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:77
+#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:64
 msgid "C Stick"
-msgstr ""
+msgstr "C-joystick"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:77
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:64
 msgid "C-Stick"
 msgstr "C-joystick"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:764
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:763
 msgid "CP reg"
-msgstr ""
+msgstr "CP-register"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:567
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547
 msgid "CPU Emulator Engine"
 msgstr "CPU-emulatormotor"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:490
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500
 msgid "Cache Display Lists"
 msgstr "Cacher Display-lister"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88
 msgid ""
 "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n"
 "Decreases emulation speed by some percent (depending on your GPU).\n"
@@ -925,31 +974,49 @@ msgstr ""
 "\n"
 "Hvis usikker, la stå avslått."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1858
+#, c-format
+msgid "Can't 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:1872
+#, c-format
+msgid "Can't find WiiMote by connection handle %02x"
+msgstr "Kan ikke finne WiiMote fra koblingshandler %02x"
+
+#: Source/Core/Core/Src/HW/DVDInterface.cpp:669
+#: Source/Core/Core/Src/HW/DVDInterface.cpp:679
+msgid "Can't read from DVD_Plugin - DVD-Interface: Fatal Error"
+msgstr "Kan ikke lese fra DVD_Plugin - DVD-Interface: Fatal Feil"
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:124
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:28
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:91
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:178
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:240
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:84
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:171
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:233
 #, c-format
 msgid "Cannot open %s"
 msgstr "Kan ikke åpne %s"
 
-#: Source/Core/Core/Src/CoreTiming.cpp:141
+#: Source/Core/Core/Src/CoreTiming.cpp:128
 msgid "Cannot unregister events with events pending"
 msgstr "Kan ikke avregistrere events med events under behandling"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1078
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1061
 #, c-format
 msgid ""
 "Cannot use that file as a memory card.\n"
 "%s\n"
 "is not a valid gamecube memory card file"
 msgstr ""
+"Kan ikke bruke den filen som et minnekort.\n"
+" %s\n"
+" er ikke en gyldig GameCube-minnekortfil."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1108
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1091
 msgid ""
 "Cannot use that file as a memory card.\n"
 "Are you trying to use the same file in both slots?"
@@ -957,30 +1024,15 @@ 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:1867
-#, 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:1881
-#, 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: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"
-
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:52
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:39
 msgid "Caps Lock"
 msgstr "Caps Lock"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288
 msgid "Catalan"
 msgstr "Katalansk"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:311
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:298
 msgid "Center"
 msgstr "Senter"
 
@@ -988,12 +1040,12 @@ msgstr "Senter"
 msgid "Change"
 msgstr "Endre"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:316
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:322
 msgid "Change &Disc..."
 msgstr "Endre &Disk..."
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:179
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:179
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:167
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:167
 msgid "Change Disc"
 msgstr "Endre Disk"
 
@@ -1001,7 +1053,7 @@ msgstr "Endre Disk"
 msgid "Change Game"
 msgstr "Endre Spill"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:515
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495
 msgid ""
 "Change the language of the user interface.\n"
 "Requires restart."
@@ -1009,75 +1061,75 @@ msgstr ""
 "Endre språk for brukerinnstillinger.\n"
 "Krever omstart."
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:60
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:47
 msgid "Changes sign to zFar Parameter (after correction)"
 msgstr "Endringer signeres til zFar-parameteren (etter korreksjon)"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:55
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:42
 msgid "Changes sign to zNear Parameter (after correction)"
 msgstr "Endringer signeres til zNear-parameteren (etter korreksjon)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:519
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499
 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:295
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:298
 msgid "Chat"
 msgstr "Chat"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:47
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:34
 msgid "Cheat Code"
 msgstr "Juksekode"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:118
 msgid "Cheat Search"
 msgstr "Juksekodesøk"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:38
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:25
 msgid "Cheats Manager"
 msgstr "Juksekode Manager"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:633
 msgid "Check Partition Integrity"
-msgstr ""
+msgstr "Sjekk partisjonsintegritet"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:864
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:880
 msgid "Checking integrity..."
-msgstr ""
+msgstr "Sjekker integritet..."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289
 msgid "Chinese (Simplified)"
 msgstr "Kinesisk (Simplifisert)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290
 msgid "Chinese (Traditional)"
 msgstr "Kinesisk (Tradisjonell)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:818
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:799
 msgid "Choose a DVD root directory:"
 msgstr "Velg en DVD-rotmappe"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:822
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803
 msgid "Choose a NAND root directory:"
 msgstr "Velg en NAND-rotmappe"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:815
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:796
 msgid "Choose a default ISO:"
 msgstr "Velg en standard-ISO:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1236
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1219
 msgid "Choose a directory to add"
 msgstr "Velg en mappe å legge til"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1065
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1048
 msgid "Choose a file to open"
 msgstr "Velg en fil å åpne"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:217
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:204
 msgid "Choose a memory card:"
 msgstr "Velg et minnekort:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:819
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800
 msgid ""
 "Choose file to use as apploader: (applies to discs constructed from "
 "directories only)"
@@ -1085,27 +1137,27 @@ msgstr ""
 "Velg fil til å bruke som applikasjonslaster: (gjelder kun for disker laget "
 "fra mapper)"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:767
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:806
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:781
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:822
 msgid "Choose the folder to extract to"
 msgstr "Velg mappen å ekstrahere til"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:297
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:284
 msgid "Circle Stick"
 msgstr "Sirkel-joystick"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:52
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:56
 msgid "Classic"
 msgstr "Klassisk"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:144
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:43
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:487
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:913
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:137
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:30
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:474
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:904
 msgid "Clear"
 msgstr "Tøm"
 
-#: Source/Core/Core/Src/NetPlayServer.cpp:259
+#: Source/Core/Core/Src/NetPlayServer.cpp:263
 msgid ""
 "Client disconnect while game is running!! NetPlay is disabled. You must "
 "manually stop the game."
@@ -1113,138 +1165,138 @@ msgstr ""
 "Klientfrakobling mens spillet kjørte!! NetPlay er slått av. Du må manuelt "
 "stoppe spillet."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:298
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:247
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:552
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:578
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:285
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:234
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:562
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:590
 msgid "Close"
 msgstr "Lukk"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:174
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:177
 msgid "Co&nfigure..."
 msgstr "Ko&nfigurer..."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:86
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:73
 msgid "Code Info"
 msgstr "Kodeinfo"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:568
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:556
 msgid "Code: "
 msgstr "Kode:"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:35
 msgid "Command"
 msgstr "Kommando"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:629
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:623
 msgid "Comment"
 msgstr "Kommentar"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489
 msgid "Comment:"
 msgstr "Kommentar:"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:893
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:884
 msgid "Compress ISO..."
 msgstr "Komprimer ISO..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:905
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:899
 msgid "Compress selected ISOs..."
 msgstr "Komprimer valgte ISO-er..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1088
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1224
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1089
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1225
 msgid "Compressing ISO"
 msgstr "Komprimerer ISO"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:429
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:435
 msgid "Config"
 msgstr "Konfig"
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:37
-#: Source/Core/DolphinWX/Src/InputConfigDiag.h:135
-#: Source/Core/DolphinWX/Src/InputConfigDiag.h:154
+#: Source/Core/DolphinWX/Src/InputConfigDiag.h:122
+#: Source/Core/DolphinWX/Src/InputConfigDiag.h:141
 msgid "Configure"
 msgstr "Konfigurer"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:111
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:98
 msgid "Configure Control"
 msgstr "Konfigurer Kontroller"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:306
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
 #: Source/Core/DolphinWX/Src/NetWindow.cpp:583
 msgid "Configure Pads"
 msgstr "Konfigurer Kontrollere"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:429
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:435
 msgid "Configure..."
 msgstr "Konfigurer..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1119
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1147
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1217
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1120
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1218
 msgid "Confirm File Overwrite"
 msgstr "Bekreft filoverskriving"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:597
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:577
 msgid "Confirm on Stop"
 msgstr "Bekreft ved Stans"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:83
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:105
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:74
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:96
 msgid "Connect"
 msgstr "Koble til"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:783
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:764
 msgid "Connect USB Keyboard"
 msgstr "Koble til USB-tastatur"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:362
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:368
 #, c-format
 msgid "Connect Wiimote %i"
 msgstr "Koble til Wiimote %i"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:195
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183
 msgid "Connect Wiimote 1"
 msgstr "Koble til Wiimote 1"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184
 msgid "Connect Wiimote 2"
 msgstr "Koble til Wiimote 2"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:185
 msgid "Connect Wiimote 3"
 msgstr "Koble til Wiimote 3"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:198
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:186
 msgid "Connect Wiimote 4"
 msgstr "Koble til Wiimote 4"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:627
+#: Source/Core/DolphinWX/Src/Main.cpp:655
 msgid "Connecting..."
 msgstr "Kobler til..."
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:155
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:156
 msgid "Console"
 msgstr "Konsoll"
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:71
 msgid "Continuous Scanning"
-msgstr ""
+msgstr "Kontinuerlig skanning"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:46
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:33
 msgid "Control"
 msgstr "Kontroll"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:189
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:176
 msgid "Convert to GCI"
 msgstr "Konverter til GCI"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:379
+#: Source/Core/Core/Src/CoreParameter.cpp:368
 msgid "Copy failed"
 msgstr "Kopi feilet"
 
@@ -1253,21 +1305,21 @@ msgstr "Kopi feilet"
 msgid "Copy to Memcard %c"
 msgstr "Kopier til Minnekort %c"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:359
 msgid "Core"
 msgstr "Kjerne"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:154
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:148
 #, c-format
 msgid "Could not create %s"
 msgstr "Kunne ikke lage %s"
 
-#: Source/Core/AudioCommon/Src/AudioCommon.cpp:75
+#: Source/Core/AudioCommon/Src/AudioCommon.cpp:62
 #, c-format
 msgid "Could not initialize backend %s."
 msgstr "Kunne ikke initialisere backend %s."
 
-#: Source/Core/Core/Src/CoreParameter.cpp:137
+#: Source/Core/Core/Src/CoreParameter.cpp:126
 #, c-format
 msgid ""
 "Could not read \"%s\".  There is no disc in the drive, or it is not a GC/Wii "
@@ -1278,12 +1330,12 @@ msgstr ""
 "ikke en GC/Wii-backup. Vennligst merk at originale GameCube og Wii-disker "
 "ikke kan leses av de fleste PC-DVD-diskstasjoner."
 
-#: Source/Core/Core/Src/CoreParameter.cpp:292
+#: Source/Core/Core/Src/CoreParameter.cpp:281
 #, c-format
 msgid "Could not recognize ISO file %s"
 msgstr "Kunne ikke gjennkjenne ISO-fil %s"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:569
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:579
 #, c-format
 msgid "Could not save %s"
 msgstr "Kunne ikke lagre %s"
@@ -1297,23 +1349,37 @@ 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:123
+#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119
 #, c-format
 msgid ""
 "Could not write memory card file %s.\n"
 "\n"
 "Are you running Dolphin from a CD/DVD, or is the save file maybe write "
-"protected?"
+"protected?\n"
+"\n"
+"Are you receiving this after moving the emulator directory?\n"
+"If so, then you may need to re-specify your memory card location in the "
+"options."
 msgstr ""
 "Kunne ikke skrive til minnekortfil %s.\n"
 "\n"
-"Kjører du Dolphin fra en CD/DVD, eller er lagringsfilen kanskje beskyttet?"
+"\n"
+"\n"
+"Kjører du Dolphin fra en CD/DVD, eller er lagringsfilen kanskje "
+"skrivebeskyttet?\n"
+"\n"
+"\n"
+"\n"
+"Får du denne meldingen etter å ha flyttet emulatorens mappe?\n"
+"\n"
+"I så tilfelle, må du kanskje re-spesifisere minnekortslokasjonen i "
+"innstillingene."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1107
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1133
 msgid "Couldn't find open command for extension 'ini'!"
 msgstr "Kunne ikke finne åpningskommandoen for utvidelsen 'ini'!"
 
-#: Source/Core/Core/Src/BootManager.cpp:146
+#: Source/Core/Core/Src/BootManager.cpp:137
 msgid ""
 "Couldn't init the core.\n"
 "Check your configuration."
@@ -1321,38 +1387,38 @@ 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:170
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:495
 msgid "Count:"
 msgstr "Antall:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:452
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456
 msgid "Country:"
 msgstr "Land:"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:186
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:562
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:173
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:550
 msgid "Create AR Code"
 msgstr "Lag AR-kode"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:543
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:608
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:569
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:641
 msgid "Create new perspective"
 msgstr "Lag nytt perspektiv"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:17
 msgid "Creator: "
 msgstr "Skaper:"
 
-#: Source/Core/Common/Src/MsgHandler.cpp:68
+#: Source/Core/Common/Src/MsgHandler.cpp:54
 msgid "Critical"
-msgstr ""
+msgstr "Kritisk"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562
 msgid "Crop"
 msgstr "Krum"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119
 msgid ""
 "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n"
 "\n"
@@ -1362,140 +1428,140 @@ msgstr ""
 "\n"
 "Hvis usikker, la stå avslått."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:48
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:52
 msgid "Crossfade"
 msgstr "Kryssutfase"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:597
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:600
 #, c-format
-msgid "Current dir changed from %s to %s after wxFileSelector!"
-msgstr "Nåværende mappesti endret fra %s til %s etter wxFilVelger!"
+msgid "Current directory changed from %s to %s after wxFileSelector!"
+msgstr "Nåværende mappe endret fra %s til %s etter wxFileSelector!"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339
 msgid "Custom Projection Hack"
 msgstr "Selvdefinert Projeksjons-hack"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.h:30
+#: Source/Core/DolphinWX/Src/PHackSettings.h:17
 msgid "Custom Projection Hack Settings"
 msgstr "Innstillinger for Selvdefinerte Projeksjons-hack"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342
 msgid "Customize some Orthographic Projection parameters."
 msgstr "Selvdefiner noen Ortografisk Projeksjons-parametere."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291
 msgid "Czech"
 msgstr "Tsjekkisk"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:698
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:697
 msgid "D"
-msgstr ""
+msgstr "D"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:89
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
 msgid "D-Pad"
 msgstr "D-Pad"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:431
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
 msgid "DSP"
 msgstr "DSP"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:639
 msgid "DSP Emulator Engine"
 msgstr "CPU Emulatormotor"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:254
 msgid "DSP HLE emulation (fast)"
 msgstr "DSP HLE-emulering (raskt)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:256
 msgid "DSP LLE interpreter (slow)"
 msgstr "DSP LLE interpreter (tregt)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660
-msgid "DSP LLE on Thread"
-msgstr "DSP LLE på CPU-tråd"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:255
 msgid "DSP LLE recompiler"
 msgstr "DSP LLE re-kompilering"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:431
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:641
+msgid "DSP on Dedicated Thread"
+msgstr "DSP på Dedikert Tråd"
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
 msgid "DSP settings"
 msgstr "Innstillinger for DSP"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:838
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:819
 msgid "DVD Root:"
 msgstr "DVD-rot:"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:239
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:226
 msgid "DVDLowRead - Fatal Error: failed to read from volume"
-msgstr ""
+msgstr "DVDLowRead - Fatal Feil: Mislyktes i å lese fra volum"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:333
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:320
 msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume"
-msgstr ""
+msgstr "DVDLowUnencryptedRead - Fatal Feil: Mislyktes i å lese fra volum"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:176
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:163
 msgid "Data Size"
 msgstr "Datastørrelse"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468
 msgid "Date:"
 msgstr "Dato:"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:528
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:564
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:518
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:557
 msgid "Datel MaxDrive/Pro files(*.sav)"
 msgstr "Datel MaxDrive/Pro-filer(*.sav)"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:242
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:259
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:267
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:281
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:296
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:229
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:246
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:254
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:268
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:283
 msgid "Dead Zone"
 msgstr "Dødsone"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:35
 msgid "Debug"
 msgstr "Debug"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:521
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534
 msgid "Debugging"
 msgstr "Debugging"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:79
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:66
 msgid "Decimal"
 msgstr "Desimal"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:890
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:881
 msgid "Decompress ISO..."
 msgstr "Dekomprimer ISO..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:906
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:900
 msgid "Decompress selected ISOs..."
 msgstr "Dekomprimer valgte ISO-filer..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1088
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1224
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1089
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1225
 msgid "Decompressing ISO"
 msgstr "Dekomprimerer ISO"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:912
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:903
 msgid "Default"
 msgstr "Standard"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:835
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:816
 msgid "Default ISO:"
 msgstr "Standard-ISO:"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:114
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:107
 msgid "Default font"
 msgstr "Standard tekst-font"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:32
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:926
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:19
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917
 msgid "Delete"
 msgstr "Slett"
 
@@ -1503,21 +1569,21 @@ msgstr "Slett"
 msgid "Delete Save"
 msgstr "Slett Lagringsfil"
 
-#: Source/Core/VideoCommon/Src/AVIDump.cpp:77
+#: Source/Core/VideoCommon/Src/AVIDump.cpp:64
 #, c-format
 msgid "Delete the existing file '%s'?"
 msgstr "Slett den eksiterende filen '%s'?"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:671
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:683
 msgid "Description"
 msgstr "Beskrivelse"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:472
 msgid "Detect"
 msgstr "Finn automatisk"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:233
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:328
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:220
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:315
 msgid ""
 "Detected attempt to read more data from the DVD than fit inside the out "
 "buffer. Clamp."
@@ -1525,29 +1591,29 @@ 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:127
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:898
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:114
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:889
 msgid "Device"
 msgstr "Device"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:798
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:731
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779
 msgid "Device Settings"
 msgstr "Innstillinger for device"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:45
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:49
 msgid "Dial"
-msgstr ""
+msgstr "Ring"
 
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:146
+#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:135
 msgid "Direct3D11"
 msgstr "Direct3D11"
 
-#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:128
+#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:125
 msgid "Direct3D9"
 msgstr "Direct3D9"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:167
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:155
 msgid ""
 "Directory checksum failed\n"
 " and Directory backup checksum failed"
@@ -1555,16 +1621,20 @@ msgstr ""
 "Mappestisjekksum misyktes\n"
 " og mappesti backup-sjekksummen mislyktes"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:433
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:443
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485
 msgid "Disable"
 msgstr "Deaktiver"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:491
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501
+msgid "Disable Destination Alpha"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:409
 msgid "Disable Fog"
 msgstr "Deaktiver tåke (fog)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108
 msgid ""
 "Disable any XFB emulation.\n"
 "Speeds up emulation a lot but causes heavy glitches in many games which rely "
@@ -1578,7 +1648,7 @@ msgstr ""
 "\n"
 "Hvis usikker, la stå på."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95
 msgid ""
 "Disable emulation of EFB copies.\n"
 "These are often used for post-processing or render-to-texture effects, so "
@@ -1594,20 +1664,33 @@ msgstr ""
 "\n"
 "Hvis usikker, la stå avslått."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:543
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101
+#, fuzzy
+msgid ""
+"Disables emulation of a hardware feature called destination alpha, which is "
+"used in many games for various graphical effects.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+"Dropper destinasjon alpha pass, brukt i mange spill for diverse grafiske "
+"effekter.\n"
+"\n"
+"Hvis usikker, la stå avslått."
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:553
 msgid "Disc"
 msgstr "Disk"
 
-#: Source/Core/DiscIO/Src/DriveBlob.cpp:107
-#: Source/Core/DiscIO/Src/DriveBlob.cpp:126
+#: Source/Core/DiscIO/Src/DriveBlob.cpp:94
+#: Source/Core/DiscIO/Src/DriveBlob.cpp:113
 msgid "Disc Read Error"
 msgstr "Feil ved lesing av disk"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:312
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:320
 msgid "Display"
 msgstr "Visning"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104
 msgid ""
 "Display the inputs read by the emulator.\n"
 "\n"
@@ -1617,32 +1700,32 @@ msgstr ""
 "\n"
 "Hvis usikker, la stå avslått."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:80
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:67
 msgid "Divide"
 msgstr "Del"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:987
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:990
 msgid "Do you want to stop the current emulation?"
 msgstr "Vil du stoppe pågående emulering?"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:663
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:644
 msgid "Dolby Pro Logic II decoder"
-msgstr ""
+msgstr "Dolby Pro Logic II-dekoder"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:864
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:856
 msgid "Dolphin"
 msgstr "Dolphin"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:183
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:188
 #, c-format
 msgid "Dolphin %s Graphics Configuration"
 msgstr "Dolphin %s Grafikkinstillinger"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:292
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:298
 msgid "Dolphin &Web Site"
 msgstr "Dolphin &Webside"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.h:37
+#: Source/Core/DolphinWX/Src/ConfigMain.h:24
 msgid "Dolphin Configuration"
 msgstr "Konfigurer Dolphin"
 
@@ -1650,16 +1733,16 @@ msgstr "Konfigurer Dolphin"
 msgid "Dolphin Emulated Wiimote Configuration"
 msgstr "Dolphin Emulert Wiimote Konfigurasjon"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:394
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:383
 msgid "Dolphin FIFO"
 msgstr "Dolphin FIFO"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1136
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1153
 msgid "Dolphin GCPad Configuration"
 msgstr "Dolphin GC-kontroll konfigurasjon"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:679
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1074
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:685
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1089
 msgid "Dolphin TAS Movies (*.dtm)"
 msgstr "Dolphin TAS-Filmer (*.dtm)"
 
@@ -1667,11 +1750,11 @@ msgstr "Dolphin TAS-Filmer (*.dtm)"
 msgid "Dolphin Wiimote Configuration"
 msgstr "Dolphin Wiimote Konfigurasjon"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:293
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:299
 msgid "Dolphin at &Google Code"
 msgstr "Dolphin på &Google Code"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:364
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:351
 msgid ""
 "Dolphin could not find any GC/Wii ISOs.  Doubleclick here to browse for "
 "files..."
@@ -1679,7 +1762,7 @@ msgstr ""
 "Dolphin kunne ikke finne noen GC/Wii ISO-filer. Dobbeltklikk her for å bla "
 "etter filer..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:368
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:355
 msgid ""
 "Dolphin is currently set to hide all games.  Doubleclick here to show all "
 "games..."
@@ -1687,50 +1770,59 @@ msgstr ""
 "Dolphin er satt til å gjemme alle spill. Dobbeltklikk her for å vise alle "
 "spill..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1159
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1160
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1246
 msgid "Dolphin was unable to complete the requested action."
-msgstr ""
+msgstr "Dolphin kunne ikke fullføre den forespurte handligen."
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:275
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:58
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
+#, fuzzy
+msgid ""
+"Doubles the emulated GPU clock rate. May speed up some games (ON = Fast, OFF "
+"= Compatible)"
+msgstr ""
+"Aktiver rask disktilgang. Trengs for noen få spill. (PÅ = Raskt, AV = "
+"Kompitabelt)"
+
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:262
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:45
 msgid "Down"
 msgstr "Ned"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:54
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:44
 msgid "Download Codes (WiiRD Database)"
 msgstr "Last ned juksekoder (WiiRD Database)"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:297
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:287
 #, c-format
 msgid "Downloaded %lu codes. (added %lu)"
 msgstr "Lastet ned %lu koder. (la til %lu)"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:31
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:35
 msgid "Drums"
 msgstr "Trommer"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:105
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
 msgid "Dummy"
 msgstr "Juksedukke"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:661
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:642
 msgid "Dump Audio"
 msgstr "Dump Audio"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:532
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545
 msgid "Dump EFB Target"
 msgstr "Dump EFB Target"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546
 msgid "Dump Frames"
 msgstr "Skjermdumping"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543
 msgid "Dump Textures"
 msgstr "Dump teksturer"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114
 msgid ""
 "Dump all rendered frames to an AVI file in User/Dump/Frames/\n"
 "\n"
@@ -1740,7 +1832,7 @@ msgstr ""
 "\n"
 "Hvis usikker, la stå avslått."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111
 msgid ""
 "Dump decoded game textures to User/Dump/Textures/<game_id>/\n"
 "\n"
@@ -1750,7 +1842,7 @@ msgstr ""
 "\n"
 "Hvis usikker, la stå avslått."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113
 msgid ""
 "Dump the contents of EFB copies to User/Dump/Textures/\n"
 "\n"
@@ -1760,21 +1852,21 @@ msgstr ""
 "\n"
 "Hvis usikker, la stå avslått."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:474
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292
 msgid "Dutch"
 msgstr "Nederlansk"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:112
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:113
 msgid "E&xit"
 msgstr "&Avslutt"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:441
 msgid "EFB Copies"
 msgstr "EFB-kopier"
 
-#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:223
+#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:210
 #, c-format
 msgid ""
 "ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least "
@@ -1782,53 +1874,56 @@ msgid ""
 "reboot is probably required at this point to get Windows to see the new "
 "driver."
 msgstr ""
+"FEIL: Denne versjonen av Dolphin krever en TAP-Win32-driver av versjon minst "
+"%d. %d -- Hvis du nylig har oppdatert din Dolphin distribusjon, kreves "
+"sannsynligvis en reboot for at Windows skal detektere defn nye driveren."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:166
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:160
 msgid "EUROPE"
 msgstr "EUROPA"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:156
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:143
 msgid "Early Memory Updates"
 msgstr "Tidlige Minneoppdateringer"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:447
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:453
 msgid "Edit"
 msgstr "Endre"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.h:30
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.h:17
 msgid "Edit ActionReplay Code"
 msgstr "Endre ActionReplay-kode"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:285
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:286
 msgid "Edit Config"
 msgstr "Endre Konfigurasjon"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.h:30
+#: Source/Core/DolphinWX/Src/PatchAddEdit.h:17
 msgid "Edit Patch"
 msgstr "Endre Patch"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:447
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:453
 msgid "Edit current perspective"
 msgstr "Endre nåværende perspektiv"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:403
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:425
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:407
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:429
 msgid "Edit..."
 msgstr "Endre..."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:44
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:48
 msgid "Effect"
 msgstr "Effekt"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:425
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435
 msgid "Embedded Frame Buffer"
 msgstr "Embedded Frame Buffer (EFB)"
 
-#: Source/Core/Core/Src/Core.cpp:201
+#: Source/Core/Core/Src/Core.cpp:190
 msgid "Emu Thread already running"
 msgstr "Emulator-CPU-tråden kjører allerede"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110
 msgid ""
 "Emulate XFBs accurately.\n"
 "Slows down emulation a lot and prohibits high-resolution rendering but is "
@@ -1842,7 +1937,7 @@ msgstr ""
 "\n"
 "Hvis usikker, benytt virtuell XFB isteden."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109
 msgid ""
 "Emulate XFBs using GPU texture objects.\n"
 "Fixes many games which don't work without XFB emulation while not being as "
@@ -1862,7 +1957,7 @@ msgstr ""
 msgid "Emulated Wiimote"
 msgstr "Emulert Wiimote"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346
 msgid "Emulation State: "
 msgstr "Emulasjonsstatus:"
 
@@ -1870,7 +1965,7 @@ msgstr "Emulasjonsstatus:"
 msgid "Enable"
 msgstr "Aktiver"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91
 msgid ""
 "Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's "
 "supported by your GPU.\n"
@@ -1886,72 +1981,71 @@ msgstr ""
 "\n"
 "Hvis usikker, la stå avslått."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:111
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:98
 msgid "Enable AR Logging"
 msgstr "Aktiver AR-logging"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324
 msgid "Enable Block Merging"
 msgstr "Aktiver Block Merging"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331
 msgid "Enable Bounding Box Calculation"
-msgstr ""
+msgstr "Aktiver Bounding Box-kalkulasjoner"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:446
 msgid "Enable Cache"
 msgstr "Aktiver cache"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:562
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542
 msgid "Enable Cheats"
 msgstr "Aktiver Juksekoder"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310
 msgid "Enable Dual Core"
 msgstr "Aktiver Dobbelkjerne"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
 msgid "Enable Dual Core (speedup)"
 msgstr "Aktiver Dobbelkjerne (for bedre ytelse)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:550
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:563
 msgid "Enable Hotkeys"
 msgstr "Aktiver Snarveistaster"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311
 msgid "Enable Idle Skipping"
 msgstr "Aktiver Idle Skipping"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541
 msgid "Enable Idle Skipping (speedup)"
 msgstr "Aktiver Idle Skipping (for bedre ytelse)"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312
 msgid "Enable MMU"
 msgstr "Aktiver MMU"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:554
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:567
 msgid "Enable Progressive Scan"
 msgstr "Aktiver Progressiv Skanning"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757
 msgid "Enable Screen Saver"
 msgstr "Aktiver Skjermsparer"
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:75
-#, fuzzy
 msgid "Enable Speaker Data"
-msgstr "Aktiver sider"
+msgstr "Tillat Høytaler Data"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
 msgid "Enable WideScreen"
 msgstr "Aktiver Widescreen"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:516
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529
 msgid "Enable Wireframe"
 msgstr "Aktiver WireFrame"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85
 msgid ""
 "Enable anisotropic filtering.\n"
 "Enhances visual quality of textures that are at oblique viewing angles.\n"
@@ -1964,7 +2058,7 @@ msgstr ""
 "\n"
 "Hvis usikker, velg 1x."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323
 msgid ""
 "Enable fast disc access.  Needed for a few games. (ON = Fast, OFF = "
 "Compatible)"
@@ -1976,7 +2070,7 @@ msgstr ""
 msgid "Enable pages"
 msgstr "Aktiver sider"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76
 msgid ""
 "Enable this if you want the whole screen to be used for rendering.\n"
 "If this is disabled, a render window will be created instead.\n"
@@ -1988,7 +2082,7 @@ msgstr ""
 "\n"
 "Hvis usikker, la stå avslått."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80
 msgid ""
 "Enable this if you want to use the main Dolphin window for rendering rather "
 "than a separate render window.\n"
@@ -2000,7 +2094,7 @@ msgstr ""
 "\n"
 "Hvis usikker, la stå avslått."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:335
 msgid ""
 "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for "
 "ANY other game."
@@ -2008,28 +2102,35 @@ msgstr ""
 "Aktiver dette for å bedre ytelsen i The Legend Of Zelda: Twillight Princess. "
 "Deaktiver for andre spill."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340
 msgid "Enables Custom Projection Hack"
 msgstr "Tillater Selvdefinerte Projeksjons-hack"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:528
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508
 msgid ""
 "Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on "
 "OSX."
 msgstr ""
+"Aktiver Dolby Pro Logic II-emulering med 5.1 surround. Ikke tilgjengelig på "
+"OSX."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510
 msgid ""
 "Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only."
 msgstr ""
+"Aktiver Dolphin Pro Logic II-emulering med 5.1 surround. Kun for OpenAL "
+"backend."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:512
 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 ""
+"Aktiver Dolby Pro Logic II-emulering med 5.1 surround. Kun for OpenAL "
+"backend. Det kan hende soft_oal.dll må omdøpes til OpenAL32.dll for at det "
+"skal fungere."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81
 msgid ""
 "Enables progressive scan if supported by the emulated software.\n"
 "Most games don't care about this.\n"
@@ -2042,7 +2143,7 @@ msgstr ""
 "\n"
 "Hvis usikker, la stå avslått."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313
 msgid ""
 "Enables the Memory Management Unit, needed for some games. (ON = Compatible, "
 "OFF = Fast)"
@@ -2050,7 +2151,7 @@ msgstr ""
 "Tillater Memory Management Unit (MMU), som trengs for noen spill. (PÅ = "
 "Kompitabelt, AV = Raskt)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116
 msgid ""
 "Encode frame dumps using the FFV1 codec.\n"
 "\n"
@@ -2060,57 +2161,59 @@ msgstr ""
 "\n"
 "Hvis usikker, la stå avslått."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:40
 msgid "End"
 msgstr "Slutt"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:469
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:280
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:260
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293
 msgid "English"
 msgstr "Engelsk"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:329
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:407
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:337
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:417
 msgid "Enhancements"
 msgstr "Forbedringer"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:607
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:640
 msgid "Enter a name for the new perspective:"
 msgstr "Skriv inn et navn for det nye perspektivet:"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:191
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:178
 #, c-format
 msgid "Entry %d/%d"
 msgstr "Entry %d/%d"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:85
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:72
 #, c-format
 msgid "Entry 1/%d"
 msgstr "Entry 1/%d"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:204
 msgid "Equal"
 msgstr "Lik"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:45
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:156
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1242
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:32
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:150
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226
 msgid "Error"
 msgstr "Feil"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:381
+#: Source/Core/DolphinWX/Src/Main.cpp:409
 msgid "Error loading selected language. Falling back to system default."
 msgstr "Feil ved lasting av valgt språk. Faller tilbake til systemstandarden."
 
-#: Source/Core/Common/Src/ChunkFile.h:226
+#: Source/Core/Common/Src/ChunkFile.h:221
 #, c-format
 msgid ""
 "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). "
 "Aborting savestate load..."
 msgstr ""
+"Feil: Etter \"%s\", ble %d (0x%X) funnet isteden for lagringsmarkøren %d (0x"
+"%X). Avbryter savestate-lasting..."
 
-#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:342
+#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:329
 #, c-format
 msgid ""
 "Error: Trying to access %s fonts but they are not loaded. Games may not show "
@@ -2119,38 +2222,38 @@ msgstr ""
 "Feil: Prøver å åpne %s-fonter, men de lastes ikke. Det kan hende spill ikke "
 "åpner fonter korrekt, eller krasjer."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:30
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:17
 msgid "Escape"
 msgstr "Escape"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:26
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:30
 msgid "Euphoria"
-msgstr ""
+msgstr "Euforia"
 
 #: Source/Core/Core/Src/ArmMemTools.cpp:78
-#: Source/Core/Core/Src/x64MemTools.cpp:217
+#: Source/Core/Core/Src/x64MemTools.cpp:206
 #, c-format
 msgid "Exception handler - access below memory space. %08llx%08llx"
 msgstr "Unntakshandler - tilgang under minneområde. %08llx%08llx"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:61
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
 msgid "Execute"
 msgstr "Kjør"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:459
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:446
 msgid "Export Failed"
 msgstr "Eksportering mislyktes"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:639
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:649
 msgid "Export File"
 msgstr "Eksporter Fil"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:177
 msgid "Export Recording"
 msgstr "Eksporter Opptak"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:345
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:351
 msgid "Export Recording..."
 msgstr "Eksporter Opptak..."
 
@@ -2158,7 +2261,7 @@ msgstr "Eksporter Opptak..."
 msgid "Export Save"
 msgstr "Eksporter Lagringsfil"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:874
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:865
 msgid "Export Wii save (Experimental)"
 msgstr "Eksporter Wii-lagringsfil (Eksperimentiell)"
 
@@ -2166,100 +2269,100 @@ msgstr "Eksporter Wii-lagringsfil (Eksperimentiell)"
 msgid "Export all saves"
 msgstr "Eksporter alle lagringsfiler"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:80
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:72
 msgid "Export failed, try again?"
 msgstr "Eksportering mislyktes, prøv igjen?"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:559
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:552
 msgid "Export save as..."
 msgstr "Eksporter lagringsfil som..."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:297
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:284
 msgid "Extension"
 msgstr "Utvidelse"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483
 msgid "External Frame Buffer"
 msgstr "Ekstern Bildebuffer (EFB)"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:61
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:48
 msgid "Extra Parameter"
 msgstr "Ekstra Parameter"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:62
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:49
 msgid "Extra Parameter useful in ''Metroid: Other M'' only."
 msgstr "Ekstra Parameter nyttig kun i ''Metroid: Other M\"."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:614
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:624
 msgid "Extract All Files..."
 msgstr "Ekstraher Alle Filer..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:616
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:626
 msgid "Extract Apploader..."
 msgstr "Ekstraher Applikasjonslaster..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:617
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627
 msgid "Extract DOL..."
 msgstr "Ekstraher DOL..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:610
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:620
 msgid "Extract Directory..."
 msgstr "Ekstraher Mappe..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:612
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:622
 msgid "Extract File..."
 msgstr "Ekstraher Fil..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:608
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:618
 msgid "Extract Partition..."
 msgstr "Ekstraher Partisjon..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:724
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:738
 #, c-format
 msgid "Extracting %s"
 msgstr "Ekstraherer %s"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:707
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:721
 msgid "Extracting All Files"
 msgstr "Ekstraherer Alle Filer"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:707
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:721
 msgid "Extracting Directory"
 msgstr "Ekstraherer Mappe"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:710
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:724
 msgid "Extracting..."
 msgstr "Ekstraherer..."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:892
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:893
 msgid "FIFO Byte"
 msgstr "FIFO-Byte"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:45
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:32
 msgid "FIFO Player"
 msgstr "FIFO-spiller"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:169
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:163
 msgid "FRANCE"
 msgstr "FRANKRIKE"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472
 msgid "FST Size:"
 msgstr "FST-størrelse:"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:77
+#: Source/Core/Core/Src/NetPlayClient.cpp:81
 msgid "Failed to Connect!"
 msgstr "Tilkobling Mislyktes!"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:225
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:228
 msgid "Failed to Listen!!"
 msgstr "Lytting Mislyktes!"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:307
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:300
 msgid "Failed to download codes."
 msgstr "Nedlasting av koder mislyktes."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:827
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:843
 #, c-format
 msgid "Failed to extract to %s!"
 msgstr "Ekstrahering til %s mislyktes!"
@@ -2285,34 +2388,41 @@ msgstr ""
 "Du kan benytte DSP HLE-motoren som ikke krever noen ROM-dump.\n"
 "(Velg den fra \"audio\"-panelet i konfigurasjonspanelet.)"
 
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:116
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:139
+#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:108
+#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:131
 msgid "Failed to load bthprops.cpl"
 msgstr "Kunne ikke laste bthprops.cpl"
 
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:100
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:109
+#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:90
+#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:101
 msgid "Failed to load hid.dll"
 msgstr "Kunne ikke laste hid.dll"
 
-#: Source/Core/Core/Src/Movie.cpp:792
+#: Source/Core/Core/Src/Movie.cpp:783
 #, c-format
 msgid "Failed to read %s"
-msgstr ""
+msgstr "Mislyktes i å lese %s"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:151
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:144
 msgid "Failed to read banner.bin"
 msgstr "Kunne ikke lese banner.bin"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:223
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:178
+msgid "Failed to read bk header"
+msgstr "Kunne ikke lese bk-header"
+
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:211
 #, c-format
 msgid ""
 "Failed to read block %d of the save data\n"
 "Memcard may be truncated\n"
 "FilePosition:%llx"
 msgstr ""
+"Mislyktes i å lese blokk %d av lagringsdataen\n"
+" Minnekortet kan ha blitt trunktert\n"
+" Filposisjon:%llx"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:148
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:136
 msgid ""
 "Failed to read block allocation table backup correctly\n"
 "(0x8000-0x9FFF)"
@@ -2320,7 +2430,7 @@ msgstr ""
 "Kunne ikke lese blokkallokasjonstabell-backup'en korrekt\n"
 "(0x8000-0x9FFF)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:142
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:130
 msgid ""
 "Failed to read block allocation table correctly\n"
 "(0x6000-0x7FFF)"
@@ -2328,12 +2438,17 @@ msgstr ""
 "Kunne ikke lese blokkallokasjonstabell-backup'en korrekt\n"
 "(0x6000-0x7FFF)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:286
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:279
 #, c-format
 msgid "Failed to read data from file %d"
 msgstr "Kunne ikke lese data fra filen %d"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:136
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:367
+#, c-format
+msgid "Failed to read data from file: %s"
+msgstr "Kunne ikke lese data fra fil: %s"
+
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:124
 msgid ""
 "Failed to read directory backup correctly\n"
 "(0x4000-0x5FFF)"
@@ -2341,7 +2456,7 @@ msgstr ""
 "Kunne ikke lese mappesti-backup'en korrekt\n"
 "(0x4000-0x5FFF)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:130
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:118
 msgid ""
 "Failed to read directory correctly\n"
 "(0x2000-0x3FFF)"
@@ -2349,7 +2464,11 @@ msgstr ""
 "Kunne ikke lese mappestien korrekt\n"
 "(0x2000-0x3FFF)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:119
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:90
+msgid "Failed to read header"
+msgstr "Kunne ikke lese header"
+
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:107
 msgid ""
 "Failed to read header correctly\n"
 "(0x0000-0x1FFF)"
@@ -2357,63 +2476,65 @@ msgstr ""
 "kunne ikke lese headeren korrekt\n"
 "(0x0000-0x1FFF)"
 
-#: Source/Core/DiscIO/Src/VolumeGC.cpp:61
+#: Source/Core/DiscIO/Src/VolumeGC.cpp:48
 msgid "Failed to read unique ID from disc image"
 msgstr "Kunne ikke lese unik ID fra disk-bildet"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:84
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:71
 msgid "Failed to write BT.DINF to SYSCONF"
 msgstr "Kunne ikke skrive BT.DINF til SYSCONF"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:228
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:221
 msgid "Failed to write bkhdr"
 msgstr "Kunne ikke skrive bkhdr"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:164
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:157
 #, c-format
 msgid "Failed to write header for %s"
 msgstr "Kunne ikke skrive header for %s"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:258
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:251
 #, c-format
 msgid "Failed to write header for file %d"
 msgstr "Kunne ikke skrive header for filen %d"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294
 msgid "Farsi"
-msgstr ""
+msgstr "Persisk"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477
 msgid "Fast"
 msgstr "Rask"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315
 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:1046
+#: Source/Core/Core/Src/Movie.cpp:1037
 #, c-format
 msgid ""
 "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s"
 msgstr ""
+"Fatal desynkronisering. Avbryter avspilling. (Feil i PlayWiimote: %u != %u, "
+"byte %u)%s"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:199
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:202
 msgid "Fifo Player"
 msgstr "Fifo-spiller"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:99
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:86
 msgid "File Info"
 msgstr "Filinformasjon"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:304
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:295
 msgid "File contained no codes."
 msgstr "Filen inneholder ingen koder."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:413
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:400
 msgid "File converted to .gci"
 msgstr "Fil konvertert til .gci"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:428
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:415
 msgid ""
 "File could not be opened\n"
 "or does not have a valid extension"
@@ -2421,7 +2542,7 @@ msgstr ""
 "Filen kunne ikke åpnes\n"
 "eller har ingen gyldig utvidelse"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:84
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:72
 #, c-format
 msgid ""
 "File has the extension \"%s\"\n"
@@ -2430,36 +2551,36 @@ msgstr ""
 "Filen har utvidelsen \"%s\"\n"
 "gyldige utvidelser er (.raw/.gcp)"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:425
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:412
 msgid "File is not recognized as a memcard"
 msgstr "Filen kjennes ikke igjen som et minnekort"
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:294
+#: Source/Core/DiscIO/Src/CompressedBlob.cpp:281
 msgid "File not compressed"
 msgstr "Filen ikke komprimert"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:127
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:109
 #, c-format
 msgid "FileIO: Unknown open mode : 0x%02x"
 msgstr "FileIO: Ukjent åpenmodus: 0x%02x"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:531
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:541
 msgid "Filesystem"
 msgstr "Filsystem"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1100
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1126
 msgid "Filetype 'ini' is unknown! Will not open!"
 msgstr "Filtypen 'ini' er ukjent! kan ikke åpnes!"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:265
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:252
 msgid "Find next"
-msgstr ""
+msgstr "Finn neste"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:266
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:253
 msgid "Find previous"
-msgstr ""
+msgstr "Finn forrige"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:632
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626
 msgid "First Block"
 msgstr "Første Blokk"
 
@@ -2467,23 +2588,23 @@ msgstr "Første Blokk"
 msgid "Fix Checksums"
 msgstr "Fiks Sjekksummer"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:275
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283
 msgid "Force 16:9"
 msgstr "Tving 16:9"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:275
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283
 msgid "Force 4:3"
 msgstr "Tving 4:3"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:568
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548
 msgid "Force Console as NTSC-J"
 msgstr "Tving Konsoll til NTSC-J"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406
 msgid "Force Texture Filtering"
 msgstr "Tving Teksturfiltrering"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90
 msgid ""
 "Force texture filtering even if the emulated game explicitly disabled it.\n"
 "Improves texture quality slightly but causes glitches in some games.\n"
@@ -2496,7 +2617,7 @@ msgstr ""
 "\n"
 "Hvis usikker, la stå avslått."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83
 msgid ""
 "Force the game to output graphics for widescreen resolutions.\n"
 "Causes graphical glitches is some games.\n"
@@ -2508,7 +2629,7 @@ msgstr ""
 "\n"
 "Hvis usikker, la stå avslått."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488
 msgid ""
 "Forces NTSC-J mode for using the Japanese ROM font.\n"
 "Left unchecked, dolphin defaults to NTSC-U and automatically enables this "
@@ -2518,7 +2639,7 @@ msgstr ""
 "Er dette avslått, benytter Dolphin NTSC-U som standard og går automatisk "
 "over til denne innstillingen når japanske spill spilles."
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:74
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:62
 msgid ""
 "Format as ascii (NTSC\\PAL)?\n"
 "Choose no for sjis (NTSC-J)"
@@ -2526,148 +2647,147 @@ msgstr ""
 "Formater som ascii (NTSC\\PAL)?\n"
 "Velg nei for sjis (NTSC-J)"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:278
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:265
 msgid "Forward"
 msgstr "Send frem"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504
 #, c-format
 msgid "Found %d results for '"
-msgstr ""
+msgstr "Fant %d resultater for '"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:857
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:925
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:858
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:926
 msgid "Frame"
 msgstr "Stillbilde"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:867
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:868
 msgid "Frame "
 msgstr "Stillbilde"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:185
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:173
 msgid "Frame Advance"
 msgstr "Bilde-for-bilde Modus"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:536
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549
 msgid "Frame Dumps use FFV1"
 msgstr "Spillopptak bruker FFV1"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:227
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:214
 msgid "Frame Info"
-msgstr ""
+msgstr "Frame info"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:116
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:103
 msgid "Frame Range"
 msgstr "Bilderekkevidde"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:138
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:139
 msgid "Frame S&kipping"
 msgstr "Frame S&kipping"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:572
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552
 msgid "Framelimit:"
 msgstr "Framelimit:"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:204
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:191
 msgid "Frames To Record"
 msgstr "Bilder Til Opptak"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547
 msgid "Free Look"
 msgstr "Fri Utkikk"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
 msgid "French"
 msgstr "Fransk"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:38
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:42
 msgid "Frets"
-msgstr ""
+msgstr "Frets"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:118
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:137
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:105
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:124
 msgid "From"
 msgstr "Fra"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:426
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:432
 msgid "FullScr"
 msgstr "FullSkj"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:256
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263
 msgid "Fullscreen resolution:"
 msgstr "Fullskjermsoppløsning:"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:534
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524
 msgid "GCI File(*.gci)"
 msgstr "GCI Fil(*.gci)"
 
-#: Source/Core/DolphinWX/Src/GCMicDlg.h:44
+#: Source/Core/DolphinWX/Src/GCMicDlg.h:31
 msgid "GCMic Configuration"
-msgstr ""
+msgstr "GCMic-konfigurasjon"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:432
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
 msgid "GCPad"
 msgstr "GC-kontroll"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:659
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:658
 msgid "GX_CMD_INVL_VC"
-msgstr ""
+msgstr "GX_CMD_INVL_VC"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:448
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:452
 msgid "Game ID:"
 msgstr "Spill-ID:"
 
-#: Source/Core/Core/Src/NetPlay.cpp:229
+#: Source/Core/Core/Src/NetPlay.cpp:216
 msgid "Game is already running!"
 msgstr "Spillet kjører allerede!"
 
-#: Source/Core/Core/Src/NetPlay.cpp:259
+#: Source/Core/Core/Src/NetPlay.cpp:246
 msgid "Game isn't running!"
 msgstr "Et spill kjører ikke!"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:389
-#, fuzzy
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:393
 msgid "Game not found!"
 msgstr "Spill ikke funnet!"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:385
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:389
 msgid "Game-Specific Settings"
 msgstr "Spill-spesifikke Innstillinger"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:293
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:294
 msgid "GameConfig"
 msgstr "SpillKonfigurasjon"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:525
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:515
 msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)"
-msgstr ""
+msgstr "GameCube-lagringsfiler(*.gci;*.gcs;*.sav)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534
 msgid "Gamecube"
 msgstr "GameCube"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:178
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:181
 msgid "Gamecube &Pad Settings"
 msgstr "Innstillinger for &GameCube-kontroll"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:218
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1069
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:205
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1052
 msgid "Gamecube Memory Cards (*.raw,*.gcp)"
 msgstr "GameCube-minnekort (*.raw,*.gcp)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:432
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
 msgid "Gamecube Pad settings"
 msgstr "Innstillinger for GameCube-kontroll"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:117
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302
 msgid "Gecko Codes"
 msgstr "Gecko-juksekoder"
 
-#: Source/Core/Core/Src/GeckoCode.cpp:222
+#: Source/Core/Core/Src/GeckoCode.cpp:214
 #, c-format
 msgid ""
 "GeckoCode failed to run (CT%i CST%i) (%s)\n"
@@ -2675,11 +2795,15 @@ msgid ""
 "native code handler by placing the codehandler.bin file into the Sys "
 "directory and restarting Dolphin.)"
 msgstr ""
+"GeckoCode mislyktes i å kjøre (CT%i CST%i) (%s)\n"
+" (Enten en dårlig kode, eller så støttes ikke kodetypen. Prøv å bruke den "
+"medbragte kodehandleren ved å plassere codehandler.bin-filen i Sys-mappen og "
+"restart Dolphin.)"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:172
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:197
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:160
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:160
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:202
 msgid "General"
 msgstr "Generelt"
 
@@ -2687,30 +2811,30 @@ msgstr "Generelt"
 msgid "General Settings"
 msgstr "Generelle Innstillinger"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:470
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:281
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:316
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:261
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
 msgid "German"
 msgstr "Tysk"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:449
+#: Source/Core/Core/Src/ActionReplay.cpp:439
 #, 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:430
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:436
 msgid "Graphics"
 msgstr "Grafikk"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:430
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:436
 msgid "Graphics settings"
 msgstr "Innstillinger for Grafikk"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:205
 msgid "Greater Than"
 msgstr "Større Enn"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87
 msgid ""
 "Greatly increases quality of textures generated using render to texture "
 "effects.\n"
@@ -2720,52 +2844,90 @@ msgid ""
 "\n"
 "If unsure, leave this checked."
 msgstr ""
+"Øker kvaliteten drastisk på teksturer generert ved rendering-til-tekstur-"
+"ekkekter.\n"
+" Å øke den interne oppløsningen vil øke effekten av denne innstillingen.\n"
+" Senker ytelsen noe og kan muligens forårsake problemer (men mest sannsyling "
+"ikke)\n"
+" \n"
+" Hvis usikker, la stå deaktivert."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:317
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
 msgid "Greek"
 msgstr "Gresk"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:22
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Green"
 msgstr "Grønn"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:24
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Green Left"
 msgstr "Grønn Venstre"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:25
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Green Right"
 msgstr "Grønn Høyre"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:35
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:39
 msgid "Guitar"
 msgstr "Gitar"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1259
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1250
 msgid "HCI_CMD_INQUIRY is called, please report!"
 msgstr "HCI_CMD_INQUIRY ble kalt, venligst rapporter!"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:421
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504
+msgid "Hacked Buffer Upload"
+msgstr "Hacket Bufferopplastning"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431
 msgid "Hacks"
 msgstr "Hacks"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:158
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:146
 msgid "Header checksum failed"
 msgstr "Header-sjekksum feilet"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:318
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298
 msgid "Hebrew"
 msgstr "Hebraisk"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:313
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:300
 msgid "Height"
 msgstr "Høyde"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:64
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:51
 msgid "Help"
 msgstr "Hjelp"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:209
+#: Source/Core/DolphinWX/Src/Main.cpp:229
+msgid ""
+"Hi,\n"
+"\n"
+"Dolphin requires Mac OS X 10.7 or greater.\n"
+"Unfortunately you're running an old version of OS X.\n"
+"The last Dolphin version to support OS X 10.6 is Dolphin 3.5\n"
+"Please upgrade to 10.7 or greater to use the newest Dolphin version.\n"
+"\n"
+"Sayonara!\n"
+msgstr ""
+"Hei,\n"
+"\n"
+"\n"
+"\n"
+"Dolphin krever Max OS X 10.7 eller nyere.\n"
+"\n"
+"Dessverre kjører du en gammel versjon av OS X.\n"
+"\n"
+"The seneste versjonen av Dolphin som støtter OS X 10.6 er Dolphin 3.5\n"
+"\n"
+"Vennligst oppgrader til 10.7 eller nyere for å bruke siste Dolphin-versjon.\n"
+"\n"
+"\n"
+"\n"
+"Sayonara!\n"
+
+#: Source/Core/DolphinWX/Src/Main.cpp:220
 msgid ""
 "Hi,\n"
 "\n"
@@ -2781,15 +2943,15 @@ msgstr ""
 "\n"
 "Sayonara!\n"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:309
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:296
 msgid "Hide"
 msgstr "Gjem"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:307
 msgid "Hide Mouse Cursor"
 msgstr "Gjem Musepeker"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79
 msgid ""
 "Hides the mouse cursor if it's on top of the emulation window.\n"
 "\n"
@@ -2799,26 +2961,26 @@ msgstr ""
 "\n"
 "Hvis usikker, la stå på."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:54
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41
 msgid "Home"
 msgstr "Hjem"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:85
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:138
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:76
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:141
 msgid "Host"
 msgstr "Vert"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.h:44
+#: Source/Core/DolphinWX/Src/HotkeyDlg.h:31
 msgid "Hotkey Configuration"
 msgstr "Konfigurer Snarveistaster"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:272
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:272
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:594
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:260
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:260
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574
 msgid "Hotkeys"
 msgstr "Snarveistaster"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:319
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299
 msgid "Hungarian"
 msgstr "Ungarsk"
 
@@ -2826,33 +2988,35 @@ msgstr "Ungarsk"
 msgid "Hybrid Wiimote"
 msgstr "Hybrid Wiimote"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:532
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:519
 #, 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:786
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:773
 #, c-format
 msgid ""
-"IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available "
-"in your nand dump\n"
+"IOCTL_ES_LAUNCH: Game tried to reload an IOS or a title that is not "
+"available in your NAND dump\n"
 "TitleID %016llx.\n"
-" Dolphin will likely hang now"
+" Dolphin will likely hang now."
 msgstr ""
-"IOCTL_ES_LAUNCH: Spillet forsøkte å re-laste ios eller en billett som ikke "
-"finnes i din NAND-dump\n"
+"IOCTL_ES_LAUNCH: Spillet kunne ikke relaste en IOS eller tittel som ikke er "
+"tilgjengelig i ditt NAND-dump\n"
+"\n"
 "TitleID %016llx.\n"
-"Dolphin vil sannsynligvis krasje nå"
+"\n"
+"Dolphin vil sannsynligvis krasje nå."
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:313
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:300
 msgid "IOCTL_ES_READCONTENT - bad destination"
 msgstr "IOCTL_ES_READCONTENT - dårlig destinasjon"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729
 msgid "IPL Settings"
 msgstr "Innstillinger for IPL"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269
 msgid "IR"
 msgstr "IR"
 
@@ -2864,47 +3028,35 @@ msgstr "IR-peker"
 msgid "IR Sensitivity:"
 msgstr "IR-sensitivitet:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:502
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:512
 msgid "ISO Details"
 msgstr "ISO-detaljer"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:830
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:811
 msgid "ISO Directories"
 msgstr "ISO-mapper"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:172
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:166
 msgid "ITALY"
 msgstr "ITALIA"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:630
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:624
 msgid "Icon"
 msgstr "Ikon"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332
 msgid ""
 "If checked, the bounding box registers will be updated. Used by the Paper "
 "Mario games."
 msgstr ""
+"Hvis aktivert, vil bounding box-registre bli oppdatert. Brukt av Paper Mario-"
+"spillene."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318
-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:505
-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:428
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438
 msgid "Ignore Format Changes"
 msgstr "Ignorer Formatendringer"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94
 msgid ""
 "Ignore any changes to the EFB format.\n"
 "Improves performance in many games without any negative effect. Causes "
@@ -2918,7 +3070,7 @@ msgstr ""
 "\n"
 "Hvis usikker, la stå på."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93
 msgid ""
 "Ignore any requests of the CPU to read from or write to the EFB.\n"
 "Improves performance in some games, but might disable some gameplay-related "
@@ -2936,11 +3088,11 @@ msgstr ""
 msgid "Import Save"
 msgstr "Importer Lagringsfil"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:59
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:48
 msgid "Import failed, try again?"
 msgstr "Importering mislyktes, prøv igjen?"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:454
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:441
 msgid ""
 "Imported file has gsc extension\n"
 "but does not have a correct header"
@@ -2948,11 +3100,11 @@ msgstr ""
 "Importert fil har .gsc-utvidelse\n"
 "men har ikke korrekt header"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:442
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:429
 msgid "Imported file has invalid length"
 msgstr "importert fil har ugyldig lengde"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:451
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:438
 msgid ""
 "Imported file has sav extension\n"
 "but does not have a correct header"
@@ -2960,18 +3112,7 @@ msgstr ""
 "Importert fil har .sav-utvidelse\n"
 "men har ikke korrekt header"
 
-#: 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 ""
-"Øker ytelsen, men skaper feil i spill som krever nøyaktig tåkeemulering.\n"
-"\n"
-"Hvis usikker, la stå avslått."
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350
 msgid "In Game"
 msgstr "I spillet"
 
@@ -2979,84 +3120,86 @@ msgstr "I spillet"
 msgid "In-Game"
 msgstr "I spillet"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:34
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305
 msgid "Info"
 msgstr "Info"
 
-#: Source/Core/Common/Src/MsgHandler.cpp:65
+#: Source/Core/Common/Src/MsgHandler.cpp:51
 msgid "Information"
 msgstr "Informasjon"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:481
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:468
 msgid "Input"
 msgstr "Inndata"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:63
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:50
 msgid "Insert"
 msgstr "Sett Inn"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:176
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:166
 msgid "Insert Encrypted or Decrypted code here..."
 msgstr "Sett Inn Kryptert eller Dekryptert kode her..."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:763
 msgid "Insert SD Card"
 msgstr "Sett inn SD-kort"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:34
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:21
 msgid "Insert name here.."
 msgstr "Sett inn navn her..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:196
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:199
 msgid "Install WAD"
 msgstr "Installer WAD"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:895
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:888
 msgid "Install to Wii Menu"
 msgstr "Installer til Wii Meny"
 
-#: Source/Core/Core/Src/x64MemTools.cpp:252
+#: Source/Core/Core/Src/x64MemTools.cpp:242
 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:1297
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
 msgid "Installing WAD..."
 msgstr "Installer WAD..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:885
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:901
 msgid "Integrity Check Error"
-msgstr ""
+msgstr "Feil i Integritetssjekk"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:891
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:907
 msgid "Integrity check completed"
-msgstr ""
+msgstr "Integritetssjekk fullført"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:890
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:906
 msgid "Integrity check completed. No errors have been found."
-msgstr ""
+msgstr "Integritetssjekk fullført. Ingen feil ble oppdaget."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:882
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:898
 #, c-format
 msgid ""
 "Integrity check for partition %d failed. Your dump is most likely corrupted "
 "or has been patched incorrectly."
 msgstr ""
+"Integritetssjekk for partisjonen %d feilet. Ditt spill-rip er mest "
+"sannsynlig korrupt, eller har blitt patchet feil."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532
 msgid "Interface"
 msgstr "Kontrollpanel"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:646
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627
 msgid "Interface Settings"
 msgstr "Innstillinger for kontrollpanel"
 
-#: Source/Core/Core/Src/State.cpp:240
+#: Source/Core/Core/Src/State.cpp:228
 msgid "Internal LZO Error - compression failed"
 msgstr "Intern LZO-feil - komprimering mislyktes"
 
-#: Source/Core/Core/Src/State.cpp:348
+#: Source/Core/Core/Src/State.cpp:336
 #, c-format
 msgid ""
 "Internal LZO Error - decompression failed (%d) (%li, %li) \n"
@@ -3065,41 +3208,45 @@ msgstr ""
 "Intern LZO-feil - dekomprimering mislyktes (%d) (%li, %li) \n"
 "Prøv å laste Save State'en igjen"
 
-#: Source/Core/Core/Src/State.cpp:485
+#: Source/Core/Core/Src/State.cpp:473
 msgid "Internal LZO Error - lzo_init() failed"
 msgstr "Intern LZO-feil - lzo_init() mislyktes"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:344
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:352
 msgid "Internal Resolution:"
 msgstr "Intern Oppløsning:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:42
+msgid "Interpreter (VERY slow)"
+msgstr "Interpreter (VELDIG treg)"
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349
 msgid "Intro"
 msgstr "Intro"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:194
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:187
 #, c-format
 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:600
 msgid "Invalid Value!"
 msgstr "Ugyldig verdi!"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:462
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:449
 msgid "Invalid bat.map or dir entry"
 msgstr "Ugyldig bat.map eller mappesti"
 
-#: Source/Core/Core/Src/CoreTiming.cpp:548
+#: Source/Core/Core/Src/CoreTiming.cpp:553
 #, c-format
 msgid "Invalid event type %i"
 msgstr "Ugyldig event-type %i"
 
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:326
+#: Source/Core/Core/Src/HW/DVDInterface.cpp:309
 msgid "Invalid file"
 msgstr "Ugyldig fil"
 
-#: Source/Core/DiscIO/Src/BannerLoaderGC.cpp:41
+#: Source/Core/DiscIO/Src/BannerLoaderGC.cpp:28
 #, c-format
 msgid ""
 "Invalid opening.bnr found in gcm:\n"
@@ -3110,108 +3257,119 @@ msgstr ""
 "%s\n"
 " Det kan hende du må re-dumpe dette spillet."
 
-#: Source/Core/Core/Src/Movie.cpp:735
+#: Source/Core/Core/Src/Movie.cpp:726
 msgid "Invalid recording file"
 msgstr "Ugyldig opptaksfil"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:473
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:472
 msgid "Invalid search parameters (no object selected)"
-msgstr ""
+msgstr "Ugyldige søkeparametre (inget objekt valgt)"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:456
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:455
 msgid "Invalid search string (couldn't convert to number)"
-msgstr ""
+msgstr "Ugyldig søkestring (kunne ikke konverte til tall)"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:444
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:443
 msgid "Invalid search string (only even string lengths supported)"
-msgstr ""
+msgstr "Ugyldig søkestring (bare strenger av partallslengde støttes)"
 
-#: Source/Core/Core/Src/Core.cpp:513
+#: Source/Core/Core/Src/Core.cpp:511
 msgid "Invalid state"
 msgstr "Ugyldig save state"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:473
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:320
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300
 msgid "Italian"
 msgstr "Italiensk"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:183
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:177
 msgid "JAPAN"
 msgstr "JAPAN"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:321
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:46
+msgid "JIT Recompiler (recommended)"
+msgstr "JIT rekompilator (anbefalt)"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:47
+msgid "JITIL experimental recompiler"
+msgstr "JITIL eksperimentell rekompilator"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:279
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
 msgid "Japanese"
 msgstr "Japansk"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:188
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:182
 msgid "KOREA"
 msgstr "KOREA"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78
 msgid ""
 "Keep the game window on top of all other windows.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
+"Hold spillvinduet på toppen av alle andre vinduer.\n"
+" \n"
+" Hvis usikker, la stå uaktivert."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:298
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:306
 msgid "Keep window on top"
-msgstr ""
+msgstr "Hold vindu på toppen"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:241
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:241
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:229
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:229
 msgid "Key"
 msgstr "Tast"
 
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282
 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:322
 msgid "Korean"
 msgstr "Koreansk"
 
 #. i18n:  Left
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:57
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:44
 msgid "L"
 msgstr "L"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:39
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:26
 msgid "L Button"
 msgstr "L-Knappen"
 
 #. i18n:  Left-Analog
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:61
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:48
 msgid "L-Analog"
 msgstr "Venstre-Analog"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:585
 msgid "Language:"
 msgstr "Språk:"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:152
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:153
 msgid "Last Overwritten State"
 msgstr "Siste Overskrevne Save State:"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:159
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:161
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:160
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:162
 msgid "Last Saved State"
 msgstr "Siste Save State:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:696
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:677
 msgid "Latency:"
-msgstr ""
+msgstr "Forsinkelse:"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:276
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:55
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:263
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:42
 msgid "Left"
 msgstr "Venstre"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:60
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:64
 msgid "Left Stick"
 msgstr "Venstre Joystick"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:257
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:257
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:245
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:245
 msgid ""
 "Left click to detect hotkeys.\n"
 "Enter space to clear."
@@ -3219,7 +3377,7 @@ msgstr ""
 "Venstreklikk for å oppdage hot-taster.\n"
 "Trykk space for å klarere."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:689
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:678
 msgid ""
 "Left-click to detect input.\n"
 "Middle-click to clear.\n"
@@ -3229,7 +3387,7 @@ msgstr ""
 "Middelklikk for å tømme.\n"
 "Høyreklikk for flere alternativer."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:694
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:683
 msgid ""
 "Left/Right-click for more options.\n"
 "Middle-click to clear."
@@ -3237,76 +3395,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:206
 msgid "Less Than"
 msgstr "Mindre Enn"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:565
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545
 msgid "Limit by FPS"
 msgstr "Begrens med FPS (bilder-per-sekund)"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:924
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:915
 msgid "Load"
 msgstr "Last inn"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544
 msgid "Load Custom Textures"
 msgstr "Last inn Kustomiserte Teksturer"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
 msgid "Load State Slot 1"
 msgstr "Last Inn Save State Slot 1"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189
 msgid "Load State Slot 2"
 msgstr "Last Inn Save State Slot 2"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:190
 msgid "Load State Slot 3"
 msgstr "Last Inn Save State Slot 3"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:203
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:191
 msgid "Load State Slot 4"
 msgstr "Last Inn Save State Slot 4"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192
 msgid "Load State Slot 5"
 msgstr "Last Inn Save State Slot 5"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193
 msgid "Load State Slot 6"
 msgstr "Last Inn Save State Slot 6"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:194
 msgid "Load State Slot 7"
 msgstr "Last Inn Save State Slot 7"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:195
 msgid "Load State Slot 8"
 msgstr "Last Inn Save State Slot 8"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:155
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:156
 msgid "Load State..."
 msgstr "Last Inn Save State..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1332
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1359
 msgid "Load Wii System Menu"
 msgstr "Last inn Wii System Meny"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1327
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1354
 #, c-format
 msgid "Load Wii System Menu %d%c"
 msgstr "Last inn Wii System Meny %d %c"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112
 msgid ""
 "Load custom textures from User/Load/Textures/<game_id>/\n"
 "\n"
@@ -3316,7 +3474,7 @@ msgstr ""
 "\n"
 "Hvis usikker, la stå avslått."
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:50
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:37
 msgid "Load preset values from hack patterns available."
 msgstr "Last in pre-satte verdier fra tilgjengelige hack-mønstre."
 
@@ -3324,48 +3482,50 @@ msgstr "Last in pre-satte verdier fra tilgjengelige hack-mønstre."
 msgid "Local"
 msgstr "Lokal"
 
-#: Source/Core/DolphinWX/Src/LogWindow.h:51
+#: Source/Core/DolphinWX/Src/LogWindow.h:38
 msgid "Log"
 msgstr "Logg"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:26
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:13
 msgid "Log Configuration"
 msgstr "Konfigurer Logg"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:296
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304
 msgid "Log FPS to file"
-msgstr ""
+msgstr "Logg FPS til fil"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:96
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83
 msgid "Log Types"
 msgstr "Loggtyper"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103
 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 ""
+"Logg antallet bilder rendert per sekund til User/Logs/fps.txt. Bruk denne "
+"funksjonaliteten hvis du vil måle ytelsen til Dolphin."
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:81
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:68
 msgid "Logger Outputs"
 msgstr "Logger utdata"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132
-#: Source/Core/DolphinWX/Src/Frame.cpp:328
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:119
+#: Source/Core/DolphinWX/Src/Frame.cpp:314
 msgid "Logging"
 msgstr "Logging"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:255
+#: Source/Core/Core/Src/NetPlayClient.cpp:259
 msgid "Lost connection to server!"
 msgstr "Mistet koblingen til server!"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:42
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:29
 msgid "M Button"
 msgstr "M-knappen"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:119
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:112
 #, c-format
 msgid ""
 "MD5 mismatch\n"
@@ -3374,51 +3534,66 @@ msgstr ""
 "MD5 mismatch\n"
 " %016llx%016llx != %016llx%016llx"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314
 msgid "MMU Speed Hack"
 msgstr "Ytelses-hack for MMU"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:527
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:563
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:517
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:556
 msgid "MadCatz Gameshark files(*.gcs)"
 msgstr "MadCatz Gameshark-filer(*.gcs)"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:51
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:63
+#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:38
 msgid "Main Stick"
 msgstr "Hoved-joystick"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460
 msgid "Maker ID:"
 msgstr "Skaper-ID:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487
 msgid "Maker:"
 msgstr "Skaper:"
 
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100
+msgid ""
+"Makes distant objects more visible by removing fog, thus increasing the "
+"overall detail.\n"
+"Disabling fog will break some games which rely on proper fog emulation.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+"Gjør objekter langt unna mer synlige ved å fjerne tåke, slik at det "
+"generelle detaljenivået øker.\n"
+"  Å deaktivere tåke vil ødelegge noen spill som avhenger av skikkelig "
+"tåkeemulering.\n"
+" \n"
+" Hvis usikker, la stå deaktivert."
+
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:97
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:100
 msgid "Max"
 msgstr "Maximum"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:448
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:435
 msgid "Memcard already has a save for this title"
 msgstr "Minnekortet har allerede en lagringsfil for denne tittelen."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:291
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:278
 msgid "Memcard already opened"
 msgstr "Minnekort allerede åpnet"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:912
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:913
 msgid "Memory Byte"
 msgstr "Memory Byte"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:225
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:113
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:212
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:93
 msgid "Memory Card"
 msgstr "Minnekort"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.h:36
+#: Source/Core/DolphinWX/Src/MemcardManager.h:23
 msgid ""
 "Memory Card Manager WARNING-Make backups before using, should be fixed but "
 "could mangle stuff!"
@@ -3426,7 +3601,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:371
+#: Source/Core/Core/Src/CoreParameter.cpp:360
 #, c-format
 msgid ""
 "Memory Card filename in Slot %c is incorrect\n"
@@ -3443,15 +3618,15 @@ msgstr ""
 "%s\n"
 "Vil du kopiere den gamle filen til denne nye plasseringen?\n"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:124
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:112
 msgid "Memorycard filesize does not match the header size"
-msgstr ""
+msgstr "Minnekortfilstørrelse matcher ikke header-størrelsen"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:50
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:37
 msgid "Menu"
 msgstr "Meny"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:114
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:94
 msgid "Mic"
 msgstr "Mic"
 
@@ -3460,20 +3635,20 @@ msgstr "Mic"
 msgid "Min"
 msgstr "Minimum"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:580
 msgid "Misc"
 msgstr "Diverse"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:795
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776
 msgid "Misc Settings"
 msgstr "Diverse Innstillinger"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:240
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:294
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:227
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:281
 msgid "Modifier"
 msgstr "Modifiserer"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106
 msgid ""
 "Modify textures to show the format they're encoded in. Needs an emulation "
 "reset in most cases.\n"
@@ -3485,20 +3660,20 @@ msgstr ""
 "\n"
 "Hvis usikker, la stå avslått."
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:115
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:108
 msgid "Monospaced font"
 msgstr "Mono-mellomrom tekst-font"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:305
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:292
 msgid "Motion Plus"
 msgstr "Motion Plus"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:309
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:86
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:296
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73
 msgid "Motor"
 msgstr "Motor"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:654
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:666
 msgid ""
 "Move the mouse pointer over an option to display a detailed description.\n"
 "\n"
@@ -3516,224 +3691,235 @@ msgstr ""
 "\n"
 "\n"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:75
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:62
 msgid "Multiply"
 msgstr "Multipliser"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:651
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:650
 msgid "NOP"
-msgstr ""
+msgstr "NOP"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:629
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:628
 msgid "NOTE: Stream size doesn't match actual data length\n"
-msgstr ""
+msgstr "MERK: Streamstørrelsen matcher ikke den faktiske datalengden\n"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:129
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:116
 msgid "NP Add"
 msgstr "NP Legg Til"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:124
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:111
 msgid "NP Begin"
 msgstr "NP Begynn"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:132
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:119
 msgid "NP Decimal"
 msgstr "NP Desimal"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:126
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:113
 msgid "NP Delete"
 msgstr "NP Slett"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:133
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:120
 msgid "NP Divide"
 msgstr "NP Divider"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:120
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:107
 msgid "NP Down"
 msgstr "NP Ned"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:123
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:110
 msgid "NP End"
 msgstr "NP Slutt"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:111
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:98
 msgid "NP Enter"
 msgstr "NP Enter"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:127
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:114
 msgid "NP Equal"
 msgstr "NP Erlik"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:116
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:103
 msgid "NP Home"
 msgstr "NP Hjem"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:125
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:112
 msgid "NP Insert"
 msgstr "NP Insert"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:117
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:104
 msgid "NP Left"
 msgstr "NP Venstre"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:128
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:115
 msgid "NP Multiply"
 msgstr "NP Multipliser"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:122
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:109
 msgid "NP Page Down"
 msgstr "NP Page Down"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:121
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:108
 msgid "NP Page Up"
 msgstr "NP Page Up"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:119
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:106
 msgid "NP Right"
 msgstr "NP Høyre"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:130
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:117
 msgid "NP Separator"
 msgstr "NP Separatør"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:109
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:96
 msgid "NP Space"
 msgstr "NP Mellomrom"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:131
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:118
 msgid "NP Subtract"
 msgstr "NP Trekk Fra"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:110
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:97
 msgid "NP Tab"
 msgstr "NP Tab"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:118
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:105
 msgid "NP Up"
 msgstr "NP Opp"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:444
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:59
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:50
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:448
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:46
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:37
 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:25
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:72
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:282
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:553
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:15
 msgid "Name: "
 msgstr "Navn:"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:526
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:562
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:516
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:555
 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:148
 msgid "New Scan"
 msgstr "Nytt Søk"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:206
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:193
 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:801
 msgid "Next Page"
 msgstr "Neste Side"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:165
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:152
 msgid "Next Scan"
 msgstr "Neste Søk"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:68
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:59
 msgid "Nickname :"
 msgstr "Brukernavn :"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:196
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:190
 msgid "No Country (SDK)"
 msgstr "Intet Land (SDK)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:370
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:357
 msgid "No ISOs or WADS found"
 msgstr "Ingen ISO- eller WAD-filer funnet"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:508
+#: Source/Core/Core/Src/ConfigManager.h:17
+msgid "No audio output"
+msgstr "Ingen audio-output"
+
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:501
 #, c-format
 msgid "No banner file found for title  %s"
 msgstr "Inngen banner-fil funnet for tittelen %s"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:761
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:768
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:760
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:767
 msgid "No description available"
-msgstr ""
+msgstr "Ingen beskrivelse tilgjengelig"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:514
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:535
 msgid "No docking"
 msgstr "Ingen dokking"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:859
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:860
 msgid "No file loaded"
 msgstr "Ingen fil lastet"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:439
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:426
 msgid "No free dir index entries"
 msgstr "Ingen ledige mappestiindeks-entries"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:895
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:896
 msgid "No recorded file"
 msgstr "Ingen opptaksfil"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:501
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:494
 #, c-format
 msgid "No save folder found for title %s"
 msgstr "Ingen lagringsmappe funnet for tittel %s"
 
+#: Source/Plugins/Plugin_VideoOGL/Src/main.cpp:132
+#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:111
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:23
 #: Source/Core/DolphinWX/Src/NetWindow.cpp:600
 msgid "None"
 msgstr "Ingen"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:323
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303
 msgid "Norwegian Bokmaal"
 msgstr "Norsk Bokmål"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:203
 msgid "Not Equal"
 msgstr "Ikke Lik"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:804
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:794
 msgid "Not Set"
 msgstr "Ikke Satt"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:626
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:101
+#, c-format
+msgid "Not a Wii save or read failure for file header size %x"
+msgstr "Ikke en Wii-lagringsfil, eller lesefeil for filheaderstørrelse %x"
+
+#: Source/Core/DolphinWX/Src/Main.cpp:654
 msgid "Not connected"
 msgstr "Ikke tilkoblet"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:309
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:296
 msgid "Notes"
 msgstr "Notater"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:16
 msgid "Notes: "
 msgstr "Notater:"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:71
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:74
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:580
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:621
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:629
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:59
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:64
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:613
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:659
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:667
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:31
 msgid "Notice"
 msgstr "Merknad"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:105
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:92
 msgid "Num Lock"
 msgstr "Num Lock"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:88
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:75
 msgid "Number Of Codes: "
 msgstr "Antall koder:"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:30
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:34
 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26
 msgid "Nunchuk"
 msgstr "Nunchuk"
@@ -3742,96 +3928,97 @@ msgstr "Nunchuk"
 msgid "Nunchuk Acceleration"
 msgstr "Nunchuk Aksellerasjon"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:877
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:878
 msgid "Object"
 msgstr "Objekt"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:135
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:122
 msgid "Object Range"
 msgstr "Objekt Radius"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:243
 msgid "Off"
 msgstr "Av"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:62
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:49
 msgid "Offset:"
 msgstr "Offset:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:582
 msgid "On-Screen Display Messages"
-msgstr ""
+msgstr "On-Screen Meldinger"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:436
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:423
 #, c-format
 msgid "Only %d blocks available"
 msgstr "Kun %d blokker tilgjengelig"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:420
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:178
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:426
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:166
 msgid "Open"
 msgstr "Åpne"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:876
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:867
 msgid "Open &containing folder"
 msgstr "Åpne &tilholdsmappe"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:873
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:864
 msgid "Open Wii &save folder"
 msgstr "Åpne Wii-&lagringsfil-mappe"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:420
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:426
 msgid "Open file..."
 msgstr "Åpne fil..."
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:61
+#: Source/Core/AudioCommon/Src/OpenALStream.cpp:48
 #, 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:72
+#: Source/Core/AudioCommon/Src/OpenALStream.cpp:59
 msgid "OpenAL: can't find sound devices"
 msgstr "OpenAL: Kan ikke finne lyd-device"
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:66
+#: Source/Core/AudioCommon/Src/OpenALStream.cpp:53
 #, c-format
 msgid "OpenAL: can't open device %s"
 msgstr "OpenAL: Kan ikke åpne device %s"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502
 msgid "OpenCL Texture Decoder"
 msgstr "OpenCL Teksturdekoder"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503
 msgid "OpenMP Texture Decoder"
 msgstr "OpenMP Teksturdekoder"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:317
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:94
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:304
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:81
 msgid "Options"
 msgstr "Alternativer"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:22
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Orange"
 msgstr "Oransje"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:468
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:455
+#, fuzzy
 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"
+"and import the saves to a new memcard\n"
 msgstr ""
 "Rekkefølgen av filer if Filmappen matcher ikke blokkrekkefølgen\n"
 "Høyreklikk og eksporter all lagringsfilene,\n"
 "og importer lagringsfilene til et nytt minnekort\n"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:316
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:324
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:509
 msgid "Other"
 msgstr "Annet"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:206
+#: Source/Core/Core/Src/NetPlayClient.cpp:210
 msgid ""
 "Other client disconnected while game is running!! NetPlay is disabled. You "
 "manually stop the game."
@@ -3839,15 +4026,15 @@ msgstr ""
 "Den andre klienten koblet fra mens spillet kjører! NetPlay er frakoblet. Du "
 "må stoppe spillet manuelt."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:481
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:468
 msgid "Output"
 msgstr "Utdata"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:342
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:348
 msgid "P&lay Recording..."
 msgstr "Spi&llopptak..."
 
-#: Source/Core/Core/Src/HW/GCPad.cpp:30
+#: Source/Core/Core/Src/HW/GCPad.cpp:18
 msgid "Pad"
 msgstr "Kontroll"
 
@@ -3855,160 +4042,160 @@ msgstr "Kontroll"
 msgid "Pad "
 msgstr "Kontroll"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:34
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:38
 msgid "Pads"
 msgstr "Kontrollere"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:108
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:95
 msgid "Page Down"
 msgstr "Page Down"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:107
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:94
 msgid "Page Up"
 msgstr "Page Up"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:35
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:22
 msgid "Paragraph"
 msgstr "Paragraf"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:64
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:51
 msgid "Parameters"
 msgstr "Parametere"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:222
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:217
 #, c-format
 msgid "Partition %i"
 msgstr "Partisjon %i"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:296
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:297
 msgid "Patches"
 msgstr "Patcher"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:556
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536
 msgid "Paths"
 msgstr "Mappestier"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1538
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1539
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:51
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1565
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1566
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:38
 msgid "Pause"
 msgstr "Pause"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:128
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:129
 msgid "Pause at end of movie"
-msgstr ""
+msgstr "Pause på slutten av filmen"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:397
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405
 msgid "Per-Pixel Lighting"
 msgstr "Per-Pikselbelysning"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352
 msgid "Perfect"
 msgstr "Perfekt"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:609
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:642
 #, c-format
 msgid "Perspective %d"
 msgstr "Perspektiv %d"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:165
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:424
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1547
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1548
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:152
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:430
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1574
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1575
 msgid "Play"
 msgstr "Spill"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176
 msgid "Play Recording"
 msgstr "Spill Opptak"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:170
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:170
 msgid "Play/Pause"
 msgstr "Spill/Pause"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351
 msgid "Playable"
 msgstr "Spillbar"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:154
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:141
 msgid "Playback Options"
 msgstr "Avspillingsalterntiver"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:301
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:304
 msgid "Players"
 msgstr "Spillere"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:988
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:991
 msgid "Please confirm..."
 msgstr "Vennligst bekreft..."
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:579
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:612
 msgid "Please create a perspective before saving"
 msgstr "Vennligst lag et persektiv før du lagrer"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:36
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:23
 msgid "Plus-Minus"
 msgstr "Pluss-Minus"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:324
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304
 msgid "Polish"
 msgstr "Polsk"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:713
 msgid "Port 1"
 msgstr "Port 1"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714
 msgid "Port 2"
 msgstr "Port 2"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:734
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715
 msgid "Port 3"
 msgstr "Port 3"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716
 msgid "Port 4"
 msgstr "Port 4"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:97
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:130
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:88
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:133
 msgid "Port :"
 msgstr "Port :"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:325
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305
 msgid "Portuguese"
 msgstr "Portugisisk"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:326
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306
 msgid "Portuguese (Brazilian)"
 msgstr "Portugisisk (Brasilsk)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:391
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:399
 msgid "Post-Processing Effect:"
 msgstr "postprosesseringseffekt:"
 
-#: Source/Core/Core/Src/Movie.cpp:936
+#: Source/Core/Core/Src/Movie.cpp:927
 #, c-format
 msgid "Premature movie end in PlayController. %u + 8 > %u"
-msgstr ""
+msgstr "Prematur filmslutt i PlayController. %u + 8 > %u"
 
-#: Source/Core/Core/Src/Movie.cpp:1055
+#: Source/Core/Core/Src/Movie.cpp:1046
 #, c-format
 msgid "Premature movie end in PlayWiimote. %u + %d > %u"
-msgstr ""
+msgstr "Prematur filmslutt i PlayWiiote. %u + %d > %u"
 
-#: Source/Core/Core/Src/Movie.cpp:1032
+#: Source/Core/Core/Src/Movie.cpp:1023
 #, c-format
 msgid "Premature movie end in PlayWiimote. %u > %u"
-msgstr ""
+msgstr "Prematur filmslutt i PlayWiimote. %u > %u"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:48
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:35
 msgid "Presets: "
 msgstr "Forhåndssatte:"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:205
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:192
 msgid "Prev Page"
 msgstr "Forrige Side"
 
@@ -4016,67 +4203,67 @@ msgstr "Forrige Side"
 msgid "Previous Page"
 msgstr "Forrige Side"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:183
 msgid "Previous Value"
 msgstr "Forrige Verdi"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:60
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:47
 msgid "Print"
 msgstr "Print"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:894
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:885
 msgid "Profile"
 msgstr "Profil"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.h:55
+#: Source/Core/DolphinWX/Src/ISOProperties.h:42
 msgid "Properties"
 msgstr "Egenskaper"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:283
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:286
 msgid "Purge Cache"
 msgstr "Tøm Cache"
 
-#: Source/Core/Common/Src/MsgHandler.cpp:66
+#: Source/Core/Common/Src/MsgHandler.cpp:52
 msgid "Question"
 msgstr "Spørsmål"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:159
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:316
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:162
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:319
 msgid "Quit"
 msgstr "Avslutt"
 
 #. i18n:  Right
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:59
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:46
 msgid "R"
 msgstr "R"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:40
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:27
 msgid "R Button"
 msgstr "R-knappen"
 
 #. i18n:  Right-Analog
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:63
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
 msgid "R-Analog"
 msgstr "Høyre-analog"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:445
 msgid "RAM"
 msgstr "RAM"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:175
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:169
 msgid "RUSSIA"
 msgstr "RUSSLAND"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:528
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:515
 msgid "Range"
 msgstr "Rekkevidde"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:190
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:178
 msgid "Read-only mode"
 msgstr "Les-kun-modus"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:487
 msgid "Real"
 msgstr "Ekte"
 
@@ -4086,39 +4273,39 @@ msgstr "Ekte Wiimote"
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:63
 msgid "Real Wiimotes"
-msgstr ""
+msgstr "Ekte WiiMote"
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
 msgid "Reconnect Wiimote on State Loading"
 msgstr "Gjenntilkoble Wiimote ved Lasting av Save State"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:193
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:217
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:791
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:180
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:204
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:790
 msgid "Record"
 msgstr "Opptak"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:174
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:161
 msgid "Recording Info"
 msgstr "Opptaksinformasjon"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:202
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:189
 msgid "Recording Options"
 msgstr "Opptaksinnstillinger"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:21
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Red"
 msgstr "Rød"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:24
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Red Left"
 msgstr "Rød Venstre"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:25
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Red Right"
 msgstr "Rød Høyre"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86
 msgid ""
 "Reduces the amount of aliasing caused by rasterizing 3D graphics.\n"
 "This makes the rendered picture look less blocky.\n"
@@ -4134,28 +4321,28 @@ msgstr ""
 "Hvis usikker, velg ingen."
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:60
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:421
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:903
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:427
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:894
 msgid "Refresh"
 msgstr "Oppdater"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:180
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:168
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:168
 msgid "Refresh List"
 msgstr "Oppdater liste"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:421
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:427
 msgid "Refresh game list"
 msgstr "Oppdater spilliste"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:405
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:427
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:77
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:812
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:409
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:431
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:64
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:793
 msgid "Remove"
 msgstr "Fjern"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99
 msgid ""
 "Render the scene as a wireframe.\n"
 "\n"
@@ -4165,196 +4352,204 @@ msgstr ""
 "\n"
 "Hvis usikker, la stå avslått."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:308
 msgid "Render to Main Window"
 msgstr "Render til Hovedvindu"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:915
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:172
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:906
 msgid "Reset"
 msgstr "Restart"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:190
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:177
 msgid "Results"
 msgstr "Resultater"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:29
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:16
 msgid "Return"
 msgstr "Tilbake"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:277
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:57
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464
+msgid "Revision:"
+msgstr ""
+
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:264
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:44
 msgid "Right"
 msgstr "Høyre"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:61
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:65
 msgid "Right Stick"
 msgstr "Høyre Joystick"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:85
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:295
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:72
 msgid "Rumble"
 msgstr "Rumble"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:518
-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:498
+msgid ""
+"Run DSP HLE and LLE on a dedicated thread (not recommended: might cause "
+"audio glitches with HLE and freezes with LLE)."
+msgstr ""
+"Kjør DSP HLE og LLE på en dedikert tråd (ikke anbefalt: Kan forårsake audio-"
+"bugs med HLE og krasj med LLE)."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:327
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307
 msgid "Russian"
 msgstr "Russisk"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:149
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:150
 msgid "Sa&ve State"
 msgstr "Lagre Sa&ve State"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:465
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475
 msgid "Safe"
 msgstr "Sikker"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:196
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:446
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:925
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:183
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:452
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916
 msgid "Save"
 msgstr "Lagre"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:532
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:522
 msgid "Save GCI as..."
 msgstr "Lagre GCI som..."
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
 msgid "Save State Slot 1"
 msgstr "Lagre Save State Slot 1"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:198
 msgid "Save State Slot 2"
 msgstr "Lagre Save State Slot 2"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:199
 msgid "Save State Slot 3"
 msgstr "Lagre Save State Slot 3"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:212
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:212
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200
 msgid "Save State Slot 4"
 msgstr "Lagre Save State Slot 4"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201
 msgid "Save State Slot 5"
 msgstr "Lagre Save State Slot 5"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202
 msgid "Save State Slot 6"
 msgstr "Lagre Save State Slot 6"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:203
 msgid "Save State Slot 7"
 msgstr "Lagre Save State Slot 7"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204
 msgid "Save State Slot 8"
 msgstr "Lagre Save State Slot 8"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:151
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:152
 msgid "Save State..."
 msgstr "Lagre Save State..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:582
 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:592
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:602
 msgid "Save as..."
 msgstr "Lagre som..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1203
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1204
 msgid "Save compressed GCM/ISO"
 msgstr "Lagre komprimert GCM/ISO"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:446
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:452
 msgid "Save current perspective"
 msgstr "Lagre nåværende perspektiv"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1192
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193
 msgid "Save decompressed GCM/ISO"
 msgstr "Lagre dekomprimert GCM/ISO"
 
-#: Source/Core/Core/Src/Movie.cpp:801
+#: Source/Core/Core/Src/Movie.cpp:792
 #, 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:396
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:404
 msgid "Scaled EFB Copy"
 msgstr "Skalert EFB-kopi"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:556
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:543
 #, c-format
 msgid "Scanning %s"
 msgstr "Søker i %s"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:539
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:526
 msgid "Scanning for ISOs"
 msgstr "Søker etter ISO-filer"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:540
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:527
 msgid "Scanning..."
 msgstr "Søker..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:427
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
 msgid "ScrShot"
 msgstr "SkjDump"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:106
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:93
 msgid "Scroll Lock"
 msgstr "Scroll Lock"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:264
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:251
 msgid "Search"
-msgstr ""
+msgstr "Søk"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:227
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:214
 msgid "Search Filter"
 msgstr "Søkefilter"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:810
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:791
 msgid "Search Subfolders"
 msgstr "Søk i Undermapper"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:250
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:237
 msgid "Search current Object"
-msgstr ""
+msgstr "Søk i dette objektet"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:254
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:241
 msgid "Search for hex Value:"
-msgstr ""
+msgstr "Søk etter hex-verdi:"
 
-#: Source/Core/Common/Src/SysConf.h:103 Source/Core/Common/Src/SysConf.h:126
-#: Source/Core/Common/Src/SysConf.h:146 Source/Core/Common/Src/SysConf.h:167
+#: Source/Core/Common/Src/SysConf.h:90 Source/Core/Common/Src/SysConf.h:113
+#: Source/Core/Common/Src/SysConf.h:133 Source/Core/Common/Src/SysConf.h:154
 #, c-format
 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:490
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:46
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:477
 msgid "Select"
 msgstr "Velg"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:677
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1072
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:683
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1087
 msgid "Select The Recording File"
 msgstr "Velg Opptaksfil"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1285
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1312
 msgid "Select a Wii WAD file to install"
 msgstr "Velg en Wii WAD-fil å innstallere"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:70
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74
 msgid ""
 "Select a hardware adapter to use.\n"
 "\n"
@@ -4364,31 +4559,31 @@ msgstr ""
 "\n"
 "Om du er i tvil, benytt den første."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:520
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:510
 msgid "Select a save file to import"
 msgstr "Velg en lagringsfil å importere"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:363
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:366
 msgid "Select floating windows"
 msgstr "Velg flytvindu"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:582
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:585
 msgid "Select the file to load"
 msgstr "Velg fil å laste"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1241
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1268
 msgid "Select the save file"
 msgstr "Velg lagringsfil"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1388
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1415
 msgid "Select the state to load"
 msgstr "Velg en save state å laste"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1429
 msgid "Select the state to save"
 msgstr "Velg en save state å lagre"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82
 msgid ""
 "Select what aspect ratio to use when rendering:\n"
 "Auto: Use the native aspect ratio\n"
@@ -4406,15 +4601,15 @@ msgstr ""
 "\n"
 "Hvis usikker, velg Automatisk."
 
-#: Source/Core/InputCommon/Src/InputConfig.cpp:61
+#: Source/Core/InputCommon/Src/InputConfig.cpp:48
 msgid "Selected controller profile does not exist"
-msgstr ""
+msgstr "Valgt kontrolprofil eksisterer ikke"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:116
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:109
 msgid "Selected font"
 msgstr "Valgt font"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75
 msgid ""
 "Selects the display resolution used in fullscreen mode.\n"
 "This should always be bigger than or equal to the internal resolution. "
@@ -4430,23 +4625,39 @@ 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:69
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:70
 msgid ""
 "Selects what graphics API to use internally.\n"
 "Direct3D 9 usually is the fastest one. OpenGL is more accurate though. "
 "Direct3D 11 is somewhere between the two.\n"
 "Note that the Direct3D backends are only available on Windows.\n"
 "\n"
-"If unsure, use Direct3D 9."
+"If unsure, use Direct3D 11."
 msgstr ""
-"Velger hvilken grafikk-API som skal brukes internt.\n"
-"Direct3D 9 er vanligvis den raskeste. OpenGL er derimot mer nøyaktig. "
-"Direct3D 11 ligger noe immelom de to.\n"
-"Merk at Direct3D backend-ene kun kan benyttes på Windows.\n"
-"\n"
-"Hvis usikker, velg Direct3D 9."
+"Velg hvilken grafikk-API som skal brukes internt.\n"
+" Direct3D 9 er vanligvis den raskeste. OpenGL er mer nøyaktig. Direct3D 11 "
+"ligger et sted imellom de to.\n"
+" Merk at Direct3D bakendene kun er tilgjengelig på Windows.\n"
+" \n"
+" Hvis usikker, benytt Direct3D 11."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:288
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72
+msgid ""
+"Selects what graphics API to use internally.\n"
+"Direct3D 9 usually is the fastest one. OpenGL is more accurate though. "
+"Direct3D 11 is somewhere between the two.\n"
+"Note that the Direct3D backends are only available on Windows.\n"
+"\n"
+"If unsure, use OpenGL."
+msgstr ""
+"Velg hvilken grafikk-API som skal brukes internt.\n"
+" Direct3D 9 er vanligvis den raskeste. OpenGL er mer nøyaktig. Direct3D 11 "
+"ligger et sted imellom de to.\n"
+" Merk at Direct3D bakendene kun er tilgjengelig på Windows.\n"
+" \n"
+" Hvis usikker, benytt OpenGL."
+
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:291
 msgid "Send"
 msgstr "Send"
 
@@ -4454,24 +4665,24 @@ msgstr "Send"
 msgid "Sensor Bar Position:"
 msgstr "Sensorbarposisjon:"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:77
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:64
 msgid "Separator"
 msgstr "Separatør"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:328
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308
 msgid "Serbian"
 msgstr "Serbisk"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:522
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502
 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:488
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:475
 msgid "Set"
 msgstr "Sett"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:877
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:868
 msgid "Set as &default ISO"
 msgstr "Sett som &standard-ISO"
 
@@ -4480,134 +4691,136 @@ msgstr "Sett som &standard-ISO"
 msgid "Set as default Memcard %c"
 msgstr "Sett som standard Minnekort %c"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:460
+#: Source/Core/Core/Src/ActionReplay.cpp:450
 #, 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/ConfigMain.cpp:535
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:515
 msgid ""
 "Sets the latency (in ms).  Higher values may reduce audio crackling. OpenAL "
 "backend only."
 msgstr ""
+"Sett forsinkelsen (i ms). Høyere verdier kan redusere audioknaking. Kun for "
+"OpenAL backend."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341
 msgid "Settings..."
 msgstr "Innstillinger..."
 
-#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:222
+#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:209
 msgid "SetupWiiMem: Cant find setting file"
 msgstr "SetupWiiMem: Kan ikke finne konfigurasjonsfilen"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:291
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:278
 msgid "Shake"
 msgstr "Rist"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
 msgid "Short Name:"
 msgstr "Kortnavn:"
 
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:103
+#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:90
 msgid "Shoulder Buttons"
-msgstr ""
+msgstr "Skulderknapper"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:217
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:220
 msgid "Show &Console"
 msgstr "Vis &Konsoll"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:215
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:218
 msgid "Show &Log"
 msgstr "Vis &Logg"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:212
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:215
 msgid "Show &Statusbar"
 msgstr "Vis &Statusbar"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:210
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:213
 msgid "Show &Toolbar"
 msgstr "Vis &Verktøylinje"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:281
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:284
 msgid "Show Drives"
 msgstr "Vis DVD-stasjoner"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:517
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530
 msgid "Show EFB Copy Regions"
 msgstr "Vis Kopieringsregioner for EFB"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:295
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303
 msgid "Show FPS"
 msgstr "Vis Bildefrekvens (FPS)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:271
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:274
 msgid "Show France"
 msgstr "Vis Frankrike"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:257
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:260
 msgid "Show GameCube"
 msgstr "Vis GameCube"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561
 msgid "Show Input Display"
 msgstr "Vis Inndata"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:273
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:276
 msgid "Show Italy"
 msgstr "Vis Italia"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:264
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:267
 msgid "Show JAP"
 msgstr "Vis JAP"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:275
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:278
 msgid "Show Korea"
 msgstr "Vis Korea"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476
 msgid "Show Language:"
 msgstr "Vis Språk:"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:216
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:219
 msgid "Show Log &Configuration"
 msgstr "Vis Loggk&onfigurasjon"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:266
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:269
 msgid "Show PAL"
 msgstr "Vis PAL"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:254
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:257
 msgid "Show Platforms"
 msgstr "Vis Plattformer"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:263
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:266
 msgid "Show Regions"
 msgstr "Vis Regioner"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:518
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531
 msgid "Show Statistics"
 msgstr "Vis Statistikker"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:277
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:280
 msgid "Show Taiwan"
 msgstr "Vis Taiwan"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:268
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:271
 msgid "Show USA"
 msgstr "Vis USA"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:259
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:262
 msgid "Show Wad"
 msgstr "Vis WAD"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:255
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:258
 msgid "Show Wii"
 msgstr "Vis Wii"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491
 msgid "Show a confirmation box before stopping a game."
 msgstr "Vis en bekreftelsesboks før spill stoppes."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:512
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492
 msgid ""
 "Show a message box when a potentially serious error has occurred.\n"
 "Disabling this may avoid annoying and non-fatal messages, but it may also "
@@ -4622,16 +4835,19 @@ msgstr ""
 msgid "Show first block"
 msgstr "Vis første blokk"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:130
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:131
 msgid "Show lag counter"
-msgstr ""
+msgstr "Vis lagteller"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493
 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 ""
+"Vis meldinger på emulasjonsområdet av skjermen.\n"
+" Disse meldingene innkluderer minnekortskrivninger, Video-backend- og CPU-"
+"informasjon, og JIT cache-tømninger."
 
 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:815
 msgid "Show save blocks"
@@ -4649,7 +4865,7 @@ msgstr "Vis lagringsikon"
 msgid "Show save title"
 msgstr "Vis lagringstittel"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102
 msgid ""
 "Show the number of frames rendered per second as a measure of emulation "
 "speed.\n"
@@ -4660,11 +4876,11 @@ msgstr ""
 "\n"
 "Hvis usikker, la stå avslått."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:279
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:282
 msgid "Show unknown"
 msgstr "Vis ukjent"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105
 msgid ""
 "Show various statistics.\n"
 "\n"
@@ -4674,47 +4890,31 @@ msgstr ""
 "\n"
 "Hvis usikker, la stå avslått."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:319
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:306
 msgid "Sideways Wiimote"
 msgstr "Sideveis-pekende Wiimote"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:280
 msgid "Simplified Chinese"
 msgstr "Simplifisert Kinesisk"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:311
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:298
 msgid "Size"
 msgstr "Størrelse"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:696
 msgid "Skip BIOS"
 msgstr "Dropp BIOS"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316
 msgid "Skip DCBZ clearing"
-msgstr ""
+msgstr "Hopp over DCBZ-tømming"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:492
-msgid "Skip Dest. Alpha Pass"
-msgstr "Dropp Dest. Alpha Pass"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:444
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:454
 msgid "Skip EFB Access from CPU"
 msgstr "Dropp EFB Access fra CPU"
 
-#: 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 ""
-"Dropper destinasjon alpha pass, brukt i mange spill for diverse grafiske "
-"effekter.\n"
-"\n"
-"Hvis usikker, la stå avslått."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125
 msgid ""
 "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n"
 "Sometimes also increases visual quality.\n"
@@ -4730,25 +4930,25 @@ msgstr ""
 "\n"
 "Hvis usikker, la stå avslått."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:374
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:386
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:380
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:392
 #, c-format
 msgid "Slot %i"
 msgstr "Slot %i"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:700
 msgid "Slot A"
 msgstr "Slot A"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:701
 msgid "Slot B"
 msgstr "Slot B"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:62
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:49
 msgid "Snapshot"
 msgstr "Stillbilde"
 
-#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:58
+#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:46
 msgid "Software Renderer"
 msgstr "Software-renderer"
 
@@ -4763,27 +4963,27 @@ msgstr ""
 "Det er kun nyttig for å debugge.\n"
 "Vil du virkelig benytte programvarerendering? Hvis usikker, velg 'nei'."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:683
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:664
 msgid "Sound Settings"
 msgstr "Innstillinger for Audio"
 
-#: Source/Core/AudioCommon/Src/AudioCommon.cpp:77
+#: Source/Core/AudioCommon/Src/AudioCommon.cpp:64
 #, c-format
 msgid "Sound backend %s is not valid."
 msgstr "Audio backend %s er ugyldig"
 
-#: Source/Core/AudioCommon/Src/DSoundStream.cpp:59
+#: Source/Core/AudioCommon/Src/DSoundStream.cpp:46
 #, c-format
 msgid "Sound buffer creation failed: %s"
 msgstr "Laging av lydbuffer mislyktes: %s"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:31
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:18
 msgid "Space"
 msgstr "Mellomrom"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:329
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309
 msgid "Spanish"
 msgstr "Spansk"
 
@@ -4791,7 +4991,7 @@ msgstr "Spansk"
 msgid "Speaker Volume:"
 msgstr "Høytalervolum:"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92
 msgid ""
 "Specifies the resolution used to render at. A high resolution will improve "
 "visual quality a lot but is also quite heavy on performance and might cause "
@@ -4810,63 +5010,63 @@ msgstr ""
 "\n"
 "Hvis usikker, velg 640x528."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322
 msgid "Speed up Disc Transfer Rate"
 msgstr "Øk diskoverføringshatighet"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:243
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:230
 msgid "Square Stick"
 msgstr "Kvadrat-joystick"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:107
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87
 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:322
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:37
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:25
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:325
 msgid "Start"
 msgstr "Start"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:194
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:197
 msgid "Start &NetPlay"
 msgstr "Start &NetPlay"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:339
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:345
 msgid "Start Re&cording"
 msgstr "Begynn &Opptak"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:175
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:175
 msgid "Start Recording"
 msgstr "Begynn Opptak"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:312
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:299
 msgid "State"
 msgstr "Save State"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:173
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:161
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:161
 msgid "State Saves"
 msgstr "Save State-lagringsfiler"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:108
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88
 msgid "Steering Wheel"
-msgstr ""
+msgstr "Ratt"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:53
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:57
 msgid "Stick"
 msgstr "Joystick"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:420
-#: 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:325
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:419
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:431
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:171
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:171
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:328
 msgid "Stop"
 msgstr "Stopp"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96
 msgid ""
 "Store EFB copies in GPU texture objects.\n"
 "This is not so accurate, but it works well enough for most games and gives a "
@@ -4880,107 +5080,119 @@ msgstr ""
 "\n"
 "Hvis usikker, la stå på."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:275
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283
 msgid "Stretch to Window"
 msgstr "Strekk til Vindu"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:43
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:47
 msgid "Strum"
 msgstr "Klimpre"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:78
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:65
 msgid "Subtract"
 msgstr "Trekk Fra"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:77
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:67
 #, c-format
 msgid "Successfully exported file to %s"
 msgstr "Eksportering av fil til %s vellykket"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:56
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:43
 msgid "Successfully imported save files"
 msgstr "Importering av lagringsfiler vellykket"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:285
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:272
 msgid "Swing"
 msgstr "Sving"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:744
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:792
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320
+msgid "Synchronize GPU thread"
+msgstr "Synkroniser GPU-tråd"
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321
+msgid ""
+"Synchronizes the GPU and CPU threads to help prevent random freezes in Dual "
+"Core mode. (ON = Compatible, OFF = Fast)"
+msgstr ""
+"Synkroniserer GPU- og CPU-trådene for å hindre tilfeldige krasj i "
+"dobbelkjernemodus. (PÅ = kompatibel, AV = raskt)"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773
 msgid "System Language:"
 msgstr "Systemspråk:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:191
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:185
 msgid "TAIWAN"
 msgstr "TAIWAN"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:127
-#: Source/Core/DolphinWX/Src/TASInputDlg.h:32
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:128
+#: Source/Core/DolphinWX/Src/TASInputDlg.h:19
 msgid "TAS Input"
-msgstr ""
+msgstr "TAS-input"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:28
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:15
 msgid "Tab"
 msgstr "Tab"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:510
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:531
 msgid "Tab split"
 msgstr "Tab-splitting"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:37
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:41
 msgid "Table Left"
 msgstr "Tabell Venstre"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:38
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:42
 msgid "Table Right"
 msgstr "Tabell Høyre"
 
-#: 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
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:361
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:181
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:181
 msgid "Take Screenshot"
 msgstr "Ta Skjermbilde"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:109
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89
 msgid "TaruKonga (Bongos)"
-msgstr ""
+msgstr "TaruKonga (Bongoer)"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:472
 msgid "Test"
 msgstr "Test"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:444
 msgid "Texture"
 msgstr "Tekstur"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:451
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:461
 msgid "Texture Cache"
 msgstr "Tekstur-cache"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:519
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:532
 msgid "Texture Format Overlay"
 msgstr "Teksturformat Overlegg"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:226
+#: Source/Core/Core/Src/CoreParameter.cpp:215
 msgid "The WAD has been installed successfully"
 msgstr "Installasjon av WAD-fil var vellykket"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:197
+#: Source/Core/Core/Src/ActionReplay.cpp:185
 msgid "The address is invalid"
 msgstr "Adressen er ugyldig"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:509
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:496
 msgid "The checksum was successfully fixed"
 msgstr "Fiksing av sjekksummen var vellykket"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1242
+#: 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:1117
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1216
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1118
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1146
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1217
 #, c-format
 msgid ""
 "The file %s already exists.\n"
@@ -4989,7 +5201,7 @@ msgstr ""
 "Filen %s eksisterer allerede.\n"
 "Ønsker du å erstatte den?"
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:51
+#: Source/Core/AudioCommon/Src/WaveFile.cpp:38
 #, c-format
 msgid ""
 "The file %s could not be opened for writing. Please check if it's already "
@@ -4998,84 +5210,88 @@ msgstr ""
 "Filen %s kunne åpnes for skriving. Vennligst sjekk at den ikke allerede er "
 "åpen i et annet program."
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:44
+#: Source/Core/AudioCommon/Src/WaveFile.cpp:31
 #, c-format
 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:332
+#: Source/Core/Core/Src/Boot/Boot.cpp:320
 #, c-format
 msgid "The file you specified (%s) does not exist"
 msgstr "Filen du spesifiserte (%s) eksisterer ikke"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:628
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:666
 msgid "The name can not be empty"
 msgstr "Navnet kan ikke være blankt"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:620
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:658
 msgid "The name can not contain the character ','"
 msgstr "navnet kan ikke inneholde tegnet ','"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:142
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:129
 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:93
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98
 msgid ""
 "The safer you adjust this, the less likely the emulator will be missing any "
 "texture updates from RAM.\n"
 "\n"
 "If unsure, use the rightmost value."
 msgstr ""
+"Jo tryggere denne settes, jo mindre sannsynlig er det at emulatoren vil "
+"mangle noen teksturoppdateringer fra RAM.\n"
+" \n"
+" Hvis usikker, bruk verdien mest til høyre."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:445
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:432
 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:388
+#: Source/Core/DolphinWX/Src/Main.cpp:416
 msgid ""
 "The selected language is not supported by your system. Falling back to "
 "system default."
 msgstr ""
 "Det valgte språket støttes ikke av ditt system. Faller tilbake til standard."
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:43
+#: Source/Core/Core/Src/NetPlayClient.cpp:47
 msgid "The server and client's NetPlay versions are incompatible!"
 msgstr "Serverens og klientens NetPlay-versjoner er ukompitable!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:40
+#: Source/Core/Core/Src/NetPlayClient.cpp:44
 msgid "The server is full!"
 msgstr "Serveren er full!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:46
+#: Source/Core/Core/Src/NetPlayClient.cpp:50
 msgid "The server responded: the game is currently running!"
 msgstr "Serveren responderte: Spillet kjører!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:49
+#: Source/Core/Core/Src/NetPlayClient.cpp:53
 msgid "The server sent an unknown error message!"
 msgstr "Serveren sente en ukjent feilmelding!"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:119
+#: Source/Core/Core/Src/CoreParameter.cpp:108
 #, c-format
 msgid "The specified file \"%s\" does not exist"
 msgstr "Den spesifiserte filen \"%s\" eksisterer ikke"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:198
+#: Source/Core/Core/Src/ActionReplay.cpp:186
 msgid "The value is invalid"
 msgstr "Verdien er ugyldig"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:642
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:623
 msgid "Theme:"
-msgstr ""
+msgstr "Tema:"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:476
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:463
 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:307
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308
 msgid ""
 "These settings override core Dolphin settings.\n"
 "Undetermined means the game uses Dolphin's setting."
@@ -5083,7 +5299,7 @@ msgstr ""
 "Disse innstillingene overstyrer Dolphins kjerneinnstillinger.\n"
 "Ubestemt betyr at spillet bruker Dolphins kjerneinnstillinger."
 
-#: Source/Core/Core/Src/ActionReplay.cpp:355
+#: Source/Core/Core/Src/ActionReplay.cpp:345
 msgid ""
 "This action replay simulator does not support codes that modify Action "
 "Replay itself."
@@ -5091,11 +5307,11 @@ msgstr ""
 "Denne Action Replay-simulatoren støtter ikke koder som modifiserer selve "
 "Action Replay."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505
 msgid "This could cause slow down in Wii Menu and some games."
 msgstr "Dette kan føre til ytelsesreduksjon i Wii Meny og noen spill."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118
 msgid ""
 "This feature allows you to change the game's camera.\n"
 "Move the mouse while holding the right mouse button to pan and while holding "
@@ -5106,8 +5322,25 @@ msgid ""
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
+"Denne funksjonen tillater deg å endre spillets kameraposisjon. Hold nede "
+"høyre museknapp og flytt musen for å snu på kameraet. Hold nede SHIFT og "
+"press en av tastene WASD for å flytte kameraet en viss distanse (SHIFT + 0 "
+"for å flytte raskere og SHIFT + 9 for å flytte saktere). Trykk SHIFT + R for "
+"å resette kameraet. Hvis usikker, la stå avslått."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485
+#, fuzzy
+msgid ""
+"This limits the game speed to the specified number of frames per second "
+"(full speed is 60 for NTSC and 50 for PAL). Alternatively, use Audio to "
+"throttle using the DSP (might fix audio clicks but can also cause constant "
+"noise depending on the game)."
+msgstr ""
+"Hvis du setter Bildebegrensning høyere enn spillets fulle hastighet "
+"(NTSC:60, PAL:50). Bruk audio for å begrense ved å bruke  DSP (kan muligens "
+"fikse audioklikk, men kan også forårsake støy, avhengig av spillet)."
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484
 msgid ""
 "This splits the Video and CPU threads, so they can be run on separate "
 "cores.\n"
@@ -5119,61 +5352,61 @@ 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:286
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:287
 msgid "This will let you Manually Edit the INI config file"
 msgstr "Dette lar deg manuelt endre INI-konfigurasjonsfilen"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:249
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:254
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:236
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:241
 msgid "Threshold"
 msgstr "Terskel"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:288
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:275
 msgid "Tilt"
 msgstr "Tilt"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:628
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:304
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:622
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:291
 msgid "Title"
 msgstr "Tittel"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:125
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:144
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:112
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:131
 msgid "To"
 msgstr "Til"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:72
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59
 msgid "Toggle All Log Types"
 msgstr "Vipp Alle Loggtyper"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:426
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:432
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:180
 msgid "Toggle Fullscreen"
 msgstr "Vipp Mellom Vindu/Fullskjerm"
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:87
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:271
 msgid "Top"
 msgstr "Topp"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:281
 msgid "Traditional Chinese"
 msgstr "Tradisjonell Kinesisk"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:426
+#: Source/Core/Core/Src/Boot/Boot.cpp:414
 msgid "Tried to load an unknown file type."
 msgstr "Forsøkte å laste en ukjent filtype."
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:80
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:67
 msgid "Triggers"
 msgstr "Triggere"
 
-#: Source/Core/Common/Src/SysConf.h:91 Source/Core/Common/Src/SysConf.h:114
+#: Source/Core/Common/Src/SysConf.h:78 Source/Core/Common/Src/SysConf.h:101
 msgid "Trying to read from invalid SYSCONF"
 msgstr "Forsøker å lese fra ugyldig SYSCONF"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:44
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:31
 msgid ""
 "Trying to read from invalid SYSCONF\n"
 "Wiimote bt ids are not available"
@@ -5181,15 +5414,15 @@ msgstr ""
 "Forsøker å lese fra ugyldig SYSCONF\n"
 "Wiimote bt ids er ikke tilgjengelig"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:330
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
 msgid "Turkish"
 msgstr "Tyrkisk"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:33
 msgid "Turntable"
 msgstr "Dreieskive"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:71
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58
 msgid "Type"
 msgstr "Type"
 
@@ -5197,31 +5430,33 @@ msgstr "Type"
 msgid "UDP Port:"
 msgstr "UDP Port:"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:279
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:266
 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12
 msgid "UDP Wiimote"
 msgstr "UDP Wiimote"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:199
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:193
 msgid "UNKNOWN"
 msgstr "UKJENT"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:756
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:755
 #, c-format
 msgid "UNKNOWN_%02X"
-msgstr ""
+msgstr "UKJENT_%02X"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:178
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:172
 msgid "USA"
 msgstr "USA"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:225
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:214
 msgid ""
 "Unable to create patch from given values.\n"
 "Entry not modified."
 msgstr ""
+"Kunne ikke lage patch fra gitte verdier.\n"
+" Modifiseringen ble ikke gjort."
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:124
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:111
 #, c-format
 msgid ""
 "Unable to parse line %lu of the entered AR code as a valid encrypted or "
@@ -5232,74 +5467,93 @@ 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:391
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:397
 #, c-format
 msgid "Undefined %i"
 msgstr "Udefinert %i"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:163
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:164
 msgid "Undo Load State"
 msgstr "Angre Lasting av Save State"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:718
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:717
 msgid "Unexpected 0x80 call? Aborting..."
-msgstr ""
+msgstr "Uforventet 0x80 kall? Avbryter..."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:215
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:202
 msgid "Unknown"
 msgstr "Ukjent"
 
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:971
+#: Source/Core/Core/Src/HW/DVDInterface.cpp:965
 #, c-format
 msgid "Unknown DVD command %08x - fatal error"
 msgstr "Ukjent DVD-kommando%08x - fatal feil"
 
-#: Source/Core/Common/Src/SysConf.cpp:145
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:444
+#, c-format
+msgid "Unknown command 0x%08x"
+msgstr "Ukjent kommando 0x%08x"
+
+#: Source/Core/Common/Src/SysConf.cpp:132
 #, c-format
 msgid "Unknown entry type %i in SYSCONF (%s@%x)!"
 msgstr "Ukjent entry-type %i in SYSCONF (%s@%x)!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:228
+#: Source/Core/Core/Src/NetPlayClient.cpp:232
 #, c-format
 msgid "Unknown message received with id : %d"
 msgstr "Ukjent melding mottatt med ID: %d"
 
-#: Source/Core/Core/Src/NetPlayServer.cpp:504
+#: Source/Core/Core/Src/NetPlayServer.cpp:508
 #, c-format
 msgid "Unknown message with id:%d received from player:%d Kicking player!"
 msgstr "Ukjent melding mottatt med ID: %d fra spiller: %d Sparker spiller!"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:274
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:56
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:261
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:43
 msgid "Up"
 msgstr "Opp"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:108
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:95
 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17
 msgid "Update"
 msgstr "Oppdater"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:320
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:307
 msgid "Upright Wiimote"
 msgstr "Mot-skjerm-pekende Wiimote"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:777
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758
 msgid "Use EuRGB60 Mode (PAL60)"
 msgstr "Bruk EuRGB60-modus (PAL60)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:294
 msgid "Use Fullscreen"
 msgstr "Bruk Fullskjerm"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:575
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:563
 msgid "Use Hex"
 msgstr "Bruk Hex"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:600
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580
 msgid "Use Panic Handlers"
 msgstr "Bruk Panikkadvarslere"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89
+msgid ""
+"Use a hacked upload strategy to stream vertices.\n"
+"This usually speed up, but is forbidden by OpenGL specification and may "
+"causes heavy glitches.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+"Bruk en hacket opplastningsstrategi for å streame punkter.\n"
+" Dette vil vanligvis øke ytelsen, men er forbudt av OpenGL spesifikasjonen "
+"og kan forårsake store bugs.\n"
+" \n"
+" Hvis usikker, la stå deaktivert."
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122
 msgid ""
 "Use multiple threads to decode textures.\n"
 "Might result in a speedup (especially on CPUs with more than two cores).\n"
@@ -5312,7 +5566,7 @@ msgstr ""
 "\n"
 "Hvis usikker, la stå avslått."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126
 msgid ""
 "Usually if shader compilation fails, an error message is displayed.\n"
 "However, one may skip the popups to allow interruption free gameplay by "
@@ -5326,53 +5580,58 @@ msgstr ""
 "\n"
 "Hvis usikker, la stå avslått."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:539
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:552
 msgid "Utility"
 msgstr "Verktøyet"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:285
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:293
 msgid "V-Sync"
 msgstr "Vertikal Synkronisering"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:209
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318
+#, fuzzy
+msgid "VBeam Speed Hack"
+msgstr "Ytelses-hack for MMU"
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196
 msgid "Value"
 msgstr "Verdi"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:73
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:60
 msgid "Value:"
 msgstr "Verdi:"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:572
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:560
 msgid "Value: "
 msgstr "Verdi:"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:51
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:38
 msgid "Verbosity"
 msgstr "Verbøsitet"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:377
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:381
 msgid "Video"
 msgstr "Video"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:486
 msgid "Virtual"
 msgstr "Virtuell"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:689
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670
 msgid "Volume"
 msgstr "Volum"
 
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:498
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:527
+#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:488
+#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:517
 #, c-format
 msgid "WAD installation failed: error creating %s"
 msgstr "WAD-installasjon feilet: Skaper feil %s"
 
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:547
+#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:537
 msgid "WAD installation failed: error creating ticket"
-msgstr ""
+msgstr "WAD-installasjon mislyktes: Feil ved ticket-laging"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84
 msgid ""
 "Wait for vertical blanks in order to reduce tearing.\n"
 "Decreases performance if emulation speed is below 100%.\n"
@@ -5384,25 +5643,25 @@ msgstr ""
 "\n"
 "Hvis usikker, la stå avslått."
 
-#: Source/Core/Common/Src/MsgHandler.cpp:67
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46
+#: Source/Core/Common/Src/MsgHandler.cpp:53
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:33
 #: Source/Core/DolphinWX/Src/VideoConfigDiag.h:85
 msgid "Warning"
 msgstr "Advarsel"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:291
+#: Source/Core/Core/Src/Boot/Boot.cpp:279
 msgid "Warning - starting DOL in wrong console mode!"
 msgstr "Advarsel - starter DOL i feil konsollmodus!"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:341
+#: Source/Core/Core/Src/Boot/Boot.cpp:329
 msgid "Warning - starting ELF in wrong console mode!"
 msgstr "Advarsel - starter ELF i feil konsollmodus!"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:221
+#: Source/Core/Core/Src/Boot/Boot.cpp:209
 msgid "Warning - starting ISO in wrong console mode!"
 msgstr "Advarsel - starter ISO i feil konsollmodus!"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:519
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:512
 #, c-format
 msgid ""
 "Warning! it is advised to backup all files in the folder:\n"
@@ -5413,7 +5672,7 @@ msgstr ""
 "%s\n"
 "Ønsker du å fortsette?"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:585
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:578
 #, c-format
 msgid ""
 "Warning: This will overwrite any existing saves that are in the folder:\n"
@@ -5426,23 +5685,30 @@ msgstr ""
 "og har samme navn som en fil på ditt minnekort\n"
 "Fortsette?"
 
-#: Source/Core/Core/Src/Movie.cpp:844
+#: Source/Core/Core/Src/Movie.cpp:835
 #, 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 ""
+"Advarsel: Du forsøkte å laste en savestate fra etter slutten på filmen som "
+"spilles. (Byte %u > %u) (Frame %u > %u). Du burde laste en annen savestate "
+"før du fortsetter, eller laste denne savestate-en med kun-les modus av."
 
-#: Source/Core/Core/Src/Movie.cpp:861
+#: Source/Core/Core/Src/Movie.cpp:852
 #, 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 ""
+"Advarsel: Du forsøkte å laste en savestate der filmen ikke matcher på byte "
+"%d (0x%X). Du burde laste en annen savestate før du forsetter, eller laste "
+"denne savestate-en med les-kun modus av. Ellers får du sannsynligvis en "
+"desynkronisering."
 
-#: Source/Core/Core/Src/Movie.cpp:870
+#: Source/Core/Core/Src/Movie.cpp:861
 #, c-format
 msgid ""
 "Warning: You loaded a save whose movie mismatches on frame %d. You should "
@@ -5460,59 +5726,74 @@ 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 ""
+"Advarsel: Du forsøkte å laste en savestate der filmen ikke matcher på bilde "
+"%d. Du burde laste en annen savestate før du forsetter, eller laste denne "
+"savestate-en med les-kun modus av. Ellers får du sannsynligvis en "
+"desynkronisering.\n"
+" \n"
+" Mer informasjon: Den nåværende filmen er %d bilder lang, og savestate'ens "
+"film er %d bilder lang.\n"
+" \n"
+" På bilde %d, trykker filmen på:\n"
+" Start=%d, A=%d, B=%d, X=%d, Y=%d, Z=%d, DOpp=%d, DNed=%d, DVenstre=%d, "
+"DHøyre=%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d\n"
+" \n"
+" På bilde %d, trykker savestate'ens film:\n"
+" Start=%d, A=%d, B=%d, X=%d, Y=%d, Z=%d, DOpp=%d, DNed=%d, DVenstre=%d, "
+"DHøyre=%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d"
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:106
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:129
+#: Source/Core/AudioCommon/Src/WaveFile.cpp:93
+#: Source/Core/AudioCommon/Src/WaveFile.cpp:116
 msgid "WaveFileWriter - file not open."
 msgstr "WaveFileWriter - fil ikke åpen."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:56
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:60
 msgid "Whammy"
-msgstr ""
+msgstr "Whammy"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:404
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:408
 msgid "Widescreen Hack"
 msgstr "Widescreen Hack"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:312
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:299
 msgid "Width"
 msgstr "Bredde"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535
 msgid "Wii"
 msgstr "Wii"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:372
 msgid "Wii Console"
 msgstr "Wii-konsoll"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:844
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:825
 msgid "Wii NAND Root:"
 msgstr "Wii NAND-rot:"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:191
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:194
 msgid "Wii Save Import"
 msgstr "Importer Wii-lagringsfil"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1243
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1270
 msgid "Wii save files (*.bin)|*.bin"
 msgstr "Wii-lagringsfiler (*.bin)|*.bin"
 
-#: Source/Core/DiscIO/Src/WiiWad.cpp:82
+#: Source/Core/DiscIO/Src/WiiWad.cpp:69
 msgid "WiiWAD: Could not read from file"
 msgstr "WiiWAD: Kunne ikke lese fra fil"
 
-#: Source/Core/Core/Src/HW/Wiimote.cpp:17
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
+#: Source/Core/Core/Src/HW/Wiimote.cpp:20
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
 msgid "Wiimote"
 msgstr "Wiimote"
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:21
 #, c-format
 msgid "Wiimote %i"
-msgstr ""
+msgstr "WiiMote %i"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:628
+#: Source/Core/DolphinWX/Src/Main.cpp:656
 msgid "Wiimote Connected"
 msgstr "Wiimote Tilkoblet"
 
@@ -5520,107 +5801,133 @@ msgstr "Wiimote Tilkoblet"
 msgid "Wiimote Motor"
 msgstr "Wiimote-motor"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
 msgid "Wiimote settings"
 msgstr "Innstillinger for Wiimote"
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:48
 msgid "Wiimotes"
-msgstr ""
+msgstr "WiiMote-er"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:134
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:121
 msgid "Windows Left"
 msgstr "Windows Venstre"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:136
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:123
 msgid "Windows Menu"
 msgstr "Windows Meny"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:135
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:122
 msgid "Windows Right"
 msgstr "Windows Høyre"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:131
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:124
 msgid "Word Wrap"
 msgstr "Ordkrumning"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1298
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:864
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1089
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1225
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1325
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:880
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1090
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1226
 msgid "Working..."
 msgstr "Arbeider..."
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:338
+msgid "Write memcards (GC)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46
 msgid "Write to Console"
 msgstr "Skriv til Konsoll"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:67
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:54
 msgid "Write to Debugger"
-msgstr ""
+msgstr "Skriv til Debugger"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:57
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44
 msgid "Write to File"
 msgstr "Skriv til Fil"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:61
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48
 msgid "Write to Window"
 msgstr "Skriv til Vindu ->"
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:60
+#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:47
 #, c-format
 msgid "XAudio2 CreateSourceVoice failed: %#X"
 msgstr "XAudio2 CreateSourceVoice mislyktes: %#X"
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:114
+#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:101
 #, c-format
 msgid "XAudio2 init failed: %#X"
 msgstr "XAudio2-initialisering mislyktes: %#X"
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:124
+#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:111
 #, c-format
 msgid "XAudio2 master voice creation failed: %#X"
 msgstr "XAudio2 master voice-laging mislyktes: %#X"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:766
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:765
 msgid "XF reg"
-msgstr ""
+msgstr "XF-register"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:21
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Yellow"
 msgstr "Gul"
 
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:107
+#: Source/Core/Core/Src/DSP/DSPCore.cpp:120
 msgid ""
-"You are using free dsp roms made by Dolphin Team.\n"
-"Only Zelda ucode games will work correctly with them.\n"
+"You are using a free DSP ROM made by the Dolphin Team.\n"
+"All Wii games will work correctly, and most GC games should also work fine, "
+"but the GBA/IPL/CARD UCodes will not work.\n"
 msgstr ""
+"Du bruker en gratis DSP ROM laget av Dolphin-teamet.\n"
+" Alle Wii-spill vil fungere korret, og de fleste GameCube-spill burde også "
+"fungere fint, men GBA/IPL/CARD UKoder vil ikke fungere.\n"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:73
+#: Source/Core/Core/Src/DSP/DSPCore.cpp:116
+msgid ""
+"You are using an old free DSP ROM made by the Dolphin Team.\n"
+"Only games using the Zelda UCode will work correctly.\n"
+msgstr ""
+"Du bruker en gammel gratis DSP ROM laget av Dolphin-teamet.\n"
+" Kun spill som bruker Zelda UCode vil fungere korrekt.\n"
+
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:63
 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:207
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:210
 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:593
 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:438
 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:603
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:591
 msgid "You must enter a valid profile name."
 msgstr "Du må skrive inn et gyldig profilnavn."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:936
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:917
 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."
 
-#: Source/Core/Core/Src/CoreParameter.cpp:175
+#: Source/Core/Core/Src/DSP/DSPCore.cpp:109
+msgid ""
+"Your DSP ROMs have incorrect hashes.\n"
+"Would you like to stop now to fix the problem?\n"
+"If you select \"No\", audio might be garbled."
+msgstr ""
+"Dine DSP ROM-er har feil hash-verdier.\n"
+" Vil du stoppe nå for å fikse problemet=\n"
+" Hvis du velger \"Nei\", kan audio ha knasing."
+
+#: Source/Core/Core/Src/CoreParameter.cpp:164
 msgid ""
 "Your GCM/ISO file seems to be invalid (invalid country).\n"
 "Continue with PAL region?"
@@ -5628,7 +5935,7 @@ msgstr ""
 "Din GCM/ISO-fil synes å være ugyldig (ugyldig land).\n"
 "Fortsette som fra PAL-regionen?"
 
-#: Source/Core/Common/Src/SysConf.cpp:58
+#: Source/Core/Common/Src/SysConf.cpp:45
 #, c-format
 msgid ""
 "Your SYSCONF file is the wrong size.\n"
@@ -5639,25 +5946,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:331
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:334
 msgid "ZTP hack"
 msgstr "ZTP-hack"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:387
+#: Source/Core/Core/Src/ActionReplay.cpp:377
 msgid "Zero 3 code not supported"
 msgstr "Zero 3-kode støttes ikke"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:408
+#: Source/Core/Core/Src/ActionReplay.cpp:398
 #, c-format
 msgid "Zero code unknown to dolphin: %08x"
 msgstr "Zero-kode ukjent for Dolphin: %08x"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:436
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:460
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:423
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:447
 msgid "[ waiting ]"
 msgstr "[ venter ]"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107
 msgid ""
 "[BROKEN]\n"
 "Highlight regions the EFB was copied from.\n"
@@ -5668,11 +5975,11 @@ msgstr ""
 "\n"
 "Hvis usikker, la stå avslått."
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:91
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:78
 msgid "[Custom]"
 msgstr "[Selvdefinert]"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120
 msgid ""
 "[EXPERIMENTAL]\n"
 "Aims to speed up emulation by offloading texture decoding to the GPU using "
@@ -5691,7 +5998,7 @@ msgstr ""
 "\n"
 "Hvis usikker, la stå avslått."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121
 msgid ""
 "[EXPERIMENTAL]\n"
 "Speeds up emulation a bit by caching display lists.\n"
@@ -5705,91 +6012,47 @@ msgstr ""
 "\n"
 "Hvis usikker, la stå avslått."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:508
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:495
 msgid "^ ADD"
 msgstr "^ LEGG TIL"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:820
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:801
 msgid "apploader (.img)"
 msgstr "applikasjonslaster (.img)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:185
-msgid "failed to read bk header"
-msgstr "Kunne ikke lese bk header"
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:375
-#, c-format
-msgid "failed to read data from file: %s"
-msgstr "Kunne ikke lese data fra fil: %s"
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:97
-msgid "failed to read header"
-msgstr "Kunne ikke lese header"
-
-#: Source/Core/Core/Src/PowerPC/JitInterface.cpp:285
+#: Source/Core/Core/Src/PowerPC/JitInterface.cpp:272
 #, c-format
 msgid "iCacheJIT: Reading Opcode from %x. Please report."
 msgstr "iCacheJIT: Leser Opcode fra %x. Vennligst rapporter."
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:108
-#, c-format
-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:935
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:936
 msgid "s"
 msgstr "s"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:457
-#, c-format
-msgid "unknown cmd 0x%08x"
-msgstr "ukjent cmd 0x%08x"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1110
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1136
 msgid "wxExecute returned -1 on application run!"
 msgstr "wxExecute returnerte -1 på applikasjonskjøring!"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:56
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:43
 msgid "zFar Correction: "
 msgstr "zFar Korreksjon: "
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:51
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:38
 msgid "zNear Correction: "
 msgstr "zNear Korreksjon: "
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:493
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:480
 msgid "| OR"
 msgstr "| ELLER"
 
-#~ msgid "Interpreter (VERY slow)"
-#~ msgstr "Interpreter (VELDIG treg)"
-
-#~ msgid "JIT Recompiler (recommended)"
-#~ msgstr "JIT Rekompilerer (anbefalt)"
-
-#~ msgid "JITIL experimental recompiler"
-#~ msgstr "JITIL eksperimentiell rekompilerer"
+#~ msgid "Accurate VBeam emulation"
+#~ msgstr "Nøyaktig VBeam-emulering"
 
 #~ msgid ""
-#~ "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. "
-#~ "No effect on emulated wiimotes."
+#~ "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)"
 #~ msgstr ""
-#~ "Deaktiver Wiimote-høytaleren. Fikser tilfeldige avkoblinger på ekte "
-#~ "Wiimote-er. Har ingen effekt på emulert Wii-kontroll."
+#~ "Hvis bilderatioen er erratisk, kan denne innstillingen hjelpe. (PÅ = "
+#~ "Kompitabelt, AV = Raskt)"
 
-#~ msgid "Pair Up"
-#~ msgstr "Pair Up"
-
-#~ msgid "Reconnect Wiimote Confirm"
-#~ msgstr "Gjenntilkoble Wiimote bekreftelse"
-
-#~ msgid ""
-#~ "Wiimote %i has been disconnected by system.\n"
-#~ "Maybe this game doesn't support multi-wiimote,\n"
-#~ "or maybe it is due to idle time out or other reason.\n"
-#~ "Do you want to reconnect immediately?"
-#~ msgstr ""
-#~ "Wiimote-en %i har blitt frakoblet av systemet.\n"
-#~ "Kanskje spillet ikke støtter flere enn en Wiimote,\n"
-#~ "eller kanskje den koblet seg fra pga. inaktivitet.\n"
-#~ "Vil du koble til igjen øyeblikkelig?"
+#~ msgid "Skip Dest. Alpha Pass"
+#~ msgstr "Dropp Dest. Alpha Pass"
diff --git a/Languages/po/nl.po b/Languages/po/nl.po
index 6f0fbfc615..367e39687b 100644
--- a/Languages/po/nl.po
+++ b/Languages/po/nl.po
@@ -3,15 +3,15 @@
 # This file is distributed under the same license as the dolphin-emu package.
 #
 # Translators:
-# Garteal <garteal@gmail.com>, 2013.
-# MADCreations <http://www.dpro.freehosting.org>, 2011.
-# Marinus Schot <marinus@live.com>, 2013.
+# Garteal <garteal@gmail.com>, 2013
+# MADCreations <http://www.dpro.freehosting.org>, 2011
+# M4rinus <marinus@live.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: Dolphin Emulator\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-10 08:56-0500\n"
-"PO-Revision-Date: 2013-02-03 20:56+0000\n"
+"POT-Creation-Date: 2013-04-18 23:00-0500\n"
+"PO-Revision-Date: 2013-04-17 16:38+0000\n"
 "Last-Translator: Garteal <garteal@gmail.com>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/dolphin-emu/"
 "language/nl/)\n"
@@ -21,21 +21,21 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:511
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:499
 msgid " (too many to display)"
 msgstr "(te veel om weer te geven)"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:270
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:273
 #: Source/Core/DolphinWX/Src/NetWindow.cpp:491
 #: Source/Core/DolphinWX/Src/NetWindow.cpp:530
 msgid " Game : "
 msgstr " Spel :"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:507
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494
 msgid "! NOT"
 msgstr "! NIET"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:70
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:58
 #, c-format
 msgid ""
 "\"%s\" does not exist.\n"
@@ -44,34 +44,44 @@ msgstr ""
 "\"%s\" bestaat niet.\n"
 "Wilt u een nieuwe 16MB geheugenkaart aanmaken?"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:142
+#: Source/Core/Core/Src/CoreParameter.cpp:131
 #, c-format
 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:722
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:721
 #, c-format
 msgid "%08X:  "
 msgstr "%08X:  "
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:196
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:183
 #, c-format
 msgid "%1$sCopy%1$s"
 msgstr "%1$sKopieer%1$s"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:128
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:296
+#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:113
+#, c-format
+msgid "%d samples"
+msgstr "%d samples"
+
+#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:112
+#, c-format
+msgid "%d samples (quality level %d)"
+msgstr "%d samples (kwaliteitsniveau %d)"
+
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:121
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:289
 #, c-format
 msgid "%s already exists, overwrite?"
 msgstr "%s  bestaat al, wilt u het vervangen?"
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:167
+#: Source/Core/DiscIO/Src/CompressedBlob.cpp:154
 #, c-format
 msgid "%s failed to be scrubbed. Probably the image is corrupt."
 msgstr ""
 "Het lukte niet om %s te comprimeren. Waarschijnlijk is de image corrupt."
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:95
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:83
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
@@ -80,7 +90,7 @@ msgstr ""
 "%s kon niet worden geladen als een geheugenkaart\\n\n"
 "Bestandsgrootte op kaart is onjuist (0x%x bytes)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:110
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:98
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
@@ -89,7 +99,7 @@ msgstr ""
 "%s kon niet worden geladen als een geheugenkaart\\n\n"
 "Kaartgrootte is onjuist (0x%x bytes)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:90
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:78
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
@@ -99,48 +109,37 @@ msgstr ""
 "Bestand is niet groot genoeg om een geldige geheugenkaart bestand te zijn (0x"
 "%x bytes)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:367
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:359
 #, c-format
 msgid "%s failed to open"
 msgstr "Kon %s niet openen"
 
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:97
-#, c-format
-msgid ""
-"%s has an incorrect hash.\n"
-"Would you like to stop now to fix the problem?\n"
-"If you select \"No\", audio will be garbled."
-msgstr ""
-"%s heeft een incorrecte hashcode.\n"
-"Wil je nu stoppen om het probleem op te lossen?\n"
-"Als je \"Nee\" selecteert, zal het geluid vervormd klinken."
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:360
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:352
 #, c-format
 msgid "%s is a 0 byte file"
 msgstr "%s is een 0 byte bestand"
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:159
+#: Source/Core/DiscIO/Src/CompressedBlob.cpp:146
 #, c-format
 msgid "%s is already compressed! Cannot compress it further."
 msgstr "%s is al gecomprimeerd! Kan niet nog meer comprimeren."
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:345
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:337
 #, c-format
 msgid "%s is too long for the filename, max chars is 45"
 msgstr "%s is te lang voor de bestandsnaam, maximaal aantal karakters is 45"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:202
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:189
 #, c-format
 msgid "%sDelete%s"
 msgstr "%sVerwijder%s"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:200
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:187
 #, c-format
 msgid "%sExport GCI%s"
 msgstr "%sExporteer GCI%s"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:198
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:185
 #, c-format
 msgid "%sImport GCI%s"
 msgstr "%sImporteer GCI%s"
@@ -150,252 +149,275 @@ msgstr "%sImporteer GCI%s"
 msgid "%u Free Blocks; %u Free Dir Entries"
 msgstr "%u Vrije Blokken; %u Vrije Bestands Invoer"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:506
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:493
 msgid "&& AND"
 msgstr "&& EN"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:295
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:301
 msgid "&About..."
 msgstr "&Over..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:99
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:100
 msgid "&Boot from DVD Drive..."
 msgstr "&Start van DVD Drive..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:231
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:234
 msgid "&Breakpoints"
 msgstr "&Breekpunten"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:110
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:111
 msgid "&Browse for ISOs..."
 msgstr "&Blader voor ISOs..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:192
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:195
 msgid "&Cheats Manager"
 msgstr "&Cheats Manager"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:177
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:180
 msgid "&DSP Settings"
 msgstr "&DSP Instellingen"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:885
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:876
 msgid "&Delete ISO..."
 msgstr "&Verwijder ISO..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:903
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:897
 msgid "&Delete selected ISOs..."
 msgstr "&Verwijder geselecteerde ISOs..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:170
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:173
 msgid "&Emulation"
 msgstr "&Emulatie"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:113
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:114
 msgid "&File"
 msgstr "&Bestand"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:335
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:341
 msgid "&Frame Advance"
 msgstr "&Frame Avanceren"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:352
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:358
 msgid "&Fullscreen"
 msgstr "&Volledig Scherm"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:176
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:179
 msgid "&Graphics Settings"
 msgstr "&Grafische Instellingen "
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:296
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:302
 msgid "&Help"
 msgstr "&Help"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:180
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:183
 msgid "&Hotkey Settings"
 msgstr "&Sneltoets Instellingen "
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:233
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:236
 msgid "&JIT"
 msgstr "&JIT"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:148
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:149
 msgid "&Load State"
 msgstr "&Laad staat"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:190
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:193
 msgid "&Memcard Manager (GC)"
 msgstr "&Geheugenkaart Manager (GC) "
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:232
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:235
 msgid "&Memory"
 msgstr "&Geheugen "
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:313
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:319
 msgid "&Open..."
 msgstr "&Open..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:186
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:189
 msgid "&Options"
 msgstr "&Opties "
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:324
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:330
 msgid "&Pause"
 msgstr "&Pauze"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:326
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:332
 msgid "&Play"
 msgstr "&Speel "
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:867
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:858
 msgid "&Properties"
 msgstr "&Eigenschappen "
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:348
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:354
 msgid "&Read-only mode"
 msgstr "&Alleen-lezen modus"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:319
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:325
 msgid "&Refresh List"
 msgstr "&Lijst Vernieuwen "
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:230
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:233
 msgid "&Registers"
 msgstr "&Registers"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:332
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:338
 msgid "&Reset"
 msgstr "&Reset"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:234
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:237
 msgid "&Sound"
 msgstr "&Geluid "
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:329
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:335
 msgid "&Stop"
 msgstr "&Stop"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:207
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:210
 msgid "&Tools"
 msgstr "&Tools"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:235
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:238
 msgid "&Video"
 msgstr "&Video"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:284
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:287
 msgid "&View"
 msgstr "&Bekijk "
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:179
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:182
 msgid "&Wiimote Settings"
 msgstr "&Wiimote Instellingen "
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:868
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:859
 msgid "&Wiki"
 msgstr "&Wiki"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504
 msgid "'"
 msgstr "'"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:59
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:46
 msgid "(-)+zFar"
 msgstr "(-)+zFar"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:54
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:41
 msgid "(-)+zNear"
 msgstr "(-)+zNear"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:99
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:86
 msgid "(UNKNOWN)"
 msgstr "(ONBEKEND)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:376
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:384
 msgid "(off)"
 msgstr "(uit) "
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:655
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:654
 msgid "0x44"
 msgstr "0x44"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+msgid "1.5x Native (960x792)"
+msgstr "1.5x Native (960x792)"
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:158
 msgid "16 bit"
 msgstr "16 bit"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+msgid "1x Native (640x528)"
+msgstr "1x Native (640x528)"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+msgid "2.5x Native (1600x1320)"
+msgstr "2.5x Native (1600x1320)"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+msgid "2x Native (1280x1056)"
+msgstr "2x Native (1280x1056)"
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:159
 msgid "32 bit"
 msgstr "32 bit"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:412
 msgid "3D Vision"
 msgstr "3D Vision"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+msgid "3x Native (1920x1584)"
+msgstr "3x Native (1920x1584)"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+msgid "4x Native (2560x2112)"
+msgstr "4x Native (2560x2112)"
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:157
 msgid "8 bit"
 msgstr "8 bit"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:43
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:30
 msgid "<Insert name here>"
 msgstr "<Vul naam hier in> "
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:255
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:262
 msgid "<No resolutions found>"
 msgstr "<Geen resoluties gevonden> "
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:104
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84
 msgid "<Nothing>"
 msgstr "<Niks>"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:162
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:162
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:150
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:150
 msgid "<Press Key>"
 msgstr "<Druk op een knop>"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286
 msgid "<System>"
 msgstr "<Systeem>"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695
 msgid "A"
 msgstr "A"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:201
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:235
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:204
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:238
 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:353
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:387
 msgid "A game is not currently running."
 msgstr "Er staat geen spel aan."
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:68
-#, fuzzy
 msgid ""
 "A supported bluetooth device could not be found.\n"
 "You must manually connect your wiimotes."
 msgstr ""
-"Er is geen ondersteund bluetooth apparaat gevonden!\\n\n"
-"Als je niet de Microsoft bluetooth stack gebruikt, moet je handmatig je "
-"wiimotes pairen and alleen de \"Refresh\" knop gebruiken."
+"Er is geen ondersteunde bluetooth apparaat gevonden.\n"
+"Koppel je Wiimotes handmadig aan het systeem."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:109
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:100
+#, fuzzy
 msgid ""
 "ALERT:\n"
 "\n"
-"NetPlay will currently only work properly when using the following "
-"settings:\n"
-" - Dual Core [OFF]\n"
-" - Audio Throttle [OFF]\n"
-" - DSP-HLE with \"Null Audio\" or DSP-LLE\n"
-" - Manually set the exact number of controllers that will be used to "
-"[Standard Controller]\n"
+"Netplay will only work with the following settings:\n"
+" - Enable Dual Core [OFF]\n"
+" - DSP Emulator Engine Must be the same on all computers!\n"
+" - DSP on Dedicated Thread [OFF]\n"
+" - Framelimit NOT set to [Audio]\n"
+" - Manually set the exact number of controllers to be used to [Standard "
+"Controller]\n"
 "\n"
-"All players should try to use the same Dolphin version and settings.\n"
-"Disable all memory cards or send them to all players before starting.\n"
-"Wiimote support has not been implemented.\n"
+"All players should use the same Dolphin version and settings.\n"
+"All memory cards must be identical between players or disabled.\n"
+"Wiimote support has not been implemented!\n"
 "\n"
-"You must forward TCP port to host!!"
+"The host must have the chosen TCP port open/forwarded!\n"
 msgstr ""
 "ALERT:\n"
 "\n"
@@ -415,17 +437,17 @@ msgstr ""
 "\n"
 "Je moet de TCP poort forwarden voor het hosten!!"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:111
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:116
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96
 msgid "AM-Baseboard"
 msgstr "AM-Baseboard"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:299
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:115
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:300
 msgid "AR Codes"
 msgstr "AR Codes"
 
-#: Source/Core/DolphinWX/Src/AboutDolphin.h:33
+#: Source/Core/DolphinWX/Src/AboutDolphin.h:21
 msgid "About Dolphin"
 msgstr "Over Dolphin"
 
@@ -433,15 +455,11 @@ msgstr "Over Dolphin"
 msgid "Acceleration"
 msgstr "Acceleratie"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:463
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473
 msgid "Accuracy:"
 msgstr "Accuratie:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317
-msgid "Accurate VBeam emulation"
-msgstr "Nauwkeurige VBeam emulatie"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97
 msgid ""
 "Accurately emulate EFB copies.\n"
 "Some games depend on this for certain graphical effects or gameplay "
@@ -449,18 +467,18 @@ msgid ""
 "\n"
 "If unsure, check EFB to Texture instead."
 msgstr ""
-"Emuleer EFB kopieën nauwkeurig. \\n\n"
+"Emuleer de EFB kopieën nauwkeurig.\n"
 "Sommige spellen zijn hiervan afhankelijk voor een aantal grafische effecten "
-"of gameplay functionaliteit. \\n\n"
-"\\n\n"
-"Bij twijfel, markeer EFB to Texture."
+"of gameplay functionaliteit.\n"
+"\n"
+"Bij geval van twijfel, markeer EFB to Texture."
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:239
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:239
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:227
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:227
 msgid "Action"
 msgstr "Actie"
 
-#: Source/Core/Core/Src/ARDecrypt.cpp:481
+#: Source/Core/Core/Src/ARDecrypt.cpp:469
 #, c-format
 msgid ""
 "Action Replay Code Decryption Error:\n"
@@ -475,7 +493,7 @@ msgstr ""
 "Verantwoordelijke code:\n"
 "%s"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:667
+#: Source/Core/Core/Src/ActionReplay.cpp:657
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)"
@@ -483,7 +501,7 @@ msgstr ""
 "Action Replay Fout: Verkeerde grootte (%08x : address = %08x) in Voeg Code "
 "Toe (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:755
+#: Source/Core/Core/Src/ActionReplay.cpp:745
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide "
@@ -492,7 +510,7 @@ msgstr ""
 "Action Replay Fout: Verkeerde grootte (%08x : adres = %08x) in Vul en Schuif "
 "(%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:547
+#: Source/Core/Core/Src/ActionReplay.cpp:537
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And "
@@ -501,7 +519,7 @@ msgstr ""
 "Action Replay Fout: Verkeerde grootte (%08x : adres = %08x) in Ram Schrijf "
 "En Vul (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:607
+#: Source/Core/Core/Src/ActionReplay.cpp:597
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Write To "
@@ -510,12 +528,12 @@ msgstr ""
 "Action Replay Fout: Verkeerde grootte (%08x : adres = %08x) in Schrijf Naar "
 "Pointer (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:802
+#: Source/Core/Core/Src/ActionReplay.cpp:792
 #, c-format
 msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)"
 msgstr "Action Replay Fout: Verkeerde waarde  (%08x) in Geheugen Kopie (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:682
+#: Source/Core/Core/Src/ActionReplay.cpp:672
 #, c-format
 msgid ""
 "Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)\n"
@@ -525,63 +543,63 @@ msgstr ""
 "geimplementeerd (%s)\\n\n"
 "Master codes zijn niet nodig. Gebruik geen master codes."
 
-#: Source/Core/Core/Src/ActionReplay.cpp:196
+#: Source/Core/Core/Src/ActionReplay.cpp:184
 #, c-format
 msgid "Action Replay Error: invalid AR code line: %s"
 msgstr "Action Replay Fout: foutive AR code regel: %s"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:872
+#: Source/Core/Core/Src/ActionReplay.cpp:862
 #, 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:945
+#: Source/Core/Core/Src/ActionReplay.cpp:935
 #, 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:896
+#: Source/Core/Core/Src/ActionReplay.cpp:886
 #, 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:838
+#: Source/Core/Core/Src/ActionReplay.cpp:828
 #, 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:242
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:247
 msgid "Adapter:"
 msgstr "Adapter:"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:76
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:63
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:63
 msgid "Add"
 msgstr "Voeg toe"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1275
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1301
 msgid "Add ActionReplay Code"
 msgstr "Voeg een ActionReplay Code toe"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1204
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1230
 msgid "Add Patch"
 msgstr "Voeg een Patch toe"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:507
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:528
 msgid "Add new pane"
 msgstr "Voeg een nieuwe paneel toe"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:404
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:426
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:811
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:408
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:430
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:792
 msgid "Add..."
 msgstr "Voeg toe..."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:90
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:81
 msgid "Address :"
 msgstr "Adres :"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:58
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:45
 msgid ""
 "Adds the specified value to zFar Parameter.\n"
 "Two ways to express the floating point values.\n"
@@ -599,7 +617,7 @@ msgstr ""
 "\n"
 "NB: Controleer de uiteindelijke waardes in LogWindow/Console."
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:53
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:40
 msgid ""
 "Adds the specified value to zNear Parameter.\n"
 "Two ways to express the floating point values.\n"
@@ -617,49 +635,49 @@ msgstr ""
 "\n"
 "NB: Controleer de uiteindelijke waardes in LogWindow/Console."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:755
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:744
 msgid "Adjust the analog control pressure required to activate buttons."
 msgstr ""
 "Stel de vereiste analoge control drukgevoeligheid in om de knop te activeren."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:509
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:522
 msgid "Advanced"
 msgstr "Geavanceerd"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561
 msgid "Advanced Settings"
 msgstr "Geavanceerde Instellingen"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:584
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:587
 msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)"
 msgstr "Alle GC/Wii bestanden (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:816
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:797
 msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)"
 msgstr "Alle GC/Wii images (gcm, iso, wbfs, ciso, gcz)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1189
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1190
 msgid "All Gamecube GCM files (gcm)"
 msgstr "Alle Gamecube GCM bestanden (gcm)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1390
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1404
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1417
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1431
 msgid "All Save States (sav, s##)"
 msgstr "Alle Save Staten (sav, s##)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1187
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1188
 msgid "All Wii ISO files (iso)"
 msgstr "Alle Wii ISO Bestanden (iso)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1207
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1208
 msgid "All compressed GC/Wii ISO files (gcz)"
 msgstr "Alle gecomprimeerde GC/Wii ISO-bestanden (GCZ)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:124
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:104
 msgid "All files (*.*)|*.*"
 msgstr "Alle Bestanden (*.*)|*.*"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123
 msgid ""
 "Allows toggling certain options via the hotkeys 3 (Internal Resolution), 4 "
 "(Aspect Ratio), 5 (Copy EFB) and 6 (Fog) within the emulation window.\n"
@@ -672,39 +690,39 @@ msgstr ""
 "\\n\n"
 "Bij twijfel, ongeselecteerd laten."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:285
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:272
 msgid "Analyze"
 msgstr "Analyseer"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:298
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:285
 msgid "Angle"
 msgstr "Hoek"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:367
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:375
 msgid "Anisotropic Filtering:"
 msgstr "Anisotropic Filtering:"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:350
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:358
 msgid "Anti-Aliasing:"
 msgstr "Anti-Aliasing:"
 
-#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:308
+#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:299
 msgid "Apploader is the wrong size...is it really an apploader?"
 msgstr "Apploader heeft de verkeerde grootte.. is het wel echt een Apploader?"
 
-#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:302
+#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:293
 msgid "Apploader unable to load from file"
 msgstr "Apploader kan het bestand niet laden"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:841
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:822
 msgid "Apploader:"
 msgstr "Apploader :"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:135
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:122
 msgid "Apply"
 msgstr "Toepassen"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124
 msgid ""
 "Apply a post-processing effect after finishing a frame.\n"
 "\n"
@@ -714,11 +732,11 @@ msgstr ""
 "\n"
 "In geval van twijfel selecteer (uit)."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287
 msgid "Arabic"
 msgstr "Arabisch"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:614
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:603
 #, c-format
 msgid "Are you sure you want to delete \"%s\"?"
 msgstr "Weet je zeker dat je  \"%s\"? wilt verwijderen?"
@@ -737,46 +755,50 @@ msgstr ""
 "Weet je zeker dat je dit bestand wilt verwijderen?  Deze gegevens zijn niet "
 "terug te halen!"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:789
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:277
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:44
+msgid "Arm JIT (experimental)"
+msgstr "Arm JIT (Experimenteel)"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:285
 msgid "Aspect Ratio:"
 msgstr "Beeldverhouding:"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:70
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:58
 msgid "At least one pane must remain open."
 msgstr "Er moet tenminste één paneel open blijven."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:553
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533
 msgid "Audio"
 msgstr "Geluid"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:694
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675
 msgid "Audio Backend:"
 msgstr "Geluid Backend:"
 
-#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:41
+#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:28
 msgid "AudioCommon: Error opening AO device.\n"
 msgstr "AudioCommon: Fout bij het openen van een AO toestel. \n"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:275
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283
 msgid "Auto"
 msgstr "Auto"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:337
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345
 msgid "Auto (Multiple of 640x528)"
 msgstr "Auto (Veelvoud van 640x528)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:337
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345
 msgid "Auto (Window Size)"
 msgstr "Automatisch (Venster Grootte)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:297
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305
 msgid "Auto adjust Window Size"
 msgstr "Venster grootte automatisch aanpassen"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77
 msgid ""
 "Automatically adjusts the window size to your internal resolution.\n"
 "\n"
@@ -786,130 +808,130 @@ msgstr ""
 "\n"
 "In geval van twijfel leeg laten."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:697
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696
 msgid "B"
 msgstr "B"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:755
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:754
 msgid "BP register "
 msgstr "BP register "
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:27
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:14
 msgid "Back"
 msgstr "Terug"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:698
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:679
 msgid "Backend Settings"
 msgstr "Backend Instellingen"
 
-#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:60
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:206
+#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:47
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:211
 msgid "Backend:"
 msgstr "Geluids backend:"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:318
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:95
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:305
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:82
 msgid "Background Input"
 msgstr "Achtergrond invoer"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:279
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:266
 msgid "Backward"
 msgstr "Terug"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:264
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:257
 msgid "Bad File Header"
 msgstr "Verkeerde bestands header"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:627
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:621
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:290
 msgid "Banner"
 msgstr "Banner"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:519
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:529
 msgid "Banner Details"
 msgstr "Banner Details"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491
 msgid "Banner:"
 msgstr "Banner:"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:57
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:61
 msgid "Bar"
 msgstr "Balk"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:308
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:316
 msgid "Basic"
 msgstr "Basis"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555
 msgid "Basic Settings"
 msgstr "Basis Instellingen"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:22
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Bass"
 msgstr "Bass"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:186
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:174
 msgid "Block Allocation Table checksum failed"
 msgstr "Block Allocation Table checksum is mislukt"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:631
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625
 msgid "Blocks"
 msgstr "Blokken"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:21
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Blue"
 msgstr "Blauw"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:24
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Blue Left"
 msgstr "Blauw Links"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:25
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Blue Right"
 msgstr "Blauw Rechts"
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:87
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270
 msgid "Bottom"
 msgstr "Onder"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:238
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:225
 #, c-format
 msgid "Bound Controls: %lu"
 msgstr "Gekoppelde controls: %lu"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348
 msgid "Broken"
 msgstr "Defect"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:422
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:428
 msgid "Browse"
 msgstr "Zoek"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:256
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:243
 msgid "Browse for a directory to add"
 msgstr "Zoek een folder om toe te voegen"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:422
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:428
 msgid "Browse for an ISO directory..."
 msgstr "Zoek een ISO folder"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1079
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1080
 msgid "Browse for output directory"
 msgstr "Zoek een uitvoer folder"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:328
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:331
 msgid "Buffer:"
 msgstr "Buffer:"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:58
 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:119
+#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:106
 msgid "Buttons"
 msgstr "Knoppen"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317
 msgid ""
 "Bypass the clearing of the data cache by the DCBZ instruction. Usually leave "
 "this option disabled."
@@ -917,31 +939,31 @@ msgstr ""
 "Voorkomt het legen van de data cache door de DCBZ instructie. Laat deze "
 "optie meestal ongeactiveerd. "
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:698
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:697
 msgid "C"
 msgstr "C"
 
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:77
+#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:64
 msgid "C Stick"
 msgstr "C Stick"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:77
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:64
 msgid "C-Stick"
 msgstr "C-Stick"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:764
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:763
 msgid "CP reg"
 msgstr "CP Reg"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:567
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547
 msgid "CPU Emulator Engine"
 msgstr "CPU Emulatie Motor"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:490
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500
 msgid "Cache Display Lists"
 msgstr "Activeer scherm lijst caching."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88
 msgid ""
 "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n"
 "Decreases emulation speed by some percent (depending on your GPU).\n"
@@ -957,23 +979,38 @@ msgstr ""
 "\n"
 "In geval van twijfel leeg laten."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1858
+#, c-format
+msgid "Can't find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x"
+msgstr "Kan Wiimote niet vinden op bd: %02x:%02x:%02x:%02x:%02x:%02x"
+
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1872
+#, c-format
+msgid "Can't find WiiMote by connection handle %02x"
+msgstr "Kan Wiimote met verbinding %02x niet vinden"
+
+#: Source/Core/Core/Src/HW/DVDInterface.cpp:669
+#: Source/Core/Core/Src/HW/DVDInterface.cpp:679
+msgid "Can't read from DVD_Plugin - DVD-Interface: Fatal Error"
+msgstr "Kan niet lezen van DVD_Plugin - DVD-Interface: Fatale Error"
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:124
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:28
 msgid "Cancel"
 msgstr "Annuleer"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:91
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:178
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:240
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:84
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:171
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:233
 #, c-format
 msgid "Cannot open %s"
 msgstr "Kan %s niet openen"
 
-#: Source/Core/Core/Src/CoreTiming.cpp:141
+#: Source/Core/Core/Src/CoreTiming.cpp:128
 msgid "Cannot unregister events with events pending"
 msgstr "Kan geen events afmelden als er events in afwachting zijn"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1078
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1061
 #, c-format
 msgid ""
 "Cannot use that file as a memory card.\n"
@@ -984,7 +1021,7 @@ msgstr ""
 "%s\\n\n"
 "is geen geldig gamecube geheugenkaart bestand."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1108
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1091
 msgid ""
 "Cannot use that file as a memory card.\n"
 "Are you trying to use the same file in both slots?"
@@ -992,30 +1029,15 @@ 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:1867
-#, 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:1881
-#, 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: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"
-
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:52
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:39
 msgid "Caps Lock"
 msgstr "Caps Lock"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288
 msgid "Catalan"
 msgstr "Catalaans"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:311
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:298
 msgid "Center"
 msgstr "Middelpunt"
 
@@ -1023,12 +1045,12 @@ msgstr "Middelpunt"
 msgid "Change"
 msgstr "Verander"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:316
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:322
 msgid "Change &Disc..."
 msgstr "Verander &Schijf"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:179
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:179
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:167
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:167
 msgid "Change Disc"
 msgstr "Verander Schijf"
 
@@ -1036,7 +1058,7 @@ msgstr "Verander Schijf"
 msgid "Change Game"
 msgstr "Spel veranderen"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:515
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495
 msgid ""
 "Change the language of the user interface.\n"
 "Requires restart."
@@ -1044,75 +1066,75 @@ msgstr ""
 "Verander de taal van de gebruikersinterface.\n"
 "Vereist een herstart."
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:60
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:47
 msgid "Changes sign to zFar Parameter (after correction)"
 msgstr "Verandert teken van zVer parameter (na correctie)"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:55
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:42
 msgid "Changes sign to zNear Parameter (after correction)"
 msgstr "Verandert teken van zDichtbij parameter (na correctie)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:519
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499
 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:295
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:298
 msgid "Chat"
 msgstr "Chat"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:47
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:34
 msgid "Cheat Code"
 msgstr "Cheat Code"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:118
 msgid "Cheat Search"
 msgstr "Cheat Zoeken"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:38
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:25
 msgid "Cheats Manager"
 msgstr "Cheats Manager"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:633
 msgid "Check Partition Integrity"
 msgstr "Controleer Partitie integriteit"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:864
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:880
 msgid "Checking integrity..."
 msgstr "Integriteit controleren..."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289
 msgid "Chinese (Simplified)"
 msgstr "Chinees (Vereenvoudigd)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290
 msgid "Chinese (Traditional)"
 msgstr "Chinees (Traditioneel)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:818
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:799
 msgid "Choose a DVD root directory:"
 msgstr "Kies een DVD Station:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:822
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803
 msgid "Choose a NAND root directory:"
 msgstr "Kies een NAND basismap:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:815
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:796
 msgid "Choose a default ISO:"
 msgstr "Kies een standaard ISO:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1236
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1219
 msgid "Choose a directory to add"
 msgstr "Kies een folder om toe te voegen"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1065
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1048
 msgid "Choose a file to open"
 msgstr "Kies een bestand om te openen"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:217
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:204
 msgid "Choose a memory card:"
 msgstr "Kies een geheugen kaart:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:819
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800
 msgid ""
 "Choose file to use as apploader: (applies to discs constructed from "
 "directories only)"
@@ -1120,27 +1142,27 @@ msgstr ""
 "Kies Bestand te gebruiken als apploader: (geldt voor disks die alleen mappen "
 "uit mappen zijn opgebouwd)"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:767
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:806
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:781
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:822
 msgid "Choose the folder to extract to"
 msgstr "Kies de folder om naar uit te pakken"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:297
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:284
 msgid "Circle Stick"
 msgstr "Cirkel Stick"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:52
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:56
 msgid "Classic"
 msgstr "Klassiek"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:144
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:43
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:487
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:913
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:137
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:30
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:474
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:904
 msgid "Clear"
 msgstr "Legen"
 
-#: Source/Core/Core/Src/NetPlayServer.cpp:259
+#: Source/Core/Core/Src/NetPlayServer.cpp:263
 msgid ""
 "Client disconnect while game is running!! NetPlay is disabled. You must "
 "manually stop the game."
@@ -1148,138 +1170,138 @@ msgstr ""
 "Client is uitgeschakeld terwijl het spel draait! NetPlay is uitgeschakeld. "
 "Je moet het spel handmatig stoppen."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:298
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:247
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:552
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:578
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:285
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:234
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:562
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:590
 msgid "Close"
 msgstr "Sluit"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:174
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:177
 msgid "Co&nfigure..."
 msgstr "In&stellingen"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:86
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:73
 msgid "Code Info"
 msgstr "Code Info"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:568
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:556
 msgid "Code: "
 msgstr "Code: "
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:35
 msgid "Command"
 msgstr "Commando"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:629
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:623
 msgid "Comment"
 msgstr "Reactie"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489
 msgid "Comment:"
 msgstr "Reactie:"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:893
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:884
 msgid "Compress ISO..."
 msgstr "Comprimeer ISO ..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:905
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:899
 msgid "Compress selected ISOs..."
 msgstr "Comprimeer geselecteerde ISO's ..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1088
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1224
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1089
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1225
 msgid "Compressing ISO"
 msgstr "ISO wordt gecomprimeerd"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:429
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:435
 msgid "Config"
 msgstr "Config"
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:37
-#: Source/Core/DolphinWX/Src/InputConfigDiag.h:135
-#: Source/Core/DolphinWX/Src/InputConfigDiag.h:154
+#: Source/Core/DolphinWX/Src/InputConfigDiag.h:122
+#: Source/Core/DolphinWX/Src/InputConfigDiag.h:141
 msgid "Configure"
 msgstr "Configureer"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:111
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:98
 msgid "Configure Control"
 msgstr "Configureer Besturing"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:306
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
 #: Source/Core/DolphinWX/Src/NetWindow.cpp:583
 msgid "Configure Pads"
 msgstr "Configureer Besturing Pads"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:429
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:435
 msgid "Configure..."
 msgstr "Configureer..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1119
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1147
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1217
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1120
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1218
 msgid "Confirm File Overwrite"
 msgstr "Bevestig om bestand over te schrijven."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:597
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:577
 msgid "Confirm on Stop"
 msgstr "Bevestiging bij Stop"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:83
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:105
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:74
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:96
 msgid "Connect"
 msgstr "Verbind"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:783
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:764
 msgid "Connect USB Keyboard"
 msgstr "Verbind USB Toetsenbord"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:362
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:368
 #, c-format
 msgid "Connect Wiimote %i"
 msgstr "Verbind Wiimote %i"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:195
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183
 msgid "Connect Wiimote 1"
 msgstr "Verbind Wiimote 1"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184
 msgid "Connect Wiimote 2"
 msgstr "Verbind Wiimote 2"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:185
 msgid "Connect Wiimote 3"
 msgstr "Verbind Wiimote 3"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:198
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:186
 msgid "Connect Wiimote 4"
 msgstr "Verbind Wiimote 4"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:627
+#: Source/Core/DolphinWX/Src/Main.cpp:655
 msgid "Connecting..."
 msgstr "Verbinden..."
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:155
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:156
 msgid "Console"
 msgstr "Console"
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:71
 msgid "Continuous Scanning"
-msgstr ""
+msgstr "Continu scannen"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:46
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:33
 msgid "Control"
 msgstr "Bestuur"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:189
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:176
 msgid "Convert to GCI"
 msgstr "Omzetten naar GCI"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:379
+#: Source/Core/Core/Src/CoreParameter.cpp:368
 msgid "Copy failed"
 msgstr "Kopiëren mislukt"
 
@@ -1288,21 +1310,21 @@ msgstr "Kopiëren mislukt"
 msgid "Copy to Memcard %c"
 msgstr "Kopieer naar MemKaart %c"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:359
 msgid "Core"
 msgstr "Core"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:154
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:148
 #, c-format
 msgid "Could not create %s"
 msgstr "Het volgende bestanden kon niet gemaakt worden %s "
 
-#: Source/Core/AudioCommon/Src/AudioCommon.cpp:75
+#: Source/Core/AudioCommon/Src/AudioCommon.cpp:62
 #, c-format
 msgid "Could not initialize backend %s."
 msgstr "Kon de %s backend niet initialiseren."
 
-#: Source/Core/Core/Src/CoreParameter.cpp:137
+#: Source/Core/Core/Src/CoreParameter.cpp:126
 #, c-format
 msgid ""
 "Could not read \"%s\".  There is no disc in the drive, or it is not a GC/Wii "
@@ -1313,12 +1335,12 @@ msgstr ""
 "geen GC/Wii backup.Meeste PC DVD drives kunnen geen originele Gamecube en "
 "Wii schijven lezen!"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:292
+#: Source/Core/Core/Src/CoreParameter.cpp:281
 #, c-format
 msgid "Could not recognize ISO file %s"
 msgstr "Kon ISO bestand %s niet herkennen."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:569
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:579
 #, c-format
 msgid "Could not save %s"
 msgstr "Kon %s niet opslaan"
@@ -1332,24 +1354,32 @@ msgstr ""
 "draait nog!\n"
 "(pads instellen terwijl het spel draait wordt nog niet ondersteund)"
 
-#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:123
+#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119
 #, c-format
 msgid ""
 "Could not write memory card file %s.\n"
 "\n"
 "Are you running Dolphin from a CD/DVD, or is the save file maybe write "
-"protected?"
+"protected?\n"
+"\n"
+"Are you receiving this after moving the emulator directory?\n"
+"If so, then you may need to re-specify your memory card location in the "
+"options."
 msgstr ""
 "Kon niet naar geheugenkaart bestand %s schrijven. \n"
 "\n"
 "Draai je Dolphin vanaf een CD/DVD, of is het bestand misschien beveiligd "
-"tegen schrijven?"
+"tegen schrijven?\n"
+"\n"
+"Krijg je dit nadat je de emulator map hebt verplaatst?\n"
+"Zo ja, dan moet je je memory card locatie opnieuw aangeven in de "
+"configuratie."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1107
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1133
 msgid "Couldn't find open command for extension 'ini'!"
 msgstr "Kon geen open commando vinden voor extensie 'ini'!"
 
-#: Source/Core/Core/Src/BootManager.cpp:146
+#: Source/Core/Core/Src/BootManager.cpp:137
 msgid ""
 "Couldn't init the core.\n"
 "Check your configuration."
@@ -1357,38 +1387,38 @@ 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:170
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:495
 msgid "Count:"
 msgstr "Tel:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:452
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456
 msgid "Country:"
 msgstr "Land:"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:186
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:562
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:173
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:550
 msgid "Create AR Code"
 msgstr "Maak AR Code"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:543
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:608
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:569
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:641
 msgid "Create new perspective"
 msgstr "Maak een nieuwe  perspective"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:17
 msgid "Creator: "
 msgstr "Auteur:"
 
-#: Source/Core/Common/Src/MsgHandler.cpp:68
+#: Source/Core/Common/Src/MsgHandler.cpp:54
 msgid "Critical"
 msgstr "Kritiek"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562
 msgid "Crop"
 msgstr "Bijsnijden"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119
 msgid ""
 "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n"
 "\n"
@@ -1398,140 +1428,140 @@ msgstr ""
 "\n"
 "In geval van twijfel leeg laten."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:48
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:52
 msgid "Crossfade"
 msgstr "Crossfade"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:597
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:600
 #, c-format
-msgid "Current dir changed from %s to %s after wxFileSelector!"
-msgstr "Huidige map veranderd van %s naar %s na wxFileSelector!"
+msgid "Current directory changed from %s to %s after wxFileSelector!"
+msgstr "Huidige map verandert van %s naar %s na wxFileSelector!"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339
 msgid "Custom Projection Hack"
 msgstr "Aangepaste Projectie Hack"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.h:30
+#: Source/Core/DolphinWX/Src/PHackSettings.h:17
 msgid "Custom Projection Hack Settings"
 msgstr "Aangepaste Projectie Instellingen"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342
 msgid "Customize some Orthographic Projection parameters."
 msgstr "Pas sommige orthogonale projectie parameters aan."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291
 msgid "Czech"
 msgstr "Tsjechisch"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:698
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:697
 msgid "D"
 msgstr "D"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:89
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
 msgid "D-Pad"
 msgstr "D-Pad"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:431
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
 msgid "DSP"
 msgstr "DSP"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:639
 msgid "DSP Emulator Engine"
 msgstr "DSP Emulator Motor"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:254
 msgid "DSP HLE emulation (fast)"
 msgstr "DSP HLE emulatie (snel)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:256
 msgid "DSP LLE interpreter (slow)"
 msgstr "DSP LLE Interpreteer (Behoorlijk langzaam)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660
-msgid "DSP LLE on Thread"
-msgstr "DSP LLE op Thread"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:255
 msgid "DSP LLE recompiler"
 msgstr "DSP LLE hercompileerder"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:431
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:641
+msgid "DSP on Dedicated Thread"
+msgstr "DSP op toegeweide thread"
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
 msgid "DSP settings"
 msgstr "DSP Instellingen"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:838
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:819
 msgid "DVD Root:"
 msgstr "DVD Station:"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:239
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:226
 msgid "DVDLowRead - Fatal Error: failed to read from volume"
 msgstr "DVDLowRead - Fatale Error: kan het volume niet lezen"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:333
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:320
 msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume"
 msgstr "DVDLowUnencryptedRead - Fatale Error: kan het volume niet lezen"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:176
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:163
 msgid "Data Size"
 msgstr "Data grootte"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468
 msgid "Date:"
 msgstr "Datum:"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:528
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:564
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:518
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:557
 msgid "Datel MaxDrive/Pro files(*.sav)"
 msgstr "Datel MaxDrive/Pro bestanden(*.sav)"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:242
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:259
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:267
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:281
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:296
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:229
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:246
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:254
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:268
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:283
 msgid "Dead Zone"
 msgstr "Dode Zone"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:35
 msgid "Debug"
 msgstr "Debug"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:521
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534
 msgid "Debugging"
 msgstr "Fouthersteller"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:79
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:66
 msgid "Decimal"
 msgstr "Decimaal"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:890
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:881
 msgid "Decompress ISO..."
 msgstr "Decomprimeer ISO..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:906
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:900
 msgid "Decompress selected ISOs..."
 msgstr "Decomprimeer geselecteerde ISOs"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1088
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1224
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1089
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1225
 msgid "Decompressing ISO"
 msgstr "Decomprimeer ISO"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:912
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:903
 msgid "Default"
 msgstr "Standaard"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:835
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:816
 msgid "Default ISO:"
 msgstr "Standaard ISO:"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:114
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:107
 msgid "Default font"
 msgstr "Standaard font"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:32
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:926
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:19
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917
 msgid "Delete"
 msgstr "Verwijder"
 
@@ -1539,21 +1569,21 @@ msgstr "Verwijder"
 msgid "Delete Save"
 msgstr "Verwijder Save"
 
-#: Source/Core/VideoCommon/Src/AVIDump.cpp:77
+#: Source/Core/VideoCommon/Src/AVIDump.cpp:64
 #, c-format
 msgid "Delete the existing file '%s'?"
 msgstr "Verwijder het bestaande bestand '%s'?"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:671
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:683
 msgid "Description"
 msgstr "Beschrijving"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:472
 msgid "Detect"
 msgstr "Detect"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:233
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:328
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:220
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:315
 msgid ""
 "Detected attempt to read more data from the DVD than fit inside the out "
 "buffer. Clamp."
@@ -1561,29 +1591,29 @@ 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:127
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:898
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:114
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:889
 msgid "Device"
 msgstr "Apparaat"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:798
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:731
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779
 msgid "Device Settings"
 msgstr "Apparaat Instellingen"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:45
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:49
 msgid "Dial"
 msgstr "Bellen"
 
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:146
+#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:135
 msgid "Direct3D11"
 msgstr "Direct3D11"
 
-#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:128
+#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:125
 msgid "Direct3D9"
 msgstr "Direct3D9"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:167
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:155
 msgid ""
 "Directory checksum failed\n"
 " and Directory backup checksum failed"
@@ -1591,16 +1621,20 @@ msgstr ""
 "Map checksum is mislukt\n"
 " en map backup checksum is mislukt"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:433
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:443
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485
 msgid "Disable"
 msgstr "Uitschakelen"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:491
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501
+msgid "Disable Destination Alpha"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:409
 msgid "Disable Fog"
 msgstr "Schakel Fog uit"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108
 msgid ""
 "Disable any XFB emulation.\n"
 "Speeds up emulation a lot but causes heavy glitches in many games which rely "
@@ -1614,7 +1648,7 @@ msgstr ""
 "\n"
 "In geval van twijfel leeg laten."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95
 msgid ""
 "Disable emulation of EFB copies.\n"
 "These are often used for post-processing or render-to-texture effects, so "
@@ -1623,27 +1657,40 @@ msgid ""
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Schakel emulatie van EFB kopiën uit.\n"
-"Dit wordt vaak gebruik voor post-processing of render-naar-texture effects, "
-"hoewel deze instelling een hoge versnelling geeft, veroorzaakt het ook bijna "
-"altijd problemen.\n"
+"Schakel de emulatie van EFB kopieën uit.\n"
+"Dit wordt vaak gebruik voor post-processing of render-naar-texture effects. "
+"Alhoewel deze instelling een speedup geeft, veroorzaakt het ook bijna altijd "
+"problemen.\n"
 "\n"
 "In geval van twijfel leeg laten."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:543
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101
+#, fuzzy
+msgid ""
+"Disables emulation of a hardware feature called destination alpha, which is "
+"used in many games for various graphical effects.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+"Sla de destination alpha pass over die in veel spellen voor verschillende "
+"grafische effecten gebruikt wordt.\n"
+"\n"
+"In geval van twijfel leeg laten."
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:553
 msgid "Disc"
 msgstr "Schijf"
 
-#: Source/Core/DiscIO/Src/DriveBlob.cpp:107
-#: Source/Core/DiscIO/Src/DriveBlob.cpp:126
+#: Source/Core/DiscIO/Src/DriveBlob.cpp:94
+#: Source/Core/DiscIO/Src/DriveBlob.cpp:113
 msgid "Disc Read Error"
 msgstr "Schijf Lees Fout"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:312
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:320
 msgid "Display"
 msgstr "Scherm"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104
 msgid ""
 "Display the inputs read by the emulator.\n"
 "\n"
@@ -1653,32 +1700,32 @@ msgstr ""
 "\n"
 "In geval van twijfel leeg laten."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:80
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:67
 msgid "Divide"
 msgstr "Verdelen"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:987
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:990
 msgid "Do you want to stop the current emulation?"
 msgstr "Wil je de emulatie stoppen?"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:663
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:644
 msgid "Dolby Pro Logic II decoder"
 msgstr "Dolby Pro Logic II decodering"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:864
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:856
 msgid "Dolphin"
 msgstr "Dolphin"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:183
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:188
 #, c-format
 msgid "Dolphin %s Graphics Configuration"
 msgstr "Dolphin %s Grafische Configuratie"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:292
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:298
 msgid "Dolphin &Web Site"
 msgstr "Dolphin &Web Site"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.h:37
+#: Source/Core/DolphinWX/Src/ConfigMain.h:24
 msgid "Dolphin Configuration"
 msgstr "Dolphin Configuratie"
 
@@ -1686,16 +1733,16 @@ msgstr "Dolphin Configuratie"
 msgid "Dolphin Emulated Wiimote Configuration"
 msgstr "Dolphin Geëmuleerde Wiimote configuratie"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:394
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:383
 msgid "Dolphin FIFO"
 msgstr "Dolphin FIFO"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1136
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1153
 msgid "Dolphin GCPad Configuration"
 msgstr "Dolphin GCPad Configuratie"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:679
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1074
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:685
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1089
 msgid "Dolphin TAS Movies (*.dtm)"
 msgstr "Dolphin TAS Film (*.dtm)"
 
@@ -1703,18 +1750,18 @@ msgstr "Dolphin TAS Film (*.dtm)"
 msgid "Dolphin Wiimote Configuration"
 msgstr "Dolphin Wiimote configuratie"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:293
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:299
 msgid "Dolphin at &Google Code"
 msgstr "Dolphin op &Google Code"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:364
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:351
 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:368
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:355
 msgid ""
 "Dolphin is currently set to hide all games.  Doubleclick here to show all "
 "games..."
@@ -1722,50 +1769,59 @@ msgstr ""
 "Dolphin is ingesteld om alle spellen te verbergen. Dubbelklik hier om alle "
 "spellen te weergeven..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1159
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1160
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1246
 msgid "Dolphin was unable to complete the requested action."
 msgstr "Dolphin kan de verzochte actie niet uitvoeren."
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:275
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:58
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
+#, fuzzy
+msgid ""
+"Doubles the emulated GPU clock rate. May speed up some games (ON = Fast, OFF "
+"= Compatible)"
+msgstr ""
+"Activeer snelle schijf toegang. Nodig voor een aantal spelletjes. (AAN = "
+"Snel, UIT = Compatibel)"
+
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:262
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:45
 msgid "Down"
 msgstr "Omlaag"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:54
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:44
 msgid "Download Codes (WiiRD Database)"
 msgstr "Download Codes (WiiRD Database)"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:297
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:287
 #, c-format
 msgid "Downloaded %lu codes. (added %lu)"
 msgstr "%lu codes gedownload. (%lu toegevoegd)"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:31
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:35
 msgid "Drums"
 msgstr "Drums"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:105
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
 msgid "Dummy"
 msgstr "Pop"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:661
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:642
 msgid "Dump Audio"
 msgstr "Dump Geluid"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:532
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545
 msgid "Dump EFB Target"
 msgstr "Dump EFB Doel"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546
 msgid "Dump Frames"
 msgstr "Dump Frames"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543
 msgid "Dump Textures"
-msgstr "Dump texturen"
+msgstr "Dump Textures"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114
 msgid ""
 "Dump all rendered frames to an AVI file in User/Dump/Frames/\n"
 "\n"
@@ -1775,7 +1831,7 @@ msgstr ""
 "\n"
 "In geval van twijfel leeg laten."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111
 msgid ""
 "Dump decoded game textures to User/Dump/Textures/<game_id>/\n"
 "\n"
@@ -1785,7 +1841,7 @@ msgstr ""
 "\n"
 "In geval van twijfel leeg laten."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113
 msgid ""
 "Dump the contents of EFB copies to User/Dump/Textures/\n"
 "\n"
@@ -1795,21 +1851,21 @@ msgstr ""
 "\n"
 "In geval van twijfel leeg laten."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:474
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292
 msgid "Dutch"
 msgstr "Nederlands"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:112
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:113
 msgid "E&xit"
 msgstr "Sl&uiten"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:441
 msgid "EFB Copies"
 msgstr "EFB Regio kopie"
 
-#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:223
+#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:210
 #, c-format
 msgid ""
 "ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least "
@@ -1821,52 +1877,52 @@ msgstr ""
 "versie %d.%d -- Als je recentelijk Dolphin hebt geupgrade is het mogelijk "
 "dat je Windows moet herstarten om deze de driver te  detecteren."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:166
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:160
 msgid "EUROPE"
 msgstr "EUROPA"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:156
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:143
 msgid "Early Memory Updates"
 msgstr "Vroege Geheugen Updates"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:447
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:453
 msgid "Edit"
 msgstr "Wijzig"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.h:30
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.h:17
 msgid "Edit ActionReplay Code"
 msgstr "Wijzig ActionReplay Code"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:285
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:286
 msgid "Edit Config"
 msgstr "Wijzig Configuratie"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.h:30
+#: Source/Core/DolphinWX/Src/PatchAddEdit.h:17
 msgid "Edit Patch"
 msgstr "Wijzig Patch"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:447
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:453
 msgid "Edit current perspective"
 msgstr "Wijzig het huidige perspectief"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:403
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:425
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:407
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:429
 msgid "Edit..."
 msgstr "Wijzig..."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:44
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:48
 msgid "Effect"
 msgstr "Effect"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:425
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435
 msgid "Embedded Frame Buffer"
 msgstr "Ingebedde Frame Buffer"
 
-#: Source/Core/Core/Src/Core.cpp:201
+#: Source/Core/Core/Src/Core.cpp:190
 msgid "Emu Thread already running"
 msgstr "Emu Thread draait al!"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110
 msgid ""
 "Emulate XFBs accurately.\n"
 "Slows down emulation a lot and prohibits high-resolution rendering but is "
@@ -1880,7 +1936,7 @@ msgstr ""
 "\n"
 "In geval van twijfel selecteer virtuele XFB emulatie."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109
 msgid ""
 "Emulate XFBs using GPU texture objects.\n"
 "Fixes many games which don't work without XFB emulation while not being as "
@@ -1900,7 +1956,7 @@ msgstr ""
 msgid "Emulated Wiimote"
 msgstr "Geëmuleerde Wiimote"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346
 msgid "Emulation State: "
 msgstr "Emulatie Staat:"
 
@@ -1908,7 +1964,7 @@ msgstr "Emulatie Staat:"
 msgid "Enable"
 msgstr "Activeer"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91
 msgid ""
 "Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's "
 "supported by your GPU.\n"
@@ -1924,72 +1980,71 @@ msgstr ""
 "\n"
 "In geval van twijfel leeg laten."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:111
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:98
 msgid "Enable AR Logging"
 msgstr "Activeer AR Logging"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324
 msgid "Enable Block Merging"
 msgstr "Activeer Block Merging"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331
 msgid "Enable Bounding Box Calculation"
 msgstr "Activeer Bounding Box Berekeningen"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:446
 msgid "Enable Cache"
 msgstr "Activeer Cache"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:562
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542
 msgid "Enable Cheats"
 msgstr "Activeer Cheats"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310
 msgid "Enable Dual Core"
 msgstr "Activeer Dual Core"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
 msgid "Enable Dual Core (speedup)"
 msgstr "Activeer Dual Core (verhoogt de snelheid)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:550
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:563
 msgid "Enable Hotkeys"
 msgstr "Activeer Sneltoetsen"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311
 msgid "Enable Idle Skipping"
 msgstr "Activeer Idle Skipping"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541
 msgid "Enable Idle Skipping (speedup)"
 msgstr "Activeer Idle Skipping (verhoogt de snelheid)"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312
 msgid "Enable MMU"
 msgstr "Activeer MMU"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:554
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:567
 msgid "Enable Progressive Scan"
 msgstr "Activeer Progressive Scan"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757
 msgid "Enable Screen Saver"
 msgstr "Activeer Schermbeveiliger"
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:75
-#, fuzzy
 msgid "Enable Speaker Data"
-msgstr "Activeer Pagina's"
+msgstr "Activeer Speaker Data"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
 msgid "Enable WideScreen"
 msgstr "Activeer BreedBeeld"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:516
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529
 msgid "Enable Wireframe"
 msgstr "Activeer Wireframe"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85
 msgid ""
 "Enable anisotropic filtering.\n"
 "Enhances visual quality of textures that are at oblique viewing angles.\n"
@@ -2003,7 +2058,7 @@ msgstr ""
 "\n"
 "In geval van twijfel selecteer 1x."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323
 msgid ""
 "Enable fast disc access.  Needed for a few games. (ON = Fast, OFF = "
 "Compatible)"
@@ -2015,7 +2070,7 @@ msgstr ""
 msgid "Enable pages"
 msgstr "Activeer Pagina's"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76
 msgid ""
 "Enable this if you want the whole screen to be used for rendering.\n"
 "If this is disabled, a render window will be created instead.\n"
@@ -2027,7 +2082,7 @@ msgstr ""
 "\n"
 "In geval van twijfel leeg laten."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80
 msgid ""
 "Enable this if you want to use the main Dolphin window for rendering rather "
 "than a separate render window.\n"
@@ -2039,7 +2094,7 @@ msgstr ""
 "\n"
 "In geval van twijfel leeg laten."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:335
 msgid ""
 "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for "
 "ANY other game."
@@ -2047,11 +2102,11 @@ msgstr ""
 "Activeer dit om The Legend of Zelda: Twilight Princess te versnellen. "
 "Uitschakelen voor elk ander spel."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340
 msgid "Enables Custom Projection Hack"
 msgstr "Schakelt aangepaste projectie hack in"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:528
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508
 msgid ""
 "Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on "
 "OSX."
@@ -2059,14 +2114,14 @@ msgstr ""
 "Activeert Dolby Pro Logic II emulatie met 5.1 surround. Niet beschikbaar met "
 "OSX"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510
 msgid ""
 "Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only."
 msgstr ""
 "Activeert Dolby Pro Logic II emulatie met 5.1 surround. Alleen voor OpenAL "
 "backend."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:512
 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."
@@ -2075,7 +2130,7 @@ msgstr ""
 "backend. Het hernoemen van soft_oal.dll naa OpenAL32.dll kan nodig zijn om "
 "het werkend te maken."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81
 msgid ""
 "Enables progressive scan if supported by the emulated software.\n"
 "Most games don't care about this.\n"
@@ -2088,7 +2143,7 @@ msgstr ""
 "\n"
 "In geval van twijfel leeg laten."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313
 msgid ""
 "Enables the Memory Management Unit, needed for some games. (ON = Compatible, "
 "OFF = Fast)"
@@ -2096,7 +2151,7 @@ msgstr ""
 "Schakel de Memory Management Unit in, die nodig is voor sommige games. (AAN "
 "= Compatibel, UIT = Snel)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116
 msgid ""
 "Encode frame dumps using the FFV1 codec.\n"
 "\n"
@@ -2106,52 +2161,52 @@ msgstr ""
 "\n"
 "In geval van twijfel leeg laten."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:40
 msgid "End"
 msgstr "Einde"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:469
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:280
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:260
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293
 msgid "English"
 msgstr "Engels"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:329
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:407
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:337
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:417
 msgid "Enhancements"
 msgstr "Verbeteringen"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:607
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:640
 msgid "Enter a name for the new perspective:"
 msgstr "Voeg een naam toe voor een nieuwe perspectief:"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:191
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:178
 #, c-format
 msgid "Entry %d/%d"
 msgstr "Toegang %d/%d"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:85
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:72
 #, c-format
 msgid "Entry 1/%d"
 msgstr "Toegang 1/%d"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:204
 msgid "Equal"
 msgstr "Gelijk"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:45
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:156
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1242
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:32
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:150
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226
 msgid "Error"
 msgstr "Error (Fout)"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:381
+#: Source/Core/DolphinWX/Src/Main.cpp:409
 msgid "Error loading selected language. Falling back to system default."
 msgstr ""
 "Fout bij het laden van de geselecteerde taal. Dolphin zal terugvallen op de "
 "systeemtaal."
 
-#: Source/Core/Common/Src/ChunkFile.h:226
+#: Source/Core/Common/Src/ChunkFile.h:221
 #, c-format
 msgid ""
 "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). "
@@ -2160,7 +2215,7 @@ msgstr ""
 "Fout: Na \\\"%s\\\", gevonden %d (0x%X) in plaats van bewaar punt %d (0x%X). "
 "Bewaarstaat laadactie wordt geannuleerd..."
 
-#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:342
+#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:329
 #, c-format
 msgid ""
 "Error: Trying to access %s fonts but they are not loaded. Games may not show "
@@ -2170,38 +2225,38 @@ msgstr ""
 "geladen. Spellen kunnen wellicht lettertypes niet juist afbeelden, of "
 "crashen."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:30
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:17
 msgid "Escape"
 msgstr "Verlaten"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:26
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:30
 msgid "Euphoria"
 msgstr "Euforie"
 
 #: Source/Core/Core/Src/ArmMemTools.cpp:78
-#: Source/Core/Core/Src/x64MemTools.cpp:217
+#: Source/Core/Core/Src/x64MemTools.cpp:206
 #, c-format
 msgid "Exception handler - access below memory space. %08llx%08llx"
 msgstr "Exception handler - toegang onder geheugen ruimte. %08llx%08llx"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:61
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
 msgid "Execute"
 msgstr "Uitvoeren"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:459
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:446
 msgid "Export Failed"
 msgstr "Exporteren Mislukt"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:639
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:649
 msgid "Export File"
 msgstr "Exporteer Bestand"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:177
 msgid "Export Recording"
 msgstr "Exporteer Opname..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:345
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:351
 msgid "Export Recording..."
 msgstr "Exporteer Opname..."
 
@@ -2209,7 +2264,7 @@ msgstr "Exporteer Opname..."
 msgid "Export Save"
 msgstr "Exporteer Save"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:874
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:865
 msgid "Export Wii save (Experimental)"
 msgstr "Exporteer Wii save (Experimenteel)"
 
@@ -2217,100 +2272,100 @@ msgstr "Exporteer Wii save (Experimenteel)"
 msgid "Export all saves"
 msgstr "Exporteer alle saves..."
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:80
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:72
 msgid "Export failed, try again?"
 msgstr "Uitpakken is mislukt, opnieuw proberen?"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:559
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:552
 msgid "Export save as..."
 msgstr "Exporteer save als..."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:297
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:284
 msgid "Extension"
 msgstr "Extensie"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483
 msgid "External Frame Buffer"
 msgstr "Externe Frame Buffer"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:61
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:48
 msgid "Extra Parameter"
 msgstr "Extra Parameter"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:62
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:49
 msgid "Extra Parameter useful in ''Metroid: Other M'' only."
 msgstr "Extra parameter, alleen nuttig in \"Metroid: Other M\"."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:614
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:624
 msgid "Extract All Files..."
 msgstr "Alle Bestanden Uitpakken"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:616
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:626
 msgid "Extract Apploader..."
 msgstr "Apploader Uitpakken"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:617
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627
 msgid "Extract DOL..."
 msgstr "DOL Uitpakken"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:610
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:620
 msgid "Extract Directory..."
 msgstr "Map Uitpakken"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:612
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:622
 msgid "Extract File..."
 msgstr "Bestand Uitpakken"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:608
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:618
 msgid "Extract Partition..."
 msgstr "Partitie Uitpakken"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:724
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:738
 #, c-format
 msgid "Extracting %s"
 msgstr "%s Uitpakken"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:707
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:721
 msgid "Extracting All Files"
 msgstr "Alle Bestanden Uitpakken"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:707
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:721
 msgid "Extracting Directory"
 msgstr "Uitpakken van de map"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:710
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:724
 msgid "Extracting..."
 msgstr "Uitpakken..."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:892
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:893
 msgid "FIFO Byte"
 msgstr "FIFO Byte"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:45
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:32
 msgid "FIFO Player"
 msgstr "FIFO Speler"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:169
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:163
 msgid "FRANCE"
 msgstr "Frankrijk"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472
 msgid "FST Size:"
 msgstr "FST Groote:"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:77
+#: Source/Core/Core/Src/NetPlayClient.cpp:81
 msgid "Failed to Connect!"
 msgstr "Verbinden Mislukt!"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:225
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:228
 msgid "Failed to Listen!!"
 msgstr "Luisteren Mislukt!!"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:307
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:300
 msgid "Failed to download codes."
 msgstr "Mislukt om de codes te downloaden."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:827
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:843
 #, c-format
 msgid "Failed to extract to %s!"
 msgstr "Mislukt om naar %s uit te pakken!"
@@ -2337,26 +2392,30 @@ msgstr ""
 "Je kunt wel de DSP HLE motor gebruiken die geen ROM dumps vereist.\n"
 "(Stel deze in via de \"Audio\" tab of het configuratie scherm.)"
 
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:116
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:139
+#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:108
+#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:131
 msgid "Failed to load bthprops.cpl"
 msgstr "Kon bthprops.cpl niet laden"
 
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:100
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:109
+#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:90
+#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:101
 msgid "Failed to load hid.dll"
 msgstr "Mislukt om hid.dll te laden"
 
-#: Source/Core/Core/Src/Movie.cpp:792
+#: Source/Core/Core/Src/Movie.cpp:783
 #, c-format
 msgid "Failed to read %s"
 msgstr "Kon geen data lezen van %s"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:151
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:144
 msgid "Failed to read banner.bin"
 msgstr "Mislukt om banner.bin te lezen"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:223
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:178
+msgid "Failed to read bk header"
+msgstr "bk header lezen mislukt"
+
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:211
 #, c-format
 msgid ""
 "Failed to read block %d of the save data\n"
@@ -2367,7 +2426,7 @@ msgstr ""
 "De geheugenkaart is wellicht afgeknot\\n\n"
 "BestandsPositie:%llx"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:148
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:136
 msgid ""
 "Failed to read block allocation table backup correctly\n"
 "(0x8000-0x9FFF)"
@@ -2375,7 +2434,7 @@ msgstr ""
 "Het lezen van de block allocation table backup is mislukt\n"
 "(0x8000-0x9FFF)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:142
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:130
 msgid ""
 "Failed to read block allocation table correctly\n"
 "(0x6000-0x7FFF)"
@@ -2383,12 +2442,17 @@ msgstr ""
 "Het lezen van de block allocation table is mislukt\n"
 "(0x6000-0x7FFF)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:286
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:279
 #, c-format
 msgid "Failed to read data from file %d"
 msgstr "Mislukt om gegevens uit %d te lezen"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:136
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:367
+#, c-format
+msgid "Failed to read data from file: %s"
+msgstr "Kon geen data lezen van bestand: %s"
+
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:124
 msgid ""
 "Failed to read directory backup correctly\n"
 "(0x4000-0x5FFF)"
@@ -2396,7 +2460,7 @@ msgstr ""
 "Het lezen van de map backup is mislukt\n"
 "(0x4000-0x5FFF)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:130
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:118
 msgid ""
 "Failed to read directory correctly\n"
 "(0x2000-0x3FFF)"
@@ -2404,7 +2468,11 @@ msgstr ""
 "Het lezen van de map is mislukt\n"
 "(0x2000-0x3FFF)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:119
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:90
+msgid "Failed to read header"
+msgstr "Kon de header niet lezen"
+
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:107
 msgid ""
 "Failed to read header correctly\n"
 "(0x0000-0x1FFF)"
@@ -2412,41 +2480,41 @@ msgstr ""
 "Het lezen van de header is mislukt\n"
 "(0x000-0x1FFF)"
 
-#: Source/Core/DiscIO/Src/VolumeGC.cpp:61
+#: Source/Core/DiscIO/Src/VolumeGC.cpp:48
 msgid "Failed to read unique ID from disc image"
 msgstr "Het lezen van de unieke ID van de schijf image is mislukt"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:84
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:71
 msgid "Failed to write BT.DINF to SYSCONF"
 msgstr "Het schrijven van BT.DINF naar SYSCONF is mislukt"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:228
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:221
 msgid "Failed to write bkhdr"
 msgstr "Mislukt om te schrijven bkhdr"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:164
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:157
 #, c-format
 msgid "Failed to write header for %s"
 msgstr "Het schrijven van header voor %s is mislukt"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:258
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:251
 #, c-format
 msgid "Failed to write header for file %d"
 msgstr "Het schrijven van header voor bestanden %d is mislukt"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294
 msgid "Farsi"
 msgstr "Farsi"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477
 msgid "Fast"
 msgstr "Snel"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315
 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:1046
+#: Source/Core/Core/Src/Movie.cpp:1037
 #, c-format
 msgid ""
 "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s"
@@ -2454,23 +2522,23 @@ msgstr ""
 "Fatale desync. Terugspelen wordt geannuleerd. (Fout in SpeelWiimote: %u != "
 "%u, byte %u.)%s"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:199
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:202
 msgid "Fifo Player"
 msgstr "Fifo Speler"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:99
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:86
 msgid "File Info"
 msgstr "Bestands Info"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:304
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:295
 msgid "File contained no codes."
 msgstr "Bestand bevat geen codes."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:413
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:400
 msgid "File converted to .gci"
 msgstr "Bestand geconverteerd naar .gci"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:428
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:415
 msgid ""
 "File could not be opened\n"
 "or does not have a valid extension"
@@ -2478,7 +2546,7 @@ msgstr ""
 "Bestand kon niet geopend worden\n"
 "of heeft geen valide extensie"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:84
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:72
 #, c-format
 msgid ""
 "File has the extension \"%s\"\n"
@@ -2487,36 +2555,36 @@ msgstr ""
 "Bestand heeft de extensie \"%s\"\n"
 "juiste extensie zijn (.raw/.gcp)"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:425
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:412
 msgid "File is not recognized as a memcard"
 msgstr "Bestand is niet herkend als geheugenkaart"
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:294
+#: Source/Core/DiscIO/Src/CompressedBlob.cpp:281
 msgid "File not compressed"
 msgstr "Bestand niet gecompressed"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:127
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:109
 #, c-format
 msgid "FileIO: Unknown open mode : 0x%02x"
 msgstr "FileIO: Onbekende open mode: 0x%02x"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:531
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:541
 msgid "Filesystem"
 msgstr "Bestand systeem"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1100
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1126
 msgid "Filetype 'ini' is unknown! Will not open!"
 msgstr "Bestandstype 'ini' is onbekend! Kan niet openen!"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:265
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:252
 msgid "Find next"
 msgstr "Zoek volgende"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:266
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:253
 msgid "Find previous"
 msgstr "Zoek vorige"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:632
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626
 msgid "First Block"
 msgstr "Eerste Blok"
 
@@ -2524,23 +2592,23 @@ msgstr "Eerste Blok"
 msgid "Fix Checksums"
 msgstr "Herstel Checksums"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:275
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283
 msgid "Force 16:9"
 msgstr "Forceer 16:9"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:275
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283
 msgid "Force 4:3"
 msgstr "Forceer 4:3"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:568
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548
 msgid "Force Console as NTSC-J"
 msgstr "Forceer Textuur Filtering"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406
 msgid "Force Texture Filtering"
 msgstr "Forceer Texture Filtering"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90
 msgid ""
 "Force texture filtering even if the emulated game explicitly disabled it.\n"
 "Improves texture quality slightly but causes glitches in some games.\n"
@@ -2553,7 +2621,7 @@ msgstr ""
 "\n"
 "In geval van twijfel leeg laten."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83
 msgid ""
 "Force the game to output graphics for widescreen resolutions.\n"
 "Causes graphical glitches is some games.\n"
@@ -2565,7 +2633,7 @@ msgstr ""
 "\n"
 "In geval van twijfel leeg laten."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488
 msgid ""
 "Forces NTSC-J mode for using the Japanese ROM font.\n"
 "Left unchecked, dolphin defaults to NTSC-U and automatically enables this "
@@ -2576,7 +2644,7 @@ msgstr ""
 "deze instelling automatisch aanzetten als je de Japanese versie van spellen "
 "speelt."
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:74
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:62
 msgid ""
 "Format as ascii (NTSC\\PAL)?\n"
 "Choose no for sjis (NTSC-J)"
@@ -2584,148 +2652,147 @@ msgstr ""
 "Formateer als ascii (NTSC\\{AL)? \n"
 "Kies nee voor sjis (NTSC-J)"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:278
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:265
 msgid "Forward"
 msgstr "Vooruit"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504
 #, c-format
 msgid "Found %d results for '"
 msgstr "%d resulataten gevonden voor '"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:857
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:925
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:858
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:926
 msgid "Frame"
 msgstr "Frame"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:867
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:868
 msgid "Frame "
 msgstr "Frame"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:185
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:173
 msgid "Frame Advance"
 msgstr "Frame Geavanceerd"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:536
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549
 msgid "Frame Dumps use FFV1"
 msgstr "Frame Dumps gebruiken FFV1"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:227
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:214
 msgid "Frame Info"
 msgstr "Frame Informatie"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:116
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:103
 msgid "Frame Range"
 msgstr "Frame Bereik"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:138
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:139
 msgid "Frame S&kipping"
 msgstr "Frame O&verslaan"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:572
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552
 msgid "Framelimit:"
 msgstr "Framelimiet:"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:204
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:191
 msgid "Frames To Record"
 msgstr "Frames om op te nemen"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547
 msgid "Free Look"
 msgstr "Vrije kijk"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
 msgid "French"
 msgstr "Frans"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:38
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:42
 msgid "Frets"
 msgstr "Frets"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:118
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:137
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:105
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:124
 msgid "From"
 msgstr "Van"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:426
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:432
 msgid "FullScr"
 msgstr "Volledig scherm"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:256
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263
 msgid "Fullscreen resolution:"
 msgstr "Volledige Scherm Resolutie:"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:534
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524
 msgid "GCI File(*.gci)"
 msgstr "GCI Bestand(*.gci)"
 
-#: Source/Core/DolphinWX/Src/GCMicDlg.h:44
+#: Source/Core/DolphinWX/Src/GCMicDlg.h:31
 msgid "GCMic Configuration"
 msgstr "GCMic configuratie"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:432
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
 msgid "GCPad"
 msgstr "GCPad"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:659
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:658
 msgid "GX_CMD_INVL_VC"
 msgstr "GX_CMD_INVL_VC"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:448
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:452
 msgid "Game ID:"
 msgstr "Spel ID:"
 
-#: Source/Core/Core/Src/NetPlay.cpp:229
+#: Source/Core/Core/Src/NetPlay.cpp:216
 msgid "Game is already running!"
 msgstr "Het spel draait al!"
 
-#: Source/Core/Core/Src/NetPlay.cpp:259
+#: Source/Core/Core/Src/NetPlay.cpp:246
 msgid "Game isn't running!"
 msgstr "Het spel draait niet!"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:389
-#, fuzzy
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:393
 msgid "Game not found!"
-msgstr "Spel niet gevonden!!"
+msgstr "Spel niet gevonden!"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:385
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:389
 msgid "Game-Specific Settings"
 msgstr "Spel Specifieke Instellingen"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:293
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:294
 msgid "GameConfig"
 msgstr "Spel Config"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:525
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:515
 msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)"
 msgstr "GameCube Savegame bestanden(*.gci;*.gcs;*.sav)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534
 msgid "Gamecube"
 msgstr "Gamecube"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:178
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:181
 msgid "Gamecube &Pad Settings"
 msgstr "Gamecube &Pad Instellingen"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:218
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1069
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:205
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1052
 msgid "Gamecube Memory Cards (*.raw,*.gcp)"
 msgstr "Gamecube Memory Kaarten (*.raw,*.gcp)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:432
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
 msgid "Gamecube Pad settings"
 msgstr "Gamecube Pad Instellingen"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:117
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302
 msgid "Gecko Codes"
 msgstr "Gecko Codes"
 
-#: Source/Core/Core/Src/GeckoCode.cpp:222
+#: Source/Core/Core/Src/GeckoCode.cpp:214
 #, c-format
 msgid ""
 "GeckoCode failed to run (CT%i CST%i) (%s)\n"
@@ -2738,10 +2805,10 @@ msgstr ""
 "Probeer de originele code, door het codehandler.bin bestand in de Sys "
 "directory te plaatsen en Dolphin opnieuw op te starten.)"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:172
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:197
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:160
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:160
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:202
 msgid "General"
 msgstr "Algemeen"
 
@@ -2749,30 +2816,30 @@ msgstr "Algemeen"
 msgid "General Settings"
 msgstr "Algemene Instellingen"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:470
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:281
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:316
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:261
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
 msgid "German"
 msgstr "Duits"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:449
+#: Source/Core/Core/Src/ActionReplay.cpp:439
 #, 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:430
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:436
 msgid "Graphics"
 msgstr "Grafische"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:430
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:436
 msgid "Graphics settings"
 msgstr "Grafische instellingen"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:205
 msgid "Greater Than"
 msgstr "Grooter dan"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87
 msgid ""
 "Greatly increases quality of textures generated using render to texture "
 "effects.\n"
@@ -2782,60 +2849,85 @@ msgid ""
 "\n"
 "If unsure, leave this checked."
 msgstr ""
-"Verbeterd de kwaliteit van texturen enorm wanneer deze gegenereerd zijn met "
-"render-naar-texture effecten.\\n\n"
-"Het ophogen van de interne resolutie zal het effect van deze instelling "
-"verhogen.\\n\n"
-"Verminderd de prestatie enigszins en kan mogelijk problemen veroorzaken "
-"(hoewel onwaarschijnlijk)\\n\n"
-"\\n\n"
-"Bij twijfel, geselecteerd laten."
+"Verbetert de kwaliteit van texturen enorm wanneer deze gegenereerd zijn met "
+"render-naar-texture effecten.\n"
+"Het verhogen van de interne resolutie zal het effect van deze instelling "
+"verhogen.\n"
+"Deze optie verminderd de prestatie enigszins en kan mogelijk problemen "
+"veroorzaken (hoewel onwaarschijnlijk).\n"
+"\n"
+"Bij geval van twijfel gemarkeerd laten."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:317
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
 msgid "Greek"
 msgstr "Grieks"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:22
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Green"
 msgstr "Groen "
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:24
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Green Left"
 msgstr "Groen Links"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:25
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Green Right"
 msgstr "Groen Rechts"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:35
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:39
 msgid "Guitar"
 msgstr "Gitaar"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1259
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1250
 msgid "HCI_CMD_INQUIRY is called, please report!"
 msgstr "HCI_CMD_INQUIRY is opgeroepen, rapport dit alstubliefst!"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:421
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504
+msgid "Hacked Buffer Upload"
+msgstr "Gehackte Buffer Upload"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431
 msgid "Hacks"
 msgstr "Hacks"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:158
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:146
 msgid "Header checksum failed"
 msgstr "Header checksum is mislukt"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:318
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298
 msgid "Hebrew"
 msgstr "Hebreeuws"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:313
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:300
 msgid "Height"
 msgstr "Hoogte"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:64
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:51
 msgid "Help"
 msgstr "Help"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:209
+#: Source/Core/DolphinWX/Src/Main.cpp:229
+msgid ""
+"Hi,\n"
+"\n"
+"Dolphin requires Mac OS X 10.7 or greater.\n"
+"Unfortunately you're running an old version of OS X.\n"
+"The last Dolphin version to support OS X 10.6 is Dolphin 3.5\n"
+"Please upgrade to 10.7 or greater to use the newest Dolphin version.\n"
+"\n"
+"Sayonara!\n"
+msgstr ""
+"Hallo,\n"
+"\n"
+"Dolphin vereist Mac OS X 10.7 of hoger.\n"
+"Helaas gebruik je een oude versie van OS X.\n"
+"De laatste versie van Dolphin dat OS X 10.6 ondersteunt is Dolphin 3.5\n"
+"Upgrade alsjeblieft naar 10.7 of hoger om de nieuwste versie van Dolphin te "
+"kunnen gebruiken.\n"
+"\n"
+"Sayonara!\n"
+
+#: Source/Core/DolphinWX/Src/Main.cpp:220
 msgid ""
 "Hi,\n"
 "\n"
@@ -2851,15 +2943,15 @@ msgstr ""
 "\n"
 "Sayonara!\n"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:309
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:296
 msgid "Hide"
 msgstr "Verberg"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:307
 msgid "Hide Mouse Cursor"
 msgstr "Verberg Muis Cursor"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79
 msgid ""
 "Hides the mouse cursor if it's on top of the emulation window.\n"
 "\n"
@@ -2869,26 +2961,26 @@ msgstr ""
 "\n"
 "In geval van twijfel leeg laten."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:54
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41
 msgid "Home"
 msgstr "Thuis"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:85
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:138
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:76
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:141
 msgid "Host"
 msgstr "Host"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.h:44
+#: Source/Core/DolphinWX/Src/HotkeyDlg.h:31
 msgid "Hotkey Configuration"
 msgstr "Sneltoets Configuratie"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:272
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:272
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:594
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:260
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:260
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574
 msgid "Hotkeys"
 msgstr "Hotkeys"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:319
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299
 msgid "Hungarian"
 msgstr "Hongaarse"
 
@@ -2896,35 +2988,35 @@ msgstr "Hongaarse"
 msgid "Hybrid Wiimote"
 msgstr "Hybride Wiimote"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:532
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:519
 #, 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:786
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:773
 #, c-format
 msgid ""
-"IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available "
-"in your nand dump\n"
+"IOCTL_ES_LAUNCH: Game tried to reload an IOS or a title that is not "
+"available in your NAND dump\n"
 "TitleID %016llx.\n"
-" Dolphin will likely hang now"
+" Dolphin will likely hang now."
 msgstr ""
 "IOCTL_ES_LAUNCH: Het spel probeerde het IOS of een titel die niet "
 "beschikbaar is in je NAND dump te laten\n"
 "TitleID %016llx.\n"
 "Dolphin zal waarschijnlijk blijven hangen."
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:313
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:300
 msgid "IOCTL_ES_READCONTENT - bad destination"
 msgstr "IOCTL_ES_READCONTENT - onjuiste bestemming"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729
 msgid "IPL Settings"
 msgstr "IPL Instellingen"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269
 msgid "IR"
 msgstr "IR"
 
@@ -2936,23 +3028,23 @@ msgstr "IR Aanwijzer"
 msgid "IR Sensitivity:"
 msgstr "IR Gevoeligheid:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:502
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:512
 msgid "ISO Details"
 msgstr "ISO Details"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:830
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:811
 msgid "ISO Directories"
 msgstr "ISO Map"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:172
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:166
 msgid "ITALY"
 msgstr "ITALIË"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:630
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:624
 msgid "Icon"
 msgstr "Icoon"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332
 msgid ""
 "If checked, the bounding box registers will be updated. Used by the Paper "
 "Mario games."
@@ -2960,29 +3052,11 @@ msgstr ""
 "Wanneer dit geselecteerd is, worden de bounding box registers ge-update. "
 "Gebruikt door de Paper Mario spellen."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318
-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:505
-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 ""
-"Als je de Framelimiet hoger zet dan de snelheid van het spel (NTSC: 60, PAL: "
-"50). Gebruik de Audio om te versnellen met behulp van DSP (kan het klikkend "
-"geluid verhelpen, maar kan ook constant lawaai ten gevolge hebben, "
-"afhankelijk van welk spel gebruikt wordt)."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:428
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438
 msgid "Ignore Format Changes"
 msgstr "Negeer formaat veranderingen."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94
 msgid ""
 "Ignore any changes to the EFB format.\n"
 "Improves performance in many games without any negative effect. Causes "
@@ -2996,7 +3070,7 @@ msgstr ""
 "\n"
 "In geval van twijfel ingevuld laten."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93
 msgid ""
 "Ignore any requests of the CPU to read from or write to the EFB.\n"
 "Improves performance in some games, but might disable some gameplay-related "
@@ -3014,11 +3088,11 @@ msgstr ""
 msgid "Import Save"
 msgstr "Importeer Save"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:59
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:48
 msgid "Import failed, try again?"
 msgstr "Importeren is mislukt, opnieuw proberen?"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:454
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:441
 msgid ""
 "Imported file has gsc extension\n"
 "but does not have a correct header"
@@ -3026,11 +3100,11 @@ msgstr ""
 "Geimporteerd bestand heeft gsc extensie\n"
 "maar heeft niet de juiste header"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:442
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:429
 msgid "Imported file has invalid length"
 msgstr "Geimporteerd bestand heeft een onjuiste lengte"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:451
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:438
 msgid ""
 "Imported file has sav extension\n"
 "but does not have a correct header"
@@ -3038,19 +3112,7 @@ msgstr ""
 "Geimporteerd bestand heeft sav extension\n"
 "maar heeft geen juiste header"
 
-#: 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 ""
-"Verbeterd prestaties, maar kan grafische glitches veroorzaken in spellen die "
-"afhankelijk zijn van juiste mist emulatie. \n"
-"\n"
-"In geval van twijfel leeg laten."
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350
 msgid "In Game"
 msgstr "In Game"
 
@@ -3058,67 +3120,67 @@ msgstr "In Game"
 msgid "In-Game"
 msgstr "In-Game"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:34
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305
 msgid "Info"
 msgstr "Info"
 
-#: Source/Core/Common/Src/MsgHandler.cpp:65
+#: Source/Core/Common/Src/MsgHandler.cpp:51
 msgid "Information"
 msgstr "Informatie"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:481
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:468
 msgid "Input"
 msgstr "Invoer"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:63
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:50
 msgid "Insert"
 msgstr "Toevoegen"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:176
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:166
 msgid "Insert Encrypted or Decrypted code here..."
 msgstr "Voer Gecodeerde of Gedecodeerde code hier in..."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:763
 msgid "Insert SD Card"
 msgstr "Schakel SD Card in"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:34
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:21
 msgid "Insert name here.."
 msgstr "Voeg naam hier toe"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:196
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:199
 msgid "Install WAD"
 msgstr "Installeer WAD"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:895
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:888
 msgid "Install to Wii Menu"
 msgstr "Installeren in Wii-menu"
 
-#: Source/Core/Core/Src/x64MemTools.cpp:252
+#: Source/Core/Core/Src/x64MemTools.cpp:242
 msgid ""
 "InstallExceptionHandler called, but this platform does not yet support it."
 msgstr ""
 "InstallExceptionHandler opgeroepen, maar dit platform ondersteund dit nog "
 "niet."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1297
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
 msgid "Installing WAD..."
 msgstr "WAD aan het installeren..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:885
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:901
 msgid "Integrity Check Error"
 msgstr "Integriteitscontrole Fout"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:891
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:907
 msgid "Integrity check completed"
 msgstr "Integriteitscontrole afgerond"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:890
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:906
 msgid "Integrity check completed. No errors have been found."
 msgstr "Integriteitscontrole afgerond. Geen fouten gevonden."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:882
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:898
 #, c-format
 msgid ""
 "Integrity check for partition %d failed. Your dump is most likely corrupted "
@@ -3127,19 +3189,19 @@ msgstr ""
 "Integriteitscontrole for partitie %d mislukt. De dump is waarschijnlijk "
 "corrupt or is verkeerd gepatcht. "
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532
 msgid "Interface"
 msgstr "Interface Instellingen"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:646
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627
 msgid "Interface Settings"
 msgstr "Interface Instellingen"
 
-#: Source/Core/Core/Src/State.cpp:240
+#: Source/Core/Core/Src/State.cpp:228
 msgid "Internal LZO Error - compression failed"
 msgstr "Interne LZO fout - compressie is mislukt"
 
-#: Source/Core/Core/Src/State.cpp:348
+#: Source/Core/Core/Src/State.cpp:336
 #, c-format
 msgid ""
 "Internal LZO Error - decompression failed (%d) (%li, %li) \n"
@@ -3148,41 +3210,45 @@ msgstr ""
 "Interne LZO fout - decompressie is mislukt (%d) (%li, %li) \n"
 "Probeer de staat opnieuw te laden"
 
-#: Source/Core/Core/Src/State.cpp:485
+#: Source/Core/Core/Src/State.cpp:473
 msgid "Internal LZO Error - lzo_init() failed"
 msgstr "Interne LZO fout - lzo_init() is mislukt"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:344
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:352
 msgid "Internal Resolution:"
 msgstr "Interne Resolutie:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:42
+msgid "Interpreter (VERY slow)"
+msgstr "Interpreteer (Behoorlijk langzaam)"
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349
 msgid "Intro"
 msgstr "Intro"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:194
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:187
 #, c-format
 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:600
 msgid "Invalid Value!"
 msgstr "Onjuiste waarde!"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:462
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:449
 msgid "Invalid bat.map or dir entry"
 msgstr "Onjuiste bat.map of map vermelding"
 
-#: Source/Core/Core/Src/CoreTiming.cpp:548
+#: Source/Core/Core/Src/CoreTiming.cpp:553
 #, c-format
 msgid "Invalid event type %i"
 msgstr "Onjuist event type %i"
 
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:326
+#: Source/Core/Core/Src/HW/DVDInterface.cpp:309
 msgid "Invalid file"
 msgstr "Onjuist bestand"
 
-#: Source/Core/DiscIO/Src/BannerLoaderGC.cpp:41
+#: Source/Core/DiscIO/Src/BannerLoaderGC.cpp:28
 #, c-format
 msgid ""
 "Invalid opening.bnr found in gcm:\n"
@@ -3193,46 +3259,54 @@ msgstr ""
 "%s\n"
 "Wellicht moet je dit spel opnieuw dumpen"
 
-#: Source/Core/Core/Src/Movie.cpp:735
+#: Source/Core/Core/Src/Movie.cpp:726
 msgid "Invalid recording file"
 msgstr "Onjuist opname bestand"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:473
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:472
 msgid "Invalid search parameters (no object selected)"
 msgstr "Ongeldige zoek-parameters (geen object geselecteerd)"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:456
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:455
 msgid "Invalid search string (couldn't convert to number)"
 msgstr "Ongeldige zoekopdracht (niet in staat naar nummers te converteren)"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:444
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:443
 msgid "Invalid search string (only even string lengths supported)"
 msgstr "Ongeldige zoekopdracht (alleen even string lengte ondersteund)"
 
-#: Source/Core/Core/Src/Core.cpp:513
+#: Source/Core/Core/Src/Core.cpp:511
 msgid "Invalid state"
 msgstr "Onjuiste staat"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:473
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:320
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300
 msgid "Italian"
 msgstr "Italië"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:183
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:177
 msgid "JAPAN"
 msgstr "JAPAN"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:321
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:46
+msgid "JIT Recompiler (recommended)"
+msgstr "JIT Recompiler (aanbevolen)"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:47
+msgid "JITIL experimental recompiler"
+msgstr "JITIL experimentele recompiler"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:279
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
 msgid "Japanese"
 msgstr "Japans"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:188
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:182
 msgid "KOREA"
 msgstr "KOREA"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78
 msgid ""
 "Keep the game window on top of all other windows.\n"
 "\n"
@@ -3242,62 +3316,62 @@ msgstr ""
 "\\n\n"
 "Bij twijfel, ongeselecteerd laten."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:298
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:306
 msgid "Keep window on top"
 msgstr "Houdt venster bovenop"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:241
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:241
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:229
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:229
 msgid "Key"
 msgstr "Toets"
 
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282
 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:322
 msgid "Korean"
 msgstr "Koreaans"
 
 #. i18n:  Left
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:57
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:44
 msgid "L"
 msgstr "L"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:39
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:26
 msgid "L Button"
 msgstr "L Knop"
 
 #. i18n:  Left-Analog
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:61
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:48
 msgid "L-Analog"
 msgstr "L-Analoog"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:585
 msgid "Language:"
 msgstr "Taal:"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:152
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:153
 msgid "Last Overwritten State"
 msgstr "Laatste Overgeschreven Staat"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:159
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:161
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:160
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:162
 msgid "Last Saved State"
 msgstr "Laatste Opgeslagen Staat"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:696
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:677
 msgid "Latency:"
 msgstr "Wachttijd:"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:276
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:55
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:263
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:42
 msgid "Left"
 msgstr "Links"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:60
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:64
 msgid "Left Stick"
 msgstr "Linker Knuppel"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:257
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:257
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:245
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:245
 msgid ""
 "Left click to detect hotkeys.\n"
 "Enter space to clear."
@@ -3305,7 +3379,7 @@ msgstr ""
 "Links-klik om sneltoetsen te detecteren.\n"
 "Druk op spatie om te legen."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:689
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:678
 msgid ""
 "Left-click to detect input.\n"
 "Middle-click to clear.\n"
@@ -3315,7 +3389,7 @@ msgstr ""
 "Midden-klik om te wissen.\n"
 "Klik met de rechtermuisknop voor meer opties."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:694
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:683
 msgid ""
 "Left/Right-click for more options.\n"
 "Middle-click to clear."
@@ -3323,86 +3397,86 @@ 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:206
 msgid "Less Than"
 msgstr "Minder dan"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:565
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545
 msgid "Limit by FPS"
 msgstr "Limiteer met behulp van FPS"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:924
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:915
 msgid "Load"
 msgstr "Laad"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544
 msgid "Load Custom Textures"
 msgstr "Laad Aangepaste Textures"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
 msgid "Load State Slot 1"
 msgstr "Laad staat 1"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189
 msgid "Load State Slot 2"
 msgstr "Laad staat 2"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:190
 msgid "Load State Slot 3"
 msgstr "Laad staat 3"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:203
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:191
 msgid "Load State Slot 4"
 msgstr "Laad staat 4"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192
 msgid "Load State Slot 5"
 msgstr "Laad staat 5"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193
 msgid "Load State Slot 6"
 msgstr "Laad staat 6"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:194
 msgid "Load State Slot 7"
 msgstr "Laad staat 7"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:195
 msgid "Load State Slot 8"
 msgstr "Laad staat 8"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:155
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:156
 msgid "Load State..."
 msgstr "Laad staat..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1332
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1359
 msgid "Load Wii System Menu"
 msgstr "Laad Wii System Menu"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1327
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1354
 #, c-format
 msgid "Load Wii System Menu %d%c"
 msgstr "Laad Wii System Menu %d%c"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112
 msgid ""
 "Load custom textures from User/Load/Textures/<game_id>/\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"Laad aangepasteresolutie textures van User/Load/Textures/<game id>/\n"
+"Laad aangepaste textures van User/Load/Textures/<game id>/\n"
 "\n"
 "In geval van twijfel leeg laten."
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:50
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:37
 msgid "Load preset values from hack patterns available."
 msgstr "Laad vooraf ingestelde waardes van de beschikbare hack patronen."
 
@@ -3410,23 +3484,23 @@ msgstr "Laad vooraf ingestelde waardes van de beschikbare hack patronen."
 msgid "Local"
 msgstr "Lokaal"
 
-#: Source/Core/DolphinWX/Src/LogWindow.h:51
+#: Source/Core/DolphinWX/Src/LogWindow.h:38
 msgid "Log"
 msgstr "Logboek"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:26
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:13
 msgid "Log Configuration"
 msgstr "Logboek configuratie"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:296
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304
 msgid "Log FPS to file"
 msgstr "Log FPS naar bestand"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:96
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83
 msgid "Log Types"
 msgstr "Log Types"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103
 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"
@@ -3438,24 +3512,24 @@ msgstr ""
 "\\n\n"
 "Bij twijfel, ongeselecteerd laten."
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:81
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:68
 msgid "Logger Outputs"
 msgstr "Logger Uitvoer"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132
-#: Source/Core/DolphinWX/Src/Frame.cpp:328
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:119
+#: Source/Core/DolphinWX/Src/Frame.cpp:314
 msgid "Logging"
 msgstr "Logboek Bijhouden"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:255
+#: Source/Core/Core/Src/NetPlayClient.cpp:259
 msgid "Lost connection to server!"
 msgstr "Verbinding met de server verloren!"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:42
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:29
 msgid "M Button"
 msgstr "M Knop"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:119
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:112
 #, c-format
 msgid ""
 "MD5 mismatch\n"
@@ -3464,51 +3538,65 @@ msgstr ""
 "Verkeerde MD5\n"
 " %016llx%016llx != %016llx%016llx"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314
 msgid "MMU Speed Hack"
 msgstr "MMU Snelheids Hack"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:527
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:563
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:517
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:556
 msgid "MadCatz Gameshark files(*.gcs)"
 msgstr "MadCatz Gameshark bestanden(*.gcs)"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:51
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:63
+#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:38
 msgid "Main Stick"
 msgstr "Hoofd Knuppel"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460
 msgid "Maker ID:"
 msgstr "Maker ID:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487
 msgid "Maker:"
 msgstr "Maker:"
 
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100
+msgid ""
+"Makes distant objects more visible by removing fog, thus increasing the "
+"overall detail.\n"
+"Disabling fog will break some games which rely on proper fog emulation.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+"Maakt objecten op afstand meer zichtbaar door de mist te verwijderen.\n"
+"Het deactiveren van mist zal sommige spellen breken dat op correcte mist "
+"emulatie rekent.\n"
+"\n"
+"In geval van twijfel laat dit uitgevinkt."
+
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:97
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:100
 msgid "Max"
 msgstr "Max"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:448
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:435
 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:291
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:278
 msgid "Memcard already opened"
 msgstr "De geheugenkaart is al geopend"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:912
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:913
 msgid "Memory Byte"
 msgstr "Geheugen Byte"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:225
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:113
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:212
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:93
 msgid "Memory Card"
 msgstr "Geheugen Kaart"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.h:36
+#: Source/Core/DolphinWX/Src/MemcardManager.h:23
 msgid ""
 "Memory Card Manager WARNING-Make backups before using, should be fixed but "
 "could mangle stuff!"
@@ -3516,7 +3604,7 @@ msgstr ""
 "Geheugenkaart Manager Waarschuwing - Maak backups voor gebruik, het zou "
 "moeten werken"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:371
+#: Source/Core/Core/Src/CoreParameter.cpp:360
 #, c-format
 msgid ""
 "Memory Card filename in Slot %c is incorrect\n"
@@ -3533,17 +3621,17 @@ msgstr ""
 "%s\n"
 "Wil je de oude bestanden naar de nieuwe lokatie kopiëren?\n"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:124
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:112
 msgid "Memorycard filesize does not match the header size"
 msgstr ""
 "Het formaat van de geheugenkaart komt niet overeen met het formaat van de "
 "header."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:50
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:37
 msgid "Menu"
 msgstr "Menu"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:114
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:94
 msgid "Mic"
 msgstr "Microfoon"
 
@@ -3552,20 +3640,20 @@ msgstr "Microfoon"
 msgid "Min"
 msgstr "Min"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:580
 msgid "Misc"
 msgstr "Overig"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:795
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776
 msgid "Misc Settings"
 msgstr "Overige Instellingen"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:240
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:294
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:227
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:281
 msgid "Modifier"
 msgstr "Aanpasser"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106
 msgid ""
 "Modify textures to show the format they're encoded in. Needs an emulation "
 "reset in most cases.\n"
@@ -3577,20 +3665,20 @@ msgstr ""
 "\n"
 "In geval van twijfel leeg laten."
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:115
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:108
 msgid "Monospaced font"
 msgstr "Niet-proportioneel (monospace) lettertype"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:305
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:292
 msgid "Motion Plus"
 msgstr "Motion Plus"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:309
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:86
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:296
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73
 msgid "Motor"
 msgstr "Motor"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:654
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:666
 msgid ""
 "Move the mouse pointer over an option to display a detailed description.\n"
 "\n"
@@ -3600,8 +3688,8 @@ msgid ""
 "\n"
 "\n"
 msgstr ""
-"Plaats de cursor over een optie om de gedetaillerde beschrijving te "
-"weergeven.\n"
+"Plaats de cursor over een optie om een gedetailleerde beschrijving weer te "
+"geven.\n"
 "\n"
 "\n"
 "\n"
@@ -3609,224 +3697,236 @@ msgstr ""
 "\n"
 "\n"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:75
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:62
 msgid "Multiply"
 msgstr "Vermenigvuldigen"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:651
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:650
 msgid "NOP"
 msgstr "NOP"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:629
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:628
 msgid "NOTE: Stream size doesn't match actual data length\n"
 msgstr "Notitie: Steam grootte komt niet overeen met werkelijke lengte\\n\n"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:129
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:116
 msgid "NP Add"
 msgstr "NP Toevoegen"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:124
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:111
 msgid "NP Begin"
 msgstr "NP Begin"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:132
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:119
 msgid "NP Decimal"
 msgstr "NP Decimaal"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:126
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:113
 msgid "NP Delete"
 msgstr "NP Verwijderen"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:133
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:120
 msgid "NP Divide"
 msgstr "NP Verdalen"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:120
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:107
 msgid "NP Down"
 msgstr "NP Omlaag"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:123
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:110
 msgid "NP End"
 msgstr "NP Einde"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:111
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:98
 msgid "NP Enter"
 msgstr "NP Enter"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:127
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:114
 msgid "NP Equal"
 msgstr "NP Gelijk"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:116
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:103
 msgid "NP Home"
 msgstr "NP Thuis"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:125
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:112
 msgid "NP Insert"
 msgstr "NP Invoegen"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:117
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:104
 msgid "NP Left"
 msgstr "NP Links"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:128
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:115
 msgid "NP Multiply"
 msgstr "NP Vermenigvuldigen"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:122
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:109
 msgid "NP Page Down"
 msgstr "NP Pagina Omlaang"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:121
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:108
 msgid "NP Page Up"
 msgstr "NP Pagina Omhoog"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:119
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:106
 msgid "NP Right"
 msgstr "NP Rechts"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:130
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:117
 msgid "NP Separator"
 msgstr "NP Scheiding"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:109
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:96
 msgid "NP Space"
 msgstr "NP Ruimte"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:131
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:118
 msgid "NP Subtract"
 msgstr "NP Aftrekken"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:110
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:97
 msgid "NP Tab"
 msgstr "NP Tab"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:118
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:105
 msgid "NP Up"
 msgstr "NP Omhoog"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:444
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:59
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:50
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:448
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:46
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:37
 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:25
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:72
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:282
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:553
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:15
 msgid "Name: "
 msgstr "Naam:"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:526
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:562
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:516
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:555
 msgid "Native GCI files(*.gci)"
 msgstr "Native GCI-bestanden (*. GCI)"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:161
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:148
 msgid "New Scan"
 msgstr "Nieuwe Scan"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:206
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:193
 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:801
 msgid "Next Page"
 msgstr "Volgende Pagina"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:165
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:152
 msgid "Next Scan"
 msgstr "Volgende Scan"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:68
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:59
 msgid "Nickname :"
 msgstr "Gebruikersnaam :"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:196
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:190
 msgid "No Country (SDK)"
 msgstr "Geen land (SDK)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:370
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:357
 msgid "No ISOs or WADS found"
 msgstr "Geen ISOs of WADS gevonden."
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:508
+#: Source/Core/Core/Src/ConfigManager.h:17
+msgid "No audio output"
+msgstr "Geen audio output"
+
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:501
 #, c-format
 msgid "No banner file found for title  %s"
 msgstr "Geen banner gevonden voor titel  %s"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:761
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:768
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:760
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:767
 msgid "No description available"
 msgstr "Geen omschrijving beschikbaar"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:514
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:535
 msgid "No docking"
 msgstr "Geen docking"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:859
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:860
 msgid "No file loaded"
 msgstr "Geen bestand geladen"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:439
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:426
 msgid "No free dir index entries"
 msgstr "Geen vrije map indexes"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:895
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:896
 msgid "No recorded file"
 msgstr "Geen opgenomen bestand"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:501
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:494
 #, c-format
 msgid "No save folder found for title %s"
 msgstr "Geen save map gevonden voor titel %s"
 
+#: Source/Plugins/Plugin_VideoOGL/Src/main.cpp:132
+#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:111
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:23
 #: Source/Core/DolphinWX/Src/NetWindow.cpp:600
 msgid "None"
 msgstr "Geen"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:323
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303
 msgid "Norwegian Bokmaal"
 msgstr "Noorweegse Bokmaal"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:203
 msgid "Not Equal"
 msgstr "Niet gelijk"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:804
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:794
 msgid "Not Set"
 msgstr "Niet ingesteld"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:626
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:101
+#, c-format
+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/Main.cpp:654
 msgid "Not connected"
 msgstr "Niet verbonden"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:309
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:296
 msgid "Notes"
 msgstr "Opmerkingen"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:16
 msgid "Notes: "
 msgstr "Opmerkingen:"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:71
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:74
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:580
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:621
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:629
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:59
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:64
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:613
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:659
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:667
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:31
 msgid "Notice"
 msgstr "Opmerkingen"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:105
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:92
 msgid "Num Lock"
 msgstr "Num Lock"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:88
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:75
 msgid "Number Of Codes: "
 msgstr "Aantal Codes:"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:30
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:34
 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26
 msgid "Nunchuk"
 msgstr "Nunchuk"
@@ -3835,97 +3935,98 @@ msgstr "Nunchuk"
 msgid "Nunchuk Acceleration"
 msgstr "Nunchuk Acceleratie"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:877
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:878
 msgid "Object"
 msgstr "Object"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:135
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:122
 msgid "Object Range"
 msgstr "Object Bereik"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:243
 msgid "Off"
 msgstr "Uit"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:62
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:49
 msgid "Offset:"
 msgstr "Afstand:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:582
 msgid "On-Screen Display Messages"
 msgstr "In-Scherm Berichtgeving"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:436
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:423
 #, c-format
 msgid "Only %d blocks available"
 msgstr "Er zijn maar %d blocks beschikaarr"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:420
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:178
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:426
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:166
 msgid "Open"
 msgstr "Open"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:876
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:867
 msgid "Open &containing folder"
 msgstr "Open &bevattende map"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:873
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:864
 msgid "Open Wii &save folder"
 msgstr "Open Wii &save map"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:420
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:426
 msgid "Open file..."
 msgstr "Open Bestand..."
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:61
+#: Source/Core/AudioCommon/Src/OpenALStream.cpp:48
 #, 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:72
+#: Source/Core/AudioCommon/Src/OpenALStream.cpp:59
 msgid "OpenAL: can't find sound devices"
 msgstr "OpenAL: Kan geen geluids devices vinden"
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:66
+#: Source/Core/AudioCommon/Src/OpenALStream.cpp:53
 #, c-format
 msgid "OpenAL: can't open device %s"
 msgstr "OpenAL: Kan device %s niet openen"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502
 msgid "OpenCL Texture Decoder"
-msgstr "OpenCL Texture Decodeerder"
+msgstr "OpenCL Texture Decoder"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503
 msgid "OpenMP Texture Decoder"
-msgstr "OpenMP Texture Decodeerder"
+msgstr "OpenMP Texture Decoder"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:317
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:94
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:304
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:81
 msgid "Options"
 msgstr "Opties"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:22
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Orange"
 msgstr "Oranje"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:468
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:455
+#, fuzzy
 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"
+"and import the saves to a new memcard\n"
 msgstr ""
 "De volgorde van bestanden in de map komt niet overeen met de volgorde van "
 "blokken\n"
 "Rechts-klik en exporteer alle save bestanden,\n"
 "en importeer de saves naar een nieuwe geheugenkaart\n"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:316
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:324
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:509
 msgid "Other"
 msgstr "Overige"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:206
+#: Source/Core/Core/Src/NetPlayClient.cpp:210
 msgid ""
 "Other client disconnected while game is running!! NetPlay is disabled. You "
 "manually stop the game."
@@ -3933,15 +4034,15 @@ 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:481
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:468
 msgid "Output"
 msgstr "Uitgang"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:342
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:348
 msgid "P&lay Recording..."
 msgstr "Opname afspelen"
 
-#: Source/Core/Core/Src/HW/GCPad.cpp:30
+#: Source/Core/Core/Src/HW/GCPad.cpp:18
 msgid "Pad"
 msgstr "Pad"
 
@@ -3949,160 +4050,160 @@ msgstr "Pad"
 msgid "Pad "
 msgstr "Pad"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:34
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:38
 msgid "Pads"
 msgstr "Pads"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:108
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:95
 msgid "Page Down"
 msgstr "Page Down"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:107
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:94
 msgid "Page Up"
 msgstr "Page Up"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:35
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:22
 msgid "Paragraph"
 msgstr "Paragraaf"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:64
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:51
 msgid "Parameters"
 msgstr "Parameters"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:222
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:217
 #, c-format
 msgid "Partition %i"
 msgstr "Partitie %i"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:296
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:297
 msgid "Patches"
 msgstr "Patches"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:556
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536
 msgid "Paths"
 msgstr "Pad"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1538
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1539
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:51
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1565
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1566
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:38
 msgid "Pause"
 msgstr "Pauze"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:128
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:129
 msgid "Pause at end of movie"
 msgstr "Pauze aan het eind van de film"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:397
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405
 msgid "Per-Pixel Lighting"
 msgstr "Per-Pixel Belichting"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352
 msgid "Perfect"
 msgstr "Perfect"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:609
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:642
 #, c-format
 msgid "Perspective %d"
 msgstr "Perspectief %d"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:165
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:424
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1547
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1548
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:152
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:430
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1574
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1575
 msgid "Play"
 msgstr "Speel"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176
 msgid "Play Recording"
 msgstr "Speel Opname"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:170
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:170
 msgid "Play/Pause"
 msgstr "Spel/Pauze"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351
 msgid "Playable"
 msgstr "Speelbaar"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:154
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:141
 msgid "Playback Options"
 msgstr "Terugspeel Opties"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:301
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:304
 msgid "Players"
 msgstr "Spelers"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:988
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:991
 msgid "Please confirm..."
 msgstr "Bevestig alsjeblieft..."
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:579
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:612
 msgid "Please create a perspective before saving"
 msgstr "Maak een perspectief voor het opslaan"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:36
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:23
 msgid "Plus-Minus"
 msgstr "Ongeveer"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:324
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304
 msgid "Polish"
 msgstr "Pools"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:713
 msgid "Port 1"
 msgstr "Poort 1"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714
 msgid "Port 2"
 msgstr "Poort 2"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:734
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715
 msgid "Port 3"
 msgstr "Poort 3"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716
 msgid "Port 4"
 msgstr "Poort 4"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:97
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:130
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:88
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:133
 msgid "Port :"
 msgstr "Poort :"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:325
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305
 msgid "Portuguese"
 msgstr "Portugees"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:326
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306
 msgid "Portuguese (Brazilian)"
 msgstr "Portugees (Braziliaans)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:391
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:399
 msgid "Post-Processing Effect:"
 msgstr "Post-Processing Effect:"
 
-#: Source/Core/Core/Src/Movie.cpp:936
+#: Source/Core/Core/Src/Movie.cpp:927
 #, c-format
 msgid "Premature movie end in PlayController. %u + 8 > %u"
 msgstr "Vroegtijdige beeïndiging van filmpje in PlayController. %u + 8 > %u"
 
-#: Source/Core/Core/Src/Movie.cpp:1055
+#: Source/Core/Core/Src/Movie.cpp:1046
 #, c-format
 msgid "Premature movie end in PlayWiimote. %u + %d > %u"
 msgstr "Vroegtijdige beeïndiging van filmpje in PlayWiimote. %u + %d > %u"
 
-#: Source/Core/Core/Src/Movie.cpp:1032
+#: Source/Core/Core/Src/Movie.cpp:1023
 #, c-format
 msgid "Premature movie end in PlayWiimote. %u > %u"
 msgstr "Vroegtijdige beeïndiging van filmpje in PlayWiimote. %u > %u"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:48
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:35
 msgid "Presets: "
 msgstr "Presets: "
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:205
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:192
 msgid "Prev Page"
 msgstr "Vorige Pagina"
 
@@ -4110,67 +4211,67 @@ msgstr "Vorige Pagina"
 msgid "Previous Page"
 msgstr "Vorige Pagina"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:183
 msgid "Previous Value"
 msgstr "Vorige waarden"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:60
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:47
 msgid "Print"
 msgstr "Print"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:894
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:885
 msgid "Profile"
 msgstr "Profiel"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.h:55
+#: Source/Core/DolphinWX/Src/ISOProperties.h:42
 msgid "Properties"
 msgstr "Eigenschappen"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:283
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:286
 msgid "Purge Cache"
 msgstr "Cache leegmaken"
 
-#: Source/Core/Common/Src/MsgHandler.cpp:66
+#: Source/Core/Common/Src/MsgHandler.cpp:52
 msgid "Question"
 msgstr "Vraag"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:159
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:316
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:162
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:319
 msgid "Quit"
 msgstr "Stoppen"
 
 #. i18n:  Right
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:59
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:46
 msgid "R"
 msgstr "R"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:40
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:27
 msgid "R Button"
 msgstr "R Knop"
 
 #. i18n:  Right-Analog
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:63
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
 msgid "R-Analog"
 msgstr "R-Analoog"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:445
 msgid "RAM"
 msgstr "RAM"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:175
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:169
 msgid "RUSSIA"
 msgstr "RUSLAND"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:528
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:515
 msgid "Range"
 msgstr "Afstand"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:190
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:178
 msgid "Read-only mode"
 msgstr "Alleen-lezen modus"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:487
 msgid "Real"
 msgstr "Echt"
 
@@ -4186,33 +4287,33 @@ msgstr "Echte Wiimotes"
 msgid "Reconnect Wiimote on State Loading"
 msgstr "Herverbind Wiimote bij Staat Laden"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:193
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:217
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:791
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:180
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:204
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:790
 msgid "Record"
 msgstr "Speel Opnemen"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:174
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:161
 msgid "Recording Info"
 msgstr "Opname Informatie"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:202
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:189
 msgid "Recording Options"
 msgstr "Opname Opties"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:21
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Red"
 msgstr "Rood"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:24
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Red Left"
 msgstr "Rood Links"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:25
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Red Right"
 msgstr "Rood Rechts"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86
 msgid ""
 "Reduces the amount of aliasing caused by rasterizing 3D graphics.\n"
 "This makes the rendered picture look less blocky.\n"
@@ -4227,28 +4328,28 @@ msgstr ""
 "In geval van twijfel selecteer Geen."
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:60
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:421
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:903
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:427
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:894
 msgid "Refresh"
 msgstr "Ververs"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:180
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:168
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:168
 msgid "Refresh List"
 msgstr "Lijst Verversen"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:421
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:427
 msgid "Refresh game list"
 msgstr "Ververs de speellijst"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:405
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:427
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:77
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:812
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:409
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:431
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:64
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:793
 msgid "Remove"
 msgstr "Verwijder"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99
 msgid ""
 "Render the scene as a wireframe.\n"
 "\n"
@@ -4259,196 +4360,204 @@ msgstr ""
 "\n"
 "In geval van twijfel leeg laten."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:308
 msgid "Render to Main Window"
 msgstr "Geef weer op hoofdscherm"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:915
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:172
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:906
 msgid "Reset"
 msgstr "Opnieuw"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:190
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:177
 msgid "Results"
 msgstr "Resultaten"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:29
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:16
 msgid "Return"
 msgstr "Enter"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:277
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:57
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464
+msgid "Revision:"
+msgstr ""
+
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:264
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:44
 msgid "Right"
 msgstr "Rechts"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:61
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:65
 msgid "Right Stick"
 msgstr "Rechter Stick"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:85
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:295
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:72
 msgid "Rumble"
 msgstr "Rumble"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:518
-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:498
+msgid ""
+"Run DSP HLE and LLE on a dedicated thread (not recommended: might cause "
+"audio glitches with HLE and freezes with LLE)."
+msgstr ""
+"Zet DSP HLE en LLE op een toegeweide thread (niet aangeraden omdat het audio "
+"problemen kan veroorzaken met HLE en freezes met LLE)."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:327
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307
 msgid "Russian"
 msgstr "Russisch"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:149
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:150
 msgid "Sa&ve State"
 msgstr "S&la Staat Op"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:465
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475
 msgid "Safe"
-msgstr "Opslaan"
+msgstr "Betrouwbaar"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:196
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:446
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:925
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:183
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:452
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916
 msgid "Save"
 msgstr "Opslaan"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:532
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:522
 msgid "Save GCI as..."
 msgstr "Sla GCI op als..."
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
 msgid "Save State Slot 1"
 msgstr "Sla Staat 1 Op"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:198
 msgid "Save State Slot 2"
 msgstr "Sla Staat 2 Op"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:199
 msgid "Save State Slot 3"
 msgstr "Sla Staat 3 Op"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:212
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:212
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200
 msgid "Save State Slot 4"
 msgstr "Sla Staat 4 op"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201
 msgid "Save State Slot 5"
 msgstr "Sla Staat 5 Op"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202
 msgid "Save State Slot 6"
 msgstr "Sla Staat 6 Op"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:203
 msgid "Save State Slot 7"
 msgstr "Sla Staat 7 Op"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204
 msgid "Save State Slot 8"
 msgstr "Sla Staat 8 Op"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:151
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:152
 msgid "Save State..."
 msgstr "Sla staat op als..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:582
 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:592
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:602
 msgid "Save as..."
 msgstr "Opslaan als..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1203
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1204
 msgid "Save compressed GCM/ISO"
 msgstr "Sla gecomprimeerde GCM / ISO op"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:446
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:452
 msgid "Save current perspective"
 msgstr "Sla huidige perspectief op"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1192
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193
 msgid "Save decompressed GCM/ISO"
 msgstr "Sla gedecomprimeerd GCM / ISO op"
 
-#: Source/Core/Core/Src/Movie.cpp:801
+#: Source/Core/Core/Src/Movie.cpp:792
 #, 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:396
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:404
 msgid "Scaled EFB Copy"
 msgstr "Geschaalde EFB Kopie"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:556
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:543
 #, c-format
 msgid "Scanning %s"
 msgstr "Scannen van %s"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:539
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:526
 msgid "Scanning for ISOs"
 msgstr "Scannen voor ISO's"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:540
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:527
 msgid "Scanning..."
 msgstr "Scannen..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:427
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
 msgid "ScrShot"
 msgstr "ScrShot"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:106
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:93
 msgid "Scroll Lock"
 msgstr "Scroll Slot"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:264
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:251
 msgid "Search"
 msgstr "Zoeken"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:227
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:214
 msgid "Search Filter"
 msgstr "Zoekfilter"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:810
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:791
 msgid "Search Subfolders"
 msgstr "Zoeken in submappen"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:250
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:237
 msgid "Search current Object"
 msgstr "Zoek huidige Object"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:254
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:241
 msgid "Search for hex Value:"
 msgstr "Zoek naar hex Waarde:"
 
-#: Source/Core/Common/Src/SysConf.h:103 Source/Core/Common/Src/SysConf.h:126
-#: Source/Core/Common/Src/SysConf.h:146 Source/Core/Common/Src/SysConf.h:167
+#: Source/Core/Common/Src/SysConf.h:90 Source/Core/Common/Src/SysConf.h:113
+#: Source/Core/Common/Src/SysConf.h:133 Source/Core/Common/Src/SysConf.h:154
 #, c-format
 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:490
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:46
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:477
 msgid "Select"
 msgstr "Selecteer"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:677
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1072
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:683
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1087
 msgid "Select The Recording File"
 msgstr "Selecteer de opname Bestand"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1285
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1312
 msgid "Select a Wii WAD file to install"
 msgstr "Selecteer een Wii WAD bestand om te installeren"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:70
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74
 msgid ""
 "Select a hardware adapter to use.\n"
 "\n"
@@ -4458,31 +4567,31 @@ msgstr ""
 "\n"
 "In geval van twijfel, gebruik de eerste."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:520
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:510
 msgid "Select a save file to import"
 msgstr "Selecteer een save file om te importeren"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:363
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:366
 msgid "Select floating windows"
 msgstr "Selecteer zwevende vensters"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:582
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:585
 msgid "Select the file to load"
 msgstr "Selecteer het bestand om het te laden"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1241
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1268
 msgid "Select the save file"
 msgstr "Selecteer het save - bestand"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1388
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1415
 msgid "Select the state to load"
 msgstr "Selecteer de Staat om te laden"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1429
 msgid "Select the state to save"
 msgstr "Selecteer de Staat om op te slaan"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82
 msgid ""
 "Select what aspect ratio to use when rendering:\n"
 "Auto: Use the native aspect ratio\n"
@@ -4498,15 +4607,15 @@ 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
+#: Source/Core/InputCommon/Src/InputConfig.cpp:48
 msgid "Selected controller profile does not exist"
 msgstr "Geselecteerd controller profiel bestaat niet"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:116
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:109
 msgid "Selected font"
 msgstr "Geselecteerde font"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75
 msgid ""
 "Selects the display resolution used in fullscreen mode.\n"
 "This should always be bigger than or equal to the internal resolution. "
@@ -4523,23 +4632,39 @@ 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:69
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:70
 msgid ""
 "Selects what graphics API to use internally.\n"
 "Direct3D 9 usually is the fastest one. OpenGL is more accurate though. "
 "Direct3D 11 is somewhere between the two.\n"
 "Note that the Direct3D backends are only available on Windows.\n"
 "\n"
-"If unsure, use Direct3D 9."
+"If unsure, use Direct3D 11."
 msgstr ""
 "Selecteer de intern te gebruiken grafische API.\n"
 "Direct3D 9 is meestal de snelste. OpenGL is echter nauwkeuriger. Direct3D 11 "
 "zit ergens tussenin.\n"
 "Let erop dat de Direct3D backends alleen op Windows beschikbaar zijn.\n"
 "\n"
-"In geval van twijfel gebruik Direct3D 9."
+"In geval van twijfel gebruik Direct3D 11."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:288
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72
+msgid ""
+"Selects what graphics API to use internally.\n"
+"Direct3D 9 usually is the fastest one. OpenGL is more accurate though. "
+"Direct3D 11 is somewhere between the two.\n"
+"Note that the Direct3D backends are only available on Windows.\n"
+"\n"
+"If unsure, use OpenGL."
+msgstr ""
+"Selecteer de intern te gebruiken grafische API.\n"
+"Direct3D 9 is meestal de snelste. OpenGL is echter nauwkeuriger. Direct3D 11 "
+"zit ergens tussenin.\n"
+"Let erop dat de Direct3D backends alleen op Windows beschikbaar zijn.\n"
+"\n"
+"In geval van twijfel gebruik OpenGL."
+
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:291
 msgid "Send"
 msgstr "Verzend"
 
@@ -4547,25 +4672,25 @@ msgstr "Verzend"
 msgid "Sensor Bar Position:"
 msgstr "Sensor Bar Positie:"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:77
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:64
 msgid "Separator"
 msgstr "Scheidingsteken"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:328
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308
 msgid "Serbian"
 msgstr "Servisch"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:522
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502
 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:488
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:475
 msgid "Set"
 msgstr "Stel"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:877
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:868
 msgid "Set as &default ISO"
 msgstr "Ingesteld als &standaard ISO"
 
@@ -4574,13 +4699,13 @@ msgstr "Ingesteld als &standaard ISO"
 msgid "Set as default Memcard %c"
 msgstr "Ingesteld als standaard memcard% c"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:460
+#: Source/Core/Core/Src/ActionReplay.cpp:450
 #, 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/ConfigMain.cpp:535
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:515
 msgid ""
 "Sets the latency (in ms).  Higher values may reduce audio crackling. OpenAL "
 "backend only."
@@ -4588,123 +4713,123 @@ msgstr ""
 "Zet de wachttijd (in ms). Hogere waarden kunnen krakende audio verminderen. "
 "Alleen voor OpenAL instellingen."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341
 msgid "Settings..."
 msgstr "Instellingen..."
 
-#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:222
+#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:209
 msgid "SetupWiiMem: Cant find setting file"
 msgstr "SetupWiiMem: Kan het instellingen bestand niet vinden"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:291
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:278
 msgid "Shake"
 msgstr "Schudden"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
 msgid "Short Name:"
 msgstr "Korte Naam:"
 
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:103
+#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:90
 msgid "Shoulder Buttons"
 msgstr "Schouder Knoppen"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:217
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:220
 msgid "Show &Console"
 msgstr "Toon &Console"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:215
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:218
 msgid "Show &Log"
 msgstr "Toon &Log"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:212
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:215
 msgid "Show &Statusbar"
 msgstr "Toon &Statusbar"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:210
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:213
 msgid "Show &Toolbar"
 msgstr "Toon &Toolbar"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:281
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:284
 msgid "Show Drives"
 msgstr "Toon Schijven"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:517
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530
 msgid "Show EFB Copy Regions"
 msgstr "Weergeef EFB Kopie Regios"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:295
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303
 msgid "Show FPS"
 msgstr "Toon FPS"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:271
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:274
 msgid "Show France"
 msgstr "Toon Frans"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:257
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:260
 msgid "Show GameCube"
 msgstr "Toon Gamecube"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561
 msgid "Show Input Display"
 msgstr "Toon Input Venster"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:273
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:276
 msgid "Show Italy"
 msgstr "Toon Italië"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:264
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:267
 msgid "Show JAP"
 msgstr "Toon JAP"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:275
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:278
 msgid "Show Korea"
 msgstr "Toon Korea"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476
 msgid "Show Language:"
 msgstr "Toon Taal:"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:216
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:219
 msgid "Show Log &Configuration"
 msgstr "Bekijk Log &Configuratie"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:266
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:269
 msgid "Show PAL"
 msgstr "Toon PAL"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:254
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:257
 msgid "Show Platforms"
 msgstr "Toon Platformen"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:263
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:266
 msgid "Show Regions"
 msgstr "Toon Regio"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:518
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531
 msgid "Show Statistics"
 msgstr "Weergeef statistieken"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:277
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:280
 msgid "Show Taiwan"
 msgstr "Toon Taiwan"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:268
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:271
 msgid "Show USA"
 msgstr "Toon USA"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:259
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:262
 msgid "Show Wad"
 msgstr "Toon Wad"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:255
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:258
 msgid "Show Wii"
 msgstr "Toon Wii"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491
 msgid "Show a confirmation box before stopping a game."
 msgstr "Toon een bevestigingsvenster voordat u stopt met een spel."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:512
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492
 msgid ""
 "Show a message box when a potentially serious error has occurred.\n"
 "Disabling this may avoid annoying and non-fatal messages, but it may also "
@@ -4718,11 +4843,11 @@ msgstr ""
 msgid "Show first block"
 msgstr "Toon eerste blok"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:130
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:131
 msgid "Show lag counter"
 msgstr "Toon vertragingsteller"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493
 msgid ""
 "Show messages on the emulation screen area.\n"
 "These messages include memory card writes, video backend and CPU "
@@ -4748,7 +4873,7 @@ msgstr "Toon save icon"
 msgid "Show save title"
 msgstr "Toon save titel"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102
 msgid ""
 "Show the number of frames rendered per second as a measure of emulation "
 "speed.\n"
@@ -4760,11 +4885,11 @@ msgstr ""
 "\n"
 "In geval van twijfel leeg laten."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:279
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:282
 msgid "Show unknown"
 msgstr "Toon onbekend"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105
 msgid ""
 "Show various statistics.\n"
 "\n"
@@ -4774,47 +4899,31 @@ msgstr ""
 "\n"
 "In geval van twijfel leeg laten."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:319
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:306
 msgid "Sideways Wiimote"
 msgstr "Zijdelings Wiimote"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:280
 msgid "Simplified Chinese"
 msgstr "Vereenvoudigd Chinees"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:311
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:298
 msgid "Size"
 msgstr "Grootte"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:696
 msgid "Skip BIOS"
 msgstr "Sla BIOS Over"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316
 msgid "Skip DCBZ clearing"
 msgstr "Sla het legen van DCBZ over"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:492
-msgid "Skip Dest. Alpha Pass"
-msgstr "Sla Dest. Alpha Pass over"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:444
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:454
 msgid "Skip EFB Access from CPU"
 msgstr "Sla EFB toegang van de CPU over"
 
-#: 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 ""
-"Sla de destination alpha pass over die in veel spellen voor verschillende "
-"grafische effecten gebruikt wordt.\n"
-"\n"
-"In geval van twijfel leeg laten."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125
 msgid ""
 "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n"
 "Sometimes also increases visual quality.\n"
@@ -4824,32 +4933,32 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 "Versnelt het EFB naar RAM kopiëren lichtelijk door de nauwkeurigheid van de "
-"emulatie op te offeren.\\n\n"
-"Verbeterd soms ook de beeldkwaliteit.\\n\n"
-"Wanneer er enige problemen optreden, probeer dan de textuur cache precisie "
-"te verhogen of schakel deze optie uit.\\n\n"
-"\\n\n"
-"Bij twijfel, ongeselecteerd laten."
+"emulatie op te offeren.\n"
+"Verbetert soms ook de beeldkwaliteit.\n"
+"Wanneer er enige problemen optreden, probeer dan de texture cache precisie "
+"te verhogen of schakel deze optie uit.\n"
+"\n"
+"Bij geval van twijfel ongemarkeerd laten."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:374
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:386
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:380
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:392
 #, c-format
 msgid "Slot %i"
 msgstr "Slot %i"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:700
 msgid "Slot A"
 msgstr "Slot A"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:701
 msgid "Slot B"
 msgstr "Slot B"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:62
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:49
 msgid "Snapshot"
 msgstr "Snapshot"
 
-#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:58
+#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:46
 msgid "Software Renderer"
 msgstr "Software Weergever"
 
@@ -4865,27 +4974,27 @@ msgstr ""
 "Weet je zeker dat je software rendering aan wil zetten? In geval van "
 "twijfel, selecteer 'Nee'."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:683
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:664
 msgid "Sound Settings"
 msgstr "Geluids Instellingen"
 
-#: Source/Core/AudioCommon/Src/AudioCommon.cpp:77
+#: Source/Core/AudioCommon/Src/AudioCommon.cpp:64
 #, c-format
 msgid "Sound backend %s is not valid."
 msgstr "Geluids backend %s is niet juist."
 
-#: Source/Core/AudioCommon/Src/DSoundStream.cpp:59
+#: Source/Core/AudioCommon/Src/DSoundStream.cpp:46
 #, c-format
 msgid "Sound buffer creation failed: %s"
 msgstr "Het aanmaken van de geluids buffer  is mislukt: %s"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:31
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:18
 msgid "Space"
 msgstr "Ruimte"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:329
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309
 msgid "Spanish"
 msgstr "Spaans"
 
@@ -4893,7 +5002,7 @@ msgstr "Spaans"
 msgid "Speaker Volume:"
 msgstr "Speaker Volume:"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92
 msgid ""
 "Specifies the resolution used to render at. A high resolution will improve "
 "visual quality a lot but is also quite heavy on performance and might cause "
@@ -4913,63 +5022,63 @@ msgstr ""
 "\n"
 "In geval van twijfel selecteer 640x528"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322
 msgid "Speed up Disc Transfer Rate"
 msgstr "Versnel Disc Transfer Rate"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:243
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:230
 msgid "Square Stick"
 msgstr "Vierkante knuppel"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:107
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87
 msgid "Standard Controller"
 msgstr "Standaard Controller"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:38
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:322
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:37
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:25
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:325
 msgid "Start"
 msgstr "Start"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:194
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:197
 msgid "Start &NetPlay"
 msgstr "Start &netplay"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:339
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:345
 msgid "Start Re&cording"
 msgstr "Start Op&nemen"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:175
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:175
 msgid "Start Recording"
 msgstr "Start Opnemen"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:312
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:299
 msgid "State"
 msgstr "Staat"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:173
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:161
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:161
 msgid "State Saves"
 msgstr "Opgeslage Staten"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:108
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88
 msgid "Steering Wheel"
 msgstr "Stuurwiel"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:53
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:57
 msgid "Stick"
 msgstr "Knuppel"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:420
-#: 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:325
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:419
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:431
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:171
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:171
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:328
 msgid "Stop"
 msgstr "Stop"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96
 msgid ""
 "Store EFB copies in GPU texture objects.\n"
 "This is not so accurate, but it works well enough for most games and gives a "
@@ -4977,113 +5086,125 @@ msgid ""
 "\n"
 "If unsure, leave this checked."
 msgstr ""
-"Sla EFB kopieën op in GPU texture objecten.\\n\n"
+"Sla EFB kopieën op in GPU texture objecten.\n"
 "Dit is niet zo nauwkeurig, maar het werkt goed genoeg voor de meeste spellen "
-"en levert een flinke versnelling op ten op zicht van EFB naar RAM.\\n\n"
-"\\n\n"
-"Bij twijfel, geselecteerd laten."
+"en levert een flinke versnelling op ten opzichte van EFB naar RAM.\n"
+"\n"
+"Bij geval van twijfel gemarkeerd laten."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:275
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283
 msgid "Stretch to Window"
 msgstr "Uitrekken naar Venster"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:43
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:47
 msgid "Strum"
 msgstr "Strum"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:78
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:65
 msgid "Subtract"
 msgstr "Onttrekken "
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:77
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:67
 #, c-format
 msgid "Successfully exported file to %s"
 msgstr "Bestand succesvol gexporteerd naar %s"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:56
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:43
 msgid "Successfully imported save files"
 msgstr "Succesvol save games geimporteerd"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:285
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:272
 msgid "Swing"
 msgstr "Zwaai"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:744
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:792
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320
+msgid "Synchronize GPU thread"
+msgstr "Synchroniseer GPU thread"
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321
+msgid ""
+"Synchronizes the GPU and CPU threads to help prevent random freezes in Dual "
+"Core mode. (ON = Compatible, OFF = Fast)"
+msgstr ""
+"Synchroniseert de GPU en CPU threads om willekeurige freezes te voorkomen in "
+"Dual Core modus. (Aan = Compatibel, Uit = Snel)"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773
 msgid "System Language:"
 msgstr "Systeem Taal:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:191
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:185
 msgid "TAIWAN"
 msgstr "TAIWAN"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:127
-#: Source/Core/DolphinWX/Src/TASInputDlg.h:32
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:128
+#: Source/Core/DolphinWX/Src/TASInputDlg.h:19
 msgid "TAS Input"
 msgstr "TAS Ingang"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:28
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:15
 msgid "Tab"
 msgstr "Tab"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:510
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:531
 msgid "Tab split"
 msgstr "Tab split"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:37
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:41
 msgid "Table Left"
 msgstr "Linker Tabel"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:38
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:42
 msgid "Table Right"
 msgstr "Rechter Tabel"
 
-#: 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
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:361
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:181
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:181
 msgid "Take Screenshot"
 msgstr "Neem een Schermafdruk"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:109
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89
 msgid "TaruKonga (Bongos)"
 msgstr "TaruKonga (Bongos)"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:472
 msgid "Test"
 msgstr "Test"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:444
 msgid "Texture"
-msgstr "Textuur"
+msgstr "Texture"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:451
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:461
 msgid "Texture Cache"
-msgstr "Textuur Cache"
+msgstr "Texture Cache"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:519
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:532
 msgid "Texture Format Overlay"
-msgstr "Textuur Formaat Overlay"
+msgstr "Texture Formaat Overlay"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:226
+#: Source/Core/Core/Src/CoreParameter.cpp:215
 msgid "The WAD has been installed successfully"
 msgstr "De WAD is succesvol geinstalleerd"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:197
+#: Source/Core/Core/Src/ActionReplay.cpp:185
 msgid "The address is invalid"
 msgstr "Het adres is onjuist"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:509
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:496
 msgid "The checksum was successfully fixed"
 msgstr "De checksum was met succes gefixt"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1242
+#: 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:1117
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1216
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1118
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1146
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1217
 #, c-format
 msgid ""
 "The file %s already exists.\n"
@@ -5092,7 +5213,7 @@ msgstr ""
 "Het bestand %s bestaat al.\n"
 "Wilt u het vervangen?"
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:51
+#: Source/Core/AudioCommon/Src/WaveFile.cpp:38
 #, c-format
 msgid ""
 "The file %s could not be opened for writing. Please check if it's already "
@@ -5101,48 +5222,48 @@ msgstr ""
 "Het bestand %s kon niet worden geopend om te schrijven. Controleer of het "
 "niet open is in een ander programma."
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:44
+#: Source/Core/AudioCommon/Src/WaveFile.cpp:31
 #, c-format
 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:332
+#: Source/Core/Core/Src/Boot/Boot.cpp:320
 #, c-format
 msgid "The file you specified (%s) does not exist"
 msgstr "Het opgegeven bestand(%s) bestaat niet"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:628
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:666
 msgid "The name can not be empty"
 msgstr "De naam mag niet leeg zijn"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:620
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:658
 msgid "The name can not contain the character ','"
 msgstr "De naam mag niet het volgende teken bevatten ','"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:142
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:129
 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:93
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98
 msgid ""
 "The safer you adjust this, the less likely the emulator will be missing any "
 "texture updates from RAM.\n"
 "\n"
 "If unsure, use the rightmost value."
 msgstr ""
-"Hoe veiliger je deze afstelt, hoe kleiner de kans dat de emulator textuur "
-"updates vanuit RAM mist.\\n\n"
-"\\n\n"
-"Bij twijfel, de meest rechtse waarde gebruiken."
+"Hoe veiliger je deze afstelt, hoe kleiner de kans is dat de emulator texture "
+"updates vanuit de RAM mist.\n"
+"\n"
+"Bij geval van twijfel de meest rechtse waarde gebruiken."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:445
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:432
 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:388
+#: Source/Core/DolphinWX/Src/Main.cpp:416
 msgid ""
 "The selected language is not supported by your system. Falling back to "
 "system default."
@@ -5150,36 +5271,36 @@ msgstr ""
 "De geselecteerde taal wordt niet door je systeem ondersteund. Dolphin zal "
 "terugvallen op je systeems taal."
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:43
+#: Source/Core/Core/Src/NetPlayClient.cpp:47
 msgid "The server and client's NetPlay versions are incompatible!"
 msgstr "De NetPlay versie van de server en client zijn incompatibel!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:40
+#: Source/Core/Core/Src/NetPlayClient.cpp:44
 msgid "The server is full!"
 msgstr "De server is vol!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:46
+#: Source/Core/Core/Src/NetPlayClient.cpp:50
 msgid "The server responded: the game is currently running!"
 msgstr "De server reageerde: het spel draait al!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:49
+#: Source/Core/Core/Src/NetPlayClient.cpp:53
 msgid "The server sent an unknown error message!"
 msgstr "De server verstuurde een onbekende foutmelding!"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:119
+#: Source/Core/Core/Src/CoreParameter.cpp:108
 #, c-format
 msgid "The specified file \"%s\" does not exist"
 msgstr "Het opgegeven bestand \"%s\" bestaat niet"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:198
+#: Source/Core/Core/Src/ActionReplay.cpp:186
 msgid "The value is invalid"
 msgstr "De waarde is onjuist"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:642
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:623
 msgid "Theme:"
 msgstr "Thema:"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:476
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:463
 msgid ""
 "There must be a ticket for 00000001/00000002. Your NAND dump is probably "
 "incomplete."
@@ -5187,7 +5308,7 @@ msgstr ""
 "Er moet een ticket zijn voor 00000001/00000002. Je NAND dump is "
 "waarschijnlijk incompleet."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308
 msgid ""
 "These settings override core Dolphin settings.\n"
 "Undetermined means the game uses Dolphin's setting."
@@ -5195,7 +5316,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:355
+#: Source/Core/Core/Src/ActionReplay.cpp:345
 msgid ""
 "This action replay simulator does not support codes that modify Action "
 "Replay itself."
@@ -5203,11 +5324,11 @@ msgstr ""
 "Deze action replay simulator ondersteund geen codes die de Action Replay "
 "zelf aanpassen."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505
 msgid "This could cause slow down in Wii Menu and some games."
 msgstr "Dit kan leiden tot vertraging van het Wii-menu en een aantal games."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118
 msgid ""
 "This feature allows you to change the game's camera.\n"
 "Move the mouse while holding the right mouse button to pan and while holding "
@@ -5226,7 +5347,20 @@ msgstr ""
 "\\n\n"
 "Bij twijfel, ongeselecteerd laten."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485
+#, fuzzy
+msgid ""
+"This limits the game speed to the specified number of frames per second "
+"(full speed is 60 for NTSC and 50 for PAL). Alternatively, use Audio to "
+"throttle using the DSP (might fix audio clicks but can also cause constant "
+"noise depending on the game)."
+msgstr ""
+"Als je de Framelimiet hoger zet dan de snelheid van het spel (NTSC: 60, PAL: "
+"50). Gebruik de Audio om te versnellen met behulp van DSP (kan het klikkend "
+"geluid verhelpen, maar kan ook constant lawaai ten gevolge hebben, "
+"afhankelijk van welk spel gebruikt wordt)."
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484
 msgid ""
 "This splits the Video and CPU threads, so they can be run on separate "
 "cores.\n"
@@ -5238,61 +5372,61 @@ 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:286
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:287
 msgid "This will let you Manually Edit the INI config file"
 msgstr "Dit laat je handmatig het INI configuratie bestand wijzigen"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:249
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:254
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:236
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:241
 msgid "Threshold"
 msgstr "Drempelwaarde"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:288
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:275
 msgid "Tilt"
 msgstr "Kantelen"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:628
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:304
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:622
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:291
 msgid "Title"
 msgstr "Titel"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:125
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:144
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:112
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:131
 msgid "To"
 msgstr "Naar"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:72
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59
 msgid "Toggle All Log Types"
 msgstr "Zet Alle Log Types Aan"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:426
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:432
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:180
 msgid "Toggle Fullscreen"
 msgstr "Volledig Scherm Inschakelen"
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:87
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:271
 msgid "Top"
 msgstr "Boven"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:281
 msgid "Traditional Chinese"
 msgstr "Chinees (Traditioneel)"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:426
+#: Source/Core/Core/Src/Boot/Boot.cpp:414
 msgid "Tried to load an unknown file type."
 msgstr "Poging tot het laden van een onbekend bestands type."
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:80
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:67
 msgid "Triggers"
 msgstr "Trekkers"
 
-#: Source/Core/Common/Src/SysConf.h:91 Source/Core/Common/Src/SysConf.h:114
+#: Source/Core/Common/Src/SysConf.h:78 Source/Core/Common/Src/SysConf.h:101
 msgid "Trying to read from invalid SYSCONF"
 msgstr "Poging tot het inlezen van een ongeldige SYSCONF"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:44
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:31
 msgid ""
 "Trying to read from invalid SYSCONF\n"
 "Wiimote bt ids are not available"
@@ -5300,15 +5434,15 @@ msgstr ""
 "Poging tot het inlezen van een ongeldige SYSCONF\n"
 "Wiimote bt ids zijn niet beschikbaar"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:330
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
 msgid "Turkish"
 msgstr "Turks"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:33
 msgid "Turntable"
 msgstr "Draaischijf"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:71
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58
 msgid "Type"
 msgstr "Type"
 
@@ -5316,25 +5450,25 @@ msgstr "Type"
 msgid "UDP Port:"
 msgstr "UDP Port:"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:279
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:266
 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12
 msgid "UDP Wiimote"
 msgstr "UDP Wiimote "
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:199
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:193
 msgid "UNKNOWN"
 msgstr "ONBEKEND"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:756
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:755
 #, c-format
 msgid "UNKNOWN_%02X"
 msgstr "ONBEKEND_%02X"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:178
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:172
 msgid "USA"
 msgstr "USA"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:225
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:214
 msgid ""
 "Unable to create patch from given values.\n"
 "Entry not modified."
@@ -5342,7 +5476,7 @@ msgstr ""
 "Niet mogelijk om patch te creëren vanuit de gegeven waardes.\\n\n"
 "Entry niet aangepast."
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:124
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:111
 #, c-format
 msgid ""
 "Unable to parse line %lu of the entered AR code as a valid encrypted or "
@@ -5354,76 +5488,95 @@ msgstr ""
 "manier hebt ingevoerd. \n"
 "Wil je deze regel negeren en verder gaan met verwerken?"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:391
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:397
 #, c-format
 msgid "Undefined %i"
 msgstr "Onbepaalde %i"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:163
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:164
 msgid "Undo Load State"
 msgstr "Ongedaan maken van Load staat"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:718
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:717
 msgid "Unexpected 0x80 call? Aborting..."
 msgstr "Onverwachtte 0x80 fout? Annuleren..."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:215
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:202
 msgid "Unknown"
 msgstr "Onbekend"
 
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:971
+#: Source/Core/Core/Src/HW/DVDInterface.cpp:965
 #, c-format
 msgid "Unknown DVD command %08x - fatal error"
 msgstr "Onbekend DVD commando %08x - fatale fout"
 
-#: Source/Core/Common/Src/SysConf.cpp:145
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:444
+#, c-format
+msgid "Unknown command 0x%08x"
+msgstr "Onbekende commando 0x%08x"
+
+#: Source/Core/Common/Src/SysConf.cpp:132
 #, c-format
 msgid "Unknown entry type %i in SYSCONF (%s@%x)!"
 msgstr "Onbekende vermeldingstype %i in SYSCONF (%s@%x)!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:228
+#: Source/Core/Core/Src/NetPlayClient.cpp:232
 #, c-format
 msgid "Unknown message received with id : %d"
 msgstr "Onbekend bericht ontvangen met id : %d"
 
-#: Source/Core/Core/Src/NetPlayServer.cpp:504
+#: Source/Core/Core/Src/NetPlayServer.cpp:508
 #, c-format
 msgid "Unknown message with id:%d received from player:%d Kicking player!"
 msgstr ""
 "Onbekend bericht ontvagen met id : %d ontvangen van speler: %d Speler "
 "eruitgeschopt!"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:274
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:56
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:261
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:43
 msgid "Up"
 msgstr "Omhoog"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:108
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:95
 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17
 msgid "Update"
 msgstr "Update"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:320
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:307
 msgid "Upright Wiimote"
 msgstr "Wiimote rechtop"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:777
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758
 msgid "Use EuRGB60 Mode (PAL60)"
 msgstr "Gebruik EuRGB60 Mode (PAL60)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:294
 msgid "Use Fullscreen"
 msgstr "Gebruik &Volledig Scherm"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:575
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:563
 msgid "Use Hex"
 msgstr "Gebruik Hex"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:600
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580
 msgid "Use Panic Handlers"
 msgstr "Gebruik Panic Handlers"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89
+msgid ""
+"Use a hacked upload strategy to stream vertices.\n"
+"This usually speed up, but is forbidden by OpenGL specification and may "
+"causes heavy glitches.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+"Gebruik een gehackte upload strategy om vertices te streamen.\n"
+"Dit verhoogt meestal de emulatie snelheid, maar is verboden door de OpenGL "
+"specificaties en kan glitches veroorzaken.\n"
+"\n"
+"In geval van twijfel laat dit uitgevinkt."
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122
 msgid ""
 "Use multiple threads to decode textures.\n"
 "Might result in a speedup (especially on CPUs with more than two cores).\n"
@@ -5431,12 +5584,11 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 "Gebruik meerdere threads om textures te decoderen. \n"
-"Kan resulteren in betere prestaties (vooral op CPUs met meer dan twee "
-"cores).\n"
+"Kan voor betere prestaties zorgen (vooral op CPUs met meer dan twee cores).\n"
 "\n"
-"In geval van twijfel leeg laten."
+"In geval van twijfel ongemarkeerd laten."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126
 msgid ""
 "Usually if shader compilation fails, an error message is displayed.\n"
 "However, one may skip the popups to allow interruption free gameplay by "
@@ -5450,53 +5602,58 @@ msgstr ""
 "\n"
 "In geval van twijfel leeg laten."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:539
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:552
 msgid "Utility"
 msgstr "Hulpprogramma"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:285
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:293
 msgid "V-Sync"
 msgstr "V-Sync"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:209
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318
+#, fuzzy
+msgid "VBeam Speed Hack"
+msgstr "MMU Snelheids Hack"
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196
 msgid "Value"
 msgstr "Waarde"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:73
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:60
 msgid "Value:"
 msgstr "Waarde:"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:572
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:560
 msgid "Value: "
 msgstr "Waarde:"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:51
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:38
 msgid "Verbosity"
 msgstr "Breedsprakigheid"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:377
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:381
 msgid "Video"
 msgstr "Video"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:486
 msgid "Virtual"
 msgstr "Virtueel"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:689
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670
 msgid "Volume"
 msgstr "Volume"
 
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:498
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:527
+#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:488
+#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:517
 #, c-format
 msgid "WAD installation failed: error creating %s"
 msgstr "WAD installatie mislukt: fout bij het creëren van %s"
 
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:547
+#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:537
 msgid "WAD installation failed: error creating ticket"
 msgstr "WAD installatie mislukt: fout bij het creëren van ticket"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84
 msgid ""
 "Wait for vertical blanks in order to reduce tearing.\n"
 "Decreases performance if emulation speed is below 100%.\n"
@@ -5508,25 +5665,25 @@ msgstr ""
 "\n"
 "In geval van twijfel leeg laten."
 
-#: Source/Core/Common/Src/MsgHandler.cpp:67
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46
+#: Source/Core/Common/Src/MsgHandler.cpp:53
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:33
 #: Source/Core/DolphinWX/Src/VideoConfigDiag.h:85
 msgid "Warning"
 msgstr "Waarschuwing"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:291
+#: Source/Core/Core/Src/Boot/Boot.cpp:279
 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:341
+#: Source/Core/Core/Src/Boot/Boot.cpp:329
 msgid "Warning - starting ELF in wrong console mode!"
 msgstr "Waarschuwing - ELF  wordt in de verkeerde console mode gestart!"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:221
+#: Source/Core/Core/Src/Boot/Boot.cpp:209
 msgid "Warning - starting ISO in wrong console mode!"
 msgstr "Waarschuwing - ISO wordt in de verkeerde console mode gestart!"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:519
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:512
 #, c-format
 msgid ""
 "Warning! it is advised to backup all files in the folder:\n"
@@ -5538,7 +5695,7 @@ msgstr ""
 "%s\n"
 "Weet je zeker dat je door wil gaan?"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:585
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:578
 #, c-format
 msgid ""
 "Warning: This will overwrite any existing saves that are in the folder:\n"
@@ -5551,7 +5708,7 @@ msgstr ""
 "en heeft dezelfde naam als een bestand op je geheugenkaart\n"
 "Doorgaan?"
 
-#: Source/Core/Core/Src/Movie.cpp:844
+#: Source/Core/Core/Src/Movie.cpp:835
 #, c-format
 msgid ""
 "Warning: You loaded a save that's after the end of the current movie. (byte "
@@ -5562,7 +5719,7 @@ msgstr ""
 "> %u) (frame %u > %u). Je dient een andere save te laden voordat je verder "
 "gaat, of deze staat laden met alleen-lezen uitgeschakeld. "
 
-#: Source/Core/Core/Src/Movie.cpp:861
+#: Source/Core/Core/Src/Movie.cpp:852
 #, c-format
 msgid ""
 "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You "
@@ -5574,7 +5731,7 @@ msgstr ""
 "of deze staat laden met alleen-lezen uitgeschakeld. Anders zullen er "
 "waarschijnlijk synchronisatie problemen optreden. "
 
-#: Source/Core/Core/Src/Movie.cpp:870
+#: Source/Core/Core/Src/Movie.cpp:861
 #, c-format
 msgid ""
 "Warning: You loaded a save whose movie mismatches on frame %d. You should "
@@ -5609,49 +5766,49 @@ msgstr ""
 "Start=%d, A=%d, B=%d, X=%d, Y=%d, Z=%d, DOmhoog=%d, DOmlaag=%d, DLinks=%d, "
 "DRechts=%d, L=%d, R=%d, LT=%d, RT=%d, AnaloogX=%d, AnaloogY=%d, CX=%d, CY=%d"
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:106
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:129
+#: Source/Core/AudioCommon/Src/WaveFile.cpp:93
+#: Source/Core/AudioCommon/Src/WaveFile.cpp:116
 msgid "WaveFileWriter - file not open."
 msgstr "WaveFileWriter - bestand niet open."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:56
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:60
 msgid "Whammy"
 msgstr "Whammy"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:404
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:408
 msgid "Widescreen Hack"
 msgstr "Breedbeeld Hack"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:312
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:299
 msgid "Width"
 msgstr "Breedte"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535
 msgid "Wii"
 msgstr "Wii"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:372
 msgid "Wii Console"
 msgstr "Wii Console "
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:844
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:825
 msgid "Wii NAND Root:"
 msgstr "Wii NAND basismap:"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:191
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:194
 msgid "Wii Save Import"
 msgstr "Wii Save Importeren"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1243
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1270
 msgid "Wii save files (*.bin)|*.bin"
 msgstr "Wii save bestanden (*.bin)|*.bin"
 
-#: Source/Core/DiscIO/Src/WiiWad.cpp:82
+#: Source/Core/DiscIO/Src/WiiWad.cpp:69
 msgid "WiiWAD: Could not read from file"
 msgstr "WiiWAD: Kon het bestand niet lezen"
 
-#: Source/Core/Core/Src/HW/Wiimote.cpp:17
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
+#: Source/Core/Core/Src/HW/Wiimote.cpp:20
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
 msgid "Wiimote"
 msgstr "Wiimote"
 
@@ -5660,7 +5817,7 @@ msgstr "Wiimote"
 msgid "Wiimote %i"
 msgstr "Wiimote %i"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:628
+#: Source/Core/DolphinWX/Src/Main.cpp:656
 msgid "Wiimote Connected"
 msgstr "Wiimote Connected"
 
@@ -5668,7 +5825,7 @@ msgstr "Wiimote Connected"
 msgid "Wiimote Motor"
 msgstr "Wiimote Motor"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
 msgid "Wiimote settings"
 msgstr "Wiimote instellingen"
 
@@ -5676,101 +5833,125 @@ msgstr "Wiimote instellingen"
 msgid "Wiimotes"
 msgstr "Wiimotes"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:134
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:121
 msgid "Windows Left"
 msgstr "Venster Links"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:136
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:123
 msgid "Windows Menu"
 msgstr "Venster Menu"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:135
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:122
 msgid "Windows Right"
 msgstr "Venster Rechts"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:131
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:124
 msgid "Word Wrap"
 msgstr "Regelafbreking"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1298
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:864
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1089
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1225
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1325
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:880
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1090
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1226
 msgid "Working..."
 msgstr "Werken..."
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:338
+msgid "Write memcards (GC)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46
 msgid "Write to Console"
 msgstr "Schrijf naar Console"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:67
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:54
 msgid "Write to Debugger"
 msgstr "Schrijf naar Fouthersteller"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:57
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44
 msgid "Write to File"
 msgstr "Schrijf naar Bestand"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:61
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48
 msgid "Write to Window"
 msgstr "Schrijf naar venster"
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:60
+#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:47
 #, c-format
 msgid "XAudio2 CreateSourceVoice failed: %#X"
 msgstr "XAudio2 CreateSourceVoice is mislukt: %#X"
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:114
+#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:101
 #, c-format
 msgid "XAudio2 init failed: %#X"
 msgstr "XAudio2 initialisatie mislukt: %#X"
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:124
+#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:111
 #, c-format
 msgid "XAudio2 master voice creation failed: %#X"
 msgstr "XAudio2 master voice creatie mislukt: %#X"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:766
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:765
 msgid "XF reg"
 msgstr "XF Reg"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:21
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Yellow"
 msgstr "Geel"
 
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:107
+#: Source/Core/Core/Src/DSP/DSPCore.cpp:120
 msgid ""
-"You are using free dsp roms made by Dolphin Team.\n"
-"Only Zelda ucode games will work correctly with them.\n"
+"You are using a free DSP ROM made by the Dolphin Team.\n"
+"All Wii games will work correctly, and most GC games should also work fine, "
+"but the GBA/IPL/CARD UCodes will not work.\n"
 msgstr ""
-"Je maakt gebruik van gratis dsp roms gemaakt door het Dolphin Team.\\n\n"
-"Alleen Zelda ucode spellen zullen hier goed mee werken.\\n\n"
+"Je gebruikt een gratis DSP ROM gemaakt door de Dolphin team.\n"
+"Alle Wii spellen en de meeste Gamecube spellen zullen correct werken, maar "
+"de GBA/IPL/CARD UCodes zullen niet werken.\n"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:73
+#: Source/Core/Core/Src/DSP/DSPCore.cpp:116
+msgid ""
+"You are using an old free DSP ROM made by the Dolphin Team.\n"
+"Only games using the Zelda UCode will work correctly.\n"
+msgstr ""
+"Je maakt gebruik van een gratis DSP ROM gemaakt door de Dolphin team.\n"
+"Alleen Zelda UCode spellen zullen hier goed mee werken.\n"
+
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:63
 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:207
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:210
 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:593
 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:438
 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:603
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:591
 msgid "You must enter a valid profile name."
 msgstr "Je moet een geldige profiel naam invoeren!"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:936
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:917
 msgid "You must restart Dolphin in order for the change to take effect."
 msgstr "Je moet Dolphin herstarten voordat deze optie effect zal hebben."
 
-#: Source/Core/Core/Src/CoreParameter.cpp:175
+#: Source/Core/Core/Src/DSP/DSPCore.cpp:109
+msgid ""
+"Your DSP ROMs have incorrect hashes.\n"
+"Would you like to stop now to fix the problem?\n"
+"If you select \"No\", audio might be garbled."
+msgstr ""
+"Jouw DSP ROMS hebben incorrecte hashes.\n"
+"Wil je nu stoppen om het probleem op te lossen?\n"
+"Als je \"Nee\" selecteert kan het geluid vervromd klinken."
+
+#: Source/Core/Core/Src/CoreParameter.cpp:164
 msgid ""
 "Your GCM/ISO file seems to be invalid (invalid country).\n"
 "Continue with PAL region?"
@@ -5778,7 +5959,7 @@ msgstr ""
 "Je GCM/ISO bestand lijkt ongeldig (ongeldig land).\n"
 "Doorgaan met PAL regio?"
 
-#: Source/Core/Common/Src/SysConf.cpp:58
+#: Source/Core/Common/Src/SysConf.cpp:45
 #, c-format
 msgid ""
 "Your SYSCONF file is the wrong size.\n"
@@ -5789,25 +5970,25 @@ msgstr ""
 "Het zou 0x%04x moet zijn, maar is 0x%04llx \n"
 "Wil je een nieuwe genereren?"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:334
 msgid "ZTP hack"
 msgstr "ZTP hack"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:387
+#: Source/Core/Core/Src/ActionReplay.cpp:377
 msgid "Zero 3 code not supported"
 msgstr "Zero 3 code niet ondersteund"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:408
+#: Source/Core/Core/Src/ActionReplay.cpp:398
 #, c-format
 msgid "Zero code unknown to dolphin: %08x"
 msgstr "Zero code onbekend voor Dolphin: %08x"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:436
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:460
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:423
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:447
 msgid "[ waiting ]"
 msgstr "[ wachten ]"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107
 msgid ""
 "[BROKEN]\n"
 "Highlight regions the EFB was copied from.\n"
@@ -5819,11 +6000,11 @@ msgstr ""
 "\n"
 "In geval van twijfel leeg laten."
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:91
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:78
 msgid "[Custom]"
 msgstr "[Aangepast]"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120
 msgid ""
 "[EXPERIMENTAL]\n"
 "Aims to speed up emulation by offloading texture decoding to the GPU using "
@@ -5833,14 +6014,15 @@ msgid ""
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"[EXPERIMENTEEL]Probeert de emulatie te versnellen door texture decodering "
-"via de GPU te doen door gebruik te maken van de OpenCL framework. \n"
+"[EXPERIMENTEEL]\n"
+"Probeert de emulatie te versnellen door texture decodering via de GPU te "
+"doen door gebruik te maken van de OpenCL framework.\n"
 "Het veroorzaakt echter texture defecten in verschillende spellen. Het is ook "
 "trager dan normale CPU texture decoding in veel gevallen. \n"
 "\n"
-"In geval van twijfel leeg laten."
+"In geval van twijfel ongemarkeerd laten."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121
 msgid ""
 "[EXPERIMENTAL]\n"
 "Speeds up emulation a bit by caching display lists.\n"
@@ -5854,98 +6036,47 @@ msgstr ""
 "\n"
 "In geval van twijfel leeg laten."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:508
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:495
 msgid "^ ADD"
 msgstr "^ ERBIJ"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:820
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:801
 msgid "apploader (.img)"
 msgstr "applader (.img)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:185
-msgid "failed to read bk header"
-msgstr "bk header lezen mislukt"
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:375
-#, c-format
-msgid "failed to read data from file: %s"
-msgstr "kon geen data lezen van bestand: %s"
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:97
-msgid "failed to read header"
-msgstr "kon de header niet lezen"
-
-#: Source/Core/Core/Src/PowerPC/JitInterface.cpp:285
+#: Source/Core/Core/Src/PowerPC/JitInterface.cpp:272
 #, c-format
 msgid "iCacheJIT: Reading Opcode from %x. Please report."
 msgstr "iCacheJIT: Lezen van Opcode vanaf %x. Graag rapporteren."
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:108
-#, c-format
-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:935
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:936
 msgid "s"
 msgstr "s"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:457
-#, c-format
-msgid "unknown cmd 0x%08x"
-msgstr "onbekend commando 0x%08x"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1110
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1136
 msgid "wxExecute returned -1 on application run!"
 msgstr "wxExecute retourneerde -1 bij het draaien van de applicatie!"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:56
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:43
 msgid "zFar Correction: "
 msgstr "zVer correctie:"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:51
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:38
 msgid "zNear Correction: "
 msgstr "zDichtbij correctie:"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:493
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:480
 msgid "| OR"
 msgstr "| OF"
 
-#~ msgid "%i connected"
-#~ msgstr "%i verbonden"
-
-#~ msgid "Alternate Wiimote Timing"
-#~ msgstr "Alternatieve Wiimote Timing"
-
-#~ msgid "Interpreter (VERY slow)"
-#~ msgstr "Interpreteer (Behoorlijk langzaam)"
-
-#~ msgid "JIT Recompiler (recommended)"
-#~ msgstr "JIT Recompiler (aanbevolen)"
-
-#~ msgid "JITIL experimental recompiler"
-#~ msgstr "JITIL experimentele recompiler"
+#~ msgid "Accurate VBeam emulation"
+#~ msgstr "Nauwkeurige VBeam emulatie"
 
 #~ msgid ""
-#~ "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. "
-#~ "No effect on emulated wiimotes."
+#~ "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)"
 #~ msgstr ""
-#~ "Dempt de Wiimote speaker. Fixt willekeurige loskoppelingen van echte "
-#~ "wiimotes. Heeft geen effect op geëmuleerde wiimotes."
+#~ "Als de FPS onregelmatig is dan kan deze optie helpen. (AAN = Veilig, UIT "
+#~ "= Snel)"
 
-#~ msgid "Pair Up"
-#~ msgstr "Verbinden"
-
-#~ msgid "Reconnect Wiimote Confirm"
-#~ msgstr "Bevestig herverbinding van Wiimote "
-
-#~ msgid ""
-#~ "Wiimote %i has been disconnected by system.\n"
-#~ "Maybe this game doesn't support multi-wiimote,\n"
-#~ "or maybe it is due to idle time out or other reason.\n"
-#~ "Do you want to reconnect immediately?"
-#~ msgstr ""
-#~ "Wiimote %i is losgekoppeld door het systeem.\n"
-#~ "Wellicht ondersteunt dit spel geen multi-Wiimote,\n"
-#~ "of misschien is het te wijten aan een time-out of een andere reden.\n"
-#~ "Wilt u meteen opnieuw verbinden?"
+#~ msgid "Skip Dest. Alpha Pass"
+#~ msgstr "Sla Dest. Alpha Pass over"
diff --git a/Languages/po/pl.po b/Languages/po/pl.po
index 9189095f9d..58c4a52b51 100644
--- a/Languages/po/pl.po
+++ b/Languages/po/pl.po
@@ -3,15 +3,15 @@
 # This file is distributed under the same license as the dolphin-emu package.
 #
 # Translators:
-# Krzysztof Baszczok <baszta2@gmail.com>, 2011,2013.
-# Robert <Robert@10g.pl>, 2013.
+# Baszta <baszta2@gmail.com>, 2011,2013
+# Robert202 <Robert@10g.pl>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: Dolphin Emulator\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-10 08:56-0500\n"
-"PO-Revision-Date: 2013-02-06 12:58+0000\n"
-"Last-Translator: Robert202 <Robert@10g.pl>\n"
+"POT-Creation-Date: 2013-04-18 23:00-0500\n"
+"PO-Revision-Date: 2013-04-18 20:46+0000\n"
+"Last-Translator: Baszta <baszta2@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/dolphin-emu/"
 "language/pl/)\n"
 "Language: pl\n"
@@ -21,21 +21,21 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:511
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:499
 msgid " (too many to display)"
 msgstr "(za dużo do wyświetlenia)"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:270
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:273
 #: Source/Core/DolphinWX/Src/NetWindow.cpp:491
 #: Source/Core/DolphinWX/Src/NetWindow.cpp:530
 msgid " Game : "
 msgstr "Gra :"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:507
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494
 msgid "! NOT"
 msgstr "! NOT"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:70
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:58
 #, c-format
 msgid ""
 "\"%s\" does not exist.\n"
@@ -44,36 +44,46 @@ msgstr ""
 "\"%s\" nie istnieje.\n"
 "Stworzyć nową 16MB kartę pamięci?"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:142
+#: Source/Core/Core/Src/CoreParameter.cpp:131
 #, c-format
 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 nie jest prawidłowym obrazem GC/"
 "Wii ISO"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:722
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:721
 #, c-format
 msgid "%08X:  "
 msgstr "%08X:  "
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:196
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:183
 #, c-format
 msgid "%1$sCopy%1$s"
 msgstr "%1$sKopiuj%1$s"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:128
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:296
+#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:113
+#, c-format
+msgid "%d samples"
+msgstr "%d próbki"
+
+#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:112
+#, c-format
+msgid "%d samples (quality level %d)"
+msgstr "%d próbki (poziom jakości %d)"
+
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:121
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:289
 #, c-format
 msgid "%s already exists, overwrite?"
 msgstr "%s już istnieje, zastąpić?"
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:167
+#: Source/Core/DiscIO/Src/CompressedBlob.cpp:154
 #, c-format
 msgid "%s failed to be scrubbed. Probably the image is corrupt."
 msgstr ""
 "Oczyszczanie %s nie powiodło się. Obraz prawdopodobnie jest uszkodzony."
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:95
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:83
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
@@ -82,7 +92,7 @@ msgstr ""
 "Wczytanie %s jako karty pamięci nie powiodło się\n"
 "Niewłaściwa wielkość pliku (0x%x bajtów)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:110
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:98
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
@@ -91,7 +101,7 @@ msgstr ""
 "Wczytanie %s jako karty pamięci nie powiodło się\n"
 "Niewłaściwa wielkość karty (0x%x bajtów)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:90
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:78
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
@@ -101,48 +111,37 @@ msgstr ""
 "Plik nie jest wystarczającej wielkości by być poprawnym plikiem karty "
 "pamięci (0x%x bajtów)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:367
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:359
 #, c-format
 msgid "%s failed to open"
 msgstr "Nie można otworzyć %s"
 
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:97
-#, c-format
-msgid ""
-"%s has an incorrect hash.\n"
-"Would you like to stop now to fix the problem?\n"
-"If you select \"No\", audio will be garbled."
-msgstr ""
-"%s ma niewłaściwy hash.\n"
-"Czy chcesz zatrzymac i naprawić problem?\n"
-"Jeśli wybierzesz \"Nie\", audio będzie zniekształcone."
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:360
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:352
 #, c-format
 msgid "%s is a 0 byte file"
 msgstr "%s jest plikiem o wadze 0 bajtów"
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:159
+#: Source/Core/DiscIO/Src/CompressedBlob.cpp:146
 #, c-format
 msgid "%s is already compressed! Cannot compress it further."
 msgstr "%s jest już skompresowany! Bardziej się nie da."
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:345
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:337
 #, c-format
 msgid "%s is too long for the filename, max chars is 45"
 msgstr "Nazwa pliku %s jest zbyt długa, max 45 znaków"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:202
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:189
 #, c-format
 msgid "%sDelete%s"
 msgstr "%sUsuń%s"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:200
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:187
 #, c-format
 msgid "%sExport GCI%s"
 msgstr "%sEksportuj GCI%s"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:198
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:185
 #, c-format
 msgid "%sImport GCI%s"
 msgstr "%sImportuj GCI%s"
@@ -152,252 +151,275 @@ msgstr "%sImportuj GCI%s"
 msgid "%u Free Blocks; %u Free Dir Entries"
 msgstr "%u wolnych bloków; %u wolnych wejść katalogowych"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:506
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:493
 msgid "&& AND"
 msgstr "&& AND"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:295
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:301
 msgid "&About..."
 msgstr "&O programie..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:99
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:100
 msgid "&Boot from DVD Drive..."
 msgstr "&Załaduj z napędu DVD..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:231
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:234
 msgid "&Breakpoints"
 msgstr "&Breakpointy"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:110
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:111
 msgid "&Browse for ISOs..."
 msgstr "&Załaduj z ISO..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:192
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:195
 msgid "&Cheats Manager"
 msgstr "&Menadżer cheatów"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:177
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:180
 msgid "&DSP Settings"
 msgstr "&Ustawienia DSP"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:885
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:876
 msgid "&Delete ISO..."
 msgstr "&Usuń ISO..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:903
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:897
 msgid "&Delete selected ISOs..."
 msgstr "&Usuń wybrane ISO..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:170
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:173
 msgid "&Emulation"
 msgstr "&Emulacja"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:113
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:114
 msgid "&File"
 msgstr "&Plik"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:335
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:341
 msgid "&Frame Advance"
 msgstr "&Wyprzedzanie klatek"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:352
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:358
 msgid "&Fullscreen"
 msgstr "&Pełny ekran"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:176
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:179
 msgid "&Graphics Settings"
 msgstr "&Ustawienia graficzne"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:296
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:302
 msgid "&Help"
 msgstr "&Pomoc"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:180
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:183
 msgid "&Hotkey Settings"
 msgstr "Ustawienia &hotkey'ów"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:233
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:236
 msgid "&JIT"
 msgstr "&JIT"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:148
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:149
 msgid "&Load State"
 msgstr "&Wczytaj stan"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:190
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:193
 msgid "&Memcard Manager (GC)"
 msgstr "&Menadżer karty pamięci (GC)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:232
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:235
 msgid "&Memory"
 msgstr "&Pamięć"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:313
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:319
 msgid "&Open..."
 msgstr "&Otwórz..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:186
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:189
 msgid "&Options"
 msgstr "&Opcje"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:324
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:330
 msgid "&Pause"
 msgstr "&Wstrzymaj"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:326
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:332
 msgid "&Play"
 msgstr "&Graj"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:867
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:858
 msgid "&Properties"
 msgstr "&Właściwości"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:348
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:354
 msgid "&Read-only mode"
 msgstr "Tryb &Tylko do odczytu"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:319
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:325
 msgid "&Refresh List"
 msgstr "&Odśwież listę"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:230
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:233
 msgid "&Registers"
 msgstr "&Rejestry"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:332
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:338
 msgid "&Reset"
 msgstr "&Reset"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:234
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:237
 msgid "&Sound"
 msgstr "&Dźwięk"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:329
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:335
 msgid "&Stop"
 msgstr "&Stop"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:207
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:210
 msgid "&Tools"
 msgstr "&Narzędzia"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:235
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:238
 msgid "&Video"
 msgstr "&Wideo"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:284
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:287
 msgid "&View"
 msgstr "&Widok"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:179
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:182
 msgid "&Wiimote Settings"
 msgstr "&Ustawienia Wiilota"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:868
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:859
 msgid "&Wiki"
 msgstr "&Wiki"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504
 msgid "'"
 msgstr "'"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:59
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:46
 msgid "(-)+zFar"
 msgstr "(-)+zFar"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:54
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:41
 msgid "(-)+zNear"
 msgstr "(-)+zNear"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:99
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:86
 msgid "(UNKNOWN)"
 msgstr "(Nieznany)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:376
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:384
 msgid "(off)"
 msgstr "(wyłączone)"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:655
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:654
 msgid "0x44"
 msgstr "0x44"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+msgid "1.5x Native (960x792)"
+msgstr "1.5x Native (960x792)"
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:158
 msgid "16 bit"
 msgstr "16 bitów"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+msgid "1x Native (640x528)"
+msgstr "1x Native (640x528)"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+msgid "2.5x Native (1600x1320)"
+msgstr "2.5x Native (1600x1320)"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+msgid "2x Native (1280x1056)"
+msgstr "2x Native (1280x1056)"
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:159
 msgid "32 bit"
 msgstr "32 bity"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:412
 msgid "3D Vision"
 msgstr "3D Vision"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+msgid "3x Native (1920x1584)"
+msgstr "3x Native (1920x1584)"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+msgid "4x Native (2560x2112)"
+msgstr "4x Native (2560x2112)"
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:157
 msgid "8 bit"
 msgstr "8 bitów"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:43
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:30
 msgid "<Insert name here>"
 msgstr "<Podaj nazwę>"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:255
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:262
 msgid "<No resolutions found>"
 msgstr "<Brak rozdzielczości>"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:104
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84
 msgid "<Nothing>"
 msgstr "<Nic>"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:162
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:162
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:150
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:150
 msgid "<Press Key>"
 msgstr "<Naciśnij klawisz>"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286
 msgid "<System>"
 msgstr "<System>"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695
 msgid "A"
 msgstr "A"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:201
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:235
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:204
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:238
 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:353
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:387
 msgid "A game is not currently running."
 msgstr "Gra nie jest aktualnie uruchomiona."
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:68
-#, fuzzy
 msgid ""
 "A supported bluetooth device could not be found.\n"
 "You must manually connect your wiimotes."
 msgstr ""
-"Kompatybilny adapter bluetooth nie został znaleziony!\n"
-"Jeśli nie używasz bluetooth stack Microsoftu, musisz ręcznie sparować "
-"wiiloty oraz używać tylko przycisku \\\"Odśwież\\\"."
+"Nie znaleziono wspieranego urządzenia bluetooth.\n"
+"Należy ręcznie podłączyć Wiiloty."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:109
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:100
+#, fuzzy
 msgid ""
 "ALERT:\n"
 "\n"
-"NetPlay will currently only work properly when using the following "
-"settings:\n"
-" - Dual Core [OFF]\n"
-" - Audio Throttle [OFF]\n"
-" - DSP-HLE with \"Null Audio\" or DSP-LLE\n"
-" - Manually set the exact number of controllers that will be used to "
-"[Standard Controller]\n"
+"Netplay will only work with the following settings:\n"
+" - Enable Dual Core [OFF]\n"
+" - DSP Emulator Engine Must be the same on all computers!\n"
+" - DSP on Dedicated Thread [OFF]\n"
+" - Framelimit NOT set to [Audio]\n"
+" - Manually set the exact number of controllers to be used to [Standard "
+"Controller]\n"
 "\n"
-"All players should try to use the same Dolphin version and settings.\n"
-"Disable all memory cards or send them to all players before starting.\n"
-"Wiimote support has not been implemented.\n"
+"All players should use the same Dolphin version and settings.\n"
+"All memory cards must be identical between players or disabled.\n"
+"Wiimote support has not been implemented!\n"
 "\n"
-"You must forward TCP port to host!!"
+"The host must have the chosen TCP port open/forwarded!\n"
 msgstr ""
 "Uwaga:\n"
 "\n"
@@ -414,17 +436,17 @@ msgstr ""
 "\n"
 "Wymagane jest przekierowanie portu TCP do hosta!"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:111
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:116
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96
 msgid "AM-Baseboard"
 msgstr "AM-Baseboard"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:299
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:115
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:300
 msgid "AR Codes"
 msgstr "Kody AR"
 
-#: Source/Core/DolphinWX/Src/AboutDolphin.h:33
+#: Source/Core/DolphinWX/Src/AboutDolphin.h:21
 msgid "About Dolphin"
 msgstr "O Dolphin"
 
@@ -432,15 +454,11 @@ msgstr "O Dolphin"
 msgid "Acceleration"
 msgstr "Przyspieszenie"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:463
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473
 msgid "Accuracy:"
 msgstr "Dokładność:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317
-msgid "Accurate VBeam emulation"
-msgstr "Emulacja Accurate VBeam"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97
 msgid ""
 "Accurately emulate EFB copies.\n"
 "Some games depend on this for certain graphical effects or gameplay "
@@ -453,12 +471,12 @@ msgstr ""
 "\n"
 "W razie wątpliwości, włącz EFB to Texture."
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:239
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:239
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:227
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:227
 msgid "Action"
 msgstr "Akcja"
 
-#: Source/Core/Core/Src/ARDecrypt.cpp:481
+#: Source/Core/Core/Src/ARDecrypt.cpp:469
 #, c-format
 msgid ""
 "Action Replay Code Decryption Error:\n"
@@ -473,7 +491,7 @@ msgstr ""
 "Kod:\n"
 "%s"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:667
+#: Source/Core/Core/Src/ActionReplay.cpp:657
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)"
@@ -481,7 +499,7 @@ msgstr ""
 "Błąd Action Replay: Niewłaściwy rozmiar (%08x : address = %08x) w Add Code "
 "(%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:755
+#: Source/Core/Core/Src/ActionReplay.cpp:745
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide "
@@ -490,7 +508,7 @@ msgstr ""
 "Błąd Action Replay: Niewłaściwy rozmiar (%08x : address = %08x) w Fill and "
 "Slide (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:547
+#: Source/Core/Core/Src/ActionReplay.cpp:537
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And "
@@ -499,7 +517,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:607
+#: Source/Core/Core/Src/ActionReplay.cpp:597
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Write To "
@@ -508,12 +526,12 @@ msgstr ""
 "Błąd Action Replay: Niewłaściwy rozmiar (%08x : address = %08x) w Write To "
 "Pointer (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:802
+#: Source/Core/Core/Src/ActionReplay.cpp:792
 #, c-format
 msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)"
 msgstr "Błąd Action Replay: Niewłaściwa wartość (%08x) w Memory Copy (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:682
+#: Source/Core/Core/Src/ActionReplay.cpp:672
 #, c-format
 msgid ""
 "Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)\n"
@@ -523,63 +541,63 @@ msgstr ""
 "zaimplementowane (%s)\n"
 "Master kody nie są potrzebne. Nie używaj master kodów."
 
-#: Source/Core/Core/Src/ActionReplay.cpp:196
+#: Source/Core/Core/Src/ActionReplay.cpp:184
 #, c-format
 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:872
+#: Source/Core/Core/Src/ActionReplay.cpp:862
 #, 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:945
+#: Source/Core/Core/Src/ActionReplay.cpp:935
 #, 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:896
+#: Source/Core/Core/Src/ActionReplay.cpp:886
 #, 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:838
+#: Source/Core/Core/Src/ActionReplay.cpp:828
 #, 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:242
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:247
 msgid "Adapter:"
 msgstr "Adapter:"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:76
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:63
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:63
 msgid "Add"
 msgstr "Dodaj"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1275
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1301
 msgid "Add ActionReplay Code"
 msgstr "Dodaj kod ActionReplay"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1204
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1230
 msgid "Add Patch"
 msgstr "Dodaj łatkę"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:507
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:528
 msgid "Add new pane"
 msgstr "Dodaj nowy panel"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:404
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:426
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:811
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:408
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:430
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:792
 msgid "Add..."
 msgstr "Dodaj..."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:90
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:81
 msgid "Address :"
 msgstr "Adres :"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:58
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:45
 msgid ""
 "Adds the specified value to zFar Parameter.\n"
 "Two ways to express the floating point values.\n"
@@ -597,7 +615,7 @@ msgstr ""
 "\n"
 "Notka: Sprawdź LogWindow/Konsola dla ustwaionych wartości."
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:53
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:40
 msgid ""
 "Adds the specified value to zNear Parameter.\n"
 "Two ways to express the floating point values.\n"
@@ -615,48 +633,48 @@ msgstr ""
 "\n"
 "Notka: Sprawdź LogWindow/Konsola dla ustwaionych wartości."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:755
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:744
 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:509
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:522
 msgid "Advanced"
 msgstr "Zaawansowane"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561
 msgid "Advanced Settings"
 msgstr "Ustawienia zaawansowane"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:584
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:587
 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:816
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:797
 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:1189
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1190
 msgid "All Gamecube GCM files (gcm)"
 msgstr "Pliki GCM"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1390
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1404
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1417
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1431
 msgid "All Save States (sav, s##)"
 msgstr "Stany zapisu (sav, s##)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1187
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1188
 msgid "All Wii ISO files (iso)"
 msgstr "Wszystkie obrazy Wii (iso)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1207
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1208
 msgid "All compressed GC/Wii ISO files (gcz)"
 msgstr "Spakowane obrazy GC/Wii (gcz)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:124
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:104
 msgid "All files (*.*)|*.*"
 msgstr "Wszystkie pliki (*.*)|*.*"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123
 msgid ""
 "Allows toggling certain options via the hotkeys 3 (Internal Resolution), 4 "
 "(Aspect Ratio), 5 (Copy EFB) and 6 (Fog) within the emulation window.\n"
@@ -669,39 +687,39 @@ msgstr ""
 "\n"
 "W razie wątpliwości, pozostaw wyłączone."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:285
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:272
 msgid "Analyze"
 msgstr "Analizuj"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:298
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:285
 msgid "Angle"
 msgstr "Kąt"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:367
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:375
 msgid "Anisotropic Filtering:"
 msgstr "Filtrowanie anizotropowe:"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:350
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:358
 msgid "Anti-Aliasing:"
 msgstr "Antyaliasing:"
 
-#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:308
+#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:299
 msgid "Apploader is the wrong size...is it really an apploader?"
 msgstr "Apploader niewłaściwego rozmiaru... Czy to rzeczywiście apploader?"
 
-#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:302
+#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:293
 msgid "Apploader unable to load from file"
 msgstr "Apploader nie mógł wczytać z pliku"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:841
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:822
 msgid "Apploader:"
 msgstr "Apploader:"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:135
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:122
 msgid "Apply"
 msgstr "Zastosuj"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124
 msgid ""
 "Apply a post-processing effect after finishing a frame.\n"
 "\n"
@@ -711,11 +729,11 @@ msgstr ""
 "\n"
 "W razie wątpliwości, wybierz (wyłączone)."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287
 msgid "Arabic"
 msgstr "Arabski"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:614
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:603
 #, c-format
 msgid "Are you sure you want to delete \"%s\"?"
 msgstr "Czy jesteś pewny by usunąc \"%s\"?"
@@ -732,46 +750,50 @@ msgstr ""
 msgid "Are you sure you want to delete this file?  It will be gone forever!"
 msgstr "Czy jesteś pewny by usunąc ten plik? Przepadnie na zawsze!"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:789
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:277
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:44
+msgid "Arm JIT (experimental)"
+msgstr "Arm JIT (eksperymentalne)"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:285
 msgid "Aspect Ratio:"
 msgstr "Proporcje ekranu:"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:70
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:58
 msgid "At least one pane must remain open."
 msgstr "Przynajmniej jeden panel musi pozostać otwarty."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:553
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533
 msgid "Audio"
 msgstr "Audio"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:694
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675
 msgid "Audio Backend:"
 msgstr "Audio Backend :"
 
-#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:41
+#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:28
 msgid "AudioCommon: Error opening AO device.\n"
 msgstr "AudioCommon: Błąd otwarcia urządzenia AO.\n"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:275
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283
 msgid "Auto"
 msgstr "Auto"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:337
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345
 msgid "Auto (Multiple of 640x528)"
 msgstr "Auto (Wiele z 640x528)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:337
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345
 msgid "Auto (Window Size)"
 msgstr "Auto (rozmiar okna)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:297
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305
 msgid "Auto adjust Window Size"
 msgstr "Auto-dopasowanie rozmiaru okna"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77
 msgid ""
 "Automatically adjusts the window size to your internal resolution.\n"
 "\n"
@@ -781,130 +803,130 @@ msgstr ""
 "\n"
 "W razie wątpliwości, pozostaw wyłączone."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:697
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696
 msgid "B"
 msgstr "B"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:755
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:754
 msgid "BP register "
 msgstr "BP rejestr"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:27
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:14
 msgid "Back"
 msgstr "Wstecz"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:698
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:679
 msgid "Backend Settings"
 msgstr "Ustawienia Backend'u"
 
-#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:60
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:206
+#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:47
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:211
 msgid "Backend:"
 msgstr "Backend :"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:318
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:95
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:305
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:82
 msgid "Background Input"
 msgstr "Wejście w tle"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:279
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:266
 msgid "Backward"
 msgstr "W tył"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:264
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:257
 msgid "Bad File Header"
 msgstr "Zły nagłówek pliku"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:627
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:621
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:290
 msgid "Banner"
 msgstr "Baner"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:519
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:529
 msgid "Banner Details"
 msgstr "Szczegóły banera"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491
 msgid "Banner:"
 msgstr "Baner:"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:57
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:61
 msgid "Bar"
 msgstr "Wajcha"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:308
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:316
 msgid "Basic"
 msgstr "Podstawowy"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555
 msgid "Basic Settings"
 msgstr "Ustawienia podstawowe"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:22
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Bass"
 msgstr "Bass"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:186
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:174
 msgid "Block Allocation Table checksum failed"
 msgstr "Suma kontrolna Block Allocation Table nie powiodła się"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:631
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625
 msgid "Blocks"
 msgstr "Bloki"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:21
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Blue"
 msgstr "Niebieski"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:24
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Blue Left"
 msgstr "Niebieski lewo"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:25
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Blue Right"
 msgstr "Niebieski prawo"
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:87
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270
 msgid "Bottom"
 msgstr "Dół"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:238
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:225
 #, c-format
 msgid "Bound Controls: %lu"
 msgstr "Bound Controls: %lu"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348
 msgid "Broken"
 msgstr "Zepsuty"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:422
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:428
 msgid "Browse"
 msgstr "Szukaj"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:256
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:243
 msgid "Browse for a directory to add"
 msgstr "Szukaj folder do dodania"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:422
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:428
 msgid "Browse for an ISO directory..."
 msgstr "Szukaj folder ISO..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1079
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1080
 msgid "Browse for output directory"
 msgstr "Szukaj folderu wyjściowego"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:328
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:331
 msgid "Buffer:"
 msgstr "Bufor:"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:58
 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:119
+#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:106
 msgid "Buttons"
 msgstr "Przyciski"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317
 msgid ""
 "Bypass the clearing of the data cache by the DCBZ instruction. Usually leave "
 "this option disabled."
@@ -912,31 +934,31 @@ msgstr ""
 "Omija oczyszczanie cache'u danych przez instrukcję DCBZ. Zazwyczaj pozostaw "
 "tę opcję wyłączoną."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:698
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:697
 msgid "C"
 msgstr "C"
 
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:77
+#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:64
 msgid "C Stick"
 msgstr "C Stick"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:77
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:64
 msgid "C-Stick"
 msgstr "C-Stick"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:764
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:763
 msgid "CP reg"
 msgstr "CP reg"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:567
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547
 msgid "CPU Emulator Engine"
 msgstr "Silnik emulacji CPU"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:490
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500
 msgid "Cache Display Lists"
 msgstr "Cache Display Lists"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88
 msgid ""
 "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n"
 "Decreases emulation speed by some percent (depending on your GPU).\n"
@@ -949,23 +971,38 @@ 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/WXInputBase.cpp:41
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1858
+#, c-format
+msgid "Can't 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:1872
+#, c-format
+msgid "Can't find WiiMote by connection handle %02x"
+msgstr "Nie można odnaleźć Wiilota przez handle połączenia %02x"
+
+#: Source/Core/Core/Src/HW/DVDInterface.cpp:669
+#: Source/Core/Core/Src/HW/DVDInterface.cpp:679
+msgid "Can't read from DVD_Plugin - DVD-Interface: Fatal Error"
+msgstr "Nie można odczytać z wtyczki DVD - Interfejs DVD: Poważny błąd"
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:124
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:28
 msgid "Cancel"
 msgstr "Anuluj"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:91
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:178
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:240
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:84
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:171
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:233
 #, c-format
 msgid "Cannot open %s"
 msgstr "Nie moża otworzyć %s"
 
-#: Source/Core/Core/Src/CoreTiming.cpp:141
+#: Source/Core/Core/Src/CoreTiming.cpp:128
 msgid "Cannot unregister events with events pending"
 msgstr "Nie można wyrejestrować zdarzeń podczas ich wykonywania"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1078
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1061
 #, c-format
 msgid ""
 "Cannot use that file as a memory card.\n"
@@ -976,7 +1013,7 @@ msgstr ""
 "%s\n"
 "nie jest właściwym plikiem karty pamięci GC"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1108
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1091
 msgid ""
 "Cannot use that file as a memory card.\n"
 "Are you trying to use the same file in both slots?"
@@ -984,30 +1021,15 @@ 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:1867
-#, 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:1881
-#, 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: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"
-
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:52
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:39
 msgid "Caps Lock"
 msgstr "Caps Lock"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288
 msgid "Catalan"
 msgstr "Kataloński"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:311
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:298
 msgid "Center"
 msgstr "Środek"
 
@@ -1015,12 +1037,12 @@ msgstr "Środek"
 msgid "Change"
 msgstr "Zmień"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:316
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:322
 msgid "Change &Disc..."
 msgstr "Zmień &dysk"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:179
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:179
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:167
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:167
 msgid "Change Disc"
 msgstr "Zmień dysk"
 
@@ -1028,7 +1050,7 @@ msgstr "Zmień dysk"
 msgid "Change Game"
 msgstr "Zmień grę"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:515
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495
 msgid ""
 "Change the language of the user interface.\n"
 "Requires restart."
@@ -1036,76 +1058,76 @@ msgstr ""
 "Zmień język UI.\n"
 "Restert wymagany."
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:60
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:47
 msgid "Changes sign to zFar Parameter (after correction)"
 msgstr "Zmienia symbol do parametru zFar (po poprawce)"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:55
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:42
 msgid "Changes sign to zNear Parameter (after correction)"
 msgstr "Zmienia symbol do parametru zNear (po poprawce)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:519
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499
 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:295
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:298
 msgid "Chat"
 msgstr "Chat"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:47
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:34
 msgid "Cheat Code"
 msgstr "Cheat Code"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:118
 msgid "Cheat Search"
 msgstr "Szukaj cheatów"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:38
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:25
 msgid "Cheats Manager"
 msgstr "Menadżer cheatów"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:633
 msgid "Check Partition Integrity"
 msgstr "Sprawdź integralność partycji"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:864
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:880
 msgid "Checking integrity..."
 msgstr "Sprawdzanie integralności..."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289
 msgid "Chinese (Simplified)"
 msgstr "Chiński uproszczony"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290
 msgid "Chinese (Traditional)"
 msgstr "Chinski (Tradycyjny)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:818
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:799
 msgid "Choose a DVD root directory:"
 msgstr "Wybierz folder źródłowy DVD"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:822
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803
 msgid "Choose a NAND root directory:"
 msgstr "Wybierz folder źródłowy NAND"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:815
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:796
 msgid "Choose a default ISO:"
 msgstr "Wybierz domyślne ISO"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1236
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1219
 msgid "Choose a directory to add"
 msgstr "Wybierz folder do dodania"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1065
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1048
 msgid "Choose a file to open"
 msgstr "Wybierz plik do otwarcia"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:217
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:204
 msgid "Choose a memory card:"
 msgstr "Wybierz kartę pamięci:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:819
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800
 msgid ""
 "Choose file to use as apploader: (applies to discs constructed from "
 "directories only)"
@@ -1113,27 +1135,27 @@ msgstr ""
 "Wybierz plik używany jako apploader: (dotyczy dysków stworzonych tylko z "
 "folderów)"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:767
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:806
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:781
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:822
 msgid "Choose the folder to extract to"
 msgstr "Wypakuj do"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:297
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:284
 msgid "Circle Stick"
 msgstr "Circle Stick"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:52
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:56
 msgid "Classic"
 msgstr "Classic"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:144
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:43
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:487
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:913
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:137
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:30
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:474
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:904
 msgid "Clear"
 msgstr "Wyczyść"
 
-#: Source/Core/Core/Src/NetPlayServer.cpp:259
+#: Source/Core/Core/Src/NetPlayServer.cpp:263
 msgid ""
 "Client disconnect while game is running!! NetPlay is disabled. You must "
 "manually stop the game."
@@ -1141,138 +1163,138 @@ msgstr ""
 "Klient rozłączony podczas uruchomionej gry! NetPlay wyłączony. Musisz "
 "ręcznie zatrzymać grę."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:298
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:247
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:552
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:578
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:285
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:234
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:562
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:590
 msgid "Close"
 msgstr "Zamknij"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:174
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:177
 msgid "Co&nfigure..."
 msgstr "Ko&nfiguruj..."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:86
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:73
 msgid "Code Info"
 msgstr "Info kodu"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:568
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:556
 msgid "Code: "
 msgstr "Kod:"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:35
 msgid "Command"
 msgstr "Polecenie"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:629
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:623
 msgid "Comment"
 msgstr "Komentarz"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489
 msgid "Comment:"
 msgstr "Komentarz:"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:893
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:884
 msgid "Compress ISO..."
 msgstr "Kompresuj ISO"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:905
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:899
 msgid "Compress selected ISOs..."
 msgstr "Kompresuj wybrane ISO..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1088
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1224
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1089
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1225
 msgid "Compressing ISO"
 msgstr "Kompresowanie ISO"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:429
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:435
 msgid "Config"
 msgstr "Konfig"
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:37
-#: Source/Core/DolphinWX/Src/InputConfigDiag.h:135
-#: Source/Core/DolphinWX/Src/InputConfigDiag.h:154
+#: Source/Core/DolphinWX/Src/InputConfigDiag.h:122
+#: Source/Core/DolphinWX/Src/InputConfigDiag.h:141
 msgid "Configure"
 msgstr "Konfiguracja"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:111
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:98
 msgid "Configure Control"
 msgstr "Konfiguracja sterowania"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:306
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
 #: Source/Core/DolphinWX/Src/NetWindow.cpp:583
 msgid "Configure Pads"
 msgstr "Konfiguracja padów"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:429
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:435
 msgid "Configure..."
 msgstr "Konfiguruj..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1119
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1147
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1217
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1120
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1218
 msgid "Confirm File Overwrite"
 msgstr "Potwierdź nadpis pliku"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:597
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:577
 msgid "Confirm on Stop"
 msgstr "Potwierdź przy zatrzymaniu"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:83
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:105
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:74
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:96
 msgid "Connect"
 msgstr "Połącz"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:783
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:764
 msgid "Connect USB Keyboard"
 msgstr "Podłącz klawiaturę USB"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:362
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:368
 #, c-format
 msgid "Connect Wiimote %i"
 msgstr "Połącz Wiilot %i"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:195
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183
 msgid "Connect Wiimote 1"
 msgstr "Połącz Wiilot 1"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184
 msgid "Connect Wiimote 2"
 msgstr "Połącz Wiilot 2"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:185
 msgid "Connect Wiimote 3"
 msgstr "Połącz Wiilot 3"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:198
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:186
 msgid "Connect Wiimote 4"
 msgstr "Połącz Wiilot 4"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:627
+#: Source/Core/DolphinWX/Src/Main.cpp:655
 msgid "Connecting..."
 msgstr "Łączę..."
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:155
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:156
 msgid "Console"
 msgstr "Konsola"
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:71
 msgid "Continuous Scanning"
-msgstr ""
+msgstr "Skanowanie ciągłe"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:46
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:33
 msgid "Control"
 msgstr "Sterowanie"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:189
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:176
 msgid "Convert to GCI"
 msgstr "Konwertuj do GCI"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:379
+#: Source/Core/Core/Src/CoreParameter.cpp:368
 msgid "Copy failed"
 msgstr "Kopiowanie nie powiodło się"
 
@@ -1281,21 +1303,21 @@ msgstr "Kopiowanie nie powiodło się"
 msgid "Copy to Memcard %c"
 msgstr "Kopiuj do Memcard %c"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:359
 msgid "Core"
 msgstr "Rdzeń"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:154
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:148
 #, c-format
 msgid "Could not create %s"
 msgstr "Nie można utworzyć %s"
 
-#: Source/Core/AudioCommon/Src/AudioCommon.cpp:75
+#: Source/Core/AudioCommon/Src/AudioCommon.cpp:62
 #, c-format
 msgid "Could not initialize backend %s."
 msgstr "Beckend %s nie mógł zostać zainicjalizowany."
 
-#: Source/Core/Core/Src/CoreParameter.cpp:137
+#: Source/Core/Core/Src/CoreParameter.cpp:126
 #, c-format
 msgid ""
 "Could not read \"%s\".  There is no disc in the drive, or it is not a GC/Wii "
@@ -1306,12 +1328,12 @@ msgstr ""
 "Wii. Zwróć uwagę, że oryginalne nośniki GC i Wii nie będą odczytywane przez "
 "większość napędów DVD."
 
-#: Source/Core/Core/Src/CoreParameter.cpp:292
+#: Source/Core/Core/Src/CoreParameter.cpp:281
 #, c-format
 msgid "Could not recognize ISO file %s"
 msgstr "Nie rozpoznao pliku ISO %s"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:569
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:579
 #, c-format
 msgid "Could not save %s"
 msgstr "Nie można zapisać %s"
@@ -1324,24 +1346,31 @@ 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:123
+#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119
 #, c-format
 msgid ""
 "Could not write memory card file %s.\n"
 "\n"
 "Are you running Dolphin from a CD/DVD, or is the save file maybe write "
-"protected?"
+"protected?\n"
+"\n"
+"Are you receiving this after moving the emulator directory?\n"
+"If so, then you may need to re-specify your memory card location in the "
+"options."
 msgstr ""
 "Nie można zapisać pliku karty pamięci %s.\n"
 "\n"
 "Uruchamiasz program z CD/DVD albo plik zapisu jest zabezpieczony przed "
-"zapisem?"
+"zapisem?\n"
+"\n"
+"Czy wiadomość ta pojawia się po przeniesieniu folderu emulatora?\n"
+"Jeśli tak, należy ponownie określić ścieżki kart pamięci w opcjach programu."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1107
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1133
 msgid "Couldn't find open command for extension 'ini'!"
 msgstr "Nie odnaleziono polecenia otwarcia dla rozszerzenia 'ini'!"
 
-#: Source/Core/Core/Src/BootManager.cpp:146
+#: Source/Core/Core/Src/BootManager.cpp:137
 msgid ""
 "Couldn't init the core.\n"
 "Check your configuration."
@@ -1349,38 +1378,38 @@ 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:170
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:495
 msgid "Count:"
 msgstr "Ilość:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:452
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456
 msgid "Country:"
 msgstr "Kraj:"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:186
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:562
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:173
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:550
 msgid "Create AR Code"
 msgstr "Utwórz kod AR"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:543
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:608
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:569
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:641
 msgid "Create new perspective"
 msgstr "Utwórz nową perspektywę"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:17
 msgid "Creator: "
 msgstr "Twórca:"
 
-#: Source/Core/Common/Src/MsgHandler.cpp:68
+#: Source/Core/Common/Src/MsgHandler.cpp:54
 msgid "Critical"
 msgstr "Krytyczny"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562
 msgid "Crop"
 msgstr "Obcięcie"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119
 msgid ""
 "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n"
 "\n"
@@ -1390,140 +1419,140 @@ msgstr ""
 "\n"
 "W razie wątpliwości, pozostaw wyłączone."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:48
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:52
 msgid "Crossfade"
 msgstr "Suwak"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:597
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:600
 #, c-format
-msgid "Current dir changed from %s to %s after wxFileSelector!"
-msgstr "Actualny folder zmieniono z %s na %s po wxFileSelector!"
+msgid "Current directory changed from %s to %s after wxFileSelector!"
+msgstr "Aktualny folder zmieniono z %s na %s po wxFileSelector!"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339
 msgid "Custom Projection Hack"
 msgstr "Custom Projection Hack"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.h:30
+#: Source/Core/DolphinWX/Src/PHackSettings.h:17
 msgid "Custom Projection Hack Settings"
 msgstr "Ustawienia Custom Projection Hack"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342
 msgid "Customize some Orthographic Projection parameters."
 msgstr "Własne parametry Orthographic Projection"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291
 msgid "Czech"
 msgstr "Czeski"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:698
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:697
 msgid "D"
 msgstr "D"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:89
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
 msgid "D-Pad"
 msgstr "D-Pad"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:431
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
 msgid "DSP"
 msgstr "DSP"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:639
 msgid "DSP Emulator Engine"
 msgstr "DSP Emulator Engine"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:254
 msgid "DSP HLE emulation (fast)"
 msgstr "DSP HLE emulacja (szybkie)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:256
 msgid "DSP LLE interpreter (slow)"
 msgstr "DSP LLE interpreter (wolne)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660
-msgid "DSP LLE on Thread"
-msgstr "Wątek dla DSPLLE"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:255
 msgid "DSP LLE recompiler"
 msgstr "DSP LLE rekompilator"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:431
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:641
+msgid "DSP on Dedicated Thread"
+msgstr "Dedykowany wątek dla DSPLLE"
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
 msgid "DSP settings"
 msgstr "Ustawienia DSP"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:838
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:819
 msgid "DVD Root:"
 msgstr "Źródło DVD:"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:239
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:226
 msgid "DVDLowRead - Fatal Error: failed to read from volume"
 msgstr "DVDLowRead - Fatal Error: błąd odczytu dysku"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:333
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:320
 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:163
 msgid "Data Size"
 msgstr "Rozmiar danych"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468
 msgid "Date:"
 msgstr "Data:"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:528
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:564
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:518
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:557
 msgid "Datel MaxDrive/Pro files(*.sav)"
 msgstr "Pliki Datel MaxDrive/Pro(*.sav)"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:242
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:259
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:267
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:281
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:296
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:229
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:246
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:254
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:268
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:283
 msgid "Dead Zone"
 msgstr "Dead Zone"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:35
 msgid "Debug"
 msgstr "Debuguj"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:521
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534
 msgid "Debugging"
 msgstr "Debugowanie"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:79
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:66
 msgid "Decimal"
 msgstr "Dziesiętnie"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:890
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:881
 msgid "Decompress ISO..."
 msgstr "Wypakuj ISO..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:906
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:900
 msgid "Decompress selected ISOs..."
 msgstr "Wypakuj wybrane ISO..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1088
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1224
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1089
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1225
 msgid "Decompressing ISO"
 msgstr "Wypakowywanie ISO"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:912
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:903
 msgid "Default"
 msgstr "Domyślne"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:835
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:816
 msgid "Default ISO:"
 msgstr "Domyślne ISO:"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:114
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:107
 msgid "Default font"
 msgstr "Domyślna czcionka"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:32
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:926
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:19
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917
 msgid "Delete"
 msgstr "Usuń"
 
@@ -1531,21 +1560,21 @@ msgstr "Usuń"
 msgid "Delete Save"
 msgstr "Usuń zapis"
 
-#: Source/Core/VideoCommon/Src/AVIDump.cpp:77
+#: Source/Core/VideoCommon/Src/AVIDump.cpp:64
 #, c-format
 msgid "Delete the existing file '%s'?"
 msgstr "Usunąć istniejący plik '%s'?"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:671
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:683
 msgid "Description"
 msgstr "Opis"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:472
 msgid "Detect"
 msgstr "Wykryj"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:233
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:328
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:220
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:315
 msgid ""
 "Detected attempt to read more data from the DVD than fit inside the out "
 "buffer. Clamp."
@@ -1553,29 +1582,29 @@ 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:127
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:898
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:114
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:889
 msgid "Device"
 msgstr "Urządzenie"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:798
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:731
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779
 msgid "Device Settings"
 msgstr "Ustawienia urządzenia"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:45
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:49
 msgid "Dial"
 msgstr "Pokrętło"
 
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:146
+#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:135
 msgid "Direct3D11"
 msgstr "Direct3D11"
 
-#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:128
+#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:125
 msgid "Direct3D9"
 msgstr "Direct3D9"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:167
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:155
 msgid ""
 "Directory checksum failed\n"
 " and Directory backup checksum failed"
@@ -1583,16 +1612,20 @@ msgstr ""
 "Suma kontrolna folderu oraz \n"
 "folderu zapasowego nie powiodła się"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:433
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:443
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485
 msgid "Disable"
 msgstr "Wyłącz"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:491
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501
+msgid "Disable Destination Alpha"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:409
 msgid "Disable Fog"
 msgstr "Wyłącz mgłę"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108
 msgid ""
 "Disable any XFB emulation.\n"
 "Speeds up emulation a lot but causes heavy glitches in many games which rely "
@@ -1606,7 +1639,7 @@ msgstr ""
 "\n"
 "W razie wątpliwości, pozostaw włączone."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95
 msgid ""
 "Disable emulation of EFB copies.\n"
 "These are often used for post-processing or render-to-texture effects, so "
@@ -1622,20 +1655,33 @@ msgstr ""
 "\n"
 "W razie wątpliwości, pozostaw wyłączone."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:543
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101
+#, fuzzy
+msgid ""
+"Disables emulation of a hardware feature called destination alpha, which is "
+"used in many games for various graphical effects.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+"Pomiń destination alpha pass używany w wielu grach dla niektórych efektów "
+"graficznych.\n"
+"\n"
+"W razie wątpliwości, pozostaw wyłączone."
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:553
 msgid "Disc"
 msgstr "Dysk"
 
-#: Source/Core/DiscIO/Src/DriveBlob.cpp:107
-#: Source/Core/DiscIO/Src/DriveBlob.cpp:126
+#: Source/Core/DiscIO/Src/DriveBlob.cpp:94
+#: Source/Core/DiscIO/Src/DriveBlob.cpp:113
 msgid "Disc Read Error"
 msgstr "Dłąd odczytu dysku"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:312
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:320
 msgid "Display"
 msgstr "Ekran"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104
 msgid ""
 "Display the inputs read by the emulator.\n"
 "\n"
@@ -1645,32 +1691,32 @@ msgstr ""
 "\n"
 "W razie wątpliwości, pozostaw wyłączone."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:80
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:67
 msgid "Divide"
 msgstr "Podziel"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:987
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:990
 msgid "Do you want to stop the current emulation?"
 msgstr "Zatrzymać aktualną emulację?"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:663
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:644
 msgid "Dolby Pro Logic II decoder"
 msgstr "Dekoder Dolby Pro Logic II"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:864
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:856
 msgid "Dolphin"
 msgstr "Dolphin"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:183
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:188
 #, c-format
 msgid "Dolphin %s Graphics Configuration"
 msgstr "Ustawienia graficzne %s"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:292
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:298
 msgid "Dolphin &Web Site"
 msgstr "Dolphin strona &WWW"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.h:37
+#: Source/Core/DolphinWX/Src/ConfigMain.h:24
 msgid "Dolphin Configuration"
 msgstr "Konfiguracja Dolphin'a"
 
@@ -1678,16 +1724,16 @@ msgstr "Konfiguracja Dolphin'a"
 msgid "Dolphin Emulated Wiimote Configuration"
 msgstr "Konfiguracja emulowanego Wiilota"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:394
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:383
 msgid "Dolphin FIFO"
 msgstr "Dolphin FIFO"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1136
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1153
 msgid "Dolphin GCPad Configuration"
 msgstr "Konfiguracja GCPad'a"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:679
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1074
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:685
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1089
 msgid "Dolphin TAS Movies (*.dtm)"
 msgstr "Filmy TAS (*.dtm)"
 
@@ -1695,11 +1741,11 @@ msgstr "Filmy TAS (*.dtm)"
 msgid "Dolphin Wiimote Configuration"
 msgstr "Konfiguracja Wiilot'a"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:293
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:299
 msgid "Dolphin at &Google Code"
 msgstr "Dolphin na &Google Code"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:364
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:351
 msgid ""
 "Dolphin could not find any GC/Wii ISOs.  Doubleclick here to browse for "
 "files..."
@@ -1707,7 +1753,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:368
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:355
 msgid ""
 "Dolphin is currently set to hide all games.  Doubleclick here to show all "
 "games..."
@@ -1715,50 +1761,59 @@ msgstr ""
 "Program jest obecnie ustawiony by ukrywać wszystkie gry. Kliknij tutaj by "
 "pokazać wszystkie gry..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1159
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1160
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1246
 msgid "Dolphin was unable to complete the requested action."
 msgstr "Program nie był w stanie zakończyć żądanej akcji."
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:275
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:58
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
+#, fuzzy
+msgid ""
+"Doubles the emulated GPU clock rate. May speed up some games (ON = Fast, OFF "
+"= Compatible)"
+msgstr ""
+"Włącz szybki dostęp do dysku. Wymagane dla kilku gier. (ON = szybko, OFF = "
+"kompatybilne)"
+
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:262
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:45
 msgid "Down"
 msgstr "Dół"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:54
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:44
 msgid "Download Codes (WiiRD Database)"
 msgstr "Ściągnij kody (baza WiiRD)"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:297
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:287
 #, c-format
 msgid "Downloaded %lu codes. (added %lu)"
 msgstr "Pobrano %lu kodów. (dodano %lu)"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:31
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:35
 msgid "Drums"
 msgstr "Perkusja"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:105
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
 msgid "Dummy"
 msgstr "Atrapa"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:661
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:642
 msgid "Dump Audio"
 msgstr "Zrzut audio"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:532
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545
 msgid "Dump EFB Target"
 msgstr "Zrzut EFB Target"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546
 msgid "Dump Frames"
 msgstr "Zrzut klatek"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543
 msgid "Dump Textures"
 msgstr "Zrzut tekstur"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114
 msgid ""
 "Dump all rendered frames to an AVI file in User/Dump/Frames/\n"
 "\n"
@@ -1768,7 +1823,7 @@ msgstr ""
 "\n"
 "W razie wątpliwości, pozostaw wyłączone."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111
 msgid ""
 "Dump decoded game textures to User/Dump/Textures/<game_id>/\n"
 "\n"
@@ -1778,7 +1833,7 @@ msgstr ""
 "\n"
 "W razie wątpliwości, pozostaw wyłączone."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113
 msgid ""
 "Dump the contents of EFB copies to User/Dump/Textures/\n"
 "\n"
@@ -1788,21 +1843,21 @@ msgstr ""
 "\n"
 "W razie wątpliwości, pozostaw wyłączone."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:474
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292
 msgid "Dutch"
 msgstr "Holenderski"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:112
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:113
 msgid "E&xit"
 msgstr "&Wyjście"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:441
 msgid "EFB Copies"
 msgstr "EFB Copies"
 
-#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:223
+#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:210
 #, c-format
 msgid ""
 "ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least "
@@ -1814,52 +1869,52 @@ msgstr ""
 "%d. %d -- Jeśli ostatnio aktualizowałeś program, ponowne uruchomienie "
 "systemu jest wymagane aby sterownik zaczął działać."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:166
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:160
 msgid "EUROPE"
 msgstr "Europa"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:156
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:143
 msgid "Early Memory Updates"
 msgstr "Early Memory Updates"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:447
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:453
 msgid "Edit"
 msgstr "Edycja"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.h:30
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.h:17
 msgid "Edit ActionReplay Code"
 msgstr "Edytuj kody ActionReplay"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:285
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:286
 msgid "Edit Config"
 msgstr "Edytuj konfigurację"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.h:30
+#: Source/Core/DolphinWX/Src/PatchAddEdit.h:17
 msgid "Edit Patch"
 msgstr "Edytuj patch"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:447
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:453
 msgid "Edit current perspective"
 msgstr "Edytuj bierzącą perspektywę"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:403
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:425
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:407
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:429
 msgid "Edit..."
 msgstr "Edytuj..."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:44
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:48
 msgid "Effect"
 msgstr "Efekt"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:425
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435
 msgid "Embedded Frame Buffer"
 msgstr "Embedded Frame Buffer"
 
-#: Source/Core/Core/Src/Core.cpp:201
+#: Source/Core/Core/Src/Core.cpp:190
 msgid "Emu Thread already running"
 msgstr "Wątek emulacji jest już uruchomiony"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110
 msgid ""
 "Emulate XFBs accurately.\n"
 "Slows down emulation a lot and prohibits high-resolution rendering but is "
@@ -1874,7 +1929,7 @@ msgstr ""
 "\n"
 "W razie wątpliwości, włącz wirtualną emulację XFB."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109
 msgid ""
 "Emulate XFBs using GPU texture objects.\n"
 "Fixes many games which don't work without XFB emulation while not being as "
@@ -1894,7 +1949,7 @@ msgstr ""
 msgid "Emulated Wiimote"
 msgstr "Emulowany Wiilot"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346
 msgid "Emulation State: "
 msgstr "Stan emulacji:"
 
@@ -1902,7 +1957,7 @@ msgstr "Stan emulacji:"
 msgid "Enable"
 msgstr "Włącz"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91
 msgid ""
 "Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's "
 "supported by your GPU.\n"
@@ -1918,72 +1973,71 @@ msgstr ""
 "\n"
 "W razie wątpliwości, pozostaw wyłączone."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:111
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:98
 msgid "Enable AR Logging"
 msgstr "Włącz log AR"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324
 msgid "Enable Block Merging"
 msgstr "Włącz łączenie bloków"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331
 msgid "Enable Bounding Box Calculation"
 msgstr "Włącz Bounding Box Calculation"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:446
 msgid "Enable Cache"
 msgstr "Włącz cache"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:562
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542
 msgid "Enable Cheats"
 msgstr "Włącz kody"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310
 msgid "Enable Dual Core"
 msgstr "Włącz 2 rdzenie"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
 msgid "Enable Dual Core (speedup)"
 msgstr "Włącz 2 rdzenie (przyspieszenie)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:550
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:563
 msgid "Enable Hotkeys"
 msgstr "Włącz skróty klawiszowe"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311
 msgid "Enable Idle Skipping"
 msgstr "Włącz Idle Skipping"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541
 msgid "Enable Idle Skipping (speedup)"
 msgstr "Włącz Idle Skipping (przyspieszenie)"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312
 msgid "Enable MMU"
 msgstr "Włącz MMU"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:554
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:567
 msgid "Enable Progressive Scan"
 msgstr "Włącz Progressive Scan"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757
 msgid "Enable Screen Saver"
 msgstr "Włącz wygaszacz ekranu"
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:75
-#, fuzzy
 msgid "Enable Speaker Data"
-msgstr "Włącz strony"
+msgstr "Włącz dane głosu"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
 msgid "Enable WideScreen"
 msgstr "Włącz WideScreen"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:516
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529
 msgid "Enable Wireframe"
 msgstr "Włącz Wireframe"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85
 msgid ""
 "Enable anisotropic filtering.\n"
 "Enhances visual quality of textures that are at oblique viewing angles.\n"
@@ -1997,7 +2051,7 @@ msgstr ""
 "\n"
 "W razie wątpliwości, wybierz 1x."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323
 msgid ""
 "Enable fast disc access.  Needed for a few games. (ON = Fast, OFF = "
 "Compatible)"
@@ -2009,7 +2063,7 @@ msgstr ""
 msgid "Enable pages"
 msgstr "Włącz strony"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76
 msgid ""
 "Enable this if you want the whole screen to be used for rendering.\n"
 "If this is disabled, a render window will be created instead.\n"
@@ -2021,7 +2075,7 @@ msgstr ""
 "\n"
 "W razie wątpliwości, pozostaw wyłączone."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80
 msgid ""
 "Enable this if you want to use the main Dolphin window for rendering rather "
 "than a separate render window.\n"
@@ -2033,7 +2087,7 @@ msgstr ""
 "\n"
 "W razie wątpliwości, pozostaw wyłączone."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:335
 msgid ""
 "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for "
 "ANY other game."
@@ -2041,24 +2095,24 @@ 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:337
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340
 msgid "Enables Custom Projection Hack"
 msgstr "Włącza Custom Projection Hack"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:528
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508
 msgid ""
 "Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on "
 "OSX."
 msgstr ""
 "Włącza emulację Dolby Pro Logic II używając 5.1 surround. Niedostępne na OSX."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510
 msgid ""
 "Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only."
 msgstr ""
 "Włącza emulację Dolby Pro Logic II używając 5.1 surround. Tylko OpenAL."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:512
 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."
@@ -2067,7 +2121,7 @@ msgstr ""
 "Zmiana nazwy pliku soft_oal.dll na OpenAL32.dll może spowodować, że ta opcja "
 "zacznie działać."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81
 msgid ""
 "Enables progressive scan if supported by the emulated software.\n"
 "Most games don't care about this.\n"
@@ -2079,7 +2133,7 @@ msgstr ""
 "\n"
 "W razie wątpliwości, pozostaw wyłączone."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313
 msgid ""
 "Enables the Memory Management Unit, needed for some games. (ON = Compatible, "
 "OFF = Fast)"
@@ -2087,7 +2141,7 @@ msgstr ""
 "Włącza Memory Management Unit, wymagane dla niektórych gier. (ON = "
 "kompatybilny, OFF = szybko)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116
 msgid ""
 "Encode frame dumps using the FFV1 codec.\n"
 "\n"
@@ -2097,50 +2151,50 @@ msgstr ""
 "\n"
 "W razie wątpliwości, pozostaw wyłączone."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:40
 msgid "End"
 msgstr "Koniec"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:469
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:280
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:260
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293
 msgid "English"
 msgstr "Angielski"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:329
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:407
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:337
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:417
 msgid "Enhancements"
 msgstr "Ulepszenia"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:607
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:640
 msgid "Enter a name for the new perspective:"
 msgstr "Wprowadź nazwę nowej perspektywy:"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:191
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:178
 #, c-format
 msgid "Entry %d/%d"
 msgstr "Wejście %d/%d"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:85
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:72
 #, c-format
 msgid "Entry 1/%d"
 msgstr "Wejście 1/%d"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:204
 msgid "Equal"
 msgstr "Równy"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:45
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:156
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1242
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:32
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:150
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226
 msgid "Error"
 msgstr "Błąd"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:381
+#: Source/Core/DolphinWX/Src/Main.cpp:409
 msgid "Error loading selected language. Falling back to system default."
 msgstr "Błąd wczytywania wybranego języka. Ustawienia domyślne."
 
-#: Source/Core/Common/Src/ChunkFile.h:226
+#: Source/Core/Common/Src/ChunkFile.h:221
 #, c-format
 msgid ""
 "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). "
@@ -2149,7 +2203,7 @@ msgstr ""
 "Błąd: Po \"%s\", znaleziono %d (0x%X) zamiast save maker'a %d (0x%X). "
 "Anulowanie wczytywania zapisanego stanu..."
 
-#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:342
+#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:329
 #, c-format
 msgid ""
 "Error: Trying to access %s fonts but they are not loaded. Games may not show "
@@ -2158,38 +2212,38 @@ msgstr ""
 "Błąd: Próba dostępu do czcionek %s ale nie są one wczytane. Gry mogą "
 "pokazywać czcionki niewłaściwie lub zawieścić się."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:30
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:17
 msgid "Escape"
 msgstr "Escape"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:26
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:30
 msgid "Euphoria"
 msgstr "Euforia"
 
 #: Source/Core/Core/Src/ArmMemTools.cpp:78
-#: Source/Core/Core/Src/x64MemTools.cpp:217
+#: Source/Core/Core/Src/x64MemTools.cpp:206
 #, c-format
 msgid "Exception handler - access below memory space. %08llx%08llx"
 msgstr "Handler wyjątku - dostęp poniżej obszaru pamięci. %08llx%08llx"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:61
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
 msgid "Execute"
 msgstr "Wykonaj"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:459
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:446
 msgid "Export Failed"
 msgstr "Eksportuj nieudany"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:639
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:649
 msgid "Export File"
 msgstr "Eksportuj plik"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:177
 msgid "Export Recording"
 msgstr "Eksportuj nagranie"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:345
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:351
 msgid "Export Recording..."
 msgstr "Eksportuj nagranie..."
 
@@ -2197,7 +2251,7 @@ msgstr "Eksportuj nagranie..."
 msgid "Export Save"
 msgstr "Eksportuj zapis"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:874
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:865
 msgid "Export Wii save (Experimental)"
 msgstr "Eksportuj zapis Wii (eksperymentalne)"
 
@@ -2205,100 +2259,100 @@ msgstr "Eksportuj zapis Wii (eksperymentalne)"
 msgid "Export all saves"
 msgstr "Eksportuj wszystkie zapisy"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:80
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:72
 msgid "Export failed, try again?"
 msgstr "Eksport nieudany, ponowić?"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:559
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:552
 msgid "Export save as..."
 msgstr "Eksportuj zapis jako..."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:297
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:284
 msgid "Extension"
 msgstr "Rozszerzenie"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483
 msgid "External Frame Buffer"
 msgstr "External Frame Buffer"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:61
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:48
 msgid "Extra Parameter"
 msgstr "Parametr Dodatkowy"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:62
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:49
 msgid "Extra Parameter useful in ''Metroid: Other M'' only."
 msgstr "Parametr Dodatkowy przydatny tylko w ''Metroid: Other M\"."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:614
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:624
 msgid "Extract All Files..."
 msgstr "Wypakuj wszystkie pliki..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:616
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:626
 msgid "Extract Apploader..."
 msgstr "Wypakuj Apploader'a..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:617
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627
 msgid "Extract DOL..."
 msgstr "Wypakuj DOL..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:610
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:620
 msgid "Extract Directory..."
 msgstr "Wypakuj folder..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:612
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:622
 msgid "Extract File..."
 msgstr "Wypakuj plik..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:608
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:618
 msgid "Extract Partition..."
 msgstr "Wypakuj partycję..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:724
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:738
 #, c-format
 msgid "Extracting %s"
 msgstr "Wypakowywanie %s"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:707
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:721
 msgid "Extracting All Files"
 msgstr "Wypakowywanie wszystkich plików"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:707
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:721
 msgid "Extracting Directory"
 msgstr "Wypakowywanie folderu"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:710
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:724
 msgid "Extracting..."
 msgstr "Wypakowywanie..."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:892
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:893
 msgid "FIFO Byte"
 msgstr "Bajt FIFO"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:45
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:32
 msgid "FIFO Player"
 msgstr "FIFO Player"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:169
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:163
 msgid "FRANCE"
 msgstr "Francja"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472
 msgid "FST Size:"
 msgstr "Rozmiar FST:"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:77
+#: Source/Core/Core/Src/NetPlayClient.cpp:81
 msgid "Failed to Connect!"
 msgstr "Połączenie nieudane!"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:225
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:228
 msgid "Failed to Listen!!"
 msgstr "Nasłuchiwanie nieudane!"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:307
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:300
 msgid "Failed to download codes."
 msgstr "Pobieranie kodów nieudane!"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:827
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:843
 #, c-format
 msgid "Failed to extract to %s!"
 msgstr "Wypakowanie do %s nie udało się!"
@@ -2324,26 +2378,30 @@ msgstr ""
 "Możesz wykorzystać silnik DSP HLE, który nie wymaga ROM'ów.\n"
 "(Wybierz z zakładki \"Audio\" okna konfiguracyjnego.)"
 
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:116
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:139
+#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:108
+#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:131
 msgid "Failed to load bthprops.cpl"
 msgstr "Ładowanie bthprops.cpl nie udało się"
 
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:100
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:109
+#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:90
+#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:101
 msgid "Failed to load hid.dll"
 msgstr "Ładowanie hid.dll nie udało się"
 
-#: Source/Core/Core/Src/Movie.cpp:792
+#: Source/Core/Core/Src/Movie.cpp:783
 #, c-format
 msgid "Failed to read %s"
 msgstr "Nieudany odczyt %s"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:151
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:144
 msgid "Failed to read banner.bin"
 msgstr "Błąd odczytu banner.bin"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:223
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:178
+msgid "Failed to read bk header"
+msgstr "Odczyt nagłówka bk nie powiódł się"
+
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:211
 #, c-format
 msgid ""
 "Failed to read block %d of the save data\n"
@@ -2354,7 +2412,7 @@ msgstr ""
 "Karta pamięci może być okrojona\n"
 "FilePosition:%llx"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:148
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:136
 msgid ""
 "Failed to read block allocation table backup correctly\n"
 "(0x8000-0x9FFF)"
@@ -2362,7 +2420,7 @@ msgstr ""
 "Błąd poprawnego odczytu block allocation table backup\n"
 "(0x8000-0x9FFF)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:142
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:130
 msgid ""
 "Failed to read block allocation table correctly\n"
 "(0x6000-0x7FFF)"
@@ -2370,12 +2428,17 @@ msgstr ""
 "Błąd poprawnego odczytu block allocation table\n"
 "(0x6000-0x7FFF)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:286
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:279
 #, c-format
 msgid "Failed to read data from file %d"
 msgstr "Odczyt z %d nieudany"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:136
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:367
+#, c-format
+msgid "Failed to read data from file: %s"
+msgstr "Odczyt z pliku %s nie powiódł się"
+
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:124
 msgid ""
 "Failed to read directory backup correctly\n"
 "(0x4000-0x5FFF)"
@@ -2383,7 +2446,7 @@ msgstr ""
 "Błąd poprawnego odczytu folderu zapasowego\n"
 "(0x4000-0x5FFF)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:130
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:118
 msgid ""
 "Failed to read directory correctly\n"
 "(0x2000-0x3FFF)"
@@ -2391,7 +2454,11 @@ msgstr ""
 "Błąd poprawnego odczytu folderu\n"
 "(0x2000-0x3FFF)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:119
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:90
+msgid "Failed to read header"
+msgstr "Odczyt nagłówka nie powiódł się"
+
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:107
 msgid ""
 "Failed to read header correctly\n"
 "(0x0000-0x1FFF)"
@@ -2399,41 +2466,41 @@ msgstr ""
 "Błąd poprawnego odczytu nagłówka\n"
 "(0x0000-0x1FFF)"
 
-#: Source/Core/DiscIO/Src/VolumeGC.cpp:61
+#: Source/Core/DiscIO/Src/VolumeGC.cpp:48
 msgid "Failed to read unique ID from disc image"
 msgstr "Błąd odczytu unikalnego ID z obrazu dysku"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:84
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:71
 msgid "Failed to write BT.DINF to SYSCONF"
 msgstr "Błąd zapisu BT.DINF do SYSCONF"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:228
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:221
 msgid "Failed to write bkhdr"
 msgstr "Zapis bkhdr nie powiódł się"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:164
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:157
 #, c-format
 msgid "Failed to write header for %s"
 msgstr "Zapis nagłówka do %s nie powiódł się"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:258
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:251
 #, c-format
 msgid "Failed to write header for file %d"
 msgstr "Błąd zapisu nagłówka do pliku %d"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294
 msgid "Farsi"
 msgstr "Farsi"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477
 msgid "Fast"
 msgstr "Szybki"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315
 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:1046
+#: Source/Core/Core/Src/Movie.cpp:1037
 #, c-format
 msgid ""
 "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s"
@@ -2441,23 +2508,23 @@ msgstr ""
 "Fatal desync. Anulowanie playback'u. (Błąd w PlayWiimote: %u != %u, byte "
 "%u.)%s"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:199
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:202
 msgid "Fifo Player"
 msgstr "Fifo Player"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:99
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:86
 msgid "File Info"
 msgstr "Informacja o pliku"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:304
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:295
 msgid "File contained no codes."
 msgstr "Plik nie zawiera kodów."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:413
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:400
 msgid "File converted to .gci"
 msgstr "Plik skonwertowany do .gci."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:428
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:415
 msgid ""
 "File could not be opened\n"
 "or does not have a valid extension"
@@ -2465,7 +2532,7 @@ msgstr ""
 "Nie można otworzyć pliku\n"
 "lub posiada niewłaściwe rozszerzenie"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:84
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:72
 #, c-format
 msgid ""
 "File has the extension \"%s\"\n"
@@ -2474,36 +2541,36 @@ msgstr ""
 "Plik posiada rozszerzenie \"%s\"\n"
 "poprawne rozszerzenia to (.raw/.gcp)"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:425
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:412
 msgid "File is not recognized as a memcard"
 msgstr "Plik nierozpoznany jako karta pamięci"
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:294
+#: Source/Core/DiscIO/Src/CompressedBlob.cpp:281
 msgid "File not compressed"
 msgstr "Plik nie skompresowany"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:127
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:109
 #, c-format
 msgid "FileIO: Unknown open mode : 0x%02x"
 msgstr "FileIO: Nieznany tryb otwarcia: 0x%02x"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:531
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:541
 msgid "Filesystem"
 msgstr "System plików"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1100
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1126
 msgid "Filetype 'ini' is unknown! Will not open!"
 msgstr "Nieznany plik typu 'ini'! Nie otworzy się!"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:265
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:252
 msgid "Find next"
 msgstr "Następny"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:266
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:253
 msgid "Find previous"
 msgstr "Poprzedni"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:632
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626
 msgid "First Block"
 msgstr "Blok pierwszy"
 
@@ -2511,23 +2578,23 @@ msgstr "Blok pierwszy"
 msgid "Fix Checksums"
 msgstr "Napraw sumy kontrolne"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:275
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283
 msgid "Force 16:9"
 msgstr "Wymuś 16:9"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:275
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283
 msgid "Force 4:3"
 msgstr "Wymuś 4:3"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:568
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548
 msgid "Force Console as NTSC-J"
 msgstr "Wymuś konsolę jako NTSC-J"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406
 msgid "Force Texture Filtering"
 msgstr "Wymuś filtrowanie tekstur"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90
 msgid ""
 "Force texture filtering even if the emulated game explicitly disabled it.\n"
 "Improves texture quality slightly but causes glitches in some games.\n"
@@ -2539,7 +2606,7 @@ msgstr ""
 "\n"
 "W razie wątpliwości, pozostaw wyłaczone."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83
 msgid ""
 "Force the game to output graphics for widescreen resolutions.\n"
 "Causes graphical glitches is some games.\n"
@@ -2551,7 +2618,7 @@ msgstr ""
 "\n"
 "W razie wątpliwości, pozostaw wyłączone."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488
 msgid ""
 "Forces NTSC-J mode for using the Japanese ROM font.\n"
 "Left unchecked, dolphin defaults to NTSC-U and automatically enables this "
@@ -2561,7 +2628,7 @@ msgstr ""
 "Pozostaw wyłączone, domyślnie NTSC-U i automatycznie włącza gdy gramy w "
 "japońskie gry."
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:74
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:62
 msgid ""
 "Format as ascii (NTSC\\PAL)?\n"
 "Choose no for sjis (NTSC-J)"
@@ -2569,148 +2636,147 @@ msgstr ""
 "Formatować jako ascii (NTSC\\PAL)?\n"
 "Wybierz nie dla sjis (NTSC-J)"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:278
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:265
 msgid "Forward"
 msgstr "W przód"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504
 #, c-format
 msgid "Found %d results for '"
 msgstr "Znaleziono %d dla '"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:857
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:925
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:858
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:926
 msgid "Frame"
 msgstr "Klatka"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:867
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:868
 msgid "Frame "
 msgstr "Klatka"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:185
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:173
 msgid "Frame Advance"
 msgstr "Frame Advance"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:536
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549
 msgid "Frame Dumps use FFV1"
 msgstr "Zrzuty klatek używają FFV1"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:227
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:214
 msgid "Frame Info"
 msgstr "Frame Info"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:116
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:103
 msgid "Frame Range"
 msgstr "Zasięg klatki"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:138
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:139
 msgid "Frame S&kipping"
 msgstr "Frame S&kipping"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:572
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552
 msgid "Framelimit:"
 msgstr "Limit klatek:"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:204
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:191
 msgid "Frames To Record"
 msgstr "Klatki do nagrania"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547
 msgid "Free Look"
 msgstr "Free Look"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
 msgid "French"
 msgstr "Francuski"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:38
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:42
 msgid "Frets"
 msgstr "Gryfy"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:118
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:137
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:105
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:124
 msgid "From"
 msgstr "Z"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:426
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:432
 msgid "FullScr"
 msgstr "FullScr"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:256
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263
 msgid "Fullscreen resolution:"
 msgstr "Rozdzielczość pełnoekranowa:"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:534
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524
 msgid "GCI File(*.gci)"
 msgstr "Plik GCI(*.gci)"
 
-#: Source/Core/DolphinWX/Src/GCMicDlg.h:44
+#: Source/Core/DolphinWX/Src/GCMicDlg.h:31
 msgid "GCMic Configuration"
 msgstr "Konfiguracja GCMic"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:432
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
 msgid "GCPad"
 msgstr "GCPad"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:659
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:658
 msgid "GX_CMD_INVL_VC"
 msgstr "GX_CMD_INVL_VC"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:448
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:452
 msgid "Game ID:"
 msgstr "ID gry:"
 
-#: Source/Core/Core/Src/NetPlay.cpp:229
+#: Source/Core/Core/Src/NetPlay.cpp:216
 msgid "Game is already running!"
 msgstr "Gra jest już uruchomiona!"
 
-#: Source/Core/Core/Src/NetPlay.cpp:259
+#: Source/Core/Core/Src/NetPlay.cpp:246
 msgid "Game isn't running!"
 msgstr "Gra nie jest uruchomiona!"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:389
-#, fuzzy
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:393
 msgid "Game not found!"
-msgstr "Gry nie odnaleziono!"
+msgstr "Nie znaleziono gry!"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:385
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:389
 msgid "Game-Specific Settings"
 msgstr "Specyficzne ustawienia gry"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:293
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:294
 msgid "GameConfig"
 msgstr "Konfiguracja gry"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:525
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:515
 msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)"
 msgstr "Pliki zapisu GameCube(*.gci;*.gcs;*.sav)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534
 msgid "Gamecube"
 msgstr "Gamecube"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:178
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:181
 msgid "Gamecube &Pad Settings"
 msgstr "Ustawienia &pada GC"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:218
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1069
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:205
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1052
 msgid "Gamecube Memory Cards (*.raw,*.gcp)"
 msgstr "Karty pamięci GC (*.raw,*.gcp)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:432
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
 msgid "Gamecube Pad settings"
 msgstr "Ustawienia pada GC"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:117
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302
 msgid "Gecko Codes"
 msgstr "Kody Gecko"
 
-#: Source/Core/Core/Src/GeckoCode.cpp:222
+#: Source/Core/Core/Src/GeckoCode.cpp:214
 #, c-format
 msgid ""
 "GeckoCode failed to run (CT%i CST%i) (%s)\n"
@@ -2723,10 +2789,10 @@ msgstr ""
 "obsługi kodu poprzez wklejenie pliku codehandler.bin w folderze Sys oraz "
 "zrestartowaniiu programu)"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:172
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:197
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:160
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:160
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:202
 msgid "General"
 msgstr "Główne"
 
@@ -2734,30 +2800,30 @@ msgstr "Główne"
 msgid "General Settings"
 msgstr "Ustawienia ogólne"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:470
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:281
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:316
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:261
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
 msgid "German"
 msgstr "Niemiecki"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:449
+#: Source/Core/Core/Src/ActionReplay.cpp:439
 #, 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:430
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:436
 msgid "Graphics"
 msgstr "Grafika"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:430
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:436
 msgid "Graphics settings"
 msgstr "Ustawienia graficzne"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:205
 msgid "Greater Than"
 msgstr "Większy niż"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87
 msgid ""
 "Greatly increases quality of textures generated using render to texture "
 "effects.\n"
@@ -2775,51 +2841,76 @@ msgstr ""
 "\n"
 "W razie wątpliwości, pozostaw włączone."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:317
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
 msgid "Greek"
 msgstr "Grecki"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:22
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Green"
 msgstr "Zielony"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:24
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Green Left"
 msgstr "Zielony lewo"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:25
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Green Right"
 msgstr "Zielony prawo"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:35
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:39
 msgid "Guitar"
 msgstr "Gitara"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1259
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1250
 msgid "HCI_CMD_INQUIRY is called, please report!"
 msgstr "HCI_CMD_INQUIRY wywołany, raportuj!"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:421
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504
+msgid "Hacked Buffer Upload"
+msgstr "Hacked Buffer Upload"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431
 msgid "Hacks"
 msgstr "Hacki"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:158
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:146
 msgid "Header checksum failed"
 msgstr "Suma kontrolna nagłówka nie powiodła się"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:318
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298
 msgid "Hebrew"
 msgstr "Hebrajski"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:313
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:300
 msgid "Height"
 msgstr "Wysokość"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:64
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:51
 msgid "Help"
 msgstr "Pomoc"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:209
+#: Source/Core/DolphinWX/Src/Main.cpp:229
+msgid ""
+"Hi,\n"
+"\n"
+"Dolphin requires Mac OS X 10.7 or greater.\n"
+"Unfortunately you're running an old version of OS X.\n"
+"The last Dolphin version to support OS X 10.6 is Dolphin 3.5\n"
+"Please upgrade to 10.7 or greater to use the newest Dolphin version.\n"
+"\n"
+"Sayonara!\n"
+msgstr ""
+"Hej!\n"
+"\n"
+"Dolphin wymaga Mac OS X 10.7 lub nowszego.\n"
+"Niestety pracujesz na starszej wersji OS X'a.\n"
+"Ostatnią wersją Dolphin'a, która wspiera OS X 10.6 jest Dolphin 3.5.\n"
+"Proszę uaktualnić system do wersji 10.7 lub nowszej, w celu korzystania z "
+"najnowszych wersji Dolphin'a.\n"
+"\n"
+"Narka!\n"
+
+#: Source/Core/DolphinWX/Src/Main.cpp:220
 msgid ""
 "Hi,\n"
 "\n"
@@ -2834,15 +2925,15 @@ msgstr ""
 "\n"
 "Pozdro i poćwicz!\n"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:309
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:296
 msgid "Hide"
 msgstr "Ukryj"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:307
 msgid "Hide Mouse Cursor"
 msgstr "Ukryj kursor myszy"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79
 msgid ""
 "Hides the mouse cursor if it's on top of the emulation window.\n"
 "\n"
@@ -2852,26 +2943,26 @@ msgstr ""
 "\n"
 "W razie wątpliwości, pozostaw włączone."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:54
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41
 msgid "Home"
 msgstr "Home"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:85
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:138
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:76
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:141
 msgid "Host"
 msgstr "Host"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.h:44
+#: Source/Core/DolphinWX/Src/HotkeyDlg.h:31
 msgid "Hotkey Configuration"
 msgstr "Konfiguracja skrótów klawiszowych"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:272
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:272
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:594
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:260
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:260
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574
 msgid "Hotkeys"
 msgstr "Skróty klawiszowe"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:319
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299
 msgid "Hungarian"
 msgstr "Węgierski"
 
@@ -2879,34 +2970,34 @@ msgstr "Węgierski"
 msgid "Hybrid Wiimote"
 msgstr "Hybrydowy Wiilot"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:532
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:519
 #, 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:786
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:773
 #, c-format
 msgid ""
-"IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available "
-"in your nand dump\n"
+"IOCTL_ES_LAUNCH: Game tried to reload an IOS or a title that is not "
+"available in your NAND dump\n"
 "TitleID %016llx.\n"
-" Dolphin will likely hang now"
+" Dolphin will likely hang now."
 msgstr ""
-"IOCTL_ES_LAUNCH: Gra próbowała ponownie wczytać ios lub tytuł, który jest "
+"IOCTL_ES_LAUNCH: Gra próbowała ponownie wczytać IOS lub tytuł, który jest "
 "niedostępny w Twoim zrzucie NAND\n"
 "TitleID %016llx.\n"
 "Program teraz chyba się zawiesi :C"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:313
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:300
 msgid "IOCTL_ES_READCONTENT - bad destination"
 msgstr "IOCTL_ES_READCONTENT - zła ścieżka"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729
 msgid "IPL Settings"
 msgstr "Ustawienia IPL"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269
 msgid "IR"
 msgstr "IR"
 
@@ -2918,23 +3009,23 @@ msgstr "Wskaźnik IR"
 msgid "IR Sensitivity:"
 msgstr "Czułość IR"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:502
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:512
 msgid "ISO Details"
 msgstr "Szczegóły ISO"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:830
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:811
 msgid "ISO Directories"
 msgstr "Foldery ISO"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:172
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:166
 msgid "ITALY"
 msgstr "Włochy"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:630
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:624
 msgid "Icon"
 msgstr "Ikona"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332
 msgid ""
 "If checked, the bounding box registers will be updated. Used by the Paper "
 "Mario games."
@@ -2942,28 +3033,11 @@ msgstr ""
 "Jeśli włączone, bounding box registers zostaną zaktualizowane. "
 "Wykorzystywane przez gry Paper Mario."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318
-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:505
-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 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:428
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438
 msgid "Ignore Format Changes"
 msgstr "Ignoruj zmiany formatu"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94
 msgid ""
 "Ignore any changes to the EFB format.\n"
 "Improves performance in many games without any negative effect. Causes "
@@ -2977,7 +3051,7 @@ msgstr ""
 "\n"
 "W razie wątpliwości, pozostaw włączone."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93
 msgid ""
 "Ignore any requests of the CPU to read from or write to the EFB.\n"
 "Improves performance in some games, but might disable some gameplay-related "
@@ -2995,11 +3069,11 @@ msgstr ""
 msgid "Import Save"
 msgstr "Importuj zapis"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:59
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:48
 msgid "Import failed, try again?"
 msgstr "Importowanie nie powiodło się, próbować ponownie?"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:454
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:441
 msgid ""
 "Imported file has gsc extension\n"
 "but does not have a correct header"
@@ -3007,11 +3081,11 @@ msgstr ""
 "Zaimportowany plik posiada rozszerzenie gsc\n"
 "lecz nie posiada właściwego nagłówka"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:442
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:429
 msgid "Imported file has invalid length"
 msgstr "Zaimportowany plik jest niewłąściwej wielkości"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:451
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:438
 msgid ""
 "Imported file has sav extension\n"
 "but does not have a correct header"
@@ -3019,19 +3093,7 @@ msgstr ""
 "Zaimportowany plik posiada rozszerzenie sav\n"
 "lecz nie posiada właściwego nagłówka"
 
-#: 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 ""
-"Zwiększa wydajność, ale powoduje błędy w grach, które wymagają właściwej "
-"emulacji mgły.\n"
-"\n"
-"W razie wątpliwości, pozostaw wyłączone."
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350
 msgid "In Game"
 msgstr "W grze"
 
@@ -3039,66 +3101,66 @@ msgstr "W grze"
 msgid "In-Game"
 msgstr "W grze"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:34
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305
 msgid "Info"
 msgstr "Info"
 
-#: Source/Core/Common/Src/MsgHandler.cpp:65
+#: Source/Core/Common/Src/MsgHandler.cpp:51
 msgid "Information"
 msgstr "Informacja"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:481
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:468
 msgid "Input"
 msgstr "Wejście"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:63
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:50
 msgid "Insert"
 msgstr "Wstaw"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:176
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:166
 msgid "Insert Encrypted or Decrypted code here..."
 msgstr "Wprowadź zaszyfrowany/zdeszyfrowany kod tutaj..."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:763
 msgid "Insert SD Card"
 msgstr "Włóż kartę SD"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:34
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:21
 msgid "Insert name here.."
 msgstr "Wprowadź nazwę tutaj..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:196
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:199
 msgid "Install WAD"
 msgstr "Zainstaluj WAD"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:895
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:888
 msgid "Install to Wii Menu"
 msgstr "Zainstaluj do Wii Menu"
 
-#: Source/Core/Core/Src/x64MemTools.cpp:252
+#: Source/Core/Core/Src/x64MemTools.cpp:242
 msgid ""
 "InstallExceptionHandler called, but this platform does not yet support it."
 msgstr ""
 "InstallExceptionHandler wywołany, ale ta platforma nie wspiera go jeszcze."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1297
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
 msgid "Installing WAD..."
 msgstr "Instalacja WAD..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:885
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:901
 msgid "Integrity Check Error"
 msgstr "Błąd sprawdzania integralności"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:891
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:907
 msgid "Integrity check completed"
 msgstr "Sprawdzanie integralności zakończone"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:890
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:906
 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:882
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:898
 #, c-format
 msgid ""
 "Integrity check for partition %d failed. Your dump is most likely corrupted "
@@ -3107,19 +3169,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:552
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532
 msgid "Interface"
 msgstr "Interfejs"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:646
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627
 msgid "Interface Settings"
 msgstr "Ustawienia interfejsu"
 
-#: Source/Core/Core/Src/State.cpp:240
+#: Source/Core/Core/Src/State.cpp:228
 msgid "Internal LZO Error - compression failed"
 msgstr "Wewnętrzny błąd LZO - kompresja nie powiodła się"
 
-#: Source/Core/Core/Src/State.cpp:348
+#: Source/Core/Core/Src/State.cpp:336
 #, c-format
 msgid ""
 "Internal LZO Error - decompression failed (%d) (%li, %li) \n"
@@ -3128,41 +3190,45 @@ msgstr ""
 "Wewnętrzny błąd LZO - dekompresja nie powiodła się (%d) (%li, %li) \n"
 "Wczytaj stan ponownie"
 
-#: Source/Core/Core/Src/State.cpp:485
+#: Source/Core/Core/Src/State.cpp:473
 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:344
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:352
 msgid "Internal Resolution:"
 msgstr "Wewnętrzna rozdzielczość:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:42
+msgid "Interpreter (VERY slow)"
+msgstr "Interpreter (BARDZO wolne)"
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349
 msgid "Intro"
 msgstr "Intro"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:194
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:187
 #, c-format
 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:600
 msgid "Invalid Value!"
 msgstr "Niewłaściwa wartość!"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:462
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:449
 msgid "Invalid bat.map or dir entry"
 msgstr "Niewłaściwe bat.map lub wejście folderu"
 
-#: Source/Core/Core/Src/CoreTiming.cpp:548
+#: Source/Core/Core/Src/CoreTiming.cpp:553
 #, c-format
 msgid "Invalid event type %i"
 msgstr "Niewłaściwy typ zdarzenia %i"
 
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:326
+#: Source/Core/Core/Src/HW/DVDInterface.cpp:309
 msgid "Invalid file"
 msgstr "Niewłaściwy plik"
 
-#: Source/Core/DiscIO/Src/BannerLoaderGC.cpp:41
+#: Source/Core/DiscIO/Src/BannerLoaderGC.cpp:28
 #, c-format
 msgid ""
 "Invalid opening.bnr found in gcm:\n"
@@ -3173,48 +3239,56 @@ msgstr ""
 "%s\n"
 "Będziesz musiał ponownie zrzucić grę."
 
-#: Source/Core/Core/Src/Movie.cpp:735
+#: Source/Core/Core/Src/Movie.cpp:726
 msgid "Invalid recording file"
 msgstr "Newłaściwy plik nagrania"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:473
+#: 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:456
+#: 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:444
+#: 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:513
+#: Source/Core/Core/Src/Core.cpp:511
 msgid "Invalid state"
 msgstr "Niewłaściwy stan"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:473
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:320
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300
 msgid "Italian"
 msgstr "Włoski"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:183
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:177
 msgid "JAPAN"
 msgstr "Japonia"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:321
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:46
+msgid "JIT Recompiler (recommended)"
+msgstr "JIT Recompiler (zalecane)"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:47
+msgid "JITIL experimental recompiler"
+msgstr "JITIL experimental recompiler"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:279
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
 msgid "Japanese"
 msgstr "Japoński"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:188
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:182
 msgid "KOREA"
 msgstr "Korea"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78
 msgid ""
 "Keep the game window on top of all other windows.\n"
 "\n"
@@ -3224,62 +3298,62 @@ msgstr ""
 "\n"
 "W razie wątpliwości, pozostaw wyączone."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:298
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:306
 msgid "Keep window on top"
 msgstr "Okno na wierzchu"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:241
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:241
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:229
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:229
 msgid "Key"
 msgstr "Klawisz"
 
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282
 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:322
 msgid "Korean"
 msgstr "Koreański"
 
 #. i18n:  Left
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:57
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:44
 msgid "L"
 msgstr "L"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:39
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:26
 msgid "L Button"
 msgstr "L Button"
 
 #. i18n:  Left-Analog
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:61
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:48
 msgid "L-Analog"
 msgstr "L-Analog"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:585
 msgid "Language:"
 msgstr "Język:"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:152
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:153
 msgid "Last Overwritten State"
 msgstr "Ostatni nadpisany stan"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:159
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:161
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:160
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:162
 msgid "Last Saved State"
 msgstr "Ostatni zapisany stan"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:696
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:677
 msgid "Latency:"
 msgstr "Opóźnienie:"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:276
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:55
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:263
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:42
 msgid "Left"
 msgstr "Lewo"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:60
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:64
 msgid "Left Stick"
 msgstr "Gałka lewa"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:257
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:257
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:245
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:245
 msgid ""
 "Left click to detect hotkeys.\n"
 "Enter space to clear."
@@ -3287,7 +3361,7 @@ msgstr ""
 "LPM by wykryc skróty klawiszowe.\n"
 "Wciśnij spację by wyczyścic."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:689
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:678
 msgid ""
 "Left-click to detect input.\n"
 "Middle-click to clear.\n"
@@ -3297,7 +3371,7 @@ msgstr ""
 "ŚPM by wyczyścic.\n"
 "PPM więcej opcji."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:694
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:683
 msgid ""
 "Left/Right-click for more options.\n"
 "Middle-click to clear."
@@ -3305,76 +3379,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:206
 msgid "Less Than"
 msgstr "Mniej niż"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:565
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545
 msgid "Limit by FPS"
 msgstr "Limit FPS"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:924
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:915
 msgid "Load"
 msgstr "Wczytaj"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544
 msgid "Load Custom Textures"
 msgstr "Wczytaj własne tekstury"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
 msgid "Load State Slot 1"
 msgstr "Wczytaj stan Slot 1"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189
 msgid "Load State Slot 2"
 msgstr "Wczytaj stan Slot 2"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:190
 msgid "Load State Slot 3"
 msgstr "Wczytaj stan Slot 3"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:203
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:191
 msgid "Load State Slot 4"
 msgstr "Wczytaj stan Slot 4"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192
 msgid "Load State Slot 5"
 msgstr "Wczytaj stan Slot 5"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193
 msgid "Load State Slot 6"
 msgstr "Wczytaj stan Slot 6"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:194
 msgid "Load State Slot 7"
 msgstr "Wczytaj stan Slot 7"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:195
 msgid "Load State Slot 8"
 msgstr "Wczytaj stan Slot 8"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:155
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:156
 msgid "Load State..."
 msgstr "Wczytaj stan..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1332
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1359
 msgid "Load Wii System Menu"
 msgstr "Wczytaj Wii System Menu"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1327
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1354
 #, c-format
 msgid "Load Wii System Menu %d%c"
 msgstr "Wczytaj Wii System Menu %d %c"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112
 msgid ""
 "Load custom textures from User/Load/Textures/<game_id>/\n"
 "\n"
@@ -3384,7 +3458,7 @@ msgstr ""
 "\n"
 "W razie wątpliwości, pozostaw wyłączone."
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:50
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:37
 msgid "Load preset values from hack patterns available."
 msgstr "Ładuje wartości wcześniej ustawione z dostępnych hack patterns"
 
@@ -3392,23 +3466,23 @@ msgstr "Ładuje wartości wcześniej ustawione z dostępnych hack patterns"
 msgid "Local"
 msgstr "Lokalny"
 
-#: Source/Core/DolphinWX/Src/LogWindow.h:51
+#: Source/Core/DolphinWX/Src/LogWindow.h:38
 msgid "Log"
 msgstr "Log"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:26
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:13
 msgid "Log Configuration"
 msgstr "Konfiguracja Logu"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:296
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304
 msgid "Log FPS to file"
 msgstr "Zapisz FPS do pliku"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:96
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83
 msgid "Log Types"
 msgstr "Typy logów"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103
 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"
@@ -3420,24 +3494,24 @@ msgstr ""
 "\n"
 "W razie wątpliwości, pozostaw wyłączone."
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:81
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:68
 msgid "Logger Outputs"
 msgstr "Logger Outputs"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132
-#: Source/Core/DolphinWX/Src/Frame.cpp:328
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:119
+#: Source/Core/DolphinWX/Src/Frame.cpp:314
 msgid "Logging"
 msgstr "Logging"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:255
+#: Source/Core/Core/Src/NetPlayClient.cpp:259
 msgid "Lost connection to server!"
 msgstr "Połączenie z serwerem przerwane!"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:42
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:29
 msgid "M Button"
 msgstr "M Button"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:119
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:112
 #, c-format
 msgid ""
 "MD5 mismatch\n"
@@ -3446,51 +3520,66 @@ msgstr ""
 "MD5 niepoprawne\n"
 " %016llx%016llx != %016llx%016llx"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314
 msgid "MMU Speed Hack"
 msgstr "MMU Speed Hack"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:527
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:563
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:517
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:556
 msgid "MadCatz Gameshark files(*.gcs)"
 msgstr "Pliki MadCatz Gameshark(*.gcs)"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:51
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:63
+#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:38
 msgid "Main Stick"
 msgstr "Główna gałka"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460
 msgid "Maker ID:"
 msgstr "ID twórcy:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487
 msgid "Maker:"
 msgstr "Twórca:"
 
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100
+msgid ""
+"Makes distant objects more visible by removing fog, thus increasing the "
+"overall detail.\n"
+"Disabling fog will break some games which rely on proper fog emulation.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+"Sprawia, że odległe obiekty są bardziej widoczne przez usunięcie mgły, "
+"wyostrzając ogólne szczegóły.\n"
+"Wyłącznie mgły może zepsuć niektóre gry, które opierają się na poprawnej "
+"emulacji mgły.\n"
+"\n"
+"W razie wątpliwości, pozostaw wyłączone."
+
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:97
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:100
 msgid "Max"
 msgstr "Max"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:448
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:435
 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:291
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:278
 msgid "Memcard already opened"
 msgstr "Karta pamięci już otwarta"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:912
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:913
 msgid "Memory Byte"
 msgstr "Bajt pamięci"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:225
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:113
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:212
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:93
 msgid "Memory Card"
 msgstr "Karta pamięci"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.h:36
+#: Source/Core/DolphinWX/Src/MemcardManager.h:23
 msgid ""
 "Memory Card Manager WARNING-Make backups before using, should be fixed but "
 "could mangle stuff!"
@@ -3498,7 +3587,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:371
+#: Source/Core/Core/Src/CoreParameter.cpp:360
 #, c-format
 msgid ""
 "Memory Card filename in Slot %c is incorrect\n"
@@ -3515,15 +3604,15 @@ msgstr ""
 "%s\n"
 "Czy chcesz skopiować stary plik do nowej lokacji?\n"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:124
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:112
 msgid "Memorycard filesize does not match the header size"
 msgstr "Wielkość pliku karty pamięci nie odpowiada wielkości nagłówka"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:50
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:37
 msgid "Menu"
 msgstr "Menu"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:114
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:94
 msgid "Mic"
 msgstr "Mikrofon"
 
@@ -3532,20 +3621,20 @@ msgstr "Mikrofon"
 msgid "Min"
 msgstr "Min"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:580
 msgid "Misc"
 msgstr "Różne"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:795
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776
 msgid "Misc Settings"
 msgstr "Ustawienia różne"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:240
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:294
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:227
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:281
 msgid "Modifier"
 msgstr "Zmiennik"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106
 msgid ""
 "Modify textures to show the format they're encoded in. Needs an emulation "
 "reset in most cases.\n"
@@ -3557,20 +3646,20 @@ msgstr ""
 "\n"
 "W razie wątpliwości, pozostaw wyłączone."
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:115
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:108
 msgid "Monospaced font"
 msgstr "Nieproporcjonalna czcionka"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:305
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:292
 msgid "Motion Plus"
 msgstr "Motion Plus"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:309
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:86
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:296
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73
 msgid "Motor"
 msgstr "Motor"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:654
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:666
 msgid ""
 "Move the mouse pointer over an option to display a detailed description.\n"
 "\n"
@@ -3588,225 +3677,236 @@ msgstr ""
 "\n"
 "\n"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:75
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:62
 msgid "Multiply"
 msgstr "Pomnóż"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:651
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:650
 msgid "NOP"
 msgstr "NOP"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:629
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:628
 msgid "NOTE: Stream size doesn't match actual data length\n"
 msgstr ""
 "Notka: Wielkość strumienia nie zgadza się z właściwą długością danych\n"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:129
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:116
 msgid "NP Add"
 msgstr "NP Add"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:124
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:111
 msgid "NP Begin"
 msgstr "NP Begin"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:132
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:119
 msgid "NP Decimal"
 msgstr "NP Decimal"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:126
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:113
 msgid "NP Delete"
 msgstr "NP Delete"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:133
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:120
 msgid "NP Divide"
 msgstr "NP Divide"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:120
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:107
 msgid "NP Down"
 msgstr "NP Down"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:123
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:110
 msgid "NP End"
 msgstr "NP End"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:111
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:98
 msgid "NP Enter"
 msgstr "NP Enter"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:127
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:114
 msgid "NP Equal"
 msgstr "NP Equal"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:116
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:103
 msgid "NP Home"
 msgstr "NP Home"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:125
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:112
 msgid "NP Insert"
 msgstr "NP Insert"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:117
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:104
 msgid "NP Left"
 msgstr "NP Left"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:128
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:115
 msgid "NP Multiply"
 msgstr "NP Multiply"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:122
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:109
 msgid "NP Page Down"
 msgstr "NP Page Down"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:121
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:108
 msgid "NP Page Up"
 msgstr "NP Page Up"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:119
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:106
 msgid "NP Right"
 msgstr "NP Right"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:130
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:117
 msgid "NP Separator"
 msgstr "NP Separator"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:109
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:96
 msgid "NP Space"
 msgstr "NP Space"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:131
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:118
 msgid "NP Subtract"
 msgstr "NP Subtract"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:110
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:97
 msgid "NP Tab"
 msgstr "NP Tab"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:118
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:105
 msgid "NP Up"
 msgstr "NP Up"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:444
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:59
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:50
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:448
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:46
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:37
 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:25
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:72
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:282
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:553
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:15
 msgid "Name: "
 msgstr "Nazwa:"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:526
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:562
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:516
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:555
 msgid "Native GCI files(*.gci)"
 msgstr "Natywne pliki GCI(*.gci)"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:161
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:148
 msgid "New Scan"
 msgstr "Nowe skanowanie"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:206
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:193
 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:801
 msgid "Next Page"
 msgstr "Następna strona"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:165
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:152
 msgid "Next Scan"
 msgstr "Następne skanowanie"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:68
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:59
 msgid "Nickname :"
 msgstr "Ksywa:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:196
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:190
 msgid "No Country (SDK)"
 msgstr "No Country (SDK)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:370
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:357
 msgid "No ISOs or WADS found"
 msgstr "Nie odnaleziono IOS/WAD"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:508
+#: Source/Core/Core/Src/ConfigManager.h:17
+msgid "No audio output"
+msgstr "Brak wyjścia audio"
+
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:501
 #, c-format
 msgid "No banner file found for title  %s"
 msgstr "Nie odnaleziono pliku banera dla tytułu %s"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:761
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:768
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:760
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:767
 msgid "No description available"
 msgstr "Brak opisu"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:514
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:535
 msgid "No docking"
 msgstr "Brak dokowania"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:859
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:860
 msgid "No file loaded"
 msgstr "Nie wczytano żadnego pliku"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:439
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:426
 msgid "No free dir index entries"
 msgstr "Brak wolnych wejść folderów"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:895
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:896
 msgid "No recorded file"
 msgstr "Brak nagranego pliku"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:501
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:494
 #, c-format
 msgid "No save folder found for title %s"
 msgstr "Nie odnaleziono folderu zapisu dla tytułu %s"
 
+#: Source/Plugins/Plugin_VideoOGL/Src/main.cpp:132
+#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:111
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:23
 #: Source/Core/DolphinWX/Src/NetWindow.cpp:600
 msgid "None"
 msgstr "Żadne"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:323
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303
 msgid "Norwegian Bokmaal"
 msgstr "Norweski"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:203
 msgid "Not Equal"
 msgstr "Nie równe"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:804
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:794
 msgid "Not Set"
 msgstr "Nie ustawiono"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:626
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:101
+#, c-format
+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/Main.cpp:654
 msgid "Not connected"
 msgstr "Nie połączono"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:309
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:296
 msgid "Notes"
 msgstr "Notatki"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:16
 msgid "Notes: "
 msgstr "Notatki:"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:71
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:74
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:580
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:621
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:629
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:59
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:64
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:613
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:659
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:667
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:31
 msgid "Notice"
 msgstr "Uwagi"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:105
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:92
 msgid "Num Lock"
 msgstr "Num Lock"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:88
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:75
 msgid "Number Of Codes: "
 msgstr "Liczba kodów:"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:30
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:34
 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26
 msgid "Nunchuk"
 msgstr "Nunchuk"
@@ -3815,96 +3915,97 @@ msgstr "Nunchuk"
 msgid "Nunchuk Acceleration"
 msgstr "Acelerator Nunchak'a"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:877
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:878
 msgid "Object"
 msgstr "Objekt"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:135
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:122
 msgid "Object Range"
 msgstr "Zasięg objektu"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:243
 msgid "Off"
 msgstr "Wyłączone"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:62
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:49
 msgid "Offset:"
 msgstr "Offset:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:582
 msgid "On-Screen Display Messages"
 msgstr "On-Screen Display Messages"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:436
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:423
 #, c-format
 msgid "Only %d blocks available"
 msgstr "Dostępnych tylko %d bloków"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:420
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:178
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:426
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:166
 msgid "Open"
 msgstr "Otwórz"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:876
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:867
 msgid "Open &containing folder"
 msgstr "Otwórz &folder zawartości"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:873
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:864
 msgid "Open Wii &save folder"
 msgstr "Otwórz folder &zapisów Wii"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:420
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:426
 msgid "Open file..."
 msgstr "Otwórz plik..."
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:61
+#: Source/Core/AudioCommon/Src/OpenALStream.cpp:48
 #, 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:72
+#: Source/Core/AudioCommon/Src/OpenALStream.cpp:59
 msgid "OpenAL: can't find sound devices"
 msgstr "OpenAL: nie można odnaleźć urządzeń dźwiękowych"
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:66
+#: Source/Core/AudioCommon/Src/OpenALStream.cpp:53
 #, c-format
 msgid "OpenAL: can't open device %s"
 msgstr "OpenAL: nie można otworzyć urządzenia %s"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502
 msgid "OpenCL Texture Decoder"
 msgstr "OpenCL Texture Decoder"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503
 msgid "OpenMP Texture Decoder"
 msgstr "OpenMP Texture Decoder"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:317
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:94
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:304
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:81
 msgid "Options"
 msgstr "Opcje"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:22
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Orange"
 msgstr "Pomarańczowy"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:468
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:455
+#, fuzzy
 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"
+"and import the saves to a new memcard\n"
 msgstr ""
 "Kolejność plików w folderze niezgodna z kolejnościa bloków\n"
 "PPM i wyeksportuj wszystkie zapisy,\n"
 "następnie zaimportuj te zapisy do nowej karty pamięci\n"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:316
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:324
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:509
 msgid "Other"
 msgstr "Pozostałe"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:206
+#: Source/Core/Core/Src/NetPlayClient.cpp:210
 msgid ""
 "Other client disconnected while game is running!! NetPlay is disabled. You "
 "manually stop the game."
@@ -3912,15 +4013,15 @@ msgstr ""
 "Inny klient rozłączony podczas uruchomionej gry! NetPlay wyłączony. Musisz "
 "ręcznie zatrzymać grę."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:481
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:468
 msgid "Output"
 msgstr "Wyjście"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:342
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:348
 msgid "P&lay Recording..."
 msgstr "Od&twórz nagranie"
 
-#: Source/Core/Core/Src/HW/GCPad.cpp:30
+#: Source/Core/Core/Src/HW/GCPad.cpp:18
 msgid "Pad"
 msgstr "Pad"
 
@@ -3928,160 +4029,160 @@ msgstr "Pad"
 msgid "Pad "
 msgstr "Pad "
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:34
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:38
 msgid "Pads"
 msgstr "Pady"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:108
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:95
 msgid "Page Down"
 msgstr "Page Down"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:107
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:94
 msgid "Page Up"
 msgstr "Page Up"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:35
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:22
 msgid "Paragraph"
 msgstr "Paragraf"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:64
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:51
 msgid "Parameters"
 msgstr "Paramerty"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:222
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:217
 #, c-format
 msgid "Partition %i"
 msgstr "Partycja %i"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:296
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:297
 msgid "Patches"
 msgstr "Patche"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:556
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536
 msgid "Paths"
 msgstr "Ścieżki"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1538
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1539
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:51
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1565
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1566
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:38
 msgid "Pause"
 msgstr "Pause"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:128
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:129
 msgid "Pause at end of movie"
 msgstr "Zatrzymaj na koncu filmu"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:397
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405
 msgid "Per-Pixel Lighting"
 msgstr "Per-Pixel Lighting"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352
 msgid "Perfect"
 msgstr "Perfekcyjny"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:609
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:642
 #, c-format
 msgid "Perspective %d"
 msgstr "Perspekrtywa %d"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:165
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:424
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1547
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1548
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:152
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:430
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1574
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1575
 msgid "Play"
 msgstr "Play"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176
 msgid "Play Recording"
 msgstr "Odtwórz nagranie"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:170
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:170
 msgid "Play/Pause"
 msgstr "Play/Pause"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351
 msgid "Playable"
 msgstr "Grywalny"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:154
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:141
 msgid "Playback Options"
 msgstr "Opcje playback'u"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:301
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:304
 msgid "Players"
 msgstr "Gracze"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:988
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:991
 msgid "Please confirm..."
 msgstr "Potwierdź..."
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:579
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:612
 msgid "Please create a perspective before saving"
 msgstr "Proszę utworzyć perspektywę przed zapisem"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:36
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:23
 msgid "Plus-Minus"
 msgstr "Plus-Minus"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:324
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304
 msgid "Polish"
 msgstr "Polski"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:713
 msgid "Port 1"
 msgstr "Port 1"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714
 msgid "Port 2"
 msgstr "Port 2"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:734
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715
 msgid "Port 3"
 msgstr "Port 3"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716
 msgid "Port 4"
 msgstr "Port 4"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:97
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:130
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:88
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:133
 msgid "Port :"
 msgstr "Port :"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:325
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305
 msgid "Portuguese"
 msgstr "Portugalski"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:326
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306
 msgid "Portuguese (Brazilian)"
 msgstr "Portugalski (Brazylijski)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:391
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:399
 msgid "Post-Processing Effect:"
 msgstr "Post-Processing Effect:"
 
-#: Source/Core/Core/Src/Movie.cpp:936
+#: Source/Core/Core/Src/Movie.cpp:927
 #, 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:1055
+#: Source/Core/Core/Src/Movie.cpp:1046
 #, 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:1032
+#: Source/Core/Core/Src/Movie.cpp:1023
 #, c-format
 msgid "Premature movie end in PlayWiimote. %u > %u"
 msgstr "Premature movie end in PlayWiimote. %u > %u"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:48
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:35
 msgid "Presets: "
 msgstr "Presets: "
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:205
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:192
 msgid "Prev Page"
 msgstr "Poprzednia strona"
 
@@ -4089,67 +4190,67 @@ msgstr "Poprzednia strona"
 msgid "Previous Page"
 msgstr "Poprzednia strona"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:183
 msgid "Previous Value"
 msgstr "Poprzednia wartość"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:60
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:47
 msgid "Print"
 msgstr "Drukuj"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:894
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:885
 msgid "Profile"
 msgstr "Profil"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.h:55
+#: Source/Core/DolphinWX/Src/ISOProperties.h:42
 msgid "Properties"
 msgstr "Właściwości"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:283
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:286
 msgid "Purge Cache"
 msgstr "Purge Cache"
 
-#: Source/Core/Common/Src/MsgHandler.cpp:66
+#: Source/Core/Common/Src/MsgHandler.cpp:52
 msgid "Question"
 msgstr "Pytanie"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:159
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:316
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:162
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:319
 msgid "Quit"
 msgstr "Zamknij"
 
 #. i18n:  Right
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:59
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:46
 msgid "R"
 msgstr "R"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:40
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:27
 msgid "R Button"
 msgstr "R Button"
 
 #. i18n:  Right-Analog
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:63
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
 msgid "R-Analog"
 msgstr "R-Analog"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:445
 msgid "RAM"
 msgstr "RAM"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:175
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:169
 msgid "RUSSIA"
 msgstr "Rosja"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:528
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:515
 msgid "Range"
 msgstr "Zasięg"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:190
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:178
 msgid "Read-only mode"
 msgstr "Tryb tylko do odczytu"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:487
 msgid "Real"
 msgstr "Prawdziwy"
 
@@ -4165,33 +4266,33 @@ msgstr "Prawdziwe Wiiloty"
 msgid "Reconnect Wiimote on State Loading"
 msgstr "Podłacz ponownie Wiilota gdy wczytywany jest stan"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:193
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:217
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:791
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:180
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:204
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:790
 msgid "Record"
 msgstr "Nagranie"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:174
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:161
 msgid "Recording Info"
 msgstr "Informacje nagrywania"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:202
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:189
 msgid "Recording Options"
 msgstr "Opcje nagrywania"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:21
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Red"
 msgstr "Czerwony"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:24
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Red Left"
 msgstr "Czerwony lewo"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:25
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Red Right"
 msgstr "Czerwony prawo"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86
 msgid ""
 "Reduces the amount of aliasing caused by rasterizing 3D graphics.\n"
 "This makes the rendered picture look less blocky.\n"
@@ -4206,28 +4307,28 @@ msgstr ""
 "W razie wątpliwości, wybierz Żadne."
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:60
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:421
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:903
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:427
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:894
 msgid "Refresh"
 msgstr "Odśwież"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:180
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:168
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:168
 msgid "Refresh List"
 msgstr "Odśwież listę"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:421
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:427
 msgid "Refresh game list"
 msgstr "Odśwież listę gier"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:405
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:427
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:77
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:812
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:409
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:431
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:64
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:793
 msgid "Remove"
 msgstr "Usuń"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99
 msgid ""
 "Render the scene as a wireframe.\n"
 "\n"
@@ -4237,196 +4338,204 @@ msgstr ""
 "\n"
 "W razie wątpliwości, pozostaw wyłączone."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:308
 msgid "Render to Main Window"
 msgstr "Generuj w oknie głównym"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:915
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:172
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:906
 msgid "Reset"
 msgstr "Reset"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:190
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:177
 msgid "Results"
 msgstr "Wynik"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:29
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:16
 msgid "Return"
 msgstr "Enter"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:277
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:57
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464
+msgid "Revision:"
+msgstr ""
+
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:264
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:44
 msgid "Right"
 msgstr "Prawo"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:61
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:65
 msgid "Right Stick"
 msgstr "Gałka prawa"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:85
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:295
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:72
 msgid "Rumble"
 msgstr "Wibracje"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:518
-msgid "Run DSP LLE on a dedicated thread (not recommended)."
-msgstr "Wykonuj DSPLLE na dedykowanym wątku (niezalecane)."
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498
+msgid ""
+"Run DSP HLE and LLE on a dedicated thread (not recommended: might cause "
+"audio glitches with HLE and freezes with LLE)."
+msgstr ""
+"Wykonuj DSPLLE na dedykowanym wątku (niezalecane: może powodować błędy audio "
+"z HLE oraz zawieszanie z LLE)."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:327
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307
 msgid "Russian"
 msgstr "Rosyjski"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:149
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:150
 msgid "Sa&ve State"
 msgstr "Zapisz &stan"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:465
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475
 msgid "Safe"
 msgstr "Bezpieczny"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:196
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:446
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:925
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:183
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:452
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916
 msgid "Save"
 msgstr "Zapisz"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:532
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:522
 msgid "Save GCI as..."
 msgstr "Zapisz GCI jako..."
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
 msgid "Save State Slot 1"
 msgstr "Slot stanu 1"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:198
 msgid "Save State Slot 2"
 msgstr "Slot stanu 2"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:199
 msgid "Save State Slot 3"
 msgstr "Slot stanu 3"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:212
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:212
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200
 msgid "Save State Slot 4"
 msgstr "Slot stanu 4"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201
 msgid "Save State Slot 5"
 msgstr "Slot stanu 5"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202
 msgid "Save State Slot 6"
 msgstr "Slot stanu 6"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:203
 msgid "Save State Slot 7"
 msgstr "Slot stanu 8"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204
 msgid "Save State Slot 8"
 msgstr "Slot stanu 9"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:151
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:152
 msgid "Save State..."
 msgstr "Zapisz stan..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:582
 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:592
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:602
 msgid "Save as..."
 msgstr "Zapisz jako..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1203
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1204
 msgid "Save compressed GCM/ISO"
 msgstr "Zapisz spakowany GCM/ISO"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:446
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:452
 msgid "Save current perspective"
 msgstr "Zapisz bierzącą perspektywę"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1192
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193
 msgid "Save decompressed GCM/ISO"
 msgstr "Zapisz wypakowany GCM/ISO"
 
-#: Source/Core/Core/Src/Movie.cpp:801
+#: Source/Core/Core/Src/Movie.cpp:792
 #, 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:396
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:404
 msgid "Scaled EFB Copy"
 msgstr "Scaled EFB Copy"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:556
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:543
 #, c-format
 msgid "Scanning %s"
 msgstr "Sknauję %s"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:539
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:526
 msgid "Scanning for ISOs"
 msgstr "Przeszukuję obrazy ISO"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:540
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:527
 msgid "Scanning..."
 msgstr "Przeszukuję..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:427
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
 msgid "ScrShot"
 msgstr "ScrShot"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:106
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:93
 msgid "Scroll Lock"
 msgstr "Scroll Lock"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:264
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:251
 msgid "Search"
 msgstr "Szukaj"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:227
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:214
 msgid "Search Filter"
 msgstr "Filtr wyszukiwania"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:810
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:791
 msgid "Search Subfolders"
 msgstr "Przeszukuj podfoldery"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:250
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:237
 msgid "Search current Object"
 msgstr "Przeszukaj bieżący obiekt"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:254
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:241
 msgid "Search for hex Value:"
 msgstr "Szukaj wartości hex:"
 
-#: Source/Core/Common/Src/SysConf.h:103 Source/Core/Common/Src/SysConf.h:126
-#: Source/Core/Common/Src/SysConf.h:146 Source/Core/Common/Src/SysConf.h:167
+#: Source/Core/Common/Src/SysConf.h:90 Source/Core/Common/Src/SysConf.h:113
+#: Source/Core/Common/Src/SysConf.h:133 Source/Core/Common/Src/SysConf.h:154
 #, c-format
 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:490
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:46
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:477
 msgid "Select"
 msgstr "Select"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:677
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1072
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:683
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1087
 msgid "Select The Recording File"
 msgstr "Wybierz plik nagrania"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1285
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1312
 msgid "Select a Wii WAD file to install"
 msgstr "Wybierz plik Wii WAD do zainstalowania"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:70
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74
 msgid ""
 "Select a hardware adapter to use.\n"
 "\n"
@@ -4436,31 +4545,31 @@ msgstr ""
 "\n"
 "W razie wątpliwości, wybierz pierwszy."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:520
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:510
 msgid "Select a save file to import"
 msgstr "Wybierz plik zapisu do importowania"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:363
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:366
 msgid "Select floating windows"
 msgstr "Select floating windows"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:582
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:585
 msgid "Select the file to load"
 msgstr "Wybierz plik do wczytania"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1241
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1268
 msgid "Select the save file"
 msgstr "Wybierz plik do zapisu"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1388
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1415
 msgid "Select the state to load"
 msgstr "Wybierz stan do wczytania"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1429
 msgid "Select the state to save"
 msgstr "Wybierz stan do zapisu"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82
 msgid ""
 "Select what aspect ratio to use when rendering:\n"
 "Auto: Use the native aspect ratio\n"
@@ -4478,15 +4587,15 @@ msgstr ""
 "\n"
 "W razie wątpliwości, wybierz Auto."
 
-#: Source/Core/InputCommon/Src/InputConfig.cpp:61
+#: Source/Core/InputCommon/Src/InputConfig.cpp:48
 msgid "Selected controller profile does not exist"
 msgstr "Wybrany progil kontrolera nie istnieje"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:116
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:109
 msgid "Selected font"
 msgstr "Wybrana czcionka"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75
 msgid ""
 "Selects the display resolution used in fullscreen mode.\n"
 "This should always be bigger than or equal to the internal resolution. "
@@ -4502,22 +4611,39 @@ 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:69
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:70
 msgid ""
 "Selects what graphics API to use internally.\n"
 "Direct3D 9 usually is the fastest one. OpenGL is more accurate though. "
 "Direct3D 11 is somewhere between the two.\n"
 "Note that the Direct3D backends are only available on Windows.\n"
 "\n"
-"If unsure, use Direct3D 9."
+"If unsure, use Direct3D 11."
 msgstr ""
 "Wybiera, które graficzne API ma być użyte wewnętrznie.\n"
 "Direct3D 9 zazwyczaj jest najszybsze. OpenGL jest bardziej dokładne. "
 "Direct3D 11 jest pomiędzy tymi opcjami.\n"
+"Należy zauważyć, że Direct3D dostępny jest tylko pod systemami Windows.\n"
 "\n"
-"W razie wątpliwości, użyj Direct3D 9."
+"W razie wątpliwości, użyj Direct3D 11."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:288
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72
+msgid ""
+"Selects what graphics API to use internally.\n"
+"Direct3D 9 usually is the fastest one. OpenGL is more accurate though. "
+"Direct3D 11 is somewhere between the two.\n"
+"Note that the Direct3D backends are only available on Windows.\n"
+"\n"
+"If unsure, use OpenGL."
+msgstr ""
+"Wybiera, które graficzne API ma być użyte wewnętrznie.\n"
+"Direct3D 9 zazwyczaj jest najszybsze. OpenGL jest bardziej dokładne. "
+"Direct3D 11 jest pomiędzy tymi opcjami.\n"
+"Należy zauważyć, że Direct3D dostępny jest tylko pod systemami Windows.\n"
+"\n"
+"W razie wątpliwości, użyj OpenGL."
+
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:291
 msgid "Send"
 msgstr "Wyślij"
 
@@ -4525,24 +4651,24 @@ msgstr "Wyślij"
 msgid "Sensor Bar Position:"
 msgstr "Pozycja Sensor Bar'a"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:77
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:64
 msgid "Separator"
 msgstr "Separator"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:328
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308
 msgid "Serbian"
 msgstr "Serbski"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:522
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502
 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:488
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:475
 msgid "Set"
 msgstr "Ustaw"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:877
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:868
 msgid "Set as &default ISO"
 msgstr "Ustaw jako domyślne ISO"
 
@@ -4551,12 +4677,12 @@ msgstr "Ustaw jako domyślne ISO"
 msgid "Set as default Memcard %c"
 msgstr "Ustaw jako domyślną kartę pamięci %c"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:460
+#: Source/Core/Core/Src/ActionReplay.cpp:450
 #, 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/ConfigMain.cpp:535
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:515
 msgid ""
 "Sets the latency (in ms).  Higher values may reduce audio crackling. OpenAL "
 "backend only."
@@ -4564,123 +4690,123 @@ msgstr ""
 "Ustaw opóźnienie (ms). Wyższe wartości mogą zniwelować trzaski dźwięków. "
 "Tylko OpenAL."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341
 msgid "Settings..."
 msgstr "Ustawienia..."
 
-#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:222
+#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:209
 msgid "SetupWiiMem: Cant find setting file"
 msgstr "SetupWiiMem: Nie można odnaleźć pliku konfiguracyjnego"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:291
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:278
 msgid "Shake"
 msgstr "Wstrząs"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
 msgid "Short Name:"
 msgstr "Krótka nazwa:"
 
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:103
+#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:90
 msgid "Shoulder Buttons"
 msgstr "Przyciski tylnie"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:217
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:220
 msgid "Show &Console"
 msgstr "Pokaż &konsolę"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:215
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:218
 msgid "Show &Log"
 msgstr "Pokaż &Log"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:212
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:215
 msgid "Show &Statusbar"
 msgstr "Pokaż pasek &stanu"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:210
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:213
 msgid "Show &Toolbar"
 msgstr "Pokaż pasek &narzędzi"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:281
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:284
 msgid "Show Drives"
 msgstr "Pokaż napędy"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:517
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530
 msgid "Show EFB Copy Regions"
 msgstr "Pokaż EFB Copy Regions"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:295
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303
 msgid "Show FPS"
 msgstr "Pokaż FPS"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:271
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:274
 msgid "Show France"
 msgstr "Pokaż Francję"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:257
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:260
 msgid "Show GameCube"
 msgstr "Pokaż GameCube"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561
 msgid "Show Input Display"
 msgstr "Pokaż Input Display"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:273
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:276
 msgid "Show Italy"
 msgstr "Pokaż Włochy"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:264
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:267
 msgid "Show JAP"
 msgstr "Pokaż Japonię"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:275
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:278
 msgid "Show Korea"
 msgstr "Pokaż Koreę"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476
 msgid "Show Language:"
 msgstr "Pokaż język:"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:216
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:219
 msgid "Show Log &Configuration"
 msgstr "Pokaż &konfigurację logu"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:266
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:269
 msgid "Show PAL"
 msgstr "Pokaż PAL"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:254
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:257
 msgid "Show Platforms"
 msgstr "Pokaż platformy"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:263
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:266
 msgid "Show Regions"
 msgstr "Pokaż regiony"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:518
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531
 msgid "Show Statistics"
 msgstr "Pokaż statystyki"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:277
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:280
 msgid "Show Taiwan"
 msgstr "Pokaż Taiwan"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:268
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:271
 msgid "Show USA"
 msgstr "Pokaż USA"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:259
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:262
 msgid "Show Wad"
 msgstr "Pokaż WAD"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:255
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:258
 msgid "Show Wii"
 msgstr "Pokaż Wii"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491
 msgid "Show a confirmation box before stopping a game."
 msgstr "Pokazuje okno potwierdzenia przed zatrzymaniem gry."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:512
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492
 msgid ""
 "Show a message box when a potentially serious error has occurred.\n"
 "Disabling this may avoid annoying and non-fatal messages, but it may also "
@@ -4694,11 +4820,11 @@ msgstr ""
 msgid "Show first block"
 msgstr "Pokaż pierwszy blok"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:130
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:131
 msgid "Show lag counter"
 msgstr "Pokaż licznik opóźnienia"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493
 msgid ""
 "Show messages on the emulation screen area.\n"
 "These messages include memory card writes, video backend and CPU "
@@ -4724,7 +4850,7 @@ msgstr "Pokaż ikonę zapisu"
 msgid "Show save title"
 msgstr "Pokaż tytuł zapisu"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102
 msgid ""
 "Show the number of frames rendered per second as a measure of emulation "
 "speed.\n"
@@ -4735,11 +4861,11 @@ msgstr ""
 "\n"
 "W razie wątpliwości, pozostaw wyłączone."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:279
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:282
 msgid "Show unknown"
 msgstr "Pokaż niewiadome"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105
 msgid ""
 "Show various statistics.\n"
 "\n"
@@ -4749,47 +4875,31 @@ msgstr ""
 "\n"
 "W razie wątpliwości, pozostaw wyłączone."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:319
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:306
 msgid "Sideways Wiimote"
 msgstr "Willot bokiem"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:280
 msgid "Simplified Chinese"
 msgstr "Chiński uproszczony"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:311
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:298
 msgid "Size"
 msgstr "Rozmiar"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:696
 msgid "Skip BIOS"
 msgstr "Pomiń BIOS"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316
 msgid "Skip DCBZ clearing"
 msgstr "Pomiń oczyszczanie DCBZ"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:492
-msgid "Skip Dest. Alpha Pass"
-msgstr "Pomiń Dest. Alpha Pass"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:444
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:454
 msgid "Skip EFB Access from CPU"
 msgstr "Pomiń EFB Access z CPU"
 
-#: 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 ""
-"Pomiń destination alpha pass używany w wielu grach dla niektórych efektów "
-"graficznych.\n"
-"\n"
-"W razie wątpliwości, pozostaw wyłączone."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125
 msgid ""
 "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n"
 "Sometimes also increases visual quality.\n"
@@ -4805,25 +4915,25 @@ msgstr ""
 "\n"
 "W razie wątpliwości, pozostaw wyłączone."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:374
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:386
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:380
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:392
 #, c-format
 msgid "Slot %i"
 msgstr "Slot %i"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:700
 msgid "Slot A"
 msgstr "Slot A"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:701
 msgid "Slot B"
 msgstr "Slot B"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:62
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:49
 msgid "Snapshot"
 msgstr "Snapshot"
 
-#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:58
+#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:46
 msgid "Software Renderer"
 msgstr "Renderer Programowy"
 
@@ -4839,27 +4949,27 @@ msgstr ""
 "Czy na pewno chcesz włączyć renderowanie programowe? W razie wątpliwości, "
 "wybierz 'Nie'."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:683
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:664
 msgid "Sound Settings"
 msgstr "Ustawienia dźwięku"
 
-#: Source/Core/AudioCommon/Src/AudioCommon.cpp:77
+#: Source/Core/AudioCommon/Src/AudioCommon.cpp:64
 #, c-format
 msgid "Sound backend %s is not valid."
 msgstr "Niewłaściwy sound beckend %s."
 
-#: Source/Core/AudioCommon/Src/DSoundStream.cpp:59
+#: Source/Core/AudioCommon/Src/DSoundStream.cpp:46
 #, c-format
 msgid "Sound buffer creation failed: %s"
 msgstr "Utworzenie bufora dźwięku nie powiodło się: %s"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:31
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:18
 msgid "Space"
 msgstr "Space"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:329
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309
 msgid "Spanish"
 msgstr "Hiszpański"
 
@@ -4867,7 +4977,7 @@ msgstr "Hiszpański"
 msgid "Speaker Volume:"
 msgstr "Poziom głośnika:"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92
 msgid ""
 "Specifies the resolution used to render at. A high resolution will improve "
 "visual quality a lot but is also quite heavy on performance and might cause "
@@ -4887,63 +4997,63 @@ msgstr ""
 "\n"
 "W razie wątpliwości, wybierz 640x528."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322
 msgid "Speed up Disc Transfer Rate"
 msgstr "Przyspiesz Disc Transfer Rate"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:243
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:230
 msgid "Square Stick"
 msgstr "Square Stick"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:107
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87
 msgid "Standard Controller"
 msgstr "Standardowy kontroler"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:38
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:322
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:37
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:25
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:325
 msgid "Start"
 msgstr "Start"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:194
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:197
 msgid "Start &NetPlay"
 msgstr "Start &NetPlay"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:339
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:345
 msgid "Start Re&cording"
 msgstr "&Rozpocznij nagrywanie"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:175
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:175
 msgid "Start Recording"
 msgstr "Rozpocznij nagrywanie"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:312
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:299
 msgid "State"
 msgstr "Stan"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:173
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:161
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:161
 msgid "State Saves"
 msgstr "Stany zapisu"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:108
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88
 msgid "Steering Wheel"
 msgstr "Kierownica"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:53
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:57
 msgid "Stick"
 msgstr "Gałka"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:420
-#: 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:325
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:419
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:431
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:171
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:171
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:328
 msgid "Stop"
 msgstr "Stop"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96
 msgid ""
 "Store EFB copies in GPU texture objects.\n"
 "This is not so accurate, but it works well enough for most games and gives a "
@@ -4957,107 +5067,119 @@ msgstr ""
 "\n"
 "W razie wątpliwości, pozostaw wyłączone."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:275
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283
 msgid "Stretch to Window"
 msgstr "Rozciągnij do okna"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:43
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:47
 msgid "Strum"
 msgstr "Struny"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:78
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:65
 msgid "Subtract"
 msgstr "Wyciągnij"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:77
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:67
 #, c-format
 msgid "Successfully exported file to %s"
 msgstr "Sukcesywnie wyeksportowano plik do %s"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:56
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:43
 msgid "Successfully imported save files"
 msgstr "Importowanie zapisów zakończone powodzeniem"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:285
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:272
 msgid "Swing"
 msgstr "Zamach"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:744
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:792
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320
+msgid "Synchronize GPU thread"
+msgstr "Synchronizuj wątek GPU"
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321
+msgid ""
+"Synchronizes the GPU and CPU threads to help prevent random freezes in Dual "
+"Core mode. (ON = Compatible, OFF = Fast)"
+msgstr ""
+"Synchronizuje wątki GPU i CPU by zapobiec zawieszaniu w trybie dwóch rdzeni "
+"(ON = zgodne, OFF = szybkie)"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773
 msgid "System Language:"
 msgstr "Język systemu:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:191
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:185
 msgid "TAIWAN"
 msgstr "Taiwan"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:127
-#: Source/Core/DolphinWX/Src/TASInputDlg.h:32
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:128
+#: Source/Core/DolphinWX/Src/TASInputDlg.h:19
 msgid "TAS Input"
 msgstr "Wejście TAS"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:28
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:15
 msgid "Tab"
 msgstr "Tab"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:510
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:531
 msgid "Tab split"
 msgstr "Tab split"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:37
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:41
 msgid "Table Left"
 msgstr "Talerz lewo"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:38
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:42
 msgid "Table Right"
 msgstr "Talerz prawo"
 
-#: 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
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:361
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:181
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:181
 msgid "Take Screenshot"
 msgstr "Zrób zdjęcie"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:109
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89
 msgid "TaruKonga (Bongos)"
 msgstr "TaruKonga (Bongos)"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:472
 msgid "Test"
 msgstr "Test"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:444
 msgid "Texture"
 msgstr "Tekstura"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:451
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:461
 msgid "Texture Cache"
 msgstr "Cache tekstur"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:519
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:532
 msgid "Texture Format Overlay"
 msgstr "Format pokrycia tekstur"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:226
+#: Source/Core/Core/Src/CoreParameter.cpp:215
 msgid "The WAD has been installed successfully"
 msgstr "WAD zainstalowany poprawnie"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:197
+#: Source/Core/Core/Src/ActionReplay.cpp:185
 msgid "The address is invalid"
 msgstr "Nieprawidłowy adres"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:509
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:496
 msgid "The checksum was successfully fixed"
 msgstr "Suma kontrolna poprawnie naprawiona"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1242
+#: 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:1117
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1216
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1118
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1146
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1217
 #, c-format
 msgid ""
 "The file %s already exists.\n"
@@ -5066,7 +5188,7 @@ msgstr ""
 "Plik %s już istnieje.\n"
 "Zastąpić?"
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:51
+#: Source/Core/AudioCommon/Src/WaveFile.cpp:38
 #, c-format
 msgid ""
 "The file %s could not be opened for writing. Please check if it's already "
@@ -5075,29 +5197,29 @@ msgstr ""
 "Nie można otworzyć pliku %s do zapisu. Sprawdź czy nie jest używany przez "
 "inny program."
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:44
+#: Source/Core/AudioCommon/Src/WaveFile.cpp:31
 #, c-format
 msgid "The file %s was already open, the file header will not be written."
 msgstr "Plik %s jest już otwarty, nagłówek pliku nie zostanie zapisany."
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:332
+#: Source/Core/Core/Src/Boot/Boot.cpp:320
 #, c-format
 msgid "The file you specified (%s) does not exist"
 msgstr "Plik, który wybrałeś (%s) nie istnieje"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:628
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:666
 msgid "The name can not be empty"
 msgstr "Nazwa nie może być pusta"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:620
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:658
 msgid "The name can not contain the character ','"
 msgstr "Nazwa nie może zawierać znaku ','"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:142
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:129
 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:93
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98
 msgid ""
 "The safer you adjust this, the less likely the emulator will be missing any "
 "texture updates from RAM.\n"
@@ -5109,47 +5231,47 @@ msgstr ""
 "\n"
 "W razie wątpliwości, wybierz wartość na końcu po prawej."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:445
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:432
 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:388
+#: Source/Core/DolphinWX/Src/Main.cpp:416
 msgid ""
 "The selected language is not supported by your system. Falling back to "
 "system default."
 msgstr ""
 "Wybrany język nie jest wspierany przez Twój system. Ustawienia domyślne."
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:43
+#: Source/Core/Core/Src/NetPlayClient.cpp:47
 msgid "The server and client's NetPlay versions are incompatible!"
 msgstr "Wersje NetPlay klienta i serwera są niekompatybilne!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:40
+#: Source/Core/Core/Src/NetPlayClient.cpp:44
 msgid "The server is full!"
 msgstr "Serwer pełny!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:46
+#: Source/Core/Core/Src/NetPlayClient.cpp:50
 msgid "The server responded: the game is currently running!"
 msgstr "Odpowiedź serwera: gra aktualnie uruchomiona!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:49
+#: Source/Core/Core/Src/NetPlayClient.cpp:53
 msgid "The server sent an unknown error message!"
 msgstr "Serwer odesłał nieznany błąd!"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:119
+#: Source/Core/Core/Src/CoreParameter.cpp:108
 #, c-format
 msgid "The specified file \"%s\" does not exist"
 msgstr "Wskazany plik \"%s\" nie istnieje."
 
-#: Source/Core/Core/Src/ActionReplay.cpp:198
+#: Source/Core/Core/Src/ActionReplay.cpp:186
 msgid "The value is invalid"
 msgstr "Niewłaściwa wartość"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:642
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:623
 msgid "Theme:"
 msgstr "Kompozycja:"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:476
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:463
 msgid ""
 "There must be a ticket for 00000001/00000002. Your NAND dump is probably "
 "incomplete."
@@ -5157,7 +5279,7 @@ msgstr ""
 "Tutaj musi być ticket dla 00000001/00000002. Twój zrzut NAND jes "
 "prawdopodobnie niekompletny."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308
 msgid ""
 "These settings override core Dolphin settings.\n"
 "Undetermined means the game uses Dolphin's setting."
@@ -5165,7 +5287,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:355
+#: Source/Core/Core/Src/ActionReplay.cpp:345
 msgid ""
 "This action replay simulator does not support codes that modify Action "
 "Replay itself."
@@ -5173,11 +5295,11 @@ msgstr ""
 "Ten symulator action replay nie wspiera kodów, które modyfikują Action "
 "Replay'a."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505
 msgid "This could cause slow down in Wii Menu and some games."
 msgstr "Może powodować spowolnienie w Wii Menu i niektórych grach."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118
 msgid ""
 "This feature allows you to change the game's camera.\n"
 "Move the mouse while holding the right mouse button to pan and while holding "
@@ -5197,7 +5319,19 @@ msgstr ""
 "\n"
 "W razie wątpliwości, pozostaw wyłączone."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485
+#, fuzzy
+msgid ""
+"This limits the game speed to the specified number of frames per second "
+"(full speed is 60 for NTSC and 50 for PAL). Alternatively, 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 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/ConfigMain.cpp:484
 msgid ""
 "This splits the Video and CPU threads, so they can be run on separate "
 "cores.\n"
@@ -5208,61 +5342,61 @@ 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:286
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:287
 msgid "This will let you Manually Edit the INI config file"
 msgstr "Pozwala na ręczną edycję pliku konfiguracyjnego."
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:249
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:254
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:236
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:241
 msgid "Threshold"
 msgstr "Threshold"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:288
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:275
 msgid "Tilt"
 msgstr "Przechylenie"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:628
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:304
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:622
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:291
 msgid "Title"
 msgstr "Tytuł"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:125
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:144
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:112
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:131
 msgid "To"
 msgstr "Do"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:72
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59
 msgid "Toggle All Log Types"
 msgstr "Przełącz wszystkie typy logów"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:426
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:432
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:180
 msgid "Toggle Fullscreen"
 msgstr "Przełącz na pełny ekran"
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:87
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:271
 msgid "Top"
 msgstr "Góra"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:281
 msgid "Traditional Chinese"
 msgstr "Chiński tradycyjny"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:426
+#: Source/Core/Core/Src/Boot/Boot.cpp:414
 msgid "Tried to load an unknown file type."
 msgstr "Próbowano odczytać nieznany typ pliku."
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:80
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:67
 msgid "Triggers"
 msgstr "Spusty"
 
-#: Source/Core/Common/Src/SysConf.h:91 Source/Core/Common/Src/SysConf.h:114
+#: Source/Core/Common/Src/SysConf.h:78 Source/Core/Common/Src/SysConf.h:101
 msgid "Trying to read from invalid SYSCONF"
 msgstr "Próba odczytu z niewłaściwego SYSCONF"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:44
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:31
 msgid ""
 "Trying to read from invalid SYSCONF\n"
 "Wiimote bt ids are not available"
@@ -5270,15 +5404,15 @@ msgstr ""
 "Próba odczytu z niewłaściwego SYSCONF\n"
 "bt id Wiilota niedostępne"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:330
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
 msgid "Turkish"
 msgstr "Turecki"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:33
 msgid "Turntable"
 msgstr "DJ Gramofon"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:71
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58
 msgid "Type"
 msgstr "Typ"
 
@@ -5286,25 +5420,25 @@ msgstr "Typ"
 msgid "UDP Port:"
 msgstr "Port UDP:"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:279
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:266
 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12
 msgid "UDP Wiimote"
 msgstr "UDP Wiilot"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:199
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:193
 msgid "UNKNOWN"
 msgstr "Nieznany"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:756
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:755
 #, c-format
 msgid "UNKNOWN_%02X"
 msgstr "Nieznany_%X"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:178
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:172
 msgid "USA"
 msgstr "USA"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:225
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:214
 msgid ""
 "Unable to create patch from given values.\n"
 "Entry not modified."
@@ -5312,7 +5446,7 @@ msgstr ""
 "Nie można utworzyć patcha z podanych wartości.\n"
 "Wejście nie zostało zmienione."
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:124
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:111
 #, c-format
 msgid ""
 "Unable to parse line %lu of the entered AR code as a valid encrypted or "
@@ -5323,74 +5457,93 @@ msgstr ""
 "zaszyfrowanego/odszyfrowanego kodu. Sprawdź poprawność wpisanego kodu.\n"
 "Czy chcesz pominąć linię i kontynuować analizę?"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:391
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:397
 #, c-format
 msgid "Undefined %i"
 msgstr "Niezdefiniowane %i"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:163
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:164
 msgid "Undo Load State"
 msgstr "Cofnij wczytywanie stanu"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:718
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:717
 msgid "Unexpected 0x80 call? Aborting..."
 msgstr "Nieoczekiwane wywołanie 0x80? Przerywanie..."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:215
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:202
 msgid "Unknown"
 msgstr "Nieznany"
 
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:971
+#: Source/Core/Core/Src/HW/DVDInterface.cpp:965
 #, c-format
 msgid "Unknown DVD command %08x - fatal error"
 msgstr "Nieznane polecenie DVD %08x - poważny błąd"
 
-#: Source/Core/Common/Src/SysConf.cpp:145
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:444
+#, c-format
+msgid "Unknown command 0x%08x"
+msgstr "Nieznane polecenie 0x%08x"
+
+#: Source/Core/Common/Src/SysConf.cpp:132
 #, c-format
 msgid "Unknown entry type %i in SYSCONF (%s@%x)!"
 msgstr "Nieznany typ wejścia %i w SYSCONF (%s@%x)!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:228
+#: Source/Core/Core/Src/NetPlayClient.cpp:232
 #, c-format
 msgid "Unknown message received with id : %d"
 msgstr "Nieznana wiadomość o ID: %d"
 
-#: Source/Core/Core/Src/NetPlayServer.cpp:504
+#: Source/Core/Core/Src/NetPlayServer.cpp:508
 #, c-format
 msgid "Unknown message with id:%d received from player:%d Kicking player!"
 msgstr "Nieznana wiadomość o ID: %d od gracza: %d Gracz wylatuje!"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:274
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:56
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:261
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:43
 msgid "Up"
 msgstr "Góra"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:108
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:95
 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17
 msgid "Update"
 msgstr "Aktualizuj"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:320
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:307
 msgid "Upright Wiimote"
 msgstr "Willot pionowo"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:777
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758
 msgid "Use EuRGB60 Mode (PAL60)"
 msgstr "Użyj trybu EuRGB60 (PAL60)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:294
 msgid "Use Fullscreen"
 msgstr "Użyj trybu pełnoekranowego"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:575
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:563
 msgid "Use Hex"
 msgstr "Użyj HEX"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:600
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580
 msgid "Use Panic Handlers"
 msgstr "Użyj Panic Handlers"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89
+msgid ""
+"Use a hacked upload strategy to stream vertices.\n"
+"This usually speed up, but is forbidden by OpenGL specification and may "
+"causes heavy glitches.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+"Należy użyć strategii hackowanego wgrywania do wierzchołków.\n"
+"Zazwyczaj przyspiesza, ale jest zakazane przez specyfikację OpenGL i może "
+"powodować spore błędy.\n"
+"\n"
+"W razie wątpliwości, pozostaw wyłączone."
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122
 msgid ""
 "Use multiple threads to decode textures.\n"
 "Might result in a speedup (especially on CPUs with more than two cores).\n"
@@ -5402,7 +5555,7 @@ msgstr ""
 "\n"
 "W razie wątpliwości, pozostaw wyłączone."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126
 msgid ""
 "Usually if shader compilation fails, an error message is displayed.\n"
 "However, one may skip the popups to allow interruption free gameplay by "
@@ -5417,53 +5570,58 @@ msgstr ""
 "\n"
 "W razie wątpliwości, pozostaw wyłączone."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:539
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:552
 msgid "Utility"
 msgstr "Narzędzie"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:285
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:293
 msgid "V-Sync"
 msgstr "V-Sync"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:209
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318
+#, fuzzy
+msgid "VBeam Speed Hack"
+msgstr "MMU Speed Hack"
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196
 msgid "Value"
 msgstr "Wartość"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:73
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:60
 msgid "Value:"
 msgstr "Wartość:"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:572
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:560
 msgid "Value: "
 msgstr "Wartość:"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:51
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:38
 msgid "Verbosity"
 msgstr "Verbosity"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:377
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:381
 msgid "Video"
 msgstr "Wideo"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:486
 msgid "Virtual"
 msgstr "Wirtualny"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:689
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670
 msgid "Volume"
 msgstr "Poziom"
 
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:498
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:527
+#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:488
+#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:517
 #, c-format
 msgid "WAD installation failed: error creating %s"
 msgstr "Instalacja WAD nie powiodła się: błąd tworzenia %s"
 
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:547
+#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:537
 msgid "WAD installation failed: error creating ticket"
 msgstr "Instalacja WAD nie powiodła się: błąd tworzenia biletu"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84
 msgid ""
 "Wait for vertical blanks in order to reduce tearing.\n"
 "Decreases performance if emulation speed is below 100%.\n"
@@ -5475,25 +5633,25 @@ msgstr ""
 "\n"
 "W razie wątpliwości, pozostaw wyłączone."
 
-#: Source/Core/Common/Src/MsgHandler.cpp:67
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46
+#: Source/Core/Common/Src/MsgHandler.cpp:53
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:33
 #: Source/Core/DolphinWX/Src/VideoConfigDiag.h:85
 msgid "Warning"
 msgstr "Ostrzeżenie"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:291
+#: Source/Core/Core/Src/Boot/Boot.cpp:279
 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:341
+#: Source/Core/Core/Src/Boot/Boot.cpp:329
 msgid "Warning - starting ELF in wrong console mode!"
 msgstr "Ostrzeżenie - uruchomienie ELF w złym trybie konsoli!"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:221
+#: Source/Core/Core/Src/Boot/Boot.cpp:209
 msgid "Warning - starting ISO in wrong console mode!"
 msgstr "Ostrzeżenie - uruchomienie ISO w złym trybie konsoli!"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:519
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:512
 #, c-format
 msgid ""
 "Warning! it is advised to backup all files in the folder:\n"
@@ -5504,7 +5662,7 @@ msgstr ""
 "%s\n"
 "Kontynuować?"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:585
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:578
 #, c-format
 msgid ""
 "Warning: This will overwrite any existing saves that are in the folder:\n"
@@ -5517,7 +5675,7 @@ msgstr ""
 "i mają taką samą nazwę jak plik na Twojej karcie pamięci\n"
 "Kontynuować?"
 
-#: Source/Core/Core/Src/Movie.cpp:844
+#: Source/Core/Core/Src/Movie.cpp:835
 #, c-format
 msgid ""
 "Warning: You loaded a save that's after the end of the current movie. (byte "
@@ -5528,7 +5686,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:861
+#: Source/Core/Core/Src/Movie.cpp:852
 #, c-format
 msgid ""
 "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You "
@@ -5540,7 +5698,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:870
+#: Source/Core/Core/Src/Movie.cpp:861
 #, c-format
 msgid ""
 "Warning: You loaded a save whose movie mismatches on frame %d. You should "
@@ -5573,49 +5731,49 @@ msgstr ""
 "Start=%d, A=%d, B=%d, X=%d, Y=%d, Z=%d, DUp=%d, DDown=%d, DLeft=%d, DRight="
 "%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d"
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:106
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:129
+#: Source/Core/AudioCommon/Src/WaveFile.cpp:93
+#: Source/Core/AudioCommon/Src/WaveFile.cpp:116
 msgid "WaveFileWriter - file not open."
 msgstr "WaveFileWriter - plik nie jest otwarty."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:56
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:60
 msgid "Whammy"
 msgstr "Whammy"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:404
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:408
 msgid "Widescreen Hack"
 msgstr "Widescreen Hack"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:312
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:299
 msgid "Width"
 msgstr "Szerokość"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535
 msgid "Wii"
 msgstr "Wii"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:372
 msgid "Wii Console"
 msgstr "Konsola Wii"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:844
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:825
 msgid "Wii NAND Root:"
 msgstr "Źródło Wii NAND:"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:191
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:194
 msgid "Wii Save Import"
 msgstr "Import zapisów Wii"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1243
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1270
 msgid "Wii save files (*.bin)|*.bin"
 msgstr "Pliki zapisu Wii (*.bin)|*.bin"
 
-#: Source/Core/DiscIO/Src/WiiWad.cpp:82
+#: Source/Core/DiscIO/Src/WiiWad.cpp:69
 msgid "WiiWAD: Could not read from file"
 msgstr "WiiWAD: nie moża odczytać z pliku"
 
-#: Source/Core/Core/Src/HW/Wiimote.cpp:17
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
+#: Source/Core/Core/Src/HW/Wiimote.cpp:20
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
 msgid "Wiimote"
 msgstr "Wiilot"
 
@@ -5624,7 +5782,7 @@ msgstr "Wiilot"
 msgid "Wiimote %i"
 msgstr "Wiilot %i"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:628
+#: Source/Core/DolphinWX/Src/Main.cpp:656
 msgid "Wiimote Connected"
 msgstr "Wiilot połączony"
 
@@ -5632,7 +5790,7 @@ msgstr "Wiilot połączony"
 msgid "Wiimote Motor"
 msgstr "Wiilot Motor"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
 msgid "Wiimote settings"
 msgstr "Ustawienia Wiilota"
 
@@ -5640,102 +5798,126 @@ msgstr "Ustawienia Wiilota"
 msgid "Wiimotes"
 msgstr "Wiiloty"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:134
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:121
 msgid "Windows Left"
 msgstr "Windows Left"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:136
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:123
 msgid "Windows Menu"
 msgstr "Windows Menu"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:135
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:122
 msgid "Windows Right"
 msgstr "Windows Right"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:131
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:124
 msgid "Word Wrap"
 msgstr "Zawijanie wierszy"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1298
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:864
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1089
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1225
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1325
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:880
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1090
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1226
 msgid "Working..."
 msgstr "Pracuję..."
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:338
+msgid "Write memcards (GC)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46
 msgid "Write to Console"
 msgstr "Zapisz do konsoli"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:67
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:54
 msgid "Write to Debugger"
 msgstr "Zapisz do Debugger'a"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:57
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44
 msgid "Write to File"
 msgstr "Zapisz do pliku"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:61
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48
 msgid "Write to Window"
 msgstr "Wpisz do okna"
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:60
+#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:47
 #, c-format
 msgid "XAudio2 CreateSourceVoice failed: %#X"
 msgstr "XAudio2 CreateSourceVoice nie powiodło się: %#X"
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:114
+#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:101
 #, c-format
 msgid "XAudio2 init failed: %#X"
 msgstr "Inicjalizacja XAudio2 nie powiodła się: %#X"
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:124
+#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:111
 #, c-format
 msgid "XAudio2 master voice creation failed: %#X"
 msgstr "Utworzenie XAudio2 master voice nie powiodło się: %#X"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:766
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:765
 msgid "XF reg"
 msgstr "XF reg"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:21
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Yellow"
 msgstr "Żółty"
 
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:107
+#: Source/Core/Core/Src/DSP/DSPCore.cpp:120
 msgid ""
-"You are using free dsp roms made by Dolphin Team.\n"
-"Only Zelda ucode games will work correctly with them.\n"
+"You are using a free DSP ROM made by the Dolphin Team.\n"
+"All Wii games will work correctly, and most GC games should also work fine, "
+"but the GBA/IPL/CARD UCodes will not work.\n"
 msgstr ""
-"Używasz darmowych romów dsp stowrzonych przez Zespół Dolphin'a.\n"
-"Tylko gry Zelda ucode będą działały poprawnie.\n"
+"Używasz darmowych romów DSP stworzonych przez Zespół Dolphin'a.\n"
+"Wszystkie gry Wii będą działały poprawnie oraz większość gier GC również, "
+"ale UCody GBA/IPL/CARD nie będą działać.\n"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:73
+#: Source/Core/Core/Src/DSP/DSPCore.cpp:116
+msgid ""
+"You are using an old free DSP ROM made by the Dolphin Team.\n"
+"Only games using the Zelda UCode will work correctly.\n"
+msgstr ""
+"Używasz darmowych romów DSP stworzonych przez Zespół Dolphin'a.\n"
+"Tylko gry Zelda UCode będą działały poprawnie.\n"
+
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:63
 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:207
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:210
 msgid "You must choose a game!!"
 msgstr "Wybierz grę!"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:605
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:593
 msgid "You must enter a name!"
 msgstr "Musisz wprowadzić nazwę!"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:450
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:438
 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:603
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:591
 msgid "You must enter a valid profile name."
 msgstr "Musisz wprowadzić poprawną nazwę profilu."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:936
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:917
 msgid "You must restart Dolphin in order for the change to take effect."
 msgstr "Musisz ponownie uruchomić program w celu zaaplikowania zmian."
 
-#: Source/Core/Core/Src/CoreParameter.cpp:175
+#: Source/Core/Core/Src/DSP/DSPCore.cpp:109
+msgid ""
+"Your DSP ROMs have incorrect hashes.\n"
+"Would you like to stop now to fix the problem?\n"
+"If you select \"No\", audio might be garbled."
+msgstr ""
+"Twoje romy DSP mają niewłaściwe hashe.\n"
+"Czy chcesz zatrzymać i naprawić problrm?\n"
+"Jeśli wybierzesz \"Nie\", audio będzie zniekształcone."
+
+#: Source/Core/Core/Src/CoreParameter.cpp:164
 msgid ""
 "Your GCM/ISO file seems to be invalid (invalid country).\n"
 "Continue with PAL region?"
@@ -5743,7 +5925,7 @@ msgstr ""
 "Twój plik GMC/ISO wygląda na niewłaściwy (niewłaściwy kraj).\n"
 "Kontynuować w regionie PAL?"
 
-#: Source/Core/Common/Src/SysConf.cpp:58
+#: Source/Core/Common/Src/SysConf.cpp:45
 #, c-format
 msgid ""
 "Your SYSCONF file is the wrong size.\n"
@@ -5754,25 +5936,25 @@ msgstr ""
 "Powinno być 0x%04x (jest 0x%04llx)\n"
 "Czy chcesz wygenerować nowy?"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:334
 msgid "ZTP hack"
 msgstr "ZTP hack"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:387
+#: Source/Core/Core/Src/ActionReplay.cpp:377
 msgid "Zero 3 code not supported"
 msgstr "Kod 3 zero niewspierany"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:408
+#: Source/Core/Core/Src/ActionReplay.cpp:398
 #, c-format
 msgid "Zero code unknown to dolphin: %08x"
 msgstr "Kod zero nieznany dla programu: %08x"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:436
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:460
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:423
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:447
 msgid "[ waiting ]"
 msgstr "[ czekam ]"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107
 msgid ""
 "[BROKEN]\n"
 "Highlight regions the EFB was copied from.\n"
@@ -5784,11 +5966,11 @@ msgstr ""
 "\n"
 "W razie wątpliwości, pozostaw wyłączone."
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:91
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:78
 msgid "[Custom]"
 msgstr "[Własne]"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120
 msgid ""
 "[EXPERIMENTAL]\n"
 "Aims to speed up emulation by offloading texture decoding to the GPU using "
@@ -5807,7 +5989,7 @@ msgstr ""
 "\n"
 "W razie wątpliwości, pozostaw wyłączone."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121
 msgid ""
 "[EXPERIMENTAL]\n"
 "Speeds up emulation a bit by caching display lists.\n"
@@ -5821,97 +6003,47 @@ msgstr ""
 "\n"
 "W razie wątpliwości, pozostaw wyłączone."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:508
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:495
 msgid "^ ADD"
 msgstr "^ ADD"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:820
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:801
 msgid "apploader (.img)"
 msgstr "apploader (.img)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:185
-msgid "failed to read bk header"
-msgstr "Odczyt nagłówka bk nie powiódł się"
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:375
-#, c-format
-msgid "failed to read data from file: %s"
-msgstr "Odczyt z pliku %s nie powiódł się"
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:97
-msgid "failed to read header"
-msgstr "Odczyt nagłówka nie powiódł się"
-
-#: Source/Core/Core/Src/PowerPC/JitInterface.cpp:285
+#: Source/Core/Core/Src/PowerPC/JitInterface.cpp:272
 #, c-format
 msgid "iCacheJIT: Reading Opcode from %x. Please report."
 msgstr "iCacheJIT: Odczyt Opcode z %x. Raportuj."
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:108
-#, c-format
-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:935
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:936
 msgid "s"
 msgstr "s"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:457
-#, c-format
-msgid "unknown cmd 0x%08x"
-msgstr "nieznane polecenie 0x%08x"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1110
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1136
 msgid "wxExecute returned -1 on application run!"
 msgstr "wxExecute zwrócił -1 przy uruchamianiu programu!"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:56
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:43
 msgid "zFar Correction: "
 msgstr "zFar Correction: "
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:51
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:38
 msgid "zNear Correction: "
 msgstr "zNear Correction: "
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:493
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:480
 msgid "| OR"
 msgstr "| OR"
 
-#~ msgid "%i connected"
-#~ msgstr "%i połączony"
-
-#~ msgid "Alternate Wiimote Timing"
-#~ msgstr "Alternate Wiimote Timing"
-
-#~ msgid "Interpreter (VERY slow)"
-#~ msgstr "Interpreter (BARDZO wolny)"
-
-#~ msgid "JIT Recompiler (recommended)"
-#~ msgstr "Rekompilator JIT (zalecany)"
-
-#~ msgid "JITIL experimental recompiler"
-#~ msgstr "Eksperymentalny rekompilator JITIL"
+#~ msgid "Accurate VBeam emulation"
+#~ msgstr "Emulacja Accurate VBeam"
 
 #~ msgid ""
-#~ "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. "
-#~ "No effect on emulated wiimotes."
+#~ "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)"
 #~ msgstr ""
-#~ " Wycisza głośnik Wiilota. Naprawia losowe rozłączenia z prawdziwymi "
-#~ "Wiilotami. Brak efektu na emulowanych Wiilotach."
+#~ "Jeśli FPS jest niezrównoważony, ta opcja może pomóc. (ON = kompatybilny, "
+#~ "OFF = szybko)"
 
-#~ msgid "Pair Up"
-#~ msgstr "Parowanie"
-
-#~ msgid "Reconnect Wiimote Confirm"
-#~ msgstr "Potwierdzenie ponownego połączenia Wiilota"
-
-#~ msgid ""
-#~ "Wiimote %i has been disconnected by system.\n"
-#~ "Maybe this game doesn't support multi-wiimote,\n"
-#~ "or maybe it is due to idle time out or other reason.\n"
-#~ "Do you want to reconnect immediately?"
-#~ msgstr ""
-#~ "Wiilot %i rozłączony przez system.\n"
-#~ "Może ta gra nie wpsiera kilku wiilotów,\n"
-#~ "lub zbyt długi czas nieobecności lub coś innego.\n"
-#~ "Połączyć ponownie?"
+#~ msgid "Skip Dest. Alpha Pass"
+#~ msgstr "Pomiń Dest. Alpha Pass"
diff --git a/Languages/po/pt.po b/Languages/po/pt.po
index bae41aaf92..27c1d5f75c 100644
--- a/Languages/po/pt.po
+++ b/Languages/po/pt.po
@@ -3,13 +3,13 @@
 # This file is distributed under the same license as the dolphin-emu package.
 #
 # Translators:
-# Zilaan <nunogomesrebelo@hotmail.com>, 2011.
+# Zilaan <nunogomesrebelo@hotmail.com>, 2011
 msgid ""
 msgstr ""
 "Project-Id-Version: Dolphin Emulator\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-10 08:56-0500\n"
-"PO-Revision-Date: 2013-02-02 08:31+0000\n"
+"POT-Creation-Date: 2013-04-18 23:00-0500\n"
+"PO-Revision-Date: 2013-04-04 08:13+0000\n"
 "Last-Translator: delroth <delroth@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: pt\n"
@@ -18,21 +18,21 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:511
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:499
 msgid " (too many to display)"
 msgstr "(demasiados para mostrar)"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:270
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:273
 #: Source/Core/DolphinWX/Src/NetWindow.cpp:491
 #: Source/Core/DolphinWX/Src/NetWindow.cpp:530
 msgid " Game : "
 msgstr "Jogo: "
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:507
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494
 msgid "! NOT"
 msgstr "! NÃO"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:70
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:58
 #, c-format
 msgid ""
 "\"%s\" does not exist.\n"
@@ -41,96 +41,95 @@ msgstr ""
 "\"%s\" Inexistente.\n"
 " Criar um novo cartão de memória de 16MB?"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:142
+#: Source/Core/Core/Src/CoreParameter.cpp:131
 #, c-format
 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:722
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:721
 #, c-format
 msgid "%08X:  "
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:196
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:183
 #, c-format
 msgid "%1$sCopy%1$s"
 msgstr "%1$sCopiar%1$s"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:128
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:296
+#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:113
+#, c-format
+msgid "%d samples"
+msgstr ""
+
+#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:112
+#, c-format
+msgid "%d samples (quality level %d)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:121
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:289
 #, c-format
 msgid "%s already exists, overwrite?"
 msgstr "%s já existe, substituir?"
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:167
+#: Source/Core/DiscIO/Src/CompressedBlob.cpp:154
 #, c-format
 msgid "%s failed to be scrubbed. Probably the image is corrupt."
 msgstr "%s falha ao ficar scrubbed. Provavelmente a imagem está corrompida."
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:95
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:83
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
 " Card file size is invalid (0x%x bytes)"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:110
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:98
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
 " Card size is invalid (0x%x bytes)"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:90
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:78
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
 "file is not large enough to be a valid memory card file (0x%x bytes)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:367
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:359
 #, c-format
 msgid "%s failed to open"
 msgstr "%s falha ao abrir"
 
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:97
-#, c-format
-msgid ""
-"%s has an incorrect hash.\n"
-"Would you like to stop now to fix the problem?\n"
-"If you select \"No\", audio will be garbled."
-msgstr ""
-"%s tem um hash incorrecto.\n"
-"Gostaria de parar agora para resolver o problema?\n"
-"Se seleccionar \"Não\", o áudio terá falhas."
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:360
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:352
 #, c-format
 msgid "%s is a 0 byte file"
 msgstr "%s é um ficheiro com 0 bytes"
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:159
+#: Source/Core/DiscIO/Src/CompressedBlob.cpp:146
 #, c-format
 msgid "%s is already compressed! Cannot compress it further."
 msgstr "%s já está comprimido! Não é possível comprimir mais."
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:345
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:337
 #, c-format
 msgid "%s is too long for the filename, max chars is 45"
 msgstr ""
 "%s é demasiado longo para um nome de ficheiro, o máximo de caracteres é 45"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:202
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:189
 #, c-format
 msgid "%sDelete%s"
 msgstr "%sEliminar%s"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:200
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:187
 #, c-format
 msgid "%sExport GCI%s"
 msgstr "%sExportar GCI%s"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:198
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:185
 #, c-format
 msgid "%sImport GCI%s"
 msgstr "%sImportar GCI%s"
@@ -140,222 +139,246 @@ msgstr "%sImportar GCI%s"
 msgid "%u Free Blocks; %u Free Dir Entries"
 msgstr "%u Blocos livres; %u Entradas de directórios livres"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:506
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:493
 msgid "&& AND"
 msgstr "&& E"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:295
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:301
 msgid "&About..."
 msgstr "&Sobre..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:99
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:100
 msgid "&Boot from DVD Drive..."
 msgstr "&Arrancar através da unidade de DVD ..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:231
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:234
 msgid "&Breakpoints"
 msgstr "&Pontos de partida"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:110
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:111
 msgid "&Browse for ISOs..."
 msgstr "&Procurar ISOs..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:192
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:195
 msgid "&Cheats Manager"
 msgstr "&Gestor de Cheats"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:177
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:180
 msgid "&DSP Settings"
 msgstr "&Definições de DSP"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:885
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:876
 msgid "&Delete ISO..."
 msgstr "&Eliminar ISO..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:903
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:897
 msgid "&Delete selected ISOs..."
 msgstr "&Eliminar ISOs seleccionados..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:170
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:173
 msgid "&Emulation"
 msgstr "&Emulação"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:113
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:114
 msgid "&File"
 msgstr "&Ficheiro"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:335
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:341
 msgid "&Frame Advance"
 msgstr "&Avançar Quadro"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:352
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:358
 msgid "&Fullscreen"
 msgstr "&Ecrã Inteiro"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:176
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:179
 msgid "&Graphics Settings"
 msgstr "&Definições Gráficas"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:296
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:302
 msgid "&Help"
 msgstr "&Ajuda"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:180
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:183
 msgid "&Hotkey Settings"
 msgstr "&Definições de Teclas de Atalho"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:233
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:236
 msgid "&JIT"
 msgstr "&JIT"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:148
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:149
 msgid "&Load State"
 msgstr "&Carregar Estado"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:190
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:193
 msgid "&Memcard Manager (GC)"
 msgstr "&Gestor de Cartão de Memória(GC)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:232
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:235
 msgid "&Memory"
 msgstr "&Memória"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:313
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:319
 msgid "&Open..."
 msgstr "&Abrir..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:186
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:189
 msgid "&Options"
 msgstr "&Opções"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:324
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:330
 msgid "&Pause"
 msgstr "&Pausa"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:326
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:332
 msgid "&Play"
 msgstr "&Começar"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:867
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:858
 msgid "&Properties"
 msgstr "&Propriedades"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:348
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:354
 msgid "&Read-only mode"
 msgstr "&Modo só de leitura"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:319
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:325
 msgid "&Refresh List"
 msgstr "&Actualizar lista"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:230
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:233
 msgid "&Registers"
 msgstr "&Registos"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:332
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:338
 msgid "&Reset"
 msgstr "&Reset"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:234
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:237
 msgid "&Sound"
 msgstr "&Som"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:329
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:335
 msgid "&Stop"
 msgstr "&Parar"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:207
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:210
 msgid "&Tools"
 msgstr "&Ferramentas"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:235
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:238
 msgid "&Video"
 msgstr "&Vídeo"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:284
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:287
 msgid "&View"
 msgstr "&Ver"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:179
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:182
 msgid "&Wiimote Settings"
 msgstr "&Definições Wiimote"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:868
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:859
 msgid "&Wiki"
 msgstr "&Wiki"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504
 msgid "'"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:59
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:46
 msgid "(-)+zFar"
 msgstr "(-)+zLonge"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:54
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:41
 msgid "(-)+zNear"
 msgstr "(-)+zPerto"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:99
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:86
 msgid "(UNKNOWN)"
 msgstr "(DESCONHECIDO)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:376
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:384
 msgid "(off)"
 msgstr "(desligado)"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:655
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:654
 msgid "0x44"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+msgid "1.5x Native (960x792)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:158
 msgid "16 bit"
 msgstr "16 bit"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+msgid "1x Native (640x528)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+msgid "2.5x Native (1600x1320)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+msgid "2x Native (1280x1056)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:159
 msgid "32 bit"
 msgstr "32 bit"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:412
 msgid "3D Vision"
 msgstr "3D Vision"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+msgid "3x Native (1920x1584)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+msgid "4x Native (2560x2112)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:157
 msgid "8 bit"
 msgstr "8 bit"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:43
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:30
 msgid "<Insert name here>"
 msgstr "<Introduza aqui o nome>"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:255
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:262
 msgid "<No resolutions found>"
 msgstr "<Resoluções não encontradas>"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:104
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84
 msgid "<Nothing>"
 msgstr "<Nada>"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:162
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:162
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:150
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:150
 msgid "<Press Key>"
 msgstr "<Pressione Tecla>"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286
 msgid "<System>"
 msgstr "<Sistema>"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695
 msgid "A"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:201
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:235
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:204
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:238
 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:353
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:387
 msgid "A game is not currently running."
 msgstr "Nenhum jogo actualmente a correr."
 
@@ -365,23 +388,24 @@ msgid ""
 "You must manually connect your wiimotes."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:109
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:100
+#, fuzzy
 msgid ""
 "ALERT:\n"
 "\n"
-"NetPlay will currently only work properly when using the following "
-"settings:\n"
-" - Dual Core [OFF]\n"
-" - Audio Throttle [OFF]\n"
-" - DSP-HLE with \"Null Audio\" or DSP-LLE\n"
-" - Manually set the exact number of controllers that will be used to "
-"[Standard Controller]\n"
+"Netplay will only work with the following settings:\n"
+" - Enable Dual Core [OFF]\n"
+" - DSP Emulator Engine Must be the same on all computers!\n"
+" - DSP on Dedicated Thread [OFF]\n"
+" - Framelimit NOT set to [Audio]\n"
+" - Manually set the exact number of controllers to be used to [Standard "
+"Controller]\n"
 "\n"
-"All players should try to use the same Dolphin version and settings.\n"
-"Disable all memory cards or send them to all players before starting.\n"
-"Wiimote support has not been implemented.\n"
+"All players should use the same Dolphin version and settings.\n"
+"All memory cards must be identical between players or disabled.\n"
+"Wiimote support has not been implemented!\n"
 "\n"
-"You must forward TCP port to host!!"
+"The host must have the chosen TCP port open/forwarded!\n"
 msgstr ""
 "ALERTA:\n"
 "\n"
@@ -400,17 +424,17 @@ msgstr ""
 "\n"
 "Tem que fazer forward TCP para ser host!!"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:111
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:116
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96
 msgid "AM-Baseboard"
 msgstr "AM-Baseboard"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:299
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:115
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:300
 msgid "AR Codes"
 msgstr "Códigos AR"
 
-#: Source/Core/DolphinWX/Src/AboutDolphin.h:33
+#: Source/Core/DolphinWX/Src/AboutDolphin.h:21
 msgid "About Dolphin"
 msgstr "Sobre o Dolphin"
 
@@ -418,15 +442,11 @@ msgstr "Sobre o Dolphin"
 msgid "Acceleration"
 msgstr "Aceleração"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:463
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473
 msgid "Accuracy:"
 msgstr "Precisão:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317
-msgid "Accurate VBeam emulation"
-msgstr "Emulação VBeam precisa"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97
 msgid ""
 "Accurately emulate EFB copies.\n"
 "Some games depend on this for certain graphical effects or gameplay "
@@ -435,12 +455,12 @@ msgid ""
 "If unsure, check EFB to Texture instead."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:239
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:239
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:227
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:227
 msgid "Action"
 msgstr "Acção"
 
-#: Source/Core/Core/Src/ARDecrypt.cpp:481
+#: Source/Core/Core/Src/ARDecrypt.cpp:469
 #, c-format
 msgid ""
 "Action Replay Code Decryption Error:\n"
@@ -455,7 +475,7 @@ msgstr ""
 "Culprit Code:\n"
 "%s"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:667
+#: Source/Core/Core/Src/ActionReplay.cpp:657
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)"
@@ -463,7 +483,7 @@ msgstr ""
 "Erro Action Replay: Tamanho Inválido (%08x : address = %08x) em Adição de "
 "Código (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:755
+#: Source/Core/Core/Src/ActionReplay.cpp:745
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide "
@@ -472,7 +492,7 @@ msgstr ""
 "Erro Action Replay: Tamanho inválido (%08x : address = %08x) em "
 "Preenchimento e Slide (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:547
+#: Source/Core/Core/Src/ActionReplay.cpp:537
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And "
@@ -481,7 +501,7 @@ msgstr ""
 "Erro Action Replay: Tamanho inválido (%08x : address = %08x) em Escrita e "
 "Preenchimento Ram (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:607
+#: Source/Core/Core/Src/ActionReplay.cpp:597
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Write To "
@@ -490,75 +510,75 @@ msgstr ""
 "Erro Action Replay: Tamanho inválido (%08x : address = %08x) em Escrita para "
 "Ponteiro (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:802
+#: Source/Core/Core/Src/ActionReplay.cpp:792
 #, c-format
 msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)"
 msgstr "Erro Action Replay: Valor inválido (%08x) em cópia de memória (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:682
+#: Source/Core/Core/Src/ActionReplay.cpp:672
 #, c-format
 msgid ""
 "Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)\n"
 "Master codes are not needed. Do not use master codes."
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:196
+#: Source/Core/Core/Src/ActionReplay.cpp:184
 #, c-format
 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:872
+#: Source/Core/Core/Src/ActionReplay.cpp:862
 #, 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:945
+#: Source/Core/Core/Src/ActionReplay.cpp:935
 #, 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:896
+#: Source/Core/Core/Src/ActionReplay.cpp:886
 #, 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:838
+#: Source/Core/Core/Src/ActionReplay.cpp:828
 #, 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:242
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:247
 msgid "Adapter:"
 msgstr "Adaptador:"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:76
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:63
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:63
 msgid "Add"
 msgstr "Adicionar"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1275
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1301
 msgid "Add ActionReplay Code"
 msgstr "Adicionar Código ActionReplay"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1204
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1230
 msgid "Add Patch"
 msgstr "Adicionar Patch"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:507
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:528
 msgid "Add new pane"
 msgstr "Adicionar novo painel"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:404
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:426
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:811
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:408
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:430
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:792
 msgid "Add..."
 msgstr "Adicionar..."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:90
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:81
 msgid "Address :"
 msgstr "Localização :"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:58
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:45
 msgid ""
 "Adds the specified value to zFar Parameter.\n"
 "Two ways to express the floating point values.\n"
@@ -576,7 +596,7 @@ msgstr ""
 "\n"
 "NOTA: Verifique a Janela de Relatórios/Consola para os valores adquiridos."
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:53
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:40
 msgid ""
 "Adds the specified value to zNear Parameter.\n"
 "Two ways to express the floating point values.\n"
@@ -594,49 +614,49 @@ msgstr ""
 "\n"
 "NOTA: Verifique a Janela de Relatórios/Consola para os valores adquiridos."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:755
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:744
 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:509
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:522
 msgid "Advanced"
 msgstr "Avançadas"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561
 msgid "Advanced Settings"
 msgstr "Definições avançadas"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:584
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:587
 msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:816
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:797
 msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1189
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1190
 msgid "All Gamecube GCM files (gcm)"
 msgstr "Todos os ficheiros Gamecube GCM (gcm)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1390
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1404
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1417
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1431
 msgid "All Save States (sav, s##)"
 msgstr "Todos os Estados Guardados (sav, s##)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1187
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1188
 msgid "All Wii ISO files (iso)"
 msgstr "Todos os ficheiros Wii ISO (iso)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1207
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1208
 msgid "All compressed GC/Wii ISO files (gcz)"
 msgstr "Todos os ficheiros GC/Wii ISO comprimidos (gcz)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:124
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:104
 msgid "All files (*.*)|*.*"
 msgstr "Todos os ficheiros (*.*)|*.*"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123
 msgid ""
 "Allows toggling certain options via the hotkeys 3 (Internal Resolution), 4 "
 "(Aspect Ratio), 5 (Copy EFB) and 6 (Fog) within the emulation window.\n"
@@ -644,39 +664,39 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:285
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:272
 msgid "Analyze"
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:298
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:285
 msgid "Angle"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:367
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:375
 msgid "Anisotropic Filtering:"
 msgstr "Filtro Anisotrópico"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:350
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:358
 msgid "Anti-Aliasing:"
 msgstr "Anti-Serrilhamento"
 
-#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:308
+#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:299
 msgid "Apploader is the wrong size...is it really an apploader?"
 msgstr "Apploader é do tamanho errado...é mesmo uma apploader?"
 
-#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:302
+#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:293
 msgid "Apploader unable to load from file"
 msgstr "Apploader impossibilitada de carregar através do ficheiro"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:841
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:822
 msgid "Apploader:"
 msgstr "Apploader:"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:135
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:122
 msgid "Apply"
 msgstr "Aplicar"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124
 msgid ""
 "Apply a post-processing effect after finishing a frame.\n"
 "\n"
@@ -686,11 +706,11 @@ msgstr ""
 "\n"
 "Em caso de dúvida, seleccione (off)."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287
 msgid "Arabic"
 msgstr "Árabe"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:614
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:603
 #, c-format
 msgid "Are you sure you want to delete \"%s\"?"
 msgstr "Tem a certeza que quer apagar \"%s\"?"
@@ -709,46 +729,50 @@ msgstr ""
 "Tem a certeza que quer eliminar este ficheiro?  Será eliminado "
 "permanentemente!"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:789
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:277
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:44
+msgid "Arm JIT (experimental)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:285
 msgid "Aspect Ratio:"
 msgstr "Proporção de ecrã:"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:70
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:58
 msgid "At least one pane must remain open."
 msgstr "Pelo menos um painel deve manter-se aberto."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:553
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533
 msgid "Audio"
 msgstr "Áudio"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:694
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675
 msgid "Audio Backend:"
 msgstr "Áudio Backend :"
 
-#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:41
+#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:28
 msgid "AudioCommon: Error opening AO device.\n"
 msgstr "AudioCommon: Erro ao abrir dispositivo AO.\n"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:275
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283
 msgid "Auto"
 msgstr "Automático"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:337
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345
 msgid "Auto (Multiple of 640x528)"
 msgstr "Automático (Multiplo de 640x528)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:337
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345
 msgid "Auto (Window Size)"
 msgstr "Auto (Dimensão da Janela)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:297
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305
 msgid "Auto adjust Window Size"
 msgstr "Ajuste Automático da Dimensão da Janela"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77
 msgid ""
 "Automatically adjusts the window size to your internal resolution.\n"
 "\n"
@@ -758,160 +782,160 @@ msgstr ""
 "\n"
 "Em caso de dúvida, mantenha esta opção desactivada."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:697
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696
 msgid "B"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:755
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:754
 msgid "BP register "
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:27
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:14
 msgid "Back"
 msgstr "Trás"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:698
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:679
 msgid "Backend Settings"
 msgstr "Definições Backend"
 
-#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:60
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:206
+#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:47
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:211
 msgid "Backend:"
 msgstr "Backend:"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:318
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:95
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:305
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:82
 msgid "Background Input"
 msgstr "Introdução em segundo plano"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:279
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:266
 msgid "Backward"
 msgstr "Retroceder"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:264
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:257
 msgid "Bad File Header"
 msgstr "Cabeçalho de ficheiro inválido"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:627
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:621
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:290
 msgid "Banner"
 msgstr "Banner"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:519
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:529
 msgid "Banner Details"
 msgstr "Detalhes de Banner"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491
 msgid "Banner:"
 msgstr "Banner:"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:57
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:61
 msgid "Bar"
 msgstr "Barra"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:308
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:316
 msgid "Basic"
 msgstr "Básico"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555
 msgid "Basic Settings"
 msgstr "Definições Básicas"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:22
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Bass"
 msgstr "Baixo"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:186
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:174
 msgid "Block Allocation Table checksum failed"
 msgstr "Verificação da Tabela de Atribuição de Blocos falhou"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:631
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625
 msgid "Blocks"
 msgstr "Blocos"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:21
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Blue"
 msgstr "Azul"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:24
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Blue Left"
 msgstr "Azul esquerda"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:25
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Blue Right"
 msgstr "Azul Direita"
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:87
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270
 msgid "Bottom"
 msgstr "Inferior"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:238
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:225
 #, c-format
 msgid "Bound Controls: %lu"
 msgstr "Controlos agregados: %lu"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348
 msgid "Broken"
 msgstr "Inactivo"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:422
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:428
 msgid "Browse"
 msgstr "Procurar"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:256
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:243
 msgid "Browse for a directory to add"
 msgstr "Procurar por uma pasta para adicionar"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:422
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:428
 msgid "Browse for an ISO directory..."
 msgstr "Procurar por uma pasta de ISO..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1079
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1080
 msgid "Browse for output directory"
 msgstr "Procurar por pasta de destino"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:328
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:331
 msgid "Buffer:"
 msgstr "Buffer:"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:58
 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:119
+#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:106
 msgid "Buttons"
 msgstr "Botões"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317
 msgid ""
 "Bypass the clearing of the data cache by the DCBZ instruction. Usually leave "
 "this option disabled."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:698
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:697
 msgid "C"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:77
+#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:64
 msgid "C Stick"
 msgstr "C Stick"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:77
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:64
 msgid "C-Stick"
 msgstr "C-Stick"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:764
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:763
 msgid "CP reg"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:567
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547
 msgid "CPU Emulator Engine"
 msgstr "Motor de emulador de CPU"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:490
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500
 msgid "Cache Display Lists"
 msgstr "Cache de listas de Visualização"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88
 msgid ""
 "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n"
 "Decreases emulation speed by some percent (depending on your GPU).\n"
@@ -927,23 +951,38 @@ msgstr ""
 "\n"
 "Em caso de dúvida, mantenha esta opção desactivada."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1858
+#, c-format
+msgid "Can't find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x"
+msgstr ""
+
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1872
+#, c-format
+msgid "Can't find WiiMote by connection handle %02x"
+msgstr ""
+
+#: Source/Core/Core/Src/HW/DVDInterface.cpp:669
+#: Source/Core/Core/Src/HW/DVDInterface.cpp:679
+msgid "Can't read from DVD_Plugin - DVD-Interface: Fatal Error"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:124
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:28
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:91
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:178
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:240
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:84
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:171
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:233
 #, c-format
 msgid "Cannot open %s"
 msgstr "Impossível abrir %s"
 
-#: Source/Core/Core/Src/CoreTiming.cpp:141
+#: Source/Core/Core/Src/CoreTiming.cpp:128
 msgid "Cannot unregister events with events pending"
 msgstr "Impossível retirar registo de eventos quando há eventos pendentes"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1078
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1061
 #, c-format
 msgid ""
 "Cannot use that file as a memory card.\n"
@@ -951,7 +990,7 @@ msgid ""
 "is not a valid gamecube memory card file"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1108
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1091
 msgid ""
 "Cannot use that file as a memory card.\n"
 "Are you trying to use the same file in both slots?"
@@ -959,31 +998,15 @@ 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:1867
-#, 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:1881
-#, 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: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"
-
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:52
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:39
 msgid "Caps Lock"
 msgstr "Caps Lock"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288
 msgid "Catalan"
 msgstr "Catalão"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:311
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:298
 msgid "Center"
 msgstr "Centro"
 
@@ -991,12 +1014,12 @@ msgstr "Centro"
 msgid "Change"
 msgstr "Mudar"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:316
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:322
 msgid "Change &Disc..."
 msgstr "Mudar &Disco..."
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:179
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:179
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:167
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:167
 msgid "Change Disc"
 msgstr "Mudar Disco"
 
@@ -1004,7 +1027,7 @@ msgstr "Mudar Disco"
 msgid "Change Game"
 msgstr "Mudar de Jogo"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:515
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495
 msgid ""
 "Change the language of the user interface.\n"
 "Requires restart."
@@ -1012,76 +1035,76 @@ msgstr ""
 "Mudar o idioma do interface do utilizador. \n"
 "Necessário reiniciar. "
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:60
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:47
 msgid "Changes sign to zFar Parameter (after correction)"
 msgstr "Alterações assinaladas a parâmetro zFar  (após correcção)"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:55
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:42
 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:519
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499
 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:295
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:298
 msgid "Chat"
 msgstr "Conversa"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:47
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:34
 msgid "Cheat Code"
 msgstr "Código de Cheat"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:118
 msgid "Cheat Search"
 msgstr "Procura de Cheats"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:38
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:25
 msgid "Cheats Manager"
 msgstr "Gestor de Cheats"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:633
 msgid "Check Partition Integrity"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:864
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:880
 msgid "Checking integrity..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289
 msgid "Chinese (Simplified)"
 msgstr "Chinês (Simplificado)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290
 msgid "Chinese (Traditional)"
 msgstr "Chinês (Tradicional)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:818
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:799
 msgid "Choose a DVD root directory:"
 msgstr "Escolha uma pasta de raiz do DVD:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:822
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803
 msgid "Choose a NAND root directory:"
 msgstr "Escolha uma pasta de raiz NAND:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:815
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:796
 msgid "Choose a default ISO:"
 msgstr "Escolha um ISO padrão:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1236
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1219
 msgid "Choose a directory to add"
 msgstr "Escolha uma pasta para adicionar"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1065
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1048
 msgid "Choose a file to open"
 msgstr "Escolha um ficheiro para abrir"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:217
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:204
 msgid "Choose a memory card:"
 msgstr "Escolha um cartão de memória:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:819
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800
 msgid ""
 "Choose file to use as apploader: (applies to discs constructed from "
 "directories only)"
@@ -1089,27 +1112,27 @@ 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:767
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:806
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:781
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:822
 msgid "Choose the folder to extract to"
 msgstr "Escolha a pasta para extrair"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:297
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:284
 msgid "Circle Stick"
 msgstr "Stick circular"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:52
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:56
 msgid "Classic"
 msgstr "Clássico"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:144
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:43
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:487
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:913
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:137
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:30
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:474
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:904
 msgid "Clear"
 msgstr "Limpar"
 
-#: Source/Core/Core/Src/NetPlayServer.cpp:259
+#: Source/Core/Core/Src/NetPlayServer.cpp:263
 msgid ""
 "Client disconnect while game is running!! NetPlay is disabled. You must "
 "manually stop the game."
@@ -1117,122 +1140,122 @@ msgstr ""
 "O Cliente desligou enquanto jogo decorria!! NetPlay está desactivado. Terá "
 "que parar o jogo manualmente."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:298
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:247
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:552
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:578
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:285
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:234
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:562
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:590
 msgid "Close"
 msgstr "Fechar"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:174
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:177
 msgid "Co&nfigure..."
 msgstr "Co&nfigurar..."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:86
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:73
 msgid "Code Info"
 msgstr "Info de Código"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:568
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:556
 msgid "Code: "
 msgstr "Código:"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:35
 msgid "Command"
 msgstr "Comando"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:629
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:623
 msgid "Comment"
 msgstr "Comentário"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489
 msgid "Comment:"
 msgstr "Comentar:"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:893
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:884
 msgid "Compress ISO..."
 msgstr "Comprimir ISO..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:905
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:899
 msgid "Compress selected ISOs..."
 msgstr "Comprimir ISOs seleccionados..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1088
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1224
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1089
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1225
 msgid "Compressing ISO"
 msgstr "A comprimir ISO"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:429
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:435
 msgid "Config"
 msgstr "Configurar"
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:37
-#: Source/Core/DolphinWX/Src/InputConfigDiag.h:135
-#: Source/Core/DolphinWX/Src/InputConfigDiag.h:154
+#: Source/Core/DolphinWX/Src/InputConfigDiag.h:122
+#: Source/Core/DolphinWX/Src/InputConfigDiag.h:141
 msgid "Configure"
 msgstr "Configuração"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:111
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:98
 msgid "Configure Control"
 msgstr "Configuração de Controlos"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:306
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
 #: Source/Core/DolphinWX/Src/NetWindow.cpp:583
 msgid "Configure Pads"
 msgstr "Configuração de Comandos"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:429
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:435
 msgid "Configure..."
 msgstr "Configurar..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1119
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1147
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1217
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1120
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1218
 msgid "Confirm File Overwrite"
 msgstr "Confirmar Substituição de Ficheiro"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:597
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:577
 msgid "Confirm on Stop"
 msgstr "Confirmar Ao Parar"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:83
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:105
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:74
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:96
 msgid "Connect"
 msgstr "Conectar"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:783
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:764
 msgid "Connect USB Keyboard"
 msgstr "Conectar Teclado USB"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:362
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:368
 #, c-format
 msgid "Connect Wiimote %i"
 msgstr "Conectar Wiimote %i"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:195
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183
 msgid "Connect Wiimote 1"
 msgstr "Conectar Wiimote 1"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184
 msgid "Connect Wiimote 2"
 msgstr "Conectar Wiimote 2"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:185
 msgid "Connect Wiimote 3"
 msgstr "Conectar Wiimote 3"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:198
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:186
 msgid "Connect Wiimote 4"
 msgstr "Conectar Wiimote 4"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:627
+#: Source/Core/DolphinWX/Src/Main.cpp:655
 msgid "Connecting..."
 msgstr "A conectar..."
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:155
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:156
 msgid "Console"
 msgstr "Consola"
 
@@ -1240,15 +1263,15 @@ msgstr "Consola"
 msgid "Continuous Scanning"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:46
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:33
 msgid "Control"
 msgstr "Controlo"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:189
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:176
 msgid "Convert to GCI"
 msgstr "Converter para GCI"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:379
+#: Source/Core/Core/Src/CoreParameter.cpp:368
 msgid "Copy failed"
 msgstr "Cópia Falhou"
 
@@ -1257,21 +1280,21 @@ msgstr "Cópia Falhou"
 msgid "Copy to Memcard %c"
 msgstr "Copiar para o Cartão de memória %c"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:359
 msgid "Core"
 msgstr "Core"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:154
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:148
 #, c-format
 msgid "Could not create %s"
 msgstr "Não foi possível criar %s"
 
-#: Source/Core/AudioCommon/Src/AudioCommon.cpp:75
+#: Source/Core/AudioCommon/Src/AudioCommon.cpp:62
 #, c-format
 msgid "Could not initialize backend %s."
 msgstr "Não foi possível iniciar o backend %s."
 
-#: Source/Core/Core/Src/CoreParameter.cpp:137
+#: Source/Core/Core/Src/CoreParameter.cpp:126
 #, c-format
 msgid ""
 "Could not read \"%s\".  There is no disc in the drive, or it is not a GC/Wii "
@@ -1282,12 +1305,12 @@ msgstr ""
 "de GC/Wii.  Tenha atenção que discos de jogos originais Gamecube ou Wii não "
 "serão lidos na maioria das unidades de DVD."
 
-#: Source/Core/Core/Src/CoreParameter.cpp:292
+#: Source/Core/Core/Src/CoreParameter.cpp:281
 #, c-format
 msgid "Could not recognize ISO file %s"
 msgstr "Não foi possível reconhecer ficheiro ISO %s"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:569
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:579
 #, c-format
 msgid "Could not save %s"
 msgstr "Não foi possível guardar %s"
@@ -1301,24 +1324,24 @@ 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:123
+#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119
 #, c-format
 msgid ""
 "Could not write memory card file %s.\n"
 "\n"
 "Are you running Dolphin from a CD/DVD, or is the save file maybe write "
-"protected?"
-msgstr ""
-"Não foi possível escrever no ficheiro do cartão de memória %s.\n"
+"protected?\n"
 "\n"
-"Está a correr o Dolphin através de CD/DVD, ou o ficheiro de jogo guardado "
-"está com protecção contra escrita?"
+"Are you receiving this after moving the emulator directory?\n"
+"If so, then you may need to re-specify your memory card location in the "
+"options."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1107
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1133
 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:146
+#: Source/Core/Core/Src/BootManager.cpp:137
 msgid ""
 "Couldn't init the core.\n"
 "Check your configuration."
@@ -1326,38 +1349,38 @@ 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:170
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:495
 msgid "Count:"
 msgstr "Contador:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:452
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456
 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:173
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:550
 msgid "Create AR Code"
 msgstr "Criar um código AR"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:543
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:608
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:569
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:641
 msgid "Create new perspective"
 msgstr "Criar nova perspectiva"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:17
 msgid "Creator: "
 msgstr "Criador:"
 
-#: Source/Core/Common/Src/MsgHandler.cpp:68
+#: Source/Core/Common/Src/MsgHandler.cpp:54
 msgid "Critical"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562
 msgid "Crop"
 msgstr "Recortar"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119
 msgid ""
 "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n"
 "\n"
@@ -1367,140 +1390,140 @@ msgstr ""
 "\n"
 "em caso de dúvida, mantenha esta opção desactivada."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:48
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:52
 msgid "Crossfade"
 msgstr "Desvanecimento cruzado"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:597
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:600
 #, c-format
-msgid "Current dir changed from %s to %s after wxFileSelector!"
-msgstr "A pasta actual mudou de %s para %s depois wxFileSelector!"
+msgid "Current directory changed from %s to %s after wxFileSelector!"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339
 msgid "Custom Projection Hack"
 msgstr "Hack de projecção personalizada"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.h:30
+#: Source/Core/DolphinWX/Src/PHackSettings.h:17
 msgid "Custom Projection Hack Settings"
 msgstr "Definições de Hack de projecção customizada"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342
 msgid "Customize some Orthographic Projection parameters."
 msgstr "Personalizar alguns parâmetros de Projecção Ortogonal."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291
 msgid "Czech"
 msgstr "Checo"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:698
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:697
 msgid "D"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:89
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
 msgid "D-Pad"
 msgstr "D-Pad"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:431
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
 msgid "DSP"
 msgstr "DSP"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:639
 msgid "DSP Emulator Engine"
 msgstr "Motor de Emulador DSP"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:254
 msgid "DSP HLE emulation (fast)"
 msgstr "Emulação de DSP HLE (rápido)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:256
 msgid "DSP LLE interpreter (slow)"
 msgstr "Interpretador DSP LLE (lento)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660
-msgid "DSP LLE on Thread"
-msgstr "DSP LLE em thread"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:255
 msgid "DSP LLE recompiler"
 msgstr "Recompilador de DSP LLE"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:431
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:641
+msgid "DSP on Dedicated Thread"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
 msgid "DSP settings"
 msgstr "Definições de DSP"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:838
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:819
 msgid "DVD Root:"
 msgstr "Raiz de DVD:"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:239
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:226
 msgid "DVDLowRead - Fatal Error: failed to read from volume"
 msgstr ""
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:333
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:320
 msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:176
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:163
 msgid "Data Size"
 msgstr "Dimensão de Dados"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468
 msgid "Date:"
 msgstr "Data:"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:528
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:564
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:518
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:557
 msgid "Datel MaxDrive/Pro files(*.sav)"
 msgstr "Datel MaxDrive/Pro files(*.sav)"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:242
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:259
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:267
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:281
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:296
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:229
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:246
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:254
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:268
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:283
 msgid "Dead Zone"
 msgstr "Zona morta"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:35
 msgid "Debug"
 msgstr "Depuração"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:521
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534
 msgid "Debugging"
 msgstr "Depuração"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:79
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:66
 msgid "Decimal"
 msgstr "Decimal"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:890
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:881
 msgid "Decompress ISO..."
 msgstr "Descomprimir ISO..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:906
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:900
 msgid "Decompress selected ISOs..."
 msgstr "Descomprimir ISOs seleccionados..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1088
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1224
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1089
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1225
 msgid "Decompressing ISO"
 msgstr "A descomprimir ISO"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:912
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:903
 msgid "Default"
 msgstr "Padrão"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:835
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:816
 msgid "Default ISO:"
 msgstr "ISO Padrão:"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:114
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:107
 msgid "Default font"
 msgstr "Tipo de letra Padrão"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:32
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:926
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:19
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917
 msgid "Delete"
 msgstr "Apagar"
 
@@ -1508,21 +1531,21 @@ msgstr "Apagar"
 msgid "Delete Save"
 msgstr "Apagar Jogo Guardado"
 
-#: Source/Core/VideoCommon/Src/AVIDump.cpp:77
+#: Source/Core/VideoCommon/Src/AVIDump.cpp:64
 #, c-format
 msgid "Delete the existing file '%s'?"
 msgstr "Apagar o ficheiro existente '%s'?"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:671
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:683
 msgid "Description"
 msgstr "Descrição"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:472
 msgid "Detect"
 msgstr "Detectar"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:233
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:328
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:220
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:315
 msgid ""
 "Detected attempt to read more data from the DVD than fit inside the out "
 "buffer. Clamp."
@@ -1530,29 +1553,29 @@ 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:127
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:898
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:114
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:889
 msgid "Device"
 msgstr "Dispositivo"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:798
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:731
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779
 msgid "Device Settings"
 msgstr "Definições de Dispositivo"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:45
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:49
 msgid "Dial"
 msgstr "Marcação"
 
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:146
+#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:135
 msgid "Direct3D11"
 msgstr "Direct3D11"
 
-#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:128
+#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:125
 msgid "Direct3D9"
 msgstr "Direct3D9"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:167
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:155
 msgid ""
 "Directory checksum failed\n"
 " and Directory backup checksum failed"
@@ -1560,16 +1583,20 @@ msgstr ""
 "Verificação de pasta falhou\n"
 " e verificação da cópia de segurança de pasta falhou"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:433
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:443
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485
 msgid "Disable"
 msgstr "Desactivar"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:491
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501
+msgid "Disable Destination Alpha"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:409
 msgid "Disable Fog"
 msgstr "Desactivar Nevoeiro"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108
 msgid ""
 "Disable any XFB emulation.\n"
 "Speeds up emulation a lot but causes heavy glitches in many games which rely "
@@ -1583,7 +1610,7 @@ msgstr ""
 "\n"
 "Em caso de dúvida, mantenha esta opção activada."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95
 msgid ""
 "Disable emulation of EFB copies.\n"
 "These are often used for post-processing or render-to-texture effects, so "
@@ -1599,20 +1626,33 @@ msgstr ""
 "\n"
 "Em caso de dúvida, mantenha esta opção desactivada."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:543
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101
+#, fuzzy
+msgid ""
+"Disables emulation of a hardware feature called destination alpha, which is "
+"used in many games for various graphical effects.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+"Salta a passagem de destino alfa utilizada em muitos jogos para diversos "
+"efeitos gráficos.\n"
+"\n"
+"Em caso de dúvida, mantenha esta opção desactivada."
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:553
 msgid "Disc"
 msgstr "Disco"
 
-#: Source/Core/DiscIO/Src/DriveBlob.cpp:107
-#: Source/Core/DiscIO/Src/DriveBlob.cpp:126
+#: Source/Core/DiscIO/Src/DriveBlob.cpp:94
+#: Source/Core/DiscIO/Src/DriveBlob.cpp:113
 msgid "Disc Read Error"
 msgstr "Erro de leitura de disco"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:312
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:320
 msgid "Display"
 msgstr "Visualização"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104
 msgid ""
 "Display the inputs read by the emulator.\n"
 "\n"
@@ -1622,32 +1662,32 @@ msgstr ""
 "\n"
 "Em caso de dúvida, mantenha esta opção desactivada."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:80
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:67
 msgid "Divide"
 msgstr "Dividir"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:987
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:990
 msgid "Do you want to stop the current emulation?"
 msgstr "Deseja parar a emulação actual?"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:663
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:644
 msgid "Dolby Pro Logic II decoder"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:864
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:856
 msgid "Dolphin"
 msgstr "Dolphin"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:183
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:188
 #, c-format
 msgid "Dolphin %s Graphics Configuration"
 msgstr "Dolphin %s Configurações Gráficas"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:292
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:298
 msgid "Dolphin &Web Site"
 msgstr "Dolphin &Web Site"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.h:37
+#: Source/Core/DolphinWX/Src/ConfigMain.h:24
 msgid "Dolphin Configuration"
 msgstr "Configurações Dolphin"
 
@@ -1655,16 +1695,16 @@ msgstr "Configurações Dolphin"
 msgid "Dolphin Emulated Wiimote Configuration"
 msgstr "Configuração da emulação de Wiimote"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:394
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:383
 msgid "Dolphin FIFO"
 msgstr "Dolphin FIFO"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1136
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1153
 msgid "Dolphin GCPad Configuration"
 msgstr "Configuração de GCPad "
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:679
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1074
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:685
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1089
 msgid "Dolphin TAS Movies (*.dtm)"
 msgstr "Dolphin TAS filmes (*.dtm)"
 
@@ -1672,11 +1712,11 @@ msgstr "Dolphin TAS filmes (*.dtm)"
 msgid "Dolphin Wiimote Configuration"
 msgstr "Configuração Dolphin do Wiimote"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:293
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:299
 msgid "Dolphin at &Google Code"
 msgstr "Dolphin em &Google Code"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:364
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:351
 msgid ""
 "Dolphin could not find any GC/Wii ISOs.  Doubleclick here to browse for "
 "files..."
@@ -1684,7 +1724,7 @@ msgstr ""
 "O Dolphin não conseguiu encontrar ISOs de GC/Wii.  Duplo clique aqui para "
 "procurar ficheiros..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:368
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:355
 msgid ""
 "Dolphin is currently set to hide all games.  Doubleclick here to show all "
 "games..."
@@ -1692,50 +1732,59 @@ msgstr ""
 "Dolphin está actualmente definido para esconder todos os jogos.  Duplo "
 "clique aqui para mostrar todos os jogos..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1159
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1160
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1246
 msgid "Dolphin was unable to complete the requested action."
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:275
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:58
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
+#, fuzzy
+msgid ""
+"Doubles the emulated GPU clock rate. May speed up some games (ON = Fast, OFF "
+"= Compatible)"
+msgstr ""
+"Activar acesso rápido ao disco.  Necessário para alguns jogos. (ON = Rápido, "
+"OFF = Compatível)"
+
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:262
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:45
 msgid "Down"
 msgstr "Baixo"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:54
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:44
 msgid "Download Codes (WiiRD Database)"
 msgstr "Download de Códigos (Base de dados WiiRD)"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:297
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:287
 #, c-format
 msgid "Downloaded %lu codes. (added %lu)"
 msgstr "Descarregados %lu códigos. (adicionados %lu)"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:31
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:35
 msgid "Drums"
 msgstr "Tambores"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:105
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
 msgid "Dummy"
 msgstr "Dummy"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:661
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:642
 msgid "Dump Audio"
 msgstr "Depositar Áudio"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:532
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545
 msgid "Dump EFB Target"
 msgstr "Depositar Alvo EFB"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546
 msgid "Dump Frames"
 msgstr "Depositar Quadros"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543
 msgid "Dump Textures"
 msgstr "Depositar Texturas"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114
 msgid ""
 "Dump all rendered frames to an AVI file in User/Dump/Frames/\n"
 "\n"
@@ -1746,7 +1795,7 @@ msgstr ""
 "\n"
 "Em caso de dúvida, mantenha esta opção desactivada."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111
 msgid ""
 "Dump decoded game textures to User/Dump/Textures/<game_id>/\n"
 "\n"
@@ -1756,7 +1805,7 @@ msgstr ""
 "\n"
 "Em caso de dúvida. mantenha esta opção desactivada."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113
 msgid ""
 "Dump the contents of EFB copies to User/Dump/Textures/\n"
 "\n"
@@ -1766,21 +1815,21 @@ msgstr ""
 "\n"
 "Em caso de dúvida, mantenha esta opção desactivada."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:474
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292
 msgid "Dutch"
 msgstr "Holandês"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:112
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:113
 msgid "E&xit"
 msgstr "S&air"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:441
 msgid "EFB Copies"
 msgstr "Cópias EFB"
 
-#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:223
+#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:210
 #, c-format
 msgid ""
 "ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least "
@@ -1789,52 +1838,52 @@ msgid ""
 "driver."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:166
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:160
 msgid "EUROPE"
 msgstr "EUROPA"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:156
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:143
 msgid "Early Memory Updates"
 msgstr "Actualizações de Memória Inicial"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:447
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:453
 msgid "Edit"
 msgstr "Editar"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.h:30
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.h:17
 msgid "Edit ActionReplay Code"
 msgstr "Editar Código ActionReplay"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:285
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:286
 msgid "Edit Config"
 msgstr "Editar Configuração"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.h:30
+#: Source/Core/DolphinWX/Src/PatchAddEdit.h:17
 msgid "Edit Patch"
 msgstr "Editar Patch"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:447
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:453
 msgid "Edit current perspective"
 msgstr "Editar perspectiva actual"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:403
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:425
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:407
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:429
 msgid "Edit..."
 msgstr "Editar..."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:44
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:48
 msgid "Effect"
 msgstr "Efeito"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:425
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435
 msgid "Embedded Frame Buffer"
 msgstr "Frame Buffer Embutido"
 
-#: Source/Core/Core/Src/Core.cpp:201
+#: Source/Core/Core/Src/Core.cpp:190
 msgid "Emu Thread already running"
 msgstr "Thread de Emulador já em execução"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110
 msgid ""
 "Emulate XFBs accurately.\n"
 "Slows down emulation a lot and prohibits high-resolution rendering but is "
@@ -1848,7 +1897,7 @@ msgstr ""
 "\n"
 "Em caso de dúvida, active a opção emulação virtual XFB como alternativa."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109
 msgid ""
 "Emulate XFBs using GPU texture objects.\n"
 "Fixes many games which don't work without XFB emulation while not being as "
@@ -1868,7 +1917,7 @@ msgstr ""
 msgid "Emulated Wiimote"
 msgstr "Wiimote Emulado"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346
 msgid "Emulation State: "
 msgstr "Estado da Emulação:"
 
@@ -1876,7 +1925,7 @@ msgstr "Estado da Emulação:"
 msgid "Enable"
 msgstr "Activar"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91
 msgid ""
 "Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's "
 "supported by your GPU.\n"
@@ -1892,72 +1941,71 @@ msgstr ""
 "Necessita de ecrã inteiro para funcionar.\n"
 "Em caso de dúvida mantenha esta opção desactivada."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:111
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:98
 msgid "Enable AR Logging"
 msgstr "Activar Execução de relatórios AR"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324
 msgid "Enable Block Merging"
 msgstr "Activar Fusão de blocos"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331
 msgid "Enable Bounding Box Calculation"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:446
 msgid "Enable Cache"
 msgstr "Activar Cache"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:562
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542
 msgid "Enable Cheats"
 msgstr "Activar Cheats"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310
 msgid "Enable Dual Core"
 msgstr "Activar Dual Core"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
 msgid "Enable Dual Core (speedup)"
 msgstr "Activar Dual Core (aumento de desempenho)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:550
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:563
 msgid "Enable Hotkeys"
 msgstr "Activar Teclas de Atalho"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311
 msgid "Enable Idle Skipping"
 msgstr "Activar Idle Skipping"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541
 msgid "Enable Idle Skipping (speedup)"
 msgstr "Activar Idle Skipping (aumento de desempenho)"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312
 msgid "Enable MMU"
 msgstr "Activar MMU"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:554
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:567
 msgid "Enable Progressive Scan"
 msgstr "Activar Progressive Scan"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757
 msgid "Enable Screen Saver"
 msgstr "Activar Protector de Ecrã"
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:75
-#, fuzzy
 msgid "Enable Speaker Data"
-msgstr "Activar Páginas"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
 msgid "Enable WideScreen"
 msgstr "Activar Ecrã Panorâmico"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:516
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529
 msgid "Enable Wireframe"
 msgstr "Activar Wireframe"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85
 msgid ""
 "Enable anisotropic filtering.\n"
 "Enhances visual quality of textures that are at oblique viewing angles.\n"
@@ -1971,7 +2019,7 @@ msgstr ""
 "\n"
 "Em caso de dúvida, seleccione 1x."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323
 msgid ""
 "Enable fast disc access.  Needed for a few games. (ON = Fast, OFF = "
 "Compatible)"
@@ -1983,7 +2031,7 @@ msgstr ""
 msgid "Enable pages"
 msgstr "Activar Páginas"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76
 msgid ""
 "Enable this if you want the whole screen to be used for rendering.\n"
 "If this is disabled, a render window will be created instead.\n"
@@ -1996,7 +2044,7 @@ msgstr ""
 "\n"
 "Em caso de dúvida, mantenha esta opção desactivada."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80
 msgid ""
 "Enable this if you want to use the main Dolphin window for rendering rather "
 "than a separate render window.\n"
@@ -2008,7 +2056,7 @@ msgstr ""
 "\n"
 "Em caso de dúvida, mantenha esta opção desactivada."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:335
 msgid ""
 "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for "
 "ANY other game."
@@ -2016,28 +2064,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:337
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340
 msgid "Enables Custom Projection Hack"
 msgstr "Hack de projecção customizada"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:528
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508
 msgid ""
 "Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on "
 "OSX."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510
 msgid ""
 "Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:512
 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
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81
 msgid ""
 "Enables progressive scan if supported by the emulated software.\n"
 "Most games don't care about this.\n"
@@ -2049,7 +2097,7 @@ msgstr ""
 "\n"
 "Em caso de dúvida, mantenha esta opção desactivada."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313
 msgid ""
 "Enables the Memory Management Unit, needed for some games. (ON = Compatible, "
 "OFF = Fast)"
@@ -2057,7 +2105,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:111
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116
 msgid ""
 "Encode frame dumps using the FFV1 codec.\n"
 "\n"
@@ -2067,59 +2115,59 @@ msgstr ""
 "\n"
 "Em caso de dúvida, mantenha esta opção desactivada."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:40
 msgid "End"
 msgstr "Fim"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:469
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:280
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:260
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293
 msgid "English"
 msgstr "Inglês"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:329
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:407
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:337
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:417
 msgid "Enhancements"
 msgstr "Melhorias"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:607
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:640
 msgid "Enter a name for the new perspective:"
 msgstr "Introduza um nome para a nova perspectiva:"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:191
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:178
 #, c-format
 msgid "Entry %d/%d"
 msgstr "Entrada %d/%d"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:85
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:72
 #, c-format
 msgid "Entry 1/%d"
 msgstr "Entrada 1/%d"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:204
 msgid "Equal"
 msgstr "Igual"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:45
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:156
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1242
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:32
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:150
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226
 msgid "Error"
 msgstr "Erro"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:381
+#: Source/Core/DolphinWX/Src/Main.cpp:409
 msgid "Error loading selected language. Falling back to system default."
 msgstr ""
 "Erro ao carregar o idioma seleccionado. Será revertido para o idioma padrão "
 "do sistema."
 
-#: Source/Core/Common/Src/ChunkFile.h:226
+#: Source/Core/Common/Src/ChunkFile.h:221
 #, c-format
 msgid ""
 "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). "
 "Aborting savestate load..."
 msgstr ""
 
-#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:342
+#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:329
 #, c-format
 msgid ""
 "Error: Trying to access %s fonts but they are not loaded. Games may not show "
@@ -2128,39 +2176,39 @@ msgstr ""
 "Erro: Tentativa de acesso ao tipo de letra %s mas não estão carregadas. Os "
 "jogos poderão não mostrar os tipos de letra correctamente, ou crashar."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:30
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:17
 msgid "Escape"
 msgstr "Escape"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:26
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:30
 msgid "Euphoria"
 msgstr "Euphoria"
 
 #: Source/Core/Core/Src/ArmMemTools.cpp:78
-#: Source/Core/Core/Src/x64MemTools.cpp:217
+#: Source/Core/Core/Src/x64MemTools.cpp:206
 #, c-format
 msgid "Exception handler - access below memory space. %08llx%08llx"
 msgstr ""
 "Manipulador de excepções - acesso inferior ao espaço da memória. %08llx%08llx"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:61
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
 msgid "Execute"
 msgstr "Executar"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:459
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:446
 msgid "Export Failed"
 msgstr "A Exportação Falhou"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:639
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:649
 msgid "Export File"
 msgstr "Exportar Ficheiro"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:177
 msgid "Export Recording"
 msgstr "Exportar Gravação"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:345
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:351
 msgid "Export Recording..."
 msgstr "Exportar Gravação..."
 
@@ -2168,7 +2216,7 @@ msgstr "Exportar Gravação..."
 msgid "Export Save"
 msgstr "Exportar Jogo Guardado"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:874
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:865
 msgid "Export Wii save (Experimental)"
 msgstr "Exportar jogo guardado Wii (Experimental)"
 
@@ -2176,100 +2224,100 @@ msgstr "Exportar jogo guardado Wii (Experimental)"
 msgid "Export all saves"
 msgstr "Exportar todos os jogos guardados"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:80
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:72
 msgid "Export failed, try again?"
 msgstr "Exportação falhou, tentar novamente?"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:559
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:552
 msgid "Export save as..."
 msgstr "Exportar guardar como..."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:297
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:284
 msgid "Extension"
 msgstr "Extensão"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483
 msgid "External Frame Buffer"
 msgstr "Frame Buffer externo"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:61
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:48
 msgid "Extra Parameter"
 msgstr "Parâmetro Extra"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:62
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:49
 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:614
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:624
 msgid "Extract All Files..."
 msgstr "Extrair Todos os Ficheiros..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:616
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:626
 msgid "Extract Apploader..."
 msgstr "Extrair Apploader..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:617
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627
 msgid "Extract DOL..."
 msgstr "Extrair DOL..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:610
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:620
 msgid "Extract Directory..."
 msgstr "Extrair Pasta..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:612
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:622
 msgid "Extract File..."
 msgstr "Extrair Ficheiro..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:608
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:618
 msgid "Extract Partition..."
 msgstr "Extrair Partição..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:724
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:738
 #, c-format
 msgid "Extracting %s"
 msgstr "A Extrair %s"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:707
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:721
 msgid "Extracting All Files"
 msgstr "A Extrair Todos os Ficheiros"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:707
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:721
 msgid "Extracting Directory"
 msgstr "A Extrair Pasta"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:710
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:724
 msgid "Extracting..."
 msgstr "A Extrair..."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:892
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:893
 msgid "FIFO Byte"
 msgstr "FIFO Byte"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:45
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:32
 msgid "FIFO Player"
 msgstr "Reprodutor FIFO"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:169
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:163
 msgid "FRANCE"
 msgstr "FRANÇA"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472
 msgid "FST Size:"
 msgstr "Tamanho FST:"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:77
+#: Source/Core/Core/Src/NetPlayClient.cpp:81
 msgid "Failed to Connect!"
 msgstr "A Conexão Falhou!"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:225
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:228
 msgid "Failed to Listen!!"
 msgstr "A Escuta Falhou!!"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:307
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:300
 msgid "Failed to download codes."
 msgstr "Falha ao descarregar códigos"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:827
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:843
 #, c-format
 msgid "Failed to extract to %s!"
 msgstr "Falha ao extrair para %s!"
@@ -2296,26 +2344,30 @@ msgstr ""
 "Poderá utilizar o motor DSP HLE que não necessita de depósitos ROM.\n"
 "(Escolha-o através do separador \"Áudio\" na janela de configuração.)"
 
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:116
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:139
+#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:108
+#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:131
 msgid "Failed to load bthprops.cpl"
 msgstr "Falha ao carregar bthprops.cpl"
 
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:100
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:109
+#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:90
+#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:101
 msgid "Failed to load hid.dll"
 msgstr "Falha ao carregar hid.dll"
 
-#: Source/Core/Core/Src/Movie.cpp:792
+#: Source/Core/Core/Src/Movie.cpp:783
 #, c-format
 msgid "Failed to read %s"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:151
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:144
 msgid "Failed to read banner.bin"
 msgstr "Falha ao ler banner.bin"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:223
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:178
+msgid "Failed to read bk header"
+msgstr ""
+
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:211
 #, c-format
 msgid ""
 "Failed to read block %d of the save data\n"
@@ -2323,7 +2375,7 @@ msgid ""
 "FilePosition:%llx"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:148
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:136
 msgid ""
 "Failed to read block allocation table backup correctly\n"
 "(0x8000-0x9FFF)"
@@ -2332,7 +2384,7 @@ msgstr ""
 "atribuídos\n"
 "(0x8000-0x9FFF)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:142
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:130
 msgid ""
 "Failed to read block allocation table correctly\n"
 "(0x6000-0x7FFF)"
@@ -2340,12 +2392,17 @@ msgstr ""
 "Falha ao ler a tabela de blocos atribuídos\n"
 "(0x6000-0x7FFF)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:286
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:279
 #, c-format
 msgid "Failed to read data from file %d"
 msgstr "Falha ao ler dados do ficheiro %d"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:136
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:367
+#, c-format
+msgid "Failed to read data from file: %s"
+msgstr ""
+
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:124
 msgid ""
 "Failed to read directory backup correctly\n"
 "(0x4000-0x5FFF)"
@@ -2353,7 +2410,7 @@ msgstr ""
 "Falha ao ler correctamente a pasta com cópia de segurança\n"
 "(0x4000-0x5FFF)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:130
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:118
 msgid ""
 "Failed to read directory correctly\n"
 "(0x2000-0x3FFF)"
@@ -2361,7 +2418,11 @@ msgstr ""
 "Falha ao ler a pasta correctamente\n"
 "(0x2000-0x3FFF)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:119
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:90
+msgid "Failed to read header"
+msgstr ""
+
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:107
 msgid ""
 "Failed to read header correctly\n"
 "(0x0000-0x1FFF)"
@@ -2369,63 +2430,63 @@ msgstr ""
 "Falha ao ler o cabeçalho correctamente\n"
 "(0x0000-0x1FFF)"
 
-#: Source/Core/DiscIO/Src/VolumeGC.cpp:61
+#: Source/Core/DiscIO/Src/VolumeGC.cpp:48
 msgid "Failed to read unique ID from disc image"
 msgstr "Falha ao ler ID único da imagem do disco"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:84
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:71
 msgid "Failed to write BT.DINF to SYSCONF"
 msgstr "Falha ao escrever BT.DINF para SYSCONF"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:228
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:221
 msgid "Failed to write bkhdr"
 msgstr "Falha ao escrever bkhdr"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:164
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:157
 #, c-format
 msgid "Failed to write header for %s"
 msgstr "Falha ao escrever cabeçalho para %s"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:258
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:251
 #, c-format
 msgid "Failed to write header for file %d"
 msgstr "Falha ao escrever cabeçalho para o ficheiro %d"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294
 msgid "Farsi"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477
 msgid "Fast"
 msgstr "Rápido"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315
 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:1046
+#: Source/Core/Core/Src/Movie.cpp:1037
 #, c-format
 msgid ""
 "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:199
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:202
 msgid "Fifo Player"
 msgstr "Reprodutor Fifo"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:99
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:86
 msgid "File Info"
 msgstr "Informação de Ficheiro"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:304
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:295
 msgid "File contained no codes."
 msgstr "O ficheiro não continha códigos."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:413
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:400
 msgid "File converted to .gci"
 msgstr "Ficheiro convertido para .gci"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:428
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:415
 msgid ""
 "File could not be opened\n"
 "or does not have a valid extension"
@@ -2433,7 +2494,7 @@ msgstr ""
 "O ficheiro não pôde ser aberto\n"
 "ou não tem uma extensão válida"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:84
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:72
 #, c-format
 msgid ""
 "File has the extension \"%s\"\n"
@@ -2442,36 +2503,36 @@ msgstr ""
 "O ficheiro tem a extensão \"%s\"\n"
 "as extensões válidas são (.raw/.gcp)"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:425
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:412
 msgid "File is not recognized as a memcard"
 msgstr "Ficheiros não são reconhecidos como sendo de cartão de memória"
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:294
+#: Source/Core/DiscIO/Src/CompressedBlob.cpp:281
 msgid "File not compressed"
 msgstr "Ficheiro não comprimido"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:127
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:109
 #, c-format
 msgid "FileIO: Unknown open mode : 0x%02x"
 msgstr "FileIO: Modo aberto desconhecido : 0x%02x"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:531
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:541
 msgid "Filesystem"
 msgstr "Sistema de ficheiros"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1100
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1126
 msgid "Filetype 'ini' is unknown! Will not open!"
 msgstr "Tipo de ficheiro 'ini' é desconhecido! Não será aberto!"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:265
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:252
 msgid "Find next"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:266
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:253
 msgid "Find previous"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:632
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626
 msgid "First Block"
 msgstr "Primeiro Bloco"
 
@@ -2479,23 +2540,23 @@ msgstr "Primeiro Bloco"
 msgid "Fix Checksums"
 msgstr "Corrigir Checksums"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:275
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283
 msgid "Force 16:9"
 msgstr "Forçar 16:9"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:275
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283
 msgid "Force 4:3"
 msgstr "Forçar 4:3"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:568
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548
 msgid "Force Console as NTSC-J"
 msgstr "Definir a consola como NTSC-J"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406
 msgid "Force Texture Filtering"
 msgstr "Forçar Filtro de Textura"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90
 msgid ""
 "Force texture filtering even if the emulated game explicitly disabled it.\n"
 "Improves texture quality slightly but causes glitches in some games.\n"
@@ -2508,7 +2569,7 @@ msgstr ""
 "jogos.\n"
 "Em caso de dúvida, mantenha esta opção desactivada."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83
 msgid ""
 "Force the game to output graphics for widescreen resolutions.\n"
 "Causes graphical glitches is some games.\n"
@@ -2520,7 +2581,7 @@ msgstr ""
 "\n"
 "Em caso de dúvida, mantenha esta opção desactivada."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488
 msgid ""
 "Forces NTSC-J mode for using the Japanese ROM font.\n"
 "Left unchecked, dolphin defaults to NTSC-U and automatically enables this "
@@ -2530,7 +2591,7 @@ msgstr ""
 "Se deixar desactivada, o dolphin utiliza a NTSC-U como padrão e "
 "automaticamente activa esta definição quando um jogo Japonês é jogado."
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:74
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:62
 msgid ""
 "Format as ascii (NTSC\\PAL)?\n"
 "Choose no for sjis (NTSC-J)"
@@ -2538,148 +2599,147 @@ msgstr ""
 "Formatar como ascii (NTSC\\PAL)?\n"
 "Escolha não para sjis (NTSC-J)"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:278
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:265
 msgid "Forward"
 msgstr "Frente"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504
 #, c-format
 msgid "Found %d results for '"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:857
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:925
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:858
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:926
 msgid "Frame"
 msgstr "Quadro"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:867
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:868
 msgid "Frame "
 msgstr "Quadro"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:185
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:173
 msgid "Frame Advance"
 msgstr "Avançar Quadro"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:536
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549
 msgid "Frame Dumps use FFV1"
 msgstr "Depósitos de Quadros usam FFV1"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:227
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:214
 msgid "Frame Info"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:116
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:103
 msgid "Frame Range"
 msgstr "Alcance de Quadros"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:138
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:139
 msgid "Frame S&kipping"
 msgstr "S&altar Quadros"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:572
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552
 msgid "Framelimit:"
 msgstr "Limite de Quadros:"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:204
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:191
 msgid "Frames To Record"
 msgstr "Quadros para Gravar"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547
 msgid "Free Look"
 msgstr "Vista Livre"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
 msgid "French"
 msgstr "Francês"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:38
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:42
 msgid "Frets"
 msgstr "Trastes"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:118
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:137
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:105
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:124
 msgid "From"
 msgstr "De"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:426
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:432
 msgid "FullScr"
 msgstr "Ecrã Inteiro"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:256
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263
 msgid "Fullscreen resolution:"
 msgstr "Resolução em ecrã Inteiro:"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:534
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524
 msgid "GCI File(*.gci)"
 msgstr "Ficheiro GCI(*.gci)"
 
-#: Source/Core/DolphinWX/Src/GCMicDlg.h:44
+#: Source/Core/DolphinWX/Src/GCMicDlg.h:31
 msgid "GCMic Configuration"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:432
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
 msgid "GCPad"
 msgstr "ComandoGC"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:659
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:658
 msgid "GX_CMD_INVL_VC"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:448
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:452
 msgid "Game ID:"
 msgstr "ID do Jogo:"
 
-#: Source/Core/Core/Src/NetPlay.cpp:229
+#: Source/Core/Core/Src/NetPlay.cpp:216
 msgid "Game is already running!"
 msgstr "O jogo já está a correr!"
 
-#: Source/Core/Core/Src/NetPlay.cpp:259
+#: Source/Core/Core/Src/NetPlay.cpp:246
 msgid "Game isn't running!"
 msgstr "O jogo não está a correr!"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:389
-#, fuzzy
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:393
 msgid "Game not found!"
-msgstr "Jogo não encontrado"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:385
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:389
 msgid "Game-Specific Settings"
 msgstr "Definições específicas por jogo"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:293
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:294
 msgid "GameConfig"
 msgstr "Configuração de Jogo"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:525
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:515
 msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534
 msgid "Gamecube"
 msgstr "Gamecube"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:178
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:181
 msgid "Gamecube &Pad Settings"
 msgstr "Definições de Comando &Gamecube"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:218
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1069
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:205
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1052
 msgid "Gamecube Memory Cards (*.raw,*.gcp)"
 msgstr "Cartões de memória Gamecube (*.raw,*.gcp)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:432
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
 msgid "Gamecube Pad settings"
 msgstr "Definições de Comando Gamecube"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:117
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302
 msgid "Gecko Codes"
 msgstr "Códigos Gecko"
 
-#: Source/Core/Core/Src/GeckoCode.cpp:222
+#: Source/Core/Core/Src/GeckoCode.cpp:214
 #, c-format
 msgid ""
 "GeckoCode failed to run (CT%i CST%i) (%s)\n"
@@ -2688,10 +2748,10 @@ msgid ""
 "directory and restarting Dolphin.)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:172
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:197
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:160
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:160
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:202
 msgid "General"
 msgstr "Geral"
 
@@ -2699,30 +2759,30 @@ msgstr "Geral"
 msgid "General Settings"
 msgstr "Definições Gerais"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:470
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:281
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:316
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:261
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
 msgid "German"
 msgstr "Alemão"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:449
+#: Source/Core/Core/Src/ActionReplay.cpp:439
 #, 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:430
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:436
 msgid "Graphics"
 msgstr "Gráficos"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:430
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:436
 msgid "Graphics settings"
 msgstr "Definições Gráficas"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:205
 msgid "Greater Than"
 msgstr "Maior Que"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87
 msgid ""
 "Greatly increases quality of textures generated using render to texture "
 "effects.\n"
@@ -2733,51 +2793,67 @@ msgid ""
 "If unsure, leave this checked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:317
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
 msgid "Greek"
 msgstr "Grego"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:22
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Green"
 msgstr "Verde"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:24
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Green Left"
 msgstr "Verde Esquerda"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:25
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Green Right"
 msgstr "Verde Direita"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:35
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:39
 msgid "Guitar"
 msgstr "Guitarra"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1259
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1250
 msgid "HCI_CMD_INQUIRY is called, please report!"
 msgstr "HCI_CMD_INQUIRY é chamada, Por favor reporte!"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:421
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504
+msgid "Hacked Buffer Upload"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431
 msgid "Hacks"
 msgstr "Hacks"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:158
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:146
 msgid "Header checksum failed"
 msgstr "Verificação de Cabeçalho falhou"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:318
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298
 msgid "Hebrew"
 msgstr "Hebraico"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:313
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:300
 msgid "Height"
 msgstr "Altura"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:64
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:51
 msgid "Help"
 msgstr "Ajuda"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:209
+#: Source/Core/DolphinWX/Src/Main.cpp:229
+msgid ""
+"Hi,\n"
+"\n"
+"Dolphin requires Mac OS X 10.7 or greater.\n"
+"Unfortunately you're running an old version of OS X.\n"
+"The last Dolphin version to support OS X 10.6 is Dolphin 3.5\n"
+"Please upgrade to 10.7 or greater to use the newest Dolphin version.\n"
+"\n"
+"Sayonara!\n"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/Main.cpp:220
 msgid ""
 "Hi,\n"
 "\n"
@@ -2793,15 +2869,15 @@ msgstr ""
 "\n"
 "Sayonara!\n"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:309
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:296
 msgid "Hide"
 msgstr "Esconder"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:307
 msgid "Hide Mouse Cursor"
 msgstr "Esconder o cursor do rato"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79
 msgid ""
 "Hides the mouse cursor if it's on top of the emulation window.\n"
 "\n"
@@ -2811,26 +2887,26 @@ msgstr ""
 "\n"
 "Em caso de dúvida, mantenha esta opção activada."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:54
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41
 msgid "Home"
 msgstr "Home"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:85
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:138
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:76
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:141
 msgid "Host"
 msgstr "Host"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.h:44
+#: Source/Core/DolphinWX/Src/HotkeyDlg.h:31
 msgid "Hotkey Configuration"
 msgstr "Configuração de Teclas de atalho"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:272
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:272
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:594
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:260
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:260
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574
 msgid "Hotkeys"
 msgstr "Teclas de Atalho"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:319
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299
 msgid "Hungarian"
 msgstr "Húngaro"
 
@@ -2838,35 +2914,31 @@ msgstr "Húngaro"
 msgid "Hybrid Wiimote"
 msgstr "Wiimote Hibrido"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:532
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:519
 #, 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:786
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:773
 #, c-format
 msgid ""
-"IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available "
-"in your nand dump\n"
+"IOCTL_ES_LAUNCH: Game tried to reload an IOS or a title that is not "
+"available in your NAND dump\n"
 "TitleID %016llx.\n"
-" Dolphin will likely hang now"
+" Dolphin will likely hang now."
 msgstr ""
-"IOCTL_ES_LAUNCH:O jogo tentou recarregar ios ou um título que não está "
-"disponível no seu nand dump\n"
-"TitleID %016llx.\n"
-" O Dolphin irá provavelmente bloquear agora"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:313
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:300
 msgid "IOCTL_ES_READCONTENT - bad destination"
 msgstr "IOCTL_ES_READCONTENT - destino inválido"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729
 msgid "IPL Settings"
 msgstr "Definições IPL"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269
 msgid "IR"
 msgstr "IV"
 
@@ -2878,47 +2950,33 @@ msgstr "Ponteiro Infra Vermelho"
 msgid "IR Sensitivity:"
 msgstr "Sensibilidade de Infra Vermelhos"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:502
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:512
 msgid "ISO Details"
 msgstr "Detalhes ISO"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:830
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:811
 msgid "ISO Directories"
 msgstr "Pastas ISO"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:172
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:166
 msgid "ITALY"
 msgstr "Itália"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:630
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:624
 msgid "Icon"
 msgstr "Ícone"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332
 msgid ""
 "If checked, the bounding box registers will be updated. Used by the Paper "
 "Mario games."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318
-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:505
-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:428
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438
 msgid "Ignore Format Changes"
 msgstr "Ignorar Mudanças de Formato"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94
 msgid ""
 "Ignore any changes to the EFB format.\n"
 "Improves performance in many games without any negative effect. Causes "
@@ -2932,7 +2990,7 @@ msgstr ""
 "\n"
 "Em caso de dúvida, mantenha esta opção activada."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93
 msgid ""
 "Ignore any requests of the CPU to read from or write to the EFB.\n"
 "Improves performance in some games, but might disable some gameplay-related "
@@ -2950,11 +3008,11 @@ msgstr ""
 msgid "Import Save"
 msgstr "Importar Jogo Guardado"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:59
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:48
 msgid "Import failed, try again?"
 msgstr "Importação falhou, tentar novamente?"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:454
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:441
 msgid ""
 "Imported file has gsc extension\n"
 "but does not have a correct header"
@@ -2962,11 +3020,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:442
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:429
 msgid "Imported file has invalid length"
 msgstr "O ficheiro importado tem um tamanho inválido"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:451
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:438
 msgid ""
 "Imported file has sav extension\n"
 "but does not have a correct header"
@@ -2974,19 +3032,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:95
-msgid ""
-"Improves performance but causes glitches in most games which rely on proper "
-"fog emulation.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"Aumenta o desempenho mas provoca falhas na maioria dos jogos que necessitem "
-"da emulação correcta de nevoeiro.\n"
-"\n"
-"Em caso de dúvida, manteha esta opção desactivada."
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350
 msgid "In Game"
 msgstr "Em Jogo"
 
@@ -2994,85 +3040,85 @@ msgstr "Em Jogo"
 msgid "In-Game"
 msgstr "Em-Jogo"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:34
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305
 msgid "Info"
 msgstr "Informação"
 
-#: Source/Core/Common/Src/MsgHandler.cpp:65
+#: Source/Core/Common/Src/MsgHandler.cpp:51
 msgid "Information"
 msgstr "Informação"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:481
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:468
 msgid "Input"
 msgstr "Entrada"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:63
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:50
 msgid "Insert"
 msgstr "Inserir"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:176
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:166
 msgid "Insert Encrypted or Decrypted code here..."
 msgstr "Insira o código criptográfado ou \"descriptografado\" aqui..."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:763
 msgid "Insert SD Card"
 msgstr "Inserir Cartão SD"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:34
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:21
 msgid "Insert name here.."
 msgstr "Introduza o nome aqui..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:196
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:199
 msgid "Install WAD"
 msgstr "Instalar WAD"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:895
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:888
 msgid "Install to Wii Menu"
 msgstr "Instalar para o Menu Wii"
 
-#: Source/Core/Core/Src/x64MemTools.cpp:252
+#: Source/Core/Core/Src/x64MemTools.cpp:242
 msgid ""
 "InstallExceptionHandler called, but this platform does not yet support it."
 msgstr ""
 "InstallExceptionHandler chamado, mas esta plataforma ainda não a suporta."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1297
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
 msgid "Installing WAD..."
 msgstr "A Instalar WAD..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:885
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:901
 msgid "Integrity Check Error"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:891
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:907
 msgid "Integrity check completed"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:890
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:906
 msgid "Integrity check completed. No errors have been found."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:882
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:898
 #, 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:552
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532
 msgid "Interface"
 msgstr "Iinterface"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:646
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627
 msgid "Interface Settings"
 msgstr "Definições de interface"
 
-#: Source/Core/Core/Src/State.cpp:240
+#: Source/Core/Core/Src/State.cpp:228
 msgid "Internal LZO Error - compression failed"
 msgstr "Erro interno de LZO - compressão falhou"
 
-#: Source/Core/Core/Src/State.cpp:348
+#: Source/Core/Core/Src/State.cpp:336
 #, c-format
 msgid ""
 "Internal LZO Error - decompression failed (%d) (%li, %li) \n"
@@ -3081,41 +3127,45 @@ msgstr ""
 "Erro interno de LZO - a descompressão falhou (%d) (%li, %li) \n"
 "Tente carregar o estado novamente"
 
-#: Source/Core/Core/Src/State.cpp:485
+#: Source/Core/Core/Src/State.cpp:473
 msgid "Internal LZO Error - lzo_init() failed"
 msgstr "Erro interno de LZO - lzo_init() falhou"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:344
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:352
 msgid "Internal Resolution:"
 msgstr "Resolução Interna:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:42
+msgid "Interpreter (VERY slow)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349
 msgid "Intro"
 msgstr "Intro"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:194
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:187
 #, c-format
 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:600
 msgid "Invalid Value!"
 msgstr "Valor inválido!"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:462
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:449
 msgid "Invalid bat.map or dir entry"
 msgstr "bat.map inválido ou entrada de pasta"
 
-#: Source/Core/Core/Src/CoreTiming.cpp:548
+#: Source/Core/Core/Src/CoreTiming.cpp:553
 #, c-format
 msgid "Invalid event type %i"
 msgstr "Tipo de evento inválido %i"
 
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:326
+#: Source/Core/Core/Src/HW/DVDInterface.cpp:309
 msgid "Invalid file"
 msgstr "Ficheiro inválido"
 
-#: Source/Core/DiscIO/Src/BannerLoaderGC.cpp:41
+#: Source/Core/DiscIO/Src/BannerLoaderGC.cpp:28
 #, c-format
 msgid ""
 "Invalid opening.bnr found in gcm:\n"
@@ -3126,108 +3176,116 @@ msgstr ""
 "%s\n"
 " Poderá ter que refazer o depósito deste jogo."
 
-#: Source/Core/Core/Src/Movie.cpp:735
+#: Source/Core/Core/Src/Movie.cpp:726
 msgid "Invalid recording file"
 msgstr "Ficheiro de Gravação inválido"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:473
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:472
 msgid "Invalid search parameters (no object selected)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:456
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:455
 msgid "Invalid search string (couldn't convert to number)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:444
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:443
 msgid "Invalid search string (only even string lengths supported)"
 msgstr ""
 
-#: Source/Core/Core/Src/Core.cpp:513
+#: Source/Core/Core/Src/Core.cpp:511
 msgid "Invalid state"
 msgstr "Estado Inválido"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:473
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:320
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300
 msgid "Italian"
 msgstr "Italiano"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:183
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:177
 msgid "JAPAN"
 msgstr "JAPÃO"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:321
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:46
+msgid "JIT Recompiler (recommended)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:47
+msgid "JITIL experimental recompiler"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:279
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
 msgid "Japanese"
 msgstr "Japonês"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:188
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:182
 msgid "KOREA"
 msgstr "COREIA"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78
 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:298
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:306
 msgid "Keep window on top"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:241
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:241
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:229
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:229
 msgid "Key"
 msgstr "Tecla"
 
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282
 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:322
 msgid "Korean"
 msgstr "Coreano"
 
 #. i18n:  Left
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:57
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:44
 msgid "L"
 msgstr "L"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:39
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:26
 msgid "L Button"
 msgstr "Botão L"
 
 #. i18n:  Left-Analog
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:61
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:48
 msgid "L-Analog"
 msgstr "L-Analógico"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:585
 msgid "Language:"
 msgstr "Idioma:"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:152
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:153
 msgid "Last Overwritten State"
 msgstr "Último estado Substituído"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:159
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:161
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:160
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:162
 msgid "Last Saved State"
 msgstr "Último Estado Guardado"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:696
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:677
 msgid "Latency:"
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:276
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:55
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:263
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:42
 msgid "Left"
 msgstr "Esquerda"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:60
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:64
 msgid "Left Stick"
 msgstr "Stick Esquerdo"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:257
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:257
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:245
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:245
 msgid ""
 "Left click to detect hotkeys.\n"
 "Enter space to clear."
@@ -3235,7 +3293,7 @@ msgstr ""
 "Clique esquerdo para detectar teclas de atalho. \n"
 "Prima barra de espaço para limpar."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:689
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:678
 msgid ""
 "Left-click to detect input.\n"
 "Middle-click to clear.\n"
@@ -3245,7 +3303,7 @@ msgstr ""
 "Clique botão do meio para limpar.\n"
 "Clique botão direito para mais opções."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:694
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:683
 msgid ""
 "Left/Right-click for more options.\n"
 "Middle-click to clear."
@@ -3253,76 +3311,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:206
 msgid "Less Than"
 msgstr "Inferior que"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:565
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545
 msgid "Limit by FPS"
 msgstr "Limitar por FPS"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:924
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:915
 msgid "Load"
 msgstr "Carregar"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544
 msgid "Load Custom Textures"
 msgstr "Carregar Texturas Personalizadas"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
 msgid "Load State Slot 1"
 msgstr "Carregar Estado Slot 1"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189
 msgid "Load State Slot 2"
 msgstr "Carregar Estado Slot 2"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:190
 msgid "Load State Slot 3"
 msgstr "Carregar Estado Slot 3"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:203
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:191
 msgid "Load State Slot 4"
 msgstr "Carregar Estado Slot 4"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192
 msgid "Load State Slot 5"
 msgstr "Carregar Estado Slot 5"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193
 msgid "Load State Slot 6"
 msgstr "Carregar Estado Slot 6"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:194
 msgid "Load State Slot 7"
 msgstr "Carregar Estado Slot 7"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:195
 msgid "Load State Slot 8"
 msgstr "Carregar Estado Slot 8"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:155
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:156
 msgid "Load State..."
 msgstr "Carregar Estado..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1332
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1359
 msgid "Load Wii System Menu"
 msgstr "Carregar Sistema de Menu Wii"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1327
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1354
 #, c-format
 msgid "Load Wii System Menu %d%c"
 msgstr "Carregar Sistema de Menu Wii %d%c"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112
 msgid ""
 "Load custom textures from User/Load/Textures/<game_id>/\n"
 "\n"
@@ -3332,7 +3390,7 @@ msgstr ""
 "\n"
 "Em caso de dúvida, mantenha esta opção desactivada."
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:50
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:37
 msgid "Load preset values from hack patterns available."
 msgstr "Carregar Valores de origem para padrões de hack disponíveis."
 
@@ -3340,23 +3398,23 @@ msgstr "Carregar Valores de origem para padrões de hack disponíveis."
 msgid "Local"
 msgstr "Local"
 
-#: Source/Core/DolphinWX/Src/LogWindow.h:51
+#: Source/Core/DolphinWX/Src/LogWindow.h:38
 msgid "Log"
 msgstr "Relatório"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:26
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:13
 msgid "Log Configuration"
 msgstr "Configuração de Relatório"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:296
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304
 msgid "Log FPS to file"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:96
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83
 msgid "Log Types"
 msgstr "Tipos de Relatório"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103
 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"
@@ -3364,24 +3422,24 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:81
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:68
 msgid "Logger Outputs"
 msgstr "Saídas de Gerador de Relatórios"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132
-#: Source/Core/DolphinWX/Src/Frame.cpp:328
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:119
+#: Source/Core/DolphinWX/Src/Frame.cpp:314
 msgid "Logging"
 msgstr "Relatório em execução"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:255
+#: Source/Core/Core/Src/NetPlayClient.cpp:259
 msgid "Lost connection to server!"
 msgstr "A ligação ao servidor perdeu-se!"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:42
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:29
 msgid "M Button"
 msgstr "Botão M"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:119
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:112
 #, c-format
 msgid ""
 "MD5 mismatch\n"
@@ -3390,51 +3448,60 @@ msgstr ""
 "MD5 não combina\n"
 " %016llx%016llx != %016llx%016llx"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314
 msgid "MMU Speed Hack"
 msgstr "MMU Hack de velocidade"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:527
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:563
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:517
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:556
 msgid "MadCatz Gameshark files(*.gcs)"
 msgstr "ficheiros MadCatz Gameshark(*.gcs)"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:51
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:63
+#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:38
 msgid "Main Stick"
 msgstr "Stick Principal"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460
 msgid "Maker ID:"
 msgstr "ID do autor:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487
 msgid "Maker:"
 msgstr "Fabricante:"
 
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100
+msgid ""
+"Makes distant objects more visible by removing fog, thus increasing the "
+"overall detail.\n"
+"Disabling fog will break some games which rely on proper fog emulation.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:97
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:100
 msgid "Max"
 msgstr "Max"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:448
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:435
 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:291
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:278
 msgid "Memcard already opened"
 msgstr "O cartão de memória já abriu"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:912
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:913
 msgid "Memory Byte"
 msgstr "Byte de Memória"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:225
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:113
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:212
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:93
 msgid "Memory Card"
 msgstr "Cartão de memória"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.h:36
+#: Source/Core/DolphinWX/Src/MemcardManager.h:23
 msgid ""
 "Memory Card Manager WARNING-Make backups before using, should be fixed but "
 "could mangle stuff!"
@@ -3442,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:371
+#: Source/Core/Core/Src/CoreParameter.cpp:360
 #, c-format
 msgid ""
 "Memory Card filename in Slot %c is incorrect\n"
@@ -3459,15 +3526,15 @@ msgstr ""
 "%s\n"
 "Quer fazer uma cópia do ficheiro antigo para esta nova localização?\n"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:124
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:112
 msgid "Memorycard filesize does not match the header size"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:50
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:37
 msgid "Menu"
 msgstr "Menu"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:114
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:94
 msgid "Mic"
 msgstr "Mic"
 
@@ -3476,20 +3543,20 @@ msgstr "Mic"
 msgid "Min"
 msgstr "Min"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:580
 msgid "Misc"
 msgstr "Diversos"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:795
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776
 msgid "Misc Settings"
 msgstr "Configurações Diversas"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:240
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:294
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:227
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:281
 msgid "Modifier"
 msgstr "Modificador"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106
 msgid ""
 "Modify textures to show the format they're encoded in. Needs an emulation "
 "reset in most cases.\n"
@@ -3501,20 +3568,20 @@ msgstr ""
 "\n"
 "Em caso de dúvida, mantenha esta opção desactivada."
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:115
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:108
 msgid "Monospaced font"
 msgstr "Tipo de letra monoespaçada"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:305
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:292
 msgid "Motion Plus"
 msgstr "Motion Plus"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:309
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:86
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:296
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73
 msgid "Motor"
 msgstr "Motor"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:654
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:666
 msgid ""
 "Move the mouse pointer over an option to display a detailed description.\n"
 "\n"
@@ -3533,224 +3600,235 @@ msgstr ""
 "\n"
 "\n"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:75
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:62
 msgid "Multiply"
 msgstr "Multiplicar"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:651
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:650
 msgid "NOP"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:629
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:628
 msgid "NOTE: Stream size doesn't match actual data length\n"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:129
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:116
 msgid "NP Add"
 msgstr "NP Adicionar"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:124
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:111
 msgid "NP Begin"
 msgstr "NP Começar"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:132
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:119
 msgid "NP Decimal"
 msgstr "NP Decimal"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:126
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:113
 msgid "NP Delete"
 msgstr "NP Apagar"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:133
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:120
 msgid "NP Divide"
 msgstr "NP Dividir"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:120
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:107
 msgid "NP Down"
 msgstr "NP Baixo"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:123
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:110
 msgid "NP End"
 msgstr "NP Fim"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:111
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:98
 msgid "NP Enter"
 msgstr "NP Enter"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:127
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:114
 msgid "NP Equal"
 msgstr "NP Igual"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:116
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:103
 msgid "NP Home"
 msgstr "NP Início"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:125
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:112
 msgid "NP Insert"
 msgstr "NP Inserir"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:117
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:104
 msgid "NP Left"
 msgstr "NP Esquerda"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:128
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:115
 msgid "NP Multiply"
 msgstr "NP Multiplicar"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:122
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:109
 msgid "NP Page Down"
 msgstr "NP Página abaixo"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:121
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:108
 msgid "NP Page Up"
 msgstr "NP Página acima"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:119
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:106
 msgid "NP Right"
 msgstr "NP Direita"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:130
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:117
 msgid "NP Separator"
 msgstr "NP Separador"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:109
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:96
 msgid "NP Space"
 msgstr "NP Espaço"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:131
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:118
 msgid "NP Subtract"
 msgstr "NP Subtrair"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:110
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:97
 msgid "NP Tab"
 msgstr "NP Tab"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:118
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:105
 msgid "NP Up"
 msgstr "NP Cima"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:444
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:59
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:50
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:448
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:46
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:37
 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:25
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:72
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:282
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:553
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:15
 msgid "Name: "
 msgstr "Nome:"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:526
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:562
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:516
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:555
 msgid "Native GCI files(*.gci)"
 msgstr "Ficheiros GCI nativos(*.gci)"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:161
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:148
 msgid "New Scan"
 msgstr "Nova procura"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:206
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:193
 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:801
 msgid "Next Page"
 msgstr "Próxima Página"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:165
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:152
 msgid "Next Scan"
 msgstr "Próxima Procura"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:68
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:59
 msgid "Nickname :"
 msgstr "Alcunha :"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:196
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:190
 msgid "No Country (SDK)"
 msgstr "Sem País (SDK)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:370
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:357
 msgid "No ISOs or WADS found"
 msgstr "Nenhum ISO ou WAD encontrado"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:508
+#: Source/Core/Core/Src/ConfigManager.h:17
+msgid "No audio output"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:501
 #, c-format
 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:761
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:768
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:760
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:767
 msgid "No description available"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:514
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:535
 msgid "No docking"
 msgstr "Sem colocação"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:859
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:860
 msgid "No file loaded"
 msgstr "Nenhum ficheiro carregado"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:439
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:426
 msgid "No free dir index entries"
 msgstr "Sem entradas de índice para pastas livres"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:895
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:896
 msgid "No recorded file"
 msgstr "Nenhum ficheiro de gravação"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:501
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:494
 #, c-format
 msgid "No save folder found for title %s"
 msgstr "Não foi encontrada a pasta de jogo guardado para o título %s"
 
+#: Source/Plugins/Plugin_VideoOGL/Src/main.cpp:132
+#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:111
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:23
 #: Source/Core/DolphinWX/Src/NetWindow.cpp:600
 msgid "None"
 msgstr "Nenhum"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:323
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303
 msgid "Norwegian Bokmaal"
 msgstr "Bokmaal Norueguês"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:203
 msgid "Not Equal"
 msgstr "Não igual"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:804
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:794
 msgid "Not Set"
 msgstr "Não definido"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:626
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:101
+#, c-format
+msgid "Not a Wii save or read failure for file header size %x"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/Main.cpp:654
 msgid "Not connected"
 msgstr "Não conectado"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:309
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:296
 msgid "Notes"
 msgstr "Notas"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:16
 msgid "Notes: "
 msgstr "Notas:"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:71
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:74
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:580
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:621
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:629
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:59
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:64
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:613
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:659
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:667
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:31
 msgid "Notice"
 msgstr "Noticia"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:105
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:92
 msgid "Num Lock"
 msgstr "Num Lock"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:88
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:75
 msgid "Number Of Codes: "
 msgstr "Número De Códigos"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:30
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:34
 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26
 msgid "Nunchuk"
 msgstr "Nunchuk"
@@ -3759,96 +3837,97 @@ msgstr "Nunchuk"
 msgid "Nunchuk Acceleration"
 msgstr "Aceleração Nunchuk"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:877
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:878
 msgid "Object"
 msgstr "Objecto"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:135
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:122
 msgid "Object Range"
 msgstr "Alcance de Objecto"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:243
 msgid "Off"
 msgstr "Desligado"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:62
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:49
 msgid "Offset:"
 msgstr "Offset:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:582
 msgid "On-Screen Display Messages"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:436
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:423
 #, c-format
 msgid "Only %d blocks available"
 msgstr "Apenas %d blocos disponíveis"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:420
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:178
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:426
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:166
 msgid "Open"
 msgstr "Abrir"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:876
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:867
 msgid "Open &containing folder"
 msgstr "Abrir &Pasta"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:873
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:864
 msgid "Open Wii &save folder"
 msgstr "Abrir Pasta de &Jogo guardado Wii "
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:420
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:426
 msgid "Open file..."
 msgstr "Abrir ficheiro..."
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:61
+#: Source/Core/AudioCommon/Src/OpenALStream.cpp:48
 #, 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:72
+#: Source/Core/AudioCommon/Src/OpenALStream.cpp:59
 msgid "OpenAL: can't find sound devices"
 msgstr "OpenAL: não foram encontrados dispositivos de som"
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:66
+#: Source/Core/AudioCommon/Src/OpenALStream.cpp:53
 #, 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:493
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502
 msgid "OpenCL Texture Decoder"
 msgstr "Descodificador de Textura OpenCL"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503
 msgid "OpenMP Texture Decoder"
 msgstr "Descodificador de Textura OpenMP"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:317
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:94
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:304
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:81
 msgid "Options"
 msgstr "Opções"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:22
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Orange"
 msgstr "Laranja"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:468
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:455
+#, fuzzy
 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"
+"and import the saves to a new memcard\n"
 msgstr ""
 "A ordem dos ficheiros na pasta não combina com a ordem dos blocos\n"
 "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:316
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:324
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:509
 msgid "Other"
 msgstr "Outro"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:206
+#: Source/Core/Core/Src/NetPlayClient.cpp:210
 msgid ""
 "Other client disconnected while game is running!! NetPlay is disabled. You "
 "manually stop the game."
@@ -3856,15 +3935,15 @@ msgstr ""
 "O outro cliente desligou enquanto o jogo corria!! Netplay está desactivado. "
 "Manualmente parou o jogo."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:481
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:468
 msgid "Output"
 msgstr "Destino"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:342
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:348
 msgid "P&lay Recording..."
 msgstr "R&eproduzir Gravação..."
 
-#: Source/Core/Core/Src/HW/GCPad.cpp:30
+#: Source/Core/Core/Src/HW/GCPad.cpp:18
 msgid "Pad"
 msgstr "Comando"
 
@@ -3872,160 +3951,160 @@ msgstr "Comando"
 msgid "Pad "
 msgstr "Comando"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:34
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:38
 msgid "Pads"
 msgstr "Comandos"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:108
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:95
 msgid "Page Down"
 msgstr "Página Abaixo"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:107
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:94
 msgid "Page Up"
 msgstr "Página Acima"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:35
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:22
 msgid "Paragraph"
 msgstr "Parágrafo"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:64
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:51
 msgid "Parameters"
 msgstr "Parâmetros"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:222
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:217
 #, c-format
 msgid "Partition %i"
 msgstr "Partição %i"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:296
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:297
 msgid "Patches"
 msgstr "Patches"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:556
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536
 msgid "Paths"
 msgstr "Caminhos"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1538
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1539
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:51
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1565
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1566
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:38
 msgid "Pause"
 msgstr "Pausa"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:128
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:129
 msgid "Pause at end of movie"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:397
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405
 msgid "Per-Pixel Lighting"
 msgstr "Iluminação por Pixel"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352
 msgid "Perfect"
 msgstr "Perfeito"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:609
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:642
 #, c-format
 msgid "Perspective %d"
 msgstr "Perspectiva %d"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:165
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:424
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1547
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1548
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:152
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:430
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1574
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1575
 msgid "Play"
 msgstr "Começar"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176
 msgid "Play Recording"
 msgstr "Tocar Gravação"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:170
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:170
 msgid "Play/Pause"
 msgstr "Começar/Pausar"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351
 msgid "Playable"
 msgstr "Jogável"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:154
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:141
 msgid "Playback Options"
 msgstr "Opções de Reprodução"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:301
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:304
 msgid "Players"
 msgstr "Jogadores"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:988
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:991
 msgid "Please confirm..."
 msgstr "Por favor confirme..."
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:579
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:612
 msgid "Please create a perspective before saving"
 msgstr "Por favor crie uma perspectiva antes de guardar"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:36
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:23
 msgid "Plus-Minus"
 msgstr "Mais-Menos"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:324
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304
 msgid "Polish"
 msgstr "Polaco"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:713
 msgid "Port 1"
 msgstr "Port 1"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714
 msgid "Port 2"
 msgstr "Port 2"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:734
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715
 msgid "Port 3"
 msgstr "Port 3"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716
 msgid "Port 4"
 msgstr "Port 4"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:97
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:130
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:88
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:133
 msgid "Port :"
 msgstr "Port :"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:325
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305
 msgid "Portuguese"
 msgstr "Português"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:326
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306
 msgid "Portuguese (Brazilian)"
 msgstr "Português (Brasileiro)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:391
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:399
 msgid "Post-Processing Effect:"
 msgstr "Efeito de Pós-Processamento"
 
-#: Source/Core/Core/Src/Movie.cpp:936
+#: Source/Core/Core/Src/Movie.cpp:927
 #, c-format
 msgid "Premature movie end in PlayController. %u + 8 > %u"
 msgstr ""
 
-#: Source/Core/Core/Src/Movie.cpp:1055
+#: Source/Core/Core/Src/Movie.cpp:1046
 #, c-format
 msgid "Premature movie end in PlayWiimote. %u + %d > %u"
 msgstr ""
 
-#: Source/Core/Core/Src/Movie.cpp:1032
+#: Source/Core/Core/Src/Movie.cpp:1023
 #, c-format
 msgid "Premature movie end in PlayWiimote. %u > %u"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:48
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:35
 msgid "Presets: "
 msgstr "Predefinições:"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:205
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:192
 msgid "Prev Page"
 msgstr "Pág Anterior"
 
@@ -4033,67 +4112,67 @@ msgstr "Pág Anterior"
 msgid "Previous Page"
 msgstr "Página Anterior"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:183
 msgid "Previous Value"
 msgstr "Valor anterior"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:60
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:47
 msgid "Print"
 msgstr "Imprimir"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:894
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:885
 msgid "Profile"
 msgstr "Perfil"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.h:55
+#: Source/Core/DolphinWX/Src/ISOProperties.h:42
 msgid "Properties"
 msgstr "Propriedades"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:283
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:286
 msgid "Purge Cache"
 msgstr "Limpar Cache"
 
-#: Source/Core/Common/Src/MsgHandler.cpp:66
+#: Source/Core/Common/Src/MsgHandler.cpp:52
 msgid "Question"
 msgstr "Questão"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:159
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:316
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:162
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:319
 msgid "Quit"
 msgstr "Sair"
 
 #. i18n:  Right
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:59
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:46
 msgid "R"
 msgstr "R"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:40
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:27
 msgid "R Button"
 msgstr "Botão R"
 
 #. i18n:  Right-Analog
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:63
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
 msgid "R-Analog"
 msgstr "R-Analógico"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:445
 msgid "RAM"
 msgstr "RAM"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:175
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:169
 msgid "RUSSIA"
 msgstr "RUSSIA"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:528
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:515
 msgid "Range"
 msgstr "Alcance"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:190
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:178
 msgid "Read-only mode"
 msgstr "Modo só de leitura"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:487
 msgid "Real"
 msgstr "Real"
 
@@ -4109,33 +4188,33 @@ msgstr ""
 msgid "Reconnect Wiimote on State Loading"
 msgstr "Reconectar Wiimote ao Carregar Estado"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:193
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:217
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:791
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:180
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:204
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:790
 msgid "Record"
 msgstr "Gravar"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:174
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:161
 msgid "Recording Info"
 msgstr "Informação de Gravação"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:202
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:189
 msgid "Recording Options"
 msgstr "Opções de Gravação"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:21
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Red"
 msgstr "Vermelho"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:24
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Red Left"
 msgstr "Vermelho Esquerda"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:25
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Red Right"
 msgstr "Vermelho Direita"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86
 msgid ""
 "Reduces the amount of aliasing caused by rasterizing 3D graphics.\n"
 "This makes the rendered picture look less blocky.\n"
@@ -4151,28 +4230,28 @@ msgstr ""
 "Em caso de dúvida, seleccione Nenhum."
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:60
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:421
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:903
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:427
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:894
 msgid "Refresh"
 msgstr "Actualizar"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:180
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:168
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:168
 msgid "Refresh List"
 msgstr "Actualizar Lista"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:421
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:427
 msgid "Refresh game list"
 msgstr "Actualizar lista de Jogos"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:405
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:427
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:77
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:812
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:409
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:431
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:64
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:793
 msgid "Remove"
 msgstr "Remover"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99
 msgid ""
 "Render the scene as a wireframe.\n"
 "\n"
@@ -4182,196 +4261,202 @@ msgstr ""
 "\n"
 "Em caso de dúvida, mantenha esta opção desactivada."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:308
 msgid "Render to Main Window"
 msgstr "Renderizar para a Janela Principal"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:915
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:172
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:906
 msgid "Reset"
 msgstr "Reset"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:190
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:177
 msgid "Results"
 msgstr "Resultados"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:29
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:16
 msgid "Return"
 msgstr "Return"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:277
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:57
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464
+msgid "Revision:"
+msgstr ""
+
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:264
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:44
 msgid "Right"
 msgstr "Direita"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:61
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:65
 msgid "Right Stick"
 msgstr "Stick Direito"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:85
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:295
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:72
 msgid "Rumble"
 msgstr "Vibração"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:518
-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:498
+msgid ""
+"Run DSP HLE and LLE on a dedicated thread (not recommended: might cause "
+"audio glitches with HLE and freezes with LLE)."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:327
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307
 msgid "Russian"
 msgstr "Russo"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:149
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:150
 msgid "Sa&ve State"
 msgstr "Gua&rdar Estado"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:465
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475
 msgid "Safe"
 msgstr "Seguro"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:196
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:446
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:925
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:183
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:452
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916
 msgid "Save"
 msgstr "Guardar"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:532
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:522
 msgid "Save GCI as..."
 msgstr "Guardar GCI como..."
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
 msgid "Save State Slot 1"
 msgstr "Guardar Estado Slot 1"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:198
 msgid "Save State Slot 2"
 msgstr "Guardar Estado Slot 2"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:199
 msgid "Save State Slot 3"
 msgstr "Guardar Estado Slot 3"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:212
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:212
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200
 msgid "Save State Slot 4"
 msgstr "Guardar Estado Slot 4"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201
 msgid "Save State Slot 5"
 msgstr "Guardar Estado Slot 5"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202
 msgid "Save State Slot 6"
 msgstr "Guardar Estado Slot 6"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:203
 msgid "Save State Slot 7"
 msgstr "Guardar Estado Slot 7"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204
 msgid "Save State Slot 8"
 msgstr "Guardar Estado Slot 8"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:151
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:152
 msgid "Save State..."
 msgstr "Guardar Estado..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:582
 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:592
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:602
 msgid "Save as..."
 msgstr "Guardar como..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1203
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1204
 msgid "Save compressed GCM/ISO"
 msgstr "Guardar GCM/ISO comprimido"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:446
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:452
 msgid "Save current perspective"
 msgstr "Guardar perspectiva actual"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1192
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193
 msgid "Save decompressed GCM/ISO"
 msgstr "Jogo guardado descomprimido GCM/ISO"
 
-#: Source/Core/Core/Src/Movie.cpp:801
+#: Source/Core/Core/Src/Movie.cpp:792
 #, 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:396
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:404
 msgid "Scaled EFB Copy"
 msgstr "Cópia EFB Escalada"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:556
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:543
 #, c-format
 msgid "Scanning %s"
 msgstr "A procurar %s"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:539
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:526
 msgid "Scanning for ISOs"
 msgstr "A procurar ISOs"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:540
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:527
 msgid "Scanning..."
 msgstr "Em Analise..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:427
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
 msgid "ScrShot"
 msgstr "ScrShot"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:106
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:93
 msgid "Scroll Lock"
 msgstr "Scroll Lock"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:264
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:251
 msgid "Search"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:227
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:214
 msgid "Search Filter"
 msgstr "Filtro de Pesquisa"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:810
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:791
 msgid "Search Subfolders"
 msgstr "Procurar em Sub-Pastas"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:250
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:237
 msgid "Search current Object"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:254
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:241
 msgid "Search for hex Value:"
 msgstr ""
 
-#: Source/Core/Common/Src/SysConf.h:103 Source/Core/Common/Src/SysConf.h:126
-#: Source/Core/Common/Src/SysConf.h:146 Source/Core/Common/Src/SysConf.h:167
+#: Source/Core/Common/Src/SysConf.h:90 Source/Core/Common/Src/SysConf.h:113
+#: Source/Core/Common/Src/SysConf.h:133 Source/Core/Common/Src/SysConf.h:154
 #, c-format
 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:490
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:46
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:477
 msgid "Select"
 msgstr "Seleccionar"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:677
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1072
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:683
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1087
 msgid "Select The Recording File"
 msgstr "Seleccione o Ficheiro de Gravação"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1285
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1312
 msgid "Select a Wii WAD file to install"
 msgstr "Seleccione um ficheiro Wii WAD para instalar"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:70
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74
 msgid ""
 "Select a hardware adapter to use.\n"
 "\n"
@@ -4381,31 +4466,31 @@ msgstr ""
 "\n"
 "Em caso de dúvida, utilize o primeiro."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:520
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:510
 msgid "Select a save file to import"
 msgstr "Seleccione um ficheiro de jogo guardado para importar"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:363
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:366
 msgid "Select floating windows"
 msgstr "Seleccionar janelas flutuantes"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:582
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:585
 msgid "Select the file to load"
 msgstr "Seleccione o ficheiro para carregar"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1241
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1268
 msgid "Select the save file"
 msgstr "Seleccione o ficheiro de jogo guardado"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1388
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1415
 msgid "Select the state to load"
 msgstr "Seleccione o estado para carregar"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1429
 msgid "Select the state to save"
 msgstr "Seleccione o estado para gravar"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82
 msgid ""
 "Select what aspect ratio to use when rendering:\n"
 "Auto: Use the native aspect ratio\n"
@@ -4423,15 +4508,15 @@ msgstr ""
 "da sua proporção.\n"
 "Em caso de dúvida, seleccione Automático."
 
-#: Source/Core/InputCommon/Src/InputConfig.cpp:61
+#: Source/Core/InputCommon/Src/InputConfig.cpp:48
 msgid "Selected controller profile does not exist"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:116
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:109
 msgid "Selected font"
 msgstr "Tipo de letra seleccionado"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75
 msgid ""
 "Selects the display resolution used in fullscreen mode.\n"
 "This should always be bigger than or equal to the internal resolution. "
@@ -4447,23 +4532,27 @@ 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:69
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:70
 msgid ""
 "Selects what graphics API to use internally.\n"
 "Direct3D 9 usually is the fastest one. OpenGL is more accurate though. "
 "Direct3D 11 is somewhere between the two.\n"
 "Note that the Direct3D backends are only available on Windows.\n"
 "\n"
-"If unsure, use Direct3D 9."
+"If unsure, use Direct3D 11."
 msgstr ""
-"Selecciona qual a  API a utilizar internamente.\n"
-"Direct3D 9 normalmente é a mais rápida. OpenGL no entanto é mais precisa. "
-"Direct3D 11 está algures entre as duas.\n"
-"Tenha atenção que os backends Direct3D só estão disponíveis no Windows.\n"
-"\n"
-"Em caso de dúvida, utilize o Direct3D 9."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:288
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72
+msgid ""
+"Selects what graphics API to use internally.\n"
+"Direct3D 9 usually is the fastest one. OpenGL is more accurate though. "
+"Direct3D 11 is somewhere between the two.\n"
+"Note that the Direct3D backends are only available on Windows.\n"
+"\n"
+"If unsure, use OpenGL."
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:291
 msgid "Send"
 msgstr "Enviar"
 
@@ -4471,26 +4560,26 @@ msgstr "Enviar"
 msgid "Sensor Bar Position:"
 msgstr "Posição da Barra de Sensor:"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:77
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:64
 msgid "Separator"
 msgstr "Separador"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:328
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308
 msgid "Serbian"
 msgstr "Sérvio"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:522
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502
 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:488
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:475
 msgid "Set"
 msgstr "Definir"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:877
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:868
 msgid "Set as &default ISO"
 msgstr "Definir como ISO &padrão"
 
@@ -4499,134 +4588,134 @@ msgstr "Definir como ISO &padrão"
 msgid "Set as default Memcard %c"
 msgstr "Definir como cartão de memória padrão %c"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:460
+#: Source/Core/Core/Src/ActionReplay.cpp:450
 #, 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/ConfigMain.cpp:535
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:515
 msgid ""
 "Sets the latency (in ms).  Higher values may reduce audio crackling. OpenAL "
 "backend only."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341
 msgid "Settings..."
 msgstr "Definições..."
 
-#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:222
+#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:209
 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:291
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:278
 msgid "Shake"
 msgstr "Abanar"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
 msgid "Short Name:"
 msgstr "Abreviatura:"
 
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:103
+#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:90
 msgid "Shoulder Buttons"
 msgstr "Botões Shoulder"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:217
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:220
 msgid "Show &Console"
 msgstr "Mostrar &Consola"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:215
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:218
 msgid "Show &Log"
 msgstr "Mostrar &Relatório"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:212
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:215
 msgid "Show &Statusbar"
 msgstr "Mostrar &Barra de estado"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:210
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:213
 msgid "Show &Toolbar"
 msgstr "Mostrar Barra de Ferramen&tas"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:281
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:284
 msgid "Show Drives"
 msgstr "Mostrar Unidades"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:517
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530
 msgid "Show EFB Copy Regions"
 msgstr "Mostrar Regiões de Cópia EFB"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:295
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303
 msgid "Show FPS"
 msgstr "Mostrar FPS"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:271
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:274
 msgid "Show France"
 msgstr "Mostrar França"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:257
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:260
 msgid "Show GameCube"
 msgstr "Mostrar GameCube"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561
 msgid "Show Input Display"
 msgstr "Mostrar visualização de Entradas"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:273
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:276
 msgid "Show Italy"
 msgstr "Mostrar Itália"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:264
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:267
 msgid "Show JAP"
 msgstr "Mostrar Japão"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:275
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:278
 msgid "Show Korea"
 msgstr "Mostrar Coreia"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476
 msgid "Show Language:"
 msgstr "Mostrar Idioma:"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:216
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:219
 msgid "Show Log &Configuration"
 msgstr "Mostrar &Configuração de Relatório"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:266
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:269
 msgid "Show PAL"
 msgstr "Mostrar Pal"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:254
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:257
 msgid "Show Platforms"
 msgstr "Mostrar Plataformas"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:263
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:266
 msgid "Show Regions"
 msgstr "Mostrar Regiões"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:518
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531
 msgid "Show Statistics"
 msgstr "Mostrar Estatísticas"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:277
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:280
 msgid "Show Taiwan"
 msgstr "Mostrar Taiwan"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:268
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:271
 msgid "Show USA"
 msgstr "Mostrar EUA"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:259
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:262
 msgid "Show Wad"
 msgstr "Mostrar Wad"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:255
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:258
 msgid "Show Wii"
 msgstr "Mostrar Wii"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491
 msgid "Show a confirmation box before stopping a game."
 msgstr "Mostrar uma caixa de confirmação antes de parar um jogo."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:512
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492
 msgid ""
 "Show a message box when a potentially serious error has occurred.\n"
 "Disabling this may avoid annoying and non-fatal messages, but it may also "
@@ -4640,11 +4729,11 @@ msgstr ""
 msgid "Show first block"
 msgstr "Mostrar primeiro bloco"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:130
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:131
 msgid "Show lag counter"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493
 msgid ""
 "Show messages on the emulation screen area.\n"
 "These messages include memory card writes, video backend and CPU "
@@ -4667,7 +4756,7 @@ msgstr "Mostrar ícone de guardar"
 msgid "Show save title"
 msgstr "Mostrar o título de jogo guardado"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102
 msgid ""
 "Show the number of frames rendered per second as a measure of emulation "
 "speed.\n"
@@ -4679,11 +4768,11 @@ msgstr ""
 "\n"
 "Em caso de dúvida, mantenha esta opção desactivada."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:279
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:282
 msgid "Show unknown"
 msgstr "Mostrar desconhecido"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105
 msgid ""
 "Show various statistics.\n"
 "\n"
@@ -4693,47 +4782,31 @@ msgstr ""
 "\n"
 "Em caso de dúvida, mantenha esta opção desactivada."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:319
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:306
 msgid "Sideways Wiimote"
 msgstr "Wiimote na horizontal"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:280
 msgid "Simplified Chinese"
 msgstr "Chinês Simplificado"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:311
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:298
 msgid "Size"
 msgstr "Dimensão"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:696
 msgid "Skip BIOS"
 msgstr "Saltar Bios"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316
 msgid "Skip DCBZ clearing"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:492
-msgid "Skip Dest. Alpha Pass"
-msgstr "Saltar Dest. Alpha Pass"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:444
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:454
 msgid "Skip EFB Access from CPU"
 msgstr "Ignorar o acesso do EFB a partir do CPU"
 
-#: 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 ""
-"Salta a passagem de destino alfa utilizada em muitos jogos para diversos "
-"efeitos gráficos.\n"
-"\n"
-"Em caso de dúvida, mantenha esta opção desactivada."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125
 msgid ""
 "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n"
 "Sometimes also increases visual quality.\n"
@@ -4750,25 +4823,25 @@ msgstr ""
 "\n"
 "Em caso de dúvida, mantenha esta opção desactivada."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:374
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:386
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:380
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:392
 #, c-format
 msgid "Slot %i"
 msgstr "Slot %i"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:700
 msgid "Slot A"
 msgstr "Slot A"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:701
 msgid "Slot B"
 msgstr "Slot B"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:62
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:49
 msgid "Snapshot"
 msgstr "Captura de ecrã"
 
-#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:58
+#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:46
 msgid "Software Renderer"
 msgstr "Renderizador por Software"
 
@@ -4785,27 +4858,27 @@ 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:683
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:664
 msgid "Sound Settings"
 msgstr "Definições de Som"
 
-#: Source/Core/AudioCommon/Src/AudioCommon.cpp:77
+#: Source/Core/AudioCommon/Src/AudioCommon.cpp:64
 #, c-format
 msgid "Sound backend %s is not valid."
 msgstr "Backend de Som %s não é válido"
 
-#: Source/Core/AudioCommon/Src/DSoundStream.cpp:59
+#: Source/Core/AudioCommon/Src/DSoundStream.cpp:46
 #, c-format
 msgid "Sound buffer creation failed: %s"
 msgstr "Criação do buffer de som falhou: %s"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:31
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:18
 msgid "Space"
 msgstr "Espaço"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:329
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309
 msgid "Spanish"
 msgstr "Espanhol"
 
@@ -4813,7 +4886,7 @@ msgstr "Espanhol"
 msgid "Speaker Volume:"
 msgstr "Volume do Altifalante:"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92
 msgid ""
 "Specifies the resolution used to render at. A high resolution will improve "
 "visual quality a lot but is also quite heavy on performance and might cause "
@@ -4833,63 +4906,63 @@ msgstr ""
 "\n"
 "Em caso de dúvida, seleccione 640x528."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322
 msgid "Speed up Disc Transfer Rate"
 msgstr "Aumente a taxa de transferência do disco"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:243
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:230
 msgid "Square Stick"
 msgstr "Stick quadrado"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:107
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87
 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:322
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:37
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:25
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:325
 msgid "Start"
 msgstr "Começar"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:194
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:197
 msgid "Start &NetPlay"
 msgstr "Começar &NetPlay"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:339
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:345
 msgid "Start Re&cording"
 msgstr "&Começar Gravação"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:175
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:175
 msgid "Start Recording"
 msgstr "Começar Gravação"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:312
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:299
 msgid "State"
 msgstr "Estado"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:173
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:161
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:161
 msgid "State Saves"
 msgstr "Estados Guardados"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:108
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88
 msgid "Steering Wheel"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:53
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:57
 msgid "Stick"
 msgstr "Stick"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:420
-#: 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:325
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:419
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:431
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:171
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:171
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:328
 msgid "Stop"
 msgstr "Parar"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96
 msgid ""
 "Store EFB copies in GPU texture objects.\n"
 "This is not so accurate, but it works well enough for most games and gives a "
@@ -4903,107 +4976,117 @@ msgstr ""
 "\n"
 "Em caso de dúvida, mantenha esta opção activada."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:275
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283
 msgid "Stretch to Window"
 msgstr "Ajustar à janela"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:43
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:47
 msgid "Strum"
 msgstr "Strum"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:78
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:65
 msgid "Subtract"
 msgstr "Subtrair"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:77
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:67
 #, c-format
 msgid "Successfully exported file to %s"
 msgstr "Ficheiros extraídos com sucesso para %s"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:56
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:43
 msgid "Successfully imported save files"
 msgstr "Sucesso na importação de ficheiros de jogo guardado"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:285
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:272
 msgid "Swing"
 msgstr "Balanço"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:744
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:792
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320
+msgid "Synchronize GPU thread"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321
+msgid ""
+"Synchronizes the GPU and CPU threads to help prevent random freezes in Dual "
+"Core mode. (ON = Compatible, OFF = Fast)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773
 msgid "System Language:"
 msgstr "Idioma do sistema:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:191
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:185
 msgid "TAIWAN"
 msgstr "TAIWAN"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:127
-#: Source/Core/DolphinWX/Src/TASInputDlg.h:32
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:128
+#: Source/Core/DolphinWX/Src/TASInputDlg.h:19
 msgid "TAS Input"
 msgstr "Entrada TAS"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:28
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:15
 msgid "Tab"
 msgstr "Tab"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:510
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:531
 msgid "Tab split"
 msgstr "Tab divisão"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:37
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:41
 msgid "Table Left"
 msgstr "Table Esquerda"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:38
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:42
 msgid "Table Right"
 msgstr "Table Direita"
 
-#: 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
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:361
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:181
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:181
 msgid "Take Screenshot"
 msgstr "Tirar Screenshot"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:109
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89
 msgid "TaruKonga (Bongos)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:472
 msgid "Test"
 msgstr "Teste"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:444
 msgid "Texture"
 msgstr "Textura"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:451
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:461
 msgid "Texture Cache"
 msgstr "Cache de Textura"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:519
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:532
 msgid "Texture Format Overlay"
 msgstr "Formato da textura"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:226
+#: Source/Core/Core/Src/CoreParameter.cpp:215
 msgid "The WAD has been installed successfully"
 msgstr "O WAD foi instalado correctamente"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:197
+#: Source/Core/Core/Src/ActionReplay.cpp:185
 msgid "The address is invalid"
 msgstr "O caminho é inválido"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:509
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:496
 msgid "The checksum was successfully fixed"
 msgstr "A checksum foi reparada com sucesso"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1242
+#: 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:1117
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1216
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1118
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1146
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1217
 #, c-format
 msgid ""
 "The file %s already exists.\n"
@@ -5012,7 +5095,7 @@ msgstr ""
 "O ficheiro %s já existe.\n"
 "Deseja substituir?"
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:51
+#: Source/Core/AudioCommon/Src/WaveFile.cpp:38
 #, c-format
 msgid ""
 "The file %s could not be opened for writing. Please check if it's already "
@@ -5021,31 +5104,31 @@ msgstr ""
 "O ficheiro %s não pôde ser aberto para escrita. Por favor verifique se já "
 "está aberto por outro programa."
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:44
+#: Source/Core/AudioCommon/Src/WaveFile.cpp:31
 #, c-format
 msgid "The file %s was already open, the file header will not be written."
 msgstr ""
 "O ficheiro %s já estava aberto, o cabeçalho do ficheiro não poderá ser "
 "escrito."
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:332
+#: Source/Core/Core/Src/Boot/Boot.cpp:320
 #, c-format
 msgid "The file you specified (%s) does not exist"
 msgstr "O ficheiro que especificou (%s) não existe"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:628
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:666
 msgid "The name can not be empty"
 msgstr "O nome não pode estar vazio"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:620
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:658
 msgid "The name can not contain the character ','"
 msgstr "O nome não pode conter o caracter ','"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:142
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:129
 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:93
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98
 msgid ""
 "The safer you adjust this, the less likely the emulator will be missing any "
 "texture updates from RAM.\n"
@@ -5053,12 +5136,12 @@ msgid ""
 "If unsure, use the rightmost value."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:445
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:432
 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:388
+#: Source/Core/DolphinWX/Src/Main.cpp:416
 msgid ""
 "The selected language is not supported by your system. Falling back to "
 "system default."
@@ -5066,36 +5149,36 @@ msgstr ""
 "O idioma seleccionado não é suportado pelo seu sistema. A repor padrão do "
 "sistema."
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:43
+#: Source/Core/Core/Src/NetPlayClient.cpp:47
 msgid "The server and client's NetPlay versions are incompatible!"
 msgstr "O servidor e a versão NetPlay do cliente são incompatíveis"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:40
+#: Source/Core/Core/Src/NetPlayClient.cpp:44
 msgid "The server is full!"
 msgstr "O servidor está cheio!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:46
+#: Source/Core/Core/Src/NetPlayClient.cpp:50
 msgid "The server responded: the game is currently running!"
 msgstr "O servidor respondeu: O jogo está a correr neste momento!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:49
+#: Source/Core/Core/Src/NetPlayClient.cpp:53
 msgid "The server sent an unknown error message!"
 msgstr "O servidor enviou uma mensagem de erro desconhecida!"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:119
+#: Source/Core/Core/Src/CoreParameter.cpp:108
 #, c-format
 msgid "The specified file \"%s\" does not exist"
 msgstr "O ficheiro especificado \"%s\" não existe"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:198
+#: Source/Core/Core/Src/ActionReplay.cpp:186
 msgid "The value is invalid"
 msgstr "O valor é inválido"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:642
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:623
 msgid "Theme:"
 msgstr ""
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:476
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:463
 msgid ""
 "There must be a ticket for 00000001/00000002. Your NAND dump is probably "
 "incomplete."
@@ -5103,7 +5186,7 @@ msgstr ""
 "Tem que existir um ticket para 00000001/00000002. O seu NAND depositado está "
 "provavelmente incompleto."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308
 msgid ""
 "These settings override core Dolphin settings.\n"
 "Undetermined means the game uses Dolphin's setting."
@@ -5111,7 +5194,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:355
+#: Source/Core/Core/Src/ActionReplay.cpp:345
 msgid ""
 "This action replay simulator does not support codes that modify Action "
 "Replay itself."
@@ -5119,11 +5202,11 @@ msgstr ""
 "Este simulador de Action Replay não suporta códigos que modifiquem o próprio "
 "Action Replay"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505
 msgid "This could cause slow down in Wii Menu and some games."
 msgstr "Isto poderá causar lentidão no menu Wii e em alguns jogos."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118
 msgid ""
 "This feature allows you to change the game's camera.\n"
 "Move the mouse while holding the right mouse button to pan and while holding "
@@ -5135,7 +5218,15 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485
+msgid ""
+"This limits the game speed to the specified number of frames per second "
+"(full speed is 60 for NTSC and 50 for PAL). Alternatively, 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/ConfigMain.cpp:484
 msgid ""
 "This splits the Video and CPU threads, so they can be run on separate "
 "cores.\n"
@@ -5147,61 +5238,61 @@ 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:286
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:287
 msgid "This will let you Manually Edit the INI config file"
 msgstr "Isto permite a edição manual do ficheiro de configuração INI"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:249
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:254
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:236
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:241
 msgid "Threshold"
 msgstr "Limite"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:288
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:275
 msgid "Tilt"
 msgstr "Tilt"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:628
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:304
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:622
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:291
 msgid "Title"
 msgstr "Título"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:125
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:144
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:112
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:131
 msgid "To"
 msgstr "Para"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:72
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59
 msgid "Toggle All Log Types"
 msgstr "Alternar Todos os Tipos de Relatório"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:426
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:432
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:180
 msgid "Toggle Fullscreen"
 msgstr "Alternar Ecrã Inteiro"
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:87
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:271
 msgid "Top"
 msgstr "Topo"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:281
 msgid "Traditional Chinese"
 msgstr "Chinês Tradicional"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:426
+#: Source/Core/Core/Src/Boot/Boot.cpp:414
 msgid "Tried to load an unknown file type."
 msgstr "Tentou carregar um tipo de ficheiro desconhecido."
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:80
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:67
 msgid "Triggers"
 msgstr "Gatilhos"
 
-#: Source/Core/Common/Src/SysConf.h:91 Source/Core/Common/Src/SysConf.h:114
+#: Source/Core/Common/Src/SysConf.h:78 Source/Core/Common/Src/SysConf.h:101
 msgid "Trying to read from invalid SYSCONF"
 msgstr "Tentativa de leitura inválida de SYSCONF"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:44
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:31
 msgid ""
 "Trying to read from invalid SYSCONF\n"
 "Wiimote bt ids are not available"
@@ -5209,15 +5300,15 @@ 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:330
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
 msgid "Turkish"
 msgstr "Turco"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:33
 msgid "Turntable"
 msgstr "Rotação"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:71
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58
 msgid "Type"
 msgstr "Tipo"
 
@@ -5225,31 +5316,31 @@ msgstr "Tipo"
 msgid "UDP Port:"
 msgstr "Porta UDP:"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:279
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:266
 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12
 msgid "UDP Wiimote"
 msgstr "UDP Wiimote"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:199
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:193
 msgid "UNKNOWN"
 msgstr "DESCONHECIDO"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:756
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:755
 #, c-format
 msgid "UNKNOWN_%02X"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:178
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:172
 msgid "USA"
 msgstr "EUA"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:225
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:214
 msgid ""
 "Unable to create patch from given values.\n"
 "Entry not modified."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:124
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:111
 #, c-format
 msgid ""
 "Unable to parse line %lu of the entered AR code as a valid encrypted or "
@@ -5260,76 +5351,90 @@ 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:391
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:397
 #, c-format
 msgid "Undefined %i"
 msgstr "Indefinido %i"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:163
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:164
 msgid "Undo Load State"
 msgstr "Retroceder Carregamento de Estado"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:718
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:717
 msgid "Unexpected 0x80 call? Aborting..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:215
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:202
 msgid "Unknown"
 msgstr "Desconhecido"
 
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:971
+#: Source/Core/Core/Src/HW/DVDInterface.cpp:965
 #, c-format
 msgid "Unknown DVD command %08x - fatal error"
 msgstr "Comando de DVD desconhecido %08x - Erro fatal"
 
-#: Source/Core/Common/Src/SysConf.cpp:145
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:444
+#, c-format
+msgid "Unknown command 0x%08x"
+msgstr ""
+
+#: Source/Core/Common/Src/SysConf.cpp:132
 #, c-format
 msgid "Unknown entry type %i in SYSCONF (%s@%x)!"
 msgstr "Tipo de entrada desconhecida %i em SYSCONF (%s@%x)!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:228
+#: Source/Core/Core/Src/NetPlayClient.cpp:232
 #, c-format
 msgid "Unknown message received with id : %d"
 msgstr "Mensagem desconhecida recebida com a id : %d"
 
-#: Source/Core/Core/Src/NetPlayServer.cpp:504
+#: Source/Core/Core/Src/NetPlayServer.cpp:508
 #, c-format
 msgid "Unknown message with id:%d received from player:%d Kicking player!"
 msgstr ""
 "Mensagem desconhecida com a id:%d recebida pelo jogador:%d Excluindo o "
 "jogador!"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:274
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:56
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:261
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:43
 msgid "Up"
 msgstr "Cima"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:108
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:95
 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17
 msgid "Update"
 msgstr "Actualizar"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:320
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:307
 msgid "Upright Wiimote"
 msgstr "Wiimote na vertical"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:777
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758
 msgid "Use EuRGB60 Mode (PAL60)"
 msgstr "Usar modo EuRGB60 (PAL60)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:294
 msgid "Use Fullscreen"
 msgstr "Utilizar Ecrã Inteiro"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:575
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:563
 msgid "Use Hex"
 msgstr "Usar Hex"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:600
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580
 msgid "Use Panic Handlers"
 msgstr "Usar Manipuladores de Pânico"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89
+msgid ""
+"Use a hacked upload strategy to stream vertices.\n"
+"This usually speed up, but is forbidden by OpenGL specification and may "
+"causes heavy glitches.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122
 msgid ""
 "Use multiple threads to decode textures.\n"
 "Might result in a speedup (especially on CPUs with more than two cores).\n"
@@ -5342,7 +5447,7 @@ msgstr ""
 "\n"
 "Em caso de dúvida, mantenha esta opção desactivada."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126
 msgid ""
 "Usually if shader compilation fails, an error message is displayed.\n"
 "However, one may skip the popups to allow interruption free gameplay by "
@@ -5357,53 +5462,58 @@ msgstr ""
 "\n"
 "Em caso de dúvida, mantenha esta opção desactivada."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:539
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:552
 msgid "Utility"
 msgstr "Utilidade"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:285
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:293
 msgid "V-Sync"
 msgstr "V-Sync"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:209
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318
+#, fuzzy
+msgid "VBeam Speed Hack"
+msgstr "MMU Hack de velocidade"
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196
 msgid "Value"
 msgstr "Valor"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:73
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:60
 msgid "Value:"
 msgstr "Valor:"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:572
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:560
 msgid "Value: "
 msgstr "Valor: "
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:51
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:38
 msgid "Verbosity"
 msgstr "Verbosidade"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:377
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:381
 msgid "Video"
 msgstr "Vídeo"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:486
 msgid "Virtual"
 msgstr "Virtual"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:689
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670
 msgid "Volume"
 msgstr "Volume"
 
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:498
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:527
+#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:488
+#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:517
 #, c-format
 msgid "WAD installation failed: error creating %s"
 msgstr "Instalação WAD falhou: erro ao criar %s"
 
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:547
+#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:537
 msgid "WAD installation failed: error creating ticket"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84
 msgid ""
 "Wait for vertical blanks in order to reduce tearing.\n"
 "Decreases performance if emulation speed is below 100%.\n"
@@ -5416,25 +5526,25 @@ msgstr ""
 "\n"
 "Em caso de dúvida, mantenha esta opção desactivada."
 
-#: Source/Core/Common/Src/MsgHandler.cpp:67
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46
+#: Source/Core/Common/Src/MsgHandler.cpp:53
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:33
 #: Source/Core/DolphinWX/Src/VideoConfigDiag.h:85
 msgid "Warning"
 msgstr "Aviso"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:291
+#: Source/Core/Core/Src/Boot/Boot.cpp:279
 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:341
+#: Source/Core/Core/Src/Boot/Boot.cpp:329
 msgid "Warning - starting ELF in wrong console mode!"
 msgstr "Aviso - A iniciar um  ELF em modo errado de consola!"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:221
+#: Source/Core/Core/Src/Boot/Boot.cpp:209
 msgid "Warning - starting ISO in wrong console mode!"
 msgstr "Aviso - A iniciar um ISO em modo errado de consola!"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:519
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:512
 #, c-format
 msgid ""
 "Warning! it is advised to backup all files in the folder:\n"
@@ -5446,7 +5556,7 @@ msgstr ""
 "%s\n"
 "Deseja continuar?"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:585
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:578
 #, c-format
 msgid ""
 "Warning: This will overwrite any existing saves that are in the folder:\n"
@@ -5459,7 +5569,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:844
+#: Source/Core/Core/Src/Movie.cpp:835
 #, c-format
 msgid ""
 "Warning: You loaded a save that's after the end of the current movie. (byte "
@@ -5467,7 +5577,7 @@ msgid ""
 "load this state with read-only mode off."
 msgstr ""
 
-#: Source/Core/Core/Src/Movie.cpp:861
+#: Source/Core/Core/Src/Movie.cpp:852
 #, c-format
 msgid ""
 "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You "
@@ -5475,7 +5585,7 @@ msgid ""
 "only mode off. Otherwise you'll probably get a desync."
 msgstr ""
 
-#: Source/Core/Core/Src/Movie.cpp:870
+#: Source/Core/Core/Src/Movie.cpp:861
 #, c-format
 msgid ""
 "Warning: You loaded a save whose movie mismatches on frame %d. You should "
@@ -5494,49 +5604,49 @@ msgid ""
 "%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d"
 msgstr ""
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:106
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:129
+#: Source/Core/AudioCommon/Src/WaveFile.cpp:93
+#: Source/Core/AudioCommon/Src/WaveFile.cpp:116
 msgid "WaveFileWriter - file not open."
 msgstr "WaveFileWriter - ficheiro não aberto."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:56
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:60
 msgid "Whammy"
 msgstr "Whammy"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:404
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:408
 msgid "Widescreen Hack"
 msgstr "Hack de Ecrã Panorâmico"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:312
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:299
 msgid "Width"
 msgstr "Largura"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535
 msgid "Wii"
 msgstr "Wii"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:372
 msgid "Wii Console"
 msgstr "Consola Wii"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:844
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:825
 msgid "Wii NAND Root:"
 msgstr "Raiz de NAND Wii:"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:191
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:194
 msgid "Wii Save Import"
 msgstr "Importação de Jogo Guardado Wii"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1243
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1270
 msgid "Wii save files (*.bin)|*.bin"
 msgstr "Ficheiros de jogo guardado Wii (*.bin)|*.bin"
 
-#: Source/Core/DiscIO/Src/WiiWad.cpp:82
+#: Source/Core/DiscIO/Src/WiiWad.cpp:69
 msgid "WiiWAD: Could not read from file"
 msgstr "WiiWAD: Não foi possível ler do ficheiro"
 
-#: Source/Core/Core/Src/HW/Wiimote.cpp:17
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
+#: Source/Core/Core/Src/HW/Wiimote.cpp:20
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
 msgid "Wiimote"
 msgstr "Wiimote"
 
@@ -5545,7 +5655,7 @@ msgstr "Wiimote"
 msgid "Wiimote %i"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/Main.cpp:628
+#: Source/Core/DolphinWX/Src/Main.cpp:656
 msgid "Wiimote Connected"
 msgstr "Wiimote Conectado"
 
@@ -5553,7 +5663,7 @@ msgstr "Wiimote Conectado"
 msgid "Wiimote Motor"
 msgstr "Motor de Wiimote"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
 msgid "Wiimote settings"
 msgstr "Definições de Wiimote"
 
@@ -5561,99 +5671,117 @@ msgstr "Definições de Wiimote"
 msgid "Wiimotes"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:134
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:121
 msgid "Windows Left"
 msgstr "Janelas Esquerda"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:136
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:123
 msgid "Windows Menu"
 msgstr "Menu de Janelas"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:135
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:122
 msgid "Windows Right"
 msgstr "Janelas Direita"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:131
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:124
 msgid "Word Wrap"
 msgstr "Moldar o texto"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1298
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:864
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1089
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1225
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1325
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:880
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1090
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1226
 msgid "Working..."
 msgstr "A trabalhar..."
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:338
+msgid "Write memcards (GC)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46
 msgid "Write to Console"
 msgstr "Escrever para Consola"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:67
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:54
 msgid "Write to Debugger"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:57
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44
 msgid "Write to File"
 msgstr "Escrever para Ficheiro"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:61
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48
 msgid "Write to Window"
 msgstr "Escrever para a Janela"
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:60
+#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:47
 #, c-format
 msgid "XAudio2 CreateSourceVoice failed: %#X"
 msgstr "XAudio2 CreateSourceVoice falhou: %#X"
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:114
+#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:101
 #, c-format
 msgid "XAudio2 init failed: %#X"
 msgstr "Inicialização do XAudio2 falhou: %#X"
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:124
+#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:111
 #, c-format
 msgid "XAudio2 master voice creation failed: %#X"
 msgstr "Criação de master voice do XAudio2 falhou: %#X"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:766
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:765
 msgid "XF reg"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:21
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Yellow"
 msgstr "Amarelo"
 
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:107
+#: Source/Core/Core/Src/DSP/DSPCore.cpp:120
 msgid ""
-"You are using free dsp roms made by Dolphin Team.\n"
-"Only Zelda ucode games will work correctly with them.\n"
+"You are using a free DSP ROM made by the Dolphin Team.\n"
+"All Wii games will work correctly, and most GC games should also work fine, "
+"but the GBA/IPL/CARD UCodes will not work.\n"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:73
+#: Source/Core/Core/Src/DSP/DSPCore.cpp:116
+msgid ""
+"You are using an old free DSP ROM made by the Dolphin Team.\n"
+"Only games using the Zelda UCode will work correctly.\n"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:63
 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:207
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:210
 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:593
 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:438
 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:603
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:591
 msgid "You must enter a valid profile name."
 msgstr "Tem que introduzir um nome de perfil válido."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:936
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:917
 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"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:175
+#: Source/Core/Core/Src/DSP/DSPCore.cpp:109
+msgid ""
+"Your DSP ROMs have incorrect hashes.\n"
+"Would you like to stop now to fix the problem?\n"
+"If you select \"No\", audio might be garbled."
+msgstr ""
+
+#: Source/Core/Core/Src/CoreParameter.cpp:164
 msgid ""
 "Your GCM/ISO file seems to be invalid (invalid country).\n"
 "Continue with PAL region?"
@@ -5661,7 +5789,7 @@ msgstr ""
 "O seu ficheiro GCM/ISO parece ser inválido (país inválido).\n"
 "Continuar com a região PAL?"
 
-#: Source/Core/Common/Src/SysConf.cpp:58
+#: Source/Core/Common/Src/SysConf.cpp:45
 #, c-format
 msgid ""
 "Your SYSCONF file is the wrong size.\n"
@@ -5672,25 +5800,25 @@ msgstr ""
 "Deveria ser 0x%04x (mas é 0x%04llx)\n"
 "Pretende gerar um novo?"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:334
 msgid "ZTP hack"
 msgstr "ZTP hack"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:387
+#: Source/Core/Core/Src/ActionReplay.cpp:377
 msgid "Zero 3 code not supported"
 msgstr "Código Zero 3 não é suportado"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:408
+#: Source/Core/Core/Src/ActionReplay.cpp:398
 #, c-format
 msgid "Zero code unknown to dolphin: %08x"
 msgstr "Código Zero desconhecido para o Dolphin: %08x"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:436
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:460
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:423
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:447
 msgid "[ waiting ]"
 msgstr "[ em espera ]"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107
 msgid ""
 "[BROKEN]\n"
 "Highlight regions the EFB was copied from.\n"
@@ -5702,11 +5830,11 @@ msgstr ""
 "\n"
 "Em caso de dúvida, mantenha esta opção desactivada."
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:91
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:78
 msgid "[Custom]"
 msgstr "[Costumizar]"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120
 msgid ""
 "[EXPERIMENTAL]\n"
 "Aims to speed up emulation by offloading texture decoding to the GPU using "
@@ -5725,7 +5853,7 @@ msgstr ""
 "\n"
 "Em caso de dúvida, mantenha esta opção desactivada."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121
 msgid ""
 "[EXPERIMENTAL]\n"
 "Speeds up emulation a bit by caching display lists.\n"
@@ -5740,93 +5868,47 @@ msgstr ""
 "\n"
 "Em caso de dúvida, mantenha esta opção desactivada."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:508
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:495
 msgid "^ ADD"
 msgstr "^ ADD"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:820
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:801
 msgid "apploader (.img)"
 msgstr "apploader (.img)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:185
-msgid "failed to read bk header"
-msgstr "falha ao ler cabeçalho bk"
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:375
-#, c-format
-msgid "failed to read data from file: %s"
-msgstr "falha ao ler dados de ficheiro: %s"
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:97
-msgid "failed to read header"
-msgstr "falha ao ler cabeçalho"
-
-#: Source/Core/Core/Src/PowerPC/JitInterface.cpp:285
+#: Source/Core/Core/Src/PowerPC/JitInterface.cpp:272
 #, c-format
 msgid "iCacheJIT: Reading Opcode from %x. Please report."
 msgstr "iCacheJIT: A ler Opcode de %x. Por favor reportar."
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:108
-#, c-format
-msgid "not a wii save or read failure for file header size %x"
-msgstr ""
-"não é uma falha de gravação ou de leitura Wii para o cabeçalho do ficheiro %x"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:935
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:936
 msgid "s"
 msgstr "s"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:457
-#, c-format
-msgid "unknown cmd 0x%08x"
-msgstr "cmd desconhecido 0x%08x"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1110
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1136
 msgid "wxExecute returned -1 on application run!"
 msgstr "wxExecute devolveu -1 quando a aplicação executou!"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:56
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:43
 msgid "zFar Correction: "
 msgstr "Correcção zFar: "
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:51
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:38
 msgid "zNear Correction: "
 msgstr "Correcção zNear: "
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:493
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:480
 msgid "| OR"
 msgstr "| OU"
 
-#~ msgid "Interpreter (VERY slow)"
-#~ msgstr "Interpretador (Muito lento)"
-
-#~ msgid "JIT Recompiler (recommended)"
-#~ msgstr "Recompilador JIT (recomendado)"
-
-#~ msgid "JITIL experimental recompiler"
-#~ msgstr "Recompilador experimental JITIL"
+#~ msgid "Accurate VBeam emulation"
+#~ msgstr "Emulação VBeam precisa"
 
 #~ msgid ""
-#~ "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. "
-#~ "No effect on emulated wiimotes."
+#~ "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)"
 #~ msgstr ""
-#~ "Silencía o altifalante Wiimote. Corrige desconexões aleatórias em "
-#~ "wiimotes reais. Sem efeito em wiimotes emulados."
+#~ "Se os FPS são erráticos, esta opção poderá ajudar. (ON = Compatível, OFF "
+#~ "= Rápido)"
 
-#~ msgid "Pair Up"
-#~ msgstr "Emparelhar"
-
-#~ msgid "Reconnect Wiimote Confirm"
-#~ msgstr "Confirmação de Reconexão de Wiimote"
-
-#~ msgid ""
-#~ "Wiimote %i has been disconnected by system.\n"
-#~ "Maybe this game doesn't support multi-wiimote,\n"
-#~ "or maybe it is due to idle time out or other reason.\n"
-#~ "Do you want to reconnect immediately?"
-#~ msgstr ""
-#~ "Wiimote %ifoi desligado do sistema.\n"
-#~ "Talvez este jogo não suporte Wiimotes multiplos,\n"
-#~ "ou talvez poderá ser por ter estado inactivo por algum tempo ou por outra "
-#~ "razão.\n"
-#~ "Quer reconectar imediatamente?"
+#~ msgid "Skip Dest. Alpha Pass"
+#~ msgstr "Saltar Dest. Alpha Pass"
diff --git a/Languages/po/pt_BR.po b/Languages/po/pt_BR.po
index 9863ac84d9..48b03ae6eb 100644
--- a/Languages/po/pt_BR.po
+++ b/Languages/po/pt_BR.po
@@ -3,15 +3,17 @@
 # This file is distributed under the same license as the dolphin-emu package.
 #
 # Translators:
-# Dante Jr. <danteprojetos@gmail.com>, 2011.
-# Mateus B. Cassiano <jhonn.copperfield@gmail.com>, 2013.
+# Maldonny <eu.charles@hotmail.com>, 2013
+# Dante Jr. <danteprojetos@gmail.com>, 2011
+# Runo <i.am.runo@gmail.com>, 2013
+# Mateus B. Cassiano <jhonn.copperfield@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: Dolphin Emulator\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-10 08:56-0500\n"
-"PO-Revision-Date: 2013-02-02 20:54+0000\n"
-"Last-Translator: Jhonn <jhonn.copperfield@gmail.com>\n"
+"POT-Creation-Date: 2013-04-18 23:00-0500\n"
+"PO-Revision-Date: 2013-04-08 18:30+0000\n"
+"Last-Translator: Runo <i.am.runo@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/"
 "dolphin-emu/language/pt_BR/)\n"
 "Language: pt_BR\n"
@@ -20,21 +22,21 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:511
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:499
 msgid " (too many to display)"
-msgstr " (muitos para mostrar)"
+msgstr "(muitos para mostrar)"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:270
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:273
 #: Source/Core/DolphinWX/Src/NetWindow.cpp:491
 #: Source/Core/DolphinWX/Src/NetWindow.cpp:530
 msgid " Game : "
 msgstr " Jogo : "
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:507
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494
 msgid "! NOT"
 msgstr "! NÃO"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:70
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:58
 #, c-format
 msgid ""
 "\"%s\" does not exist.\n"
@@ -43,34 +45,44 @@ msgstr ""
 "\"%s\" não existe.\n"
 "Criar um novo Memory Card de 16MB?"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:142
+#: Source/Core/Core/Src/CoreParameter.cpp:131
 #, c-format
 msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO."
 msgstr ""
 "\"%s\" é um arquivo GCM/ISO inválido, ou não é um arquivo ISO de GC/Wii."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:722
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:721
 #, c-format
 msgid "%08X:  "
 msgstr "%08X:  "
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:196
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:183
 #, c-format
 msgid "%1$sCopy%1$s"
 msgstr "%1$sCopiar%1$s"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:128
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:296
+#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:113
+#, c-format
+msgid "%d samples"
+msgstr "%d amostras"
+
+#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:112
+#, c-format
+msgid "%d samples (quality level %d)"
+msgstr "%d amostras (nível de qualidade %d)"
+
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:121
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:289
 #, c-format
 msgid "%s already exists, overwrite?"
 msgstr "%s já existe, deseja substituir?"
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:167
+#: Source/Core/DiscIO/Src/CompressedBlob.cpp:154
 #, c-format
 msgid "%s failed to be scrubbed. Probably the image is corrupt."
 msgstr "%s não pôde ser \"limpo\". A imagem provavelmente está corrompida."
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:95
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:83
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
@@ -79,7 +91,7 @@ msgstr ""
 "%s falhou ao ser carregado como Memory Card\n"
 " O tamanho é inválido (0x%x bytes)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:110
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:98
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
@@ -88,7 +100,7 @@ msgstr ""
 "%s falhou ao ser carregado como Memory Card\n"
 " O tamanho é inválido (0x%x bytes)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:90
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:78
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
@@ -98,48 +110,37 @@ msgstr ""
 "o arquivo não é grande o bastante para ser um arquivo de Memory Card (0x%x "
 "bytes)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:367
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:359
 #, c-format
 msgid "%s failed to open"
 msgstr "%s Falha na abertura"
 
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:97
-#, c-format
-msgid ""
-"%s has an incorrect hash.\n"
-"Would you like to stop now to fix the problem?\n"
-"If you select \"No\", audio will be garbled."
-msgstr ""
-"%s tem um hash incorreto.\n"
-"Você gostaria de parar agora para resolver o problema?\n"
-"Se você selecionar \"Não\", o som ficará falhado."
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:360
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:352
 #, c-format
 msgid "%s is a 0 byte file"
 msgstr "%s é um arquivo de 0 bytes"
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:159
+#: Source/Core/DiscIO/Src/CompressedBlob.cpp:146
 #, c-format
 msgid "%s is already compressed! Cannot compress it further."
 msgstr "%s Já está comprimido! Não é possível comprimir mais."
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:345
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:337
 #, c-format
 msgid "%s is too long for the filename, max chars is 45"
 msgstr "%s é muito longo para o nome do arquivo, o máximo de caractéres é 45"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:202
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:189
 #, c-format
 msgid "%sDelete%s"
 msgstr "%sDeletar%s"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:200
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:187
 #, c-format
 msgid "%sExport GCI%s"
 msgstr "%sExportar GCI%s"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:198
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:185
 #, c-format
 msgid "%sImport GCI%s"
 msgstr "%sImportar GCI%s"
@@ -149,252 +150,275 @@ msgstr "%sImportar GCI%s"
 msgid "%u Free Blocks; %u Free Dir Entries"
 msgstr "%u Blocos Livres; %u Entradas de Diretórios Livres"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:506
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:493
 msgid "&& AND"
 msgstr "&& E"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:295
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:301
 msgid "&About..."
 msgstr "&Sobre..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:99
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:100
 msgid "&Boot from DVD Drive..."
 msgstr "&Carregar a Partir do Drive de DVD..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:231
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:234
 msgid "&Breakpoints"
 msgstr "&Pontos de Interrupção"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:110
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:111
 msgid "&Browse for ISOs..."
 msgstr "&Procurar por ISOs..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:192
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:195
 msgid "&Cheats Manager"
 msgstr "Gerenciador de &Cheats"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:177
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:180
 msgid "&DSP Settings"
 msgstr "Configurações do &DSP"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:885
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:876
 msgid "&Delete ISO..."
 msgstr "&Deletar ISO..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:903
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:897
 msgid "&Delete selected ISOs..."
 msgstr "&Deletar ISOs selecionadas..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:170
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:173
 msgid "&Emulation"
 msgstr "&Emulação"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:113
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:114
 msgid "&File"
 msgstr "&Arquivo"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:335
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:341
 msgid "&Frame Advance"
 msgstr "Avançar Quadro"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:352
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:358
 msgid "&Fullscreen"
 msgstr "&Tela Cheia"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:176
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:179
 msgid "&Graphics Settings"
 msgstr "Configurações de &Gráficos"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:296
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:302
 msgid "&Help"
 msgstr "&Ajuda"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:180
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:183
 msgid "&Hotkey Settings"
 msgstr "Configurações de &Atalho"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:233
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:236
 msgid "&JIT"
 msgstr "&JIT"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:148
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:149
 msgid "&Load State"
 msgstr "&Carregar Estado"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:190
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:193
 msgid "&Memcard Manager (GC)"
 msgstr "Gerenciador de Cartão de &Memória (GC)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:232
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:235
 msgid "&Memory"
 msgstr "&Memória"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:313
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:319
 msgid "&Open..."
 msgstr "&Abrir..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:186
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:189
 msgid "&Options"
 msgstr "&Opções"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:324
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:330
 msgid "&Pause"
 msgstr "&Pausar"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:326
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:332
 msgid "&Play"
 msgstr "&Jogar"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:867
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:858
 msgid "&Properties"
 msgstr "&Propriedades"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:348
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:354
 msgid "&Read-only mode"
 msgstr "&Modo Somente Leitura"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:319
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:325
 msgid "&Refresh List"
 msgstr "&Recarregar Lista"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:230
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:233
 msgid "&Registers"
 msgstr "&Registradores"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:332
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:338
 msgid "&Reset"
 msgstr "&Reset"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:234
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:237
 msgid "&Sound"
 msgstr "&Som"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:329
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:335
 msgid "&Stop"
 msgstr "&Parar"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:207
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:210
 msgid "&Tools"
 msgstr "Ferramen&tas"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:235
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:238
 msgid "&Video"
 msgstr "&Video"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:284
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:287
 msgid "&View"
 msgstr "&Ver"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:179
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:182
 msgid "&Wiimote Settings"
 msgstr "Configurações de &Wiimote"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:868
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:859
 msgid "&Wiki"
 msgstr "&Wiki"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504
 msgid "'"
 msgstr "'"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:59
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:46
 msgid "(-)+zFar"
 msgstr "(-)+zFar"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:54
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:41
 msgid "(-)+zNear"
 msgstr "(-)+zNear"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:99
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:86
 msgid "(UNKNOWN)"
 msgstr "(DESCONHECIDO)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:376
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:384
 msgid "(off)"
 msgstr "(desligado)"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:655
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:654
 msgid "0x44"
 msgstr "0x44"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+msgid "1.5x Native (960x792)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:158
 msgid "16 bit"
 msgstr "16 bit"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+msgid "1x Native (640x528)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+msgid "2.5x Native (1600x1320)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+msgid "2x Native (1280x1056)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:159
 msgid "32 bit"
 msgstr "32 bit"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:412
 msgid "3D Vision"
 msgstr "3D Vision"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+msgid "3x Native (1920x1584)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+msgid "4x Native (2560x2112)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:157
 msgid "8 bit"
 msgstr "8 bit"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:43
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:30
 msgid "<Insert name here>"
 msgstr "<Insira o nome aqui>"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:255
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:262
 msgid "<No resolutions found>"
 msgstr "<Nennhuma resolução encontrada>"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:104
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84
 msgid "<Nothing>"
 msgstr "<Nada>"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:162
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:162
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:150
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:150
 msgid "<Press Key>"
 msgstr "<Pressione Tecla>"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286
 msgid "<System>"
 msgstr "<Sistema>"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695
 msgid "A"
 msgstr "A"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:201
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:235
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:204
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:238
 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:353
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:387
 msgid "A game is not currently running."
 msgstr "Não tem nenhum jogo rodando no momento."
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:68
-#, fuzzy
 msgid ""
 "A supported bluetooth device could not be found.\n"
 "You must manually connect your wiimotes."
 msgstr ""
-"Nenhum dispositivo Bluetooth suportado foi encontrado!\n"
-"(Se você não está usando o dispositivo Bluetooth da Microsoft você deve "
-"parear seus wiimotes manualmente e usar apenas o botão \"Atualizar\"."
+"Não foi possível encontrar um dispositivo Bluetooth compatível.\n"
+"Você deve conectar seus Wiimotes manualmente."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:109
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:100
+#, fuzzy
 msgid ""
 "ALERT:\n"
 "\n"
-"NetPlay will currently only work properly when using the following "
-"settings:\n"
-" - Dual Core [OFF]\n"
-" - Audio Throttle [OFF]\n"
-" - DSP-HLE with \"Null Audio\" or DSP-LLE\n"
-" - Manually set the exact number of controllers that will be used to "
-"[Standard Controller]\n"
+"Netplay will only work with the following settings:\n"
+" - Enable Dual Core [OFF]\n"
+" - DSP Emulator Engine Must be the same on all computers!\n"
+" - DSP on Dedicated Thread [OFF]\n"
+" - Framelimit NOT set to [Audio]\n"
+" - Manually set the exact number of controllers to be used to [Standard "
+"Controller]\n"
 "\n"
-"All players should try to use the same Dolphin version and settings.\n"
-"Disable all memory cards or send them to all players before starting.\n"
-"Wiimote support has not been implemented.\n"
+"All players should use the same Dolphin version and settings.\n"
+"All memory cards must be identical between players or disabled.\n"
+"Wiimote support has not been implemented!\n"
 "\n"
-"You must forward TCP port to host!!"
+"The host must have the chosen TCP port open/forwarded!\n"
 msgstr ""
 "ALERTA:\n"
 "\n"
@@ -414,17 +438,17 @@ msgstr ""
 "\n"
 "Você deve redirecionar as portas TCP para ser o Host!!"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:111
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:116
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96
 msgid "AM-Baseboard"
 msgstr "AM-Baseboard"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:299
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:115
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:300
 msgid "AR Codes"
 msgstr "Códigos AR"
 
-#: Source/Core/DolphinWX/Src/AboutDolphin.h:33
+#: Source/Core/DolphinWX/Src/AboutDolphin.h:21
 msgid "About Dolphin"
 msgstr "Sobre o Dolphin"
 
@@ -432,15 +456,11 @@ msgstr "Sobre o Dolphin"
 msgid "Acceleration"
 msgstr "Aceleração"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:463
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473
 msgid "Accuracy:"
 msgstr "Precisão:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317
-msgid "Accurate VBeam emulation"
-msgstr "Emulação correta do VBeam"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97
 msgid ""
 "Accurately emulate EFB copies.\n"
 "Some games depend on this for certain graphical effects or gameplay "
@@ -454,12 +474,12 @@ msgstr ""
 "\n"
 "Se estiver em dúvida, mude o EFB para Textura."
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:239
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:239
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:227
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:227
 msgid "Action"
 msgstr "Ação"
 
-#: Source/Core/Core/Src/ARDecrypt.cpp:481
+#: Source/Core/Core/Src/ARDecrypt.cpp:469
 #, c-format
 msgid ""
 "Action Replay Code Decryption Error:\n"
@@ -474,7 +494,7 @@ msgstr ""
 "Código Culpado:\n"
 "%s"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:667
+#: Source/Core/Core/Src/ActionReplay.cpp:657
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)"
@@ -482,7 +502,7 @@ msgstr ""
 "Erro no Action Replay: Tamanho inválido (%08x : address = %08x) em Add Code "
 "(%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:755
+#: Source/Core/Core/Src/ActionReplay.cpp:745
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide "
@@ -491,7 +511,7 @@ msgstr ""
 "Erro no Action Replay: Tamanho inválido (%08x : address = %08x) em Fill e "
 "Slide (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:547
+#: Source/Core/Core/Src/ActionReplay.cpp:537
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And "
@@ -500,7 +520,7 @@ msgstr ""
 "Erro no Action Replay: Tamanho inválido (%08x : address = %08x) em RAM Write "
 "e Fill (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:607
+#: Source/Core/Core/Src/ActionReplay.cpp:597
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Write To "
@@ -509,12 +529,12 @@ msgstr ""
 "Erro no Action Replay: Tamanho inválido (%08x : address = %08x) em Write to "
 "Pointer (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:802
+#: Source/Core/Core/Src/ActionReplay.cpp:792
 #, c-format
 msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)"
 msgstr "Erro no Action Replay: Valor inválido (%08x) na Cópia de Memória (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:682
+#: Source/Core/Core/Src/ActionReplay.cpp:672
 #, c-format
 msgid ""
 "Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)\n"
@@ -524,63 +544,63 @@ msgstr ""
 "(%s)\n"
 "Master codes não são necessários. Não use master codes."
 
-#: Source/Core/Core/Src/ActionReplay.cpp:196
+#: Source/Core/Core/Src/ActionReplay.cpp:184
 #, 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:872
+#: Source/Core/Core/Src/ActionReplay.cpp:862
 #, 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:945
+#: Source/Core/Core/Src/ActionReplay.cpp:935
 #, 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:896
+#: Source/Core/Core/Src/ActionReplay.cpp:886
 #, 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:838
+#: Source/Core/Core/Src/ActionReplay.cpp:828
 #, 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:242
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:247
 msgid "Adapter:"
 msgstr "Adaptador:"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:76
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:63
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:63
 msgid "Add"
 msgstr "Adicionar"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1275
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1301
 msgid "Add ActionReplay Code"
 msgstr "Adicionar Código de ActionReplay"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1204
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1230
 msgid "Add Patch"
 msgstr "Adicionar Patch"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:507
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:528
 msgid "Add new pane"
 msgstr "Adicionar novo painel"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:404
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:426
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:811
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:408
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:430
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:792
 msgid "Add..."
 msgstr "Adicionar..."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:90
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:81
 msgid "Address :"
 msgstr "Endereço:"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:58
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:45
 msgid ""
 "Adds the specified value to zFar Parameter.\n"
 "Two ways to express the floating point values.\n"
@@ -598,7 +618,7 @@ msgstr ""
 "\n"
 "NOTA: Confira a Janela de Log/Console para ver os valores adquiridos."
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:53
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:40
 msgid ""
 "Adds the specified value to zNear Parameter.\n"
 "Two ways to express the floating point values.\n"
@@ -616,48 +636,48 @@ msgstr ""
 "\n"
 "NOTA: Confira a Janela de Log/Console para ver os valores adquiridos."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:755
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:744
 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:509
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:522
 msgid "Advanced"
 msgstr "Avançado"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561
 msgid "Advanced Settings"
 msgstr "Configurações Avançadas"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:584
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:587
 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:816
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:797
 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:1189
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1190
 msgid "All Gamecube GCM files (gcm)"
 msgstr "Todos os arquivos Gamecube CGM (gcm)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1390
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1404
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1417
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1431
 msgid "All Save States (sav, s##)"
 msgstr "Todos os Pontos de Jogo Salvos (sav, s##)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1187
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1188
 msgid "All Wii ISO files (iso)"
 msgstr "Todos os Arquivos ISO Wii"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1207
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1208
 msgid "All compressed GC/Wii ISO files (gcz)"
 msgstr "Todos os arquivos ISO GC/Wii comprimidos"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:124
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:104
 msgid "All files (*.*)|*.*"
 msgstr "Todos os arquivos (*.*)|*.*"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123
 msgid ""
 "Allows toggling certain options via the hotkeys 3 (Internal Resolution), 4 "
 "(Aspect Ratio), 5 (Copy EFB) and 6 (Fog) within the emulation window.\n"
@@ -669,39 +689,39 @@ msgstr ""
 "\n"
 "Se estiver em dúvida, deixe isto desativado."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:285
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:272
 msgid "Analyze"
 msgstr "Analizar"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:298
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:285
 msgid "Angle"
 msgstr "Ângulo"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:367
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:375
 msgid "Anisotropic Filtering:"
 msgstr "Filtragem Anisotrópica"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:350
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:358
 msgid "Anti-Aliasing:"
 msgstr "Anti-Aliasing:"
 
-#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:308
+#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:299
 msgid "Apploader is the wrong size...is it really an apploader?"
 msgstr "O Apploader é do tamanho errado... Isso é mesmo um Apploader?"
 
-#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:302
+#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:293
 msgid "Apploader unable to load from file"
 msgstr "O Apploader não pôde carregar do arquivo"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:841
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:822
 msgid "Apploader:"
 msgstr "Apploader:"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:135
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:122
 msgid "Apply"
 msgstr "Aplicar"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124
 msgid ""
 "Apply a post-processing effect after finishing a frame.\n"
 "\n"
@@ -711,11 +731,11 @@ msgstr ""
 "\n"
 "Se estiver em dúvida, selecione (desligado)."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287
 msgid "Arabic"
 msgstr "Árabe"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:614
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:603
 #, c-format
 msgid "Are you sure you want to delete \"%s\"?"
 msgstr "Você tem certeza de que quer apagar \"%s\"?"
@@ -734,46 +754,50 @@ msgstr ""
 "Você tem certeza que quer deletar este arquivo? Ele ficará perdido para "
 "sempre!"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:789
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:277
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:44
+msgid "Arm JIT (experimental)"
+msgstr "Arm JIT (experimental)"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:285
 msgid "Aspect Ratio:"
 msgstr "Proporção:"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:70
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:58
 msgid "At least one pane must remain open."
 msgstr "Pelo menos um painél deve permanecer aberto."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:553
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533
 msgid "Audio"
 msgstr "Áudio"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:694
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675
 msgid "Audio Backend:"
 msgstr "Backend de Audio"
 
-#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:41
+#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:28
 msgid "AudioCommon: Error opening AO device.\n"
 msgstr "AudioCommon: Erro ao abrir o dispositivo AO.\n"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:275
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283
 msgid "Auto"
 msgstr "Automático"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:337
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345
 msgid "Auto (Multiple of 640x528)"
 msgstr "Auto (Múltiplo de 640x528)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:337
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345
 msgid "Auto (Window Size)"
 msgstr "Auto (Tamanho da Janela)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:297
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305
 msgid "Auto adjust Window Size"
 msgstr "Ajustar Automaticamente o Tamanho da Janela"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77
 msgid ""
 "Automatically adjusts the window size to your internal resolution.\n"
 "\n"
@@ -783,130 +807,130 @@ msgstr ""
 "\n"
 "Se estiver em dúvida, deixe isto desativado."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:697
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696
 msgid "B"
 msgstr "B"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:755
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:754
 msgid "BP register "
 msgstr "Registrador BP"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:27
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:14
 msgid "Back"
 msgstr "Voltar"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:698
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:679
 msgid "Backend Settings"
 msgstr "Configurações do Backend"
 
-#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:60
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:206
+#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:47
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:211
 msgid "Backend:"
 msgstr "Backend:"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:318
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:95
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:305
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:82
 msgid "Background Input"
 msgstr "Input em Background"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:279
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:266
 msgid "Backward"
 msgstr "Para trás"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:264
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:257
 msgid "Bad File Header"
 msgstr "Header de Arquivo Ruim"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:627
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:621
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:290
 msgid "Banner"
 msgstr "Banner"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:519
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:529
 msgid "Banner Details"
 msgstr "Detalhes de Banner"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491
 msgid "Banner:"
 msgstr "Banner:"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:57
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:61
 msgid "Bar"
 msgstr "Alavanca"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:308
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:316
 msgid "Basic"
 msgstr "Básico"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555
 msgid "Basic Settings"
 msgstr "Configurações Básicas"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:22
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Bass"
 msgstr "Baixo"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:186
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:174
 msgid "Block Allocation Table checksum failed"
 msgstr "Falha no teste de Mesa de Alocação de Blocos"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:631
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625
 msgid "Blocks"
 msgstr "Blocos"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:21
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Blue"
 msgstr "Azul"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:24
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Blue Left"
 msgstr "Azul Esquerdo"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:25
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Blue Right"
 msgstr "Azul Direito"
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:87
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270
 msgid "Bottom"
 msgstr "Embaixo"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:238
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:225
 #, c-format
 msgid "Bound Controls: %lu"
 msgstr "Controles Acoplados: %lu"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348
 msgid "Broken"
 msgstr "Quebrado"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:422
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:428
 msgid "Browse"
 msgstr "Procurar"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:256
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:243
 msgid "Browse for a directory to add"
 msgstr "Procurar por um diretório para adicionar"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:422
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:428
 msgid "Browse for an ISO directory..."
 msgstr "Procurar por um diretório de ISO..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1079
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1080
 msgid "Browse for output directory"
 msgstr "Procurar por um diretório de output"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:328
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:331
 msgid "Buffer:"
 msgstr "Buffer:"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:58
 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:119
+#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:106
 msgid "Buttons"
 msgstr "Botões"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317
 msgid ""
 "Bypass the clearing of the data cache by the DCBZ instruction. Usually leave "
 "this option disabled."
@@ -914,31 +938,31 @@ msgstr ""
 "Pula a limpeza do cache de dados da instrução DCBZ. Normalmente, deixe esta "
 "opção desativada."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:698
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:697
 msgid "C"
 msgstr "C"
 
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:77
+#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:64
 msgid "C Stick"
 msgstr "C Stick"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:77
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:64
 msgid "C-Stick"
 msgstr "C-Stick"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:764
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:763
 msgid "CP reg"
 msgstr "CP reg"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:567
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547
 msgid "CPU Emulator Engine"
 msgstr "Engine de Emulação do CPU"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:490
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500
 msgid "Cache Display Lists"
 msgstr "Cache das Listas de Display"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88
 msgid ""
 "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n"
 "Decreases emulation speed by some percent (depending on your GPU).\n"
@@ -952,23 +976,38 @@ msgstr ""
 "\n"
 "Se estiver em dúvida, deixe isto desativado."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1858
+#, c-format
+msgid "Can't find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x"
+msgstr ""
+
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1872
+#, c-format
+msgid "Can't find WiiMote by connection handle %02x"
+msgstr ""
+
+#: Source/Core/Core/Src/HW/DVDInterface.cpp:669
+#: Source/Core/Core/Src/HW/DVDInterface.cpp:679
+msgid "Can't read from DVD_Plugin - DVD-Interface: Fatal Error"
+msgstr "Não é possível ler do DVD_Plugin - DVD-Interface: Erro Fatal"
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:124
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:28
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:91
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:178
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:240
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:84
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:171
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:233
 #, c-format
 msgid "Cannot open %s"
 msgstr "Não é possível abrir %s"
 
-#: Source/Core/Core/Src/CoreTiming.cpp:141
+#: Source/Core/Core/Src/CoreTiming.cpp:128
 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:1078
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1061
 #, c-format
 msgid ""
 "Cannot use that file as a memory card.\n"
@@ -979,7 +1018,7 @@ msgstr ""
 "%s\n"
 "não é um arquivo de Memory Card válido"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1108
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1091
 msgid ""
 "Cannot use that file as a memory card.\n"
 "Are you trying to use the same file in both slots?"
@@ -987,32 +1026,15 @@ 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:1867
-#, 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:1881
-#, 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: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"
-
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:52
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:39
 msgid "Caps Lock"
 msgstr "Caps Lock"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288
 msgid "Catalan"
 msgstr "Catalão"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:311
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:298
 msgid "Center"
 msgstr "Centralizar"
 
@@ -1020,12 +1042,12 @@ msgstr "Centralizar"
 msgid "Change"
 msgstr "Mudar"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:316
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:322
 msgid "Change &Disc..."
 msgstr "Mudar &Disco..."
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:179
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:179
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:167
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:167
 msgid "Change Disc"
 msgstr "Mudar o Disco"
 
@@ -1033,7 +1055,7 @@ msgstr "Mudar o Disco"
 msgid "Change Game"
 msgstr "Mudar Jogo"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:515
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495
 msgid ""
 "Change the language of the user interface.\n"
 "Requires restart."
@@ -1041,75 +1063,75 @@ msgstr ""
 "Mudar a linguagem da interface de usuário.\n"
 "Requer reinício."
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:60
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:47
 msgid "Changes sign to zFar Parameter (after correction)"
 msgstr "Muda o sinal para o parâmetro do zFar (após a correção)"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:55
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:42
 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:519
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499
 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:295
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:298
 msgid "Chat"
 msgstr "Chat"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:47
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:34
 msgid "Cheat Code"
 msgstr "Códigos de Cheat"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:118
 msgid "Cheat Search"
 msgstr "Busca de Cheats"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:38
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:25
 msgid "Cheats Manager"
 msgstr "Gerenciador de Cheat"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:633
 msgid "Check Partition Integrity"
 msgstr "Checar Integridade da Partição"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:864
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:880
 msgid "Checking integrity..."
 msgstr "Checando Integridade..."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289
 msgid "Chinese (Simplified)"
 msgstr "Chinês (Simplificado)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290
 msgid "Chinese (Traditional)"
 msgstr "Chinês (Tradicional)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:818
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:799
 msgid "Choose a DVD root directory:"
 msgstr "Escolher um diretório raiz de DVD:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:822
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803
 msgid "Choose a NAND root directory:"
 msgstr "Escolha um diretório raíz para o NAND:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:815
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:796
 msgid "Choose a default ISO:"
 msgstr "Escolher uma ISO padrão:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1236
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1219
 msgid "Choose a directory to add"
 msgstr "Escolher um diretório para adicionar"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1065
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1048
 msgid "Choose a file to open"
 msgstr "Escolher um arquivo para abrir"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:217
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:204
 msgid "Choose a memory card:"
 msgstr "Escolher um cartão de memória:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:819
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800
 msgid ""
 "Choose file to use as apploader: (applies to discs constructed from "
 "directories only)"
@@ -1117,27 +1139,27 @@ 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:767
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:806
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:781
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:822
 msgid "Choose the folder to extract to"
 msgstr "Escolha a pasta para extrair"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:297
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:284
 msgid "Circle Stick"
 msgstr "Analógico Circular"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:52
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:56
 msgid "Classic"
 msgstr "Clássico"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:144
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:43
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:487
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:913
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:137
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:30
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:474
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:904
 msgid "Clear"
 msgstr "Limpar"
 
-#: Source/Core/Core/Src/NetPlayServer.cpp:259
+#: Source/Core/Core/Src/NetPlayServer.cpp:263
 msgid ""
 "Client disconnect while game is running!! NetPlay is disabled. You must "
 "manually stop the game."
@@ -1145,138 +1167,138 @@ 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:298
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:247
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:552
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:578
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:285
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:234
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:562
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:590
 msgid "Close"
 msgstr "Fechar"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:174
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:177
 msgid "Co&nfigure..."
 msgstr "Co&nfigurar..."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:86
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:73
 msgid "Code Info"
 msgstr "Informação do Código"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:568
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:556
 msgid "Code: "
 msgstr "Código:"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:35
 msgid "Command"
 msgstr "Comandos"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:629
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:623
 msgid "Comment"
 msgstr "Comentário"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489
 msgid "Comment:"
 msgstr "Comentário:"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:893
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:884
 msgid "Compress ISO..."
 msgstr "Comprimir ISO..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:905
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:899
 msgid "Compress selected ISOs..."
 msgstr "Comprimir ISOs selecionadas..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1088
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1224
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1089
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1225
 msgid "Compressing ISO"
 msgstr "Comprimindo ISO"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:429
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:435
 msgid "Config"
 msgstr "Configurar"
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:37
-#: Source/Core/DolphinWX/Src/InputConfigDiag.h:135
-#: Source/Core/DolphinWX/Src/InputConfigDiag.h:154
+#: Source/Core/DolphinWX/Src/InputConfigDiag.h:122
+#: Source/Core/DolphinWX/Src/InputConfigDiag.h:141
 msgid "Configure"
 msgstr "Configurar"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:111
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:98
 msgid "Configure Control"
 msgstr "Configurar Controle"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:306
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
 #: Source/Core/DolphinWX/Src/NetWindow.cpp:583
 msgid "Configure Pads"
 msgstr "Configurar Controles"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:429
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:435
 msgid "Configure..."
 msgstr "Configurar..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1119
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1147
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1217
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1120
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1218
 msgid "Confirm File Overwrite"
 msgstr "Confirmar sobrescrição de arquivo"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:597
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:577
 msgid "Confirm on Stop"
 msgstr "Confirmar ao Parar"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:83
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:105
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:74
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:96
 msgid "Connect"
 msgstr "Conectar"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:783
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:764
 msgid "Connect USB Keyboard"
 msgstr "Conectar Teclado USB"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:362
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:368
 #, c-format
 msgid "Connect Wiimote %i"
 msgstr "Conectar Wiimote %i"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:195
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183
 msgid "Connect Wiimote 1"
 msgstr "Conectar Wiimote 1"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184
 msgid "Connect Wiimote 2"
 msgstr "Conectar Wiimote 2"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:185
 msgid "Connect Wiimote 3"
 msgstr "Conectar Wiimote 3"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:198
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:186
 msgid "Connect Wiimote 4"
 msgstr "Conectar Wiimote 4"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:627
+#: Source/Core/DolphinWX/Src/Main.cpp:655
 msgid "Connecting..."
 msgstr "Conectando..."
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:155
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:156
 msgid "Console"
 msgstr "Console"
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:71
 msgid "Continuous Scanning"
-msgstr ""
+msgstr "Scanning Contínuo"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:46
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:33
 msgid "Control"
 msgstr "Controle"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:189
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:176
 msgid "Convert to GCI"
 msgstr "Converter para GCI"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:379
+#: Source/Core/Core/Src/CoreParameter.cpp:368
 msgid "Copy failed"
 msgstr "Falha na Cópia"
 
@@ -1285,21 +1307,21 @@ msgstr "Falha na Cópia"
 msgid "Copy to Memcard %c"
 msgstr "Copiar para Cartão de Memória %c"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:359
 msgid "Core"
 msgstr "Núcleo"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:154
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:148
 #, c-format
 msgid "Could not create %s"
 msgstr "Não pôde criar %s"
 
-#: Source/Core/AudioCommon/Src/AudioCommon.cpp:75
+#: Source/Core/AudioCommon/Src/AudioCommon.cpp:62
 #, c-format
 msgid "Could not initialize backend %s."
 msgstr "Não foi possível inicializar o Backend 5s. %s"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:137
+#: Source/Core/Core/Src/CoreParameter.cpp:126
 #, c-format
 msgid ""
 "Could not read \"%s\".  There is no disc in the drive, or it is not a GC/Wii "
@@ -1310,12 +1332,12 @@ msgstr ""
 "cópia de GC/Wii. Note que os discos originais de Gamecube e Wii não podem "
 "ser lidos pela maioria dos leitores de DVD dos PCs."
 
-#: Source/Core/Core/Src/CoreParameter.cpp:292
+#: Source/Core/Core/Src/CoreParameter.cpp:281
 #, c-format
 msgid "Could not recognize ISO file %s"
 msgstr "Não foi possível reconhecer o arquivo ISO %s"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:569
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:579
 #, c-format
 msgid "Could not save %s"
 msgstr "Não foi possível salvar %s"
@@ -1329,24 +1351,24 @@ msgstr ""
 "no momento!\n"
 "(Definir os controles durante o jogo ainda não é suportado)"
 
-#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:123
+#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119
 #, c-format
 msgid ""
 "Could not write memory card file %s.\n"
 "\n"
 "Are you running Dolphin from a CD/DVD, or is the save file maybe write "
-"protected?"
-msgstr ""
-"Não foi possível escrever no arquivo de Memory Card %s.\n"
+"protected?\n"
 "\n"
-"Você está executando o Dolphin de um CD/DVD, ou talvez o arquivo de salva "
-"seja somente-leitura?"
+"Are you receiving this after moving the emulator directory?\n"
+"If so, then you may need to re-specify your memory card location in the "
+"options."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1107
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1133
 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:146
+#: Source/Core/Core/Src/BootManager.cpp:137
 msgid ""
 "Couldn't init the core.\n"
 "Check your configuration."
@@ -1354,38 +1376,38 @@ 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:170
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:495
 msgid "Count:"
 msgstr "Contagem:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:452
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456
 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:173
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:550
 msgid "Create AR Code"
 msgstr "Criar Código AR"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:543
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:608
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:569
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:641
 msgid "Create new perspective"
 msgstr "Criar nova perspectiva"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:17
 msgid "Creator: "
 msgstr "Criador:"
 
-#: Source/Core/Common/Src/MsgHandler.cpp:68
+#: Source/Core/Common/Src/MsgHandler.cpp:54
 msgid "Critical"
 msgstr "Crítico"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562
 msgid "Crop"
 msgstr "Cortar"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119
 msgid ""
 "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n"
 "\n"
@@ -1395,140 +1417,140 @@ msgstr ""
 "\n"
 "Se estiver em dúvida, deixe isto desativado."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:48
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:52
 msgid "Crossfade"
 msgstr "Crossfade"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:597
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:600
 #, 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!"
+msgid "Current directory changed from %s to %s after wxFileSelector!"
+msgstr "Diretória atual foi alterado de %s para %s conforme wxFileSelector!"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339
 msgid "Custom Projection Hack"
 msgstr "Hack de Projeção Customizado"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.h:30
+#: Source/Core/DolphinWX/Src/PHackSettings.h:17
 msgid "Custom Projection Hack Settings"
 msgstr "Configurações de Hack de Projeção Customizado"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342
 msgid "Customize some Orthographic Projection parameters."
 msgstr "Cuztomize alguns parâmetros de Projeção Ortográfica."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291
 msgid "Czech"
 msgstr "Tcheco"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:698
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:697
 msgid "D"
 msgstr "D"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:89
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
 msgid "D-Pad"
 msgstr "Direcional Digital"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:431
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
 msgid "DSP"
 msgstr "DSP"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:639
 msgid "DSP Emulator Engine"
 msgstr "Engine de Emulação do DSP"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:254
 msgid "DSP HLE emulation (fast)"
 msgstr "Emulação HLE do DSP (rápido)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:256
 msgid "DSP LLE interpreter (slow)"
 msgstr "Interpretador LLE do DSP (lento)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660
-msgid "DSP LLE on Thread"
-msgstr "DSP LLE em Segmento"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:255
 msgid "DSP LLE recompiler"
 msgstr "Recompilador LLE do DSP"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:431
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:641
+msgid "DSP on Dedicated Thread"
+msgstr "DSP em um Thread Dedicado"
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
 msgid "DSP settings"
 msgstr "Configurações de Áudio"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:838
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:819
 msgid "DVD Root:"
 msgstr "Raiz do DVD:"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:239
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:226
 msgid "DVDLowRead - Fatal Error: failed to read from volume"
 msgstr "DVDLowRead - Erro Fatal: falha ao ler do volume"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:333
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:320
 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:163
 msgid "Data Size"
 msgstr "Tamanho de Arquivo"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468
 msgid "Date:"
 msgstr "Data:"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:528
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:564
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:518
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:557
 msgid "Datel MaxDrive/Pro files(*.sav)"
 msgstr "Arquivos Datel Maxdrive/Pro (*.sav)"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:242
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:259
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:267
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:281
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:296
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:229
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:246
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:254
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:268
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:283
 msgid "Dead Zone"
 msgstr "Zona Morta"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:35
 msgid "Debug"
 msgstr "Debug"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:521
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534
 msgid "Debugging"
 msgstr "Debugging"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:79
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:66
 msgid "Decimal"
 msgstr "Decimal"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:890
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:881
 msgid "Decompress ISO..."
 msgstr "Descomprimir ISO..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:906
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:900
 msgid "Decompress selected ISOs..."
 msgstr "Descomprimir ISOs selecionados..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1088
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1224
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1089
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1225
 msgid "Decompressing ISO"
 msgstr "Descomprimindo ISO"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:912
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:903
 msgid "Default"
 msgstr "Padrão"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:835
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:816
 msgid "Default ISO:"
 msgstr "ISO Padrão:"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:114
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:107
 msgid "Default font"
 msgstr "Fonte Padrão"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:32
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:926
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:19
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917
 msgid "Delete"
 msgstr "Excluir"
 
@@ -1536,21 +1558,21 @@ msgstr "Excluir"
 msgid "Delete Save"
 msgstr "Excluir Save"
 
-#: Source/Core/VideoCommon/Src/AVIDump.cpp:77
+#: Source/Core/VideoCommon/Src/AVIDump.cpp:64
 #, c-format
 msgid "Delete the existing file '%s'?"
 msgstr "Apagar o arquivo existente '%s'?"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:671
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:683
 msgid "Description"
 msgstr "Descrição"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:472
 msgid "Detect"
 msgstr "Detectar"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:233
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:328
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:220
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:315
 msgid ""
 "Detected attempt to read more data from the DVD than fit inside the out "
 "buffer. Clamp."
@@ -1558,29 +1580,29 @@ 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:127
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:898
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:114
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:889
 msgid "Device"
 msgstr "Dispositivo"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:798
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:731
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779
 msgid "Device Settings"
 msgstr "Configurações de Dispositivo"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:45
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:49
 msgid "Dial"
 msgstr "Discar"
 
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:146
+#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:135
 msgid "Direct3D11"
 msgstr "Direct3D11"
 
-#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:128
+#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:125
 msgid "Direct3D9"
 msgstr "Direct3D9"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:167
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:155
 msgid ""
 "Directory checksum failed\n"
 " and Directory backup checksum failed"
@@ -1588,16 +1610,20 @@ msgstr ""
 "A checagem de diretório falhou\n"
 " e a checagem de Backup de Diretório falhou"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:433
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:443
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485
 msgid "Disable"
 msgstr "Desativar"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:491
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501
+msgid "Disable Destination Alpha"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:409
 msgid "Disable Fog"
 msgstr "Desativar Neblina"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108
 msgid ""
 "Disable any XFB emulation.\n"
 "Speeds up emulation a lot but causes heavy glitches in many games which rely "
@@ -1607,11 +1633,11 @@ msgid ""
 msgstr ""
 "Desativa a emulação do XFB.\n"
 "Aumenta bastante a performance mas pode causar problemas em vários jogos que "
-"precisam dela (especialmente aplicativos amadores/homebrew).\n"
+"precisam dela (especialmente aplicativos indie/homebrew).\n"
 "\n"
 "Se estiver em dúvida, deixe isto ativado."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95
 msgid ""
 "Disable emulation of EFB copies.\n"
 "These are often used for post-processing or render-to-texture effects, so "
@@ -1627,20 +1653,33 @@ msgstr ""
 "\n"
 "Se estiver em dúvida, deixe isto desativado."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:543
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101
+#, fuzzy
+msgid ""
+"Disables emulation of a hardware feature called destination alpha, which is "
+"used in many games for various graphical effects.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+"Não faz o passe de destino Alfa usado em muitos jogos para vários efeitos "
+"gráficos.\n"
+"\n"
+"Se estiver em dúvida, deixe isto desativado."
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:553
 msgid "Disc"
 msgstr "Disco"
 
-#: Source/Core/DiscIO/Src/DriveBlob.cpp:107
-#: Source/Core/DiscIO/Src/DriveBlob.cpp:126
+#: Source/Core/DiscIO/Src/DriveBlob.cpp:94
+#: Source/Core/DiscIO/Src/DriveBlob.cpp:113
 msgid "Disc Read Error"
 msgstr "Erro na leitura do Disco"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:312
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:320
 msgid "Display"
 msgstr "Display"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104
 msgid ""
 "Display the inputs read by the emulator.\n"
 "\n"
@@ -1650,32 +1689,32 @@ msgstr ""
 "\n"
 "Se estiver em dúvida, deixe isto desativado."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:80
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:67
 msgid "Divide"
 msgstr "Dividir"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:987
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:990
 msgid "Do you want to stop the current emulation?"
 msgstr "Você quer parar a emulação atual?"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:663
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:644
 msgid "Dolby Pro Logic II decoder"
 msgstr "Decoder Dolby Pro Logic II"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:864
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:856
 msgid "Dolphin"
 msgstr "Dolphin"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:183
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:188
 #, c-format
 msgid "Dolphin %s Graphics Configuration"
 msgstr "Configurações %s Gráficas do Dolphin"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:292
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:298
 msgid "Dolphin &Web Site"
 msgstr "&Web Site do Dolphin"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.h:37
+#: Source/Core/DolphinWX/Src/ConfigMain.h:24
 msgid "Dolphin Configuration"
 msgstr "Configuração do Dolphin"
 
@@ -1683,28 +1722,28 @@ msgstr "Configuração do Dolphin"
 msgid "Dolphin Emulated Wiimote Configuration"
 msgstr "Configuração de Wiimote Emulado do Dolphin"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:394
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:383
 msgid "Dolphin FIFO"
 msgstr "Dolphin FIFO"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1136
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1153
 msgid "Dolphin GCPad Configuration"
 msgstr "Configuração do GCPad do Dolphin"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:679
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1074
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:685
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1089
 msgid "Dolphin TAS Movies (*.dtm)"
-msgstr "Filmes TAS Dolphin (*.dtm)"
+msgstr "Filmes TAS do Dolphin (*.dtm)"
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:8
 msgid "Dolphin Wiimote Configuration"
 msgstr "Configuração de Wiimote Dolphin"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:293
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:299
 msgid "Dolphin at &Google Code"
 msgstr "Dolphin no &Google Code"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:364
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:351
 msgid ""
 "Dolphin could not find any GC/Wii ISOs.  Doubleclick here to browse for "
 "files..."
@@ -1712,7 +1751,7 @@ msgstr ""
 "Dolphin não pôde encontrar ISOs GC/Wii. Duplo-clique aqui para procurar por "
 "arquivos..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:368
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:355
 msgid ""
 "Dolphin is currently set to hide all games.  Doubleclick here to show all "
 "games..."
@@ -1720,50 +1759,59 @@ msgstr ""
 "Dolphin atualmente está configurado para esconder todos os jogos. Duplo-"
 "clique aqui para mostrar todos os jogos..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1159
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1160
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1246
 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
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
+#, fuzzy
+msgid ""
+"Doubles the emulated GPU clock rate. May speed up some games (ON = Fast, OFF "
+"= Compatible)"
+msgstr ""
+"Ativar acesso rápido de disco. Necessário para alguns jogos.(ON = Rapido, "
+"OFF = Compativel)"
+
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:262
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:45
 msgid "Down"
 msgstr "Para Baixo"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:54
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:44
 msgid "Download Codes (WiiRD Database)"
 msgstr "Download de Códigos (Banco de Dados WiiRD)"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:297
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:287
 #, c-format
 msgid "Downloaded %lu codes. (added %lu)"
 msgstr "Códigos %lu baixados. (Adicionados %lu)"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:31
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:35
 msgid "Drums"
 msgstr "Bateria"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:105
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
 msgid "Dummy"
 msgstr "Dummy"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:661
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:642
 msgid "Dump Audio"
 msgstr "Extrair Áudio"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:532
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545
 msgid "Dump EFB Target"
 msgstr "Extrair Código EFB"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546
 msgid "Dump Frames"
 msgstr "Extrair Quadros"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543
 msgid "Dump Textures"
 msgstr "Extrair Texturas"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114
 msgid ""
 "Dump all rendered frames to an AVI file in User/Dump/Frames/\n"
 "\n"
@@ -1774,7 +1822,7 @@ msgstr ""
 "\n"
 "Se estiver em dúvida, deixe isto desativado."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111
 msgid ""
 "Dump decoded game textures to User/Dump/Textures/<game_id>/\n"
 "\n"
@@ -1783,7 +1831,7 @@ msgstr ""
 "Extrair texturas do jogo para Usuário/Despejo/Texturas/<id do jogo>/\n"
 "Se estiver em dúvida, deixe isto desativado."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113
 msgid ""
 "Dump the contents of EFB copies to User/Dump/Textures/\n"
 "\n"
@@ -1793,21 +1841,21 @@ msgstr ""
 "\n"
 "Se estiver em dúvida, deixe isto desativado."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:474
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292
 msgid "Dutch"
 msgstr "Holandês"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:112
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:113
 msgid "E&xit"
 msgstr "&Sair"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:441
 msgid "EFB Copies"
 msgstr "Cópias de EFB"
 
-#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:223
+#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:210
 #, c-format
 msgid ""
 "ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least "
@@ -1820,52 +1868,52 @@ msgstr ""
 "PC é provavelmente necessário no momento para que o Windows veja o novo "
 "driver."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:166
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:160
 msgid "EUROPE"
 msgstr "EUROPA"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:156
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:143
 msgid "Early Memory Updates"
 msgstr "Atualizações prévias de Memória"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:447
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:453
 msgid "Edit"
 msgstr "Editar"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.h:30
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.h:17
 msgid "Edit ActionReplay Code"
 msgstr "Editar Código ActionReplay"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:285
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:286
 msgid "Edit Config"
 msgstr "Editar Configuração"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.h:30
+#: Source/Core/DolphinWX/Src/PatchAddEdit.h:17
 msgid "Edit Patch"
 msgstr "Editar Patch"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:447
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:453
 msgid "Edit current perspective"
 msgstr "Editar perspectiva atual"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:403
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:425
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:407
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:429
 msgid "Edit..."
 msgstr "Editar..."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:44
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:48
 msgid "Effect"
 msgstr "Efeito"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:425
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435
 msgid "Embedded Frame Buffer"
 msgstr "Frame Buffer Embutido"
 
-#: Source/Core/Core/Src/Core.cpp:201
+#: Source/Core/Core/Src/Core.cpp:190
 msgid "Emu Thread already running"
 msgstr "Este Segmento de Emulação já está rodando"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110
 msgid ""
 "Emulate XFBs accurately.\n"
 "Slows down emulation a lot and prohibits high-resolution rendering but is "
@@ -1879,7 +1927,7 @@ msgstr ""
 "\n"
 "Se estiver em dúvida, selecione Virtual."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109
 msgid ""
 "Emulate XFBs using GPU texture objects.\n"
 "Fixes many games which don't work without XFB emulation while not being as "
@@ -1899,7 +1947,7 @@ msgstr ""
 msgid "Emulated Wiimote"
 msgstr "Emular Wiimote"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346
 msgid "Emulation State: "
 msgstr "Estado de Emulação"
 
@@ -1907,7 +1955,7 @@ msgstr "Estado de Emulação"
 msgid "Enable"
 msgstr "Ativar"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91
 msgid ""
 "Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's "
 "supported by your GPU.\n"
@@ -1923,72 +1971,71 @@ msgstr ""
 "\n"
 "Se estiver em dúvida, deixe isto desativado."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:111
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:98
 msgid "Enable AR Logging"
 msgstr "Ativar Registro AR"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324
 msgid "Enable Block Merging"
 msgstr "Ativar Block Merging"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331
 msgid "Enable Bounding Box Calculation"
 msgstr "Ativar Cálculo de Caixas Limitadoras"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:446
 msgid "Enable Cache"
 msgstr "Ativar Cache"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:562
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542
 msgid "Enable Cheats"
 msgstr "Ativar Cheats"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310
 msgid "Enable Dual Core"
 msgstr "Ativar Modo de Dois Núcleos"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
 msgid "Enable Dual Core (speedup)"
 msgstr "Ativar Modo de Dois Núcleos (Aumento na velocidade)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:550
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:563
 msgid "Enable Hotkeys"
 msgstr "Ativar Hotkeys"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311
 msgid "Enable Idle Skipping"
 msgstr "Ativar Idle Skipping"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541
 msgid "Enable Idle Skipping (speedup)"
 msgstr "Ativar Idle Skipping (Aumento na velocidade)"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312
 msgid "Enable MMU"
 msgstr "Ativar MMU"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:554
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:567
 msgid "Enable Progressive Scan"
 msgstr "Ativar Varredura Progressiva"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757
 msgid "Enable Screen Saver"
 msgstr "Ativar Salva-Tela"
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:75
-#, fuzzy
 msgid "Enable Speaker Data"
-msgstr "Ativar Paginas"
+msgstr "Ativar Dados do Auto-falante"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
 msgid "Enable WideScreen"
 msgstr "Ativar WideScreen"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:516
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529
 msgid "Enable Wireframe"
 msgstr "Ativar Wireframe"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85
 msgid ""
 "Enable anisotropic filtering.\n"
 "Enhances visual quality of textures that are at oblique viewing angles.\n"
@@ -2003,7 +2050,7 @@ msgstr ""
 "\n"
 "Se estiver em dúvida, selecione 1x."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323
 msgid ""
 "Enable fast disc access.  Needed for a few games. (ON = Fast, OFF = "
 "Compatible)"
@@ -2015,7 +2062,7 @@ msgstr ""
 msgid "Enable pages"
 msgstr "Ativar Paginas"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76
 msgid ""
 "Enable this if you want the whole screen to be used for rendering.\n"
 "If this is disabled, a render window will be created instead.\n"
@@ -2027,7 +2074,7 @@ msgstr ""
 "\n"
 "Se estiver em dúvida, deixe isto desativado."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80
 msgid ""
 "Enable this if you want to use the main Dolphin window for rendering rather "
 "than a separate render window.\n"
@@ -2039,7 +2086,7 @@ msgstr ""
 "\n"
 "Se estiver em dúvida, deixe isto desativado."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:335
 msgid ""
 "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for "
 "ANY other game."
@@ -2047,11 +2094,11 @@ 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:337
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340
 msgid "Enables Custom Projection Hack"
 msgstr "Ativa Hack de Projeção Personalizado"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:528
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508
 msgid ""
 "Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on "
 "OSX."
@@ -2059,14 +2106,14 @@ 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:530
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510
 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:532
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:512
 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."
@@ -2075,7 +2122,7 @@ msgstr ""
 "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
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81
 msgid ""
 "Enables progressive scan if supported by the emulated software.\n"
 "Most games don't care about this.\n"
@@ -2087,7 +2134,7 @@ msgstr ""
 "\n"
 "Se estiver em dúvida, deixe isto desativado"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313
 msgid ""
 "Enables the Memory Management Unit, needed for some games. (ON = Compatible, "
 "OFF = Fast)"
@@ -2095,7 +2142,7 @@ msgstr ""
 "Ativar unidade de gerenciamento de memoria, necessário para alguns jogos. "
 "(ON = Compativel, OFF = Rapido)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116
 msgid ""
 "Encode frame dumps using the FFV1 codec.\n"
 "\n"
@@ -2105,50 +2152,50 @@ msgstr ""
 "\n"
 "Se estiver em dúvida, deixe isto desativado."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:40
 msgid "End"
 msgstr "Fim"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:469
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:280
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:260
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293
 msgid "English"
 msgstr "Inglês"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:329
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:407
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:337
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:417
 msgid "Enhancements"
 msgstr "Improvisos"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:607
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:640
 msgid "Enter a name for the new perspective:"
 msgstr "Insira um nome para a nova perspectiva:"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:191
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:178
 #, c-format
 msgid "Entry %d/%d"
 msgstr "Entry %d/%d"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:85
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:72
 #, c-format
 msgid "Entry 1/%d"
 msgstr "Entry 1/%d"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:204
 msgid "Equal"
 msgstr "Igual"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:45
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:156
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1242
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:32
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:150
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226
 msgid "Error"
 msgstr "Erro"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:381
+#: Source/Core/DolphinWX/Src/Main.cpp:409
 msgid "Error loading selected language. Falling back to system default."
 msgstr "Erro ao carregar o idioma selecionado. Voltando ao padrão do sistema."
 
-#: Source/Core/Common/Src/ChunkFile.h:226
+#: Source/Core/Common/Src/ChunkFile.h:221
 #, c-format
 msgid ""
 "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). "
@@ -2157,7 +2204,7 @@ msgstr ""
 "Erro: Depois de \"%s\", foi encontrado %d (0x%X) ao invés do marcador de "
 "save %d (0x%X). Abortando carregamento de instante salvo..."
 
-#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:342
+#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:329
 #, c-format
 msgid ""
 "Error: Trying to access %s fonts but they are not loaded. Games may not show "
@@ -2166,39 +2213,39 @@ msgstr ""
 "Erro: Tentando acessar as fontes %s mas elas não estão carregadas. Os jogos "
 "podem não mostrar as fontes corretamente, ou travar."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:30
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:17
 msgid "Escape"
 msgstr "Sair"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:26
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:30
 msgid "Euphoria"
 msgstr "Euphoria"
 
 #: Source/Core/Core/Src/ArmMemTools.cpp:78
-#: Source/Core/Core/Src/x64MemTools.cpp:217
+#: Source/Core/Core/Src/x64MemTools.cpp:206
 #, c-format
 msgid "Exception handler - access below memory space. %08llx%08llx"
 msgstr ""
 "Manipulador de Exceções - Acesso abaixo do espaço da memória. %08llx%08llx"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:61
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
 msgid "Execute"
 msgstr "Executar"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:459
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:446
 msgid "Export Failed"
 msgstr "Falha na Exportação"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:639
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:649
 msgid "Export File"
 msgstr "Exportar Arquivo"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:177
 msgid "Export Recording"
 msgstr "Exportar Gravação"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:345
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:351
 msgid "Export Recording..."
 msgstr "Exportar Gravação..."
 
@@ -2206,7 +2253,7 @@ msgstr "Exportar Gravação..."
 msgid "Export Save"
 msgstr "Exportar Save"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:874
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:865
 msgid "Export Wii save (Experimental)"
 msgstr "Exportar save do Wii (Experimental)"
 
@@ -2214,100 +2261,100 @@ msgstr "Exportar save do Wii (Experimental)"
 msgid "Export all saves"
 msgstr "Exportar todos os saves"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:80
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:72
 msgid "Export failed, try again?"
 msgstr "Falha na exportação, tentar novamente?"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:559
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:552
 msgid "Export save as..."
 msgstr "Exportar Salvar como..."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:297
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:284
 msgid "Extension"
 msgstr "Extensão"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483
 msgid "External Frame Buffer"
 msgstr "Frame Buffer Externo"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:61
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:48
 msgid "Extra Parameter"
 msgstr "Parâmetro Extra"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:62
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:49
 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:614
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:624
 msgid "Extract All Files..."
 msgstr "Extrair Todos os arquivos..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:616
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:626
 msgid "Extract Apploader..."
 msgstr "Extrair Apploader..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:617
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627
 msgid "Extract DOL..."
 msgstr "Extrair DOL..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:610
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:620
 msgid "Extract Directory..."
 msgstr "Extrair diretorio..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:612
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:622
 msgid "Extract File..."
 msgstr "Extrair Arquivo..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:608
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:618
 msgid "Extract Partition..."
 msgstr "Extrair Partição..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:724
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:738
 #, c-format
 msgid "Extracting %s"
 msgstr "Extraindo %s"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:707
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:721
 msgid "Extracting All Files"
 msgstr "Extraindo todos os arquivos"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:707
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:721
 msgid "Extracting Directory"
 msgstr "Extraindo diretorio"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:710
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:724
 msgid "Extracting..."
 msgstr "Extraindo..."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:892
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:893
 msgid "FIFO Byte"
 msgstr "Byte do FIFO"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:45
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:32
 msgid "FIFO Player"
 msgstr "FIFO Player"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:169
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:163
 msgid "FRANCE"
 msgstr "FRANÇA"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472
 msgid "FST Size:"
 msgstr "Tamanho FST:"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:77
+#: Source/Core/Core/Src/NetPlayClient.cpp:81
 msgid "Failed to Connect!"
 msgstr "Falha ao Conectar\""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:225
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:228
 msgid "Failed to Listen!!"
 msgstr "Não foi possível Ouvir!!"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:307
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:300
 msgid "Failed to download codes."
 msgstr "Falha ao dazer o download de códigos."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:827
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:843
 #, c-format
 msgid "Failed to extract to %s!"
 msgstr "Falha ao extrair %s!"
@@ -2333,26 +2380,30 @@ msgstr ""
 "Você pode usar a engine HLE do DSP que não precisa do dump da ROM.\n"
 "(Escolha-o na aba \"Áudio\" da Janela de Configuração.)"
 
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:116
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:139
+#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:108
+#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:131
 msgid "Failed to load bthprops.cpl"
 msgstr "Falha ao carregar bthprops.cpl"
 
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:100
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:109
+#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:90
+#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:101
 msgid "Failed to load hid.dll"
 msgstr "Falha ao carregar hid.dll"
 
-#: Source/Core/Core/Src/Movie.cpp:792
+#: Source/Core/Core/Src/Movie.cpp:783
 #, c-format
 msgid "Failed to read %s"
 msgstr "Falha ao ler %s"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:151
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:144
 msgid "Failed to read banner.bin"
 msgstr "Falha ao ler banner.bin"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:223
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:178
+msgid "Failed to read bk header"
+msgstr "Falha ao ler o bk header"
+
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:211
 #, c-format
 msgid ""
 "Failed to read block %d of the save data\n"
@@ -2363,7 +2414,7 @@ msgstr ""
 "O Memory Card pode estar truncado\n"
 "Posição no Arquivo:%llx"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:148
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:136
 msgid ""
 "Failed to read block allocation table backup correctly\n"
 "(0x8000-0x9FFF)"
@@ -2371,7 +2422,7 @@ msgstr ""
 "Falha ao ler mesa de alocação de blocos corretamente\n"
 "(0x8000-0x9FFF)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:142
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:130
 msgid ""
 "Failed to read block allocation table correctly\n"
 "(0x6000-0x7FFF)"
@@ -2379,12 +2430,17 @@ msgstr ""
 "Falha ao ler mesa de alocação de blocos corretamente\n"
 "(0x6000-0x7FFF)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:286
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:279
 #, c-format
 msgid "Failed to read data from file %d"
 msgstr "Falha ao ler dados do arquivo %d"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:136
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:367
+#, c-format
+msgid "Failed to read data from file: %s"
+msgstr "Falha ao ler dados do arquivo: %s"
+
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:124
 msgid ""
 "Failed to read directory backup correctly\n"
 "(0x4000-0x5FFF)"
@@ -2392,7 +2448,7 @@ msgstr ""
 "Não foii possível ler o Backup do diretório corretamente\n"
 "(0x4000-0x5FFF)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:130
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:118
 msgid ""
 "Failed to read directory correctly\n"
 "(0x2000-0x3FFF)"
@@ -2400,7 +2456,11 @@ msgstr ""
 "Não foi possível ler o diretório corretamente\n"
 "(0x2000-0x3FFF)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:119
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:90
+msgid "Failed to read header"
+msgstr "Falha ao ler o header"
+
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:107
 msgid ""
 "Failed to read header correctly\n"
 "(0x0000-0x1FFF)"
@@ -2408,41 +2468,41 @@ msgstr ""
 "Não foi possível ler o header corretamente\n"
 "(0x0000-0x1FFF)"
 
-#: Source/Core/DiscIO/Src/VolumeGC.cpp:61
+#: Source/Core/DiscIO/Src/VolumeGC.cpp:48
 msgid "Failed to read unique ID from disc image"
 msgstr "Não foi possível ler ID exclusivo da imagem do disco"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:84
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:71
 msgid "Failed to write BT.DINF to SYSCONF"
 msgstr "Falha ao escrever BT.DINF no SYSCONF"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:228
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:221
 msgid "Failed to write bkhdr"
 msgstr "Falha ao escrever bkhdr"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:164
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:157
 #, c-format
 msgid "Failed to write header for %s"
 msgstr "Falha ao escrever o header para %s"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:258
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:251
 #, c-format
 msgid "Failed to write header for file %d"
 msgstr "Falha ao escrever o header para o arquivo %d"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294
 msgid "Farsi"
 msgstr "Persa"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477
 msgid "Fast"
 msgstr "Rápido"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315
 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:1046
+#: Source/Core/Core/Src/Movie.cpp:1037
 #, c-format
 msgid ""
 "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s"
@@ -2450,23 +2510,23 @@ msgstr ""
 "Desincronização fatal. Abortando reprodução. (Erro em PlayWiimote: %u != %u, "
 "byte %u.)%s"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:199
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:202
 msgid "Fifo Player"
 msgstr "Fifo Player"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:99
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:86
 msgid "File Info"
 msgstr "Informações do Arquivo"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:304
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:295
 msgid "File contained no codes."
 msgstr "O arquivo não contém códigos."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:413
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:400
 msgid "File converted to .gci"
 msgstr "Arquivo convertido para .gci"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:428
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:415
 msgid ""
 "File could not be opened\n"
 "or does not have a valid extension"
@@ -2474,7 +2534,7 @@ msgstr ""
 "O arquivo não pode ser aberto\n"
 "ou não tem uma extensão válida"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:84
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:72
 #, c-format
 msgid ""
 "File has the extension \"%s\"\n"
@@ -2483,36 +2543,36 @@ msgstr ""
 "O arquivo tem a extensão \"%s\"\n"
 "extensões válidas são (.raw/.gcp)"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:425
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:412
 msgid "File is not recognized as a memcard"
 msgstr "Arquivo não reconhecido como Memory Card"
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:294
+#: Source/Core/DiscIO/Src/CompressedBlob.cpp:281
 msgid "File not compressed"
 msgstr "Arquivo não comprimido"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:127
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:109
 #, c-format
 msgid "FileIO: Unknown open mode : 0x%02x"
 msgstr "FileIO: Modo de abertura desconhecido : 0x%02x"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:531
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:541
 msgid "Filesystem"
 msgstr "Arquivo de sistema"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1100
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1126
 msgid "Filetype 'ini' is unknown! Will not open!"
 msgstr "Tipo do arquivo 'ini' desconhecido! Não vai abrir!"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:265
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:252
 msgid "Find next"
 msgstr "Achar Próximo"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:266
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:253
 msgid "Find previous"
 msgstr "Achar Anterior"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:632
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626
 msgid "First Block"
 msgstr "Primeiro Bloco"
 
@@ -2520,23 +2580,23 @@ msgstr "Primeiro Bloco"
 msgid "Fix Checksums"
 msgstr "Corrigir Checksums"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:275
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283
 msgid "Force 16:9"
 msgstr "Forçar 16:9"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:275
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283
 msgid "Force 4:3"
 msgstr "Forçar 4:3"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:568
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548
 msgid "Force Console as NTSC-J"
 msgstr "Forçar Console para NTSC-J"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406
 msgid "Force Texture Filtering"
 msgstr "Forçar Filtro de Texturas"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90
 msgid ""
 "Force texture filtering even if the emulated game explicitly disabled it.\n"
 "Improves texture quality slightly but causes glitches in some games.\n"
@@ -2549,7 +2609,7 @@ msgstr ""
 "\n"
 "Se estiver em dúvida, deixe isto desativado."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83
 msgid ""
 "Force the game to output graphics for widescreen resolutions.\n"
 "Causes graphical glitches is some games.\n"
@@ -2561,7 +2621,7 @@ msgstr ""
 "\n"
 "Se estiver em dúvida, deixe isto desativado."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488
 msgid ""
 "Forces NTSC-J mode for using the Japanese ROM font.\n"
 "Left unchecked, dolphin defaults to NTSC-U and automatically enables this "
@@ -2571,7 +2631,7 @@ msgstr ""
 "Se isto ficar desativado, o Dolphin usa NTSC-U e ativa esta opção "
 "automaticamente quando você jogar jogos japoneses."
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:74
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:62
 msgid ""
 "Format as ascii (NTSC\\PAL)?\n"
 "Choose no for sjis (NTSC-J)"
@@ -2579,148 +2639,147 @@ msgstr ""
 "Formatar como ascii (NTSC\\PAL)?\n"
 "Escolha não para sjis (NTSC-J)"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:278
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:265
 msgid "Forward"
 msgstr "Para frente"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504
 #, c-format
 msgid "Found %d results for '"
 msgstr "%d resultados encontrados para '"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:857
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:925
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:858
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:926
 msgid "Frame"
 msgstr "Quadro"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:867
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:868
 msgid "Frame "
 msgstr "Quadro"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:185
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:173
 msgid "Frame Advance"
 msgstr "Avançar Quadro"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:536
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549
 msgid "Frame Dumps use FFV1"
 msgstr "Extração de Quadros usam FFV1"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:227
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:214
 msgid "Frame Info"
 msgstr "Informação do Frame"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:116
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:103
 msgid "Frame Range"
 msgstr "Alcanço do Quadro"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:138
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:139
 msgid "Frame S&kipping"
 msgstr "Frame S&kipping"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:572
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552
 msgid "Framelimit:"
 msgstr "Limitador de FPS:"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:204
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:191
 msgid "Frames To Record"
 msgstr "QUadros para Capturar"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547
 msgid "Free Look"
 msgstr "Olhar Livre"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
 msgid "French"
 msgstr "Francês"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:38
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:42
 msgid "Frets"
 msgstr "Notas"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:118
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:137
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:105
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:124
 msgid "From"
 msgstr "De"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:426
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:432
 msgid "FullScr"
 msgstr "Tela Cheia"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:256
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263
 msgid "Fullscreen resolution:"
 msgstr "Resolução da Tela Cheia:"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:534
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524
 msgid "GCI File(*.gci)"
 msgstr "Arquivo GCI(*.gci)"
 
-#: Source/Core/DolphinWX/Src/GCMicDlg.h:44
+#: Source/Core/DolphinWX/Src/GCMicDlg.h:31
 msgid "GCMic Configuration"
 msgstr "Configuração do GCMic"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:432
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
 msgid "GCPad"
 msgstr "GCPad"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:659
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:658
 msgid "GX_CMD_INVL_VC"
 msgstr "GX_CMD_INVL_VC"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:448
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:452
 msgid "Game ID:"
 msgstr "ID do jogo:"
 
-#: Source/Core/Core/Src/NetPlay.cpp:229
+#: Source/Core/Core/Src/NetPlay.cpp:216
 msgid "Game is already running!"
 msgstr "O jogo já está rodando!"
 
-#: Source/Core/Core/Src/NetPlay.cpp:259
+#: Source/Core/Core/Src/NetPlay.cpp:246
 msgid "Game isn't running!"
 msgstr "O jogo não está rodando!"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:389
-#, fuzzy
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:393
 msgid "Game not found!"
-msgstr "Jogo não encontrado!!"
+msgstr "Jogo não encontrado!"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:385
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:389
 msgid "Game-Specific Settings"
 msgstr "Opções especificas do jogo"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:293
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:294
 msgid "GameConfig"
 msgstr "Opçõesdojogo"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:525
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:515
 msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)"
 msgstr "Arquivos de Save do GameCube (*.gci;*.gcs;*.sav)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534
 msgid "Gamecube"
 msgstr "Gamecube"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:178
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:181
 msgid "Gamecube &Pad Settings"
 msgstr "Configurações de &Controle de Gamecube"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:218
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1069
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:205
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1052
 msgid "Gamecube Memory Cards (*.raw,*.gcp)"
 msgstr "Memory Cards do Gamecube (*.raw,*.gcp)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:432
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
 msgid "Gamecube Pad settings"
 msgstr "Configurações do controle de Gamecube"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:117
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302
 msgid "Gecko Codes"
 msgstr "Códigos Gecko"
 
-#: Source/Core/Core/Src/GeckoCode.cpp:222
+#: Source/Core/Core/Src/GeckoCode.cpp:214
 #, c-format
 msgid ""
 "GeckoCode failed to run (CT%i CST%i) (%s)\n"
@@ -2733,10 +2792,10 @@ 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:172
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:172
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:197
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:160
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:160
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:202
 msgid "General"
 msgstr "Geral"
 
@@ -2744,30 +2803,30 @@ msgstr "Geral"
 msgid "General Settings"
 msgstr "Configurações Gerais"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:470
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:281
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:316
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:261
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
 msgid "German"
 msgstr "Alemão"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:449
+#: Source/Core/Core/Src/ActionReplay.cpp:439
 #, 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:430
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:436
 msgid "Graphics"
 msgstr "Gráficos"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:430
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:436
 msgid "Graphics settings"
 msgstr "Configurações Gráficas"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:205
 msgid "Greater Than"
 msgstr "Maior do que"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87
 msgid ""
 "Greatly increases quality of textures generated using render to texture "
 "effects.\n"
@@ -2785,51 +2844,75 @@ msgstr ""
 "\n"
 "Se estiver em dúvida, deixe isto ativado."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:317
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
 msgid "Greek"
 msgstr "Grego"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:22
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Green"
 msgstr "Verde"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:24
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Green Left"
 msgstr "Verde Esquerdo"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:25
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Green Right"
 msgstr "Verde Direito"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:35
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:39
 msgid "Guitar"
 msgstr "Guitarra"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1259
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1250
 msgid "HCI_CMD_INQUIRY is called, please report!"
 msgstr "HCI_CMD_INQUIRY foi chamado, favor reportar!"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:421
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504
+msgid "Hacked Buffer Upload"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431
 msgid "Hacks"
 msgstr "Hacks"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:158
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:146
 msgid "Header checksum failed"
 msgstr "A checagem do header falhou"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:318
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298
 msgid "Hebrew"
 msgstr "Hebreu"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:313
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:300
 msgid "Height"
 msgstr "Altura"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:64
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:51
 msgid "Help"
 msgstr "Ajuda"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:209
+#: Source/Core/DolphinWX/Src/Main.cpp:229
+msgid ""
+"Hi,\n"
+"\n"
+"Dolphin requires Mac OS X 10.7 or greater.\n"
+"Unfortunately you're running an old version of OS X.\n"
+"The last Dolphin version to support OS X 10.6 is Dolphin 3.5\n"
+"Please upgrade to 10.7 or greater to use the newest Dolphin version.\n"
+"\n"
+"Sayonara!\n"
+msgstr ""
+"Olá,\n"
+"\n"
+"Dolphin requer Mac OS X 10.7 ou superior para funcionar.\n"
+"Infelizmente você está executando uma versão antiga do OS X.\n"
+"A última versão do Dolphin que suporta OS X 10.6 é o Dolphin 3.5\n"
+"Atualize para 10.7 ou superior para usar as novas versões do Dolphin.\n"
+"\n"
+"Até mais!\n"
+
+#: Source/Core/DolphinWX/Src/Main.cpp:220
 msgid ""
 "Hi,\n"
 "\n"
@@ -2846,15 +2929,15 @@ msgstr ""
 "\n"
 "Sayonara!\n"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:309
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:296
 msgid "Hide"
 msgstr "Ocultar"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:307
 msgid "Hide Mouse Cursor"
 msgstr "Esconder Cursor Do Mouse"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79
 msgid ""
 "Hides the mouse cursor if it's on top of the emulation window.\n"
 "\n"
@@ -2864,26 +2947,26 @@ msgstr ""
 "\n"
 "Se estiver em dúvida, deixe isto ativado."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:54
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41
 msgid "Home"
 msgstr "Home"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:85
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:138
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:76
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:141
 msgid "Host"
 msgstr "Host"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.h:44
+#: Source/Core/DolphinWX/Src/HotkeyDlg.h:31
 msgid "Hotkey Configuration"
 msgstr "Configuração de hotkey"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:272
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:272
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:594
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:260
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:260
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574
 msgid "Hotkeys"
 msgstr "Hotkeys"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:319
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299
 msgid "Hungarian"
 msgstr "Húngaro"
 
@@ -2891,34 +2974,30 @@ msgstr "Húngaro"
 msgid "Hybrid Wiimote"
 msgstr "Wiimote Hibrido"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:532
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:519
 #, 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:786
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:773
 #, c-format
 msgid ""
-"IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available "
-"in your nand dump\n"
+"IOCTL_ES_LAUNCH: Game tried to reload an IOS or a title that is not "
+"available in your NAND dump\n"
 "TitleID %016llx.\n"
-" Dolphin will likely hang now"
+" Dolphin will likely hang now."
 msgstr ""
-"IOCTL_ES_LAUNCH: O jogo tentou recarregar a ios ou um título que não está "
-"disponível no dump do seu NAND\n"
-"TitleID %016llx.\n"
-" O Dolphin vai provavelmente travar agora"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:313
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:300
 msgid "IOCTL_ES_READCONTENT - bad destination"
 msgstr "IOCTL_ES_READCONTENT - Destino ruim"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729
 msgid "IPL Settings"
 msgstr "Definições de IPL"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269
 msgid "IR"
 msgstr "IR"
 
@@ -2930,23 +3009,23 @@ msgstr "Ponteiro IR"
 msgid "IR Sensitivity:"
 msgstr "Sensibilidade IR:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:502
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:512
 msgid "ISO Details"
 msgstr "Detalhes da ISO"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:830
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:811
 msgid "ISO Directories"
 msgstr "Diretórios de ISO"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:172
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:166
 msgid "ITALY"
 msgstr "ITÁLIA"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:630
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:624
 msgid "Icon"
 msgstr "Icone"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332
 msgid ""
 "If checked, the bounding box registers will be updated. Used by the Paper "
 "Mario games."
@@ -2954,29 +3033,11 @@ 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:318
-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:505
-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 ""
-"Se você colocar o Limitador de FPS em um valor maior que a velocidade máxima "
-"do jogo (NTSC:60, PAL:50). Use Áudio para acelerar através do DSP (deve "
-"consertar cortes no áudio mas pode causar ruído constante dependendo do "
-"jogo)."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:428
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438
 msgid "Ignore Format Changes"
 msgstr "Ignorar Mudanças de Formato"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94
 msgid ""
 "Ignore any changes to the EFB format.\n"
 "Improves performance in many games without any negative effect. Causes "
@@ -2990,7 +3051,7 @@ msgstr ""
 "\n"
 "Se estiver em dúvida, deixe isto ativado."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93
 msgid ""
 "Ignore any requests of the CPU to read from or write to the EFB.\n"
 "Improves performance in some games, but might disable some gameplay-related "
@@ -3008,11 +3069,11 @@ msgstr ""
 msgid "Import Save"
 msgstr "Importar Save"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:59
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:48
 msgid "Import failed, try again?"
 msgstr "Falha na Importação, tentar novamente?"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:454
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:441
 msgid ""
 "Imported file has gsc extension\n"
 "but does not have a correct header"
@@ -3020,11 +3081,11 @@ msgstr ""
 "O arquivo importado tem a extensão gsc\n"
 "mas não tem um header correto"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:442
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:429
 msgid "Imported file has invalid length"
 msgstr "O arquivo importado tem comprimento inválido"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:451
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:438
 msgid ""
 "Imported file has sav extension\n"
 "but does not have a correct header"
@@ -3032,19 +3093,7 @@ msgstr ""
 "O arquivo importado tem a extensão sav\n"
 "mas não tem um header correto"
 
-#: 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 ""
-"Aumenta a performance mas causa problemas em jogos que dependem da emulação "
-"apropriada da névoa.\n"
-"\n"
-"Se estiver em dúvida, deixe esta opção desativada."
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350
 msgid "In Game"
 msgstr "Funciona"
 
@@ -3052,67 +3101,67 @@ msgstr "Funciona"
 msgid "In-Game"
 msgstr "In-Game"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:34
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305
 msgid "Info"
 msgstr "Info"
 
-#: Source/Core/Common/Src/MsgHandler.cpp:65
+#: Source/Core/Common/Src/MsgHandler.cpp:51
 msgid "Information"
 msgstr "Informação"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:481
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:468
 msgid "Input"
 msgstr "Entrada"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:63
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:50
 msgid "Insert"
 msgstr "Inserir"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:176
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:166
 msgid "Insert Encrypted or Decrypted code here..."
 msgstr "Inserir Código Encryptado ou Decriptado aqui..."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:763
 msgid "Insert SD Card"
 msgstr "Insira cartão SD"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:34
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:21
 msgid "Insert name here.."
 msgstr "Insira nome aqui.."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:196
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:199
 msgid "Install WAD"
 msgstr "Instalar WAD"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:895
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:888
 msgid "Install to Wii Menu"
 msgstr "Instalar para o menu do WII"
 
-#: Source/Core/Core/Src/x64MemTools.cpp:252
+#: Source/Core/Core/Src/x64MemTools.cpp:242
 msgid ""
 "InstallExceptionHandler called, but this platform does not yet support it."
 msgstr ""
 "InstallExceptionHandler foi chamado, mas esta plataforma ainda não tem "
 "suporte a ele."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1297
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
 msgid "Installing WAD..."
 msgstr "Instalando WAD..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:885
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:901
 msgid "Integrity Check Error"
 msgstr "Erro na Checagem de Integridade"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:891
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:907
 msgid "Integrity check completed"
 msgstr "Checagem de Integridade completa"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:890
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:906
 msgid "Integrity check completed. No errors have been found."
 msgstr "Checagem de Integridade completa. Nenhum erro foi encontrado."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:882
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:898
 #, c-format
 msgid ""
 "Integrity check for partition %d failed. Your dump is most likely corrupted "
@@ -3121,19 +3170,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:552
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532
 msgid "Interface"
 msgstr "Interface"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:646
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627
 msgid "Interface Settings"
 msgstr "Opções de interface"
 
-#: Source/Core/Core/Src/State.cpp:240
+#: Source/Core/Core/Src/State.cpp:228
 msgid "Internal LZO Error - compression failed"
 msgstr "Erro Interno do LZO - A compressão falhou"
 
-#: Source/Core/Core/Src/State.cpp:348
+#: Source/Core/Core/Src/State.cpp:336
 #, c-format
 msgid ""
 "Internal LZO Error - decompression failed (%d) (%li, %li) \n"
@@ -3142,41 +3191,45 @@ msgstr ""
 "Erro Interno do LZO - a descompressão falhou (%d) (%li, %li) \n"
 "Tente recarregar o Estado Salvo"
 
-#: Source/Core/Core/Src/State.cpp:485
+#: Source/Core/Core/Src/State.cpp:473
 msgid "Internal LZO Error - lzo_init() failed"
 msgstr "Erro Interno do LZO - lzo_init() falhou"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:344
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:352
 msgid "Internal Resolution:"
 msgstr "Resolução Interna:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:42
+msgid "Interpreter (VERY slow)"
+msgstr "Interpretador (MUITO lento)"
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349
 msgid "Intro"
 msgstr "Intro"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:194
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:187
 #, c-format
 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:600
 msgid "Invalid Value!"
 msgstr "Valor Inválido!"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:462
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:449
 msgid "Invalid bat.map or dir entry"
 msgstr "Bat.map ou entrada de Diretório inválidas"
 
-#: Source/Core/Core/Src/CoreTiming.cpp:548
+#: Source/Core/Core/Src/CoreTiming.cpp:553
 #, c-format
 msgid "Invalid event type %i"
 msgstr "Tipo de evento %i inválido"
 
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:326
+#: Source/Core/Core/Src/HW/DVDInterface.cpp:309
 msgid "Invalid file"
 msgstr "Arquivo inválido"
 
-#: Source/Core/DiscIO/Src/BannerLoaderGC.cpp:41
+#: Source/Core/DiscIO/Src/BannerLoaderGC.cpp:28
 #, c-format
 msgid ""
 "Invalid opening.bnr found in gcm:\n"
@@ -3187,48 +3240,56 @@ msgstr ""
 "%s\n"
 "Você pode precisar refazer o dump deste jogo."
 
-#: Source/Core/Core/Src/Movie.cpp:735
+#: Source/Core/Core/Src/Movie.cpp:726
 msgid "Invalid recording file"
 msgstr "Arquivo de gravação inválido"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:473
+#: 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:456
+#: 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:444
+#: 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:513
+#: Source/Core/Core/Src/Core.cpp:511
 msgid "Invalid state"
 msgstr "Estado Salvo Inválido"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:473
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:320
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300
 msgid "Italian"
 msgstr "Italiano"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:183
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:177
 msgid "JAPAN"
 msgstr "JAPÃO"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:321
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:46
+msgid "JIT Recompiler (recommended)"
+msgstr "Recompilador JIT (Recomendado)"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:47
+msgid "JITIL experimental recompiler"
+msgstr "Recompilador experimental JITIL"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:279
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
 msgid "Japanese"
 msgstr "Japonês"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:188
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:182
 msgid "KOREA"
 msgstr "CORÉIA"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78
 msgid ""
 "Keep the game window on top of all other windows.\n"
 "\n"
@@ -3238,62 +3299,62 @@ msgstr ""
 "\n"
 "Se estiver em dúvida, deixe isto desativado."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:298
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:306
 msgid "Keep window on top"
 msgstr "Manter Janela no Topo"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:241
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:241
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:229
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:229
 msgid "Key"
 msgstr "Chave"
 
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282
 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:322
 msgid "Korean"
 msgstr "Coreano"
 
 #. i18n:  Left
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:57
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:44
 msgid "L"
 msgstr "L"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:39
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:26
 msgid "L Button"
 msgstr "Botão L"
 
 #. i18n:  Left-Analog
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:61
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:48
 msgid "L-Analog"
 msgstr "L-Analógico"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:585
 msgid "Language:"
 msgstr "Linguagem:"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:152
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:153
 msgid "Last Overwritten State"
 msgstr "Último State sobrescrito"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:159
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:161
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:160
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:162
 msgid "Last Saved State"
 msgstr "Último State Salvo"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:696
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:677
 msgid "Latency:"
 msgstr "Latência:"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:276
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:55
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:263
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:42
 msgid "Left"
 msgstr "Esquerda"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:60
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:64
 msgid "Left Stick"
 msgstr "Analógico Esquerdo"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:257
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:257
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:245
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:245
 msgid ""
 "Left click to detect hotkeys.\n"
 "Enter space to clear."
@@ -3301,7 +3362,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:689
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:678
 msgid ""
 "Left-click to detect input.\n"
 "Middle-click to clear.\n"
@@ -3311,7 +3372,7 @@ msgstr ""
 "Clique do meio para limpar.\n"
 "Clique direito para mais opções."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:694
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:683
 msgid ""
 "Left/Right-click for more options.\n"
 "Middle-click to clear."
@@ -3319,76 +3380,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:206
 msgid "Less Than"
 msgstr "Menor que"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:565
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545
 msgid "Limit by FPS"
 msgstr "Limitar por FPS"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:924
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:915
 msgid "Load"
 msgstr "Carregar"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544
 msgid "Load Custom Textures"
 msgstr "Carregar Texturas Personalizadas"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
 msgid "Load State Slot 1"
 msgstr "Carregar Estado do Slot 1"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189
 msgid "Load State Slot 2"
 msgstr "Carregar Estado do Slot 2"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:190
 msgid "Load State Slot 3"
 msgstr "Carregar Estado do Slot 3"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:203
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:191
 msgid "Load State Slot 4"
 msgstr "Carregar Estado do Slot 4"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192
 msgid "Load State Slot 5"
 msgstr "Carregar Estado do Slot 5"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193
 msgid "Load State Slot 6"
 msgstr "Carregar Estado do Slot 6"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:194
 msgid "Load State Slot 7"
 msgstr "Carregar Estado do Slot 7"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:195
 msgid "Load State Slot 8"
 msgstr "Carregar Estado do Slot 8"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:155
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:156
 msgid "Load State..."
 msgstr "Carregar State..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1332
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1359
 msgid "Load Wii System Menu"
 msgstr "Carregar Menu de Sistema do Wii"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1327
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1354
 #, c-format
 msgid "Load Wii System Menu %d%c"
 msgstr "Carregar Menu de Sistema do Wii %d %c"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112
 msgid ""
 "Load custom textures from User/Load/Textures/<game_id>/\n"
 "\n"
@@ -3399,7 +3460,7 @@ msgstr ""
 "\n"
 "Se estiver em dúvida, deixe isto desativado."
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:50
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:37
 msgid "Load preset values from hack patterns available."
 msgstr "Carregar valores predefinidos dos padrões de hacks disponíveis."
 
@@ -3407,23 +3468,23 @@ msgstr "Carregar valores predefinidos dos padrões de hacks disponíveis."
 msgid "Local"
 msgstr "Local"
 
-#: Source/Core/DolphinWX/Src/LogWindow.h:51
+#: Source/Core/DolphinWX/Src/LogWindow.h:38
 msgid "Log"
 msgstr "Log"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:26
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:13
 msgid "Log Configuration"
 msgstr "Configuração do Log"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:296
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304
 msgid "Log FPS to file"
 msgstr "Registrar FPS em arquivo"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:96
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83
 msgid "Log Types"
 msgstr "Tipo de Log"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103
 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"
@@ -3435,24 +3496,24 @@ msgstr ""
 "\n"
 "Se estiver em dúvida, deixe isto desativado."
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:81
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:68
 msgid "Logger Outputs"
 msgstr "Resposta do Logger"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132
-#: Source/Core/DolphinWX/Src/Frame.cpp:328
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:119
+#: Source/Core/DolphinWX/Src/Frame.cpp:314
 msgid "Logging"
 msgstr "Logando"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:255
+#: Source/Core/Core/Src/NetPlayClient.cpp:259
 msgid "Lost connection to server!"
 msgstr "A conexão com o servidor foi perdida!"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:42
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:29
 msgid "M Button"
 msgstr "Butão M"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:119
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:112
 #, c-format
 msgid ""
 "MD5 mismatch\n"
@@ -3461,51 +3522,66 @@ msgstr ""
 "Incompatibilidade do MD5\n"
 " %016llx%016llx != %016llx%016llx"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314
 msgid "MMU Speed Hack"
 msgstr "Hack de velocidade MMU"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:527
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:563
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:517
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:556
 msgid "MadCatz Gameshark files(*.gcs)"
 msgstr "Arquivos de Gameshark MadCatz(*.gcs)"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:51
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:63
+#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:38
 msgid "Main Stick"
 msgstr "Analógico Principal"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460
 msgid "Maker ID:"
 msgstr "ID da fabricante:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487
 msgid "Maker:"
 msgstr "Fabricante:"
 
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100
+msgid ""
+"Makes distant objects more visible by removing fog, thus increasing the "
+"overall detail.\n"
+"Disabling fog will break some games which rely on proper fog emulation.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+"Faz os objetos distantes ficarem mais visíveis por remover a névoa, "
+"aumentando assim os detalhes gerais.\n"
+"Desativar a névoa pode atrapalhar a emulação de jogos que dependem de névoa "
+"adequada.\n"
+"\n"
+"Se estiver em dúvida, deixe essa opção desligada."
+
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:97
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:100
 msgid "Max"
 msgstr "Máximo"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:448
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:435
 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:291
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:278
 msgid "Memcard already opened"
 msgstr "O Memory Card já está aberto"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:912
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:913
 msgid "Memory Byte"
 msgstr "Byte de Memória"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:225
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:113
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:212
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:93
 msgid "Memory Card"
 msgstr "Cartão de memoria"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.h:36
+#: Source/Core/DolphinWX/Src/MemcardManager.h:23
 msgid ""
 "Memory Card Manager WARNING-Make backups before using, should be fixed but "
 "could mangle stuff!"
@@ -3513,7 +3589,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:371
+#: Source/Core/Core/Src/CoreParameter.cpp:360
 #, c-format
 msgid ""
 "Memory Card filename in Slot %c is incorrect\n"
@@ -3530,15 +3606,15 @@ msgstr ""
 "%s\n"
 "Você gostaria de copiar o arquivo antigo para o novo local?\n"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:124
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:112
 msgid "Memorycard filesize does not match the header size"
 msgstr "O tamanho do arquivo do Memory Card é diferente do tamanho do header"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:50
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:37
 msgid "Menu"
 msgstr "Menu"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:114
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:94
 msgid "Mic"
 msgstr "Microfone"
 
@@ -3547,20 +3623,20 @@ msgstr "Microfone"
 msgid "Min"
 msgstr "Mínimo"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:580
 msgid "Misc"
 msgstr "Diversas"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:795
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776
 msgid "Misc Settings"
 msgstr "Opções diversas"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:240
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:294
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:227
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:281
 msgid "Modifier"
 msgstr "Modificador"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106
 msgid ""
 "Modify textures to show the format they're encoded in. Needs an emulation "
 "reset in most cases.\n"
@@ -3573,20 +3649,20 @@ msgstr ""
 "\n"
 "Se estiver em dúvida, deixe isto desativado."
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:115
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:108
 msgid "Monospaced font"
 msgstr "Fonte Monospaced"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:305
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:292
 msgid "Motion Plus"
 msgstr "Motion Plus"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:309
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:86
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:296
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73
 msgid "Motor"
 msgstr "Motor"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:654
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:666
 msgid ""
 "Move the mouse pointer over an option to display a detailed description.\n"
 "\n"
@@ -3604,224 +3680,236 @@ msgstr ""
 "\n"
 "\n"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:75
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:62
 msgid "Multiply"
 msgstr "Multiplicar"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:651
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:650
 msgid "NOP"
 msgstr "NOP"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:629
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:628
 msgid "NOTE: Stream size doesn't match actual data length\n"
 msgstr "NOTA: O tamanho do stream não corresponde ao comprimento dos dados\n"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:129
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:116
 msgid "NP Add"
 msgstr "NP Adicionar"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:124
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:111
 msgid "NP Begin"
 msgstr "NP Começar"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:132
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:119
 msgid "NP Decimal"
 msgstr "NP Decimal"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:126
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:113
 msgid "NP Delete"
 msgstr "NP Deletar"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:133
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:120
 msgid "NP Divide"
 msgstr "NP Dividir"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:120
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:107
 msgid "NP Down"
 msgstr "NP Baixar"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:123
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:110
 msgid "NP End"
 msgstr "NP Fim"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:111
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:98
 msgid "NP Enter"
 msgstr "NP Enter"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:127
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:114
 msgid "NP Equal"
 msgstr "NP Igual"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:116
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:103
 msgid "NP Home"
 msgstr "NP Home"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:125
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:112
 msgid "NP Insert"
 msgstr "NP Inserir"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:117
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:104
 msgid "NP Left"
 msgstr "NP Esquerda"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:128
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:115
 msgid "NP Multiply"
 msgstr "NP Multiplicar"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:122
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:109
 msgid "NP Page Down"
 msgstr "NP Descer Página"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:121
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:108
 msgid "NP Page Up"
 msgstr "NP Subir Página"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:119
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:106
 msgid "NP Right"
 msgstr "NP Direita"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:130
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:117
 msgid "NP Separator"
 msgstr "NP Separador"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:109
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:96
 msgid "NP Space"
 msgstr "NP Espaço"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:131
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:118
 msgid "NP Subtract"
 msgstr "NP Subtrair"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:110
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:97
 msgid "NP Tab"
 msgstr "NP Tab"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:118
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:105
 msgid "NP Up"
 msgstr "NP Cima"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:444
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:59
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:50
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:448
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:46
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:37
 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:25
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:72
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:282
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:553
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:15
 msgid "Name: "
 msgstr "Nome:"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:526
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:562
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:516
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:555
 msgid "Native GCI files(*.gci)"
 msgstr "Arquivos GCI nativos(*.gci)"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:161
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:148
 msgid "New Scan"
 msgstr "Nova Busca"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:206
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:193
 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:801
 msgid "Next Page"
 msgstr "Próxima Página"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:165
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:152
 msgid "Next Scan"
 msgstr "Próxima Busca"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:68
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:59
 msgid "Nickname :"
 msgstr "Nick:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:196
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:190
 msgid "No Country (SDK)"
 msgstr "Sem região (SDK)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:370
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:357
 msgid "No ISOs or WADS found"
 msgstr "Sem ISOs ou WADs achados"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:508
+#: Source/Core/Core/Src/ConfigManager.h:17
+msgid "No audio output"
+msgstr "Nenhuma saída de áudio"
+
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:501
 #, c-format
 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:761
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:768
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:760
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:767
 msgid "No description available"
 msgstr "Descrição indisponível"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:514
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:535
 msgid "No docking"
 msgstr "Sem colocação"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:859
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:860
 msgid "No file loaded"
 msgstr "Nenhum arquivo carregado"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:439
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:426
 msgid "No free dir index entries"
 msgstr "Não há entradas de índice de diretório livres"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:895
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:896
 msgid "No recorded file"
 msgstr "Nenhum arquivo gravado"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:501
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:494
 #, c-format
 msgid "No save folder found for title %s"
 msgstr "Nenhuma pasta de salva encontrada para o título %s"
 
+#: Source/Plugins/Plugin_VideoOGL/Src/main.cpp:132
+#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:111
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:23
 #: Source/Core/DolphinWX/Src/NetWindow.cpp:600
 msgid "None"
 msgstr "Nenhum"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:323
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303
 msgid "Norwegian Bokmaal"
 msgstr "Norueguês Bokmaal"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:203
 msgid "Not Equal"
 msgstr "Não igual"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:804
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:794
 msgid "Not Set"
 msgstr "Indefinido"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:626
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:101
+#, c-format
+msgid "Not a Wii save or read failure for file header size %x"
+msgstr ""
+"Nenhum arquivo salvo do Wii save ou falha ao ler o header de tamanho %x"
+
+#: Source/Core/DolphinWX/Src/Main.cpp:654
 msgid "Not connected"
 msgstr "Não conectado"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:309
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:296
 msgid "Notes"
 msgstr "Notas"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:16
 msgid "Notes: "
 msgstr "Notas:"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:71
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:74
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:580
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:621
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:629
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:59
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:64
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:613
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:659
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:667
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:31
 msgid "Notice"
 msgstr "Noticía"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:105
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:92
 msgid "Num Lock"
 msgstr "Num Lock"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:88
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:75
 msgid "Number Of Codes: "
 msgstr "Números dos códigos:"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:30
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:34
 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26
 msgid "Nunchuk"
 msgstr "Nunchuk"
@@ -3830,96 +3918,97 @@ msgstr "Nunchuk"
 msgid "Nunchuk Acceleration"
 msgstr "Aceleração do Nunchuk"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:877
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:878
 msgid "Object"
 msgstr "Objeto"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:135
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:122
 msgid "Object Range"
 msgstr "Alcance do Objeto"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:243
 msgid "Off"
 msgstr "Desligado"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:62
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:49
 msgid "Offset:"
 msgstr "Offset:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:582
 msgid "On-Screen Display Messages"
 msgstr "Mostrar Mensagens na Tela"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:436
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:423
 #, c-format
 msgid "Only %d blocks available"
 msgstr "Apenas %d blocos disponíveis"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:420
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:178
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:426
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:166
 msgid "Open"
 msgstr "Abrir"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:876
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:867
 msgid "Open &containing folder"
 msgstr "Abrir &conteúdo da pasta"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:873
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:864
 msgid "Open Wii &save folder"
 msgstr "Abrir pasta do &save do WII"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:420
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:426
 msgid "Open file..."
 msgstr "Abrir Arquivo..."
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:61
+#: Source/Core/AudioCommon/Src/OpenALStream.cpp:48
 #, 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:72
+#: Source/Core/AudioCommon/Src/OpenALStream.cpp:59
 msgid "OpenAL: can't find sound devices"
 msgstr "OpenAL: Não foi possível encontrar dispositivos de som"
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:66
+#: Source/Core/AudioCommon/Src/OpenALStream.cpp:53
 #, 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:493
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502
 msgid "OpenCL Texture Decoder"
 msgstr "Decodificador de Texturas OpenCL"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503
 msgid "OpenMP Texture Decoder"
 msgstr "Decodificador de Texturas OpenMP"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:317
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:94
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:304
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:81
 msgid "Options"
 msgstr "Opções"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:22
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Orange"
 msgstr "Laranja"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:468
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:455
+#, fuzzy
 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"
+"and import the saves to a new memcard\n"
 msgstr ""
 "A ordem dos arquivos no Diretório de Arquivos não bate\n"
 "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:316
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:324
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:509
 msgid "Other"
 msgstr "Outros"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:206
+#: Source/Core/Core/Src/NetPlayClient.cpp:210
 msgid ""
 "Other client disconnected while game is running!! NetPlay is disabled. You "
 "manually stop the game."
@@ -3927,15 +4016,15 @@ msgstr ""
 "Outro Client desconectou enquanto o jogo rodava!! O Netplay foi "
 "desabilitado. Você deve parar o jogo manualmente."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:481
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:468
 msgid "Output"
 msgstr "Saída"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:342
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:348
 msgid "P&lay Recording..."
 msgstr "R&eproduzir gravação..."
 
-#: Source/Core/Core/Src/HW/GCPad.cpp:30
+#: Source/Core/Core/Src/HW/GCPad.cpp:18
 msgid "Pad"
 msgstr "Controle"
 
@@ -3943,160 +4032,160 @@ msgstr "Controle"
 msgid "Pad "
 msgstr "Controle"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:34
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:38
 msgid "Pads"
 msgstr "Controles"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:108
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:95
 msgid "Page Down"
 msgstr "Page Down"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:107
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:94
 msgid "Page Up"
 msgstr "Page Up"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:35
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:22
 msgid "Paragraph"
 msgstr "Parágrafo"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:64
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:51
 msgid "Parameters"
 msgstr "Parâmetros"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:222
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:217
 #, c-format
 msgid "Partition %i"
 msgstr "Partição %i"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:296
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:297
 msgid "Patches"
 msgstr "Patches"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:556
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536
 msgid "Paths"
 msgstr "Diretórios"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1538
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1539
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:51
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1565
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1566
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:38
 msgid "Pause"
 msgstr "Pausar"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:128
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:129
 msgid "Pause at end of movie"
 msgstr "Pausar no fim do vídeo"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:397
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405
 msgid "Per-Pixel Lighting"
 msgstr "Iluminação Por Pixels"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352
 msgid "Perfect"
 msgstr "Perfeito"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:609
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:642
 #, c-format
 msgid "Perspective %d"
 msgstr "Perspectiva %d"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:165
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:424
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1547
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1548
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:152
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:430
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1574
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1575
 msgid "Play"
 msgstr "Executar"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176
 msgid "Play Recording"
 msgstr "Reproduzir Gravação"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:170
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:170
 msgid "Play/Pause"
 msgstr "Executar/Pausar"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351
 msgid "Playable"
 msgstr "Jogável"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:154
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:141
 msgid "Playback Options"
 msgstr "Opções de Reprodução"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:301
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:304
 msgid "Players"
 msgstr "Jogadores"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:988
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:991
 msgid "Please confirm..."
 msgstr "Favor confirmar..."
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:579
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:612
 msgid "Please create a perspective before saving"
 msgstr "Favor criar uma perspectiva antes de salvar"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:36
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:23
 msgid "Plus-Minus"
 msgstr "Positivo-Negativo"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:324
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304
 msgid "Polish"
 msgstr "Polonês"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:713
 msgid "Port 1"
 msgstr "Porta 1"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714
 msgid "Port 2"
 msgstr "Porta 2"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:734
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715
 msgid "Port 3"
 msgstr "Porta 3"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716
 msgid "Port 4"
 msgstr "Porta 4"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:97
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:130
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:88
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:133
 msgid "Port :"
 msgstr "Porta:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:325
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305
 msgid "Portuguese"
 msgstr "Português"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:326
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306
 msgid "Portuguese (Brazilian)"
 msgstr "Português (Brasil)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:391
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:399
 msgid "Post-Processing Effect:"
 msgstr "Efeito Pós-Processamento"
 
-#: Source/Core/Core/Src/Movie.cpp:936
+#: Source/Core/Core/Src/Movie.cpp:927
 #, 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:1055
+#: Source/Core/Core/Src/Movie.cpp:1046
 #, 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:1032
+#: Source/Core/Core/Src/Movie.cpp:1023
 #, c-format
 msgid "Premature movie end in PlayWiimote. %u > %u"
 msgstr "Fim prematuro do vídeo no PlayWiimote. %u > %u"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:48
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:35
 msgid "Presets: "
 msgstr "Predefinidos:"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:205
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:192
 msgid "Prev Page"
 msgstr "Pág. Anterior"
 
@@ -4104,67 +4193,67 @@ msgstr "Pág. Anterior"
 msgid "Previous Page"
 msgstr "Página Anterior"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:183
 msgid "Previous Value"
 msgstr "Valor anterior"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:60
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:47
 msgid "Print"
 msgstr "Imprimir"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:894
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:885
 msgid "Profile"
 msgstr "Perfil"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.h:55
+#: Source/Core/DolphinWX/Src/ISOProperties.h:42
 msgid "Properties"
 msgstr "Propriedades"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:283
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:286
 msgid "Purge Cache"
 msgstr "Limpar o Cache"
 
-#: Source/Core/Common/Src/MsgHandler.cpp:66
+#: Source/Core/Common/Src/MsgHandler.cpp:52
 msgid "Question"
 msgstr "Questão"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:159
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:316
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:162
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:319
 msgid "Quit"
 msgstr "Sair"
 
 #. i18n:  Right
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:59
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:46
 msgid "R"
 msgstr "R"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:40
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:27
 msgid "R Button"
 msgstr "Botão R"
 
 #. i18n:  Right-Analog
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:63
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
 msgid "R-Analog"
 msgstr "R-Analógico"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:445
 msgid "RAM"
 msgstr "RAM"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:175
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:169
 msgid "RUSSIA"
 msgstr "Russia"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:528
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:515
 msgid "Range"
 msgstr "Alcance"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:190
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:178
 msgid "Read-only mode"
 msgstr "Modo Somente Leitura"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:487
 msgid "Real"
 msgstr "Real"
 
@@ -4180,33 +4269,33 @@ msgstr "Wiimotes Reais"
 msgid "Reconnect Wiimote on State Loading"
 msgstr "Reconectar Wiimote ao carregar Estado Salvo"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:193
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:217
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:791
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:180
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:204
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:790
 msgid "Record"
 msgstr "Gravar"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:174
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:161
 msgid "Recording Info"
 msgstr "Informações de Gravação"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:202
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:189
 msgid "Recording Options"
 msgstr "Opções de Gravação"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:21
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Red"
 msgstr "Vermelho"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:24
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Red Left"
 msgstr "Vermelho Esquerdo"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:25
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Red Right"
 msgstr "Vermelho Direito"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86
 msgid ""
 "Reduces the amount of aliasing caused by rasterizing 3D graphics.\n"
 "This makes the rendered picture look less blocky.\n"
@@ -4221,28 +4310,28 @@ msgstr ""
 "Se estiver em dúvida, deixe isto desativado."
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:60
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:421
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:903
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:427
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:894
 msgid "Refresh"
 msgstr "Atualizar"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:180
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:168
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:168
 msgid "Refresh List"
 msgstr "Atualizar Lista"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:421
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:427
 msgid "Refresh game list"
 msgstr "Atualizar a lista de jogos"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:405
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:427
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:77
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:812
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:409
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:431
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:64
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:793
 msgid "Remove"
 msgstr "Remover"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99
 msgid ""
 "Render the scene as a wireframe.\n"
 "\n"
@@ -4252,196 +4341,204 @@ msgstr ""
 "\n"
 "Se estiver em dúvida, deixe isto desativado."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:308
 msgid "Render to Main Window"
 msgstr "Renderizar na Janela Principal"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:915
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:172
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:906
 msgid "Reset"
 msgstr "Reiniciar"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:190
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:177
 msgid "Results"
 msgstr "Resultados"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:29
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:16
 msgid "Return"
 msgstr "Retornar"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:277
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:57
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464
+msgid "Revision:"
+msgstr ""
+
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:264
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:44
 msgid "Right"
 msgstr "Direita"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:61
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:65
 msgid "Right Stick"
 msgstr "Analógico Direito"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:85
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:295
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:72
 msgid "Rumble"
 msgstr "Vibração"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:518
-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:498
+msgid ""
+"Run DSP HLE and LLE on a dedicated thread (not recommended: might cause "
+"audio glitches with HLE and freezes with LLE)."
+msgstr ""
+"Executa DSP HLE e LLE em um thread dedicado (não recomendado: pode causar "
+"falhas no áudio com HLE e congelamentos com LLE)."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:327
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307
 msgid "Russian"
 msgstr "Russo"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:149
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:150
 msgid "Sa&ve State"
 msgstr "Sal&var Instante Atual"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:465
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475
 msgid "Safe"
 msgstr "Seguro"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:196
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:446
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:925
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:183
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:452
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916
 msgid "Save"
 msgstr "Salvar"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:532
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:522
 msgid "Save GCI as..."
 msgstr "Salvar GCI como..."
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
 msgid "Save State Slot 1"
 msgstr "Salvar Instante Atual no Slot 1"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:198
 msgid "Save State Slot 2"
 msgstr "Salvar Instante Atual no Slot 2"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:199
 msgid "Save State Slot 3"
 msgstr "Salvar Instante Atual no Slot 3"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:212
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:212
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200
 msgid "Save State Slot 4"
 msgstr "Salvar Instante Atual no Slot 4"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201
 msgid "Save State Slot 5"
 msgstr "Salvar Instante Atual no Slot 5"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202
 msgid "Save State Slot 6"
 msgstr "Salvar Instante Atual no Slot 6"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:203
 msgid "Save State Slot 7"
 msgstr "Salvar Instante Atual no Slot 7"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204
 msgid "Save State Slot 8"
 msgstr "Salvar Instante Atual no Slot 8"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:151
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:152
 msgid "Save State..."
 msgstr "Salvar Instante Atual..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:582
 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:592
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:602
 msgid "Save as..."
 msgstr "Salvar como..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1203
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1204
 msgid "Save compressed GCM/ISO"
 msgstr "Salvar GCM/ISO comprimido"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:446
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:452
 msgid "Save current perspective"
 msgstr "Salvar perspectiva atual"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1192
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193
 msgid "Save decompressed GCM/ISO"
 msgstr "Salvar GCM/ISO descomprimido"
 
-#: Source/Core/Core/Src/Movie.cpp:801
+#: Source/Core/Core/Src/Movie.cpp:792
 #, 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:396
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:404
 msgid "Scaled EFB Copy"
 msgstr "Cópia Escalada do EFB"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:556
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:543
 #, c-format
 msgid "Scanning %s"
 msgstr "Escaneando %s"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:539
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:526
 msgid "Scanning for ISOs"
 msgstr "Procurando por ISOs"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:540
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:527
 msgid "Scanning..."
 msgstr "Escaneando..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:427
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
 msgid "ScrShot"
 msgstr "ScrShot"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:106
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:93
 msgid "Scroll Lock"
 msgstr "Scroll Lock"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:264
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:251
 msgid "Search"
 msgstr "Busca"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:227
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:214
 msgid "Search Filter"
 msgstr "Filtro de Busca"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:810
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:791
 msgid "Search Subfolders"
 msgstr "Procurar em sub-pastas"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:250
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:237
 msgid "Search current Object"
 msgstr "Pesquisar Objeto atual"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:254
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:241
 msgid "Search for hex Value:"
 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
+#: Source/Core/Common/Src/SysConf.h:90 Source/Core/Common/Src/SysConf.h:113
+#: Source/Core/Common/Src/SysConf.h:133 Source/Core/Common/Src/SysConf.h:154
 #, c-format
 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:490
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:46
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:477
 msgid "Select"
 msgstr "Selecionar"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:677
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1072
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:683
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1087
 msgid "Select The Recording File"
 msgstr "Selecione o arquivo de Gravação"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1285
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1312
 msgid "Select a Wii WAD file to install"
 msgstr "Selecione um arquivo WAD de Wii para instalar"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:70
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74
 msgid ""
 "Select a hardware adapter to use.\n"
 "\n"
@@ -4450,31 +4547,31 @@ msgstr ""
 "Selecione um adaptador de hardware para ser usado.\n"
 "Se estiver em dúvida, use o primeiro."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:520
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:510
 msgid "Select a save file to import"
 msgstr "Selecione um arquivo de jogo salvo para importar"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:363
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:366
 msgid "Select floating windows"
 msgstr "Selecionar Janelas flutuantes"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:582
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:585
 msgid "Select the file to load"
 msgstr "Selecione um arquivo para carregar"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1241
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1268
 msgid "Select the save file"
 msgstr "Selecione o arquivo de salva"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1388
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1415
 msgid "Select the state to load"
 msgstr "Selecione um instante para carregar"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1429
 msgid "Select the state to save"
 msgstr "Selecione um instante para salvar"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82
 msgid ""
 "Select what aspect ratio to use when rendering:\n"
 "Auto: Use the native aspect ratio\n"
@@ -4492,15 +4589,15 @@ msgstr ""
 "\n"
 "Se estiver em dúvida, selecione Automático."
 
-#: Source/Core/InputCommon/Src/InputConfig.cpp:61
+#: Source/Core/InputCommon/Src/InputConfig.cpp:48
 msgid "Selected controller profile does not exist"
 msgstr "O perfil de controle especificado não existe"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:116
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:109
 msgid "Selected font"
 msgstr "Fonte Selecionada"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75
 msgid ""
 "Selects the display resolution used in fullscreen mode.\n"
 "This should always be bigger than or equal to the internal resolution. "
@@ -4516,23 +4613,39 @@ 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:69
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:70
 msgid ""
 "Selects what graphics API to use internally.\n"
 "Direct3D 9 usually is the fastest one. OpenGL is more accurate though. "
 "Direct3D 11 is somewhere between the two.\n"
 "Note that the Direct3D backends are only available on Windows.\n"
 "\n"
-"If unsure, use Direct3D 9."
+"If unsure, use Direct3D 11."
 msgstr ""
-"Seleciona qual API gráfico será usado internamente.\n"
-"Direct3D 9 é geralmente o mais rápido. O OpenGL tem menos erros, no entanto. "
-"O Direct3D 11 está entre os dois.\n"
-"Note que os Backends Direct3D só podem ser usados no Windows.\n"
+"Selecione qual API gráfica será usada internamente.\n"
+"Direct3D 9 geralmente é a mais rápida. No entanto, a OpenGL é a mais "
+"precisa. Direct3D 11 fica entre as outras duas.\n"
+"Lembre-se que os Direct3D backends só estão disponíveis no Windows.\n"
 "\n"
-"Se estiver em dúvida, use o Direct3D 9."
+"Se estiver em dúvida, use Direct3D 11."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:288
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72
+msgid ""
+"Selects what graphics API to use internally.\n"
+"Direct3D 9 usually is the fastest one. OpenGL is more accurate though. "
+"Direct3D 11 is somewhere between the two.\n"
+"Note that the Direct3D backends are only available on Windows.\n"
+"\n"
+"If unsure, use OpenGL."
+msgstr ""
+"Selecione qual API gráfica será usada internamente.\n"
+"Direct3D 9 geralmente é a mais rápida. No entanto, a OpenGL é a mais "
+"precisa. Direct3D 11 fica entre as outras duas.\n"
+"Lembre-se que os Direct3D backends só estão disponíveis no Windows.\n"
+"\n"
+"Se estiver em dúvida, use Direct3D 11."
+
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:291
 msgid "Send"
 msgstr "Enviar"
 
@@ -4540,26 +4653,26 @@ msgstr "Enviar"
 msgid "Sensor Bar Position:"
 msgstr "Posição da Sensor Bar:"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:77
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:64
 msgid "Separator"
 msgstr "Separador"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:328
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308
 msgid "Serbian"
 msgstr "Sérvio"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:522
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502
 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:488
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:475
 msgid "Set"
 msgstr "Definir"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:877
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:868
 msgid "Set as &default ISO"
 msgstr "Definir como ISO &padrão"
 
@@ -4568,13 +4681,13 @@ msgstr "Definir como ISO &padrão"
 msgid "Set as default Memcard %c"
 msgstr "Definir como Memory Card padrão%c"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:460
+#: Source/Core/Core/Src/ActionReplay.cpp:450
 #, 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/ConfigMain.cpp:535
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:515
 msgid ""
 "Sets the latency (in ms).  Higher values may reduce audio crackling. OpenAL "
 "backend only."
@@ -4582,123 +4695,123 @@ 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:338
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341
 msgid "Settings..."
 msgstr "Configurações..."
 
-#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:222
+#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:209
 msgid "SetupWiiMem: Cant find setting file"
 msgstr "SetupWiiMem: Arquivo de configuração não encontrado"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:291
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:278
 msgid "Shake"
 msgstr "Sacudir"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
 msgid "Short Name:"
 msgstr "Nome Curto:"
 
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:103
+#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:90
 msgid "Shoulder Buttons"
 msgstr "Botões Superiores"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:217
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:220
 msgid "Show &Console"
 msgstr "Mostrar &Console"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:215
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:218
 msgid "Show &Log"
 msgstr "Mostrar Janela de &Log"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:212
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:215
 msgid "Show &Statusbar"
 msgstr "Mostrar barra de &Status"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:210
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:213
 msgid "Show &Toolbar"
 msgstr "Show Barra de &Ferramentas"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:281
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:284
 msgid "Show Drives"
 msgstr "Mostrar Drives"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:517
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530
 msgid "Show EFB Copy Regions"
 msgstr "Mostrar Regiões de Cópia do EFB"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:295
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303
 msgid "Show FPS"
 msgstr "Mostrar FPS"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:271
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:274
 msgid "Show France"
 msgstr "Mostrar França"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:257
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:260
 msgid "Show GameCube"
 msgstr "Mostrar GameCube"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561
 msgid "Show Input Display"
 msgstr "Mostrar"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:273
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:276
 msgid "Show Italy"
 msgstr "Mostrar Itália"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:264
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:267
 msgid "Show JAP"
 msgstr "Mostrar JAP"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:275
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:278
 msgid "Show Korea"
 msgstr "Mostrar Coréia"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476
 msgid "Show Language:"
 msgstr "Mostrar Idioma:"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:216
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:219
 msgid "Show Log &Configuration"
 msgstr "Mostrar &Configuração de Logs"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:266
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:269
 msgid "Show PAL"
 msgstr "Mostrar PAL"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:254
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:257
 msgid "Show Platforms"
 msgstr "Mostrar Plataformas"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:263
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:266
 msgid "Show Regions"
 msgstr "Mostrar Regiões"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:518
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531
 msgid "Show Statistics"
 msgstr "Mostrar Estatísticas"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:277
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:280
 msgid "Show Taiwan"
 msgstr "Mostrar Taiwan"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:268
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:271
 msgid "Show USA"
 msgstr "Mostrar EUA"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:259
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:262
 msgid "Show Wad"
 msgstr "Mostrar Wad"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:255
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:258
 msgid "Show Wii"
 msgstr "Mostrar Wii"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491
 msgid "Show a confirmation box before stopping a game."
 msgstr "Mostrar uma janela de confirmação antes de parar um jogo."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:512
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492
 msgid ""
 "Show a message box when a potentially serious error has occurred.\n"
 "Disabling this may avoid annoying and non-fatal messages, but it may also "
@@ -4712,11 +4825,11 @@ msgstr ""
 msgid "Show first block"
 msgstr "Mostrar o primeiro bloco"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:130
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:131
 msgid "Show lag counter"
 msgstr "Mostar o contador de lag"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493
 msgid ""
 "Show messages on the emulation screen area.\n"
 "These messages include memory card writes, video backend and CPU "
@@ -4742,7 +4855,7 @@ msgstr "Mostrar ícone do salva"
 msgid "Show save title"
 msgstr "Mostrar título do salva"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102
 msgid ""
 "Show the number of frames rendered per second as a measure of emulation "
 "speed.\n"
@@ -4754,11 +4867,11 @@ msgstr ""
 "\n"
 "Se estiver em dúvida, deixe isto desativado."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:279
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:282
 msgid "Show unknown"
 msgstr "Mostra desconhecido"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105
 msgid ""
 "Show various statistics.\n"
 "\n"
@@ -4768,47 +4881,31 @@ msgstr ""
 "\n"
 "Se estiver em dúvida, deixe isto desativado."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:319
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:306
 msgid "Sideways Wiimote"
 msgstr "Wiimote na Horizontal"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:280
 msgid "Simplified Chinese"
 msgstr "Chinês Simplificado"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:311
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:298
 msgid "Size"
 msgstr "Tamanho"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:696
 msgid "Skip BIOS"
 msgstr "Pular a BIOS"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316
 msgid "Skip DCBZ clearing"
 msgstr "Pular limpeza DCBZ"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:492
-msgid "Skip Dest. Alpha Pass"
-msgstr "Não fazer o Dest. Alpha Pass"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:444
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:454
 msgid "Skip EFB Access from CPU"
 msgstr "Não permite o acesso da CPU ao EFB"
 
-#: 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ão faz o passe de destino Alfa usado em muitos jogos para vários efeitos "
-"gráficos.\n"
-"\n"
-"Se estiver em dúvida, deixe isto desativado."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125
 msgid ""
 "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n"
 "Sometimes also increases visual quality.\n"
@@ -4825,25 +4922,25 @@ msgstr ""
 "\n"
 "Se estiver em dúvida, deixe isto desativado."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:374
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:386
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:380
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:392
 #, c-format
 msgid "Slot %i"
 msgstr "Slot %i"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:700
 msgid "Slot A"
 msgstr "Slot A"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:701
 msgid "Slot B"
 msgstr "Slot B"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:62
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:49
 msgid "Snapshot"
 msgstr "Captura de tela"
 
-#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:58
+#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:46
 msgid "Software Renderer"
 msgstr "Renderizador por Software"
 
@@ -4859,27 +4956,27 @@ msgstr ""
 "Você realmente quer utilizar o Renderizador por Software? Se estiver em "
 "dúvida, pressione 'Não'."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:683
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:664
 msgid "Sound Settings"
 msgstr "Configurações de Som"
 
-#: Source/Core/AudioCommon/Src/AudioCommon.cpp:77
+#: Source/Core/AudioCommon/Src/AudioCommon.cpp:64
 #, c-format
 msgid "Sound backend %s is not valid."
 msgstr "O Backend de Som %s não é válido."
 
-#: Source/Core/AudioCommon/Src/DSoundStream.cpp:59
+#: Source/Core/AudioCommon/Src/DSoundStream.cpp:46
 #, c-format
 msgid "Sound buffer creation failed: %s"
 msgstr "Falha na criação do buffer de som: %s"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:31
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:18
 msgid "Space"
 msgstr "Barra de Espaço"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:329
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309
 msgid "Spanish"
 msgstr "Espanhol"
 
@@ -4887,7 +4984,7 @@ msgstr "Espanhol"
 msgid "Speaker Volume:"
 msgstr "Volume do Auto-Falante:"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92
 msgid ""
 "Specifies the resolution used to render at. A high resolution will improve "
 "visual quality a lot but is also quite heavy on performance and might cause "
@@ -4907,63 +5004,63 @@ msgstr ""
 "\n"
 "Se estiver em dúvida, selecione 640x528."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322
 msgid "Speed up Disc Transfer Rate"
 msgstr "Aumentar a velocidade de transferência do disco"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:243
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:230
 msgid "Square Stick"
 msgstr "Analógico Quadrado"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:107
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87
 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:322
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:37
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:25
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:325
 msgid "Start"
 msgstr "Start"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:194
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:197
 msgid "Start &NetPlay"
 msgstr "Iniciar NetPlay"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:339
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:345
 msgid "Start Re&cording"
 msgstr "Iniciar Ca&ptura"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:175
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:175
 msgid "Start Recording"
 msgstr "Iniciar Captura"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:312
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:299
 msgid "State"
 msgstr "Status"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:173
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:161
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:161
 msgid "State Saves"
 msgstr "Estados Salvos"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:108
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88
 msgid "Steering Wheel"
 msgstr "Volante"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:53
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:57
 msgid "Stick"
 msgstr "Analógico"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:420
-#: 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:325
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:419
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:431
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:171
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:171
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:328
 msgid "Stop"
 msgstr "Parar"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96
 msgid ""
 "Store EFB copies in GPU texture objects.\n"
 "This is not so accurate, but it works well enough for most games and gives a "
@@ -4977,107 +5074,119 @@ msgstr ""
 "\n"
 "Se estiver em dúvida, deixe isto ativado."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:275
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283
 msgid "Stretch to Window"
 msgstr "Redimensionar para a Tela"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:43
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:47
 msgid "Strum"
 msgstr "Palheta"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:78
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:65
 msgid "Subtract"
 msgstr "Subtrair"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:77
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:67
 #, c-format
 msgid "Successfully exported file to %s"
 msgstr "Arquivo exportado com sucesso para %s"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:56
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:43
 msgid "Successfully imported save files"
 msgstr "Arquivos de salva importados com sucesso"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:285
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:272
 msgid "Swing"
 msgstr "Balançar"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:744
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:792
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320
+msgid "Synchronize GPU thread"
+msgstr "Sincronizar thread da GPU"
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321
+msgid ""
+"Synchronizes the GPU and CPU threads to help prevent random freezes in Dual "
+"Core mode. (ON = Compatible, OFF = Fast)"
+msgstr ""
+"Sincroniza as threads da GPU e da CPU para ajudar a evitar travamentos "
+"aleatórios no modo Dual Core. (ATIVADO = Compatível, DESATIVADO = Rápido)"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773
 msgid "System Language:"
 msgstr "Idioma do Systema:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:191
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:185
 msgid "TAIWAN"
 msgstr "TAIWAN"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:127
-#: Source/Core/DolphinWX/Src/TASInputDlg.h:32
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:128
+#: Source/Core/DolphinWX/Src/TASInputDlg.h:19
 msgid "TAS Input"
 msgstr "Input do TAS"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:28
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:15
 msgid "Tab"
 msgstr "Tab"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:510
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:531
 msgid "Tab split"
 msgstr "Divisão de aba"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:37
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:41
 msgid "Table Left"
 msgstr "Esquerda da Mesa"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:38
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:42
 msgid "Table Right"
 msgstr "Direita da Mesa"
 
-#: 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
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:361
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:181
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:181
 msgid "Take Screenshot"
 msgstr "Capturar Tela"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:109
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89
 msgid "TaruKonga (Bongos)"
 msgstr "TaruKonga (Bongos)"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:472
 msgid "Test"
 msgstr "Testar"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:444
 msgid "Texture"
 msgstr "Textura"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:451
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:461
 msgid "Texture Cache"
 msgstr "Cache de Texturas"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:519
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:532
 msgid "Texture Format Overlay"
 msgstr "Sobreposição Formato das Texturas"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:226
+#: Source/Core/Core/Src/CoreParameter.cpp:215
 msgid "The WAD has been installed successfully"
 msgstr "O WAD foi instalado com sucesso"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:197
+#: Source/Core/Core/Src/ActionReplay.cpp:185
 msgid "The address is invalid"
 msgstr "O endereço é inválido"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:509
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:496
 msgid "The checksum was successfully fixed"
 msgstr "O Checksum foi corrigido com sucesso"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1242
+#: 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:1117
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1216
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1118
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1146
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1217
 #, c-format
 msgid ""
 "The file %s already exists.\n"
@@ -5086,7 +5195,7 @@ msgstr ""
 "O arquivo %s já existe.\n"
 "Deseja substituí-lo?"
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:51
+#: Source/Core/AudioCommon/Src/WaveFile.cpp:38
 #, c-format
 msgid ""
 "The file %s could not be opened for writing. Please check if it's already "
@@ -5095,29 +5204,29 @@ msgstr ""
 "O arquivo %s não pôde ser aberto para escrita. Por favor cheque se ele não "
 "está aberto em outro programa."
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:44
+#: Source/Core/AudioCommon/Src/WaveFile.cpp:31
 #, c-format
 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:332
+#: Source/Core/Core/Src/Boot/Boot.cpp:320
 #, c-format
 msgid "The file you specified (%s) does not exist"
 msgstr "O arquivo que você especificou (%s) não existe"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:628
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:666
 msgid "The name can not be empty"
 msgstr "O nome não pode ficar vazio"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:620
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:658
 msgid "The name can not contain the character ','"
 msgstr "O nome não pode conter o caracter ','"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:142
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:129
 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:93
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98
 msgid ""
 "The safer you adjust this, the less likely the emulator will be missing any "
 "texture updates from RAM.\n"
@@ -5129,12 +5238,12 @@ msgstr ""
 "\n"
 "Se estiver em dúvida, use o o valor mais à direita."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:445
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:432
 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:388
+#: Source/Core/DolphinWX/Src/Main.cpp:416
 msgid ""
 "The selected language is not supported by your system. Falling back to "
 "system default."
@@ -5142,36 +5251,36 @@ msgstr ""
 "O idioma selecionado não é suportado pelo seu sistema. Voltando ao padrão do "
 "sistema."
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:43
+#: Source/Core/Core/Src/NetPlayClient.cpp:47
 msgid "The server and client's NetPlay versions are incompatible!"
 msgstr "As versões de NetPlay do Client e do Servidor são incompatíveis!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:40
+#: Source/Core/Core/Src/NetPlayClient.cpp:44
 msgid "The server is full!"
 msgstr "O servidor está cheio!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:46
+#: Source/Core/Core/Src/NetPlayClient.cpp:50
 msgid "The server responded: the game is currently running!"
 msgstr "O servidor respondeu: O jogo está rodando no momento!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:49
+#: Source/Core/Core/Src/NetPlayClient.cpp:53
 msgid "The server sent an unknown error message!"
 msgstr "O servidor enviou uma mensagem de erro desconhecida!"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:119
+#: Source/Core/Core/Src/CoreParameter.cpp:108
 #, c-format
 msgid "The specified file \"%s\" does not exist"
 msgstr "O arquivo especificado \"%s\" não existe"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:198
+#: Source/Core/Core/Src/ActionReplay.cpp:186
 msgid "The value is invalid"
 msgstr "O valor é inválido"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:642
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:623
 msgid "Theme:"
 msgstr "Tema:"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:476
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:463
 msgid ""
 "There must be a ticket for 00000001/00000002. Your NAND dump is probably "
 "incomplete."
@@ -5179,7 +5288,7 @@ msgstr ""
 "É necessário um ticket para 00000001/00000002. O seu Dump do NAND está "
 "provavelmente incompleto."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308
 msgid ""
 "These settings override core Dolphin settings.\n"
 "Undetermined means the game uses Dolphin's setting."
@@ -5187,7 +5296,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:355
+#: Source/Core/Core/Src/ActionReplay.cpp:345
 msgid ""
 "This action replay simulator does not support codes that modify Action "
 "Replay itself."
@@ -5195,12 +5304,12 @@ msgstr ""
 "Este simulador de Action Replay não suporta códigos que modifiquem o Action "
 "Replay em si."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505
 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:113
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118
 msgid ""
 "This feature allows you to change the game's camera.\n"
 "Move the mouse while holding the right mouse button to pan and while holding "
@@ -5220,7 +5329,20 @@ msgstr ""
 "\n"
 "Se estiver em dúvida, deixe isto desativado."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485
+#, fuzzy
+msgid ""
+"This limits the game speed to the specified number of frames per second "
+"(full speed is 60 for NTSC and 50 for PAL). Alternatively, use Audio to "
+"throttle using the DSP (might fix audio clicks but can also cause constant "
+"noise depending on the game)."
+msgstr ""
+"Se você colocar o Limitador de FPS em um valor maior que a velocidade máxima "
+"do jogo (NTSC:60, PAL:50). Use Áudio para acelerar através do DSP (deve "
+"consertar cortes no áudio mas pode causar ruído constante dependendo do "
+"jogo)."
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484
 msgid ""
 "This splits the Video and CPU threads, so they can be run on separate "
 "cores.\n"
@@ -5232,61 +5354,61 @@ 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:286
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:287
 msgid "This will let you Manually Edit the INI config file"
 msgstr "Isto vai deixar você editar manualmente o arquivo de configuração .INI"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:249
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:254
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:236
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:241
 msgid "Threshold"
 msgstr "Threshold"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:288
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:275
 msgid "Tilt"
 msgstr "Inclinar"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:628
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:304
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:622
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:291
 msgid "Title"
 msgstr "Título"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:125
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:144
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:112
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:131
 msgid "To"
 msgstr "Para"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:72
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59
 msgid "Toggle All Log Types"
 msgstr "Ligar/Desligar Todos os Logs"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:426
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:432
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:180
 msgid "Toggle Fullscreen"
 msgstr "Ir para Tela Cheia"
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:87
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:271
 msgid "Top"
 msgstr "Topo"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:281
 msgid "Traditional Chinese"
 msgstr "Chinês Tradicional"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:426
+#: Source/Core/Core/Src/Boot/Boot.cpp:414
 msgid "Tried to load an unknown file type."
 msgstr "Houve a tentativa de carregar um tipo de arquivo desconhecido."
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:80
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:67
 msgid "Triggers"
 msgstr "Gatilhos"
 
-#: Source/Core/Common/Src/SysConf.h:91 Source/Core/Common/Src/SysConf.h:114
+#: Source/Core/Common/Src/SysConf.h:78 Source/Core/Common/Src/SysConf.h:101
 msgid "Trying to read from invalid SYSCONF"
 msgstr "Tentando ler de um SYSCONF inválido"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:44
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:31
 msgid ""
 "Trying to read from invalid SYSCONF\n"
 "Wiimote bt ids are not available"
@@ -5294,15 +5416,15 @@ 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:330
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
 msgid "Turkish"
 msgstr "Turco"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:33
 msgid "Turntable"
 msgstr "Turntable"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:71
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58
 msgid "Type"
 msgstr "Tipo"
 
@@ -5310,25 +5432,25 @@ msgstr "Tipo"
 msgid "UDP Port:"
 msgstr "Porta UDP:"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:279
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:266
 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12
 msgid "UDP Wiimote"
 msgstr "Wiimote UDP"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:199
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:193
 msgid "UNKNOWN"
 msgstr "DESCONHECIDO"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:756
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:755
 #, c-format
 msgid "UNKNOWN_%02X"
 msgstr "DESCONHECIDO_%02X"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:178
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:172
 msgid "USA"
 msgstr "EUA"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:225
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:214
 msgid ""
 "Unable to create patch from given values.\n"
 "Entry not modified."
@@ -5336,7 +5458,7 @@ msgstr ""
 "Impossível criar patch com os valores dados. \n"
 "Nada modificado."
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:124
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:111
 #, c-format
 msgid ""
 "Unable to parse line %lu of the entered AR code as a valid encrypted or "
@@ -5348,75 +5470,89 @@ msgstr ""
 "corretamente.\n"
 "Você gostaria de ignorar esta linha e continuar a análise?"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:391
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:397
 #, c-format
 msgid "Undefined %i"
 msgstr "%i indefinido"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:163
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:164
 msgid "Undo Load State"
 msgstr "Desfazer carregamento de estado"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:718
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:717
 msgid "Unexpected 0x80 call? Aborting..."
 msgstr "Chamada 0x80 inesperada? Abortando..."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:215
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:202
 msgid "Unknown"
 msgstr "Desconhecido"
 
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:971
+#: Source/Core/Core/Src/HW/DVDInterface.cpp:965
 #, c-format
 msgid "Unknown DVD command %08x - fatal error"
 msgstr "Comando de DVD desconhecido %08x - Erro Fatal"
 
-#: Source/Core/Common/Src/SysConf.cpp:145
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:444
+#, c-format
+msgid "Unknown command 0x%08x"
+msgstr "Comando desconhecido 0x%08x"
+
+#: Source/Core/Common/Src/SysConf.cpp:132
 #, c-format
 msgid "Unknown entry type %i in SYSCONF (%s@%x)!"
 msgstr "Tipo de entrada desconhecido %i no SYSCONF (%s@%x)!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:228
+#: Source/Core/Core/Src/NetPlayClient.cpp:232
 #, c-format
 msgid "Unknown message received with id : %d"
 msgstr "Menssagem desconhecida recebida com identificação: %d"
 
-#: Source/Core/Core/Src/NetPlayServer.cpp:504
+#: Source/Core/Core/Src/NetPlayServer.cpp:508
 #, c-format
 msgid "Unknown message with id:%d received from player:%d Kicking player!"
 msgstr ""
 "Menssagem desconhecida com ID:%d recebida do jogador:%d Expulsando jogador!"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:274
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:56
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:261
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:43
 msgid "Up"
 msgstr "Para cima"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:108
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:95
 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17
 msgid "Update"
 msgstr "Atualizar"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:320
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:307
 msgid "Upright Wiimote"
 msgstr "Wiimote na Vertical"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:777
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758
 msgid "Use EuRGB60 Mode (PAL60)"
 msgstr "Usar modo EuRGB60 (PAL60)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:294
 msgid "Use Fullscreen"
 msgstr "Usar Tela Cheia"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:575
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:563
 msgid "Use Hex"
 msgstr "Usar Hex"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:600
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580
 msgid "Use Panic Handlers"
 msgstr "Usar Panic Handlers"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89
+msgid ""
+"Use a hacked upload strategy to stream vertices.\n"
+"This usually speed up, but is forbidden by OpenGL specification and may "
+"causes heavy glitches.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122
 msgid ""
 "Use multiple threads to decode textures.\n"
 "Might result in a speedup (especially on CPUs with more than two cores).\n"
@@ -5429,7 +5565,7 @@ msgstr ""
 "\n"
 "Se estiver em dúvida, deixe isto desativado."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126
 msgid ""
 "Usually if shader compilation fails, an error message is displayed.\n"
 "However, one may skip the popups to allow interruption free gameplay by "
@@ -5444,53 +5580,58 @@ msgstr ""
 "\n"
 "Se estiver em dúvida, deixe isto desativado."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:539
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:552
 msgid "Utility"
 msgstr "Utilitário"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:285
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:293
 msgid "V-Sync"
 msgstr "V-Sync"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:209
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318
+#, fuzzy
+msgid "VBeam Speed Hack"
+msgstr "Hack de velocidade MMU"
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196
 msgid "Value"
 msgstr "Valor"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:73
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:60
 msgid "Value:"
 msgstr "Valor:"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:572
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:560
 msgid "Value: "
 msgstr "Valor:"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:51
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:38
 msgid "Verbosity"
 msgstr "Verbosidade"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:377
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:381
 msgid "Video"
 msgstr "Vídeo"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:486
 msgid "Virtual"
 msgstr "Virtual"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:689
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670
 msgid "Volume"
 msgstr "Volume"
 
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:498
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:527
+#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:488
+#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:517
 #, c-format
 msgid "WAD installation failed: error creating %s"
 msgstr "Falha na instalação da WAD: Erro na criação de %s"
 
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:547
+#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:537
 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:80
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84
 msgid ""
 "Wait for vertical blanks in order to reduce tearing.\n"
 "Decreases performance if emulation speed is below 100%.\n"
@@ -5502,25 +5643,25 @@ msgstr ""
 "\n"
 "Se estiver em dúvida, deixe isto desativado."
 
-#: Source/Core/Common/Src/MsgHandler.cpp:67
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46
+#: Source/Core/Common/Src/MsgHandler.cpp:53
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:33
 #: Source/Core/DolphinWX/Src/VideoConfigDiag.h:85
 msgid "Warning"
 msgstr "Aviso"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:291
+#: Source/Core/Core/Src/Boot/Boot.cpp:279
 msgid "Warning - starting DOL in wrong console mode!"
 msgstr "Aviso - Inicializando DOL no modo de console errado!"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:341
+#: Source/Core/Core/Src/Boot/Boot.cpp:329
 msgid "Warning - starting ELF in wrong console mode!"
 msgstr "Aviso - Inicializando ELF no modo de console errado!"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:221
+#: Source/Core/Core/Src/Boot/Boot.cpp:209
 msgid "Warning - starting ISO in wrong console mode!"
 msgstr "Aviso - Inicializando ISO no modo de console errado!"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:519
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:512
 #, c-format
 msgid ""
 "Warning! it is advised to backup all files in the folder:\n"
@@ -5532,7 +5673,7 @@ msgstr ""
 "%s\n"
 "Deseja continuar?"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:585
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:578
 #, c-format
 msgid ""
 "Warning: This will overwrite any existing saves that are in the folder:\n"
@@ -5545,7 +5686,7 @@ msgstr ""
 "que tenham o mesmo nome de um arquivo do Memory Card\n"
 "Continuar?"
 
-#: Source/Core/Core/Src/Movie.cpp:844
+#: Source/Core/Core/Src/Movie.cpp:835
 #, c-format
 msgid ""
 "Warning: You loaded a save that's after the end of the current movie. (byte "
@@ -5556,7 +5697,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:861
+#: Source/Core/Core/Src/Movie.cpp:852
 #, c-format
 msgid ""
 "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You "
@@ -5568,7 +5709,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:870
+#: Source/Core/Core/Src/Movie.cpp:861
 #, c-format
 msgid ""
 "Warning: You loaded a save whose movie mismatches on frame %d. You should "
@@ -5602,49 +5743,49 @@ msgstr ""
 "Start=%d, A=%d, B=%d, X=%d, Y=%d, Z=%d, DUp=%d, DDown=%d, DLeft=%d, DRight="
 "%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d"
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:106
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:129
+#: Source/Core/AudioCommon/Src/WaveFile.cpp:93
+#: Source/Core/AudioCommon/Src/WaveFile.cpp:116
 msgid "WaveFileWriter - file not open."
 msgstr "WaveFileWriter - Arquivo não aberto."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:56
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:60
 msgid "Whammy"
 msgstr "Distorção"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:404
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:408
 msgid "Widescreen Hack"
 msgstr "Hack de Widescreen"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:312
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:299
 msgid "Width"
 msgstr "Largura"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535
 msgid "Wii"
 msgstr "Wii"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:372
 msgid "Wii Console"
 msgstr "Console do Wii"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:844
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:825
 msgid "Wii NAND Root:"
 msgstr "Raiz do Wii NAND"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:191
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:194
 msgid "Wii Save Import"
 msgstr "Importar Save de Wii"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1243
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1270
 msgid "Wii save files (*.bin)|*.bin"
 msgstr "Arquivos de Save do Wii (*.bin)|*.bin"
 
-#: Source/Core/DiscIO/Src/WiiWad.cpp:82
+#: Source/Core/DiscIO/Src/WiiWad.cpp:69
 msgid "WiiWAD: Could not read from file"
 msgstr "WiiWAD: Não foi possível ler o arquivo"
 
-#: Source/Core/Core/Src/HW/Wiimote.cpp:17
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
+#: Source/Core/Core/Src/HW/Wiimote.cpp:20
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
 msgid "Wiimote"
 msgstr "Wiimote"
 
@@ -5653,7 +5794,7 @@ msgstr "Wiimote"
 msgid "Wiimote %i"
 msgstr "Wiimote %i"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:628
+#: Source/Core/DolphinWX/Src/Main.cpp:656
 msgid "Wiimote Connected"
 msgstr "Wiimote Conectado"
 
@@ -5661,7 +5802,7 @@ msgstr "Wiimote Conectado"
 msgid "Wiimote Motor"
 msgstr "Motor do Wiimote"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
 msgid "Wiimote settings"
 msgstr "Configurações do Wiimote"
 
@@ -5669,102 +5810,125 @@ msgstr "Configurações do Wiimote"
 msgid "Wiimotes"
 msgstr "Wiimotes"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:134
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:121
 msgid "Windows Left"
 msgstr "Janelas da Esquerda"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:136
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:123
 msgid "Windows Menu"
 msgstr "Menu de Janelas"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:135
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:122
 msgid "Windows Right"
 msgstr "Janelas da Direita"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:131
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:124
 msgid "Word Wrap"
 msgstr "Word Wrap"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1298
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:864
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1089
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1225
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1325
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:880
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1090
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1226
 msgid "Working..."
 msgstr "Funcionando..."
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:338
+msgid "Write memcards (GC)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46
 msgid "Write to Console"
 msgstr "Escrever no Console"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:67
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:54
 msgid "Write to Debugger"
 msgstr "Escrever no Debugger"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:57
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44
 msgid "Write to File"
 msgstr "Escrever para o Arquivo"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:61
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48
 msgid "Write to Window"
 msgstr "Escrever na Janela"
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:60
+#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:47
 #, c-format
 msgid "XAudio2 CreateSourceVoice failed: %#X"
 msgstr "XAudio2 CreateSourceVoice falhou: %#X"
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:114
+#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:101
 #, c-format
 msgid "XAudio2 init failed: %#X"
 msgstr "XAudio2 Falha na inicialização: %#X"
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:124
+#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:111
 #, c-format
 msgid "XAudio2 master voice creation failed: %#X"
 msgstr "XAudio2 Criação de Master Voice falhou: %#X"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:766
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:765
 msgid "XF reg"
 msgstr "XF reg"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:21
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Yellow"
 msgstr "Amarelo"
 
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:107
+#: Source/Core/Core/Src/DSP/DSPCore.cpp:120
 msgid ""
-"You are using free dsp roms made by Dolphin Team.\n"
-"Only Zelda ucode games will work correctly with them.\n"
+"You are using a free DSP ROM made by the Dolphin Team.\n"
+"All Wii games will work correctly, and most GC games should also work fine, "
+"but the GBA/IPL/CARD UCodes will not work.\n"
 msgstr ""
-"Você está usando roms do DSP grátis feitas pela Equipe do Dolphin.\n"
-"Apenas o ucode dos jogos da série Zelda irão funcionar corretamente com "
-"elas. \n"
+"Você está usando uma DSP ROM livre feita pela Dolphin Team.\n"
+"Todos os jogos do Wii funcionarão corretamente, e a maioria dos jogos de GC "
+"também devem funcionar bem, mas os GBA/IPL/CARD UCodes não irão funcionar.\n"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:73
+#: Source/Core/Core/Src/DSP/DSPCore.cpp:116
+msgid ""
+"You are using an old free DSP ROM made by the Dolphin Team.\n"
+"Only games using the Zelda UCode will work correctly.\n"
+msgstr ""
+"Você está usando uma DSP ROM antiga feita pela Dolphin Team.\n"
+"Somente jogos usando Zelda UCode funcionarão corretamente.\n"
+
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:63
 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:207
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:210
 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:593
 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:438
 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:603
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:591
 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:936
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:917
 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."
 
-#: Source/Core/Core/Src/CoreParameter.cpp:175
+#: Source/Core/Core/Src/DSP/DSPCore.cpp:109
+msgid ""
+"Your DSP ROMs have incorrect hashes.\n"
+"Would you like to stop now to fix the problem?\n"
+"If you select \"No\", audio might be garbled."
+msgstr ""
+"Suas DSP ROMs possuem hashes incorretos.\n"
+"Gostaria de parar agora para resolver o problema?\n"
+"Se você escolher \"Não\", o áudio pode falhar."
+
+#: Source/Core/Core/Src/CoreParameter.cpp:164
 msgid ""
 "Your GCM/ISO file seems to be invalid (invalid country).\n"
 "Continue with PAL region?"
@@ -5772,7 +5936,7 @@ msgstr ""
 "Sua GCM/ISO parece ser inválida (país inválido).\n"
 "Continuar com a região PAL?"
 
-#: Source/Core/Common/Src/SysConf.cpp:58
+#: Source/Core/Common/Src/SysConf.cpp:45
 #, c-format
 msgid ""
 "Your SYSCONF file is the wrong size.\n"
@@ -5783,25 +5947,25 @@ msgstr ""
 "Ele deveria ter 0x%04x (mas tem 0x%04llx)\n"
 "Você gostaria de gerar um novo?"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:334
 msgid "ZTP hack"
 msgstr "Hack do ZTB"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:387
+#: Source/Core/Core/Src/ActionReplay.cpp:377
 msgid "Zero 3 code not supported"
 msgstr "Código Zero 3 não é suportado"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:408
+#: Source/Core/Core/Src/ActionReplay.cpp:398
 #, c-format
 msgid "Zero code unknown to dolphin: %08x"
 msgstr "Código Zero desconhecido pelo Dolphin: %08x"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:436
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:460
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:423
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:447
 msgid "[ waiting ]"
 msgstr "[ Aguardando ]"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107
 msgid ""
 "[BROKEN]\n"
 "Highlight regions the EFB was copied from.\n"
@@ -5813,11 +5977,11 @@ msgstr ""
 "\n"
 "Se estiver em dúvida, deixe isto desativado."
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:91
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:78
 msgid "[Custom]"
 msgstr "[Personalizado]"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120
 msgid ""
 "[EXPERIMENTAL]\n"
 "Aims to speed up emulation by offloading texture decoding to the GPU using "
@@ -5836,7 +6000,7 @@ msgstr ""
 "\n"
 "Se estiver em dúvida, deixe isto desativado."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121
 msgid ""
 "[EXPERIMENTAL]\n"
 "Speeds up emulation a bit by caching display lists.\n"
@@ -5851,99 +6015,47 @@ msgstr ""
 "\n"
 "Se estiver em dúvida, deixe isto desativado."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:508
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:495
 msgid "^ ADD"
 msgstr "^ ADD"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:820
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:801
 msgid "apploader (.img)"
 msgstr "apploader (.img)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:185
-msgid "failed to read bk header"
-msgstr "Falha ao ler o header do bk"
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:375
-#, c-format
-msgid "failed to read data from file: %s"
-msgstr "Falha ao ler dados do arquivo: %s"
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:97
-msgid "failed to read header"
-msgstr "Falha ao ler o header"
-
-#: Source/Core/Core/Src/PowerPC/JitInterface.cpp:285
+#: Source/Core/Core/Src/PowerPC/JitInterface.cpp:272
 #, c-format
 msgid "iCacheJIT: Reading Opcode from %x. Please report."
 msgstr "iCacheJIT: Lendo Opcode de %x. Favor reportar."
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:108
-#, c-format
-msgid "not a wii save or read failure for file header size %x"
-msgstr ""
-"Não é um save de Wii ou houve erro de leitura no tamanho do header do "
-"arquivo %x"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:935
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:936
 msgid "s"
 msgstr "s"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:457
-#, c-format
-msgid "unknown cmd 0x%08x"
-msgstr "Cmd 0x%08x desconhecido"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1110
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1136
 msgid "wxExecute returned -1 on application run!"
 msgstr "wxExecute retornou -1 ao rodar o aplicativo!"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:56
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:43
 msgid "zFar Correction: "
 msgstr "Correção do zFar:"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:51
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:38
 msgid "zNear Correction: "
 msgstr "Correção do zNear:"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:493
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:480
 msgid "| OR"
 msgstr "| OR"
 
-#~ msgid "%i connected"
-#~ msgstr "%i conectado"
-
-#~ msgid "Alternate Wiimote Timing"
-#~ msgstr "Tempo Alternativo de Wiimote"
-
-#~ msgid "Interpreter (VERY slow)"
-#~ msgstr "Interpretador (MUITO lento)"
-
-#~ msgid "JIT Recompiler (recommended)"
-#~ msgstr "JIT recompilador (recomendado)"
-
-#~ msgid "JITIL experimental recompiler"
-#~ msgstr "JITIL recompilador experimental"
+#~ msgid "Accurate VBeam emulation"
+#~ msgstr "Emulação correta do VBeam"
 
 #~ msgid ""
-#~ "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. "
-#~ "No effect on emulated wiimotes."
+#~ "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)"
 #~ msgstr ""
-#~ "Desliga o som que sai do Wiimote. Corrige desconexões imprevisíveis em "
-#~ "Wiimotes Reais. Não faz efeito em Wiimotes Emulados."
+#~ "Se a taxa de FPS estiver instável, esta opção pode ajudar. (ON = "
+#~ "Compatível, OFF = Rápido)"
 
-#~ msgid "Pair Up"
-#~ msgstr "Parear"
-
-#~ msgid "Reconnect Wiimote Confirm"
-#~ msgstr "Confirmação de reconexão do Wiimote"
-
-#~ msgid ""
-#~ "Wiimote %i has been disconnected by system.\n"
-#~ "Maybe this game doesn't support multi-wiimote,\n"
-#~ "or maybe it is due to idle time out or other reason.\n"
-#~ "Do you want to reconnect immediately?"
-#~ msgstr ""
-#~ "O Wiimote %i foi desconectado pelo sistema.\n"
-#~ "Talvez este jogo não tenha suporte a múltiplos Wiimotes,\n"
-#~ "ou talvez tenha sido pelo tempo parado ou por outra razão.\n"
-#~ "Você quer reconectar imediatamente?"
+#~ msgid "Skip Dest. Alpha Pass"
+#~ msgstr "Não fazer o Dest. Alpha Pass"
diff --git a/Languages/po/ru.po b/Languages/po/ru.po
index 0bce381345..030d6818ef 100644
--- a/Languages/po/ru.po
+++ b/Languages/po/ru.po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the dolphin-emu package.
 #
 # Translators:
-# dffggff <69@no-spam.ws>, 2013.
-# Kein <kein-of@yandex.ru>, 2011.
+# N69 <69@no-spam.ws>, 2013
+# Kein <kein-of@yandex.ru>, 2011
 msgid ""
 msgstr ""
 "Project-Id-Version: Dolphin Emulator\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-10 08:56-0500\n"
-"PO-Revision-Date: 2013-02-11 13:34+0000\n"
+"POT-Creation-Date: 2013-04-18 23:00-0500\n"
+"PO-Revision-Date: 2013-04-04 08:13+0000\n"
 "Last-Translator: N69 <69@no-spam.ws>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/dolphin-emu/"
 "language/ru/)\n"
@@ -21,21 +21,21 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:511
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:499
 msgid " (too many to display)"
 msgstr "(слишком много)"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:270
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:273
 #: Source/Core/DolphinWX/Src/NetWindow.cpp:491
 #: Source/Core/DolphinWX/Src/NetWindow.cpp:530
 msgid " Game : "
 msgstr " Игра : "
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:507
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494
 msgid "! NOT"
 msgstr "! НЕТ"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:70
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:58
 #, c-format
 msgid ""
 "\"%s\" does not exist.\n"
@@ -44,34 +44,44 @@ msgstr ""
 "\"%s\" не существует.\n"
 " Создать новую карту памяти на 16Мб?"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:142
+#: Source/Core/Core/Src/CoreParameter.cpp:131
 #, c-format
 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:722
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:721
 #, c-format
 msgid "%08X:  "
 msgstr "%08X: "
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:196
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:183
 #, c-format
 msgid "%1$sCopy%1$s"
 msgstr "%1$sКопировать%1$s"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:128
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:296
+#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:113
+#, c-format
+msgid "%d samples"
+msgstr ""
+
+#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:112
+#, c-format
+msgid "%d samples (quality level %d)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:121
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:289
 #, c-format
 msgid "%s already exists, overwrite?"
 msgstr "%s уже существует, переписать?"
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:167
+#: Source/Core/DiscIO/Src/CompressedBlob.cpp:154
 #, c-format
 msgid "%s failed to be scrubbed. Probably the image is corrupt."
 msgstr "%s не может быть сжат. Возможно образ поврежден."
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:95
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:83
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
@@ -80,7 +90,7 @@ msgstr ""
 "%s невозможно загрузить карту памяти\n"
 "Размер файла карты поврежден (0x%x bytes)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:110
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:98
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
@@ -89,7 +99,7 @@ msgstr ""
 "%s невозможно загрузить карту памяти\n"
 "Размер карты поврежден (0x%x bytes)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:90
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:78
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
@@ -98,48 +108,37 @@ msgstr ""
 "%s невозможно загрузить карту памяти\n"
 "Размер файла неверен (0x%x bytes)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:367
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:359
 #, c-format
 msgid "%s failed to open"
 msgstr "%s не может быть открыт"
 
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:97
-#, c-format
-msgid ""
-"%s has an incorrect hash.\n"
-"Would you like to stop now to fix the problem?\n"
-"If you select \"No\", audio will be garbled."
-msgstr ""
-"%s содержит не верный хэш.\n"
-"Хотите остановить эмуляцию для исправления ошибки?\n"
-"Если вы выбрете \"Нет\", то звук будет испорчен."
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:360
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:352
 #, c-format
 msgid "%s is a 0 byte file"
 msgstr "%s - пустой файл"
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:159
+#: Source/Core/DiscIO/Src/CompressedBlob.cpp:146
 #, c-format
 msgid "%s is already compressed! Cannot compress it further."
 msgstr "%s уже сжат! Больше сжать нельзя."
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:345
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:337
 #, c-format
 msgid "%s is too long for the filename, max chars is 45"
 msgstr "%s слишком длинное имя файла, максимальная длина 45 знаков"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:202
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:189
 #, c-format
 msgid "%sDelete%s"
 msgstr "%sУдалить%s"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:200
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:187
 #, c-format
 msgid "%sExport GCI%s"
 msgstr "%sЭкспоритровать GCI%s"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:198
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:185
 #, c-format
 msgid "%sImport GCI%s"
 msgstr "%sИмпортировать GCI%s"
@@ -149,222 +148,246 @@ msgstr "%sИмпортировать GCI%s"
 msgid "%u Free Blocks; %u Free Dir Entries"
 msgstr "%u Свободных блоков; %u Свободных папок"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:506
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:493
 msgid "&& AND"
 msgstr "&& И"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:295
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:301
 msgid "&About..."
 msgstr "&О программе"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:99
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:100
 msgid "&Boot from DVD Drive..."
 msgstr "&Запустить игру с DVD-диска..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:231
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:234
 msgid "&Breakpoints"
 msgstr "&Закладки"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:110
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:111
 msgid "&Browse for ISOs..."
 msgstr "&Выбрать папку с ISO-файлами..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:192
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:195
 msgid "&Cheats Manager"
 msgstr "Менеджер &читов"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:177
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:180
 msgid "&DSP Settings"
 msgstr "&Опции аудио"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:885
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:876
 msgid "&Delete ISO..."
 msgstr "&Удалить ISO-файл..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:903
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:897
 msgid "&Delete selected ISOs..."
 msgstr "&Удалить выбранные ISO-файлы..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:170
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:173
 msgid "&Emulation"
 msgstr "&Эмуляция"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:113
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:114
 msgid "&File"
 msgstr "&Файл"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:335
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:341
 msgid "&Frame Advance"
 msgstr "&Frame Advance"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:352
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:358
 msgid "&Fullscreen"
 msgstr "&Полноэкранный режим"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:176
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:179
 msgid "&Graphics Settings"
 msgstr "&Опции видео"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:296
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:302
 msgid "&Help"
 msgstr "&Помощь"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:180
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:183
 msgid "&Hotkey Settings"
 msgstr "&Настройка \"Горячих\" клавиш"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:233
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:236
 msgid "&JIT"
 msgstr "&JIT"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:148
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:149
 msgid "&Load State"
 msgstr "Быстрая &загрузка"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:190
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:193
 msgid "&Memcard Manager (GC)"
 msgstr "&Менеджер карт памяти (GC)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:232
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:235
 msgid "&Memory"
 msgstr "Па&мять"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:313
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:319
 msgid "&Open..."
 msgstr "Выбор &файла для запуска..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:186
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:189
 msgid "&Options"
 msgstr "&Опции"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:324
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:330
 msgid "&Pause"
 msgstr "&Пауза"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:326
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:332
 msgid "&Play"
 msgstr "&Запустить"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:867
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:858
 msgid "&Properties"
 msgstr "&Свойства"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:348
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:354
 msgid "&Read-only mode"
 msgstr "&Режим \"Только для чтения\""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:319
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:325
 msgid "&Refresh List"
 msgstr "&Обновить список игр"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:230
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:233
 msgid "&Registers"
 msgstr "&Регистры"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:332
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:338
 msgid "&Reset"
 msgstr "&Сбросить"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:234
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:237
 msgid "&Sound"
 msgstr "З&вук"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:329
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:335
 msgid "&Stop"
 msgstr "&Остановить"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:207
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:210
 msgid "&Tools"
 msgstr "&Инструменты"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:235
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:238
 msgid "&Video"
 msgstr "&Видео"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:284
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:287
 msgid "&View"
 msgstr "&Вид"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:179
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:182
 msgid "&Wiimote Settings"
 msgstr "Опц&ии Wiimote"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:868
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:859
 msgid "&Wiki"
 msgstr "&Энциклопедия"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504
 msgid "'"
 msgstr "'"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:59
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:46
 msgid "(-)+zFar"
 msgstr "(-)+zFar"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:54
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:41
 msgid "(-)+zNear"
 msgstr "(-)+zNear"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:99
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:86
 msgid "(UNKNOWN)"
 msgstr "(НЕИЗВЕСТНЫЙ)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:376
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:384
 msgid "(off)"
 msgstr "(отключен)"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:655
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:654
 msgid "0x44"
 msgstr "0x44"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+msgid "1.5x Native (960x792)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:158
 msgid "16 bit"
 msgstr "16 бит"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+msgid "1x Native (640x528)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+msgid "2.5x Native (1600x1320)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+msgid "2x Native (1280x1056)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:159
 msgid "32 bit"
 msgstr "32 бита"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:412
 msgid "3D Vision"
 msgstr "3D Vision"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+msgid "3x Native (1920x1584)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+msgid "4x Native (2560x2112)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:157
 msgid "8 bit"
 msgstr "8 бит"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:43
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:30
 msgid "<Insert name here>"
 msgstr "<Введите название>"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:255
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:262
 msgid "<No resolutions found>"
 msgstr "<Разрешений экрана не найдено>"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:104
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84
 msgid "<Nothing>"
 msgstr "<Ничего>"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:162
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:162
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:150
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:150
 msgid "<Press Key>"
 msgstr "<Нажмите кнопку>"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286
 msgid "<System>"
 msgstr "<Системный>"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695
 msgid "A"
 msgstr "A"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:201
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:235
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:204
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:238
 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:353
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:387
 msgid "A game is not currently running."
 msgstr "Игра не запущена."
 
@@ -374,23 +397,24 @@ msgid ""
 "You must manually connect your wiimotes."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:109
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:100
+#, fuzzy
 msgid ""
 "ALERT:\n"
 "\n"
-"NetPlay will currently only work properly when using the following "
-"settings:\n"
-" - Dual Core [OFF]\n"
-" - Audio Throttle [OFF]\n"
-" - DSP-HLE with \"Null Audio\" or DSP-LLE\n"
-" - Manually set the exact number of controllers that will be used to "
-"[Standard Controller]\n"
+"Netplay will only work with the following settings:\n"
+" - Enable Dual Core [OFF]\n"
+" - DSP Emulator Engine Must be the same on all computers!\n"
+" - DSP on Dedicated Thread [OFF]\n"
+" - Framelimit NOT set to [Audio]\n"
+" - Manually set the exact number of controllers to be used to [Standard "
+"Controller]\n"
 "\n"
-"All players should try to use the same Dolphin version and settings.\n"
-"Disable all memory cards or send them to all players before starting.\n"
-"Wiimote support has not been implemented.\n"
+"All players should use the same Dolphin version and settings.\n"
+"All memory cards must be identical between players or disabled.\n"
+"Wiimote support has not been implemented!\n"
 "\n"
-"You must forward TCP port to host!!"
+"The host must have the chosen TCP port open/forwarded!\n"
 msgstr ""
 "ВНИМАНИЕ:\n"
 "\n"
@@ -410,17 +434,17 @@ msgstr ""
 "\n"
 "Для создания игры вам необходимо открыть указанный порт на вашем роутере!!"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:111
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:116
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96
 msgid "AM-Baseboard"
 msgstr "AM-Baseboard"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:299
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:115
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:300
 msgid "AR Codes"
 msgstr "AR-коды"
 
-#: Source/Core/DolphinWX/Src/AboutDolphin.h:33
+#: Source/Core/DolphinWX/Src/AboutDolphin.h:21
 msgid "About Dolphin"
 msgstr "Об эмуляторе Dolphin"
 
@@ -428,15 +452,11 @@ msgstr "Об эмуляторе Dolphin"
 msgid "Acceleration"
 msgstr "Ускорение"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:463
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473
 msgid "Accuracy:"
 msgstr "Точность:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317
-msgid "Accurate VBeam emulation"
-msgstr "Аккуратная VBeam эмуляция"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97
 msgid ""
 "Accurately emulate EFB copies.\n"
 "Some games depend on this for certain graphical effects or gameplay "
@@ -445,12 +465,12 @@ msgid ""
 "If unsure, check EFB to Texture instead."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:239
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:239
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:227
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:227
 msgid "Action"
 msgstr "Действие"
 
-#: Source/Core/Core/Src/ARDecrypt.cpp:481
+#: Source/Core/Core/Src/ARDecrypt.cpp:469
 #, c-format
 msgid ""
 "Action Replay Code Decryption Error:\n"
@@ -465,7 +485,7 @@ msgstr ""
 "Ошибочный код:\n"
 "%s"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:667
+#: Source/Core/Core/Src/ActionReplay.cpp:657
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)"
@@ -473,7 +493,7 @@ msgstr ""
 "Ошибка ActionReplay: неверный размер (%08x : адрес = %08x) в добавляемом "
 "коде (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:755
+#: Source/Core/Core/Src/ActionReplay.cpp:745
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide "
@@ -482,89 +502,89 @@ msgstr ""
 "Ошибка Action Replay: Неверный размер  (%08x : address = %08x) в Fill и "
 "Slide (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:547
+#: Source/Core/Core/Src/ActionReplay.cpp:537
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And "
 "Fill (%s)"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:607
+#: Source/Core/Core/Src/ActionReplay.cpp:597
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Write To "
 "Pointer (%s)"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:802
+#: Source/Core/Core/Src/ActionReplay.cpp:792
 #, c-format
 msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:682
+#: Source/Core/Core/Src/ActionReplay.cpp:672
 #, c-format
 msgid ""
 "Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)\n"
 "Master codes are not needed. Do not use master codes."
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:196
+#: Source/Core/Core/Src/ActionReplay.cpp:184
 #, c-format
 msgid "Action Replay Error: invalid AR code line: %s"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:872
+#: Source/Core/Core/Src/ActionReplay.cpp:862
 #, c-format
 msgid "Action Replay: Conditional Code: Invalid Size %08x (%s)"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:945
+#: Source/Core/Core/Src/ActionReplay.cpp:935
 #, c-format
 msgid "Action Replay: Invalid Normal Code Type %08x (%s)"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:896
+#: Source/Core/Core/Src/ActionReplay.cpp:886
 #, c-format
 msgid "Action Replay: Normal Code %i: Invalid subtype %08x (%s)"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:838
+#: Source/Core/Core/Src/ActionReplay.cpp:828
 #, c-format
 msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:242
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:247
 msgid "Adapter:"
 msgstr "Адаптер:"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:76
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:63
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:63
 msgid "Add"
 msgstr "Добавить"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1275
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1301
 msgid "Add ActionReplay Code"
 msgstr "Добавление ActionReplay-кода"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1204
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1230
 msgid "Add Patch"
 msgstr "Добавление патча"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:507
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:528
 msgid "Add new pane"
 msgstr "Добавить панель"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:404
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:426
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:811
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:408
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:430
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:792
 msgid "Add..."
 msgstr "Добавить..."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:90
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:81
 msgid "Address :"
 msgstr "Адрес :"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:58
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:45
 msgid ""
 "Adds the specified value to zFar Parameter.\n"
 "Two ways to express the floating point values.\n"
@@ -575,7 +595,7 @@ msgid ""
 "NOTE: Check LogWindow/Console for the acquired values."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:53
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:40
 msgid ""
 "Adds the specified value to zNear Parameter.\n"
 "Two ways to express the floating point values.\n"
@@ -586,48 +606,48 @@ msgid ""
 "NOTE: Check LogWindow/Console for the acquired values."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:755
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:744
 msgid "Adjust the analog control pressure required to activate buttons."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:509
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:522
 msgid "Advanced"
 msgstr "Расширенные"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561
 msgid "Advanced Settings"
 msgstr "Расширенные настройки"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:584
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:587
 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:816
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:797
 msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)"
 msgstr "Все GC/Wii образы (gcm, iso, wbfs, ciso, gcz)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1189
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1190
 msgid "All Gamecube GCM files (gcm)"
 msgstr "Все GCM-файлы Gamecube (gcm)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1390
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1404
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1417
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1431
 msgid "All Save States (sav, s##)"
 msgstr "Файлы быстрых сохранений (sav, s##)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1187
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1188
 msgid "All Wii ISO files (iso)"
 msgstr "Файлы образов Wii (iso)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1207
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1208
 msgid "All compressed GC/Wii ISO files (gcz)"
 msgstr "Сжатые образа дисков GC/Wii (gcz)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:124
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:104
 msgid "All files (*.*)|*.*"
 msgstr "Все файлы (*.*)|*.*"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123
 msgid ""
 "Allows toggling certain options via the hotkeys 3 (Internal Resolution), 4 "
 "(Aspect Ratio), 5 (Copy EFB) and 6 (Fog) within the emulation window.\n"
@@ -635,50 +655,50 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:285
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:272
 msgid "Analyze"
 msgstr "Анализ"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:298
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:285
 msgid "Angle"
 msgstr "Ракурс"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:367
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:375
 msgid "Anisotropic Filtering:"
 msgstr "Анизотропная фильтрация"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:350
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:358
 msgid "Anti-Aliasing:"
 msgstr "Сглаживание:"
 
-#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:308
+#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:299
 msgid "Apploader is the wrong size...is it really an apploader?"
 msgstr "Загрузчик неверноего размера... это точно загрузчик?"
 
-#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:302
+#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:293
 msgid "Apploader unable to load from file"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:841
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:822
 msgid "Apploader:"
 msgstr "Загрузчик:"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:135
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:122
 msgid "Apply"
 msgstr "Применить"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124
 msgid ""
 "Apply a post-processing effect after finishing a frame.\n"
 "\n"
 "If unsure, select (off)."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287
 msgid "Arabic"
 msgstr "Arabic"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:614
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:603
 #, c-format
 msgid "Are you sure you want to delete \"%s\"?"
 msgstr "Вы уверены, что хотите удалить \"%s\"?"
@@ -695,206 +715,210 @@ msgstr ""
 msgid "Are you sure you want to delete this file?  It will be gone forever!"
 msgstr "Вы уверены, что хотите удалить этот файл? Он исчезнет навсегда!"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:789
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:277
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:44
+msgid "Arm JIT (experimental)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:285
 msgid "Aspect Ratio:"
 msgstr "Соотношение сторон:"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:70
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:58
 msgid "At least one pane must remain open."
 msgstr "Хотя бы одна панель должна быть открыта."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:553
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533
 msgid "Audio"
 msgstr "Аудио"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:694
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675
 msgid "Audio Backend:"
 msgstr "Вывод аудио:"
 
-#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:41
+#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:28
 msgid "AudioCommon: Error opening AO device.\n"
 msgstr "AudioCommon: Ошибка открытия устройства вывода звука.\n"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:275
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283
 msgid "Auto"
 msgstr "Авто"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:337
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345
 msgid "Auto (Multiple of 640x528)"
 msgstr "Автоматически (Начиная с 640x528)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:337
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345
 msgid "Auto (Window Size)"
 msgstr "Автоматически (По размеру окна)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:297
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305
 msgid "Auto adjust Window Size"
 msgstr "Автоматическая настройка размера окно"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77
 msgid ""
 "Automatically adjusts the window size to your internal resolution.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:697
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696
 msgid "B"
 msgstr "B"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:755
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:754
 msgid "BP register "
 msgstr "BP регистры"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:27
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:14
 msgid "Back"
 msgstr "Назад"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:698
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:679
 msgid "Backend Settings"
 msgstr "Настройка вывода"
 
-#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:60
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:206
+#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:47
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:211
 msgid "Backend:"
 msgstr "Вывод:"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:318
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:95
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:305
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:82
 msgid "Background Input"
 msgstr "Фоновой ввод"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:279
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:266
 msgid "Backward"
 msgstr "Взмах"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:264
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:257
 msgid "Bad File Header"
 msgstr "Неверный заголовок файла"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:627
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:621
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:290
 msgid "Banner"
 msgstr "Логотип"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:519
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:529
 msgid "Banner Details"
 msgstr "Данные логотипа"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491
 msgid "Banner:"
 msgstr "Логотип:"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:57
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:61
 msgid "Bar"
 msgstr "Панель"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:308
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:316
 msgid "Basic"
 msgstr "Основные"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555
 msgid "Basic Settings"
 msgstr "Основные настройки"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:22
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Bass"
 msgstr "Басы"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:186
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:174
 msgid "Block Allocation Table checksum failed"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:631
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625
 msgid "Blocks"
 msgstr "Блоки"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:21
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Blue"
 msgstr "Синий"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:24
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Blue Left"
 msgstr "Синяя слева"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:25
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Blue Right"
 msgstr "Синяя справа"
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:87
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270
 msgid "Bottom"
 msgstr "снизу"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:238
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:225
 #, c-format
 msgid "Bound Controls: %lu"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348
 msgid "Broken"
 msgstr "Не работает"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:422
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:428
 msgid "Browse"
 msgstr "Обзор"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:256
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:243
 msgid "Browse for a directory to add"
 msgstr "Выберите папку с образами игр"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:422
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:428
 msgid "Browse for an ISO directory..."
 msgstr "Выбор папки с ISO-файлами..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1079
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1080
 msgid "Browse for output directory"
 msgstr "Укажите папку для сохранения"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:328
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:331
 msgid "Buffer:"
 msgstr "Буфер:"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:58
 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:119
+#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:106
 msgid "Buttons"
 msgstr "Кнопки"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317
 msgid ""
 "Bypass the clearing of the data cache by the DCBZ instruction. Usually leave "
 "this option disabled."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:698
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:697
 msgid "C"
 msgstr "C"
 
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:77
+#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:64
 msgid "C Stick"
 msgstr "C Stick"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:77
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:64
 msgid "C-Stick"
 msgstr "C Stick"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:764
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:763
 msgid "CP reg"
 msgstr "CP reg"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:567
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547
 msgid "CPU Emulator Engine"
 msgstr "Режим эмуляции CPU"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:490
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500
 msgid "Cache Display Lists"
 msgstr "Кэшировать списки экрана"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88
 msgid ""
 "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n"
 "Decreases emulation speed by some percent (depending on your GPU).\n"
@@ -903,23 +927,38 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1858
+#, c-format
+msgid "Can't find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x"
+msgstr ""
+
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1872
+#, c-format
+msgid "Can't find WiiMote by connection handle %02x"
+msgstr ""
+
+#: Source/Core/Core/Src/HW/DVDInterface.cpp:669
+#: Source/Core/Core/Src/HW/DVDInterface.cpp:679
+msgid "Can't read from DVD_Plugin - DVD-Interface: Fatal Error"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:124
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:28
 msgid "Cancel"
 msgstr "Отмена"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:91
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:178
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:240
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:84
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:171
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:233
 #, c-format
 msgid "Cannot open %s"
 msgstr "Не удалось открыть %s"
 
-#: Source/Core/Core/Src/CoreTiming.cpp:141
+#: Source/Core/Core/Src/CoreTiming.cpp:128
 msgid "Cannot unregister events with events pending"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1078
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1061
 #, c-format
 msgid ""
 "Cannot use that file as a memory card.\n"
@@ -927,7 +966,7 @@ msgid ""
 "is not a valid gamecube memory card file"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1108
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1091
 msgid ""
 "Cannot use that file as a memory card.\n"
 "Are you trying to use the same file in both slots?"
@@ -935,30 +974,15 @@ msgstr ""
 "Нельзя использовать этот файл, как карту памяти\n"
 "Вы пытаетесь использовать один файл в обоих слотах?"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1867
-#, 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:1881
-#, c-format
-msgid "Cant find WiiMote by connection handle %02x"
-msgstr "Не получается найти WiiMote по дескриптору %02x"
-
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:679
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:689
-msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error"
-msgstr "Ошибка чтения из DVD_Plugin - DVD-Interface: Критическая ошибка"
-
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:52
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:39
 msgid "Caps Lock"
 msgstr "Caps Lock"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288
 msgid "Catalan"
 msgstr "Catalan"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:311
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:298
 msgid "Center"
 msgstr "Центр"
 
@@ -966,12 +990,12 @@ msgstr "Центр"
 msgid "Change"
 msgstr "Сменить"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:316
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:322
 msgid "Change &Disc..."
 msgstr "Сменить &диск..."
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:179
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:179
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:167
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:167
 msgid "Change Disc"
 msgstr "Изменить диск"
 
@@ -979,7 +1003,7 @@ msgstr "Изменить диск"
 msgid "Change Game"
 msgstr "Сменить игру"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:515
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495
 msgid ""
 "Change the language of the user interface.\n"
 "Requires restart."
@@ -987,102 +1011,102 @@ msgstr ""
 "Позволяет сменить язык интерфейса программы.\n"
 "Для активации требуется перезапуск."
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:60
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:47
 msgid "Changes sign to zFar Parameter (after correction)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:55
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:42
 msgid "Changes sign to zNear Parameter (after correction)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:519
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499
 msgid "Changing this will have no effect while the emulator is running!"
 msgstr ""
 "Изменения данной опции вступят в силу только после перезапуска эмулятора."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:295
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:298
 msgid "Chat"
 msgstr "Чат"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:47
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:34
 msgid "Cheat Code"
 msgstr "Чит-код"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:118
 msgid "Cheat Search"
 msgstr "Поиск кодов"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:38
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:25
 msgid "Cheats Manager"
 msgstr "Менеджер чит-кодов"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:633
 msgid "Check Partition Integrity"
 msgstr "Проверка целостности раздела"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:864
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:880
 msgid "Checking integrity..."
 msgstr "Проверка целостности ..."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289
 msgid "Chinese (Simplified)"
 msgstr "Chinese (Simplified)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290
 msgid "Chinese (Traditional)"
 msgstr "Chinese (Traditional)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:818
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:799
 msgid "Choose a DVD root directory:"
 msgstr "Выберите основной DVD-диск:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:822
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803
 msgid "Choose a NAND root directory:"
 msgstr "Выберете папку с NAND:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:815
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:796
 msgid "Choose a default ISO:"
 msgstr "Выберите файл образа:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1236
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1219
 msgid "Choose a directory to add"
 msgstr "Выберите папку для добавления в список"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1065
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1048
 msgid "Choose a file to open"
 msgstr "Выберите файл карты памяти"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:217
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:204
 msgid "Choose a memory card:"
 msgstr "Выберите карту памяти:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:819
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800
 msgid ""
 "Choose file to use as apploader: (applies to discs constructed from "
 "directories only)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:767
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:806
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:781
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:822
 msgid "Choose the folder to extract to"
 msgstr "Выберите папку для сохранения файлов"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:297
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:284
 msgid "Circle Stick"
 msgstr "Circle Stick"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:52
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:56
 msgid "Classic"
 msgstr "Circle Stick"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:144
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:43
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:487
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:913
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:137
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:30
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:474
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:904
 msgid "Clear"
 msgstr "Очистить"
 
-#: Source/Core/Core/Src/NetPlayServer.cpp:259
+#: Source/Core/Core/Src/NetPlayServer.cpp:263
 msgid ""
 "Client disconnect while game is running!! NetPlay is disabled. You must "
 "manually stop the game."
@@ -1090,122 +1114,122 @@ msgstr ""
 "Клиент отсоединился во время игры! Сетевая игра остановлена. Вы должны "
 "остановить игру."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:298
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:247
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:552
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:578
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:285
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:234
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:562
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:590
 msgid "Close"
 msgstr "Закрыть"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:174
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:177
 msgid "Co&nfigure..."
 msgstr "&Настройка эмулятора..."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:86
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:73
 msgid "Code Info"
 msgstr "Информация о коде"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:568
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:556
 msgid "Code: "
 msgstr "Код:"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:35
 msgid "Command"
 msgstr "Команда"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:629
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:623
 msgid "Comment"
 msgstr "Комментарий"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489
 msgid "Comment:"
 msgstr "Комментарий:"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:893
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:884
 msgid "Compress ISO..."
 msgstr "Сжать ISO-файл..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:905
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:899
 msgid "Compress selected ISOs..."
 msgstr "Сжать выбранные ISO-файлы..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1088
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1224
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1089
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1225
 msgid "Compressing ISO"
 msgstr "Сжатие образа"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:429
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:435
 msgid "Config"
 msgstr "Настройки"
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:37
-#: Source/Core/DolphinWX/Src/InputConfigDiag.h:135
-#: Source/Core/DolphinWX/Src/InputConfigDiag.h:154
+#: Source/Core/DolphinWX/Src/InputConfigDiag.h:122
+#: Source/Core/DolphinWX/Src/InputConfigDiag.h:141
 msgid "Configure"
 msgstr "Настройка"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:111
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:98
 msgid "Configure Control"
 msgstr "Настройка управления"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:306
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
 #: Source/Core/DolphinWX/Src/NetWindow.cpp:583
 msgid "Configure Pads"
 msgstr "Настроить контроллеры"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:429
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:435
 msgid "Configure..."
 msgstr "Настройка эмулятора..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1119
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1147
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1217
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1120
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1218
 msgid "Confirm File Overwrite"
 msgstr "Подтвердить перезапись файла"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:597
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:577
 msgid "Confirm on Stop"
 msgstr "Спрашивать при остановке"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:83
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:105
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:74
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:96
 msgid "Connect"
 msgstr "Подключиться"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:783
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:764
 msgid "Connect USB Keyboard"
 msgstr "Подключить USB-клавиатуру"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:362
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:368
 #, c-format
 msgid "Connect Wiimote %i"
 msgstr "Подключить Wiimote %i"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:195
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183
 msgid "Connect Wiimote 1"
 msgstr "Подключить Wiimote 1"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184
 msgid "Connect Wiimote 2"
 msgstr "Подключить Wiimote 2"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:185
 msgid "Connect Wiimote 3"
 msgstr "Подключить Wiimote 3"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:198
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:186
 msgid "Connect Wiimote 4"
 msgstr "Подключить Wiimote 4"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:627
+#: Source/Core/DolphinWX/Src/Main.cpp:655
 msgid "Connecting..."
 msgstr "Подключение..."
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:155
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:156
 msgid "Console"
 msgstr "Консоль"
 
@@ -1213,15 +1237,15 @@ msgstr "Консоль"
 msgid "Continuous Scanning"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:46
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:33
 msgid "Control"
 msgstr "Ctrl"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:189
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:176
 msgid "Convert to GCI"
 msgstr "Конвертировать в GCI"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:379
+#: Source/Core/Core/Src/CoreParameter.cpp:368
 msgid "Copy failed"
 msgstr "Копирование неудачно"
 
@@ -1230,21 +1254,21 @@ msgstr "Копирование неудачно"
 msgid "Copy to Memcard %c"
 msgstr "Копировать на карту памяти %c"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:359
 msgid "Core"
 msgstr "Ядро"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:154
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:148
 #, c-format
 msgid "Could not create %s"
 msgstr "Не удалось создать %s"
 
-#: Source/Core/AudioCommon/Src/AudioCommon.cpp:75
+#: Source/Core/AudioCommon/Src/AudioCommon.cpp:62
 #, c-format
 msgid "Could not initialize backend %s."
 msgstr "Не удалось инициализировать вывод %s."
 
-#: Source/Core/Core/Src/CoreParameter.cpp:137
+#: Source/Core/Core/Src/CoreParameter.cpp:126
 #, c-format
 msgid ""
 "Could not read \"%s\".  There is no disc in the drive, or it is not a GC/Wii "
@@ -1255,12 +1279,12 @@ msgstr ""
 "игры GC/Wii. Пожалйста, учитывайте, что большинство приводов для ПК не "
 "способны прочитать оригинальные диски для Gamecube и Wii."
 
-#: Source/Core/Core/Src/CoreParameter.cpp:292
+#: Source/Core/Core/Src/CoreParameter.cpp:281
 #, c-format
 msgid "Could not recognize ISO file %s"
 msgstr "Не удалось определить ISO образ %s"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:569
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:579
 #, c-format
 msgid "Could not save %s"
 msgstr "Не удалось сохранить %s"
@@ -1271,200 +1295,201 @@ msgid ""
 "(setting pads while the game is running is not yet supported)"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:123
+#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119
 #, c-format
 msgid ""
 "Could not write memory card file %s.\n"
 "\n"
 "Are you running Dolphin from a CD/DVD, or is the save file maybe write "
-"protected?"
-msgstr ""
-"Не получается сохранить карту памяти %s.\n"
+"protected?\n"
 "\n"
-"Вы запустили Dolphin с CD/DVD, или файл защищен от записи?"
+"Are you receiving this after moving the emulator directory?\n"
+"If so, then you may need to re-specify your memory card location in the "
+"options."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1107
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1133
 msgid "Couldn't find open command for extension 'ini'!"
 msgstr ""
 
-#: Source/Core/Core/Src/BootManager.cpp:146
+#: Source/Core/Core/Src/BootManager.cpp:137
 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:170
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:495
 msgid "Count:"
 msgstr "Счетчик:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:452
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456
 msgid "Country:"
 msgstr "Страна:"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:186
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:562
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:173
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:550
 msgid "Create AR Code"
 msgstr "Создать новый AR-код"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:543
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:608
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:569
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:641
 msgid "Create new perspective"
 msgstr "Создать новую точку обозрения"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:17
 msgid "Creator: "
 msgstr "Создатель:"
 
-#: Source/Core/Common/Src/MsgHandler.cpp:68
+#: Source/Core/Common/Src/MsgHandler.cpp:54
 msgid "Critical"
 msgstr "Критический"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562
 msgid "Crop"
 msgstr "обрезать"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119
 msgid ""
 "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:48
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:52
 msgid "Crossfade"
 msgstr "Crossfade"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:597
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:600
 #, c-format
-msgid "Current dir changed from %s to %s after wxFileSelector!"
-msgstr "Текущая папка сменилась с %s на %s после wxFileSelector!"
+msgid "Current directory changed from %s to %s after wxFileSelector!"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339
 msgid "Custom Projection Hack"
 msgstr "Custom Projection Hack"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.h:30
+#: Source/Core/DolphinWX/Src/PHackSettings.h:17
 msgid "Custom Projection Hack Settings"
 msgstr "Настройки Custom Projection Hack"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342
 msgid "Customize some Orthographic Projection parameters."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291
 msgid "Czech"
 msgstr "Czech"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:698
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:697
 msgid "D"
 msgstr "D"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:89
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
 msgid "D-Pad"
 msgstr "D-Pad"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:431
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
 msgid "DSP"
 msgstr "Аудио"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:639
 msgid "DSP Emulator Engine"
 msgstr "Эмулятор движка DSP"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:254
 msgid "DSP HLE emulation (fast)"
 msgstr "Эмуляция DSP HLE (быстрая)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:256
 msgid "DSP LLE interpreter (slow)"
 msgstr "Интерпретатор DSP LLE (медленный)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660
-msgid "DSP LLE on Thread"
-msgstr "DSP LLE в потоке"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:255
 msgid "DSP LLE recompiler"
 msgstr "DSP LLE рекомпилятор"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:431
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:641
+msgid "DSP on Dedicated Thread"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
 msgid "DSP settings"
 msgstr "Настройка аудио (DSP)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:838
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:819
 msgid "DVD Root:"
 msgstr "DVD-диск:"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:239
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:226
 msgid "DVDLowRead - Fatal Error: failed to read from volume"
 msgstr ""
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:333
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:320
 msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:176
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:163
 msgid "Data Size"
 msgstr "Размер данных"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468
 msgid "Date:"
 msgstr "Дата:"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:528
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:564
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:518
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:557
 msgid "Datel MaxDrive/Pro files(*.sav)"
 msgstr "Файлы Datel MaxDrive/Pro (*.sav)"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:242
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:259
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:267
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:281
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:296
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:229
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:246
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:254
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:268
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:283
 msgid "Dead Zone"
 msgstr "Мертвая зона"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:35
 msgid "Debug"
 msgstr "Отладка"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:521
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534
 msgid "Debugging"
 msgstr "Отладчик"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:79
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:66
 msgid "Decimal"
 msgstr "Десятичный"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:890
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:881
 msgid "Decompress ISO..."
 msgstr "Распаковка ISO..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:906
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:900
 msgid "Decompress selected ISOs..."
 msgstr "Снять сжатие с выбранных ISO-файлов..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1088
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1224
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1089
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1225
 msgid "Decompressing ISO"
 msgstr "Распаковка ISO..."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:912
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:903
 msgid "Default"
 msgstr "Сброс"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:835
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:816
 msgid "Default ISO:"
 msgstr "Образ по умолчанию:"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:114
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:107
 msgid "Default font"
 msgstr "Шрифт по умолчанию"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:32
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:926
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:19
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917
 msgid "Delete"
 msgstr "Удалить"
 
@@ -1472,64 +1497,68 @@ msgstr "Удалить"
 msgid "Delete Save"
 msgstr "Удалить сохранение"
 
-#: Source/Core/VideoCommon/Src/AVIDump.cpp:77
+#: Source/Core/VideoCommon/Src/AVIDump.cpp:64
 #, c-format
 msgid "Delete the existing file '%s'?"
 msgstr "Удалить существующий файл '%s'?"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:671
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:683
 msgid "Description"
 msgstr "Описание"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:472
 msgid "Detect"
 msgstr "Определить"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:233
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:328
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:220
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:315
 msgid ""
 "Detected attempt to read more data from the DVD than fit inside the out "
 "buffer. Clamp."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:127
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:898
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:114
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:889
 msgid "Device"
 msgstr "Устройство"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:798
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:731
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779
 msgid "Device Settings"
 msgstr "Настройки устройств"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:45
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:49
 msgid "Dial"
 msgstr "Вызов"
 
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:146
+#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:135
 msgid "Direct3D11"
 msgstr "Direct3D11"
 
-#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:128
+#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:125
 msgid "Direct3D9"
 msgstr "Direct3D9"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:167
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:155
 msgid ""
 "Directory checksum failed\n"
 " and Directory backup checksum failed"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:433
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:443
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485
 msgid "Disable"
 msgstr "Отключен"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:491
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501
+msgid "Disable Destination Alpha"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:409
 msgid "Disable Fog"
 msgstr "Отключить туман"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108
 msgid ""
 "Disable any XFB emulation.\n"
 "Speeds up emulation a lot but causes heavy glitches in many games which rely "
@@ -1538,7 +1567,7 @@ msgid ""
 "If unsure, leave this checked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95
 msgid ""
 "Disable emulation of EFB copies.\n"
 "These are often used for post-processing or render-to-texture effects, so "
@@ -1548,52 +1577,60 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:543
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101
+msgid ""
+"Disables emulation of a hardware feature called destination alpha, which is "
+"used in many games for various graphical effects.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:553
 msgid "Disc"
 msgstr "Диск"
 
-#: Source/Core/DiscIO/Src/DriveBlob.cpp:107
-#: Source/Core/DiscIO/Src/DriveBlob.cpp:126
+#: Source/Core/DiscIO/Src/DriveBlob.cpp:94
+#: Source/Core/DiscIO/Src/DriveBlob.cpp:113
 msgid "Disc Read Error"
 msgstr "Ошибка чтения диска"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:312
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:320
 msgid "Display"
 msgstr "Изображение"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104
 msgid ""
 "Display the inputs read by the emulator.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:80
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:67
 msgid "Divide"
 msgstr "/"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:987
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:990
 msgid "Do you want to stop the current emulation?"
 msgstr "Вы хотите остановить эмуляцию?"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:663
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:644
 msgid "Dolby Pro Logic II decoder"
 msgstr "Декодер Dolby Pro Logic II"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:864
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:856
 msgid "Dolphin"
 msgstr "Dolphin"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:183
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:188
 #, c-format
 msgid "Dolphin %s Graphics Configuration"
 msgstr "Настройки графики %s"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:292
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:298
 msgid "Dolphin &Web Site"
 msgstr "&Веб-сайт эмулятора"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.h:37
+#: Source/Core/DolphinWX/Src/ConfigMain.h:24
 msgid "Dolphin Configuration"
 msgstr "Настройки эмуляции"
 
@@ -1601,16 +1638,16 @@ msgstr "Настройки эмуляции"
 msgid "Dolphin Emulated Wiimote Configuration"
 msgstr "Настройки эмулируемого Wiimote"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:394
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:383
 msgid "Dolphin FIFO"
 msgstr "Dolphin FIFO"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1136
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1153
 msgid "Dolphin GCPad Configuration"
 msgstr "Настройки Dolphin GCPad"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:679
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1074
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:685
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1089
 msgid "Dolphin TAS Movies (*.dtm)"
 msgstr "Dolphin TAS ролики (*.dtm)"
 
@@ -1618,11 +1655,11 @@ msgstr "Dolphin TAS ролики (*.dtm)"
 msgid "Dolphin Wiimote Configuration"
 msgstr "Настройка Wiimote"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:293
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:299
 msgid "Dolphin at &Google Code"
 msgstr "&Репозиторий на Google Code"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:364
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:351
 msgid ""
 "Dolphin could not find any GC/Wii ISOs.  Doubleclick here to browse for "
 "files..."
@@ -1630,7 +1667,7 @@ msgstr ""
 "Dolphin не нашел образов игр GC/Wii. Щелкните дважды по этой надписи, чтобы "
 "указать путь..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:368
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:355
 msgid ""
 "Dolphin is currently set to hide all games.  Doubleclick here to show all "
 "games..."
@@ -1638,85 +1675,94 @@ msgstr ""
 "Dolphin настроен на скрытие всех игр. Кликните здесь два раза, чтобы "
 "показать игры..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1159
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1160
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1246
 msgid "Dolphin was unable to complete the requested action."
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:275
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:58
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
+#, fuzzy
+msgid ""
+"Doubles the emulated GPU clock rate. May speed up some games (ON = Fast, OFF "
+"= Compatible)"
+msgstr ""
+"Активирует режим быстрого доступ к диску, необходим для некоторых игр "
+"(отключите для повышения совместимости)."
+
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:262
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:45
 msgid "Down"
 msgstr "Вниз"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:54
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:44
 msgid "Download Codes (WiiRD Database)"
 msgstr "Скачать готовые коды (база WiiRD)"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:297
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:287
 #, c-format
 msgid "Downloaded %lu codes. (added %lu)"
 msgstr "Скачано %lu кодов. (добавлено %lu)"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:31
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:35
 msgid "Drums"
 msgstr "Барабаны"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:105
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
 msgid "Dummy"
 msgstr "Макет"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:661
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:642
 msgid "Dump Audio"
 msgstr "Дампить аудио"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:532
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545
 msgid "Dump EFB Target"
 msgstr "Дампить EFB Target"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546
 msgid "Dump Frames"
 msgstr "Дампить Кадры"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543
 msgid "Dump Textures"
 msgstr "Дампить текстуры"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114
 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:106
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111
 msgid ""
 "Dump decoded game textures to User/Dump/Textures/<game_id>/\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr "Сохраняет текстуры игры в User/Dump/Textures/<id игры>/ "
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113
 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:474
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292
 msgid "Dutch"
 msgstr "Dutch"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:112
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:113
 msgid "E&xit"
 msgstr "&Закрыть"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:441
 msgid "EFB Copies"
 msgstr "EFB Копии"
 
-#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:223
+#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:210
 #, c-format
 msgid ""
 "ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least "
@@ -1728,52 +1774,52 @@ msgstr ""
 "-- Если вы недавно обновили Dolphin , то скорее всего необходимо перегрузить "
 "компьютер, чтобы Windows обнаружил новый драйвер."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:166
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:160
 msgid "EUROPE"
 msgstr "ЕВРОПА"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:156
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:143
 msgid "Early Memory Updates"
 msgstr "Ранние обновление памяти"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:447
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:453
 msgid "Edit"
 msgstr "Изменить"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.h:30
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.h:17
 msgid "Edit ActionReplay Code"
 msgstr "Изменить код ActionReplay"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:285
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:286
 msgid "Edit Config"
 msgstr "Править вручную"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.h:30
+#: Source/Core/DolphinWX/Src/PatchAddEdit.h:17
 msgid "Edit Patch"
 msgstr "Изменить патч"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:447
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:453
 msgid "Edit current perspective"
 msgstr "Изменить точку"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:403
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:425
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:407
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:429
 msgid "Edit..."
 msgstr "Изменить..."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:44
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:48
 msgid "Effect"
 msgstr "Эффект"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:425
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435
 msgid "Embedded Frame Buffer"
 msgstr ""
 
-#: Source/Core/Core/Src/Core.cpp:201
+#: Source/Core/Core/Src/Core.cpp:190
 msgid "Emu Thread already running"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110
 msgid ""
 "Emulate XFBs accurately.\n"
 "Slows down emulation a lot and prohibits high-resolution rendering but is "
@@ -1782,7 +1828,7 @@ msgid ""
 "If unsure, check virtual XFB emulation instead."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109
 msgid ""
 "Emulate XFBs using GPU texture objects.\n"
 "Fixes many games which don't work without XFB emulation while not being as "
@@ -1796,7 +1842,7 @@ msgstr ""
 msgid "Emulated Wiimote"
 msgstr "Эмулируемый Wiimote"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346
 msgid "Emulation State: "
 msgstr "Качество эмуляции:"
 
@@ -1804,7 +1850,7 @@ msgstr "Качество эмуляции:"
 msgid "Enable"
 msgstr "Включить"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91
 msgid ""
 "Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's "
 "supported by your GPU.\n"
@@ -1814,72 +1860,71 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:111
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:98
 msgid "Enable AR Logging"
 msgstr "Включить логирование AR-событий"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324
 msgid "Enable Block Merging"
 msgstr "Включить совмещение блоков"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331
 msgid "Enable Bounding Box Calculation"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:446
 msgid "Enable Cache"
 msgstr "Включить кэш"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:562
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542
 msgid "Enable Cheats"
 msgstr "Включить чит-коды"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310
 msgid "Enable Dual Core"
 msgstr "Включить DualCore-режим"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
 msgid "Enable Dual Core (speedup)"
 msgstr "Включить DualCore-режим (ускорение)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:550
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:563
 msgid "Enable Hotkeys"
 msgstr "Включить горячие клавиши"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311
 msgid "Enable Idle Skipping"
 msgstr "Включить IdleSkipping-режим"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541
 msgid "Enable Idle Skipping (speedup)"
 msgstr "Включить IdleSkipping-режим (ускорение)"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312
 msgid "Enable MMU"
 msgstr "Включить MMU"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:554
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:567
 msgid "Enable Progressive Scan"
 msgstr "Включить прогрессивную развертку"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757
 msgid "Enable Screen Saver"
 msgstr "Включить режим \"Сохранения экрана\""
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:75
-#, fuzzy
 msgid "Enable Speaker Data"
-msgstr "Включить страницы"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
 msgid "Enable WideScreen"
 msgstr "Включить широкий экран"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:516
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529
 msgid "Enable Wireframe"
 msgstr "Включить каркас моделей"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85
 msgid ""
 "Enable anisotropic filtering.\n"
 "Enhances visual quality of textures that are at oblique viewing angles.\n"
@@ -1892,7 +1937,7 @@ msgstr ""
 "В некоторых играх возможны проблемы.\n"
 " Если не уверены , выберите 1х."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323
 msgid ""
 "Enable fast disc access.  Needed for a few games. (ON = Fast, OFF = "
 "Compatible)"
@@ -1904,7 +1949,7 @@ msgstr ""
 msgid "Enable pages"
 msgstr "Включить страницы"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76
 msgid ""
 "Enable this if you want the whole screen to be used for rendering.\n"
 "If this is disabled, a render window will be created instead.\n"
@@ -1912,7 +1957,7 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80
 msgid ""
 "Enable this if you want to use the main Dolphin window for rendering rather "
 "than a separate render window.\n"
@@ -1920,7 +1965,7 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:335
 msgid ""
 "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for "
 "ANY other game."
@@ -1928,11 +1973,11 @@ msgstr ""
 "Ускоряет игру The Legend of Zelda: Twilight Princess. Для любой ДРУГОЙ игры "
 "данный хак должен быть ОТКЛЮЧЕН."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340
 msgid "Enables Custom Projection Hack"
 msgstr "Включить Custom Projection Hack"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:528
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508
 msgid ""
 "Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on "
 "OSX."
@@ -1940,20 +1985,20 @@ msgstr ""
 "Включить Dolby Pro Logic II эмуляцию, используя 5.1 канальный звук. Нет "
 "поддержки в OSX."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510
 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:532
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:512
 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
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81
 msgid ""
 "Enables progressive scan if supported by the emulated software.\n"
 "Most games don't care about this.\n"
@@ -1961,7 +2006,7 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313
 msgid ""
 "Enables the Memory Management Unit, needed for some games. (ON = Compatible, "
 "OFF = Fast)"
@@ -1969,64 +2014,64 @@ msgstr ""
 "Активирует устройство управления памятью, требуется для некоторых игр "
 "(активация повышает совместимость, деактивация - скорость)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116
 msgid ""
 "Encode frame dumps using the FFV1 codec.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:40
 msgid "End"
 msgstr "Конец"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:469
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:280
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:260
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293
 msgid "English"
 msgstr "English"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:329
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:407
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:337
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:417
 msgid "Enhancements"
 msgstr "Улучшения"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:607
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:640
 msgid "Enter a name for the new perspective:"
 msgstr "Введите имя для новой точки обозрения:"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:191
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:178
 #, c-format
 msgid "Entry %d/%d"
 msgstr "Запись %d/%d"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:85
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:72
 #, c-format
 msgid "Entry 1/%d"
 msgstr "Запись 1/%d"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:204
 msgid "Equal"
 msgstr "Равно"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:45
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:156
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1242
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:32
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:150
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226
 msgid "Error"
 msgstr "Ошибки"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:381
+#: Source/Core/DolphinWX/Src/Main.cpp:409
 msgid "Error loading selected language. Falling back to system default."
 msgstr "Ошибка загрузки выбранного языка. Возвращаемся к стандартному."
 
-#: Source/Core/Common/Src/ChunkFile.h:226
+#: Source/Core/Common/Src/ChunkFile.h:221
 #, c-format
 msgid ""
 "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). "
 "Aborting savestate load..."
 msgstr ""
 
-#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:342
+#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:329
 #, c-format
 msgid ""
 "Error: Trying to access %s fonts but they are not loaded. Games may not show "
@@ -2035,38 +2080,38 @@ msgstr ""
 "Ошибка: Попытка использовать шрифт %s, но он не загружен. Игра может "
 "отображать шрифт некорректно или вылетить."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:30
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:17
 msgid "Escape"
 msgstr "Escape"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:26
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:30
 msgid "Euphoria"
 msgstr "Эйфория"
 
 #: Source/Core/Core/Src/ArmMemTools.cpp:78
-#: Source/Core/Core/Src/x64MemTools.cpp:217
+#: Source/Core/Core/Src/x64MemTools.cpp:206
 #, c-format
 msgid "Exception handler - access below memory space. %08llx%08llx"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:61
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
 msgid "Execute"
 msgstr "Выполнить"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:459
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:446
 msgid "Export Failed"
 msgstr "Экспорт неудачен"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:639
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:649
 msgid "Export File"
 msgstr "Экспортирование файла"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:177
 msgid "Export Recording"
 msgstr "Экспорт записи"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:345
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:351
 msgid "Export Recording..."
 msgstr "&Экспортировать запись процесса"
 
@@ -2074,7 +2119,7 @@ msgstr "&Экспортировать запись процесса"
 msgid "Export Save"
 msgstr "Экспортировать сохранение"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:874
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:865
 msgid "Export Wii save (Experimental)"
 msgstr "Экспортировать сохранение Wii (эксперемент)"
 
@@ -2082,100 +2127,100 @@ msgstr "Экспортировать сохранение Wii (эксперем
 msgid "Export all saves"
 msgstr "Экспортировать все сохранения"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:80
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:72
 msgid "Export failed, try again?"
 msgstr "Экспорт неудачен, повторить?"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:559
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:552
 msgid "Export save as..."
 msgstr "&Экспортировать сохранение как..."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:297
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:284
 msgid "Extension"
 msgstr "Расширение"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483
 msgid "External Frame Buffer"
 msgstr "Внешний буфер кадров"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:61
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:48
 msgid "Extra Parameter"
 msgstr "Экстра параметр"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:62
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:49
 msgid "Extra Parameter useful in ''Metroid: Other M'' only."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:614
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:624
 msgid "Extract All Files..."
 msgstr "Извлечь все файлы..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:616
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:626
 msgid "Extract Apploader..."
 msgstr "Извлечь apploader..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:617
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627
 msgid "Extract DOL..."
 msgstr "Извлечь DOL..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:610
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:620
 msgid "Extract Directory..."
 msgstr "Извлесь папку..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:612
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:622
 msgid "Extract File..."
 msgstr "Извлечь файл..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:608
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:618
 msgid "Extract Partition..."
 msgstr "Извлечь раздел..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:724
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:738
 #, c-format
 msgid "Extracting %s"
 msgstr "Извлечение %s"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:707
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:721
 msgid "Extracting All Files"
 msgstr "Извлечение всех файлов"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:707
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:721
 msgid "Extracting Directory"
 msgstr "Извлечение папки"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:710
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:724
 msgid "Extracting..."
 msgstr "Подождите..."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:892
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:893
 msgid "FIFO Byte"
 msgstr "Байт FIFO"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:45
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:32
 msgid "FIFO Player"
 msgstr "FIFO Player"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:169
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:163
 msgid "FRANCE"
 msgstr "ФРАНЦИЯ"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472
 msgid "FST Size:"
 msgstr "Размер ТФС:"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:77
+#: Source/Core/Core/Src/NetPlayClient.cpp:81
 msgid "Failed to Connect!"
 msgstr "Ошибка подключания!"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:225
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:228
 msgid "Failed to Listen!!"
 msgstr "Нельзя прослушать!!"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:307
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:300
 msgid "Failed to download codes."
 msgstr "Ошибка скачивания кодов."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:827
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:843
 #, c-format
 msgid "Failed to extract to %s!"
 msgstr "Ошибка извлечения в %s!"
@@ -2193,26 +2238,30 @@ msgid ""
 "(Choose it from the \"Audio\" tab of the configuration dialog.)"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:116
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:139
+#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:108
+#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:131
 msgid "Failed to load bthprops.cpl"
 msgstr "Невозможно загрузить bthprops.cpl"
 
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:100
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:109
+#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:90
+#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:101
 msgid "Failed to load hid.dll"
 msgstr "Ошибка подключения hid.dll"
 
-#: Source/Core/Core/Src/Movie.cpp:792
+#: Source/Core/Core/Src/Movie.cpp:783
 #, c-format
 msgid "Failed to read %s"
 msgstr "Невозможно прочитать %s"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:151
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:144
 msgid "Failed to read banner.bin"
 msgstr "Ошибка чтения banner.bin"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:223
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:178
+msgid "Failed to read bk header"
+msgstr ""
+
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:211
 #, c-format
 msgid ""
 "Failed to read block %d of the save data\n"
@@ -2220,30 +2269,35 @@ msgid ""
 "FilePosition:%llx"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:148
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:136
 msgid ""
 "Failed to read block allocation table backup correctly\n"
 "(0x8000-0x9FFF)"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:142
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:130
 msgid ""
 "Failed to read block allocation table correctly\n"
 "(0x6000-0x7FFF)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:286
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:279
 #, c-format
 msgid "Failed to read data from file %d"
 msgstr "Ошибка чтения данных из файла %d"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:136
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:367
+#, c-format
+msgid "Failed to read data from file: %s"
+msgstr ""
+
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:124
 msgid ""
 "Failed to read directory backup correctly\n"
 "(0x4000-0x5FFF)"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:130
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:118
 msgid ""
 "Failed to read directory correctly\n"
 "(0x2000-0x3FFF)"
@@ -2251,69 +2305,73 @@ msgstr ""
 "Невозможно прочитать директорию корректно \n"
 "(0x2000-0x3FFF)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:119
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:90
+msgid "Failed to read header"
+msgstr ""
+
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:107
 msgid ""
 "Failed to read header correctly\n"
 "(0x0000-0x1FFF)"
 msgstr ""
 
-#: Source/Core/DiscIO/Src/VolumeGC.cpp:61
+#: Source/Core/DiscIO/Src/VolumeGC.cpp:48
 msgid "Failed to read unique ID from disc image"
 msgstr "Ошибка чтения уникального ID из образа диска"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:84
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:71
 msgid "Failed to write BT.DINF to SYSCONF"
 msgstr "Ошибка записи BT.DINF в SYSCONF"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:228
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:221
 msgid "Failed to write bkhdr"
 msgstr "Ошибка записи bkhdr"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:164
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:157
 #, c-format
 msgid "Failed to write header for %s"
 msgstr "Ошибка записи заголовка для %s"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:258
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:251
 #, c-format
 msgid "Failed to write header for file %d"
 msgstr "Ошибка записи заголовка для файла %d"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294
 msgid "Farsi"
 msgstr "Farsi"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477
 msgid "Fast"
 msgstr "быстрое"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315
 msgid "Fast version of the MMU.  Does not work for every game."
 msgstr "Более быстрая верси MMU (работает не со всеми играми)."
 
-#: Source/Core/Core/Src/Movie.cpp:1046
+#: Source/Core/Core/Src/Movie.cpp:1037
 #, c-format
 msgid ""
 "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:199
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:202
 msgid "Fifo Player"
 msgstr "FIFO Player"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:99
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:86
 msgid "File Info"
 msgstr "Информация о файле"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:304
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:295
 msgid "File contained no codes."
 msgstr "Файл не содержит кодов."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:413
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:400
 msgid "File converted to .gci"
 msgstr "Файл конвертирован в .gci"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:428
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:415
 msgid ""
 "File could not be opened\n"
 "or does not have a valid extension"
@@ -2321,7 +2379,7 @@ msgstr ""
 "Файл не может быть открыт\n"
 "или имеет неверное расширение"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:84
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:72
 #, c-format
 msgid ""
 "File has the extension \"%s\"\n"
@@ -2330,36 +2388,36 @@ msgstr ""
 "Файл имеет расширение \"%s\"\n"
 "допустимые расширения (.raw/.gcp)"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:425
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:412
 msgid "File is not recognized as a memcard"
 msgstr "Файл не распознается как карта памяти"
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:294
+#: Source/Core/DiscIO/Src/CompressedBlob.cpp:281
 msgid "File not compressed"
 msgstr "Файл не сжат"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:127
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:109
 #, c-format
 msgid "FileIO: Unknown open mode : 0x%02x"
 msgstr "FileIO: неизвестный режим открытия : 0x%02x"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:531
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:541
 msgid "Filesystem"
 msgstr "Файловая система"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1100
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1126
 msgid "Filetype 'ini' is unknown! Will not open!"
 msgstr "Тип файла 'ini' неизвестен! Его нельзя открыть!"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:265
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:252
 msgid "Find next"
 msgstr "Найти текст"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:266
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:253
 msgid "Find previous"
 msgstr "Найти предыдущий"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:632
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626
 msgid "First Block"
 msgstr "Первый блок"
 
@@ -2367,23 +2425,23 @@ msgstr "Первый блок"
 msgid "Fix Checksums"
 msgstr "Исправить контрольную сумму"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:275
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283
 msgid "Force 16:9"
 msgstr "16:9"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:275
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283
 msgid "Force 4:3"
 msgstr "4:3"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:568
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548
 msgid "Force Console as NTSC-J"
 msgstr "Запускать консоль в режиме NTSC-J"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406
 msgid "Force Texture Filtering"
 msgstr "Принудительная фильтрация текстур"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90
 msgid ""
 "Force texture filtering even if the emulated game explicitly disabled it.\n"
 "Improves texture quality slightly but causes glitches in some games.\n"
@@ -2391,7 +2449,7 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83
 msgid ""
 "Force the game to output graphics for widescreen resolutions.\n"
 "Causes graphical glitches is some games.\n"
@@ -2399,14 +2457,14 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488
 msgid ""
 "Forces NTSC-J mode for using the Japanese ROM font.\n"
 "Left unchecked, dolphin defaults to NTSC-U and automatically enables this "
 "setting when playing Japanese games."
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:74
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:62
 msgid ""
 "Format as ascii (NTSC\\PAL)?\n"
 "Choose no for sjis (NTSC-J)"
@@ -2414,148 +2472,147 @@ msgstr ""
 "Формат в ascii (NTSC\\PAL)?\n"
 "Выберите \"no\" для sjis (NTSC-J)"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:278
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:265
 msgid "Forward"
 msgstr "Вперед"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504
 #, c-format
 msgid "Found %d results for '"
 msgstr "Найдено %d результатов для '"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:857
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:925
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:858
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:926
 msgid "Frame"
 msgstr "Кадр"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:867
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:868
 msgid "Frame "
 msgstr "Кадр"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:185
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:173
 msgid "Frame Advance"
 msgstr "Покадровый режим"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:536
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549
 msgid "Frame Dumps use FFV1"
 msgstr "Дампить кадры, используя FFV1"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:227
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:214
 msgid "Frame Info"
 msgstr "Информация о кадре"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:116
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:103
 msgid "Frame Range"
 msgstr "Диапазон кадра"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:138
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:139
 msgid "Frame S&kipping"
 msgstr "&Пропуск кадров"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:572
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552
 msgid "Framelimit:"
 msgstr "Лимит кадров:"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:204
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:191
 msgid "Frames To Record"
 msgstr "Кадров для записи"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547
 msgid "Free Look"
 msgstr "Свободный обзор"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
 msgid "French"
 msgstr "French"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:38
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:42
 msgid "Frets"
 msgstr "Лады"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:118
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:137
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:105
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:124
 msgid "From"
 msgstr "Из"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:426
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:432
 msgid "FullScr"
 msgstr "ПолнЭкран"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:256
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263
 msgid "Fullscreen resolution:"
 msgstr "Полноэкранное разрешение:"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:534
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524
 msgid "GCI File(*.gci)"
 msgstr "Файл GCI(*.gci)"
 
-#: Source/Core/DolphinWX/Src/GCMicDlg.h:44
+#: Source/Core/DolphinWX/Src/GCMicDlg.h:31
 msgid "GCMic Configuration"
 msgstr "Настройка GCMic"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:432
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
 msgid "GCPad"
 msgstr "Джойстик"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:659
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:658
 msgid "GX_CMD_INVL_VC"
 msgstr "GX_CMD_INVL_VC"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:448
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:452
 msgid "Game ID:"
 msgstr "ID игры:"
 
-#: Source/Core/Core/Src/NetPlay.cpp:229
+#: Source/Core/Core/Src/NetPlay.cpp:216
 msgid "Game is already running!"
 msgstr "Игра уже запущена!"
 
-#: Source/Core/Core/Src/NetPlay.cpp:259
+#: Source/Core/Core/Src/NetPlay.cpp:246
 msgid "Game isn't running!"
 msgstr "Игра не запущена!"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:389
-#, fuzzy
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:393
 msgid "Game not found!"
-msgstr "Игра не найдена!"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:385
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:389
 msgid "Game-Specific Settings"
 msgstr "Персональные настройки игр"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:293
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:294
 msgid "GameConfig"
 msgstr "Настройки игры"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:525
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:515
 msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)"
 msgstr "Файлы созранений GameCube(*.gci;*.gcs;*.sav)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534
 msgid "Gamecube"
 msgstr "Gamecube"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:178
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:181
 msgid "Gamecube &Pad Settings"
 msgstr "Настройки джойстика Gamecube"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:218
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1069
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:205
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1052
 msgid "Gamecube Memory Cards (*.raw,*.gcp)"
 msgstr "Файлы карт памяти Gamecube (*.raw,*.gcp)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:432
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
 msgid "Gamecube Pad settings"
 msgstr "Настройка контроллера GameCube"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:117
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302
 msgid "Gecko Codes"
 msgstr "Gecko-коды"
 
-#: Source/Core/Core/Src/GeckoCode.cpp:222
+#: Source/Core/Core/Src/GeckoCode.cpp:214
 #, c-format
 msgid ""
 "GeckoCode failed to run (CT%i CST%i) (%s)\n"
@@ -2564,10 +2621,10 @@ msgid ""
 "directory and restarting Dolphin.)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:172
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:197
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:160
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:160
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:202
 msgid "General"
 msgstr "Общие"
 
@@ -2575,30 +2632,30 @@ msgstr "Общие"
 msgid "General Settings"
 msgstr "Основные настройки"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:470
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:281
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:316
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:261
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
 msgid "German"
 msgstr "German"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:449
+#: Source/Core/Core/Src/ActionReplay.cpp:439
 #, c-format
 msgid "GetARCode: Index is greater than ar code list size %lu"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:430
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:436
 msgid "Graphics"
 msgstr "Видео"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:430
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:436
 msgid "Graphics settings"
 msgstr "Настройка видео"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:205
 msgid "Greater Than"
 msgstr "Больше чем"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87
 msgid ""
 "Greatly increases quality of textures generated using render to texture "
 "effects.\n"
@@ -2609,51 +2666,67 @@ msgid ""
 "If unsure, leave this checked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:317
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
 msgid "Greek"
 msgstr "Greek"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:22
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Green"
 msgstr "Зеленый"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:24
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Green Left"
 msgstr "Зеленая слева"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:25
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Green Right"
 msgstr "Зеленая справа"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:35
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:39
 msgid "Guitar"
 msgstr "Гитара"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1259
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1250
 msgid "HCI_CMD_INQUIRY is called, please report!"
 msgstr "Вызван HCI_CMD_INQUIRY, пожалуйста сообщите!"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:421
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504
+msgid "Hacked Buffer Upload"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431
 msgid "Hacks"
 msgstr "Хаки"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:158
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:146
 msgid "Header checksum failed"
 msgstr "Ошибка контрольной суммы заголовка"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:318
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298
 msgid "Hebrew"
 msgstr "Hebrew"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:313
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:300
 msgid "Height"
 msgstr "Высота"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:64
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:51
 msgid "Help"
 msgstr "Помощь"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:209
+#: Source/Core/DolphinWX/Src/Main.cpp:229
+msgid ""
+"Hi,\n"
+"\n"
+"Dolphin requires Mac OS X 10.7 or greater.\n"
+"Unfortunately you're running an old version of OS X.\n"
+"The last Dolphin version to support OS X 10.6 is Dolphin 3.5\n"
+"Please upgrade to 10.7 or greater to use the newest Dolphin version.\n"
+"\n"
+"Sayonara!\n"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/Main.cpp:220
 msgid ""
 "Hi,\n"
 "\n"
@@ -2670,41 +2743,41 @@ msgstr ""
 "\n"
 "Sayonara!\n"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:309
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:296
 msgid "Hide"
 msgstr "Спрятать"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:307
 msgid "Hide Mouse Cursor"
 msgstr "Скрывать курсор мыши"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79
 msgid ""
 "Hides the mouse cursor if it's on top of the emulation window.\n"
 "\n"
 "If unsure, leave this checked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:54
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41
 msgid "Home"
 msgstr "Дом"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:85
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:138
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:76
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:141
 msgid "Host"
 msgstr "Создать"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.h:44
+#: Source/Core/DolphinWX/Src/HotkeyDlg.h:31
 msgid "Hotkey Configuration"
 msgstr "Настройка \"горячих\" клавиш"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:272
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:272
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:594
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:260
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:260
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574
 msgid "Hotkeys"
 msgstr "Клавиши"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:319
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299
 msgid "Hungarian"
 msgstr "Hungarian"
 
@@ -2712,33 +2785,29 @@ msgstr "Hungarian"
 msgid "Hybrid Wiimote"
 msgstr "Гибридный Wiimote"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:532
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:519
 #, 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:786
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:773
 #, c-format
 msgid ""
-"IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available "
-"in your nand dump\n"
+"IOCTL_ES_LAUNCH: Game tried to reload an IOS or a title that is not "
+"available in your NAND dump\n"
 "TitleID %016llx.\n"
-" Dolphin will likely hang now"
+" Dolphin will likely hang now."
 msgstr ""
-"IOCTL_ES_LAUNCH: Игра попыталась загрузить IOS или приложения, которого нет "
-"в вашей копии NAND\n"
-"TitleID %016llx.\n"
-" Dolphin cкорее всего зависнет"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:313
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:300
 msgid "IOCTL_ES_READCONTENT - bad destination"
 msgstr "IOCTL_ES_READCONTENT - bad destination"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729
 msgid "IPL Settings"
 msgstr "Настройки консоли (IPL)"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269
 msgid "IR"
 msgstr "ИК"
 
@@ -2750,47 +2819,33 @@ msgstr "ИК указатель"
 msgid "IR Sensitivity:"
 msgstr "Чувствительность IR-сигнала:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:502
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:512
 msgid "ISO Details"
 msgstr "Данные образа"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:830
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:811
 msgid "ISO Directories"
 msgstr "Папки с файлами образов"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:172
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:166
 msgid "ITALY"
 msgstr "ИТАЛИЯ"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:630
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:624
 msgid "Icon"
 msgstr "Иконка"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332
 msgid ""
 "If checked, the bounding box registers will be updated. Used by the Paper "
 "Mario games."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318
-msgid ""
-"If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)"
-msgstr ""
-"Если FPS прыгает, эта опция может помочь. (ВКЛ = Совместимость, ВЫКЛ = "
-"Ускорение)"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505
-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:428
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438
 msgid "Ignore Format Changes"
 msgstr "Пропускать изменение формата"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94
 msgid ""
 "Ignore any changes to the EFB format.\n"
 "Improves performance in many games without any negative effect. Causes "
@@ -2799,7 +2854,7 @@ msgid ""
 "If unsure, leave this checked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93
 msgid ""
 "Ignore any requests of the CPU to read from or write to the EFB.\n"
 "Improves performance in some games, but might disable some gameplay-related "
@@ -2812,11 +2867,11 @@ msgstr ""
 msgid "Import Save"
 msgstr "Импортировать сохранение"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:59
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:48
 msgid "Import failed, try again?"
 msgstr "Ошибка импорта, попробовать еще раз?"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:454
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:441
 msgid ""
 "Imported file has gsc extension\n"
 "but does not have a correct header"
@@ -2824,11 +2879,11 @@ msgstr ""
 "Импортированный файл имеет расширение gsc\n"
 "но содержит неверный заголовок"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:442
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:429
 msgid "Imported file has invalid length"
 msgstr "Импортиванный неверного размера"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:451
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:438
 msgid ""
 "Imported file has sav extension\n"
 "but does not have a correct header"
@@ -2836,15 +2891,7 @@ msgstr ""
 "Импортированный файл имеет расширение sav\n"
 "но содержит неверный заголовок"
 
-#: 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/ISOProperties.cpp:347
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350
 msgid "In Game"
 msgstr "Почти играбельна"
 
@@ -2852,85 +2899,85 @@ msgstr "Почти играбельна"
 msgid "In-Game"
 msgstr "В игре"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:34
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305
 msgid "Info"
 msgstr "Информация"
 
-#: Source/Core/Common/Src/MsgHandler.cpp:65
+#: Source/Core/Common/Src/MsgHandler.cpp:51
 msgid "Information"
 msgstr "Информация"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:481
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:468
 msgid "Input"
 msgstr "Ввод"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:63
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:50
 msgid "Insert"
 msgstr "Insert"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:176
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:166
 msgid "Insert Encrypted or Decrypted code here..."
 msgstr "Вставьте сюда сам код (шифрованный или нешифрованный)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:763
 msgid "Insert SD Card"
 msgstr "Вставить SD-карту"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:34
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:21
 msgid "Insert name here.."
 msgstr "Введите имя кода..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:196
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:199
 msgid "Install WAD"
 msgstr "Установить WAD"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:895
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:888
 msgid "Install to Wii Menu"
 msgstr "Установить в меню Wii"
 
-#: Source/Core/Core/Src/x64MemTools.cpp:252
+#: Source/Core/Core/Src/x64MemTools.cpp:242
 msgid ""
 "InstallExceptionHandler called, but this platform does not yet support it."
 msgstr ""
 "Вызван InstallExceptionHandler, но ваша платформа его еще не поддерживает."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1297
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
 msgid "Installing WAD..."
 msgstr "Установка WAD..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:885
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:901
 msgid "Integrity Check Error"
 msgstr "Ошибка проверки целостности"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:891
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:907
 msgid "Integrity check completed"
 msgstr "Проверка целостности завершена"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:890
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:906
 msgid "Integrity check completed. No errors have been found."
 msgstr "Проверка целостности завершена. Ошибок не было найдено."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:882
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:898
 #, 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:552
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532
 msgid "Interface"
 msgstr "Интерфейс"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:646
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627
 msgid "Interface Settings"
 msgstr "Настройки интерфейса"
 
-#: Source/Core/Core/Src/State.cpp:240
+#: Source/Core/Core/Src/State.cpp:228
 msgid "Internal LZO Error - compression failed"
 msgstr "Внутреняя ошибка LZO - ошибка сжатия"
 
-#: Source/Core/Core/Src/State.cpp:348
+#: Source/Core/Core/Src/State.cpp:336
 #, c-format
 msgid ""
 "Internal LZO Error - decompression failed (%d) (%li, %li) \n"
@@ -2939,41 +2986,45 @@ msgstr ""
 "Внутреняя ошибка LZO - ошибка распаковки (%d) (%li, %li) \n"
 "Попробуйте звгрузить опять"
 
-#: Source/Core/Core/Src/State.cpp:485
+#: Source/Core/Core/Src/State.cpp:473
 msgid "Internal LZO Error - lzo_init() failed"
 msgstr "Внутреняя ошибка LZO - ошибка в lzo_init()"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:344
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:352
 msgid "Internal Resolution:"
 msgstr "Внутреннее разрешение:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:42
+msgid "Interpreter (VERY slow)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349
 msgid "Intro"
 msgstr "Заставка"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:194
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:187
 #, c-format
 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:600
 msgid "Invalid Value!"
 msgstr "Неверное значение!"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:462
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:449
 msgid "Invalid bat.map or dir entry"
 msgstr "Неверный bat.map или каталог"
 
-#: Source/Core/Core/Src/CoreTiming.cpp:548
+#: Source/Core/Core/Src/CoreTiming.cpp:553
 #, c-format
 msgid "Invalid event type %i"
 msgstr "Неверный тип события %i"
 
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:326
+#: Source/Core/Core/Src/HW/DVDInterface.cpp:309
 msgid "Invalid file"
 msgstr "Неверный файл"
 
-#: Source/Core/DiscIO/Src/BannerLoaderGC.cpp:41
+#: Source/Core/DiscIO/Src/BannerLoaderGC.cpp:28
 #, c-format
 msgid ""
 "Invalid opening.bnr found in gcm:\n"
@@ -2984,121 +3035,129 @@ msgstr ""
 "%s\n"
 " Лучше сделать новую копию игры."
 
-#: Source/Core/Core/Src/Movie.cpp:735
+#: Source/Core/Core/Src/Movie.cpp:726
 msgid "Invalid recording file"
 msgstr "Неверный файл записи"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:473
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:472
 msgid "Invalid search parameters (no object selected)"
 msgstr "Неудачный поиск параметров (объект не выбран)"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:456
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:455
 msgid "Invalid search string (couldn't convert to number)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:444
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:443
 msgid "Invalid search string (only even string lengths supported)"
 msgstr ""
 
-#: Source/Core/Core/Src/Core.cpp:513
+#: Source/Core/Core/Src/Core.cpp:511
 msgid "Invalid state"
 msgstr "Неверное сохранение"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:473
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:320
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300
 msgid "Italian"
 msgstr "Italian"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:183
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:177
 msgid "JAPAN"
 msgstr "ЯПОНИЯ"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:321
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:46
+msgid "JIT Recompiler (recommended)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:47
+msgid "JITIL experimental recompiler"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:279
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
 msgid "Japanese"
 msgstr "Italian"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:188
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:182
 msgid "KOREA"
 msgstr "КОРЕЯ"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78
 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:298
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:306
 msgid "Keep window on top"
 msgstr "Держать окно главным"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:241
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:241
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:229
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:229
 msgid "Key"
 msgstr "Комбинация"
 
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282
 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:322
 msgid "Korean"
 msgstr "Korean"
 
 #. i18n:  Left
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:57
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:44
 msgid "L"
 msgstr "L"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:39
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:26
 msgid "L Button"
 msgstr "Кнопка L"
 
 #. i18n:  Left-Analog
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:61
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:48
 msgid "L-Analog"
 msgstr "L-Analog"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:585
 msgid "Language:"
 msgstr "Язык"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:152
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:153
 msgid "Last Overwritten State"
 msgstr "Последнее перезаписанное сохранение"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:159
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:161
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:160
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:162
 msgid "Last Saved State"
 msgstr "Последнее сохранение"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:696
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:677
 msgid "Latency:"
 msgstr "Задержка:"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:276
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:55
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:263
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:42
 msgid "Left"
 msgstr "Влево"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:60
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:64
 msgid "Left Stick"
 msgstr "Левый стик"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:257
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:257
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:245
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:245
 msgid ""
 "Left click to detect hotkeys.\n"
 "Enter space to clear."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:689
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:678
 msgid ""
 "Left-click to detect input.\n"
 "Middle-click to clear.\n"
 "Right-click for more options."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:694
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:683
 msgid ""
 "Left/Right-click for more options.\n"
 "Middle-click to clear."
@@ -3106,76 +3165,76 @@ msgstr ""
 "Левый/Правый клик для доп. опций\n"
 "Средний-клик - очистить."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:219
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:206
 msgid "Less Than"
 msgstr "Меньше чем"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:565
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545
 msgid "Limit by FPS"
 msgstr "Лимитировать FPS"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:924
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:915
 msgid "Load"
 msgstr "Загр."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544
 msgid "Load Custom Textures"
 msgstr "Использовать свои текстуры"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
 msgid "Load State Slot 1"
 msgstr "Загрузить \"быстрое сохранение\" 1"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189
 msgid "Load State Slot 2"
 msgstr "Загрузить \"быстрое сохранение\" 2"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:190
 msgid "Load State Slot 3"
 msgstr "Загрузить \"быстрое сохранение\" 3"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:203
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:191
 msgid "Load State Slot 4"
 msgstr "Загрузить \"быстрое сохранение\" 4"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192
 msgid "Load State Slot 5"
 msgstr "Загрузить \"быстрое сохранение\" 5"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193
 msgid "Load State Slot 6"
 msgstr "Загрузить \"быстрое сохранение\" 6"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:194
 msgid "Load State Slot 7"
 msgstr "Загрузить \"быстрое сохранение\" 7"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:195
 msgid "Load State Slot 8"
 msgstr "Загрузить \"быстрое сохранение\" 8"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:155
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:156
 msgid "Load State..."
 msgstr "Загрузить игру..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1332
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1359
 msgid "Load Wii System Menu"
 msgstr "Загрузить системное меню Wii"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1327
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1354
 #, c-format
 msgid "Load Wii System Menu %d%c"
 msgstr "Загрузить системное меню Wii %d%c"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112
 msgid ""
 "Load custom textures from User/Load/Textures/<game_id>/\n"
 "\n"
@@ -3185,7 +3244,7 @@ msgstr ""
 "\n"
 "Если вы не уверены, то галочку не ставьте."
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:50
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:37
 msgid "Load preset values from hack patterns available."
 msgstr ""
 
@@ -3193,23 +3252,23 @@ msgstr ""
 msgid "Local"
 msgstr "Локальный"
 
-#: Source/Core/DolphinWX/Src/LogWindow.h:51
+#: Source/Core/DolphinWX/Src/LogWindow.h:38
 msgid "Log"
 msgstr "Лог"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:26
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:13
 msgid "Log Configuration"
 msgstr "Настройка лог-записи"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:296
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304
 msgid "Log FPS to file"
 msgstr "Записывать FPS в файл"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:96
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83
 msgid "Log Types"
 msgstr "Тип лога"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103
 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"
@@ -3217,24 +3276,24 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:81
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:68
 msgid "Logger Outputs"
 msgstr "Logger Outputs"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132
-#: Source/Core/DolphinWX/Src/Frame.cpp:328
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:119
+#: Source/Core/DolphinWX/Src/Frame.cpp:314
 msgid "Logging"
 msgstr "Окно лога"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:255
+#: Source/Core/Core/Src/NetPlayClient.cpp:259
 msgid "Lost connection to server!"
 msgstr "Соединение с сервером потеряно!"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:42
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:29
 msgid "M Button"
 msgstr "Кнопка M"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:119
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:112
 #, c-format
 msgid ""
 "MD5 mismatch\n"
@@ -3243,57 +3302,66 @@ msgstr ""
 "MD5 не совпадает\n"
 " %016llx%016llx != %016llx%016llx"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314
 msgid "MMU Speed Hack"
 msgstr "Ускорить MMU (спидхак)"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:527
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:563
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:517
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:556
 msgid "MadCatz Gameshark files(*.gcs)"
 msgstr "Файлы Gameshark MadCatz (*.gcs)"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:51
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:63
+#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:38
 msgid "Main Stick"
 msgstr "Основной стик"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460
 msgid "Maker ID:"
 msgstr "ID создателя:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487
 msgid "Maker:"
 msgstr "Создатель:"
 
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100
+msgid ""
+"Makes distant objects more visible by removing fog, thus increasing the "
+"overall detail.\n"
+"Disabling fog will break some games which rely on proper fog emulation.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:97
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:100
 msgid "Max"
 msgstr "Макс."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:448
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:435
 msgid "Memcard already has a save for this title"
 msgstr "На карте памяти уже есть сохранение этой игры"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:291
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:278
 msgid "Memcard already opened"
 msgstr "Карта памяти уже открыта"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:912
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:913
 msgid "Memory Byte"
 msgstr "Байт памяти"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:225
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:113
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:212
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:93
 msgid "Memory Card"
 msgstr "Карта памяти"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.h:36
+#: Source/Core/DolphinWX/Src/MemcardManager.h:23
 msgid ""
 "Memory Card Manager WARNING-Make backups before using, should be fixed but "
 "could mangle stuff!"
 msgstr ""
 
-#: Source/Core/Core/Src/CoreParameter.cpp:371
+#: Source/Core/Core/Src/CoreParameter.cpp:360
 #, c-format
 msgid ""
 "Memory Card filename in Slot %c is incorrect\n"
@@ -3304,15 +3372,15 @@ msgid ""
 "Would you like to copy the old file to this new location?\n"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:124
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:112
 msgid "Memorycard filesize does not match the header size"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:50
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:37
 msgid "Menu"
 msgstr "Меню"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:114
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:94
 msgid "Mic"
 msgstr "Мик."
 
@@ -3321,20 +3389,20 @@ msgstr "Мик."
 msgid "Min"
 msgstr "Мин."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:580
 msgid "Misc"
 msgstr "Разное"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:795
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776
 msgid "Misc Settings"
 msgstr "Разное"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:240
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:294
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:227
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:281
 msgid "Modifier"
 msgstr "Определение"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106
 msgid ""
 "Modify textures to show the format they're encoded in. Needs an emulation "
 "reset in most cases.\n"
@@ -3342,20 +3410,20 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:115
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:108
 msgid "Monospaced font"
 msgstr "Моноширный шрифт"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:305
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:292
 msgid "Motion Plus"
 msgstr "Motion Plus"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:309
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:86
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:296
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73
 msgid "Motor"
 msgstr "Мотор"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:654
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:666
 msgid ""
 "Move the mouse pointer over an option to display a detailed description.\n"
 "\n"
@@ -3366,224 +3434,235 @@ msgid ""
 "\n"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:75
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:62
 msgid "Multiply"
 msgstr "Умножить"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:651
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:650
 msgid "NOP"
 msgstr "NOP"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:629
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:628
 msgid "NOTE: Stream size doesn't match actual data length\n"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:129
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:116
 msgid "NP Add"
 msgstr "NP +"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:124
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:111
 msgid "NP Begin"
 msgstr "NP Begin"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:132
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:119
 msgid "NP Decimal"
 msgstr "NP Decimal"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:126
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:113
 msgid "NP Delete"
 msgstr "NP Delete"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:133
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:120
 msgid "NP Divide"
 msgstr "NP /"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:120
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:107
 msgid "NP Down"
 msgstr "NP Вниз"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:123
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:110
 msgid "NP End"
 msgstr "NP End"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:111
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:98
 msgid "NP Enter"
 msgstr "NP Enter"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:127
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:114
 msgid "NP Equal"
 msgstr "NP ="
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:116
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:103
 msgid "NP Home"
 msgstr "NP Home"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:125
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:112
 msgid "NP Insert"
 msgstr "NP Insert"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:117
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:104
 msgid "NP Left"
 msgstr "NP Влево"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:128
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:115
 msgid "NP Multiply"
 msgstr "NP *"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:122
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:109
 msgid "NP Page Down"
 msgstr "NP Page Down"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:121
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:108
 msgid "NP Page Up"
 msgstr "NP Page Up"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:119
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:106
 msgid "NP Right"
 msgstr "NP Вправо"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:130
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:117
 msgid "NP Separator"
 msgstr "NP Separator"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:109
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:96
 msgid "NP Space"
 msgstr "NP Пробел"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:131
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:118
 msgid "NP Subtract"
 msgstr "NP -"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:110
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:97
 msgid "NP Tab"
 msgstr "NP Tab"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:118
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:105
 msgid "NP Up"
 msgstr "NP Вверх"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:444
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:59
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:50
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:448
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:46
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:37
 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:25
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:72
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:282
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:553
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:15
 msgid "Name: "
 msgstr "Имя:"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:526
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:562
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:516
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:555
 msgid "Native GCI files(*.gci)"
 msgstr "Стандартные CGI-файлы (*.gci)"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:161
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:148
 msgid "New Scan"
 msgstr "Новый поиск"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:206
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:193
 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:801
 msgid "Next Page"
 msgstr "След. страница"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:165
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:152
 msgid "Next Scan"
 msgstr "Искать далее"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:68
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:59
 msgid "Nickname :"
 msgstr "Ник :"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:196
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:190
 msgid "No Country (SDK)"
 msgstr "Страна не указана (SDK)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:370
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:357
 msgid "No ISOs or WADS found"
 msgstr "ISO/WAD-файлов не обнаружено"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:508
+#: Source/Core/Core/Src/ConfigManager.h:17
+msgid "No audio output"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:501
 #, c-format
 msgid "No banner file found for title  %s"
 msgstr "Не найден баннер для  %s"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:761
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:768
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:760
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:767
 msgid "No description available"
 msgstr "Нет описания"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:514
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:535
 msgid "No docking"
 msgstr "Нет док станции"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:859
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:860
 msgid "No file loaded"
 msgstr "Файл не загружен"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:439
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:426
 msgid "No free dir index entries"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:895
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:896
 msgid "No recorded file"
 msgstr "Нет файла для записи"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:501
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:494
 #, c-format
 msgid "No save folder found for title %s"
 msgstr "Не найдена папка с сохранениями для %s"
 
+#: Source/Plugins/Plugin_VideoOGL/Src/main.cpp:132
+#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:111
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:23
 #: Source/Core/DolphinWX/Src/NetWindow.cpp:600
 msgid "None"
 msgstr "Отсутствует"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:323
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303
 msgid "Norwegian Bokmaal"
 msgstr "Norwegian Bokmaal"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:203
 msgid "Not Equal"
 msgstr "Не равно"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:804
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:794
 msgid "Not Set"
 msgstr "Неизвестно"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:626
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:101
+#, c-format
+msgid "Not a Wii save or read failure for file header size %x"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/Main.cpp:654
 msgid "Not connected"
 msgstr "Не подключено"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:309
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:296
 msgid "Notes"
 msgstr "Примечания"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:16
 msgid "Notes: "
 msgstr "Примечания:"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:71
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:74
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:580
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:621
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:629
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:59
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:64
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:613
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:659
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:667
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:31
 msgid "Notice"
 msgstr "Уведомления"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:105
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:92
 msgid "Num Lock"
 msgstr "Num Lock"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:88
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:75
 msgid "Number Of Codes: "
 msgstr "Кол-во кодов:"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:30
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:34
 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26
 msgid "Nunchuk"
 msgstr "Nunchuk"
@@ -3592,107 +3671,107 @@ msgstr "Nunchuk"
 msgid "Nunchuk Acceleration"
 msgstr "Ускорение Nunchuk"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:877
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:878
 msgid "Object"
 msgstr "Объект"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:135
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:122
 msgid "Object Range"
 msgstr "Объект диапазона"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:243
 msgid "Off"
 msgstr "Выкл"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:62
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:49
 msgid "Offset:"
 msgstr "Смещение:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:582
 msgid "On-Screen Display Messages"
 msgstr "Выводить сообщения на экран"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:436
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:423
 #, c-format
 msgid "Only %d blocks available"
 msgstr "Доступно только %d блоков"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:420
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:178
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:426
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:166
 msgid "Open"
 msgstr "Открыть"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:876
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:867
 msgid "Open &containing folder"
 msgstr "Открыть &папку с образом"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:873
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:864
 msgid "Open Wii &save folder"
 msgstr "Открыть папку с &сохранениями Wii"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:420
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:426
 msgid "Open file..."
 msgstr "Выбор файла для запуска..."
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:61
+#: Source/Core/AudioCommon/Src/OpenALStream.cpp:48
 #, c-format
 msgid "OpenAL: can't create context for device %s"
 msgstr "OpenAL: ошибка создания контекста для устройства %s"
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:72
+#: Source/Core/AudioCommon/Src/OpenALStream.cpp:59
 msgid "OpenAL: can't find sound devices"
 msgstr "OpenAL: не найдена аудио-карта"
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:66
+#: Source/Core/AudioCommon/Src/OpenALStream.cpp:53
 #, c-format
 msgid "OpenAL: can't open device %s"
 msgstr "OpenAL: ошибка открытия устройства %s"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502
 msgid "OpenCL Texture Decoder"
 msgstr "Декодер текстур OpenCL"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503
 msgid "OpenMP Texture Decoder"
 msgstr "Декодер текстур OpenMP"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:317
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:94
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:304
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:81
 msgid "Options"
 msgstr "Опции"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:22
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Orange"
 msgstr "Оранжевый"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:468
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:455
 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"
+"and import the saves to a new memcard\n"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:316
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:324
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:509
 msgid "Other"
 msgstr "Другой"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:206
+#: Source/Core/Core/Src/NetPlayClient.cpp:210
 msgid ""
 "Other client disconnected while game is running!! NetPlay is disabled. You "
 "manually stop the game."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:481
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:468
 msgid "Output"
 msgstr "Вывод"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:342
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:348
 msgid "P&lay Recording..."
 msgstr "Про&играть запись процесса"
 
-#: Source/Core/Core/Src/HW/GCPad.cpp:30
+#: Source/Core/Core/Src/HW/GCPad.cpp:18
 msgid "Pad"
 msgstr "Джойстик"
 
@@ -3700,160 +3779,160 @@ msgstr "Джойстик"
 msgid "Pad "
 msgstr "Джойстик"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:34
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:38
 msgid "Pads"
 msgstr "Джойстики"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:108
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:95
 msgid "Page Down"
 msgstr "Page Down"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:107
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:94
 msgid "Page Up"
 msgstr "Page Up"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:35
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:22
 msgid "Paragraph"
 msgstr "Параграф"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:64
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:51
 msgid "Parameters"
 msgstr "Параметры "
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:222
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:217
 #, c-format
 msgid "Partition %i"
 msgstr "Раздел %i"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:296
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:297
 msgid "Patches"
 msgstr "Патчи"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:556
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536
 msgid "Paths"
 msgstr "Папки"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1538
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1539
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:51
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1565
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1566
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:38
 msgid "Pause"
 msgstr "Пауза"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:128
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:129
 msgid "Pause at end of movie"
 msgstr "Пауза в конце ролика"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:397
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405
 msgid "Per-Pixel Lighting"
 msgstr "По-пискельное освещение"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352
 msgid "Perfect"
 msgstr "Отлично"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:609
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:642
 #, c-format
 msgid "Perspective %d"
 msgstr "Точка %d"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:165
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:424
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1547
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1548
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:152
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:430
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1574
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1575
 msgid "Play"
 msgstr "Запуск"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176
 msgid "Play Recording"
 msgstr "Проиграть записанное"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:170
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:170
 msgid "Play/Pause"
 msgstr "Старт/Пауза"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351
 msgid "Playable"
 msgstr "Играбельна"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:154
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:141
 msgid "Playback Options"
 msgstr "Параметры просмотра"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:301
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:304
 msgid "Players"
 msgstr "Игроки"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:988
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:991
 msgid "Please confirm..."
 msgstr "Пожалуйста, подтвердите..."
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:579
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:612
 msgid "Please create a perspective before saving"
 msgstr "Пожалуйста, создайте точку обозрения, прежде чем сохранять"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:36
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:23
 msgid "Plus-Minus"
 msgstr "Плюс-Минус"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:324
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304
 msgid "Polish"
 msgstr "Polish"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:713
 msgid "Port 1"
 msgstr "Порт 1"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714
 msgid "Port 2"
 msgstr "Порт 2"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:734
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715
 msgid "Port 3"
 msgstr "Порт 3"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716
 msgid "Port 4"
 msgstr "Порт 4"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:97
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:130
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:88
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:133
 msgid "Port :"
 msgstr "Порт :"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:325
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305
 msgid "Portuguese"
 msgstr "Portuguese"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:326
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306
 msgid "Portuguese (Brazilian)"
 msgstr "Portuguese (Brazilian)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:391
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:399
 msgid "Post-Processing Effect:"
 msgstr "Эффекты пост-обработки:"
 
-#: Source/Core/Core/Src/Movie.cpp:936
+#: Source/Core/Core/Src/Movie.cpp:927
 #, c-format
 msgid "Premature movie end in PlayController. %u + 8 > %u"
 msgstr ""
 
-#: Source/Core/Core/Src/Movie.cpp:1055
+#: Source/Core/Core/Src/Movie.cpp:1046
 #, c-format
 msgid "Premature movie end in PlayWiimote. %u + %d > %u"
 msgstr ""
 
-#: Source/Core/Core/Src/Movie.cpp:1032
+#: Source/Core/Core/Src/Movie.cpp:1023
 #, c-format
 msgid "Premature movie end in PlayWiimote. %u > %u"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:48
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:35
 msgid "Presets: "
 msgstr "Преднастройки"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:205
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:192
 msgid "Prev Page"
 msgstr "Пред. страница"
 
@@ -3861,67 +3940,67 @@ msgstr "Пред. страница"
 msgid "Previous Page"
 msgstr "Пред. страница"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:183
 msgid "Previous Value"
 msgstr "Предыдущее значение"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:60
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:47
 msgid "Print"
 msgstr "Print"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:894
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:885
 msgid "Profile"
 msgstr "Профиль"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.h:55
+#: Source/Core/DolphinWX/Src/ISOProperties.h:42
 msgid "Properties"
 msgstr "Свойства"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:283
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:286
 msgid "Purge Cache"
 msgstr "Очистить кэш"
 
-#: Source/Core/Common/Src/MsgHandler.cpp:66
+#: Source/Core/Common/Src/MsgHandler.cpp:52
 msgid "Question"
 msgstr "Вопрос"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:159
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:316
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:162
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:319
 msgid "Quit"
 msgstr "Выход"
 
 #. i18n:  Right
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:59
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:46
 msgid "R"
 msgstr "R"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:40
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:27
 msgid "R Button"
 msgstr "Кнопка R"
 
 #. i18n:  Right-Analog
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:63
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
 msgid "R-Analog"
 msgstr "R-Analog"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:445
 msgid "RAM"
 msgstr "Память"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:175
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:169
 msgid "RUSSIA"
 msgstr "РОССИЯ"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:528
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:515
 msgid "Range"
 msgstr "Диапазон"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:190
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:178
 msgid "Read-only mode"
 msgstr "Режим \"только для чтения\""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:487
 msgid "Real"
 msgstr "Настоящий"
 
@@ -3937,33 +4016,33 @@ msgstr "Настоящий Wiimotes"
 msgid "Reconnect Wiimote on State Loading"
 msgstr "Переподключить Wiimote 1, при загрузке \"быстрых сохранений\""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:193
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:217
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:791
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:180
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:204
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:790
 msgid "Record"
 msgstr "Запись"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:174
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:161
 msgid "Recording Info"
 msgstr "Информация о записи"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:202
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:189
 msgid "Recording Options"
 msgstr "Опции записи"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:21
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Red"
 msgstr "Красный"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:24
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Red Left"
 msgstr "Красная слева"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:25
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Red Right"
 msgstr "Красная справа"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86
 msgid ""
 "Reduces the amount of aliasing caused by rasterizing 3D graphics.\n"
 "This makes the rendered picture look less blocky.\n"
@@ -3973,255 +4052,261 @@ msgid ""
 msgstr ""
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:60
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:421
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:903
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:427
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:894
 msgid "Refresh"
 msgstr "Обновить"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:180
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:168
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:168
 msgid "Refresh List"
 msgstr "Обновить список"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:421
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:427
 msgid "Refresh game list"
 msgstr "Обновление списка игр"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:405
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:427
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:77
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:812
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:409
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:431
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:64
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:793
 msgid "Remove"
 msgstr "Удалить"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99
 msgid ""
 "Render the scene as a wireframe.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:308
 msgid "Render to Main Window"
 msgstr "Выводить изображение в главное окно"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:915
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:172
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:906
 msgid "Reset"
 msgstr "Сброс настроек"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:190
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:177
 msgid "Results"
 msgstr "Результаты"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:29
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:16
 msgid "Return"
 msgstr "Enter"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:277
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:57
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464
+msgid "Revision:"
+msgstr ""
+
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:264
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:44
 msgid "Right"
 msgstr "Вправо"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:61
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:65
 msgid "Right Stick"
 msgstr "Правый стик"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:85
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:295
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:72
 msgid "Rumble"
 msgstr "Видбрация"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:518
-msgid "Run DSP LLE on a dedicated thread (not recommended)."
-msgstr "Запускает обработку DSP LLE в отдельном потоке (не рекомендуется)."
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498
+msgid ""
+"Run DSP HLE and LLE on a dedicated thread (not recommended: might cause "
+"audio glitches with HLE and freezes with LLE)."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:327
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307
 msgid "Russian"
 msgstr "Русский"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:149
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:150
 msgid "Sa&ve State"
 msgstr "Быстрое &сохранение"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:465
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475
 msgid "Safe"
 msgstr "безопасное"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:196
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:446
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:925
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:183
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:452
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916
 msgid "Save"
 msgstr "Сохр."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:532
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:522
 msgid "Save GCI as..."
 msgstr "Сохранить CGI-файл как..."
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
 msgid "Save State Slot 1"
 msgstr "Слот \"быстрого сохранения\" 1"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:198
 msgid "Save State Slot 2"
 msgstr "Слот \"быстрого сохранения\" 2"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:199
 msgid "Save State Slot 3"
 msgstr "Слот \"быстрого сохранения\" 2"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:212
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:212
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200
 msgid "Save State Slot 4"
 msgstr "Слот \"быстрого сохранения\" 4"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201
 msgid "Save State Slot 5"
 msgstr "Слот \"быстрого сохранения\" 5"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202
 msgid "Save State Slot 6"
 msgstr "Слот \"быстрого сохранения\" 6"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:203
 msgid "Save State Slot 7"
 msgstr "Слот \"быстрого сохранения\" 7"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204
 msgid "Save State Slot 8"
 msgstr "Слот \"быстрого сохранения\" 8"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:151
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:152
 msgid "Save State..."
 msgstr "Сохранить игру как..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:582
 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:592
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:602
 msgid "Save as..."
 msgstr "Сохранить как..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1203
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1204
 msgid "Save compressed GCM/ISO"
 msgstr "Выберите место для сохранения сжатого GCM/ISO-образа"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:446
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:452
 msgid "Save current perspective"
 msgstr "Сохранить точку"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1192
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193
 msgid "Save decompressed GCM/ISO"
 msgstr "Выберите место для сохранения несжатого GCM/ISO-образа"
 
-#: Source/Core/Core/Src/Movie.cpp:801
+#: Source/Core/Core/Src/Movie.cpp:792
 #, c-format
 msgid "Savestate movie %s is corrupted, movie recording stopping..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:396
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:404
 msgid "Scaled EFB Copy"
 msgstr "Масштабируемые EFB копии"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:556
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:543
 #, c-format
 msgid "Scanning %s"
 msgstr "Сканирование %s"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:539
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:526
 msgid "Scanning for ISOs"
 msgstr "Поиск образов дисков"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:540
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:527
 msgid "Scanning..."
 msgstr "Поиск..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:427
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
 msgid "ScrShot"
 msgstr "Скриншот"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:106
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:93
 msgid "Scroll Lock"
 msgstr "Scroll Lock"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:264
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:251
 msgid "Search"
 msgstr "Поиск"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:227
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:214
 msgid "Search Filter"
 msgstr "Фильтр поиска"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:810
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:791
 msgid "Search Subfolders"
 msgstr "Искать в подпапках"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:250
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:237
 msgid "Search current Object"
 msgstr "Найти текущий объект"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:254
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:241
 msgid "Search for hex Value:"
 msgstr "Найти HEX значение:"
 
-#: Source/Core/Common/Src/SysConf.h:103 Source/Core/Common/Src/SysConf.h:126
-#: Source/Core/Common/Src/SysConf.h:146 Source/Core/Common/Src/SysConf.h:167
+#: Source/Core/Common/Src/SysConf.h:90 Source/Core/Common/Src/SysConf.h:113
+#: Source/Core/Common/Src/SysConf.h:133 Source/Core/Common/Src/SysConf.h:154
 #, c-format
 msgid "Section %s not found in SYSCONF"
 msgstr "Секция %s не найдена в SYSCONF"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:59
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:490
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:46
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:477
 msgid "Select"
 msgstr "Выбрать"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:677
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1072
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:683
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1087
 msgid "Select The Recording File"
 msgstr "Выберите файл для записи игрового процесса"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1285
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1312
 msgid "Select a Wii WAD file to install"
 msgstr "Выберете Wii WAD файл для установки"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:70
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74
 msgid ""
 "Select a hardware adapter to use.\n"
 "\n"
 "If unsure, use the first one."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:520
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:510
 msgid "Select a save file to import"
 msgstr "Выберите файл сохранения для импорта"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:363
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:366
 msgid "Select floating windows"
 msgstr "Выберите плавающие окна"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:582
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:585
 msgid "Select the file to load"
 msgstr "Выберите файл для запуска..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1241
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1268
 msgid "Select the save file"
 msgstr "Выберите файл сохранений Wii"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1388
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1415
 msgid "Select the state to load"
 msgstr "Выберите файл сохранения для загрузки"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1429
 msgid "Select the state to save"
 msgstr "Выберите или укажите файл для быстрого сохранения"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82
 msgid ""
 "Select what aspect ratio to use when rendering:\n"
 "Auto: Use the native aspect ratio\n"
@@ -4232,15 +4317,15 @@ msgid ""
 "If unsure, select Auto."
 msgstr ""
 
-#: Source/Core/InputCommon/Src/InputConfig.cpp:61
+#: Source/Core/InputCommon/Src/InputConfig.cpp:48
 msgid "Selected controller profile does not exist"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:116
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:109
 msgid "Selected font"
 msgstr "Выбранный шрифт"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75
 msgid ""
 "Selects the display resolution used in fullscreen mode.\n"
 "This should always be bigger than or equal to the internal resolution. "
@@ -4250,17 +4335,27 @@ msgid ""
 "If still unsure, use the highest resolution which works for you."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:69
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:70
 msgid ""
 "Selects what graphics API to use internally.\n"
 "Direct3D 9 usually is the fastest one. OpenGL is more accurate though. "
 "Direct3D 11 is somewhere between the two.\n"
 "Note that the Direct3D backends are only available on Windows.\n"
 "\n"
-"If unsure, use Direct3D 9."
+"If unsure, use Direct3D 11."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:288
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72
+msgid ""
+"Selects what graphics API to use internally.\n"
+"Direct3D 9 usually is the fastest one. OpenGL is more accurate though. "
+"Direct3D 11 is somewhere between the two.\n"
+"Note that the Direct3D backends are only available on Windows.\n"
+"\n"
+"If unsure, use OpenGL."
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:291
 msgid "Send"
 msgstr "Отправить"
 
@@ -4268,26 +4363,26 @@ msgstr "Отправить"
 msgid "Sensor Bar Position:"
 msgstr "Месторасположение сенсора:"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:77
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:64
 msgid "Separator"
 msgstr "Разделитель"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:328
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308
 msgid "Serbian"
 msgstr "Serbian"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:522
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502
 msgid ""
 "Serial Port 1 - This is the port which devices such as the net adapter use"
 msgstr ""
 "Последовательный порт №1 - тип порта, который используют такие устройства "
 "как сетевой адаптер."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:488
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:475
 msgid "Set"
 msgstr "Выбрать"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:877
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:868
 msgid "Set as &default ISO"
 msgstr "Сделать &игрой по умолчанию"
 
@@ -4296,134 +4391,134 @@ msgstr "Сделать &игрой по умолчанию"
 msgid "Set as default Memcard %c"
 msgstr "Установить картой памяти по умолчанию %c"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:460
+#: Source/Core/Core/Src/ActionReplay.cpp:450
 #, c-format
 msgid "SetARCode_IsActive: Index is greater than ar code list size %lu"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:515
 msgid ""
 "Sets the latency (in ms).  Higher values may reduce audio crackling. OpenAL "
 "backend only."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341
 msgid "Settings..."
 msgstr "Настройки..."
 
-#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:222
+#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:209
 msgid "SetupWiiMem: Cant find setting file"
 msgstr "SetupWiiMem: Файл настроек не найден"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:291
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:278
 msgid "Shake"
 msgstr "Встряска"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
 msgid "Short Name:"
 msgstr "Короткое имя:"
 
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:103
+#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:90
 msgid "Shoulder Buttons"
 msgstr "Shoulder Buttons"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:217
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:220
 msgid "Show &Console"
 msgstr "Отображать &консоль"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:215
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:218
 msgid "Show &Log"
 msgstr "Показать &лог"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:212
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:215
 msgid "Show &Statusbar"
 msgstr "Отображать панель &статуса"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:210
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:213
 msgid "Show &Toolbar"
 msgstr "Отображать панель &инструментов"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:281
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:284
 msgid "Show Drives"
 msgstr "Отображать игры на DVD"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:517
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530
 msgid "Show EFB Copy Regions"
 msgstr "Показывать регионы копии EFB"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:295
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303
 msgid "Show FPS"
 msgstr "Показывать FPS"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:271
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:274
 msgid "Show France"
 msgstr "Франции"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:257
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:260
 msgid "Show GameCube"
 msgstr "GameCube"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561
 msgid "Show Input Display"
 msgstr "Показать вывод экрана"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:273
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:276
 msgid "Show Italy"
 msgstr "Италии"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:264
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:267
 msgid "Show JAP"
 msgstr "JAP"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:275
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:278
 msgid "Show Korea"
 msgstr "Кореи"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476
 msgid "Show Language:"
 msgstr "Отображать язык:"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:216
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:219
 msgid "Show Log &Configuration"
 msgstr "Показать &настройки логирования"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:266
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:269
 msgid "Show PAL"
 msgstr "PAL"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:254
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:257
 msgid "Show Platforms"
 msgstr "Отображать игры платформ..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:263
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:266
 msgid "Show Regions"
 msgstr "Отображать игры регионов..."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:518
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531
 msgid "Show Statistics"
 msgstr "Показывать статистику"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:277
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:280
 msgid "Show Taiwan"
 msgstr "Тайваня"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:268
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:271
 msgid "Show USA"
 msgstr "USA"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:259
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:262
 msgid "Show Wad"
 msgstr "WAD-файлы"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:255
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:258
 msgid "Show Wii"
 msgstr "Wii"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491
 msgid "Show a confirmation box before stopping a game."
 msgstr "Активирует запрос подтверждения об остановке процесса эмуляции игры."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:512
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492
 msgid ""
 "Show a message box when a potentially serious error has occurred.\n"
 "Disabling this may avoid annoying and non-fatal messages, but it may also "
@@ -4439,11 +4534,11 @@ msgstr ""
 msgid "Show first block"
 msgstr "Показать первый блок"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:130
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:131
 msgid "Show lag counter"
 msgstr "Показать лаги счетчика"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493
 msgid ""
 "Show messages on the emulation screen area.\n"
 "These messages include memory card writes, video backend and CPU "
@@ -4466,7 +4561,7 @@ msgstr "Показать иконку"
 msgid "Show save title"
 msgstr "Показать заголовок"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102
 msgid ""
 "Show the number of frames rendered per second as a measure of emulation "
 "speed.\n"
@@ -4474,54 +4569,42 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:279
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:282
 msgid "Show unknown"
 msgstr "Неизвестные"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105
 msgid ""
 "Show various statistics.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:319
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:306
 msgid "Sideways Wiimote"
 msgstr "Повернутый Wiimote"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:280
 msgid "Simplified Chinese"
 msgstr "Simplified Chinese"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:311
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:298
 msgid "Size"
 msgstr "Размер"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:696
 msgid "Skip BIOS"
 msgstr "Пропускать загрузку BIOS"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316
 msgid "Skip DCBZ clearing"
 msgstr "Пропустить очистку DCBZ"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:492
-msgid "Skip Dest. Alpha Pass"
-msgstr "Пропустить Dest. Alpha доступ"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:444
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:454
 msgid "Skip EFB Access from CPU"
 msgstr "Пропустить EFB доступ из ЦП"
 
-#: 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 ""
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125
 msgid ""
 "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n"
 "Sometimes also increases visual quality.\n"
@@ -4531,25 +4614,25 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:374
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:386
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:380
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:392
 #, c-format
 msgid "Slot %i"
 msgstr "Слот %i"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:700
 msgid "Slot A"
 msgstr "Слот A"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:701
 msgid "Slot B"
 msgstr "Слот B"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:62
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:49
 msgid "Snapshot"
 msgstr "Снапшот"
 
-#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:58
+#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:46
 msgid "Software Renderer"
 msgstr "Программный рендинг"
 
@@ -4561,27 +4644,27 @@ msgid ""
 "Do you really want to enable software rendering? If unsure, select 'No'."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:683
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:664
 msgid "Sound Settings"
 msgstr "Настройки эмуляции звука"
 
-#: Source/Core/AudioCommon/Src/AudioCommon.cpp:77
+#: Source/Core/AudioCommon/Src/AudioCommon.cpp:64
 #, c-format
 msgid "Sound backend %s is not valid."
 msgstr "Вывод звука %s не верен."
 
-#: Source/Core/AudioCommon/Src/DSoundStream.cpp:59
+#: Source/Core/AudioCommon/Src/DSoundStream.cpp:46
 #, c-format
 msgid "Sound buffer creation failed: %s"
 msgstr "Ошибка создания аудио-буфера %s."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:31
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:18
 msgid "Space"
 msgstr "Пробел"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:329
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309
 msgid "Spanish"
 msgstr "Spanish"
 
@@ -4589,7 +4672,7 @@ msgstr "Spanish"
 msgid "Speaker Volume:"
 msgstr "Громкость динамика:"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92
 msgid ""
 "Specifies the resolution used to render at. A high resolution will improve "
 "visual quality a lot but is also quite heavy on performance and might cause "
@@ -4601,63 +4684,63 @@ msgid ""
 "If unsure, select 640x528."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322
 msgid "Speed up Disc Transfer Rate"
 msgstr "Ускорить чтение с диска"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:243
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:230
 msgid "Square Stick"
 msgstr "Квадратный стик"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:107
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87
 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:322
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:37
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:25
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:325
 msgid "Start"
 msgstr "Старт"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:194
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:197
 msgid "Start &NetPlay"
 msgstr "&Сетевая игра"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:339
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:345
 msgid "Start Re&cording"
 msgstr "Начать &запись процесса"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:175
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:175
 msgid "Start Recording"
 msgstr "Начать запись"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:312
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:299
 msgid "State"
 msgstr "Статус"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:173
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:161
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:161
 msgid "State Saves"
 msgstr "Быстрые сохранения"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:108
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88
 msgid "Steering Wheel"
 msgstr "Рулевое колесо"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:53
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:57
 msgid "Stick"
 msgstr "Стик"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:420
-#: 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:325
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:419
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:431
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:171
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:171
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:328
 msgid "Stop"
 msgstr "Стоп"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96
 msgid ""
 "Store EFB copies in GPU texture objects.\n"
 "This is not so accurate, but it works well enough for most games and gives a "
@@ -4666,114 +4749,124 @@ msgid ""
 "If unsure, leave this checked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:275
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283
 msgid "Stretch to Window"
 msgstr "Растянуть по окну"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:43
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:47
 msgid "Strum"
 msgstr "Бренчать"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:78
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:65
 msgid "Subtract"
 msgstr "Вычитать"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:77
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:67
 #, c-format
 msgid "Successfully exported file to %s"
 msgstr "Файл успешно экспортирован в %s"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:56
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:43
 msgid "Successfully imported save files"
 msgstr "Сохранение успешно импортировано"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:285
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:272
 msgid "Swing"
 msgstr "Покачивание"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:744
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:792
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320
+msgid "Synchronize GPU thread"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321
+msgid ""
+"Synchronizes the GPU and CPU threads to help prevent random freezes in Dual "
+"Core mode. (ON = Compatible, OFF = Fast)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773
 msgid "System Language:"
 msgstr "Язык системы:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:191
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:185
 msgid "TAIWAN"
 msgstr "ТАЙВАНЬ"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:127
-#: Source/Core/DolphinWX/Src/TASInputDlg.h:32
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:128
+#: Source/Core/DolphinWX/Src/TASInputDlg.h:19
 msgid "TAS Input"
 msgstr "Ввод TAS"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:28
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:15
 msgid "Tab"
 msgstr "Tab"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:510
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:531
 msgid "Tab split"
 msgstr "Разделение таблицы"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:37
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:41
 msgid "Table Left"
 msgstr "Левая панель"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:38
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:42
 msgid "Table Right"
 msgstr "Правая панель"
 
-#: 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
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:361
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:181
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:181
 msgid "Take Screenshot"
 msgstr "Сделать скриншот"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:109
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89
 msgid "TaruKonga (Bongos)"
 msgstr "TaruKonga (Bongos)"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:472
 msgid "Test"
 msgstr "Проверить"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:444
 msgid "Texture"
 msgstr "Текстура"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:451
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:461
 msgid "Texture Cache"
 msgstr "Кэширование текстур"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:519
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:532
 msgid "Texture Format Overlay"
 msgstr "Наложение форматов текстур"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:226
+#: Source/Core/Core/Src/CoreParameter.cpp:215
 msgid "The WAD has been installed successfully"
 msgstr "WAD-файл успешно установлен"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:197
+#: Source/Core/Core/Src/ActionReplay.cpp:185
 msgid "The address is invalid"
 msgstr "Неверный адрес"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:509
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:496
 msgid "The checksum was successfully fixed"
 msgstr "Контрольная сумма успешно исправлена"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1242
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226
 msgid "The chosen directory is already in the list"
 msgstr "Выбпвнная папка уже в списке"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1117
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1216
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1118
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1146
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1217
 #, c-format
 msgid ""
 "The file %s already exists.\n"
 "Do you wish to replace it?"
 msgstr ""
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:51
+#: Source/Core/AudioCommon/Src/WaveFile.cpp:38
 #, c-format
 msgid ""
 "The file %s could not be opened for writing. Please check if it's already "
@@ -4782,29 +4875,29 @@ msgstr ""
 "Файл %s не может быть открыт для записи. Проверьте, не открыт ли он другой "
 "программой."
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:44
+#: Source/Core/AudioCommon/Src/WaveFile.cpp:31
 #, c-format
 msgid "The file %s was already open, the file header will not be written."
 msgstr "Файл %s уже открыт, нельзя записать заголовок."
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:332
+#: Source/Core/Core/Src/Boot/Boot.cpp:320
 #, c-format
 msgid "The file you specified (%s) does not exist"
 msgstr "Указанный файл (%s) не существует"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:628
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:666
 msgid "The name can not be empty"
 msgstr "Имя не может быть пустым"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:620
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:658
 msgid "The name can not contain the character ','"
 msgstr "Имя не может содержать знак ','"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:142
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:129
 msgid "The resulting decrypted AR code doesn't contain any lines."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98
 msgid ""
 "The safer you adjust this, the less likely the emulator will be missing any "
 "texture updates from RAM.\n"
@@ -4812,47 +4905,47 @@ msgid ""
 "If unsure, use the rightmost value."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:445
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:432
 msgid "The save you are trying to copy has an invalid file size"
 msgstr "Сохранение, которое вы пытаетесь скопировать имеет неверный размер"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:388
+#: Source/Core/DolphinWX/Src/Main.cpp:416
 msgid ""
 "The selected language is not supported by your system. Falling back to "
 "system default."
 msgstr ""
 "Выбранный язык не поддерживается вашей системой. Возвращаемся к стандартному."
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:43
+#: Source/Core/Core/Src/NetPlayClient.cpp:47
 msgid "The server and client's NetPlay versions are incompatible!"
 msgstr "Версии \"сетевой игры\" сервера и клиента несовместимы!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:40
+#: Source/Core/Core/Src/NetPlayClient.cpp:44
 msgid "The server is full!"
 msgstr "Сервер заполнен!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:46
+#: Source/Core/Core/Src/NetPlayClient.cpp:50
 msgid "The server responded: the game is currently running!"
 msgstr "Ответ с сервера: игра уже запущена!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:49
+#: Source/Core/Core/Src/NetPlayClient.cpp:53
 msgid "The server sent an unknown error message!"
 msgstr "Сервер прислал неизвестное сообщение об ошибке!"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:119
+#: Source/Core/Core/Src/CoreParameter.cpp:108
 #, c-format
 msgid "The specified file \"%s\" does not exist"
 msgstr "Указанный файл \"%s\" не существует"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:198
+#: Source/Core/Core/Src/ActionReplay.cpp:186
 msgid "The value is invalid"
 msgstr "Неверное значение"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:642
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:623
 msgid "Theme:"
 msgstr "Тема:"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:476
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:463
 msgid ""
 "There must be a ticket for 00000001/00000002. Your NAND dump is probably "
 "incomplete."
@@ -4860,7 +4953,7 @@ msgstr ""
 "Не найден билет для 00000001/00000002. Ваша копия NAND скорее всего не "
 "полная."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308
 msgid ""
 "These settings override core Dolphin settings.\n"
 "Undetermined means the game uses Dolphin's setting."
@@ -4872,7 +4965,7 @@ msgstr ""
 "включена, выключена и неопределена (применяется глобальное значение данной "
 "опции)."
 
-#: Source/Core/Core/Src/ActionReplay.cpp:355
+#: Source/Core/Core/Src/ActionReplay.cpp:345
 msgid ""
 "This action replay simulator does not support codes that modify Action "
 "Replay itself."
@@ -4880,13 +4973,13 @@ msgstr ""
 "Симулятор action replay не поддерживает коды, которые меняют сам Action "
 "Replay. "
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505
 msgid "This could cause slow down in Wii Menu and some games."
 msgstr ""
 "Активация данной опции может привести к замедлению эмуляции в Wii-меню и "
 "некоторых играх."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118
 msgid ""
 "This feature allows you to change the game's camera.\n"
 "Move the mouse while holding the right mouse button to pan and while holding "
@@ -4898,7 +4991,15 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485
+msgid ""
+"This limits the game speed to the specified number of frames per second "
+"(full speed is 60 for NTSC and 50 for PAL). Alternatively, 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/ConfigMain.cpp:484
 msgid ""
 "This splits the Video and CPU threads, so they can be run on separate "
 "cores.\n"
@@ -4906,75 +5007,75 @@ msgid ""
 "cause occasional crashes/glitches."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:286
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:287
 msgid "This will let you Manually Edit the INI config file"
 msgstr "Это позволит вам вручную править INI файл с конфигурацией"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:249
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:254
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:236
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:241
 msgid "Threshold"
 msgstr "Порог"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:288
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:275
 msgid "Tilt"
 msgstr "Наклон"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:628
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:304
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:622
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:291
 msgid "Title"
 msgstr "Название"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:125
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:144
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:112
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:131
 msgid "To"
 msgstr "К"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:72
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59
 msgid "Toggle All Log Types"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:426
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:432
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:180
 msgid "Toggle Fullscreen"
 msgstr "Включение полноэкранного режима"
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:87
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:271
 msgid "Top"
 msgstr "сверху"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:281
 msgid "Traditional Chinese"
 msgstr "Traditional Chinese"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:426
+#: Source/Core/Core/Src/Boot/Boot.cpp:414
 msgid "Tried to load an unknown file type."
 msgstr "Попытка загрузить неизвестный тип файла."
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:80
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:67
 msgid "Triggers"
 msgstr "Рычажки"
 
-#: Source/Core/Common/Src/SysConf.h:91 Source/Core/Common/Src/SysConf.h:114
+#: Source/Core/Common/Src/SysConf.h:78 Source/Core/Common/Src/SysConf.h:101
 msgid "Trying to read from invalid SYSCONF"
 msgstr "Попытка чтения из неверного SYSCONF"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:44
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:31
 msgid ""
 "Trying to read from invalid SYSCONF\n"
 "Wiimote bt ids are not available"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:330
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
 msgid "Turkish"
 msgstr "Turkish"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:33
 msgid "Turntable"
 msgstr "Таблица переключения"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:71
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58
 msgid "Type"
 msgstr "Тип:"
 
@@ -4982,31 +5083,31 @@ msgstr "Тип:"
 msgid "UDP Port:"
 msgstr "Порт UDP:"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:279
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:266
 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12
 msgid "UDP Wiimote"
 msgstr "UDP Wiimote"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:199
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:193
 msgid "UNKNOWN"
 msgstr "НЕИЗВЕСТНО"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:756
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:755
 #, c-format
 msgid "UNKNOWN_%02X"
 msgstr "UNKNOWN_%02X"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:178
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:172
 msgid "USA"
 msgstr "США"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:225
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:214
 msgid ""
 "Unable to create patch from given values.\n"
 "Entry not modified."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:124
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:111
 #, c-format
 msgid ""
 "Unable to parse line %lu of the entered AR code as a valid encrypted or "
@@ -5014,74 +5115,88 @@ msgid ""
 "Would you like to ignore this line and continue parsing?"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:391
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:397
 #, c-format
 msgid "Undefined %i"
 msgstr "Не определено %i"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:163
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:164
 msgid "Undo Load State"
 msgstr "Отменить загрузку"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:718
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:717
 msgid "Unexpected 0x80 call? Aborting..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:215
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:202
 msgid "Unknown"
 msgstr "Неизвестно"
 
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:971
+#: Source/Core/Core/Src/HW/DVDInterface.cpp:965
 #, c-format
 msgid "Unknown DVD command %08x - fatal error"
 msgstr "Неизвестная комманда DVD %08x - критическая ошибка"
 
-#: Source/Core/Common/Src/SysConf.cpp:145
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:444
+#, c-format
+msgid "Unknown command 0x%08x"
+msgstr ""
+
+#: Source/Core/Common/Src/SysConf.cpp:132
 #, c-format
 msgid "Unknown entry type %i in SYSCONF (%s@%x)!"
 msgstr "Неизвестный тип записи %i в SYSCONF (%s@%x)!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:228
+#: Source/Core/Core/Src/NetPlayClient.cpp:232
 #, c-format
 msgid "Unknown message received with id : %d"
 msgstr "Получено неизвестное сообщение с id : %d"
 
-#: Source/Core/Core/Src/NetPlayServer.cpp:504
+#: Source/Core/Core/Src/NetPlayServer.cpp:508
 #, c-format
 msgid "Unknown message with id:%d received from player:%d Kicking player!"
 msgstr "Получено неизвестное сообщение с id : %d от игрока:%d Игрок выкинут!"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:274
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:56
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:261
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:43
 msgid "Up"
 msgstr "Вверх"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:108
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:95
 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17
 msgid "Update"
 msgstr "Обновить"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:320
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:307
 msgid "Upright Wiimote"
 msgstr "Перевернутый Wiimote"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:777
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758
 msgid "Use EuRGB60 Mode (PAL60)"
 msgstr "Использовать EuRGB60-режим (PAL60)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:294
 msgid "Use Fullscreen"
 msgstr "Использовать полноэкранный режим"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:575
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:563
 msgid "Use Hex"
 msgstr "Использовать HEX"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:600
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580
 msgid "Use Panic Handlers"
 msgstr "Показывать panic-уведомления (ошибки)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89
+msgid ""
+"Use a hacked upload strategy to stream vertices.\n"
+"This usually speed up, but is forbidden by OpenGL specification and may "
+"causes heavy glitches.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122
 msgid ""
 "Use multiple threads to decode textures.\n"
 "Might result in a speedup (especially on CPUs with more than two cores).\n"
@@ -5089,7 +5204,7 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126
 msgid ""
 "Usually if shader compilation fails, an error message is displayed.\n"
 "However, one may skip the popups to allow interruption free gameplay by "
@@ -5098,53 +5213,58 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:539
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:552
 msgid "Utility"
 msgstr "Утилиты"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:285
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:293
 msgid "V-Sync"
 msgstr "V-Sync"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:209
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318
+#, fuzzy
+msgid "VBeam Speed Hack"
+msgstr "Ускорить MMU (спидхак)"
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196
 msgid "Value"
 msgstr "Значение"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:73
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:60
 msgid "Value:"
 msgstr "Значение:"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:572
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:560
 msgid "Value: "
 msgstr "Значение:"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:51
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:38
 msgid "Verbosity"
 msgstr "Глубина анализа"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:377
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:381
 msgid "Video"
 msgstr "Видео"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:486
 msgid "Virtual"
 msgstr "Виртуальный"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:689
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670
 msgid "Volume"
 msgstr "Громкость"
 
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:498
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:527
+#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:488
+#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:517
 #, c-format
 msgid "WAD installation failed: error creating %s"
 msgstr "Ошибка установки WAD: ошибка создания %s"
 
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:547
+#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:537
 msgid "WAD installation failed: error creating ticket"
 msgstr "Невозможно установить WAD: ошибка создания билета"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84
 msgid ""
 "Wait for vertical blanks in order to reduce tearing.\n"
 "Decreases performance if emulation speed is below 100%.\n"
@@ -5152,25 +5272,25 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/Common/Src/MsgHandler.cpp:67
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46
+#: Source/Core/Common/Src/MsgHandler.cpp:53
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:33
 #: Source/Core/DolphinWX/Src/VideoConfigDiag.h:85
 msgid "Warning"
 msgstr "Предупреждение"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:291
+#: Source/Core/Core/Src/Boot/Boot.cpp:279
 msgid "Warning - starting DOL in wrong console mode!"
 msgstr "Предупреждение: запуск DOL в неправильном режиме!"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:341
+#: Source/Core/Core/Src/Boot/Boot.cpp:329
 msgid "Warning - starting ELF in wrong console mode!"
 msgstr "Предупреждение: запуск ELF в неправильном режиме!"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:221
+#: Source/Core/Core/Src/Boot/Boot.cpp:209
 msgid "Warning - starting ISO in wrong console mode!"
 msgstr "Предупреждение: запуск ISO в неправильном режиме!"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:519
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:512
 #, c-format
 msgid ""
 "Warning! it is advised to backup all files in the folder:\n"
@@ -5180,7 +5300,7 @@ msgstr ""
 "Предупреждение: Советуем создать резервную копию файлов папки: %s\n"
 "Хотите продолжить?"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:585
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:578
 #, c-format
 msgid ""
 "Warning: This will overwrite any existing saves that are in the folder:\n"
@@ -5193,7 +5313,7 @@ msgstr ""
 "с совпадающими именами будут переписаны\n"
 "Продолжить?"
 
-#: Source/Core/Core/Src/Movie.cpp:844
+#: Source/Core/Core/Src/Movie.cpp:835
 #, c-format
 msgid ""
 "Warning: You loaded a save that's after the end of the current movie. (byte "
@@ -5201,7 +5321,7 @@ msgid ""
 "load this state with read-only mode off."
 msgstr ""
 
-#: Source/Core/Core/Src/Movie.cpp:861
+#: Source/Core/Core/Src/Movie.cpp:852
 #, c-format
 msgid ""
 "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You "
@@ -5209,7 +5329,7 @@ msgid ""
 "only mode off. Otherwise you'll probably get a desync."
 msgstr ""
 
-#: Source/Core/Core/Src/Movie.cpp:870
+#: Source/Core/Core/Src/Movie.cpp:861
 #, c-format
 msgid ""
 "Warning: You loaded a save whose movie mismatches on frame %d. You should "
@@ -5228,49 +5348,49 @@ msgid ""
 "%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d"
 msgstr ""
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:106
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:129
+#: Source/Core/AudioCommon/Src/WaveFile.cpp:93
+#: Source/Core/AudioCommon/Src/WaveFile.cpp:116
 msgid "WaveFileWriter - file not open."
 msgstr "WaveFileWriter - файл не открыт."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:56
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:60
 msgid "Whammy"
 msgstr "Сглаз"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:404
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:408
 msgid "Widescreen Hack"
 msgstr "Форсировать \"Широкоформатный экран\""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:312
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:299
 msgid "Width"
 msgstr "Ширина"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535
 msgid "Wii"
 msgstr "Wii"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:372
 msgid "Wii Console"
 msgstr "Wii"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:844
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:825
 msgid "Wii NAND Root:"
 msgstr "Wii NAND Root:"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:191
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:194
 msgid "Wii Save Import"
 msgstr "Импорт сохранений Wii"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1243
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1270
 msgid "Wii save files (*.bin)|*.bin"
 msgstr "Файлы сохранений Wii (*.bin)|*.bin"
 
-#: Source/Core/DiscIO/Src/WiiWad.cpp:82
+#: Source/Core/DiscIO/Src/WiiWad.cpp:69
 msgid "WiiWAD: Could not read from file"
 msgstr "WiiWAD: Нельзя прочесть файл"
 
-#: Source/Core/Core/Src/HW/Wiimote.cpp:17
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
+#: Source/Core/Core/Src/HW/Wiimote.cpp:20
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
 msgid "Wiimote"
 msgstr "Wiimote"
 
@@ -5279,7 +5399,7 @@ msgstr "Wiimote"
 msgid "Wiimote %i"
 msgstr "Wiimote %i"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:628
+#: Source/Core/DolphinWX/Src/Main.cpp:656
 msgid "Wiimote Connected"
 msgstr "Wiimote подключен"
 
@@ -5287,7 +5407,7 @@ msgstr "Wiimote подключен"
 msgid "Wiimote Motor"
 msgstr "Включить поддержку мотора"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
 msgid "Wiimote settings"
 msgstr "Настройка Wiimote"
 
@@ -5295,99 +5415,117 @@ msgstr "Настройка Wiimote"
 msgid "Wiimotes"
 msgstr "Wiimotes"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:134
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:121
 msgid "Windows Left"
 msgstr "Windows Left"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:136
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:123
 msgid "Windows Menu"
 msgstr "Windows Menu"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:135
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:122
 msgid "Windows Right"
 msgstr "Windows Right"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:131
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:124
 msgid "Word Wrap"
 msgstr "Перенос строк"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1298
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:864
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1089
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1225
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1325
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:880
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1090
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1226
 msgid "Working..."
 msgstr "Подождите..."
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:338
+msgid "Write memcards (GC)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46
 msgid "Write to Console"
 msgstr "Выводить в консоль"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:67
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:54
 msgid "Write to Debugger"
 msgstr "Записать в отладчик"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:57
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44
 msgid "Write to File"
 msgstr "Сохранять в файл"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:61
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48
 msgid "Write to Window"
 msgstr "Записать в окно"
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:60
+#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:47
 #, c-format
 msgid "XAudio2 CreateSourceVoice failed: %#X"
 msgstr "XAudio2 CreateSourceVoice ошибка: %#X"
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:114
+#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:101
 #, c-format
 msgid "XAudio2 init failed: %#X"
 msgstr "XAudio2 ошибка инициализации: %#X"
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:124
+#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:111
 #, c-format
 msgid "XAudio2 master voice creation failed: %#X"
 msgstr "XAudio2 ошибка создания master voice: %#X"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:766
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:765
 msgid "XF reg"
 msgstr "XF reg"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:21
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Yellow"
 msgstr "Желтый"
 
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:107
+#: Source/Core/Core/Src/DSP/DSPCore.cpp:120
 msgid ""
-"You are using free dsp roms made by Dolphin Team.\n"
-"Only Zelda ucode games will work correctly with them.\n"
+"You are using a free DSP ROM made by the Dolphin Team.\n"
+"All Wii games will work correctly, and most GC games should also work fine, "
+"but the GBA/IPL/CARD UCodes will not work.\n"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:73
+#: Source/Core/Core/Src/DSP/DSPCore.cpp:116
+msgid ""
+"You are using an old free DSP ROM made by the Dolphin Team.\n"
+"Only games using the Zelda UCode will work correctly.\n"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:63
 msgid "You can't close panes that have pages in them."
 msgstr "Вы не можете закрыть панель, в которой есть страницы."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:207
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:210
 msgid "You must choose a game!!"
 msgstr "Выберите игру!"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:605
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:593
 msgid "You must enter a name!"
 msgstr "Введите название!"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:450
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:438
 msgid "You must enter a valid decimal, hexadecimal or octal value."
 msgstr "Нужно ввести десятичное или шестнадцатиричное число."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:603
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:591
 msgid "You must enter a valid profile name."
 msgstr "Введите правильное имя профиля."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:936
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:917
 msgid "You must restart Dolphin in order for the change to take effect."
 msgstr "Необходимо перезапустить Dolphin, чтобы изменения вступили в силу."
 
-#: Source/Core/Core/Src/CoreParameter.cpp:175
+#: Source/Core/Core/Src/DSP/DSPCore.cpp:109
+msgid ""
+"Your DSP ROMs have incorrect hashes.\n"
+"Would you like to stop now to fix the problem?\n"
+"If you select \"No\", audio might be garbled."
+msgstr ""
+
+#: Source/Core/Core/Src/CoreParameter.cpp:164
 msgid ""
 "Your GCM/ISO file seems to be invalid (invalid country).\n"
 "Continue with PAL region?"
@@ -5395,7 +5533,7 @@ msgstr ""
 "Ваш файл GCM/ISO, видимо, неверен (неверный регион).\n"
 "Продолжить в режиме PAL?"
 
-#: Source/Core/Common/Src/SysConf.cpp:58
+#: Source/Core/Common/Src/SysConf.cpp:45
 #, c-format
 msgid ""
 "Your SYSCONF file is the wrong size.\n"
@@ -5405,25 +5543,25 @@ msgstr ""
 "Ваш файл SYSCONF неверного размера (0x%2$04llx), а должен быть 0x%1$04x\n"
 "Вы хотите создать новый?"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:334
 msgid "ZTP hack"
 msgstr "Включить ZTP-хак"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:387
+#: Source/Core/Core/Src/ActionReplay.cpp:377
 msgid "Zero 3 code not supported"
 msgstr "Zero 3 code не поддерживается"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:408
+#: Source/Core/Core/Src/ActionReplay.cpp:398
 #, c-format
 msgid "Zero code unknown to dolphin: %08x"
 msgstr "Zero code неизвестен dolphin: %08x"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:436
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:460
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:423
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:447
 msgid "[ waiting ]"
 msgstr "[ жду ]"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107
 msgid ""
 "[BROKEN]\n"
 "Highlight regions the EFB was copied from.\n"
@@ -5431,11 +5569,11 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:91
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:78
 msgid "[Custom]"
 msgstr "[Модифицированный]"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120
 msgid ""
 "[EXPERIMENTAL]\n"
 "Aims to speed up emulation by offloading texture decoding to the GPU using "
@@ -5446,7 +5584,7 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121
 msgid ""
 "[EXPERIMENTAL]\n"
 "Speeds up emulation a bit by caching display lists.\n"
@@ -5455,79 +5593,47 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:508
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:495
 msgid "^ ADD"
 msgstr "^ ДОБАВИТЬ"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:820
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:801
 msgid "apploader (.img)"
 msgstr "загрузчик (.img)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:185
-msgid "failed to read bk header"
-msgstr "Ошибка чтения заголовка bk"
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:375
-#, c-format
-msgid "failed to read data from file: %s"
-msgstr "Невозможно прочесть данные из файла: %s"
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:97
-msgid "failed to read header"
-msgstr "ошибка чтения заголовка"
-
-#: Source/Core/Core/Src/PowerPC/JitInterface.cpp:285
+#: Source/Core/Core/Src/PowerPC/JitInterface.cpp:272
 #, c-format
 msgid "iCacheJIT: Reading Opcode from %x. Please report."
 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 "это сохранение не от Wii или ошибка чтения заголовка размером %x"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:935
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:936
 msgid "s"
 msgstr "s"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:457
-#, c-format
-msgid "unknown cmd 0x%08x"
-msgstr "неизвестная команда 0x%08x"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1110
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1136
 msgid "wxExecute returned -1 on application run!"
 msgstr "wxExecute вернул -1 при запуске приложения!"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:56
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:43
 msgid "zFar Correction: "
 msgstr "zFar Коррекция: "
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:51
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:38
 msgid "zNear Correction: "
 msgstr "zNear Коррекция: "
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:493
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:480
 msgid "| OR"
 msgstr "| ИЛИ"
 
-#~ msgid "%i connected"
-#~ msgstr "%i подключен"
+#~ msgid "Accurate VBeam emulation"
+#~ msgstr "Аккуратная VBeam эмуляция"
 
-#~ msgid "Alternate Wiimote Timing"
-#~ msgstr "Альтернативный тайминг Wiimote"
+#~ msgid ""
+#~ "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)"
+#~ msgstr ""
+#~ "Если FPS прыгает, эта опция может помочь. (ВКЛ = Совместимость, ВЫКЛ = "
+#~ "Ускорение)"
 
-#~ msgid "Interpreter (VERY slow)"
-#~ msgstr "Интерпретатор (ОЧЕНЬ медленный)"
-
-#~ msgid "JIT Recompiler (recommended)"
-#~ msgstr "JIT-рекомпилятор (рекомендуется)"
-
-#~ msgid "JITIL experimental recompiler"
-#~ msgstr "JITIL-рекомпилятор (экспериментальный)"
-
-#~ msgid "Pair Up"
-#~ msgstr "Объединить"
-
-#~ msgid "Reconnect Wiimote Confirm"
-#~ msgstr "Подтверждение переподключения Wiimote"
+#~ msgid "Skip Dest. Alpha Pass"
+#~ msgstr "Пропустить Dest. Alpha доступ"
diff --git a/Languages/po/sr.po b/Languages/po/sr.po
index 6dda9c8b3c..a1addba3dc 100644
--- a/Languages/po/sr.po
+++ b/Languages/po/sr.po
@@ -3,13 +3,13 @@
 # This file is distributed under the same license as the dolphin-emu package.
 #
 # Translators:
-# nikolassj, 2011.
+# nikolassj, 2011
 msgid ""
 msgstr ""
 "Project-Id-Version: Dolphin Emulator\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-10 08:56-0500\n"
-"PO-Revision-Date: 2013-02-02 08:31+0000\n"
+"POT-Creation-Date: 2013-04-18 23:00-0500\n"
+"PO-Revision-Date: 2013-04-04 08:13+0000\n"
 "Last-Translator: delroth <delroth@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: sr\n"
@@ -19,21 +19,21 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:511
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:499
 msgid " (too many to display)"
 msgstr "&"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:270
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:273
 #: Source/Core/DolphinWX/Src/NetWindow.cpp:491
 #: Source/Core/DolphinWX/Src/NetWindow.cpp:530
 msgid " Game : "
 msgstr "Igra"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:507
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494
 msgid "! NOT"
 msgstr "! NE"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:70
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:58
 #, c-format
 msgid ""
 "\"%s\" does not exist.\n"
@@ -42,92 +42,94 @@ msgstr ""
 "\"%s\" ne postoji.\n"
 " Kreiraj novu memorisku karticu (16mb)?"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:142
+#: Source/Core/Core/Src/CoreParameter.cpp:131
 #, c-format
 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:722
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:721
 #, c-format
 msgid "%08X:  "
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:196
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:183
 #, c-format
 msgid "%1$sCopy%1$s"
 msgstr "%1$sKopiraj%1$s"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:128
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:296
+#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:113
+#, c-format
+msgid "%d samples"
+msgstr ""
+
+#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:112
+#, c-format
+msgid "%d samples (quality level %d)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:121
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:289
 #, c-format
 msgid "%s already exists, overwrite?"
 msgstr "%s vec postoji, zameniti?"
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:167
+#: Source/Core/DiscIO/Src/CompressedBlob.cpp:154
 #, c-format
 msgid "%s failed to be scrubbed. Probably the image is corrupt."
 msgstr "%s ije uspelo da bude scrubbed. Najverovatnije je \"image\" ostecen."
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:95
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:83
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
 " Card file size is invalid (0x%x bytes)"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:110
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:98
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
 " Card size is invalid (0x%x bytes)"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:90
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:78
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
 "file is not large enough to be a valid memory card file (0x%x bytes)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:367
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:359
 #, c-format
 msgid "%s failed to open"
 msgstr "%s nije uspelo da otvori"
 
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:97
-#, c-format
-msgid ""
-"%s has an incorrect hash.\n"
-"Would you like to stop now to fix the problem?\n"
-"If you select \"No\", audio will be garbled."
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:360
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:352
 #, c-format
 msgid "%s is a 0 byte file"
 msgstr "%s je 0 byte fajl"
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:159
+#: Source/Core/DiscIO/Src/CompressedBlob.cpp:146
 #, c-format
 msgid "%s is already compressed! Cannot compress it further."
 msgstr "%s je vec kompresovan! Nemoze se kompresovati vise."
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:345
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:337
 #, c-format
 msgid "%s is too long for the filename, max chars is 45"
 msgstr "%s je previse dugo za \"filename\", maximalno slova 45"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:202
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:189
 #, c-format
 msgid "%sDelete%s"
 msgstr "%sObrisi%s"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:200
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:187
 #, c-format
 msgid "%sExport GCI%s"
 msgstr "%sExportuj GCI%s"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:198
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:185
 #, c-format
 msgid "%sImport GCI%s"
 msgstr "%sImportuj GCI%s"
@@ -137,222 +139,246 @@ msgstr "%sImportuj GCI%s"
 msgid "%u Free Blocks; %u Free Dir Entries"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:506
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:493
 msgid "&& AND"
 msgstr "&& I"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:295
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:301
 msgid "&About..."
 msgstr "&O"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:99
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:100
 msgid "&Boot from DVD Drive..."
 msgstr "&Bootuj sa DVD drajvera"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:231
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:234
 msgid "&Breakpoints"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:110
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:111
 msgid "&Browse for ISOs..."
 msgstr "&Trazi \"ISO\""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:192
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:195
 msgid "&Cheats Manager"
 msgstr "&Chit Meneger "
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:177
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:180
 msgid "&DSP Settings"
 msgstr "&DSP Opcije"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:885
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:876
 msgid "&Delete ISO..."
 msgstr "&Obrisi ISO..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:903
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:897
 msgid "&Delete selected ISOs..."
 msgstr "&Obrisi oznacene ISO fajlove..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:170
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:173
 msgid "&Emulation"
 msgstr "&Emulacija"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:113
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:114
 msgid "&File"
 msgstr "&Fajl"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:335
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:341
 msgid "&Frame Advance"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:352
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:358
 msgid "&Fullscreen"
 msgstr "&Pun Ekran"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:176
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:179
 msgid "&Graphics Settings"
 msgstr "&Graficke Opcije"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:296
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:302
 msgid "&Help"
 msgstr "&Pomoc"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:180
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:183
 msgid "&Hotkey Settings"
 msgstr "&Hotkey Opcije"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:233
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:236
 msgid "&JIT"
 msgstr "&JIT"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:148
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:149
 msgid "&Load State"
 msgstr "Loaduj Savestate"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:190
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:193
 msgid "&Memcard Manager (GC)"
 msgstr "&Memorijska kartica (Meneger za GC)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:232
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:235
 msgid "&Memory"
 msgstr "&Memorija"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:313
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:319
 msgid "&Open..."
 msgstr "&Otvori..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:186
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:189
 msgid "&Options"
 msgstr "&Opcije"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:324
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:330
 msgid "&Pause"
 msgstr "&Pauza"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:326
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:332
 msgid "&Play"
 msgstr "&Pokreni"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:867
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:858
 msgid "&Properties"
 msgstr "&Pribor/Opcije"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:348
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:354
 msgid "&Read-only mode"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:319
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:325
 msgid "&Refresh List"
 msgstr "&Refresuj listu"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:230
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:233
 msgid "&Registers"
 msgstr "&Registri"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:332
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:338
 msgid "&Reset"
 msgstr "&Reset"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:234
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:237
 msgid "&Sound"
 msgstr "&Zvuk"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:329
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:335
 msgid "&Stop"
 msgstr "&Stop"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:207
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:210
 msgid "&Tools"
 msgstr "&Alat"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:235
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:238
 msgid "&Video"
 msgstr "&Video"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:284
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:287
 msgid "&View"
 msgstr "&Pogledaj"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:179
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:182
 msgid "&Wiimote Settings"
 msgstr "&Wiimote Opcije"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:868
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:859
 msgid "&Wiki"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504
 msgid "'"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:59
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:46
 msgid "(-)+zFar"
 msgstr "(-)+zFar"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:54
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:41
 msgid "(-)+zNear"
 msgstr "(-)+zNear"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:99
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:86
 msgid "(UNKNOWN)"
 msgstr "(NEPOZNAT/O)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:376
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:384
 msgid "(off)"
 msgstr "(iskljucen/o)"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:655
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:654
 msgid "0x44"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+msgid "1.5x Native (960x792)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:158
 msgid "16 bit"
 msgstr "16 bit"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+msgid "1x Native (640x528)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+msgid "2.5x Native (1600x1320)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+msgid "2x Native (1280x1056)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:159
 msgid "32 bit"
 msgstr "32 bit"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:412
 msgid "3D Vision"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+msgid "3x Native (1920x1584)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+msgid "4x Native (2560x2112)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:157
 msgid "8 bit"
 msgstr "8 bit"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:43
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:30
 msgid "<Insert name here>"
 msgstr "<Ubaci ime ovde>"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:255
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:262
 msgid "<No resolutions found>"
 msgstr "<Rezolucija nije pronadjena>"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:104
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84
 msgid "<Nothing>"
 msgstr "<Nista>"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:162
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:162
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:150
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:150
 msgid "<Press Key>"
 msgstr "<Pritisni taster>"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286
 msgid "<System>"
 msgstr "<Sistem>"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695
 msgid "A"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:201
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:235
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:204
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:238
 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:353
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:387
 msgid "A game is not currently running."
 msgstr "Nijedna igra trenutno nije pokrenuta."
 
@@ -362,36 +388,36 @@ msgid ""
 "You must manually connect your wiimotes."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:109
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:100
 msgid ""
 "ALERT:\n"
 "\n"
-"NetPlay will currently only work properly when using the following "
-"settings:\n"
-" - Dual Core [OFF]\n"
-" - Audio Throttle [OFF]\n"
-" - DSP-HLE with \"Null Audio\" or DSP-LLE\n"
-" - Manually set the exact number of controllers that will be used to "
-"[Standard Controller]\n"
+"Netplay will only work with the following settings:\n"
+" - Enable Dual Core [OFF]\n"
+" - DSP Emulator Engine Must be the same on all computers!\n"
+" - DSP on Dedicated Thread [OFF]\n"
+" - Framelimit NOT set to [Audio]\n"
+" - Manually set the exact number of controllers to be used to [Standard "
+"Controller]\n"
 "\n"
-"All players should try to use the same Dolphin version and settings.\n"
-"Disable all memory cards or send them to all players before starting.\n"
-"Wiimote support has not been implemented.\n"
+"All players should use the same Dolphin version and settings.\n"
+"All memory cards must be identical between players or disabled.\n"
+"Wiimote support has not been implemented!\n"
 "\n"
-"You must forward TCP port to host!!"
+"The host must have the chosen TCP port open/forwarded!\n"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:111
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:116
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96
 msgid "AM-Baseboard"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:299
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:115
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:300
 msgid "AR Codes"
 msgstr "AR Kodovi"
 
-#: Source/Core/DolphinWX/Src/AboutDolphin.h:33
+#: Source/Core/DolphinWX/Src/AboutDolphin.h:21
 msgid "About Dolphin"
 msgstr "O Dolphin-u"
 
@@ -399,15 +425,11 @@ msgstr "O Dolphin-u"
 msgid "Acceleration"
 msgstr "Ubrzanje"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:463
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473
 msgid "Accuracy:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317
-msgid "Accurate VBeam emulation"
-msgstr "Tacna VBeam emulacija"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97
 msgid ""
 "Accurately emulate EFB copies.\n"
 "Some games depend on this for certain graphical effects or gameplay "
@@ -416,12 +438,12 @@ msgid ""
 "If unsure, check EFB to Texture instead."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:239
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:239
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:227
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:227
 msgid "Action"
 msgstr "Akcija"
 
-#: Source/Core/Core/Src/ARDecrypt.cpp:481
+#: Source/Core/Core/Src/ARDecrypt.cpp:469
 #, c-format
 msgid ""
 "Action Replay Code Decryption Error:\n"
@@ -431,102 +453,102 @@ msgid ""
 "%s"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:667
+#: Source/Core/Core/Src/ActionReplay.cpp:657
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:755
+#: Source/Core/Core/Src/ActionReplay.cpp:745
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide "
 "(%s)"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:547
+#: Source/Core/Core/Src/ActionReplay.cpp:537
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And "
 "Fill (%s)"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:607
+#: Source/Core/Core/Src/ActionReplay.cpp:597
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Write To "
 "Pointer (%s)"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:802
+#: Source/Core/Core/Src/ActionReplay.cpp:792
 #, c-format
 msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:682
+#: Source/Core/Core/Src/ActionReplay.cpp:672
 #, c-format
 msgid ""
 "Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)\n"
 "Master codes are not needed. Do not use master codes."
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:196
+#: Source/Core/Core/Src/ActionReplay.cpp:184
 #, c-format
 msgid "Action Replay Error: invalid AR code line: %s"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:872
+#: Source/Core/Core/Src/ActionReplay.cpp:862
 #, c-format
 msgid "Action Replay: Conditional Code: Invalid Size %08x (%s)"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:945
+#: Source/Core/Core/Src/ActionReplay.cpp:935
 #, c-format
 msgid "Action Replay: Invalid Normal Code Type %08x (%s)"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:896
+#: Source/Core/Core/Src/ActionReplay.cpp:886
 #, c-format
 msgid "Action Replay: Normal Code %i: Invalid subtype %08x (%s)"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:838
+#: Source/Core/Core/Src/ActionReplay.cpp:828
 #, c-format
 msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:242
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:247
 msgid "Adapter:"
 msgstr "Adapter"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:76
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:63
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:63
 msgid "Add"
 msgstr "Dodaj"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1275
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1301
 msgid "Add ActionReplay Code"
 msgstr "Dodaj ActionReplay kod"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1204
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1230
 msgid "Add Patch"
 msgstr "Dodaj Patch "
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:507
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:528
 msgid "Add new pane"
 msgstr "Dodaj nova okna"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:404
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:426
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:811
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:408
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:430
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:792
 msgid "Add..."
 msgstr "Dodaj..."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:90
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:81
 msgid "Address :"
 msgstr "Adresa :"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:58
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:45
 msgid ""
 "Adds the specified value to zFar Parameter.\n"
 "Two ways to express the floating point values.\n"
@@ -537,7 +559,7 @@ msgid ""
 "NOTE: Check LogWindow/Console for the acquired values."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:53
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:40
 msgid ""
 "Adds the specified value to zNear Parameter.\n"
 "Two ways to express the floating point values.\n"
@@ -548,48 +570,48 @@ msgid ""
 "NOTE: Check LogWindow/Console for the acquired values."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:755
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:744
 msgid "Adjust the analog control pressure required to activate buttons."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:509
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:522
 msgid "Advanced"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561
 msgid "Advanced Settings"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:584
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:587
 msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:816
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:797
 msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1189
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1190
 msgid "All Gamecube GCM files (gcm)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1390
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1404
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1417
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1431
 msgid "All Save States (sav, s##)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1187
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1188
 msgid "All Wii ISO files (iso)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1207
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1208
 msgid "All compressed GC/Wii ISO files (gcz)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:124
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:104
 msgid "All files (*.*)|*.*"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123
 msgid ""
 "Allows toggling certain options via the hotkeys 3 (Internal Resolution), 4 "
 "(Aspect Ratio), 5 (Copy EFB) and 6 (Fog) within the emulation window.\n"
@@ -597,50 +619,50 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:285
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:272
 msgid "Analyze"
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:298
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:285
 msgid "Angle"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:367
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:375
 msgid "Anisotropic Filtering:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:350
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:358
 msgid "Anti-Aliasing:"
 msgstr ""
 
-#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:308
+#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:299
 msgid "Apploader is the wrong size...is it really an apploader?"
 msgstr ""
 
-#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:302
+#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:293
 msgid "Apploader unable to load from file"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:841
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:822
 msgid "Apploader:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:135
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:122
 msgid "Apply"
 msgstr "Primeni "
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124
 msgid ""
 "Apply a post-processing effect after finishing a frame.\n"
 "\n"
 "If unsure, select (off)."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287
 msgid "Arabic"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:614
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:603
 #, c-format
 msgid "Are you sure you want to delete \"%s\"?"
 msgstr "Jeste li sigurni da zelite da obrisete \"%s\"?"
@@ -657,206 +679,210 @@ msgstr ""
 msgid "Are you sure you want to delete this file?  It will be gone forever!"
 msgstr "Jesi li siguran da zelis da obrises ovaj fajl? Nestace zauvek!"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:789
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:277
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:44
+msgid "Arm JIT (experimental)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:285
 msgid "Aspect Ratio:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:70
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:58
 msgid "At least one pane must remain open."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:553
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533
 msgid "Audio"
 msgstr "Zvuk"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:694
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675
 msgid "Audio Backend:"
 msgstr ""
 
-#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:41
+#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:28
 msgid "AudioCommon: Error opening AO device.\n"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:275
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283
 msgid "Auto"
 msgstr "Auto"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:337
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345
 msgid "Auto (Multiple of 640x528)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:337
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345
 msgid "Auto (Window Size)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:297
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305
 msgid "Auto adjust Window Size"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77
 msgid ""
 "Automatically adjusts the window size to your internal resolution.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:697
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696
 msgid "B"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:755
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:754
 msgid "BP register "
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:27
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:14
 msgid "Back"
 msgstr "Nazad "
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:698
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:679
 msgid "Backend Settings"
 msgstr ""
 
-#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:60
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:206
+#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:47
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:211
 msgid "Backend:"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:318
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:95
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:305
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:82
 msgid "Background Input"
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:279
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:266
 msgid "Backward"
 msgstr "U nazad"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:264
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:257
 msgid "Bad File Header"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:627
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:621
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:290
 msgid "Banner"
 msgstr "Baner"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:519
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:529
 msgid "Banner Details"
 msgstr "Detalji o Baneru"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491
 msgid "Banner:"
 msgstr "Baner:"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:57
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:61
 msgid "Bar"
 msgstr "Bar"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:308
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:316
 msgid "Basic"
 msgstr "Osnovno/ni/ne"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555
 msgid "Basic Settings"
 msgstr "Osnovne opcije"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:22
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Bass"
 msgstr "Bas"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:186
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:174
 msgid "Block Allocation Table checksum failed"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:631
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625
 msgid "Blocks"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:21
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Blue"
 msgstr "Blue"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:24
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Blue Left"
 msgstr "Blue left "
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:25
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Blue Right"
 msgstr "Blue right "
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:87
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270
 msgid "Bottom"
 msgstr "Donji deo/dno"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:238
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:225
 #, c-format
 msgid "Bound Controls: %lu"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348
 msgid "Broken"
 msgstr "Ostecen/a/nje..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:422
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:428
 msgid "Browse"
 msgstr "Trazi"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:256
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:243
 msgid "Browse for a directory to add"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:422
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:428
 msgid "Browse for an ISO directory..."
 msgstr "Trazi ISO direktoriju"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1079
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1080
 msgid "Browse for output directory"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:328
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:331
 msgid "Buffer:"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:58
 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:119
+#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:106
 msgid "Buttons"
 msgstr "Tasteri"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317
 msgid ""
 "Bypass the clearing of the data cache by the DCBZ instruction. Usually leave "
 "this option disabled."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:698
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:697
 msgid "C"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:77
+#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:64
 msgid "C Stick"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:77
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:64
 msgid "C-Stick"
 msgstr "C-Stick"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:764
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:763
 msgid "CP reg"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:567
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547
 msgid "CPU Emulator Engine"
 msgstr "CPU Emulacije \"Engine\""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:490
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500
 msgid "Cache Display Lists"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88
 msgid ""
 "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n"
 "Decreases emulation speed by some percent (depending on your GPU).\n"
@@ -865,23 +891,38 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1858
+#, c-format
+msgid "Can't find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x"
+msgstr ""
+
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1872
+#, c-format
+msgid "Can't find WiiMote by connection handle %02x"
+msgstr ""
+
+#: Source/Core/Core/Src/HW/DVDInterface.cpp:669
+#: Source/Core/Core/Src/HW/DVDInterface.cpp:679
+msgid "Can't read from DVD_Plugin - DVD-Interface: Fatal Error"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:124
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:28
 msgid "Cancel"
 msgstr "Odustani"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:91
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:178
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:240
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:84
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:171
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:233
 #, c-format
 msgid "Cannot open %s"
 msgstr "Nemoze otvoriti %s"
 
-#: Source/Core/Core/Src/CoreTiming.cpp:141
+#: Source/Core/Core/Src/CoreTiming.cpp:128
 msgid "Cannot unregister events with events pending"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1078
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1061
 #, c-format
 msgid ""
 "Cannot use that file as a memory card.\n"
@@ -889,36 +930,21 @@ msgid ""
 "is not a valid gamecube memory card file"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1108
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1091
 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:1867
-#, 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:1881
-#, c-format
-msgid "Cant find WiiMote by connection handle %02x"
-msgstr ""
-
-#: 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 ""
-
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:52
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:39
 msgid "Caps Lock"
 msgstr "Caps Lock"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288
 msgid "Catalan"
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:311
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:298
 msgid "Center"
 msgstr "Centar "
 
@@ -926,12 +952,12 @@ msgstr "Centar "
 msgid "Change"
 msgstr "Promeni"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:316
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:322
 msgid "Change &Disc..."
 msgstr "Promeni &Disk..."
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:179
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:179
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:167
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:167
 msgid "Change Disc"
 msgstr "Promeni Disk"
 
@@ -939,7 +965,7 @@ msgstr "Promeni Disk"
 msgid "Change Game"
 msgstr "Promeni Igru"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:515
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495
 msgid ""
 "Change the language of the user interface.\n"
 "Requires restart."
@@ -947,101 +973,101 @@ msgstr ""
 "Promeni jezik.\n"
 " Zahteva restart."
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:60
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:47
 msgid "Changes sign to zFar Parameter (after correction)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:55
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:42
 msgid "Changes sign to zNear Parameter (after correction)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:519
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499
 msgid "Changing this will have no effect while the emulator is running!"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:295
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:298
 msgid "Chat"
 msgstr "Chat/Caskanje"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:47
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:34
 msgid "Cheat Code"
 msgstr "Chit kod"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:118
 msgid "Cheat Search"
 msgstr "Trazi Chit"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:38
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:25
 msgid "Cheats Manager"
 msgstr "Chit Meneger"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:633
 msgid "Check Partition Integrity"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:864
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:880
 msgid "Checking integrity..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289
 msgid "Chinese (Simplified)"
 msgstr "Kineski (pojednostavljen)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290
 msgid "Chinese (Traditional)"
 msgstr "Kineski (tradicionalan)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:818
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:799
 msgid "Choose a DVD root directory:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:822
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803
 msgid "Choose a NAND root directory:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:815
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:796
 msgid "Choose a default ISO:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1236
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1219
 msgid "Choose a directory to add"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1065
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1048
 msgid "Choose a file to open"
 msgstr "Biraj fajl da otvoris "
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:217
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:204
 msgid "Choose a memory card:"
 msgstr "Biraj memorisku karticu:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:819
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800
 msgid ""
 "Choose file to use as apploader: (applies to discs constructed from "
 "directories only)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:767
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:806
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:781
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:822
 msgid "Choose the folder to extract to"
 msgstr "Biraj folder u kome zelis da ekstraktujes "
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:297
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:284
 msgid "Circle Stick"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:52
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:56
 msgid "Classic"
 msgstr "Klasik/a"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:144
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:43
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:487
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:913
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:137
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:30
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:474
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:904
 msgid "Clear"
 msgstr "Ocisti"
 
-#: Source/Core/Core/Src/NetPlayServer.cpp:259
+#: Source/Core/Core/Src/NetPlayServer.cpp:263
 msgid ""
 "Client disconnect while game is running!! NetPlay is disabled. You must "
 "manually stop the game."
@@ -1049,122 +1075,122 @@ msgstr ""
 "Klient diskonektovao dok je igra pokrenuta!! NetPlay je onesposobljen. Moras "
 "manualno zaustaviti igru."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:298
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:247
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:552
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:578
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:285
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:234
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:562
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:590
 msgid "Close"
 msgstr "Zatvori"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:174
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:177
 msgid "Co&nfigure..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:86
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:73
 msgid "Code Info"
 msgstr "Informacija o kodu "
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:568
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:556
 msgid "Code: "
 msgstr "Kod:"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:35
 msgid "Command"
 msgstr "Komanda"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:629
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:623
 msgid "Comment"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489
 msgid "Comment:"
 msgstr "Koment:"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:893
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:884
 msgid "Compress ISO..."
 msgstr "Kompresuj ISO..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:905
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:899
 msgid "Compress selected ISOs..."
 msgstr "Kompresuj oznaceni ISO fajlovi..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1088
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1224
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1089
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1225
 msgid "Compressing ISO"
 msgstr "Kompresivanje ISO fajla u toku"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:429
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:435
 msgid "Config"
 msgstr "Podesi"
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:37
-#: Source/Core/DolphinWX/Src/InputConfigDiag.h:135
-#: Source/Core/DolphinWX/Src/InputConfigDiag.h:154
+#: Source/Core/DolphinWX/Src/InputConfigDiag.h:122
+#: Source/Core/DolphinWX/Src/InputConfigDiag.h:141
 msgid "Configure"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:111
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:98
 msgid "Configure Control"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:306
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
 #: Source/Core/DolphinWX/Src/NetWindow.cpp:583
 msgid "Configure Pads"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:429
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:435
 msgid "Configure..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1119
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1147
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1217
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1120
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1218
 msgid "Confirm File Overwrite"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:597
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:577
 msgid "Confirm on Stop"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:83
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:105
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:74
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:96
 msgid "Connect"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:783
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:764
 msgid "Connect USB Keyboard"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:362
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:368
 #, c-format
 msgid "Connect Wiimote %i"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:195
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183
 msgid "Connect Wiimote 1"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184
 msgid "Connect Wiimote 2"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:185
 msgid "Connect Wiimote 3"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:198
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:186
 msgid "Connect Wiimote 4"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/Main.cpp:627
+#: Source/Core/DolphinWX/Src/Main.cpp:655
 msgid "Connecting..."
 msgstr "Povezivanje..."
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:155
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:156
 msgid "Console"
 msgstr "Konzola"
 
@@ -1172,15 +1198,15 @@ msgstr "Konzola"
 msgid "Continuous Scanning"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:46
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:33
 msgid "Control"
 msgstr "Kontrola"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:189
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:176
 msgid "Convert to GCI"
 msgstr "Konvertuj u GCI"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:379
+#: Source/Core/Core/Src/CoreParameter.cpp:368
 msgid "Copy failed"
 msgstr "Kopiranje neuspesno "
 
@@ -1189,21 +1215,21 @@ msgstr "Kopiranje neuspesno "
 msgid "Copy to Memcard %c"
 msgstr "Kopiraj na memorisku karticu %c"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:359
 msgid "Core"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:154
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:148
 #, c-format
 msgid "Could not create %s"
 msgstr ""
 
-#: Source/Core/AudioCommon/Src/AudioCommon.cpp:75
+#: Source/Core/AudioCommon/Src/AudioCommon.cpp:62
 #, c-format
 msgid "Could not initialize backend %s."
 msgstr ""
 
-#: Source/Core/Core/Src/CoreParameter.cpp:137
+#: Source/Core/Core/Src/CoreParameter.cpp:126
 #, c-format
 msgid ""
 "Could not read \"%s\".  There is no disc in the drive, or it is not a GC/Wii "
@@ -1211,12 +1237,12 @@ msgid ""
 "most PC DVD drives."
 msgstr ""
 
-#: Source/Core/Core/Src/CoreParameter.cpp:292
+#: Source/Core/Core/Src/CoreParameter.cpp:281
 #, c-format
 msgid "Could not recognize ISO file %s"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:569
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:579
 #, c-format
 msgid "Could not save %s"
 msgstr ""
@@ -1227,197 +1253,201 @@ msgid ""
 "(setting pads while the game is running is not yet supported)"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:123
+#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119
 #, c-format
 msgid ""
 "Could not write memory card file %s.\n"
 "\n"
 "Are you running Dolphin from a CD/DVD, or is the save file maybe write "
-"protected?"
+"protected?\n"
+"\n"
+"Are you receiving this after moving the emulator directory?\n"
+"If so, then you may need to re-specify your memory card location in the "
+"options."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1107
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1133
 msgid "Couldn't find open command for extension 'ini'!"
 msgstr ""
 
-#: Source/Core/Core/Src/BootManager.cpp:146
+#: Source/Core/Core/Src/BootManager.cpp:137
 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:170
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:495
 msgid "Count:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:452
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456
 msgid "Country:"
 msgstr "Zemlja:"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:186
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:562
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:173
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:550
 msgid "Create AR Code"
 msgstr "Kreiraj AR Kod"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:543
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:608
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:569
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:641
 msgid "Create new perspective"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:17
 msgid "Creator: "
 msgstr "Kreator "
 
-#: Source/Core/Common/Src/MsgHandler.cpp:68
+#: Source/Core/Common/Src/MsgHandler.cpp:54
 msgid "Critical"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562
 msgid "Crop"
 msgstr "Izseci"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119
 msgid ""
 "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:48
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:52
 msgid "Crossfade"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:597
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:600
 #, c-format
-msgid "Current dir changed from %s to %s after wxFileSelector!"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336
-msgid "Custom Projection Hack"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/PHackSettings.h:30
-msgid "Custom Projection Hack Settings"
+msgid "Current directory changed from %s to %s after wxFileSelector!"
 msgstr ""
 
 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:339
+msgid "Custom Projection Hack"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/PHackSettings.h:17
+msgid "Custom Projection Hack Settings"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342
 msgid "Customize some Orthographic Projection parameters."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291
 msgid "Czech"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:698
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:697
 msgid "D"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:89
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
 msgid "D-Pad"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:431
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
 msgid "DSP"
 msgstr "DSP"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:639
 msgid "DSP Emulator Engine"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:254
 msgid "DSP HLE emulation (fast)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:256
 msgid "DSP LLE interpreter (slow)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660
-msgid "DSP LLE on Thread"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:255
 msgid "DSP LLE recompiler"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:431
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:641
+msgid "DSP on Dedicated Thread"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
 msgid "DSP settings"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:838
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:819
 msgid "DVD Root:"
 msgstr ""
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:239
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:226
 msgid "DVDLowRead - Fatal Error: failed to read from volume"
 msgstr ""
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:333
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:320
 msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:176
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:163
 msgid "Data Size"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468
 msgid "Date:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:528
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:564
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:518
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:557
 msgid "Datel MaxDrive/Pro files(*.sav)"
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:242
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:259
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:267
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:281
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:296
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:229
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:246
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:254
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:268
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:283
 msgid "Dead Zone"
 msgstr "Mrtva Zona "
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:35
 msgid "Debug"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:521
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534
 msgid "Debugging"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:79
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:66
 msgid "Decimal"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:890
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:881
 msgid "Decompress ISO..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:906
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:900
 msgid "Decompress selected ISOs..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1088
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1224
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1089
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1225
 msgid "Decompressing ISO"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:912
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:903
 msgid "Default"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:835
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:816
 msgid "Default ISO:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:114
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:107
 msgid "Default font"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:32
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:926
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:19
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917
 msgid "Delete"
 msgstr "Obrisi"
 
@@ -1425,64 +1455,68 @@ msgstr "Obrisi"
 msgid "Delete Save"
 msgstr "Obrisi save"
 
-#: Source/Core/VideoCommon/Src/AVIDump.cpp:77
+#: Source/Core/VideoCommon/Src/AVIDump.cpp:64
 #, c-format
 msgid "Delete the existing file '%s'?"
 msgstr "Obrisi postojeci fajl '%s'?"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:671
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:683
 msgid "Description"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:472
 msgid "Detect"
 msgstr "Detekuj"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:233
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:328
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:220
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:315
 msgid ""
 "Detected attempt to read more data from the DVD than fit inside the out "
 "buffer. Clamp."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:127
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:898
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:114
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:889
 msgid "Device"
 msgstr "Uredjaj "
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:798
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:731
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779
 msgid "Device Settings"
 msgstr "Opcije Uredjaja "
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:45
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:49
 msgid "Dial"
 msgstr ""
 
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:146
+#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:135
 msgid "Direct3D11"
 msgstr "Direct3D11"
 
-#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:128
+#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:125
 msgid "Direct3D9"
 msgstr "Direct3D9"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:167
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:155
 msgid ""
 "Directory checksum failed\n"
 " and Directory backup checksum failed"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:433
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:443
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485
 msgid "Disable"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:491
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501
+msgid "Disable Destination Alpha"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:409
 msgid "Disable Fog"
 msgstr "Onemoguci \"Fog\""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108
 msgid ""
 "Disable any XFB emulation.\n"
 "Speeds up emulation a lot but causes heavy glitches in many games which rely "
@@ -1491,7 +1525,7 @@ msgid ""
 "If unsure, leave this checked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95
 msgid ""
 "Disable emulation of EFB copies.\n"
 "These are often used for post-processing or render-to-texture effects, so "
@@ -1501,52 +1535,60 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:543
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101
+msgid ""
+"Disables emulation of a hardware feature called destination alpha, which is "
+"used in many games for various graphical effects.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:553
 msgid "Disc"
 msgstr "Disk"
 
-#: Source/Core/DiscIO/Src/DriveBlob.cpp:107
-#: Source/Core/DiscIO/Src/DriveBlob.cpp:126
+#: Source/Core/DiscIO/Src/DriveBlob.cpp:94
+#: Source/Core/DiscIO/Src/DriveBlob.cpp:113
 msgid "Disc Read Error"
 msgstr "Error tokom ucitavanje diska"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:312
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:320
 msgid "Display"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104
 msgid ""
 "Display the inputs read by the emulator.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:80
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:67
 msgid "Divide"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:987
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:990
 msgid "Do you want to stop the current emulation?"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:663
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:644
 msgid "Dolby Pro Logic II decoder"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:864
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:856
 msgid "Dolphin"
 msgstr "Dolphin"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:183
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:188
 #, c-format
 msgid "Dolphin %s Graphics Configuration"
 msgstr "Dolphin %s Graficka Podesavanja "
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:292
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:298
 msgid "Dolphin &Web Site"
 msgstr "Dolphin &Web Sajt"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.h:37
+#: Source/Core/DolphinWX/Src/ConfigMain.h:24
 msgid "Dolphin Configuration"
 msgstr "Dolphin podesavanja/konfiguracija"
 
@@ -1554,16 +1596,16 @@ msgstr "Dolphin podesavanja/konfiguracija"
 msgid "Dolphin Emulated Wiimote Configuration"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:394
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:383
 msgid "Dolphin FIFO"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1136
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1153
 msgid "Dolphin GCPad Configuration"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:679
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1074
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:685
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1089
 msgid "Dolphin TAS Movies (*.dtm)"
 msgstr ""
 
@@ -1571,101 +1613,107 @@ msgstr ""
 msgid "Dolphin Wiimote Configuration"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:293
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:299
 msgid "Dolphin at &Google Code"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:364
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:351
 msgid ""
 "Dolphin could not find any GC/Wii ISOs.  Doubleclick here to browse for "
 "files..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:368
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:355
 msgid ""
 "Dolphin is currently set to hide all games.  Doubleclick here to show all "
 "games..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1159
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1160
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1246
 msgid "Dolphin was unable to complete the requested action."
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:275
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:58
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
+msgid ""
+"Doubles the emulated GPU clock rate. May speed up some games (ON = Fast, OFF "
+"= Compatible)"
+msgstr ""
+
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:262
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:45
 msgid "Down"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:54
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:44
 msgid "Download Codes (WiiRD Database)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:297
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:287
 #, c-format
 msgid "Downloaded %lu codes. (added %lu)"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:31
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:35
 msgid "Drums"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:105
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
 msgid "Dummy"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:661
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:642
 msgid "Dump Audio"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:532
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545
 msgid "Dump EFB Target"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546
 msgid "Dump Frames"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543
 msgid "Dump Textures"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114
 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:106
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111
 msgid ""
 "Dump decoded game textures to User/Dump/Textures/<game_id>/\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113
 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:474
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292
 msgid "Dutch"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:112
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:113
 msgid "E&xit"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:441
 msgid "EFB Copies"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:223
+#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:210
 #, c-format
 msgid ""
 "ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least "
@@ -1674,52 +1722,52 @@ msgid ""
 "driver."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:166
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:160
 msgid "EUROPE"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:156
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:143
 msgid "Early Memory Updates"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:447
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:453
 msgid "Edit"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.h:30
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.h:17
 msgid "Edit ActionReplay Code"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:285
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:286
 msgid "Edit Config"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.h:30
+#: Source/Core/DolphinWX/Src/PatchAddEdit.h:17
 msgid "Edit Patch"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:447
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:453
 msgid "Edit current perspective"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:403
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:425
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:407
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:429
 msgid "Edit..."
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:44
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:48
 msgid "Effect"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:425
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435
 msgid "Embedded Frame Buffer"
 msgstr ""
 
-#: Source/Core/Core/Src/Core.cpp:201
+#: Source/Core/Core/Src/Core.cpp:190
 msgid "Emu Thread already running"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110
 msgid ""
 "Emulate XFBs accurately.\n"
 "Slows down emulation a lot and prohibits high-resolution rendering but is "
@@ -1728,7 +1776,7 @@ msgid ""
 "If unsure, check virtual XFB emulation instead."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109
 msgid ""
 "Emulate XFBs using GPU texture objects.\n"
 "Fixes many games which don't work without XFB emulation while not being as "
@@ -1742,7 +1790,7 @@ msgstr ""
 msgid "Emulated Wiimote"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346
 msgid "Emulation State: "
 msgstr ""
 
@@ -1750,7 +1798,7 @@ msgstr ""
 msgid "Enable"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91
 msgid ""
 "Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's "
 "supported by your GPU.\n"
@@ -1760,55 +1808,55 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:111
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:98
 msgid "Enable AR Logging"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324
 msgid "Enable Block Merging"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331
 msgid "Enable Bounding Box Calculation"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:446
 msgid "Enable Cache"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:562
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542
 msgid "Enable Cheats"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310
 msgid "Enable Dual Core"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
 msgid "Enable Dual Core (speedup)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:550
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:563
 msgid "Enable Hotkeys"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311
 msgid "Enable Idle Skipping"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541
 msgid "Enable Idle Skipping (speedup)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312
 msgid "Enable MMU"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:554
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:567
 msgid "Enable Progressive Scan"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757
 msgid "Enable Screen Saver"
 msgstr ""
 
@@ -1816,15 +1864,15 @@ msgstr ""
 msgid "Enable Speaker Data"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
 msgid "Enable WideScreen"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:516
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529
 msgid "Enable Wireframe"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85
 msgid ""
 "Enable anisotropic filtering.\n"
 "Enhances visual quality of textures that are at oblique viewing angles.\n"
@@ -1833,7 +1881,7 @@ msgid ""
 "If unsure, select 1x."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323
 msgid ""
 "Enable fast disc access.  Needed for a few games. (ON = Fast, OFF = "
 "Compatible)"
@@ -1843,7 +1891,7 @@ msgstr ""
 msgid "Enable pages"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76
 msgid ""
 "Enable this if you want the whole screen to be used for rendering.\n"
 "If this is disabled, a render window will be created instead.\n"
@@ -1851,7 +1899,7 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80
 msgid ""
 "Enable this if you want to use the main Dolphin window for rendering rather "
 "than a separate render window.\n"
@@ -1859,34 +1907,34 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:335
 msgid ""
 "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for "
 "ANY other game."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340
 msgid "Enables Custom Projection Hack"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:528
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508
 msgid ""
 "Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on "
 "OSX."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510
 msgid ""
 "Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:512
 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
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81
 msgid ""
 "Enables progressive scan if supported by the emulated software.\n"
 "Most games don't care about this.\n"
@@ -1894,108 +1942,108 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313
 msgid ""
 "Enables the Memory Management Unit, needed for some games. (ON = Compatible, "
 "OFF = Fast)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116
 msgid ""
 "Encode frame dumps using the FFV1 codec.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:40
 msgid "End"
 msgstr "Kraj"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:469
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:280
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:260
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293
 msgid "English"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:329
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:407
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:337
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:417
 msgid "Enhancements"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:607
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:640
 msgid "Enter a name for the new perspective:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:191
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:178
 #, c-format
 msgid "Entry %d/%d"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:85
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:72
 #, c-format
 msgid "Entry 1/%d"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:204
 msgid "Equal"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:45
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:156
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1242
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:32
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:150
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226
 msgid "Error"
 msgstr "Error"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:381
+#: Source/Core/DolphinWX/Src/Main.cpp:409
 msgid "Error loading selected language. Falling back to system default."
 msgstr ""
 
-#: Source/Core/Common/Src/ChunkFile.h:226
+#: Source/Core/Common/Src/ChunkFile.h:221
 #, c-format
 msgid ""
 "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). "
 "Aborting savestate load..."
 msgstr ""
 
-#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:342
+#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:329
 #, c-format
 msgid ""
 "Error: Trying to access %s fonts but they are not loaded. Games may not show "
 "fonts correctly, or crash."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:30
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:17
 msgid "Escape"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:26
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:30
 msgid "Euphoria"
 msgstr ""
 
 #: Source/Core/Core/Src/ArmMemTools.cpp:78
-#: Source/Core/Core/Src/x64MemTools.cpp:217
+#: Source/Core/Core/Src/x64MemTools.cpp:206
 #, c-format
 msgid "Exception handler - access below memory space. %08llx%08llx"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:61
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
 msgid "Execute"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:459
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:446
 msgid "Export Failed"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:639
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:649
 msgid "Export File"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:177
 msgid "Export Recording"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:345
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:351
 msgid "Export Recording..."
 msgstr ""
 
@@ -2003,7 +2051,7 @@ msgstr ""
 msgid "Export Save"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:874
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:865
 msgid "Export Wii save (Experimental)"
 msgstr ""
 
@@ -2011,100 +2059,100 @@ msgstr ""
 msgid "Export all saves"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:80
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:72
 msgid "Export failed, try again?"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:559
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:552
 msgid "Export save as..."
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:297
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:284
 msgid "Extension"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483
 msgid "External Frame Buffer"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:61
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:48
 msgid "Extra Parameter"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:62
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:49
 msgid "Extra Parameter useful in ''Metroid: Other M'' only."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:614
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:624
 msgid "Extract All Files..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:616
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:626
 msgid "Extract Apploader..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:617
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627
 msgid "Extract DOL..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:610
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:620
 msgid "Extract Directory..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:612
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:622
 msgid "Extract File..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:608
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:618
 msgid "Extract Partition..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:724
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:738
 #, c-format
 msgid "Extracting %s"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:707
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:721
 msgid "Extracting All Files"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:707
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:721
 msgid "Extracting Directory"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:710
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:724
 msgid "Extracting..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:892
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:893
 msgid "FIFO Byte"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:45
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:32
 msgid "FIFO Player"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:169
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:163
 msgid "FRANCE"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472
 msgid "FST Size:"
 msgstr ""
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:77
+#: Source/Core/Core/Src/NetPlayClient.cpp:81
 msgid "Failed to Connect!"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:225
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:228
 msgid "Failed to Listen!!"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:307
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:300
 msgid "Failed to download codes."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:827
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:843
 #, c-format
 msgid "Failed to extract to %s!"
 msgstr ""
@@ -2122,26 +2170,30 @@ msgid ""
 "(Choose it from the \"Audio\" tab of the configuration dialog.)"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:116
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:139
+#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:108
+#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:131
 msgid "Failed to load bthprops.cpl"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:100
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:109
+#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:90
+#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:101
 msgid "Failed to load hid.dll"
 msgstr ""
 
-#: Source/Core/Core/Src/Movie.cpp:792
+#: Source/Core/Core/Src/Movie.cpp:783
 #, c-format
 msgid "Failed to read %s"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:151
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:144
 msgid "Failed to read banner.bin"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:223
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:178
+msgid "Failed to read bk header"
+msgstr ""
+
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:211
 #, c-format
 msgid ""
 "Failed to read block %d of the save data\n"
@@ -2149,140 +2201,149 @@ msgid ""
 "FilePosition:%llx"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:148
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:136
 msgid ""
 "Failed to read block allocation table backup correctly\n"
 "(0x8000-0x9FFF)"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:142
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:130
 msgid ""
 "Failed to read block allocation table correctly\n"
 "(0x6000-0x7FFF)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:286
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:279
 #, c-format
 msgid "Failed to read data from file %d"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:136
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:367
+#, c-format
+msgid "Failed to read data from file: %s"
+msgstr ""
+
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:124
 msgid ""
 "Failed to read directory backup correctly\n"
 "(0x4000-0x5FFF)"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:130
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:118
 msgid ""
 "Failed to read directory correctly\n"
 "(0x2000-0x3FFF)"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:119
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:90
+msgid "Failed to read header"
+msgstr ""
+
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:107
 msgid ""
 "Failed to read header correctly\n"
 "(0x0000-0x1FFF)"
 msgstr ""
 
-#: Source/Core/DiscIO/Src/VolumeGC.cpp:61
+#: Source/Core/DiscIO/Src/VolumeGC.cpp:48
 msgid "Failed to read unique ID from disc image"
 msgstr ""
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:84
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:71
 msgid "Failed to write BT.DINF to SYSCONF"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:228
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:221
 msgid "Failed to write bkhdr"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:164
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:157
 #, c-format
 msgid "Failed to write header for %s"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:258
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:251
 #, c-format
 msgid "Failed to write header for file %d"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294
 msgid "Farsi"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477
 msgid "Fast"
 msgstr "Brzo "
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315
 msgid "Fast version of the MMU.  Does not work for every game."
 msgstr ""
 
-#: Source/Core/Core/Src/Movie.cpp:1046
+#: Source/Core/Core/Src/Movie.cpp:1037
 #, c-format
 msgid ""
 "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:199
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:202
 msgid "Fifo Player"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:99
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:86
 msgid "File Info"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:304
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:295
 msgid "File contained no codes."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:413
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:400
 msgid "File converted to .gci"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:428
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:415
 msgid ""
 "File could not be opened\n"
 "or does not have a valid extension"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:84
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:72
 #, c-format
 msgid ""
 "File has the extension \"%s\"\n"
 "valid extensions are (.raw/.gcp)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:425
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:412
 msgid "File is not recognized as a memcard"
 msgstr ""
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:294
+#: Source/Core/DiscIO/Src/CompressedBlob.cpp:281
 msgid "File not compressed"
 msgstr ""
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:127
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:109
 #, c-format
 msgid "FileIO: Unknown open mode : 0x%02x"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:531
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:541
 msgid "Filesystem"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1100
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1126
 msgid "Filetype 'ini' is unknown! Will not open!"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:265
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:252
 msgid "Find next"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:266
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:253
 msgid "Find previous"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:632
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626
 msgid "First Block"
 msgstr ""
 
@@ -2290,23 +2351,23 @@ msgstr ""
 msgid "Fix Checksums"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:275
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283
 msgid "Force 16:9"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:275
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283
 msgid "Force 4:3"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:568
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548
 msgid "Force Console as NTSC-J"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406
 msgid "Force Texture Filtering"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90
 msgid ""
 "Force texture filtering even if the emulated game explicitly disabled it.\n"
 "Improves texture quality slightly but causes glitches in some games.\n"
@@ -2314,7 +2375,7 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83
 msgid ""
 "Force the game to output graphics for widescreen resolutions.\n"
 "Causes graphical glitches is some games.\n"
@@ -2322,161 +2383,160 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488
 msgid ""
 "Forces NTSC-J mode for using the Japanese ROM font.\n"
 "Left unchecked, dolphin defaults to NTSC-U and automatically enables this "
 "setting when playing Japanese games."
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:74
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:62
 msgid ""
 "Format as ascii (NTSC\\PAL)?\n"
 "Choose no for sjis (NTSC-J)"
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:278
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:265
 msgid "Forward"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504
 #, c-format
 msgid "Found %d results for '"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:857
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:925
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:858
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:926
 msgid "Frame"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:867
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:868
 msgid "Frame "
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:185
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:173
 msgid "Frame Advance"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:536
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549
 msgid "Frame Dumps use FFV1"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:227
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:214
 msgid "Frame Info"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:116
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:103
 msgid "Frame Range"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:138
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:139
 msgid "Frame S&kipping"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:572
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552
 msgid "Framelimit:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:204
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:191
 msgid "Frames To Record"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547
 msgid "Free Look"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
 msgid "French"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:38
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:42
 msgid "Frets"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:118
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:137
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:105
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:124
 msgid "From"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:426
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:432
 msgid "FullScr"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:256
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263
 msgid "Fullscreen resolution:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:534
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524
 msgid "GCI File(*.gci)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GCMicDlg.h:44
+#: Source/Core/DolphinWX/Src/GCMicDlg.h:31
 msgid "GCMic Configuration"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:432
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
 msgid "GCPad"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:659
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:658
 msgid "GX_CMD_INVL_VC"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:448
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:452
 msgid "Game ID:"
 msgstr ""
 
-#: Source/Core/Core/Src/NetPlay.cpp:229
+#: Source/Core/Core/Src/NetPlay.cpp:216
 msgid "Game is already running!"
 msgstr "Igra je vec pokrenuta!"
 
-#: Source/Core/Core/Src/NetPlay.cpp:259
+#: Source/Core/Core/Src/NetPlay.cpp:246
 msgid "Game isn't running!"
 msgstr "Igra nije pokrenuta!"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:389
-#, fuzzy
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:393
 msgid "Game not found!"
-msgstr "Igra nije pronadjena "
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:385
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:389
 msgid "Game-Specific Settings"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:293
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:294
 msgid "GameConfig"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:525
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:515
 msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534
 msgid "Gamecube"
 msgstr "Gamecube "
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:178
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:181
 msgid "Gamecube &Pad Settings"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:218
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1069
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:205
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1052
 msgid "Gamecube Memory Cards (*.raw,*.gcp)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:432
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
 msgid "Gamecube Pad settings"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:117
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302
 msgid "Gecko Codes"
 msgstr ""
 
-#: Source/Core/Core/Src/GeckoCode.cpp:222
+#: Source/Core/Core/Src/GeckoCode.cpp:214
 #, c-format
 msgid ""
 "GeckoCode failed to run (CT%i CST%i) (%s)\n"
@@ -2485,10 +2545,10 @@ msgid ""
 "directory and restarting Dolphin.)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:172
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:197
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:160
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:160
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:202
 msgid "General"
 msgstr ""
 
@@ -2496,30 +2556,30 @@ msgstr ""
 msgid "General Settings"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:470
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:281
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:316
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:261
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
 msgid "German"
 msgstr "Nemacki "
 
-#: Source/Core/Core/Src/ActionReplay.cpp:449
+#: Source/Core/Core/Src/ActionReplay.cpp:439
 #, c-format
 msgid "GetARCode: Index is greater than ar code list size %lu"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:430
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:436
 msgid "Graphics"
 msgstr "Grafike"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:430
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:436
 msgid "Graphics settings"
 msgstr "Graficke opcije/podesavanja/konfiguracije..."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:205
 msgid "Greater Than"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87
 msgid ""
 "Greatly increases quality of textures generated using render to texture "
 "effects.\n"
@@ -2530,51 +2590,67 @@ msgid ""
 "If unsure, leave this checked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:317
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
 msgid "Greek"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:22
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Green"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:24
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Green Left"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:25
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Green Right"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:35
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:39
 msgid "Guitar"
 msgstr "Gitara "
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1259
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1250
 msgid "HCI_CMD_INQUIRY is called, please report!"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:421
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504
+msgid "Hacked Buffer Upload"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431
 msgid "Hacks"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:158
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:146
 msgid "Header checksum failed"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:318
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298
 msgid "Hebrew"
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:313
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:300
 msgid "Height"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:64
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:51
 msgid "Help"
 msgstr "Pomoc"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:209
+#: Source/Core/DolphinWX/Src/Main.cpp:229
+msgid ""
+"Hi,\n"
+"\n"
+"Dolphin requires Mac OS X 10.7 or greater.\n"
+"Unfortunately you're running an old version of OS X.\n"
+"The last Dolphin version to support OS X 10.6 is Dolphin 3.5\n"
+"Please upgrade to 10.7 or greater to use the newest Dolphin version.\n"
+"\n"
+"Sayonara!\n"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/Main.cpp:220
 msgid ""
 "Hi,\n"
 "\n"
@@ -2584,41 +2660,41 @@ msgid ""
 "Sayonara!\n"
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:309
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:296
 msgid "Hide"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:307
 msgid "Hide Mouse Cursor"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79
 msgid ""
 "Hides the mouse cursor if it's on top of the emulation window.\n"
 "\n"
 "If unsure, leave this checked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:54
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41
 msgid "Home"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:85
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:138
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:76
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:141
 msgid "Host"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.h:44
+#: Source/Core/DolphinWX/Src/HotkeyDlg.h:31
 msgid "Hotkey Configuration"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:272
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:272
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:594
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:260
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:260
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574
 msgid "Hotkeys"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:319
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299
 msgid "Hungarian"
 msgstr ""
 
@@ -2626,29 +2702,29 @@ msgstr ""
 msgid "Hybrid Wiimote"
 msgstr ""
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:532
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:519
 #, 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:786
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:773
 #, c-format
 msgid ""
-"IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available "
-"in your nand dump\n"
+"IOCTL_ES_LAUNCH: Game tried to reload an IOS or a title that is not "
+"available in your NAND dump\n"
 "TitleID %016llx.\n"
-" Dolphin will likely hang now"
+" Dolphin will likely hang now."
 msgstr ""
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:313
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:300
 msgid "IOCTL_ES_READCONTENT - bad destination"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729
 msgid "IPL Settings"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269
 msgid "IR"
 msgstr ""
 
@@ -2660,45 +2736,33 @@ msgstr ""
 msgid "IR Sensitivity:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:502
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:512
 msgid "ISO Details"
 msgstr "ISO Detalji "
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:830
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:811
 msgid "ISO Directories"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:172
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:166
 msgid "ITALY"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:630
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:624
 msgid "Icon"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332
 msgid ""
 "If checked, the bounding box registers will be updated. Used by the Paper "
 "Mario games."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318
-msgid ""
-"If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505
-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:428
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438
 msgid "Ignore Format Changes"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94
 msgid ""
 "Ignore any changes to the EFB format.\n"
 "Improves performance in many games without any negative effect. Causes "
@@ -2707,7 +2771,7 @@ msgid ""
 "If unsure, leave this checked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93
 msgid ""
 "Ignore any requests of the CPU to read from or write to the EFB.\n"
 "Improves performance in some games, but might disable some gameplay-related "
@@ -2720,35 +2784,27 @@ msgstr ""
 msgid "Import Save"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:59
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:48
 msgid "Import failed, try again?"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:454
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:441
 msgid ""
 "Imported file has gsc extension\n"
 "but does not have a correct header"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:442
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:429
 msgid "Imported file has invalid length"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:451
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:438
 msgid ""
 "Imported file has sav extension\n"
 "but does not have a correct header"
 msgstr ""
 
-#: 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/ISOProperties.cpp:347
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350
 msgid "In Game"
 msgstr ""
 
@@ -2756,125 +2812,129 @@ msgstr ""
 msgid "In-Game"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:34
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305
 msgid "Info"
 msgstr "Info "
 
-#: Source/Core/Common/Src/MsgHandler.cpp:65
+#: Source/Core/Common/Src/MsgHandler.cpp:51
 msgid "Information"
 msgstr "Informacija "
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:481
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:468
 msgid "Input"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:63
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:50
 msgid "Insert"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:176
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:166
 msgid "Insert Encrypted or Decrypted code here..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:763
 msgid "Insert SD Card"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:34
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:21
 msgid "Insert name here.."
 msgstr "Ubaci ime ovde..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:196
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:199
 msgid "Install WAD"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:895
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:888
 msgid "Install to Wii Menu"
 msgstr ""
 
-#: Source/Core/Core/Src/x64MemTools.cpp:252
+#: Source/Core/Core/Src/x64MemTools.cpp:242
 msgid ""
 "InstallExceptionHandler called, but this platform does not yet support it."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1297
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
 msgid "Installing WAD..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:885
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:901
 msgid "Integrity Check Error"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:891
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:907
 msgid "Integrity check completed"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:890
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:906
 msgid "Integrity check completed. No errors have been found."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:882
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:898
 #, 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:552
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532
 msgid "Interface"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:646
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627
 msgid "Interface Settings"
 msgstr ""
 
-#: Source/Core/Core/Src/State.cpp:240
+#: Source/Core/Core/Src/State.cpp:228
 msgid "Internal LZO Error - compression failed"
 msgstr ""
 
-#: Source/Core/Core/Src/State.cpp:348
+#: Source/Core/Core/Src/State.cpp:336
 #, c-format
 msgid ""
 "Internal LZO Error - decompression failed (%d) (%li, %li) \n"
 "Try loading the state again"
 msgstr ""
 
-#: Source/Core/Core/Src/State.cpp:485
+#: Source/Core/Core/Src/State.cpp:473
 msgid "Internal LZO Error - lzo_init() failed"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:344
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:352
 msgid "Internal Resolution:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:42
+msgid "Interpreter (VERY slow)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349
 msgid "Intro"
 msgstr "Uvod"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:194
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:187
 #, c-format
 msgid "Invalid Size(%x) or Magic word (%x)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:612
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:600
 msgid "Invalid Value!"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:462
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:449
 msgid "Invalid bat.map or dir entry"
 msgstr ""
 
-#: Source/Core/Core/Src/CoreTiming.cpp:548
+#: Source/Core/Core/Src/CoreTiming.cpp:553
 #, c-format
 msgid "Invalid event type %i"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:326
+#: Source/Core/Core/Src/HW/DVDInterface.cpp:309
 msgid "Invalid file"
 msgstr ""
 
-#: Source/Core/DiscIO/Src/BannerLoaderGC.cpp:41
+#: Source/Core/DiscIO/Src/BannerLoaderGC.cpp:28
 #, c-format
 msgid ""
 "Invalid opening.bnr found in gcm:\n"
@@ -2882,203 +2942,211 @@ msgid ""
 " You may need to redump this game."
 msgstr ""
 
-#: Source/Core/Core/Src/Movie.cpp:735
+#: Source/Core/Core/Src/Movie.cpp:726
 msgid "Invalid recording file"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:473
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:472
 msgid "Invalid search parameters (no object selected)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:456
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:455
 msgid "Invalid search string (couldn't convert to number)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:444
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:443
 msgid "Invalid search string (only even string lengths supported)"
 msgstr ""
 
-#: Source/Core/Core/Src/Core.cpp:513
+#: Source/Core/Core/Src/Core.cpp:511
 msgid "Invalid state"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:473
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:320
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300
 msgid "Italian"
 msgstr "Italianski "
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:183
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:177
 msgid "JAPAN"
 msgstr "JAPAN"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:321
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:46
+msgid "JIT Recompiler (recommended)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:47
+msgid "JITIL experimental recompiler"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:279
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
 msgid "Japanese"
 msgstr "Japanski "
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:188
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:182
 msgid "KOREA"
 msgstr "KOREA "
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78
 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:298
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:306
 msgid "Keep window on top"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:241
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:241
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:229
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:229
 msgid "Key"
 msgstr "Taster "
 
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282
 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:322
 msgid "Korean"
 msgstr "Korejski "
 
 #. i18n:  Left
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:57
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:44
 msgid "L"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:39
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:26
 msgid "L Button"
 msgstr ""
 
 #. i18n:  Left-Analog
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:61
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:48
 msgid "L-Analog"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:585
 msgid "Language:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:152
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:153
 msgid "Last Overwritten State"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:159
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:161
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:160
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:162
 msgid "Last Saved State"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:696
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:677
 msgid "Latency:"
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:276
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:55
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:263
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:42
 msgid "Left"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:60
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:64
 msgid "Left Stick"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:257
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:257
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:245
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:245
 msgid ""
 "Left click to detect hotkeys.\n"
 "Enter space to clear."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:689
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:678
 msgid ""
 "Left-click to detect input.\n"
 "Middle-click to clear.\n"
 "Right-click for more options."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:694
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:683
 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:206
 msgid "Less Than"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:565
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545
 msgid "Limit by FPS"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:924
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:915
 msgid "Load"
 msgstr "Ucitaj "
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544
 msgid "Load Custom Textures"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
 msgid "Load State Slot 1"
 msgstr "Ucitaj State Slot 1"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189
 msgid "Load State Slot 2"
 msgstr "Ucitaj State Slot 2"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:190
 msgid "Load State Slot 3"
 msgstr "Ucitaj State Slot 3"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:203
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:191
 msgid "Load State Slot 4"
 msgstr "Ucitaj State Slot 4"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192
 msgid "Load State Slot 5"
 msgstr "Ucitaj State Slot 5"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193
 msgid "Load State Slot 6"
 msgstr "Uci State Slot 6"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:194
 msgid "Load State Slot 7"
 msgstr "Ucitaj State Slot 7"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:195
 msgid "Load State Slot 8"
 msgstr "Ucitaj State Slot 8"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:155
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:156
 msgid "Load State..."
 msgstr "Ucitaj State"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1332
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1359
 msgid "Load Wii System Menu"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1327
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1354
 #, c-format
 msgid "Load Wii System Menu %d%c"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112
 msgid ""
 "Load custom textures from User/Load/Textures/<game_id>/\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:50
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:37
 msgid "Load preset values from hack patterns available."
 msgstr ""
 
@@ -3086,23 +3154,23 @@ msgstr ""
 msgid "Local"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogWindow.h:51
+#: Source/Core/DolphinWX/Src/LogWindow.h:38
 msgid "Log"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:26
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:13
 msgid "Log Configuration"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:296
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304
 msgid "Log FPS to file"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:96
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83
 msgid "Log Types"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103
 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"
@@ -3110,81 +3178,90 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:81
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:68
 msgid "Logger Outputs"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132
-#: Source/Core/DolphinWX/Src/Frame.cpp:328
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:119
+#: Source/Core/DolphinWX/Src/Frame.cpp:314
 msgid "Logging"
 msgstr ""
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:255
+#: Source/Core/Core/Src/NetPlayClient.cpp:259
 msgid "Lost connection to server!"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:42
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:29
 msgid "M Button"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:119
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:112
 #, c-format
 msgid ""
 "MD5 mismatch\n"
 " %016llx%016llx != %016llx%016llx"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314
 msgid "MMU Speed Hack"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:527
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:563
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:517
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:556
 msgid "MadCatz Gameshark files(*.gcs)"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:51
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:63
+#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:38
 msgid "Main Stick"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460
 msgid "Maker ID:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487
 msgid "Maker:"
 msgstr ""
 
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100
+msgid ""
+"Makes distant objects more visible by removing fog, thus increasing the "
+"overall detail.\n"
+"Disabling fog will break some games which rely on proper fog emulation.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:97
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:100
 msgid "Max"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:448
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:435
 msgid "Memcard already has a save for this title"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:291
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:278
 msgid "Memcard already opened"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:912
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:913
 msgid "Memory Byte"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:225
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:113
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:212
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:93
 msgid "Memory Card"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.h:36
+#: Source/Core/DolphinWX/Src/MemcardManager.h:23
 msgid ""
 "Memory Card Manager WARNING-Make backups before using, should be fixed but "
 "could mangle stuff!"
 msgstr ""
 
-#: Source/Core/Core/Src/CoreParameter.cpp:371
+#: Source/Core/Core/Src/CoreParameter.cpp:360
 #, c-format
 msgid ""
 "Memory Card filename in Slot %c is incorrect\n"
@@ -3195,15 +3272,15 @@ msgid ""
 "Would you like to copy the old file to this new location?\n"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:124
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:112
 msgid "Memorycard filesize does not match the header size"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:50
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:37
 msgid "Menu"
 msgstr "Meni"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:114
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:94
 msgid "Mic"
 msgstr ""
 
@@ -3212,20 +3289,20 @@ msgstr ""
 msgid "Min"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:580
 msgid "Misc"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:795
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776
 msgid "Misc Settings"
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:240
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:294
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:227
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:281
 msgid "Modifier"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106
 msgid ""
 "Modify textures to show the format they're encoded in. Needs an emulation "
 "reset in most cases.\n"
@@ -3233,20 +3310,20 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:115
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:108
 msgid "Monospaced font"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:305
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:292
 msgid "Motion Plus"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:309
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:86
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:296
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73
 msgid "Motor"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:654
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:666
 msgid ""
 "Move the mouse pointer over an option to display a detailed description.\n"
 "\n"
@@ -3257,224 +3334,235 @@ msgid ""
 "\n"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:75
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:62
 msgid "Multiply"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:651
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:650
 msgid "NOP"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:629
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:628
 msgid "NOTE: Stream size doesn't match actual data length\n"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:129
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:116
 msgid "NP Add"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:124
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:111
 msgid "NP Begin"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:132
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:119
 msgid "NP Decimal"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:126
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:113
 msgid "NP Delete"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:133
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:120
 msgid "NP Divide"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:120
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:107
 msgid "NP Down"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:123
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:110
 msgid "NP End"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:111
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:98
 msgid "NP Enter"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:127
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:114
 msgid "NP Equal"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:116
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:103
 msgid "NP Home"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:125
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:112
 msgid "NP Insert"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:117
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:104
 msgid "NP Left"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:128
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:115
 msgid "NP Multiply"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:122
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:109
 msgid "NP Page Down"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:121
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:108
 msgid "NP Page Up"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:119
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:106
 msgid "NP Right"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:130
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:117
 msgid "NP Separator"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:109
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:96
 msgid "NP Space"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:131
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:118
 msgid "NP Subtract"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:110
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:97
 msgid "NP Tab"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:118
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:105
 msgid "NP Up"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:444
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:59
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:50
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:448
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:46
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:37
 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:25
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:72
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:282
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:553
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:15
 msgid "Name: "
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:526
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:562
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:516
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:555
 msgid "Native GCI files(*.gci)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:161
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:148
 msgid "New Scan"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:206
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:193
 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:801
 msgid "Next Page"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:165
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:152
 msgid "Next Scan"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:68
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:59
 msgid "Nickname :"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:196
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:190
 msgid "No Country (SDK)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:370
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:357
 msgid "No ISOs or WADS found"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:508
-#, c-format
-msgid "No banner file found for title  %s"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:761
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:768
-msgid "No description available"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:514
-msgid "No docking"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:859
-msgid "No file loaded"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:439
-msgid "No free dir index entries"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:895
-msgid "No recorded file"
+#: Source/Core/Core/Src/ConfigManager.h:17
+msgid "No audio output"
 msgstr ""
 
 #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:501
 #, c-format
+msgid "No banner file found for title  %s"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:760
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:767
+msgid "No description available"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:535
+msgid "No docking"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:860
+msgid "No file loaded"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:426
+msgid "No free dir index entries"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:896
+msgid "No recorded file"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:494
+#, c-format
 msgid "No save folder found for title %s"
 msgstr ""
 
+#: Source/Plugins/Plugin_VideoOGL/Src/main.cpp:132
+#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:111
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:23
 #: Source/Core/DolphinWX/Src/NetWindow.cpp:600
 msgid "None"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:323
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303
 msgid "Norwegian Bokmaal"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:203
 msgid "Not Equal"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:804
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:794
 msgid "Not Set"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/Main.cpp:626
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:101
+#, c-format
+msgid "Not a Wii save or read failure for file header size %x"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/Main.cpp:654
 msgid "Not connected"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:309
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:296
 msgid "Notes"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:16
 msgid "Notes: "
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:71
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:74
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:580
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:621
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:629
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:59
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:64
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:613
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:659
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:667
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:31
 msgid "Notice"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:105
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:92
 msgid "Num Lock"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:88
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:75
 msgid "Number Of Codes: "
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:30
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:34
 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26
 msgid "Nunchuk"
 msgstr ""
@@ -3483,107 +3571,107 @@ msgstr ""
 msgid "Nunchuk Acceleration"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:877
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:878
 msgid "Object"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:135
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:122
 msgid "Object Range"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:243
 msgid "Off"
 msgstr "Izskljucen/o"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:62
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:49
 msgid "Offset:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:582
 msgid "On-Screen Display Messages"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:436
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:423
 #, c-format
 msgid "Only %d blocks available"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:420
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:178
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:426
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:166
 msgid "Open"
 msgstr "Otvori "
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:876
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:867
 msgid "Open &containing folder"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:873
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:864
 msgid "Open Wii &save folder"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:420
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:426
 msgid "Open file..."
 msgstr "Otvori fajl..."
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:61
+#: Source/Core/AudioCommon/Src/OpenALStream.cpp:48
 #, c-format
 msgid "OpenAL: can't create context for device %s"
 msgstr ""
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:72
+#: Source/Core/AudioCommon/Src/OpenALStream.cpp:59
 msgid "OpenAL: can't find sound devices"
 msgstr ""
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:66
+#: Source/Core/AudioCommon/Src/OpenALStream.cpp:53
 #, c-format
 msgid "OpenAL: can't open device %s"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502
 msgid "OpenCL Texture Decoder"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503
 msgid "OpenMP Texture Decoder"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:317
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:94
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:304
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:81
 msgid "Options"
 msgstr "Opcije "
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:22
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Orange"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:468
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:455
 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"
+"and import the saves to a new memcard\n"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:316
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:324
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:509
 msgid "Other"
 msgstr ""
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:206
+#: Source/Core/Core/Src/NetPlayClient.cpp:210
 msgid ""
 "Other client disconnected while game is running!! NetPlay is disabled. You "
 "manually stop the game."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:481
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:468
 msgid "Output"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:342
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:348
 msgid "P&lay Recording..."
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCPad.cpp:30
+#: Source/Core/Core/Src/HW/GCPad.cpp:18
 msgid "Pad"
 msgstr ""
 
@@ -3591,160 +3679,160 @@ msgstr ""
 msgid "Pad "
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:34
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:38
 msgid "Pads"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:108
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:95
 msgid "Page Down"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:107
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:94
 msgid "Page Up"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:35
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:22
 msgid "Paragraph"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:64
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:51
 msgid "Parameters"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:222
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:217
 #, c-format
 msgid "Partition %i"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:296
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:297
 msgid "Patches"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:556
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536
 msgid "Paths"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1538
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1539
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:51
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1565
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1566
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:38
 msgid "Pause"
 msgstr "Pauza "
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:128
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:129
 msgid "Pause at end of movie"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:397
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405
 msgid "Per-Pixel Lighting"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352
 msgid "Perfect"
 msgstr "Perfektno "
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:609
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:642
 #, c-format
 msgid "Perspective %d"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:165
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:424
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1547
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1548
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:152
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:430
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1574
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1575
 msgid "Play"
 msgstr "Pokreni "
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176
 msgid "Play Recording"
 msgstr "Pokreni snimanje "
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:170
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:170
 msgid "Play/Pause"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351
 msgid "Playable"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:154
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:141
 msgid "Playback Options"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:301
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:304
 msgid "Players"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:988
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:991
 msgid "Please confirm..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:579
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:612
 msgid "Please create a perspective before saving"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:36
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:23
 msgid "Plus-Minus"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:324
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304
 msgid "Polish"
 msgstr "Polski "
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:713
 msgid "Port 1"
 msgstr "Port 1"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714
 msgid "Port 2"
 msgstr "Port 2"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:734
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715
 msgid "Port 3"
 msgstr "Port 3"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716
 msgid "Port 4"
 msgstr "Port 4"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:97
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:130
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:88
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:133
 msgid "Port :"
 msgstr "Port :"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:325
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305
 msgid "Portuguese"
 msgstr "Portugalski "
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:326
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306
 msgid "Portuguese (Brazilian)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:391
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:399
 msgid "Post-Processing Effect:"
 msgstr ""
 
-#: Source/Core/Core/Src/Movie.cpp:936
+#: Source/Core/Core/Src/Movie.cpp:927
 #, c-format
 msgid "Premature movie end in PlayController. %u + 8 > %u"
 msgstr ""
 
-#: Source/Core/Core/Src/Movie.cpp:1055
+#: Source/Core/Core/Src/Movie.cpp:1046
 #, c-format
 msgid "Premature movie end in PlayWiimote. %u + %d > %u"
 msgstr ""
 
-#: Source/Core/Core/Src/Movie.cpp:1032
+#: Source/Core/Core/Src/Movie.cpp:1023
 #, c-format
 msgid "Premature movie end in PlayWiimote. %u > %u"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:48
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:35
 msgid "Presets: "
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:205
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:192
 msgid "Prev Page"
 msgstr ""
 
@@ -3752,67 +3840,67 @@ msgstr ""
 msgid "Previous Page"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:183
 msgid "Previous Value"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:60
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:47
 msgid "Print"
 msgstr "Stampaj "
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:894
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:885
 msgid "Profile"
 msgstr "Profil"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.h:55
+#: Source/Core/DolphinWX/Src/ISOProperties.h:42
 msgid "Properties"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:283
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:286
 msgid "Purge Cache"
 msgstr ""
 
-#: Source/Core/Common/Src/MsgHandler.cpp:66
+#: Source/Core/Common/Src/MsgHandler.cpp:52
 msgid "Question"
 msgstr "Pitanje "
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:159
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:316
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:162
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:319
 msgid "Quit"
 msgstr "Izadji "
 
 #. i18n:  Right
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:59
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:46
 msgid "R"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:40
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:27
 msgid "R Button"
 msgstr ""
 
 #. i18n:  Right-Analog
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:63
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
 msgid "R-Analog"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:445
 msgid "RAM"
 msgstr "RAM "
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:175
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:169
 msgid "RUSSIA"
 msgstr "Rusija"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:528
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:515
 msgid "Range"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:190
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:178
 msgid "Read-only mode"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:487
 msgid "Real"
 msgstr ""
 
@@ -3828,33 +3916,33 @@ msgstr ""
 msgid "Reconnect Wiimote on State Loading"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:193
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:217
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:791
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:180
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:204
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:790
 msgid "Record"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:174
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:161
 msgid "Recording Info"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:202
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:189
 msgid "Recording Options"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:21
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Red"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:24
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Red Left"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:25
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Red Right"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86
 msgid ""
 "Reduces the amount of aliasing caused by rasterizing 3D graphics.\n"
 "This makes the rendered picture look less blocky.\n"
@@ -3864,255 +3952,261 @@ msgid ""
 msgstr ""
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:60
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:421
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:903
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:427
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:894
 msgid "Refresh"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:180
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:168
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:168
 msgid "Refresh List"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:421
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:427
 msgid "Refresh game list"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:405
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:427
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:77
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:812
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:409
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:431
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:64
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:793
 msgid "Remove"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99
 msgid ""
 "Render the scene as a wireframe.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:308
 msgid "Render to Main Window"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:915
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:172
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:906
 msgid "Reset"
 msgstr "Reset/Restart "
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:190
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:177
 msgid "Results"
 msgstr "Rezultati "
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:29
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:16
 msgid "Return"
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:277
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:57
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464
+msgid "Revision:"
+msgstr ""
+
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:264
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:44
 msgid "Right"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:61
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:65
 msgid "Right Stick"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:85
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:295
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:72
 msgid "Rumble"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:518
-msgid "Run DSP LLE on a dedicated thread (not recommended)."
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498
+msgid ""
+"Run DSP HLE and LLE on a dedicated thread (not recommended: might cause "
+"audio glitches with HLE and freezes with LLE)."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:327
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307
 msgid "Russian"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:149
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:150
 msgid "Sa&ve State"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:465
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475
 msgid "Safe"
 msgstr "Siguran "
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:196
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:446
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:925
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:183
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:452
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916
 msgid "Save"
 msgstr "Snimaj"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:532
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:522
 msgid "Save GCI as..."
 msgstr "Snimaj GCI kao..."
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
 msgid "Save State Slot 1"
 msgstr "Snimaj State Slot 1"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:198
 msgid "Save State Slot 2"
 msgstr "Snimaj State Slot 2"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:199
 msgid "Save State Slot 3"
 msgstr "Snimaj State Slot 3"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:212
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:212
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200
 msgid "Save State Slot 4"
 msgstr "Snimaj State Slot 4"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201
 msgid "Save State Slot 5"
 msgstr "Snimaj State Slot 5"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202
 msgid "Save State Slot 6"
 msgstr "Snimaj State Slot 6"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:203
 msgid "Save State Slot 7"
 msgstr "Snimaj State Slot 7 "
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204
 msgid "Save State Slot 8"
 msgstr "Snimaj State Slot 8"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:151
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:152
 msgid "Save State..."
 msgstr "Snimaj state..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:582
 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:592
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:602
 msgid "Save as..."
 msgstr "Snimaj kao..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1203
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1204
 msgid "Save compressed GCM/ISO"
 msgstr "Snimaj kompresovani GCM/ISO"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:446
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:452
 msgid "Save current perspective"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1192
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193
 msgid "Save decompressed GCM/ISO"
 msgstr ""
 
-#: Source/Core/Core/Src/Movie.cpp:801
+#: Source/Core/Core/Src/Movie.cpp:792
 #, c-format
 msgid "Savestate movie %s is corrupted, movie recording stopping..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:396
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:404
 msgid "Scaled EFB Copy"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:556
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:543
 #, c-format
 msgid "Scanning %s"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:539
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:526
 msgid "Scanning for ISOs"
 msgstr "Skeniranje za ISO fajlove "
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:540
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:527
 msgid "Scanning..."
 msgstr "Skeniranje..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:427
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
 msgid "ScrShot"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:106
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:93
 msgid "Scroll Lock"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:264
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:251
 msgid "Search"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:227
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:214
 msgid "Search Filter"
 msgstr "Trazi Filter"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:810
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:791
 msgid "Search Subfolders"
 msgstr "Trazi Subfoldere "
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:250
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:237
 msgid "Search current Object"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:254
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:241
 msgid "Search for hex Value:"
 msgstr ""
 
-#: Source/Core/Common/Src/SysConf.h:103 Source/Core/Common/Src/SysConf.h:126
-#: Source/Core/Common/Src/SysConf.h:146 Source/Core/Common/Src/SysConf.h:167
+#: Source/Core/Common/Src/SysConf.h:90 Source/Core/Common/Src/SysConf.h:113
+#: Source/Core/Common/Src/SysConf.h:133 Source/Core/Common/Src/SysConf.h:154
 #, c-format
 msgid "Section %s not found in SYSCONF"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:59
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:490
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:46
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:477
 msgid "Select"
 msgstr "Izaberi "
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:677
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1072
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:683
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1087
 msgid "Select The Recording File"
 msgstr "Izaberi Snimani fajl"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1285
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1312
 msgid "Select a Wii WAD file to install"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:70
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74
 msgid ""
 "Select a hardware adapter to use.\n"
 "\n"
 "If unsure, use the first one."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:520
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:510
 msgid "Select a save file to import"
 msgstr "Izaberi \"Snimani fajl/Save file\" za importovanje "
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:363
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:366
 msgid "Select floating windows"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:582
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:585
 msgid "Select the file to load"
 msgstr "Izaberi fajl za ucitavanje "
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1241
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1268
 msgid "Select the save file"
 msgstr "Izaberi \"snimani fajl/the save state\""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1388
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1415
 msgid "Select the state to load"
 msgstr "Izaberi state za ucitavanje "
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1429
 msgid "Select the state to save"
 msgstr "Izaberi state za snimanje/save"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82
 msgid ""
 "Select what aspect ratio to use when rendering:\n"
 "Auto: Use the native aspect ratio\n"
@@ -4123,15 +4217,15 @@ msgid ""
 "If unsure, select Auto."
 msgstr ""
 
-#: Source/Core/InputCommon/Src/InputConfig.cpp:61
+#: Source/Core/InputCommon/Src/InputConfig.cpp:48
 msgid "Selected controller profile does not exist"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:116
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:109
 msgid "Selected font"
 msgstr "Odabrani font"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75
 msgid ""
 "Selects the display resolution used in fullscreen mode.\n"
 "This should always be bigger than or equal to the internal resolution. "
@@ -4141,17 +4235,27 @@ msgid ""
 "If still unsure, use the highest resolution which works for you."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:69
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:70
 msgid ""
 "Selects what graphics API to use internally.\n"
 "Direct3D 9 usually is the fastest one. OpenGL is more accurate though. "
 "Direct3D 11 is somewhere between the two.\n"
 "Note that the Direct3D backends are only available on Windows.\n"
 "\n"
-"If unsure, use Direct3D 9."
+"If unsure, use Direct3D 11."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:288
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72
+msgid ""
+"Selects what graphics API to use internally.\n"
+"Direct3D 9 usually is the fastest one. OpenGL is more accurate though. "
+"Direct3D 11 is somewhere between the two.\n"
+"Note that the Direct3D backends are only available on Windows.\n"
+"\n"
+"If unsure, use OpenGL."
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:291
 msgid "Send"
 msgstr "Isprati"
 
@@ -4159,24 +4263,24 @@ msgstr "Isprati"
 msgid "Sensor Bar Position:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:77
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:64
 msgid "Separator"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:328
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308
 msgid "Serbian"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:522
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502
 msgid ""
 "Serial Port 1 - This is the port which devices such as the net adapter use"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:488
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:475
 msgid "Set"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:877
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:868
 msgid "Set as &default ISO"
 msgstr ""
 
@@ -4185,134 +4289,134 @@ msgstr ""
 msgid "Set as default Memcard %c"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:460
+#: Source/Core/Core/Src/ActionReplay.cpp:450
 #, c-format
 msgid "SetARCode_IsActive: Index is greater than ar code list size %lu"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:515
 msgid ""
 "Sets the latency (in ms).  Higher values may reduce audio crackling. OpenAL "
 "backend only."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341
 msgid "Settings..."
 msgstr ""
 
-#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:222
+#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:209
 msgid "SetupWiiMem: Cant find setting file"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:291
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:278
 msgid "Shake"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
 msgid "Short Name:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:103
+#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:90
 msgid "Shoulder Buttons"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:217
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:220
 msgid "Show &Console"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:215
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:218
 msgid "Show &Log"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:212
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:215
 msgid "Show &Statusbar"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:210
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:213
 msgid "Show &Toolbar"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:281
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:284
 msgid "Show Drives"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:517
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530
 msgid "Show EFB Copy Regions"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:295
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303
 msgid "Show FPS"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:271
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:274
 msgid "Show France"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:257
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:260
 msgid "Show GameCube"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561
 msgid "Show Input Display"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:273
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:276
 msgid "Show Italy"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:264
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:267
 msgid "Show JAP"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:275
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:278
 msgid "Show Korea"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476
 msgid "Show Language:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:216
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:219
 msgid "Show Log &Configuration"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:266
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:269
 msgid "Show PAL"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:254
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:257
 msgid "Show Platforms"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:263
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:266
 msgid "Show Regions"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:518
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531
 msgid "Show Statistics"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:277
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:280
 msgid "Show Taiwan"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:268
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:271
 msgid "Show USA"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:259
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:262
 msgid "Show Wad"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:255
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:258
 msgid "Show Wii"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491
 msgid "Show a confirmation box before stopping a game."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:512
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492
 msgid ""
 "Show a message box when a potentially serious error has occurred.\n"
 "Disabling this may avoid annoying and non-fatal messages, but it may also "
@@ -4323,11 +4427,11 @@ msgstr ""
 msgid "Show first block"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:130
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:131
 msgid "Show lag counter"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493
 msgid ""
 "Show messages on the emulation screen area.\n"
 "These messages include memory card writes, video backend and CPU "
@@ -4350,7 +4454,7 @@ msgstr ""
 msgid "Show save title"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102
 msgid ""
 "Show the number of frames rendered per second as a measure of emulation "
 "speed.\n"
@@ -4358,54 +4462,42 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:279
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:282
 msgid "Show unknown"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105
 msgid ""
 "Show various statistics.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:319
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:306
 msgid "Sideways Wiimote"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:280
 msgid "Simplified Chinese"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:311
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:298
 msgid "Size"
 msgstr "Velicina"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:696
 msgid "Skip BIOS"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316
 msgid "Skip DCBZ clearing"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:492
-msgid "Skip Dest. Alpha Pass"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:444
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:454
 msgid "Skip EFB Access from CPU"
 msgstr ""
 
-#: 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 ""
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125
 msgid ""
 "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n"
 "Sometimes also increases visual quality.\n"
@@ -4415,25 +4507,25 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:374
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:386
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:380
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:392
 #, c-format
 msgid "Slot %i"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:700
 msgid "Slot A"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:701
 msgid "Slot B"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:62
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:49
 msgid "Snapshot"
 msgstr ""
 
-#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:58
+#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:46
 msgid "Software Renderer"
 msgstr ""
 
@@ -4445,27 +4537,27 @@ msgid ""
 "Do you really want to enable software rendering? If unsure, select 'No'."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:683
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:664
 msgid "Sound Settings"
 msgstr ""
 
-#: Source/Core/AudioCommon/Src/AudioCommon.cpp:77
+#: Source/Core/AudioCommon/Src/AudioCommon.cpp:64
 #, c-format
 msgid "Sound backend %s is not valid."
 msgstr ""
 
-#: Source/Core/AudioCommon/Src/DSoundStream.cpp:59
+#: Source/Core/AudioCommon/Src/DSoundStream.cpp:46
 #, c-format
 msgid "Sound buffer creation failed: %s"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:31
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:18
 msgid "Space"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:329
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309
 msgid "Spanish"
 msgstr ""
 
@@ -4473,7 +4565,7 @@ msgstr ""
 msgid "Speaker Volume:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92
 msgid ""
 "Specifies the resolution used to render at. A high resolution will improve "
 "visual quality a lot but is also quite heavy on performance and might cause "
@@ -4485,63 +4577,63 @@ msgid ""
 "If unsure, select 640x528."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322
 msgid "Speed up Disc Transfer Rate"
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:243
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:230
 msgid "Square Stick"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:107
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87
 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:322
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:37
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:25
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:325
 msgid "Start"
 msgstr "Pokreni "
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:194
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:197
 msgid "Start &NetPlay"
 msgstr "Pokreni &NetPlay"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:339
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:345
 msgid "Start Re&cording"
 msgstr "Pokreni Sni&manje"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:175
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:175
 msgid "Start Recording"
 msgstr "Pokreni Snimanje"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:312
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:299
 msgid "State"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:173
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:161
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:161
 msgid "State Saves"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:108
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88
 msgid "Steering Wheel"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:53
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:57
 msgid "Stick"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:420
-#: 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:325
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:419
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:431
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:171
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:171
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:328
 msgid "Stop"
 msgstr " Zaustavi"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96
 msgid ""
 "Store EFB copies in GPU texture objects.\n"
 "This is not so accurate, but it works well enough for most games and gives a "
@@ -4550,143 +4642,153 @@ msgid ""
 "If unsure, leave this checked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:275
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283
 msgid "Stretch to Window"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:43
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:47
 msgid "Strum"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:78
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:65
 msgid "Subtract"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:77
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:67
 #, c-format
 msgid "Successfully exported file to %s"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:56
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:43
 msgid "Successfully imported save files"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:285
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:272
 msgid "Swing"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:744
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:792
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320
+msgid "Synchronize GPU thread"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321
+msgid ""
+"Synchronizes the GPU and CPU threads to help prevent random freezes in Dual "
+"Core mode. (ON = Compatible, OFF = Fast)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773
 msgid "System Language:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:191
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:185
 msgid "TAIWAN"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:127
-#: Source/Core/DolphinWX/Src/TASInputDlg.h:32
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:128
+#: Source/Core/DolphinWX/Src/TASInputDlg.h:19
 msgid "TAS Input"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:28
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:15
 msgid "Tab"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:510
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:531
 msgid "Tab split"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:37
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:41
 msgid "Table Left"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:38
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:42
 msgid "Table Right"
 msgstr ""
 
-#: 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
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:361
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:181
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:181
 msgid "Take Screenshot"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:109
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89
 msgid "TaruKonga (Bongos)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:472
 msgid "Test"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:444
 msgid "Texture"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:451
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:461
 msgid "Texture Cache"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:519
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:532
 msgid "Texture Format Overlay"
 msgstr ""
 
-#: Source/Core/Core/Src/CoreParameter.cpp:226
+#: Source/Core/Core/Src/CoreParameter.cpp:215
 msgid "The WAD has been installed successfully"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:197
+#: Source/Core/Core/Src/ActionReplay.cpp:185
 msgid "The address is invalid"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:509
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:496
 msgid "The checksum was successfully fixed"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1242
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226
 msgid "The chosen directory is already in the list"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1117
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1216
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1118
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1146
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1217
 #, c-format
 msgid ""
 "The file %s already exists.\n"
 "Do you wish to replace it?"
 msgstr ""
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:51
+#: Source/Core/AudioCommon/Src/WaveFile.cpp:38
 #, c-format
 msgid ""
 "The file %s could not be opened for writing. Please check if it's already "
 "opened by another program."
 msgstr ""
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:44
+#: Source/Core/AudioCommon/Src/WaveFile.cpp:31
 #, c-format
 msgid "The file %s was already open, the file header will not be written."
 msgstr ""
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:332
+#: Source/Core/Core/Src/Boot/Boot.cpp:320
 #, c-format
 msgid "The file you specified (%s) does not exist"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:628
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:666
 msgid "The name can not be empty"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:620
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:658
 msgid "The name can not contain the character ','"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:142
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:129
 msgid "The resulting decrypted AR code doesn't contain any lines."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98
 msgid ""
 "The safer you adjust this, the less likely the emulator will be missing any "
 "texture updates from RAM.\n"
@@ -4694,68 +4796,68 @@ msgid ""
 "If unsure, use the rightmost value."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:445
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:432
 msgid "The save you are trying to copy has an invalid file size"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/Main.cpp:388
+#: Source/Core/DolphinWX/Src/Main.cpp:416
 msgid ""
 "The selected language is not supported by your system. Falling back to "
 "system default."
 msgstr ""
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:43
+#: Source/Core/Core/Src/NetPlayClient.cpp:47
 msgid "The server and client's NetPlay versions are incompatible!"
 msgstr ""
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:40
+#: Source/Core/Core/Src/NetPlayClient.cpp:44
 msgid "The server is full!"
 msgstr ""
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:46
+#: Source/Core/Core/Src/NetPlayClient.cpp:50
 msgid "The server responded: the game is currently running!"
 msgstr ""
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:49
+#: Source/Core/Core/Src/NetPlayClient.cpp:53
 msgid "The server sent an unknown error message!"
 msgstr ""
 
-#: Source/Core/Core/Src/CoreParameter.cpp:119
+#: Source/Core/Core/Src/CoreParameter.cpp:108
 #, c-format
 msgid "The specified file \"%s\" does not exist"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:198
+#: Source/Core/Core/Src/ActionReplay.cpp:186
 msgid "The value is invalid"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:642
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:623
 msgid "Theme:"
 msgstr ""
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:476
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:463
 msgid ""
 "There must be a ticket for 00000001/00000002. Your NAND dump is probably "
 "incomplete."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308
 msgid ""
 "These settings override core Dolphin settings.\n"
 "Undetermined means the game uses Dolphin's setting."
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:355
+#: Source/Core/Core/Src/ActionReplay.cpp:345
 msgid ""
 "This action replay simulator does not support codes that modify Action "
 "Replay itself."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505
 msgid "This could cause slow down in Wii Menu and some games."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118
 msgid ""
 "This feature allows you to change the game's camera.\n"
 "Move the mouse while holding the right mouse button to pan and while holding "
@@ -4767,7 +4869,15 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485
+msgid ""
+"This limits the game speed to the specified number of frames per second "
+"(full speed is 60 for NTSC and 50 for PAL). Alternatively, 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/ConfigMain.cpp:484
 msgid ""
 "This splits the Video and CPU threads, so they can be run on separate "
 "cores.\n"
@@ -4775,75 +4885,75 @@ msgid ""
 "cause occasional crashes/glitches."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:286
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:287
 msgid "This will let you Manually Edit the INI config file"
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:249
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:254
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:236
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:241
 msgid "Threshold"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:288
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:275
 msgid "Tilt"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:628
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:304
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:622
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:291
 msgid "Title"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:125
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:144
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:112
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:131
 msgid "To"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:72
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59
 msgid "Toggle All Log Types"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:426
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:432
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:180
 msgid "Toggle Fullscreen"
 msgstr ""
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:87
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:271
 msgid "Top"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:281
 msgid "Traditional Chinese"
 msgstr ""
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:426
+#: Source/Core/Core/Src/Boot/Boot.cpp:414
 msgid "Tried to load an unknown file type."
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:80
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:67
 msgid "Triggers"
 msgstr ""
 
-#: Source/Core/Common/Src/SysConf.h:91 Source/Core/Common/Src/SysConf.h:114
+#: Source/Core/Common/Src/SysConf.h:78 Source/Core/Common/Src/SysConf.h:101
 msgid "Trying to read from invalid SYSCONF"
 msgstr ""
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:44
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:31
 msgid ""
 "Trying to read from invalid SYSCONF\n"
 "Wiimote bt ids are not available"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:330
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
 msgid "Turkish"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:33
 msgid "Turntable"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:71
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58
 msgid "Type"
 msgstr ""
 
@@ -4851,31 +4961,31 @@ msgstr ""
 msgid "UDP Port:"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:279
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:266
 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12
 msgid "UDP Wiimote"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:199
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:193
 msgid "UNKNOWN"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:756
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:755
 #, c-format
 msgid "UNKNOWN_%02X"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:178
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:172
 msgid "USA"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:225
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:214
 msgid ""
 "Unable to create patch from given values.\n"
 "Entry not modified."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:124
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:111
 #, c-format
 msgid ""
 "Unable to parse line %lu of the entered AR code as a valid encrypted or "
@@ -4883,74 +4993,88 @@ msgid ""
 "Would you like to ignore this line and continue parsing?"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:391
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:397
 #, c-format
 msgid "Undefined %i"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:163
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:164
 msgid "Undo Load State"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:718
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:717
 msgid "Unexpected 0x80 call? Aborting..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:215
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:202
 msgid "Unknown"
 msgstr "Nepoznat/o"
 
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:971
+#: Source/Core/Core/Src/HW/DVDInterface.cpp:965
 #, c-format
 msgid "Unknown DVD command %08x - fatal error"
 msgstr ""
 
-#: Source/Core/Common/Src/SysConf.cpp:145
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:444
+#, c-format
+msgid "Unknown command 0x%08x"
+msgstr ""
+
+#: Source/Core/Common/Src/SysConf.cpp:132
 #, c-format
 msgid "Unknown entry type %i in SYSCONF (%s@%x)!"
 msgstr ""
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:228
+#: Source/Core/Core/Src/NetPlayClient.cpp:232
 #, c-format
 msgid "Unknown message received with id : %d"
 msgstr ""
 
-#: Source/Core/Core/Src/NetPlayServer.cpp:504
+#: Source/Core/Core/Src/NetPlayServer.cpp:508
 #, c-format
 msgid "Unknown message with id:%d received from player:%d Kicking player!"
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:274
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:56
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:261
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:43
 msgid "Up"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:108
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:95
 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17
 msgid "Update"
 msgstr "Updejt "
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:320
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:307
 msgid "Upright Wiimote"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:777
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758
 msgid "Use EuRGB60 Mode (PAL60)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:294
 msgid "Use Fullscreen"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:575
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:563
 msgid "Use Hex"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:600
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580
 msgid "Use Panic Handlers"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89
+msgid ""
+"Use a hacked upload strategy to stream vertices.\n"
+"This usually speed up, but is forbidden by OpenGL specification and may "
+"causes heavy glitches.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122
 msgid ""
 "Use multiple threads to decode textures.\n"
 "Might result in a speedup (especially on CPUs with more than two cores).\n"
@@ -4958,7 +5082,7 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126
 msgid ""
 "Usually if shader compilation fails, an error message is displayed.\n"
 "However, one may skip the popups to allow interruption free gameplay by "
@@ -4967,53 +5091,57 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:539
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:552
 msgid "Utility"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:285
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:293
 msgid "V-Sync"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:209
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318
+msgid "VBeam Speed Hack"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196
 msgid "Value"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:73
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:60
 msgid "Value:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:572
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:560
 msgid "Value: "
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:51
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:38
 msgid "Verbosity"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:377
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:381
 msgid "Video"
 msgstr "Video "
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:486
 msgid "Virtual"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:689
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670
 msgid "Volume"
 msgstr "Jacina zvuka "
 
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:498
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:527
+#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:488
+#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:517
 #, c-format
 msgid "WAD installation failed: error creating %s"
 msgstr ""
 
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:547
+#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:537
 msgid "WAD installation failed: error creating ticket"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84
 msgid ""
 "Wait for vertical blanks in order to reduce tearing.\n"
 "Decreases performance if emulation speed is below 100%.\n"
@@ -5021,25 +5149,25 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/Common/Src/MsgHandler.cpp:67
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46
+#: Source/Core/Common/Src/MsgHandler.cpp:53
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:33
 #: Source/Core/DolphinWX/Src/VideoConfigDiag.h:85
 msgid "Warning"
 msgstr "Upozorenje "
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:291
+#: Source/Core/Core/Src/Boot/Boot.cpp:279
 msgid "Warning - starting DOL in wrong console mode!"
 msgstr "Upozorenje - pokrece se DOL u pogresan konzol mod!"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:341
+#: Source/Core/Core/Src/Boot/Boot.cpp:329
 msgid "Warning - starting ELF in wrong console mode!"
 msgstr "Upozorenje - pokrece se ELF u pogresan konzol mod!"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:221
+#: Source/Core/Core/Src/Boot/Boot.cpp:209
 msgid "Warning - starting ISO in wrong console mode!"
 msgstr "Upozorenje - pogretanje ISO fajla u pogresan konzol mod!"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:519
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:512
 #, c-format
 msgid ""
 "Warning! it is advised to backup all files in the folder:\n"
@@ -5047,7 +5175,7 @@ msgid ""
 "Do you wish to continue?"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:585
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:578
 #, c-format
 msgid ""
 "Warning: This will overwrite any existing saves that are in the folder:\n"
@@ -5061,7 +5189,7 @@ msgstr ""
 "koji imaju isto ime kao i fajlovi na vasoj memoriskoj kartici\n"
 " Nastavi?"
 
-#: Source/Core/Core/Src/Movie.cpp:844
+#: Source/Core/Core/Src/Movie.cpp:835
 #, c-format
 msgid ""
 "Warning: You loaded a save that's after the end of the current movie. (byte "
@@ -5069,7 +5197,7 @@ msgid ""
 "load this state with read-only mode off."
 msgstr ""
 
-#: Source/Core/Core/Src/Movie.cpp:861
+#: Source/Core/Core/Src/Movie.cpp:852
 #, c-format
 msgid ""
 "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You "
@@ -5077,7 +5205,7 @@ msgid ""
 "only mode off. Otherwise you'll probably get a desync."
 msgstr ""
 
-#: Source/Core/Core/Src/Movie.cpp:870
+#: Source/Core/Core/Src/Movie.cpp:861
 #, c-format
 msgid ""
 "Warning: You loaded a save whose movie mismatches on frame %d. You should "
@@ -5096,49 +5224,49 @@ msgid ""
 "%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d"
 msgstr ""
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:106
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:129
+#: Source/Core/AudioCommon/Src/WaveFile.cpp:93
+#: Source/Core/AudioCommon/Src/WaveFile.cpp:116
 msgid "WaveFileWriter - file not open."
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:56
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:60
 msgid "Whammy"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:404
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:408
 msgid "Widescreen Hack"
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:312
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:299
 msgid "Width"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535
 msgid "Wii"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:372
 msgid "Wii Console"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:844
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:825
 msgid "Wii NAND Root:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:191
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:194
 msgid "Wii Save Import"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1243
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1270
 msgid "Wii save files (*.bin)|*.bin"
 msgstr ""
 
-#: Source/Core/DiscIO/Src/WiiWad.cpp:82
+#: Source/Core/DiscIO/Src/WiiWad.cpp:69
 msgid "WiiWAD: Could not read from file"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/Wiimote.cpp:17
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
+#: Source/Core/Core/Src/HW/Wiimote.cpp:20
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
 msgid "Wiimote"
 msgstr ""
 
@@ -5147,7 +5275,7 @@ msgstr ""
 msgid "Wiimote %i"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/Main.cpp:628
+#: Source/Core/DolphinWX/Src/Main.cpp:656
 msgid "Wiimote Connected"
 msgstr ""
 
@@ -5155,7 +5283,7 @@ msgstr ""
 msgid "Wiimote Motor"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
 msgid "Wiimote settings"
 msgstr ""
 
@@ -5163,105 +5291,123 @@ msgstr ""
 msgid "Wiimotes"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:134
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:121
 msgid "Windows Left"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:136
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:123
 msgid "Windows Menu"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:135
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:122
 msgid "Windows Right"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:131
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:124
 msgid "Word Wrap"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1298
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:864
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1089
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1225
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1325
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:880
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1090
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1226
 msgid "Working..."
 msgstr "Radi..."
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:338
+msgid "Write memcards (GC)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46
 msgid "Write to Console"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:67
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:54
 msgid "Write to Debugger"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:57
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44
 msgid "Write to File"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:61
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48
 msgid "Write to Window"
 msgstr ""
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:60
+#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:47
 #, c-format
 msgid "XAudio2 CreateSourceVoice failed: %#X"
 msgstr ""
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:114
+#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:101
 #, c-format
 msgid "XAudio2 init failed: %#X"
 msgstr ""
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:124
+#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:111
 #, c-format
 msgid "XAudio2 master voice creation failed: %#X"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:766
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:765
 msgid "XF reg"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:21
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Yellow"
 msgstr ""
 
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:107
+#: Source/Core/Core/Src/DSP/DSPCore.cpp:120
 msgid ""
-"You are using free dsp roms made by Dolphin Team.\n"
-"Only Zelda ucode games will work correctly with them.\n"
+"You are using a free DSP ROM made by the Dolphin Team.\n"
+"All Wii games will work correctly, and most GC games should also work fine, "
+"but the GBA/IPL/CARD UCodes will not work.\n"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:73
+#: Source/Core/Core/Src/DSP/DSPCore.cpp:116
+msgid ""
+"You are using an old free DSP ROM made by the Dolphin Team.\n"
+"Only games using the Zelda UCode will work correctly.\n"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:63
 msgid "You can't close panes that have pages in them."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:207
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:210
 msgid "You must choose a game!!"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:605
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:593
 msgid "You must enter a name!"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:450
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:438
 msgid "You must enter a valid decimal, hexadecimal or octal value."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:603
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:591
 msgid "You must enter a valid profile name."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:936
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:917
 msgid "You must restart Dolphin in order for the change to take effect."
 msgstr ""
 
-#: Source/Core/Core/Src/CoreParameter.cpp:175
+#: Source/Core/Core/Src/DSP/DSPCore.cpp:109
+msgid ""
+"Your DSP ROMs have incorrect hashes.\n"
+"Would you like to stop now to fix the problem?\n"
+"If you select \"No\", audio might be garbled."
+msgstr ""
+
+#: Source/Core/Core/Src/CoreParameter.cpp:164
 msgid ""
 "Your GCM/ISO file seems to be invalid (invalid country).\n"
 "Continue with PAL region?"
 msgstr ""
 
-#: Source/Core/Common/Src/SysConf.cpp:58
+#: Source/Core/Common/Src/SysConf.cpp:45
 #, c-format
 msgid ""
 "Your SYSCONF file is the wrong size.\n"
@@ -5269,25 +5415,25 @@ msgid ""
 "Do you want to generate a new one?"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:334
 msgid "ZTP hack"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:387
+#: Source/Core/Core/Src/ActionReplay.cpp:377
 msgid "Zero 3 code not supported"
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:408
+#: Source/Core/Core/Src/ActionReplay.cpp:398
 #, c-format
 msgid "Zero code unknown to dolphin: %08x"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:436
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:460
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:423
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:447
 msgid "[ waiting ]"
 msgstr "[ cekanje ]"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107
 msgid ""
 "[BROKEN]\n"
 "Highlight regions the EFB was copied from.\n"
@@ -5295,11 +5441,11 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:91
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:78
 msgid "[Custom]"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120
 msgid ""
 "[EXPERIMENTAL]\n"
 "Aims to speed up emulation by offloading texture decoding to the GPU using "
@@ -5310,7 +5456,7 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121
 msgid ""
 "[EXPERIMENTAL]\n"
 "Speeds up emulation a bit by caching display lists.\n"
@@ -5319,61 +5465,38 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:508
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:495
 msgid "^ ADD"
 msgstr "^ DODAJ"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:820
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:801
 msgid "apploader (.img)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:185
-msgid "failed to read bk header"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:375
-#, c-format
-msgid "failed to read data from file: %s"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:97
-msgid "failed to read header"
-msgstr ""
-
-#: Source/Core/Core/Src/PowerPC/JitInterface.cpp:285
+#: Source/Core/Core/Src/PowerPC/JitInterface.cpp:272
 #, c-format
 msgid "iCacheJIT: Reading Opcode from %x. Please report."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:108
-#, c-format
-msgid "not a wii save or read failure for file header size %x"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:935
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:936
 msgid "s"
 msgstr ""
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:457
-#, c-format
-msgid "unknown cmd 0x%08x"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1110
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1136
 msgid "wxExecute returned -1 on application run!"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:56
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:43
 msgid "zFar Correction: "
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:51
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:38
 msgid "zNear Correction: "
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:493
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:480
 msgid "| OR"
 msgstr "| ILI"
 
-#~ msgid "JIT Recompiler (recommended)"
-#~ msgstr "JIT Recompiler (preporucljivo)"
+#~ msgid "Accurate VBeam emulation"
+#~ msgstr "Tacna VBeam emulacija"
diff --git a/Languages/po/sv.po b/Languages/po/sv.po
new file mode 100644
index 0000000000..fca1fdf818
--- /dev/null
+++ b/Languages/po/sv.po
@@ -0,0 +1,6060 @@
+# Translation of dolphin-emu.pot to Swedish
+# Copyright (C) 2003-2013
+# This file is distributed under the same license as the dolphin-emu package.
+#
+# Translators:
+# DolphinPhoenix <anton_r_3@hotmail.com>, 2013
+msgid ""
+msgstr ""
+"Project-Id-Version: Dolphin Emulator\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-04-18 23:02-0500\n"
+"PO-Revision-Date: 2013-04-23 06:37-0500\n"
+"Last-Translator: DolphinPhoenix <anton_r_3@hotmail.com>\n"
+"Language-Team: Swedish (http://www.transifex.com/projects/p/dolphin-emu/"
+"language/sv/)\n"
+"Language: sv\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:499
+msgid " (too many to display)"
+msgstr "(för många att visa)"
+
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:273
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:491
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:530
+msgid " Game : "
+msgstr "Spel: "
+
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494
+msgid "! NOT"
+msgstr "! INTE"
+
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:58
+#, c-format
+msgid ""
+"\"%s\" does not exist.\n"
+" Create a new 16MB Memcard?"
+msgstr ""
+"\"%s\" finns inte.\n"
+" Vill du skapa ett nytt 16MB minneskort?"
+
+#: Source/Core/Core/Src/CoreParameter.cpp:131
+#, c-format
+msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO."
+msgstr "\"%s\" är en ogiltig GCM/ISO-fil, eller inte en GC/Wii-ISO."
+
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:721
+#, c-format
+msgid "%08X:  "
+msgstr "%08X:  "
+
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:183
+#, c-format
+msgid "%1$sCopy%1$s"
+msgstr "%1$sKopiera%1$s"
+
+#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:113
+#, c-format
+msgid "%d samples"
+msgstr "%d prov"
+
+#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:112
+#, c-format
+msgid "%d samples (quality level %d)"
+msgstr "%d prov (kvalitetsnivå %d)"
+
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:121
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:289
+#, c-format
+msgid "%s already exists, overwrite?"
+msgstr "%s finns redan, vill du skriva över?"
+
+#: Source/Core/DiscIO/Src/CompressedBlob.cpp:154
+#, c-format
+msgid "%s failed to be scrubbed. Probably the image is corrupt."
+msgstr "%s misslyckades att rensas. Förmodligen är bilden korrupt."
+
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:83
+#, c-format
+msgid ""
+"%s failed to load as a memorycard \n"
+" Card file size is invalid (0x%x bytes)"
+msgstr ""
+"%s misslyckades att läsas in som ett minneskort \n"
+" Kortets filstorlek är ogiltig (0x%x bytes)"
+
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:98
+#, c-format
+msgid ""
+"%s failed to load as a memorycard \n"
+" Card size is invalid (0x%x bytes)"
+msgstr ""
+"%s misslyckades att läsas in som ett minneskort \n"
+" Kortets storlek är ogiltig (0x%x bytes)"
+
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:78
+#, c-format
+msgid ""
+"%s failed to load as a memorycard \n"
+"file is not large enough to be a valid memory card file (0x%x bytes)"
+msgstr ""
+"%s misslyckades att läsas in som ett minneskort.\n"
+"Filen är inte tillräckligt stor för att vara en riktig minneskortsfil (0x%x "
+"bytes)"
+
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:359
+#, c-format
+msgid "%s failed to open"
+msgstr "%s misslyckades att öppnas"
+
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:352
+#, c-format
+msgid "%s is a 0 byte file"
+msgstr "%s är en fil på 0 byte"
+
+#: Source/Core/DiscIO/Src/CompressedBlob.cpp:146
+#, c-format
+msgid "%s is already compressed! Cannot compress it further."
+msgstr "%s är redan komprimerad! Kan inte komprimera den ytterligare."
+
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:337
+#, c-format
+msgid "%s is too long for the filename, max chars is 45"
+msgstr "%s är för långt för filnamnet, maximalt antal tecken är 45"
+
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:189
+#, c-format
+msgid "%sDelete%s"
+msgstr "%sRadera%s"
+
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:187
+#, c-format
+msgid "%sExport GCI%s"
+msgstr "%sExportera GCI%s"
+
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:185
+#, c-format
+msgid "%sImport GCI%s"
+msgstr "%sImportera GCI%s"
+
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:763
+#, c-format
+msgid "%u Free Blocks; %u Free Dir Entries"
+msgstr "%uFria block; %u fria mappingångar"
+
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:493
+msgid "&& AND"
+msgstr "&& OCH"
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:301
+msgid "&About..."
+msgstr "&Om..."
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:100
+msgid "&Boot from DVD Drive..."
+msgstr "&Starta upp från DVD-enhet..."
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:234
+msgid "&Breakpoints"
+msgstr "&Brytpunkter"
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:111
+msgid "&Browse for ISOs..."
+msgstr "&Bläddra efter ISOs..."
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:195
+msgid "&Cheats Manager"
+msgstr "&Fuskhanterare"
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:180
+msgid "&DSP Settings"
+msgstr "&DSP-inställningar"
+
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:876
+msgid "&Delete ISO..."
+msgstr "&Radera ISO..."
+
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:897
+msgid "&Delete selected ISOs..."
+msgstr "&Radera valda ISOs..."
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:173
+msgid "&Emulation"
+msgstr "&Emulering"
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:114
+msgid "&File"
+msgstr "&Arkiv"
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:341
+msgid "&Frame Advance"
+msgstr "Avancerad &bildruta"
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:358
+msgid "&Fullscreen"
+msgstr "&Helskärm"
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:179
+msgid "&Graphics Settings"
+msgstr "&Grafikinställningar"
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:302
+msgid "&Help"
+msgstr "&Hjälp"
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:183
+msgid "&Hotkey Settings"
+msgstr "&Kortkommandoinställningar"
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:236
+msgid "&JIT"
+msgstr "&JIT"
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:149
+msgid "&Load State"
+msgstr "&Läs in snabbsparning"
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:193
+msgid "&Memcard Manager (GC)"
+msgstr "&Minneskorthanterare (GC)"
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:235
+msgid "&Memory"
+msgstr "&Minne"
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:319
+msgid "&Open..."
+msgstr "&Öppna..."
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:189
+msgid "&Options"
+msgstr "A&lternativ"
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:330
+msgid "&Pause"
+msgstr "&Pausa"
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:332
+msgid "&Play"
+msgstr "&Spela"
+
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:858
+msgid "&Properties"
+msgstr "&Egenskaper"
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:354
+msgid "&Read-only mode"
+msgstr "&Skrivskyddat läge"
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:325
+msgid "&Refresh List"
+msgstr "&Uppdatera lista"
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:233
+msgid "&Registers"
+msgstr "&Listor"
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:338
+msgid "&Reset"
+msgstr "&Återställ"
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:237
+msgid "&Sound"
+msgstr "&Ljud"
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:335
+msgid "&Stop"
+msgstr "&Stoppa"
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:210
+msgid "&Tools"
+msgstr "&Verktyg"
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:238
+msgid "&Video"
+msgstr "&Video"
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:287
+msgid "&View"
+msgstr "&Visa"
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:182
+msgid "&Wiimote Settings"
+msgstr "Inställningar för &Wiimotes"
+
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:859
+msgid "&Wiki"
+msgstr "&Wiki"
+
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504
+msgid "'"
+msgstr "'"
+
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:46
+msgid "(-)+zFar"
+msgstr "(-)+zFar"
+
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:41
+msgid "(-)+zNear"
+msgstr "(-)+zNear"
+
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:86
+msgid "(UNKNOWN)"
+msgstr "(OKÄND)"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:384
+msgid "(off)"
+msgstr "(av)"
+
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:654
+msgid "0x44"
+msgstr "0x44"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+msgid "1.5x Native (960x792)"
+msgstr "1.5x ursprunglig (960x792)"
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:158
+msgid "16 bit"
+msgstr "16 bitar"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+msgid "1x Native (640x528)"
+msgstr "1x ursprunglig (640x528)"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+msgid "2.5x Native (1600x1320)"
+msgstr "2.5x ursprunglig (1600x1320)"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+msgid "2x Native (1280x1056)"
+msgstr "2x ursprunglig (1280x1056)"
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:159
+msgid "32 bit"
+msgstr "32 bitar"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:412
+msgid "3D Vision"
+msgstr "3D-vision"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+msgid "3x Native (1920x1584)"
+msgstr "3x ursprunglig (1920x1584)"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+msgid "4x Native (2560x2112)"
+msgstr "4x ursprunglig (2560x2112)"
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:157
+msgid "8 bit"
+msgstr "8 bitar"
+
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:30
+msgid "<Insert name here>"
+msgstr "<Ange namn här>"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:262
+msgid "<No resolutions found>"
+msgstr "<Inga upplösningar hittades>"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84
+msgid "<Nothing>"
+msgstr "<Ingenting>"
+
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:150
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:150
+msgid "<Press Key>"
+msgstr "<Tryck på en tangent>"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286
+msgid "<System>"
+msgstr "<System>"
+
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695
+msgid "A"
+msgstr "A"
+
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:204
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:238
+msgid "A NetPlay window is already open!!"
+msgstr "Ett nätspelsfönster är redan öppet!!"
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:353
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:387
+msgid "A game is not currently running."
+msgstr "Ett spel körs inte för tillfället."
+
+#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:68
+msgid ""
+"A supported bluetooth device could not be found.\n"
+"You must manually connect your wiimotes."
+msgstr ""
+"En stödjande bluetooth-enhet kunde inte hittas.\n"
+"Du måste ansluta dina wiimotes manuellt."
+
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:100
+msgid ""
+"ALERT:\n"
+"\n"
+"Netplay will only work with the following settings:\n"
+" - Enable Dual Core [OFF]\n"
+" - DSP Emulator Engine Must be the same on all computers!\n"
+" - DSP on Dedicated Thread [OFF]\n"
+" - Framelimit NOT set to [Audio]\n"
+" - Manually set the exact number of controllers to be used to [Standard "
+"Controller]\n"
+"\n"
+"All players should use the same Dolphin version and settings.\n"
+"All memory cards must be identical between players or disabled.\n"
+"Wiimote support has not been implemented!\n"
+"\n"
+"The host must have the chosen TCP port open/forwarded!\n"
+msgstr ""
+"!!FUZZY!!VARNING:\n"
+"\n"
+"Nätspel kommer bara fungera med följande inställningar:\n"
+" - Aktivera dubbla kärnor [AV]\n"
+" - DSP-emulatormotorn måste vara likadana på alla datorer!\n"
+" - DSP på tillägnad tråd [AV]\n"
+" - Bildrutegränsen ska inte vara inställd på [Ljud]\n"
+" - Manuellt angivit det exakta antalet kontroller som ska användas som "
+"[Standardkontroll]\n"
+"\n"
+"Alla spelare bör ha samma inställningar och version av Dolphin.\n"
+"Alla minneskort måste antingen vara identiska mellan spelare eller "
+"inaktiverade.\n"
+"Stöd för Wiimotes har inte införts!\n"
+"\n"
+"Värden måste ha angivit TCP-porten som öppen/vidarebefordrad!\n"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96
+msgid "AM-Baseboard"
+msgstr "AM-fotlist"
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:115
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:300
+msgid "AR Codes"
+msgstr "AR-koder"
+
+#: Source/Core/DolphinWX/Src/AboutDolphin.h:21
+msgid "About Dolphin"
+msgstr "Om Dolphin"
+
+#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24
+msgid "Acceleration"
+msgstr "Acceleration"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473
+msgid "Accuracy:"
+msgstr "Precision:"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97
+msgid ""
+"Accurately emulate EFB copies.\n"
+"Some games depend on this for certain graphical effects or gameplay "
+"functionality.\n"
+"\n"
+"If unsure, check EFB to Texture instead."
+msgstr ""
+"Emulerar EFB-kopior noggrant.\n"
+"Vissa spel förlitar sig på detta för vissa grafikeffekter eller "
+"spelfunktionalitet.\n"
+"\n"
+"Om du är osäker kan du markera EFB till Textur istället."
+
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:227
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:227
+msgid "Action"
+msgstr "Handling"
+
+#: Source/Core/Core/Src/ARDecrypt.cpp:469
+#, c-format
+msgid ""
+"Action Replay Code Decryption Error:\n"
+"Parity Check Failed\n"
+"\n"
+"Culprit Code:\n"
+"%s"
+msgstr ""
+"Dekrypteringsfel av Action Replay-kod:\n"
+"Paritetkontroll misslyckades\n"
+"\n"
+"Brottkod:\n"
+"%s"
+
+#: Source/Core/Core/Src/ActionReplay.cpp:657
+#, c-format
+msgid ""
+"Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)"
+msgstr ""
+"Action Replay-fel: Ogiltig storlek (%08x : address = %08x) i 'Lägg till "
+"kod' (%s)"
+
+#: Source/Core/Core/Src/ActionReplay.cpp:745
+#, c-format
+msgid ""
+"Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide "
+"(%s)"
+msgstr ""
+"Action Replay-fel: Ogiltig storlek (%08x : adress = %08x) i 'Fill and "
+"Slide' (%s)"
+
+#: Source/Core/Core/Src/ActionReplay.cpp:537
+#, c-format
+msgid ""
+"Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And "
+"Fill (%s)"
+msgstr ""
+"Action Replay-fel: Ogiltig storlek (%08x : adress = %08x) i 'Ram Write And "
+"Fill' (%s)"
+
+#: Source/Core/Core/Src/ActionReplay.cpp:597
+#, c-format
+msgid ""
+"Action Replay Error: Invalid size (%08x : address = %08x) in Write To "
+"Pointer (%s)"
+msgstr ""
+"Action Replay-fel: Ogiltig storlek (%08x : adress = %08x) i 'Write To "
+"Pointer' (%s)"
+
+#: Source/Core/Core/Src/ActionReplay.cpp:792
+#, c-format
+msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)"
+msgstr "Action Replay-fel: Ogiltigt värde (%08x) i minneskopia (%s)"
+
+#: Source/Core/Core/Src/ActionReplay.cpp:672
+#, c-format
+msgid ""
+"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)\n"
+"Master codes are not needed. Do not use master codes."
+msgstr ""
+"Action Replay-fel: Masterkod och Skriv Till CCXXXXXX är inte implementerade "
+"(%s)\n"
+"Masterkoder behövs inte. Använd inte masterkoder."
+
+#: Source/Core/Core/Src/ActionReplay.cpp:184
+#, c-format
+msgid "Action Replay Error: invalid AR code line: %s"
+msgstr "Action Replay-fel: ogiltig AR-kodrad: %s"
+
+#: Source/Core/Core/Src/ActionReplay.cpp:862
+#, c-format
+msgid "Action Replay: Conditional Code: Invalid Size %08x (%s)"
+msgstr "Action Replay: Tillståndskod: Ogiltig storlek %08x (%s)"
+
+#: Source/Core/Core/Src/ActionReplay.cpp:935
+#, c-format
+msgid "Action Replay: Invalid Normal Code Type %08x (%s)"
+msgstr "Action Replay: Ogiltig typ av normalkod %08x (%s)"
+
+#: Source/Core/Core/Src/ActionReplay.cpp:886
+#, c-format
+msgid "Action Replay: Normal Code %i: Invalid subtype %08x (%s)"
+msgstr "Action Replay: Normalkod %i: Ogiltig undertyp %08x (%s)"
+
+#: Source/Core/Core/Src/ActionReplay.cpp:828
+#, c-format
+msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)"
+msgstr "Action Replay: Normalkod 0: Ogiltig undertyp %08x (%s)"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:247
+msgid "Adapter:"
+msgstr "Adapter:"
+
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:63
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:63
+msgid "Add"
+msgstr "Lägg till"
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1301
+msgid "Add ActionReplay Code"
+msgstr "Lägg till ActionReplay-kod"
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1230
+msgid "Add Patch"
+msgstr "Lägg till patch"
+
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:528
+msgid "Add new pane"
+msgstr "Lägg till ny panel"
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:408
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:430
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:792
+msgid "Add..."
+msgstr "Lägg till..."
+
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:81
+msgid "Address :"
+msgstr "Adress:"
+
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:45
+msgid ""
+"Adds the specified value to zFar Parameter.\n"
+"Two ways to express the floating point values.\n"
+"Example: entering ''200'' or ''0.0002'' directly, it produces equal effects, "
+"the acquired value will be ''0.0002''.\n"
+"Values: (0->+/-Integer) or (0->+/-FP[6 digits of precision])\n"
+"\n"
+"NOTE: Check LogWindow/Console for the acquired values."
+msgstr ""
+"Lägger till det valda värdet till parametern zFar.\n"
+"Två sätt att uttrycka de flytande punktvärdena.\n"
+"Exempel: Genom att skriva in ''200'' eller ''0.0002'' ger samma effekt och "
+"det erhållna värdet kommer att bli ''0.0002''.\n"
+"Värden: (0->+/-Heltal) eller (0->+/-FP[6 siffrors noggrannhet])\n"
+"\n"
+"OBS: Kontrollera LogWindow/Console för de erhållna värdena."
+
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:40
+msgid ""
+"Adds the specified value to zNear Parameter.\n"
+"Two ways to express the floating point values.\n"
+"Example: entering ''200'' or ''0.0002'' directly, it produces equal effects, "
+"the acquired value will be ''0.0002''.\n"
+"Values: (0->+/-Integer) or (0->+/-FP[6 digits of precision])\n"
+"\n"
+"NOTE: Check LogWindow/Console for the acquired values."
+msgstr ""
+"Lägger till det valda värdet till parametern zNear.\n"
+"Två sätt att uttrycka de flytande punktvärdena.\n"
+"Exempel: Genom att skriva in ''200'' eller ''0.0002'' ger samma effekt och "
+"det erhållna värdet kommer att bli ''0.0002''.\n"
+"Värden: (0->+/-Heltal) eller (0->+/-FP[6 siffrors noggrannhet])\n"
+"\n"
+"OBS: Kontrollera LogWindow/Console för de erhållna värdena."
+
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:744
+msgid "Adjust the analog control pressure required to activate buttons."
+msgstr "Justerar analoga kontrolltrycket som krävs för att aktivera knappar."
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:522
+msgid "Advanced"
+msgstr "Avancerat"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561
+msgid "Advanced Settings"
+msgstr "Avancerade inställningar"
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:587
+msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)"
+msgstr "Alla GC/Wii-filer (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:797
+msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)"
+msgstr "Alla GC/Wii-bilder (gcm, iso, wbfs, ciso, gcz)"
+
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1190
+msgid "All Gamecube GCM files (gcm)"
+msgstr "Alla GCM-filer för Gamecube (gcm)"
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1417
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1431
+msgid "All Save States (sav, s##)"
+msgstr "Alla snabbsparningar (sav, s##)"
+
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1188
+msgid "All Wii ISO files (iso)"
+msgstr "Alla ISO-filer för Wii (iso)"
+
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1208
+msgid "All compressed GC/Wii ISO files (gcz)"
+msgstr "Alla komprimerade ISO-filer för GC/Wii (gcz)"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:104
+msgid "All files (*.*)|*.*"
+msgstr "Alla filer (*.*)|*.*"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123
+msgid ""
+"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 ""
+"Tillåter att växla mellan vissa inställningar med snabbtangenterna 3 (Intern "
+"upplösning), 4 (Bildförhållande), 5 (Kopiera EFB) och 6 (Dimma) inom "
+"emulatorfönstret.\n"
+"\n"
+"Om du är osäker kan du lämna detta omarkerat."
+
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:272
+msgid "Analyze"
+msgstr "Analysera"
+
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:285
+msgid "Angle"
+msgstr "Vinkel"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:375
+msgid "Anisotropic Filtering:"
+msgstr "Anisotropisk filtrering:"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:358
+msgid "Anti-Aliasing:"
+msgstr "Kantutjämning:"
+
+#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:299
+msgid "Apploader is the wrong size...is it really an apploader?"
+msgstr "Apploader är i fel storlek...är det verkligen en apploader?"
+
+#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:293
+msgid "Apploader unable to load from file"
+msgstr "Det gick inte att läsa in apploader från fil"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:822
+msgid "Apploader:"
+msgstr "Apploader:"
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:122
+msgid "Apply"
+msgstr "Verkställ"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124
+msgid ""
+"Apply a post-processing effect after finishing a frame.\n"
+"\n"
+"If unsure, select (off)."
+msgstr ""
+"Lägger till en efterbehandlande effekt efter en bildruta har ritats.\n"
+"\n"
+"Om du är osäker kan du välja (av)."
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287
+msgid "Arabic"
+msgstr "Arabiska"
+
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:603
+#, c-format
+msgid "Are you sure you want to delete \"%s\"?"
+msgstr "Vill du verkligen raders \"%s\"?"
+
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1013
+msgid ""
+"Are you sure you want to delete these files?\n"
+"They will be gone forever!"
+msgstr ""
+"Vill du verkligen ta bort dessa filer?\n"
+"De kommer att försvinna för alltid!"
+
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1004
+msgid "Are you sure you want to delete this file?  It will be gone forever!"
+msgstr ""
+"Vill du verkligen radera denna fil? Den kommer att försvinna för alltid!"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:44
+msgid "Arm JIT (experimental)"
+msgstr "Arm JIT (experimentell)"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:285
+msgid "Aspect Ratio:"
+msgstr "Bildförhållande:"
+
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:58
+msgid "At least one pane must remain open."
+msgstr "Åtminstone en panel måste vara öppen."
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533
+msgid "Audio"
+msgstr "Ljud"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675
+msgid "Audio Backend:"
+msgstr "Ljudbackend:"
+
+#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:28
+msgid "AudioCommon: Error opening AO device.\n"
+msgstr "AudioCommon: Fel uppstod när AO-enhet skulle öppnas.\n"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283
+msgid "Auto"
+msgstr "Auto"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345
+msgid "Auto (Multiple of 640x528)"
+msgstr "Auto (multiplicerat av 640x528)"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345
+msgid "Auto (Window Size)"
+msgstr "Auto (fönsterstorlek)"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305
+msgid "Auto adjust Window Size"
+msgstr "Autojustera fönsterstorlek"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77
+msgid ""
+"Automatically adjusts the window size to your internal resolution.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+"Justerar automatiskt fönsterstorleken till din interna upplösning.\n"
+"\n"
+"Om du är osäker kan du lämna detta omarkerat."
+
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696
+msgid "B"
+msgstr "B"
+
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:754
+msgid "BP register "
+msgstr "BP-register"
+
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:14
+msgid "Back"
+msgstr "Backsteg"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:679
+msgid "Backend Settings"
+msgstr "Backendinställningar"
+
+#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:47
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:211
+msgid "Backend:"
+msgstr "Backend:"
+
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:305
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:82
+msgid "Background Input"
+msgstr "Bakgrundsindata"
+
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:266
+msgid "Backward"
+msgstr "Tillbaka"
+
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:257
+msgid "Bad File Header"
+msgstr "Dålig headerfil"
+
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:621
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:290
+msgid "Banner"
+msgstr "Banner"
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:529
+msgid "Banner Details"
+msgstr "Bannerdetaljer"
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491
+msgid "Banner:"
+msgstr "Banner:"
+
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:61
+msgid "Bar"
+msgstr "Takt"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:316
+msgid "Basic"
+msgstr "Grundläggande"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555
+msgid "Basic Settings"
+msgstr "Grundläggande inställningar"
+
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
+msgid "Bass"
+msgstr "Bas"
+
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:174
+msgid "Block Allocation Table checksum failed"
+msgstr "Kontrollsummering för blockallokeringstabellen misslyckades"
+
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625
+msgid "Blocks"
+msgstr "Block"
+
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
+msgid "Blue"
+msgstr "Blå"
+
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
+msgid "Blue Left"
+msgstr "Blå vänster"
+
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
+msgid "Blue Right"
+msgstr "Blå höger"
+
+#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:87
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270
+msgid "Bottom"
+msgstr "Under"
+
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:225
+#, c-format
+msgid "Bound Controls: %lu"
+msgstr "Bundna kontroller: %lu"
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348
+msgid "Broken"
+msgstr "Trasig"
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:428
+msgid "Browse"
+msgstr "Bläddra"
+
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:243
+msgid "Browse for a directory to add"
+msgstr "Bläddra efter en filmapp som ska läggas till"
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:428
+msgid "Browse for an ISO directory..."
+msgstr "Bläddra efter en ISO-sökväg..."
+
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1080
+msgid "Browse for output directory"
+msgstr "Bläddra mapp för utdata"
+
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:331
+msgid "Buffer:"
+msgstr "Buffer:"
+
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:58
+#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23
+#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:106
+msgid "Buttons"
+msgstr "Knappar"
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317
+msgid ""
+"Bypass the clearing of the data cache by the DCBZ instruction. Usually leave "
+"this option disabled."
+msgstr ""
+"Kringgår rensning av datacachen för DCBZ-instruktionen. Vanligtvis brukar "
+"man lämna detta alternativ inaktiverat."
+
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:697
+msgid "C"
+msgstr "C"
+
+#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:64
+msgid "C Stick"
+msgstr "C-spak"
+
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:64
+msgid "C-Stick"
+msgstr "C-spak"
+
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:763
+msgid "CP reg"
+msgstr "CP-register"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547
+msgid "CPU Emulator Engine"
+msgstr "Processorns emulatormotor"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500
+msgid "Cache Display Lists"
+msgstr "Cachevisningslista"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88
+msgid ""
+"Calculate lighting of 3D graphics per-pixel rather than per vertex.\n"
+"Decreases emulation speed by some percent (depending on your GPU).\n"
+"This usually is a safe enhancement, but might cause issues sometimes.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+"Räknar ut belysning av 3D-grafik för varje bildpunkt hellre än för varje "
+"hörn.\n"
+"Emulatorns hastighet sjunker med några procent (beroende på din "
+"grafikprocessor).\n"
+"Detta är vanligtvis en säker förbättring, men kan orsaka fel ibland.\n"
+"\n"
+"Om du är osäker kan du lämna detta omarkerat."
+
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1858
+#, c-format
+msgid "Can't find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x"
+msgstr "Kan inte hitta Wiimote med bd: %02x:%02x:%02x:%02x:%02x:%02x"
+
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1872
+#, c-format
+msgid "Can't find WiiMote by connection handle %02x"
+msgstr "Kan inte hitta Wiimote med anslutningshandtaget %02x"
+
+#: Source/Core/Core/Src/HW/DVDInterface.cpp:669
+#: Source/Core/Core/Src/HW/DVDInterface.cpp:679
+msgid "Can't read from DVD_Plugin - DVD-Interface: Fatal Error"
+msgstr "Kan inte läsa från DVD_Plugin - DVD-gränssnitt: Allvarligt fel"
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:124
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:28
+msgid "Cancel"
+msgstr "Avbryt"
+
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:84
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:171
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:233
+#, c-format
+msgid "Cannot open %s"
+msgstr "Kan inte öppna %s"
+
+#: Source/Core/Core/Src/CoreTiming.cpp:128
+msgid "Cannot unregister events with events pending"
+msgstr "Kan inte avregistrera händelser när händelser väntar"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1061
+#, c-format
+msgid ""
+"Cannot use that file as a memory card.\n"
+"%s\n"
+"is not a valid gamecube memory card file"
+msgstr ""
+"Kan inte använda denna fil som ett minneskort.\n"
+"%s\n"
+"är inte en giltig minneskortsfil för GameCube"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1091
+msgid ""
+"Cannot use that file as a memory card.\n"
+"Are you trying to use the same file in both slots?"
+msgstr ""
+"Kan inte använda denna fil som ett minneskort.\n"
+"Försöker du använda samma fil i båda spåren?"
+
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:39
+msgid "Caps Lock"
+msgstr "Caps Lock"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288
+msgid "Catalan"
+msgstr "Katalanska"
+
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:298
+msgid "Center"
+msgstr "Centrum"
+
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:564
+msgid "Change"
+msgstr "Byt"
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:322
+msgid "Change &Disc..."
+msgstr "Byt &skiva"
+
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:167
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:167
+msgid "Change Disc"
+msgstr "Byt skiva"
+
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:556
+msgid "Change Game"
+msgstr "Byt spel"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495
+msgid ""
+"Change the language of the user interface.\n"
+"Requires restart."
+msgstr ""
+"Ändrar språket för användargränssnittet.\n"
+"Kräver omstart."
+
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:47
+msgid "Changes sign to zFar Parameter (after correction)"
+msgstr "Ändrar tecken till parametern zFar (efter korrektion)"
+
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:42
+msgid "Changes sign to zNear Parameter (after correction)"
+msgstr "Ändrar tecken till parametern zNear (efter korrigering)"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499
+msgid "Changing this will have no effect while the emulator is running!"
+msgstr "Detta kommer inte ha någon effekt om det ändras medan emulatorn körs!"
+
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:298
+msgid "Chat"
+msgstr "Chatt"
+
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:34
+msgid "Cheat Code"
+msgstr "Fuskkod"
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:118
+msgid "Cheat Search"
+msgstr "Sök efter fusk"
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:25
+msgid "Cheats Manager"
+msgstr "Fuskhanterare"
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:633
+msgid "Check Partition Integrity"
+msgstr "Kontrollera partitionintegritet"
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:880
+msgid "Checking integrity..."
+msgstr "Kontrollerar integritet..."
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289
+msgid "Chinese (Simplified)"
+msgstr "Kinesiska (förenklad)"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290
+msgid "Chinese (Traditional)"
+msgstr "Kinesiska (traditionell)"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:799
+msgid "Choose a DVD root directory:"
+msgstr "Välj en DVD-filkatalog:"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803
+msgid "Choose a NAND root directory:"
+msgstr "Välj en mapp till NAND-rot:"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:796
+msgid "Choose a default ISO:"
+msgstr "Välj en standard-ISO:"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1219
+msgid "Choose a directory to add"
+msgstr "Välj en filkatalog att läggas till"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1048
+msgid "Choose a file to open"
+msgstr "Välj en fil som ska öppnas"
+
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:204
+msgid "Choose a memory card:"
+msgstr "Välj ett minneskort:"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800
+msgid ""
+"Choose file to use as apploader: (applies to discs constructed from "
+"directories only)"
+msgstr ""
+"Välj fil som ska användas som apploader: (gäller endast skivor som är "
+"tillverkade från mappar)"
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:781
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:822
+msgid "Choose the folder to extract to"
+msgstr "Välj extraheringsmappen"
+
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:284
+msgid "Circle Stick"
+msgstr "Cirkelspak"
+
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:56
+msgid "Classic"
+msgstr "Klassisk"
+
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:137
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:30
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:474
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:904
+msgid "Clear"
+msgstr "Rensa"
+
+#: Source/Core/Core/Src/NetPlayServer.cpp:263
+msgid ""
+"Client disconnect while game is running!! NetPlay is disabled. You must "
+"manually stop the game."
+msgstr ""
+"Klienten avröt anslutningen medan spelet körs!! Nätspel är inaktiverat. Du "
+"måste stoppa spelet manuellt."
+
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:285
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:234
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:562
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:590
+msgid "Close"
+msgstr "Stäng"
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:177
+msgid "Co&nfigure..."
+msgstr "Ko&nfigurera..."
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:73
+msgid "Code Info"
+msgstr "Kodinfo"
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:556
+msgid "Code: "
+msgstr "Kod:"
+
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:35
+msgid "Command"
+msgstr "Kommando"
+
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:623
+msgid "Comment"
+msgstr "Kommentar"
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489
+msgid "Comment:"
+msgstr "Kommentar:"
+
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:884
+msgid "Compress ISO..."
+msgstr "Komprimera ISO..."
+
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:899
+msgid "Compress selected ISOs..."
+msgstr "Komprimera valda ISOs..."
+
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1089
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1225
+msgid "Compressing ISO"
+msgstr "Komprimerar ISO"
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:435
+msgid "Config"
+msgstr "Konfig."
+
+#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:37
+#: Source/Core/DolphinWX/Src/InputConfigDiag.h:122
+#: Source/Core/DolphinWX/Src/InputConfigDiag.h:141
+msgid "Configure"
+msgstr "Konfigurera"
+
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:98
+msgid "Configure Control"
+msgstr "Konfigurera kontroll"
+
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:583
+msgid "Configure Pads"
+msgstr "Konfigurera styrplattor"
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:435
+msgid "Configure..."
+msgstr "Konfigurera..."
+
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1120
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1218
+msgid "Confirm File Overwrite"
+msgstr "Bekräfta överskrivning av fil"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:577
+msgid "Confirm on Stop"
+msgstr "Bekräfta vid stopp"
+
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:74
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:96
+msgid "Connect"
+msgstr "Anslut"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:764
+msgid "Connect USB Keyboard"
+msgstr "Anslut USB-tangentbord"
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:368
+#, c-format
+msgid "Connect Wiimote %i"
+msgstr "Anslut Wiimote %i"
+
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183
+msgid "Connect Wiimote 1"
+msgstr "Anslut Wiimote 1"
+
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184
+msgid "Connect Wiimote 2"
+msgstr "Anslut Wiimote 2"
+
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:185
+msgid "Connect Wiimote 3"
+msgstr "Anslut Wiimote 3"
+
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:186
+msgid "Connect Wiimote 4"
+msgstr "Anslut Wiimote 4"
+
+#: Source/Core/DolphinWX/Src/Main.cpp:655
+msgid "Connecting..."
+msgstr "Ansluter..."
+
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:156
+msgid "Console"
+msgstr "Kommandotolk"
+
+#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:71
+msgid "Continuous Scanning"
+msgstr "Kontinuerlig skanning"
+
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:33
+msgid "Control"
+msgstr "Kontroll"
+
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:176
+msgid "Convert to GCI"
+msgstr "Konvertera till GCI"
+
+#: Source/Core/Core/Src/CoreParameter.cpp:368
+msgid "Copy failed"
+msgstr "Kopiering misslyckades"
+
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:789
+#, c-format
+msgid "Copy to Memcard %c"
+msgstr "Kopiera till minneskortet %c"
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:359
+msgid "Core"
+msgstr "Kärna"
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:148
+#, c-format
+msgid "Could not create %s"
+msgstr "Kunde inte skapa %s"
+
+#: Source/Core/AudioCommon/Src/AudioCommon.cpp:62
+#, c-format
+msgid "Could not initialize backend %s."
+msgstr "Kunde inte initiera backend %s."
+
+#: Source/Core/Core/Src/CoreParameter.cpp:126
+#, c-format
+msgid ""
+"Could not read \"%s\".  There is no disc in the drive, or it is not a GC/Wii "
+"backup.  Please note that original Gamecube and Wii discs cannot be read by "
+"most PC DVD drives."
+msgstr ""
+"Kunde inte läsa \"%s\".  Det finns ingen skiva i läsaren, eller så är det "
+"ingen GC/Wii-backup. Var god notera att originalskivor för GameCube och Wii "
+"inte kan läsas av de flesta PC DVD-läsare."
+
+#: Source/Core/Core/Src/CoreParameter.cpp:281
+#, c-format
+msgid "Could not recognize ISO file %s"
+msgstr "Kunde inte känna igen ISO-fil %s"
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:579
+#, c-format
+msgid "Could not save %s"
+msgstr "Kunde inte spara %s"
+
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:551
+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 ""
+"Kunde inte konfigurera kontroller. Spelaren lämnade spelet eller så körs "
+"spelet för tillfället!\n"
+"(Att konfigurera kontroller när spelet körs stöds inte ännu)"
+
+#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119
+#, c-format
+msgid ""
+"Could not write memory card file %s.\n"
+"\n"
+"Are you running Dolphin from a CD/DVD, or is the save file maybe write "
+"protected?\n"
+"\n"
+"Are you receiving this after moving the emulator directory?\n"
+"If so, then you may need to re-specify your memory card location in the "
+"options."
+msgstr ""
+"Kunde inte skriva minneskortsfilen %s.\n"
+"\n"
+"Kör du Dolphin från en CD/DVD-skiva, eller är sparningfilen kanske "
+"skrivskyddad?\n"
+"\n"
+"Får du detta efter att ha flyttat emulatorns filmapp?\n"
+"I så fall kan du behöva ställa in dina minneskortsplatser i inställningarna "
+"igen."
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1133
+msgid "Couldn't find open command for extension 'ini'!"
+msgstr "Kunde inte öppna kommandot för tillägget 'ini'!"
+
+#: Source/Core/Core/Src/BootManager.cpp:137
+msgid ""
+"Couldn't init the core.\n"
+"Check your configuration."
+msgstr ""
+"Kunde inte initiera kärnan.\n"
+"Kontrollera dina konfigurationer."
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:495
+msgid "Count:"
+msgstr "Räkna:"
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456
+msgid "Country:"
+msgstr "Land:"
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:173
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:550
+msgid "Create AR Code"
+msgstr "Skapa AR-kod"
+
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:569
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:641
+msgid "Create new perspective"
+msgstr "Skapa nytt perspektiv"
+
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:17
+msgid "Creator: "
+msgstr "Skapare:"
+
+#: Source/Core/Common/Src/MsgHandler.cpp:54
+msgid "Critical"
+msgstr "Kritisk"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562
+msgid "Crop"
+msgstr "Beskär"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119
+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 ""
+"Beskär bilden från 4:3 till 5:4 eller från 16:9 till 16:10.\n"
+"\n"
+"Om du är osäker kan du lämna detta omarkerat."
+
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:52
+msgid "Crossfade"
+msgstr "Överbländning"
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:600
+#, c-format
+msgid "Current directory changed from %s to %s after wxFileSelector!"
+msgstr "Den aktuella filmappen ändrades från %s till %s efter wxFileSelector!"
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339
+msgid "Custom Projection Hack"
+msgstr "Anpassad projektionshackning"
+
+#: Source/Core/DolphinWX/Src/PHackSettings.h:17
+msgid "Custom Projection Hack Settings"
+msgstr "Anpassade inställnignar för projektionhackning"
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342
+msgid "Customize some Orthographic Projection parameters."
+msgstr "Anpassa några ortografiska projektionsparametrar."
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291
+msgid "Czech"
+msgstr "Tjeckiska"
+
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:697
+msgid "D"
+msgstr "D"
+
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
+msgid "D-Pad"
+msgstr "Styrplatta"
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
+msgid "DSP"
+msgstr "DSP"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:639
+msgid "DSP Emulator Engine"
+msgstr "DSP-emulatormotor"
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:254
+msgid "DSP HLE emulation (fast)"
+msgstr "DSP HLE-emulation (snabb)"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:256
+msgid "DSP LLE interpreter (slow)"
+msgstr "DSP LLE-interpreterare (långsam)"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:255
+msgid "DSP LLE recompiler"
+msgstr "DSP LLE-omkompilator"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:641
+msgid "DSP on Dedicated Thread"
+msgstr "DSP på tillägnad tråd"
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
+msgid "DSP settings"
+msgstr "DSP-inställningar"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:819
+msgid "DVD Root:"
+msgstr "DVD-rotkatalog:"
+
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:226
+msgid "DVDLowRead - Fatal Error: failed to read from volume"
+msgstr "DVDLowRead - Allvarligt fel: Misslyckades att läsa från volym"
+
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:320
+msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume"
+msgstr ""
+"DVDLowUnencryptedRead - Allvarligt fel: Misslyckades att läsa från volym"
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:163
+msgid "Data Size"
+msgstr "Datastorlek"
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468
+msgid "Date:"
+msgstr "Datum:"
+
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:518
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:557
+msgid "Datel MaxDrive/Pro files(*.sav)"
+msgstr "Datel MaxDrive/Pro-filer (*.sav)"
+
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:229
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:246
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:254
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:268
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:283
+msgid "Dead Zone"
+msgstr "Död zon"
+
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:35
+msgid "Debug"
+msgstr "Debug"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534
+msgid "Debugging"
+msgstr "Debuggning"
+
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:66
+msgid "Decimal"
+msgstr "Decimal"
+
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:881
+msgid "Decompress ISO..."
+msgstr "Avkomprimera ISO..."
+
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:900
+msgid "Decompress selected ISOs..."
+msgstr "Avkomprimera valda ISOs..."
+
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1089
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1225
+msgid "Decompressing ISO"
+msgstr "Avkomprimerar ISO"
+
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:903
+msgid "Default"
+msgstr "Standard"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:816
+msgid "Default ISO:"
+msgstr "Standard-ISO:"
+
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:107
+msgid "Default font"
+msgstr "Standardtypsnitt"
+
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:19
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917
+msgid "Delete"
+msgstr "Radera"
+
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:790
+msgid "Delete Save"
+msgstr "Radera sparning"
+
+#: Source/Core/VideoCommon/Src/AVIDump.cpp:64
+#, c-format
+msgid "Delete the existing file '%s'?"
+msgstr "Radera existerande filen '%s'?"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:683
+msgid "Description"
+msgstr "Beskrivning"
+
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:472
+msgid "Detect"
+msgstr "Dektera"
+
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:220
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:315
+msgid ""
+"Detected attempt to read more data from the DVD than fit inside the out "
+"buffer. Clamp."
+msgstr ""
+"Upptäckte försök att läsa mer data från DVD än vad som får plats i "
+"utbuffern. Trunkerar."
+
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:114
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:889
+msgid "Device"
+msgstr "Enhet"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:731
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779
+msgid "Device Settings"
+msgstr "Enhetsinställningar"
+
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:49
+msgid "Dial"
+msgstr "Ring"
+
+#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:135
+msgid "Direct3D11"
+msgstr "Direct3D11"
+
+#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:125
+msgid "Direct3D9"
+msgstr "Direct3D9"
+
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:155
+msgid ""
+"Directory checksum failed\n"
+" and Directory backup checksum failed"
+msgstr ""
+"Kontrollsummering av filkatalog misslyckades\n"
+" och kontrollsummeringen av filkatalogens säkerhetkopia misslyckades"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:443
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485
+msgid "Disable"
+msgstr "Inaktivera"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501
+msgid "Disable Destination Alpha"
+msgstr "Inaktivera Destination Alpha"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:409
+msgid "Disable Fog"
+msgstr "Inaktivera moln"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108
+msgid ""
+"Disable any XFB emulation.\n"
+"Speeds up emulation a lot but causes heavy glitches in many games which rely "
+"on them (especially homebrew applications).\n"
+"\n"
+"If unsure, leave this checked."
+msgstr ""
+"Inaktivera XFB-emulation.\n"
+"Snabbar upp emulationen mycket, men orsakar stora buggar i många spel som "
+"which förlitar sig på dem (speciellt hembryggda applikationer).\n"
+"\n"
+"Om du är osäker kan du lämna detta markerat."
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95
+msgid ""
+"Disable emulation of EFB copies.\n"
+"These are often used for post-processing or render-to-texture effects, so "
+"while checking this setting gives a great speedup it almost always also "
+"causes issues.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+"Inaktiverar emulation av EFB-kopior.\n"
+"Dessa används ofta för efterbehandlandling eller texturrenderingseffekter, "
+"så när denna inställning markeras ger den en stor prestandaökning att den "
+"nästa alltid orsakar fel.\n"
+"\n"
+"Om du är osäker kan du lämna detta omarkerat."
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101
+msgid ""
+"Disables emulation of a hardware feature called destination alpha, which is "
+"used in many games for various graphical effects.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+"Inaktiverar emulering av en hårdvarufunktion som heter destination alpha, "
+"som används i många spel för olika grafikeffekter.\n"
+"\n"
+"Om du är osäker kan du lämna detta omarkerat."
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:553
+msgid "Disc"
+msgstr "Skiva"
+
+#: Source/Core/DiscIO/Src/DriveBlob.cpp:94
+#: Source/Core/DiscIO/Src/DriveBlob.cpp:113
+msgid "Disc Read Error"
+msgstr "Diskläsningsfel"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:320
+msgid "Display"
+msgstr "Visa"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104
+msgid ""
+"Display the inputs read by the emulator.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+"Visar inmatningarna som läses av emulation.\n"
+"\n"
+"Om du är osäker kan du lämna detta omarkerat."
+
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:67
+msgid "Divide"
+msgstr "Dividera"
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:990
+msgid "Do you want to stop the current emulation?"
+msgstr "Vill du stoppa den aktuella emulationen?"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:644
+msgid "Dolby Pro Logic II decoder"
+msgstr "Dolby Pro Logic II-dekoder"
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:856
+msgid "Dolphin"
+msgstr "Dolphin"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:188
+#, c-format
+msgid "Dolphin %s Graphics Configuration"
+msgstr "Dolphin %s grafikkonfiguration"
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:298
+msgid "Dolphin &Web Site"
+msgstr "Dolphins &webbsida"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.h:24
+msgid "Dolphin Configuration"
+msgstr "Dolphin-konfiguration"
+
+#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:183
+msgid "Dolphin Emulated Wiimote Configuration"
+msgstr "Dolphin emulerad Wiimote-konfiguration"
+
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:383
+msgid "Dolphin FIFO"
+msgstr "Dolphin FIFO"
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1153
+msgid "Dolphin GCPad Configuration"
+msgstr "Dolphin GC-kontrollskonfiguration"
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:685
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1089
+msgid "Dolphin TAS Movies (*.dtm)"
+msgstr "Dolphin TAS-filmer (*.dtm)"
+
+#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:8
+msgid "Dolphin Wiimote Configuration"
+msgstr "Dolphin Wiimote-konfiguration"
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:299
+msgid "Dolphin at &Google Code"
+msgstr "Dolphin på &Google Code"
+
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:351
+msgid ""
+"Dolphin could not find any GC/Wii ISOs.  Doubleclick here to browse for "
+"files..."
+msgstr ""
+"Dolphin kunde inte hitta några GC/Wii-ISOs. Dubbelklicka här för att bläddra "
+"efter filer..."
+
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:355
+msgid ""
+"Dolphin is currently set to hide all games.  Doubleclick here to show all "
+"games..."
+msgstr ""
+"Dolphin är inställd på att gömma alla spel. Dubbelklicka här för att visa "
+"alla spel..."
+
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1160
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1246
+msgid "Dolphin was unable to complete the requested action."
+msgstr "Dolphin kunde inte slutföra den begärda handlingen."
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
+msgid ""
+"Doubles the emulated GPU clock rate. May speed up some games (ON = Fast, OFF "
+"= Compatible)"
+msgstr ""
+"Fördubblar den emulerade grafikprocessorns klockfrekvens. Kan öka "
+"hastigheten för en del spel (PÅ = snabb, AV = kompatibel)"
+
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:262
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:45
+msgid "Down"
+msgstr "Ned"
+
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:44
+msgid "Download Codes (WiiRD Database)"
+msgstr "Ladda ned koder (WiiRD-databas)"
+
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:287
+#, c-format
+msgid "Downloaded %lu codes. (added %lu)"
+msgstr "Laddade ned %lu koder. (Lade till %lu)"
+
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:35
+msgid "Drums"
+msgstr "Trummor"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
+msgid "Dummy"
+msgstr "Dummy"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:642
+msgid "Dump Audio"
+msgstr "Dumpa ljud"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545
+msgid "Dump EFB Target"
+msgstr "Dumpa EFB-mål"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546
+msgid "Dump Frames"
+msgstr "Dumpa bildrutor"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543
+msgid "Dump Textures"
+msgstr "Dumpa texturer"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114
+msgid ""
+"Dump all rendered frames to an AVI file in User/Dump/Frames/\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+"Dumpa alla renderade bildrutor till en AVI-fil i User/Dump/Frames/\n"
+"\n"
+"Om du är osäker kan du lämna detta omarkerat."
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111
+msgid ""
+"Dump decoded game textures to User/Dump/Textures/<game_id>/\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+"Dumpa dekodade speltexturer till User/Dump/Textures/<spelets_id>/\n"
+"\n"
+"Om du är osäker kan du lämna detta omarkerat."
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113
+msgid ""
+"Dump the contents of EFB copies to User/Dump/Textures/\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+"Dumpa innehållet av EFB-kopiorna till User/Dump/Textures/\n"
+"\n"
+"Om du är osäker kan du lämna detta omarkerat."
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292
+msgid "Dutch"
+msgstr "Nederländska"
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:113
+msgid "E&xit"
+msgstr "A&vsluta"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:441
+msgid "EFB Copies"
+msgstr "EFB-kopior"
+
+#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:210
+#, c-format
+msgid ""
+"ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least "
+"version %d.%d -- If you recently upgraded your Dolphin distribution, a "
+"reboot is probably required at this point to get Windows to see the new "
+"driver."
+msgstr ""
+"FEL: Denna version av Dolphin kräver drivrutinen TAP-Win32 som åtminstone är "
+"version %d.%d -- Om du nyligen har uppdaterat din utgåva av Dolphin krävs "
+"förmodligen en omstart för tillfället för att få Windows att hitta den nya "
+"drivrutinen."
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:160
+msgid "EUROPE"
+msgstr "EUROPA"
+
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:143
+msgid "Early Memory Updates"
+msgstr "Tidiga minnesuppdateringar"
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:453
+msgid "Edit"
+msgstr "Redigera"
+
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.h:17
+msgid "Edit ActionReplay Code"
+msgstr "Redigera Action Replay-kod"
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:286
+msgid "Edit Config"
+msgstr "Redigera konfig."
+
+#: Source/Core/DolphinWX/Src/PatchAddEdit.h:17
+msgid "Edit Patch"
+msgstr "Redigera patch"
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:453
+msgid "Edit current perspective"
+msgstr "Redigera aktuellt perspektiv"
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:407
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:429
+msgid "Edit..."
+msgstr "Redigera..."
+
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:48
+msgid "Effect"
+msgstr "Effekt"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435
+msgid "Embedded Frame Buffer"
+msgstr "Inbäddad bildrutebuffer"
+
+#: Source/Core/Core/Src/Core.cpp:190
+msgid "Emu Thread already running"
+msgstr "Emuleringstråd körs redan"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110
+msgid ""
+"Emulate XFBs accurately.\n"
+"Slows down emulation a lot and prohibits high-resolution rendering but is "
+"necessary to emulate a number of games properly.\n"
+"\n"
+"If unsure, check virtual XFB emulation instead."
+msgstr ""
+"Emulerar XFB noggrant.\n"
+"Saktar ned emulatorn mycket och förhindrar högupplösningsrendering men är "
+"nödvändig för att emulera ett antal spel riktigt.\n"
+"\n"
+"Om du är osäker kan du markera Virtuell XFB-emulation istället."
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109
+msgid ""
+"Emulate XFBs using GPU texture objects.\n"
+"Fixes many games which don't work without XFB emulation while not being as "
+"slow as real XFB emulation. However, it may still fail for a lot of other "
+"games (especially homebrew applications).\n"
+"\n"
+"If unsure, leave this checked."
+msgstr ""
+"Emulerar XFB med hjälp av grafikprocessors texturobjekt.\n"
+"Fixar många spel som inte fungerar utan XFB-emulering medan den inte är lika "
+"långsam som en riktig XFB-emulering. Men den kan fortfarande misslyckas för "
+"många andra spel (speciellt hemmagjorda applikationer).\n"
+"\n"
+"Om du är osäker kan du lämna detta markerat."
+
+#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:24
+msgid "Emulated Wiimote"
+msgstr "Emulerad Wiimote"
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346
+msgid "Emulation State: "
+msgstr "Emulationsnabbsparning:"
+
+#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22
+msgid "Enable"
+msgstr "Aktivera"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91
+msgid ""
+"Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's "
+"supported by your GPU.\n"
+"Possibly causes issues.\n"
+"Requires fullscreen to work.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+"Aktiverar 3D-effekter via stereoskopi med hjälp av Nvidia 3D Vision "
+"technology som det stöds av ditt.\n"
+"Kan orsaka fel.\n"
+"Kräver helskärm för att det ska fungera.\n"
+"\n"
+"Om du är osäker kan du lämna detta omarkerat."
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:98
+msgid "Enable AR Logging"
+msgstr "Aktivera AR-loggning"
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324
+msgid "Enable Block Merging"
+msgstr "Aktivera blocksammanfogning"
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331
+msgid "Enable Bounding Box Calculation"
+msgstr "Aktivera beräkning av Bounding Box"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:446
+msgid "Enable Cache"
+msgstr "Aktivera cache"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542
+msgid "Enable Cheats"
+msgstr "Aktivera fusk"
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310
+msgid "Enable Dual Core"
+msgstr "Aktivera dubbel kärna"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
+msgid "Enable Dual Core (speedup)"
+msgstr "Aktivera dubbla kärnor (höjer prestandan)"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:563
+msgid "Enable Hotkeys"
+msgstr "Aktivera "
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311
+msgid "Enable Idle Skipping"
+msgstr "Aktivera överhoppning av tomgångsloopar"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541
+msgid "Enable Idle Skipping (speedup)"
+msgstr "Aktivera överhoppning av tomgångsloopar (höjer prestandan)"
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312
+msgid "Enable MMU"
+msgstr "Aktivera MMU"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:567
+msgid "Enable Progressive Scan"
+msgstr "Aktivera Progressive scan"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757
+msgid "Enable Screen Saver"
+msgstr "Aktivera skärmsläckare"
+
+#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:75
+msgid "Enable Speaker Data"
+msgstr "Aktivera högtalardata"
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
+msgid "Enable WideScreen"
+msgstr "Aktivera bredbild"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529
+msgid "Enable Wireframe"
+msgstr "Aktivera Wireframe"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85
+msgid ""
+"Enable anisotropic filtering.\n"
+"Enhances visual quality of textures that are at oblique viewing angles.\n"
+"Might cause issues in a small number of games.\n"
+"\n"
+"If unsure, select 1x."
+msgstr ""
+"Aktivera anisotropisk filtrering.\n"
+"Förbättrar den visuella kvaliteten för texturer som är ligger i indirekta "
+"visningsvinklar.\n"
+"Kan orsaka fel i ett fåtal spel.\n"
+"\n"
+"Om du är osäker kan du välja 1x."
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323
+msgid ""
+"Enable fast disc access.  Needed for a few games. (ON = Fast, OFF = "
+"Compatible)"
+msgstr ""
+"Aktiverar snabb skivtillgång. Behövs för en del spel. (PÅ = Snabb, AV = "
+"Kompatibel)"
+
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:803
+msgid "Enable pages"
+msgstr "Aktivera sidor"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76
+msgid ""
+"Enable this if you want the whole screen to be used for rendering.\n"
+"If this is disabled, a render window will be created instead.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+"Aktivera detta om du vill att hela skärmen ska användas i renderingen.\n"
+"Om detta är inaktiverat kommer istället ett fönster att användas för att "
+"rendera.\n"
+"\n"
+"Om du är osäker kan du lämna detta omarkerat."
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80
+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 ""
+"Aktivera detta om du vill använda Dolphins huvudfönstret för rendering "
+"istället för ett separat fönster.\n"
+"\n"
+"Om du är osäker kan du lämna detta omarkerat."
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:335
+msgid ""
+"Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for "
+"ANY other game."
+msgstr ""
+"Aktivera detta för att snabba upp The Legend of Zelda: Twilight Princess. "
+"Inaktivera för NÅGOT ANNAT spel."
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340
+msgid "Enables Custom Projection Hack"
+msgstr "Aktiverar anpassat projektionshack"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508
+msgid ""
+"Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on "
+"OSX."
+msgstr ""
+"Aktiverar emulation av Dolby Pro Logic II med hjälp av 5.1 surround. Inte "
+"tillgänglig för OSX."
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510
+msgid ""
+"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only."
+msgstr ""
+"Aktiverar emulation av Dolby Pro Logic II med hjälp av 5.1 surround. Endast "
+"OpenAL-backend."
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:512
+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 ""
+"Aktiverar emulation av Dolby Pro Logic II med hjälp av 5.1 surround. Endast "
+"OpenAL-backend. Kanske behöver byta namn på soft_oal.dll till OpenAL32.dll "
+"för att det ska fungera."
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81
+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 ""
+"Aktiverar progressive scan om det stöds av den emulerade programvaran.\n"
+"De flesta spelen bryr sig inte om detta.\n"
+"\n"
+"Om du är osäker kan du lämna detta omarkerat."
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313
+msgid ""
+"Enables the Memory Management Unit, needed for some games. (ON = Compatible, "
+"OFF = Fast)"
+msgstr ""
+"Aktiverar minneshanterarenheten som behövs för några spel. (PÅ = Kompatibel, "
+"AV = Snabb)"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116
+msgid ""
+"Encode frame dumps using the FFV1 codec.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+"Kodar bildrutedumpar med hjälp av kodeket FFV1.\n"
+"\n"
+"Om du är osäker kan du lämna detta omarkerat."
+
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:40
+msgid "End"
+msgstr "End"
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:260
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293
+msgid "English"
+msgstr "Engelska"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:337
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:417
+msgid "Enhancements"
+msgstr "Förbättring"
+
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:640
+msgid "Enter a name for the new perspective:"
+msgstr "Ange ett namn för det nya perspektivet:"
+
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:178
+#, c-format
+msgid "Entry %d/%d"
+msgstr "Ingång %d/%d"
+
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:72
+#, c-format
+msgid "Entry 1/%d"
+msgstr "Ingång 1/%d"
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:204
+msgid "Equal"
+msgstr "Samma"
+
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:32
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:150
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226
+msgid "Error"
+msgstr "Fel"
+
+#: Source/Core/DolphinWX/Src/Main.cpp:409
+msgid "Error loading selected language. Falling back to system default."
+msgstr ""
+"Fel uppstod när valt språk lästes in. Byter tillbaka till systemstandard."
+
+#: Source/Core/Common/Src/ChunkFile.h:221
+#, c-format
+msgid ""
+"Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). "
+"Aborting savestate load..."
+msgstr ""
+"Fel: Efter \"%s\", hittades %d (0x%X) istället för sparningsmarkören %d (0x"
+"%X). Avbryter inläsning av snabbsparning..."
+
+#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:329
+#, c-format
+msgid ""
+"Error: Trying to access %s fonts but they are not loaded. Games may not show "
+"fonts correctly, or crash."
+msgstr ""
+"Fel: Försöker att komma åt %s typsnitt men de är inte inlästa. Spel kanske "
+"inte visar typsnitt korrekt, eller kraschar."
+
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:17
+msgid "Escape"
+msgstr "Escape"
+
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:30
+msgid "Euphoria"
+msgstr "Euphoria"
+
+#: Source/Core/Core/Src/ArmMemTools.cpp:78
+#: Source/Core/Core/Src/x64MemTools.cpp:206
+#, c-format
+msgid "Exception handler - access below memory space. %08llx%08llx"
+msgstr "Undantagshanterare - åtkomst under minnesutrymme. %08llx%08llx"
+
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
+msgid "Execute"
+msgstr "Utför"
+
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:446
+msgid "Export Failed"
+msgstr "Exportering misslyckades"
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:649
+msgid "Export File"
+msgstr "Exportera fil"
+
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:177
+msgid "Export Recording"
+msgstr "Exportera inspelning"
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:351
+msgid "Export Recording..."
+msgstr "Exportera inspelning..."
+
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:792
+msgid "Export Save"
+msgstr "Exportera sparning"
+
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:865
+msgid "Export Wii save (Experimental)"
+msgstr "Exportera Wii-sparningar (experimentell)"
+
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:793
+msgid "Export all saves"
+msgstr "Exportera alla sparningar"
+
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:72
+msgid "Export failed, try again?"
+msgstr "Exportering misslyckades, vill du försöka igen?"
+
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:552
+msgid "Export save as..."
+msgstr "Exportera sparning som..."
+
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:284
+msgid "Extension"
+msgstr "Tillägg"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483
+msgid "External Frame Buffer"
+msgstr "Extern bildrutebuffer"
+
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:48
+msgid "Extra Parameter"
+msgstr "Extra parameter"
+
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:49
+msgid "Extra Parameter useful in ''Metroid: Other M'' only."
+msgstr "Extra parameter som endast är användbar i ''Metroid: Other M''."
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:624
+msgid "Extract All Files..."
+msgstr "Extraherar alla filer..."
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:626
+msgid "Extract Apploader..."
+msgstr "Extrahera apploader..."
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627
+msgid "Extract DOL..."
+msgstr "Extrahera DOL..."
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:620
+msgid "Extract Directory..."
+msgstr "Extrahera filkatalog..."
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:622
+msgid "Extract File..."
+msgstr "Extrahera fil..."
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:618
+msgid "Extract Partition..."
+msgstr "Extrahera partition..."
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:738
+#, c-format
+msgid "Extracting %s"
+msgstr "Extraherar %s"
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:721
+msgid "Extracting All Files"
+msgstr "Extraherar alla filer"
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:721
+msgid "Extracting Directory"
+msgstr "Extraherar filmapp"
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:724
+msgid "Extracting..."
+msgstr "Extraherar..."
+
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:893
+msgid "FIFO Byte"
+msgstr "FIFO-byte"
+
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:32
+msgid "FIFO Player"
+msgstr "FIFO-spelare"
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:163
+msgid "FRANCE"
+msgstr "FRANKRIKE"
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472
+msgid "FST Size:"
+msgstr "FST-storlek:"
+
+#: Source/Core/Core/Src/NetPlayClient.cpp:81
+msgid "Failed to Connect!"
+msgstr "Misslyckades att ansluta!"
+
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:228
+msgid "Failed to Listen!!"
+msgstr "Misslyckades att lyssna!!"
+
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:300
+msgid "Failed to download codes."
+msgstr "Misslyckades att ladda ned koder."
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:843
+#, c-format
+msgid "Failed to extract to %s!"
+msgstr "Misslyckades att extrahera till %s!"
+
+#: Source/Core/Core/Src/DSP/DSPCore.cpp:66
+#, c-format
+msgid ""
+"Failed to load DSP ROM:\t%s\n"
+"\n"
+"This file is required to use DSP LLE.\n"
+"It is not included with Dolphin as it contains copyrighted data.\n"
+"Use DSPSpy to dump the file from your physical console.\n"
+"\n"
+"You may use the DSP HLE engine which does not require ROM dumps.\n"
+"(Choose it from the \"Audio\" tab of the configuration dialog.)"
+msgstr ""
+"Misslyckades att läsa in DSP-ROM:\t%s\n"
+"\n"
+"Denna fil kräver att DSP LLE används.\n"
+"Den är inte inkluderad med Dolphin eftersom den innehåller "
+"upphovsrättsskyddad data.\n"
+"Använd DSPSpy för att dumpa filen från din fysiska konsol.\n"
+"\n"
+"Du kan använda motorn DSP HLE som inte kräver dumpningar av ROM.\n"
+"(Välj den från fliken \"Audio\" i konfigurationsdialogen.)"
+
+#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:108
+#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:131
+msgid "Failed to load bthprops.cpl"
+msgstr "Misslyckades att läsa bthprops.cpl"
+
+#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:90
+#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:101
+msgid "Failed to load hid.dll"
+msgstr "Misslyckades att läsa in hid.dll"
+
+#: Source/Core/Core/Src/Movie.cpp:783
+#, c-format
+msgid "Failed to read %s"
+msgstr "Misslyckades att läsa %s"
+
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:144
+msgid "Failed to read banner.bin"
+msgstr "Misslyckades att läsa banner.bin"
+
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:178
+msgid "Failed to read bk header"
+msgstr "Misslyckades att läsa bk-header"
+
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:211
+#, c-format
+msgid ""
+"Failed to read block %d of the save data\n"
+"Memcard may be truncated\n"
+"FilePosition:%llx"
+msgstr ""
+"Misslyckades att läsa blocket %d i sparningsdatan\n"
+"Minneskortet kan vara trunkerad\n"
+"Filposition: %llx"
+
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:136
+msgid ""
+"Failed to read block allocation table backup correctly\n"
+"(0x8000-0x9FFF)"
+msgstr ""
+"Misslyckades att läsa säkerhetskopieringen för blockallokeringstabellen "
+"korrekt\n"
+"(0x8000-0x9FFF)"
+
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:130
+msgid ""
+"Failed to read block allocation table correctly\n"
+"(0x6000-0x7FFF)"
+msgstr ""
+"Misslyckades att läsa blockallokeringstabellen korrekt\n"
+"(0x8000-0x9FFF)"
+
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:279
+#, c-format
+msgid "Failed to read data from file %d"
+msgstr "Misslyckades att läsa data från fil %d"
+
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:367
+#, c-format
+msgid "Failed to read data from file: %s"
+msgstr "Misslyckades att läsa data från fil: %s"
+
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:124
+msgid ""
+"Failed to read directory backup correctly\n"
+"(0x4000-0x5FFF)"
+msgstr ""
+"Misslyckades att läsa systemåterställningsmappen korrekt\n"
+"(0x4000-0x5FFF)"
+
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:118
+msgid ""
+"Failed to read directory correctly\n"
+"(0x2000-0x3FFF)"
+msgstr ""
+"Misslyckades att läsa mappen korrekt\n"
+"(0x2000-0x3FFF)"
+
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:90
+msgid "Failed to read header"
+msgstr "Misslyckades att läsa header"
+
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:107
+msgid ""
+"Failed to read header correctly\n"
+"(0x0000-0x1FFF)"
+msgstr ""
+"Misslyckades att läsa header korrekt\n"
+"(0x0000-0x1FFF)"
+
+#: Source/Core/DiscIO/Src/VolumeGC.cpp:48
+msgid "Failed to read unique ID from disc image"
+msgstr "Misslyckades att läsa unikt ID från disk-bilden"
+
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:71
+msgid "Failed to write BT.DINF to SYSCONF"
+msgstr "Misslyckades att skriva BT.DINF till SYSCONF"
+
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:221
+msgid "Failed to write bkhdr"
+msgstr "Misslyckades att skriva bkhdr"
+
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:157
+#, c-format
+msgid "Failed to write header for %s"
+msgstr "Misslyckades att skriva header för %s"
+
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:251
+#, c-format
+msgid "Failed to write header for file %d"
+msgstr "Misslyckades att skriva header för filen %d"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294
+msgid "Farsi"
+msgstr "Persiska"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477
+msgid "Fast"
+msgstr "Snabb"
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315
+msgid "Fast version of the MMU.  Does not work for every game."
+msgstr "Snabb version av MMU. Fungerar inte för alla spel."
+
+#: Source/Core/Core/Src/Movie.cpp:1037
+#, c-format
+msgid ""
+"Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s"
+msgstr ""
+"Allvarlig desynkronisering. Avbryter Aborting uppspelning. (Fel i "
+"PlayWiimote: %u != %u, byte %u.)%s"
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:202
+msgid "Fifo Player"
+msgstr "Fifo-spelare"
+
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:86
+msgid "File Info"
+msgstr "Filinformation"
+
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:295
+msgid "File contained no codes."
+msgstr "Filen innehöll inga koder."
+
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:400
+msgid "File converted to .gci"
+msgstr "Filen konverterades till .gci"
+
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:415
+msgid ""
+"File could not be opened\n"
+"or does not have a valid extension"
+msgstr ""
+"Filen kunde inte öppnas\n"
+"eller har inte en giltig filändelse"
+
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:72
+#, c-format
+msgid ""
+"File has the extension \"%s\"\n"
+"valid extensions are (.raw/.gcp)"
+msgstr ""
+"Filen har filändelsen \"%s\"\n"
+"giltiga filändelser är (.raw/.gcp)"
+
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:412
+msgid "File is not recognized as a memcard"
+msgstr "Filen känns inte igen som ett minneskort"
+
+#: Source/Core/DiscIO/Src/CompressedBlob.cpp:281
+msgid "File not compressed"
+msgstr "Filen är inte komprimerad"
+
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:109
+#, c-format
+msgid "FileIO: Unknown open mode : 0x%02x"
+msgstr "FileIO: Okänt öppet läge: 0x%02x"
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:541
+msgid "Filesystem"
+msgstr "Filsystem"
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1126
+msgid "Filetype 'ini' is unknown! Will not open!"
+msgstr "Filtypen 'ini' är okänd! Kommer inte att öppnas!"
+
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:252
+msgid "Find next"
+msgstr "Hitta nästa"
+
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:253
+msgid "Find previous"
+msgstr "Hitta föregående"
+
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626
+msgid "First Block"
+msgstr "Första block"
+
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799
+msgid "Fix Checksums"
+msgstr "Fixa kontrollsummor"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283
+msgid "Force 16:9"
+msgstr "Tvinga 16:9"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283
+msgid "Force 4:3"
+msgstr "Tvinga 4:3"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548
+msgid "Force Console as NTSC-J"
+msgstr "Tvinga konsol som NTSC-J"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406
+msgid "Force Texture Filtering"
+msgstr "Tvinga texturfiltrering"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90
+msgid ""
+"Force texture filtering even if the emulated game explicitly disabled it.\n"
+"Improves texture quality slightly but causes glitches in some games.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+"Tvingar texturfiltrering även om det emulerade spelet har aktiverat det.\n"
+"Förbättrar texturkvaliteten lite grann, men orsakar buggar i en del spel.\n"
+"\n"
+"Om du är osäker kan du lämna detta omarkerat."
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83
+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 ""
+"Tvingar spelets grafikutdata att visas i bredskärmsupplösning.\n"
+"Orsakar grafikbuggar i några spel.\n"
+"\n"
+"Om du är osäker kan du lämna detta omarkerat."
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488
+msgid ""
+"Forces NTSC-J mode for using the Japanese ROM font.\n"
+"Left unchecked, dolphin defaults to NTSC-U and automatically enables this "
+"setting when playing Japanese games."
+msgstr ""
+"Tvingar att använda läget NTSC-J för att använda det japanska ROM-"
+"typsnittet.\n"
+"Lämna omarkerat, eftersom Dolphin anger NTSC-U som standardval och aktiverar "
+"automatiskt denna inställning när japanska spel spelas."
+
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:62
+msgid ""
+"Format as ascii (NTSC\\PAL)?\n"
+"Choose no for sjis (NTSC-J)"
+msgstr ""
+"Formatera som ascii (NTSC\\PAL)?\n"
+"Välj nej för sjis (NTSC-J)"
+
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:265
+msgid "Forward"
+msgstr "Framåt"
+
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504
+#, c-format
+msgid "Found %d results for '"
+msgstr "HIttade  %d resultar för '"
+
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:858
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:926
+msgid "Frame"
+msgstr "Bildruta"
+
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:868
+msgid "Frame "
+msgstr "Bildruta"
+
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:173
+msgid "Frame Advance"
+msgstr "Avancerad bildruta"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549
+msgid "Frame Dumps use FFV1"
+msgstr "Bildskärmsdumpar använder FFV1"
+
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:214
+msgid "Frame Info"
+msgstr "Bildruteinfo"
+
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:103
+msgid "Frame Range"
+msgstr "Räckvidd för bildrutor"
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:139
+msgid "Frame S&kipping"
+msgstr "&Hoppa över bildrutor"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552
+msgid "Framelimit:"
+msgstr "Bildrutegräns:"
+
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:191
+msgid "Frames To Record"
+msgstr "Bildrutor som ska spelas in"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547
+msgid "Free Look"
+msgstr "Fri vy"
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
+msgid "French"
+msgstr "Franska"
+
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:42
+msgid "Frets"
+msgstr "Greppband"
+
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:105
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:124
+msgid "From"
+msgstr "Från"
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:432
+msgid "FullScr"
+msgstr "Helskärm"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263
+msgid "Fullscreen resolution:"
+msgstr "Helskärmsupplösning:"
+
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524
+msgid "GCI File(*.gci)"
+msgstr "GCI-fil (*.gci)"
+
+#: Source/Core/DolphinWX/Src/GCMicDlg.h:31
+msgid "GCMic Configuration"
+msgstr "Konfiguration av GC-Mikrofon"
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
+msgid "GCPad"
+msgstr "GC-kontroll"
+
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:658
+msgid "GX_CMD_INVL_VC"
+msgstr "GX_CMD_INVL_VC"
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:452
+msgid "Game ID:"
+msgstr "Spelets ID:"
+
+#: Source/Core/Core/Src/NetPlay.cpp:216
+msgid "Game is already running!"
+msgstr "Spelet körs redan!"
+
+#: Source/Core/Core/Src/NetPlay.cpp:246
+msgid "Game isn't running!"
+msgstr "Spelet körs inte!"
+
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:393
+msgid "Game not found!"
+msgstr "Spelet hittades inte!"
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:389
+msgid "Game-Specific Settings"
+msgstr "Spelspecifika inställningar"
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:294
+msgid "GameConfig"
+msgstr "Spelkonfig."
+
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:515
+msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)"
+msgstr "GameCube sparningsfiler (*.gci;*.gcs;*.sav)"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534
+msgid "Gamecube"
+msgstr "GameCube"
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:181
+msgid "Gamecube &Pad Settings"
+msgstr "Inställningar för GameCube-&kontroller"
+
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:205
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1052
+msgid "Gamecube Memory Cards (*.raw,*.gcp)"
+msgstr "GameCube-minneskort (*.raw,*.gcp)"
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
+msgid "Gamecube Pad settings"
+msgstr "Inställningar för GameCube-kontroller"
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:117
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302
+msgid "Gecko Codes"
+msgstr "Gecko-koder"
+
+#: Source/Core/Core/Src/GeckoCode.cpp:214
+#, c-format
+msgid ""
+"GeckoCode failed to run (CT%i CST%i) (%s)\n"
+"(either a bad code or the code type is not yet supported. Try using the "
+"native code handler by placing the codehandler.bin file into the Sys "
+"directory and restarting Dolphin.)"
+msgstr ""
+"GeckoCode misslyckades att köras (CT%i CST%i) (%s)\n"
+"(antingen en dålig kod eller är så stöds kodtypen inte ännu.) Försök att "
+"använda den inbyggda kodhanteraren genom att flytta filen codehandler.bin "
+"till mappen \"Sys\" och starta om Dolphin.)"
+
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:160
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:160
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:202
+msgid "General"
+msgstr "Allmänt"
+
+#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:139
+msgid "General Settings"
+msgstr "Allmänna inställningar"
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:261
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
+msgid "German"
+msgstr "Tyska"
+
+#: Source/Core/Core/Src/ActionReplay.cpp:439
+#, c-format
+msgid "GetARCode: Index is greater than ar code list size %lu"
+msgstr "GetARCode: Index är större än AR-kodlistans storlek %lu"
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:436
+msgid "Graphics"
+msgstr "Grafik"
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:436
+msgid "Graphics settings"
+msgstr "Grafikinställningar"
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:205
+msgid "Greater Than"
+msgstr "Större än"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87
+msgid ""
+"Greatly increases quality of textures generated using render to texture "
+"effects.\n"
+"Raising the internal resolution will improve the effect of this setting.\n"
+"Slightly decreases performance and possibly causes issues (although "
+"unlikely).\n"
+"\n"
+"If unsure, leave this checked."
+msgstr ""
+"Höjer kraftigt kvaliteten på texturer som generaras med hjälp av "
+"textureffekter.\n"
+"Att höja den interna upplösningen kommer att förbättra effekten av denna "
+"inställning.\n"
+"Slightly decreases performance and possibly causes issues (although "
+"unlikely).\n"
+"\n"
+"Om du är osäker kan du lämna detta markerat."
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
+msgid "Greek"
+msgstr "Grekiska"
+
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
+msgid "Green"
+msgstr "Grön"
+
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
+msgid "Green Left"
+msgstr "Grön vänster"
+
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
+msgid "Green Right"
+msgstr "Grön höger"
+
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:39
+msgid "Guitar"
+msgstr "Gitarr"
+
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1250
+msgid "HCI_CMD_INQUIRY is called, please report!"
+msgstr "HCI_CMD_INQUIRY anropade, var god rapportera!"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504
+msgid "Hacked Buffer Upload"
+msgstr "Hackad bufferuppladdning"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431
+msgid "Hacks"
+msgstr "Hackningar"
+
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:146
+msgid "Header checksum failed"
+msgstr "Kontrollsumma för header misslyckades"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298
+msgid "Hebrew"
+msgstr "Hebreiska"
+
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:300
+msgid "Height"
+msgstr "Höjd"
+
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:51
+msgid "Help"
+msgstr "Hjälp"
+
+#: Source/Core/DolphinWX/Src/Main.cpp:229
+msgid ""
+"Hi,\n"
+"\n"
+"Dolphin requires Mac OS X 10.7 or greater.\n"
+"Unfortunately you're running an old version of OS X.\n"
+"The last Dolphin version to support OS X 10.6 is Dolphin 3.5\n"
+"Please upgrade to 10.7 or greater to use the newest Dolphin version.\n"
+"\n"
+"Sayonara!\n"
+msgstr ""
+"Hej,\n"
+"\n"
+"Dolphin kräver OS X 10.7 eller högre.\n"
+"Tyvärr använder du en gammal version av OS X.\n"
+"Den sista versionen av Dolphin som stödjer OS X 10.6 är Dolphin 3.5\n"
+"Var god uppgradera till 10.7 eller högre för att använda den senaste "
+"versionen av Dolphin.\n"
+"\n"
+"Adjö!\n"
+
+#: Source/Core/DolphinWX/Src/Main.cpp:220
+msgid ""
+"Hi,\n"
+"\n"
+"Dolphin requires that your CPU has support for SSE2 extensions.\n"
+"Unfortunately your CPU does not support them, so Dolphin will not run.\n"
+"\n"
+"Sayonara!\n"
+msgstr ""
+"Hej,\n"
+"\n"
+"Dolphin kräver att din processor stödjer SSE2-tillägg.\n"
+"Tyvärr stödjer inte din processor dem, så Dolphin kommer inte att köras.\n"
+"\n"
+"Simma lugnt!\n"
+
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:296
+msgid "Hide"
+msgstr "Göm"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:307
+msgid "Hide Mouse Cursor"
+msgstr "Göm muspekare"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79
+msgid ""
+"Hides the mouse cursor if it's on top of the emulation window.\n"
+"\n"
+"If unsure, leave this checked."
+msgstr ""
+"Gömmer muspekaren om den är ovanpå emulatorfönstret. \n"
+"\n"
+"Om du är osäker kan du lämna detta markerat."
+
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41
+msgid "Home"
+msgstr "Hem"
+
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:76
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:141
+msgid "Host"
+msgstr "Värd"
+
+#: Source/Core/DolphinWX/Src/HotkeyDlg.h:31
+msgid "Hotkey Configuration"
+msgstr "Kortkommandokonfiguration"
+
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:260
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:260
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574
+msgid "Hotkeys"
+msgstr "Kortkommandon"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299
+msgid "Hungarian"
+msgstr "Ungerska"
+
+#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:24
+msgid "Hybrid Wiimote"
+msgstr "Hybrid-Wiimote"
+
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:519
+#, c-format
+msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x"
+msgstr ""
+"IOCTL_ES_GETVIEWS: Försökte att hämta data från en okänd biljett: %08x/%08x"
+
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:773
+#, c-format
+msgid ""
+"IOCTL_ES_LAUNCH: Game tried to reload an IOS or a title that is not "
+"available in your NAND dump\n"
+"TitleID %016llx.\n"
+" Dolphin will likely hang now."
+msgstr ""
+"IOCTL_ES_LAUNCH: Spelet försökte starta om IOS eller en titel som inte finns "
+"tillgänglig i din NAND-dumpning\n"
+"Titel-ID %016llx.\n"
+" Dolphin kommer troligtvis frysa sig nu"
+
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:300
+msgid "IOCTL_ES_READCONTENT - bad destination"
+msgstr "IOCTL_ES_READCONTENT - dålig destination"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729
+msgid "IPL Settings"
+msgstr "IPL-inställningar"
+
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269
+msgid "IR"
+msgstr "IR"
+
+#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25
+msgid "IR Pointer"
+msgstr "IR-pekare"
+
+#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:95
+msgid "IR Sensitivity:"
+msgstr "IR-känslighet:"
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:512
+msgid "ISO Details"
+msgstr "ISO-detaljer"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:811
+msgid "ISO Directories"
+msgstr "ISO-filkatalog"
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:166
+msgid "ITALY"
+msgstr "ITALIEN"
+
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:624
+msgid "Icon"
+msgstr "Ikon"
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332
+msgid ""
+"If checked, the bounding box registers will be updated. Used by the Paper "
+"Mario games."
+msgstr ""
+"Om den är markerad kommer alla bundna lådregister uppdateras. Används av "
+"Paper Mario-spelen."
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438
+msgid "Ignore Format Changes"
+msgstr "Ignorera formatändringar"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94
+msgid ""
+"Ignore any changes to the EFB format.\n"
+"Improves performance in many games without any negative effect. Causes "
+"graphical defects in a small number of other games though.\n"
+"\n"
+"If unsure, leave this checked."
+msgstr ""
+"Ignorera alla ändringar i EFB-formatet.\n"
+"Förbättrar prestanda i många spel utan några negativa effekter. Orsakar dock "
+"felaktigheter i grafiken i ett litet antal andra spel.\n"
+"\n"
+"Om du är osäker kan du lämna detta markerat."
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93
+msgid ""
+"Ignore any requests of the CPU to read from or write to the EFB.\n"
+"Improves performance in some games, but might disable some gameplay-related "
+"features or graphical effects.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+"Ignorera alla efterfrågor om att processorn ska läsa från eller skriva till "
+"EFB.\n"
+"Förbättrar prestandan i några spel, man kan inaktivera några spelrelaterade "
+"funktioner eller grafikeffekter.\n"
+"\n"
+"Om du är osäker kan du lämna detta omarkerat."
+
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:791
+msgid "Import Save"
+msgstr "Importera sparningar"
+
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:48
+msgid "Import failed, try again?"
+msgstr "Importering misslyckades, försöka igen?"
+
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:441
+msgid ""
+"Imported file has gsc extension\n"
+"but does not have a correct header"
+msgstr ""
+"Den importerade filen har filändelsen gsc\n"
+"man har inte en giltig header"
+
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:429
+msgid "Imported file has invalid length"
+msgstr "Importerad fil har ogiltig längd"
+
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:438
+msgid ""
+"Imported file has sav extension\n"
+"but does not have a correct header"
+msgstr ""
+"Den importerade filen har filändelsen sav\n"
+"men har inte en giltig header"
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350
+msgid "In Game"
+msgstr "I spelet"
+
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:594
+msgid "In-Game"
+msgstr "I spelet"
+
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:34
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305
+msgid "Info"
+msgstr "Info"
+
+#: Source/Core/Common/Src/MsgHandler.cpp:51
+msgid "Information"
+msgstr "Information"
+
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:468
+msgid "Input"
+msgstr "Indata"
+
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:50
+msgid "Insert"
+msgstr "Sätt in"
+
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:166
+msgid "Insert Encrypted or Decrypted code here..."
+msgstr "Sätt in krypterad eller dekrypterad kod här..."
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:763
+msgid "Insert SD Card"
+msgstr "Sätt in SD-kort"
+
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:21
+msgid "Insert name here.."
+msgstr "Ange namn här..."
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:199
+msgid "Install WAD"
+msgstr "Installera WAD"
+
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:888
+msgid "Install to Wii Menu"
+msgstr "Installera till Wii-meny"
+
+#: Source/Core/Core/Src/x64MemTools.cpp:242
+msgid ""
+"InstallExceptionHandler called, but this platform does not yet support it."
+msgstr ""
+"InstallExceptionHandler anropade, man denna plattform stödjer inte det ännu."
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
+msgid "Installing WAD..."
+msgstr "Installerar WAD..."
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:901
+msgid "Integrity Check Error"
+msgstr "Integritetskontrollfel"
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:907
+msgid "Integrity check completed"
+msgstr "Integritetskontroll slutförd"
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:906
+msgid "Integrity check completed. No errors have been found."
+msgstr "Integritetskontroll slutförd. Inga fel har hittats."
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:898
+#, c-format
+msgid ""
+"Integrity check for partition %d failed. Your dump is most likely corrupted "
+"or has been patched incorrectly."
+msgstr ""
+"Integritetskontroll för partition %d misslyckades. Din dumpning är troligvis "
+"korrupt eller har blivit patchad inkorrekt."
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532
+msgid "Interface"
+msgstr "Gränssnitt"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627
+msgid "Interface Settings"
+msgstr "Gränssnittsinställningar"
+
+#: Source/Core/Core/Src/State.cpp:228
+msgid "Internal LZO Error - compression failed"
+msgstr "Internt LZO-fel - kompremering misslyckades"
+
+#: Source/Core/Core/Src/State.cpp:336
+#, c-format
+msgid ""
+"Internal LZO Error - decompression failed (%d) (%li, %li) \n"
+"Try loading the state again"
+msgstr ""
+"Internt LZO-fel - avkomprimering misslyckades (%d) (%li, %li) \n"
+"Försök att läsa in snabbsparning igen"
+
+#: Source/Core/Core/Src/State.cpp:473
+msgid "Internal LZO Error - lzo_init() failed"
+msgstr "Internt LZO-fel - lzo_init() misslyckades"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:352
+msgid "Internal Resolution:"
+msgstr "Intern upplösning:"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:42
+msgid "Interpreter (VERY slow)"
+msgstr "Interpreterare (RIKTIG långsam)"
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349
+msgid "Intro"
+msgstr "Intro"
+
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:187
+#, c-format
+msgid "Invalid Size(%x) or Magic word (%x)"
+msgstr "Ogiltig stolek (%x) eller magiskt ord (%x)"
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:600
+msgid "Invalid Value!"
+msgstr "Ogiltigt värde!"
+
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:449
+msgid "Invalid bat.map or dir entry"
+msgstr "Ogiltig bat.map eller mappingång"
+
+#: Source/Core/Core/Src/CoreTiming.cpp:553
+#, c-format
+msgid "Invalid event type %i"
+msgstr "Ogiltig händelsetyp %i"
+
+#: Source/Core/Core/Src/HW/DVDInterface.cpp:309
+msgid "Invalid file"
+msgstr "Ogiltig fil"
+
+#: Source/Core/DiscIO/Src/BannerLoaderGC.cpp:28
+#, c-format
+msgid ""
+"Invalid opening.bnr found in gcm:\n"
+"%s\n"
+" You may need to redump this game."
+msgstr ""
+"Ogiltig opening.bnr hittades i gcm:\n"
+"%s\n"
+" Du behöver nog göra en redump för detta spel."
+
+#: Source/Core/Core/Src/Movie.cpp:726
+msgid "Invalid recording file"
+msgstr "Ogiltig inspelningsfil"
+
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:472
+msgid "Invalid search parameters (no object selected)"
+msgstr "Ogiltiga sökparametrar (inga objekt markerades)"
+
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:455
+msgid "Invalid search string (couldn't convert to number)"
+msgstr "Ogiltig söksträng (kunde inte konvertera till nummer)"
+
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:443
+msgid "Invalid search string (only even string lengths supported)"
+msgstr "Ogiltig söksträng (endast jämna stränglängder stöds)"
+
+#: Source/Core/Core/Src/Core.cpp:511
+msgid "Invalid state"
+msgstr "Ogiltig snabbsparning"
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300
+msgid "Italian"
+msgstr "Italienska"
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:177
+msgid "JAPAN"
+msgstr "JAPAN"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:46
+msgid "JIT Recompiler (recommended)"
+msgstr "JIT-kompilator (rekommenderas)"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:47
+msgid "JITIL experimental recompiler"
+msgstr "Experimentell JITIL-kompilator"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:279
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
+msgid "Japanese"
+msgstr "Japanska"
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:182
+msgid "KOREA"
+msgstr "KOREA"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78
+msgid ""
+"Keep the game window on top of all other windows.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+"Lägger spelfönstret ovanpå alla andra fönster. \n"
+"\n"
+"Om du är osäker kan du lämna detta omarkerat."
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:306
+msgid "Keep window on top"
+msgstr "Låt fönster vara överst"
+
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:229
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:229
+msgid "Key"
+msgstr "Tangent"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302
+msgid "Korean"
+msgstr "Koreanska"
+
+#. i18n:  Left
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:44
+msgid "L"
+msgstr "L"
+
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:26
+msgid "L Button"
+msgstr "L-knapp"
+
+#. i18n:  Left-Analog
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:48
+msgid "L-Analog"
+msgstr "L-analog"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:585
+msgid "Language:"
+msgstr "Språk:"
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:153
+msgid "Last Overwritten State"
+msgstr "Senast överskrivna snabbsparning"
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:160
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:162
+msgid "Last Saved State"
+msgstr "Senast sparade snabbsparning"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:677
+msgid "Latency:"
+msgstr "Latens:"
+
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:263
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:42
+msgid "Left"
+msgstr "Vänster"
+
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:64
+msgid "Left Stick"
+msgstr "Vänster spak"
+
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:245
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:245
+msgid ""
+"Left click to detect hotkeys.\n"
+"Enter space to clear."
+msgstr ""
+"Vänsterklicka för att ange kortkommando.\n"
+"Tryck på mellanslag för att rensa."
+
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:678
+msgid ""
+"Left-click to detect input.\n"
+"Middle-click to clear.\n"
+"Right-click for more options."
+msgstr ""
+"Vänsterklicka för att söka efter indata.\n"
+"Mittenklicka för att rensa.\n"
+"Högerklicka för fler alternativ."
+
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:683
+msgid ""
+"Left/Right-click for more options.\n"
+"Middle-click to clear."
+msgstr ""
+"Vänster-/högerklicka för kler alternativ.\n"
+"Mittenklicka för att rensa."
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:206
+msgid "Less Than"
+msgstr "Mindre än"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545
+msgid "Limit by FPS"
+msgstr "Begränsa efter bildrutefrekvens"
+
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:915
+msgid "Load"
+msgstr "Läs in"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544
+msgid "Load Custom Textures"
+msgstr "Läs in anpassade texturer"
+
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
+msgid "Load State Slot 1"
+msgstr "Läs in snabbsparningsspår 1"
+
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189
+msgid "Load State Slot 2"
+msgstr "Läs in snabbsparningsspår 2"
+
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:190
+msgid "Load State Slot 3"
+msgstr "Läs in snabbsparningsspår 3"
+
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:191
+msgid "Load State Slot 4"
+msgstr "Läs in snabbsparningsspår 4"
+
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192
+msgid "Load State Slot 5"
+msgstr "Läs in snabbsparningsspår 5"
+
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193
+msgid "Load State Slot 6"
+msgstr "Läs in snabbsparningsspår 6"
+
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:194
+msgid "Load State Slot 7"
+msgstr "Läs in snabbsparningsspår 7"
+
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:195
+msgid "Load State Slot 8"
+msgstr "Läs in snabbsparningsspår 8"
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:156
+msgid "Load State..."
+msgstr "Läs in snabbsparning"
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1359
+msgid "Load Wii System Menu"
+msgstr "Läs in Wii-systemmeny"
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1354
+#, c-format
+msgid "Load Wii System Menu %d%c"
+msgstr "Läs in Wii-systemmeny %d%c"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112
+msgid ""
+"Load custom textures from User/Load/Textures/<game_id>/\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+"Läser in anpassade texturer från User/Load/Textures/<spel_id>/\n"
+"\n"
+"Om du är osäker kan du lämna detta omarkerat."
+
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:37
+msgid "Load preset values from hack patterns available."
+msgstr "Läs in föregående värden från hackmönster som är tillgängliga."
+
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:592
+msgid "Local"
+msgstr "Lokal"
+
+#: Source/Core/DolphinWX/Src/LogWindow.h:38
+msgid "Log"
+msgstr "Logg"
+
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:13
+msgid "Log Configuration"
+msgstr "Loggkonfiguration"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304
+msgid "Log FPS to file"
+msgstr "Logga FPS till fil"
+
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83
+msgid "Log Types"
+msgstr "Loggtyper"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103
+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 ""
+"Logga antalet renderade bildrutor per sekund till User/Logs/fps.txt. Använd "
+"denna funktion när du vill mäta på Dolphins prestanda.\n"
+"\n"
+"Om du är osäker kan du lämna detta omarkerat."
+
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:68
+msgid "Logger Outputs"
+msgstr "Loggningsutgångar"
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:119
+#: Source/Core/DolphinWX/Src/Frame.cpp:314
+msgid "Logging"
+msgstr "Loggning"
+
+#: Source/Core/Core/Src/NetPlayClient.cpp:259
+msgid "Lost connection to server!"
+msgstr "Förlorade anslutning till server!"
+
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:29
+msgid "M Button"
+msgstr "M-knapp"
+
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:112
+#, c-format
+msgid ""
+"MD5 mismatch\n"
+" %016llx%016llx != %016llx%016llx"
+msgstr ""
+"MD5 misspassar\n"
+" %016llx%016llx != %016llx%016llx"
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314
+msgid "MMU Speed Hack"
+msgstr "Hastighetshack för MMU"
+
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:517
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:556
+msgid "MadCatz Gameshark files(*.gcs)"
+msgstr "MadCatz Gameshark-filer (*.gcs)"
+
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:63
+#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:38
+msgid "Main Stick"
+msgstr "Huvudspak"
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460
+msgid "Maker ID:"
+msgstr "Skapar-ID:"
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487
+msgid "Maker:"
+msgstr "Skapare:"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100
+msgid ""
+"Makes distant objects more visible by removing fog, thus increasing the "
+"overall detail.\n"
+"Disabling fog will break some games which rely on proper fog emulation.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+"Gör avlägsna objekt mer synliga genom att ta bort dimma, som ökar de "
+"övergripande detaljerna.\n"
+"Om dimma inaktiveras kan det orsaka konstigheter i en del spel som förlitar "
+"sig på emulering av dimma.\n"
+"\n"
+"Om du är osäker kan du lämna detta omarkerat."
+
+#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:97
+#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:100
+msgid "Max"
+msgstr "Max"
+
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:435
+msgid "Memcard already has a save for this title"
+msgstr "Minneskortet har redan en sparning för denna titel"
+
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:278
+msgid "Memcard already opened"
+msgstr "Minneskort är redan öppnat"
+
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:913
+msgid "Memory Byte"
+msgstr "Minnesbyte"
+
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:212
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:93
+msgid "Memory Card"
+msgstr "Minneskort"
+
+#: Source/Core/DolphinWX/Src/MemcardManager.h:23
+msgid ""
+"Memory Card Manager WARNING-Make backups before using, should be fixed but "
+"could mangle stuff!"
+msgstr ""
+"Minneskorthanterare - VARNING: Gör en säkerhetskopiering innan du använder "
+"detta, bör fungera men kan fördärva saker!"
+
+#: Source/Core/Core/Src/CoreParameter.cpp:360
+#, c-format
+msgid ""
+"Memory Card filename in Slot %c is incorrect\n"
+"Region not specified\n"
+"\n"
+"Slot %c path was changed to\n"
+"%s\n"
+"Would you like to copy the old file to this new location?\n"
+msgstr ""
+"Minneskortsfilnamn i spår %c är ogiltig\n"
+"Regionen är inte specifierad\n"
+"\n"
+"Sökvägen för spåret %c ändrades till\n"
+"%s\n"
+"Vill du kopiera den gamla filen till denna nya plats?\n"
+
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:112
+msgid "Memorycard filesize does not match the header size"
+msgstr "Minneskortets filstorlek stämmer inte överens med headerstorleken"
+
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:37
+msgid "Menu"
+msgstr "Meny"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:94
+msgid "Mic"
+msgstr "Mikr"
+
+#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:96
+#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:99
+msgid "Min"
+msgstr "Min"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:580
+msgid "Misc"
+msgstr "Övrigt"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776
+msgid "Misc Settings"
+msgstr "Övriga inställningar"
+
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:227
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:281
+msgid "Modifier"
+msgstr "Redigerare"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106
+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 ""
+"Ändra texturer för att visa formatet de är kodade i. Emulatorn behöver "
+"startas om i de flesta fallen.\n"
+"\n"
+"Om du är säker kan du lämna detta omarkerat."
+
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:108
+msgid "Monospaced font"
+msgstr "Teckensnitt med fast teckenbredd"
+
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:292
+msgid "Motion Plus"
+msgstr "Motion Plus"
+
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:296
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73
+msgid "Motor"
+msgstr "Motor"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:666
+msgid ""
+"Move the mouse pointer over an option to display a detailed description.\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+msgstr ""
+"Peka med muspekaren på ett alternativ för att visa en detaljerad "
+"beskrivning.\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:62
+msgid "Multiply"
+msgstr "Multiplicera"
+
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:650
+msgid "NOP"
+msgstr "NOP"
+
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:628
+msgid "NOTE: Stream size doesn't match actual data length\n"
+msgstr "OBS: Strömningsstorlek stämmer inte överens med aktuell datalängd\n"
+
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:116
+msgid "NP Add"
+msgstr "NP Plus"
+
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:111
+msgid "NP Begin"
+msgstr "NP Börja"
+
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:119
+msgid "NP Decimal"
+msgstr "NP Decimal"
+
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:113
+msgid "NP Delete"
+msgstr "NP Delete"
+
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:120
+msgid "NP Divide"
+msgstr "NP Dividering"
+
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:107
+msgid "NP Down"
+msgstr "NP Ned"
+
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:110
+msgid "NP End"
+msgstr "NP End"
+
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:98
+msgid "NP Enter"
+msgstr "NP Enter"
+
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:114
+msgid "NP Equal"
+msgstr "NP Lika med"
+
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:103
+msgid "NP Home"
+msgstr "NP Home"
+
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:112
+msgid "NP Insert"
+msgstr "NP Insert"
+
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:104
+msgid "NP Left"
+msgstr "NP Vänster"
+
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:115
+msgid "NP Multiply"
+msgstr "NP Multiplicering"
+
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:109
+msgid "NP Page Down"
+msgstr "NP Page Down"
+
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:108
+msgid "NP Page Up"
+msgstr "NP Page Up"
+
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:106
+msgid "NP Right"
+msgstr "NP Höger"
+
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:117
+msgid "NP Separator"
+msgstr "NP Avskiljare"
+
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:96
+msgid "NP Space"
+msgstr "NP Mellanslag"
+
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:118
+msgid "NP Subtract"
+msgstr "NP Minus"
+
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:97
+msgid "NP Tab"
+msgstr "NP Tabb"
+
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:105
+msgid "NP Up"
+msgstr "NP Upp"
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:448
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:46
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:37
+msgid "Name:"
+msgstr "Namn:"
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:72
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:282
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:553
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:15
+msgid "Name: "
+msgstr "Namn:"
+
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:516
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:555
+msgid "Native GCI files(*.gci)"
+msgstr "Ursprungliga GCI-filer (*.gci)"
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:148
+msgid "New Scan"
+msgstr "Ny sökning"
+
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:193
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801
+msgid "Next Page"
+msgstr "Nästa sida"
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:152
+msgid "Next Scan"
+msgstr "Nästa sökning"
+
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:59
+msgid "Nickname :"
+msgstr "Smeknamn:"
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:190
+msgid "No Country (SDK)"
+msgstr "Inget land (SDK)"
+
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:357
+msgid "No ISOs or WADS found"
+msgstr "Inga ISOs eller WADS hittades"
+
+#: Source/Core/Core/Src/ConfigManager.h:17
+msgid "No audio output"
+msgstr "Inget utdata för ljud"
+
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:501
+#, c-format
+msgid "No banner file found for title  %s"
+msgstr "Ingen bannerfil hittades för titeln \"%s\""
+
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:760
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:767
+msgid "No description available"
+msgstr "Ingen beskrivning tillgänglig"
+
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:535
+msgid "No docking"
+msgstr "Ingen dockning"
+
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:860
+msgid "No file loaded"
+msgstr "Ingen fil inläst"
+
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:426
+msgid "No free dir index entries"
+msgstr "Inga fria ingångar till mappindex"
+
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:896
+msgid "No recorded file"
+msgstr "Ingen inspelad fil"
+
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:494
+#, c-format
+msgid "No save folder found for title %s"
+msgstr "Ingen sparningsmapp hittades för titeln %s"
+
+#: Source/Plugins/Plugin_VideoOGL/Src/main.cpp:132
+#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:111
+#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:23
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:600
+msgid "None"
+msgstr "Ingen"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303
+msgid "Norwegian Bokmaal"
+msgstr "Norsk bokmål"
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:203
+msgid "Not Equal"
+msgstr "Inte samma"
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:794
+msgid "Not Set"
+msgstr "Inte angiven"
+
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:101
+#, c-format
+msgid "Not a Wii save or read failure for file header size %x"
+msgstr "Varken en Wii-sparning eller ett läsningsfel för headerfilstorleken %x"
+
+#: Source/Core/DolphinWX/Src/Main.cpp:654
+msgid "Not connected"
+msgstr "Inte ansluten"
+
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:296
+msgid "Notes"
+msgstr "Anteckningar"
+
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:16
+msgid "Notes: "
+msgstr "Anteckningar:"
+
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:59
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:64
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:613
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:659
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:667
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:31
+msgid "Notice"
+msgstr "Meddelande"
+
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:92
+msgid "Num Lock"
+msgstr "Num Lock"
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:75
+msgid "Number Of Codes: "
+msgstr "Antal koder:"
+
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:34
+#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26
+msgid "Nunchuk"
+msgstr "Nunchuk"
+
+#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:27
+msgid "Nunchuk Acceleration"
+msgstr "Nunchuk-acceleration"
+
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:878
+msgid "Object"
+msgstr "Objekt"
+
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:122
+msgid "Object Range"
+msgstr "Räckvidd för objekt"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:243
+msgid "Off"
+msgstr "Av"
+
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:49
+msgid "Offset:"
+msgstr "Offset:"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:582
+msgid "On-Screen Display Messages"
+msgstr "Visningsmeddelanden på skärmen"
+
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:423
+#, c-format
+msgid "Only %d blocks available"
+msgstr "Endast %d block tillgängliga"
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:426
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:166
+msgid "Open"
+msgstr "Öppna"
+
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:867
+msgid "Open &containing folder"
+msgstr "Öppna &sökvägsmappen"
+
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:864
+msgid "Open Wii &save folder"
+msgstr "Öppnar sparningsmappen för Wii"
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:426
+msgid "Open file..."
+msgstr "Öppna fil..."
+
+#: Source/Core/AudioCommon/Src/OpenALStream.cpp:48
+#, c-format
+msgid "OpenAL: can't create context for device %s"
+msgstr "OpenAL: kan inte skapa sammanhang för utrustningen %s"
+
+#: Source/Core/AudioCommon/Src/OpenALStream.cpp:59
+msgid "OpenAL: can't find sound devices"
+msgstr "OpenAL: kan inte hitta någon ljudutrustning"
+
+#: Source/Core/AudioCommon/Src/OpenALStream.cpp:53
+#, c-format
+msgid "OpenAL: can't open device %s"
+msgstr "OpenAL: kan inte öppna enheten %s"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502
+msgid "OpenCL Texture Decoder"
+msgstr "OpenCL-texturdekodare"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503
+msgid "OpenMP Texture Decoder"
+msgstr "OpenMP-texturdekodare"
+
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:304
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:81
+msgid "Options"
+msgstr "Inställningar"
+
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
+msgid "Orange"
+msgstr "Orange"
+
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:455
+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 saves to a new memcard\n"
+msgstr ""
+"Filsorteringen i filmappen stämmer inte överens med blocksorteringen\n"
+"Högerklicka och exportera alla sparningar,\n"
+"och importera alla sparningar till ett nytt minneskort\n"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:324
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:509
+msgid "Other"
+msgstr "Övrigt"
+
+#: Source/Core/Core/Src/NetPlayClient.cpp:210
+msgid ""
+"Other client disconnected while game is running!! NetPlay is disabled. You "
+"manually stop the game."
+msgstr ""
+"En annan klient bröt anslutningen under tiden spelet kördes!! Nätspel är "
+"inaktiverat. Du stoppar spelet manuellt."
+
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:468
+msgid "Output"
+msgstr "Utdata"
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:348
+msgid "P&lay Recording..."
+msgstr "Spe&la upp inspelning..."
+
+#: Source/Core/Core/Src/HW/GCPad.cpp:18
+msgid "Pad"
+msgstr "Kontroll"
+
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:602
+msgid "Pad "
+msgstr "Kontroll"
+
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:38
+msgid "Pads"
+msgstr "Kontroller"
+
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:95
+msgid "Page Down"
+msgstr "Page Down"
+
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:94
+msgid "Page Up"
+msgstr "Page Up"
+
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:22
+msgid "Paragraph"
+msgstr "Paragraf"
+
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:51
+msgid "Parameters"
+msgstr "Parametrar"
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:217
+#, c-format
+msgid "Partition %i"
+msgstr "Partition %i"
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:297
+msgid "Patches"
+msgstr "Patcher"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536
+msgid "Paths"
+msgstr "Sökvägar"
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1565
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1566
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:38
+msgid "Pause"
+msgstr "Pausa"
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:129
+msgid "Pause at end of movie"
+msgstr "Pausa vid slutet av filmen"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405
+msgid "Per-Pixel Lighting"
+msgstr "Ljus per bildpunkt"
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352
+msgid "Perfect"
+msgstr "Perfekt"
+
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:642
+#, c-format
+msgid "Perspective %d"
+msgstr "Perspektiv %d"
+
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:152
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:430
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1574
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1575
+msgid "Play"
+msgstr "Spela"
+
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176
+msgid "Play Recording"
+msgstr "Spela upp inspelning"
+
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:170
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:170
+msgid "Play/Pause"
+msgstr "Spela/Pausa"
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351
+msgid "Playable"
+msgstr "Spelbar"
+
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:141
+msgid "Playback Options"
+msgstr "Uppspelningsalternativ"
+
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:304
+msgid "Players"
+msgstr "Spelare"
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:991
+msgid "Please confirm..."
+msgstr "Var god bekräfta..."
+
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:612
+msgid "Please create a perspective before saving"
+msgstr "Var god skapa ett perspektiv innan du sparar"
+
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:23
+msgid "Plus-Minus"
+msgstr "Plus-minus"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304
+msgid "Polish"
+msgstr "Polska"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:713
+msgid "Port 1"
+msgstr "Port 1"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714
+msgid "Port 2"
+msgstr "Port 2"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715
+msgid "Port 3"
+msgstr "Port 3"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716
+msgid "Port 4"
+msgstr "Port 4"
+
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:88
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:133
+msgid "Port :"
+msgstr "Port:"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305
+msgid "Portuguese"
+msgstr "Portugisiska"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306
+msgid "Portuguese (Brazilian)"
+msgstr "Portugisiska (brasiliansk)"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:399
+msgid "Post-Processing Effect:"
+msgstr "Efterprocesseringseffekt:"
+
+#: Source/Core/Core/Src/Movie.cpp:927
+#, c-format
+msgid "Premature movie end in PlayController. %u + 8 > %u"
+msgstr "För tidigt filmslut i PlayController. %u + 8 > %u"
+
+#: Source/Core/Core/Src/Movie.cpp:1046
+#, c-format
+msgid "Premature movie end in PlayWiimote. %u + %d > %u"
+msgstr "För tidigt filmslut i PlayWiimote. %u + %d > %u"
+
+#: Source/Core/Core/Src/Movie.cpp:1023
+#, c-format
+msgid "Premature movie end in PlayWiimote. %u > %u"
+msgstr "För tidigt filmslut i PlayWiimote. %u > %u"
+
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:35
+msgid "Presets: "
+msgstr "Snabbväljare:"
+
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:192
+msgid "Prev Page"
+msgstr "Föreg. sida"
+
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800
+msgid "Previous Page"
+msgstr "Föregående sida"
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:183
+msgid "Previous Value"
+msgstr "Föregående värde"
+
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:47
+msgid "Print"
+msgstr "Skriv ut"
+
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:885
+msgid "Profile"
+msgstr "Profil"
+
+#: Source/Core/DolphinWX/Src/ISOProperties.h:42
+msgid "Properties"
+msgstr "Egenskaper"
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:286
+msgid "Purge Cache"
+msgstr "Töm cache"
+
+#: Source/Core/Common/Src/MsgHandler.cpp:52
+msgid "Question"
+msgstr "Fråga"
+
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:162
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:319
+msgid "Quit"
+msgstr "Avsluta"
+
+#. i18n:  Right
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:46
+msgid "R"
+msgstr "R"
+
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:27
+msgid "R Button"
+msgstr "R-knapp"
+
+#. i18n:  Right-Analog
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
+msgid "R-Analog"
+msgstr "R-analog"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:445
+msgid "RAM"
+msgstr "RAM"
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:169
+msgid "RUSSIA"
+msgstr "RYSSLAND"
+
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:515
+msgid "Range"
+msgstr "Räckvidd"
+
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:178
+msgid "Read-only mode"
+msgstr "Skrivskyddat läge"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:487
+msgid "Real"
+msgstr "Riktig"
+
+#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:24
+msgid "Real Wiimote"
+msgstr "Riktig Wiimote"
+
+#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:63
+msgid "Real Wiimotes"
+msgstr "Verkliga Wiimotes"
+
+#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
+msgid "Reconnect Wiimote on State Loading"
+msgstr "Återanslut Wiimote när en snabbsparning läser in"
+
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:180
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:204
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:790
+msgid "Record"
+msgstr "Spela in"
+
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:161
+msgid "Recording Info"
+msgstr "Inspelningsinformation"
+
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:189
+msgid "Recording Options"
+msgstr "Inspelningsinställningar"
+
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
+msgid "Red"
+msgstr "Röd"
+
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
+msgid "Red Left"
+msgstr "Röd vänster"
+
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
+msgid "Red Right"
+msgstr "Röd höger"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86
+msgid ""
+"Reduces the amount of aliasing caused by rasterizing 3D graphics.\n"
+"This makes the rendered picture look less blocky.\n"
+"Heavily decreases emulation speed and sometimes causes issues.\n"
+"\n"
+"If unsure, select None."
+msgstr ""
+"Reducerar mängden kantutjämningen som orsakas av rastrerad 3D-grafik.\n"
+"Detta låter den renderande bilden se mindre blockliknande.\n"
+"Sänker emulatorhastigheten kraftigt och kan ibland orsaka fel.\n"
+"\n"
+"Om du är osäker kan du välja Ingen."
+
+#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:60
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:427
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:894
+msgid "Refresh"
+msgstr "Uppdatera"
+
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:168
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:168
+msgid "Refresh List"
+msgstr "Uppdatera lista"
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:427
+msgid "Refresh game list"
+msgstr "Uppdatera spellista"
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:409
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:431
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:64
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:793
+msgid "Remove"
+msgstr "Ta bort"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99
+msgid ""
+"Render the scene as a wireframe.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+"Rendera scenen som wireframe.\n"
+"\n"
+"Om du är osäker kan du lämna detta omarkerat."
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:308
+msgid "Render to Main Window"
+msgstr "Rendera till huvudfönstret"
+
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:172
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:906
+msgid "Reset"
+msgstr "Återställ"
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:177
+msgid "Results"
+msgstr "Resultat"
+
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:16
+msgid "Return"
+msgstr "Enter"
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464
+msgid "Revision:"
+msgstr "Revision:"
+
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:264
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:44
+msgid "Right"
+msgstr "Höger"
+
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:65
+msgid "Right Stick"
+msgstr "Höger spak"
+
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:295
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:72
+msgid "Rumble"
+msgstr "Vibration"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498
+msgid ""
+"Run DSP HLE and LLE on a dedicated thread (not recommended: might cause "
+"audio glitches with HLE and freezes with LLE)."
+msgstr ""
+"Kör DSP HLE och LLE på en tillägnad tråd (rekommenderas inte; kan orsaka "
+"ljudbuggar med HLE och fryser sig med LLE)."
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307
+msgid "Russian"
+msgstr "Ryska"
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:150
+msgid "Sa&ve State"
+msgstr "Spa&ra snabbsparning"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475
+msgid "Safe"
+msgstr "Säker"
+
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:183
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:452
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916
+msgid "Save"
+msgstr "Spara"
+
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:522
+msgid "Save GCI as..."
+msgstr "Spara GCI som..."
+
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
+msgid "Save State Slot 1"
+msgstr "Spara snabbsparningsspår 1"
+
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:198
+msgid "Save State Slot 2"
+msgstr "Spara snabbsparningsspår 2"
+
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:199
+msgid "Save State Slot 3"
+msgstr "Spara snabbsparningsspår 3"
+
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200
+msgid "Save State Slot 4"
+msgstr "Spara snabbsparningsspår 4"
+
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201
+msgid "Save State Slot 5"
+msgstr "Spara snabbsparningsspår 5"
+
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202
+msgid "Save State Slot 6"
+msgstr "Spara snabbsparningsspår 6"
+
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:203
+msgid "Save State Slot 7"
+msgstr "Spara snabbsparningsspår 7"
+
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204
+msgid "Save State Slot 8"
+msgstr "Spara snabbsparningsspår 8"
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:152
+msgid "Save State..."
+msgstr "Spara snabbsparning..."
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:592
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:602
+msgid "Save as..."
+msgstr "Spara som..."
+
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1204
+msgid "Save compressed GCM/ISO"
+msgstr "Spara komprimerad GCM/ISO"
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:452
+msgid "Save current perspective"
+msgstr "Spara aktuellt perspektiv"
+
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193
+msgid "Save decompressed GCM/ISO"
+msgstr "Spara avkomprimerad GCM/ISO"
+
+#: Source/Core/Core/Src/Movie.cpp:792
+#, c-format
+msgid "Savestate movie %s is corrupted, movie recording stopping..."
+msgstr "Snabbsparningens film %s är korrupt. Filminspelningen stoppas..."
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:404
+msgid "Scaled EFB Copy"
+msgstr "Skalad EFB-kopia"
+
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:543
+#, c-format
+msgid "Scanning %s"
+msgstr "Skannar %s"
+
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:526
+msgid "Scanning for ISOs"
+msgstr "Söker efter ISOs"
+
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:527
+msgid "Scanning..."
+msgstr "Skannar..."
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
+msgid "ScrShot"
+msgstr "Skärmdump"
+
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:93
+msgid "Scroll Lock"
+msgstr "Scroll Lock"
+
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:251
+msgid "Search"
+msgstr "Sök"
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:214
+msgid "Search Filter"
+msgstr "Sökfilter"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:791
+msgid "Search Subfolders"
+msgstr "Sök undermappar"
+
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:237
+msgid "Search current Object"
+msgstr "Spara aktuellt objekt"
+
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:241
+msgid "Search for hex Value:"
+msgstr "Sök efter hex-värde:"
+
+#: Source/Core/Common/Src/SysConf.h:90 Source/Core/Common/Src/SysConf.h:113
+#: Source/Core/Common/Src/SysConf.h:133 Source/Core/Common/Src/SysConf.h:154
+#, c-format
+msgid "Section %s not found in SYSCONF"
+msgstr "Sektion %s hittades inte i SYSCONF"
+
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:46
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:477
+msgid "Select"
+msgstr "Välj"
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:683
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1087
+msgid "Select The Recording File"
+msgstr "Spara inspelningsfilen"
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1312
+msgid "Select a Wii WAD file to install"
+msgstr "Välj en Wii WAD-fil som ska installeras"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74
+msgid ""
+"Select a hardware adapter to use.\n"
+"\n"
+"If unsure, use the first one."
+msgstr ""
+"Välj en hårdvara som ska användas.\n"
+"\n"
+"Om du är osäker kan du välja den första."
+
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:510
+msgid "Select a save file to import"
+msgstr "Välj en sparningsfil som ska importeras"
+
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:366
+msgid "Select floating windows"
+msgstr "Välj flytande fönster"
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:585
+msgid "Select the file to load"
+msgstr "Öppna fil"
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1268
+msgid "Select the save file"
+msgstr "Välj snabbsparning"
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1415
+msgid "Select the state to load"
+msgstr "Välj snabbsparning att läsa in"
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1429
+msgid "Select the state to save"
+msgstr "Välj snabbsparning att spara"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82
+msgid ""
+"Select what aspect ratio to use when rendering:\n"
+"Auto: Use the native aspect ratio\n"
+"Force 16:9: Stretch the picture to an aspect ratio of 16:9.\n"
+"Force 4:3: Stretch the picture to an aspect ratio of 4:3.\n"
+"Stretch to Window: Stretch the picture to the window size.\n"
+"\n"
+"If unsure, select Auto."
+msgstr ""
+"Välj vilket bildformat som ska användas vid rendering:\n"
+"Auto: Använd det ursprungliga bildförhållandet.\n"
+"Tvinga 16:9: Skräcker bilden till ett bildformat på 16:9.\n"
+"Tvinga 4:3: Skräcker bilden till ett bildformat på 4:3.\n"
+"Skräck till fönster: Sträcker bilden till fönsterstorleken.\n"
+"\n"
+"Om du är osäker kan du välja Auto."
+
+#: Source/Core/InputCommon/Src/InputConfig.cpp:48
+msgid "Selected controller profile does not exist"
+msgstr "Den valda kontrollprofilen finns inte"
+
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:109
+msgid "Selected font"
+msgstr "Valt typsnitt"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75
+msgid ""
+"Selects the display resolution used in fullscreen mode.\n"
+"This should always be bigger than or equal to the internal resolution. "
+"Performance impact is negligible.\n"
+"\n"
+"If unsure, use your desktop resolution.\n"
+"If still unsure, use the highest resolution which works for you."
+msgstr ""
+"Väljer visningsupplösningen i helskärmsläge.\n"
+"Detta borde alltid vara större än eller samma som den interna upplösningen. "
+"Påverkan på prestandan är obetydlig.\n"
+"\n"
+"Om du är osäker kan du välja ditt skrivbordsupplösning.\n"
+"Om du fortfarande är osäker kan du använda den högsta upplösningen som "
+"fungerar för dig."
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:70
+msgid ""
+"Selects what graphics API to use internally.\n"
+"Direct3D 9 usually is the fastest one. OpenGL is more accurate though. "
+"Direct3D 11 is somewhere between the two.\n"
+"Note that the Direct3D backends are only available on Windows.\n"
+"\n"
+"If unsure, use Direct3D 11."
+msgstr ""
+"Väljer vilket grafik-API som ska användas internt.\n"
+"Direct3D 9 är vanligtvis den snabbaste. OpenGL är mer noggrann. Direct3D 11 "
+"ligger någonstans mellan de båda.\n"
+"Observera att Direct3D-backend finns bara tillgängligt på Windows.\n"
+"\n"
+"Om du är osäker kan du använda Direct3D 11."
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72
+msgid ""
+"Selects what graphics API to use internally.\n"
+"Direct3D 9 usually is the fastest one. OpenGL is more accurate though. "
+"Direct3D 11 is somewhere between the two.\n"
+"Note that the Direct3D backends are only available on Windows.\n"
+"\n"
+"If unsure, use OpenGL."
+msgstr ""
+"Väljer vilket grafik-API som ska användas internt.\n"
+"Direct3D 9 är vanligtvis det snabbaste. OpenGL är dock mer noggrann. "
+"Direct3D 11 är någonstans mellan de båda.\n"
+"Notera att Direct3D-backends är endast tillgängliga för Windows.\n"
+"\n"
+"Om du är osäker kan du använda OpenGL."
+
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:291
+msgid "Send"
+msgstr "Skicka"
+
+#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:94
+msgid "Sensor Bar Position:"
+msgstr "Position av Sensor Bar:"
+
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:64
+msgid "Separator"
+msgstr "Avskiljare"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308
+msgid "Serbian"
+msgstr "Serbiriska"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502
+msgid ""
+"Serial Port 1 - This is the port which devices such as the net adapter use"
+msgstr "Serieport 1 - Detta är porten som enheter, t.ex. nätadaptern, använder"
+
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:475
+msgid "Set"
+msgstr "Ange"
+
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:868
+msgid "Set as &default ISO"
+msgstr "Ange som &standard-ISO"
+
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802
+#, c-format
+msgid "Set as default Memcard %c"
+msgstr "Ange som standardminneskort %c"
+
+#: Source/Core/Core/Src/ActionReplay.cpp:450
+#, c-format
+msgid "SetARCode_IsActive: Index is greater than ar code list size %lu"
+msgstr ""
+"SetARCode_IsActive: Indexet är större än storleken på listan över AR-koder "
+"%lu"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:515
+msgid ""
+"Sets the latency (in ms).  Higher values may reduce audio crackling. OpenAL "
+"backend only."
+msgstr ""
+"Anger latensen (i millisekunder). Högre värden kan reducera ljudknaster. "
+"Endast OpenAL backend."
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341
+msgid "Settings..."
+msgstr "Inställningar..."
+
+#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:209
+msgid "SetupWiiMem: Cant find setting file"
+msgstr "SetupWiiMem: Kan inte hitta filinställningar"
+
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:278
+msgid "Shake"
+msgstr "Skakning"
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
+msgid "Short Name:"
+msgstr "Kort namn:"
+
+#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:90
+msgid "Shoulder Buttons"
+msgstr "Avtyckarknappar"
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:220
+msgid "Show &Console"
+msgstr "Visa &kommandotolk"
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:218
+msgid "Show &Log"
+msgstr "Visa &logg"
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:215
+msgid "Show &Statusbar"
+msgstr "Visa &statusfält"
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:213
+msgid "Show &Toolbar"
+msgstr "Visa &verktygsfält"
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:284
+msgid "Show Drives"
+msgstr "Visa drivrutiner"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530
+msgid "Show EFB Copy Regions"
+msgstr "Visa regioner för EFB-kopior"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303
+msgid "Show FPS"
+msgstr "Visa bildrutefrekvens"
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:274
+msgid "Show France"
+msgstr "Visa Frankrike"
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:260
+msgid "Show GameCube"
+msgstr "Visa GameCube"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561
+msgid "Show Input Display"
+msgstr "Visa indata"
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:276
+msgid "Show Italy"
+msgstr "Visa Italien"
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:267
+msgid "Show JAP"
+msgstr "Visa JAP"
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:278
+msgid "Show Korea"
+msgstr "Visa Korea"
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476
+msgid "Show Language:"
+msgstr "Visa språk:"
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:219
+msgid "Show Log &Configuration"
+msgstr "Visa logg&konfiguration"
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:269
+msgid "Show PAL"
+msgstr "Visa PAL"
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:257
+msgid "Show Platforms"
+msgstr "Visa plattformar"
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:266
+msgid "Show Regions"
+msgstr "Visa regioner"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531
+msgid "Show Statistics"
+msgstr "Visa statistik"
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:280
+msgid "Show Taiwan"
+msgstr "Visa Taiwan"
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:271
+msgid "Show USA"
+msgstr "Visa USA"
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:262
+msgid "Show Wad"
+msgstr "Visa WAD"
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:258
+msgid "Show Wii"
+msgstr "Visa Wii"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491
+msgid "Show a confirmation box before stopping a game."
+msgstr "Visa en bekräftelsedialog innan ett spel stoppas."
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492
+msgid ""
+"Show a message box when a potentially serious error has occurred.\n"
+"Disabling this may avoid annoying and non-fatal messages, but it may also "
+"mean that Dolphin suddenly crashes without any explanation at all."
+msgstr ""
+"Visar en meddelanderuta när ett möjligt allvarligt fel har inträffat.\n"
+"Om detta inaktiveras kan man undvika irriterande och icke-katastrofala "
+"meddelanden, men det kan även betyda att Dolphin helt plötsligt kraschar "
+"utan någon förklaring alls."
+
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:816
+msgid "Show first block"
+msgstr "Visa första blocket"
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:131
+msgid "Show lag counter"
+msgstr "Visa laggräknare"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493
+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 ""
+"Visa meddelanden i emulatorns fönsterområde.\n"
+"Dessa meddelanden inkluderar skrivningar till minneskortet, videobackend och "
+"processorinformation, samt rensning av JIT-cache."
+
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:815
+msgid "Show save blocks"
+msgstr "Visa sparningsblock"
+
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:813
+msgid "Show save comment"
+msgstr "Visa sparningskommentar"
+
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:814
+msgid "Show save icon"
+msgstr "Visa sparningsikon"
+
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812
+msgid "Show save title"
+msgstr "Visa sparningstitel"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102
+msgid ""
+"Show the number of frames rendered per second as a measure of emulation "
+"speed.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+"Visa antalet renderade bildrutor per sekund som ett mått på "
+"emulatorhastigeten.\n"
+"\n"
+"Om du är osäker kan du lämna detta omarkerat."
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:282
+msgid "Show unknown"
+msgstr "Visa okänd"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105
+msgid ""
+"Show various statistics.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+"Visa blandade statistiker.\n"
+"\n"
+"Om du är osäker kan du lämna detta omarkerat."
+
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:306
+msgid "Sideways Wiimote"
+msgstr "Vertikal Wiimote"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:280
+msgid "Simplified Chinese"
+msgstr "Förenklad kinesiska"
+
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:298
+msgid "Size"
+msgstr "Storlek"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:696
+msgid "Skip BIOS"
+msgstr "Hoppa över BIOS"
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316
+msgid "Skip DCBZ clearing"
+msgstr "Hoppa över rensning av DCBZ "
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:454
+msgid "Skip EFB Access from CPU"
+msgstr "Hoppa över tillgång till EFB från processorn"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125
+msgid ""
+"Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n"
+"Sometimes also increases visual quality.\n"
+"If you're experiencing any issues, try raising texture cache accuracy or "
+"disable this option.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+"Snabbar en aning upp EFB för RAM-kopior genom att uppoffra "
+"emuleringsnogrannhet.\n"
+"Kan ibland även höja den visuella kvaliteten.\n"
+"Om du stöter på något fel, försök att höja nogrannheten för texturcachen "
+"eller inaktivera detta alternativ.\n"
+"\n"
+"Om du är osäker kan du lämna detta omarkerat."
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:380
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:392
+#, c-format
+msgid "Slot %i"
+msgstr "Spår %i"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:700
+msgid "Slot A"
+msgstr "Spår A"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:701
+msgid "Slot B"
+msgstr "Spår B"
+
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:49
+msgid "Snapshot"
+msgstr "Ögonblicksbild"
+
+#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:46
+msgid "Software Renderer"
+msgstr "Programrenderare"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.h:84
+msgid ""
+"Software rendering is an order of magnitude slower than using the other "
+"backends.\n"
+"It's only useful for debugging purposes.\n"
+"Do you really want to enable software rendering? If unsure, select 'No'."
+msgstr ""
+"Programvarurendering är storleksordning längsammare jämfört med att använda "
+"andra backends.\n"
+"Den är endast användbar för avlusningssyften.\n"
+"Vill du verkligen aktivera programvarurendering? Om du är osäker kan du "
+"välja 'Nej'."
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:664
+msgid "Sound Settings"
+msgstr "Ljudinställningar"
+
+#: Source/Core/AudioCommon/Src/AudioCommon.cpp:64
+#, c-format
+msgid "Sound backend %s is not valid."
+msgstr "Ljudbackend %s är inte giltig."
+
+#: Source/Core/AudioCommon/Src/DSoundStream.cpp:46
+#, c-format
+msgid "Sound buffer creation failed: %s"
+msgstr "Skapandet av ljudbuffer misslyckades: %s"
+
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:18
+msgid "Space"
+msgstr "Mellanrum"
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309
+msgid "Spanish"
+msgstr "Spanska"
+
+#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:98
+msgid "Speaker Volume:"
+msgstr "Högtalarvolym:"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92
+msgid ""
+"Specifies the resolution used to render at. A high resolution will improve "
+"visual quality a lot but is also quite heavy on performance and might cause "
+"glitches in certain games.\n"
+"\"Multiple of 640x528\" is a bit slower than \"Window Size\" but yields less "
+"issues. Generally speaking, the lower the internal resolution is, the better "
+"your performance will be.\n"
+"\n"
+"If unsure, select 640x528."
+msgstr ""
+"Anger upplösningen som ska renderas. En hög upplösning kommer att förbättra "
+"den visuella kvaliteten riktigt mycket, men påverkar även prestandan mycket "
+"och kan orsaka buggar på en del spel.\n"
+"\"Multiplicerat av 640x528\" är lite långsammare än \"Fönsterstorlek\" men "
+"orsakar mindre fel. Generellt sett, ju lägre den interna upplösningen är, "
+"desto högre kommer din prestanda bli.\n"
+"\n"
+"Om du är osäker kan du välja 640x528."
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322
+msgid "Speed up Disc Transfer Rate"
+msgstr "Snabba upp disköverförningshastigheten"
+
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:230
+msgid "Square Stick"
+msgstr "Fyrkantsspak"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87
+msgid "Standard Controller"
+msgstr "Standardkontroll"
+
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:37
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:25
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:325
+msgid "Start"
+msgstr "Start"
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:197
+msgid "Start &NetPlay"
+msgstr "Starta &nätspel"
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:345
+msgid "Start Re&cording"
+msgstr "&Börja spela in"
+
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:175
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:175
+msgid "Start Recording"
+msgstr "Börja spela in"
+
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:299
+msgid "State"
+msgstr "Snabbsparning"
+
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:161
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:161
+msgid "State Saves"
+msgstr "Snabbsparningar"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88
+msgid "Steering Wheel"
+msgstr "Styrhjul"
+
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:57
+msgid "Stick"
+msgstr "Spak"
+
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:419
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:431
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:171
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:171
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:328
+msgid "Stop"
+msgstr "Stoppa"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96
+msgid ""
+"Store EFB copies in GPU texture objects.\n"
+"This is not so accurate, but it works well enough for most games and gives a "
+"great speedup over EFB to RAM.\n"
+"\n"
+"If unsure, leave this checked."
+msgstr ""
+"Lagrar EFB-kopior i grafikprocessors texturobjekt.\n"
+"Den är inte speciellt noggrann, men den fungerar tillräckligt bra med de "
+"flesta spelen och ger en bra prestanda jämfört med EFB till RAM.\n"
+"\n"
+"Om du är osäker kan du lämna detta markerat."
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283
+msgid "Stretch to Window"
+msgstr "Sträck ut till fönster"
+
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:47
+msgid "Strum"
+msgstr "Slagskena"
+
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:65
+msgid "Subtract"
+msgstr "Subtrahera"
+
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:67
+#, c-format
+msgid "Successfully exported file to %s"
+msgstr "Lyckades exportera fil till %s"
+
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:43
+msgid "Successfully imported save files"
+msgstr "Lyckades importera sparningsfiler"
+
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:272
+msgid "Swing"
+msgstr "Svinga"
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320
+msgid "Synchronize GPU thread"
+msgstr "Synkronisera grafikprocessortråd"
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321
+msgid ""
+"Synchronizes the GPU and CPU threads to help prevent random freezes in Dual "
+"Core mode. (ON = Compatible, OFF = Fast)"
+msgstr ""
+"Synkroniserar grafikprocessorns och processorns trådar för att förhindra "
+"slumpartade frysningar när läget \"Dubbla kärnor\" används. (PÅ = "
+"kompatibel, AV = snabb)"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773
+msgid "System Language:"
+msgstr "Systemspråk:"
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:185
+msgid "TAIWAN"
+msgstr "TAIWAN"
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:128
+#: Source/Core/DolphinWX/Src/TASInputDlg.h:19
+msgid "TAS Input"
+msgstr "TAS-indata"
+
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:15
+msgid "Tab"
+msgstr "Tabb"
+
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:531
+msgid "Tab split"
+msgstr "Tabbdelning"
+
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:41
+msgid "Table Left"
+msgstr "Tabell vänster"
+
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:42
+msgid "Table Right"
+msgstr "Tabell höger"
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:361
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:181
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:181
+msgid "Take Screenshot"
+msgstr "Ta en skärmdump"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89
+msgid "TaruKonga (Bongos)"
+msgstr "TaruKonga (Bongos)"
+
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:472
+msgid "Test"
+msgstr "Test"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:444
+msgid "Texture"
+msgstr "Textur"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:461
+msgid "Texture Cache"
+msgstr "Textur-cache"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:532
+msgid "Texture Format Overlay"
+msgstr "Lägg över texturformat"
+
+#: Source/Core/Core/Src/CoreParameter.cpp:215
+msgid "The WAD has been installed successfully"
+msgstr "WAD har installerats utan problem."
+
+#: Source/Core/Core/Src/ActionReplay.cpp:185
+msgid "The address is invalid"
+msgstr "Adressen är ogiltig"
+
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:496
+msgid "The checksum was successfully fixed"
+msgstr "Kontrollsumman fixades utan problem"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226
+msgid "The chosen directory is already in the list"
+msgstr "Valda filkatalogen finns redan i listan"
+
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1118
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1146
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1217
+#, c-format
+msgid ""
+"The file %s already exists.\n"
+"Do you wish to replace it?"
+msgstr ""
+"Filen %s finns redan.\n"
+"Vill du ersätta den?"
+
+#: Source/Core/AudioCommon/Src/WaveFile.cpp:38
+#, c-format
+msgid ""
+"The file %s could not be opened for writing. Please check if it's already "
+"opened by another program."
+msgstr ""
+"Filen %s kunde inte öppnas för skrivning. Var god kontrollera om den redan "
+"är öppnad i ett annat program."
+
+#: Source/Core/AudioCommon/Src/WaveFile.cpp:31
+#, c-format
+msgid "The file %s was already open, the file header will not be written."
+msgstr "Filen %s var redan öppen, headerfilen kommer inte att skrivas."
+
+#: Source/Core/Core/Src/Boot/Boot.cpp:320
+#, c-format
+msgid "The file you specified (%s) does not exist"
+msgstr "Filen du valde (%s) finns inte"
+
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:666
+msgid "The name can not be empty"
+msgstr "Namnet kan inte vara tomt"
+
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:658
+msgid "The name can not contain the character ','"
+msgstr "Namnet kan inte innehålla tecknet ','"
+
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:129
+msgid "The resulting decrypted AR code doesn't contain any lines."
+msgstr "Den resulterande dekrypterade AR-koden innehåller inga rader."
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98
+msgid ""
+"The safer you adjust this, the less likely the emulator will be missing any "
+"texture updates from RAM.\n"
+"\n"
+"If unsure, use the rightmost value."
+msgstr ""
+"Ju säkrare du justerar detta, desto mindre sannorlikhet kommer emulatorn "
+"missa texturuppdateringar från RAM.\n"
+"\n"
+"Om du är osäker kan du använda värdet längst till höger."
+
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:432
+msgid "The save you are trying to copy has an invalid file size"
+msgstr "Sparningen du försöker kopiera har en ogiltig filstorlek"
+
+#: Source/Core/DolphinWX/Src/Main.cpp:416
+msgid ""
+"The selected language is not supported by your system. Falling back to "
+"system default."
+msgstr ""
+"Det valda språket stöds inte av ditt system. Ändrar tillbaka till "
+"systemstandard."
+
+#: Source/Core/Core/Src/NetPlayClient.cpp:47
+msgid "The server and client's NetPlay versions are incompatible!"
+msgstr "Serverns och klientens nätspelsversioner är inkompatibla!"
+
+#: Source/Core/Core/Src/NetPlayClient.cpp:44
+msgid "The server is full!"
+msgstr "Servern är full"
+
+#: Source/Core/Core/Src/NetPlayClient.cpp:50
+msgid "The server responded: the game is currently running!"
+msgstr "Servern svarade: Spelet körs för tillfället!"
+
+#: Source/Core/Core/Src/NetPlayClient.cpp:53
+msgid "The server sent an unknown error message!"
+msgstr "Servern skickade ett okänt felmeddelande!"
+
+#: Source/Core/Core/Src/CoreParameter.cpp:108
+#, c-format
+msgid "The specified file \"%s\" does not exist"
+msgstr "Den valda filen \"%s\" finns inte"
+
+#: Source/Core/Core/Src/ActionReplay.cpp:186
+msgid "The value is invalid"
+msgstr "Värdet är felaktigt"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:623
+msgid "Theme:"
+msgstr "Tema:"
+
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:463
+msgid ""
+"There must be a ticket for 00000001/00000002. Your NAND dump is probably "
+"incomplete."
+msgstr ""
+"Det måste finnas en biljett för 00000001/00000002. Din nanddump är "
+"förmodlingen ofullständig."
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308
+msgid ""
+"These settings override core Dolphin settings.\n"
+"Undetermined means the game uses Dolphin's setting."
+msgstr ""
+"Dessa inställningar upphäver Dolphins kärninställningar.\n"
+"'Undetermined' betyder att spelet använder Dolphins inställningar."
+
+#: Source/Core/Core/Src/ActionReplay.cpp:345
+msgid ""
+"This action replay simulator does not support codes that modify Action "
+"Replay itself."
+msgstr ""
+"Denna Action Replay-simulator stödjer inte koder som ändrar Action Replay "
+"själv."
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505
+msgid "This could cause slow down in Wii Menu and some games."
+msgstr "Detta kan orsaka fartminskningar i Wii-menyn och vissa spel."
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118
+msgid ""
+"This feature allows you to change the game's camera.\n"
+"Move the mouse while holding the right mouse button to pan and while holding "
+"the middle button to move.\n"
+"Hold SHIFT and press one of the WASD keys to move the camera by a certain "
+"step distance (SHIFT+0 to move faster and SHIFT+9 to move slower). Press "
+"SHIFT+R to reset the camera.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+"Denna funktion låter sig ändra spelets kamera.\n"
+"Flytta musen medan du håller ned den högra musknappen för att panorera och "
+"håll ned mittenknappen för att flytta.\n"
+"Håll ned SHIFT och använd tangenterna WASD för att flytta kameran ett visst "
+"avstånd (SHIFT+0 för att flytta snabbare och SHIFT+9 för att flytta "
+"långsammare). Tryck SHIFT+R för att återställa kameran.\n"
+"\n"
+"Om du är osäker kan du lämna detta omarkerat."
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485
+msgid ""
+"This limits the game speed to the specified number of frames per second "
+"(full speed is 60 for NTSC and 50 for PAL). Alternatively, use Audio to "
+"throttle using the DSP (might fix audio clicks but can also cause constant "
+"noise depending on the game)."
+msgstr ""
+"Detta begränsar spelets hastighet till ett angivet antal bildrutor per "
+"sekund (full hastighet är 60 för NTSC och 50 för PAL). Annars kan du välja "
+"Ljud för att strypa användningen av DSP (kan fixa ljudklickningar men kan "
+"även orsaka konstant brus beroende på spelet)."
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484
+msgid ""
+"This splits the Video and CPU threads, so they can be run on separate "
+"cores.\n"
+"Causes major speed improvements on PCs with more than one core, but can also "
+"cause occasional crashes/glitches."
+msgstr ""
+"Detta delar upp video- och processortrådarna så de kan köras på separata "
+"kärnor.\n"
+"Detta orsakar stora förbättringar på datorer med mer än en kärna, men kan "
+"även orsaka en del kraschar/buggar."
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:287
+msgid "This will let you Manually Edit the INI config file"
+msgstr "Detta låter redigera INI-kofigueringsfilen manuellt"
+
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:236
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:241
+msgid "Threshold"
+msgstr "Tröskel"
+
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:275
+msgid "Tilt"
+msgstr "Lutning"
+
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:622
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:291
+msgid "Title"
+msgstr "Titel"
+
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:112
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:131
+msgid "To"
+msgstr "till"
+
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59
+msgid "Toggle All Log Types"
+msgstr "Markera/avmarkera alla loggtyper"
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:432
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:180
+msgid "Toggle Fullscreen"
+msgstr "Skifta mellan helskärm- och fönsterläge"
+
+#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:87
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:271
+msgid "Top"
+msgstr "Ovan"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:281
+msgid "Traditional Chinese"
+msgstr "Traditionell kinesiska"
+
+#: Source/Core/Core/Src/Boot/Boot.cpp:414
+msgid "Tried to load an unknown file type."
+msgstr "Försökte installera en okänd filtyp."
+
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:67
+msgid "Triggers"
+msgstr "Axelknappar"
+
+#: Source/Core/Common/Src/SysConf.h:78 Source/Core/Common/Src/SysConf.h:101
+msgid "Trying to read from invalid SYSCONF"
+msgstr "Försöker att läsa från ogiltig SYSCONF"
+
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:31
+msgid ""
+"Trying to read from invalid SYSCONF\n"
+"Wiimote bt ids are not available"
+msgstr ""
+"Försöker att läsa från ogiltig SYSCONF\n"
+"Wiimote bt ids är inte tillgänglig"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
+msgid "Turkish"
+msgstr "Turkiska"
+
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:33
+msgid "Turntable"
+msgstr "Skivspelare"
+
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58
+msgid "Type"
+msgstr "Typ"
+
+#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:30
+msgid "UDP Port:"
+msgstr "UDP-port:"
+
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:266
+#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12
+msgid "UDP Wiimote"
+msgstr "UDP Wiimote"
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:193
+msgid "UNKNOWN"
+msgstr "OKÄND"
+
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:755
+#, c-format
+msgid "UNKNOWN_%02X"
+msgstr "OKÄND_%02X"
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:172
+msgid "USA"
+msgstr "USA"
+
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:214
+msgid ""
+"Unable to create patch from given values.\n"
+"Entry not modified."
+msgstr ""
+"Det gick inte att skapa patch från de angivna värdena.\n"
+"Ingången ändrades inte."
+
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:111
+#, c-format
+msgid ""
+"Unable to parse line %lu of the entered AR code as a valid encrypted or "
+"decrypted code.  Make sure you typed it correctly.\n"
+"Would you like to ignore this line and continue parsing?"
+msgstr ""
+"Det gick inte att tolka rad %lu i AR-koden som en giltig kryperad eller "
+"dekrypterad kod. Se till att den är riktigt skriven.\n"
+"Vill du ignorera denna rad och fortsätta tolka resten?"
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:397
+#, c-format
+msgid "Undefined %i"
+msgstr "Odefinerad %i"
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:164
+msgid "Undo Load State"
+msgstr "Ångra inläsning av snabbsparning"
+
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:717
+msgid "Unexpected 0x80 call? Aborting..."
+msgstr "Oväntat 0x80-anrop? Avbryter..."
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:202
+msgid "Unknown"
+msgstr "Okänd"
+
+#: Source/Core/Core/Src/HW/DVDInterface.cpp:965
+#, c-format
+msgid "Unknown DVD command %08x - fatal error"
+msgstr "Okänt DVD-kommando %08x - katastrofalt fel"
+
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:444
+#, c-format
+msgid "Unknown command 0x%08x"
+msgstr "Okänd kommando 0x%08x"
+
+#: Source/Core/Common/Src/SysConf.cpp:132
+#, c-format
+msgid "Unknown entry type %i in SYSCONF (%s@%x)!"
+msgstr "Okänd tillträdestyp %i i SYSCONF (%s@%x)!"
+
+#: Source/Core/Core/Src/NetPlayClient.cpp:232
+#, c-format
+msgid "Unknown message received with id : %d"
+msgstr "Tog emot ett okänt meddelande med id: %d"
+
+#: Source/Core/Core/Src/NetPlayServer.cpp:508
+#, c-format
+msgid "Unknown message with id:%d received from player:%d Kicking player!"
+msgstr ""
+"Ett okänt meddelande togs emot med ID:%d från spelare:%d Sparkar spelare!"
+
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:261
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:43
+msgid "Up"
+msgstr "Upp"
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:95
+#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17
+msgid "Update"
+msgstr "Uppdatera"
+
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:307
+msgid "Upright Wiimote"
+msgstr "Upprätt Wiimote"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758
+msgid "Use EuRGB60 Mode (PAL60)"
+msgstr "Använd EuRGB60-läge (PAL60)"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:294
+msgid "Use Fullscreen"
+msgstr "Använd helskärm"
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:563
+msgid "Use Hex"
+msgstr "Använd hex"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580
+msgid "Use Panic Handlers"
+msgstr "Använd panikhanterare"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89
+msgid ""
+"Use a hacked upload strategy to stream vertices.\n"
+"This usually speed up, but is forbidden by OpenGL specification and may "
+"causes heavy glitches.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+"Använd en hackad uppladdningsstrategi för att strömma hörn.\n"
+"Detta höjer vanligtvis hastigheten, men är förbjuden enligt OpenGL:s "
+"specifikationer och kan orsaka en del större buggar.\n"
+"\n"
+"Om du är osäker kan du lämna detta omarkerat."
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122
+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 ""
+"Använd flera trådar för att dekodra texturer.\n"
+"Kan resultera i en hastighetsökning (speciellt på processorer med fler än "
+"två kärnor).\n"
+"\n"
+"Om du är osäker kan du lämna detta omarkerat."
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126
+msgid ""
+"Usually if shader compilation fails, an error message is displayed.\n"
+"However, one may skip the popups to allow interruption free gameplay by "
+"checking this option.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+"Ett felmeddelande visas vanligtvis om skuggningskompileringen misslyckas.\n"
+"Hur som helst, man kan hoppa över dialogrutorna för att undvika avbrott "
+"under spelets gång genom att markera detta alternativ.\n"
+"\n"
+"Om du är osäker kan du lämna detta omarkerat."
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:552
+msgid "Utility"
+msgstr "Hjälpprogram"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:293
+msgid "V-Sync"
+msgstr "V-synk"
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318
+msgid "VBeam Speed Hack"
+msgstr "Hastighetshack för VBeam"
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196
+msgid "Value"
+msgstr "Värde"
+
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:60
+msgid "Value:"
+msgstr "Värde:"
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:560
+msgid "Value: "
+msgstr "Värde: "
+
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:38
+msgid "Verbosity"
+msgstr "Avlusningsnivå"
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:381
+msgid "Video"
+msgstr "Video"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:486
+msgid "Virtual"
+msgstr "Virtuell"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670
+msgid "Volume"
+msgstr "Volym"
+
+#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:488
+#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:517
+#, c-format
+msgid "WAD installation failed: error creating %s"
+msgstr "WAD-installation misslyckades: Ett fel uppstod när %s skulle skapas"
+
+#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:537
+msgid "WAD installation failed: error creating ticket"
+msgstr ""
+"WAD-installation misslyckades: Ett fel uppstod när biljett skulle skapas"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84
+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 ""
+"Vänta på vertikala tomrum för att reducera screen tearing.\n"
+"Sänker prestandan om emulatorns hastighet är under 100 %.\n"
+"\n"
+"Om du är osäker kan du lämna detta omarkerat."
+
+#: Source/Core/Common/Src/MsgHandler.cpp:53
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:33
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.h:85
+msgid "Warning"
+msgstr "Varning"
+
+#: Source/Core/Core/Src/Boot/Boot.cpp:279
+msgid "Warning - starting DOL in wrong console mode!"
+msgstr "Varning - startar DOL i fel konsolläge!"
+
+#: Source/Core/Core/Src/Boot/Boot.cpp:329
+msgid "Warning - starting ELF in wrong console mode!"
+msgstr "Varning - startar ELF i fel konsolläge!"
+
+#: Source/Core/Core/Src/Boot/Boot.cpp:209
+msgid "Warning - starting ISO in wrong console mode!"
+msgstr "Varning - startar ISO i fel konsolläge!"
+
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:512
+#, c-format
+msgid ""
+"Warning! it is advised to backup all files in the folder:\n"
+"%s\n"
+"Do you wish to continue?"
+msgstr ""
+"Varning! Det rekommenderas att skapa en säkerhetskopia av alla filer i "
+"mappen:\n"
+"%s\n"
+"Vill du fortsätta?"
+
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:578
+#, c-format
+msgid ""
+"Warning: This will overwrite any existing saves that are in the folder:\n"
+"%s\n"
+"and have the same name as a file on your memcard\n"
+"Continue?"
+msgstr ""
+"Varning: Detta kommer att skriva över alla existerande sparningar:\n"
+"%s\n"
+"och har samma namn som en fil på ditt minneskort\n"
+"Vill du fortsätta?"
+
+#: Source/Core/Core/Src/Movie.cpp:835
+#, 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 ""
+"Varning: Du läste in en sparning som är efter den aktuella filmen. (byte %u "
+"> %u) (bildruta %u > %u). Du borde läsa in en annan sparning innan du "
+"fortsätter, eller läsa in denna snabbsparning med skrivskyddat läge "
+"inaktiverat."
+
+#: Source/Core/Core/Src/Movie.cpp:852
+#, 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 ""
+"Varning: Du läste in en sparning, vars film misspassar på byte %d (0x%X). Du "
+"bör läsa in en annan sparning innan du fortsätter, eller läsa in denna "
+"snabbsparning med skrivskyddat läge inaktiverat. Annars kan du få en "
+"desynkronisering."
+
+#: Source/Core/Core/Src/Movie.cpp:861
+#, c-format
+msgid ""
+"Warning: You loaded a save whose movie mismatches on frame %d. You should "
+"load another save before continuing, or load this state with read-only mode "
+"off. Otherwise you'll probably get a desync.\n"
+"\n"
+"More information: The current movie is %d frames long and the savestate's "
+"movie is %d frames long.\n"
+"\n"
+"On frame %d, the current movie presses:\n"
+"Start=%d, A=%d, B=%d, X=%d, Y=%d, Z=%d, DUp=%d, DDown=%d, DLeft=%d, DRight="
+"%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d\n"
+"\n"
+"On frame %d, the savestate's movie presses:\n"
+"Start=%d, A=%d, B=%d, X=%d, Y=%d, Z=%d, DUp=%d, DDown=%d, DLeft=%d, DRight="
+"%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d"
+msgstr ""
+"Varning: Du läste in en sparning, vars film misspassar på bildrutan %d. Du "
+"bör läsa in en annan sparning innan du fortsätter, eller läsa in denna "
+"snabbsparning med skrivskyddat läge inaktiverat. Annars kan du få en "
+"desynkronisering.\n"
+"\n"
+"Mer information: Den aktuella filmen är %d bildrutor lång och "
+"snabbsparningens film är %d bildrutor lång.\n"
+"\n"
+"På bildrutan %d trycker den aktuella filmen:\n"
+"Start=%d, A=%d, B=%d, X=%d, Y=%d, Z=%d, DUp=%d, DDown=%d, DLeft=%d, DRight="
+"%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d\n"
+"\n"
+"På bildrutan %d, trycker snabbsparningens film:\n"
+"Start=%d, A=%d, B=%d, X=%d, Y=%d, Z=%d, DUp=%d, DDown=%d, DLeft=%d, DRight="
+"%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d"
+
+#: Source/Core/AudioCommon/Src/WaveFile.cpp:93
+#: Source/Core/AudioCommon/Src/WaveFile.cpp:116
+msgid "WaveFileWriter - file not open."
+msgstr "WaveFileWriter - fil är inte öppen."
+
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:60
+msgid "Whammy"
+msgstr "Svajarm"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:408
+msgid "Widescreen Hack"
+msgstr "Bredbildshack"
+
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:299
+msgid "Width"
+msgstr "Bredd"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535
+msgid "Wii"
+msgstr "Wii"
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:372
+msgid "Wii Console"
+msgstr "Wii-konsol"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:825
+msgid "Wii NAND Root:"
+msgstr "Wii nandrot:"
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:194
+msgid "Wii Save Import"
+msgstr "Importera Wii-sparningar"
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1270
+msgid "Wii save files (*.bin)|*.bin"
+msgstr "Wii-sparningsfiler (*.bin)|*.bin"
+
+#: Source/Core/DiscIO/Src/WiiWad.cpp:69
+msgid "WiiWAD: Could not read from file"
+msgstr "WiiWAD: Kunde inte läsa från fil"
+
+#: Source/Core/Core/Src/HW/Wiimote.cpp:20
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
+msgid "Wiimote"
+msgstr "Wiimote"
+
+#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:21
+#, c-format
+msgid "Wiimote %i"
+msgstr "Wiimote %i"
+
+#: Source/Core/DolphinWX/Src/Main.cpp:656
+msgid "Wiimote Connected"
+msgstr "Wiimote ansluten"
+
+#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:91
+msgid "Wiimote Motor"
+msgstr "Wiimote-motor"
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
+msgid "Wiimote settings"
+msgstr "Inställningar för Wiimote"
+
+#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:48
+msgid "Wiimotes"
+msgstr "Wiimotes"
+
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:121
+msgid "Windows Left"
+msgstr "Fönster vänster"
+
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:123
+msgid "Windows Menu"
+msgstr "Fönstermeny"
+
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:122
+msgid "Windows Right"
+msgstr "Fönster höger"
+
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:124
+msgid "Word Wrap"
+msgstr "Radbytning"
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1325
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:880
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1090
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1226
+msgid "Working..."
+msgstr "Arbetar..."
+
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:338
+msgid "Write memcards (GC)"
+msgstr "Skriv minneskort (GC)"
+
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46
+msgid "Write to Console"
+msgstr "Skriv till kommandotolk"
+
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:54
+msgid "Write to Debugger"
+msgstr "Skriv till debuggaren"
+
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44
+msgid "Write to File"
+msgstr "Skriv till fil"
+
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48
+msgid "Write to Window"
+msgstr "Skriv till fönster"
+
+#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:47
+#, c-format
+msgid "XAudio2 CreateSourceVoice failed: %#X"
+msgstr "XAudio2 CreateSourceVoice misslyckades: %#X"
+
+#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:101
+#, c-format
+msgid "XAudio2 init failed: %#X"
+msgstr "Initiering av XAudio2 misslyckades: %#X"
+
+#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:111
+#, c-format
+msgid "XAudio2 master voice creation failed: %#X"
+msgstr "Misslyckades att skapa mästarröst för XAudio2: %#X"
+
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:765
+msgid "XF reg"
+msgstr "XF-register"
+
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
+msgid "Yellow"
+msgstr "Gul"
+
+#: Source/Core/Core/Src/DSP/DSPCore.cpp:120
+msgid ""
+"You are using a free DSP ROM made by the Dolphin Team.\n"
+"All Wii games will work correctly, and most GC games should also work fine, "
+"but the GBA/IPL/CARD UCodes will not work.\n"
+msgstr ""
+"Du använder en kostnadsfri DSP-ROM som har skapats av Dolphin-teamet.\n"
+"Alla Wii-spel och de flesta GameCube-spelen kommer att fungera som de ska, "
+"men GBA/IPL/CARD UCodes kommer inte att fungera.\n"
+
+#: Source/Core/Core/Src/DSP/DSPCore.cpp:116
+msgid ""
+"You are using an old free DSP ROM made by the Dolphin Team.\n"
+"Only games using the Zelda UCode will work correctly.\n"
+msgstr ""
+"Du använder gamla kostnadsfria DPS-roms som har skapats av Dolphin-teamet.\n"
+"Endast spel som använder Zelda Ucode kommer att fungera korrekt.\n"
+
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:63
+msgid "You can't close panes that have pages in them."
+msgstr "Du kan inte stänga paneler som har sidor inuti sig."
+
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:210
+msgid "You must choose a game!!"
+msgstr "Du måste välja ett spel!!"
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:593
+msgid "You must enter a name!"
+msgstr "Du måste ange ett namn!"
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:438
+msgid "You must enter a valid decimal, hexadecimal or octal value."
+msgstr "Du måste ange en giltig decimal, hexadecimal eller oktalt värde."
+
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:591
+msgid "You must enter a valid profile name."
+msgstr "Du måste ange ett giltigt profilnamn."
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:917
+msgid "You must restart Dolphin in order for the change to take effect."
+msgstr ""
+"Du måste starta om Dolphin för att ändringarna ska kunna träda i kraft."
+
+#: Source/Core/Core/Src/DSP/DSPCore.cpp:109
+msgid ""
+"Your DSP ROMs have incorrect hashes.\n"
+"Would you like to stop now to fix the problem?\n"
+"If you select \"No\", audio might be garbled."
+msgstr ""
+"Dina DSP-roms har ogiltiga hashar.\n"
+"Vill du stoppa nu för att fixa problemet?\n"
+"Om du väljer \"nej\" kan ljudet bli förvrängt."
+
+#: Source/Core/Core/Src/CoreParameter.cpp:164
+msgid ""
+"Your GCM/ISO file seems to be invalid (invalid country).\n"
+"Continue with PAL region?"
+msgstr ""
+"Din GCM/ISO-fil verkar vara ogiltig (ogiltigt land).\n"
+"Vill du fortsätta med PAL-regionen?"
+
+#: Source/Core/Common/Src/SysConf.cpp:45
+#, c-format
+msgid ""
+"Your SYSCONF file is the wrong size.\n"
+"It should be 0x%04x (but is 0x%04llx)\n"
+"Do you want to generate a new one?"
+msgstr ""
+"Din SYSCONF-fil är i fel storlek.\n"
+"Den borde vara 0x%04x (but is 0x%04llx)\n"
+"Vill du generera en ny?"
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:334
+msgid "ZTP hack"
+msgstr "ZTP-hack"
+
+#: Source/Core/Core/Src/ActionReplay.cpp:377
+msgid "Zero 3 code not supported"
+msgstr "Zero 3-kod stöds inte"
+
+#: Source/Core/Core/Src/ActionReplay.cpp:398
+#, c-format
+msgid "Zero code unknown to dolphin: %08x"
+msgstr "Zero-kod okänd för Dolphin: %08x"
+
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:423
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:447
+msgid "[ waiting ]"
+msgstr "[ väntar ]"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107
+msgid ""
+"[BROKEN]\n"
+"Highlight regions the EFB was copied from.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+"[TRASIG]\n"
+"Belys de regioner EFB kopierades från.\n"
+"\n"
+"Om du är osäker kan du lämna detta omarkerat."
+
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:78
+msgid "[Custom]"
+msgstr "[Anpassad]"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120
+msgid ""
+"[EXPERIMENTAL]\n"
+"Aims to speed up emulation by offloading texture decoding to the GPU using "
+"the OpenCL framework.\n"
+"However, right now it's known to cause texture defects in various games. "
+"Also it's slower than regular CPU texture decoding in most cases.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+"[EXPERIMENTELL]\n"
+"Siktar mot att snabba upp emulatorn genom att lasta av texturdekodningar "
+"till grafikprocessorn med hjälp av OpenCL-strukturen.\n"
+"Hur som helst, för tillfället är denna funktion känd för att orsaka "
+"texturfel i en del spel. Den är även långsammare än vanliga "
+"texturdekodningar till processorn i de flesta fall.\n"
+"\n"
+"Om du är osäker kan du lämna detta omarkerat."
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121
+msgid ""
+"[EXPERIMENTAL]\n"
+"Speeds up emulation a bit by caching display lists.\n"
+"Possibly causes issues though.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+"[EXPERIMENTELL]\n"
+"Snabbar upp emulatorn lite grann genom att cacha visningslistan.\n"
+"Kan möjligtvis orsaka fel.\n"
+"\n"
+"Om du är osäker kan du lämna detta omarkerat."
+
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:495
+msgid "^ ADD"
+msgstr "^ LÄGG TILL"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:801
+msgid "apploader (.img)"
+msgstr "apploader (.img)"
+
+#: Source/Core/Core/Src/PowerPC/JitInterface.cpp:272
+#, c-format
+msgid "iCacheJIT: Reading Opcode from %x. Please report."
+msgstr "iCacheJIT: Läser opkod från %x. Var god rapportera detta."
+
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:936
+msgid "s"
+msgstr "s"
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1136
+msgid "wxExecute returned -1 on application run!"
+msgstr "wxExecute returnerade -1 i applikationkörningen!"
+
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:43
+msgid "zFar Correction: "
+msgstr "zFar-korrektion: "
+
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:38
+msgid "zNear Correction: "
+msgstr "zNear-korrektion: "
+
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:480
+msgid "| OR"
+msgstr "| ELLER"
diff --git a/Languages/po/tr.po b/Languages/po/tr.po
index e11101d8d3..a269a472db 100644
--- a/Languages/po/tr.po
+++ b/Languages/po/tr.po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the dolphin-emu package.
 #
 # Translators:
-# Mustafa Can <m.can.elmaci@gmail.com>, 2013.
-# nlgzrgn <nlgzrgn@live.com>, 2011.
+# mustafacan <m.can.elmaci@gmail.com>, 2013
+# nlgzrgn <nlgzrgn@live.com>, 2011
 msgid ""
 msgstr ""
 "Project-Id-Version: Dolphin Emulator\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-10 08:56-0500\n"
-"PO-Revision-Date: 2013-02-13 15:09+0000\n"
+"POT-Creation-Date: 2013-04-18 23:00-0500\n"
+"PO-Revision-Date: 2013-04-04 08:13+0000\n"
 "Last-Translator: mustafacan <m.can.elmaci@gmail.com>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/dolphin-emu/"
 "language/tr/)\n"
@@ -18,23 +18,23 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:511
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:499
 msgid " (too many to display)"
 msgstr "(Göstermek için çok fazla)"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:270
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:273
 #: Source/Core/DolphinWX/Src/NetWindow.cpp:491
 #: Source/Core/DolphinWX/Src/NetWindow.cpp:530
 msgid " Game : "
 msgstr "Oyun :"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:507
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494
 msgid "! NOT"
 msgstr "! YOK"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:70
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:58
 #, c-format
 msgid ""
 "\"%s\" does not exist.\n"
@@ -43,35 +43,45 @@ msgstr ""
 "\"%s\" bulunamadı.\n"
 "16MB'lık yeni bir hafıza kartı oluşturulsun mu?"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:142
+#: Source/Core/Core/Src/CoreParameter.cpp:131
 #, c-format
 msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO."
 msgstr ""
 "\"%s\" hatalı bir GCM veya ISO dosyası, veya herhangi bir GC veya Wii kalıbı "
 "değil."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:722
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:721
 #, c-format
 msgid "%08X:  "
 msgstr "%08X:  "
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:196
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:183
 #, c-format
 msgid "%1$sCopy%1$s"
 msgstr "%1$sKopyala%1$s"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:128
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:296
+#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:113
+#, c-format
+msgid "%d samples"
+msgstr ""
+
+#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:112
+#, c-format
+msgid "%d samples (quality level %d)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:121
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:289
 #, c-format
 msgid "%s already exists, overwrite?"
 msgstr "%s zaten var, üzerine yazılsın mı?"
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:167
+#: Source/Core/DiscIO/Src/CompressedBlob.cpp:154
 #, c-format
 msgid "%s failed to be scrubbed. Probably the image is corrupt."
 msgstr "%s küçültülemedi. Kalıp dosyası bozuk olabilir."
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:95
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:83
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
@@ -80,7 +90,7 @@ msgstr ""
 "%s hafıza kart dosyası olarak yüklenemedi \n"
 "Kart dosyası boyutu hatalı (0x%x bayt)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:110
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:98
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
@@ -89,7 +99,7 @@ msgstr ""
 "%s hafıza kartı olarak yüklenemedi \n"
 "Kart boyutu hatalı (0x%x bayt)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:90
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:78
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
@@ -98,48 +108,37 @@ msgstr ""
 "%s hafıza kartı olarak yüklenemedi. \n"
 "Dosya geçerli bir hafıza kartı dosyası olabilmek için çok küçük (0x%x bayt)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:367
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:359
 #, c-format
 msgid "%s failed to open"
 msgstr "%s açılamadı"
 
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:97
-#, c-format
-msgid ""
-"%s has an incorrect hash.\n"
-"Would you like to stop now to fix the problem?\n"
-"If you select \"No\", audio will be garbled."
-msgstr ""
-"%s nin hash değerleri hatalı.\n"
-"Sorunu düzeltmek için durdurmak istiyor musunuz?\n"
-"Eğer \"Hayır\", seçerseniz,seste sorun oluşabilir."
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:360
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:352
 #, c-format
 msgid "%s is a 0 byte file"
 msgstr "%s dosyasının boyutu 0 bayt'tır."
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:159
+#: Source/Core/DiscIO/Src/CompressedBlob.cpp:146
 #, c-format
 msgid "%s is already compressed! Cannot compress it further."
 msgstr "%s zaten sıkıştırılmış! Tekrar sıkıştırmayı denemeyin!"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:345
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:337
 #, c-format
 msgid "%s is too long for the filename, max chars is 45"
 msgstr "%s adı çok uzun, izin verilen en fazla 45 karakterdir."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:202
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:189
 #, c-format
 msgid "%sDelete%s"
 msgstr "%sSil%s"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:200
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:187
 #, c-format
 msgid "%sExport GCI%s"
 msgstr "%sGCI Ver%s"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:198
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:185
 #, c-format
 msgid "%sImport GCI%s"
 msgstr "%sGCI Al%s"
@@ -149,222 +148,246 @@ msgstr "%sGCI Al%s"
 msgid "%u Free Blocks; %u Free Dir Entries"
 msgstr "%u Boş Blok; %u Boş Dizin Girişi"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:506
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:493
 msgid "&& AND"
 msgstr "&& VE"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:295
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:301
 msgid "&About..."
 msgstr "Hakkında... (&A)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:99
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:100
 msgid "&Boot from DVD Drive..."
 msgstr "DVD Sürücüden Önyükle... (&B)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:231
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:234
 msgid "&Breakpoints"
 msgstr "Kesme noktaları (&B)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:110
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:111
 msgid "&Browse for ISOs..."
 msgstr "Kalıplara Gözat... (&B)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:192
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:195
 msgid "&Cheats Manager"
 msgstr "Hile Yöneti&cisi"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:177
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:180
 msgid "&DSP Settings"
 msgstr "Ses Ayarları (&D)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:885
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:876
 msgid "&Delete ISO..."
 msgstr "Kalıbı Sil... (&D)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:903
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:897
 msgid "&Delete selected ISOs..."
 msgstr "Seçilen Kalıpları Sil... (&D)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:170
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:173
 msgid "&Emulation"
 msgstr "&Emülasyon"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:113
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:114
 msgid "&File"
 msgstr "Dosya (&F)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:335
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:341
 msgid "&Frame Advance"
 msgstr "Gelişmiş Kareleme (&F)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:352
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:358
 msgid "&Fullscreen"
 msgstr "Tam Ekran (&F)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:176
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:179
 msgid "&Graphics Settings"
 msgstr "&Görüntü Ayarları"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:296
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:302
 msgid "&Help"
 msgstr "Yardım (&H)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:180
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:183
 msgid "&Hotkey Settings"
 msgstr "Tuş ayarları (&H)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:233
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:236
 msgid "&JIT"
 msgstr "&JIT"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:148
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:149
 msgid "&Load State"
 msgstr "Durumu Yük&le"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:190
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:193
 msgid "&Memcard Manager (GC)"
 msgstr "GC Hafıza Kartı Yönetici (&M)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:232
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:235
 msgid "&Memory"
 msgstr "Hafıza (&M)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:313
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:319
 msgid "&Open..."
 msgstr "Aç...(&O)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:186
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:189
 msgid "&Options"
 msgstr "Seçenekler (&O)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:324
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:330
 msgid "&Pause"
 msgstr "Duraklat (&P)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:326
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:332
 msgid "&Play"
 msgstr "Oynat (&P)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:867
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:858
 msgid "&Properties"
 msgstr "Özellikler (&P)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:348
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:354
 msgid "&Read-only mode"
 msgstr "Salt okunu&r mod"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:319
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:325
 msgid "&Refresh List"
 msgstr "Listeyi Yenile (&R)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:230
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:233
 msgid "&Registers"
 msgstr "Kayıtla&r"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:332
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:338
 msgid "&Reset"
 msgstr "Sıfı&rla"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:234
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:237
 msgid "&Sound"
 msgstr "&Ses"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:329
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:335
 msgid "&Stop"
 msgstr "Durdur (&S)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:207
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:210
 msgid "&Tools"
 msgstr "Araçlar (&T)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:235
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:238
 msgid "&Video"
 msgstr "Görüntü (&V)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:284
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:287
 msgid "&View"
 msgstr "Görünüm (&V)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:179
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:182
 msgid "&Wiimote Settings"
 msgstr "&Wiimote Ayarları"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:868
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:859
 msgid "&Wiki"
 msgstr "&Wiki"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504
 msgid "'"
 msgstr "'"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:59
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:46
 msgid "(-)+zFar"
 msgstr "(-)+zFar"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:54
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:41
 msgid "(-)+zNear"
 msgstr "(-)+zNear"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:99
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:86
 msgid "(UNKNOWN)"
 msgstr "(BİLİNMEYEN)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:376
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:384
 msgid "(off)"
 msgstr "(kapalı)"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:655
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:654
 msgid "0x44"
 msgstr "0x44"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+msgid "1.5x Native (960x792)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:158
 msgid "16 bit"
 msgstr "16 bit"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+msgid "1x Native (640x528)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+msgid "2.5x Native (1600x1320)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+msgid "2x Native (1280x1056)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:159
 msgid "32 bit"
 msgstr "32 bit"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:412
 msgid "3D Vision"
 msgstr "3D Vision"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+msgid "3x Native (1920x1584)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+msgid "4x Native (2560x2112)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:157
 msgid "8 bit"
 msgstr "8 bit"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:43
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:30
 msgid "<Insert name here>"
 msgstr "<Adı buraya ekleyin>"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:255
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:262
 msgid "<No resolutions found>"
 msgstr "<Çözünürlük bulunamadı>"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:104
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84
 msgid "<Nothing>"
 msgstr "<Hiçbir şey>"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:162
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:162
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:150
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:150
 msgid "<Press Key>"
 msgstr "<Tuşa Basın>"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286
 msgid "<System>"
 msgstr "<Sistem>"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695
 msgid "A"
 msgstr "A"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:201
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:235
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:204
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:238
 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:353
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:387
 msgid "A game is not currently running."
 msgstr "Bir oyun şu anda düzgün çalışmıyor."
 
@@ -374,23 +397,24 @@ msgid ""
 "You must manually connect your wiimotes."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:109
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:100
+#, fuzzy
 msgid ""
 "ALERT:\n"
 "\n"
-"NetPlay will currently only work properly when using the following "
-"settings:\n"
-" - Dual Core [OFF]\n"
-" - Audio Throttle [OFF]\n"
-" - DSP-HLE with \"Null Audio\" or DSP-LLE\n"
-" - Manually set the exact number of controllers that will be used to "
-"[Standard Controller]\n"
+"Netplay will only work with the following settings:\n"
+" - Enable Dual Core [OFF]\n"
+" - DSP Emulator Engine Must be the same on all computers!\n"
+" - DSP on Dedicated Thread [OFF]\n"
+" - Framelimit NOT set to [Audio]\n"
+" - Manually set the exact number of controllers to be used to [Standard "
+"Controller]\n"
 "\n"
-"All players should try to use the same Dolphin version and settings.\n"
-"Disable all memory cards or send them to all players before starting.\n"
-"Wiimote support has not been implemented.\n"
+"All players should use the same Dolphin version and settings.\n"
+"All memory cards must be identical between players or disabled.\n"
+"Wiimote support has not been implemented!\n"
 "\n"
-"You must forward TCP port to host!!"
+"The host must have the chosen TCP port open/forwarded!\n"
 msgstr ""
 "UYARI:\n"
 "\n"
@@ -408,17 +432,17 @@ msgstr ""
 "\n"
 "TCP bağlantı noktanızı barındırıcıya yönlendirmelisiniz!!"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:111
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:116
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96
 msgid "AM-Baseboard"
 msgstr "AM-Baseboard"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:299
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:115
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:300
 msgid "AR Codes"
 msgstr "AR Kodları"
 
-#: Source/Core/DolphinWX/Src/AboutDolphin.h:33
+#: Source/Core/DolphinWX/Src/AboutDolphin.h:21
 msgid "About Dolphin"
 msgstr "Dolphin Hakkında"
 
@@ -426,15 +450,11 @@ msgstr "Dolphin Hakkında"
 msgid "Acceleration"
 msgstr "Hızlandırma"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:463
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473
 msgid "Accuracy:"
 msgstr "Doğruluk:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317
-msgid "Accurate VBeam emulation"
-msgstr "Doğru VBeam Emülasyonu"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97
 msgid ""
 "Accurately emulate EFB copies.\n"
 "Some games depend on this for certain graphical effects or gameplay "
@@ -447,12 +467,12 @@ msgstr ""
 "\n"
 "Emin değilseniz, bunun yerine EFB'den Doku'ya seçeneğini işaretleyin."
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:239
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:239
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:227
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:227
 msgid "Action"
 msgstr "Eylem"
 
-#: Source/Core/Core/Src/ARDecrypt.cpp:481
+#: Source/Core/Core/Src/ARDecrypt.cpp:469
 #, c-format
 msgid ""
 "Action Replay Code Decryption Error:\n"
@@ -467,14 +487,14 @@ msgstr ""
 "Suçlu Kod:\n"
 "%s"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:667
+#: Source/Core/Core/Src/ActionReplay.cpp:657
 #, 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:755
+#: Source/Core/Core/Src/ActionReplay.cpp:745
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide "
@@ -483,7 +503,7 @@ msgstr ""
 "Action Replay Hatası: Doldurma ve kaydırmada (%08x : adres = %08x) hatalı "
 "boyut (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:547
+#: Source/Core/Core/Src/ActionReplay.cpp:537
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And "
@@ -492,7 +512,7 @@ msgstr ""
 "Action Replay Hatası: Anabellek yazma ve doldurmasında (%08x : adres = %08x) "
 "hatalı boyut (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:607
+#: Source/Core/Core/Src/ActionReplay.cpp:597
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Write To "
@@ -501,12 +521,12 @@ msgstr ""
 "Action Replay Hatası: İşaretleyiciye yazarken (%08x : address = %08x) hatalı "
 "boyut (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:802
+#: Source/Core/Core/Src/ActionReplay.cpp:792
 #, c-format
 msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)"
 msgstr "Action Replay Hatası: Hafıza kopyalamada (%08x) hatalı değer (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:682
+#: Source/Core/Core/Src/ActionReplay.cpp:672
 #, c-format
 msgid ""
 "Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)\n"
@@ -515,63 +535,63 @@ msgstr ""
 "Action Replay Hatası: Ana Kod ve CCXXXXXX kodu uygulanamadı (%s)\n"
 "Ana kodlar gerekli değil. Ana kodları kullanmayın."
 
-#: Source/Core/Core/Src/ActionReplay.cpp:196
+#: Source/Core/Core/Src/ActionReplay.cpp:184
 #, c-format
 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:872
+#: Source/Core/Core/Src/ActionReplay.cpp:862
 #, 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:945
+#: Source/Core/Core/Src/ActionReplay.cpp:935
 #, 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:896
+#: Source/Core/Core/Src/ActionReplay.cpp:886
 #, 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:838
+#: Source/Core/Core/Src/ActionReplay.cpp:828
 #, 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:242
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:247
 msgid "Adapter:"
 msgstr "Dönüştürücü:"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:76
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:63
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:63
 msgid "Add"
 msgstr "Ekle"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1275
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1301
 msgid "Add ActionReplay Code"
 msgstr "Action Replay Kodu Ekle"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1204
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1230
 msgid "Add Patch"
 msgstr "Yama Ekle"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:507
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:528
 msgid "Add new pane"
 msgstr "Bölme ekle"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:404
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:426
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:811
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:408
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:430
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:792
 msgid "Add..."
 msgstr "Ekle..."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:90
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:81
 msgid "Address :"
 msgstr "Adres :"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:58
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:45
 msgid ""
 "Adds the specified value to zFar Parameter.\n"
 "Two ways to express the floating point values.\n"
@@ -589,7 +609,7 @@ msgstr ""
 "\n"
 "NOT: Ulaşılan değerler için Giriş Penceresi veya Konsolu denetleyin."
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:53
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:40
 msgid ""
 "Adds the specified value to zNear Parameter.\n"
 "Two ways to express the floating point values.\n"
@@ -607,50 +627,50 @@ msgstr ""
 "\n"
 "NOT: Ulaşılan değerler için Giriş Penceresi veya Konsolu denetleyin."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:755
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:744
 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:509
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:522
 msgid "Advanced"
 msgstr "Gelişmiş"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561
 msgid "Advanced Settings"
 msgstr "Gelişmiş Ayarlar"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:584
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:587
 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:816
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:797
 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:1189
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1190
 msgid "All Gamecube GCM files (gcm)"
 msgstr "Tüm GameCube GCM Dosyaları (gcm)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1390
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1404
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1417
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1431
 msgid "All Save States (sav, s##)"
 msgstr "Tüm Kayıtlı Oyunlar (sav,s##)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1187
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1188
 msgid "All Wii ISO files (iso)"
 msgstr "Tüm Wii kalıpları (iso)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1207
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1208
 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:124
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:104
 msgid "All files (*.*)|*.*"
 msgstr "Tüm dosyalar (*.*)|*.*"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123
 msgid ""
 "Allows toggling certain options via the hotkeys 3 (Internal Resolution), 4 "
 "(Aspect Ratio), 5 (Copy EFB) and 6 (Fog) within the emulation window.\n"
@@ -658,39 +678,39 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:285
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:272
 msgid "Analyze"
 msgstr "Analiz et"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:298
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:285
 msgid "Angle"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:367
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:375
 msgid "Anisotropic Filtering:"
 msgstr "Filtreleme:"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:350
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:358
 msgid "Anti-Aliasing:"
 msgstr "Keskinleştirme:"
 
-#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:308
+#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:299
 msgid "Apploader is the wrong size...is it really an apploader?"
 msgstr "Apploader boyutu yanlış. Bu gerçekten bir apploader mı?"
 
-#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:302
+#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:293
 msgid "Apploader unable to load from file"
 msgstr "Apploader dosyadan yüklenemiyor."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:841
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:822
 msgid "Apploader:"
 msgstr "Apploader:"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:135
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:122
 msgid "Apply"
 msgstr "Uygula"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124
 msgid ""
 "Apply a post-processing effect after finishing a frame.\n"
 "\n"
@@ -700,11 +720,11 @@ msgstr ""
 "\n"
 "Emin değilseniz, kapalı seçin."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287
 msgid "Arabic"
 msgstr "Arapça"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:614
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:603
 #, c-format
 msgid "Are you sure you want to delete \"%s\"?"
 msgstr "\"%s\" dosyasını silmek istiyor musunuz?"
@@ -723,46 +743,50 @@ msgstr ""
 "Bu dosyayı gerçekten silmek istiyor musunuz? Silindikten sonra bu dosyaları "
 "geri döndüremezsiniz!"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:789
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:277
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:44
+msgid "Arm JIT (experimental)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:285
 msgid "Aspect Ratio:"
 msgstr "En-boy Oranı:"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:70
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:58
 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:265
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:553
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533
 msgid "Audio"
 msgstr "Ses"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:694
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675
 msgid "Audio Backend:"
 msgstr "Ses Çözücüsü:"
 
-#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:41
+#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:28
 msgid "AudioCommon: Error opening AO device.\n"
 msgstr "AudioCommon: AO sürücüyü açarken hata.\n"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:275
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283
 msgid "Auto"
 msgstr "Otomatik"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:337
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345
 msgid "Auto (Multiple of 640x528)"
 msgstr "Otomatik (640x528'in katları)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:337
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345
 msgid "Auto (Window Size)"
 msgstr "Otomatik (Pencere Boyutu)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:297
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305
 msgid "Auto adjust Window Size"
 msgstr "Pencere Boyutunu Otomatik Ayarla"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77
 msgid ""
 "Automatically adjusts the window size to your internal resolution.\n"
 "\n"
@@ -772,160 +796,160 @@ msgstr ""
 "\n"
 "Emin değilseniz, işaretsiz bırakın."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:697
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696
 msgid "B"
 msgstr "B"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:755
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:754
 msgid "BP register "
 msgstr "BP kaydı"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:27
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:14
 msgid "Back"
 msgstr "Geri"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:698
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:679
 msgid "Backend Settings"
 msgstr "Çözücü Ayarları"
 
-#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:60
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:206
+#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:47
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:211
 msgid "Backend:"
 msgstr "Çözücü:"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:318
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:95
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:305
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:82
 msgid "Background Input"
 msgstr "Arkaplanda Giriş"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:279
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:266
 msgid "Backward"
 msgstr "Geri"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:264
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:257
 msgid "Bad File Header"
 msgstr "Kötü Dosya Başı"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:627
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:621
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:290
 msgid "Banner"
 msgstr "Afiş"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:519
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:529
 msgid "Banner Details"
 msgstr "Afiş Ayrıntıları"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491
 msgid "Banner:"
 msgstr "Afiş:"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:57
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:61
 msgid "Bar"
 msgstr "Çubuk"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:308
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:316
 msgid "Basic"
 msgstr "Temel"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555
 msgid "Basic Settings"
 msgstr "Temel Ayarlar"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:22
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Bass"
 msgstr "Bass"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:186
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:174
 msgid "Block Allocation Table checksum failed"
 msgstr "Blok Ayırma Tablosu sağlaması başarısız."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:631
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625
 msgid "Blocks"
 msgstr "Bloklar"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:21
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Blue"
 msgstr "Mavi"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:24
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Blue Left"
 msgstr "Mavi Sol"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:25
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Blue Right"
 msgstr "Mavi Sağ"
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:87
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270
 msgid "Bottom"
 msgstr "Alt"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:238
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:225
 #, c-format
 msgid "Bound Controls: %lu"
 msgstr "Bağlı Denetimler: %lu"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348
 msgid "Broken"
 msgstr "Bozuk"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:422
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:428
 msgid "Browse"
 msgstr "Gözat..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:256
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:243
 msgid "Browse for a directory to add"
 msgstr "Eklemek için bir klasöre gözat"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:422
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:428
 msgid "Browse for an ISO directory..."
 msgstr "Bir kalıp konumu için gözat..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1079
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1080
 msgid "Browse for output directory"
 msgstr "Çıkış klasörü için gözat"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:328
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:331
 msgid "Buffer:"
 msgstr "Tampon:"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:58
 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:119
+#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:106
 msgid "Buttons"
 msgstr "Düğmeler"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317
 msgid ""
 "Bypass the clearing of the data cache by the DCBZ instruction. Usually leave "
 "this option disabled."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:698
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:697
 msgid "C"
 msgstr "C"
 
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:77
+#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:64
 msgid "C Stick"
 msgstr "C Çubuğu"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:77
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:64
 msgid "C-Stick"
 msgstr "C Çubuğu"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:764
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:763
 msgid "CP reg"
 msgstr "CP kaydı"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:567
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547
 msgid "CPU Emulator Engine"
 msgstr "CPU Emülatör Motoru"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:490
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500
 msgid "Cache Display Lists"
 msgstr "Görüntü Listelerini Önbellekle"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88
 msgid ""
 "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n"
 "Decreases emulation speed by some percent (depending on your GPU).\n"
@@ -940,23 +964,38 @@ msgstr ""
 "\n"
 "Emin değilseniz, işaretsiz bırakın."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1858
+#, c-format
+msgid "Can't find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x"
+msgstr ""
+
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1872
+#, c-format
+msgid "Can't find WiiMote by connection handle %02x"
+msgstr ""
+
+#: Source/Core/Core/Src/HW/DVDInterface.cpp:669
+#: Source/Core/Core/Src/HW/DVDInterface.cpp:679
+msgid "Can't read from DVD_Plugin - DVD-Interface: Fatal Error"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:124
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:28
 msgid "Cancel"
 msgstr "İptal"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:91
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:178
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:240
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:84
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:171
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:233
 #, c-format
 msgid "Cannot open %s"
 msgstr "%s açılamadı."
 
-#: Source/Core/Core/Src/CoreTiming.cpp:141
+#: Source/Core/Core/Src/CoreTiming.cpp:128
 msgid "Cannot unregister events with events pending"
 msgstr "Bekleyen olaylardan dolayı olaylar kayıttan kaldırılamıyor."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1078
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1061
 #, c-format
 msgid ""
 "Cannot use that file as a memory card.\n"
@@ -967,7 +1006,7 @@ msgstr ""
 "%s\n"
 "Geçerli bir Gamecube hafıza kartı dosyası değil."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1108
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1091
 msgid ""
 "Cannot use that file as a memory card.\n"
 "Are you trying to use the same file in both slots?"
@@ -975,30 +1014,15 @@ 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:1867
-#, 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:1881
-#, 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: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"
-
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:52
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:39
 msgid "Caps Lock"
 msgstr "Büyük Harf Kilidi"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288
 msgid "Catalan"
 msgstr "Katalanca"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:311
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:298
 msgid "Center"
 msgstr "Merkez"
 
@@ -1006,12 +1030,12 @@ msgstr "Merkez"
 msgid "Change"
 msgstr "Değiştir"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:316
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:322
 msgid "Change &Disc..."
 msgstr "&Diski Değiştir"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:179
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:179
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:167
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:167
 msgid "Change Disc"
 msgstr "Diski Değiştir"
 
@@ -1019,7 +1043,7 @@ msgstr "Diski Değiştir"
 msgid "Change Game"
 msgstr "Oyunu Değiştir"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:515
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495
 msgid ""
 "Change the language of the user interface.\n"
 "Requires restart."
@@ -1027,76 +1051,76 @@ msgstr ""
 "Kullanıcı arabiriminin dilini değiştirin. \n"
 "Yeniden başlatma gerektirir."
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:60
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:47
 msgid "Changes sign to zFar Parameter (after correction)"
 msgstr "zFar Parametresinin işaretini değiştirir (düzeltme sonrası)"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:55
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:42
 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:519
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499
 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:295
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:298
 msgid "Chat"
 msgstr "Sohbet"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:47
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:34
 msgid "Cheat Code"
 msgstr "Hile Kodu"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:118
 msgid "Cheat Search"
 msgstr "Hile Arama"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:38
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:25
 msgid "Cheats Manager"
 msgstr "Hile Yöneticisi"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:633
 msgid "Check Partition Integrity"
 msgstr "Bölüm Düzgünlüğünü Denetle"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:864
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:880
 msgid "Checking integrity..."
 msgstr "Düzgünlük denetleniyor..."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289
 msgid "Chinese (Simplified)"
 msgstr "Çince (Basit)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290
 msgid "Chinese (Traditional)"
 msgstr "Çince (Geleneksel)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:818
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:799
 msgid "Choose a DVD root directory:"
 msgstr "DVD kök dizinini seçin:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:822
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803
 msgid "Choose a NAND root directory:"
 msgstr "NAND kök dizinini seçin:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:815
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:796
 msgid "Choose a default ISO:"
 msgstr "Varsayılan kalıbı seçin:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1236
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1219
 msgid "Choose a directory to add"
 msgstr "Eklemek için bir konum seçin"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1065
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1048
 msgid "Choose a file to open"
 msgstr "Açmak için bir dosya seçin"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:217
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:204
 msgid "Choose a memory card:"
 msgstr "Bir hafıza kartı seçin:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:819
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800
 msgid ""
 "Choose file to use as apploader: (applies to discs constructed from "
 "directories only)"
@@ -1104,27 +1128,27 @@ msgstr ""
 "Apploader olarak bir dosya seçin: (Sadece konumlardan yapılan disklere "
 "uygulanır)"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:767
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:806
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:781
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:822
 msgid "Choose the folder to extract to"
 msgstr "Genişletmek için bir klasör seçin"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:297
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:284
 msgid "Circle Stick"
 msgstr "Çember Çubuk"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:52
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:56
 msgid "Classic"
 msgstr "Klasik"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:144
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:43
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:487
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:913
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:137
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:30
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:474
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:904
 msgid "Clear"
 msgstr "Temizle"
 
-#: Source/Core/Core/Src/NetPlayServer.cpp:259
+#: Source/Core/Core/Src/NetPlayServer.cpp:263
 msgid ""
 "Client disconnect while game is running!! NetPlay is disabled. You must "
 "manually stop the game."
@@ -1132,122 +1156,122 @@ msgstr ""
 "Oyun çalışırken istemci bağlantısı kesildi!! NetPlay iptal edildi. Oyunu "
 "elle durdurmalısınız."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:298
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:247
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:552
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:578
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:285
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:234
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:562
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:590
 msgid "Close"
 msgstr "Kapat"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:174
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:177
 msgid "Co&nfigure..."
 msgstr "Yapıla&ndır"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:86
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:73
 msgid "Code Info"
 msgstr "Kod Bilgisi"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:568
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:556
 msgid "Code: "
 msgstr "Kod:"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:35
 msgid "Command"
 msgstr "Komut"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:629
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:623
 msgid "Comment"
 msgstr "Yorum"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489
 msgid "Comment:"
 msgstr "Yorum:"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:893
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:884
 msgid "Compress ISO..."
 msgstr "Kalıbı sıkıştır..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:905
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:899
 msgid "Compress selected ISOs..."
 msgstr "Seçili kalıpları sıkıştır..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1088
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1224
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1089
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1225
 msgid "Compressing ISO"
 msgstr "Kalıp sıkıştırılıyor..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:429
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:435
 msgid "Config"
 msgstr "Yapılandırma"
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:37
-#: Source/Core/DolphinWX/Src/InputConfigDiag.h:135
-#: Source/Core/DolphinWX/Src/InputConfigDiag.h:154
+#: Source/Core/DolphinWX/Src/InputConfigDiag.h:122
+#: Source/Core/DolphinWX/Src/InputConfigDiag.h:141
 msgid "Configure"
 msgstr "Yapılandır"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:111
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:98
 msgid "Configure Control"
 msgstr "Denetimleri Yapılandır"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:306
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
 #: Source/Core/DolphinWX/Src/NetWindow.cpp:583
 msgid "Configure Pads"
 msgstr "Kolları Yapılandır"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:429
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:435
 msgid "Configure..."
 msgstr "Yapılandır..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1119
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1147
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1217
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1120
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1218
 msgid "Confirm File Overwrite"
 msgstr "Dosyanın Üzerine Yazmaya İzin Ver"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:597
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:577
 msgid "Confirm on Stop"
 msgstr "Durdurma Onayı İste"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:83
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:105
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:74
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:96
 msgid "Connect"
 msgstr "Bağlan"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:783
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:764
 msgid "Connect USB Keyboard"
 msgstr "USB Klavye Bağla"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:362
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:368
 #, c-format
 msgid "Connect Wiimote %i"
 msgstr "Wiimote'u Bağla : %i"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:195
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183
 msgid "Connect Wiimote 1"
 msgstr "Wiimote 1'i Bağla"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184
 msgid "Connect Wiimote 2"
 msgstr "Wiimote 2'yi Bağla"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:185
 msgid "Connect Wiimote 3"
 msgstr "Wiimote 3'ü Bağla"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:198
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:186
 msgid "Connect Wiimote 4"
 msgstr "Wiimote 4'ü Bağla"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:627
+#: Source/Core/DolphinWX/Src/Main.cpp:655
 msgid "Connecting..."
 msgstr "Bağlanıyor..."
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:155
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:156
 msgid "Console"
 msgstr "Konsol"
 
@@ -1255,15 +1279,15 @@ msgstr "Konsol"
 msgid "Continuous Scanning"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:46
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:33
 msgid "Control"
 msgstr "Denetim"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:189
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:176
 msgid "Convert to GCI"
 msgstr "GCI'ya dönüştür"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:379
+#: Source/Core/Core/Src/CoreParameter.cpp:368
 msgid "Copy failed"
 msgstr "Kopyalama başarısız."
 
@@ -1272,21 +1296,21 @@ msgstr "Kopyalama başarısız."
 msgid "Copy to Memcard %c"
 msgstr "Hafıza kartı %c 'ye kopyala"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:359
 msgid "Core"
 msgstr "Çekirdek"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:154
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:148
 #, c-format
 msgid "Could not create %s"
 msgstr "%s oluşturulamadı."
 
-#: Source/Core/AudioCommon/Src/AudioCommon.cpp:75
+#: Source/Core/AudioCommon/Src/AudioCommon.cpp:62
 #, c-format
 msgid "Could not initialize backend %s."
 msgstr "Çözücü %s başlatılamadı."
 
-#: Source/Core/Core/Src/CoreParameter.cpp:137
+#: Source/Core/Core/Src/CoreParameter.cpp:126
 #, c-format
 msgid ""
 "Could not read \"%s\".  There is no disc in the drive, or it is not a GC/Wii "
@@ -1297,12 +1321,12 @@ msgstr ""
 "Lütfen bilgisayarların çoğunun gerçek GameCube veya Wii disklerini "
 "okuyamadıklarını unutmayın."
 
-#: Source/Core/Core/Src/CoreParameter.cpp:292
+#: Source/Core/Core/Src/CoreParameter.cpp:281
 #, c-format
 msgid "Could not recognize ISO file %s"
 msgstr "Kalıp dosyası %s tanınamadı."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:569
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:579
 #, c-format
 msgid "Could not save %s"
 msgstr "%s kaydedilemedi."
@@ -1315,23 +1339,24 @@ 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:123
+#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119
 #, c-format
 msgid ""
 "Could not write memory card file %s.\n"
 "\n"
 "Are you running Dolphin from a CD/DVD, or is the save file maybe write "
-"protected?"
-msgstr ""
-"Hafıza kartı dosyası %s yazılamadı. \n"
+"protected?\n"
 "\n"
-"Dolphin'i bir CD/DVD'den çalıştırıyorsunuz veya kayıt dosyası yazma korumalı."
+"Are you receiving this after moving the emulator directory?\n"
+"If so, then you may need to re-specify your memory card location in the "
+"options."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1107
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1133
 msgid "Couldn't find open command for extension 'ini'!"
 msgstr "Uzantı 'ini' için açma komutu bulunamadı."
 
-#: Source/Core/Core/Src/BootManager.cpp:146
+#: Source/Core/Core/Src/BootManager.cpp:137
 msgid ""
 "Couldn't init the core.\n"
 "Check your configuration."
@@ -1339,38 +1364,38 @@ 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:170
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:495
 msgid "Count:"
 msgstr "Sayı:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:452
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456
 msgid "Country:"
 msgstr "Ülke:"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:186
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:562
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:173
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:550
 msgid "Create AR Code"
 msgstr "AR Kodu Oluştur"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:543
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:608
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:569
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:641
 msgid "Create new perspective"
 msgstr "Yeni perspektif oluştur"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:17
 msgid "Creator: "
 msgstr "Oluşturan:"
 
-#: Source/Core/Common/Src/MsgHandler.cpp:68
+#: Source/Core/Common/Src/MsgHandler.cpp:54
 msgid "Critical"
 msgstr "Önemli"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562
 msgid "Crop"
 msgstr "Kırp"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119
 msgid ""
 "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n"
 "\n"
@@ -1380,141 +1405,140 @@ msgstr ""
 "\n"
 "Emin değilseniz, işaretsiz bırakın."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:48
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:52
 msgid "Crossfade"
 msgstr "Geçişli"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:597
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:600
 #, c-format
-msgid "Current dir changed from %s to %s after wxFileSelector!"
+msgid "Current directory changed from %s to %s after wxFileSelector!"
 msgstr ""
-"wx Dosya Seçiciden sonra şu anki konum %s 'den %s 'ye değiştirilmiştir."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339
 msgid "Custom Projection Hack"
 msgstr "Özel Görüntüleme Hilesi"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.h:30
+#: Source/Core/DolphinWX/Src/PHackSettings.h:17
 msgid "Custom Projection Hack Settings"
 msgstr "Özel Görüntüleme Hilesi Ayarları"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342
 msgid "Customize some Orthographic Projection parameters."
 msgstr "Bazı ortografik projeksiyon parametrelerini özelleştir."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291
 msgid "Czech"
 msgstr "Çekçe"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:698
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:697
 msgid "D"
 msgstr "D"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:89
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
 msgid "D-Pad"
 msgstr "Yön Tuşları"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:431
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
 msgid "DSP"
 msgstr "Ses"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:639
 msgid "DSP Emulator Engine"
 msgstr "Ses Emülatörü Motoru"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:254
 msgid "DSP HLE emulation (fast)"
 msgstr "DSP HLE Emülasyonu (Hızlı)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:256
 msgid "DSP LLE interpreter (slow)"
 msgstr "DSP LLE Yorumlayıcı (Çok Yavaş)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660
-msgid "DSP LLE on Thread"
-msgstr "İşlem Birimi Üzerinde DSP LLE"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:255
 msgid "DSP LLE recompiler"
 msgstr "DSP LLE Yeniden Derleyici"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:431
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:641
+msgid "DSP on Dedicated Thread"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
 msgid "DSP settings"
 msgstr "Ses ayarları"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:838
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:819
 msgid "DVD Root:"
 msgstr "DVD Kök Dizini:"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:239
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:226
 msgid "DVDLowRead - Fatal Error: failed to read from volume"
 msgstr "DVDLowRead - Kritik Hata: Birimden okuma başarısız."
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:333
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:320
 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:163
 msgid "Data Size"
 msgstr "Veri Boyutu"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468
 msgid "Date:"
 msgstr "Tarih:"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:528
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:564
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:518
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:557
 msgid "Datel MaxDrive/Pro files(*.sav)"
 msgstr "Datel MaxDrive/Pro dosyaları (*.sav)"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:242
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:259
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:267
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:281
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:296
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:229
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:246
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:254
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:268
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:283
 msgid "Dead Zone"
 msgstr "Ölü Bölge"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:35
 msgid "Debug"
 msgstr "Hata ayıklama"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:521
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534
 msgid "Debugging"
 msgstr "Hata ayıklama"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:79
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:66
 msgid "Decimal"
 msgstr "Onluk taban"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:890
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:881
 msgid "Decompress ISO..."
 msgstr "Kalıbı genişlet..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:906
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:900
 msgid "Decompress selected ISOs..."
 msgstr "Seçili kalıpları genişlet..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1088
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1224
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1089
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1225
 msgid "Decompressing ISO"
 msgstr "Kalıp genişletiliyor..."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:912
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:903
 msgid "Default"
 msgstr "Varsayılan"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:835
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:816
 msgid "Default ISO:"
 msgstr "Varsayılan kalıp:"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:114
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:107
 msgid "Default font"
 msgstr "Varsayılan yazı tipi"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:32
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:926
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:19
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917
 msgid "Delete"
 msgstr "Sil"
 
@@ -1522,50 +1546,50 @@ msgstr "Sil"
 msgid "Delete Save"
 msgstr "Kaydı sil"
 
-#: Source/Core/VideoCommon/Src/AVIDump.cpp:77
+#: Source/Core/VideoCommon/Src/AVIDump.cpp:64
 #, c-format
 msgid "Delete the existing file '%s'?"
 msgstr "'%s' dosyasını silmek istediğinizden emin misiniz?"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:671
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:683
 msgid "Description"
 msgstr "Açıklama"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:472
 msgid "Detect"
 msgstr "Belirle"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:233
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:328
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:220
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:315
 msgid ""
 "Detected attempt to read more data from the DVD than fit inside the out "
 "buffer. Clamp."
 msgstr ""
 "DVD'nin alabileceği veriden daha fazlasını sığdırma girişimi algılandı."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:127
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:898
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:114
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:889
 msgid "Device"
 msgstr "Sürücü"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:798
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:731
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779
 msgid "Device Settings"
 msgstr "Sürücü Ayarları"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:45
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:49
 msgid "Dial"
 msgstr "Kadran"
 
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:146
+#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:135
 msgid "Direct3D11"
 msgstr "DirectX 10/11"
 
-#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:128
+#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:125
 msgid "Direct3D9"
 msgstr "DirectX 9"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:167
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:155
 msgid ""
 "Directory checksum failed\n"
 " and Directory backup checksum failed"
@@ -1573,16 +1597,20 @@ msgstr ""
 "Konum doğrulama başarısız \n"
 "ve konum yedeği doğrulama da başarısız."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:433
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:443
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485
 msgid "Disable"
 msgstr "İptal et"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:491
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501
+msgid "Disable Destination Alpha"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:409
 msgid "Disable Fog"
 msgstr "Sisi İptal Et"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108
 msgid ""
 "Disable any XFB emulation.\n"
 "Speeds up emulation a lot but causes heavy glitches in many games which rely "
@@ -1596,7 +1624,7 @@ msgstr ""
 "\n"
 "Emin değilseniz, işaretli bırakın."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95
 msgid ""
 "Disable emulation of EFB copies.\n"
 "These are often used for post-processing or render-to-texture effects, so "
@@ -1612,20 +1640,32 @@ msgstr ""
 "\n"
 "Emin değilseniz, işaretsiz bırakın."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:543
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101
+#, fuzzy
+msgid ""
+"Disables emulation of a hardware feature called destination alpha, which is "
+"used in many games for various graphical effects.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+"Çoğu oyunda çeşitli görsel efektler için hedef alpha geçişini atla. \n"
+"\n"
+"Emin değilseniz, işaretsiz bırakın."
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:553
 msgid "Disc"
 msgstr "Disk"
 
-#: Source/Core/DiscIO/Src/DriveBlob.cpp:107
-#: Source/Core/DiscIO/Src/DriveBlob.cpp:126
+#: Source/Core/DiscIO/Src/DriveBlob.cpp:94
+#: Source/Core/DiscIO/Src/DriveBlob.cpp:113
 msgid "Disc Read Error"
 msgstr "Disk Okuma Hatası"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:312
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:320
 msgid "Display"
 msgstr "Görüntü"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104
 msgid ""
 "Display the inputs read by the emulator.\n"
 "\n"
@@ -1635,32 +1675,32 @@ msgstr ""
 "\n"
 "Emin değilseniz, işaretsiz bırakın."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:80
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:67
 msgid "Divide"
 msgstr "Böl"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:987
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:990
 msgid "Do you want to stop the current emulation?"
 msgstr "Emülasyonu durdurmak istiyor musunuz?"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:663
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:644
 msgid "Dolby Pro Logic II decoder"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:864
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:856
 msgid "Dolphin"
 msgstr "Dolphin"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:183
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:188
 #, c-format
 msgid "Dolphin %s Graphics Configuration"
 msgstr "Dolphin %s Görüntü Yapılandırması"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:292
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:298
 msgid "Dolphin &Web Site"
 msgstr "Dolphin &Web Sitesi"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.h:37
+#: Source/Core/DolphinWX/Src/ConfigMain.h:24
 msgid "Dolphin Configuration"
 msgstr "Dolphin Yapılandırması"
 
@@ -1668,16 +1708,16 @@ msgstr "Dolphin Yapılandırması"
 msgid "Dolphin Emulated Wiimote Configuration"
 msgstr "Dolphin Taklit Wiimote Yapılandırması"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:394
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:383
 msgid "Dolphin FIFO"
 msgstr "Dolphin FIFO"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1136
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1153
 msgid "Dolphin GCPad Configuration"
 msgstr "Dolphin GC Kolu Yapılandırması"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:679
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1074
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:685
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1089
 msgid "Dolphin TAS Movies (*.dtm)"
 msgstr "Dolphin TAS Filmleri (*.dtm)"
 
@@ -1685,11 +1725,11 @@ msgstr "Dolphin TAS Filmleri (*.dtm)"
 msgid "Dolphin Wiimote Configuration"
 msgstr "Dolphin Wiimote Yapılandırması"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:293
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:299
 msgid "Dolphin at &Google Code"
 msgstr "&Google Code'da Dolphin"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:364
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:351
 msgid ""
 "Dolphin could not find any GC/Wii ISOs.  Doubleclick here to browse for "
 "files..."
@@ -1697,7 +1737,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:368
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:355
 msgid ""
 "Dolphin is currently set to hide all games.  Doubleclick here to show all "
 "games..."
@@ -1705,50 +1745,59 @@ msgstr ""
 "Dolphin şu anda oyunları gizlemeye ayarlıdır. Buraya çift tıklatarak tüm "
 "oyunları görebilirsiniz."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1159
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1160
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1246
 msgid "Dolphin was unable to complete the requested action."
 msgstr "Dolphin istenen işlemi gerçekleştiremedi."
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:275
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:58
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
+#, fuzzy
+msgid ""
+"Doubles the emulated GPU clock rate. May speed up some games (ON = Fast, OFF "
+"= Compatible)"
+msgstr ""
+"Disk erişimini hızlandırır. Bazı oyunlarda gereklidir. (Açık = Hızlı, Kapalı "
+"= Uyumlu)"
+
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:262
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:45
 msgid "Down"
 msgstr "Aşağı"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:54
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:44
 msgid "Download Codes (WiiRD Database)"
 msgstr "Kodları İndir (WiiRD Veritabanı)"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:297
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:287
 #, c-format
 msgid "Downloaded %lu codes. (added %lu)"
 msgstr "%lu kod indirildi. (%lu eklendi.)"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:31
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:35
 msgid "Drums"
 msgstr "Davullar"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:105
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
 msgid "Dummy"
 msgstr "Kukla"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:661
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:642
 msgid "Dump Audio"
 msgstr "Sesi Dök"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:532
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545
 msgid "Dump EFB Target"
 msgstr "EFB Hedef Dökümü"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546
 msgid "Dump Frames"
 msgstr "Kareleri Dök"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543
 msgid "Dump Textures"
 msgstr "Dokuları Dök"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114
 msgid ""
 "Dump all rendered frames to an AVI file in User/Dump/Frames/\n"
 "\n"
@@ -1759,7 +1808,7 @@ msgstr ""
 "\n"
 "Emin değilseniz, işaretsiz bırakın."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111
 msgid ""
 "Dump decoded game textures to User/Dump/Textures/<game_id>/\n"
 "\n"
@@ -1769,7 +1818,7 @@ msgstr ""
 "\n"
 "Emin değilseniz, işaretsiz bırakın."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113
 msgid ""
 "Dump the contents of EFB copies to User/Dump/Textures/\n"
 "\n"
@@ -1779,21 +1828,21 @@ msgstr ""
 "\n"
 "Emin değilseniz, işaretsiz bırakın."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:474
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292
 msgid "Dutch"
 msgstr "Flemenkçe"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:112
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:113
 msgid "E&xit"
 msgstr "Çıkış (&x)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:441
 msgid "EFB Copies"
 msgstr "EFB Kopyaları"
 
-#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:223
+#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:210
 #, c-format
 msgid ""
 "ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least "
@@ -1805,52 +1854,52 @@ msgstr ""
 "azından %d.%d sürümü olmalıdır. --- Eğer Dolphin'i sürekli güncelliyorsanız, "
 "Windows'un sürücüyü görmesi için yeniden başlatma gerekebilir."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:166
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:160
 msgid "EUROPE"
 msgstr "AVRUPA"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:156
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:143
 msgid "Early Memory Updates"
 msgstr "Erken Hafıza Güncellemeleri"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:447
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:453
 msgid "Edit"
 msgstr "Düzen"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.h:30
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.h:17
 msgid "Edit ActionReplay Code"
 msgstr "Action Replay Kodunu Düzenle"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:285
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:286
 msgid "Edit Config"
 msgstr "Yapılandırmayı Düzenle"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.h:30
+#: Source/Core/DolphinWX/Src/PatchAddEdit.h:17
 msgid "Edit Patch"
 msgstr "Yamayı Düzenle"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:447
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:453
 msgid "Edit current perspective"
 msgstr "Şu anki perspektifi düzenle"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:403
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:425
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:407
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:429
 msgid "Edit..."
 msgstr "Düzenle..."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:44
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:48
 msgid "Effect"
 msgstr "Etki"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:425
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435
 msgid "Embedded Frame Buffer"
 msgstr "Gömülü Çerçeve Tamponu"
 
-#: Source/Core/Core/Src/Core.cpp:201
+#: Source/Core/Core/Src/Core.cpp:190
 msgid "Emu Thread already running"
 msgstr "Emülasyon İşlem Birimi zaten çalışıyor."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110
 msgid ""
 "Emulate XFBs accurately.\n"
 "Slows down emulation a lot and prohibits high-resolution rendering but is "
@@ -1864,7 +1913,7 @@ msgstr ""
 "\n"
 "Emin değilseniz, bunun yerine sanal XFB emülasyonunu seçin."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109
 msgid ""
 "Emulate XFBs using GPU texture objects.\n"
 "Fixes many games which don't work without XFB emulation while not being as "
@@ -1884,7 +1933,7 @@ msgstr ""
 msgid "Emulated Wiimote"
 msgstr "Taklit Wiimote"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346
 msgid "Emulation State: "
 msgstr "Emülasyon Durumu:"
 
@@ -1892,7 +1941,7 @@ msgstr "Emülasyon Durumu:"
 msgid "Enable"
 msgstr "İzin ver"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91
 msgid ""
 "Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's "
 "supported by your GPU.\n"
@@ -1908,72 +1957,71 @@ msgstr ""
 "\n"
 "Emin değilseniz, işaretsiz bırakın."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:111
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:98
 msgid "Enable AR Logging"
 msgstr "AR Geçmişine İzin Ver"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324
 msgid "Enable Block Merging"
 msgstr "Blok Birleşimine İzin Ver"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331
 msgid "Enable Bounding Box Calculation"
 msgstr "Sınırlayıcı Kutu Hesaplama'yı Etkinleştir"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:446
 msgid "Enable Cache"
 msgstr "Ön Belleğe İzin Ver"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:562
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542
 msgid "Enable Cheats"
 msgstr "Hilelere İzin Ver"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310
 msgid "Enable Dual Core"
 msgstr "Çift Çekirdeğe İzin Ver"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
 msgid "Enable Dual Core (speedup)"
 msgstr "Çift Çekirdeğe İzin Ver (hızı artırır)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:550
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:563
 msgid "Enable Hotkeys"
 msgstr "Kısayol Tuşlarına İzin Ver"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311
 msgid "Enable Idle Skipping"
 msgstr "Boşta Atlamaya İzin Ver"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541
 msgid "Enable Idle Skipping (speedup)"
 msgstr "Boşta Atlamaya İzin Ver (hızı artırır)"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312
 msgid "Enable MMU"
 msgstr "MMU'ya İzin Ver"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:554
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:567
 msgid "Enable Progressive Scan"
 msgstr "Progresif Taramaya İzin Ver"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757
 msgid "Enable Screen Saver"
 msgstr "Ekran Koruyucusuna İzin Ver"
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:75
-#, fuzzy
 msgid "Enable Speaker Data"
-msgstr "Sayfalara izin ver"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
 msgid "Enable WideScreen"
 msgstr "Geniş Ekrana İzin Ver"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:516
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529
 msgid "Enable Wireframe"
 msgstr "Geniş Çerçeveye İzin Ver"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85
 msgid ""
 "Enable anisotropic filtering.\n"
 "Enhances visual quality of textures that are at oblique viewing angles.\n"
@@ -1987,7 +2035,7 @@ msgstr ""
 "\n"
 "Emin değilseniz, 1x seçin."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323
 msgid ""
 "Enable fast disc access.  Needed for a few games. (ON = Fast, OFF = "
 "Compatible)"
@@ -1999,7 +2047,7 @@ msgstr ""
 msgid "Enable pages"
 msgstr "Sayfalara izin ver"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76
 msgid ""
 "Enable this if you want the whole screen to be used for rendering.\n"
 "If this is disabled, a render window will be created instead.\n"
@@ -2013,7 +2061,7 @@ msgstr ""
 "\n"
 "Emin değilseniz, işaretsiz bırakın."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80
 msgid ""
 "Enable this if you want to use the main Dolphin window for rendering rather "
 "than a separate render window.\n"
@@ -2025,7 +2073,7 @@ msgstr ""
 "\n"
 "Emin değilseniz, işaretsiz bırakın."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:335
 msgid ""
 "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for "
 "ANY other game."
@@ -2033,28 +2081,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:337
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340
 msgid "Enables Custom Projection Hack"
 msgstr "Özel Gösterim Hilesini Etkinleştirir"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:528
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508
 msgid ""
 "Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on "
 "OSX."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510
 msgid ""
 "Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:512
 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
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81
 msgid ""
 "Enables progressive scan if supported by the emulated software.\n"
 "Most games don't care about this.\n"
@@ -2066,7 +2114,7 @@ msgstr ""
 "\n"
 "Emin değilseniz, işaretsiz bırakın."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313
 msgid ""
 "Enables the Memory Management Unit, needed for some games. (ON = Compatible, "
 "OFF = Fast)"
@@ -2074,7 +2122,7 @@ msgstr ""
 "Hafıza Yönetim Ünitesini etkinleştirir. Bazı oyunlarda gereklidir. (Açık = "
 "Uyumlu, Kapalı = Hızlı)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116
 msgid ""
 "Encode frame dumps using the FFV1 codec.\n"
 "\n"
@@ -2084,50 +2132,50 @@ msgstr ""
 "\n"
 "Emin değilseniz, işaretsiz bırakın."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:40
 msgid "End"
 msgstr "Son"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:469
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:280
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:260
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293
 msgid "English"
 msgstr "İngilizce"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:329
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:407
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:337
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:417
 msgid "Enhancements"
 msgstr "Geliştirmeler"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:607
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:640
 msgid "Enter a name for the new perspective:"
 msgstr "Yeni perspektif için isim yazın:"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:191
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:178
 #, c-format
 msgid "Entry %d/%d"
 msgstr "Giriş %d/%d"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:85
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:72
 #, c-format
 msgid "Entry 1/%d"
 msgstr "Giriş 1/%d"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:204
 msgid "Equal"
 msgstr "Eşit"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:45
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:156
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1242
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:32
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:150
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226
 msgid "Error"
 msgstr "Hata"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:381
+#: Source/Core/DolphinWX/Src/Main.cpp:409
 msgid "Error loading selected language. Falling back to system default."
 msgstr "Seçili dili yüklerken hata. Sistem varsayılanlarına geri dönülüyor."
 
-#: Source/Core/Common/Src/ChunkFile.h:226
+#: Source/Core/Common/Src/ChunkFile.h:221
 #, c-format
 msgid ""
 "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). "
@@ -2136,7 +2184,7 @@ msgstr ""
 "Hata: \"%s\" 'dan sonra, %d (0x%X) bulundu ( %d (0x%X) yerine). Durum kaydı "
 "yüklemesinden vazgeçiliyor..."
 
-#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:342
+#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:329
 #, c-format
 msgid ""
 "Error: Trying to access %s fonts but they are not loaded. Games may not show "
@@ -2145,38 +2193,38 @@ msgstr ""
 "Hata: %s yazı tipleri düzgün yüklenemedi. Oyunlardaki yazılar düzgün "
 "görüntülenemeyebilir, veya oyunlar çakılabilir."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:30
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:17
 msgid "Escape"
 msgstr "Esc"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:26
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:30
 msgid "Euphoria"
 msgstr "Euphoria"
 
 #: Source/Core/Core/Src/ArmMemTools.cpp:78
-#: Source/Core/Core/Src/x64MemTools.cpp:217
+#: Source/Core/Core/Src/x64MemTools.cpp:206
 #, c-format
 msgid "Exception handler - access below memory space. %08llx%08llx"
 msgstr "Özel durum işleyicisi - bellek alanı altında erişim. %08llx%08llx"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:61
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
 msgid "Execute"
 msgstr "Yürüt"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:459
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:446
 msgid "Export Failed"
 msgstr "Verme başarısız."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:639
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:649
 msgid "Export File"
 msgstr "Dosya Ver"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:177
 msgid "Export Recording"
 msgstr "Çekimi Ver"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:345
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:351
 msgid "Export Recording..."
 msgstr "Çekimi Ver..."
 
@@ -2184,7 +2232,7 @@ msgstr "Çekimi Ver..."
 msgid "Export Save"
 msgstr "Kaydı Ver"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:874
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:865
 msgid "Export Wii save (Experimental)"
 msgstr "Wii Kayıtlı Oyununu Ver (Deneme Amaçlı)"
 
@@ -2192,100 +2240,100 @@ msgstr "Wii Kayıtlı Oyununu Ver (Deneme Amaçlı)"
 msgid "Export all saves"
 msgstr "Tüm Kayıtları Ver"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:80
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:72
 msgid "Export failed, try again?"
 msgstr "Verme başarısız, tekrar dene?"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:559
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:552
 msgid "Export save as..."
 msgstr "Kaydı farklı ver..."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:297
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:284
 msgid "Extension"
 msgstr "Uzantı"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483
 msgid "External Frame Buffer"
 msgstr "Harici Çerçeve Tamponu"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:61
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:48
 msgid "Extra Parameter"
 msgstr "İlave Parametre"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:62
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:49
 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:614
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:624
 msgid "Extract All Files..."
 msgstr "Tüm Dosyaları Genişlet..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:616
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:626
 msgid "Extract Apploader..."
 msgstr "Apploader'i Genişlet..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:617
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627
 msgid "Extract DOL..."
 msgstr "DOL'ü Genişlet..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:610
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:620
 msgid "Extract Directory..."
 msgstr "Konumu Genişlet..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:612
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:622
 msgid "Extract File..."
 msgstr "Dosyayı Genişlet..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:608
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:618
 msgid "Extract Partition..."
 msgstr "Bölüntüyü Genişlet..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:724
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:738
 #, c-format
 msgid "Extracting %s"
 msgstr "%s Genişletiliyor"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:707
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:721
 msgid "Extracting All Files"
 msgstr "Tüm Dosyalar Genişletiliyor"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:707
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:721
 msgid "Extracting Directory"
 msgstr "Konum Genişletiliyor"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:710
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:724
 msgid "Extracting..."
 msgstr "Genişletiliyor..."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:892
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:893
 msgid "FIFO Byte"
 msgstr "FIFO Bayt'ı"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:45
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:32
 msgid "FIFO Player"
 msgstr "FIFO Oynatıcısı"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:169
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:163
 msgid "FRANCE"
 msgstr "FRANSA"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472
 msgid "FST Size:"
 msgstr "FST Boyutu:"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:77
+#: Source/Core/Core/Src/NetPlayClient.cpp:81
 msgid "Failed to Connect!"
 msgstr "Bağlantı başarısız!"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:225
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:228
 msgid "Failed to Listen!!"
 msgstr "Dinleme başarısız!"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:307
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:300
 msgid "Failed to download codes."
 msgstr "Kod indirme başarısız."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:827
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:843
 #, c-format
 msgid "Failed to extract to %s!"
 msgstr "%s 'ye genişletme başarısız!"
@@ -2311,26 +2359,30 @@ msgstr ""
 "ROM dökümü gerektirmeyen DSP HLE'yi kullanabilirsiniz..\n"
 "(Bunu yapılandırma diyalogundaki \"Audio\" sekmesinden yapabilirsiniz.)"
 
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:116
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:139
+#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:108
+#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:131
 msgid "Failed to load bthprops.cpl"
 msgstr "bthprops.cpl yüklenemedi."
 
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:100
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:109
+#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:90
+#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:101
 msgid "Failed to load hid.dll"
 msgstr "hid.dll yükleme başarısız."
 
-#: Source/Core/Core/Src/Movie.cpp:792
+#: Source/Core/Core/Src/Movie.cpp:783
 #, c-format
 msgid "Failed to read %s"
 msgstr "%s okunamadı"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:151
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:144
 msgid "Failed to read banner.bin"
 msgstr "banner.bin okunamadı."
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:223
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:178
+msgid "Failed to read bk header"
+msgstr ""
+
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:211
 #, c-format
 msgid ""
 "Failed to read block %d of the save data\n"
@@ -2341,7 +2393,7 @@ msgstr ""
 "Hafıza kartında sorun olabilir\n"
 "Dosya Konumu: %llx"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:148
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:136
 msgid ""
 "Failed to read block allocation table backup correctly\n"
 "(0x8000-0x9FFF)"
@@ -2349,7 +2401,7 @@ msgstr ""
 "Blok Ayırma Tablosu yedeği doğru okunamadı.\n"
 "(0x8000-0x9FFF)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:142
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:130
 msgid ""
 "Failed to read block allocation table correctly\n"
 "(0x6000-0x7FFF)"
@@ -2357,12 +2409,17 @@ msgstr ""
 "Blok Ayırma Tablosu doğru okunamadı.\n"
 "(0x6000-0x7FFF)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:286
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:279
 #, c-format
 msgid "Failed to read data from file %d"
 msgstr "%d dosyasından veri okunamadı."
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:136
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:367
+#, c-format
+msgid "Failed to read data from file: %s"
+msgstr ""
+
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:124
 msgid ""
 "Failed to read directory backup correctly\n"
 "(0x4000-0x5FFF)"
@@ -2370,7 +2427,7 @@ msgstr ""
 "Konum yedeği doğru okunamadı.\n"
 "(0x4000-0x5FFF)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:130
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:118
 msgid ""
 "Failed to read directory correctly\n"
 "(0x2000-0x3FFF)"
@@ -2378,7 +2435,11 @@ msgstr ""
 "Konum doğru okunamadı\n"
 "(0x2000-0x3FFF)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:119
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:90
+msgid "Failed to read header"
+msgstr ""
+
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:107
 msgid ""
 "Failed to read header correctly\n"
 "(0x0000-0x1FFF)"
@@ -2386,41 +2447,41 @@ msgstr ""
 "Başlık doğru okunamadı\n"
 "(0x0000-0x1FFF)"
 
-#: Source/Core/DiscIO/Src/VolumeGC.cpp:61
+#: Source/Core/DiscIO/Src/VolumeGC.cpp:48
 msgid "Failed to read unique ID from disc image"
 msgstr "Disk kalıbının Unique ID'si okunamadı."
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:84
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:71
 msgid "Failed to write BT.DINF to SYSCONF"
 msgstr "BT.DINF 'den SYSCONF 'a yazma başarısız."
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:228
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:221
 msgid "Failed to write bkhdr"
 msgstr "bkhdr yazılamadı."
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:164
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:157
 #, c-format
 msgid "Failed to write header for %s"
 msgstr "%s için başlık yazılamadı."
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:258
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:251
 #, c-format
 msgid "Failed to write header for file %d"
 msgstr "%d dosyası için başlık yazılamadı."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294
 msgid "Farsi"
 msgstr "Farsça"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477
 msgid "Fast"
 msgstr "Hızlı"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315
 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:1046
+#: Source/Core/Core/Src/Movie.cpp:1037
 #, c-format
 msgid ""
 "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s"
@@ -2428,23 +2489,23 @@ msgstr ""
 "Kritik karışıklık. Oynatma durduruluyor. (PlayWiimote'da hata: %u != %u, "
 "bayt %u.)%s"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:199
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:202
 msgid "Fifo Player"
 msgstr "Fifo Oynatıcısı"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:99
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:86
 msgid "File Info"
 msgstr "Dosya Bilgisi"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:304
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:295
 msgid "File contained no codes."
 msgstr "Dosya kod içermemektedir."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:413
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:400
 msgid "File converted to .gci"
 msgstr "Dosya .gci 'ye dönüştürüldü."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:428
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:415
 msgid ""
 "File could not be opened\n"
 "or does not have a valid extension"
@@ -2452,7 +2513,7 @@ msgstr ""
 "Dosya açılamadı\n"
 "veya geçersiz bir uzantıya sahip."
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:84
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:72
 #, c-format
 msgid ""
 "File has the extension \"%s\"\n"
@@ -2461,36 +2522,36 @@ msgstr ""
 "Dosya  \"%s\" uzantısına sahip \n"
 "doğru uzantılar .raw ve .gcp 'dir."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:425
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:412
 msgid "File is not recognized as a memcard"
 msgstr "Dosya bir hafıza kartı olarak tanınamadı."
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:294
+#: Source/Core/DiscIO/Src/CompressedBlob.cpp:281
 msgid "File not compressed"
 msgstr "Dosya sıkıştırılmadı."
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:127
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:109
 #, c-format
 msgid "FileIO: Unknown open mode : 0x%02x"
 msgstr "FileIO: Bilinmeyen açma modu : 0x%02x"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:531
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:541
 msgid "Filesystem"
 msgstr "Dosya sistemi"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1100
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1126
 msgid "Filetype 'ini' is unknown! Will not open!"
 msgstr "Dosya türü 'ini' bilinmiyor! Açılmayacaktır!"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:265
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:252
 msgid "Find next"
 msgstr "Sonrakini bul"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:266
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:253
 msgid "Find previous"
 msgstr "Öncekini bul"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:632
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626
 msgid "First Block"
 msgstr "İlk Blok"
 
@@ -2498,23 +2559,23 @@ msgstr "İlk Blok"
 msgid "Fix Checksums"
 msgstr "Sağlamayı Düzelt"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:275
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283
 msgid "Force 16:9"
 msgstr "16:9 'a zorla"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:275
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283
 msgid "Force 4:3"
 msgstr "4:3 'e zorla"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:568
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548
 msgid "Force Console as NTSC-J"
 msgstr "Konsolu NTSC-J Olmaya Zorla"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406
 msgid "Force Texture Filtering"
 msgstr "Doku Filtrelemesine Zorla"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90
 msgid ""
 "Force texture filtering even if the emulated game explicitly disabled it.\n"
 "Improves texture quality slightly but causes glitches in some games.\n"
@@ -2526,7 +2587,7 @@ msgstr ""
 "\n"
 "Emin değilseniz, işaretsiz bırakın."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83
 msgid ""
 "Force the game to output graphics for widescreen resolutions.\n"
 "Causes graphical glitches is some games.\n"
@@ -2538,7 +2599,7 @@ msgstr ""
 "\n"
 "Emin değilseniz, işaretsiz bırakın."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488
 msgid ""
 "Forces NTSC-J mode for using the Japanese ROM font.\n"
 "Left unchecked, dolphin defaults to NTSC-U and automatically enables this "
@@ -2548,7 +2609,7 @@ msgstr ""
 "İşaretsiz bırakırsanız, Dolphin varsayılan olarak NTSC-U'yu seçecektir ve "
 "Japon oyunlarını oynarken bu ayarı etkinleştirecektir."
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:74
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:62
 msgid ""
 "Format as ascii (NTSC\\PAL)?\n"
 "Choose no for sjis (NTSC-J)"
@@ -2556,148 +2617,147 @@ msgstr ""
 "ASCII olarak biçimlendir (NTSC\\PAL)?\n"
 "SJJS (NTSC-J) için Hayır seçin."
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:278
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:265
 msgid "Forward"
 msgstr "İleri"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504
 #, c-format
 msgid "Found %d results for '"
 msgstr "Bunun için %d sonuçlarını bul: '"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:857
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:925
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:858
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:926
 msgid "Frame"
 msgstr "Çerçeve"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:867
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:868
 msgid "Frame "
 msgstr "Çerçeve"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:185
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:173
 msgid "Frame Advance"
 msgstr "Gelişmiş Çerçeveleme"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:536
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549
 msgid "Frame Dumps use FFV1"
 msgstr "Çerçeve dökümünde FFV1 kullan"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:227
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:214
 msgid "Frame Info"
 msgstr "Çerçeve Bilgisi"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:116
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:103
 msgid "Frame Range"
 msgstr "Çerçeve Aralığı"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:138
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:139
 msgid "Frame S&kipping"
 msgstr "Çerçeve Atlama(&K)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:572
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552
 msgid "Framelimit:"
 msgstr "Çerçeve Sınırı:"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:204
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:191
 msgid "Frames To Record"
 msgstr "Çekilecek Çerçeveler"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547
 msgid "Free Look"
 msgstr "Serbest Bakış"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
 msgid "French"
 msgstr "Fransızca"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:38
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:42
 msgid "Frets"
 msgstr "Perdeler"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:118
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:137
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:105
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:124
 msgid "From"
 msgstr "Buradan"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:426
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:432
 msgid "FullScr"
 msgstr "Tam Ekran"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:256
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263
 msgid "Fullscreen resolution:"
 msgstr "Tam Ekran Çözünürlüğü:"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:534
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524
 msgid "GCI File(*.gci)"
 msgstr "GCI Dosyası (*.gci)"
 
-#: Source/Core/DolphinWX/Src/GCMicDlg.h:44
+#: Source/Core/DolphinWX/Src/GCMicDlg.h:31
 msgid "GCMic Configuration"
 msgstr "GCMic Yapılandırması"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:432
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
 msgid "GCPad"
 msgstr "GC Kolu"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:659
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:658
 msgid "GX_CMD_INVL_VC"
 msgstr "GX_CMD_INVL_VC"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:448
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:452
 msgid "Game ID:"
 msgstr "Oyun ID'si:"
 
-#: Source/Core/Core/Src/NetPlay.cpp:229
+#: Source/Core/Core/Src/NetPlay.cpp:216
 msgid "Game is already running!"
 msgstr "Oyun zaten çalışıyor!"
 
-#: Source/Core/Core/Src/NetPlay.cpp:259
+#: Source/Core/Core/Src/NetPlay.cpp:246
 msgid "Game isn't running!"
 msgstr "Oyun çalışmıyor!"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:389
-#, fuzzy
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:393
 msgid "Game not found!"
-msgstr "Oyun bulunamadı!!"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:385
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:389
 msgid "Game-Specific Settings"
 msgstr "Oyuna Özel Ayarlar"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:293
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:294
 msgid "GameConfig"
 msgstr "Oyun Yapılandırması"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:525
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:515
 msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534
 msgid "Gamecube"
 msgstr "GameCube"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:178
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:181
 msgid "Gamecube &Pad Settings"
 msgstr "Gamecube Kolu Ayarları (&P)"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:218
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1069
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:205
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1052
 msgid "Gamecube Memory Cards (*.raw,*.gcp)"
 msgstr "GameCube Hafıza Kartları (*.raw,*.gcp)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:432
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
 msgid "Gamecube Pad settings"
 msgstr "GameCube Kolu Ayarları"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:117
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302
 msgid "Gecko Codes"
 msgstr "Gecko Kodları"
 
-#: Source/Core/Core/Src/GeckoCode.cpp:222
+#: Source/Core/Core/Src/GeckoCode.cpp:214
 #, c-format
 msgid ""
 "GeckoCode failed to run (CT%i CST%i) (%s)\n"
@@ -2710,10 +2770,10 @@ msgstr ""
 "bin dosyası ekleyerek Dolphin'i yeniden başlatıp, yerel kod işleyicini "
 "kullanmayı deneyebilirsiniz.)"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:172
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:197
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:160
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:160
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:202
 msgid "General"
 msgstr "Genel"
 
@@ -2721,30 +2781,30 @@ msgstr "Genel"
 msgid "General Settings"
 msgstr "Genel Ayarlar"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:470
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:281
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:316
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:261
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
 msgid "German"
 msgstr "Almanca"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:449
+#: Source/Core/Core/Src/ActionReplay.cpp:439
 #, 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:430
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:436
 msgid "Graphics"
 msgstr "Görüntü"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:430
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:436
 msgid "Graphics settings"
 msgstr "Görüntü Ayarları"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:205
 msgid "Greater Than"
 msgstr "Daha Büyük"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87
 msgid ""
 "Greatly increases quality of textures generated using render to texture "
 "effects.\n"
@@ -2760,51 +2820,67 @@ msgstr ""
 "\n"
 "Emin değilseniz, işaretli bırakın."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:317
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
 msgid "Greek"
 msgstr "Yunanca"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:22
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Green"
 msgstr "Yeşil"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:24
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Green Left"
 msgstr "Yeşil Sol"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:25
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Green Right"
 msgstr "Yeşil Sağ"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:35
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:39
 msgid "Guitar"
 msgstr "Gitar"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1259
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1250
 msgid "HCI_CMD_INQUIRY is called, please report!"
 msgstr "HCI_CMD_INQUIRY çağrıldı, lütfen bildirin!"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:421
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504
+msgid "Hacked Buffer Upload"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431
 msgid "Hacks"
 msgstr "Hack'ler"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:158
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:146
 msgid "Header checksum failed"
 msgstr "Başlık sağlama hatası"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:318
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298
 msgid "Hebrew"
 msgstr "İbranice"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:313
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:300
 msgid "Height"
 msgstr "Yükseklik"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:64
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:51
 msgid "Help"
 msgstr "Yardım"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:209
+#: Source/Core/DolphinWX/Src/Main.cpp:229
+msgid ""
+"Hi,\n"
+"\n"
+"Dolphin requires Mac OS X 10.7 or greater.\n"
+"Unfortunately you're running an old version of OS X.\n"
+"The last Dolphin version to support OS X 10.6 is Dolphin 3.5\n"
+"Please upgrade to 10.7 or greater to use the newest Dolphin version.\n"
+"\n"
+"Sayonara!\n"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/Main.cpp:220
 msgid ""
 "Hi,\n"
 "\n"
@@ -2820,15 +2896,15 @@ msgstr ""
 "\n"
 "Sayanora!\n"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:309
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:296
 msgid "Hide"
 msgstr "Gizle"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:307
 msgid "Hide Mouse Cursor"
 msgstr "Fare İşaretçisini Gizle"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79
 msgid ""
 "Hides the mouse cursor if it's on top of the emulation window.\n"
 "\n"
@@ -2838,26 +2914,26 @@ msgstr ""
 "\n"
 "Emin değilseniz, işaretli bırakın."
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:54
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41
 msgid "Home"
 msgstr "Home"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:85
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:138
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:76
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:141
 msgid "Host"
 msgstr "Barındırma"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.h:44
+#: Source/Core/DolphinWX/Src/HotkeyDlg.h:31
 msgid "Hotkey Configuration"
 msgstr "Kısayol Tuşu Yapılandırması"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:272
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:272
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:594
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:260
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:260
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574
 msgid "Hotkeys"
 msgstr "Tuşlar"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:319
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299
 msgid "Hungarian"
 msgstr "Macarca"
 
@@ -2865,33 +2941,29 @@ msgstr "Macarca"
 msgid "Hybrid Wiimote"
 msgstr "Karışık Wiimote"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:532
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:519
 #, 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:786
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:773
 #, c-format
 msgid ""
-"IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available "
-"in your nand dump\n"
+"IOCTL_ES_LAUNCH: Game tried to reload an IOS or a title that is not "
+"available in your NAND dump\n"
 "TitleID %016llx.\n"
-" Dolphin will likely hang now"
+" Dolphin will likely hang now."
 msgstr ""
-"IOCTL_ES_LAUNCH: Oyun ios'u veya başlığı yeniden yüklemeyi denedi ve bu "
-"sizin nand dökümünüze uyumlu değil.\n"
-"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:313
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:300
 msgid "IOCTL_ES_READCONTENT - bad destination"
 msgstr "IOCTL_ES_READCONTENT - kötü durak"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729
 msgid "IPL Settings"
 msgstr "IPL Ayarları"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269
 msgid "IR"
 msgstr "Kızılötesi"
 
@@ -2903,23 +2975,23 @@ msgstr "Kızılötesi İşaretleyici"
 msgid "IR Sensitivity:"
 msgstr "Kızılötesi Hassasiyeti:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:502
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:512
 msgid "ISO Details"
 msgstr "Kalıp Ayrıntıları"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:830
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:811
 msgid "ISO Directories"
 msgstr "Kalıp Konumları"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:172
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:166
 msgid "ITALY"
 msgstr "İTALYA"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:630
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:624
 msgid "Icon"
 msgstr "Simge"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332
 msgid ""
 "If checked, the bounding box registers will be updated. Used by the Paper "
 "Mario games."
@@ -2927,28 +2999,11 @@ 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:318
-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:505
-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 ""
-"Eğer çerçeve sınırını oyun hızından yüksek seçerseniz (NTSC:60, PAL:50), DSP "
-"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:428
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438
 msgid "Ignore Format Changes"
 msgstr "Birim değişimini yoksay"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94
 msgid ""
 "Ignore any changes to the EFB format.\n"
 "Improves performance in many games without any negative effect. Causes "
@@ -2962,7 +3017,7 @@ msgstr ""
 "\n"
 "Emin değilseniz, işaretli bırakın."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93
 msgid ""
 "Ignore any requests of the CPU to read from or write to the EFB.\n"
 "Improves performance in some games, but might disable some gameplay-related "
@@ -2980,11 +3035,11 @@ msgstr ""
 msgid "Import Save"
 msgstr "Kayıt Al"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:59
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:48
 msgid "Import failed, try again?"
 msgstr "Alma başarısız,tekrar dene?"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:454
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:441
 msgid ""
 "Imported file has gsc extension\n"
 "but does not have a correct header"
@@ -2992,11 +3047,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:442
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:429
 msgid "Imported file has invalid length"
 msgstr "Alınan dosyanın uzunluğu hatalı."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:451
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:438
 msgid ""
 "Imported file has sav extension\n"
 "but does not have a correct header"
@@ -3004,19 +3059,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:95
-msgid ""
-"Improves performance but causes glitches in most games which rely on proper "
-"fog emulation.\n"
-"\n"
-"If unsure, leave this unchecked."
-msgstr ""
-"Performansı artırır ancak sis emülasyonu gereken bazı oyunlarda hatalara "
-"neden olabilir. \n"
-"\n"
-"Emin değilseniz, işaretsiz bırakır."
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350
 msgid "In Game"
 msgstr "Oyun İçi"
 
@@ -3024,67 +3067,67 @@ msgstr "Oyun İçi"
 msgid "In-Game"
 msgstr "Oyun-İçi"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:34
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305
 msgid "Info"
 msgstr "Bilgi"
 
-#: Source/Core/Common/Src/MsgHandler.cpp:65
+#: Source/Core/Common/Src/MsgHandler.cpp:51
 msgid "Information"
 msgstr "Bilgilendirme"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:481
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:468
 msgid "Input"
 msgstr "Giriş"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:63
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:50
 msgid "Insert"
 msgstr "Ekle"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:176
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:166
 msgid "Insert Encrypted or Decrypted code here..."
 msgstr "Şifreli veya şifresiz kodu buraya ekleyin..."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:763
 msgid "Insert SD Card"
 msgstr "SD Kart Ekle"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:34
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:21
 msgid "Insert name here.."
 msgstr "Adı buraya yazın..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:196
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:199
 msgid "Install WAD"
 msgstr "WAD Kur"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:895
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:888
 msgid "Install to Wii Menu"
 msgstr "Wii Menüsüne kur"
 
-#: Source/Core/Core/Src/x64MemTools.cpp:252
+#: Source/Core/Core/Src/x64MemTools.cpp:242
 msgid ""
 "InstallExceptionHandler called, but this platform does not yet support it."
 msgstr ""
 "Kurulum Özel Durum İşleyici çağrıldı, ama bu platform henüz bunu "
 "desteklemiyor."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1297
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
 msgid "Installing WAD..."
 msgstr "WAD kuruluyor..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:885
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:901
 msgid "Integrity Check Error"
 msgstr "Düzgünlük Denetleme Hatası"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:891
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:907
 msgid "Integrity check completed"
 msgstr "Düzgünlük denetlemesi tamamlandı"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:890
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:906
 msgid "Integrity check completed. No errors have been found."
 msgstr "Düzgünlük denetlemesi tamamlandı. Hata bulunmadı."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:882
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:898
 #, c-format
 msgid ""
 "Integrity check for partition %d failed. Your dump is most likely corrupted "
@@ -3093,19 +3136,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:552
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532
 msgid "Interface"
 msgstr "Arabirim"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:646
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627
 msgid "Interface Settings"
 msgstr "Arabirim Ayarları"
 
-#: Source/Core/Core/Src/State.cpp:240
+#: Source/Core/Core/Src/State.cpp:228
 msgid "Internal LZO Error - compression failed"
 msgstr "İç LZO Hatası - Sıkıştırma başarısız."
 
-#: Source/Core/Core/Src/State.cpp:348
+#: Source/Core/Core/Src/State.cpp:336
 #, c-format
 msgid ""
 "Internal LZO Error - decompression failed (%d) (%li, %li) \n"
@@ -3114,41 +3157,45 @@ msgstr ""
 "İç LZO Hatası - Genişletme başarısız (%d) (%li, %li) \n"
 "Durumu tekrar yüklemeyi deneyin."
 
-#: Source/Core/Core/Src/State.cpp:485
+#: Source/Core/Core/Src/State.cpp:473
 msgid "Internal LZO Error - lzo_init() failed"
 msgstr "İç LZO Hatası - lzo_init() başarısız."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:344
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:352
 msgid "Internal Resolution:"
 msgstr "İç Çözünürlük:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:42
+msgid "Interpreter (VERY slow)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349
 msgid "Intro"
 msgstr "İntro"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:194
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:187
 #, c-format
 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:600
 msgid "Invalid Value!"
 msgstr "Hatalı Değer!"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:462
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:449
 msgid "Invalid bat.map or dir entry"
 msgstr "Hatalı bat.map veya konum girişi"
 
-#: Source/Core/Core/Src/CoreTiming.cpp:548
+#: Source/Core/Core/Src/CoreTiming.cpp:553
 #, c-format
 msgid "Invalid event type %i"
 msgstr "Hatalı olay türü: %i"
 
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:326
+#: Source/Core/Core/Src/HW/DVDInterface.cpp:309
 msgid "Invalid file"
 msgstr "Hatalı dosya"
 
-#: Source/Core/DiscIO/Src/BannerLoaderGC.cpp:41
+#: Source/Core/DiscIO/Src/BannerLoaderGC.cpp:28
 #, c-format
 msgid ""
 "Invalid opening.bnr found in gcm:\n"
@@ -3159,46 +3206,54 @@ msgstr ""
 "%s\n"
 "Oyunu yeniden dökmeniz gerekebilir."
 
-#: Source/Core/Core/Src/Movie.cpp:735
+#: Source/Core/Core/Src/Movie.cpp:726
 msgid "Invalid recording file"
 msgstr "Hatalı çekim dosyası"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:473
+#: 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:456
+#: 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:444
+#: 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:513
+#: Source/Core/Core/Src/Core.cpp:511
 msgid "Invalid state"
 msgstr "Hatalı durum"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:473
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:320
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300
 msgid "Italian"
 msgstr "İtalyanca"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:183
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:177
 msgid "JAPAN"
 msgstr "JAPONYA"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:321
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:46
+msgid "JIT Recompiler (recommended)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:47
+msgid "JITIL experimental recompiler"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:279
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
 msgid "Japanese"
 msgstr "Japonca"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:188
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:182
 msgid "KOREA"
 msgstr "KORE"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78
 msgid ""
 "Keep the game window on top of all other windows.\n"
 "\n"
@@ -3208,62 +3263,62 @@ msgstr ""
 "\n"
 "Emin değilseniz, işaretsiz bırakın."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:298
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:306
 msgid "Keep window on top"
 msgstr "Pencereyi üstte tut"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:241
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:241
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:229
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:229
 msgid "Key"
 msgstr "Tuş"
 
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282
 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:322
 msgid "Korean"
 msgstr "Korece"
 
 #. i18n:  Left
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:57
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:44
 msgid "L"
 msgstr "L"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:39
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:26
 msgid "L Button"
 msgstr "L Düğmesi"
 
 #. i18n:  Left-Analog
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:61
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:48
 msgid "L-Analog"
 msgstr "L Analog"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:585
 msgid "Language:"
 msgstr "Dil:"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:152
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:153
 msgid "Last Overwritten State"
 msgstr "Son Üzerine Yazılan Durum"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:159
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:161
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:160
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:162
 msgid "Last Saved State"
 msgstr "Son Kayıtlı Durum"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:696
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:677
 msgid "Latency:"
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:276
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:55
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:263
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:42
 msgid "Left"
 msgstr "Sol"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:60
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:64
 msgid "Left Stick"
 msgstr "Sol Çubuk"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:257
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:257
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:245
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:245
 msgid ""
 "Left click to detect hotkeys.\n"
 "Enter space to clear."
@@ -3271,7 +3326,7 @@ msgstr ""
 "Tuş belirlemek için sol tıklatın. \n"
 "Temizlemek için space'ye basın."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:689
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:678
 msgid ""
 "Left-click to detect input.\n"
 "Middle-click to clear.\n"
@@ -3281,7 +3336,7 @@ msgstr ""
 "temizlemek için orta, \n"
 "daha çok seçenek için sağ tıklatın."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:694
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:683
 msgid ""
 "Left/Right-click for more options.\n"
 "Middle-click to clear."
@@ -3289,76 +3344,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:206
 msgid "Less Than"
 msgstr "Daha Az"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:565
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545
 msgid "Limit by FPS"
 msgstr "FPS Sınırlaması"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:924
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:915
 msgid "Load"
 msgstr "Yükle"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544
 msgid "Load Custom Textures"
 msgstr "Özel Dokuları Yükle"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
 msgid "Load State Slot 1"
 msgstr "Durumu Yükle : 1"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189
 msgid "Load State Slot 2"
 msgstr "Durumu Yükle : 2"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:190
 msgid "Load State Slot 3"
 msgstr "Durumu Yükle : 3"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:203
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:191
 msgid "Load State Slot 4"
 msgstr "Durumu Yükle : 4"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192
 msgid "Load State Slot 5"
 msgstr "Durumu Yükle : 5"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193
 msgid "Load State Slot 6"
 msgstr "Durumu Yükle : 6"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:194
 msgid "Load State Slot 7"
 msgstr "Durumu Yükle : 7"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:195
 msgid "Load State Slot 8"
 msgstr "Durumu Yükle : 8"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:155
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:156
 msgid "Load State..."
 msgstr "Durumu Yükle..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1332
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1359
 msgid "Load Wii System Menu"
 msgstr "Wii Sistem Menüsünü Yükle"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1327
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1354
 #, 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:107
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112
 msgid ""
 "Load custom textures from User/Load/Textures/<game_id>/\n"
 "\n"
@@ -3368,7 +3423,7 @@ msgstr ""
 "\n"
 "Emin değilseniz, işaretsiz bırakın."
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:50
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:37
 msgid "Load preset values from hack patterns available."
 msgstr "Bu oyun için kullanılabilir önayar varsa buradan seçiniz."
 
@@ -3376,23 +3431,23 @@ msgstr "Bu oyun için kullanılabilir önayar varsa buradan seçiniz."
 msgid "Local"
 msgstr "Yerel"
 
-#: Source/Core/DolphinWX/Src/LogWindow.h:51
+#: Source/Core/DolphinWX/Src/LogWindow.h:38
 msgid "Log"
 msgstr "Geçmiş"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:26
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:13
 msgid "Log Configuration"
 msgstr "Geçmiş Yapılandırması"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:296
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304
 msgid "Log FPS to file"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:96
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83
 msgid "Log Types"
 msgstr "Geçmiş Türü"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103
 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"
@@ -3400,24 +3455,24 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:81
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:68
 msgid "Logger Outputs"
 msgstr "Geçmiş Çıkışı"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132
-#: Source/Core/DolphinWX/Src/Frame.cpp:328
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:119
+#: Source/Core/DolphinWX/Src/Frame.cpp:314
 msgid "Logging"
 msgstr "Geçmiş"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:255
+#: Source/Core/Core/Src/NetPlayClient.cpp:259
 msgid "Lost connection to server!"
 msgstr "Sunucu bağlantısı kayboldu!"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:42
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:29
 msgid "M Button"
 msgstr "M Düğmesi"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:119
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:112
 #, c-format
 msgid ""
 "MD5 mismatch\n"
@@ -3426,51 +3481,60 @@ msgstr ""
 "MD5 eşleşmiyor\n"
 " %016llx%016llx != %016llx%016llx"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314
 msgid "MMU Speed Hack"
 msgstr "MMU Hız Hilesi"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:527
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:563
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:517
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:556
 msgid "MadCatz Gameshark files(*.gcs)"
 msgstr "MadCatz Gameshark dosyaları(*.gcs)"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:51
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:63
+#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:38
 msgid "Main Stick"
 msgstr "Ana Çubuk"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460
 msgid "Maker ID:"
 msgstr "Yapımcı ID'si:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487
 msgid "Maker:"
 msgstr "Yapımcı:"
 
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100
+msgid ""
+"Makes distant objects more visible by removing fog, thus increasing the "
+"overall detail.\n"
+"Disabling fog will break some games which rely on proper fog emulation.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:97
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:100
 msgid "Max"
 msgstr "En fazla"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:448
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:435
 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:291
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:278
 msgid "Memcard already opened"
 msgstr "Hafıza kartı zaten açık"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:912
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:913
 msgid "Memory Byte"
 msgstr "Hafıza Baytı"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:225
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:113
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:212
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:93
 msgid "Memory Card"
 msgstr "Hafıza Kartı"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.h:36
+#: Source/Core/DolphinWX/Src/MemcardManager.h:23
 msgid ""
 "Memory Card Manager WARNING-Make backups before using, should be fixed but "
 "could mangle stuff!"
@@ -3478,7 +3542,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:371
+#: Source/Core/Core/Src/CoreParameter.cpp:360
 #, c-format
 msgid ""
 "Memory Card filename in Slot %c is incorrect\n"
@@ -3495,15 +3559,15 @@ msgstr ""
 "%s\n"
 "Eski dosyaları bu yeni yere kopyalamak ister misiniz?\n"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:124
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:112
 msgid "Memorycard filesize does not match the header size"
 msgstr "Hafıza kartı dosya boyutu başlık boyutuyla eşleşmiyor"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:50
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:37
 msgid "Menu"
 msgstr "Menü"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:114
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:94
 msgid "Mic"
 msgstr "Mikrofon"
 
@@ -3512,20 +3576,20 @@ msgstr "Mikrofon"
 msgid "Min"
 msgstr "En az"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:580
 msgid "Misc"
 msgstr "Çeşitli"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:795
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776
 msgid "Misc Settings"
 msgstr "Çeşitli Ayarlar"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:240
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:294
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:227
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:281
 msgid "Modifier"
 msgstr "Değiştirici"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106
 msgid ""
 "Modify textures to show the format they're encoded in. Needs an emulation "
 "reset in most cases.\n"
@@ -3537,20 +3601,20 @@ msgstr ""
 "\n"
 "Emin değilseniz, işaretsiz bırakın."
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:115
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:108
 msgid "Monospaced font"
 msgstr "Boşluklu yazı"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:305
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:292
 msgid "Motion Plus"
 msgstr "Motion Plus"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:309
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:86
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:296
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73
 msgid "Motor"
 msgstr "Motor"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:654
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:666
 msgid ""
 "Move the mouse pointer over an option to display a detailed description.\n"
 "\n"
@@ -3568,224 +3632,235 @@ msgstr ""
 "\n"
 "\n"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:75
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:62
 msgid "Multiply"
 msgstr "Çarp"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:651
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:650
 msgid "NOP"
 msgstr "NOP"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:629
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:628
 msgid "NOTE: Stream size doesn't match actual data length\n"
 msgstr "NOT: Yayın boyutu asıl veri boyutuyla eşleşmiyor.\n"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:129
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:116
 msgid "NP Add"
 msgstr "NP Ekle"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:124
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:111
 msgid "NP Begin"
 msgstr "NP Başla"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:132
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:119
 msgid "NP Decimal"
 msgstr "NP Onluk Taban"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:126
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:113
 msgid "NP Delete"
 msgstr "NP Sil"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:133
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:120
 msgid "NP Divide"
 msgstr "NP Böl"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:120
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:107
 msgid "NP Down"
 msgstr "NP Aşağı"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:123
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:110
 msgid "NP End"
 msgstr "NP Son"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:111
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:98
 msgid "NP Enter"
 msgstr "NP Giriş"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:127
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:114
 msgid "NP Equal"
 msgstr "NP Eşit"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:116
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:103
 msgid "NP Home"
 msgstr "NP Ev"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:125
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:112
 msgid "NP Insert"
 msgstr "NP Yerleştir"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:117
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:104
 msgid "NP Left"
 msgstr "NP Sol"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:128
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:115
 msgid "NP Multiply"
 msgstr "NP Çarp"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:122
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:109
 msgid "NP Page Down"
 msgstr "NP Sayfa Aşağı"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:121
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:108
 msgid "NP Page Up"
 msgstr "NP Sayfa Yukarı"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:119
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:106
 msgid "NP Right"
 msgstr "NP Sağ"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:130
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:117
 msgid "NP Separator"
 msgstr "NP Ayırıcı"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:109
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:96
 msgid "NP Space"
 msgstr "NP Boşluk"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:131
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:118
 msgid "NP Subtract"
 msgstr "NP Çıkarma"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:110
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:97
 msgid "NP Tab"
 msgstr "NP Sekme"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:118
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:105
 msgid "NP Up"
 msgstr "NP Yukarı"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:444
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:59
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:50
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:448
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:46
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:37
 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:25
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:72
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:282
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:553
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:15
 msgid "Name: "
 msgstr "İsim:"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:526
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:562
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:516
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:555
 msgid "Native GCI files(*.gci)"
 msgstr "Doğal GCI Dosyaları(*.gci)"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:161
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:148
 msgid "New Scan"
 msgstr "Yeni Tarama"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:206
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:193
 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:801
 msgid "Next Page"
 msgstr "Sonraki Sayfa"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:165
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:152
 msgid "Next Scan"
 msgstr "Sonraki Tarama"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:68
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:59
 msgid "Nickname :"
 msgstr "Takma Ad :"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:196
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:190
 msgid "No Country (SDK)"
 msgstr "Ülke Yok (SDK)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:370
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:357
 msgid "No ISOs or WADS found"
 msgstr "Kalıp bulunamadı"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:508
+#: Source/Core/Core/Src/ConfigManager.h:17
+msgid "No audio output"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:501
 #, c-format
 msgid "No banner file found for title  %s"
 msgstr "Başlık %s için afiş dosyası bulunamadı"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:761
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:768
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:760
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:767
 msgid "No description available"
 msgstr "Açıklama yok"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:514
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:535
 msgid "No docking"
 msgstr "Yerleştirme yok"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:859
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:860
 msgid "No file loaded"
 msgstr "Dosya Yüklenmedi"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:439
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:426
 msgid "No free dir index entries"
 msgstr "Boş dizin indeks girişi yok"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:895
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:896
 msgid "No recorded file"
 msgstr "Çekilmiş Dosya Yok"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:501
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:494
 #, c-format
 msgid "No save folder found for title %s"
 msgstr "Başlık %s için kayıt klasörü bulunamadı"
 
+#: Source/Plugins/Plugin_VideoOGL/Src/main.cpp:132
+#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:111
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:23
 #: Source/Core/DolphinWX/Src/NetWindow.cpp:600
 msgid "None"
 msgstr "Hiçbiri"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:323
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303
 msgid "Norwegian Bokmaal"
 msgstr "Norveççe (Bokmaal Lehçesi)"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:203
 msgid "Not Equal"
 msgstr "Eşit Değil"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:804
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:794
 msgid "Not Set"
 msgstr "Ayarlanmamış"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:626
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:101
+#, c-format
+msgid "Not a Wii save or read failure for file header size %x"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/Main.cpp:654
 msgid "Not connected"
 msgstr "Bağlı değil"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:309
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:296
 msgid "Notes"
 msgstr "Notlar"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:16
 msgid "Notes: "
 msgstr "Notlar:"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:71
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:74
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:580
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:621
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:629
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:59
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:64
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:613
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:659
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:667
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:31
 msgid "Notice"
 msgstr "Duyuru"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:105
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:92
 msgid "Num Lock"
 msgstr "Sayı Kilidi"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:88
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:75
 msgid "Number Of Codes: "
 msgstr "Kod Sayısı:"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:30
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:34
 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26
 msgid "Nunchuk"
 msgstr "Nunchuck"
@@ -3794,96 +3869,97 @@ msgstr "Nunchuck"
 msgid "Nunchuk Acceleration"
 msgstr "Nunchuck Hızlandırma"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:877
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:878
 msgid "Object"
 msgstr "Nesne"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:135
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:122
 msgid "Object Range"
 msgstr "Nesne Aralığı"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:243
 msgid "Off"
 msgstr "Kapalı"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:62
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:49
 msgid "Offset:"
 msgstr "Uzantı:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:582
 msgid "On-Screen Display Messages"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:436
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:423
 #, c-format
 msgid "Only %d blocks available"
 msgstr "Sadece %d blok kullanılabilir"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:420
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:178
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:426
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:166
 msgid "Open"
 msgstr "Aç"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:876
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:867
 msgid "Open &containing folder"
 msgstr "Dosya konumunu aç (&C)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:873
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:864
 msgid "Open Wii &save folder"
 msgstr "Wii kayıt kla&sörünü aç"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:420
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:426
 msgid "Open file..."
 msgstr "Dosya aç..."
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:61
+#: Source/Core/AudioCommon/Src/OpenALStream.cpp:48
 #, 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:72
+#: Source/Core/AudioCommon/Src/OpenALStream.cpp:59
 msgid "OpenAL: can't find sound devices"
 msgstr "OpenAL: Ses sürücüleri bulunamıyor"
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:66
+#: Source/Core/AudioCommon/Src/OpenALStream.cpp:53
 #, c-format
 msgid "OpenAL: can't open device %s"
 msgstr "OpenAL: Sürücü %s açılamıyor"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502
 msgid "OpenCL Texture Decoder"
 msgstr "OpenCL Doku Çözücü"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503
 msgid "OpenMP Texture Decoder"
 msgstr "OpenMP Doku Çözücü"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:317
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:94
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:304
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:81
 msgid "Options"
 msgstr "Seçenekler"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:22
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Orange"
 msgstr "Turuncu"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:468
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:455
+#, fuzzy
 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"
+"and import the saves to a new memcard\n"
 msgstr ""
 "Dosya dizinindeki sıra blok sırasıyla eşleşmiyor. \n"
 "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:316
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:324
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:509
 msgid "Other"
 msgstr "Diğer"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:206
+#: Source/Core/Core/Src/NetPlayClient.cpp:210
 msgid ""
 "Other client disconnected while game is running!! NetPlay is disabled. You "
 "manually stop the game."
@@ -3891,15 +3967,15 @@ 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:481
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:468
 msgid "Output"
 msgstr "Çıkış"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:342
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:348
 msgid "P&lay Recording..."
 msgstr "Çekimi Oynat... (&L)"
 
-#: Source/Core/Core/Src/HW/GCPad.cpp:30
+#: Source/Core/Core/Src/HW/GCPad.cpp:18
 msgid "Pad"
 msgstr "Kol"
 
@@ -3907,160 +3983,160 @@ msgstr "Kol"
 msgid "Pad "
 msgstr "Kol"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:34
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:38
 msgid "Pads"
 msgstr "Kollar"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:108
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:95
 msgid "Page Down"
 msgstr "Sayfa Aşağı"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:107
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:94
 msgid "Page Up"
 msgstr "Sayfa Yukarı"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:35
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:22
 msgid "Paragraph"
 msgstr "Paragraf"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:64
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:51
 msgid "Parameters"
 msgstr "Parametreler"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:222
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:217
 #, c-format
 msgid "Partition %i"
 msgstr "Bölüntü %i"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:296
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:297
 msgid "Patches"
 msgstr "Yamalar"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:556
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536
 msgid "Paths"
 msgstr "Yollar"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1538
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1539
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:51
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1565
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1566
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:38
 msgid "Pause"
 msgstr "Duraklat"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:128
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:129
 msgid "Pause at end of movie"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:397
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405
 msgid "Per-Pixel Lighting"
 msgstr "Piksel Aydınlatması"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352
 msgid "Perfect"
 msgstr "Mükemmel"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:609
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:642
 #, c-format
 msgid "Perspective %d"
 msgstr "Perspektif %d"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:165
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:424
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1547
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1548
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:152
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:430
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1574
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1575
 msgid "Play"
 msgstr "Oynat"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176
 msgid "Play Recording"
 msgstr "Çekimi Oynat"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:170
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:170
 msgid "Play/Pause"
 msgstr "Oynat/Duraklat"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351
 msgid "Playable"
 msgstr "Oynanabilir"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:154
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:141
 msgid "Playback Options"
 msgstr "Oynatma Seçenekleri"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:301
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:304
 msgid "Players"
 msgstr "Oyuncular"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:988
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:991
 msgid "Please confirm..."
 msgstr "Lütfen onaylayın..."
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:579
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:612
 msgid "Please create a perspective before saving"
 msgstr "Kaydetmeden önce lütfen bir perspektif oluşturun"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:36
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:23
 msgid "Plus-Minus"
 msgstr "Artı-Eksi"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:324
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304
 msgid "Polish"
 msgstr "Lehçe"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:713
 msgid "Port 1"
 msgstr "Bağ. Nok. 1:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714
 msgid "Port 2"
 msgstr "Bağ. Nok. 2:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:734
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715
 msgid "Port 3"
 msgstr "Bağ. Nok. 3:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716
 msgid "Port 4"
 msgstr "Bağ. Nok. 4:"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:97
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:130
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:88
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:133
 msgid "Port :"
 msgstr "Bağ. Nok. :"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:325
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305
 msgid "Portuguese"
 msgstr "Portekizce"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:326
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306
 msgid "Portuguese (Brazilian)"
 msgstr "Portekizce (Brezilya)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:391
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:399
 msgid "Post-Processing Effect:"
 msgstr "Geç İşleme Etkisi:"
 
-#: Source/Core/Core/Src/Movie.cpp:936
+#: Source/Core/Core/Src/Movie.cpp:927
 #, 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:1055
+#: Source/Core/Core/Src/Movie.cpp:1046
 #, 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:1032
+#: Source/Core/Core/Src/Movie.cpp:1023
 #, c-format
 msgid "Premature movie end in PlayWiimote. %u > %u"
 msgstr "PlayWiimote'da erken kayıt bitişi. %u > %u"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:48
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:35
 msgid "Presets: "
 msgstr "Önayarlar:"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:205
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:192
 msgid "Prev Page"
 msgstr "Önceki Sayfa"
 
@@ -4068,67 +4144,67 @@ msgstr "Önceki Sayfa"
 msgid "Previous Page"
 msgstr "Önceki Sayfa"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:183
 msgid "Previous Value"
 msgstr "Önceki Değer"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:60
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:47
 msgid "Print"
 msgstr "Yazdır"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:894
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:885
 msgid "Profile"
 msgstr "Profil"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.h:55
+#: Source/Core/DolphinWX/Src/ISOProperties.h:42
 msgid "Properties"
 msgstr "Özellikler"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:283
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:286
 msgid "Purge Cache"
 msgstr "Önbelleği Temizle"
 
-#: Source/Core/Common/Src/MsgHandler.cpp:66
+#: Source/Core/Common/Src/MsgHandler.cpp:52
 msgid "Question"
 msgstr "Soru"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:159
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:316
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:162
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:319
 msgid "Quit"
 msgstr "Çık"
 
 #. i18n:  Right
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:59
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:46
 msgid "R"
 msgstr "R"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:40
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:27
 msgid "R Button"
 msgstr "R Düğmesi"
 
 #. i18n:  Right-Analog
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:63
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
 msgid "R-Analog"
 msgstr "R Analog"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:445
 msgid "RAM"
 msgstr "Anabellek"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:175
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:169
 msgid "RUSSIA"
 msgstr "RUSYA"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:528
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:515
 msgid "Range"
 msgstr "Aralık"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:190
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:178
 msgid "Read-only mode"
 msgstr "Salt Okunur Mod"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:487
 msgid "Real"
 msgstr "Gerçek"
 
@@ -4144,33 +4220,33 @@ msgstr "Gerçek Wiimote'lar"
 msgid "Reconnect Wiimote on State Loading"
 msgstr "Durum yüklemesinde Wiimote'u yeniden bağla"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:193
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:217
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:791
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:180
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:204
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:790
 msgid "Record"
 msgstr "Çek"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:174
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:161
 msgid "Recording Info"
 msgstr "Çekim Bilgisi"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:202
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:189
 msgid "Recording Options"
 msgstr "Çekim Seçenekleri"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:21
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Red"
 msgstr "Kırmızı"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:24
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Red Left"
 msgstr "Kırmızı Sol"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:25
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Red Right"
 msgstr "Kırmızı Sağ"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86
 msgid ""
 "Reduces the amount of aliasing caused by rasterizing 3D graphics.\n"
 "This makes the rendered picture look less blocky.\n"
@@ -4185,28 +4261,28 @@ msgstr ""
 "Emin değilseniz, hiçbiri seçin."
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:60
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:421
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:903
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:427
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:894
 msgid "Refresh"
 msgstr "Yenile"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:180
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:168
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:168
 msgid "Refresh List"
 msgstr "Listeyi Yenile"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:421
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:427
 msgid "Refresh game list"
 msgstr "Oyun Listesini Yenile"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:405
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:427
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:77
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:812
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:409
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:431
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:64
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:793
 msgid "Remove"
 msgstr "Kaldır"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99
 msgid ""
 "Render the scene as a wireframe.\n"
 "\n"
@@ -4216,196 +4292,202 @@ msgstr ""
 "\n"
 "Emin değilseniz, işaretsiz bırakın."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:308
 msgid "Render to Main Window"
 msgstr "Ana pencerede yorumla"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:915
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:172
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:906
 msgid "Reset"
 msgstr "Sıfırla"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:190
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:177
 msgid "Results"
 msgstr "Sonuçlar"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:29
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:16
 msgid "Return"
 msgstr "Enter"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:277
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:57
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464
+msgid "Revision:"
+msgstr ""
+
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:264
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:44
 msgid "Right"
 msgstr "Sağ"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:61
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:65
 msgid "Right Stick"
 msgstr "Sağ Çubuk"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:85
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:295
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:72
 msgid "Rumble"
 msgstr "Gümbürtü"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:518
-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:498
+msgid ""
+"Run DSP HLE and LLE on a dedicated thread (not recommended: might cause "
+"audio glitches with HLE and freezes with LLE)."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:327
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307
 msgid "Russian"
 msgstr "Rusça"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:149
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:150
 msgid "Sa&ve State"
 msgstr "Durumu Kaydet (&V)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:465
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475
 msgid "Safe"
 msgstr "Güvenli"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:196
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:446
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:925
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:183
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:452
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916
 msgid "Save"
 msgstr "Kaydet"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:532
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:522
 msgid "Save GCI as..."
 msgstr "GCI'yı farklı kaydet..."
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
 msgid "Save State Slot 1"
 msgstr "Durumu Kaydet : 1"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:198
 msgid "Save State Slot 2"
 msgstr "Durumu Kaydet : 2"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:199
 msgid "Save State Slot 3"
 msgstr "Durumu Kaydet : 3"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:212
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:212
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200
 msgid "Save State Slot 4"
 msgstr "Durumu Kaydet : 4"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201
 msgid "Save State Slot 5"
 msgstr "Durumu Kaydet : 5"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202
 msgid "Save State Slot 6"
 msgstr "Durumu Kaydet : 6"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:203
 msgid "Save State Slot 7"
 msgstr "Durumu Kaydet : 7"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204
 msgid "Save State Slot 8"
 msgstr "Durumu Kaydet : 8"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:151
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:152
 msgid "Save State..."
 msgstr "Durumu Kaydet..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:582
 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:592
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:602
 msgid "Save as..."
 msgstr "Farklı kaydet..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1203
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1204
 msgid "Save compressed GCM/ISO"
 msgstr "Sıkıştırılan GCM/ISO'yu kaydet"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:446
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:452
 msgid "Save current perspective"
 msgstr "Şu anki perspektifi kaydet"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1192
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193
 msgid "Save decompressed GCM/ISO"
 msgstr "Genişletilen GCM/ISO'yu kaydet"
 
-#: Source/Core/Core/Src/Movie.cpp:801
+#: Source/Core/Core/Src/Movie.cpp:792
 #, 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:396
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:404
 msgid "Scaled EFB Copy"
 msgstr "Boyutlandırılmış EFB Kopyası"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:556
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:543
 #, c-format
 msgid "Scanning %s"
 msgstr "Taranıyor %s"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:539
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:526
 msgid "Scanning for ISOs"
 msgstr "Kalıplar taranıyor"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:540
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:527
 msgid "Scanning..."
 msgstr "Taranıyor..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:427
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
 msgid "ScrShot"
 msgstr "Ekran Görüntüsü"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:106
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:93
 msgid "Scroll Lock"
 msgstr "Kaydırma Kilidi"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:264
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:251
 msgid "Search"
 msgstr "Ara"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:227
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:214
 msgid "Search Filter"
 msgstr "Arama Filtresi"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:810
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:791
 msgid "Search Subfolders"
 msgstr "Alt Klasörleri Ara"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:250
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:237
 msgid "Search current Object"
 msgstr "Şu anki nesneyi ara"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:254
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:241
 msgid "Search for hex Value:"
 msgstr "Hex değerini ara:"
 
-#: Source/Core/Common/Src/SysConf.h:103 Source/Core/Common/Src/SysConf.h:126
-#: Source/Core/Common/Src/SysConf.h:146 Source/Core/Common/Src/SysConf.h:167
+#: Source/Core/Common/Src/SysConf.h:90 Source/Core/Common/Src/SysConf.h:113
+#: Source/Core/Common/Src/SysConf.h:133 Source/Core/Common/Src/SysConf.h:154
 #, c-format
 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:490
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:46
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:477
 msgid "Select"
 msgstr "Seç"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:677
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1072
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:683
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1087
 msgid "Select The Recording File"
 msgstr "Çekim Dosyasını Seç"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1285
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1312
 msgid "Select a Wii WAD file to install"
 msgstr "Kurmak için bir Wii WAD dosyası seçin"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:70
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74
 msgid ""
 "Select a hardware adapter to use.\n"
 "\n"
@@ -4415,31 +4497,31 @@ msgstr ""
 "\n"
 "Emin değilseniz, ilkini kullanın."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:520
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:510
 msgid "Select a save file to import"
 msgstr "Almak için bir kayıt dosyası seçin"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:363
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:366
 msgid "Select floating windows"
 msgstr "Sabit olmayan pencereyi seçin"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:582
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:585
 msgid "Select the file to load"
 msgstr "Yüklemek için dosyayı seçin"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1241
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1268
 msgid "Select the save file"
 msgstr "Kayıt dosyasını seçin"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1388
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1415
 msgid "Select the state to load"
 msgstr "Yüklemek için durum seçin"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1429
 msgid "Select the state to save"
 msgstr "Kaydetmek için durum seçin"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82
 msgid ""
 "Select what aspect ratio to use when rendering:\n"
 "Auto: Use the native aspect ratio\n"
@@ -4457,15 +4539,15 @@ msgstr ""
 "\n"
 "Emin değilseniz, otomatik seçin."
 
-#: Source/Core/InputCommon/Src/InputConfig.cpp:61
+#: Source/Core/InputCommon/Src/InputConfig.cpp:48
 msgid "Selected controller profile does not exist"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:116
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:109
 msgid "Selected font"
 msgstr "Seçilen yazı tipi"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75
 msgid ""
 "Selects the display resolution used in fullscreen mode.\n"
 "This should always be bigger than or equal to the internal resolution. "
@@ -4481,23 +4563,27 @@ 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:69
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:70
 msgid ""
 "Selects what graphics API to use internally.\n"
 "Direct3D 9 usually is the fastest one. OpenGL is more accurate though. "
 "Direct3D 11 is somewhere between the two.\n"
 "Note that the Direct3D backends are only available on Windows.\n"
 "\n"
-"If unsure, use Direct3D 9."
+"If unsure, use Direct3D 11."
 msgstr ""
-"Hangi görüntü API'sinin kullanılacağını seçer.\n"
-"DirectX 9 genelde en hızlı olanlarıdır. OpenGL gerçekçiliğe önem verir. "
-"DirectX 10/11 ikisinin arasıdır.\n"
-"Şunu unutmayın, DirectX 9 sadece Windows'da kullanılabilir.\n"
-"\n"
-"Emin değilseniz, DirectX 9 seçin."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:288
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72
+msgid ""
+"Selects what graphics API to use internally.\n"
+"Direct3D 9 usually is the fastest one. OpenGL is more accurate though. "
+"Direct3D 11 is somewhere between the two.\n"
+"Note that the Direct3D backends are only available on Windows.\n"
+"\n"
+"If unsure, use OpenGL."
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:291
 msgid "Send"
 msgstr "Gönder"
 
@@ -4505,25 +4591,25 @@ msgstr "Gönder"
 msgid "Sensor Bar Position:"
 msgstr "Sensör Çubuk Konumu:"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:77
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:64
 msgid "Separator"
 msgstr "Bölücü"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:328
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308
 msgid "Serbian"
 msgstr "Sırpça"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:522
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502
 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:488
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:475
 msgid "Set"
 msgstr "Ayarla"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:877
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:868
 msgid "Set as &default ISO"
 msgstr "Varsayılan Kalıp Olarak Ayarla (&D)"
 
@@ -4532,134 +4618,134 @@ msgstr "Varsayılan Kalıp Olarak Ayarla (&D)"
 msgid "Set as default Memcard %c"
 msgstr "Varsayılan Hafıza Kartı %c olarak ayarla"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:460
+#: Source/Core/Core/Src/ActionReplay.cpp:450
 #, 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/ConfigMain.cpp:535
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:515
 msgid ""
 "Sets the latency (in ms).  Higher values may reduce audio crackling. OpenAL "
 "backend only."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341
 msgid "Settings..."
 msgstr "Ayarlar..."
 
-#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:222
+#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:209
 msgid "SetupWiiMem: Cant find setting file"
 msgstr "SetupWiiMem: Ayar dosyası bulunamadı"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:291
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:278
 msgid "Shake"
 msgstr "Sallama"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
 msgid "Short Name:"
 msgstr "Kısa İsim:"
 
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:103
+#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:90
 msgid "Shoulder Buttons"
 msgstr "Shoulder Düğmeleri"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:217
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:220
 msgid "Show &Console"
 msgstr "Konsolu Göster (&C)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:215
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:218
 msgid "Show &Log"
 msgstr "Geçmişi Göster (&L)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:212
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:215
 msgid "Show &Statusbar"
 msgstr "Durum Çubuğunu Gö&ster"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:210
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:213
 msgid "Show &Toolbar"
 msgstr "Araç Çubuğunu Gös&ter"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:281
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:284
 msgid "Show Drives"
 msgstr "Aygıtları Göster"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:517
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530
 msgid "Show EFB Copy Regions"
 msgstr "EFB Bölge Kopyalamasını Göster"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:295
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303
 msgid "Show FPS"
 msgstr "Kare Sayısını Göster"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:271
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:274
 msgid "Show France"
 msgstr "Fransızları Göster"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:257
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:260
 msgid "Show GameCube"
 msgstr "GameCube'leri Göster"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561
 msgid "Show Input Display"
 msgstr "Görüntü Girişini Göster"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:273
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:276
 msgid "Show Italy"
 msgstr "İtalyanları Göster"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:264
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:267
 msgid "Show JAP"
 msgstr "Japonları Göster"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:275
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:278
 msgid "Show Korea"
 msgstr "Korelileri Göster"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476
 msgid "Show Language:"
 msgstr "Gösterme Dili:"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:216
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:219
 msgid "Show Log &Configuration"
 msgstr "Geçmiş Yapılandırmasını Göster"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:266
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:269
 msgid "Show PAL"
 msgstr "PAL'ları Göster"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:254
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:257
 msgid "Show Platforms"
 msgstr "Platformları Göster"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:263
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:266
 msgid "Show Regions"
 msgstr "Bölgeleri Göster"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:518
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531
 msgid "Show Statistics"
 msgstr "İstatistikleri Göster"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:277
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:280
 msgid "Show Taiwan"
 msgstr "Tayvanlıları Göster"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:268
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:271
 msgid "Show USA"
 msgstr "Amerikanları Göster"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:259
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:262
 msgid "Show Wad"
 msgstr "WAD'ları Göster"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:255
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:258
 msgid "Show Wii"
 msgstr "Wii'leri Göster"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491
 msgid "Show a confirmation box before stopping a game."
 msgstr "Oyunu durdurmadan önce onay kutusu görüntüle."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:512
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492
 msgid ""
 "Show a message box when a potentially serious error has occurred.\n"
 "Disabling this may avoid annoying and non-fatal messages, but it may also "
@@ -4673,11 +4759,11 @@ msgstr ""
 msgid "Show first block"
 msgstr "İlk bloğu göster"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:130
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:131
 msgid "Show lag counter"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493
 msgid ""
 "Show messages on the emulation screen area.\n"
 "These messages include memory card writes, video backend and CPU "
@@ -4700,7 +4786,7 @@ msgstr "Kayıt simgesini göster"
 msgid "Show save title"
 msgstr "Kayıt başlığını göster"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102
 msgid ""
 "Show the number of frames rendered per second as a measure of emulation "
 "speed.\n"
@@ -4712,11 +4798,11 @@ msgstr ""
 "\n"
 "Emin değilseniz, işaretsiz bırakın."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:279
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:282
 msgid "Show unknown"
 msgstr "Bilinmeyenleri göster"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105
 msgid ""
 "Show various statistics.\n"
 "\n"
@@ -4726,46 +4812,31 @@ msgstr ""
 "\n"
 "Emin değilseniz, işaretsiz bırakın."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:319
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:306
 msgid "Sideways Wiimote"
 msgstr "Yatay Wiimote"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:280
 msgid "Simplified Chinese"
 msgstr "Basitleştirilmiş Çince"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:311
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:298
 msgid "Size"
 msgstr "Boyut"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:696
 msgid "Skip BIOS"
 msgstr "BIOS'u Geç"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316
 msgid "Skip DCBZ clearing"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:492
-msgid "Skip Dest. Alpha Pass"
-msgstr "Hedef Alpha Geçişini Atla"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:444
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:454
 msgid "Skip EFB Access from CPU"
 msgstr "CPU'dan EFB'ye erişimi atla"
 
-#: 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 ""
-"Çoğu oyunda çeşitli görsel efektler için hedef alpha geçişini atla. \n"
-"\n"
-"Emin değilseniz, işaretsiz bırakın."
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125
 msgid ""
 "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n"
 "Sometimes also increases visual quality.\n"
@@ -4780,25 +4851,25 @@ msgstr ""
 "doğruluğunu artırmayı deneyin.\n"
 "Emin değilseniz, işaretsiz bırakın."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:374
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:386
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:380
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:392
 #, c-format
 msgid "Slot %i"
 msgstr "Slot %i"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:700
 msgid "Slot A"
 msgstr "Slot A"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:701
 msgid "Slot B"
 msgstr "Slot B"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:62
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:49
 msgid "Snapshot"
 msgstr "Enstantene"
 
-#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:58
+#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:46
 msgid "Software Renderer"
 msgstr "Yazılımsal Yorumlayıcı"
 
@@ -4814,27 +4885,27 @@ 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:683
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:664
 msgid "Sound Settings"
 msgstr "Ses Ayarları"
 
-#: Source/Core/AudioCommon/Src/AudioCommon.cpp:77
+#: Source/Core/AudioCommon/Src/AudioCommon.cpp:64
 #, c-format
 msgid "Sound backend %s is not valid."
 msgstr "Ses arkaucu %s geçerli değil."
 
-#: Source/Core/AudioCommon/Src/DSoundStream.cpp:59
+#: Source/Core/AudioCommon/Src/DSoundStream.cpp:46
 #, c-format
 msgid "Sound buffer creation failed: %s"
 msgstr "Ses tamponu oluşturulamadı: %s"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:31
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:18
 msgid "Space"
 msgstr "Boşluk"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:329
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309
 msgid "Spanish"
 msgstr "İspanyolca"
 
@@ -4842,7 +4913,7 @@ msgstr "İspanyolca"
 msgid "Speaker Volume:"
 msgstr "Hoparlör Ses Seviyesi:"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92
 msgid ""
 "Specifies the resolution used to render at. A high resolution will improve "
 "visual quality a lot but is also quite heavy on performance and might cause "
@@ -4862,63 +4933,63 @@ msgstr ""
 "\n"
 "Emin değilseniz, 640x528'i seçin."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322
 msgid "Speed up Disc Transfer Rate"
 msgstr "Disk Aktarım Oranını Hızlandır"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:243
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:230
 msgid "Square Stick"
 msgstr "Kare Çubuk"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:107
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87
 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:322
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:37
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:25
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:325
 msgid "Start"
 msgstr "Başlat"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:194
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:197
 msgid "Start &NetPlay"
 msgstr "&NetPlay'i Başlat"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:339
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:345
 msgid "Start Re&cording"
 msgstr "Çekimi Başlat (&C)"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:175
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:175
 msgid "Start Recording"
 msgstr "Çekimi Başlat"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:312
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:299
 msgid "State"
 msgstr "Durum"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:173
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:161
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:161
 msgid "State Saves"
 msgstr "Durum Kayıtları"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:108
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88
 msgid "Steering Wheel"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:53
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:57
 msgid "Stick"
 msgstr "Çubuk"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:420
-#: 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:325
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:419
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:431
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:171
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:171
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:328
 msgid "Stop"
 msgstr "Durdur"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96
 msgid ""
 "Store EFB copies in GPU texture objects.\n"
 "This is not so accurate, but it works well enough for most games and gives a "
@@ -4932,107 +5003,117 @@ msgstr ""
 "\n"
 "Emin değilseniz, işaretli bırakın."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:275
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283
 msgid "Stretch to Window"
 msgstr "Pencereye Göre Ayarla"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:43
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:47
 msgid "Strum"
 msgstr "Tıngırtı"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:78
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:65
 msgid "Subtract"
 msgstr "Çıkarma"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:77
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:67
 #, c-format
 msgid "Successfully exported file to %s"
 msgstr "Dosya %s 'ye başarıyla verildi"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:56
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:43
 msgid "Successfully imported save files"
 msgstr "Kayıt dosyaları başarıyla alındı"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:285
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:272
 msgid "Swing"
 msgstr "Hareket"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:744
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:792
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320
+msgid "Synchronize GPU thread"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321
+msgid ""
+"Synchronizes the GPU and CPU threads to help prevent random freezes in Dual "
+"Core mode. (ON = Compatible, OFF = Fast)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773
 msgid "System Language:"
 msgstr "Sistem Dili:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:191
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:185
 msgid "TAIWAN"
 msgstr "TAYVAN"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:127
-#: Source/Core/DolphinWX/Src/TASInputDlg.h:32
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:128
+#: Source/Core/DolphinWX/Src/TASInputDlg.h:19
 msgid "TAS Input"
 msgstr "TAS Girişi"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:28
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:15
 msgid "Tab"
 msgstr "Sekme"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:510
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:531
 msgid "Tab split"
 msgstr "Sekme bölme"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:37
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:41
 msgid "Table Left"
 msgstr "Tablo Sol"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:38
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:42
 msgid "Table Right"
 msgstr "Tablo Sağ"
 
-#: 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
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:361
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:181
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:181
 msgid "Take Screenshot"
 msgstr "Ekran Görüntüsü Al"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:109
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89
 msgid "TaruKonga (Bongos)"
 msgstr "TaruKonga (Bongos)"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:472
 msgid "Test"
 msgstr "Sınama"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:444
 msgid "Texture"
 msgstr "Doku"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:451
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:461
 msgid "Texture Cache"
 msgstr "Doku Ön Belleği"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:519
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:532
 msgid "Texture Format Overlay"
 msgstr "Doku Biçimi Kaplaması"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:226
+#: Source/Core/Core/Src/CoreParameter.cpp:215
 msgid "The WAD has been installed successfully"
 msgstr "WAD Başarıyla yüklendi."
 
-#: Source/Core/Core/Src/ActionReplay.cpp:197
+#: Source/Core/Core/Src/ActionReplay.cpp:185
 msgid "The address is invalid"
 msgstr "Adres geçersiz"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:509
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:496
 msgid "The checksum was successfully fixed"
 msgstr "Sağlama başarıyla düzeltildi"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1242
+#: 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:1117
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1216
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1118
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1146
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1217
 #, c-format
 msgid ""
 "The file %s already exists.\n"
@@ -5041,7 +5122,7 @@ msgstr ""
 "%s zaten var.\n"
 "Değiştirmek istiyor musunuz?"
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:51
+#: Source/Core/AudioCommon/Src/WaveFile.cpp:38
 #, c-format
 msgid ""
 "The file %s could not be opened for writing. Please check if it's already "
@@ -5050,29 +5131,29 @@ msgstr ""
 "Dosya %s yazmak için açılamadı. Lütfen başka bir uygulama tarafından "
 "kullanılıp kullanılmadığını denetleyin."
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:44
+#: Source/Core/AudioCommon/Src/WaveFile.cpp:31
 #, c-format
 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:332
+#: Source/Core/Core/Src/Boot/Boot.cpp:320
 #, c-format
 msgid "The file you specified (%s) does not exist"
 msgstr "Belirtilen dosya (%s) bulunamadı"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:628
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:666
 msgid "The name can not be empty"
 msgstr "İsim boş olamaz"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:620
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:658
 msgid "The name can not contain the character ','"
 msgstr "İsim ',' karakterini içeremez"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:142
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:129
 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:93
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98
 msgid ""
 "The safer you adjust this, the less likely the emulator will be missing any "
 "texture updates from RAM.\n"
@@ -5084,11 +5165,11 @@ msgstr ""
 "\n"
 "Emin değilseniz, en sağdaki değeri kullanın."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:445
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:432
 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:388
+#: Source/Core/DolphinWX/Src/Main.cpp:416
 msgid ""
 "The selected language is not supported by your system. Falling back to "
 "system default."
@@ -5096,36 +5177,36 @@ msgstr ""
 "Seçilen dili sisteminiz desteklememektedir. Sistem varsayılanına geri "
 "dönülüyor."
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:43
+#: Source/Core/Core/Src/NetPlayClient.cpp:47
 msgid "The server and client's NetPlay versions are incompatible!"
 msgstr "Sunucu ve istemcinin NetPlay sürümleri uyumlu değil!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:40
+#: Source/Core/Core/Src/NetPlayClient.cpp:44
 msgid "The server is full!"
 msgstr "Sunucu dolu!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:46
+#: Source/Core/Core/Src/NetPlayClient.cpp:50
 msgid "The server responded: the game is currently running!"
 msgstr "Sunucu yanıtı: oyun şu anda çalışıyor!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:49
+#: Source/Core/Core/Src/NetPlayClient.cpp:53
 msgid "The server sent an unknown error message!"
 msgstr "Sunucu bilinmeyen bir hata mesajı gönderdi!"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:119
+#: Source/Core/Core/Src/CoreParameter.cpp:108
 #, c-format
 msgid "The specified file \"%s\" does not exist"
 msgstr "Belirtilen dosya \"%s\" bulunamadı"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:198
+#: Source/Core/Core/Src/ActionReplay.cpp:186
 msgid "The value is invalid"
 msgstr "Değer hatalı"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:642
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:623
 msgid "Theme:"
 msgstr "Tema:"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:476
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:463
 msgid ""
 "There must be a ticket for 00000001/00000002. Your NAND dump is probably "
 "incomplete."
@@ -5133,7 +5214,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:307
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308
 msgid ""
 "These settings override core Dolphin settings.\n"
 "Undetermined means the game uses Dolphin's setting."
@@ -5141,18 +5222,18 @@ msgstr ""
 "Bu ayarlar Dolphin'in kendi ayarları yerine kullanılır. \n"
 "Dolu kareler oyunun Dolphin'in ayarlarını kullandığını gösterir."
 
-#: Source/Core/Core/Src/ActionReplay.cpp:355
+#: Source/Core/Core/Src/ActionReplay.cpp:345
 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:525
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505
 msgid "This could cause slow down in Wii Menu and some games."
 msgstr "Bu Wii Menüsünde ve bazı oyunlarda yavaşlamaya neden olabilir."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118
 msgid ""
 "This feature allows you to change the game's camera.\n"
 "Move the mouse while holding the right mouse button to pan and while holding "
@@ -5171,7 +5252,19 @@ msgstr ""
 "\n"
 "Emin değilseniz, işaretsiz bırakın."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485
+#, fuzzy
+msgid ""
+"This limits the game speed to the specified number of frames per second "
+"(full speed is 60 for NTSC and 50 for PAL). Alternatively, use Audio to "
+"throttle using the DSP (might fix audio clicks but can also cause constant "
+"noise depending on the game)."
+msgstr ""
+"Eğer çerçeve sınırını oyun hızından yüksek seçerseniz (NTSC:60, PAL:50), DSP "
+"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/ConfigMain.cpp:484
 msgid ""
 "This splits the Video and CPU threads, so they can be run on separate "
 "cores.\n"
@@ -5183,61 +5276,61 @@ 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:286
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:287
 msgid "This will let you Manually Edit the INI config file"
 msgstr "INI Yapılandırma dosyasını elle düzenlemeye izin verir."
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:249
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:254
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:236
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:241
 msgid "Threshold"
 msgstr "Eşik"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:288
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:275
 msgid "Tilt"
 msgstr "Eğim"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:628
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:304
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:622
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:291
 msgid "Title"
 msgstr "Başlık"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:125
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:144
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:112
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:131
 msgid "To"
 msgstr "Buraya"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:72
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59
 msgid "Toggle All Log Types"
 msgstr "Tüm Geçmiş Türlerini Seç"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:426
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:432
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:180
 msgid "Toggle Fullscreen"
 msgstr "Tam Ekran Moduna Geç"
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:87
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:271
 msgid "Top"
 msgstr "Üst"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:281
 msgid "Traditional Chinese"
 msgstr "Geleneksel Çince"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:426
+#: Source/Core/Core/Src/Boot/Boot.cpp:414
 msgid "Tried to load an unknown file type."
 msgstr "Bilinmeyen bir dosya türünü yüklemeyi denedi."
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:80
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:67
 msgid "Triggers"
 msgstr "Tetikler"
 
-#: Source/Core/Common/Src/SysConf.h:91 Source/Core/Common/Src/SysConf.h:114
+#: Source/Core/Common/Src/SysConf.h:78 Source/Core/Common/Src/SysConf.h:101
 msgid "Trying to read from invalid SYSCONF"
 msgstr "Geçersiz SYSCONF'tan okumayı deniyor"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:44
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:31
 msgid ""
 "Trying to read from invalid SYSCONF\n"
 "Wiimote bt ids are not available"
@@ -5245,15 +5338,15 @@ msgstr ""
 "Geçersiz SYSCONF'tan okumayı deniyor\n"
 "Wiimote BT ID'leri mevcut değil"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:330
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
 msgid "Turkish"
 msgstr "Türkçe"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:33
 msgid "Turntable"
 msgstr "Döner Tabla"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:71
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58
 msgid "Type"
 msgstr "Tür"
 
@@ -5261,25 +5354,25 @@ msgstr "Tür"
 msgid "UDP Port:"
 msgstr "UDP Bağ.Nok.:"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:279
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:266
 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12
 msgid "UDP Wiimote"
 msgstr "UDP Wiimote"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:199
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:193
 msgid "UNKNOWN"
 msgstr "BİLİNMEYEN"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:756
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:755
 #, c-format
 msgid "UNKNOWN_%02X"
 msgstr "BİLİNMEYEN_%02X"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:178
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:172
 msgid "USA"
 msgstr "AMERİKA"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:225
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:214
 msgid ""
 "Unable to create patch from given values.\n"
 "Entry not modified."
@@ -5287,7 +5380,7 @@ msgstr ""
 "Verilen değerlerden yama oluşturulamıyor. \n"
 "Girilen veri değiştirilmemiş."
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:124
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:111
 #, c-format
 msgid ""
 "Unable to parse line %lu of the entered AR code as a valid encrypted or "
@@ -5298,74 +5391,88 @@ 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:391
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:397
 #, c-format
 msgid "Undefined %i"
 msgstr "Belirsiz %i"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:163
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:164
 msgid "Undo Load State"
 msgstr "Durum Yüklemeyi Geri Al"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:718
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:717
 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:202
 msgid "Unknown"
 msgstr "Bilinmeyen"
 
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:971
+#: Source/Core/Core/Src/HW/DVDInterface.cpp:965
 #, c-format
 msgid "Unknown DVD command %08x - fatal error"
 msgstr "Bilinmeyen DVD komutu %08x - önemli hata"
 
-#: Source/Core/Common/Src/SysConf.cpp:145
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:444
+#, c-format
+msgid "Unknown command 0x%08x"
+msgstr ""
+
+#: Source/Core/Common/Src/SysConf.cpp:132
 #, c-format
 msgid "Unknown entry type %i in SYSCONF (%s@%x)!"
 msgstr "SYSCONF içinde bilinmeyen giriş türü %i (%s@%x)!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:228
+#: Source/Core/Core/Src/NetPlayClient.cpp:232
 #, c-format
 msgid "Unknown message received with id : %d"
 msgstr "Şu ID ile bilinmeyen mesaj alındı : %d"
 
-#: Source/Core/Core/Src/NetPlayServer.cpp:504
+#: Source/Core/Core/Src/NetPlayServer.cpp:508
 #, c-format
 msgid "Unknown message with id:%d received from player:%d Kicking player!"
 msgstr "ID %d ile %d oyuncusundan bilinmeyen mesaj alındı. Oyuncu atılıyor!"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:274
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:56
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:261
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:43
 msgid "Up"
 msgstr "Yukarı"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:108
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:95
 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17
 msgid "Update"
 msgstr "Güncelle"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:320
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:307
 msgid "Upright Wiimote"
 msgstr "Dik Wiimote"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:777
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758
 msgid "Use EuRGB60 Mode (PAL60)"
 msgstr "EuRGB60 Modunu Kullan (PAL60)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:294
 msgid "Use Fullscreen"
 msgstr "Tam Ekran Kullan"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:575
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:563
 msgid "Use Hex"
 msgstr "HEX Kullan"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:600
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580
 msgid "Use Panic Handlers"
 msgstr "Önemli Hataları Bildir"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89
+msgid ""
+"Use a hacked upload strategy to stream vertices.\n"
+"This usually speed up, but is forbidden by OpenGL specification and may "
+"causes heavy glitches.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122
 msgid ""
 "Use multiple threads to decode textures.\n"
 "Might result in a speedup (especially on CPUs with more than two cores).\n"
@@ -5377,7 +5484,7 @@ msgstr ""
 "\n"
 "Emin değilseniz, işaretsiz bırakın."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126
 msgid ""
 "Usually if shader compilation fails, an error message is displayed.\n"
 "However, one may skip the popups to allow interruption free gameplay by "
@@ -5391,53 +5498,58 @@ msgstr ""
 "\n"
 "Emin değilseniz, işaretsiz bırakın."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:539
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:552
 msgid "Utility"
 msgstr "Gereçler"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:285
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:293
 msgid "V-Sync"
 msgstr "Dikey Eşitleme"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:209
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318
+#, fuzzy
+msgid "VBeam Speed Hack"
+msgstr "MMU Hız Hilesi"
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196
 msgid "Value"
 msgstr "Değer"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:73
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:60
 msgid "Value:"
 msgstr "Değer:"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:572
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:560
 msgid "Value: "
 msgstr "Değer:"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:51
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:38
 msgid "Verbosity"
 msgstr "Duyuru/Hata/Uyarı"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:377
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:381
 msgid "Video"
 msgstr "Görüntü"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:486
 msgid "Virtual"
 msgstr "Sanal"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:689
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670
 msgid "Volume"
 msgstr "Ses"
 
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:498
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:527
+#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:488
+#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:517
 #, c-format
 msgid "WAD installation failed: error creating %s"
 msgstr "WAD kurulumu başarısız: %s oluşturmada hata"
 
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:547
+#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:537
 msgid "WAD installation failed: error creating ticket"
 msgstr "WAD kurulumu başarısız: Ticket oluşturma hatası."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84
 msgid ""
 "Wait for vertical blanks in order to reduce tearing.\n"
 "Decreases performance if emulation speed is below 100%.\n"
@@ -5449,25 +5561,25 @@ msgstr ""
 "\n"
 "Emin değilseniz, işaretsiz bırakın."
 
-#: Source/Core/Common/Src/MsgHandler.cpp:67
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46
+#: Source/Core/Common/Src/MsgHandler.cpp:53
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:33
 #: Source/Core/DolphinWX/Src/VideoConfigDiag.h:85
 msgid "Warning"
 msgstr "Uyarı"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:291
+#: Source/Core/Core/Src/Boot/Boot.cpp:279
 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:341
+#: Source/Core/Core/Src/Boot/Boot.cpp:329
 msgid "Warning - starting ELF in wrong console mode!"
 msgstr "Uyarı - ELF yanlış konsol modunda başlatılıyor!"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:221
+#: Source/Core/Core/Src/Boot/Boot.cpp:209
 msgid "Warning - starting ISO in wrong console mode!"
 msgstr "Uyarı - Kalıp yanlış konsol modunda başlatılıyor!"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:519
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:512
 #, c-format
 msgid ""
 "Warning! it is advised to backup all files in the folder:\n"
@@ -5478,7 +5590,7 @@ msgstr ""
 "%s\n"
 "Devam edilsin mi?"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:585
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:578
 #, c-format
 msgid ""
 "Warning: This will overwrite any existing saves that are in the folder:\n"
@@ -5492,7 +5604,7 @@ msgstr ""
 "ve hafıza kartınızdaki dosyayla aynı adda olacak.\n"
 "Devam?"
 
-#: Source/Core/Core/Src/Movie.cpp:844
+#: Source/Core/Core/Src/Movie.cpp:835
 #, c-format
 msgid ""
 "Warning: You loaded a save that's after the end of the current movie. (byte "
@@ -5504,7 +5616,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:861
+#: Source/Core/Core/Src/Movie.cpp:852
 #, c-format
 msgid ""
 "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You "
@@ -5516,7 +5628,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:870
+#: Source/Core/Core/Src/Movie.cpp:861
 #, c-format
 msgid ""
 "Warning: You loaded a save whose movie mismatches on frame %d. You should "
@@ -5550,49 +5662,49 @@ msgstr ""
 "Start=%d, A=%d, B=%d, X=%d, Y=%d, Z=%d, DUp=%d, DDown=%d, DLeft=%d, DRight="
 "%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d"
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:106
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:129
+#: Source/Core/AudioCommon/Src/WaveFile.cpp:93
+#: Source/Core/AudioCommon/Src/WaveFile.cpp:116
 msgid "WaveFileWriter - file not open."
 msgstr "WaveFileWriter - dosya açılamadı."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:56
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:60
 msgid "Whammy"
 msgstr "Darbe"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:404
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:408
 msgid "Widescreen Hack"
 msgstr "Geniş Ekran Hilesi"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:312
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:299
 msgid "Width"
 msgstr "Genişlik"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535
 msgid "Wii"
 msgstr "Wii"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:372
 msgid "Wii Console"
 msgstr "Wii Konsolu"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:844
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:825
 msgid "Wii NAND Root:"
 msgstr "Wii NAND Kök Dizini:"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:191
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:194
 msgid "Wii Save Import"
 msgstr "Wii Kaydı Al"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1243
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1270
 msgid "Wii save files (*.bin)|*.bin"
 msgstr "Wii kayıt dosyaları (*.bin)|*.bin"
 
-#: Source/Core/DiscIO/Src/WiiWad.cpp:82
+#: Source/Core/DiscIO/Src/WiiWad.cpp:69
 msgid "WiiWAD: Could not read from file"
 msgstr "WiiWAD: Dosyadan okuma başarısız"
 
-#: Source/Core/Core/Src/HW/Wiimote.cpp:17
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
+#: Source/Core/Core/Src/HW/Wiimote.cpp:20
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
 msgid "Wiimote"
 msgstr "Wiimote"
 
@@ -5601,7 +5713,7 @@ msgstr "Wiimote"
 msgid "Wiimote %i"
 msgstr "Wiimote %i"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:628
+#: Source/Core/DolphinWX/Src/Main.cpp:656
 msgid "Wiimote Connected"
 msgstr "Wiimote Bağlandı"
 
@@ -5609,7 +5721,7 @@ msgstr "Wiimote Bağlandı"
 msgid "Wiimote Motor"
 msgstr "Wiimote Motoru"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
 msgid "Wiimote settings"
 msgstr "Wiimote ayarları"
 
@@ -5617,101 +5729,117 @@ msgstr "Wiimote ayarları"
 msgid "Wiimotes"
 msgstr "Wiimote'lar"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:134
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:121
 msgid "Windows Left"
 msgstr "Pencereleri Sola Döşe"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:136
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:123
 msgid "Windows Menu"
 msgstr "Pencere Menüsü"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:135
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:122
 msgid "Windows Right"
 msgstr "Pencereleri Sağa Döşe"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:131
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:124
 msgid "Word Wrap"
 msgstr "Heceleme"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1298
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:864
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1089
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1225
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1325
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:880
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1090
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1226
 msgid "Working..."
 msgstr "Çalışıyor..."
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:338
+msgid "Write memcards (GC)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46
 msgid "Write to Console"
 msgstr "Konsola Yaz"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:67
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:54
 msgid "Write to Debugger"
 msgstr "Hata ayıklayıcıya yaz"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:57
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44
 msgid "Write to File"
 msgstr "Dosyaya Yaz"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:61
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48
 msgid "Write to Window"
 msgstr "Pencereye Yaz"
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:60
+#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:47
 #, c-format
 msgid "XAudio2 CreateSourceVoice failed: %#X"
 msgstr "XAudio2 CreateSourceVoice başarsız: %#X"
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:114
+#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:101
 #, c-format
 msgid "XAudio2 init failed: %#X"
 msgstr "XAudio2 başlatılamadı: %#X"
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:124
+#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:111
 #, c-format
 msgid "XAudio2 master voice creation failed: %#X"
 msgstr "XAudio2 ana ses oluşturulamadı: %#X"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:766
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:765
 msgid "XF reg"
 msgstr "XF kaydı"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:21
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Yellow"
 msgstr "Sarı"
 
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:107
+#: Source/Core/Core/Src/DSP/DSPCore.cpp:120
 msgid ""
-"You are using free dsp roms made by Dolphin Team.\n"
-"Only Zelda ucode games will work correctly with them.\n"
+"You are using a free DSP ROM made by the Dolphin Team.\n"
+"All Wii games will work correctly, and most GC games should also work fine, "
+"but the GBA/IPL/CARD UCodes will not work.\n"
 msgstr ""
-"Dolphin Takımı tarafından yapılan bedava dsp ROM'ları kullanıyorsunuz. \n"
-"Sadece Zelda ucode oyunları bunlarla düzgün çalışabilir. \n"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:73
+#: Source/Core/Core/Src/DSP/DSPCore.cpp:116
+msgid ""
+"You are using an old free DSP ROM made by the Dolphin Team.\n"
+"Only games using the Zelda UCode will work correctly.\n"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:63
 msgid "You can't close panes that have pages in them."
 msgstr "Sayfalı bölmeleri kapatamazsınız."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:207
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:210
 msgid "You must choose a game!!"
 msgstr "Bir oyun seçmelisiniz!!"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:605
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:593
 msgid "You must enter a name!"
 msgstr "Bir isim girmelisiniz!"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:450
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:438
 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:603
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:591
 msgid "You must enter a valid profile name."
 msgstr "Geçerli bir profil ismi girmelisiniz."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:936
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:917
 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."
 
-#: Source/Core/Core/Src/CoreParameter.cpp:175
+#: Source/Core/Core/Src/DSP/DSPCore.cpp:109
+msgid ""
+"Your DSP ROMs have incorrect hashes.\n"
+"Would you like to stop now to fix the problem?\n"
+"If you select \"No\", audio might be garbled."
+msgstr ""
+
+#: Source/Core/Core/Src/CoreParameter.cpp:164
 msgid ""
 "Your GCM/ISO file seems to be invalid (invalid country).\n"
 "Continue with PAL region?"
@@ -5719,7 +5847,7 @@ msgstr ""
 "GCM/ISO dosyanız hatalı gibi görünüyor (hatalı bölge). \n"
 "PAL gibi davranılsın mı?"
 
-#: Source/Core/Common/Src/SysConf.cpp:58
+#: Source/Core/Common/Src/SysConf.cpp:45
 #, c-format
 msgid ""
 "Your SYSCONF file is the wrong size.\n"
@@ -5730,25 +5858,25 @@ msgstr ""
 "0x%04x olmalıdır (sizinki: 0x%04llx) \n"
 "Yenisini oluşturmak ister misiniz?"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:334
 msgid "ZTP hack"
 msgstr "ZTP Hilesi"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:387
+#: Source/Core/Core/Src/ActionReplay.cpp:377
 msgid "Zero 3 code not supported"
 msgstr "Sıfır-Üç kodu desteklenmemektedir."
 
-#: Source/Core/Core/Src/ActionReplay.cpp:408
+#: Source/Core/Core/Src/ActionReplay.cpp:398
 #, c-format
 msgid "Zero code unknown to dolphin: %08x"
 msgstr "Dolphin Sıfır kodu bilinmiyor: %08x"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:436
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:460
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:423
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:447
 msgid "[ waiting ]"
 msgstr "[ bekleniyor ]"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107
 msgid ""
 "[BROKEN]\n"
 "Highlight regions the EFB was copied from.\n"
@@ -5760,11 +5888,11 @@ msgstr ""
 "\n"
 "Emin değilseniz, işaretsiz bırakın."
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:91
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:78
 msgid "[Custom]"
 msgstr "[Özel]"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120
 msgid ""
 "[EXPERIMENTAL]\n"
 "Aims to speed up emulation by offloading texture decoding to the GPU using "
@@ -5782,7 +5910,7 @@ msgstr ""
 "\n"
 "Emin değilseniz, işaretsiz bırakın."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121
 msgid ""
 "[EXPERIMENTAL]\n"
 "Speeds up emulation a bit by caching display lists.\n"
@@ -5796,97 +5924,47 @@ msgstr ""
 "\n"
 "Emin değilseniz, işaretsiz bırakın."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:508
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:495
 msgid "^ ADD"
 msgstr "^ EKLE"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:820
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:801
 msgid "apploader (.img)"
 msgstr "apploader (.img)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:185
-msgid "failed to read bk header"
-msgstr "bk başlığı okunamadı"
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:375
-#, c-format
-msgid "failed to read data from file: %s"
-msgstr "%s dosyasından veri okunamadı"
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:97
-msgid "failed to read header"
-msgstr "başlık okunamadı"
-
-#: Source/Core/Core/Src/PowerPC/JitInterface.cpp:285
+#: Source/Core/Core/Src/PowerPC/JitInterface.cpp:272
 #, c-format
 msgid "iCacheJIT: Reading Opcode from %x. Please report."
 msgstr "iCacheJIT: %x 'den işlem kodu okunuyor. Lütfen bildirin."
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:108
-#, c-format
-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:935
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:936
 msgid "s"
 msgstr "s"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:457
-#, c-format
-msgid "unknown cmd 0x%08x"
-msgstr "Bilinmeyen komut 0x%08x"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1110
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1136
 msgid "wxExecute returned -1 on application run!"
 msgstr "wxExecute uygulama çalışırken -1'e düştü!"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:56
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:43
 msgid "zFar Correction: "
 msgstr "zFar Düzeltmesi:"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:51
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:38
 msgid "zNear Correction: "
 msgstr "zNear Düzeltmesi:"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:493
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:480
 msgid "| OR"
 msgstr "| VEYA"
 
-#~ msgid "%i connected"
-#~ msgstr "%i bağlandı"
-
-#~ msgid "Alternate Wiimote Timing"
-#~ msgstr "Alternatif Wiimote Zamanlaması"
-
-#~ msgid "Interpreter (VERY slow)"
-#~ msgstr "Yorumlayıcı (Çok Yavaş)"
-
-#~ msgid "JIT Recompiler (recommended)"
-#~ msgstr "JIT Yeniden Derleyici (önerilen)"
-
-#~ msgid "JITIL experimental recompiler"
-#~ msgstr "JITIL Deneysel Yeniden Derleyici"
+#~ msgid "Accurate VBeam emulation"
+#~ msgstr "Doğru VBeam Emülasyonu"
 
 #~ msgid ""
-#~ "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. "
-#~ "No effect on emulated wiimotes."
+#~ "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)"
 #~ msgstr ""
-#~ "WiiMote hoparlörünün sesini kapatır. Gerçek WiiMote'lardaki rastgele "
-#~ "bağlantı kesilmelerini önler. Taklit WiiMote'ları etkilemez."
+#~ "Saniyedeki çerçeve sayısı düzensizse, bu seçenek size yardım edebilir. "
+#~ "(Açık = Uyumlu, Kapalı = Hızlı)"
 
-#~ msgid "Pair Up"
-#~ msgstr "Eşleştir"
-
-#~ msgid "Reconnect Wiimote Confirm"
-#~ msgstr "Wiimote Tekrar Bağlama Onayı"
-
-#~ msgid ""
-#~ "Wiimote %i has been disconnected by system.\n"
-#~ "Maybe this game doesn't support multi-wiimote,\n"
-#~ "or maybe it is due to idle time out or other reason.\n"
-#~ "Do you want to reconnect immediately?"
-#~ msgstr ""
-#~ "Wiimote %i 'nin sistemdeki bağlantısı kesildi. \n"
-#~ "Bu oyun birden fazla Wiimote'u desteklemiyor olabilir,\n"
-#~ "bir zaman aşımı olabilir veya başka bir şey olabilir. \n"
-#~ "Tekrar bağlamak istiyor musunuz?"
+#~ msgid "Skip Dest. Alpha Pass"
+#~ msgstr "Hedef Alpha Geçişini Atla"
diff --git a/Languages/po/zh_CN.po b/Languages/po/zh_CN.po
index 5c7319213d..0eb3f18f5a 100644
--- a/Languages/po/zh_CN.po
+++ b/Languages/po/zh_CN.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the dolphin-emu package.
 #
 # Translators:
-# thegfw <thegfw@gmail.com>, 2011.
-# 周岩 <sentret_c@sina.cn>, 2013.
+# Sentret_C <sentret_c@sina.cn>, 2013
+# thegfw <thegfw@gmail.com>, 2011
+# Sentret_C <sentret_c@sina.cn>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: Dolphin Emulator\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-10 08:56-0500\n"
-"PO-Revision-Date: 2013-03-08 14:37+0000\n"
+"POT-Creation-Date: 2013-04-18 23:00-0500\n"
+"PO-Revision-Date: 2013-04-14 02:35+0000\n"
 "Last-Translator: Sentret_C <sentret_c@sina.cn>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/dolphin-"
 "emu/language/zh_CN/)\n"
@@ -20,21 +21,21 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:511
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:499
 msgid " (too many to display)"
 msgstr " (要显示的项目太多)"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:270
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:273
 #: Source/Core/DolphinWX/Src/NetWindow.cpp:491
 #: Source/Core/DolphinWX/Src/NetWindow.cpp:530
 msgid " Game : "
 msgstr " 游戏 : "
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:507
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494
 msgid "! NOT"
 msgstr "! 非"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:70
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:58
 #, c-format
 msgid ""
 "\"%s\" does not exist.\n"
@@ -43,101 +44,100 @@ msgstr ""
 "\"%s\" 不存在.\n"
 " 创建一个新的 16MB 记忆卡?"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:142
+#: Source/Core/Core/Src/CoreParameter.cpp:131
 #, c-format
 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:722
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:721
 #, c-format
 msgid "%08X:  "
 msgstr "%08X:  "
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:196
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:183
 #, c-format
 msgid "%1$sCopy%1$s"
 msgstr "%1$s复制%1$s"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:128
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:296
+#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:113
+#, c-format
+msgid "%d samples"
+msgstr "%d个样本"
+
+#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:112
+#, c-format
+msgid "%d samples (quality level %d)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:121
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:289
 #, c-format
 msgid "%s already exists, overwrite?"
 msgstr "%s 已经存在,覆盖吗?"
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:167
+#: Source/Core/DiscIO/Src/CompressedBlob.cpp:154
 #, c-format
 msgid "%s failed to be scrubbed. Probably the image is corrupt."
 msgstr "提取 %s 失败.可能镜像是坏的."
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:95
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:83
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
 " Card file size is invalid (0x%x bytes)"
 msgstr ""
-"未能作为记忆卡打开%s \n"
+"未能作为存储卡打开%s \n"
 " 卡文件大小无效 (0x%x 字节)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:110
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:98
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
 " Card size is invalid (0x%x bytes)"
 msgstr ""
-"未能作为记忆卡打开%s \n"
+"未能作为存储卡打开%s \n"
 " 卡大小无效 (0x%x 字节)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:90
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:78
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
 "file is not large enough to be a valid memory card file (0x%x bytes)"
 msgstr ""
-"未能作为记忆卡打开%s \n"
+"未能作为存储卡打开%s \n"
 "相对于有效的记忆卡文件，该文件太小 (0x%x 字节)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:367
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:359
 #, c-format
 msgid "%s failed to open"
 msgstr "打开 %s 失败"
 
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:97
-#, c-format
-msgid ""
-"%s has an incorrect hash.\n"
-"Would you like to stop now to fix the problem?\n"
-"If you select \"No\", audio will be garbled."
-msgstr ""
-"%s 的校检不正确.\n"
-"你是否希望现在就停止来处理这个问题?\n"
-"如果选择 \"否\", 声音可能会出现混乱."
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:360
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:352
 #, c-format
 msgid "%s is a 0 byte file"
 msgstr " %s 是一个零字节文件"
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:159
+#: Source/Core/DiscIO/Src/CompressedBlob.cpp:146
 #, c-format
 msgid "%s is already compressed! Cannot compress it further."
 msgstr "%s 已经被压缩过! 不能对它再进行压缩了."
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:345
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:337
 #, c-format
 msgid "%s is too long for the filename, max chars is 45"
 msgstr "%s 作为文件名太长,最大字符数为45"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:202
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:189
 #, c-format
 msgid "%sDelete%s"
 msgstr "%s删除%s"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:200
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:187
 #, c-format
 msgid "%sExport GCI%s"
 msgstr "%s导出 GCI%s"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:198
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:185
 #, c-format
 msgid "%sImport GCI%s"
 msgstr "%s导入 GCI%s"
@@ -147,278 +147,301 @@ msgstr "%s导入 GCI%s"
 msgid "%u Free Blocks; %u Free Dir Entries"
 msgstr "%u 空闲区块; %u 空闲目录项目"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:506
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:493
 msgid "&& AND"
 msgstr "&& 与"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:295
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:301
 msgid "&About..."
 msgstr "关于(&A)..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:99
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:100
 msgid "&Boot from DVD Drive..."
 msgstr "从光驱启动(&B)..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:231
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:234
 msgid "&Breakpoints"
 msgstr "断点(&B)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:110
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:111
 msgid "&Browse for ISOs..."
 msgstr "浏览镜像(&B)..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:192
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:195
 msgid "&Cheats Manager"
 msgstr "作弊码管理器(&C)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:177
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:180
 msgid "&DSP Settings"
 msgstr "DSP设置(&D)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:885
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:876
 msgid "&Delete ISO..."
 msgstr "删除镜像(&D)..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:903
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:897
 msgid "&Delete selected ISOs..."
 msgstr "删除所选镜像(&D)..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:170
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:173
 msgid "&Emulation"
 msgstr "模拟(&E)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:113
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:114
 msgid "&File"
 msgstr "文件(&F)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:335
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:341
 msgid "&Frame Advance"
 msgstr "帧数步进(&F)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:352
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:358
 msgid "&Fullscreen"
 msgstr "切换全屏(&F)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:176
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:179
 msgid "&Graphics Settings"
 msgstr "图形设置(&G)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:296
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:302
 msgid "&Help"
 msgstr "帮助(&H)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:180
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:183
 msgid "&Hotkey Settings"
 msgstr "热键设置(&H)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:233
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:236
 msgid "&JIT"
 msgstr "即时编译器(&J)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:148
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:149
 msgid "&Load State"
 msgstr "载入状态(&L)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:190
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:193
 msgid "&Memcard Manager (GC)"
-msgstr "GC记忆卡管理器(&M)"
+msgstr "GC存储卡管理器(&M)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:232
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:235
 msgid "&Memory"
 msgstr "内存(&M)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:313
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:319
 msgid "&Open..."
 msgstr "打开(&O)..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:186
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:189
 msgid "&Options"
 msgstr "选项(&O)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:324
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:330
 msgid "&Pause"
 msgstr "暂停游戏(&P)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:326
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:332
 msgid "&Play"
 msgstr "开始游戏(&P)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:867
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:858
 msgid "&Properties"
 msgstr "属性(&P)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:348
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:354
 msgid "&Read-only mode"
 msgstr "只读模式(&R)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:319
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:325
 msgid "&Refresh List"
 msgstr "刷新列表(&R)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:230
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:233
 msgid "&Registers"
 msgstr "寄存器(&R)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:332
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:338
 msgid "&Reset"
 msgstr "重置游戏(&R)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:234
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:237
 msgid "&Sound"
 msgstr "声音(&S)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:329
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:335
 msgid "&Stop"
 msgstr "停止游戏(&S)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:207
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:210
 msgid "&Tools"
 msgstr "工具(&T)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:235
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:238
 msgid "&Video"
 msgstr "视频(&V)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:284
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:287
 msgid "&View"
 msgstr "视图(&V)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:179
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:182
 msgid "&Wiimote Settings"
 msgstr "Wii遥控器设置(&W)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:868
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:859
 msgid "&Wiki"
 msgstr "百科(&W)"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504
 msgid "'"
 msgstr "'"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:59
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:46
 msgid "(-)+zFar"
 msgstr "(-)+zFar"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:54
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:41
 msgid "(-)+zNear"
 msgstr "(-)+zNear"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:99
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:86
 msgid "(UNKNOWN)"
 msgstr "(未知)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:376
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:384
 msgid "(off)"
 msgstr "(关)"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:655
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:654
 msgid "0x44"
 msgstr "0x44"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+msgid "1.5x Native (960x792)"
+msgstr "1.5x 原生（960x792）"
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:158
 msgid "16 bit"
 msgstr "16 位"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+msgid "1x Native (640x528)"
+msgstr "1x 原生（640x528）"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+msgid "2.5x Native (1600x1320)"
+msgstr "2.5x 原生（1600x1320）"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+msgid "2x Native (1280x1056)"
+msgstr "2x 原生（1280x1056）"
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:159
 msgid "32 bit"
 msgstr "32 位"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:412
 msgid "3D Vision"
 msgstr "3D Vision"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+msgid "3x Native (1920x1584)"
+msgstr "3x 原生（1920x1584）"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+msgid "4x Native (2560x2112)"
+msgstr "4x 原生（2560x2112）"
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:157
 msgid "8 bit"
 msgstr "8 位"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:43
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:30
 msgid "<Insert name here>"
 msgstr "<在这里插入名称>"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:255
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:262
 msgid "<No resolutions found>"
 msgstr "<未找到分辨率>"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:104
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84
 msgid "<Nothing>"
 msgstr "<无>"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:162
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:162
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:150
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:150
 msgid "<Press Key>"
 msgstr "<按任意键>"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286
 msgid "<System>"
 msgstr "<系统>"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695
 msgid "A"
 msgstr "A"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:201
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:235
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:204
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:238
 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:353
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:387
 msgid "A game is not currently running."
 msgstr "目前没有游戏运行."
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:68
-#, fuzzy
 msgid ""
 "A supported bluetooth device could not be found.\n"
 "You must manually connect your wiimotes."
 msgstr ""
-"找不到支持的蓝牙设备！\n"
-"如果使用的不是微软的蓝牙协议栈，您需要手动配对Wii遥控器且仅使用“刷新”按钮。"
+"未发现支持的蓝牙设备。\n"
+"您需要手动连接您的Wii遥控器。"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:109
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:100
+#, fuzzy
 msgid ""
 "ALERT:\n"
 "\n"
-"NetPlay will currently only work properly when using the following "
-"settings:\n"
-" - Dual Core [OFF]\n"
-" - Audio Throttle [OFF]\n"
-" - DSP-HLE with \"Null Audio\" or DSP-LLE\n"
-" - Manually set the exact number of controllers that will be used to "
-"[Standard Controller]\n"
+"Netplay will only work with the following settings:\n"
+" - Enable Dual Core [OFF]\n"
+" - DSP Emulator Engine Must be the same on all computers!\n"
+" - DSP on Dedicated Thread [OFF]\n"
+" - Framelimit NOT set to [Audio]\n"
+" - Manually set the exact number of controllers to be used to [Standard "
+"Controller]\n"
 "\n"
-"All players should try to use the same Dolphin version and settings.\n"
-"Disable all memory cards or send them to all players before starting.\n"
-"Wiimote support has not been implemented.\n"
+"All players should use the same Dolphin version and settings.\n"
+"All memory cards must be identical between players or disabled.\n"
+"Wiimote support has not been implemented!\n"
 "\n"
-"You must forward TCP port to host!!"
+"The host must have the chosen TCP port open/forwarded!\n"
 msgstr ""
 "警告:\n"
 "\n"
 "NetPlay目前仅能在如下设置下正常工作:\n"
 " - 双核心 [关]\n"
 " - 音频限流 [关]\n"
-" - DSP-HLE with \"Null Audio\" 或 DSP-LLE\n"
-" - Manually set the exact number of controllers that will be used to "
-"[Standard Controller]\n"
+" - 开启“无音频”的DSP-HLE或DSP-LLE\n"
+" - 手动在[标准控制器]中准确设置将使用的控制器数目\n"
 "\n"
-"所有玩家应尽量使用相同版本的Dolphin并使用相同设置。\n"
-"禁用所有记忆卡或在开始前将记忆卡发送给所有玩家。\n"
-"尚未实现Wiimote支持。\n"
+"所有玩家应尽量使用相同版本的Dolphin以及相同的设置。\n"
+"禁用所有存储卡或在开始前将存储卡发送给所有玩家。\n"
+"尚未实现Wii遥控器支持。\n"
 "\n"
-"You must forward TCP port to host!!"
+"您必须设置TCP端口转发以成为主机！！"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:111
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:116
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96
 msgid "AM-Baseboard"
 msgstr "AM-基板"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:299
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:115
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:300
 msgid "AR Codes"
 msgstr "动作回放代码"
 
-#: Source/Core/DolphinWX/Src/AboutDolphin.h:33
+#: Source/Core/DolphinWX/Src/AboutDolphin.h:21
 msgid "About Dolphin"
 msgstr "关于 Dolphin"
 
@@ -426,15 +449,11 @@ msgstr "关于 Dolphin"
 msgid "Acceleration"
 msgstr "加速器"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:463
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473
 msgid "Accuracy:"
 msgstr "精确度:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317
-msgid "Accurate VBeam emulation"
-msgstr "精确VBeam模拟"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97
 msgid ""
 "Accurately emulate EFB copies.\n"
 "Some games depend on this for certain graphical effects or gameplay "
@@ -447,12 +466,12 @@ msgstr ""
 "\n"
 "如果没有把握，请选择缓冲到材质。"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:239
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:239
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:227
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:227
 msgid "Action"
 msgstr "操作"
 
-#: Source/Core/Core/Src/ARDecrypt.cpp:481
+#: Source/Core/Core/Src/ARDecrypt.cpp:469
 #, c-format
 msgid ""
 "Action Replay Code Decryption Error:\n"
@@ -467,102 +486,102 @@ msgstr ""
 "错误代码:\n"
 "%s"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:667
+#: Source/Core/Core/Src/ActionReplay.cpp:657
 #, 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:755
+#: Source/Core/Core/Src/ActionReplay.cpp:745
 #, 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:547
+#: Source/Core/Core/Src/ActionReplay.cpp:537
 #, 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:607
+#: Source/Core/Core/Src/ActionReplay.cpp:597
 #, 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:802
+#: Source/Core/Core/Src/ActionReplay.cpp:792
 #, c-format
 msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)"
 msgstr "动作回放错误: 无效数值 (%08x) 于 内存复制 (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:682
+#: Source/Core/Core/Src/ActionReplay.cpp:672
 #, c-format
 msgid ""
 "Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)\n"
 "Master codes are not needed. Do not use master codes."
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:196
+#: Source/Core/Core/Src/ActionReplay.cpp:184
 #, c-format
 msgid "Action Replay Error: invalid AR code line: %s"
 msgstr "动作回放错误: 无效动作回放代码行: %s"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:872
+#: Source/Core/Core/Src/ActionReplay.cpp:862
 #, c-format
 msgid "Action Replay: Conditional Code: Invalid Size %08x (%s)"
 msgstr "动作回放: 条件代码: 无效大小 %08x (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:945
+#: Source/Core/Core/Src/ActionReplay.cpp:935
 #, c-format
 msgid "Action Replay: Invalid Normal Code Type %08x (%s)"
 msgstr "动作回放: 无效正常代码类型 %08x (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:896
+#: Source/Core/Core/Src/ActionReplay.cpp:886
 #, c-format
 msgid "Action Replay: Normal Code %i: Invalid subtype %08x (%s)"
 msgstr "动作回放: 正常代码 %i: 无效子类型 %08x (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:838
+#: Source/Core/Core/Src/ActionReplay.cpp:828
 #, c-format
 msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)"
 msgstr "动作回放: 正常代码 0: 无效子类型 %08x (%s)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:242
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:247
 msgid "Adapter:"
 msgstr "适配器:"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:76
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:63
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:63
 msgid "Add"
 msgstr "添加"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1275
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1301
 msgid "Add ActionReplay Code"
 msgstr "添加动作回放代码"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1204
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1230
 msgid "Add Patch"
 msgstr "添加补丁"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:507
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:528
 msgid "Add new pane"
 msgstr "添加新面板"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:404
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:426
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:811
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:408
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:430
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:792
 msgid "Add..."
 msgstr "添加..."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:90
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:81
 msgid "Address :"
 msgstr "地址 :"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:58
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:45
 msgid ""
 "Adds the specified value to zFar Parameter.\n"
 "Two ways to express the floating point values.\n"
@@ -574,13 +593,13 @@ msgid ""
 msgstr ""
 "将指定值加到 zFar 参数上。\n"
 "有两种方法表达浮点数值。\n"
-"例如: 输入''200''或直接输入''0.0002''将产生同样的效果，系统都将捕捉到"
-"值''0.0002''。\n"
-"值: (0->+/-整数) 或 (0->+/-浮点[6 位精度])\n"
+"例如: 输入“200”或直接输入“0.0002”将产生同样的效果，系统都将捕捉到"
+"值“0.0002”。\n"
+"值：（0->+/-整数）或（0->+/-浮点[6 位精度]）\n"
 "\n"
-"注意: 可在“日志窗口/控制台”中查看系统捕捉值。"
+"注意：可在“日志窗口/控制台”中查看系统捕捉值。"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:53
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:40
 msgid ""
 "Adds the specified value to zNear Parameter.\n"
 "Two ways to express the floating point values.\n"
@@ -592,105 +611,109 @@ msgid ""
 msgstr ""
 "将指定值加到 zNear 参数上。\n"
 "有两种方法表达浮点数值。\n"
-"例如: 输入''200''或直接输入''0.0002''将产生同样的效果，系统都将捕捉到"
-"值''0.0002''。\n"
-"值: (0->+/-整数) 或 (0->+/-浮点[6 位精度])\n"
+"例如: 输入“200”或直接输入“0.0002”将产生同样的效果，系统都将捕捉到"
+"值“0.0002”。\n"
+"值：（0->+/-整数）或（0->+/-浮点[6 位精度]）\n"
 "\n"
-"注意: 可在“日志窗口/控制台”中查看系统捕捉值。"
+"注意：可在“日志窗口/控制台”中查看系统捕捉值。"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:755
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:744
 msgid "Adjust the analog control pressure required to activate buttons."
 msgstr "调整激活按钮所需的模拟控制压力。"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:509
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:522
 msgid "Advanced"
 msgstr "高级"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561
 msgid "Advanced Settings"
 msgstr "高级设置"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:584
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:587
 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:816
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:797
 msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)"
 msgstr "所有 GC/Wii 镜像 (gcm, iso, ciso, gcz)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1189
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1190
 msgid "All Gamecube GCM files (gcm)"
 msgstr "所有 Gamecube GCM 文件 (gcm)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1390
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1404
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1417
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1431
 msgid "All Save States (sav, s##)"
 msgstr "所有存档状态 (sav, s##)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1187
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1188
 msgid "All Wii ISO files (iso)"
 msgstr "所有 Wii 镜像文件 (iso)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1207
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1208
 msgid "All compressed GC/Wii ISO files (gcz)"
 msgstr "所有压缩的 GC/Wii 镜像文件 (gcz)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:124
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:104
 msgid "All files (*.*)|*.*"
 msgstr "所有文件 (*.*)|*.*"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123
 msgid ""
 "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"
+"（复制EFB）和6（雾）。\n"
+"\n"
+"如果没有把握，请不要勾选此项。"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:285
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:272
 msgid "Analyze"
 msgstr "分析"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:298
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:285
 msgid "Angle"
 msgstr "角度"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:367
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:375
 msgid "Anisotropic Filtering:"
 msgstr "各向异性过滤:"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:350
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:358
 msgid "Anti-Aliasing:"
 msgstr "抗锯齿:"
 
-#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:308
+#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:299
 msgid "Apploader is the wrong size...is it really an apploader?"
 msgstr "应用程序载入器大小错误...这真是一个应用程序载入器(apploader)?"
 
-#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:302
+#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:293
 msgid "Apploader unable to load from file"
 msgstr "应用程序载入器不能从文件载入"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:841
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:822
 msgid "Apploader:"
 msgstr "应用载入器:"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:135
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:122
 msgid "Apply"
 msgstr "应用"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124
 msgid ""
 "Apply a post-processing effect after finishing a frame.\n"
 "\n"
 "If unsure, select (off)."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287
 msgid "Arabic"
 msgstr "阿拉伯语"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:614
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:603
 #, c-format
 msgid "Are you sure you want to delete \"%s\"?"
 msgstr "您确定要删除 \"%s\" ?"
@@ -705,48 +728,52 @@ msgstr ""
 
 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1004
 msgid "Are you sure you want to delete this file?  It will be gone forever!"
-msgstr "请确认真的要删除这个文件?这将是永久性的删除!"
+msgstr "您确定想要删除这个文件？这将是永久性的删除！"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:789
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:277
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:44
+msgid "Arm JIT (experimental)"
+msgstr "Arm JIT（实验性）"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:285
 msgid "Aspect Ratio:"
 msgstr "宽高比:"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:70
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:58
 msgid "At least one pane must remain open."
 msgstr "必须有一个窗口保持打开"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:553
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533
 msgid "Audio"
 msgstr "音频"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:694
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675
 msgid "Audio Backend:"
 msgstr "音频后端:"
 
-#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:41
+#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:28
 msgid "AudioCommon: Error opening AO device.\n"
 msgstr "AudioCommon: 打开 AO 设备错误.\n"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:275
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283
 msgid "Auto"
 msgstr "自动"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:337
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345
 msgid "Auto (Multiple of 640x528)"
-msgstr "自动 (640x528的倍数)"
+msgstr "自动（640x528的倍数）"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:337
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345
 msgid "Auto (Window Size)"
-msgstr "自动 (窗口大小)"
+msgstr "自动（窗口大小）"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:297
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305
 msgid "Auto adjust Window Size"
 msgstr "自动调节窗口大小"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77
 msgid ""
 "Automatically adjusts the window size to your internal resolution.\n"
 "\n"
@@ -756,160 +783,160 @@ msgstr ""
 "\n"
 "如果没有把握，请不要勾选此项。"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:697
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696
 msgid "B"
 msgstr "B"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:755
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:754
 msgid "BP register "
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:27
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:14
 msgid "Back"
 msgstr "Back"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:698
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:679
 msgid "Backend Settings"
 msgstr "后端设置"
 
-#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:60
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:206
+#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:47
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:211
 msgid "Backend:"
-msgstr "后端:"
+msgstr "后端："
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:318
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:95
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:305
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:82
 msgid "Background Input"
 msgstr "后台输入"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:279
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:266
 msgid "Backward"
 msgstr "Backward"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:264
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:257
 msgid "Bad File Header"
 msgstr "无效文件头"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:627
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:621
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:290
 msgid "Banner"
 msgstr "标志"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:519
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:529
 msgid "Banner Details"
 msgstr "标志详细信息"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491
 msgid "Banner:"
 msgstr "标志:"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:57
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:61
 msgid "Bar"
 msgstr "Bar"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:308
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:316
 msgid "Basic"
 msgstr "基本"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555
 msgid "Basic Settings"
 msgstr "基本设置"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:22
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Bass"
 msgstr "Bass"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:186
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:174
 msgid "Block Allocation Table checksum failed"
 msgstr "Block Allocation Table checksum failed"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:631
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625
 msgid "Blocks"
 msgstr "区块"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:21
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Blue"
 msgstr "蓝"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:24
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Blue Left"
 msgstr "蓝 左"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:25
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Blue Right"
 msgstr "蓝 右"
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:87
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270
 msgid "Bottom"
 msgstr "底部"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:238
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:225
 #, c-format
 msgid "Bound Controls: %lu"
 msgstr "绑定控制器: %lu"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348
 msgid "Broken"
 msgstr "损坏"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:422
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:428
 msgid "Browse"
 msgstr "浏览"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:256
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:243
 msgid "Browse for a directory to add"
 msgstr "浏览要添加的目录"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:422
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:428
 msgid "Browse for an ISO directory..."
 msgstr "浏览镜像目录"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1079
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1080
 msgid "Browse for output directory"
 msgstr "浏览输出目录"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:328
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:331
 msgid "Buffer:"
 msgstr "缓冲区:"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:58
 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:119
+#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:106
 msgid "Buttons"
 msgstr "按键"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317
 msgid ""
 "Bypass the clearing of the data cache by the DCBZ instruction. Usually leave "
 "this option disabled."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:698
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:697
 msgid "C"
 msgstr "C"
 
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:77
+#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:64
 msgid "C Stick"
 msgstr "C 摇杆"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:77
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:64
 msgid "C-Stick"
 msgstr "C-摇杆"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:764
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:763
 msgid "CP reg"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:567
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547
 msgid "CPU Emulator Engine"
 msgstr "CPU 模拟引擎"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:490
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500
 msgid "Cache Display Lists"
 msgstr "缓存显示列表"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88
 msgid ""
 "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n"
 "Decreases emulation speed by some percent (depending on your GPU).\n"
@@ -917,40 +944,55 @@ msgid ""
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
-"以每像素而非每顶点计算3D图像的照明。\n"
-"将在一定程度上降低模拟速度(取决于您的GPU)。\n"
+"逐个像素而非逐个顶点地计算3D图像的照明。\n"
+"在一定程度上降低模拟速度（取决于您的GPU）。\n"
 "该增强通常是安全的，但偶尔也会造成问题。\n"
 "\n"
 "如果没有把握，请不要勾选此项。"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1858
+#, c-format
+msgid "Can't find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x"
+msgstr ""
+
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1872
+#, c-format
+msgid "Can't find WiiMote by connection handle %02x"
+msgstr ""
+
+#: Source/Core/Core/Src/HW/DVDInterface.cpp:669
+#: Source/Core/Core/Src/HW/DVDInterface.cpp:679
+msgid "Can't read from DVD_Plugin - DVD-Interface: Fatal Error"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:124
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:28
 msgid "Cancel"
 msgstr "取消"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:91
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:178
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:240
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:84
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:171
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:233
 #, c-format
 msgid "Cannot open %s"
 msgstr "不能打开 %s"
 
-#: Source/Core/Core/Src/CoreTiming.cpp:141
+#: Source/Core/Core/Src/CoreTiming.cpp:128
 msgid "Cannot unregister events with events pending"
 msgstr "事件未决时不能反注册事件"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1078
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1061
 #, c-format
 msgid ""
 "Cannot use that file as a memory card.\n"
 "%s\n"
 "is not a valid gamecube memory card file"
 msgstr ""
-"不能作为记忆卡使用文件\n"
+"不能作为存储卡使用该文件。\n"
 "%s\n"
-"不是有效的Gamecube记忆卡文件"
+"不是有效的Gamecube存储卡文件"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1108
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1091
 msgid ""
 "Cannot use that file as a memory card.\n"
 "Are you trying to use the same file in both slots?"
@@ -958,30 +1000,15 @@ 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:1867
-#, 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:1881
-#, c-format
-msgid "Cant find WiiMote by connection handle %02x"
-msgstr "不能按照连接句柄 %02x 找到 WiiMote"
-
-#: 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接口读取数据: 严重错误"
-
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:52
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:39
 msgid "Caps Lock"
 msgstr "大写锁定"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288
 msgid "Catalan"
 msgstr "加泰罗尼亚语"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:311
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:298
 msgid "Center"
 msgstr "中心"
 
@@ -989,12 +1016,12 @@ msgstr "中心"
 msgid "Change"
 msgstr "切换"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:316
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:322
 msgid "Change &Disc..."
 msgstr "切换光盘(&D)..."
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:179
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:179
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:167
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:167
 msgid "Change Disc"
 msgstr "切换光盘"
 
@@ -1002,7 +1029,7 @@ msgstr "切换光盘"
 msgid "Change Game"
 msgstr "切换游戏"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:515
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495
 msgid ""
 "Change the language of the user interface.\n"
 "Requires restart."
@@ -1010,75 +1037,75 @@ msgstr ""
 "修改用户界面语言.\n"
 "需要重启."
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:60
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:47
 msgid "Changes sign to zFar Parameter (after correction)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:55
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:42
 msgid "Changes sign to zNear Parameter (after correction)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:519
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499
 msgid "Changing this will have no effect while the emulator is running!"
-msgstr "模拟器正在运行时改动将不会生效!"
+msgstr "模拟器正在运行时改动将不会生效！"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:295
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:298
 msgid "Chat"
-msgstr "Chat"
+msgstr "聊天"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:47
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:34
 msgid "Cheat Code"
 msgstr "作弊码"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:118
 msgid "Cheat Search"
 msgstr "作弊码搜索"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:38
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:25
 msgid "Cheats Manager"
 msgstr "金手指管理"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:633
 msgid "Check Partition Integrity"
 msgstr "检查分区完整性"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:864
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:880
 msgid "Checking integrity..."
 msgstr "完整性检查中..."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289
 msgid "Chinese (Simplified)"
 msgstr "简体中文"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290
 msgid "Chinese (Traditional)"
 msgstr "繁体中文"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:818
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:799
 msgid "Choose a DVD root directory:"
 msgstr "选择一个DVD根目录"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:822
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803
 msgid "Choose a NAND root directory:"
-msgstr "选择一个NAND根目录:"
+msgstr "选择一个NAND根目录："
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:815
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:796
 msgid "Choose a default ISO:"
-msgstr "选择一个默认镜像"
+msgstr "选择一个默认镜像："
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1236
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1219
 msgid "Choose a directory to add"
 msgstr "选择一个要添加的目录"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1065
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1048
 msgid "Choose a file to open"
 msgstr "选择要打开的文件"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:217
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:204
 msgid "Choose a memory card:"
-msgstr "选择一个内存卡"
+msgstr "选择一个存储卡："
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:819
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800
 msgid ""
 "Choose file to use as apploader: (applies to discs constructed from "
 "directories only)"
@@ -1086,148 +1113,148 @@ msgstr ""
 "Choose file to use as apploader: (applies to discs constructed from "
 "directories only)"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:767
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:806
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:781
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:822
 msgid "Choose the folder to extract to"
 msgstr "选择解压缩到的文件夹"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:297
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:284
 msgid "Circle Stick"
 msgstr "Circle Stick"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:52
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:56
 msgid "Classic"
 msgstr "经典"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:144
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:43
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:487
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:913
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:137
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:30
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:474
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:904
 msgid "Clear"
 msgstr "清除"
 
-#: Source/Core/Core/Src/NetPlayServer.cpp:259
+#: Source/Core/Core/Src/NetPlayServer.cpp:263
 msgid ""
 "Client disconnect while game is running!! NetPlay is disabled. You must "
 "manually stop the game."
-msgstr "游戏运行时与客户端连接断开!! NetPlay已禁用. 您必须手动停止游戏."
+msgstr "游戏运行时与客户端连接断开！！NetPlay已禁用。您必须手动停止游戏。"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:298
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:247
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:552
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:578
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:285
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:234
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:562
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:590
 msgid "Close"
 msgstr "关闭"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:174
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:177
 msgid "Co&nfigure..."
 msgstr "程序设置(&N)..."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:86
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:73
 msgid "Code Info"
 msgstr "代码信息"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:568
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:556
 msgid "Code: "
 msgstr "代码:"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:35
 msgid "Command"
 msgstr "命令"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:629
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:623
 msgid "Comment"
 msgstr "注释"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489
 msgid "Comment:"
 msgstr "注释:"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:893
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:884
 msgid "Compress ISO..."
 msgstr "压缩镜像..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:905
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:899
 msgid "Compress selected ISOs..."
 msgstr "压缩所选镜像..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1088
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1224
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1089
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1225
 msgid "Compressing ISO"
 msgstr "压缩镜像中"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:429
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:435
 msgid "Config"
 msgstr "设置"
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:37
-#: Source/Core/DolphinWX/Src/InputConfigDiag.h:135
-#: Source/Core/DolphinWX/Src/InputConfigDiag.h:154
+#: Source/Core/DolphinWX/Src/InputConfigDiag.h:122
+#: Source/Core/DolphinWX/Src/InputConfigDiag.h:141
 msgid "Configure"
 msgstr "设置"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:111
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:98
 msgid "Configure Control"
 msgstr "设置面板"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:306
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
 #: Source/Core/DolphinWX/Src/NetWindow.cpp:583
 msgid "Configure Pads"
 msgstr "设置手柄"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:429
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:435
 msgid "Configure..."
 msgstr "设置..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1119
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1147
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1217
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1120
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1218
 msgid "Confirm File Overwrite"
 msgstr "确认文件覆盖"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:597
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:577
 msgid "Confirm on Stop"
 msgstr "停止时确认"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:83
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:105
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:74
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:96
 msgid "Connect"
 msgstr "连接"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:783
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:764
 msgid "Connect USB Keyboard"
 msgstr "连接 USB 键盘"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:362
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:368
 #, c-format
 msgid "Connect Wiimote %i"
 msgstr "连接 Wiimote %i"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:195
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183
 msgid "Connect Wiimote 1"
 msgstr "连接 Wiimote 1"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184
 msgid "Connect Wiimote 2"
 msgstr "连接 Wiimote 2"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:185
 msgid "Connect Wiimote 3"
 msgstr "连接 Wiimote 3"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:198
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:186
 msgid "Connect Wiimote 4"
 msgstr "连接 Wiimote 4"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:627
+#: Source/Core/DolphinWX/Src/Main.cpp:655
 msgid "Connecting..."
 msgstr "连接中..."
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:155
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:156
 msgid "Console"
 msgstr "控制台"
 
@@ -1235,15 +1262,15 @@ msgstr "控制台"
 msgid "Continuous Scanning"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:46
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:33
 msgid "Control"
 msgstr "控制"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:189
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:176
 msgid "Convert to GCI"
 msgstr "转换到 GCI"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:379
+#: Source/Core/Core/Src/CoreParameter.cpp:368
 msgid "Copy failed"
 msgstr "复制失败"
 
@@ -1252,36 +1279,36 @@ msgstr "复制失败"
 msgid "Copy to Memcard %c"
 msgstr "复制到内存卡 %c"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:359
 msgid "Core"
 msgstr "核心"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:154
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:148
 #, c-format
 msgid "Could not create %s"
 msgstr "不能创建 %s"
 
-#: Source/Core/AudioCommon/Src/AudioCommon.cpp:75
+#: Source/Core/AudioCommon/Src/AudioCommon.cpp:62
 #, c-format
 msgid "Could not initialize backend %s."
 msgstr "不能初始化后端 %s"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:137
+#: Source/Core/Core/Src/CoreParameter.cpp:126
 #, c-format
 msgid ""
 "Could not read \"%s\".  There is no disc in the drive, or it is not a GC/Wii "
 "backup.  Please note that original Gamecube and Wii discs cannot be read by "
 "most PC DVD drives."
 msgstr ""
-"不能读取\"%s\"。  驱动器里没有光盘或不是GC/Wii备份。  请注意大多数PC DVD驱动"
-"器不能读取原始的Gamecube与Wii光盘。"
+"不能读取\"%s\"。驱动器里没有光盘或不是GC/Wii备份。请注意大多数PC DVD驱动器不"
+"能读取原始的Gamecube与Wii光盘。"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:292
+#: Source/Core/Core/Src/CoreParameter.cpp:281
 #, c-format
 msgid "Could not recognize ISO file %s"
 msgstr "不能识别 ISO 文件 %s"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:569
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:579
 #, c-format
 msgid "Could not save %s"
 msgstr "不能保存 %s"
@@ -1294,23 +1321,30 @@ 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:123
+#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119
 #, c-format
 msgid ""
 "Could not write memory card file %s.\n"
 "\n"
 "Are you running Dolphin from a CD/DVD, or is the save file maybe write "
-"protected?"
-msgstr ""
-"不能写入内存卡文件 %s.\n"
+"protected?\n"
 "\n"
-"您是不是在CD/DVD上运行的Dolphin?或者存档文件带有写入保护?"
+"Are you receiving this after moving the emulator directory?\n"
+"If so, then you may need to re-specify your memory card location in the "
+"options."
+msgstr ""
+"无法写入存储卡文件%s。\n"
+"\n"
+"您是否正在从CD/DVD上运行Dolphin，或者存档文件是否写保护？\n"
+"\n"
+"您是否是在移动模拟器目录后收到这个消息？\n"
+"如果这样，您可能需要在选项中重新指定您的存储卡位置。"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1107
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1133
 msgid "Couldn't find open command for extension 'ini'!"
-msgstr "找不到扩展名'ini'的打开命令!"
+msgstr "找不到扩展名'ini'的打开命令！"
 
-#: Source/Core/Core/Src/BootManager.cpp:146
+#: Source/Core/Core/Src/BootManager.cpp:137
 msgid ""
 "Couldn't init the core.\n"
 "Check your configuration."
@@ -1318,38 +1352,38 @@ msgstr ""
 "不能初始化核心.\n"
 "检查你的配置."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:183
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:507
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:495
 msgid "Count:"
 msgstr "数量:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:452
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456
 msgid "Country:"
 msgstr "国家:"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:186
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:562
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:173
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:550
 msgid "Create AR Code"
 msgstr "创建动作回放代码"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:543
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:608
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:569
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:641
 msgid "Create new perspective"
 msgstr "创建新布局"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:17
 msgid "Creator: "
 msgstr "创建者:"
 
-#: Source/Core/Common/Src/MsgHandler.cpp:68
+#: Source/Core/Common/Src/MsgHandler.cpp:54
 msgid "Critical"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562
 msgid "Crop"
 msgstr "裁切"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119
 msgid ""
 "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n"
 "\n"
@@ -1358,140 +1392,140 @@ msgstr ""
 "将图像由4:3裁切为5:4或由16:9裁切为16:10。\n"
 "如果没有把握，请不要勾选此项。"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:48
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:52
 msgid "Crossfade"
 msgstr "淡入淡出"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:597
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:600
 #, c-format
-msgid "Current dir changed from %s to %s after wxFileSelector!"
-msgstr "Current dir changed from %s to %s after wxFileSelector!"
+msgid "Current directory changed from %s to %s after wxFileSelector!"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339
 msgid "Custom Projection Hack"
 msgstr "自定义投影修正"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.h:30
+#: Source/Core/DolphinWX/Src/PHackSettings.h:17
 msgid "Custom Projection Hack Settings"
 msgstr "自定义投影修正设置"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342
 msgid "Customize some Orthographic Projection parameters."
 msgstr "自定义一些正交投影参数"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291
 msgid "Czech"
 msgstr "捷克语"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:698
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:697
 msgid "D"
 msgstr "D"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:89
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
 msgid "D-Pad"
 msgstr "方向键"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:431
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
 msgid "DSP"
 msgstr "DSP音频"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:639
 msgid "DSP Emulator Engine"
 msgstr "音频模拟引擎"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:254
 msgid "DSP HLE emulation (fast)"
 msgstr "音频 HLE 模拟(很快)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:256
 msgid "DSP LLE interpreter (slow)"
 msgstr "音频 LLE 解释(很慢)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660
-msgid "DSP LLE on Thread"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:255
 msgid "DSP LLE recompiler"
 msgstr "音频 LLE 重编译器"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:431
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:641
+msgid "DSP on Dedicated Thread"
+msgstr "在专门的线程上模拟DSP"
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
 msgid "DSP settings"
 msgstr "音频设置"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:838
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:819
 msgid "DVD Root:"
 msgstr "DVD 根目录:"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:239
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:226
 msgid "DVDLowRead - Fatal Error: failed to read from volume"
-msgstr "DVDLowRead - 致命错误: 读取卷失败"
+msgstr "DVDLowRead - 致命错误：读取卷失败"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:333
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:320
 msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume"
-msgstr "DVDLowUnencryptedRead - 致命错误: 读取卷失败"
+msgstr "DVDLowUnencryptedRead - 致命错误：读取卷失败"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:176
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:163
 msgid "Data Size"
 msgstr "数据大小"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468
 msgid "Date:"
 msgstr "日期:"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:528
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:564
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:518
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:557
 msgid "Datel MaxDrive/Pro files(*.sav)"
 msgstr "Datel MaxDrive/Pro files(*.sav)"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:242
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:259
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:267
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:281
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:296
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:229
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:246
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:254
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:268
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:283
 msgid "Dead Zone"
 msgstr "死区"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:35
 msgid "Debug"
 msgstr "调试"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:521
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534
 msgid "Debugging"
 msgstr "调试"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:79
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:66
 msgid "Decimal"
 msgstr "十进制"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:890
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:881
 msgid "Decompress ISO..."
 msgstr "解压缩镜像..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:906
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:900
 msgid "Decompress selected ISOs..."
 msgstr "解压缩所选镜像..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1088
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1224
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1089
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1225
 msgid "Decompressing ISO"
 msgstr "解压缩镜像中"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:912
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:903
 msgid "Default"
 msgstr "默认"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:835
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:816
 msgid "Default ISO:"
 msgstr "默认镜像:"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:114
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:107
 msgid "Default font"
 msgstr "默认字体"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:32
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:926
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:19
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917
 msgid "Delete"
 msgstr "删除"
 
@@ -1499,21 +1533,21 @@ msgstr "删除"
 msgid "Delete Save"
 msgstr "删除存档"
 
-#: Source/Core/VideoCommon/Src/AVIDump.cpp:77
+#: Source/Core/VideoCommon/Src/AVIDump.cpp:64
 #, c-format
 msgid "Delete the existing file '%s'?"
 msgstr "删除已经存在的文件 '%s' 么?"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:671
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:683
 msgid "Description"
 msgstr "说明"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:472
 msgid "Detect"
 msgstr "检测"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:233
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:328
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:220
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:315
 msgid ""
 "Detected attempt to read more data from the DVD than fit inside the out "
 "buffer. Clamp."
@@ -1521,29 +1555,29 @@ msgstr ""
 "Detected attempt to read more data from the DVD than fit inside the out "
 "buffer. Clamp."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:127
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:898
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:114
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:889
 msgid "Device"
 msgstr "设备"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:798
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:731
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779
 msgid "Device Settings"
 msgstr "设备设置"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:45
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:49
 msgid "Dial"
 msgstr "Dial"
 
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:146
+#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:135
 msgid "Direct3D11"
 msgstr "Direct3D11"
 
-#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:128
+#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:125
 msgid "Direct3D9"
 msgstr "Direct3D9"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:167
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:155
 msgid ""
 "Directory checksum failed\n"
 " and Directory backup checksum failed"
@@ -1551,16 +1585,20 @@ msgstr ""
 "目录校检失败\n"
 "和目录备份校检失败"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:433
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:443
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485
 msgid "Disable"
 msgstr "禁用"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:491
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501
+msgid "Disable Destination Alpha"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:409
 msgid "Disable Fog"
 msgstr "禁用雾化"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108
 msgid ""
 "Disable any XFB emulation.\n"
 "Speeds up emulation a lot but causes heavy glitches in many games which rely "
@@ -1569,11 +1607,12 @@ msgid ""
 "If unsure, leave this checked."
 msgstr ""
 "禁用任何XFB模拟。\n"
-"显著提高模拟速度但在模拟许多需要XFB的游戏(尤其是自制应用)时会造成严重故障。\n"
+"显著提高模拟速度，但在模拟许多需要XFB的游戏（尤其是自制应用）时会造成严重故"
+"障。\n"
 "\n"
 "如果没有把握，请不要勾选此项。"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95
 msgid ""
 "Disable emulation of EFB copies.\n"
 "These are often used for post-processing or render-to-texture effects, so "
@@ -1588,20 +1627,32 @@ msgstr ""
 "\n"
 "如果没有把握，请不要勾选此项。"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:543
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101
+#, fuzzy
+msgid ""
+"Disables emulation of a hardware feature called destination alpha, which is "
+"used in many games for various graphical effects.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+"忽略目标的Alpha通道，许多游戏使用该通道产生多种图像效果。\n"
+"\n"
+"如果没有把握，请不要勾选此项。"
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:553
 msgid "Disc"
 msgstr "光盘"
 
-#: Source/Core/DiscIO/Src/DriveBlob.cpp:107
-#: Source/Core/DiscIO/Src/DriveBlob.cpp:126
+#: Source/Core/DiscIO/Src/DriveBlob.cpp:94
+#: Source/Core/DiscIO/Src/DriveBlob.cpp:113
 msgid "Disc Read Error"
 msgstr "光盘读取错误"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:312
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:320
 msgid "Display"
 msgstr "显示"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104
 msgid ""
 "Display the inputs read by the emulator.\n"
 "\n"
@@ -1611,32 +1662,32 @@ msgstr ""
 "\n"
 "如果没有把握，请不要勾选此项。"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:80
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:67
 msgid "Divide"
 msgstr "Divide"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:987
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:990
 msgid "Do you want to stop the current emulation?"
 msgstr "您确定是否停止当前模拟?"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:663
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:644
 msgid "Dolby Pro Logic II decoder"
 msgstr "杜比定向逻辑II解码器"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:864
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:856
 msgid "Dolphin"
 msgstr "Dolphin"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:183
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:188
 #, c-format
 msgid "Dolphin %s Graphics Configuration"
 msgstr "Dolphin %s 图形设置"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:292
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:298
 msgid "Dolphin &Web Site"
 msgstr "Dolphin 网站(&W)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.h:37
+#: Source/Core/DolphinWX/Src/ConfigMain.h:24
 msgid "Dolphin Configuration"
 msgstr "Dolphin 配置"
 
@@ -1644,16 +1695,16 @@ msgstr "Dolphin 配置"
 msgid "Dolphin Emulated Wiimote Configuration"
 msgstr "Dolphin模拟Wii遥控器配置"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:394
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:383
 msgid "Dolphin FIFO"
 msgstr "Dolphin FIFO"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1136
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1153
 msgid "Dolphin GCPad Configuration"
-msgstr "Dolphin GC 手柄设置"
+msgstr "Dolphin GC手柄设置"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:679
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1074
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:685
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1089
 msgid "Dolphin TAS Movies (*.dtm)"
 msgstr "Dolphin TAS 电影 (*.dtm)"
 
@@ -1661,66 +1712,73 @@ msgstr "Dolphin TAS 电影 (*.dtm)"
 msgid "Dolphin Wiimote Configuration"
 msgstr "Dolphin Wii遥控器配置"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:293
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:299
 msgid "Dolphin at &Google Code"
-msgstr "&Google Code上的Dolphin"
+msgstr "Google Code上的Dolphin(&G)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:364
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:351
 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:368
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:355
 msgid ""
 "Dolphin is currently set to hide all games.  Doubleclick here to show all "
 "games..."
 msgstr "Dolphin 当前设置了隐藏所有游戏.  双击这里显示所有游戏..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1159
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1160
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1246
 msgid "Dolphin was unable to complete the requested action."
-msgstr "Dolphin未能完成请求的操作"
+msgstr "Dolphin未能完成请求的操作。"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:275
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:58
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
+#, fuzzy
+msgid ""
+"Doubles the emulated GPU clock rate. May speed up some games (ON = Fast, OFF "
+"= Compatible)"
+msgstr "启用快速光盘访问.  部分游戏需要. (ON = 快速, OFF = 兼容)"
+
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:262
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:45
 msgid "Down"
 msgstr "下"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:54
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:44
 msgid "Download Codes (WiiRD Database)"
 msgstr "下载代码 (WiiRD 数据库)"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:297
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:287
 #, c-format
 msgid "Downloaded %lu codes. (added %lu)"
 msgstr "已下载 %lu 代码(已添加 %lu)"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:31
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:35
 msgid "Drums"
 msgstr "鼓"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:105
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
 msgid "Dummy"
 msgstr "虚拟"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:661
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:642
 msgid "Dump Audio"
 msgstr "转储音频"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:532
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545
 msgid "Dump EFB Target"
 msgstr "转储 EFB 目标"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546
 msgid "Dump Frames"
 msgstr "转储框架"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543
 msgid "Dump Textures"
 msgstr "转储材质"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114
 msgid ""
 "Dump all rendered frames to an AVI file in User/Dump/Frames/\n"
 "\n"
@@ -1730,7 +1788,7 @@ msgstr ""
 "\n"
 "如果没有把握，请不要勾选此项。"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111
 msgid ""
 "Dump decoded game textures to User/Dump/Textures/<game_id>/\n"
 "\n"
@@ -1740,7 +1798,7 @@ msgstr ""
 "\n"
 "如果没有把握，请不要勾选此项。"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113
 msgid ""
 "Dump the contents of EFB copies to User/Dump/Textures/\n"
 "\n"
@@ -1750,21 +1808,21 @@ msgstr ""
 "\n"
 "如果没有把握，请不要勾选此项。"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:474
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292
 msgid "Dutch"
 msgstr "荷兰语"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:112
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:113
 msgid "E&xit"
 msgstr "退出模拟(&X)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:441
 msgid "EFB Copies"
 msgstr "EFB副本"
 
-#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:223
+#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:210
 #, c-format
 msgid ""
 "ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least "
@@ -1772,55 +1830,55 @@ msgid ""
 "reboot is probably required at this point to get Windows to see the new "
 "driver."
 msgstr ""
-"错误:此版本的Dolphin需要%d.%d或更高版本的TAP-Win32驱动 -- 如果您刚刚升级您的"
-"Dolphin，或许您现在需要重新启动您的计算机以使Windows加载新驱动"
+"错误：此版本的Dolphin需要%d.%d或更高版本的TAP-Win32驱动——如果您刚刚升级您的"
+"Dolphin，或许您现在需要重新启动您的计算机以使Windows加载新驱动。"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:166
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:160
 msgid "EUROPE"
 msgstr "欧版"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:156
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:143
 msgid "Early Memory Updates"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:447
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:453
 msgid "Edit"
 msgstr "编辑"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.h:30
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.h:17
 msgid "Edit ActionReplay Code"
 msgstr "编辑动作回放代码"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:285
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:286
 msgid "Edit Config"
 msgstr "编辑设置"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.h:30
+#: Source/Core/DolphinWX/Src/PatchAddEdit.h:17
 msgid "Edit Patch"
 msgstr "编辑补丁"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:447
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:453
 msgid "Edit current perspective"
 msgstr "编辑当前外观"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:403
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:425
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:407
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:429
 msgid "Edit..."
 msgstr "编辑..."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:44
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:48
 msgid "Effect"
 msgstr "效果"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:425
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435
 msgid "Embedded Frame Buffer"
 msgstr "嵌入式帧缓冲 (EFB)"
 
-#: Source/Core/Core/Src/Core.cpp:201
+#: Source/Core/Core/Src/Core.cpp:190
 msgid "Emu Thread already running"
 msgstr "模拟线程已经在运行"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110
 msgid ""
 "Emulate XFBs accurately.\n"
 "Slows down emulation a lot and prohibits high-resolution rendering but is "
@@ -1834,7 +1892,7 @@ msgstr ""
 "\n"
 "如果没有把握，请勾选虚拟XFB模拟。"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109
 msgid ""
 "Emulate XFBs using GPU texture objects.\n"
 "Fixes many games which don't work without XFB emulation while not being as "
@@ -1853,7 +1911,7 @@ msgstr ""
 msgid "Emulated Wiimote"
 msgstr "模拟Wii遥控器"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346
 msgid "Emulation State: "
 msgstr "模拟器状态: "
 
@@ -1861,7 +1919,7 @@ msgstr "模拟器状态: "
 msgid "Enable"
 msgstr "启用"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91
 msgid ""
 "Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's "
 "supported by your GPU.\n"
@@ -1876,72 +1934,71 @@ msgstr ""
 "\n"
 "如果没有把握，请不要勾选此项。"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:111
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:98
 msgid "Enable AR Logging"
 msgstr "启用动作回放记录"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324
 msgid "Enable Block Merging"
 msgstr "启用区块合并"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331
 msgid "Enable Bounding Box Calculation"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:446
 msgid "Enable Cache"
 msgstr "启用缓存"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:562
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542
 msgid "Enable Cheats"
 msgstr "启用作弊"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310
 msgid "Enable Dual Core"
 msgstr "启用多核处理"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
 msgid "Enable Dual Core (speedup)"
 msgstr "启用多核处理(加速)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:550
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:563
 msgid "Enable Hotkeys"
 msgstr "启用热键"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311
 msgid "Enable Idle Skipping"
 msgstr "启用空闲步进"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541
 msgid "Enable Idle Skipping (speedup)"
 msgstr "启用空闲步进(加速)"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312
 msgid "Enable MMU"
 msgstr "启用 MMU"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:554
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:567
 msgid "Enable Progressive Scan"
 msgstr "启用逐行扫描"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757
 msgid "Enable Screen Saver"
 msgstr ""
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:75
-#, fuzzy
 msgid "Enable Speaker Data"
-msgstr "Enable pages"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
 msgid "Enable WideScreen"
 msgstr "启用宽屏"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:516
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529
 msgid "Enable Wireframe"
 msgstr "启用线框"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85
 msgid ""
 "Enable anisotropic filtering.\n"
 "Enhances visual quality of textures that are at oblique viewing angles.\n"
@@ -1955,7 +2012,7 @@ msgstr ""
 "\n"
 "如果没有把握，请选择1x。"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323
 msgid ""
 "Enable fast disc access.  Needed for a few games. (ON = Fast, OFF = "
 "Compatible)"
@@ -1965,7 +2022,7 @@ msgstr "启用快速光盘访问.  部分游戏需要. (ON = 快速, OFF = 兼
 msgid "Enable pages"
 msgstr "Enable pages"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76
 msgid ""
 "Enable this if you want the whole screen to be used for rendering.\n"
 "If this is disabled, a render window will be created instead.\n"
@@ -1977,7 +2034,7 @@ msgstr ""
 "\n"
 "如果没有把握，请不要勾选此项。"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80
 msgid ""
 "Enable this if you want to use the main Dolphin window for rendering rather "
 "than a separate render window.\n"
@@ -1988,28 +2045,28 @@ msgstr ""
 "\n"
 "如果没有把握，请不要勾选此项。"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:335
 msgid ""
 "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for "
 "ANY other game."
 msgstr "启用此项以提速《塞尔达传说：黄昏公主》。运行任何其它游戏时请禁用此项。"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340
 msgid "Enables Custom Projection Hack"
 msgstr "启用自定义投影修正"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:528
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508
 msgid ""
 "Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on "
 "OSX."
 msgstr "启用杜比定向逻辑II模拟5.1环绕声。不适用于OSX。"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510
 msgid ""
 "Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only."
 msgstr "启用杜比定向逻辑II模拟5.1环绕声。仅适用于OpenAL后端。"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:512
 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."
@@ -2017,7 +2074,7 @@ msgstr ""
 "启用杜比定向逻辑II模拟5.1环绕声。仅适用于OpenAL后端。可能需要将soft_oal.dll重"
 "命名为OpenAL32.dll以生效。"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81
 msgid ""
 "Enables progressive scan if supported by the emulated software.\n"
 "Most games don't care about this.\n"
@@ -2029,13 +2086,13 @@ msgstr ""
 "\n"
 "如果没有把握，请不要勾选此项。"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313
 msgid ""
 "Enables the Memory Management Unit, needed for some games. (ON = Compatible, "
 "OFF = Fast)"
 msgstr "启用内存管理单元,一些游戏需要(ON = 兼容,OFF = 快速)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116
 msgid ""
 "Encode frame dumps using the FFV1 codec.\n"
 "\n"
@@ -2045,50 +2102,50 @@ msgstr ""
 "\n"
 "如果没有把握，请不要勾选此项。"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:40
 msgid "End"
 msgstr "End"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:469
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:280
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:260
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293
 msgid "English"
 msgstr "英语"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:329
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:407
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:337
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:417
 msgid "Enhancements"
 msgstr "增强"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:607
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:640
 msgid "Enter a name for the new perspective:"
 msgstr "为新视角输入一个名字:"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:191
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:178
 #, c-format
 msgid "Entry %d/%d"
 msgstr "条目 %d/%d"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:85
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:72
 #, c-format
 msgid "Entry 1/%d"
 msgstr "条目 1/%d"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:204
 msgid "Equal"
 msgstr "等于"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:45
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:156
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1242
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:32
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:150
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226
 msgid "Error"
 msgstr "错误"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:381
+#: Source/Core/DolphinWX/Src/Main.cpp:409
 msgid "Error loading selected language. Falling back to system default."
 msgstr "加载选定语言错误。正在退回系统默认。"
 
-#: Source/Core/Common/Src/ChunkFile.h:226
+#: Source/Core/Common/Src/ChunkFile.h:221
 #, c-format
 msgid ""
 "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). "
@@ -2097,47 +2154,46 @@ msgstr ""
 "错误: 在\"%s\"之后，发现了%d (0x%X)而非存档标记%d (0x%X)。正在中止读取即时存"
 "档..."
 
-#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:342
+#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:329
 #, c-format
 msgid ""
 "Error: Trying to access %s fonts but they are not loaded. Games may not show "
 "fonts correctly, or crash."
 msgstr ""
-"错误:正在试图访问字体%s，但它(们)没有加载。游戏可能无法正确显示字体，或者崩"
-"溃。"
+"错误:正在试图访问字体%s，但它们没有加载。游戏可能无法正确显示字体，或者崩溃。"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:30
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:17
 msgid "Escape"
 msgstr "Escape"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:26
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:30
 msgid "Euphoria"
 msgstr "Euphoria"
 
 #: Source/Core/Core/Src/ArmMemTools.cpp:78
-#: Source/Core/Core/Src/x64MemTools.cpp:217
+#: Source/Core/Core/Src/x64MemTools.cpp:206
 #, c-format
 msgid "Exception handler - access below memory space. %08llx%08llx"
 msgstr "Exception handler - access below memory space. %08llx%08llx"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:61
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
 msgid "Execute"
 msgstr "执行"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:459
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:446
 msgid "Export Failed"
 msgstr "导出失败"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:639
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:649
 msgid "Export File"
 msgstr "导出文件"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:177
 msgid "Export Recording"
 msgstr "导出录制"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:345
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:351
 msgid "Export Recording..."
 msgstr "导出录制..."
 
@@ -2145,7 +2201,7 @@ msgstr "导出录制..."
 msgid "Export Save"
 msgstr "导出存档"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:874
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:865
 msgid "Export Wii save (Experimental)"
 msgstr "导出 Wii 存档 (实验性)"
 
@@ -2153,100 +2209,100 @@ msgstr "导出 Wii 存档 (实验性)"
 msgid "Export all saves"
 msgstr "导出所有存档"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:80
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:72
 msgid "Export failed, try again?"
 msgstr "导出失败,需要重试吗?"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:559
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:552
 msgid "Export save as..."
 msgstr "导出存档为..."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:297
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:284
 msgid "Extension"
 msgstr "扩展"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483
 msgid "External Frame Buffer"
 msgstr "外部帧缓冲 (XFB)"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:61
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:48
 msgid "Extra Parameter"
 msgstr "外部参数"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:62
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:49
 msgid "Extra Parameter useful in ''Metroid: Other M'' only."
 msgstr "仅用于《银河战士：另一个M》的额外参数。"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:614
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:624
 msgid "Extract All Files..."
 msgstr "提取所有文件..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:616
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:626
 msgid "Extract Apploader..."
 msgstr "提取 Apploader..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:617
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627
 msgid "Extract DOL..."
 msgstr "提取 DOL..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:610
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:620
 msgid "Extract Directory..."
 msgstr "提取目录..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:612
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:622
 msgid "Extract File..."
 msgstr "提取文件..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:608
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:618
 msgid "Extract Partition..."
 msgstr "提取分区..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:724
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:738
 #, c-format
 msgid "Extracting %s"
 msgstr "正在提取 %s"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:707
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:721
 msgid "Extracting All Files"
 msgstr "提取所有文件中"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:707
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:721
 msgid "Extracting Directory"
 msgstr "提取目录中"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:710
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:724
 msgid "Extracting..."
 msgstr "提取中..."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:892
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:893
 msgid "FIFO Byte"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:45
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:32
 msgid "FIFO Player"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:169
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:163
 msgid "FRANCE"
 msgstr "法国"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472
 msgid "FST Size:"
 msgstr "FST 大小:"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:77
+#: Source/Core/Core/Src/NetPlayClient.cpp:81
 msgid "Failed to Connect!"
 msgstr "连接失败!"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:225
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:228
 msgid "Failed to Listen!!"
 msgstr "监听失败!!"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:307
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:300
 msgid "Failed to download codes."
 msgstr "下载代码失败."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:827
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:843
 #, c-format
 msgid "Failed to extract to %s!"
 msgstr "提取到 %s 失败!"
@@ -2271,26 +2327,30 @@ msgstr ""
 "您可以使用不需要ROM转储的DSP HLE引擎。\n"
 "(该选项位于配置对话框的“音频”选项卡)"
 
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:116
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:139
+#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:108
+#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:131
 msgid "Failed to load bthprops.cpl"
 msgstr "加载bthprops.cpl失败"
 
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:100
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:109
+#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:90
+#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:101
 msgid "Failed to load hid.dll"
 msgstr "不能载入 hid.dll"
 
-#: Source/Core/Core/Src/Movie.cpp:792
+#: Source/Core/Core/Src/Movie.cpp:783
 #, c-format
 msgid "Failed to read %s"
 msgstr "读取 %s 失败"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:151
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:144
 msgid "Failed to read banner.bin"
 msgstr "读取 banner.bin 失败"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:223
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:178
+msgid "Failed to read bk header"
+msgstr ""
+
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:211
 #, c-format
 msgid ""
 "Failed to read block %d of the save data\n"
@@ -2301,7 +2361,7 @@ msgstr ""
 "记忆卡可能被截断\n"
 "文件位置:%llx"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:148
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:136
 msgid ""
 "Failed to read block allocation table backup correctly\n"
 "(0x8000-0x9FFF)"
@@ -2309,7 +2369,7 @@ msgstr ""
 "未能正确读取区块分配表备份\n"
 "(0x8000-0x9FFF)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:142
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:130
 msgid ""
 "Failed to read block allocation table correctly\n"
 "(0x6000-0x7FFF)"
@@ -2317,12 +2377,17 @@ msgstr ""
 "未能正确读取区块分配表\n"
 "(0x6000-0x7FFF)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:286
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:279
 #, c-format
 msgid "Failed to read data from file %d"
 msgstr "从文件 %d 读取数据失败"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:136
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:367
+#, c-format
+msgid "Failed to read data from file: %s"
+msgstr ""
+
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:124
 msgid ""
 "Failed to read directory backup correctly\n"
 "(0x4000-0x5FFF)"
@@ -2330,7 +2395,7 @@ msgstr ""
 "Failed to read directory backup correctly\n"
 "(0x4000-0x5FFF)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:130
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:118
 msgid ""
 "Failed to read directory correctly\n"
 "(0x2000-0x3FFF)"
@@ -2338,7 +2403,11 @@ msgstr ""
 "正确的读取目录失败\n"
 "(0x2000-0x3FFF)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:119
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:90
+msgid "Failed to read header"
+msgstr ""
+
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:107
 msgid ""
 "Failed to read header correctly\n"
 "(0x0000-0x1FFF)"
@@ -2346,63 +2415,63 @@ msgstr ""
 "正确的读取头失败\n"
 "(0x000-0x1FFF)"
 
-#: Source/Core/DiscIO/Src/VolumeGC.cpp:61
+#: Source/Core/DiscIO/Src/VolumeGC.cpp:48
 msgid "Failed to read unique ID from disc image"
 msgstr "Failed to read unique ID from disc image"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:84
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:71
 msgid "Failed to write BT.DINF to SYSCONF"
 msgstr "Failed to write BT.DINF to SYSCONF"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:228
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:221
 msgid "Failed to write bkhdr"
 msgstr "Failed to write bkhdr"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:164
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:157
 #, c-format
 msgid "Failed to write header for %s"
 msgstr "写入文件头到 %s 失败"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:258
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:251
 #, c-format
 msgid "Failed to write header for file %d"
 msgstr "写入文件头失败 %d"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294
 msgid "Farsi"
 msgstr "波斯语"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477
 msgid "Fast"
 msgstr "快速"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315
 msgid "Fast version of the MMU.  Does not work for every game."
 msgstr "MMU快速版本。  不是对所有游戏都有效。"
 
-#: Source/Core/Core/Src/Movie.cpp:1046
+#: Source/Core/Core/Src/Movie.cpp:1037
 #, c-format
 msgid ""
 "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s"
 msgstr "致命的不同步。回放中止。(Error in PlayWiimote: %u != %u, byte %u.)%s"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:199
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:202
 msgid "Fifo Player"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:99
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:86
 msgid "File Info"
-msgstr ""
+msgstr "文件信息"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:304
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:295
 msgid "File contained no codes."
 msgstr "文件未包含代码."
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:413
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:400
 msgid "File converted to .gci"
 msgstr "文件已转换到 .cgi"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:428
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:415
 msgid ""
 "File could not be opened\n"
 "or does not have a valid extension"
@@ -2410,7 +2479,7 @@ msgstr ""
 "文件无法打开\n"
 "或没有有效的扩展名"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:84
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:72
 #, c-format
 msgid ""
 "File has the extension \"%s\"\n"
@@ -2419,36 +2488,36 @@ msgstr ""
 "文件扩展名为 \"%s\"\n"
 "有效扩展名为 (.raw/.gcp)"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:425
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:412
 msgid "File is not recognized as a memcard"
 msgstr "文件不能被识别成内存卡"
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:294
+#: Source/Core/DiscIO/Src/CompressedBlob.cpp:281
 msgid "File not compressed"
 msgstr "文件不是已压缩文件"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:127
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:109
 #, c-format
 msgid "FileIO: Unknown open mode : 0x%02x"
 msgstr "FileIO: 未知打开模式 : 0x%02x"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:531
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:541
 msgid "Filesystem"
 msgstr "文件系统"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1100
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1126
 msgid "Filetype 'ini' is unknown! Will not open!"
 msgstr "文件类型 'ini' 未知! 不能打开!"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:265
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:252
 msgid "Find next"
 msgstr "查找下一个"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:266
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:253
 msgid "Find previous"
 msgstr "查找上一个"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:632
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626
 msgid "First Block"
 msgstr "第一个区块"
 
@@ -2456,23 +2525,23 @@ msgstr "第一个区块"
 msgid "Fix Checksums"
 msgstr "修正校检和"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:275
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283
 msgid "Force 16:9"
 msgstr "强制 16:9"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:275
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283
 msgid "Force 4:3"
 msgstr "强制 4:3"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:568
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548
 msgid "Force Console as NTSC-J"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406
 msgid "Force Texture Filtering"
 msgstr "强制纹理过滤"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90
 msgid ""
 "Force texture filtering even if the emulated game explicitly disabled it.\n"
 "Improves texture quality slightly but causes glitches in some games.\n"
@@ -2484,7 +2553,7 @@ msgstr ""
 "\n"
 "如果没有把握，请不要勾选此项。"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83
 msgid ""
 "Force the game to output graphics for widescreen resolutions.\n"
 "Causes graphical glitches is some games.\n"
@@ -2496,14 +2565,14 @@ msgstr ""
 "\n"
 "如果没有把握，请不要勾选此项。"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488
 msgid ""
 "Forces NTSC-J mode for using the Japanese ROM font.\n"
 "Left unchecked, dolphin defaults to NTSC-U and automatically enables this "
 "setting when playing Japanese games."
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:74
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:62
 msgid ""
 "Format as ascii (NTSC\\PAL)?\n"
 "Choose no for sjis (NTSC-J)"
@@ -2511,148 +2580,147 @@ msgstr ""
 "Format as ascii (NTSC\\PAL)?\n"
 "Choose no for sjis (NTSC-J)"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:278
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:265
 msgid "Forward"
 msgstr "Forward"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504
 #, c-format
 msgid "Found %d results for '"
 msgstr "找到了 '的%d个结果"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:857
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:925
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:858
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:926
 msgid "Frame"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:867
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:868
 msgid "Frame "
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:185
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:173
 msgid "Frame Advance"
 msgstr "Frame Advance"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:536
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549
 msgid "Frame Dumps use FFV1"
 msgstr "使用FFV1转储帧"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:227
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:214
 msgid "Frame Info"
 msgstr "帧信息"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:116
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:103
 msgid "Frame Range"
 msgstr "帧范围"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:138
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:139
 msgid "Frame S&kipping"
 msgstr "帧数跳跃(&K)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:572
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552
 msgid "Framelimit:"
 msgstr "帧数限制:"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:204
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:191
 msgid "Frames To Record"
-msgstr ""
+msgstr "录制帧数"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547
 msgid "Free Look"
 msgstr "自由视点"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
 msgid "French"
 msgstr "法语"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:38
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:42
 msgid "Frets"
 msgstr "Frets"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:118
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:137
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:105
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:124
 msgid "From"
-msgstr ""
+msgstr "从"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:426
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:432
 msgid "FullScr"
 msgstr "全屏"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:256
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263
 msgid "Fullscreen resolution:"
 msgstr "全屏分辨率:"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:534
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524
 msgid "GCI File(*.gci)"
 msgstr "GCI 文件(*.gci)"
 
-#: Source/Core/DolphinWX/Src/GCMicDlg.h:44
+#: Source/Core/DolphinWX/Src/GCMicDlg.h:31
 msgid "GCMic Configuration"
 msgstr "GCMic配置"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:432
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
 msgid "GCPad"
-msgstr "手柄"
+msgstr "GC手柄"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:659
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:658
 msgid "GX_CMD_INVL_VC"
 msgstr "GX_CMD_INVL_VC"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:448
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:452
 msgid "Game ID:"
 msgstr "游戏 ID:"
 
-#: Source/Core/Core/Src/NetPlay.cpp:229
+#: Source/Core/Core/Src/NetPlay.cpp:216
 msgid "Game is already running!"
 msgstr "游戏已经运行!"
 
-#: Source/Core/Core/Src/NetPlay.cpp:259
+#: Source/Core/Core/Src/NetPlay.cpp:246
 msgid "Game isn't running!"
 msgstr "游戏没有运行!"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:389
-#, fuzzy
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:393
 msgid "Game not found!"
-msgstr "游戏没找到!!"
+msgstr "游戏没有找到！"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:385
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:389
 msgid "Game-Specific Settings"
 msgstr "游戏特殊设置"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:293
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:294
 msgid "GameConfig"
 msgstr "游戏配置"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:525
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:515
 msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)"
 msgstr "GameCube存档文件(*.gci;*.gcs;*.sav)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534
 msgid "Gamecube"
 msgstr "Gamecube"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:178
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:181
 msgid "Gamecube &Pad Settings"
 msgstr "Gamecube 手柄设置(&P)"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:218
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1069
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:205
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1052
 msgid "Gamecube Memory Cards (*.raw,*.gcp)"
 msgstr "Gamecube 内存卡 (*.raw,*.gcp)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:432
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
 msgid "Gamecube Pad settings"
 msgstr "Gamecube 手柄设置"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:117
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302
 msgid "Gecko Codes"
 msgstr "Gecko 代码"
 
-#: Source/Core/Core/Src/GeckoCode.cpp:222
+#: Source/Core/Core/Src/GeckoCode.cpp:214
 #, c-format
 msgid ""
 "GeckoCode failed to run (CT%i CST%i) (%s)\n"
@@ -2661,41 +2729,41 @@ msgid ""
 "directory and restarting Dolphin.)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:172
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:197
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:160
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:160
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:202
 msgid "General"
 msgstr "常规"
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:139
 msgid "General Settings"
-msgstr ""
+msgstr "常规设置"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:470
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:281
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:316
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:261
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
 msgid "German"
 msgstr "德语"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:449
+#: Source/Core/Core/Src/ActionReplay.cpp:439
 #, 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:430
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:436
 msgid "Graphics"
 msgstr "图形"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:430
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:436
 msgid "Graphics settings"
 msgstr "图形设置"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:205
 msgid "Greater Than"
 msgstr "大于"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87
 msgid ""
 "Greatly increases quality of textures generated using render to texture "
 "effects.\n"
@@ -2711,51 +2779,67 @@ msgstr ""
 "\n"
 "如果没有把握，请勾选此项。"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:317
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
 msgid "Greek"
 msgstr "希腊语"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:22
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Green"
 msgstr "绿"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:24
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Green Left"
 msgstr "绿 左"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:25
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Green Right"
 msgstr "绿 右"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:35
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:39
 msgid "Guitar"
 msgstr "吉它"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1259
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1250
 msgid "HCI_CMD_INQUIRY is called, please report!"
 msgstr "HCI_CMD_INQUIRY 被调用, 请报告bug!"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:421
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504
+msgid "Hacked Buffer Upload"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431
 msgid "Hacks"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:158
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:146
 msgid "Header checksum failed"
 msgstr "头部校检失败"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:318
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298
 msgid "Hebrew"
 msgstr "希伯来语"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:313
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:300
 msgid "Height"
 msgstr "高度"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:64
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:51
 msgid "Help"
 msgstr "帮助"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:209
+#: Source/Core/DolphinWX/Src/Main.cpp:229
+msgid ""
+"Hi,\n"
+"\n"
+"Dolphin requires Mac OS X 10.7 or greater.\n"
+"Unfortunately you're running an old version of OS X.\n"
+"The last Dolphin version to support OS X 10.6 is Dolphin 3.5\n"
+"Please upgrade to 10.7 or greater to use the newest Dolphin version.\n"
+"\n"
+"Sayonara!\n"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/Main.cpp:220
 msgid ""
 "Hi,\n"
 "\n"
@@ -2771,15 +2855,15 @@ msgstr ""
 "\n"
 "杀呦啦啦(再见)!\n"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:309
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:296
 msgid "Hide"
 msgstr "隐藏"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:307
 msgid "Hide Mouse Cursor"
 msgstr "隐藏鼠标光标"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79
 msgid ""
 "Hides the mouse cursor if it's on top of the emulation window.\n"
 "\n"
@@ -2789,26 +2873,26 @@ msgstr ""
 "\n"
 "如果没有把握，请勾选此项。"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:54
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41
 msgid "Home"
 msgstr "Home"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:85
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:138
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:76
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:141
 msgid "Host"
 msgstr "主机"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.h:44
+#: Source/Core/DolphinWX/Src/HotkeyDlg.h:31
 msgid "Hotkey Configuration"
 msgstr "热键设置"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:272
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:272
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:594
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:260
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:260
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574
 msgid "Hotkeys"
 msgstr "热键"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:319
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299
 msgid "Hungarian"
 msgstr "匈牙利语"
 
@@ -2816,33 +2900,29 @@ msgstr "匈牙利语"
 msgid "Hybrid Wiimote"
 msgstr "混合Wii遥控器"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:532
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:519
 #, 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:786
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:773
 #, c-format
 msgid ""
-"IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available "
-"in your nand dump\n"
+"IOCTL_ES_LAUNCH: Game tried to reload an IOS or a title that is not "
+"available in your NAND dump\n"
 "TitleID %016llx.\n"
-" Dolphin will likely hang now"
+" Dolphin will likely hang now."
 msgstr ""
-"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"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:313
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:300
 msgid "IOCTL_ES_READCONTENT - bad destination"
 msgstr "IOCTL_ES_READCONTENT - bad destination"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729
 msgid "IPL Settings"
 msgstr "IPL 设置"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269
 msgid "IR"
 msgstr "红外线"
 
@@ -2854,47 +2934,33 @@ msgstr "IR 指针"
 msgid "IR Sensitivity:"
 msgstr "红外灵敏度:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:502
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:512
 msgid "ISO Details"
 msgstr "镜像详细信息"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:830
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:811
 msgid "ISO Directories"
 msgstr "镜像目录"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:172
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:166
 msgid "ITALY"
 msgstr "意大利"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:630
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:624
 msgid "Icon"
 msgstr "图标"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332
 msgid ""
 "If checked, the bounding box registers will be updated. Used by the Paper "
 "Mario games."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318
-msgid ""
-"If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)"
-msgstr "如果帧率不稳定，此选项可能有所帮助 (ON = 兼容, OFF = 快速)"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505
-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限制速"
-"度(可能修正咔嗒声但也可能导致持续的噪音，因游戏而异)。"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:428
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438
 msgid "Ignore Format Changes"
 msgstr "忽略格式变化"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94
 msgid ""
 "Ignore any changes to the EFB format.\n"
 "Improves performance in many games without any negative effect. Causes "
@@ -2908,7 +2974,7 @@ msgstr ""
 "\n"
 "如果没有把握，请勾选此项。"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93
 msgid ""
 "Ignore any requests of the CPU to read from or write to the EFB.\n"
 "Improves performance in some games, but might disable some gameplay-related "
@@ -2925,11 +2991,11 @@ msgstr ""
 msgid "Import Save"
 msgstr "导入存档"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:59
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:48
 msgid "Import failed, try again?"
 msgstr "导入失败,要重试吗?"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:454
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:441
 msgid ""
 "Imported file has gsc extension\n"
 "but does not have a correct header"
@@ -2937,11 +3003,11 @@ msgstr ""
 "导入的文件有一个 gcs 扩展名\n"
 "但是它没有正确的文件头"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:442
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:429
 msgid "Imported file has invalid length"
 msgstr "导入的文件长度不正确"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:451
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:438
 msgid ""
 "Imported file has sav extension\n"
 "but does not have a correct header"
@@ -2949,18 +3015,7 @@ msgstr ""
 "导入的文件有一个 sav 扩展名\n"
 "但是它没有正确的文件头"
 
-#: 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 ""
-"提高性能但在依赖正确雾模拟的多数游戏中引起故障。\n"
-"\n"
-"如果没有把握，请不要勾选此项。"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350
 msgid "In Game"
 msgstr "进游戏"
 
@@ -2968,85 +3023,85 @@ msgstr "进游戏"
 msgid "In-Game"
 msgstr "进游戏"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:34
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305
 msgid "Info"
 msgstr "信息"
 
-#: Source/Core/Common/Src/MsgHandler.cpp:65
+#: Source/Core/Common/Src/MsgHandler.cpp:51
 msgid "Information"
 msgstr "信息"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:481
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:468
 msgid "Input"
 msgstr "输入"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:63
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:50
 msgid "Insert"
 msgstr "插入"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:176
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:166
 msgid "Insert Encrypted or Decrypted code here..."
 msgstr "在这里插入加密的或者解密的代码..."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:763
 msgid "Insert SD Card"
 msgstr "插入SD卡"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:34
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:21
 msgid "Insert name here.."
 msgstr "在这里插入名称..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:196
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:199
 msgid "Install WAD"
 msgstr "安装 WAD"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:895
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:888
 msgid "Install to Wii Menu"
 msgstr "安装到Wii菜单"
 
-#: Source/Core/Core/Src/x64MemTools.cpp:252
+#: Source/Core/Core/Src/x64MemTools.cpp:242
 msgid ""
 "InstallExceptionHandler called, but this platform does not yet support it."
 msgstr ""
 "InstallExceptionHandler called, but this platform does not yet support it."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1297
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
 msgid "Installing WAD..."
 msgstr "正在安装 WAD..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:885
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:901
 msgid "Integrity Check Error"
 msgstr "完整性校验失败"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:891
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:907
 msgid "Integrity check completed"
 msgstr "完整性校验完成"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:890
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:906
 msgid "Integrity check completed. No errors have been found."
 msgstr "完整性校验完成。没有发现错误。"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:882
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:898
 #, c-format
 msgid ""
 "Integrity check for partition %d failed. Your dump is most likely corrupted "
 "or has been patched incorrectly."
 msgstr "分区%d完整性校验失败。您的dump很可能已损坏或补丁错误。"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532
 msgid "Interface"
 msgstr "界面"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:646
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627
 msgid "Interface Settings"
 msgstr "界面设置"
 
-#: Source/Core/Core/Src/State.cpp:240
+#: Source/Core/Core/Src/State.cpp:228
 msgid "Internal LZO Error - compression failed"
 msgstr "内部 LZO 错误 - 压缩失败"
 
-#: Source/Core/Core/Src/State.cpp:348
+#: Source/Core/Core/Src/State.cpp:336
 #, c-format
 msgid ""
 "Internal LZO Error - decompression failed (%d) (%li, %li) \n"
@@ -3055,41 +3110,45 @@ msgstr ""
 "Internal LZO Error - decompression failed (%d) (%li, %li) \n"
 "Try loading the state again"
 
-#: Source/Core/Core/Src/State.cpp:485
+#: Source/Core/Core/Src/State.cpp:473
 msgid "Internal LZO Error - lzo_init() failed"
 msgstr "内部 LZO 错误 - lzo_init() 失败"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:344
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:352
 msgid "Internal Resolution:"
 msgstr "内部分辨率:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:42
+msgid "Interpreter (VERY slow)"
+msgstr "解释器（非常慢）"
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349
 msgid "Intro"
 msgstr "片头"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:194
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:187
 #, c-format
 msgid "Invalid Size(%x) or Magic word (%x)"
 msgstr "无效大小(%x) 或 魔字(%x)"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:612
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:600
 msgid "Invalid Value!"
 msgstr "无效值!"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:462
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:449
 msgid "Invalid bat.map or dir entry"
 msgstr "无效 bat.map 或 目录项目"
 
-#: Source/Core/Core/Src/CoreTiming.cpp:548
+#: Source/Core/Core/Src/CoreTiming.cpp:553
 #, c-format
 msgid "Invalid event type %i"
 msgstr "无效事件类型 %i"
 
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:326
+#: Source/Core/Core/Src/HW/DVDInterface.cpp:309
 msgid "Invalid file"
 msgstr "无效文件"
 
-#: Source/Core/DiscIO/Src/BannerLoaderGC.cpp:41
+#: Source/Core/DiscIO/Src/BannerLoaderGC.cpp:28
 #, c-format
 msgid ""
 "Invalid opening.bnr found in gcm:\n"
@@ -3100,46 +3159,54 @@ msgstr ""
 "%s\n"
 "您可能需要重新转储此游戏。"
 
-#: Source/Core/Core/Src/Movie.cpp:735
+#: Source/Core/Core/Src/Movie.cpp:726
 msgid "Invalid recording file"
 msgstr "无效录制文件"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:473
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:472
 msgid "Invalid search parameters (no object selected)"
 msgstr "无效的搜索参数(没有选择对象)"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:456
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:455
 msgid "Invalid search string (couldn't convert to number)"
 msgstr "无效的搜索字串(无法转换成数字)"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:444
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:443
 msgid "Invalid search string (only even string lengths supported)"
 msgstr ""
 
-#: Source/Core/Core/Src/Core.cpp:513
+#: Source/Core/Core/Src/Core.cpp:511
 msgid "Invalid state"
 msgstr "Invalid state"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:473
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:320
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300
 msgid "Italian"
 msgstr "意大利语"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:183
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:177
 msgid "JAPAN"
 msgstr "日本"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:321
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:46
+msgid "JIT Recompiler (recommended)"
+msgstr "JIT 重编译器（推荐）"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:47
+msgid "JITIL experimental recompiler"
+msgstr "JITIL 实验性重编译器"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:279
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
 msgid "Japanese"
 msgstr "日语"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:188
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:182
 msgid "KOREA"
 msgstr "韩国"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78
 msgid ""
 "Keep the game window on top of all other windows.\n"
 "\n"
@@ -3149,62 +3216,62 @@ msgstr ""
 "\n"
 "如果没有把握，请不要勾选此项。"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:298
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:306
 msgid "Keep window on top"
 msgstr "前端显示"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:241
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:241
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:229
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:229
 msgid "Key"
 msgstr "按键"
 
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282
 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:322
 msgid "Korean"
 msgstr "韩语"
 
 #. i18n:  Left
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:57
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:44
 msgid "L"
 msgstr "L"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:39
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:26
 msgid "L Button"
 msgstr "L 键"
 
 #. i18n:  Left-Analog
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:61
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:48
 msgid "L-Analog"
 msgstr "L-摇杆"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:585
 msgid "Language:"
 msgstr "语言:"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:152
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:153
 msgid "Last Overwritten State"
 msgstr "最后覆盖状态"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:159
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:161
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:160
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:162
 msgid "Last Saved State"
 msgstr "最后保存状态"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:696
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:677
 msgid "Latency:"
-msgstr ""
+msgstr "延迟："
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:276
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:55
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:263
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:42
 msgid "Left"
 msgstr "左"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:60
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:64
 msgid "Left Stick"
 msgstr "左摇杆"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:257
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:257
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:245
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:245
 msgid ""
 "Left click to detect hotkeys.\n"
 "Enter space to clear."
@@ -3212,7 +3279,7 @@ msgstr ""
 "左键单击检测热键.\n"
 "按空格清除."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:689
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:678
 msgid ""
 "Left-click to detect input.\n"
 "Middle-click to clear.\n"
@@ -3222,7 +3289,7 @@ msgstr ""
 "中键单击清除.\n"
 "右键单击得到更多选项."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:694
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:683
 msgid ""
 "Left/Right-click for more options.\n"
 "Middle-click to clear."
@@ -3230,76 +3297,76 @@ msgstr ""
 "左/右单击得到更多选项.\n"
 "中键单击清除"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:219
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:206
 msgid "Less Than"
 msgstr "小于"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:565
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545
 msgid "Limit by FPS"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:924
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:915
 msgid "Load"
 msgstr "载入"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544
 msgid "Load Custom Textures"
 msgstr "加载自定义纹理"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
 msgid "Load State Slot 1"
 msgstr "载入存档插槽 1"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189
 msgid "Load State Slot 2"
 msgstr "载入存档插槽 2"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:190
 msgid "Load State Slot 3"
 msgstr "载入存档插槽 3"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:203
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:191
 msgid "Load State Slot 4"
 msgstr "载入存档插槽 4"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192
 msgid "Load State Slot 5"
 msgstr "载入存档插槽 5"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193
 msgid "Load State Slot 6"
 msgstr "载入存档插槽 6"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:194
 msgid "Load State Slot 7"
 msgstr "载入存档插槽 7"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:195
 msgid "Load State Slot 8"
 msgstr "载入存档插槽 8"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:155
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:156
 msgid "Load State..."
 msgstr "载入状态..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1332
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1359
 msgid "Load Wii System Menu"
-msgstr ""
+msgstr "加载Wii系统菜单"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1327
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1354
 #, c-format
 msgid "Load Wii System Menu %d%c"
-msgstr ""
+msgstr "加载Wii系统菜单 %d%c"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112
 msgid ""
 "Load custom textures from User/Load/Textures/<game_id>/\n"
 "\n"
@@ -3309,7 +3376,7 @@ msgstr ""
 "\n"
 "如果没有把握，请不要勾选此项。"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:50
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:37
 msgid "Load preset values from hack patterns available."
 msgstr ""
 
@@ -3317,52 +3384,52 @@ msgstr ""
 msgid "Local"
 msgstr "本地"
 
-#: Source/Core/DolphinWX/Src/LogWindow.h:51
+#: Source/Core/DolphinWX/Src/LogWindow.h:38
 msgid "Log"
 msgstr "日志"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:26
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:13
 msgid "Log Configuration"
 msgstr "记录设置"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:296
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304
 msgid "Log FPS to file"
 msgstr "记录FPS到文件"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:96
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83
 msgid "Log Types"
 msgstr "记录类型"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103
 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的性能时可启用此"
+"将每秒渲染的帧数记录于User/Logs/fps.txt。当您想要​衡量​Dolphin的性能时可启用此"
 "功能。\n"
 "\n"
 "如果没有把握，请不要勾选此项。"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:81
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:68
 msgid "Logger Outputs"
 msgstr "记录输出"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132
-#: Source/Core/DolphinWX/Src/Frame.cpp:328
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:119
+#: Source/Core/DolphinWX/Src/Frame.cpp:314
 msgid "Logging"
 msgstr "记录中"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:255
+#: Source/Core/Core/Src/NetPlayClient.cpp:259
 msgid "Lost connection to server!"
 msgstr "丢失服务器连接!"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:42
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:29
 msgid "M Button"
 msgstr "M 键"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:119
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:112
 #, c-format
 msgid ""
 "MD5 mismatch\n"
@@ -3371,57 +3438,70 @@ msgstr ""
 "MD5 不匹配\n"
 " %016llx%016llx != %016llx%016llx"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314
 msgid "MMU Speed Hack"
 msgstr "MMU 速度破解"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:527
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:563
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:517
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:556
 msgid "MadCatz Gameshark files(*.gcs)"
 msgstr "MadCatz Gameshark 文件(*.gcs)"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:51
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:63
+#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:38
 msgid "Main Stick"
 msgstr "主摇杆"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460
 msgid "Maker ID:"
 msgstr "制作者ID:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487
 msgid "Maker:"
 msgstr "制作者:"
 
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100
+msgid ""
+"Makes distant objects more visible by removing fog, thus increasing the "
+"overall detail.\n"
+"Disabling fog will break some games which rely on proper fog emulation.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+"通过移除雾提升远处对象的可见性，进而增加整体细节。\n"
+"有些游戏依靠正确的雾模拟，禁用雾将破坏其可玩性。\n"
+"\n"
+"如果没有把握，请不要勾选此项。"
+
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:97
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:100
 msgid "Max"
-msgstr ""
+msgstr "最大"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:448
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:435
 msgid "Memcard already has a save for this title"
 msgstr "Memcard already has a save for this title"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:291
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:278
 msgid "Memcard already opened"
 msgstr "内存卡已经打开"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:912
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:913
 msgid "Memory Byte"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:225
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:113
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:212
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:93
 msgid "Memory Card"
 msgstr "内存卡"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.h:36
+#: Source/Core/DolphinWX/Src/MemcardManager.h:23
 msgid ""
 "Memory Card Manager WARNING-Make backups before using, should be fixed but "
 "could mangle stuff!"
 msgstr ""
 
-#: Source/Core/Core/Src/CoreParameter.cpp:371
+#: Source/Core/Core/Src/CoreParameter.cpp:360
 #, c-format
 msgid ""
 "Memory Card filename in Slot %c is incorrect\n"
@@ -3438,37 +3518,37 @@ msgstr ""
 "%s\n"
 "Would you like to copy the old file to this new location?\n"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:124
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:112
 msgid "Memorycard filesize does not match the header size"
-msgstr ""
+msgstr "存储卡文件大小与文件头大小不匹配"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:50
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:37
 msgid "Menu"
 msgstr "菜单"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:114
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:94
 msgid "Mic"
 msgstr "Mic"
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:96
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:99
 msgid "Min"
-msgstr ""
+msgstr "最小"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:580
 msgid "Misc"
 msgstr "其它"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:795
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776
 msgid "Misc Settings"
 msgstr "其它设置"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:240
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:294
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:227
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:281
 msgid "Modifier"
 msgstr "修改者"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106
 msgid ""
 "Modify textures to show the format they're encoded in. Needs an emulation "
 "reset in most cases.\n"
@@ -3476,20 +3556,20 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr "修改纹理以显示以哪种格式编码"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:115
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:108
 msgid "Monospaced font"
 msgstr "等宽字体"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:305
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:292
 msgid "Motion Plus"
 msgstr "Motion Plus"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:309
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:86
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:296
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73
 msgid "Motor"
 msgstr "马达"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:654
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:666
 msgid ""
 "Move the mouse pointer over an option to display a detailed description.\n"
 "\n"
@@ -3507,322 +3587,334 @@ msgstr ""
 "\n"
 "\n"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:75
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:62
 msgid "Multiply"
 msgstr "多人游戏"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:651
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:650
 msgid "NOP"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:629
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:628
 msgid "NOTE: Stream size doesn't match actual data length\n"
-msgstr ""
+msgstr "注意：流大小与真实数据长度不匹配\n"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:129
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:116
 msgid "NP Add"
 msgstr "NP Add"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:124
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:111
 msgid "NP Begin"
 msgstr "NP Begin"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:132
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:119
 msgid "NP Decimal"
 msgstr "NP Decimal"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:126
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:113
 msgid "NP Delete"
 msgstr "NP Delete"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:133
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:120
 msgid "NP Divide"
 msgstr "NP Divide"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:120
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:107
 msgid "NP Down"
 msgstr "NP Down"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:123
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:110
 msgid "NP End"
 msgstr "NP End"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:111
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:98
 msgid "NP Enter"
 msgstr "NP Enter"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:127
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:114
 msgid "NP Equal"
 msgstr "NP Equal"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:116
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:103
 msgid "NP Home"
 msgstr "NP Home"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:125
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:112
 msgid "NP Insert"
 msgstr "NP Insert"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:117
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:104
 msgid "NP Left"
 msgstr "NP Left"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:128
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:115
 msgid "NP Multiply"
 msgstr "NP Multiply"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:122
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:109
 msgid "NP Page Down"
 msgstr "NP Page Down"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:121
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:108
 msgid "NP Page Up"
 msgstr "NP Page Up"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:119
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:106
 msgid "NP Right"
 msgstr "NP Right"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:130
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:117
 msgid "NP Separator"
 msgstr "NP Separator"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:109
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:96
 msgid "NP Space"
 msgstr "NP Space"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:131
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:118
 msgid "NP Subtract"
 msgstr "NP Subtract"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:110
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:97
 msgid "NP Tab"
 msgstr "NP Tab"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:118
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:105
 msgid "NP Up"
 msgstr "NP Up"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:444
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:59
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:50
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:448
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:46
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:37
 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:25
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:72
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:282
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:553
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:15
 msgid "Name: "
 msgstr "名称:"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:526
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:562
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:516
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:555
 msgid "Native GCI files(*.gci)"
 msgstr "内部 GCI 文件(*.gci)"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:161
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:148
 msgid "New Scan"
 msgstr "新建扫描"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:206
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:193
 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:801
 msgid "Next Page"
 msgstr "下一页"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:165
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:152
 msgid "Next Scan"
 msgstr "下一扫描"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:68
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:59
 msgid "Nickname :"
 msgstr "昵称 :"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:196
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:190
 msgid "No Country (SDK)"
 msgstr "无国家 (SDK)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:370
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:357
 msgid "No ISOs or WADS found"
 msgstr "未找到镜像或者WAD"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:508
-#, c-format
-msgid "No banner file found for title  %s"
-msgstr "没有找到标题为 %s 的标志文件"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:761
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:768
-msgid "No description available"
-msgstr "没有可用的说明"
-
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:514
-msgid "No docking"
-msgstr "No docking"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:859
-msgid "No file loaded"
-msgstr "未加载文件"
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:439
-msgid "No free dir index entries"
-msgstr "没有空闲目录索引项目"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:895
-msgid "No recorded file"
+#: Source/Core/Core/Src/ConfigManager.h:17
+msgid "No audio output"
 msgstr ""
 
 #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:501
 #, c-format
+msgid "No banner file found for title  %s"
+msgstr "没有找到标题为 %s 的标志文件"
+
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:760
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:767
+msgid "No description available"
+msgstr "没有可用的说明"
+
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:535
+msgid "No docking"
+msgstr "No docking"
+
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:860
+msgid "No file loaded"
+msgstr "未加载文件"
+
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:426
+msgid "No free dir index entries"
+msgstr "没有空闲目录索引项目"
+
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:896
+msgid "No recorded file"
+msgstr "没有已录制文件"
+
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:494
+#, c-format
 msgid "No save folder found for title %s"
 msgstr "No save folder found for title %s"
 
+#: Source/Plugins/Plugin_VideoOGL/Src/main.cpp:132
+#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:111
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:23
 #: Source/Core/DolphinWX/Src/NetWindow.cpp:600
 msgid "None"
 msgstr "无"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:323
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303
 msgid "Norwegian Bokmaal"
 msgstr "书面挪威语"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:203
 msgid "Not Equal"
 msgstr "不等于"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:804
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:794
 msgid "Not Set"
 msgstr "未设置"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:626
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:101
+#, c-format
+msgid "Not a Wii save or read failure for file header size %x"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/Main.cpp:654
 msgid "Not connected"
 msgstr "未连接"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:309
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:296
 msgid "Notes"
 msgstr "说明"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:16
 msgid "Notes: "
 msgstr "说明: "
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:71
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:74
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:580
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:621
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:629
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:59
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:64
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:613
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:659
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:667
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:31
 msgid "Notice"
 msgstr "提示"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:105
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:92
 msgid "Num Lock"
 msgstr "Num Lock"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:88
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:75
 msgid "Number Of Codes: "
 msgstr "代码数量: "
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:30
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:34
 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26
 msgid "Nunchuk"
-msgstr "雙節棍控制器"
+msgstr "双节棍控制器"
 
 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:27
 msgid "Nunchuk Acceleration"
 msgstr "Nunchuk 加速"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:877
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:878
 msgid "Object"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:135
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:122
 msgid "Object Range"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:243
 msgid "Off"
 msgstr "关闭"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:62
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:49
 msgid "Offset:"
 msgstr "偏移量:"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:582
 msgid "On-Screen Display Messages"
-msgstr ""
+msgstr "屏幕显示消息（OSD）"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:436
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:423
 #, c-format
 msgid "Only %d blocks available"
 msgstr "只有 %d 区块有效"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:420
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:178
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:426
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:166
 msgid "Open"
 msgstr "打开"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:876
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:867
 msgid "Open &containing folder"
 msgstr "打开包含文件夹(&C)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:873
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:864
 msgid "Open Wii &save folder"
 msgstr "打开 Wii 存档目录(&S)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:420
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:426
 msgid "Open file..."
 msgstr "打开文件..."
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:61
+#: Source/Core/AudioCommon/Src/OpenALStream.cpp:48
 #, c-format
 msgid "OpenAL: can't create context for device %s"
 msgstr "OpenAL: 不能创建设备 %s 上下文"
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:72
+#: Source/Core/AudioCommon/Src/OpenALStream.cpp:59
 msgid "OpenAL: can't find sound devices"
 msgstr "OpenAL: 不能找到音频设备"
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:66
+#: Source/Core/AudioCommon/Src/OpenALStream.cpp:53
 #, c-format
 msgid "OpenAL: can't open device %s"
 msgstr "OpenAL: 不能打开设备 %s"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502
 msgid "OpenCL Texture Decoder"
 msgstr "OpenCL纹理解码器"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503
 msgid "OpenMP Texture Decoder"
 msgstr "OpenMP纹理解码器"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:317
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:94
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:304
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:81
 msgid "Options"
 msgstr "选项"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:22
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Orange"
 msgstr "橙"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:468
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:455
+#, fuzzy
 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"
+"and import the saves to a new memcard\n"
 msgstr ""
 "文件目录中文件的顺序与区块顺序不匹配\n"
 "右键单击并导出所有存档，\n"
 "之后将存档导入一个新的记忆卡\n"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:316
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:324
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:509
 msgid "Other"
-msgstr ""
+msgstr "其他"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:206
+#: Source/Core/Core/Src/NetPlayClient.cpp:210
 msgid ""
 "Other client disconnected while game is running!! NetPlay is disabled. You "
 "manually stop the game."
@@ -3830,15 +3922,15 @@ msgstr ""
 "Other client disconnected while game is running!! NetPlay is disabled. You "
 "manually stop the game."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:481
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:468
 msgid "Output"
 msgstr "输出"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:342
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:348
 msgid "P&lay Recording..."
 msgstr "播放录制(&L)..."
 
-#: Source/Core/Core/Src/HW/GCPad.cpp:30
+#: Source/Core/Core/Src/HW/GCPad.cpp:18
 msgid "Pad"
 msgstr "手柄"
 
@@ -3846,160 +3938,160 @@ msgstr "手柄"
 msgid "Pad "
 msgstr "手柄"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:34
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:38
 msgid "Pads"
 msgstr "手柄"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:108
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:95
 msgid "Page Down"
 msgstr "Page Down"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:107
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:94
 msgid "Page Up"
 msgstr "Page Up"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:35
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:22
 msgid "Paragraph"
 msgstr "段落"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:64
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:51
 msgid "Parameters"
 msgstr "参数"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:222
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:217
 #, c-format
 msgid "Partition %i"
 msgstr "分区 %i"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:296
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:297
 msgid "Patches"
 msgstr "补丁"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:556
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536
 msgid "Paths"
 msgstr "路径"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1538
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1539
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:51
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1565
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1566
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:38
 msgid "Pause"
 msgstr "暂停"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:128
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:129
 msgid "Pause at end of movie"
 msgstr "在影片末尾暂停"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:397
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405
 msgid "Per-Pixel Lighting"
-msgstr "每像素照明"
+msgstr "逐像素照明"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352
 msgid "Perfect"
 msgstr "完美"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:609
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:642
 #, c-format
 msgid "Perspective %d"
-msgstr "视角 %d"
+msgstr "视角%d"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:165
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:424
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1547
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1548
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:152
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:430
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1574
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1575
 msgid "Play"
 msgstr "开始"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176
 msgid "Play Recording"
 msgstr "播放录制"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:170
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:170
 msgid "Play/Pause"
 msgstr "开始/暂停"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351
 msgid "Playable"
 msgstr "可以玩"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:154
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:141
 msgid "Playback Options"
 msgstr "回放选项"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:301
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:304
 msgid "Players"
 msgstr "玩家"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:988
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:991
 msgid "Please confirm..."
 msgstr "请确认..."
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:579
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:612
 msgid "Please create a perspective before saving"
 msgstr "Please create a perspective before saving"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:36
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:23
 msgid "Plus-Minus"
 msgstr "Plus-Minus"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:324
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304
 msgid "Polish"
 msgstr "波兰语"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:713
 msgid "Port 1"
 msgstr "端口 1"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714
 msgid "Port 2"
 msgstr "端口 2"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:734
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715
 msgid "Port 3"
 msgstr "端口 3"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716
 msgid "Port 4"
 msgstr "端口 4"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:97
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:130
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:88
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:133
 msgid "Port :"
 msgstr "端口 :"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:325
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305
 msgid "Portuguese"
 msgstr "葡萄牙语"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:326
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306
 msgid "Portuguese (Brazilian)"
 msgstr "葡萄牙语(巴西)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:391
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:399
 msgid "Post-Processing Effect:"
 msgstr "后处理效果:"
 
-#: Source/Core/Core/Src/Movie.cpp:936
+#: Source/Core/Core/Src/Movie.cpp:927
 #, c-format
 msgid "Premature movie end in PlayController. %u + 8 > %u"
 msgstr ""
 
-#: Source/Core/Core/Src/Movie.cpp:1055
+#: Source/Core/Core/Src/Movie.cpp:1046
 #, c-format
 msgid "Premature movie end in PlayWiimote. %u + %d > %u"
 msgstr ""
 
-#: Source/Core/Core/Src/Movie.cpp:1032
+#: Source/Core/Core/Src/Movie.cpp:1023
 #, c-format
 msgid "Premature movie end in PlayWiimote. %u > %u"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:48
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:35
 msgid "Presets: "
 msgstr "预置: "
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:205
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:192
 msgid "Prev Page"
 msgstr "上一页"
 
@@ -4007,67 +4099,67 @@ msgstr "上一页"
 msgid "Previous Page"
 msgstr "上一页"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:183
 msgid "Previous Value"
 msgstr "上一个值"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:60
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:47
 msgid "Print"
 msgstr "打印"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:894
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:885
 msgid "Profile"
 msgstr "配置"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.h:55
+#: Source/Core/DolphinWX/Src/ISOProperties.h:42
 msgid "Properties"
 msgstr "属性"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:283
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:286
 msgid "Purge Cache"
 msgstr "清除缓存"
 
-#: Source/Core/Common/Src/MsgHandler.cpp:66
+#: Source/Core/Common/Src/MsgHandler.cpp:52
 msgid "Question"
 msgstr "询问"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:159
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:316
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:162
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:319
 msgid "Quit"
 msgstr "退出"
 
 #. i18n:  Right
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:59
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:46
 msgid "R"
 msgstr "R"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:40
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:27
 msgid "R Button"
 msgstr "R 键"
 
 #. i18n:  Right-Analog
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:63
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
 msgid "R-Analog"
 msgstr "R-摇杆"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:445
 msgid "RAM"
 msgstr "内存"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:175
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:169
 msgid "RUSSIA"
 msgstr "俄语"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:528
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:515
 msgid "Range"
 msgstr "范围"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:190
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:178
 msgid "Read-only mode"
 msgstr "只读模式"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:487
 msgid "Real"
 msgstr "真实"
 
@@ -4083,33 +4175,33 @@ msgstr "真实Wii遥控器"
 msgid "Reconnect Wiimote on State Loading"
 msgstr "读取状态时重连Wii遥控器"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:193
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:217
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:791
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:180
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:204
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:790
 msgid "Record"
 msgstr "录制"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:174
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:161
 msgid "Recording Info"
-msgstr ""
+msgstr "录制信息"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:202
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:189
 msgid "Recording Options"
 msgstr "录制选项"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:21
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Red"
 msgstr "红"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:24
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Red Left"
 msgstr "红 左"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:25
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Red Right"
 msgstr "红 右"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86
 msgid ""
 "Reduces the amount of aliasing caused by rasterizing 3D graphics.\n"
 "This makes the rendered picture look less blocky.\n"
@@ -4124,28 +4216,28 @@ msgstr ""
 "如果没有把握，选择“无”。"
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:60
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:421
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:903
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:427
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:894
 msgid "Refresh"
 msgstr "刷新"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:180
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:168
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:168
 msgid "Refresh List"
 msgstr "刷新列表"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:421
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:427
 msgid "Refresh game list"
 msgstr "刷新游戏列表"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:405
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:427
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:77
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:812
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:409
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:431
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:64
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:793
 msgid "Remove"
 msgstr "移除"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99
 msgid ""
 "Render the scene as a wireframe.\n"
 "\n"
@@ -4155,196 +4247,204 @@ msgstr ""
 "\n"
 "如果没有把握，请不要勾选此项"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:308
 msgid "Render to Main Window"
 msgstr "附加到主窗口"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:915
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:172
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:906
 msgid "Reset"
 msgstr "重置"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:190
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:177
 msgid "Results"
 msgstr "结果"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:29
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:16
 msgid "Return"
 msgstr "回车"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:277
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:57
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464
+msgid "Revision:"
+msgstr ""
+
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:264
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:44
 msgid "Right"
 msgstr "右"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:61
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:65
 msgid "Right Stick"
 msgstr "右摇杆"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:85
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:295
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:72
 msgid "Rumble"
 msgstr "震动"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:518
-msgid "Run DSP LLE on a dedicated thread (not recommended)."
-msgstr "在单独的线程中运行DSP LLE (不推荐)."
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498
+msgid ""
+"Run DSP HLE and LLE on a dedicated thread (not recommended: might cause "
+"audio glitches with HLE and freezes with LLE)."
+msgstr ""
+"在一个专门的线程上运行DSP HLE和LLE（不推荐：用于HLE时可能产生声音差错，用于"
+"LLE时可能导致卡机）。"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:327
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307
 msgid "Russian"
 msgstr "俄语"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:149
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:150
 msgid "Sa&ve State"
 msgstr "保存状态(&V)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:465
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475
 msgid "Safe"
 msgstr "安全"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:196
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:446
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:925
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:183
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:452
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916
 msgid "Save"
 msgstr "保存"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:532
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:522
 msgid "Save GCI as..."
 msgstr "保存GCI为..."
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
 msgid "Save State Slot 1"
 msgstr "存档插槽 1"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:198
 msgid "Save State Slot 2"
 msgstr "存档插槽 2"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:199
 msgid "Save State Slot 3"
 msgstr "存档插槽 3"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:212
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:212
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200
 msgid "Save State Slot 4"
 msgstr "存档插槽 4"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201
 msgid "Save State Slot 5"
 msgstr "存档插槽 5"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202
 msgid "Save State Slot 6"
 msgstr "存档插槽 6"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:203
 msgid "Save State Slot 7"
 msgstr "存档插槽 7"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204
 msgid "Save State Slot 8"
 msgstr "存档插槽 8"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:151
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:152
 msgid "Save State..."
 msgstr "保存状态..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:582
 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:592
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:602
 msgid "Save as..."
 msgstr "另存为..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1203
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1204
 msgid "Save compressed GCM/ISO"
 msgstr "保存压缩的GCM/镜像"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:446
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:452
 msgid "Save current perspective"
 msgstr "保存当前视角"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1192
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193
 msgid "Save decompressed GCM/ISO"
 msgstr "保存解压缩的GCM/镜像"
 
-#: Source/Core/Core/Src/Movie.cpp:801
+#: Source/Core/Core/Src/Movie.cpp:792
 #, 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:396
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:404
 msgid "Scaled EFB Copy"
-msgstr ""
+msgstr "缩放EFB副本"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:556
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:543
 #, c-format
 msgid "Scanning %s"
 msgstr "正在扫描%s"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:539
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:526
 msgid "Scanning for ISOs"
 msgstr "扫描镜像中"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:540
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:527
 msgid "Scanning..."
 msgstr "扫描中..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:427
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
 msgid "ScrShot"
 msgstr "截图"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:106
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:93
 msgid "Scroll Lock"
 msgstr "Scroll Lock"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:264
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:251
 msgid "Search"
 msgstr "搜索"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:227
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:214
 msgid "Search Filter"
 msgstr "搜索过滤"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:810
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:791
 msgid "Search Subfolders"
 msgstr "搜索子目录"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:250
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:237
 msgid "Search current Object"
 msgstr "搜索当前对象"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:254
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:241
 msgid "Search for hex Value:"
 msgstr "搜索十六进制值:"
 
-#: Source/Core/Common/Src/SysConf.h:103 Source/Core/Common/Src/SysConf.h:126
-#: Source/Core/Common/Src/SysConf.h:146 Source/Core/Common/Src/SysConf.h:167
+#: Source/Core/Common/Src/SysConf.h:90 Source/Core/Common/Src/SysConf.h:113
+#: Source/Core/Common/Src/SysConf.h:133 Source/Core/Common/Src/SysConf.h:154
 #, c-format
 msgid "Section %s not found in SYSCONF"
 msgstr "未在SYSCONF中找到部分%s"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:59
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:490
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:46
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:477
 msgid "Select"
 msgstr "选择"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:677
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1072
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:683
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1087
 msgid "Select The Recording File"
 msgstr "选择录制文件"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1285
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1312
 msgid "Select a Wii WAD file to install"
 msgstr "选择要安装的 Wii WAD 文件"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:70
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74
 msgid ""
 "Select a hardware adapter to use.\n"
 "\n"
@@ -4353,31 +4453,31 @@ msgstr ""
 "选择要使用的硬件适配器。\n"
 "如果没有把握，请使用第一个。"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:520
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:510
 msgid "Select a save file to import"
 msgstr "选择要导入的存档"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:363
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:366
 msgid "Select floating windows"
 msgstr "选择浮动窗口"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:582
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:585
 msgid "Select the file to load"
 msgstr "选择要载入的文件"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1241
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1268
 msgid "Select the save file"
 msgstr "选择一个存档文件"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1388
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1415
 msgid "Select the state to load"
 msgstr "选择要载入的状态"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1429
 msgid "Select the state to save"
 msgstr "选择要保存的状态"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82
 msgid ""
 "Select what aspect ratio to use when rendering:\n"
 "Auto: Use the native aspect ratio\n"
@@ -4395,15 +4495,15 @@ msgstr ""
 "\n"
 "如果没有把握，请选择“自动”。"
 
-#: Source/Core/InputCommon/Src/InputConfig.cpp:61
+#: Source/Core/InputCommon/Src/InputConfig.cpp:48
 msgid "Selected controller profile does not exist"
-msgstr ""
+msgstr "所选控制器配置不存在"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:116
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:109
 msgid "Selected font"
 msgstr "所选字体"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75
 msgid ""
 "Selects the display resolution used in fullscreen mode.\n"
 "This should always be bigger than or equal to the internal resolution. "
@@ -4418,22 +4518,37 @@ msgstr ""
 "如果没有把握，请使用您的桌面分辨率。\n"
 "如果仍然不能确定，使用最高的有效分辨率。"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:69
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:70
 msgid ""
 "Selects what graphics API to use internally.\n"
 "Direct3D 9 usually is the fastest one. OpenGL is more accurate though. "
 "Direct3D 11 is somewhere between the two.\n"
 "Note that the Direct3D backends are only available on Windows.\n"
 "\n"
-"If unsure, use Direct3D 9."
+"If unsure, use Direct3D 11."
 msgstr ""
-"选择内部使用哪种图像应用程序接口(API)\n"
+"选择供内部使用的图像应用程序接口（API）。\n"
+"Direct3D 9通常最快，而OpenGL会更加精确，Direct3D 11介乎两者之间。\n"
+"请注意Direct3D后端只在Windows下可用。\n"
+"\n"
+"如果没有把握，请选择Direct3D 11。"
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72
+msgid ""
+"Selects what graphics API to use internally.\n"
+"Direct3D 9 usually is the fastest one. OpenGL is more accurate though. "
+"Direct3D 11 is somewhere between the two.\n"
+"Note that the Direct3D backends are only available on Windows.\n"
+"\n"
+"If unsure, use OpenGL."
+msgstr ""
+"选择内部使用哪种图像应用程序接口（API）。\n"
 "Direct3D 9通常最快，而OpenGL更加精确，Direct3D 11介乎两者之间。\n"
 "请注意Direct3D后端只在Windows下可用。\n"
 "\n"
-"如果没有把握，请选择Direct3D 9。"
+"如果没有把握，请选择OpenGL。"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:288
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:291
 msgid "Send"
 msgstr "发送"
 
@@ -4441,24 +4556,24 @@ msgstr "发送"
 msgid "Sensor Bar Position:"
 msgstr "传感器栏位置"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:77
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:64
 msgid "Separator"
 msgstr "分割"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:328
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308
 msgid "Serbian"
 msgstr "塞尔维亚语"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:522
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502
 msgid ""
 "Serial Port 1 - This is the port which devices such as the net adapter use"
 msgstr "串行端口 1 - 这是网络适配器等设备使用的端口"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:488
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:475
 msgid "Set"
 msgstr "设置"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:877
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:868
 msgid "Set as &default ISO"
 msgstr "设置为默认镜像(&D)"
 
@@ -4467,134 +4582,134 @@ msgstr "设置为默认镜像(&D)"
 msgid "Set as default Memcard %c"
 msgstr "设置为默认内存卡 %c"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:460
+#: Source/Core/Core/Src/ActionReplay.cpp:450
 #, 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/ConfigMain.cpp:535
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:515
 msgid ""
 "Sets the latency (in ms).  Higher values may reduce audio crackling. OpenAL "
 "backend only."
-msgstr ""
+msgstr "设置延迟（以毫秒计）。较高的值或将减少音频噼啪声。仅适用于OpenAL后端。"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341
 msgid "Settings..."
 msgstr "设置..."
 
-#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:222
+#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:209
 msgid "SetupWiiMem: Cant find setting file"
 msgstr "安装Wii内存: 不能找到设置文件"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:291
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:278
 msgid "Shake"
 msgstr "震动"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
 msgid "Short Name:"
 msgstr "短名称:"
 
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:103
+#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:90
 msgid "Shoulder Buttons"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:217
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:220
 msgid "Show &Console"
 msgstr "显示控制台(&C)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:215
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:218
 msgid "Show &Log"
 msgstr "显示日志(&L)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:212
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:215
 msgid "Show &Statusbar"
 msgstr "显示状态栏(&S)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:210
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:213
 msgid "Show &Toolbar"
 msgstr "显示工具栏(&T)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:281
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:284
 msgid "Show Drives"
 msgstr "显示驱动器"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:517
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530
 msgid "Show EFB Copy Regions"
 msgstr "显示EFB复制范围"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:295
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303
 msgid "Show FPS"
 msgstr "显示 FPS"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:271
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:274
 msgid "Show France"
 msgstr "显示法国"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:257
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:260
 msgid "Show GameCube"
 msgstr "显示 GameCube"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561
 msgid "Show Input Display"
 msgstr "显示输入显示"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:273
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:276
 msgid "Show Italy"
 msgstr "显示意大利"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:264
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:267
 msgid "Show JAP"
 msgstr "显示日本"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:275
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:278
 msgid "Show Korea"
 msgstr "显示韩国"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476
 msgid "Show Language:"
 msgstr "显示语言:"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:216
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:219
 msgid "Show Log &Configuration"
 msgstr "显示日志设置(&C)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:266
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:269
 msgid "Show PAL"
 msgstr "显示PAL"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:254
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:257
 msgid "Show Platforms"
 msgstr "显示平台"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:263
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:266
 msgid "Show Regions"
 msgstr "显示国家"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:518
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531
 msgid "Show Statistics"
 msgstr "显示统计数据"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:277
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:280
 msgid "Show Taiwan"
 msgstr "显示台湾"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:268
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:271
 msgid "Show USA"
 msgstr "显示美国"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:259
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:262
 msgid "Show Wad"
 msgstr "显示 Wad"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:255
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:258
 msgid "Show Wii"
 msgstr "显示 Wii"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491
 msgid "Show a confirmation box before stopping a game."
 msgstr "停止游戏时显示确认对话框"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:512
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492
 msgid ""
 "Show a message box when a potentially serious error has occurred.\n"
 "Disabling this may avoid annoying and non-fatal messages, but it may also "
@@ -4608,11 +4723,11 @@ msgstr ""
 msgid "Show first block"
 msgstr "显示第一区块"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:130
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:131
 msgid "Show lag counter"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493
 msgid ""
 "Show messages on the emulation screen area.\n"
 "These messages include memory card writes, video backend and CPU "
@@ -4637,7 +4752,7 @@ msgstr "显示存档图标"
 msgid "Show save title"
 msgstr "显示存档标题"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102
 msgid ""
 "Show the number of frames rendered per second as a measure of emulation "
 "speed.\n"
@@ -4648,11 +4763,11 @@ msgstr ""
 "\n"
 "如果没有把握，请不要勾选此项。"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:279
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:282
 msgid "Show unknown"
 msgstr "显示未知"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105
 msgid ""
 "Show various statistics.\n"
 "\n"
@@ -4662,43 +4777,31 @@ msgstr ""
 "\n"
 "如果没有把握，请不要勾选此项。"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:319
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:306
 msgid "Sideways Wiimote"
 msgstr "Sideways Wiimote"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:280
 msgid "Simplified Chinese"
 msgstr "简体中文"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:311
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:298
 msgid "Size"
 msgstr "大小"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:696
 msgid "Skip BIOS"
-msgstr ""
+msgstr "跳过BIOS"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316
 msgid "Skip DCBZ clearing"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:492
-msgid "Skip Dest. Alpha Pass"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:444
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:454
 msgid "Skip EFB Access from CPU"
 msgstr "跳过EFB访问"
 
-#: 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 ""
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125
 msgid ""
 "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n"
 "Sometimes also increases visual quality.\n"
@@ -4708,25 +4811,25 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:374
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:386
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:380
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:392
 #, c-format
 msgid "Slot %i"
 msgstr "插槽 %i"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:700
 msgid "Slot A"
 msgstr "插槽 A"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:701
 msgid "Slot B"
 msgstr "插槽 B"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:62
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:49
 msgid "Snapshot"
 msgstr "截图"
 
-#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:58
+#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:46
 msgid "Software Renderer"
 msgstr "软件渲染器"
 
@@ -4741,27 +4844,27 @@ msgstr ""
 "该项仅当用于调试目的时有所帮助。\n"
 "您真的想要启用软件渲染吗？如果没有把握，请选择“否”。"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:683
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:664
 msgid "Sound Settings"
 msgstr "声音设置"
 
-#: Source/Core/AudioCommon/Src/AudioCommon.cpp:77
+#: Source/Core/AudioCommon/Src/AudioCommon.cpp:64
 #, c-format
 msgid "Sound backend %s is not valid."
 msgstr "声音后端 %s 无效."
 
-#: Source/Core/AudioCommon/Src/DSoundStream.cpp:59
+#: Source/Core/AudioCommon/Src/DSoundStream.cpp:46
 #, c-format
 msgid "Sound buffer creation failed: %s"
 msgstr "声音缓冲区创建失败: %s"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:31
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:18
 msgid "Space"
 msgstr "空格"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:329
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309
 msgid "Spanish"
 msgstr "西班牙语"
 
@@ -4769,7 +4872,7 @@ msgstr "西班牙语"
 msgid "Speaker Volume:"
 msgstr "扬声器音量:"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92
 msgid ""
 "Specifies the resolution used to render at. A high resolution will improve "
 "visual quality a lot but is also quite heavy on performance and might cause "
@@ -4786,63 +4889,63 @@ msgstr ""
 "能将越高。\n"
 "如果没有把握，请选择640x528。"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322
 msgid "Speed up Disc Transfer Rate"
 msgstr "提升光盘传输率"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:243
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:230
 msgid "Square Stick"
 msgstr "方块键"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:107
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87
 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:322
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:37
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:25
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:325
 msgid "Start"
 msgstr "开始"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:194
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:197
 msgid "Start &NetPlay"
 msgstr "开始网络对战(&N)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:339
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:345
 msgid "Start Re&cording"
 msgstr "开始录制(&C)"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:175
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:175
 msgid "Start Recording"
 msgstr "开始录制"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:312
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:299
 msgid "State"
 msgstr "状态"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:173
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:161
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:161
 msgid "State Saves"
 msgstr "状态存档"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:108
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88
 msgid "Steering Wheel"
 msgstr "方向盘"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:53
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:57
 msgid "Stick"
 msgstr "摇杆"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:420
-#: 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:325
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:419
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:431
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:171
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:171
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:328
 msgid "Stop"
 msgstr "停止"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96
 msgid ""
 "Store EFB copies in GPU texture objects.\n"
 "This is not so accurate, but it works well enough for most games and gives a "
@@ -4855,107 +4958,117 @@ msgstr ""
 "\n"
 "如果没有把握，请勾选此项。"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:275
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283
 msgid "Stretch to Window"
 msgstr "拉伸到窗口大小"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:43
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:47
 msgid "Strum"
 msgstr "Strum"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:78
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:65
 msgid "Subtract"
 msgstr "Subtract"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:77
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:67
 #, c-format
 msgid "Successfully exported file to %s"
 msgstr "成功导出文件到 %s"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:56
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:43
 msgid "Successfully imported save files"
 msgstr "成功导入存档文件"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:285
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:272
 msgid "Swing"
 msgstr "摇摆"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:744
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:792
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320
+msgid "Synchronize GPU thread"
+msgstr "同步GPU线程"
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321
+msgid ""
+"Synchronizes the GPU and CPU threads to help prevent random freezes in Dual "
+"Core mode. (ON = Compatible, OFF = Fast)"
+msgstr "同步GPU与CPU线程以帮助防止双核模式下的偶发卡死。（开=兼容，关=快速）"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773
 msgid "System Language:"
 msgstr "系统语言:"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:191
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:185
 msgid "TAIWAN"
 msgstr "台湾"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:127
-#: Source/Core/DolphinWX/Src/TASInputDlg.h:32
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:128
+#: Source/Core/DolphinWX/Src/TASInputDlg.h:19
 msgid "TAS Input"
 msgstr "TAS 输入"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:28
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:15
 msgid "Tab"
 msgstr "Tab"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:510
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:531
 msgid "Tab split"
 msgstr "Tab split"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:37
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:41
 msgid "Table Left"
 msgstr "Table Left"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:38
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:42
 msgid "Table Right"
 msgstr "Table Right"
 
-#: 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
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:361
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:181
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:181
 msgid "Take Screenshot"
 msgstr "屏幕截图"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:109
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89
 msgid "TaruKonga (Bongos)"
 msgstr "TaruKonga (Bongos)"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:472
 msgid "Test"
 msgstr "测试"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:444
 msgid "Texture"
 msgstr "材质"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:451
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:461
 msgid "Texture Cache"
 msgstr "纹理缓存"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:519
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:532
 msgid "Texture Format Overlay"
 msgstr "纹理格式覆盖"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:226
+#: Source/Core/Core/Src/CoreParameter.cpp:215
 msgid "The WAD has been installed successfully"
 msgstr "WAD 安装成功"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:197
+#: Source/Core/Core/Src/ActionReplay.cpp:185
 msgid "The address is invalid"
 msgstr "地址无效"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:509
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:496
 msgid "The checksum was successfully fixed"
 msgstr "校检和成功修复"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1242
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226
 msgid "The chosen directory is already in the list"
 msgstr "选择的目录已经存在于列表"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1117
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1216
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1118
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1146
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1217
 #, c-format
 msgid ""
 "The file %s already exists.\n"
@@ -4964,36 +5077,36 @@ msgstr ""
 "文件 %s 已经存在.\n"
 "您要替换它么?"
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:51
+#: Source/Core/AudioCommon/Src/WaveFile.cpp:38
 #, c-format
 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
+#: Source/Core/AudioCommon/Src/WaveFile.cpp:31
 #, c-format
 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:332
+#: Source/Core/Core/Src/Boot/Boot.cpp:320
 #, c-format
 msgid "The file you specified (%s) does not exist"
 msgstr "您指定的文件 %s 不存在"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:628
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:666
 msgid "The name can not be empty"
 msgstr "名称不能为空"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:620
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:658
 msgid "The name can not contain the character ','"
 msgstr "名称不能包含字符 ','"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:142
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:129
 msgid "The resulting decrypted AR code doesn't contain any lines."
 msgstr "产生的已解密动作回放代码不包含任何行。"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98
 msgid ""
 "The safer you adjust this, the less likely the emulator will be missing any "
 "texture updates from RAM.\n"
@@ -5004,46 +5117,46 @@ msgstr ""
 "\n"
 "如果没有把握，请将滑块拖动至最右。"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:445
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:432
 msgid "The save you are trying to copy has an invalid file size"
 msgstr "您正在试图复制的存档文件大小无效"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:388
+#: Source/Core/DolphinWX/Src/Main.cpp:416
 msgid ""
 "The selected language is not supported by your system. Falling back to "
 "system default."
 msgstr "您的系统不支持选定的语言。正在退回系统默认。"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:43
+#: Source/Core/Core/Src/NetPlayClient.cpp:47
 msgid "The server and client's NetPlay versions are incompatible!"
 msgstr "服务器与客户端的NetPlay版本不兼容！"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:40
+#: Source/Core/Core/Src/NetPlayClient.cpp:44
 msgid "The server is full!"
 msgstr "服务器已满!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:46
+#: Source/Core/Core/Src/NetPlayClient.cpp:50
 msgid "The server responded: the game is currently running!"
-msgstr "服务器已响应:游戏正在运行！"
+msgstr "服务器回应：游戏正在运行！"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:49
+#: Source/Core/Core/Src/NetPlayClient.cpp:53
 msgid "The server sent an unknown error message!"
 msgstr "服务器发送了一个未知错误消息!"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:119
+#: Source/Core/Core/Src/CoreParameter.cpp:108
 #, c-format
 msgid "The specified file \"%s\" does not exist"
 msgstr "指定的文件 \"%s\" 不存在"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:198
+#: Source/Core/Core/Src/ActionReplay.cpp:186
 msgid "The value is invalid"
 msgstr "这个值无效"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:642
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:623
 msgid "Theme:"
 msgstr "主题:"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:476
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:463
 msgid ""
 "There must be a ticket for 00000001/00000002. Your NAND dump is probably "
 "incomplete."
@@ -5051,25 +5164,25 @@ msgstr ""
 "There must be a ticket for 00000001/00000002. Your NAND dump is probably "
 "incomplete."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308
 msgid ""
 "These settings override core Dolphin settings.\n"
 "Undetermined means the game uses Dolphin's setting."
 msgstr ""
-"这些设置将覆盖Dolphi核心设置.\n"
-"未决设置将使用Dolphi的设置."
+"这些设置将覆盖核心Dolphin设置。\n"
+"未决设置将使用Dolphin的设置。"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:355
+#: Source/Core/Core/Src/ActionReplay.cpp:345
 msgid ""
 "This action replay simulator does not support codes that modify Action "
 "Replay itself."
 msgstr "此动作回放模拟器不支持修改动作回放本身的代码。"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505
 msgid "This could cause slow down in Wii Menu and some games."
 msgstr "这会导致Wii Menu和一些游戏减速。"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118
 msgid ""
 "This feature allows you to change the game's camera.\n"
 "Move the mouse while holding the right mouse button to pan and while holding "
@@ -5087,7 +5200,18 @@ msgstr ""
 "\n"
 "如果没有把握，请不要勾选此项。"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485
+#, fuzzy
+msgid ""
+"This limits the game speed to the specified number of frames per second "
+"(full speed is 60 for NTSC and 50 for PAL). Alternatively, 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限制速"
+"度(可能修正咔嗒声但也可能导致持续的噪音，因游戏而异)。"
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484
 msgid ""
 "This splits the Video and CPU threads, so they can be run on separate "
 "cores.\n"
@@ -5097,61 +5221,61 @@ msgstr ""
 "这将分离视频与CPU线程，以便于在不同的核心中运行。\n"
 "在有多于一个核心的PC中将带来大幅提速，但可能导致偶发性的崩溃或故障。"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:286
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:287
 msgid "This will let you Manually Edit the INI config file"
 msgstr "这将允许你手动编辑INI配置文件"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:249
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:254
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:236
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:241
 msgid "Threshold"
 msgstr "阈值"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:288
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:275
 msgid "Tilt"
 msgstr "倾斜"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:628
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:304
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:622
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:291
 msgid "Title"
 msgstr "标题"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:125
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:144
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:112
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:131
 msgid "To"
-msgstr ""
+msgstr "至"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:72
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59
 msgid "Toggle All Log Types"
 msgstr "切换所有日志类型"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:426
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:432
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:180
 msgid "Toggle Fullscreen"
 msgstr "切换全屏"
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:87
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:271
 msgid "Top"
 msgstr "顶部"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:281
 msgid "Traditional Chinese"
 msgstr "繁体中文"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:426
+#: Source/Core/Core/Src/Boot/Boot.cpp:414
 msgid "Tried to load an unknown file type."
 msgstr "已经尝试载入未知文件类型."
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:80
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:67
 msgid "Triggers"
 msgstr "扳机"
 
-#: Source/Core/Common/Src/SysConf.h:91 Source/Core/Common/Src/SysConf.h:114
+#: Source/Core/Common/Src/SysConf.h:78 Source/Core/Common/Src/SysConf.h:101
 msgid "Trying to read from invalid SYSCONF"
 msgstr "正在尝试从无效的SYSCONF中读取"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:44
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:31
 msgid ""
 "Trying to read from invalid SYSCONF\n"
 "Wiimote bt ids are not available"
@@ -5159,15 +5283,15 @@ msgstr ""
 "正在尝试从无效的SYSCONF中读取\n"
 "Wiimote bt ids将不可用"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:330
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
 msgid "Turkish"
 msgstr "土耳其语"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:33
 msgid "Turntable"
-msgstr "转台"
+msgstr "唱机转盘"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:71
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58
 msgid "Type"
 msgstr "类型"
 
@@ -5175,31 +5299,31 @@ msgstr "类型"
 msgid "UDP Port:"
 msgstr "UDP 端口:"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:279
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:266
 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12
 msgid "UDP Wiimote"
 msgstr "UDP Wiimote"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:199
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:193
 msgid "UNKNOWN"
 msgstr "未知"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:756
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:755
 #, c-format
 msgid "UNKNOWN_%02X"
 msgstr "UNKNOWN_%02X"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:178
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:172
 msgid "USA"
 msgstr "美国"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:225
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:214
 msgid ""
 "Unable to create patch from given values.\n"
 "Entry not modified."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:124
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:111
 #, c-format
 msgid ""
 "Unable to parse line %lu of the entered AR code as a valid encrypted or "
@@ -5210,74 +5334,88 @@ msgstr ""
 "正确。\n"
 "是否忽略此行继续分析？"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:391
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:397
 #, c-format
 msgid "Undefined %i"
 msgstr "未定义的 %i"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:163
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:164
 msgid "Undo Load State"
 msgstr "撤销载入状态"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:718
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:717
 msgid "Unexpected 0x80 call? Aborting..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:215
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:202
 msgid "Unknown"
 msgstr "未知"
 
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:971
+#: Source/Core/Core/Src/HW/DVDInterface.cpp:965
 #, c-format
 msgid "Unknown DVD command %08x - fatal error"
 msgstr "未知 DVD 命令 %08x - 致命错误"
 
-#: Source/Core/Common/Src/SysConf.cpp:145
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:444
+#, c-format
+msgid "Unknown command 0x%08x"
+msgstr ""
+
+#: Source/Core/Common/Src/SysConf.cpp:132
 #, c-format
 msgid "Unknown entry type %i in SYSCONF (%s@%x)!"
 msgstr "Unknown entry type %i in SYSCONF (%s@%x)!"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:228
+#: Source/Core/Core/Src/NetPlayClient.cpp:232
 #, c-format
 msgid "Unknown message received with id : %d"
 msgstr "Unknown message received with id : %d"
 
-#: Source/Core/Core/Src/NetPlayServer.cpp:504
+#: Source/Core/Core/Src/NetPlayServer.cpp:508
 #, c-format
 msgid "Unknown message with id:%d received from player:%d Kicking player!"
 msgstr "Unknown message with id:%d received from player:%d Kicking player!"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:274
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:56
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:261
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:43
 msgid "Up"
 msgstr "上"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:108
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:95
 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17
 msgid "Update"
 msgstr "更新"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:320
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:307
 msgid "Upright Wiimote"
 msgstr "直握 Wiimote"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:777
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758
 msgid "Use EuRGB60 Mode (PAL60)"
 msgstr "使用 EuRGB60 模式 (PAL60)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:294
 msgid "Use Fullscreen"
 msgstr "全屏显示"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:575
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:563
 msgid "Use Hex"
 msgstr "使用十六进制"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:600
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580
 msgid "Use Panic Handlers"
 msgstr "使用警告程序"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89
+msgid ""
+"Use a hacked upload strategy to stream vertices.\n"
+"This usually speed up, but is forbidden by OpenGL specification and may "
+"causes heavy glitches.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122
 msgid ""
 "Use multiple threads to decode textures.\n"
 "Might result in a speedup (especially on CPUs with more than two cores).\n"
@@ -5289,7 +5427,7 @@ msgstr ""
 "\n"
 "如果没有把握，请不要勾选此项。"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126
 msgid ""
 "Usually if shader compilation fails, an error message is displayed.\n"
 "However, one may skip the popups to allow interruption free gameplay by "
@@ -5302,53 +5440,58 @@ msgstr ""
 "\n"
 "如果没有把握，请不要勾选此项。"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:539
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:552
 msgid "Utility"
 msgstr "实用扩展"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:285
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:293
 msgid "V-Sync"
 msgstr "垂直同步"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:209
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318
+#, fuzzy
+msgid "VBeam Speed Hack"
+msgstr "MMU 速度破解"
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196
 msgid "Value"
 msgstr "值"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:73
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:60
 msgid "Value:"
 msgstr "值:"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:572
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:560
 msgid "Value: "
 msgstr "值: "
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:51
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:38
 msgid "Verbosity"
 msgstr "详细"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:377
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:381
 msgid "Video"
 msgstr "视频"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:486
 msgid "Virtual"
 msgstr "虚拟"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:689
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670
 msgid "Volume"
 msgstr "音量"
 
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:498
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:527
+#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:488
+#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:517
 #, c-format
 msgid "WAD installation failed: error creating %s"
 msgstr "WAD 安装失败: 创建 %s 错误"
 
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:547
+#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:537
 msgid "WAD installation failed: error creating ticket"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84
 msgid ""
 "Wait for vertical blanks in order to reduce tearing.\n"
 "Decreases performance if emulation speed is below 100%.\n"
@@ -5360,25 +5503,25 @@ msgstr ""
 "\n"
 "如果没有把握，请不要勾选此项。"
 
-#: Source/Core/Common/Src/MsgHandler.cpp:67
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46
+#: Source/Core/Common/Src/MsgHandler.cpp:53
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:33
 #: Source/Core/DolphinWX/Src/VideoConfigDiag.h:85
 msgid "Warning"
 msgstr "警告"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:291
+#: Source/Core/Core/Src/Boot/Boot.cpp:279
 msgid "Warning - starting DOL in wrong console mode!"
 msgstr "Warning - starting DOL in wrong console mode!"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:341
+#: Source/Core/Core/Src/Boot/Boot.cpp:329
 msgid "Warning - starting ELF in wrong console mode!"
 msgstr "Warning - starting ELF in wrong console mode!"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:221
+#: Source/Core/Core/Src/Boot/Boot.cpp:209
 msgid "Warning - starting ISO in wrong console mode!"
 msgstr "Warning - starting ISO in wrong console mode!"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:519
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:512
 #, c-format
 msgid ""
 "Warning! it is advised to backup all files in the folder:\n"
@@ -5389,7 +5532,7 @@ msgstr ""
 "%s\n"
 "现在继续吗?"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:585
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:578
 #, c-format
 msgid ""
 "Warning: This will overwrite any existing saves that are in the folder:\n"
@@ -5401,7 +5544,7 @@ msgstr ""
 "%s\n"
 "要继续吗?"
 
-#: Source/Core/Core/Src/Movie.cpp:844
+#: Source/Core/Core/Src/Movie.cpp:835
 #, c-format
 msgid ""
 "Warning: You loaded a save that's after the end of the current movie. (byte "
@@ -5409,7 +5552,7 @@ msgid ""
 "load this state with read-only mode off."
 msgstr ""
 
-#: Source/Core/Core/Src/Movie.cpp:861
+#: Source/Core/Core/Src/Movie.cpp:852
 #, c-format
 msgid ""
 "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You "
@@ -5417,7 +5560,7 @@ msgid ""
 "only mode off. Otherwise you'll probably get a desync."
 msgstr ""
 
-#: Source/Core/Core/Src/Movie.cpp:870
+#: Source/Core/Core/Src/Movie.cpp:861
 #, c-format
 msgid ""
 "Warning: You loaded a save whose movie mismatches on frame %d. You should "
@@ -5436,49 +5579,49 @@ msgid ""
 "%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d"
 msgstr ""
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:106
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:129
+#: Source/Core/AudioCommon/Src/WaveFile.cpp:93
+#: Source/Core/AudioCommon/Src/WaveFile.cpp:116
 msgid "WaveFileWriter - file not open."
 msgstr "波形文件写入器 - 文件未打开."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:56
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:60
 msgid "Whammy"
 msgstr "Whammy"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:404
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:408
 msgid "Widescreen Hack"
 msgstr "宽屏破解"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:312
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:299
 msgid "Width"
 msgstr "宽度"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535
 msgid "Wii"
 msgstr "Wii"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:372
 msgid "Wii Console"
 msgstr "Wii控制台"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:844
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:825
 msgid "Wii NAND Root:"
-msgstr ""
+msgstr "Wii NAND 根目录："
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:191
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:194
 msgid "Wii Save Import"
 msgstr "导入 Wii 存档"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1243
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1270
 msgid "Wii save files (*.bin)|*.bin"
 msgstr "Wii 存档文件 (*.bin)|*.bin"
 
-#: Source/Core/DiscIO/Src/WiiWad.cpp:82
+#: Source/Core/DiscIO/Src/WiiWad.cpp:69
 msgid "WiiWAD: Could not read from file"
 msgstr "WiiWAD: 不能从文件读取"
 
-#: Source/Core/Core/Src/HW/Wiimote.cpp:17
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
+#: Source/Core/Core/Src/HW/Wiimote.cpp:20
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
 msgid "Wiimote"
 msgstr "Wii遥控器"
 
@@ -5487,7 +5630,7 @@ msgstr "Wii遥控器"
 msgid "Wiimote %i"
 msgstr "Wii遥控器 %i"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:628
+#: Source/Core/DolphinWX/Src/Main.cpp:656
 msgid "Wiimote Connected"
 msgstr "Wii遥控器已连接"
 
@@ -5495,7 +5638,7 @@ msgstr "Wii遥控器已连接"
 msgid "Wiimote Motor"
 msgstr "Wiimote 马达"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
 msgid "Wiimote settings"
 msgstr "Wii遥控器设置"
 
@@ -5503,101 +5646,125 @@ msgstr "Wii遥控器设置"
 msgid "Wiimotes"
 msgstr "Wii遥控器"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:134
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:121
 msgid "Windows Left"
 msgstr "窗口左侧"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:136
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:123
 msgid "Windows Menu"
 msgstr "窗口菜单"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:135
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:122
 msgid "Windows Right"
 msgstr "窗口右侧"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:131
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:124
 msgid "Word Wrap"
 msgstr "自动换行"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1298
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:864
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1089
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1225
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1325
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:880
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1090
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1226
 msgid "Working..."
 msgstr "工作中..."
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:338
+msgid "Write memcards (GC)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46
 msgid "Write to Console"
 msgstr "写入到控制台"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:67
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:54
 msgid "Write to Debugger"
 msgstr "写入到调试器"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:57
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44
 msgid "Write to File"
 msgstr "写入到文件"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:61
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48
 msgid "Write to Window"
 msgstr "写入到窗口"
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:60
+#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:47
 #, c-format
 msgid "XAudio2 CreateSourceVoice failed: %#X"
 msgstr "XAudio2 CreateSourceVoice failed: %#X"
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:114
+#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:101
 #, c-format
 msgid "XAudio2 init failed: %#X"
 msgstr "XAudio2 init failed: %#X"
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:124
+#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:111
 #, c-format
 msgid "XAudio2 master voice creation failed: %#X"
 msgstr "XAudio2 master voice creation failed: %#X"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:766
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:765
 msgid "XF reg"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:21
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Yellow"
 msgstr "黄"
 
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:107
+#: Source/Core/Core/Src/DSP/DSPCore.cpp:120
 msgid ""
-"You are using free dsp roms made by Dolphin Team.\n"
-"Only Zelda ucode games will work correctly with them.\n"
+"You are using a free DSP ROM made by the Dolphin Team.\n"
+"All Wii games will work correctly, and most GC games should also work fine, "
+"but the GBA/IPL/CARD UCodes will not work.\n"
 msgstr ""
-"您正在使用Dolphin团队开发的免费DSP ROM。\n"
-"该ROM仅能使塞尔达ucode的游戏正确运行。\n"
+"您正在使用Dolphin团队制作的自由DSP ROM。\n"
+"所有Wii游戏都能正确运行，多数GC游戏也将运行良好，但GBA/IPL/CARD UCode将无法运"
+"行。\n"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:73
+#: Source/Core/Core/Src/DSP/DSPCore.cpp:116
+msgid ""
+"You are using an old free DSP ROM made by the Dolphin Team.\n"
+"Only games using the Zelda UCode will work correctly.\n"
+msgstr ""
+"您正在使用Dolphin团队制作的旧版自由DSP ROM。\n"
+"只有塞尔达UCode的游戏能够正确运行。\n"
+
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:63
 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:207
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:210
 msgid "You must choose a game!!"
 msgstr "您必须选择一个游戏!!"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:605
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:593
 msgid "You must enter a name!"
 msgstr "您必须输入一个名称!"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:450
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:438
 msgid "You must enter a valid decimal, hexadecimal or octal value."
 msgstr "您必须输入一个十进制或者十六进制值."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:603
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:591
 msgid "You must enter a valid profile name."
 msgstr "您必须输入一个有效的配置文件名称."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:936
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:917
 msgid "You must restart Dolphin in order for the change to take effect."
-msgstr "您必须重新启动Dolphin以使改动生效。"
+msgstr "您必须重新启动Dolphin以使改动生效。 "
 
-#: Source/Core/Core/Src/CoreParameter.cpp:175
+#: Source/Core/Core/Src/DSP/DSPCore.cpp:109
+msgid ""
+"Your DSP ROMs have incorrect hashes.\n"
+"Would you like to stop now to fix the problem?\n"
+"If you select \"No\", audio might be garbled."
+msgstr ""
+"您的DSP ROM校检不正确。\n"
+"是否要现在停止以处理这个问题？\n"
+"如果选择“否”，声音可能会出现混乱。"
+
+#: Source/Core/Core/Src/CoreParameter.cpp:164
 msgid ""
 "Your GCM/ISO file seems to be invalid (invalid country).\n"
 "Continue with PAL region?"
@@ -5605,7 +5772,7 @@ msgstr ""
 "您的 GCM/ISO 文件似乎是无效的 (无效的国家)。\n"
 "是否要使用 PAL 地区继续？"
 
-#: Source/Core/Common/Src/SysConf.cpp:58
+#: Source/Core/Common/Src/SysConf.cpp:45
 #, c-format
 msgid ""
 "Your SYSCONF file is the wrong size.\n"
@@ -5616,37 +5783,41 @@ msgstr ""
 "正确的大小为 0x%04x (但您的是 0x%04llx)\n"
 "是否要生成一个新的？"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:334
 msgid "ZTP hack"
 msgstr "ZTP 破解"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:387
+#: Source/Core/Core/Src/ActionReplay.cpp:377
 msgid "Zero 3 code not supported"
 msgstr "Zero 3 代码不支持"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:408
+#: Source/Core/Core/Src/ActionReplay.cpp:398
 #, c-format
 msgid "Zero code unknown to dolphin: %08x"
 msgstr "Zero code unknown to dolphin: %08x"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:436
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:460
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:423
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:447
 msgid "[ waiting ]"
 msgstr "[ 等待中 ]"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107
 msgid ""
 "[BROKEN]\n"
 "Highlight regions the EFB was copied from.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
+"[故障中]\n"
+"高亮显示EFB所复制的区域。\n"
+"\n"
+"如果没有把握，请不要勾选此项。"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:91
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:78
 msgid "[Custom]"
 msgstr "[自定义]"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120
 msgid ""
 "[EXPERIMENTAL]\n"
 "Aims to speed up emulation by offloading texture decoding to the GPU using "
@@ -5656,8 +5827,14 @@ msgid ""
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
+"[实验性]\n"
+"使用OpenCL框架将纹理解码工作转载至GPU旨在提高模拟速度。\n"
+"然而目前已知在多款游戏中会导致纹理缺陷。并且多数情况下比常规的CPU纹理解码要"
+"慢。\n"
+"\n"
+"如果没有把握，请不要勾选此项。"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121
 msgid ""
 "[EXPERIMENTAL]\n"
 "Speeds up emulation a bit by caching display lists.\n"
@@ -5665,88 +5842,51 @@ msgid ""
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
+"[实验性]\n"
+"通过缓存显示列表略微提高模拟速度。\n"
+"另一方面也可能产生问题。\n"
+"\n"
+"如果没有把握，请不要勾选此项。"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:508
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:495
 msgid "^ ADD"
 msgstr "^ 加"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:820
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:801
 msgid "apploader (.img)"
 msgstr "应用程序载入器 (.img)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:185
-msgid "failed to read bk header"
-msgstr "读取bk头失败"
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:375
-#, c-format
-msgid "failed to read data from file: %s"
-msgstr "从 %s 文件读取数据失败."
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:97
-msgid "failed to read header"
-msgstr "读取头部失败"
-
-#: Source/Core/Core/Src/PowerPC/JitInterface.cpp:285
+#: Source/Core/Core/Src/PowerPC/JitInterface.cpp:272
 #, c-format
 msgid "iCacheJIT: Reading Opcode from %x. Please report."
 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 "not a wii save or read failure for file header size %x"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:935
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:936
 msgid "s"
 msgstr ""
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:457
-#, c-format
-msgid "unknown cmd 0x%08x"
-msgstr "未知命令 0x%08x"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1110
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1136
 msgid "wxExecute returned -1 on application run!"
 msgstr "wxExecute returned -1 on application run!"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:56
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:43
 msgid "zFar Correction: "
 msgstr "zFar 修正: "
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:51
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:38
 msgid "zNear Correction: "
 msgstr "zNear 修正: "
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:493
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:480
 msgid "| OR"
 msgstr "| 或"
 
-#~ msgid "%i connected"
-#~ msgstr "%i 已连接"
-
-#~ msgid "Interpreter (VERY slow)"
-#~ msgstr "解释器 (非常慢)"
-
-#~ msgid "JIT Recompiler (recommended)"
-#~ msgstr "JIT 重编译器 (推荐)"
-
-#~ msgid "JITIL experimental recompiler"
-#~ msgstr "JITIL 实验性重编译器"
-
-#~ msgid "Pair Up"
-#~ msgstr "配对"
-
-#~ msgid "Reconnect Wiimote Confirm"
-#~ msgstr "确认Wii遥控器重连"
+#~ msgid "Accurate VBeam emulation"
+#~ msgstr "精确VBeam模拟"
 
 #~ msgid ""
-#~ "Wiimote %i has been disconnected by system.\n"
-#~ "Maybe this game doesn't support multi-wiimote,\n"
-#~ "or maybe it is due to idle time out or other reason.\n"
-#~ "Do you want to reconnect immediately?"
-#~ msgstr ""
-#~ "Wii遥控器 %i 已被系统取消链接。\n"
-#~ "有可能这个游戏不支持多个Wii遥控器，\n"
-#~ "也有可能由空闲超时或其他原因导致。\n"
-#~ "您希望现在就重新连接吗？"
+#~ "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)"
+#~ msgstr "如果帧率不稳定，此选项可能有所帮助 (ON = 兼容, OFF = 快速)"
+
+#~ msgid "Skip Dest. Alpha Pass"
+#~ msgstr "忽略目标Alpha通道"
diff --git a/Languages/po/zh_TW.po b/Languages/po/zh_TW.po
index f3c39b66a5..de7db5c6f4 100644
--- a/Languages/po/zh_TW.po
+++ b/Languages/po/zh_TW.po
@@ -3,36 +3,37 @@
 # This file is distributed under the same license as the dolphin-emu package.
 #
 # Translators:
-# khiav <khiav1118@yahoo.com.tw>, 2011.
+# khiav <khiav1118@yahoo.com.tw>, 2011
 msgid ""
 msgstr ""
 "Project-Id-Version: Dolphin Emulator\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-10 08:56-0500\n"
-"PO-Revision-Date: 2013-02-02 08:32+0000\n"
+"POT-Creation-Date: 2013-04-18 23:00-0500\n"
+"PO-Revision-Date: 2013-04-04 08:13+0000\n"
 "Last-Translator: delroth <delroth@gmail.com>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/dolphin-"
+"emu/language/zh_TW/)\n"
 "Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:511
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:499
 msgid " (too many to display)"
 msgstr " (要顯示的項目太多)"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:270
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:273
 #: Source/Core/DolphinWX/Src/NetWindow.cpp:491
 #: Source/Core/DolphinWX/Src/NetWindow.cpp:530
 msgid " Game : "
 msgstr " 遊戲："
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:507
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494
 msgid "! NOT"
 msgstr "! 非"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:70
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:58
 #, c-format
 msgid ""
 "\"%s\" does not exist.\n"
@@ -41,95 +42,94 @@ msgstr ""
 "\"%s\" 不存在。\n"
 " 是否建立新的 16MB 記憶卡？"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:142
+#: Source/Core/Core/Src/CoreParameter.cpp:131
 #, c-format
 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:722
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:721
 #, c-format
 msgid "%08X:  "
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:196
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:183
 #, c-format
 msgid "%1$sCopy%1$s"
 msgstr "%1$s複製%1$s"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:128
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:296
+#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:113
+#, c-format
+msgid "%d samples"
+msgstr ""
+
+#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:112
+#, c-format
+msgid "%d samples (quality level %d)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:121
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:289
 #, c-format
 msgid "%s already exists, overwrite?"
 msgstr "%s 已經存在，是否覆寫？"
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:167
+#: Source/Core/DiscIO/Src/CompressedBlob.cpp:154
 #, c-format
 msgid "%s failed to be scrubbed. Probably the image is corrupt."
 msgstr "抹除 %s 失敗。也許檔案是不正確的。"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:95
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:83
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
 " Card file size is invalid (0x%x bytes)"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:110
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:98
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
 " Card size is invalid (0x%x bytes)"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:90
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:78
 #, c-format
 msgid ""
 "%s failed to load as a memorycard \n"
 "file is not large enough to be a valid memory card file (0x%x bytes)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:367
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:359
 #, c-format
 msgid "%s failed to open"
 msgstr "開啟 %s 失敗"
 
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:97
-#, c-format
-msgid ""
-"%s has an incorrect hash.\n"
-"Would you like to stop now to fix the problem?\n"
-"If you select \"No\", audio will be garbled."
-msgstr ""
-"%s 出現不正確的散列值。\n"
-"現在是否停止並進行修正這個問題？\n"
-"如果選擇 \"否\"，聲音將會混淆。"
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:360
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:352
 #, c-format
 msgid "%s is a 0 byte file"
 msgstr "%s 為 0 位元的檔案"
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:159
+#: Source/Core/DiscIO/Src/CompressedBlob.cpp:146
 #, c-format
 msgid "%s is already compressed! Cannot compress it further."
 msgstr "%s 已經被壓縮過了！無法再次進行壓縮。"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:345
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:337
 #, c-format
 msgid "%s is too long for the filename, max chars is 45"
 msgstr "%s 做為檔名太長了，最多允許 45 個位元"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:202
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:189
 #, c-format
 msgid "%sDelete%s"
 msgstr "%s刪除%s"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:200
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:187
 #, c-format
 msgid "%sExport GCI%s"
 msgstr "%s匯出 GCI%s"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:198
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:185
 #, c-format
 msgid "%sImport GCI%s"
 msgstr "%s匯入 GCI%s"
@@ -139,222 +139,246 @@ msgstr "%s匯入 GCI%s"
 msgid "%u Free Blocks; %u Free Dir Entries"
 msgstr "剩餘 %u 個區塊；剩餘 %u 個目錄項目"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:506
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:493
 msgid "&& AND"
 msgstr "和(&&)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:295
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:301
 msgid "&About..."
 msgstr "關於(&A)..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:99
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:100
 msgid "&Boot from DVD Drive..."
 msgstr "從 DVD 光碟機啟動(&B)..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:231
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:234
 msgid "&Breakpoints"
 msgstr "中斷點(&B)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:110
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:111
 msgid "&Browse for ISOs..."
 msgstr "瀏覽 ISO 檔(&B)..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:192
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:195
 msgid "&Cheats Manager"
 msgstr "作弊檔管理器(&C)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:177
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:180
 msgid "&DSP Settings"
 msgstr "DSP 設定(&D)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:885
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:876
 msgid "&Delete ISO..."
 msgstr "刪除 ISO 檔(&D)..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:903
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:897
 msgid "&Delete selected ISOs..."
 msgstr "刪除已選取的 ISO 檔(&D)..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:170
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:173
 msgid "&Emulation"
 msgstr "模擬器(&E)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:113
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:114
 msgid "&File"
 msgstr "檔案(&F)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:335
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:341
 msgid "&Frame Advance"
 msgstr "畫格步進(&F)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:352
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:358
 msgid "&Fullscreen"
 msgstr "全螢幕(&F)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:176
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:179
 msgid "&Graphics Settings"
 msgstr "影像設定(&G)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:296
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:302
 msgid "&Help"
 msgstr "說明(&H)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:180
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:183
 msgid "&Hotkey Settings"
 msgstr "快捷鍵設定(&D)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:233
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:236
 msgid "&JIT"
 msgstr "&JIT"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:148
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:149
 msgid "&Load State"
 msgstr "讀取進度(&L)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:190
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:193
 msgid "&Memcard Manager (GC)"
 msgstr "GC 記憶卡管理器(&M)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:232
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:235
 msgid "&Memory"
 msgstr "記憶卡(&M)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:313
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:319
 msgid "&Open..."
 msgstr "開啟(&O)..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:186
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:189
 msgid "&Options"
 msgstr "選項(&O)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:324
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:330
 msgid "&Pause"
 msgstr "暫停(&P)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:326
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:332
 msgid "&Play"
 msgstr "執行(&P)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:867
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:858
 msgid "&Properties"
 msgstr "屬性(&P)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:348
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:354
 msgid "&Read-only mode"
 msgstr "唯讀模式(&R)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:319
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:325
 msgid "&Refresh List"
 msgstr "更新列表(&R)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:230
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:233
 msgid "&Registers"
 msgstr "寄存器(&R)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:332
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:338
 msgid "&Reset"
 msgstr "重新啟動(&R)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:234
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:237
 msgid "&Sound"
 msgstr "聲音(&S)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:329
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:335
 msgid "&Stop"
 msgstr "停止(&S)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:207
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:210
 msgid "&Tools"
 msgstr "工具(&T)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:235
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:238
 msgid "&Video"
 msgstr "影像(&V)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:284
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:287
 msgid "&View"
 msgstr "檢視(&V)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:179
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:182
 msgid "&Wiimote Settings"
 msgstr "Wiimote 設定(&W)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:868
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:859
 msgid "&Wiki"
 msgstr "&Wiki"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504
 msgid "'"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:59
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:46
 msgid "(-)+zFar"
 msgstr "(-)+zFar"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:54
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:41
 msgid "(-)+zNear"
 msgstr "(-)+zNear"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:99
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:86
 msgid "(UNKNOWN)"
 msgstr "(未知)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:376
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:384
 msgid "(off)"
 msgstr "(關閉)"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:655
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:654
 msgid "0x44"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+msgid "1.5x Native (960x792)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:158
 msgid "16 bit"
 msgstr "16 位元"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+msgid "1x Native (640x528)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+msgid "2.5x Native (1600x1320)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:346
+msgid "2x Native (1280x1056)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:159
 msgid "32 bit"
 msgstr "32 位元"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:412
 msgid "3D Vision"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+msgid "3x Native (1920x1584)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:347
+msgid "4x Native (2560x2112)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:157
 msgid "8 bit"
 msgstr "8 位元"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:43
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:30
 msgid "<Insert name here>"
 msgstr "<插入名稱>"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:255
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:262
 msgid "<No resolutions found>"
 msgstr "<無解析度設定>"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:104
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84
 msgid "<Nothing>"
 msgstr "<無>"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:162
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:162
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:150
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:150
 msgid "<Press Key>"
 msgstr "<按任意鍵>"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286
 msgid "<System>"
 msgstr "<系統>"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695
 msgid "A"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:201
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:235
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:204
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:238
 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:353
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:387
 msgid "A game is not currently running."
 msgstr "目前沒有執行遊戲。"
 
@@ -364,23 +388,24 @@ msgid ""
 "You must manually connect your wiimotes."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:109
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:100
+#, fuzzy
 msgid ""
 "ALERT:\n"
 "\n"
-"NetPlay will currently only work properly when using the following "
-"settings:\n"
-" - Dual Core [OFF]\n"
-" - Audio Throttle [OFF]\n"
-" - DSP-HLE with \"Null Audio\" or DSP-LLE\n"
-" - Manually set the exact number of controllers that will be used to "
-"[Standard Controller]\n"
+"Netplay will only work with the following settings:\n"
+" - Enable Dual Core [OFF]\n"
+" - DSP Emulator Engine Must be the same on all computers!\n"
+" - DSP on Dedicated Thread [OFF]\n"
+" - Framelimit NOT set to [Audio]\n"
+" - Manually set the exact number of controllers to be used to [Standard "
+"Controller]\n"
 "\n"
-"All players should try to use the same Dolphin version and settings.\n"
-"Disable all memory cards or send them to all players before starting.\n"
-"Wiimote support has not been implemented.\n"
+"All players should use the same Dolphin version and settings.\n"
+"All memory cards must be identical between players or disabled.\n"
+"Wiimote support has not been implemented!\n"
 "\n"
-"You must forward TCP port to host!!"
+"The host must have the chosen TCP port open/forwarded!\n"
 msgstr ""
 "警告：\n"
 "\n"
@@ -396,17 +421,17 @@ msgstr ""
 "\n"
 "您必須至主機的 TCP 埠口進行設定！！"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:111
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:116
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96
 msgid "AM-Baseboard"
 msgstr "AM-Baseboard"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:299
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:115
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:300
 msgid "AR Codes"
 msgstr "AR 代碼"
 
-#: Source/Core/DolphinWX/Src/AboutDolphin.h:33
+#: Source/Core/DolphinWX/Src/AboutDolphin.h:21
 msgid "About Dolphin"
 msgstr "關於 Dolphin"
 
@@ -414,15 +439,11 @@ msgstr "關於 Dolphin"
 msgid "Acceleration"
 msgstr "加速"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:463
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473
 msgid "Accuracy:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317
-msgid "Accurate VBeam emulation"
-msgstr "精確的 VBeam 模擬"
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97
 msgid ""
 "Accurately emulate EFB copies.\n"
 "Some games depend on this for certain graphical effects or gameplay "
@@ -431,12 +452,12 @@ msgid ""
 "If unsure, check EFB to Texture instead."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:239
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:239
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:227
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:227
 msgid "Action"
 msgstr "操作"
 
-#: Source/Core/Core/Src/ARDecrypt.cpp:481
+#: Source/Core/Core/Src/ARDecrypt.cpp:469
 #, c-format
 msgid ""
 "Action Replay Code Decryption Error:\n"
@@ -451,20 +472,20 @@ msgstr ""
 "兇手代碼：\n"
 "%s"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:667
+#: Source/Core/Core/Src/ActionReplay.cpp:657
 #, 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:755
+#: Source/Core/Core/Src/ActionReplay.cpp:745
 #, 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:547
+#: Source/Core/Core/Src/ActionReplay.cpp:537
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And "
@@ -472,7 +493,7 @@ msgid ""
 msgstr ""
 "Action Replay 錯誤：無效的大小 (%08x : 位址 = %08x) 於 Ram 寫入及 輸入 (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:607
+#: Source/Core/Core/Src/ActionReplay.cpp:597
 #, c-format
 msgid ""
 "Action Replay Error: Invalid size (%08x : address = %08x) in Write To "
@@ -480,75 +501,75 @@ msgid ""
 msgstr ""
 "Action Replay 錯誤：無效的大小 (%08x : 位址 = %08x) 於寫入至 指示器 (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:802
+#: Source/Core/Core/Src/ActionReplay.cpp:792
 #, c-format
 msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)"
 msgstr "Action Replay 錯誤：無效的數值 (%08x) 於記憶體複製 (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:682
+#: Source/Core/Core/Src/ActionReplay.cpp:672
 #, c-format
 msgid ""
 "Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)\n"
 "Master codes are not needed. Do not use master codes."
 msgstr ""
 
-#: Source/Core/Core/Src/ActionReplay.cpp:196
+#: Source/Core/Core/Src/ActionReplay.cpp:184
 #, c-format
 msgid "Action Replay Error: invalid AR code line: %s"
 msgstr "Action Replay 錯誤：無效的 AR 代碼行： %s"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:872
+#: Source/Core/Core/Src/ActionReplay.cpp:862
 #, c-format
 msgid "Action Replay: Conditional Code: Invalid Size %08x (%s)"
 msgstr "Action Replay：有條件的代碼：無效的大小 %08x (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:945
+#: Source/Core/Core/Src/ActionReplay.cpp:935
 #, c-format
 msgid "Action Replay: Invalid Normal Code Type %08x (%s)"
 msgstr "Action Replay：無效的一般代碼類型 %08x (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:896
+#: Source/Core/Core/Src/ActionReplay.cpp:886
 #, c-format
 msgid "Action Replay: Normal Code %i: Invalid subtype %08x (%s)"
 msgstr "Action Replay：一般代碼 %i: 無效的副類型 %08x (%s)"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:838
+#: Source/Core/Core/Src/ActionReplay.cpp:828
 #, c-format
 msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)"
 msgstr "Action Replay：一般代碼 0: 無效的副類型 %08x (%s)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:242
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:247
 msgid "Adapter:"
 msgstr "配接器："
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:76
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:63
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:63
 msgid "Add"
 msgstr "新增"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1275
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1301
 msgid "Add ActionReplay Code"
 msgstr "新增 ActionReplay 代碼"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1204
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1230
 msgid "Add Patch"
 msgstr "新增修正"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:507
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:528
 msgid "Add new pane"
 msgstr "新增面版"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:404
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:426
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:811
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:408
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:430
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:792
 msgid "Add..."
 msgstr "新增..."
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:90
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:81
 msgid "Address :"
 msgstr "位址..."
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:58
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:45
 msgid ""
 "Adds the specified value to zFar Parameter.\n"
 "Two ways to express the floating point values.\n"
@@ -565,7 +586,7 @@ msgstr ""
 "\n"
 "注意：檢查日誌/控制台視窗檢視取得的值。"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:53
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:40
 msgid ""
 "Adds the specified value to zNear Parameter.\n"
 "Two ways to express the floating point values.\n"
@@ -583,48 +604,48 @@ msgstr ""
 "\n"
 "注意：檢查日誌/控制台視窗檢視取得的值。"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:755
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:744
 msgid "Adjust the analog control pressure required to activate buttons."
 msgstr "調整模擬搖桿控制壓力需要活動的按鈕。"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:509
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:522
 msgid "Advanced"
 msgstr "進階"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561
 msgid "Advanced Settings"
 msgstr "進階設定"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:584
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:587
 msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:816
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:797
 msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1189
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1190
 msgid "All Gamecube GCM files (gcm)"
 msgstr "所有 Gamecube GCM 檔案 (gcm)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1390
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1404
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1417
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1431
 msgid "All Save States (sav, s##)"
 msgstr "所有即時存檔 (sav, s##)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1187
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1188
 msgid "All Wii ISO files (iso)"
 msgstr "所有 Wii ISO 檔案 (iso)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1207
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1208
 msgid "All compressed GC/Wii ISO files (gcz)"
 msgstr "所有已壓縮的 GC/Wii ISO 檔案 (gcz)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:124
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:104
 msgid "All files (*.*)|*.*"
 msgstr "所有檔案 (*.*)|*.*"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123
 msgid ""
 "Allows toggling certain options via the hotkeys 3 (Internal Resolution), 4 "
 "(Aspect Ratio), 5 (Copy EFB) and 6 (Fog) within the emulation window.\n"
@@ -632,50 +653,50 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:285
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:272
 msgid "Analyze"
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:298
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:285
 msgid "Angle"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:367
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:375
 msgid "Anisotropic Filtering:"
 msgstr "各向異性過濾："
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:350
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:358
 msgid "Anti-Aliasing:"
 msgstr "邊緣抗鋸齒："
 
-#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:308
+#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:299
 msgid "Apploader is the wrong size...is it really an apploader?"
 msgstr "程式讀取器為錯誤的大小...它是程式讀取器嗎？"
 
-#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:302
+#: Source/Core/DiscIO/Src/VolumeDirectory.cpp:293
 msgid "Apploader unable to load from file"
 msgstr "程式讀取器無法從檔案中讀取"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:841
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:822
 msgid "Apploader:"
 msgstr "程式讀取器："
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:135
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:122
 msgid "Apply"
 msgstr "套用"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124
 msgid ""
 "Apply a post-processing effect after finishing a frame.\n"
 "\n"
 "If unsure, select (off)."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287
 msgid "Arabic"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:614
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:603
 #, c-format
 msgid "Are you sure you want to delete \"%s\"?"
 msgstr "是否確認刪除 \"%s\" ？"
@@ -692,206 +713,210 @@ msgstr ""
 msgid "Are you sure you want to delete this file?  It will be gone forever!"
 msgstr "是否真的要刪除這些檔案？刪了之後就回不來了哦！"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:789
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:277
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:44
+msgid "Arm JIT (experimental)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:285
 msgid "Aspect Ratio:"
 msgstr "畫面比例："
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:70
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:58
 msgid "At least one pane must remain open."
 msgstr "必須剩餘至少一個面板。"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:553
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533
 msgid "Audio"
 msgstr "聲音"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:694
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675
 msgid "Audio Backend:"
 msgstr "聲音裝置："
 
-#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:41
+#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:28
 msgid "AudioCommon: Error opening AO device.\n"
 msgstr "AudioCommon：開啟 AO 裝置出錯。\n"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:275
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283
 msgid "Auto"
 msgstr "自動"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:337
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345
 msgid "Auto (Multiple of 640x528)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:337
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345
 msgid "Auto (Window Size)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:297
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305
 msgid "Auto adjust Window Size"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77
 msgid ""
 "Automatically adjusts the window size to your internal resolution.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:697
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696
 msgid "B"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:755
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:754
 msgid "BP register "
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:27
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:14
 msgid "Back"
 msgstr "返回"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:698
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:679
 msgid "Backend Settings"
 msgstr "裝置設定"
 
-#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:60
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:206
+#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:47
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:211
 msgid "Backend:"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:318
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:95
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:305
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:82
 msgid "Background Input"
 msgstr "背景輸入"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:279
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:266
 msgid "Backward"
 msgstr "向後"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:264
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:257
 msgid "Bad File Header"
 msgstr "損壞的檔頭"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:627
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:621
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:290
 msgid "Banner"
 msgstr "橫幅"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:519
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:529
 msgid "Banner Details"
 msgstr "圖示明細"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491
 msgid "Banner:"
 msgstr "橫幅："
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:57
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:61
 msgid "Bar"
 msgstr "Bar"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:308
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:316
 msgid "Basic"
 msgstr "基本"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555
 msgid "Basic Settings"
 msgstr "基本設定"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:22
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Bass"
 msgstr "Bass"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:186
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:174
 msgid "Block Allocation Table checksum failed"
 msgstr "區塊分配表校驗失敗"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:631
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625
 msgid "Blocks"
 msgstr "區塊"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:21
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Blue"
 msgstr "藍"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:24
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Blue Left"
 msgstr "藍 左"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:25
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Blue Right"
 msgstr "藍 右"
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:87
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270
 msgid "Bottom"
 msgstr "下方"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:238
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:225
 #, c-format
 msgid "Bound Controls: %lu"
 msgstr "綁定控制器：%lu"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348
 msgid "Broken"
 msgstr "破損"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:422
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:428
 msgid "Browse"
 msgstr "瀏覽"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:256
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:243
 msgid "Browse for a directory to add"
 msgstr "瀏覽要新增的資料夾"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:422
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:428
 msgid "Browse for an ISO directory..."
 msgstr "瀏覽 ISO 資料夾..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1079
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1080
 msgid "Browse for output directory"
 msgstr "瀏覽輸出的資料夾"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:328
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:331
 msgid "Buffer:"
 msgstr "緩衝："
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:58
 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:119
+#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:106
 msgid "Buttons"
 msgstr "按鈕"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317
 msgid ""
 "Bypass the clearing of the data cache by the DCBZ instruction. Usually leave "
 "this option disabled."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:698
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:697
 msgid "C"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:77
+#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:64
 msgid "C Stick"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:77
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:64
 msgid "C-Stick"
 msgstr "C-搖桿"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:764
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:763
 msgid "CP reg"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:567
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547
 msgid "CPU Emulator Engine"
 msgstr "CPU 模擬引擎"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:490
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500
 msgid "Cache Display Lists"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88
 msgid ""
 "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n"
 "Decreases emulation speed by some percent (depending on your GPU).\n"
@@ -900,23 +925,38 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1858
+#, c-format
+msgid "Can't find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x"
+msgstr ""
+
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1872
+#, c-format
+msgid "Can't find WiiMote by connection handle %02x"
+msgstr ""
+
+#: Source/Core/Core/Src/HW/DVDInterface.cpp:669
+#: Source/Core/Core/Src/HW/DVDInterface.cpp:679
+msgid "Can't read from DVD_Plugin - DVD-Interface: Fatal Error"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:124
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:28
 msgid "Cancel"
 msgstr "取消"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:91
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:178
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:240
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:84
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:171
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:233
 #, c-format
 msgid "Cannot open %s"
 msgstr "無法開啟 %s"
 
-#: Source/Core/Core/Src/CoreTiming.cpp:141
+#: Source/Core/Core/Src/CoreTiming.cpp:128
 msgid "Cannot unregister events with events pending"
 msgstr "事件未決定時無法註銷事件"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1078
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1061
 #, c-format
 msgid ""
 "Cannot use that file as a memory card.\n"
@@ -924,7 +964,7 @@ msgid ""
 "is not a valid gamecube memory card file"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1108
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1091
 msgid ""
 "Cannot use that file as a memory card.\n"
 "Are you trying to use the same file in both slots?"
@@ -932,30 +972,15 @@ msgstr ""
 "無法使用此檔案作為記憶卡。\n"
 "您要在相同的插槽中使用相同的檔案嗎？"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1867
-#, 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:1881
-#, c-format
-msgid "Cant find WiiMote by connection handle %02x"
-msgstr "找不到 WiiMote 依連接項 %02x"
-
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:679
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:689
-msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error"
-msgstr "無法讀取從 DVD_Plugin - DVD-界面：嚴重錯誤"
-
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:52
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:39
 msgid "Caps Lock"
 msgstr "Caps Lock"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288
 msgid "Catalan"
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:311
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:298
 msgid "Center"
 msgstr "中心"
 
@@ -963,12 +988,12 @@ msgstr "中心"
 msgid "Change"
 msgstr "更改"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:316
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:322
 msgid "Change &Disc..."
 msgstr "更換光碟(&D)..."
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:179
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:179
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:167
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:167
 msgid "Change Disc"
 msgstr "更換光碟"
 
@@ -976,7 +1001,7 @@ msgstr "更換光碟"
 msgid "Change Game"
 msgstr "更換遊戲"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:515
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495
 msgid ""
 "Change the language of the user interface.\n"
 "Requires restart."
@@ -984,222 +1009,222 @@ msgstr ""
 "更改用戶界面語系。\n"
 "需要重新啟動。"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:60
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:47
 msgid "Changes sign to zFar Parameter (after correction)"
 msgstr "更改 zFar 參數符號 (在修正後)"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:55
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:42
 msgid "Changes sign to zNear Parameter (after correction)"
 msgstr "更改 zNear 參數的符號 (在修正後)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:519
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499
 msgid "Changing this will have no effect while the emulator is running!"
 msgstr "更改此選項在模擬器執行時沒有效果！"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:295
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:298
 msgid "Chat"
 msgstr "聊天"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:47
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:34
 msgid "Cheat Code"
 msgstr "作弊代碼"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:118
 msgid "Cheat Search"
 msgstr "尋找作弊代碼"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:38
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:25
 msgid "Cheats Manager"
 msgstr "作弊代碼管理器"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:633
 msgid "Check Partition Integrity"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:864
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:880
 msgid "Checking integrity..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289
 msgid "Chinese (Simplified)"
 msgstr "Chinese (Simplified)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290
 msgid "Chinese (Traditional)"
 msgstr "Chinese (Traditional)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:818
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:799
 msgid "Choose a DVD root directory:"
 msgstr "選擇一個 DVD 根目錄："
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:822
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803
 msgid "Choose a NAND root directory:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:815
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:796
 msgid "Choose a default ISO:"
 msgstr "選擇一個預設 ISO："
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1236
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1219
 msgid "Choose a directory to add"
 msgstr "選擇一個要添加的資料夾"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1065
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1048
 msgid "Choose a file to open"
 msgstr "選擇一個要開啟的檔案"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:217
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:204
 msgid "Choose a memory card:"
 msgstr "選擇一個記憶卡："
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:819
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800
 msgid ""
 "Choose file to use as apploader: (applies to discs constructed from "
 "directories only)"
 msgstr "選擇作為程式讀取器的檔案：(僅用於來讀取 光碟的目錄結構)"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:767
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:806
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:781
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:822
 msgid "Choose the folder to extract to"
 msgstr "選擇提取的資料夾存放位置"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:297
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:284
 msgid "Circle Stick"
 msgstr "Circle Stick"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:52
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:56
 msgid "Classic"
 msgstr "Classic"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:144
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:43
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:487
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:913
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:137
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:30
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:474
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:904
 msgid "Clear"
 msgstr "清除"
 
-#: Source/Core/Core/Src/NetPlayServer.cpp:259
+#: Source/Core/Core/Src/NetPlayServer.cpp:263
 msgid ""
 "Client disconnect while game is running!! NetPlay is disabled. You must "
 "manually stop the game."
 msgstr "在遊戲執行時客戶端斷開連接！！網路對戰已經被關閉。您必須手動停止遊戲。"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:298
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:247
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:552
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:578
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:285
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:234
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:562
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:590
 msgid "Close"
 msgstr "關閉"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:174
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:177
 msgid "Co&nfigure..."
 msgstr "設定(&N)..."
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:86
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:73
 msgid "Code Info"
 msgstr "代碼訊息"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:568
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:556
 msgid "Code: "
 msgstr "代碼："
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:35
 msgid "Command"
 msgstr "命令"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:629
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:623
 msgid "Comment"
 msgstr "註釋"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489
 msgid "Comment:"
 msgstr "註釋："
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:893
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:884
 msgid "Compress ISO..."
 msgstr "壓縮 ISO..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:905
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:899
 msgid "Compress selected ISOs..."
 msgstr "壓縮選擇的 ISO 檔..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1088
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1224
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1089
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1225
 msgid "Compressing ISO"
 msgstr "正在壓縮 ISO"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:429
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:435
 msgid "Config"
 msgstr "設定"
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:37
-#: Source/Core/DolphinWX/Src/InputConfigDiag.h:135
-#: Source/Core/DolphinWX/Src/InputConfigDiag.h:154
+#: Source/Core/DolphinWX/Src/InputConfigDiag.h:122
+#: Source/Core/DolphinWX/Src/InputConfigDiag.h:141
 msgid "Configure"
 msgstr "設定"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:111
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:98
 msgid "Configure Control"
 msgstr "設定控制器"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:306
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
 #: Source/Core/DolphinWX/Src/NetWindow.cpp:583
 msgid "Configure Pads"
 msgstr "設定控制器"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:429
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:435
 msgid "Configure..."
 msgstr "模擬器設定..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1119
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1147
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1217
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1120
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1218
 msgid "Confirm File Overwrite"
 msgstr "確認檔案覆蓋"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:597
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:577
 msgid "Confirm on Stop"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:83
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:105
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:74
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:96
 msgid "Connect"
 msgstr "連接"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:783
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:764
 msgid "Connect USB Keyboard"
 msgstr "連接 USB 鍵盤"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:362
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:368
 #, c-format
 msgid "Connect Wiimote %i"
 msgstr "連接 Wiimote %i"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:195
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183
 msgid "Connect Wiimote 1"
 msgstr "連接 Wiimote 1"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184
 msgid "Connect Wiimote 2"
 msgstr "連接 Wiimote 2"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:185
 msgid "Connect Wiimote 3"
 msgstr "連接 Wiimote 3"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:198
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:186
 msgid "Connect Wiimote 4"
 msgstr "連接 Wiimote 4"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:627
+#: Source/Core/DolphinWX/Src/Main.cpp:655
 msgid "Connecting..."
 msgstr "正在連接..."
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:155
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:156
 msgid "Console"
 msgstr "控制台"
 
@@ -1207,15 +1232,15 @@ msgstr "控制台"
 msgid "Continuous Scanning"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:46
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:33
 msgid "Control"
 msgstr "控制器"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:189
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:176
 msgid "Convert to GCI"
 msgstr "轉換為 GCI"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:379
+#: Source/Core/Core/Src/CoreParameter.cpp:368
 msgid "Copy failed"
 msgstr "複製失敗"
 
@@ -1224,21 +1249,21 @@ msgstr "複製失敗"
 msgid "Copy to Memcard %c"
 msgstr "複製至記憶卡 %c"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:359
 msgid "Core"
 msgstr "核心"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:154
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:148
 #, c-format
 msgid "Could not create %s"
 msgstr "無法建立 %s"
 
-#: Source/Core/AudioCommon/Src/AudioCommon.cpp:75
+#: Source/Core/AudioCommon/Src/AudioCommon.cpp:62
 #, c-format
 msgid "Could not initialize backend %s."
 msgstr "無法初始化 backend %s。"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:137
+#: Source/Core/Core/Src/CoreParameter.cpp:126
 #, c-format
 msgid ""
 "Could not read \"%s\".  There is no disc in the drive, or it is not a GC/Wii "
@@ -1249,12 +1274,12 @@ msgstr ""
 "請注意，原始的 Gamecube 及 Wii 光碟在大多數的 PC DVD 光碟機中是無法被正常讀取"
 "的。"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:292
+#: Source/Core/Core/Src/CoreParameter.cpp:281
 #, c-format
 msgid "Could not recognize ISO file %s"
 msgstr "無法識別 ISO 檔案 %s"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:569
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:579
 #, c-format
 msgid "Could not save %s"
 msgstr "無法儲存 %s"
@@ -1267,23 +1292,24 @@ msgstr ""
 "無法設置控制器。有玩家存留或者遊戲正在執行！\n"
 "(還不支援在遊戲執行時設定控制器)"
 
-#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:123
+#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119
 #, c-format
 msgid ""
 "Could not write memory card file %s.\n"
 "\n"
 "Are you running Dolphin from a CD/DVD, or is the save file maybe write "
-"protected?"
-msgstr ""
-"無法寫入記憶卡檔案 %s。\n"
+"protected?\n"
 "\n"
-"請確認是否經由 CD/DVD 執行 Dolphin，或者是檔案具有唯讀的屬性？"
+"Are you receiving this after moving the emulator directory?\n"
+"If so, then you may need to re-specify your memory card location in the "
+"options."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1107
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1133
 msgid "Couldn't find open command for extension 'ini'!"
 msgstr "找不到副檔名 'ini' 的開啟命令！"
 
-#: Source/Core/Core/Src/BootManager.cpp:146
+#: Source/Core/Core/Src/BootManager.cpp:137
 msgid ""
 "Couldn't init the core.\n"
 "Check your configuration."
@@ -1291,178 +1317,178 @@ msgstr ""
 "無法初始化核心。\n"
 "請檢查您的設定。"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:183
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:507
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:495
 msgid "Count:"
 msgstr "數量："
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:452
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456
 msgid "Country:"
 msgstr "國別："
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:186
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:562
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:173
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:550
 msgid "Create AR Code"
 msgstr "建立 AR 代碼"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:543
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:608
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:569
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:641
 msgid "Create new perspective"
 msgstr "建立一個新的透檢視"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:17
 msgid "Creator: "
 msgstr "作者："
 
-#: Source/Core/Common/Src/MsgHandler.cpp:68
+#: Source/Core/Common/Src/MsgHandler.cpp:54
 msgid "Critical"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562
 msgid "Crop"
 msgstr "剪裁"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119
 msgid ""
 "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:48
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:52
 msgid "Crossfade"
 msgstr "Crossfade"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:597
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:600
 #, c-format
-msgid "Current dir changed from %s to %s after wxFileSelector!"
-msgstr "目前的目錄在 wxFileSelector 後從 %s 更改至 %s ！"
+msgid "Current directory changed from %s to %s after wxFileSelector!"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339
 msgid "Custom Projection Hack"
 msgstr "自訂投影修正"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.h:30
+#: Source/Core/DolphinWX/Src/PHackSettings.h:17
 msgid "Custom Projection Hack Settings"
 msgstr "自訂投影修正設定"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342
 msgid "Customize some Orthographic Projection parameters."
 msgstr "自訂一些直線投影參數。"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291
 msgid "Czech"
 msgstr "Czech"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:698
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:697
 msgid "D"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:89
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
 msgid "D-Pad"
 msgstr "十字方向鍵"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:431
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
 msgid "DSP"
 msgstr "聲音"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:639
 msgid "DSP Emulator Engine"
 msgstr "DSP 模擬引擎"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:254
 msgid "DSP HLE emulation (fast)"
 msgstr "DSP HLE 模擬器 (快)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:256
 msgid "DSP LLE interpreter (slow)"
 msgstr "DSP LLE 解釋器 (慢)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660
-msgid "DSP LLE on Thread"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:255
 msgid "DSP LLE recompiler"
 msgstr "DSP LLE 重編譯器 (慢)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:431
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:641
+msgid "DSP on Dedicated Thread"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
 msgid "DSP settings"
 msgstr "聲音設定"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:838
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:819
 msgid "DVD Root:"
 msgstr "DVD 根："
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:239
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:226
 msgid "DVDLowRead - Fatal Error: failed to read from volume"
 msgstr ""
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:333
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:320
 msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:176
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:163
 msgid "Data Size"
 msgstr "資料大小"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468
 msgid "Date:"
 msgstr "日期："
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:528
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:564
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:518
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:557
 msgid "Datel MaxDrive/Pro files(*.sav)"
 msgstr "Datel MaxDrive/Pro 檔案(*.sav)"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:242
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:259
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:267
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:281
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:296
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:229
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:246
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:254
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:268
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:283
 msgid "Dead Zone"
 msgstr "非作用區"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:35
 msgid "Debug"
 msgstr "除錯"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:521
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534
 msgid "Debugging"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:79
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:66
 msgid "Decimal"
 msgstr "Decimal"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:890
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:881
 msgid "Decompress ISO..."
 msgstr "解壓 ISO..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:906
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:900
 msgid "Decompress selected ISOs..."
 msgstr "解壓選擇的 ISO..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1088
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1224
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1089
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1225
 msgid "Decompressing ISO"
 msgstr "ISO 解壓中"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:912
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:903
 msgid "Default"
 msgstr "預設值"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:835
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:816
 msgid "Default ISO:"
 msgstr "預設的 ISO："
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:114
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:107
 msgid "Default font"
 msgstr "預設的字型"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:32
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:926
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:19
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917
 msgid "Delete"
 msgstr "刪除"
 
@@ -1470,21 +1496,21 @@ msgstr "刪除"
 msgid "Delete Save"
 msgstr "刪除存檔"
 
-#: Source/Core/VideoCommon/Src/AVIDump.cpp:77
+#: Source/Core/VideoCommon/Src/AVIDump.cpp:64
 #, c-format
 msgid "Delete the existing file '%s'?"
 msgstr "刪除已存在的檔案 '%s' ？"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:671
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:683
 msgid "Description"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:472
 msgid "Detect"
 msgstr "檢測"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:233
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:328
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:220
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:315
 msgid ""
 "Detected attempt to read more data from the DVD than fit inside the out "
 "buffer. Clamp."
@@ -1492,29 +1518,29 @@ msgstr ""
 "Detected attempt to read more data from the DVD than fit inside the out "
 "buffer. Clamp."
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:127
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:898
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:114
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:889
 msgid "Device"
 msgstr "裝置"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:798
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:731
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779
 msgid "Device Settings"
 msgstr "裝置設定"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:45
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:49
 msgid "Dial"
 msgstr "Dial"
 
-#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:146
+#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:135
 msgid "Direct3D11"
 msgstr "Direct3D11"
 
-#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:128
+#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:125
 msgid "Direct3D9"
 msgstr "Direct3D9"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:167
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:155
 msgid ""
 "Directory checksum failed\n"
 " and Directory backup checksum failed"
@@ -1522,16 +1548,20 @@ msgstr ""
 "目錄校驗失敗\n"
 " 並且目錄備份校驗失敗"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:433
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:443
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485
 msgid "Disable"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:491
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501
+msgid "Disable Destination Alpha"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:409
 msgid "Disable Fog"
 msgstr "關閉霧化"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108
 msgid ""
 "Disable any XFB emulation.\n"
 "Speeds up emulation a lot but causes heavy glitches in many games which rely "
@@ -1540,7 +1570,7 @@ msgid ""
 "If unsure, leave this checked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95
 msgid ""
 "Disable emulation of EFB copies.\n"
 "These are often used for post-processing or render-to-texture effects, so "
@@ -1550,52 +1580,60 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:543
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101
+msgid ""
+"Disables emulation of a hardware feature called destination alpha, which is "
+"used in many games for various graphical effects.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:553
 msgid "Disc"
 msgstr "光碟"
 
-#: Source/Core/DiscIO/Src/DriveBlob.cpp:107
-#: Source/Core/DiscIO/Src/DriveBlob.cpp:126
+#: Source/Core/DiscIO/Src/DriveBlob.cpp:94
+#: Source/Core/DiscIO/Src/DriveBlob.cpp:113
 msgid "Disc Read Error"
 msgstr "光碟讀取錯誤"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:312
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:320
 msgid "Display"
 msgstr "顯示"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104
 msgid ""
 "Display the inputs read by the emulator.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:80
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:67
 msgid "Divide"
 msgstr "Divide"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:987
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:990
 msgid "Do you want to stop the current emulation?"
 msgstr "您要停止目前的模擬嗎？"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:663
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:644
 msgid "Dolby Pro Logic II decoder"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:864
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:856
 msgid "Dolphin"
 msgstr "Dolphin"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:183
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:188
 #, c-format
 msgid "Dolphin %s Graphics Configuration"
 msgstr "Dolphin %s 影像設定"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:292
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:298
 msgid "Dolphin &Web Site"
 msgstr "Dolphin 官網(&W)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.h:37
+#: Source/Core/DolphinWX/Src/ConfigMain.h:24
 msgid "Dolphin Configuration"
 msgstr "Dolphin 模擬器設定"
 
@@ -1603,16 +1641,16 @@ msgstr "Dolphin 模擬器設定"
 msgid "Dolphin Emulated Wiimote Configuration"
 msgstr "Dolphin 模擬 Wiimote 設定"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:394
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:383
 msgid "Dolphin FIFO"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1136
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1153
 msgid "Dolphin GCPad Configuration"
 msgstr "Dolphin GC 控制器設定"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:679
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1074
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:685
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1089
 msgid "Dolphin TAS Movies (*.dtm)"
 msgstr "Dolphin TAS 影片 (*.dtm)"
 
@@ -1620,101 +1658,108 @@ msgstr "Dolphin TAS 影片 (*.dtm)"
 msgid "Dolphin Wiimote Configuration"
 msgstr "Dolphin Wiimote 設定"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:293
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:299
 msgid "Dolphin at &Google Code"
 msgstr "Dolphin SVN (&G)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:364
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:351
 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:368
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:355
 msgid ""
 "Dolphin is currently set to hide all games.  Doubleclick here to show all "
 "games..."
 msgstr "Dolphin 目前被設定為隱藏所有遊戲。按兩下這裡顯示所有遊戲..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1159
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1160
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1246
 msgid "Dolphin was unable to complete the requested action."
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:275
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:58
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
+#, fuzzy
+msgid ""
+"Doubles the emulated GPU clock rate. May speed up some games (ON = Fast, OFF "
+"= Compatible)"
+msgstr "開啟快速光碟存取。部份遊戲需要。(ON = 兼容、OFF = 快速)"
+
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:262
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:45
 msgid "Down"
 msgstr "下"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:54
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:44
 msgid "Download Codes (WiiRD Database)"
 msgstr "下載代碼 (WiiRD 數據庫)"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:297
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:287
 #, c-format
 msgid "Downloaded %lu codes. (added %lu)"
 msgstr "已下載 %lu 條代碼。 (已添加 %lu 條)"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:31
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:35
 msgid "Drums"
 msgstr "Drums"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:105
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
 msgid "Dummy"
 msgstr "空"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:661
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:642
 msgid "Dump Audio"
 msgstr "轉儲聲音"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:532
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545
 msgid "Dump EFB Target"
 msgstr "轉儲 EFB 目標"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546
 msgid "Dump Frames"
 msgstr "轉儲畫格"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543
 msgid "Dump Textures"
 msgstr "轉儲紋理"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114
 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:106
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111
 msgid ""
 "Dump decoded game textures to User/Dump/Textures/<game_id>/\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113
 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:474
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292
 msgid "Dutch"
 msgstr "Dutch"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:112
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:113
 msgid "E&xit"
 msgstr "離開(&X)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:441
 msgid "EFB Copies"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:223
+#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:210
 #, c-format
 msgid ""
 "ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least "
@@ -1723,52 +1768,52 @@ msgid ""
 "driver."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:166
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:160
 msgid "EUROPE"
 msgstr "EUROPE"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:156
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:143
 msgid "Early Memory Updates"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:447
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:453
 msgid "Edit"
 msgstr "編輯"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.h:30
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.h:17
 msgid "Edit ActionReplay Code"
 msgstr "編輯 ActionReplay 代碼"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:285
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:286
 msgid "Edit Config"
 msgstr "編輯 ini 設定檔"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.h:30
+#: Source/Core/DolphinWX/Src/PatchAddEdit.h:17
 msgid "Edit Patch"
 msgstr "編輯修正"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:447
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:453
 msgid "Edit current perspective"
 msgstr "編輯目前版式"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:403
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:425
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:407
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:429
 msgid "Edit..."
 msgstr "編輯..."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:44
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:48
 msgid "Effect"
 msgstr "效果"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:425
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435
 msgid "Embedded Frame Buffer"
 msgstr ""
 
-#: Source/Core/Core/Src/Core.cpp:201
+#: Source/Core/Core/Src/Core.cpp:190
 msgid "Emu Thread already running"
 msgstr "模擬器線程已經執行中"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110
 msgid ""
 "Emulate XFBs accurately.\n"
 "Slows down emulation a lot and prohibits high-resolution rendering but is "
@@ -1777,7 +1822,7 @@ msgid ""
 "If unsure, check virtual XFB emulation instead."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109
 msgid ""
 "Emulate XFBs using GPU texture objects.\n"
 "Fixes many games which don't work without XFB emulation while not being as "
@@ -1791,7 +1836,7 @@ msgstr ""
 msgid "Emulated Wiimote"
 msgstr "模擬 Wiimote"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346
 msgid "Emulation State: "
 msgstr "模擬狀態："
 
@@ -1799,7 +1844,7 @@ msgstr "模擬狀態："
 msgid "Enable"
 msgstr "開啟"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91
 msgid ""
 "Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's "
 "supported by your GPU.\n"
@@ -1809,72 +1854,71 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:111
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:98
 msgid "Enable AR Logging"
 msgstr "開啟 AR 日誌"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324
 msgid "Enable Block Merging"
 msgstr "開啟塊合併"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331
 msgid "Enable Bounding Box Calculation"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:446
 msgid "Enable Cache"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:562
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542
 msgid "Enable Cheats"
 msgstr "開啟作弊"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310
 msgid "Enable Dual Core"
 msgstr "開啟雙核心"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
 msgid "Enable Dual Core (speedup)"
 msgstr "開啟雙核心 (加速)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:550
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:563
 msgid "Enable Hotkeys"
 msgstr "開啟快捷鍵"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311
 msgid "Enable Idle Skipping"
 msgstr "開啟略過空閒"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541
 msgid "Enable Idle Skipping (speedup)"
 msgstr "開啟略過空閒 (加速)"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312
 msgid "Enable MMU"
 msgstr "開啟 MMU"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:554
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:567
 msgid "Enable Progressive Scan"
 msgstr "開啟逐行掃瞄"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757
 msgid "Enable Screen Saver"
 msgstr ""
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:75
-#, fuzzy
 msgid "Enable Speaker Data"
-msgstr "開啟分頁瀏覽"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
 msgid "Enable WideScreen"
 msgstr "開啟寬螢幕"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:516
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529
 msgid "Enable Wireframe"
 msgstr "開啟線框"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85
 msgid ""
 "Enable anisotropic filtering.\n"
 "Enhances visual quality of textures that are at oblique viewing angles.\n"
@@ -1883,7 +1927,7 @@ msgid ""
 "If unsure, select 1x."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323
 msgid ""
 "Enable fast disc access.  Needed for a few games. (ON = Fast, OFF = "
 "Compatible)"
@@ -1893,7 +1937,7 @@ msgstr "開啟快速光碟存取。部份遊戲需要。(ON = 兼容、OFF = 快
 msgid "Enable pages"
 msgstr "開啟分頁瀏覽"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76
 msgid ""
 "Enable this if you want the whole screen to be used for rendering.\n"
 "If this is disabled, a render window will be created instead.\n"
@@ -1901,7 +1945,7 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80
 msgid ""
 "Enable this if you want to use the main Dolphin window for rendering rather "
 "than a separate render window.\n"
@@ -1909,34 +1953,34 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:335
 msgid ""
 "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for "
 "ANY other game."
 msgstr "開啟此選項將加速塞爾達傳說：曙光公主，請勿在其它遊戲中使用。"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340
 msgid "Enables Custom Projection Hack"
 msgstr "開啟自訂投影修正"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:528
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508
 msgid ""
 "Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on "
 "OSX."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510
 msgid ""
 "Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:512
 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
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81
 msgid ""
 "Enables progressive scan if supported by the emulated software.\n"
 "Most games don't care about this.\n"
@@ -1944,70 +1988,70 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313
 msgid ""
 "Enables the Memory Management Unit, needed for some games. (ON = Compatible, "
 "OFF = Fast)"
 msgstr "開啟記憶體管理單元，某些遊戲需要。(ON = 兼容、OFF = 快速)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116
 msgid ""
 "Encode frame dumps using the FFV1 codec.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:40
 msgid "End"
 msgstr "End"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:469
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:280
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:260
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293
 msgid "English"
 msgstr "English"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:329
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:407
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:337
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:417
 msgid "Enhancements"
 msgstr "增強"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:607
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:640
 msgid "Enter a name for the new perspective:"
 msgstr "為新透檢視輸入名稱："
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:191
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:178
 #, c-format
 msgid "Entry %d/%d"
 msgstr "項目 %d/%d"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:85
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:72
 #, c-format
 msgid "Entry 1/%d"
 msgstr "項目 1/%d"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:204
 msgid "Equal"
 msgstr "等於"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:45
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:156
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1242
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:32
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:150
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226
 msgid "Error"
 msgstr "錯誤"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:381
+#: Source/Core/DolphinWX/Src/Main.cpp:409
 msgid "Error loading selected language. Falling back to system default."
 msgstr "讀取選擇的語系出錯。返回使用系統預設值。"
 
-#: Source/Core/Common/Src/ChunkFile.h:226
+#: Source/Core/Common/Src/ChunkFile.h:221
 #, c-format
 msgid ""
 "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). "
 "Aborting savestate load..."
 msgstr ""
 
-#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:342
+#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:329
 #, c-format
 msgid ""
 "Error: Trying to access %s fonts but they are not loaded. Games may not show "
@@ -2015,38 +2059,38 @@ msgid ""
 msgstr ""
 "錯誤：試圖存取字型 %s 但無法進行讀取。遊戲可能會無法顯示正確的字型或崩潰。"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:30
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:17
 msgid "Escape"
 msgstr "Escape"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:26
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:30
 msgid "Euphoria"
 msgstr "Euphoria"
 
 #: Source/Core/Core/Src/ArmMemTools.cpp:78
-#: Source/Core/Core/Src/x64MemTools.cpp:217
+#: Source/Core/Core/Src/x64MemTools.cpp:206
 #, c-format
 msgid "Exception handler - access below memory space. %08llx%08llx"
 msgstr "處理異常 - 存取下列記憶體空間。 %08llx%08llx"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:61
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
 msgid "Execute"
 msgstr "執行"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:459
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:446
 msgid "Export Failed"
 msgstr "匯出失敗"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:639
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:649
 msgid "Export File"
 msgstr "匯出檔案"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:177
 msgid "Export Recording"
 msgstr "匯出錄像"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:345
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:351
 msgid "Export Recording..."
 msgstr "匯出錄像..."
 
@@ -2054,7 +2098,7 @@ msgstr "匯出錄像..."
 msgid "Export Save"
 msgstr "匯出存檔"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:874
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:865
 msgid "Export Wii save (Experimental)"
 msgstr "匯出 Wii 存檔 (實驗性)"
 
@@ -2062,100 +2106,100 @@ msgstr "匯出 Wii 存檔 (實驗性)"
 msgid "Export all saves"
 msgstr "匯出所有存檔"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:80
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:72
 msgid "Export failed, try again?"
 msgstr "匯出失敗，要重試嗎？"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:559
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:552
 msgid "Export save as..."
 msgstr "匯出存檔為..."
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:297
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:284
 msgid "Extension"
 msgstr "擴充"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483
 msgid "External Frame Buffer"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:61
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:48
 msgid "Extra Parameter"
 msgstr "額外參數"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:62
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:49
 msgid "Extra Parameter useful in ''Metroid: Other M'' only."
 msgstr "僅在 ''銀河戰士：另一個 M'' 中有效的額外參數。"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:614
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:624
 msgid "Extract All Files..."
 msgstr "提取所有檔案..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:616
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:626
 msgid "Extract Apploader..."
 msgstr "提取程式讀取器..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:617
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627
 msgid "Extract DOL..."
 msgstr "提取 DOL..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:610
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:620
 msgid "Extract Directory..."
 msgstr "提取資料夾..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:612
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:622
 msgid "Extract File..."
 msgstr "提取檔案..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:608
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:618
 msgid "Extract Partition..."
 msgstr "提取分割區..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:724
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:738
 #, c-format
 msgid "Extracting %s"
 msgstr "%s 提取中"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:707
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:721
 msgid "Extracting All Files"
 msgstr "所有檔案提取中"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:707
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:721
 msgid "Extracting Directory"
 msgstr "資料夾提取中"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:710
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:724
 msgid "Extracting..."
 msgstr "提取中..."
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:892
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:893
 msgid "FIFO Byte"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:45
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:32
 msgid "FIFO Player"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:169
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:163
 msgid "FRANCE"
 msgstr "FRANCE"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472
 msgid "FST Size:"
 msgstr "FST 大小"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:77
+#: Source/Core/Core/Src/NetPlayClient.cpp:81
 msgid "Failed to Connect!"
 msgstr "連接失敗！"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:225
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:228
 msgid "Failed to Listen!!"
 msgstr "監聽失敗！！"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:307
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:300
 msgid "Failed to download codes."
 msgstr "下載代碼失敗。"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:827
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:843
 #, c-format
 msgid "Failed to extract to %s!"
 msgstr "提取至 %s 失敗！"
@@ -2173,26 +2217,30 @@ msgid ""
 "(Choose it from the \"Audio\" tab of the configuration dialog.)"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:116
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:139
+#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:108
+#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:131
 msgid "Failed to load bthprops.cpl"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:100
-#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:109
+#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:90
+#: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:101
 msgid "Failed to load hid.dll"
 msgstr "讀取 hid.dll 失敗"
 
-#: Source/Core/Core/Src/Movie.cpp:792
+#: Source/Core/Core/Src/Movie.cpp:783
 #, c-format
 msgid "Failed to read %s"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:151
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:144
 msgid "Failed to read banner.bin"
 msgstr "讀取 banner.bin 失敗"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:223
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:178
+msgid "Failed to read bk header"
+msgstr ""
+
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:211
 #, c-format
 msgid ""
 "Failed to read block %d of the save data\n"
@@ -2200,7 +2248,7 @@ msgid ""
 "FilePosition:%llx"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:148
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:136
 msgid ""
 "Failed to read block allocation table backup correctly\n"
 "(0x8000-0x9FFF)"
@@ -2208,7 +2256,7 @@ msgstr ""
 "讀取正確的塊分配表備份失敗\n"
 "(0x8000-0x9FFF)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:142
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:130
 msgid ""
 "Failed to read block allocation table correctly\n"
 "(0x6000-0x7FFF)"
@@ -2216,12 +2264,17 @@ msgstr ""
 "讀取正確的塊分配表失敗\n"
 "(0x6000-0x7FFF)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:286
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:279
 #, c-format
 msgid "Failed to read data from file %d"
 msgstr "從檔案 %d 讀取數據失敗"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:136
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:367
+#, c-format
+msgid "Failed to read data from file: %s"
+msgstr ""
+
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:124
 msgid ""
 "Failed to read directory backup correctly\n"
 "(0x4000-0x5FFF)"
@@ -2229,7 +2282,7 @@ msgstr ""
 "讀取目錄備份失敗\n"
 "(0x4000-0x5FFF)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:130
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:118
 msgid ""
 "Failed to read directory correctly\n"
 "(0x2000-0x3FFF)"
@@ -2237,7 +2290,11 @@ msgstr ""
 "讀取正確的目錄失敗\n"
 "(0x2000-0x3FFF)"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:119
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:90
+msgid "Failed to read header"
+msgstr ""
+
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:107
 msgid ""
 "Failed to read header correctly\n"
 "(0x0000-0x1FFF)"
@@ -2245,63 +2302,63 @@ msgstr ""
 "讀取正確的頭部失敗\n"
 "(0x0000-0x1FFF)"
 
-#: Source/Core/DiscIO/Src/VolumeGC.cpp:61
+#: Source/Core/DiscIO/Src/VolumeGC.cpp:48
 msgid "Failed to read unique ID from disc image"
 msgstr "從光碟中讀取唯一的 ID 失敗"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:84
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:71
 msgid "Failed to write BT.DINF to SYSCONF"
 msgstr "寫入 BT.DINF 至 SYSCONF 失敗"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:228
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:221
 msgid "Failed to write bkhdr"
 msgstr "寫入 bkhdr 失敗"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:164
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:157
 #, c-format
 msgid "Failed to write header for %s"
 msgstr "檔案 %s 寫入檔頭失敗"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:258
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:251
 #, c-format
 msgid "Failed to write header for file %d"
 msgstr "檔案 %d 寫入檔頭失敗"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294
 msgid "Farsi"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477
 msgid "Fast"
 msgstr "快速"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315
 msgid "Fast version of the MMU.  Does not work for every game."
 msgstr "快速版本的 MMU。可能無法在所有遊戲上執行。"
 
-#: Source/Core/Core/Src/Movie.cpp:1046
+#: Source/Core/Core/Src/Movie.cpp:1037
 #, c-format
 msgid ""
 "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:199
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:202
 msgid "Fifo Player"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:99
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:86
 msgid "File Info"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:304
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:295
 msgid "File contained no codes."
 msgstr "檔案未含有代碼。"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:413
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:400
 msgid "File converted to .gci"
 msgstr "檔案已轉換為 .gci"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:428
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:415
 msgid ""
 "File could not be opened\n"
 "or does not have a valid extension"
@@ -2309,7 +2366,7 @@ msgstr ""
 "無法開啟檔案\n"
 "或沒有一個有效的副檔名"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:84
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:72
 #, c-format
 msgid ""
 "File has the extension \"%s\"\n"
@@ -2318,36 +2375,36 @@ msgstr ""
 "檔案有副檔名 \"%s\"\n"
 "有效的副檔名是 (.raw/.gcp)"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:425
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:412
 msgid "File is not recognized as a memcard"
 msgstr "檔案未被識別為一張記憶卡"
 
-#: Source/Core/DiscIO/Src/CompressedBlob.cpp:294
+#: Source/Core/DiscIO/Src/CompressedBlob.cpp:281
 msgid "File not compressed"
 msgstr "檔案未壓縮"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:127
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:109
 #, c-format
 msgid "FileIO: Unknown open mode : 0x%02x"
 msgstr "FileIO：未知開啟模式： 0x%02x"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:531
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:541
 msgid "Filesystem"
 msgstr "檔案系統"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1100
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1126
 msgid "Filetype 'ini' is unknown! Will not open!"
 msgstr "檔案類型 'ini' 未知！ 無法開啟！"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:265
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:252
 msgid "Find next"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:266
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:253
 msgid "Find previous"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:632
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626
 msgid "First Block"
 msgstr "首數據區塊"
 
@@ -2355,23 +2412,23 @@ msgstr "首數據區塊"
 msgid "Fix Checksums"
 msgstr "修正校驗"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:275
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283
 msgid "Force 16:9"
 msgstr "強制 16:9"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:275
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283
 msgid "Force 4:3"
 msgstr "強制 4:3"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:568
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548
 msgid "Force Console as NTSC-J"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406
 msgid "Force Texture Filtering"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90
 msgid ""
 "Force texture filtering even if the emulated game explicitly disabled it.\n"
 "Improves texture quality slightly but causes glitches in some games.\n"
@@ -2379,7 +2436,7 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83
 msgid ""
 "Force the game to output graphics for widescreen resolutions.\n"
 "Causes graphical glitches is some games.\n"
@@ -2387,14 +2444,14 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488
 msgid ""
 "Forces NTSC-J mode for using the Japanese ROM font.\n"
 "Left unchecked, dolphin defaults to NTSC-U and automatically enables this "
 "setting when playing Japanese games."
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:74
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:62
 msgid ""
 "Format as ascii (NTSC\\PAL)?\n"
 "Choose no for sjis (NTSC-J)"
@@ -2402,148 +2459,147 @@ msgstr ""
 "格式為 ascii (NTSC\\PAL)?\n"
 "否為 sjis (NTSC-J)"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:278
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:265
 msgid "Forward"
 msgstr "向前"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504
 #, c-format
 msgid "Found %d results for '"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:857
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:925
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:858
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:926
 msgid "Frame"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:867
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:868
 msgid "Frame "
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:185
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:173
 msgid "Frame Advance"
 msgstr "畫格步進"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:536
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549
 msgid "Frame Dumps use FFV1"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:227
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:214
 msgid "Frame Info"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:116
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:103
 msgid "Frame Range"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:138
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:139
 msgid "Frame S&kipping"
 msgstr "畫格省略(&K)"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:572
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552
 msgid "Framelimit:"
 msgstr "畫格速限制："
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:204
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:191
 msgid "Frames To Record"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547
 msgid "Free Look"
 msgstr "自由視點"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
 msgid "French"
 msgstr "French"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:38
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:42
 msgid "Frets"
 msgstr "Frets"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:118
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:137
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:105
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:124
 msgid "From"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:426
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:432
 msgid "FullScr"
 msgstr "全螢幕"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:256
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263
 msgid "Fullscreen resolution:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:534
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524
 msgid "GCI File(*.gci)"
 msgstr "GCI 檔案(*.gci)"
 
-#: Source/Core/DolphinWX/Src/GCMicDlg.h:44
+#: Source/Core/DolphinWX/Src/GCMicDlg.h:31
 msgid "GCMic Configuration"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:432
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
 msgid "GCPad"
 msgstr "GC 控制器"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:659
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:658
 msgid "GX_CMD_INVL_VC"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:448
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:452
 msgid "Game ID:"
 msgstr "遊戲 ID ："
 
-#: Source/Core/Core/Src/NetPlay.cpp:229
+#: Source/Core/Core/Src/NetPlay.cpp:216
 msgid "Game is already running!"
 msgstr "遊戲正在執行！"
 
-#: Source/Core/Core/Src/NetPlay.cpp:259
+#: Source/Core/Core/Src/NetPlay.cpp:246
 msgid "Game isn't running!"
 msgstr "遊戲未執行！"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:389
-#, fuzzy
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:393
 msgid "Game not found!"
-msgstr "找不到遊戲！！"
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:385
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:389
 msgid "Game-Specific Settings"
 msgstr "遊戲規格設定"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:293
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:294
 msgid "GameConfig"
 msgstr "遊戲設定"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:525
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:515
 msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534
 msgid "Gamecube"
 msgstr "Gamecube"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:178
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:181
 msgid "Gamecube &Pad Settings"
 msgstr "Gamecube 控制器設定(&P)"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:218
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1069
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:205
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1052
 msgid "Gamecube Memory Cards (*.raw,*.gcp)"
 msgstr "Gamecube 記憶卡 (*.raw,*.gcp)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:432
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
 msgid "Gamecube Pad settings"
 msgstr "Gamecube 控制器設定"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:117
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302
 msgid "Gecko Codes"
 msgstr "Gecko 代碼"
 
-#: Source/Core/Core/Src/GeckoCode.cpp:222
+#: Source/Core/Core/Src/GeckoCode.cpp:214
 #, c-format
 msgid ""
 "GeckoCode failed to run (CT%i CST%i) (%s)\n"
@@ -2552,10 +2608,10 @@ msgid ""
 "directory and restarting Dolphin.)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:172
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:197
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:160
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:160
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:202
 msgid "General"
 msgstr "一般"
 
@@ -2563,30 +2619,30 @@ msgstr "一般"
 msgid "General Settings"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:470
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:281
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:316
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:261
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
 msgid "German"
 msgstr "German"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:449
+#: Source/Core/Core/Src/ActionReplay.cpp:439
 #, c-format
 msgid "GetARCode: Index is greater than ar code list size %lu"
 msgstr "GetARCode：索引大於 ar 代碼列表大小 %lu"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:430
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:436
 msgid "Graphics"
 msgstr "影像"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:430
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:436
 msgid "Graphics settings"
 msgstr "影像設定"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:205
 msgid "Greater Than"
 msgstr "大於"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87
 msgid ""
 "Greatly increases quality of textures generated using render to texture "
 "effects.\n"
@@ -2597,51 +2653,67 @@ msgid ""
 "If unsure, leave this checked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:317
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
 msgid "Greek"
 msgstr "Greek"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:22
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Green"
 msgstr "綠"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:24
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Green Left"
 msgstr "綠 左"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:25
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Green Right"
 msgstr "綠 右"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:35
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:39
 msgid "Guitar"
 msgstr "Guitar"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1259
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1250
 msgid "HCI_CMD_INQUIRY is called, please report!"
 msgstr "HCI_CMD_INQUIRY 被調用，請回報！"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:421
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504
+msgid "Hacked Buffer Upload"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431
 msgid "Hacks"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:158
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:146
 msgid "Header checksum failed"
 msgstr "檔頭校驗失敗"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:318
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298
 msgid "Hebrew"
 msgstr "Hebrew"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:313
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:300
 msgid "Height"
 msgstr "高度"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:64
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:51
 msgid "Help"
 msgstr "說明"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:209
+#: Source/Core/DolphinWX/Src/Main.cpp:229
+msgid ""
+"Hi,\n"
+"\n"
+"Dolphin requires Mac OS X 10.7 or greater.\n"
+"Unfortunately you're running an old version of OS X.\n"
+"The last Dolphin version to support OS X 10.6 is Dolphin 3.5\n"
+"Please upgrade to 10.7 or greater to use the newest Dolphin version.\n"
+"\n"
+"Sayonara!\n"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/Main.cpp:220
 msgid ""
 "Hi,\n"
 "\n"
@@ -2657,41 +2729,41 @@ msgstr ""
 "\n"
 "再見！\n"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:309
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:296
 msgid "Hide"
 msgstr "隱藏"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:307
 msgid "Hide Mouse Cursor"
 msgstr "隱藏滑鼠游標"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79
 msgid ""
 "Hides the mouse cursor if it's on top of the emulation window.\n"
 "\n"
 "If unsure, leave this checked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:54
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41
 msgid "Home"
 msgstr "Home"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:85
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:138
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:76
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:141
 msgid "Host"
 msgstr "主機"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.h:44
+#: Source/Core/DolphinWX/Src/HotkeyDlg.h:31
 msgid "Hotkey Configuration"
 msgstr "快捷鍵設定"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:272
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:272
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:594
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:260
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:260
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574
 msgid "Hotkeys"
 msgstr "快捷鍵"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:319
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299
 msgid "Hungarian"
 msgstr "Hungarian"
 
@@ -2699,32 +2771,29 @@ msgstr "Hungarian"
 msgid "Hybrid Wiimote"
 msgstr "混合 Wiimote"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:532
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:519
 #, 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:786
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:773
 #, c-format
 msgid ""
-"IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available "
-"in your nand dump\n"
+"IOCTL_ES_LAUNCH: Game tried to reload an IOS or a title that is not "
+"available in your NAND dump\n"
 "TitleID %016llx.\n"
-" Dolphin will likely hang now"
+" Dolphin will likely hang now."
 msgstr ""
-"IOCTL_ES_LAUNCH：遊戲試圖重新讀取的 ios 或標題是無效的在這個檔案\n"
-"標題 ID %016llx.\n"
-" Dolphin 可能會當"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:313
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:300
 msgid "IOCTL_ES_READCONTENT - bad destination"
 msgstr "IOCTL_ES_READCONTENT - 損毀的目標"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729
 msgid "IPL Settings"
 msgstr "IPL 設定"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269
 msgid "IR"
 msgstr "IR"
 
@@ -2736,45 +2805,33 @@ msgstr "IR 指示器"
 msgid "IR Sensitivity:"
 msgstr "IR 靈敏度："
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:502
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:512
 msgid "ISO Details"
 msgstr "ISO 明細"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:830
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:811
 msgid "ISO Directories"
 msgstr "ISO 資料夾"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:172
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:166
 msgid "ITALY"
 msgstr "ITALY"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:630
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:624
 msgid "Icon"
 msgstr "圖示"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332
 msgid ""
 "If checked, the bounding box registers will be updated. Used by the Paper "
 "Mario games."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318
-msgid ""
-"If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)"
-msgstr "開啟記憶體管理單元，某些遊戲需要。(ON = 兼容、OFF = 快速)"
-
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505
-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:428
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438
 msgid "Ignore Format Changes"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94
 msgid ""
 "Ignore any changes to the EFB format.\n"
 "Improves performance in many games without any negative effect. Causes "
@@ -2783,7 +2840,7 @@ msgid ""
 "If unsure, leave this checked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93
 msgid ""
 "Ignore any requests of the CPU to read from or write to the EFB.\n"
 "Improves performance in some games, but might disable some gameplay-related "
@@ -2796,11 +2853,11 @@ msgstr ""
 msgid "Import Save"
 msgstr "匯入存檔"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:59
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:48
 msgid "Import failed, try again?"
 msgstr "匯入失敗，是否重試？"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:454
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:441
 msgid ""
 "Imported file has gsc extension\n"
 "but does not have a correct header"
@@ -2808,11 +2865,11 @@ msgstr ""
 "匯入的檔案有 gsc 副檔名\n"
 "但是沒有正確的檔頭"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:442
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:429
 msgid "Imported file has invalid length"
 msgstr "匯入的檔案有無效的長度"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:451
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:438
 msgid ""
 "Imported file has sav extension\n"
 "but does not have a correct header"
@@ -2820,15 +2877,7 @@ msgstr ""
 "匯入的檔案有 sav 副檔名\n"
 "但是沒有正確的檔頭"
 
-#: 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/ISOProperties.cpp:347
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350
 msgid "In Game"
 msgstr "遊戲中"
 
@@ -2836,84 +2885,84 @@ msgstr "遊戲中"
 msgid "In-Game"
 msgstr "遊戲中"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:34
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305
 msgid "Info"
 msgstr "訊息"
 
-#: Source/Core/Common/Src/MsgHandler.cpp:65
+#: Source/Core/Common/Src/MsgHandler.cpp:51
 msgid "Information"
 msgstr "訊息"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:481
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:468
 msgid "Input"
 msgstr "輸入"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:63
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:50
 msgid "Insert"
 msgstr "Insert"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:176
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:166
 msgid "Insert Encrypted or Decrypted code here..."
 msgstr "在這裡插入被加密或已解密的代碼..."
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:763
 msgid "Insert SD Card"
 msgstr "插入 SD 卡"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:34
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:21
 msgid "Insert name here.."
 msgstr "在這裡插入名稱.."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:196
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:199
 msgid "Install WAD"
 msgstr "安裝 WAD"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:895
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:888
 msgid "Install to Wii Menu"
 msgstr "安裝至 Wii 選單"
 
-#: Source/Core/Core/Src/x64MemTools.cpp:252
+#: Source/Core/Core/Src/x64MemTools.cpp:242
 msgid ""
 "InstallExceptionHandler called, but this platform does not yet support it."
 msgstr "調用 InstallExceptionHandler，但是這個平台尚未支援此功能。"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1297
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
 msgid "Installing WAD..."
 msgstr "正在安裝 WAD 至 Wii 選單..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:885
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:901
 msgid "Integrity Check Error"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:891
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:907
 msgid "Integrity check completed"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:890
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:906
 msgid "Integrity check completed. No errors have been found."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:882
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:898
 #, 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:552
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532
 msgid "Interface"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:646
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627
 msgid "Interface Settings"
 msgstr "界面設定"
 
-#: Source/Core/Core/Src/State.cpp:240
+#: Source/Core/Core/Src/State.cpp:228
 msgid "Internal LZO Error - compression failed"
 msgstr "內部 LZO 錯誤 - 壓縮失敗"
 
-#: Source/Core/Core/Src/State.cpp:348
+#: Source/Core/Core/Src/State.cpp:336
 #, c-format
 msgid ""
 "Internal LZO Error - decompression failed (%d) (%li, %li) \n"
@@ -2922,41 +2971,45 @@ msgstr ""
 "內部 LZO 錯誤 - 解壓縮失敗 (%d) (%li, %li) \n"
 "請重試讀取"
 
-#: Source/Core/Core/Src/State.cpp:485
+#: Source/Core/Core/Src/State.cpp:473
 msgid "Internal LZO Error - lzo_init() failed"
 msgstr "內部 LZO 錯誤 - lzo_init() 失敗"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:344
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:352
 msgid "Internal Resolution:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:42
+msgid "Interpreter (VERY slow)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349
 msgid "Intro"
 msgstr "標題"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:194
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:187
 #, c-format
 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:600
 msgid "Invalid Value!"
 msgstr "無效的數值！"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:462
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:449
 msgid "Invalid bat.map or dir entry"
 msgstr "無效的 bat.map 或目錄項目"
 
-#: Source/Core/Core/Src/CoreTiming.cpp:548
+#: Source/Core/Core/Src/CoreTiming.cpp:553
 #, c-format
 msgid "Invalid event type %i"
 msgstr "無效的事件類型 %i"
 
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:326
+#: Source/Core/Core/Src/HW/DVDInterface.cpp:309
 msgid "Invalid file"
 msgstr "無效的檔案"
 
-#: Source/Core/DiscIO/Src/BannerLoaderGC.cpp:41
+#: Source/Core/DiscIO/Src/BannerLoaderGC.cpp:28
 #, c-format
 msgid ""
 "Invalid opening.bnr found in gcm:\n"
@@ -2967,108 +3020,116 @@ msgstr ""
 "%s\n"
 " 可能需要重新轉儲這個遊戲。"
 
-#: Source/Core/Core/Src/Movie.cpp:735
+#: Source/Core/Core/Src/Movie.cpp:726
 msgid "Invalid recording file"
 msgstr "無效的錄像檔"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:473
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:472
 msgid "Invalid search parameters (no object selected)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:456
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:455
 msgid "Invalid search string (couldn't convert to number)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:444
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:443
 msgid "Invalid search string (only even string lengths supported)"
 msgstr ""
 
-#: Source/Core/Core/Src/Core.cpp:513
+#: Source/Core/Core/Src/Core.cpp:511
 msgid "Invalid state"
 msgstr "無效的狀態"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:473
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:320
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300
 msgid "Italian"
 msgstr "Italian"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:183
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:177
 msgid "JAPAN"
 msgstr "JAPAN"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:321
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:46
+msgid "JIT Recompiler (recommended)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:47
+msgid "JITIL experimental recompiler"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:279
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
 msgid "Japanese"
 msgstr "Japanese"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:188
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:182
 msgid "KOREA"
 msgstr "KOREA"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78
 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:298
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:306
 msgid "Keep window on top"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:241
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:241
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:229
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:229
 msgid "Key"
 msgstr "鍵"
 
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282
 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:322
 msgid "Korean"
 msgstr "Korean"
 
 #. i18n:  Left
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:57
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:44
 msgid "L"
 msgstr "L"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:39
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:26
 msgid "L Button"
 msgstr "L 鈕"
 
 #. i18n:  Left-Analog
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:61
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:48
 msgid "L-Analog"
 msgstr "L-類比"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:585
 msgid "Language:"
 msgstr "語系："
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:152
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:153
 msgid "Last Overwritten State"
 msgstr "最後覆蓋的進度"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:159
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:161
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:160
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:162
 msgid "Last Saved State"
 msgstr "最後使用的進度"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:696
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:677
 msgid "Latency:"
 msgstr ""
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:276
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:55
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:263
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:42
 msgid "Left"
 msgstr "左"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:60
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:64
 msgid "Left Stick"
 msgstr "左 搖桿"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:257
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:257
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:245
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:245
 msgid ""
 "Left click to detect hotkeys.\n"
 "Enter space to clear."
@@ -3076,7 +3137,7 @@ msgstr ""
 "按左鍵檢測快捷鍵。\n"
 "按鍵盤空白鍵為清除。"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:689
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:678
 msgid ""
 "Left-click to detect input.\n"
 "Middle-click to clear.\n"
@@ -3086,7 +3147,7 @@ msgstr ""
 "中鍵清除。\n"
 "右鍵取得更多選項。"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:694
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:683
 msgid ""
 "Left/Right-click for more options.\n"
 "Middle-click to clear."
@@ -3094,83 +3155,83 @@ msgstr ""
 "左/右鍵取得更多選項。\n"
 "中鍵清除。"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:219
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:206
 msgid "Less Than"
 msgstr "小於"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:565
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545
 msgid "Limit by FPS"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:924
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:915
 msgid "Load"
 msgstr "讀取"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544
 msgid "Load Custom Textures"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
 msgid "Load State Slot 1"
 msgstr "讀取儲存格 1"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189
 msgid "Load State Slot 2"
 msgstr "讀取儲存格 2"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:190
 msgid "Load State Slot 3"
 msgstr "讀取儲存格 3"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:203
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:191
 msgid "Load State Slot 4"
 msgstr "讀取儲存格 4"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192
 msgid "Load State Slot 5"
 msgstr "讀取儲存格 5"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193
 msgid "Load State Slot 6"
 msgstr "讀取儲存格 6"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:194
 msgid "Load State Slot 7"
 msgstr "讀取儲存格 7"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:195
 msgid "Load State Slot 8"
 msgstr "讀取儲存格 8"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:155
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:156
 msgid "Load State..."
 msgstr "讀取進度檔..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1332
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1359
 msgid "Load Wii System Menu"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1327
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1354
 #, c-format
 msgid "Load Wii System Menu %d%c"
 msgstr "讀取 Wii 系統選單 (%d%c)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112
 msgid ""
 "Load custom textures from User/Load/Textures/<game_id>/\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:50
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:37
 msgid "Load preset values from hack patterns available."
 msgstr "讀取可用的修正設定預設檔"
 
@@ -3178,23 +3239,23 @@ msgstr "讀取可用的修正設定預設檔"
 msgid "Local"
 msgstr "本地"
 
-#: Source/Core/DolphinWX/Src/LogWindow.h:51
+#: Source/Core/DolphinWX/Src/LogWindow.h:38
 msgid "Log"
 msgstr "記錄"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:26
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:13
 msgid "Log Configuration"
 msgstr "記錄設定"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:296
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304
 msgid "Log FPS to file"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:96
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83
 msgid "Log Types"
 msgstr "記錄類型"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103
 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"
@@ -3202,24 +3263,24 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:81
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:68
 msgid "Logger Outputs"
 msgstr "記錄輸出"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132
-#: Source/Core/DolphinWX/Src/Frame.cpp:328
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:119
+#: Source/Core/DolphinWX/Src/Frame.cpp:314
 msgid "Logging"
 msgstr "日誌"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:255
+#: Source/Core/Core/Src/NetPlayClient.cpp:259
 msgid "Lost connection to server!"
 msgstr "遺失與伺服器的連接"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:42
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:29
 msgid "M Button"
 msgstr "M 鈕"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:119
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:112
 #, c-format
 msgid ""
 "MD5 mismatch\n"
@@ -3228,57 +3289,66 @@ msgstr ""
 "MD5 不符合\n"
 " %016llx%016llx != %016llx%016llx"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314
 msgid "MMU Speed Hack"
 msgstr "MMU 速度修正"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:527
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:563
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:517
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:556
 msgid "MadCatz Gameshark files(*.gcs)"
 msgstr "MadCatz Gameshark 檔案(*.gcs)"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:51
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:63
+#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:38
 msgid "Main Stick"
 msgstr "主搖桿"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:456
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:460
 msgid "Maker ID:"
 msgstr "廠商 ID："
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487
 msgid "Maker:"
 msgstr "廠商："
 
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100
+msgid ""
+"Makes distant objects more visible by removing fog, thus increasing the "
+"overall detail.\n"
+"Disabling fog will break some games which rely on proper fog emulation.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:97
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:100
 msgid "Max"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:448
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:435
 msgid "Memcard already has a save for this title"
 msgstr "記憶卡中已經存在一個此標題的存檔"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:291
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:278
 msgid "Memcard already opened"
 msgstr "記憶卡已經開啟"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:912
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:913
 msgid "Memory Byte"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:225
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:113
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:212
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:93
 msgid "Memory Card"
 msgstr "記憶卡"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.h:36
+#: Source/Core/DolphinWX/Src/MemcardManager.h:23
 msgid ""
 "Memory Card Manager WARNING-Make backups before using, should be fixed but "
 "could mangle stuff!"
 msgstr "記憶卡管理器警告-在使用前請先備份，以防止出現損毀時無法復原！"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:371
+#: Source/Core/Core/Src/CoreParameter.cpp:360
 #, c-format
 msgid ""
 "Memory Card filename in Slot %c is incorrect\n"
@@ -3295,15 +3365,15 @@ msgstr ""
 "%s\n"
 "是否要複製舊檔案至新路徑？\n"
 
-#: Source/Core/Core/Src/HW/GCMemcard.cpp:124
+#: Source/Core/Core/Src/HW/GCMemcard.cpp:112
 msgid "Memorycard filesize does not match the header size"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:50
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:37
 msgid "Menu"
 msgstr "選單"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:114
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:94
 msgid "Mic"
 msgstr "麥克風"
 
@@ -3312,20 +3382,20 @@ msgstr "麥克風"
 msgid "Min"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:580
 msgid "Misc"
 msgstr "雜項"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:795
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776
 msgid "Misc Settings"
 msgstr "其它設定"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:240
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:294
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:227
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:281
 msgid "Modifier"
 msgstr "Modifier"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106
 msgid ""
 "Modify textures to show the format they're encoded in. Needs an emulation "
 "reset in most cases.\n"
@@ -3333,20 +3403,20 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:115
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:108
 msgid "Monospaced font"
 msgstr "等寬字型"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:305
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:292
 msgid "Motion Plus"
 msgstr "Motion Plus"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:309
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:86
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:296
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73
 msgid "Motor"
 msgstr "馬達"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:654
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:666
 msgid ""
 "Move the mouse pointer over an option to display a detailed description.\n"
 "\n"
@@ -3357,224 +3427,235 @@ msgid ""
 "\n"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:75
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:62
 msgid "Multiply"
 msgstr "多重分插"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:651
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:650
 msgid "NOP"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:629
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:628
 msgid "NOTE: Stream size doesn't match actual data length\n"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:129
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:116
 msgid "NP Add"
 msgstr "NP Add"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:124
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:111
 msgid "NP Begin"
 msgstr "NP Begin"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:132
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:119
 msgid "NP Decimal"
 msgstr "NP Decimal"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:126
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:113
 msgid "NP Delete"
 msgstr "NP Delete"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:133
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:120
 msgid "NP Divide"
 msgstr "NP Divide"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:120
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:107
 msgid "NP Down"
 msgstr "NP Down"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:123
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:110
 msgid "NP End"
 msgstr "NP End"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:111
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:98
 msgid "NP Enter"
 msgstr "NP Enter"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:127
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:114
 msgid "NP Equal"
 msgstr "NP Equal"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:116
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:103
 msgid "NP Home"
 msgstr "NP Home"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:125
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:112
 msgid "NP Insert"
 msgstr "NP Insert"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:117
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:104
 msgid "NP Left"
 msgstr "NP Left"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:128
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:115
 msgid "NP Multiply"
 msgstr "NP Multiply"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:122
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:109
 msgid "NP Page Down"
 msgstr "NP Page Down"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:121
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:108
 msgid "NP Page Up"
 msgstr "NP Page Up"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:119
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:106
 msgid "NP Right"
 msgstr "NP Right"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:130
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:117
 msgid "NP Separator"
 msgstr "NP Separator"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:109
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:96
 msgid "NP Space"
 msgstr "NP Space"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:131
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:118
 msgid "NP Subtract"
 msgstr "NP Subtract"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:110
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:97
 msgid "NP Tab"
 msgstr "NP Tab"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:118
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:105
 msgid "NP Up"
 msgstr "NP Up"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:444
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:59
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:50
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:448
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:46
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:37
 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:25
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:72
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:282
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:553
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:15
 msgid "Name: "
 msgstr "名稱："
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:526
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:562
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:516
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:555
 msgid "Native GCI files(*.gci)"
 msgstr "原始 GCI 檔案(*.gci)"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:161
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:148
 msgid "New Scan"
 msgstr "新的搜尋"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:206
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:193
 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:801
 msgid "Next Page"
 msgstr "下一頁"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:165
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:152
 msgid "Next Scan"
 msgstr "尋找下一個"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:68
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:59
 msgid "Nickname :"
 msgstr "暱稱："
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:196
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:190
 msgid "No Country (SDK)"
 msgstr "無國家 (SDK)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:370
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:357
 msgid "No ISOs or WADS found"
 msgstr "找不到 ISO 或 WAD"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:508
-#, c-format
-msgid "No banner file found for title  %s"
-msgstr "找不到標題 %s 的圖示檔案"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:761
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:768
-msgid "No description available"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:514
-msgid "No docking"
-msgstr "不停靠"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:859
-msgid "No file loaded"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:439
-msgid "No free dir index entries"
-msgstr "沒有剩餘的目錄索引項目"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:895
-msgid "No recorded file"
+#: Source/Core/Core/Src/ConfigManager.h:17
+msgid "No audio output"
 msgstr ""
 
 #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:501
 #, c-format
+msgid "No banner file found for title  %s"
+msgstr "找不到標題 %s 的圖示檔案"
+
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:760
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:767
+msgid "No description available"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:535
+msgid "No docking"
+msgstr "不停靠"
+
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:860
+msgid "No file loaded"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:426
+msgid "No free dir index entries"
+msgstr "沒有剩餘的目錄索引項目"
+
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:896
+msgid "No recorded file"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:494
+#, c-format
 msgid "No save folder found for title %s"
 msgstr "找不到標題 %s 的存檔資料夾"
 
+#: Source/Plugins/Plugin_VideoOGL/Src/main.cpp:132
+#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:111
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:23
 #: Source/Core/DolphinWX/Src/NetWindow.cpp:600
 msgid "None"
 msgstr "無"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:323
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303
 msgid "Norwegian Bokmaal"
 msgstr "Norwegian Bokmaal"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:203
 msgid "Not Equal"
 msgstr "不相等"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:804
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:794
 msgid "Not Set"
 msgstr "未設定"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:626
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:101
+#, c-format
+msgid "Not a Wii save or read failure for file header size %x"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/Main.cpp:654
 msgid "Not connected"
 msgstr "未連接"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:309
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:296
 msgid "Notes"
 msgstr "註釋"
 
-#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26
+#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:16
 msgid "Notes: "
 msgstr "注意："
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:71
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:74
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:580
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:621
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:629
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:59
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:64
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:613
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:659
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:667
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:31
 msgid "Notice"
 msgstr "注意"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:105
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:92
 msgid "Num Lock"
 msgstr "Num Lock"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:88
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:75
 msgid "Number Of Codes: "
 msgstr "代碼數量："
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:30
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:34
 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26
 msgid "Nunchuk"
 msgstr "Nunchuk"
@@ -3583,110 +3664,111 @@ msgstr "Nunchuk"
 msgid "Nunchuk Acceleration"
 msgstr "Nunchuk 加速"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:877
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:878
 msgid "Object"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:135
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:122
 msgid "Object Range"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:243
 msgid "Off"
 msgstr "關閉"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:62
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:49
 msgid "Offset:"
 msgstr "偏移："
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:582
 msgid "On-Screen Display Messages"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:436
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:423
 #, c-format
 msgid "Only %d blocks available"
 msgstr "僅 %d 個區塊可用"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:420
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:178
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:426
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:166
 msgid "Open"
 msgstr "開啟"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:876
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:867
 msgid "Open &containing folder"
 msgstr "開啟內容資料夾(&C)"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:873
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:864
 msgid "Open Wii &save folder"
 msgstr "開啟 Wii 存檔資料夾(&S)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:420
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:426
 msgid "Open file..."
 msgstr "開啟檔案..."
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:61
+#: Source/Core/AudioCommon/Src/OpenALStream.cpp:48
 #, c-format
 msgid "OpenAL: can't create context for device %s"
 msgstr "OpenAL：無法關聯至裝置 %s"
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:72
+#: Source/Core/AudioCommon/Src/OpenALStream.cpp:59
 msgid "OpenAL: can't find sound devices"
 msgstr "OpenAL：找不到聲音裝置"
 
-#: Source/Core/AudioCommon/Src/OpenALStream.cpp:66
+#: Source/Core/AudioCommon/Src/OpenALStream.cpp:53
 #, c-format
 msgid "OpenAL: can't open device %s"
 msgstr "OpenAL：無法開啟裝置 %s"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502
 msgid "OpenCL Texture Decoder"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503
 msgid "OpenMP Texture Decoder"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:317
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:94
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:304
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:81
 msgid "Options"
 msgstr "選項"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:22
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:26
 msgid "Orange"
 msgstr "橘"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:468
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:455
+#, fuzzy
 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"
+"and import the saves to a new memcard\n"
 msgstr ""
 "在檔案目錄中的檔案順序與區塊順序不符合\n"
 "按右鍵匯出所有存檔，\n"
 "並匯入存檔至一張新的記憶卡中\n"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:316
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:324
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:509
 msgid "Other"
 msgstr ""
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:206
+#: Source/Core/Core/Src/NetPlayClient.cpp:210
 msgid ""
 "Other client disconnected while game is running!! NetPlay is disabled. You "
 "manually stop the game."
 msgstr "其它客戶端在遊戲執行時連接埠口！！已關閉網路對戰。您需要手動停止遊戲。"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:481
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:468
 msgid "Output"
 msgstr "輸出"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:342
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:348
 msgid "P&lay Recording..."
 msgstr "播放錄像(&L)..."
 
-#: Source/Core/Core/Src/HW/GCPad.cpp:30
+#: Source/Core/Core/Src/HW/GCPad.cpp:18
 msgid "Pad"
 msgstr "控制器"
 
@@ -3694,160 +3776,160 @@ msgstr "控制器"
 msgid "Pad "
 msgstr "控制器"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:34
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:38
 msgid "Pads"
 msgstr "控制器"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:108
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:95
 msgid "Page Down"
 msgstr "下一頁"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:107
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:94
 msgid "Page Up"
 msgstr "上一頁"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:35
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:22
 msgid "Paragraph"
 msgstr "段落"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:64
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:51
 msgid "Parameters"
 msgstr "參數"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:222
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:217
 #, c-format
 msgid "Partition %i"
 msgstr "分割區 %i"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:296
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:297
 msgid "Patches"
 msgstr "修正"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:556
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536
 msgid "Paths"
 msgstr "路徑"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1538
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1539
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:51
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1565
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1566
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:38
 msgid "Pause"
 msgstr "暫停"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:128
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:129
 msgid "Pause at end of movie"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:397
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405
 msgid "Per-Pixel Lighting"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352
 msgid "Perfect"
 msgstr "完美"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:609
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:642
 #, c-format
 msgid "Perspective %d"
 msgstr "版式 %d"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:165
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:424
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1547
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1548
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:152
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:430
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1574
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1575
 msgid "Play"
 msgstr "執行"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176
 msgid "Play Recording"
 msgstr "播放錄像"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:170
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:170
 msgid "Play/Pause"
 msgstr "執行/暫停"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351
 msgid "Playable"
 msgstr "可玩"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:154
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:141
 msgid "Playback Options"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:301
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:304
 msgid "Players"
 msgstr "玩家"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:988
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:991
 msgid "Please confirm..."
 msgstr "請確認..."
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:579
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:612
 msgid "Please create a perspective before saving"
 msgstr "請在儲存前建立一個新的透檢視"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:36
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:23
 msgid "Plus-Minus"
 msgstr "Plus-Minus"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:324
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304
 msgid "Polish"
 msgstr "Polish"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:713
 msgid "Port 1"
 msgstr "埠口 1"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714
 msgid "Port 2"
 msgstr "埠口 2"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:734
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715
 msgid "Port 3"
 msgstr "埠口 3"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716
 msgid "Port 4"
 msgstr "埠口 4"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:97
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:130
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:88
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:133
 msgid "Port :"
 msgstr "埠口："
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:325
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305
 msgid "Portuguese"
 msgstr "Portuguese"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:326
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306
 msgid "Portuguese (Brazilian)"
 msgstr "Portuguese (Brazilian)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:391
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:399
 msgid "Post-Processing Effect:"
 msgstr ""
 
-#: Source/Core/Core/Src/Movie.cpp:936
+#: Source/Core/Core/Src/Movie.cpp:927
 #, c-format
 msgid "Premature movie end in PlayController. %u + 8 > %u"
 msgstr ""
 
-#: Source/Core/Core/Src/Movie.cpp:1055
+#: Source/Core/Core/Src/Movie.cpp:1046
 #, c-format
 msgid "Premature movie end in PlayWiimote. %u + %d > %u"
 msgstr ""
 
-#: Source/Core/Core/Src/Movie.cpp:1032
+#: Source/Core/Core/Src/Movie.cpp:1023
 #, c-format
 msgid "Premature movie end in PlayWiimote. %u > %u"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:48
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:35
 msgid "Presets: "
 msgstr "預設："
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:205
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:192
 msgid "Prev Page"
 msgstr "上一頁"
 
@@ -3855,67 +3937,67 @@ msgstr "上一頁"
 msgid "Previous Page"
 msgstr "上一頁"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:183
 msgid "Previous Value"
 msgstr "上一個數值"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:60
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:47
 msgid "Print"
 msgstr "列印"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:894
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:885
 msgid "Profile"
 msgstr "設定檔"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.h:55
+#: Source/Core/DolphinWX/Src/ISOProperties.h:42
 msgid "Properties"
 msgstr "屬性"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:283
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:286
 msgid "Purge Cache"
 msgstr "清理快取"
 
-#: Source/Core/Common/Src/MsgHandler.cpp:66
+#: Source/Core/Common/Src/MsgHandler.cpp:52
 msgid "Question"
 msgstr "問題"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:159
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:316
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:162
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:319
 msgid "Quit"
 msgstr "離開"
 
 #. i18n:  Right
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:59
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:46
 msgid "R"
 msgstr "R"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:40
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:27
 msgid "R Button"
 msgstr "R 鈕"
 
 #. i18n:  Right-Analog
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:63
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
 msgid "R-Analog"
 msgstr "R-類比"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:445
 msgid "RAM"
 msgstr "RAM"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:175
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:169
 msgid "RUSSIA"
 msgstr "RUSSIA"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:528
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:515
 msgid "Range"
 msgstr "範圍"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:190
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:178
 msgid "Read-only mode"
 msgstr "唯讀模式"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:487
 msgid "Real"
 msgstr "實體"
 
@@ -3931,33 +4013,33 @@ msgstr ""
 msgid "Reconnect Wiimote on State Loading"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:193
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:217
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:791
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:180
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:204
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:790
 msgid "Record"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:174
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:161
 msgid "Recording Info"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:202
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:189
 msgid "Recording Options"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:21
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Red"
 msgstr "紅"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:24
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:28
 msgid "Red Left"
 msgstr "紅 左"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:25
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
 msgid "Red Right"
 msgstr "紅 右"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86
 msgid ""
 "Reduces the amount of aliasing caused by rasterizing 3D graphics.\n"
 "This makes the rendered picture look less blocky.\n"
@@ -3967,255 +4049,261 @@ msgid ""
 msgstr ""
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:60
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:421
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:903
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:427
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:894
 msgid "Refresh"
 msgstr "更新"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:180
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:168
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:168
 msgid "Refresh List"
 msgstr "更新列表"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:421
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:427
 msgid "Refresh game list"
 msgstr "更新遊戲列表"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:405
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:427
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:77
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:812
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:409
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:431
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:64
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:793
 msgid "Remove"
 msgstr "移除"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99
 msgid ""
 "Render the scene as a wireframe.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:308
 msgid "Render to Main Window"
 msgstr "渲染至主視窗"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:915
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:172
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:906
 msgid "Reset"
 msgstr "重置"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:190
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:177
 msgid "Results"
 msgstr "結果"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:29
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:16
 msgid "Return"
 msgstr "Return"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:277
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:57
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464
+msgid "Revision:"
+msgstr ""
+
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:264
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:44
 msgid "Right"
 msgstr "右"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:61
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:65
 msgid "Right Stick"
 msgstr "右 搖桿"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:85
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:295
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:72
 msgid "Rumble"
 msgstr "震動"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:518
-msgid "Run DSP LLE on a dedicated thread (not recommended)."
-msgstr "在獨立的線程中執行 DSP LLE (不推薦)。"
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498
+msgid ""
+"Run DSP HLE and LLE on a dedicated thread (not recommended: might cause "
+"audio glitches with HLE and freezes with LLE)."
+msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:327
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307
 msgid "Russian"
 msgstr "Russian"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:149
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:150
 msgid "Sa&ve State"
 msgstr "儲存進度(&V)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:465
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475
 msgid "Safe"
 msgstr "安全"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:196
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:446
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:925
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:183
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:452
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916
 msgid "Save"
 msgstr "儲存"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:532
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:522
 msgid "Save GCI as..."
 msgstr "另存 GCI ..."
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
 msgid "Save State Slot 1"
 msgstr "儲存至儲存格 1"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:198
 msgid "Save State Slot 2"
 msgstr "儲存至儲存格 2"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:199
 msgid "Save State Slot 3"
 msgstr "儲存至儲存格 3"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:212
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:212
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200
 msgid "Save State Slot 4"
 msgstr "儲存至儲存格 4"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201
 msgid "Save State Slot 5"
 msgstr "儲存至儲存格 5"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202
 msgid "Save State Slot 6"
 msgstr "儲存至儲存格 6"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:203
 msgid "Save State Slot 7"
 msgstr "儲存至儲存格 7"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204
 msgid "Save State Slot 8"
 msgstr "儲存至儲存格 8"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:151
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:152
 msgid "Save State..."
 msgstr "另存進度..."
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:582
 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:592
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:602
 msgid "Save as..."
 msgstr "另存為..."
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1203
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1204
 msgid "Save compressed GCM/ISO"
 msgstr "儲存已壓縮的 GCM/ISO"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:446
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:452
 msgid "Save current perspective"
 msgstr "儲存目前版式"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1192
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193
 msgid "Save decompressed GCM/ISO"
 msgstr "儲存已解壓縮的 GCM/ISO"
 
-#: Source/Core/Core/Src/Movie.cpp:801
+#: Source/Core/Core/Src/Movie.cpp:792
 #, c-format
 msgid "Savestate movie %s is corrupted, movie recording stopping..."
 msgstr "儲存的影片 %s 是損毀的，影片錄製停止..."
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:396
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:404
 msgid "Scaled EFB Copy"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:556
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:543
 #, c-format
 msgid "Scanning %s"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:539
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:526
 msgid "Scanning for ISOs"
 msgstr "正在掃瞄 ISO"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:540
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:527
 msgid "Scanning..."
 msgstr "正在掃瞄..."
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:427
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
 msgid "ScrShot"
 msgstr "截圖"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:106
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:93
 msgid "Scroll Lock"
 msgstr "滾動鎖定"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:264
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:251
 msgid "Search"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:227
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:214
 msgid "Search Filter"
 msgstr "搜索篩選"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:810
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:791
 msgid "Search Subfolders"
 msgstr "搜尋子資料夾"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:250
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:237
 msgid "Search current Object"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:254
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:241
 msgid "Search for hex Value:"
 msgstr ""
 
-#: Source/Core/Common/Src/SysConf.h:103 Source/Core/Common/Src/SysConf.h:126
-#: Source/Core/Common/Src/SysConf.h:146 Source/Core/Common/Src/SysConf.h:167
+#: Source/Core/Common/Src/SysConf.h:90 Source/Core/Common/Src/SysConf.h:113
+#: Source/Core/Common/Src/SysConf.h:133 Source/Core/Common/Src/SysConf.h:154
 #, c-format
 msgid "Section %s not found in SYSCONF"
 msgstr "項目 %s 在 SYSCONF 中找不到"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:59
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:490
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:46
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:477
 msgid "Select"
 msgstr "選擇"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:677
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1072
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:683
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1087
 msgid "Select The Recording File"
 msgstr "選擇已錄製的檔案"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1285
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1312
 msgid "Select a Wii WAD file to install"
 msgstr "選擇要安裝的 Wii WAD"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:70
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74
 msgid ""
 "Select a hardware adapter to use.\n"
 "\n"
 "If unsure, use the first one."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:520
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:510
 msgid "Select a save file to import"
 msgstr "選擇要匯入的存檔"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:363
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:366
 msgid "Select floating windows"
 msgstr "選擇浮動視窗"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:582
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:585
 msgid "Select the file to load"
 msgstr "選擇要讀取的檔案"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1241
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1268
 msgid "Select the save file"
 msgstr "選擇存檔"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1388
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1415
 msgid "Select the state to load"
 msgstr "選擇要讀取的進度"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1429
 msgid "Select the state to save"
 msgstr "選擇要儲存的進度"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82
 msgid ""
 "Select what aspect ratio to use when rendering:\n"
 "Auto: Use the native aspect ratio\n"
@@ -4226,15 +4314,15 @@ msgid ""
 "If unsure, select Auto."
 msgstr ""
 
-#: Source/Core/InputCommon/Src/InputConfig.cpp:61
+#: Source/Core/InputCommon/Src/InputConfig.cpp:48
 msgid "Selected controller profile does not exist"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:116
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:109
 msgid "Selected font"
 msgstr "選擇字型"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75
 msgid ""
 "Selects the display resolution used in fullscreen mode.\n"
 "This should always be bigger than or equal to the internal resolution. "
@@ -4244,17 +4332,27 @@ msgid ""
 "If still unsure, use the highest resolution which works for you."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:69
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:70
 msgid ""
 "Selects what graphics API to use internally.\n"
 "Direct3D 9 usually is the fastest one. OpenGL is more accurate though. "
 "Direct3D 11 is somewhere between the two.\n"
 "Note that the Direct3D backends are only available on Windows.\n"
 "\n"
-"If unsure, use Direct3D 9."
+"If unsure, use Direct3D 11."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:288
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72
+msgid ""
+"Selects what graphics API to use internally.\n"
+"Direct3D 9 usually is the fastest one. OpenGL is more accurate though. "
+"Direct3D 11 is somewhere between the two.\n"
+"Note that the Direct3D backends are only available on Windows.\n"
+"\n"
+"If unsure, use OpenGL."
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:291
 msgid "Send"
 msgstr "傳送"
 
@@ -4262,24 +4360,24 @@ msgstr "傳送"
 msgid "Sensor Bar Position:"
 msgstr "傳感器位置："
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:77
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:64
 msgid "Separator"
 msgstr "分離器"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:328
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308
 msgid "Serbian"
 msgstr "Serbian"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:522
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502
 msgid ""
 "Serial Port 1 - This is the port which devices such as the net adapter use"
 msgstr "埠口 1 - 這是類似於網卡等裝置使用的埠口。"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:488
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:475
 msgid "Set"
 msgstr "設定"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:877
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:868
 msgid "Set as &default ISO"
 msgstr "設為預設 ISO (&D)"
 
@@ -4288,134 +4386,134 @@ msgstr "設為預設 ISO (&D)"
 msgid "Set as default Memcard %c"
 msgstr "設定為預設記憶卡 %c"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:460
+#: Source/Core/Core/Src/ActionReplay.cpp:450
 #, c-format
 msgid "SetARCode_IsActive: Index is greater than ar code list size %lu"
 msgstr "SetARCode_IsActive：索引大於 ar 代碼列表大小 %lu"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:515
 msgid ""
 "Sets the latency (in ms).  Higher values may reduce audio crackling. OpenAL "
 "backend only."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341
 msgid "Settings..."
 msgstr "設定..."
 
-#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:222
+#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:209
 msgid "SetupWiiMem: Cant find setting file"
 msgstr "SetupWiiMem：無法找到設定檔"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:291
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:278
 msgid "Shake"
 msgstr "搖晃"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
 msgid "Short Name:"
 msgstr "短名："
 
-#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:103
+#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:90
 msgid "Shoulder Buttons"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:217
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:220
 msgid "Show &Console"
 msgstr "顯示控制台(&C)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:215
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:218
 msgid "Show &Log"
 msgstr "顯示日誌視窗(&L)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:212
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:215
 msgid "Show &Statusbar"
 msgstr "顯示狀態欄(&S)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:210
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:213
 msgid "Show &Toolbar"
 msgstr "顯示工具列(&T)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:281
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:284
 msgid "Show Drives"
 msgstr "顯示裝置"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:517
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530
 msgid "Show EFB Copy Regions"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:295
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303
 msgid "Show FPS"
 msgstr "顯示 FPS"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:271
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:274
 msgid "Show France"
 msgstr "顯示 France"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:257
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:260
 msgid "Show GameCube"
 msgstr "顯示 GameCube"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561
 msgid "Show Input Display"
 msgstr "輸入顯示"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:273
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:276
 msgid "Show Italy"
 msgstr "顯示 Italy"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:264
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:267
 msgid "Show JAP"
 msgstr "顯示 JAP"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:275
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:278
 msgid "Show Korea"
 msgstr "顯示 Korea"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476
 msgid "Show Language:"
 msgstr "顯示語系："
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:216
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:219
 msgid "Show Log &Configuration"
 msgstr "日誌記錄設定(&C)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:266
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:269
 msgid "Show PAL"
 msgstr "顯示 PAL"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:254
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:257
 msgid "Show Platforms"
 msgstr "顯示平台"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:263
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:266
 msgid "Show Regions"
 msgstr "顯示區域"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:518
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531
 msgid "Show Statistics"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:277
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:280
 msgid "Show Taiwan"
 msgstr "顯示 Taiwan"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:268
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:271
 msgid "Show USA"
 msgstr "顯示 USA"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:259
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:262
 msgid "Show Wad"
 msgstr "顯示 Wad"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:255
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:258
 msgid "Show Wii"
 msgstr "顯示 Wii"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491
 msgid "Show a confirmation box before stopping a game."
 msgstr "在停止遊戲後顯示一個確認框。"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:512
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492
 msgid ""
 "Show a message box when a potentially serious error has occurred.\n"
 "Disabling this may avoid annoying and non-fatal messages, but it may also "
@@ -4429,11 +4527,11 @@ msgstr ""
 msgid "Show first block"
 msgstr "顯示第一個區塊"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:130
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:131
 msgid "Show lag counter"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493
 msgid ""
 "Show messages on the emulation screen area.\n"
 "These messages include memory card writes, video backend and CPU "
@@ -4456,7 +4554,7 @@ msgstr "顯示存檔圖示"
 msgid "Show save title"
 msgstr "顯示存檔標題"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102
 msgid ""
 "Show the number of frames rendered per second as a measure of emulation "
 "speed.\n"
@@ -4464,54 +4562,42 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:279
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:282
 msgid "Show unknown"
 msgstr "顯示 未知"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105
 msgid ""
 "Show various statistics.\n"
 "\n"
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:319
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:306
 msgid "Sideways Wiimote"
 msgstr "橫握 Wiimote"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:280
 msgid "Simplified Chinese"
 msgstr "Simplified Chinese"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:311
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:298
 msgid "Size"
 msgstr "大小"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:696
 msgid "Skip BIOS"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316
 msgid "Skip DCBZ clearing"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:492
-msgid "Skip Dest. Alpha Pass"
-msgstr ""
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:444
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:454
 msgid "Skip EFB Access from CPU"
 msgstr ""
 
-#: 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 ""
-
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125
 msgid ""
 "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n"
 "Sometimes also increases visual quality.\n"
@@ -4521,25 +4607,25 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:374
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:386
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:380
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:392
 #, c-format
 msgid "Slot %i"
 msgstr "儲存格 %i"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:700
 msgid "Slot A"
 msgstr "插槽 A"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:701
 msgid "Slot B"
 msgstr "插槽 B"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:62
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:49
 msgid "Snapshot"
 msgstr "截圖"
 
-#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:58
+#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:46
 msgid "Software Renderer"
 msgstr ""
 
@@ -4551,27 +4637,27 @@ msgid ""
 "Do you really want to enable software rendering? If unsure, select 'No'."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:683
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:664
 msgid "Sound Settings"
 msgstr "聲音設定"
 
-#: Source/Core/AudioCommon/Src/AudioCommon.cpp:77
+#: Source/Core/AudioCommon/Src/AudioCommon.cpp:64
 #, c-format
 msgid "Sound backend %s is not valid."
 msgstr "聲音 backend %s 是無效的。"
 
-#: Source/Core/AudioCommon/Src/DSoundStream.cpp:59
+#: Source/Core/AudioCommon/Src/DSoundStream.cpp:46
 #, c-format
 msgid "Sound buffer creation failed: %s"
 msgstr "聲音緩衝建立失敗：%s"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:31
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:18
 msgid "Space"
 msgstr "Space"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:329
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309
 msgid "Spanish"
 msgstr "Spanish"
 
@@ -4579,7 +4665,7 @@ msgstr "Spanish"
 msgid "Speaker Volume:"
 msgstr "揚聲器音量："
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92
 msgid ""
 "Specifies the resolution used to render at. A high resolution will improve "
 "visual quality a lot but is also quite heavy on performance and might cause "
@@ -4591,63 +4677,63 @@ msgid ""
 "If unsure, select 640x528."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322
 msgid "Speed up Disc Transfer Rate"
 msgstr "加速光碟傳輸率"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:243
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:230
 msgid "Square Stick"
 msgstr "Square Stick"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:107
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87
 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:322
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:37
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:25
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:325
 msgid "Start"
 msgstr "Start"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:194
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:197
 msgid "Start &NetPlay"
 msgstr "開始網路對戰(&N)"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:339
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:345
 msgid "Start Re&cording"
 msgstr "開始錄製(&C)"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:175
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:175
 msgid "Start Recording"
 msgstr "開始錄製"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:312
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:299
 msgid "State"
 msgstr "狀態"
 
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:173
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:161
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:161
 msgid "State Saves"
 msgstr "即時存檔"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:108
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88
 msgid "Steering Wheel"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:53
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:57
 msgid "Stick"
 msgstr "搖桿"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:420
-#: 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:325
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:419
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:431
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:171
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:171
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:328
 msgid "Stop"
 msgstr "停止"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96
 msgid ""
 "Store EFB copies in GPU texture objects.\n"
 "This is not so accurate, but it works well enough for most games and gives a "
@@ -4656,107 +4742,117 @@ msgid ""
 "If unsure, leave this checked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:275
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283
 msgid "Stretch to Window"
 msgstr "拉伸至視窗"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:43
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:47
 msgid "Strum"
 msgstr "Strum"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:78
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:65
 msgid "Subtract"
 msgstr "減少"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:77
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:67
 #, c-format
 msgid "Successfully exported file to %s"
 msgstr "成功匯出檔案至 %s"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:56
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:43
 msgid "Successfully imported save files"
 msgstr "成功匯入存檔"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:285
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:272
 msgid "Swing"
 msgstr "揮舞"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:744
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:792
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320
+msgid "Synchronize GPU thread"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321
+msgid ""
+"Synchronizes the GPU and CPU threads to help prevent random freezes in Dual "
+"Core mode. (ON = Compatible, OFF = Fast)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773
 msgid "System Language:"
 msgstr "系統語系："
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:191
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:185
 msgid "TAIWAN"
 msgstr "TAIWAN"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:127
-#: Source/Core/DolphinWX/Src/TASInputDlg.h:32
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:128
+#: Source/Core/DolphinWX/Src/TASInputDlg.h:19
 msgid "TAS Input"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:28
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:15
 msgid "Tab"
 msgstr "Tab"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:510
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:531
 msgid "Tab split"
 msgstr "分離面版"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:37
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:41
 msgid "Table Left"
 msgstr "Table 左"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:38
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:42
 msgid "Table Right"
 msgstr "Table 右"
 
-#: 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
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:361
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:181
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:181
 msgid "Take Screenshot"
 msgstr "截取畫面"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:109
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89
 msgid "TaruKonga (Bongos)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:472
 msgid "Test"
 msgstr "測試"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:444
 msgid "Texture"
 msgstr "紋理"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:451
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:461
 msgid "Texture Cache"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:519
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:532
 msgid "Texture Format Overlay"
 msgstr ""
 
-#: Source/Core/Core/Src/CoreParameter.cpp:226
+#: Source/Core/Core/Src/CoreParameter.cpp:215
 msgid "The WAD has been installed successfully"
 msgstr "WAD 已經安裝成功"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:197
+#: Source/Core/Core/Src/ActionReplay.cpp:185
 msgid "The address is invalid"
 msgstr "位址無效"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:509
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:496
 msgid "The checksum was successfully fixed"
 msgstr "校驗已經被成功修復"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1242
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226
 msgid "The chosen directory is already in the list"
 msgstr "選取的資料夾已經在列表中"
 
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1117
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1216
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1118
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1146
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1217
 #, c-format
 msgid ""
 "The file %s already exists.\n"
@@ -4765,36 +4861,36 @@ msgstr ""
 "檔案 %s 已經存在。\n"
 "是否要進行取代？"
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:51
+#: Source/Core/AudioCommon/Src/WaveFile.cpp:38
 #, c-format
 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
+#: Source/Core/AudioCommon/Src/WaveFile.cpp:31
 #, c-format
 msgid "The file %s was already open, the file header will not be written."
 msgstr "檔案 %s 已經開啟，檔頭無法被寫入。"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:332
+#: Source/Core/Core/Src/Boot/Boot.cpp:320
 #, c-format
 msgid "The file you specified (%s) does not exist"
 msgstr "指定的檔案 (%s) 不存在"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:628
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:666
 msgid "The name can not be empty"
 msgstr "名稱不能為空"
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:620
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:658
 msgid "The name can not contain the character ','"
 msgstr "名稱不能含有字符 ','"
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:142
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:129
 msgid "The resulting decrypted AR code doesn't contain any lines."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98
 msgid ""
 "The safer you adjust this, the less likely the emulator will be missing any "
 "texture updates from RAM.\n"
@@ -4802,52 +4898,52 @@ msgid ""
 "If unsure, use the rightmost value."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:445
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:432
 msgid "The save you are trying to copy has an invalid file size"
 msgstr "您嘗試複製的檔案有一個無效的檔案大小"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:388
+#: Source/Core/DolphinWX/Src/Main.cpp:416
 msgid ""
 "The selected language is not supported by your system. Falling back to "
 "system default."
 msgstr "選擇的語系不支援您的系統。將使用系統預設值。"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:43
+#: Source/Core/Core/Src/NetPlayClient.cpp:47
 msgid "The server and client's NetPlay versions are incompatible!"
 msgstr "伺服器與客戶端的網路對戰版本不兼容！"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:40
+#: Source/Core/Core/Src/NetPlayClient.cpp:44
 msgid "The server is full!"
 msgstr "伺服器已滿！"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:46
+#: Source/Core/Core/Src/NetPlayClient.cpp:50
 msgid "The server responded: the game is currently running!"
 msgstr "伺服器回應：遊戲目前正在執行！"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:49
+#: Source/Core/Core/Src/NetPlayClient.cpp:53
 msgid "The server sent an unknown error message!"
 msgstr "伺服器發生了一個未知錯誤訊息！"
 
-#: Source/Core/Core/Src/CoreParameter.cpp:119
+#: Source/Core/Core/Src/CoreParameter.cpp:108
 #, c-format
 msgid "The specified file \"%s\" does not exist"
 msgstr "指定的檔案 \"%s\" 不存在"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:198
+#: Source/Core/Core/Src/ActionReplay.cpp:186
 msgid "The value is invalid"
 msgstr "這個數值無效"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:642
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:623
 msgid "Theme:"
 msgstr ""
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:476
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:463
 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:307
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308
 msgid ""
 "These settings override core Dolphin settings.\n"
 "Undetermined means the game uses Dolphin's setting."
@@ -4855,17 +4951,17 @@ msgstr ""
 "這些設定將替代核心 Dolphin 設定。\n"
 "未確定表示遊戲使用 Dolphin 的設定。"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:355
+#: Source/Core/Core/Src/ActionReplay.cpp:345
 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:525
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505
 msgid "This could cause slow down in Wii Menu and some games."
 msgstr "這可能會使 Wii Menu 和部分遊戲降速。"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118
 msgid ""
 "This feature allows you to change the game's camera.\n"
 "Move the mouse while holding the right mouse button to pan and while holding "
@@ -4877,7 +4973,15 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485
+msgid ""
+"This limits the game speed to the specified number of frames per second "
+"(full speed is 60 for NTSC and 50 for PAL). Alternatively, 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/ConfigMain.cpp:484
 msgid ""
 "This splits the Video and CPU threads, so they can be run on separate "
 "cores.\n"
@@ -4887,61 +4991,61 @@ msgstr ""
 "這將分離影像和 CPU 線程，所以它們可以執行於獨立的內核中。\n"
 "可以在多核心的 PC 上取得非常大的加速，但是也可能導致偶爾崩潰或圖片問題。"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:286
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:287
 msgid "This will let you Manually Edit the INI config file"
 msgstr "這將允許您手工編輯 INI 設定檔案"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:249
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:254
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:236
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:241
 msgid "Threshold"
 msgstr "閾值"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:288
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:275
 msgid "Tilt"
 msgstr "傾斜"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:628
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:304
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:622
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:291
 msgid "Title"
 msgstr "標題"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:125
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:144
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:112
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:131
 msgid "To"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:72
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59
 msgid "Toggle All Log Types"
 msgstr "全選/全部取消"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:426
-#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192
-#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:432
+#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180
+#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:180
 msgid "Toggle Fullscreen"
 msgstr "切換全螢幕"
 
 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:87
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:271
 msgid "Top"
 msgstr "上方"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:281
 msgid "Traditional Chinese"
 msgstr "Traditional Chinese"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:426
+#: Source/Core/Core/Src/Boot/Boot.cpp:414
 msgid "Tried to load an unknown file type."
 msgstr "已嘗試讀取從未知的檔案類型。"
 
-#: Source/Core/Core/Src/HW/GCPadEmu.cpp:80
+#: Source/Core/Core/Src/HW/GCPadEmu.cpp:67
 msgid "Triggers"
 msgstr "扳機"
 
-#: Source/Core/Common/Src/SysConf.h:91 Source/Core/Common/Src/SysConf.h:114
+#: Source/Core/Common/Src/SysConf.h:78 Source/Core/Common/Src/SysConf.h:101
 msgid "Trying to read from invalid SYSCONF"
 msgstr "嘗試讀取從無效的 SYSCONF"
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:44
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:31
 msgid ""
 "Trying to read from invalid SYSCONF\n"
 "Wiimote bt ids are not available"
@@ -4949,15 +5053,15 @@ msgstr ""
 "嘗試讀取從無效的 SYSCONF\n"
 "Wiimote bt ids 是無效的"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:330
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
 msgid "Turkish"
 msgstr "Turkish"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:33
 msgid "Turntable"
 msgstr "Turntable"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:71
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58
 msgid "Type"
 msgstr "類型"
 
@@ -4965,31 +5069,31 @@ msgstr "類型"
 msgid "UDP Port:"
 msgstr "UDP 埠口："
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:279
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:266
 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12
 msgid "UDP Wiimote"
 msgstr "UDP Wiimote"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:199
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:193
 msgid "UNKNOWN"
 msgstr "未知"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:756
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:755
 #, c-format
 msgid "UNKNOWN_%02X"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:178
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:172
 msgid "USA"
 msgstr "USA"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:225
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:214
 msgid ""
 "Unable to create patch from given values.\n"
 "Entry not modified."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:124
+#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:111
 #, c-format
 msgid ""
 "Unable to parse line %lu of the entered AR code as a valid encrypted or "
@@ -4997,74 +5101,88 @@ msgid ""
 "Would you like to ignore this line and continue parsing?"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:391
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:397
 #, c-format
 msgid "Undefined %i"
 msgstr "未指定 %i"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:163
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:164
 msgid "Undo Load State"
 msgstr "取消讀取進度"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:718
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:717
 msgid "Unexpected 0x80 call? Aborting..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:215
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:202
 msgid "Unknown"
 msgstr "未知"
 
-#: Source/Core/Core/Src/HW/DVDInterface.cpp:971
+#: Source/Core/Core/Src/HW/DVDInterface.cpp:965
 #, c-format
 msgid "Unknown DVD command %08x - fatal error"
 msgstr "未知的 DVD 命令 %08x - 致命錯誤"
 
-#: Source/Core/Common/Src/SysConf.cpp:145
+#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:444
+#, c-format
+msgid "Unknown command 0x%08x"
+msgstr ""
+
+#: Source/Core/Common/Src/SysConf.cpp:132
 #, c-format
 msgid "Unknown entry type %i in SYSCONF (%s@%x)!"
 msgstr "未知的登錄類型 %i 於 SYSCONF (%s@%x)！"
 
-#: Source/Core/Core/Src/NetPlayClient.cpp:228
+#: Source/Core/Core/Src/NetPlayClient.cpp:232
 #, c-format
 msgid "Unknown message received with id : %d"
 msgstr "接收到帶有未知 id 的錯誤訊息：%d"
 
-#: Source/Core/Core/Src/NetPlayServer.cpp:504
+#: Source/Core/Core/Src/NetPlayServer.cpp:508
 #, c-format
 msgid "Unknown message with id:%d received from player:%d Kicking player!"
 msgstr "知訊息帶有 id:%d 接收於玩家:%d 正在提出玩家！"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:274
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:56
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:261
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:43
 msgid "Up"
 msgstr "上"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:108
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:95
 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17
 msgid "Update"
 msgstr "更新"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:320
+#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:307
 msgid "Upright Wiimote"
 msgstr "直握 Wiimote"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:777
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758
 msgid "Use EuRGB60 Mode (PAL60)"
 msgstr "使用 EuRGB60 模式 (PAL60)"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:294
 msgid "Use Fullscreen"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:575
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:563
 msgid "Use Hex"
 msgstr "使用 Hex"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:600
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580
 msgid "Use Panic Handlers"
 msgstr "顯示錯誤提示"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89
+msgid ""
+"Use a hacked upload strategy to stream vertices.\n"
+"This usually speed up, but is forbidden by OpenGL specification and may "
+"causes heavy glitches.\n"
+"\n"
+"If unsure, leave this unchecked."
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122
 msgid ""
 "Use multiple threads to decode textures.\n"
 "Might result in a speedup (especially on CPUs with more than two cores).\n"
@@ -5072,7 +5190,7 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126
 msgid ""
 "Usually if shader compilation fails, an error message is displayed.\n"
 "However, one may skip the popups to allow interruption free gameplay by "
@@ -5081,53 +5199,58 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:539
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:552
 msgid "Utility"
 msgstr "工具"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:285
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:293
 msgid "V-Sync"
 msgstr "垂直同步"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:209
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318
+#, fuzzy
+msgid "VBeam Speed Hack"
+msgstr "MMU 速度修正"
+
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196
 msgid "Value"
 msgstr "數值"
 
-#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:73
+#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:60
 msgid "Value:"
 msgstr "數值："
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:572
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:560
 msgid "Value: "
 msgstr "數值："
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:51
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:38
 msgid "Verbosity"
 msgstr "事件"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:377
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:381
 msgid "Video"
 msgstr "影像"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:486
 msgid "Virtual"
 msgstr "虛擬"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:689
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670
 msgid "Volume"
 msgstr "音量"
 
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:498
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:527
+#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:488
+#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:517
 #, c-format
 msgid "WAD installation failed: error creating %s"
 msgstr "WAD installation 失敗：錯誤於建立 %s"
 
-#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:547
+#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:537
 msgid "WAD installation failed: error creating ticket"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84
 msgid ""
 "Wait for vertical blanks in order to reduce tearing.\n"
 "Decreases performance if emulation speed is below 100%.\n"
@@ -5135,25 +5258,25 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/Common/Src/MsgHandler.cpp:67
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46
+#: Source/Core/Common/Src/MsgHandler.cpp:53
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:33
 #: Source/Core/DolphinWX/Src/VideoConfigDiag.h:85
 msgid "Warning"
 msgstr "警告"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:291
+#: Source/Core/Core/Src/Boot/Boot.cpp:279
 msgid "Warning - starting DOL in wrong console mode!"
 msgstr "警告 - DOL 啟動於錯誤的主機模式！"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:341
+#: Source/Core/Core/Src/Boot/Boot.cpp:329
 msgid "Warning - starting ELF in wrong console mode!"
 msgstr "警告 - ELF 啟動於錯誤的主機模式！"
 
-#: Source/Core/Core/Src/Boot/Boot.cpp:221
+#: Source/Core/Core/Src/Boot/Boot.cpp:209
 msgid "Warning - starting ISO in wrong console mode!"
 msgstr "警告 - ISO 啟動於錯誤的主機模式！"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:519
+#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:512
 #, c-format
 msgid ""
 "Warning! it is advised to backup all files in the folder:\n"
@@ -5164,7 +5287,7 @@ msgstr ""
 "%s\n"
 "您要繼續嗎？"
 
-#: Source/Core/DolphinWX/Src/MemcardManager.cpp:585
+#: Source/Core/DolphinWX/Src/MemcardManager.cpp:578
 #, c-format
 msgid ""
 "Warning: This will overwrite any existing saves that are in the folder:\n"
@@ -5177,7 +5300,7 @@ msgstr ""
 "以及在您記憶卡中 相同檔案名的檔案\n"
 "要繼續嗎？"
 
-#: Source/Core/Core/Src/Movie.cpp:844
+#: Source/Core/Core/Src/Movie.cpp:835
 #, c-format
 msgid ""
 "Warning: You loaded a save that's after the end of the current movie. (byte "
@@ -5185,7 +5308,7 @@ msgid ""
 "load this state with read-only mode off."
 msgstr ""
 
-#: Source/Core/Core/Src/Movie.cpp:861
+#: Source/Core/Core/Src/Movie.cpp:852
 #, c-format
 msgid ""
 "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You "
@@ -5193,7 +5316,7 @@ msgid ""
 "only mode off. Otherwise you'll probably get a desync."
 msgstr ""
 
-#: Source/Core/Core/Src/Movie.cpp:870
+#: Source/Core/Core/Src/Movie.cpp:861
 #, c-format
 msgid ""
 "Warning: You loaded a save whose movie mismatches on frame %d. You should "
@@ -5212,49 +5335,49 @@ msgid ""
 "%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d"
 msgstr ""
 
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:106
-#: Source/Core/AudioCommon/Src/WaveFile.cpp:129
+#: Source/Core/AudioCommon/Src/WaveFile.cpp:93
+#: Source/Core/AudioCommon/Src/WaveFile.cpp:116
 msgid "WaveFileWriter - file not open."
 msgstr "WaveFileWriter - 檔案無法開啟。"
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:56
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:60
 msgid "Whammy"
 msgstr "Whammy"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:404
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:408
 msgid "Widescreen Hack"
 msgstr "寬螢幕修正"
 
-#: Source/Core/InputCommon/Src/ControllerEmu.cpp:312
+#: Source/Core/InputCommon/Src/ControllerEmu.cpp:299
 msgid "Width"
 msgstr "寬度"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535
 msgid "Wii"
 msgstr "Wii"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:372
 msgid "Wii Console"
 msgstr "Wii 主機"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:844
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:825
 msgid "Wii NAND Root:"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:191
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:194
 msgid "Wii Save Import"
 msgstr "匯入 Wii 存檔"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1243
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1270
 msgid "Wii save files (*.bin)|*.bin"
 msgstr "Wii 存檔 (*.bin)|*.bin"
 
-#: Source/Core/DiscIO/Src/WiiWad.cpp:82
+#: Source/Core/DiscIO/Src/WiiWad.cpp:69
 msgid "WiiWAD: Could not read from file"
 msgstr "WiiWAD：無法從檔案中讀取"
 
-#: Source/Core/Core/Src/HW/Wiimote.cpp:17
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
+#: Source/Core/Core/Src/HW/Wiimote.cpp:20
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
 msgid "Wiimote"
 msgstr "Wiimote"
 
@@ -5263,7 +5386,7 @@ msgstr "Wiimote"
 msgid "Wiimote %i"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/Main.cpp:628
+#: Source/Core/DolphinWX/Src/Main.cpp:656
 msgid "Wiimote Connected"
 msgstr "Wiimote 已連接"
 
@@ -5271,7 +5394,7 @@ msgstr "Wiimote 已連接"
 msgid "Wiimote Motor"
 msgstr "Wiimote 馬達"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
 msgid "Wiimote settings"
 msgstr "Wiimote 設定"
 
@@ -5279,99 +5402,117 @@ msgstr "Wiimote 設定"
 msgid "Wiimotes"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:134
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:121
 msgid "Windows Left"
 msgstr "視窗 左"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:136
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:123
 msgid "Windows Menu"
 msgstr "視窗 選單"
 
-#: Source/Core/DolphinWX/Src/WXInputBase.cpp:135
+#: Source/Core/DolphinWX/Src/WXInputBase.cpp:122
 msgid "Windows Right"
 msgstr "視窗 右"
 
-#: Source/Core/DolphinWX/Src/LogWindow.cpp:131
+#: Source/Core/DolphinWX/Src/LogWindow.cpp:124
 msgid "Word Wrap"
 msgstr "自動換行"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1298
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:864
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1089
-#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1225
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1325
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:880
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1090
+#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1226
 msgid "Working..."
 msgstr "執行中..."
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:338
+msgid "Write memcards (GC)"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46
 msgid "Write to Console"
 msgstr "寫入至控制台"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:67
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:54
 msgid "Write to Debugger"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:57
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44
 msgid "Write to File"
 msgstr "寫入至檔案"
 
-#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:61
+#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48
 msgid "Write to Window"
 msgstr "寫入至視窗"
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:60
+#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:47
 #, c-format
 msgid "XAudio2 CreateSourceVoice failed: %#X"
 msgstr "XAudio2 建立原始聲音失敗： %#X"
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:114
+#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:101
 #, c-format
 msgid "XAudio2 init failed: %#X"
 msgstr "XAudio2 初始化失敗： %#X"
 
-#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:124
+#: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:111
 #, c-format
 msgid "XAudio2 master voice creation failed: %#X"
 msgstr "XAudio2 主聲音建立失敗： %#X"
 
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:766
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:765
 msgid "XF reg"
 msgstr ""
 
-#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:21
+#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:25
 msgid "Yellow"
 msgstr "黃"
 
-#: Source/Core/Core/Src/DSP/DSPCore.cpp:107
+#: Source/Core/Core/Src/DSP/DSPCore.cpp:120
 msgid ""
-"You are using free dsp roms made by Dolphin Team.\n"
-"Only Zelda ucode games will work correctly with them.\n"
+"You are using a free DSP ROM made by the Dolphin Team.\n"
+"All Wii games will work correctly, and most GC games should also work fine, "
+"but the GBA/IPL/CARD UCodes will not work.\n"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameAui.cpp:73
+#: Source/Core/Core/Src/DSP/DSPCore.cpp:116
+msgid ""
+"You are using an old free DSP ROM made by the Dolphin Team.\n"
+"Only games using the Zelda UCode will work correctly.\n"
+msgstr ""
+
+#: Source/Core/DolphinWX/Src/FrameAui.cpp:63
 msgid "You can't close panes that have pages in them."
 msgstr "您不能關閉有頁面的面板。"
 
-#: Source/Core/DolphinWX/Src/NetWindow.cpp:207
+#: Source/Core/DolphinWX/Src/NetWindow.cpp:210
 msgid "You must choose a game!!"
 msgstr "您必須選擇一個遊戲！！"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:605
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:593
 msgid "You must enter a name!"
 msgstr "您必須輸入一個名稱！"
 
-#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:450
+#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:438
 msgid "You must enter a valid decimal, hexadecimal or octal value."
 msgstr "您必須輸入一個有效的十進制，十六進制或八進制的數值。"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:603
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:591
 msgid "You must enter a valid profile name."
 msgstr "您必須輸入一個有效的設定檔名稱。"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:936
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:917
 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."
 
-#: Source/Core/Core/Src/CoreParameter.cpp:175
+#: Source/Core/Core/Src/DSP/DSPCore.cpp:109
+msgid ""
+"Your DSP ROMs have incorrect hashes.\n"
+"Would you like to stop now to fix the problem?\n"
+"If you select \"No\", audio might be garbled."
+msgstr ""
+
+#: Source/Core/Core/Src/CoreParameter.cpp:164
 msgid ""
 "Your GCM/ISO file seems to be invalid (invalid country).\n"
 "Continue with PAL region?"
@@ -5379,7 +5520,7 @@ msgstr ""
 "GCM/ISO 檔案似乎是無效的 (無效的區域)。\n"
 "是否以 PAL 制式繼續？"
 
-#: Source/Core/Common/Src/SysConf.cpp:58
+#: Source/Core/Common/Src/SysConf.cpp:45
 #, c-format
 msgid ""
 "Your SYSCONF file is the wrong size.\n"
@@ -5390,25 +5531,25 @@ msgstr ""
 "應該是 0x%04x (而非 0x%04llx)\n"
 "是否要建立新的檔案？"
 
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:334
 msgid "ZTP hack"
 msgstr "ZTP 修正"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:387
+#: Source/Core/Core/Src/ActionReplay.cpp:377
 msgid "Zero 3 code not supported"
 msgstr "不支援 Zero 3 代碼"
 
-#: Source/Core/Core/Src/ActionReplay.cpp:408
+#: Source/Core/Core/Src/ActionReplay.cpp:398
 #, c-format
 msgid "Zero code unknown to dolphin: %08x"
 msgstr "Zero code 未知於 dolphin: %08x"
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:436
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:460
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:423
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:447
 msgid "[ waiting ]"
 msgstr "[ 等候中 ]"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107
 msgid ""
 "[BROKEN]\n"
 "Highlight regions the EFB was copied from.\n"
@@ -5416,11 +5557,11 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:91
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:78
 msgid "[Custom]"
 msgstr "[自訂]"
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120
 msgid ""
 "[EXPERIMENTAL]\n"
 "Aims to speed up emulation by offloading texture decoding to the GPU using "
@@ -5431,7 +5572,7 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116
+#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121
 msgid ""
 "[EXPERIMENTAL]\n"
 "Speeds up emulation a bit by caching display lists.\n"
@@ -5440,84 +5581,42 @@ msgid ""
 "If unsure, leave this unchecked."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:508
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:495
 msgid "^ ADD"
 msgstr "^ 新增"
 
-#: Source/Core/DolphinWX/Src/ConfigMain.cpp:820
+#: Source/Core/DolphinWX/Src/ConfigMain.cpp:801
 msgid "apploader (.img)"
 msgstr "程式讀取器 (.img)"
 
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:185
-msgid "failed to read bk header"
-msgstr "讀取 bk 檔頭失敗"
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:375
-#, c-format
-msgid "failed to read data from file: %s"
-msgstr "無法讀取資料，從檔案： %s"
-
-#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:97
-msgid "failed to read header"
-msgstr "讀取檔頭失敗"
-
-#: Source/Core/Core/Src/PowerPC/JitInterface.cpp:285
+#: Source/Core/Core/Src/PowerPC/JitInterface.cpp:272
 #, c-format
 msgid "iCacheJIT: Reading Opcode from %x. Please report."
 msgstr "iCacheJIT：從 %x 中讀取 Opcode 。請回報。"
 
-#: 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"
-
-#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:935
+#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:936
 msgid "s"
 msgstr ""
 
-#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:457
-#, c-format
-msgid "unknown cmd 0x%08x"
-msgstr "未知的 cmd 0x%08x"
-
-#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1110
+#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1136
 msgid "wxExecute returned -1 on application run!"
 msgstr "wxExecute 返回 -1 在應用程式執行時！"
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:56
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:43
 msgid "zFar Correction: "
 msgstr "zFar 修正："
 
-#: Source/Core/DolphinWX/Src/PHackSettings.cpp:51
+#: Source/Core/DolphinWX/Src/PHackSettings.cpp:38
 msgid "zNear Correction: "
 msgstr "zNear 修正："
 
-#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:493
+#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:480
 msgid "| OR"
 msgstr "| 或"
 
-#~ msgid "Interpreter (VERY slow)"
-#~ msgstr "解釋器 (非常緩慢)"
-
-#~ msgid "JIT Recompiler (recommended)"
-#~ msgstr "JIT 重編譯器 (推薦)"
-
-#~ msgid "JITIL experimental recompiler"
-#~ msgstr "JITIL 實驗性重編譯器"
-
-#~ msgid "Pair Up"
-#~ msgstr "配對"
-
-#~ msgid "Reconnect Wiimote Confirm"
-#~ msgstr "確認重新連接 Wiimote"
+#~ msgid "Accurate VBeam emulation"
+#~ msgstr "精確的 VBeam 模擬"
 
 #~ msgid ""
-#~ "Wiimote %i has been disconnected by system.\n"
-#~ "Maybe this game doesn't support multi-wiimote,\n"
-#~ "or maybe it is due to idle time out or other reason.\n"
-#~ "Do you want to reconnect immediately?"
-#~ msgstr ""
-#~ "Wiimote %i 已被系統中斷連接。\n"
-#~ "也許這個遊戲不支援多重-wiimote，\n"
-#~ "或閒置的時間太久。\n"
-#~ "是否要重新連接？"
+#~ "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)"
+#~ msgstr "開啟記憶體管理單元，某些遊戲需要。(ON = 兼容、OFF = 快速)"
diff --git a/Source/Android/.classpath b/Source/Android/.classpath
new file mode 100644
index 0000000000..3f9691c5dd
--- /dev/null
+++ b/Source/Android/.classpath
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
+	<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="gen"/>
+	<classpathentry kind="output" path="bin/classes"/>
+</classpath>
diff --git a/Source/Android/.gitignore b/Source/Android/.gitignore
new file mode 100644
index 0000000000..31bce7aa41
--- /dev/null
+++ b/Source/Android/.gitignore
@@ -0,0 +1,7 @@
+gen
+obj
+#ui_atlas.zim
+ui_atlas.zim.png
+#assets/ui_atlas.zim
+#jni/ui_atlas.cpp
+#jni/ui_atlas.h
diff --git a/Source/Android/.project b/Source/Android/.project
new file mode 100644
index 0000000000..b4a12698bf
--- /dev/null
+++ b/Source/Android/.project
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>dolphinemulator</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.ApkBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/Source/Android/.settings/org.eclipse.jdt.core.prefs b/Source/Android/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000000..f77b31c2d2
--- /dev/null
+++ b/Source/Android/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,4 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.source=1.5
diff --git a/Source/Android/AndroidManifest.xml b/Source/Android/AndroidManifest.xml
new file mode 100644
index 0000000000..82573aa8aa
--- /dev/null
+++ b/Source/Android/AndroidManifest.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="org.dolphinemu.dolphinemu"
+    android:versionCode="2"
+    android:versionName="0.2" >
+
+    <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="14"/>
+    
+    <uses-feature android:glEsVersion="0x00020000"></uses-feature>
+		<uses-feature android:name="android.hardware.screen.landscape" />
+		<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+		<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+		
+		<application
+        android:icon="@drawable/launcher"
+        android:label="@string/app_name">
+        <activity
+            android:name=".DolphinEmulator"
+            android:label="@string/app_name"
+            android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
+            android:screenOrientation="landscape"
+            android:configChanges="locale|keyboard|keyboardHidden|navigation|fontScale|uiMode" >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+        <activity 
+            android:name="org.dolphinemu.dolphinemu.GameListView"
+            android:label="@string/app_name"
+            android:theme="@android:style/Theme"
+            android:configChanges="orientation|locale|keyboard|keyboardHidden|navigation|fontScale|uiMode" >
+        </activity>
+                <activity 
+            android:name="org.dolphinemu.dolphinemu.FolderBrowser"
+            android:label="@string/app_name"
+            android:theme="@android:style/Theme"
+            android:configChanges="orientation|locale|keyboard|keyboardHidden|navigation|fontScale|uiMode" >
+        </activity>
+    </application>
+
+</manifest>
diff --git a/Source/Android/android.toolchain.cmake b/Source/Android/android.toolchain.cmake
new file mode 100644
index 0000000000..0f7e340678
--- /dev/null
+++ b/Source/Android/android.toolchain.cmake
@@ -0,0 +1,1632 @@
+# Copyright (c) 2010-2011, Ethan Rublee
+# Copyright (c) 2011-2013, Andrey Kamaev
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# 1.  Redistributions of source code must retain the above copyright notice,
+#     this list of conditions and the following disclaimer.
+#
+# 2.  Redistributions in binary form must reproduce the above copyright notice,
+#     this list of conditions and the following disclaimer in the documentation
+#     and/or other materials provided with the distribution.
+#
+# 3.  The name of the copyright holders may be used to endorse or promote
+#     products derived from this software without specific prior written
+#     permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
+# ------------------------------------------------------------------------------
+#  Android CMake toolchain file, for use with the Android NDK r5-r8
+#  Requires cmake 2.6.3 or newer (2.8.5 or newer is recommended).
+#  See home page: https://github.com/taka-no-me/android-cmake
+#
+#  The file is mantained by the OpenCV project. The latest version can be get at
+#  http://code.opencv.org/projects/opencv/repository/revisions/master/changes/android/android.toolchain.cmake
+#
+#  Usage Linux:
+#   $ export ANDROID_NDK=/absolute/path/to/the/android-ndk
+#   $ mkdir build && cd build
+#   $ cmake -DCMAKE_TOOLCHAIN_FILE=path/to/the/android.toolchain.cmake ..
+#   $ make -j8
+#
+#  Usage Linux (using standalone toolchain):
+#   $ export ANDROID_STANDALONE_TOOLCHAIN=/absolute/path/to/android-toolchain
+#   $ mkdir build && cd build
+#   $ cmake -DCMAKE_TOOLCHAIN_FILE=path/to/the/android.toolchain.cmake ..
+#   $ make -j8
+#
+#  Usage Windows:
+#     You need native port of make to build your project.
+#     Android NDK r7 (or newer) already has make.exe on board.
+#     For older NDK you have to install it separately.
+#     For example, this one: http://gnuwin32.sourceforge.net/packages/make.htm
+#
+#   $ SET ANDROID_NDK=C:\absolute\path\to\the\android-ndk
+#   $ mkdir build && cd build
+#   $ cmake.exe -G"MinGW Makefiles"
+#       -DCMAKE_TOOLCHAIN_FILE=path\to\the\android.toolchain.cmake
+#       -DCMAKE_MAKE_PROGRAM="%ANDROID_NDK%\prebuilt\windows\bin\make.exe" ..
+#   $ cmake.exe --build .
+#
+#
+#  Options (can be set as cmake parameters: -D<option_name>=<value>):
+#    ANDROID_NDK=/opt/android-ndk - path to the NDK root.
+#      Can be set as environment variable. Can be set only at first cmake run.
+#
+#    ANDROID_STANDALONE_TOOLCHAIN=/opt/android-toolchain - path to the
+#      standalone toolchain. This option is not used if full NDK is found
+#      (ignored if ANDROID_NDK is set).
+#      Can be set as environment variable. Can be set only at first cmake run.
+#
+#    ANDROID_ABI=armeabi-v7a - specifies the target Application Binary
+#      Interface (ABI). This option nearly matches to the APP_ABI variable
+#      used by ndk-build tool from Android NDK.
+#
+#      Possible targets are:
+#        "armeabi" - matches to the NDK ABI with the same name.
+#           See ${ANDROID_NDK}/docs/CPU-ARCH-ABIS.html for the documentation.
+#        "armeabi-v7a" - matches to the NDK ABI with the same name.
+#           See ${ANDROID_NDK}/docs/CPU-ARCH-ABIS.html for the documentation.
+#        "armeabi-v7a with NEON" - same as armeabi-v7a, but
+#            sets NEON as floating-point unit
+#        "armeabi-v7a with VFPV3" - same as armeabi-v7a, but
+#            sets VFPV3 as floating-point unit (has 32 registers instead of 16).
+#        "armeabi-v6 with VFP" - tuned for ARMv6 processors having VFP.
+#        "x86" - matches to the NDK ABI with the same name.
+#            See ${ANDROID_NDK}/docs/CPU-ARCH-ABIS.html for the documentation.
+#        "mips" - matches to the NDK ABI with the same name
+#            (It is not tested on real devices by the authos of this toolchain)
+#            See ${ANDROID_NDK}/docs/CPU-ARCH-ABIS.html for the documentation.
+#
+#    ANDROID_NATIVE_API_LEVEL=android-8 - level of Android API compile for.
+#      Option is read-only when standalone toolchain is used.
+#
+#    ANDROID_TOOLCHAIN_NAME=arm-linux-androideabi-4.6 - the name of compiler
+#      toolchain to be used. The list of possible values depends on the NDK
+#      version. For NDK r8c the possible values are:
+#
+#        * arm-linux-androideabi-4.4.3
+#        * arm-linux-androideabi-4.6
+#        * arm-linux-androideabi-clang3.1
+#        * mipsel-linux-android-4.4.3
+#        * mipsel-linux-android-4.6
+#        * mipsel-linux-android-clang3.1
+#        * x86-4.4.3
+#        * x86-4.6
+#        * x86-clang3.1
+#
+#    ANDROID_FORCE_ARM_BUILD=OFF - set ON to generate 32-bit ARM instructions
+#      instead of Thumb. Is not available for "x86" (inapplicable) and
+#      "armeabi-v6 with VFP" (is forced to be ON) ABIs.
+#
+#    ANDROID_NO_UNDEFINED=ON - set ON to show all undefined symbols as linker
+#      errors even if they are not used.
+#
+#    ANDROID_SO_UNDEFINED=OFF - set ON to allow undefined symbols in shared
+#      libraries. Automatically turned for NDK r5x and r6x due to GLESv2
+#      problems.
+#
+#    LIBRARY_OUTPUT_PATH_ROOT=${CMAKE_SOURCE_DIR} - where to output binary
+#      files. See additional details below.
+#
+#    ANDROID_SET_OBSOLETE_VARIABLES=ON - if set, then toolchain defines some
+#      obsolete variables which were used by previous versions of this file for
+#      backward compatibility.
+#
+#    ANDROID_STL=gnustl_static - specify the runtime to use.
+#
+#      Possible values are:
+#        none           -> Do not configure the runtime.
+#        system         -> Use the default minimal system C++ runtime library.
+#                          Implies -fno-rtti -fno-exceptions.
+#                          Is not available for standalone toolchain.
+#        system_re      -> Use the default minimal system C++ runtime library.
+#                          Implies -frtti -fexceptions.
+#                          Is not available for standalone toolchain.
+#        gabi++_static  -> Use the GAbi++ runtime as a static library.
+#                          Implies -frtti -fno-exceptions.
+#                          Available for NDK r7 and newer.
+#                          Is not available for standalone toolchain.
+#        gabi++_shared  -> Use the GAbi++ runtime as a shared library.
+#                          Implies -frtti -fno-exceptions.
+#                          Available for NDK r7 and newer.
+#                          Is not available for standalone toolchain.
+#        stlport_static -> Use the STLport runtime as a static library.
+#                          Implies -fno-rtti -fno-exceptions for NDK before r7.
+#                          Implies -frtti -fno-exceptions for NDK r7 and newer.
+#                          Is not available for standalone toolchain.
+#        stlport_shared -> Use the STLport runtime as a shared library.
+#                          Implies -fno-rtti -fno-exceptions for NDK before r7.
+#                          Implies -frtti -fno-exceptions for NDK r7 and newer.
+#                          Is not available for standalone toolchain.
+#        gnustl_static  -> Use the GNU STL as a static library.
+#                          Implies -frtti -fexceptions.
+#        gnustl_shared  -> Use the GNU STL as a shared library.
+#                          Implies -frtti -fno-exceptions.
+#                          Available for NDK r7b and newer.
+#                          Silently degrades to gnustl_static if not available.
+#
+#    ANDROID_STL_FORCE_FEATURES=ON - turn rtti and exceptions support based on
+#      chosen runtime. If disabled, then the user is responsible for settings
+#      these options.
+#
+#  What?:
+#    android-cmake toolchain searches for NDK/toolchain in the following order:
+#      ANDROID_NDK - cmake parameter
+#      ANDROID_NDK - environment variable
+#      ANDROID_STANDALONE_TOOLCHAIN - cmake parameter
+#      ANDROID_STANDALONE_TOOLCHAIN - environment variable
+#      ANDROID_NDK - default locations
+#      ANDROID_STANDALONE_TOOLCHAIN - default locations
+#
+#    Make sure to do the following in your scripts:
+#      SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${my_cxx_flags}" )
+#      SET( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${my_cxx_flags}" )
+#    The flags will be prepopulated with critical flags, so don't loose them.
+#    Also be aware that toolchain also sets configuration-specific compiler
+#    flags and linker flags.
+#
+#    ANDROID and BUILD_ANDROID will be set to true, you may test any of these
+#    variables to make necessary Android-specific configuration changes.
+#
+#    Also ARMEABI or ARMEABI_V7A or X86 or MIPS will be set true, mutually
+#    exclusive. NEON option will be set true if VFP is set to NEON.
+#
+#    LIBRARY_OUTPUT_PATH_ROOT should be set in cache to determine where Android
+#    libraries will be installed.
+#    Default is ${CMAKE_SOURCE_DIR}, and the android libs will always be
+#    under the ${LIBRARY_OUTPUT_PATH_ROOT}/libs/${ANDROID_NDK_ABI_NAME}
+#    (depending on the target ABI). This is convenient for Android packaging.
+#
+#  Change Log:
+#   - initial version December 2010
+#   - April 2011
+#     [+] added possibility to build with NDK (without standalone toolchain)
+#     [+] support cross-compilation on Windows (native, no cygwin support)
+#     [+] added compiler option to force "char" type to be signed
+#     [+] added toolchain option to compile to 32-bit ARM instructions
+#     [+] added toolchain option to disable SWIG search
+#     [+] added platform "armeabi-v7a with VFPV3"
+#     [~] ARM_TARGETS renamed to ARM_TARGET
+#     [+] EXECUTABLE_OUTPUT_PATH is set by toolchain (required on Windows)
+#     [~] Fixed bug with ANDROID_API_LEVEL variable
+#     [~] turn off SWIG search if it is not found first time
+#   - May 2011
+#     [~] ANDROID_LEVEL is renamed to ANDROID_API_LEVEL
+#     [+] ANDROID_API_LEVEL is detected by toolchain if not specified
+#     [~] added guard to prevent changing of output directories on the first
+#         cmake pass
+#     [~] toolchain exits with error if ARM_TARGET is not recognized
+#   - June 2011
+#     [~] default NDK path is updated for version r5c
+#     [+] variable CMAKE_SYSTEM_PROCESSOR is set based on ARM_TARGET
+#     [~] toolchain install directory is added to linker paths
+#     [-] removed SWIG-related stuff from toolchain
+#     [+] added macro find_host_package, find_host_program to search
+#         packages/programs on the host system
+#     [~] fixed path to STL library
+#   - July 2011
+#     [~] fixed options caching
+#     [~] search for all supported NDK versions
+#     [~] allowed spaces in NDK path
+#   - September 2011
+#     [~] updated for NDK r6b
+#   - November 2011
+#     [*] rewritten for NDK r7
+#     [+] x86 toolchain support (experimental)
+#     [+] added "armeabi-v6 with VFP" ABI for ARMv6 processors.
+#     [~] improved compiler and linker flags management
+#     [+] support different build flags for Release and Debug configurations
+#     [~] by default compiler flags the same as used by ndk-build (but only
+#         where reasonable)
+#     [~] ANDROID_NDK_TOOLCHAIN_ROOT is splitted to ANDROID_STANDALONE_TOOLCHAIN
+#         and ANDROID_TOOLCHAIN_ROOT
+#     [~] ARM_TARGET is renamed to ANDROID_ABI
+#     [~] ARMEABI_NDK_NAME is renamed to ANDROID_NDK_ABI_NAME
+#     [~] ANDROID_API_LEVEL is renamed to ANDROID_NATIVE_API_LEVEL
+#   - January 2012
+#     [+] added stlport_static support (experimental)
+#     [+] added special check for cygwin
+#     [+] filtered out hidden files (starting with .) while globbing inside NDK
+#     [+] automatically applied GLESv2 linkage fix for NDK revisions 5-6
+#     [+] added ANDROID_GET_ABI_RAWNAME to get NDK ABI names by CMake flags
+#   - February 2012
+#     [+] updated for NDK r7b
+#     [~] fixed cmake try_compile() command
+#     [~] Fix for missing install_name_tool on OS X
+#   - March 2012
+#     [~] fixed incorrect C compiler flags
+#     [~] fixed CMAKE_SYSTEM_PROCESSOR change on ANDROID_ABI change
+#     [+] improved toolchain loading speed
+#     [+] added assembler language support (.S)
+#     [+] allowed preset search paths and extra search suffixes
+#   - April 2012
+#     [+] updated for NDK r7c
+#     [~] fixed most of problems with compiler/linker flags and caching
+#     [+] added option ANDROID_FUNCTION_LEVEL_LINKING
+#   - May 2012
+#     [+] updated for NDK r8
+#     [+] added mips architecture support
+#   - August 2012
+#     [+] updated for NDK r8b
+#     [~] all intermediate files generated by toolchain are moved to CMakeFiles
+#     [~] libstdc++ and libsupc are removed from explicit link libraries
+#     [+] added CCache support (via NDK_CCACHE environment or cmake variable)
+#     [+] added gold linker support for NDK r8b
+#     [~] fixed mips linker flags for NDK r8b
+#   - September 2012
+#     [+] added NDK release name detection (see ANDROID_NDK_RELEASE)
+#     [+] added support for all C++ runtimes from NDK
+#         (system, gabi++, stlport, gnustl)
+#     [+] improved warnings on known issues of NDKs
+#     [~] use gold linker as default if available (NDK r8b)
+#     [~] globally turned off rpath
+#     [~] compiler options are aligned with NDK r8b
+#   - October 2012
+#     [~] fixed C++ linking: explicitly link with math library (OpenCV #2426)
+#   - November 2012
+#     [+] updated for NDK r8c
+#     [+] added support for clang compiler
+#   - December 2012
+#     [+] suppress warning about unused CMAKE_TOOLCHAIN_FILE variable
+#     [+] adjust API level to closest compatible as NDK does
+#     [~] fixed ccache full path search
+#     [+] updated for NDK r8d
+#     [~] compiler options are aligned with NDK r8d
+#   - March 2013
+#     [+] updated for NDK r8e (x86 version)
+#     [+] support x86_64 version of NDK
+# ------------------------------------------------------------------------------
+
+cmake_minimum_required( VERSION 2.6.3 )
+
+if( DEFINED CMAKE_CROSSCOMPILING )
+ # subsequent toolchain loading is not really needed
+ return()
+endif()
+
+if( CMAKE_TOOLCHAIN_FILE )
+ # touch toolchain variable only to suppress "unused variable" warning
+endif()
+
+get_property( _CMAKE_IN_TRY_COMPILE GLOBAL PROPERTY IN_TRY_COMPILE )
+if( _CMAKE_IN_TRY_COMPILE )
+ include( "${CMAKE_CURRENT_SOURCE_DIR}/../android.toolchain.config.cmake" OPTIONAL )
+endif()
+
+# this one is important
+set( CMAKE_SYSTEM_NAME Linux )
+# this one not so much
+set( CMAKE_SYSTEM_VERSION 1 )
+
+# rpath makes low sence for Android
+set( CMAKE_SKIP_RPATH TRUE CACHE BOOL "If set, runtime paths are not added when using shared libraries." )
+
+set( ANDROID_SUPPORTED_NDK_VERSIONS ${ANDROID_EXTRA_NDK_VERSIONS} -r8e -r8d -r8c -r8b -r8 -r7c -r7b -r7 -r6b -r6 -r5c -r5b -r5 "" )
+if(NOT DEFINED ANDROID_NDK_SEARCH_PATHS)
+ if( CMAKE_HOST_WIN32 )
+  file( TO_CMAKE_PATH "$ENV{PROGRAMFILES}" ANDROID_NDK_SEARCH_PATHS )
+  set( ANDROID_NDK_SEARCH_PATHS "${ANDROID_NDK_SEARCH_PATHS}/android-ndk" "$ENV{SystemDrive}/NVPACK/android-ndk" )
+ else()
+  file( TO_CMAKE_PATH "$ENV{HOME}" ANDROID_NDK_SEARCH_PATHS )
+  set( ANDROID_NDK_SEARCH_PATHS /opt/android-ndk "${ANDROID_NDK_SEARCH_PATHS}/NVPACK/android-ndk" )
+ endif()
+endif()
+if(NOT DEFINED ANDROID_STANDALONE_TOOLCHAIN_SEARCH_PATH)
+ set( ANDROID_STANDALONE_TOOLCHAIN_SEARCH_PATH /opt/android-toolchain )
+endif()
+
+set( ANDROID_SUPPORTED_ABIS_arm "armeabi-v7a;armeabi;armeabi-v7a with NEON;armeabi-v7a with VFPV3;armeabi-v6 with VFP" )
+set( ANDROID_SUPPORTED_ABIS_x86 "x86" )
+set( ANDROID_SUPPORTED_ABIS_mipsel "mips" )
+
+set( ANDROID_DEFAULT_NDK_API_LEVEL 8 )
+set( ANDROID_DEFAULT_NDK_API_LEVEL_x86 9 )
+set( ANDROID_DEFAULT_NDK_API_LEVEL_mips 9 )
+
+
+macro( __LIST_FILTER listvar regex )
+ if( ${listvar} )
+  foreach( __val ${${listvar}} )
+   if( __val MATCHES "${regex}" )
+    list( REMOVE_ITEM ${listvar} "${__val}" )
+   endif()
+  endforeach()
+ endif()
+endmacro()
+
+macro( __INIT_VARIABLE var_name )
+ set( __test_path 0 )
+ foreach( __var ${ARGN} )
+  if( __var STREQUAL "PATH" )
+   set( __test_path 1 )
+   break()
+  endif()
+ endforeach()
+ if( __test_path AND NOT EXISTS "${${var_name}}" )
+  unset( ${var_name} CACHE )
+ endif()
+ if( "${${var_name}}" STREQUAL "" )
+  set( __values 0 )
+  foreach( __var ${ARGN} )
+   if( __var STREQUAL "VALUES" )
+    set( __values 1 )
+   elseif( NOT __var STREQUAL "PATH" )
+    set( __obsolete 0 )
+    if( __var MATCHES "^OBSOLETE_.*$" )
+     string( REPLACE "OBSOLETE_" "" __var "${__var}" )
+     set( __obsolete 1 )
+    endif()
+    if( __var MATCHES "^ENV_.*$" )
+     string( REPLACE "ENV_" "" __var "${__var}" )
+     set( __value "$ENV{${__var}}" )
+    elseif( DEFINED ${__var} )
+     set( __value "${${__var}}" )
+    else()
+     if( __values )
+      set( __value "${__var}" )
+     else()
+      set( __value "" )
+     endif()
+    endif()
+    if( NOT "${__value}" STREQUAL "" )
+     if( __test_path )
+      if( EXISTS "${__value}" )
+       file( TO_CMAKE_PATH "${__value}" ${var_name} )
+       if( __obsolete AND NOT _CMAKE_IN_TRY_COMPILE )
+        message( WARNING "Using value of obsolete variable ${__var} as initial value for ${var_name}. Please note, that ${__var} can be completely removed in future versions of the toolchain." )
+       endif()
+       break()
+      endif()
+     else()
+      set( ${var_name} "${__value}" )
+       if( __obsolete AND NOT _CMAKE_IN_TRY_COMPILE )
+        message( WARNING "Using value of obsolete variable ${__var} as initial value for ${var_name}. Please note, that ${__var} can be completely removed in future versions of the toolchain." )
+       endif()
+      break()
+     endif()
+    endif()
+   endif()
+  endforeach()
+  unset( __value )
+  unset( __values )
+  unset( __obsolete )
+ elseif( __test_path )
+  file( TO_CMAKE_PATH "${${var_name}}" ${var_name} )
+ endif()
+ unset( __test_path )
+endmacro()
+
+macro( __DETECT_NATIVE_API_LEVEL _var _path )
+ SET( __ndkApiLevelRegex "^[\t ]*#define[\t ]+__ANDROID_API__[\t ]+([0-9]+)[\t ]*$" )
+ FILE( STRINGS ${_path} __apiFileContent REGEX "${__ndkApiLevelRegex}" )
+ if( NOT __apiFileContent )
+  message( SEND_ERROR "Could not get Android native API level. Probably you have specified invalid level value, or your copy of NDK/toolchain is broken." )
+ endif()
+ string( REGEX REPLACE "${__ndkApiLevelRegex}" "\\1" ${_var} "${__apiFileContent}" )
+ unset( __apiFileContent )
+ unset( __ndkApiLevelRegex )
+endmacro()
+
+macro( __DETECT_TOOLCHAIN_MACHINE_NAME _var _root )
+ if( EXISTS "${_root}" )
+  file( GLOB __gccExePath RELATIVE "${_root}/bin/" "${_root}/bin/*-gcc${TOOL_OS_SUFFIX}" )
+  __LIST_FILTER( __gccExePath "^[.].*" )
+  list( LENGTH __gccExePath __gccExePathsCount )
+  if( NOT __gccExePathsCount EQUAL 1  AND NOT _CMAKE_IN_TRY_COMPILE )
+   message( WARNING "Could not determine machine name for compiler from ${_root}" )
+   set( ${_var} "" )
+  else()
+   get_filename_component( __gccExeName "${__gccExePath}" NAME_WE )
+   string( REPLACE "-gcc" "" ${_var} "${__gccExeName}" )
+  endif()
+  unset( __gccExePath )
+  unset( __gccExePathsCount )
+  unset( __gccExeName )
+ else()
+  set( ${_var} "" )
+ endif()
+endmacro()
+
+
+# fight against cygwin
+set( ANDROID_FORBID_SYGWIN TRUE CACHE BOOL "Prevent cmake from working under cygwin and using cygwin tools")
+mark_as_advanced( ANDROID_FORBID_SYGWIN )
+if( ANDROID_FORBID_SYGWIN )
+ if( CYGWIN )
+  message( FATAL_ERROR "Android NDK and android-cmake toolchain are not welcome Cygwin. It is unlikely that this cmake toolchain will work under cygwin. But if you want to try then you can set cmake variable ANDROID_FORBID_SYGWIN to FALSE and rerun cmake." )
+ endif()
+
+ if( CMAKE_HOST_WIN32 )
+  # remove cygwin from PATH
+  set( __new_path "$ENV{PATH}")
+  __LIST_FILTER( __new_path "cygwin" )
+  set(ENV{PATH} "${__new_path}")
+  unset(__new_path)
+ endif()
+endif()
+
+
+# detect current host platform
+if( NOT DEFINED ANDROID_NDK_HOST_X64 AND CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "amd64|x86_64|AMD64")
+ set( ANDROID_NDK_HOST_X64 1 CACHE BOOL "Try to use 64-bit compiler toolchain" )
+ mark_as_advanced( ANDROID_NDK_HOST_X64 )
+endif()
+
+set( TOOL_OS_SUFFIX "" )
+if( CMAKE_HOST_APPLE )
+ set( ANDROID_NDK_HOST_SYSTEM_NAME "darwin-x86_64" )
+ set( ANDROID_NDK_HOST_SYSTEM_NAME2 "darwin-x86" )
+elseif( CMAKE_HOST_WIN32 )
+ set( ANDROID_NDK_HOST_SYSTEM_NAME "windows-x86_64" )
+ set( ANDROID_NDK_HOST_SYSTEM_NAME2 "windows" )
+ set( TOOL_OS_SUFFIX ".exe" )
+elseif( CMAKE_HOST_UNIX )
+ set( ANDROID_NDK_HOST_SYSTEM_NAME "linux-x86_64" )
+ set( ANDROID_NDK_HOST_SYSTEM_NAME2 "linux-x86" )
+else()
+ message( FATAL_ERROR "Cross-compilation on your platform is not supported by this cmake toolchain" )
+endif()
+
+if( NOT ANDROID_NDK_HOST_X64 )
+ set( ANDROID_NDK_HOST_SYSTEM_NAME ${ANDROID_NDK_HOST_SYSTEM_NAME2} )
+endif()
+
+# see if we have path to Android NDK
+__INIT_VARIABLE( ANDROID_NDK PATH ENV_ANDROID_NDK )
+if( NOT ANDROID_NDK )
+ # see if we have path to Android standalone toolchain
+ __INIT_VARIABLE( ANDROID_STANDALONE_TOOLCHAIN PATH ENV_ANDROID_STANDALONE_TOOLCHAIN OBSOLETE_ANDROID_NDK_TOOLCHAIN_ROOT OBSOLETE_ENV_ANDROID_NDK_TOOLCHAIN_ROOT )
+
+ if( NOT ANDROID_STANDALONE_TOOLCHAIN )
+  #try to find Android NDK in one of the the default locations
+  set( __ndkSearchPaths )
+  foreach( __ndkSearchPath ${ANDROID_NDK_SEARCH_PATHS} )
+   foreach( suffix ${ANDROID_SUPPORTED_NDK_VERSIONS} )
+    list( APPEND __ndkSearchPaths "${__ndkSearchPath}${suffix}" )
+   endforeach()
+  endforeach()
+  __INIT_VARIABLE( ANDROID_NDK PATH VALUES ${__ndkSearchPaths} )
+  unset( __ndkSearchPaths )
+
+  if( ANDROID_NDK )
+   message( STATUS "Using default path for Android NDK: ${ANDROID_NDK}" )
+   message( STATUS "  If you prefer to use a different location, please define a cmake or environment variable: ANDROID_NDK" )
+  else()
+   #try to find Android standalone toolchain in one of the the default locations
+   __INIT_VARIABLE( ANDROID_STANDALONE_TOOLCHAIN PATH ANDROID_STANDALONE_TOOLCHAIN_SEARCH_PATH )
+
+   if( ANDROID_STANDALONE_TOOLCHAIN )
+    message( STATUS "Using default path for standalone toolchain ${ANDROID_STANDALONE_TOOLCHAIN}" )
+    message( STATUS "  If you prefer to use a different location, please define the variable: ANDROID_STANDALONE_TOOLCHAIN" )
+   endif( ANDROID_STANDALONE_TOOLCHAIN )
+  endif( ANDROID_NDK )
+ endif( NOT ANDROID_STANDALONE_TOOLCHAIN )
+endif( NOT ANDROID_NDK )
+# remember found paths
+if( ANDROID_NDK )
+ get_filename_component( ANDROID_NDK "${ANDROID_NDK}" ABSOLUTE )
+ # try to detect change
+ if( CMAKE_AR )
+  string( LENGTH "${ANDROID_NDK}" __length )
+  string( SUBSTRING "${CMAKE_AR}" 0 ${__length} __androidNdkPreviousPath )
+  if( NOT __androidNdkPreviousPath STREQUAL ANDROID_NDK )
+   message( FATAL_ERROR "It is not possible to change the path to the NDK on subsequent CMake run. You must remove all generated files from your build folder first.
+   " )
+  endif()
+  unset( __androidNdkPreviousPath )
+  unset( __length )
+ endif()
+ set( ANDROID_NDK "${ANDROID_NDK}" CACHE INTERNAL "Path of the Android NDK" FORCE )
+ set( BUILD_WITH_ANDROID_NDK True )
+ file( STRINGS "${ANDROID_NDK}/RELEASE.TXT" ANDROID_NDK_RELEASE_FULL LIMIT_COUNT 1 REGEX r[0-9]+[a-z]? )
+ string( REGEX MATCH r[0-9]+[a-z]? ANDROID_NDK_RELEASE "${ANDROID_NDK_RELEASE_FULL}" )
+elseif( ANDROID_STANDALONE_TOOLCHAIN )
+ get_filename_component( ANDROID_STANDALONE_TOOLCHAIN "${ANDROID_STANDALONE_TOOLCHAIN}" ABSOLUTE )
+ # try to detect change
+ if( CMAKE_AR )
+  string( LENGTH "${ANDROID_STANDALONE_TOOLCHAIN}" __length )
+  string( SUBSTRING "${CMAKE_AR}" 0 ${__length} __androidStandaloneToolchainPreviousPath )
+  if( NOT __androidStandaloneToolchainPreviousPath STREQUAL ANDROID_STANDALONE_TOOLCHAIN )
+   message( FATAL_ERROR "It is not possible to change path to the Android standalone toolchain on subsequent run." )
+  endif()
+  unset( __androidStandaloneToolchainPreviousPath )
+  unset( __length )
+ endif()
+ set( ANDROID_STANDALONE_TOOLCHAIN "${ANDROID_STANDALONE_TOOLCHAIN}" CACHE INTERNAL "Path of the Android standalone toolchain" FORCE )
+ set( BUILD_WITH_STANDALONE_TOOLCHAIN True )
+else()
+ list(GET ANDROID_NDK_SEARCH_PATHS 0 ANDROID_NDK_SEARCH_PATH)
+ message( FATAL_ERROR "Could not find neither Android NDK nor Android standalone toolchain.
+    You should either set an environment variable:
+      export ANDROID_NDK=~/my-android-ndk
+    or
+      export ANDROID_STANDALONE_TOOLCHAIN=~/my-android-toolchain
+    or put the toolchain or NDK in the default path:
+      sudo ln -s ~/my-android-ndk ${ANDROID_NDK_SEARCH_PATH}
+      sudo ln -s ~/my-android-toolchain ${ANDROID_STANDALONE_TOOLCHAIN_SEARCH_PATH}" )
+endif()
+
+# get all the details about standalone toolchain
+if( BUILD_WITH_STANDALONE_TOOLCHAIN )
+ __DETECT_NATIVE_API_LEVEL( ANDROID_SUPPORTED_NATIVE_API_LEVELS "${ANDROID_STANDALONE_TOOLCHAIN}/sysroot/usr/include/android/api-level.h" )
+ set( ANDROID_STANDALONE_TOOLCHAIN_API_LEVEL ${ANDROID_SUPPORTED_NATIVE_API_LEVELS} )
+ set( __availableToolchains "standalone" )
+ __DETECT_TOOLCHAIN_MACHINE_NAME( __availableToolchainMachines "${ANDROID_STANDALONE_TOOLCHAIN}" )
+ if( NOT __availableToolchainMachines )
+  message( FATAL_ERROR "Could not determine machine name of your toolchain. Probably your Android standalone toolchain is broken." )
+ endif()
+ if( __availableToolchainMachines MATCHES i686 )
+  set( __availableToolchainArchs "x86" )
+ elseif( __availableToolchainMachines MATCHES arm )
+  set( __availableToolchainArchs "arm" )
+ elseif( __availableToolchainMachines MATCHES mipsel )
+  set( __availableToolchainArchs "mipsel" )
+ endif()
+ execute_process( COMMAND "${ANDROID_STANDALONE_TOOLCHAIN}/bin/${__availableToolchainMachines}-gcc${TOOL_OS_SUFFIX}" -dumpversion
+                  OUTPUT_VARIABLE __availableToolchainCompilerVersions OUTPUT_STRIP_TRAILING_WHITESPACE )
+ string( REGEX MATCH "[0-9]+[.][0-9]+([.][0-9]+)?" __availableToolchainCompilerVersions "${__availableToolchainCompilerVersions}" )
+ if( EXISTS "${ANDROID_STANDALONE_TOOLCHAIN}/bin/clang${TOOL_OS_SUFFIX}" )
+  list( APPEND __availableToolchains "standalone-clang" )
+  list( APPEND __availableToolchainMachines ${__availableToolchainMachines} )
+  list( APPEND __availableToolchainArchs ${__availableToolchainArchs} )
+  list( APPEND __availableToolchainCompilerVersions ${__availableToolchainCompilerVersions} )
+ endif()
+endif()
+
+macro( __GLOB_NDK_TOOLCHAINS __availableToolchainsVar __availableToolchainsLst __host_system_name )
+ foreach( __toolchain ${${__availableToolchainsLst}} )
+  if( "${__toolchain}" MATCHES "-clang3[.][0-9]$" AND NOT EXISTS "${ANDROID_NDK}/toolchains/${__toolchain}/prebuilt/" )
+   string( REGEX REPLACE "-clang3[.][0-9]$" "-4.6" __gcc_toolchain "${__toolchain}" )
+  else()
+   set( __gcc_toolchain "${__toolchain}" )
+  endif()
+  __DETECT_TOOLCHAIN_MACHINE_NAME( __machine "${ANDROID_NDK}/toolchains/${__gcc_toolchain}/prebuilt/${__host_system_name}" )
+  if( __machine )
+   string( REGEX MATCH "[0-9]+[.][0-9]+([.][0-9]+)?$" __version "${__gcc_toolchain}" )
+   string( REGEX MATCH "^[^-]+" __arch "${__gcc_toolchain}" )
+   list( APPEND __availableToolchainMachines "${__machine}" )
+   list( APPEND __availableToolchainArchs "${__arch}" )
+   list( APPEND __availableToolchainCompilerVersions "${__version}" )
+   list( APPEND ${__availableToolchainsVar} "${__toolchain}" )
+  endif()
+  unset( __gcc_toolchain )
+ endforeach()
+endmacro()
+
+# get all the details about NDK
+if( BUILD_WITH_ANDROID_NDK )
+ file( GLOB ANDROID_SUPPORTED_NATIVE_API_LEVELS RELATIVE "${ANDROID_NDK}/platforms" "${ANDROID_NDK}/platforms/android-*" )
+ string( REPLACE "android-" "" ANDROID_SUPPORTED_NATIVE_API_LEVELS "${ANDROID_SUPPORTED_NATIVE_API_LEVELS}" )
+ set( __availableToolchains "" )
+ set( __availableToolchainMachines "" )
+ set( __availableToolchainArchs "" )
+ set( __availableToolchainCompilerVersions "" )
+ if( ANDROID_TOOLCHAIN_NAME AND EXISTS "${ANDROID_NDK}/toolchains/${ANDROID_TOOLCHAIN_NAME}/" )
+  # do not go through all toolchains if we know the name
+  set( __availableToolchainsLst "${ANDROID_TOOLCHAIN_NAME}" )
+  __GLOB_NDK_TOOLCHAINS( __availableToolchains __availableToolchainsLst ${ANDROID_NDK_HOST_SYSTEM_NAME} )
+  if( NOT __availableToolchains AND NOT ANDROID_NDK_HOST_SYSTEM_NAME STREQUAL ANDROID_NDK_HOST_SYSTEM_NAME2 )
+   __GLOB_NDK_TOOLCHAINS( __availableToolchains __availableToolchainsLst ${ANDROID_NDK_HOST_SYSTEM_NAME2} )
+   if( __availableToolchains )
+    set( ANDROID_NDK_HOST_SYSTEM_NAME ${ANDROID_NDK_HOST_SYSTEM_NAME2} )
+   endif()
+  endif()
+ endif()
+ if( NOT __availableToolchains )
+  file( GLOB __availableToolchainsLst RELATIVE "${ANDROID_NDK}/toolchains" "${ANDROID_NDK}/toolchains/*" )
+  if( __availableToolchains )
+   list(SORT __availableToolchainsLst) # we need clang to go after gcc
+  endif()
+  __LIST_FILTER( __availableToolchainsLst "^[.]" )
+  __LIST_FILTER( __availableToolchainsLst "llvm" )
+  __GLOB_NDK_TOOLCHAINS( __availableToolchains __availableToolchainsLst ${ANDROID_NDK_HOST_SYSTEM_NAME} )
+  if( NOT __availableToolchains AND NOT ANDROID_NDK_HOST_SYSTEM_NAME STREQUAL ANDROID_NDK_HOST_SYSTEM_NAME2 )
+   __GLOB_NDK_TOOLCHAINS( __availableToolchains __availableToolchainsLst ${ANDROID_NDK_HOST_SYSTEM_NAME2} )
+   if( __availableToolchains )
+    set( ANDROID_NDK_HOST_SYSTEM_NAME ${ANDROID_NDK_HOST_SYSTEM_NAME2} )
+   endif()
+  endif()
+ endif()
+ if( NOT __availableToolchains )
+  message( FATAL_ERROR "Could not find any working toolchain in the NDK. Probably your Android NDK is broken." )
+ endif()
+endif()
+
+# build list of available ABIs
+set( ANDROID_SUPPORTED_ABIS "" )
+set( __uniqToolchainArchNames ${__availableToolchainArchs} )
+list( REMOVE_DUPLICATES __uniqToolchainArchNames )
+list( SORT __uniqToolchainArchNames )
+foreach( __arch ${__uniqToolchainArchNames} )
+ list( APPEND ANDROID_SUPPORTED_ABIS ${ANDROID_SUPPORTED_ABIS_${__arch}} )
+endforeach()
+unset( __uniqToolchainArchNames )
+if( NOT ANDROID_SUPPORTED_ABIS )
+ message( FATAL_ERROR "No one of known Android ABIs is supported by this cmake toolchain." )
+endif()
+
+# choose target ABI
+__INIT_VARIABLE( ANDROID_ABI OBSOLETE_ARM_TARGET OBSOLETE_ARM_TARGETS VALUES ${ANDROID_SUPPORTED_ABIS} )
+# verify that target ABI is supported
+list( FIND ANDROID_SUPPORTED_ABIS "${ANDROID_ABI}" __androidAbiIdx )
+if( __androidAbiIdx EQUAL -1 )
+ string( REPLACE ";" "\", \"", PRINTABLE_ANDROID_SUPPORTED_ABIS  "${ANDROID_SUPPORTED_ABIS}" )
+ message( FATAL_ERROR "Specified ANDROID_ABI = \"${ANDROID_ABI}\" is not supported by this cmake toolchain or your NDK/toolchain.
+   Supported values are: \"${PRINTABLE_ANDROID_SUPPORTED_ABIS}\"
+   " )
+endif()
+unset( __androidAbiIdx )
+
+# set target ABI options
+if( ANDROID_ABI STREQUAL "x86" )
+ set( X86 true )
+ set( ANDROID_NDK_ABI_NAME "x86" )
+ set( ANDROID_ARCH_NAME "x86" )
+ set( ANDROID_ARCH_FULLNAME "x86" )
+ set( ANDROID_LLVM_TRIPLE "i686-none-linux-android" )
+ set( CMAKE_SYSTEM_PROCESSOR "i686" )
+elseif( ANDROID_ABI STREQUAL "mips" )
+ set( MIPS true )
+ set( ANDROID_NDK_ABI_NAME "mips" )
+ set( ANDROID_ARCH_NAME "mips" )
+ set( ANDROID_ARCH_FULLNAME "mipsel" )
+ set( ANDROID_LLVM_TRIPLE "mipsel-none-linux-android" )
+ set( CMAKE_SYSTEM_PROCESSOR "mips" )
+elseif( ANDROID_ABI STREQUAL "armeabi" )
+ set( ARMEABI true )
+ set( ANDROID_NDK_ABI_NAME "armeabi" )
+ set( ANDROID_ARCH_NAME "arm" )
+ set( ANDROID_ARCH_FULLNAME "arm" )
+ set( ANDROID_LLVM_TRIPLE "armv5te-none-linux-androideabi" )
+ set( CMAKE_SYSTEM_PROCESSOR "armv5te" )
+elseif( ANDROID_ABI STREQUAL "armeabi-v6 with VFP" )
+ set( ARMEABI_V6 true )
+ set( ANDROID_NDK_ABI_NAME "armeabi" )
+ set( ANDROID_ARCH_NAME "arm" )
+ set( ANDROID_ARCH_FULLNAME "arm" )
+ set( ANDROID_LLVM_TRIPLE "armv5te-none-linux-androideabi" )
+ set( CMAKE_SYSTEM_PROCESSOR "armv6" )
+ # need always fallback to older platform
+ set( ARMEABI true )
+elseif( ANDROID_ABI STREQUAL "armeabi-v7a")
+ set( ARMEABI_V7A true )
+ set( ANDROID_NDK_ABI_NAME "armeabi-v7a" )
+ set( ANDROID_ARCH_NAME "arm" )
+ set( ANDROID_ARCH_FULLNAME "arm" )
+ set( ANDROID_LLVM_TRIPLE "armv7-none-linux-androideabi" )
+ set( CMAKE_SYSTEM_PROCESSOR "armv7-a" )
+elseif( ANDROID_ABI STREQUAL "armeabi-v7a with VFPV3" )
+ set( ARMEABI_V7A true )
+ set( ANDROID_NDK_ABI_NAME "armeabi-v7a" )
+ set( ANDROID_ARCH_NAME "arm" )
+ set( ANDROID_ARCH_FULLNAME "arm" )
+ set( ANDROID_LLVM_TRIPLE "armv7-none-linux-androideabi" )
+ set( CMAKE_SYSTEM_PROCESSOR "armv7-a" )
+ set( VFPV3 true )
+elseif( ANDROID_ABI STREQUAL "armeabi-v7a with NEON" )
+ set( ARMEABI_V7A true )
+ set( ANDROID_NDK_ABI_NAME "armeabi-v7a" )
+ set( ANDROID_ARCH_NAME "arm" )
+ set( ANDROID_ARCH_FULLNAME "arm" )
+ set( ANDROID_LLVM_TRIPLE "armv7-none-linux-androideabi" )
+ set( CMAKE_SYSTEM_PROCESSOR "armv7-a" )
+ set( VFPV3 true )
+ set( NEON true )
+else()
+ message( SEND_ERROR "Unknown ANDROID_ABI=\"${ANDROID_ABI}\" is specified." )
+endif()
+
+if( CMAKE_BINARY_DIR AND EXISTS "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeSystem.cmake" )
+ # really dirty hack
+ # it is not possible to change CMAKE_SYSTEM_PROCESSOR after the first run...
+ file( APPEND "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeSystem.cmake" "SET(CMAKE_SYSTEM_PROCESSOR \"${CMAKE_SYSTEM_PROCESSOR}\")\n" )
+endif()
+
+if( ANDROID_ARCH_NAME STREQUAL "arm" AND NOT ARMEABI_V6 )
+ __INIT_VARIABLE( ANDROID_FORCE_ARM_BUILD OBSOLETE_FORCE_ARM VALUES OFF )
+ set( ANDROID_FORCE_ARM_BUILD ${ANDROID_FORCE_ARM_BUILD} CACHE BOOL "Use 32-bit ARM instructions instead of Thumb-1" FORCE )
+ mark_as_advanced( ANDROID_FORCE_ARM_BUILD )
+else()
+ unset( ANDROID_FORCE_ARM_BUILD CACHE )
+endif()
+
+# choose toolchain
+if( ANDROID_TOOLCHAIN_NAME )
+ list( FIND __availableToolchains "${ANDROID_TOOLCHAIN_NAME}" __toolchainIdx )
+ if( __toolchainIdx EQUAL -1 )
+  list( SORT __availableToolchains )
+  string( REPLACE ";" "\n  * " toolchains_list "${__availableToolchains}" )
+  set( toolchains_list "  * ${toolchains_list}")
+  message( FATAL_ERROR "Specified toolchain \"${ANDROID_TOOLCHAIN_NAME}\" is missing in your NDK or broken. Please verify that your NDK is working or select another compiler toolchain.
+To configure the toolchain set CMake variable ANDROID_TOOLCHAIN_NAME to one of the following values:\n${toolchains_list}\n" )
+ endif()
+ list( GET __availableToolchainArchs ${__toolchainIdx} __toolchainArch )
+ if( NOT __toolchainArch STREQUAL ANDROID_ARCH_FULLNAME )
+  message( SEND_ERROR "Selected toolchain \"${ANDROID_TOOLCHAIN_NAME}\" is not able to compile binaries for the \"${ANDROID_ARCH_NAME}\" platform." )
+ endif()
+else()
+ set( __toolchainIdx -1 )
+ set( __applicableToolchains "" )
+ set( __toolchainMaxVersion "0.0.0" )
+ list( LENGTH __availableToolchains __availableToolchainsCount )
+ math( EXPR __availableToolchainsCount "${__availableToolchainsCount}-1" )
+ foreach( __idx RANGE ${__availableToolchainsCount} )
+  list( GET __availableToolchainArchs ${__idx} __toolchainArch )
+  if( __toolchainArch STREQUAL ANDROID_ARCH_FULLNAME )
+   list( GET __availableToolchainCompilerVersions ${__idx} __toolchainVersion )
+   if( __toolchainVersion VERSION_GREATER __toolchainMaxVersion )
+    set( __toolchainMaxVersion "${__toolchainVersion}" )
+    set( __toolchainIdx ${__idx} )
+   endif()
+  endif()
+ endforeach()
+ unset( __availableToolchainsCount )
+ unset( __toolchainMaxVersion )
+ unset( __toolchainVersion )
+endif()
+unset( __toolchainArch )
+if( __toolchainIdx EQUAL -1 )
+ message( FATAL_ERROR "No one of available compiler toolchains is able to compile for ${ANDROID_ARCH_NAME} platform." )
+endif()
+list( GET __availableToolchains ${__toolchainIdx} ANDROID_TOOLCHAIN_NAME )
+list( GET __availableToolchainMachines ${__toolchainIdx} ANDROID_TOOLCHAIN_MACHINE_NAME )
+list( GET __availableToolchainCompilerVersions ${__toolchainIdx} ANDROID_COMPILER_VERSION )
+
+unset( __toolchainIdx )
+unset( __availableToolchains )
+unset( __availableToolchainMachines )
+unset( __availableToolchainArchs )
+unset( __availableToolchainCompilerVersions )
+
+# choose native API level
+__INIT_VARIABLE( ANDROID_NATIVE_API_LEVEL ENV_ANDROID_NATIVE_API_LEVEL ANDROID_API_LEVEL ENV_ANDROID_API_LEVEL ANDROID_STANDALONE_TOOLCHAIN_API_LEVEL ANDROID_DEFAULT_NDK_API_LEVEL_${ANDROID_ARCH_NAME} ANDROID_DEFAULT_NDK_API_LEVEL )
+string( REGEX MATCH "[0-9]+" ANDROID_NATIVE_API_LEVEL "${ANDROID_NATIVE_API_LEVEL}" )
+# adjust API level
+set( __real_api_level ${ANDROID_DEFAULT_NDK_API_LEVEL_${ANDROID_ARCH_NAME}} )
+foreach( __level ${ANDROID_SUPPORTED_NATIVE_API_LEVELS} )
+ if( NOT __level GREATER ANDROID_NATIVE_API_LEVEL AND NOT __level LESS __real_api_level )
+  set( __real_api_level ${__level} )
+ endif()
+endforeach()
+if( __real_api_level AND NOT ANDROID_NATIVE_API_LEVEL EQUAL __real_api_level )
+ message( STATUS "Adjusting Android API level 'android-${ANDROID_NATIVE_API_LEVEL}' to 'android-${__real_api_level}'")
+ set( ANDROID_NATIVE_API_LEVEL ${__real_api_level} )
+endif()
+unset(__real_api_level)
+# validate
+list( FIND ANDROID_SUPPORTED_NATIVE_API_LEVELS "${ANDROID_NATIVE_API_LEVEL}" __levelIdx )
+if( __levelIdx EQUAL -1 )
+ message( SEND_ERROR "Specified Android native API level 'android-${ANDROID_NATIVE_API_LEVEL}' is not supported by your NDK/toolchain." )
+else()
+ if( BUILD_WITH_ANDROID_NDK )
+  __DETECT_NATIVE_API_LEVEL( __realApiLevel "${ANDROID_NDK}/platforms/android-${ANDROID_NATIVE_API_LEVEL}/arch-${ANDROID_ARCH_NAME}/usr/include/android/api-level.h" )
+  if( NOT __realApiLevel EQUAL ANDROID_NATIVE_API_LEVEL )
+   message( SEND_ERROR "Specified Android API level (${ANDROID_NATIVE_API_LEVEL}) does not match to the level found (${__realApiLevel}). Probably your copy of NDK is broken." )
+  endif()
+  unset( __realApiLevel )
+ endif()
+ set( ANDROID_NATIVE_API_LEVEL "${ANDROID_NATIVE_API_LEVEL}" CACHE STRING "Android API level for native code" FORCE )
+ if( CMAKE_VERSION VERSION_GREATER "2.8" )
+  list( SORT ANDROID_SUPPORTED_NATIVE_API_LEVELS )
+  set_property( CACHE ANDROID_NATIVE_API_LEVEL PROPERTY STRINGS ${ANDROID_SUPPORTED_NATIVE_API_LEVELS} )
+ endif()
+endif()
+unset( __levelIdx )
+
+
+# remember target ABI
+set( ANDROID_ABI "${ANDROID_ABI}" CACHE STRING "The target ABI for Android. If arm, then armeabi-v7a is recommended for hardware floating point." FORCE )
+if( CMAKE_VERSION VERSION_GREATER "2.8" )
+ list( SORT ANDROID_SUPPORTED_ABIS_${ANDROID_ARCH_FULLNAME} )
+ set_property( CACHE ANDROID_ABI PROPERTY STRINGS ${ANDROID_SUPPORTED_ABIS_${ANDROID_ARCH_FULLNAME}} )
+endif()
+
+
+# runtime choice (STL, rtti, exceptions)
+if( NOT ANDROID_STL )
+ # honor legacy ANDROID_USE_STLPORT
+ if( DEFINED ANDROID_USE_STLPORT )
+  if( ANDROID_USE_STLPORT )
+   set( ANDROID_STL stlport_static )
+  endif()
+  message( WARNING "You are using an obsolete variable ANDROID_USE_STLPORT to select the STL variant. Use -DANDROID_STL=stlport_static instead." )
+ endif()
+ if( NOT ANDROID_STL )
+  set( ANDROID_STL gnustl_static )
+ endif()
+endif()
+set( ANDROID_STL "${ANDROID_STL}" CACHE STRING "C++ runtime" )
+set( ANDROID_STL_FORCE_FEATURES ON CACHE BOOL "automatically configure rtti and exceptions support based on C++ runtime" )
+mark_as_advanced( ANDROID_STL ANDROID_STL_FORCE_FEATURES )
+
+if( BUILD_WITH_ANDROID_NDK )
+ if( NOT "${ANDROID_STL}" MATCHES "^(none|system|system_re|gabi\\+\\+_static|gabi\\+\\+_shared|stlport_static|stlport_shared|gnustl_static|gnustl_shared)$")
+  message( FATAL_ERROR "ANDROID_STL is set to invalid value \"${ANDROID_STL}\".
+The possible values are:
+  none           -> Do not configure the runtime.
+  system         -> Use the default minimal system C++ runtime library.
+  system_re      -> Same as system but with rtti and exceptions.
+  gabi++_static  -> Use the GAbi++ runtime as a static library.
+  gabi++_shared  -> Use the GAbi++ runtime as a shared library.
+  stlport_static -> Use the STLport runtime as a static library.
+  stlport_shared -> Use the STLport runtime as a shared library.
+  gnustl_static  -> (default) Use the GNU STL as a static library.
+  gnustl_shared  -> Use the GNU STL as a shared library.
+" )
+ endif()
+elseif( BUILD_WITH_STANDALONE_TOOLCHAIN )
+ if( NOT "${ANDROID_STL}" MATCHES "^(none|gnustl_static|gnustl_shared)$")
+  message( FATAL_ERROR "ANDROID_STL is set to invalid value \"${ANDROID_STL}\".
+The possible values are:
+  none           -> Do not configure the runtime.
+  gnustl_static  -> (default) Use the GNU STL as a static library.
+  gnustl_shared  -> Use the GNU STL as a shared library.
+" )
+ endif()
+endif()
+
+unset( ANDROID_RTTI )
+unset( ANDROID_EXCEPTIONS )
+unset( ANDROID_STL_INCLUDE_DIRS )
+unset( __libstl )
+unset( __libsupcxx )
+
+if( NOT _CMAKE_IN_TRY_COMPILE AND ANDROID_NDK_RELEASE STREQUAL "r7b" AND ARMEABI_V7A AND NOT VFPV3 AND ANDROID_STL MATCHES "gnustl" )
+ message( WARNING  "The GNU STL armeabi-v7a binaries from NDK r7b can crash non-NEON devices. The files provided with NDK r7b were not configured properly, resulting in crashes on Tegra2-based devices and others when trying to use certain floating-point functions (e.g., cosf, sinf, expf).
+You are strongly recommended to switch to another NDK release.
+" )
+endif()
+
+if( NOT _CMAKE_IN_TRY_COMPILE AND X86 AND ANDROID_STL MATCHES "gnustl" AND ANDROID_NDK_RELEASE STREQUAL "r6" )
+  message( WARNING  "The x86 system header file from NDK r6 has incorrect definition for ptrdiff_t. You are recommended to upgrade to a newer NDK release or manually patch the header:
+See https://android.googlesource.com/platform/development.git f907f4f9d4e56ccc8093df6fee54454b8bcab6c2
+  diff --git a/ndk/platforms/android-9/arch-x86/include/machine/_types.h b/ndk/platforms/android-9/arch-x86/include/machine/_types.h
+  index 5e28c64..65892a1 100644
+  --- a/ndk/platforms/android-9/arch-x86/include/machine/_types.h
+  +++ b/ndk/platforms/android-9/arch-x86/include/machine/_types.h
+  @@ -51,7 +51,11 @@ typedef long int       ssize_t;
+   #endif
+   #ifndef _PTRDIFF_T
+   #define _PTRDIFF_T
+  -typedef long           ptrdiff_t;
+  +#  ifdef __ANDROID__
+  +     typedef int            ptrdiff_t;
+  +#  else
+  +     typedef long           ptrdiff_t;
+  +#  endif
+   #endif
+" )
+endif()
+
+
+# setup paths and STL for standalone toolchain
+if( BUILD_WITH_STANDALONE_TOOLCHAIN )
+ set( ANDROID_TOOLCHAIN_ROOT "${ANDROID_STANDALONE_TOOLCHAIN}" )
+ set( ANDROID_CLANG_TOOLCHAIN_ROOT "${ANDROID_STANDALONE_TOOLCHAIN}" )
+ set( ANDROID_SYSROOT "${ANDROID_STANDALONE_TOOLCHAIN}/sysroot" )
+
+ if( NOT ANDROID_STL STREQUAL "none" )
+  set( ANDROID_STL_INCLUDE_DIRS "${ANDROID_STANDALONE_TOOLCHAIN}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/include/c++/${ANDROID_COMPILER_VERSION}" )
+  if( ARMEABI_V7A AND EXISTS "${ANDROID_STL_INCLUDE_DIRS}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/${CMAKE_SYSTEM_PROCESSOR}/bits" )
+   list( APPEND ANDROID_STL_INCLUDE_DIRS "${ANDROID_STL_INCLUDE_DIRS}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/${CMAKE_SYSTEM_PROCESSOR}" )
+  elseif( ARMEABI AND NOT ANDROID_FORCE_ARM_BUILD AND EXISTS "${ANDROID_STL_INCLUDE_DIRS}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/thumb/bits" )
+   list( APPEND ANDROID_STL_INCLUDE_DIRS "${ANDROID_STL_INCLUDE_DIRS}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/thumb" )
+  else()
+   list( APPEND ANDROID_STL_INCLUDE_DIRS "${ANDROID_STL_INCLUDE_DIRS}/${ANDROID_TOOLCHAIN_MACHINE_NAME}" )
+  endif()
+  # always search static GNU STL to get the location of libsupc++.a
+  if( ARMEABI_V7A AND NOT ANDROID_FORCE_ARM_BUILD AND EXISTS "${ANDROID_STANDALONE_TOOLCHAIN}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/lib/${CMAKE_SYSTEM_PROCESSOR}/thumb/libstdc++.a" )
+   set( __libstl "${ANDROID_STANDALONE_TOOLCHAIN}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/lib/${CMAKE_SYSTEM_PROCESSOR}/thumb" )
+  elseif( ARMEABI_V7A AND EXISTS "${ANDROID_STANDALONE_TOOLCHAIN}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/lib/${CMAKE_SYSTEM_PROCESSOR}/libstdc++.a" )
+   set( __libstl "${ANDROID_STANDALONE_TOOLCHAIN}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/lib/${CMAKE_SYSTEM_PROCESSOR}" )
+  elseif( ARMEABI AND NOT ANDROID_FORCE_ARM_BUILD AND EXISTS "${ANDROID_STANDALONE_TOOLCHAIN}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/lib/thumb/libstdc++.a" )
+   set( __libstl "${ANDROID_STANDALONE_TOOLCHAIN}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/lib/thumb" )
+  elseif( EXISTS "${ANDROID_STANDALONE_TOOLCHAIN}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/lib/libstdc++.a" )
+   set( __libstl "${ANDROID_STANDALONE_TOOLCHAIN}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/lib" )
+  endif()
+  if( __libstl )
+   set( __libsupcxx "${__libstl}/libsupc++.a" )
+   set( __libstl    "${__libstl}/libstdc++.a" )
+  endif()
+  if( NOT EXISTS "${__libsupcxx}" )
+   message( FATAL_ERROR "The required libstdsupc++.a is missing in your standalone toolchain.
+ Usually it happens because of bug in make-standalone-toolchain.sh script from NDK r7, r7b and r7c.
+ You need to either upgrade to newer NDK or manually copy
+     $ANDROID_NDK/sources/cxx-stl/gnu-libstdc++/libs/${ANDROID_NDK_ABI_NAME}/libsupc++.a
+ to
+     ${__libsupcxx}
+   " )
+  endif()
+  if( ANDROID_STL STREQUAL "gnustl_shared" )
+   if( ARMEABI_V7A AND EXISTS "${ANDROID_STANDALONE_TOOLCHAIN}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/lib/${CMAKE_SYSTEM_PROCESSOR}/libgnustl_shared.so" )
+    set( __libstl "${ANDROID_STANDALONE_TOOLCHAIN}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/lib/${CMAKE_SYSTEM_PROCESSOR}/libgnustl_shared.so" )
+   elseif( ARMEABI AND NOT ANDROID_FORCE_ARM_BUILD AND EXISTS "${ANDROID_STANDALONE_TOOLCHAIN}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/lib/thumb/libgnustl_shared.so" )
+    set( __libstl "${ANDROID_STANDALONE_TOOLCHAIN}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/lib/thumb/libgnustl_shared.so" )
+   elseif( EXISTS "${ANDROID_STANDALONE_TOOLCHAIN}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/lib/libgnustl_shared.so" )
+    set( __libstl "${ANDROID_STANDALONE_TOOLCHAIN}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/lib/libgnustl_shared.so" )
+   endif()
+  endif()
+ endif()
+endif()
+
+# clang
+if( "${ANDROID_TOOLCHAIN_NAME}" STREQUAL "standalone-clang" )
+ set( ANDROID_COMPILER_IS_CLANG 1 )
+ execute_process( COMMAND "${ANDROID_CLANG_TOOLCHAIN_ROOT}/bin/clang${TOOL_OS_SUFFIX}" --version OUTPUT_VARIABLE ANDROID_CLANG_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE )
+ string( REGEX MATCH "[0-9]+[.][0-9]+" ANDROID_CLANG_VERSION "${ANDROID_CLANG_VERSION}")
+elseif( "${ANDROID_TOOLCHAIN_NAME}" MATCHES "-clang3[.][0-9]?$" )
+ string( REGEX MATCH "3[.][0-9]$" ANDROID_CLANG_VERSION "${ANDROID_TOOLCHAIN_NAME}")
+ string( REGEX REPLACE "-clang${ANDROID_CLANG_VERSION}$" "-4.6" ANDROID_GCC_TOOLCHAIN_NAME "${ANDROID_TOOLCHAIN_NAME}" )
+ if( NOT EXISTS "${ANDROID_NDK}/toolchains/llvm-${ANDROID_CLANG_VERSION}/prebuilt/${ANDROID_NDK_HOST_SYSTEM_NAME}/bin/clang${TOOL_OS_SUFFIX}" )
+  message( FATAL_ERROR "Could not find the Clang compiler driver" )
+ endif()
+ set( ANDROID_COMPILER_IS_CLANG 1 )
+ set( ANDROID_CLANG_TOOLCHAIN_ROOT "${ANDROID_NDK}/toolchains/llvm-${ANDROID_CLANG_VERSION}/prebuilt/${ANDROID_NDK_HOST_SYSTEM_NAME}" )
+else()
+ set( ANDROID_GCC_TOOLCHAIN_NAME "${ANDROID_TOOLCHAIN_NAME}" )
+ unset( ANDROID_COMPILER_IS_CLANG CACHE )
+endif()
+
+string( REPLACE "." "" _clang_name "clang${ANDROID_CLANG_VERSION}" )
+if( NOT EXISTS "${ANDROID_CLANG_TOOLCHAIN_ROOT}/bin/${_clang_name}${TOOL_OS_SUFFIX}" )
+ set( _clang_name "clang" )
+endif()
+
+
+# setup paths and STL for NDK
+if( BUILD_WITH_ANDROID_NDK )
+ set( ANDROID_TOOLCHAIN_ROOT "${ANDROID_NDK}/toolchains/${ANDROID_GCC_TOOLCHAIN_NAME}/prebuilt/${ANDROID_NDK_HOST_SYSTEM_NAME}" )
+ set( ANDROID_SYSROOT "${ANDROID_NDK}/platforms/android-${ANDROID_NATIVE_API_LEVEL}/arch-${ANDROID_ARCH_NAME}" )
+
+ if( ANDROID_STL STREQUAL "none" )
+  # do nothing
+ elseif( ANDROID_STL STREQUAL "system" )
+  set( ANDROID_RTTI             OFF )
+  set( ANDROID_EXCEPTIONS       OFF )
+  set( ANDROID_STL_INCLUDE_DIRS "${ANDROID_NDK}/sources/cxx-stl/system/include" )
+ elseif( ANDROID_STL STREQUAL "system_re" )
+  set( ANDROID_RTTI             ON )
+  set( ANDROID_EXCEPTIONS       ON )
+  set( ANDROID_STL_INCLUDE_DIRS "${ANDROID_NDK}/sources/cxx-stl/system/include" )
+ elseif( ANDROID_STL MATCHES "gabi" )
+  if( ANDROID_NDK_RELEASE STRLESS "r7" )
+   message( FATAL_ERROR "gabi++ is not awailable in your NDK. You have to upgrade to NDK r7 or newer to use gabi++.")
+  endif()
+  set( ANDROID_RTTI             ON )
+  set( ANDROID_EXCEPTIONS       OFF )
+  set( ANDROID_STL_INCLUDE_DIRS "${ANDROID_NDK}/sources/cxx-stl/gabi++/include" )
+  set( __libstl                 "${ANDROID_NDK}/sources/cxx-stl/gabi++/libs/${ANDROID_NDK_ABI_NAME}/libgabi++_static.a" )
+ elseif( ANDROID_STL MATCHES "stlport" )
+  if( NOT ANDROID_NDK_RELEASE STRLESS "r8d" )
+   set( ANDROID_EXCEPTIONS       ON )
+  else()
+   set( ANDROID_EXCEPTIONS       OFF )
+  endif()
+  if( ANDROID_NDK_RELEASE STRLESS "r7" )
+   set( ANDROID_RTTI            OFF )
+  else()
+   set( ANDROID_RTTI            ON )
+  endif()
+  set( ANDROID_STL_INCLUDE_DIRS "${ANDROID_NDK}/sources/cxx-stl/stlport/stlport" )
+  set( __libstl                 "${ANDROID_NDK}/sources/cxx-stl/stlport/libs/${ANDROID_NDK_ABI_NAME}/libstlport_static.a" )
+ elseif( ANDROID_STL MATCHES "gnustl" )
+  set( ANDROID_EXCEPTIONS       ON )
+  set( ANDROID_RTTI             ON )
+  if( EXISTS "${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++/${ANDROID_COMPILER_VERSION}" )
+   if( ARMEABI_V7A AND ANDROID_COMPILER_VERSION VERSION_EQUAL "4.7" AND ANDROID_NDK_RELEASE STREQUAL "r8d" )
+    # gnustl binary for 4.7 compiler is buggy :(
+    # TODO: look for right fix
+    set( __libstl                "${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++/4.6" )
+   else()
+    set( __libstl                "${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++/${ANDROID_COMPILER_VERSION}" )
+   endif()
+  else()
+   set( __libstl                "${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++" )
+  endif()
+  set( ANDROID_STL_INCLUDE_DIRS "${__libstl}/include" "${__libstl}/libs/${ANDROID_NDK_ABI_NAME}/include" )
+  if( EXISTS "${__libstl}/libs/${ANDROID_NDK_ABI_NAME}/libgnustl_static.a" )
+   set( __libstl                "${__libstl}/libs/${ANDROID_NDK_ABI_NAME}/libgnustl_static.a" )
+  else()
+   set( __libstl                "${__libstl}/libs/${ANDROID_NDK_ABI_NAME}/libstdc++.a" )
+  endif()
+ else()
+  message( FATAL_ERROR "Unknown runtime: ${ANDROID_STL}" )
+ endif()
+ # find libsupc++.a - rtti & exceptions
+ if( ANDROID_STL STREQUAL "system_re" OR ANDROID_STL MATCHES "gnustl" )
+  if( ANDROID_NDK_RELEASE STRGREATER "r8" ) # r8b
+   set( __libsupcxx "${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++/${ANDROID_COMPILER_VERSION}/libs/${ANDROID_NDK_ABI_NAME}/libsupc++.a" )
+  elseif( NOT ANDROID_NDK_RELEASE STRLESS "r7" AND ANDROID_NDK_RELEASE STRLESS "r8b")
+   set( __libsupcxx "${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++/libs/${ANDROID_NDK_ABI_NAME}/libsupc++.a" )
+  else( ANDROID_NDK_RELEASE STRLESS "r7" )
+   if( ARMEABI_V7A )
+    if( ANDROID_FORCE_ARM_BUILD )
+     set( __libsupcxx "${ANDROID_TOOLCHAIN_ROOT}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/lib/${CMAKE_SYSTEM_PROCESSOR}/libsupc++.a" )
+    else()
+     set( __libsupcxx "${ANDROID_TOOLCHAIN_ROOT}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/lib/${CMAKE_SYSTEM_PROCESSOR}/thumb/libsupc++.a" )
+    endif()
+   elseif( ARMEABI AND NOT ANDROID_FORCE_ARM_BUILD )
+    set( __libsupcxx "${ANDROID_TOOLCHAIN_ROOT}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/lib/thumb/libsupc++.a" )
+   else()
+    set( __libsupcxx "${ANDROID_TOOLCHAIN_ROOT}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/lib/libsupc++.a" )
+   endif()
+  endif()
+  if( NOT EXISTS "${__libsupcxx}")
+   message( ERROR "Could not find libsupc++.a for a chosen platform. Either your NDK is not supported or is broken.")
+  endif()
+ endif()
+endif()
+
+
+# case of shared STL linkage
+if( ANDROID_STL MATCHES "shared" AND DEFINED __libstl )
+ string( REPLACE "_static.a" "_shared.so" __libstl "${__libstl}" )
+ if( NOT _CMAKE_IN_TRY_COMPILE AND __libstl MATCHES "[.]so$" )
+  get_filename_component( __libstlname "${__libstl}" NAME )
+  execute_process( COMMAND "${CMAKE_COMMAND}" -E copy_if_different "${__libstl}" "${LIBRARY_OUTPUT_PATH}/${__libstlname}" RESULT_VARIABLE __fileCopyProcess )
+  if( NOT __fileCopyProcess EQUAL 0 OR NOT EXISTS "${LIBRARY_OUTPUT_PATH}/${__libstlname}")
+   message( SEND_ERROR "Failed copying of ${__libstl} to the ${LIBRARY_OUTPUT_PATH}/${__libstlname}" )
+  endif()
+  unset( __fileCopyProcess )
+  unset( __libstlname )
+ endif()
+endif()
+
+
+# ccache support
+__INIT_VARIABLE( _ndk_ccache NDK_CCACHE ENV_NDK_CCACHE )
+if( _ndk_ccache )
+ if( DEFINED NDK_CCACHE AND NOT EXISTS NDK_CCACHE )
+  unset( NDK_CCACHE CACHE )
+ endif()
+ find_program( NDK_CCACHE "${_ndk_ccache}" DOC "The path to ccache binary")
+else()
+ unset( NDK_CCACHE CACHE )
+endif()
+unset( _ndk_ccache )
+
+
+# setup the cross-compiler
+if( NOT CMAKE_C_COMPILER )
+ if( NDK_CCACHE )
+  set( CMAKE_C_COMPILER   "${NDK_CCACHE}" CACHE PATH "ccache as C compiler" )
+  set( CMAKE_CXX_COMPILER "${NDK_CCACHE}" CACHE PATH "ccache as C++ compiler" )
+  if( ANDROID_COMPILER_IS_CLANG )
+   set( CMAKE_C_COMPILER_ARG1   "${ANDROID_CLANG_TOOLCHAIN_ROOT}/bin/${_clang_name}${TOOL_OS_SUFFIX}"   CACHE PATH "C compiler")
+   set( CMAKE_CXX_COMPILER_ARG1 "${ANDROID_CLANG_TOOLCHAIN_ROOT}/bin/${_clang_name}++${TOOL_OS_SUFFIX}" CACHE PATH "C++ compiler")
+  else()
+   set( CMAKE_C_COMPILER_ARG1   "${ANDROID_TOOLCHAIN_ROOT}/bin/${ANDROID_TOOLCHAIN_MACHINE_NAME}-gcc${TOOL_OS_SUFFIX}" CACHE PATH "C compiler")
+   set( CMAKE_CXX_COMPILER_ARG1 "${ANDROID_TOOLCHAIN_ROOT}/bin/${ANDROID_TOOLCHAIN_MACHINE_NAME}-g++${TOOL_OS_SUFFIX}" CACHE PATH "C++ compiler")
+  endif()
+ else()
+  if( ANDROID_COMPILER_IS_CLANG )
+   set( CMAKE_C_COMPILER   "${ANDROID_CLANG_TOOLCHAIN_ROOT}/bin/${_clang_name}${TOOL_OS_SUFFIX}"   CACHE PATH "C compiler")
+   set( CMAKE_CXX_COMPILER "${ANDROID_CLANG_TOOLCHAIN_ROOT}/bin/${_clang_name}++${TOOL_OS_SUFFIX}" CACHE PATH "C++ compiler")
+  else()
+   set( CMAKE_C_COMPILER   "${ANDROID_TOOLCHAIN_ROOT}/bin/${ANDROID_TOOLCHAIN_MACHINE_NAME}-gcc${TOOL_OS_SUFFIX}"    CACHE PATH "C compiler" )
+   set( CMAKE_CXX_COMPILER "${ANDROID_TOOLCHAIN_ROOT}/bin/${ANDROID_TOOLCHAIN_MACHINE_NAME}-g++${TOOL_OS_SUFFIX}"    CACHE PATH "C++ compiler" )
+  endif()
+ endif()
+ set( CMAKE_ASM_COMPILER "${ANDROID_TOOLCHAIN_ROOT}/bin/${ANDROID_TOOLCHAIN_MACHINE_NAME}-gcc${TOOL_OS_SUFFIX}"     CACHE PATH "assembler" )
+ set( CMAKE_STRIP        "${ANDROID_TOOLCHAIN_ROOT}/bin/${ANDROID_TOOLCHAIN_MACHINE_NAME}-strip${TOOL_OS_SUFFIX}"   CACHE PATH "strip" )
+ set( CMAKE_AR           "${ANDROID_TOOLCHAIN_ROOT}/bin/${ANDROID_TOOLCHAIN_MACHINE_NAME}-ar${TOOL_OS_SUFFIX}"      CACHE PATH "archive" )
+ set( CMAKE_LINKER       "${ANDROID_TOOLCHAIN_ROOT}/bin/${ANDROID_TOOLCHAIN_MACHINE_NAME}-ld${TOOL_OS_SUFFIX}"      CACHE PATH "linker" )
+ set( CMAKE_NM           "${ANDROID_TOOLCHAIN_ROOT}/bin/${ANDROID_TOOLCHAIN_MACHINE_NAME}-nm${TOOL_OS_SUFFIX}"      CACHE PATH "nm" )
+ set( CMAKE_OBJCOPY      "${ANDROID_TOOLCHAIN_ROOT}/bin/${ANDROID_TOOLCHAIN_MACHINE_NAME}-objcopy${TOOL_OS_SUFFIX}" CACHE PATH "objcopy" )
+ set( CMAKE_OBJDUMP      "${ANDROID_TOOLCHAIN_ROOT}/bin/${ANDROID_TOOLCHAIN_MACHINE_NAME}-objdump${TOOL_OS_SUFFIX}" CACHE PATH "objdump" )
+ set( CMAKE_RANLIB       "${ANDROID_TOOLCHAIN_ROOT}/bin/${ANDROID_TOOLCHAIN_MACHINE_NAME}-ranlib${TOOL_OS_SUFFIX}"  CACHE PATH "ranlib" )
+endif()
+
+set( _CMAKE_TOOLCHAIN_PREFIX "${ANDROID_TOOLCHAIN_MACHINE_NAME}-" )
+if( CMAKE_VERSION VERSION_LESS 2.8.5 )
+ set( CMAKE_ASM_COMPILER_ARG1 "-c" )
+endif()
+if( APPLE )
+ find_program( CMAKE_INSTALL_NAME_TOOL NAMES install_name_tool )
+ if( NOT CMAKE_INSTALL_NAME_TOOL )
+  message( FATAL_ERROR "Could not find install_name_tool, please check your installation." )
+ endif()
+ mark_as_advanced( CMAKE_INSTALL_NAME_TOOL )
+endif()
+
+# Force set compilers because standard identification works badly for us
+include( CMakeForceCompiler )
+CMAKE_FORCE_C_COMPILER( "${CMAKE_C_COMPILER}" GNU )
+if( ANDROID_COMPILER_IS_CLANG )
+ set( CMAKE_C_COMPILER_ID Clang)
+endif()
+set( CMAKE_C_PLATFORM_ID Linux )
+set( CMAKE_C_SIZEOF_DATA_PTR 4 )
+set( CMAKE_C_HAS_ISYSROOT 1 )
+set( CMAKE_C_COMPILER_ABI ELF )
+CMAKE_FORCE_CXX_COMPILER( "${CMAKE_CXX_COMPILER}" GNU )
+if( ANDROID_COMPILER_IS_CLANG )
+ set( CMAKE_CXX_COMPILER_ID Clang)
+endif()
+set( CMAKE_CXX_PLATFORM_ID Linux )
+set( CMAKE_CXX_SIZEOF_DATA_PTR 4 )
+set( CMAKE_CXX_HAS_ISYSROOT 1 )
+set( CMAKE_CXX_COMPILER_ABI ELF )
+set( CMAKE_CXX_SOURCE_FILE_EXTENSIONS cc cp cxx cpp CPP c++ C )
+# force ASM compiler (required for CMake < 2.8.5)
+set( CMAKE_ASM_COMPILER_ID_RUN TRUE )
+set( CMAKE_ASM_COMPILER_ID GNU )
+set( CMAKE_ASM_COMPILER_WORKS TRUE )
+set( CMAKE_ASM_COMPILER_FORCED TRUE )
+set( CMAKE_COMPILER_IS_GNUASM 1)
+set( CMAKE_ASM_SOURCE_FILE_EXTENSIONS s S asm )
+
+# flags and definitions
+remove_definitions( -DANDROID )
+add_definitions( -DANDROID )
+
+if(ANDROID_SYSROOT MATCHES "[ ;\"]")
+ set( ANDROID_CXX_FLAGS "--sysroot=\"${ANDROID_SYSROOT}\"" )
+ if( NOT _CMAKE_IN_TRY_COMPILE )
+  # quotes will break try_compile and compiler identification
+  message(WARNING "Your Android system root has non-alphanumeric symbols. It can break compiler features detection and the whole build.")
+ endif()
+else()
+ set( ANDROID_CXX_FLAGS "--sysroot=${ANDROID_SYSROOT}" )
+endif()
+
+# NDK flags
+if( ARMEABI OR ARMEABI_V7A )
+ set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -fpic -funwind-tables" )
+ if( NOT ANDROID_FORCE_ARM_BUILD AND NOT ARMEABI_V6 )
+  set( ANDROID_CXX_FLAGS_RELEASE "-mthumb -fomit-frame-pointer -fno-strict-aliasing" )
+  set( ANDROID_CXX_FLAGS_DEBUG   "-marm -fno-omit-frame-pointer -fno-strict-aliasing" )
+  if( NOT ANDROID_COMPILER_IS_CLANG )
+   set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -finline-limit=64" )
+  endif()
+ else()
+  # always compile ARMEABI_V6 in arm mode; otherwise there is no difference from ARMEABI
+  set( ANDROID_CXX_FLAGS_RELEASE "-marm -fomit-frame-pointer -fstrict-aliasing" )
+  set( ANDROID_CXX_FLAGS_DEBUG   "-marm -fno-omit-frame-pointer -fno-strict-aliasing" )
+  if( NOT ANDROID_COMPILER_IS_CLANG )
+   set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -funswitch-loops -finline-limit=300" )
+  endif()
+ endif()
+elseif( X86 )
+ set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -funwind-tables" )
+ if( NOT ANDROID_COMPILER_IS_CLANG )
+  set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -funswitch-loops -finline-limit=300" )
+ else()
+  set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -fPIC" )
+ endif()
+ set( ANDROID_CXX_FLAGS_RELEASE "-fomit-frame-pointer -fstrict-aliasing" )
+ set( ANDROID_CXX_FLAGS_DEBUG   "-fno-omit-frame-pointer -fno-strict-aliasing" )
+elseif( MIPS )
+ set( ANDROID_CXX_FLAGS         "${ANDROID_CXX_FLAGS} -fpic -fno-strict-aliasing -finline-functions -ffunction-sections -funwind-tables -fmessage-length=0" )
+ set( ANDROID_CXX_FLAGS_RELEASE "-fomit-frame-pointer" )
+ set( ANDROID_CXX_FLAGS_DEBUG   "-fno-omit-frame-pointer" )
+ if( NOT ANDROID_COMPILER_IS_CLANG )
+  set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -fno-inline-functions-called-once -fgcse-after-reload -frerun-cse-after-loop -frename-registers" )
+  set( ANDROID_CXX_FLAGS_RELEASE "${ANDROID_CXX_FLAGS_RELEASE} -funswitch-loops -finline-limit=300" )
+ endif()
+elseif()
+ set( ANDROID_CXX_FLAGS_RELEASE "" )
+ set( ANDROID_CXX_FLAGS_DEBUG   "" )
+endif()
+
+set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -fsigned-char" ) # good/necessary when porting desktop libraries
+
+if( NOT X86 AND NOT ANDROID_COMPILER_IS_CLANG )
+ set( ANDROID_CXX_FLAGS "-Wno-psabi ${ANDROID_CXX_FLAGS}" )
+endif()
+
+if( NOT ANDROID_COMPILER_VERSION VERSION_LESS "4.6" )
+ set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -no-canonical-prefixes" ) # see https://android-review.googlesource.com/#/c/47564/
+endif()
+
+# ABI-specific flags
+if( ARMEABI_V7A )
+ set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -march=armv7-a -mfloat-abi=softfp" )
+ if( NEON )
+  set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -mfpu=neon" )
+ elseif( VFPV3 )
+  set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -mfpu=vfpv3" )
+ else()
+  set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -mfpu=vfpv3-d16" )
+ endif()
+elseif( ARMEABI_V6 )
+ set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -march=armv6 -mfloat-abi=softfp -mfpu=vfp" ) # vfp == vfpv2
+elseif( ARMEABI )
+ set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -march=armv5te -mtune=xscale -msoft-float" )
+endif()
+
+# STL
+if( EXISTS "${__libstl}" OR EXISTS "${__libsupcxx}" )
+ if( ANDROID_STL MATCHES "gnustl" )
+  set( CMAKE_CXX_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_CXX_FLAGS> <LANGUAGE_COMPILE_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS> <CMAKE_SHARED_LIBRARY_SONAME_CXX_FLAG><TARGET_SONAME> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>" )
+  set( CMAKE_CXX_CREATE_SHARED_MODULE  "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_CXX_FLAGS> <LANGUAGE_COMPILE_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS> <CMAKE_SHARED_LIBRARY_SONAME_CXX_FLAG><TARGET_SONAME> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>" )
+  set( CMAKE_CXX_LINK_EXECUTABLE       "<CMAKE_C_COMPILER> <FLAGS> <CMAKE_CXX_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>" )
+ else()
+  set( CMAKE_CXX_CREATE_SHARED_LIBRARY "<CMAKE_CXX_COMPILER> <CMAKE_SHARED_LIBRARY_CXX_FLAGS> <LANGUAGE_COMPILE_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS> <CMAKE_SHARED_LIBRARY_SONAME_CXX_FLAG><TARGET_SONAME> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>" )
+  set( CMAKE_CXX_CREATE_SHARED_MODULE  "<CMAKE_CXX_COMPILER> <CMAKE_SHARED_LIBRARY_CXX_FLAGS> <LANGUAGE_COMPILE_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS> <CMAKE_SHARED_LIBRARY_SONAME_CXX_FLAG><TARGET_SONAME> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>" )
+  set( CMAKE_CXX_LINK_EXECUTABLE       "<CMAKE_CXX_COMPILER> <FLAGS> <CMAKE_CXX_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>" )
+ endif()
+ if ( X86 AND ANDROID_STL MATCHES "gnustl" AND ANDROID_NDK_RELEASE STREQUAL "r6" )
+  # workaround "undefined reference to `__dso_handle'" problem
+  set( CMAKE_CXX_CREATE_SHARED_LIBRARY "${CMAKE_CXX_CREATE_SHARED_LIBRARY} \"${ANDROID_SYSROOT}/usr/lib/crtbegin_so.o\"" )
+  set( CMAKE_CXX_CREATE_SHARED_MODULE  "${CMAKE_CXX_CREATE_SHARED_MODULE} \"${ANDROID_SYSROOT}/usr/lib/crtbegin_so.o\"" )
+ endif()
+ if( EXISTS "${__libstl}" )
+  set( CMAKE_CXX_CREATE_SHARED_LIBRARY "${CMAKE_CXX_CREATE_SHARED_LIBRARY} \"${__libstl}\"" )
+  set( CMAKE_CXX_CREATE_SHARED_MODULE  "${CMAKE_CXX_CREATE_SHARED_MODULE} \"${__libstl}\"" )
+  set( CMAKE_CXX_LINK_EXECUTABLE       "${CMAKE_CXX_LINK_EXECUTABLE} \"${__libstl}\"" )
+ endif()
+ if( EXISTS "${__libsupcxx}" )
+  set( CMAKE_CXX_CREATE_SHARED_LIBRARY "${CMAKE_CXX_CREATE_SHARED_LIBRARY} \"${__libsupcxx}\"" )
+  set( CMAKE_CXX_CREATE_SHARED_MODULE  "${CMAKE_CXX_CREATE_SHARED_MODULE} \"${__libsupcxx}\"" )
+  set( CMAKE_CXX_LINK_EXECUTABLE       "${CMAKE_CXX_LINK_EXECUTABLE} \"${__libsupcxx}\"" )
+  # C objects:
+  set( CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LANGUAGE_COMPILE_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> <CMAKE_SHARED_LIBRARY_SONAME_C_FLAG><TARGET_SONAME> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>" )
+  set( CMAKE_C_CREATE_SHARED_MODULE  "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LANGUAGE_COMPILE_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> <CMAKE_SHARED_LIBRARY_SONAME_C_FLAG><TARGET_SONAME> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>" )
+  set( CMAKE_C_LINK_EXECUTABLE       "<CMAKE_C_COMPILER> <FLAGS> <CMAKE_C_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>" )
+  set( CMAKE_C_CREATE_SHARED_LIBRARY "${CMAKE_C_CREATE_SHARED_LIBRARY} \"${__libsupcxx}\"" )
+  set( CMAKE_C_CREATE_SHARED_MODULE  "${CMAKE_C_CREATE_SHARED_MODULE} \"${__libsupcxx}\"" )
+  set( CMAKE_C_LINK_EXECUTABLE       "${CMAKE_C_LINK_EXECUTABLE} \"${__libsupcxx}\"" )
+ endif()
+ if( ANDROID_STL MATCHES "gnustl" )
+  set( CMAKE_CXX_CREATE_SHARED_LIBRARY "${CMAKE_CXX_CREATE_SHARED_LIBRARY} -lm" )
+  set( CMAKE_CXX_CREATE_SHARED_MODULE  "${CMAKE_CXX_CREATE_SHARED_MODULE} -lm" )
+  set( CMAKE_CXX_LINK_EXECUTABLE       "${CMAKE_CXX_LINK_EXECUTABLE} -lm" )
+ endif()
+endif()
+
+# variables controlling optional build flags
+if (ANDROID_NDK_RELEASE STRLESS "r7")
+ # libGLESv2.so in NDK's prior to r7 refers to missing external symbols.
+ # So this flag option is required for all projects using OpenGL from native.
+ __INIT_VARIABLE( ANDROID_SO_UNDEFINED                      VALUES ON )
+else()
+ __INIT_VARIABLE( ANDROID_SO_UNDEFINED                      VALUES OFF )
+endif()
+__INIT_VARIABLE( ANDROID_NO_UNDEFINED OBSOLETE_NO_UNDEFINED VALUES ON )
+__INIT_VARIABLE( ANDROID_FUNCTION_LEVEL_LINKING             VALUES ON )
+__INIT_VARIABLE( ANDROID_GOLD_LINKER                        VALUES ON )
+__INIT_VARIABLE( ANDROID_NOEXECSTACK                        VALUES ON )
+__INIT_VARIABLE( ANDROID_RELRO                              VALUES ON )
+
+set( ANDROID_NO_UNDEFINED           ${ANDROID_NO_UNDEFINED}           CACHE BOOL "Show all undefined symbols as linker errors" )
+set( ANDROID_SO_UNDEFINED           ${ANDROID_SO_UNDEFINED}           CACHE BOOL "Allows or disallows undefined symbols in shared libraries" )
+set( ANDROID_FUNCTION_LEVEL_LINKING ${ANDROID_FUNCTION_LEVEL_LINKING} CACHE BOOL "Allows or disallows undefined symbols in shared libraries" )
+set( ANDROID_GOLD_LINKER            ${ANDROID_GOLD_LINKER}            CACHE BOOL "Enables gold linker (only avaialble for NDK r8b for ARM and x86 architectures on linux-86 and darwin-x86 hosts)" )
+set( ANDROID_NOEXECSTACK            ${ANDROID_NOEXECSTACK}            CACHE BOOL "Allows or disallows undefined symbols in shared libraries" )
+set( ANDROID_RELRO                  ${ANDROID_RELRO}                  CACHE BOOL "Enables RELRO - a memory corruption mitigation technique" )
+mark_as_advanced( ANDROID_NO_UNDEFINED ANDROID_SO_UNDEFINED ANDROID_FUNCTION_LEVEL_LINKING ANDROID_GOLD_LINKER ANDROID_NOEXECSTACK ANDROID_RELRO )
+
+# linker flags
+set( ANDROID_LINKER_FLAGS "" )
+
+if( ARMEABI_V7A )
+ # this is *required* to use the following linker flags that routes around
+ # a CPU bug in some Cortex-A8 implementations:
+ set( ANDROID_LINKER_FLAGS "${ANDROID_LINKER_FLAGS} -Wl,--fix-cortex-a8" )
+endif()
+
+if( ANDROID_NO_UNDEFINED )
+ set( ANDROID_LINKER_FLAGS "${ANDROID_LINKER_FLAGS} -Wl,--no-undefined" )
+endif()
+
+if( ANDROID_SO_UNDEFINED )
+ set( ANDROID_LINKER_FLAGS "${ANDROID_LINKER_FLAGS} -Wl,-allow-shlib-undefined" )
+endif()
+
+if( ANDROID_FUNCTION_LEVEL_LINKING )
+ set( ANDROID_CXX_FLAGS    "${ANDROID_CXX_FLAGS} -fdata-sections -ffunction-sections" )
+ set( ANDROID_LINKER_FLAGS "${ANDROID_LINKER_FLAGS} -Wl,--gc-sections" )
+endif()
+
+if( ANDROID_COMPILER_VERSION VERSION_EQUAL "4.6" )
+ if( ANDROID_GOLD_LINKER AND (CMAKE_HOST_UNIX OR ANDROID_NDK_RELEASE STRGREATER "r8b") AND (ARMEABI OR ARMEABI_V7A OR X86) )
+  set( ANDROID_LINKER_FLAGS "${ANDROID_LINKER_FLAGS} -fuse-ld=gold" )
+ elseif( ANDROID_NDK_RELEASE STRGREATER "r8b")
+  set( ANDROID_LINKER_FLAGS "${ANDROID_LINKER_FLAGS} -fuse-ld=bfd" )
+ elseif( ANDROID_NDK_RELEASE STREQUAL "r8b" AND ARMEABI AND NOT _CMAKE_IN_TRY_COMPILE )
+  message( WARNING "The default bfd linker from arm GCC 4.6 toolchain can fail with 'unresolvable R_ARM_THM_CALL relocation' error message. See https://code.google.com/p/android/issues/detail?id=35342
+  On Linux and OS X host platform you can workaround this problem using gold linker (default).
+  Rerun cmake with -DANDROID_GOLD_LINKER=ON option in case of problems.
+" )
+ endif()
+endif() # version 4.6
+
+if( ANDROID_NOEXECSTACK )
+ if( ANDROID_COMPILER_IS_CLANG )
+  set( ANDROID_CXX_FLAGS    "${ANDROID_CXX_FLAGS} -Xclang -mnoexecstack" )
+ else()
+  set( ANDROID_CXX_FLAGS    "${ANDROID_CXX_FLAGS} -Wa,--noexecstack" )
+ endif()
+ set( ANDROID_LINKER_FLAGS "${ANDROID_LINKER_FLAGS} -Wl,-z,noexecstack" )
+endif()
+
+if( ANDROID_RELRO )
+ set( ANDROID_LINKER_FLAGS "${ANDROID_LINKER_FLAGS} -Wl,-z,relro -Wl,-z,now" )
+endif()
+
+if( ANDROID_COMPILER_IS_CLANG )
+ set( ANDROID_CXX_FLAGS "-Qunused-arguments ${ANDROID_CXX_FLAGS}" )
+ if( ARMEABI_V7A AND NOT ANDROID_FORCE_ARM_BUILD )
+  set( ANDROID_CXX_FLAGS_RELEASE "-target thumbv7-none-linux-androideabi ${ANDROID_CXX_FLAGS_RELEASE}" )
+  set( ANDROID_CXX_FLAGS_DEBUG   "-target ${ANDROID_LLVM_TRIPLE} ${ANDROID_CXX_FLAGS_DEBUG}" )
+ else()
+  set( ANDROID_CXX_FLAGS "-target ${ANDROID_LLVM_TRIPLE} ${ANDROID_CXX_FLAGS}" )
+ endif()
+ if( BUILD_WITH_ANDROID_NDK )
+  set( ANDROID_CXX_FLAGS "-gcc-toolchain ${ANDROID_TOOLCHAIN_ROOT} ${ANDROID_CXX_FLAGS}" )
+ endif()
+endif()
+
+# cache flags
+set( CMAKE_CXX_FLAGS           ""                        CACHE STRING "c++ flags" )
+set( CMAKE_C_FLAGS             ""                        CACHE STRING "c flags" )
+set( CMAKE_CXX_FLAGS_RELEASE   "-O3 -DNDEBUG"            CACHE STRING "c++ Release flags" )
+set( CMAKE_C_FLAGS_RELEASE     "-O3 -DNDEBUG"            CACHE STRING "c Release flags" )
+set( CMAKE_CXX_FLAGS_DEBUG     "-O0 -g -DDEBUG -D_DEBUG" CACHE STRING "c++ Debug flags" )
+set( CMAKE_C_FLAGS_DEBUG       "-O0 -g -DDEBUG -D_DEBUG" CACHE STRING "c Debug flags" )
+set( CMAKE_SHARED_LINKER_FLAGS ""                        CACHE STRING "shared linker flags" )
+set( CMAKE_MODULE_LINKER_FLAGS ""                        CACHE STRING "module linker flags" )
+set( CMAKE_EXE_LINKER_FLAGS    "-Wl,-z,nocopyreloc"      CACHE STRING "executable linker flags" )
+
+# put flags to cache (for debug purpose only)
+set( ANDROID_CXX_FLAGS         "${ANDROID_CXX_FLAGS}"         CACHE INTERNAL "Android specific c/c++ flags" )
+set( ANDROID_CXX_FLAGS_RELEASE "${ANDROID_CXX_FLAGS_RELEASE}" CACHE INTERNAL "Android specific c/c++ Release flags" )
+set( ANDROID_CXX_FLAGS_DEBUG   "${ANDROID_CXX_FLAGS_DEBUG}"   CACHE INTERNAL "Android specific c/c++ Debug flags" )
+set( ANDROID_LINKER_FLAGS      "${ANDROID_LINKER_FLAGS}"      CACHE INTERNAL "Android specific c/c++ linker flags" )
+
+# finish flags
+set( CMAKE_CXX_FLAGS           "${ANDROID_CXX_FLAGS} ${CMAKE_CXX_FLAGS}" )
+set( CMAKE_C_FLAGS             "${ANDROID_CXX_FLAGS} ${CMAKE_C_FLAGS}" )
+set( CMAKE_CXX_FLAGS_RELEASE   "${ANDROID_CXX_FLAGS_RELEASE} ${CMAKE_CXX_FLAGS_RELEASE}" )
+set( CMAKE_C_FLAGS_RELEASE     "${ANDROID_CXX_FLAGS_RELEASE} ${CMAKE_C_FLAGS_RELEASE}" )
+set( CMAKE_CXX_FLAGS_DEBUG     "${ANDROID_CXX_FLAGS_DEBUG} ${CMAKE_CXX_FLAGS_DEBUG}" )
+set( CMAKE_C_FLAGS_DEBUG       "${ANDROID_CXX_FLAGS_DEBUG} ${CMAKE_C_FLAGS_DEBUG}" )
+set( CMAKE_SHARED_LINKER_FLAGS "${ANDROID_LINKER_FLAGS} ${CMAKE_SHARED_LINKER_FLAGS}" )
+set( CMAKE_MODULE_LINKER_FLAGS "${ANDROID_LINKER_FLAGS} ${CMAKE_MODULE_LINKER_FLAGS}" )
+set( CMAKE_EXE_LINKER_FLAGS    "${ANDROID_LINKER_FLAGS} ${CMAKE_EXE_LINKER_FLAGS}" )
+
+if( MIPS AND BUILD_WITH_ANDROID_NDK AND ANDROID_NDK_RELEASE STREQUAL "r8" )
+ set( CMAKE_SHARED_LINKER_FLAGS "-Wl,-T,${ANDROID_NDK}/toolchains/${ANDROID_GCC_TOOLCHAIN_NAME}/mipself.xsc ${CMAKE_SHARED_LINKER_FLAGS}" )
+ set( CMAKE_MODULE_LINKER_FLAGS "-Wl,-T,${ANDROID_NDK}/toolchains/${ANDROID_GCC_TOOLCHAIN_NAME}/mipself.xsc ${CMAKE_MODULE_LINKER_FLAGS}" )
+ set( CMAKE_EXE_LINKER_FLAGS    "-Wl,-T,${ANDROID_NDK}/toolchains/${ANDROID_GCC_TOOLCHAIN_NAME}/mipself.x ${CMAKE_EXE_LINKER_FLAGS}" )
+endif()
+
+# configure rtti
+if( DEFINED ANDROID_RTTI AND ANDROID_STL_FORCE_FEATURES )
+ if( ANDROID_RTTI )
+  set( CMAKE_CXX_FLAGS "-frtti ${CMAKE_CXX_FLAGS}" )
+ else()
+  set( CMAKE_CXX_FLAGS "-fno-rtti ${CMAKE_CXX_FLAGS}" )
+ endif()
+endif()
+
+# configure exceptios
+if( DEFINED ANDROID_EXCEPTIONS AND ANDROID_STL_FORCE_FEATURES )
+ if( ANDROID_EXCEPTIONS )
+  set( CMAKE_CXX_FLAGS "-fexceptions ${CMAKE_CXX_FLAGS}" )
+  set( CMAKE_C_FLAGS "-fexceptions ${CMAKE_C_FLAGS}" )
+ else()
+  set( CMAKE_CXX_FLAGS "-fno-exceptions ${CMAKE_CXX_FLAGS}" )
+  set( CMAKE_C_FLAGS "-fno-exceptions ${CMAKE_C_FLAGS}" )
+ endif()
+endif()
+
+# global includes and link directories
+include_directories( SYSTEM "${ANDROID_SYSROOT}/usr/include" ${ANDROID_STL_INCLUDE_DIRS} )
+link_directories( "${CMAKE_INSTALL_PREFIX}/libs/${ANDROID_NDK_ABI_NAME}" )
+
+# setup output directories
+set( LIBRARY_OUTPUT_PATH_ROOT ${CMAKE_SOURCE_DIR} CACHE PATH "root for library output, set this to change where android libs are installed to" )
+set( CMAKE_INSTALL_PREFIX "${ANDROID_TOOLCHAIN_ROOT}/user" CACHE STRING "path for installing" )
+
+if(NOT _CMAKE_IN_TRY_COMPILE)
+ if( EXISTS "${CMAKE_SOURCE_DIR}/jni/CMakeLists.txt" )
+  set( EXECUTABLE_OUTPUT_PATH "${LIBRARY_OUTPUT_PATH_ROOT}/bin/${ANDROID_NDK_ABI_NAME}" CACHE PATH "Output directory for applications" )
+ else()
+  set( EXECUTABLE_OUTPUT_PATH "${LIBRARY_OUTPUT_PATH_ROOT}/bin" CACHE PATH "Output directory for applications" )
+ endif()
+ set( LIBRARY_OUTPUT_PATH "${LIBRARY_OUTPUT_PATH_ROOT}/libs/${ANDROID_NDK_ABI_NAME}" CACHE PATH "path for android libs" )
+endif()
+
+# set these global flags for cmake client scripts to change behavior
+set( ANDROID True )
+set( BUILD_ANDROID True )
+
+# where is the target environment
+set( CMAKE_FIND_ROOT_PATH "${ANDROID_TOOLCHAIN_ROOT}/bin" "${ANDROID_TOOLCHAIN_ROOT}/${ANDROID_TOOLCHAIN_MACHINE_NAME}" "${ANDROID_SYSROOT}" "${CMAKE_INSTALL_PREFIX}" "${CMAKE_INSTALL_PREFIX}/share" )
+
+# only search for libraries and includes in the ndk toolchain
+set( CMAKE_FIND_ROOT_PATH_MODE_PROGRAM ONLY )
+set( CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY )
+set( CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY )
+
+
+# macro to find packages on the host OS
+macro( find_host_package )
+ set( CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER )
+ set( CMAKE_FIND_ROOT_PATH_MODE_LIBRARY NEVER )
+ set( CMAKE_FIND_ROOT_PATH_MODE_INCLUDE NEVER )
+ if( CMAKE_HOST_WIN32 )
+  SET( WIN32 1 )
+  SET( UNIX )
+ elseif( CMAKE_HOST_APPLE )
+  SET( APPLE 1 )
+  SET( UNIX )
+ endif()
+ find_package( ${ARGN} )
+ SET( WIN32 )
+ SET( APPLE )
+ SET( UNIX 1 )
+ set( CMAKE_FIND_ROOT_PATH_MODE_PROGRAM ONLY )
+ set( CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY )
+ set( CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY )
+endmacro()
+
+
+# macro to find programs on the host OS
+macro( find_host_program )
+ set( CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER )
+ set( CMAKE_FIND_ROOT_PATH_MODE_LIBRARY NEVER )
+ set( CMAKE_FIND_ROOT_PATH_MODE_INCLUDE NEVER )
+ if( CMAKE_HOST_WIN32 )
+  SET( WIN32 1 )
+  SET( UNIX )
+ elseif( CMAKE_HOST_APPLE )
+  SET( APPLE 1 )
+  SET( UNIX )
+ endif()
+ find_program( ${ARGN} )
+ SET( WIN32 )
+ SET( APPLE )
+ SET( UNIX 1 )
+ set( CMAKE_FIND_ROOT_PATH_MODE_PROGRAM ONLY )
+ set( CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY )
+ set( CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY )
+endmacro()
+
+
+macro( ANDROID_GET_ABI_RAWNAME TOOLCHAIN_FLAG VAR )
+ if( "${TOOLCHAIN_FLAG}" STREQUAL "ARMEABI" )
+  set( ${VAR} "armeabi" )
+ elseif( "${TOOLCHAIN_FLAG}" STREQUAL "ARMEABI_V7A" )
+  set( ${VAR} "armeabi-v7a" )
+ elseif( "${TOOLCHAIN_FLAG}" STREQUAL "X86" )
+  set( ${VAR} "x86" )
+ elseif( "${TOOLCHAIN_FLAG}" STREQUAL "MIPS" )
+  set( ${VAR} "mips" )
+ else()
+  set( ${VAR} "unknown" )
+ endif()
+endmacro()
+
+
+# export toolchain settings for the try_compile() command
+if( NOT PROJECT_NAME STREQUAL "CMAKE_TRY_COMPILE" )
+ set( __toolchain_config "")
+ foreach( __var NDK_CCACHE  LIBRARY_OUTPUT_PATH_ROOT  ANDROID_FORBID_SYGWIN  ANDROID_SET_OBSOLETE_VARIABLES
+                ANDROID_NDK_HOST_X64
+                ANDROID_NDK
+                ANDROID_STANDALONE_TOOLCHAIN
+                ANDROID_TOOLCHAIN_NAME
+                ANDROID_ABI
+                ANDROID_NATIVE_API_LEVEL
+                ANDROID_STL
+                ANDROID_STL_FORCE_FEATURES
+                ANDROID_FORCE_ARM_BUILD
+                ANDROID_NO_UNDEFINED
+                ANDROID_SO_UNDEFINED
+                ANDROID_FUNCTION_LEVEL_LINKING
+                ANDROID_GOLD_LINKER
+                ANDROID_NOEXECSTACK
+                ANDROID_RELRO
+                )
+  if( DEFINED ${__var} )
+   if( "${__var}" MATCHES " ")
+    set( __toolchain_config "${__toolchain_config}set( ${__var} \"${${__var}}\" CACHE INTERNAL \"\" )\n" )
+   else()
+    set( __toolchain_config "${__toolchain_config}set( ${__var} ${${__var}} CACHE INTERNAL \"\" )\n" )
+   endif()
+  endif()
+ endforeach()
+ file( WRITE "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/android.toolchain.config.cmake" "${__toolchain_config}" )
+ unset( __toolchain_config )
+endif()
+
+
+# set some obsolete variables for backward compatibility
+set( ANDROID_SET_OBSOLETE_VARIABLES ON CACHE BOOL "Define obsolete Andrid-specific cmake variables" )
+mark_as_advanced( ANDROID_SET_OBSOLETE_VARIABLES )
+if( ANDROID_SET_OBSOLETE_VARIABLES )
+ set( ANDROID_API_LEVEL ${ANDROID_NATIVE_API_LEVEL} )
+ set( ARM_TARGET "${ANDROID_ABI}" )
+ set( ARMEABI_NDK_NAME "${ANDROID_NDK_ABI_NAME}" )
+endif()
+
+
+# Variables controlling behavior or set by cmake toolchain:
+#   ANDROID_ABI : "armeabi-v7a" (default), "armeabi", "armeabi-v7a with NEON", "armeabi-v7a with VFPV3", "armeabi-v6 with VFP", "x86", "mips"
+#   ANDROID_NATIVE_API_LEVEL : 3,4,5,8,9,14 (depends on NDK version)
+#   ANDROID_STL : gnustl_static/gnustl_shared/stlport_static/stlport_shared/gabi++_static/gabi++_shared/system_re/system/none
+#   ANDROID_FORBID_SYGWIN : ON/OFF
+#   ANDROID_NO_UNDEFINED : ON/OFF
+#   ANDROID_SO_UNDEFINED : OFF/ON  (default depends on NDK version)
+#   ANDROID_FUNCTION_LEVEL_LINKING : ON/OFF
+#   ANDROID_GOLD_LINKER : ON/OFF
+#   ANDROID_NOEXECSTACK : ON/OFF
+#   ANDROID_RELRO : ON/OFF
+#   ANDROID_FORCE_ARM_BUILD : ON/OFF
+#   ANDROID_STL_FORCE_FEATURES : ON/OFF
+#   ANDROID_SET_OBSOLETE_VARIABLES : ON/OFF
+# Can be set only at the first run:
+#   ANDROID_NDK
+#   ANDROID_STANDALONE_TOOLCHAIN
+#   ANDROID_TOOLCHAIN_NAME : the NDK name of compiler toolchain
+#   ANDROID_NDK_HOST_X64 : try to use x86_64 toolchain (default for x64 host systems)
+#   LIBRARY_OUTPUT_PATH_ROOT : <any valid path>
+#   NDK_CCACHE : <path to your ccache executable>
+# Obsolete:
+#   ANDROID_API_LEVEL : superseded by ANDROID_NATIVE_API_LEVEL
+#   ARM_TARGET : superseded by ANDROID_ABI
+#   ARM_TARGETS : superseded by ANDROID_ABI (can be set only)
+#   ANDROID_NDK_TOOLCHAIN_ROOT : superseded by ANDROID_STANDALONE_TOOLCHAIN (can be set only)
+#   ANDROID_USE_STLPORT : superseded by ANDROID_STL=stlport_static
+#   ANDROID_LEVEL : superseded by ANDROID_NATIVE_API_LEVEL (completely removed)
+#
+# Primary read-only variables:
+#   ANDROID : always TRUE
+#   ARMEABI : TRUE for arm v6 and older devices
+#   ARMEABI_V6 : TRUE for arm v6
+#   ARMEABI_V7A : TRUE for arm v7a
+#   NEON : TRUE if NEON unit is enabled
+#   VFPV3 : TRUE if VFP version 3 is enabled
+#   X86 : TRUE if configured for x86
+#   MIPS : TRUE if configured for mips
+#   BUILD_ANDROID : always TRUE
+#   BUILD_WITH_ANDROID_NDK : TRUE if NDK is used
+#   BUILD_WITH_STANDALONE_TOOLCHAIN : TRUE if standalone toolchain is used
+#   ANDROID_NDK_HOST_SYSTEM_NAME : "windows", "linux-x86" or "darwin-x86" depending on host platform
+#   ANDROID_NDK_ABI_NAME : "armeabi", "armeabi-v7a", "x86" or "mips" depending on ANDROID_ABI
+#   ANDROID_NDK_RELEASE : one of r5, r5b, r5c, r6, r6b, r7, r7b, r7c, r8, r8b, r8c, r8d, r8e; set only for NDK
+#   ANDROID_ARCH_NAME : "arm" or "x86" or "mips" depending on ANDROID_ABI
+#   ANDROID_SYSROOT : path to the compiler sysroot
+#   TOOL_OS_SUFFIX : "" or ".exe" depending on host platform
+#   ANDROID_COMPILER_IS_CLANG : TRUE if clang compiler is used
+# Obsolete:
+#   ARMEABI_NDK_NAME : superseded by ANDROID_NDK_ABI_NAME
+#
+# Secondary (less stable) read-only variables:
+#   ANDROID_COMPILER_VERSION : GCC version used
+#   ANDROID_CXX_FLAGS : C/C++ compiler flags required by Android platform
+#   ANDROID_SUPPORTED_ABIS : list of currently allowed values for ANDROID_ABI
+#   ANDROID_TOOLCHAIN_MACHINE_NAME : "arm-linux-androideabi", "arm-eabi" or "i686-android-linux"
+#   ANDROID_TOOLCHAIN_ROOT : path to the top level of toolchain (standalone or placed inside NDK)
+#   ANDROID_CLANG_TOOLCHAIN_ROOT : path to clang tools
+#   ANDROID_SUPPORTED_NATIVE_API_LEVELS : list of native API levels found inside NDK
+#   ANDROID_STL_INCLUDE_DIRS : stl include paths
+#   ANDROID_RTTI : if rtti is enabled by the runtime
+#   ANDROID_EXCEPTIONS : if exceptions are enabled by the runtime
+#   ANDROID_GCC_TOOLCHAIN_NAME : read-only, differs from ANDROID_TOOLCHAIN_NAME only if clang is used
+#   ANDROID_CLANG_VERSION : version of clang compiler if clang is used
+#
+# Defaults:
+#   ANDROID_DEFAULT_NDK_API_LEVEL
+#   ANDROID_DEFAULT_NDK_API_LEVEL_${ARCH}
+#   ANDROID_NDK_SEARCH_PATHS
+#   ANDROID_STANDALONE_TOOLCHAIN_SEARCH_PATH
+#   ANDROID_SUPPORTED_ABIS_${ARCH}
+#   ANDROID_SUPPORTED_NDK_VERSIONS
diff --git a/Source/Android/assets/ButtonA.png b/Source/Android/assets/ButtonA.png
new file mode 100644
index 0000000000..7e685324ae
Binary files /dev/null and b/Source/Android/assets/ButtonA.png differ
diff --git a/Source/Android/assets/ButtonB.png b/Source/Android/assets/ButtonB.png
new file mode 100644
index 0000000000..21da4c20f1
Binary files /dev/null and b/Source/Android/assets/ButtonB.png differ
diff --git a/Source/Android/assets/ButtonStart.png b/Source/Android/assets/ButtonStart.png
new file mode 100644
index 0000000000..e79a9269ee
Binary files /dev/null and b/Source/Android/assets/ButtonStart.png differ
diff --git a/Source/Android/assets/GCPadNew.ini b/Source/Android/assets/GCPadNew.ini
new file mode 100644
index 0000000000..cb828f9960
--- /dev/null
+++ b/Source/Android/assets/GCPadNew.ini
@@ -0,0 +1,29 @@
+[GCPad1]
+Device = Android/0/Touchscreen
+Buttons/A = Button 0
+Buttons/B = Button 1
+Buttons/X = C
+Buttons/Y = S
+Buttons/Z = D
+Buttons/Start = Button 2
+Main Stick/Up = Up
+Main Stick/Down = Down
+Main Stick/Left = Left
+Main Stick/Right = Right
+Main Stick/Modifier = Shift_L
+Main Stick/Modifier/Range = 50.000000
+C-Stick/Up = I
+C-Stick/Down = K
+C-Stick/Left = J
+C-Stick/Right = L
+C-Stick/Modifier = Control_L
+C-Stick/Modifier/Range = 50.000000
+Triggers/L = Q
+Triggers/R = W
+D-Pad/Up = T
+D-Pad/Down = G
+D-Pad/Left = F
+D-Pad/Right = H
+[GCPad2]
+[GCPad3]
+[GCPad4]
diff --git a/Source/Android/assets/NoBanner.png b/Source/Android/assets/NoBanner.png
new file mode 100644
index 0000000000..e15ae972c8
Binary files /dev/null and b/Source/Android/assets/NoBanner.png differ
diff --git a/Source/Android/build.xml b/Source/Android/build.xml
new file mode 100644
index 0000000000..dc36e5c45a
--- /dev/null
+++ b/Source/Android/build.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="Dolphin Emulator" default="help">
+
+    <!-- The local.properties file is created and updated by the 'android' tool.
+         It contains the path to the SDK. It should *NOT* be checked into
+         Version Control Systems. -->
+    <property file="local.properties" />
+
+    <!-- The ant.properties file can be created by you. It is only edited by the
+         'android' tool to add properties to it.
+         This is the place to change some Ant specific build properties.
+         Here are some properties you may want to change/update:
+
+         source.dir
+             The name of the source directory. Default is 'src'.
+         out.dir
+             The name of the output directory. Default is 'bin'.
+
+         For other overridable properties, look at the beginning of the rules
+         files in the SDK, at tools/ant/build.xml
+
+         Properties related to the SDK location or the project target should
+         be updated using the 'android' tool with the 'update' action.
+
+         This file is an integral part of the build system for your
+         application and should be checked into Version Control Systems.
+
+         -->
+    <property file="ant.properties" />
+
+    <!-- if sdk.dir was not set from one of the property file, then
+         get it from the ANDROID_HOME env var.
+         This must be done before we load project.properties since
+         the proguard config can use sdk.dir -->
+    <property environment="env" />
+    <condition property="sdk.dir" value="${env.ANDROID_HOME}">
+        <isset property="env.ANDROID_HOME" />
+    </condition>
+
+    <!-- The project.properties file is created and updated by the 'android'
+         tool, as well as ADT.
+
+         This contains project specific properties such as project target, and library
+         dependencies. Lower level build properties are stored in ant.properties
+         (or in .classpath for Eclipse projects).
+
+         This file is an integral part of the build system for your
+         application and should be checked into Version Control Systems. -->
+    <loadproperties srcFile="project.properties" />
+
+    <!-- quick check on sdk.dir -->
+    <fail
+            message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through the ANDROID_HOME environment variable."
+            unless="sdk.dir"
+    />
+
+    <!--
+        Import per project custom build rules if present at the root of the project.
+        This is the place to put custom intermediary targets such as:
+            -pre-build
+            -pre-compile
+            -post-compile (This is typically used for code obfuscation.
+                           Compiled code location: ${out.classes.absolute.dir}
+                           If this is not done in place, override ${out.dex.input.absolute.dir})
+            -post-package
+            -post-build
+            -pre-clean
+    -->
+    <import file="custom_rules.xml" optional="true" />
+
+    <!-- Import the actual build file.
+
+         To customize existing targets, there are two options:
+         - Customize only one target:
+             - copy/paste the target into this file, *before* the
+               <import> task.
+             - customize it to your needs.
+         - Customize the whole content of build.xml
+             - copy/paste the content of the rules files (minus the top node)
+               into this file, replacing the <import> task.
+             - customize to your needs.
+
+         ***********************
+         ****** IMPORTANT ******
+         ***********************
+         In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
+         in order to avoid having your file be overridden by tools such as "android update project"
+    -->
+    <!-- version-tag: 1 -->
+    <import file="${sdk.dir}/tools/ant/build.xml" />
+
+</project>
diff --git a/Source/Android/custom_rules.xml b/Source/Android/custom_rules.xml
new file mode 100644
index 0000000000..e06de68e57
--- /dev/null
+++ b/Source/Android/custom_rules.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="Dolphin" default="help">
+    <property name="ndkbuildopt" value=""/>
+    <target name="-pre-build">
+        <exec executable="${ndk.dir}/ndk-build" failonerror="true">
+            <arg line="-j4 ${ndkbuildopt}"/>
+        </exec>
+	<copy todir="${jar.libs.dir}/armeabi-v7a">
+		<fileset
+			dir="../../libs/armeabi-v7a"
+			includes="libdolphin-emu-nogui.so" />
+	</copy>
+    </target>
+    <target name="clean" depends="android_rules.clean">
+        <exec executable="${ndk.dir}/ndk-build" failonerror="true">
+            <arg value="clean"/>
+        </exec>
+    </target>
+</project>
diff --git a/Source/Android/jni/Android.mk b/Source/Android/jni/Android.mk
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/Source/Android/jni/Application.mk b/Source/Android/jni/Application.mk
new file mode 100644
index 0000000000..5941ec944e
--- /dev/null
+++ b/Source/Android/jni/Application.mk
@@ -0,0 +1,4 @@
+APP_STL := stlport_static
+APP_ABI := armeabi-v7a 
+
+#APP_ABI := armeabi-v7a
diff --git a/Source/Android/project.properties b/Source/Android/project.properties
new file mode 100644
index 0000000000..91be165ce3
--- /dev/null
+++ b/Source/Android/project.properties
@@ -0,0 +1,15 @@
+# This file is automatically generated by Android Tools.
+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
+#
+# This file must be checked in Version Control Systems.
+#
+# To customize properties used by the Ant build system edit
+# "ant.properties", and override values to adapt the script to your
+# project structure.
+#
+# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
+#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
+
+# Project target.
+target=android-17
+android.library.reference.1=../../Externals/android-menudrawer/library
diff --git a/Source/Android/res/drawable-hdpi/launcher.png b/Source/Android/res/drawable-hdpi/launcher.png
new file mode 100644
index 0000000000..da35bbad81
Binary files /dev/null and b/Source/Android/res/drawable-hdpi/launcher.png differ
diff --git a/Source/Android/res/drawable-mdpi/launcher.png b/Source/Android/res/drawable-mdpi/launcher.png
new file mode 100644
index 0000000000..03e5eea949
Binary files /dev/null and b/Source/Android/res/drawable-mdpi/launcher.png differ
diff --git a/Source/Android/res/drawable-xhdpi/launcher.png b/Source/Android/res/drawable-xhdpi/launcher.png
new file mode 100644
index 0000000000..28770da81f
Binary files /dev/null and b/Source/Android/res/drawable-xhdpi/launcher.png differ
diff --git a/Source/Android/res/drawable-xxhdpi/launcher.png b/Source/Android/res/drawable-xxhdpi/launcher.png
new file mode 100644
index 0000000000..7cb72b57bb
Binary files /dev/null and b/Source/Android/res/drawable-xxhdpi/launcher.png differ
diff --git a/Source/Android/res/layout/folderbrowser.xml b/Source/Android/res/layout/folderbrowser.xml
new file mode 100644
index 0000000000..ae480d0807
--- /dev/null
+++ b/Source/Android/res/layout/folderbrowser.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:orientation="vertical" >
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" >
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:orientation="vertical" >
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" >
+            </LinearLayout>
+
+            <TextView
+                android:id="@+id/TextView01"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="5dip"
+                android:layout_marginTop="5dip"
+                android:singleLine="true"
+                android:text="@+id/TextView01"
+                android:textStyle="bold" />
+
+            <TextView
+                android:id="@+id/TextView02"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="10dip"
+                android:text="@+id/TextView02" />
+
+        </LinearLayout>
+
+    </LinearLayout>
+
+
+
+</LinearLayout>
diff --git a/Source/Android/res/layout/folderbrowserfooter.xml b/Source/Android/res/layout/folderbrowserfooter.xml
new file mode 100644
index 0000000000..9c0e11d81b
--- /dev/null
+++ b/Source/Android/res/layout/folderbrowserfooter.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+</LinearLayout>
\ No newline at end of file
diff --git a/Source/Android/res/layout/main.xml b/Source/Android/res/layout/main.xml
new file mode 100644
index 0000000000..1b19ad19fe
--- /dev/null
+++ b/Source/Android/res/layout/main.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:orientation="vertical" >
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" >
+
+        <ImageView
+            android:id="@+id/imageView1"
+            android:layout_width="96dp"
+            android:layout_height="match_parent" />
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:orientation="vertical" >
+
+            <TextView
+                android:id="@+id/TextView01"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="5dip"
+                android:layout_marginTop="5dip"
+                android:singleLine="true"
+                android:text="@+id/TextView01"
+                android:textStyle="bold" />
+
+            <TextView
+                android:id="@+id/TextView02"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="10dip"
+                android:text="@+id/TextView02" />
+
+        </LinearLayout>
+
+    </LinearLayout>
+
+</LinearLayout>
diff --git a/Source/Android/res/layout/sidemenu.xml b/Source/Android/res/layout/sidemenu.xml
new file mode 100644
index 0000000000..57ab67e3ca
--- /dev/null
+++ b/Source/Android/res/layout/sidemenu.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:gravity="left"
+    android:orientation="vertical" >
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" >
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:orientation="vertical" >
+
+            <TextView
+                android:id="@+id/TextView01"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="5dip"
+                android:layout_marginTop="5dip"
+                android:singleLine="true"
+                android:text="@+id/TextView01"
+                android:textAppearance="?android:attr/textAppearanceLarge" 
+                android:textStyle="bold" />
+
+        </LinearLayout>
+    </LinearLayout>
+
+</LinearLayout>
diff --git a/Source/Android/res/values/strings.xml b/Source/Android/res/values/strings.xml
new file mode 100644
index 0000000000..2cfdcb6e7e
--- /dev/null
+++ b/Source/Android/res/values/strings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="app_name">Dolphin Emulator</string>
+
+</resources>
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java b/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java
new file mode 100644
index 0000000000..db647723ad
--- /dev/null
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java
@@ -0,0 +1,177 @@
+package org.dolphinemu.dolphinemu;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+
+import net.simonvt.menudrawer.MenuDrawer;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.os.Environment;
+import android.util.DisplayMetrics;
+import android.util.Log;
+import android.view.MotionEvent;
+import android.view.WindowManager;
+
+public class DolphinEmulator<MainActivity> extends Activity 
+{	
+	static private NativeGLSurfaceView GLview = null;
+	static private boolean Running = false;
+	
+	private float screenWidth;
+	private float screenHeight;
+	
+	public static native void onTouchEvent(int Action, float X, float Y);
+	
+	static
+	{
+		try
+		{
+			System.loadLibrary("dolphin-emu-nogui"); 
+		}
+		catch (Exception ex)
+		{
+			Log.w("me", ex.toString());
+		}
+	}
+	private void CopyAsset(String asset, String output) {
+        InputStream in = null;
+        OutputStream out = null;
+        try {
+          in = getAssets().open(asset);
+          out = new FileOutputStream(output);
+          copyFile(in, out);
+          in.close();
+          in = null;
+          out.flush();
+          out.close();
+          out = null;
+        } catch(IOException e) {
+            Log.e("tag", "Failed to copy asset file: " + asset, e);
+        }       
+	}
+	private void copyFile(InputStream in, OutputStream out) throws IOException {
+	    byte[] buffer = new byte[1024];
+	    int read;
+	    while((read = in.read(buffer)) != -1){
+	      out.write(buffer, 0, read);
+	    }
+	}
+	
+	@Override
+	public void onStop()
+	{
+		super.onStop();
+		if (Running)
+			NativeGLSurfaceView.StopEmulation();
+	}
+	@Override
+	public void onPause()
+	{
+		super.onPause();
+		if (Running)
+			NativeGLSurfaceView.PauseEmulation();
+	}
+	@Override
+	public void onResume()
+	{
+		super.onResume();
+		if (Running)
+			NativeGLSurfaceView.UnPauseEmulation();
+	}
+
+    /** Called when the activity is first created. */
+	@Override
+	public void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		if (savedInstanceState == null)
+		{
+
+			Intent ListIntent = new Intent(this, GameListView.class);
+			startActivityForResult(ListIntent, 1);
+			
+			// Make the assets directory
+			String strDir = Environment.getExternalStorageDirectory()+File.separator+"dolphin-emu";
+			File directory = new File(strDir);
+			directory.mkdirs();
+			
+			strDir += File.separator+"Config";
+			directory = new File(strDir);
+			directory.mkdirs();
+			
+			// Copy assets if needed
+			java.io.File file = new java.io.File(
+					Environment.getExternalStorageDirectory()+File.separator+"dolphin-emu" + File.separator + "NoBanner.png");
+			if(!file.exists())
+			{
+				CopyAsset("ButtonA.png", 
+						Environment.getExternalStorageDirectory()+File.separator+
+						"dolphin-emu" + File.separator + "ButtonA.png");
+				CopyAsset("ButtonB.png", 
+						Environment.getExternalStorageDirectory()+File.separator+
+						"dolphin-emu" + File.separator + "ButtonB.png");
+				CopyAsset("ButtonStart.png", 
+						Environment.getExternalStorageDirectory()+File.separator+
+						"dolphin-emu" + File.separator + "ButtonStart.png");
+				CopyAsset("NoBanner.png", 
+						Environment.getExternalStorageDirectory()+File.separator+
+						"dolphin-emu" + File.separator + "NoBanner.png");
+				CopyAsset("GCPadNew.ini", 
+						Environment.getExternalStorageDirectory()+File.separator+
+						"dolphin-emu" + File.separator +"Config"+ File.separator +"GCPadNew.ini");
+			}
+		}
+	}
+
+	@Override
+	public void onActivityResult(int requestCode, int resultCode, Intent data)
+	{
+		super.onActivityResult(requestCode, resultCode, data);
+		
+		if (resultCode == Activity.RESULT_OK)
+		{
+			DisplayMetrics displayMetrics = new DisplayMetrics();
+			WindowManager wm = (WindowManager) getApplicationContext().getSystemService(Context.WINDOW_SERVICE); // the results will be higher than using the activity context object or the getWindowManager() shortcut
+			wm.getDefaultDisplay().getMetrics(displayMetrics);
+			screenWidth = displayMetrics.widthPixels;
+			screenHeight = displayMetrics.heightPixels;
+			
+			String FileName = data.getStringExtra("Select");
+			GLview = new NativeGLSurfaceView(this);
+			//this.getWindow().setUiOptions(View.SYSTEM_UI_FLAG_HIDE_NAVIGATION | View.SYSTEM_UI_FLAG_FULLSCREEN, View.SYSTEM_UI_FLAG_HIDE_NAVIGATION | View.SYSTEM_UI_FLAG_FULLSCREEN);
+			GLview.SetDimensions(screenWidth, screenHeight);
+			GLview.SetFileName(FileName);
+			setContentView(GLview);
+			Running = true;
+		}
+	}
+	
+	@Override
+	public boolean onTouchEvent(MotionEvent event)
+	{
+		float X, Y;
+		int Action;
+		X = event.getX();
+		Y = event.getY();
+		Action = event.getActionMasked();
+		
+		// Converts button locations 0 - 1 to OGL screen coords -1.0 - 1.0
+		float ScreenX = ((X / screenWidth) * 2.0f) - 1.0f;
+		float ScreenY = ((Y / screenHeight) * -2.0f) + 1.0f;
+
+		onTouchEvent(Action, ScreenX, ScreenY);
+		
+		return false;
+	}
+	
+	public boolean overrideKeys()
+	{   
+		return false;
+	}  
+
+}                                
\ No newline at end of file
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/FolderBrowser.java b/Source/Android/src/org/dolphinemu/dolphinemu/FolderBrowser.java
new file mode 100644
index 0000000000..68203413b7
--- /dev/null
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/FolderBrowser.java
@@ -0,0 +1,98 @@
+package org.dolphinemu.dolphinemu;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import net.simonvt.menudrawer.MenuDrawer;
+
+import android.app.Activity;
+import android.app.ListActivity;
+import android.content.Intent;
+import android.os.Bundle;
+import android.os.Environment;
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.AdapterView;
+import android.widget.AdapterView.OnItemLongClickListener;
+import android.widget.BaseAdapter;
+import android.widget.LinearLayout;
+import android.widget.ListView;
+import android.widget.TextView;
+import android.widget.Toast;
+
+public class FolderBrowser extends ListActivity {
+	private GameListAdapter adapter;
+	private static File currentDir = null;
+	private void Fill(File f)
+    {
+		File[]dirs = f.listFiles();
+		this.setTitle("Current Dir: " + f.getName());
+		List<GameListItem>dir = new ArrayList<GameListItem>();
+		List<GameListItem>fls = new ArrayList<GameListItem>();
+         
+		try
+		{
+			for(File ff: dirs)
+			{
+				if (ff.getName().charAt(0) != '.')
+					if(ff.isDirectory())
+	                	dir.add(new GameListItem(getApplicationContext(), ff.getName(),"Folder",ff.getAbsolutePath()));
+					else
+						if (ff.getName().toLowerCase().contains(".gcm") ||
+		                		ff.getName().toLowerCase().contains(".iso") ||
+		                		ff.getName().toLowerCase().contains(".wbfs") ||
+		                		ff.getName().toLowerCase().contains(".gcz") ||
+		                		ff.getName().toLowerCase().contains(".dol") ||
+		                		ff.getName().toLowerCase().contains(".elf"))
+		                			fls.add(new GameListItem(getApplicationContext(), ff.getName(),"File Size: "+ff.length(),ff.getAbsolutePath()));
+             }
+         }
+         catch(Exception e)
+         {
+         }
+         
+		Collections.sort(dir);
+        Collections.sort(fls);
+        dir.addAll(fls);
+         if (!f.getName().equalsIgnoreCase("sdcard"))
+        	 dir.add(0, new GameListItem(getApplicationContext(), "..", "Parent Directory", f.getParent()));
+
+         adapter = new GameListAdapter(this,R.layout.folderbrowser,dir);
+		 this.setListAdapter(adapter);
+    }
+
+	@Override
+	protected void onListItemClick(ListView l, View v, int position, long id) {
+		// TODO Auto-generated method stub
+		super.onListItemClick(l, v, position, id);
+		GameListItem o = adapter.getItem(position);
+		if(o.getData().equalsIgnoreCase("folder")||o.getData().equalsIgnoreCase("parent directory")){
+			currentDir = new File(o.getPath());
+			Fill(currentDir);
+		}
+	}
+	
+	@Override
+	public void onCreate(Bundle savedInstanceState) 
+	{
+		super.onCreate(savedInstanceState);
+		 
+		if(currentDir == null)
+			currentDir = new File(Environment.getExternalStorageDirectory().getPath());
+		Fill(currentDir);
+	}
+    @Override
+    public void onBackPressed() {
+        Intent intent = new Intent();
+        intent.putExtra("Select", currentDir.getPath());
+        setResult(Activity.RESULT_OK, intent);
+        
+    	this.finish();
+    	super.onBackPressed();
+    }
+}
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/GameListAdapter.java b/Source/Android/src/org/dolphinemu/dolphinemu/GameListAdapter.java
new file mode 100644
index 0000000000..f0aa522a1f
--- /dev/null
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/GameListAdapter.java
@@ -0,0 +1,57 @@
+package org.dolphinemu.dolphinemu;
+
+import java.util.List;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ArrayAdapter;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+public class GameListAdapter extends ArrayAdapter<GameListItem>{
+
+	private Context c;
+	private int id;
+	private List<GameListItem>items;
+	
+	public GameListAdapter(Context context, int textViewResourceId,
+			List<GameListItem> objects) {
+		super(context, textViewResourceId, objects);
+		c = context;
+		id = textViewResourceId;
+		items = objects;
+	}
+	public GameListItem getItem(int i)
+	 {
+		 return items.get(i);
+	 }
+	 @Override
+      public View getView(int position, View convertView, ViewGroup parent) {
+              View v = convertView;
+              if (v == null) {
+                  LayoutInflater vi = (LayoutInflater)c.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+                  v = vi.inflate(id, null);
+              }
+              final GameListItem o = items.get(position);
+              if (o != null) {
+                      TextView t1 = (TextView) v.findViewById(R.id.TextView01);
+                      TextView t2 = (TextView) v.findViewById(R.id.TextView02);
+                      ImageView v1 = (ImageView) v.findViewById(R.id.imageView1);
+                      
+                      if(t1!=null)
+                      	t1.setText(o.getName());
+                      if(t2!=null)
+                      	t2.setText(o.getData());
+                      if(v1!=null)
+                    	  v1.setImageBitmap(o.getImage());
+                      
+              }
+              return v;
+      }
+
+
+
+}
+
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/GameListItem.java b/Source/Android/src/org/dolphinemu/dolphinemu/GameListItem.java
new file mode 100644
index 0000000000..87137db48d
--- /dev/null
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/GameListItem.java
@@ -0,0 +1,84 @@
+package org.dolphinemu.dolphinemu;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.util.Log;
+
+public class GameListItem implements Comparable<GameListItem>{
+    private String name;
+    private String data;
+    private String path;
+    private Bitmap image;
+    public static native int[] GetBanner(String filename);
+    public static native String GetTitle(String filename);
+	static
+	{
+		try
+		{
+			System.loadLibrary("dolphin-emu-nogui"); 
+		}
+		catch (Exception ex)
+		{
+			Log.w("me", ex.toString());
+		}
+	}
+    
+    public GameListItem(Context ctx, String n,String d,String p)
+    {
+        name = n;
+        data = d;
+        path = p;
+        File file = new File(path);
+        if (!file.isDirectory())
+        {
+        	int[] Banner = GetBanner(path);
+        	if (Banner[0] == 0)
+        	{
+        		try {
+					InputStream path = ctx.getAssets().open("NoBanner.png");
+					image = BitmapFactory.decodeStream(path);
+				} catch (IOException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
+        		
+        	}
+        	else
+        		image = Bitmap.createBitmap(Banner, 96, 32, Bitmap.Config.ARGB_8888);
+        	name = GetTitle(path);
+        }
+    }
+    
+    public String getName()
+    {
+        return name;
+    }
+    
+    public String getData()
+    {
+        return data;
+    }
+    
+    public String getPath()
+    {
+        return path;
+    }
+    public Bitmap getImage()
+    {
+    	return image;
+    }
+    
+    public int compareTo(GameListItem o) 
+    {
+        if(this.name != null)
+            return this.name.toLowerCase().compareTo(o.getName().toLowerCase()); 
+        else 
+            throw new IllegalArgumentException();
+    }
+}
+
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/GameListView.java b/Source/Android/src/org/dolphinemu/dolphinemu/GameListView.java
new file mode 100644
index 0000000000..d585ead372
--- /dev/null
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/GameListView.java
@@ -0,0 +1,181 @@
+package org.dolphinemu.dolphinemu;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import net.simonvt.menudrawer.MenuDrawer;
+
+import android.app.Activity;
+import android.app.ListActivity;
+import android.content.Intent;
+import android.os.Bundle;
+import android.os.Environment;
+import android.util.DisplayMetrics;
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.MenuItem;
+import android.view.Surface;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.WindowManager;
+import android.widget.AdapterView;
+import android.widget.BaseAdapter;
+import android.widget.ListView;
+import android.widget.TextView;
+import android.widget.Toast;
+
+public class GameListView extends ListActivity {
+	private GameListAdapter adapter;
+	private static File currentDir = null;
+	private MenuDrawer mDrawer;
+	
+    private SideMenuAdapter mAdapter;
+    private ListView mList;
+    private static GameListView me;
+    public static native String GetConfig(String Key, String Value, String Default);
+    public static native void SetConfig(String Key, String Value, String Default);
+	
+	private void Fill(File f)
+    {
+		File[]dirs = f.listFiles();
+		this.setTitle("Game List");
+		List<GameListItem>dir = new ArrayList<GameListItem>();
+		List<GameListItem>fls = new ArrayList<GameListItem>();
+         
+		try
+		{
+			for(File ff: dirs)
+			{
+				if (ff.getName().charAt(0) != '.')
+					if(!ff.isDirectory())
+	                	if (ff.getName().toLowerCase().contains(".gcm") ||
+	                		ff.getName().toLowerCase().contains(".iso") ||
+	                		ff.getName().toLowerCase().contains(".wbfs") ||
+	                		ff.getName().toLowerCase().contains(".gcz") ||
+	                		ff.getName().toLowerCase().contains(".dol") ||
+	                		ff.getName().toLowerCase().contains(".elf"))
+	                			fls.add(new GameListItem(getApplicationContext(), ff.getName(),"File Size: "+ff.length(),ff.getAbsolutePath()));
+             }
+         }
+         catch(Exception e)
+         {
+         }
+         
+         Collections.sort(dir);
+         Collections.sort(fls);
+         dir.addAll(fls);
+         
+         adapter = new GameListAdapter(this,R.layout.main,dir);
+		 this.setListAdapter(adapter);
+    }
+	
+	@Override
+	protected void onListItemClick(ListView l, View v, int position, long id) {
+		// TODO Auto-generated method stub
+		super.onListItemClick(l, v, position, id);
+		GameListItem o = adapter.getItem(position);
+		if(o.getData().equalsIgnoreCase("folder")||o.getData().equalsIgnoreCase("parent directory")){
+		}
+		else
+		{
+			onFileClick(o.getPath());
+		}
+	}
+	
+	private void onFileClick(String o)
+    {
+    	Toast.makeText(this, "File Clicked: " + o, Toast.LENGTH_SHORT).show();
+    	
+        Intent intent = new Intent();
+        intent.putExtra("Select", o);
+        setResult(Activity.RESULT_OK, intent);
+        
+    	this.finish();
+    }
+	@Override
+	public void onActivityResult(int requestCode, int resultCode, Intent data)
+	{
+		super.onActivityResult(requestCode, resultCode, data);
+		
+		if (resultCode == Activity.RESULT_OK)
+		{
+			String FileName = data.getStringExtra("Select");
+			Toast.makeText(this, "Folder Selected: " + FileName, Toast.LENGTH_SHORT).show();
+			SetConfig("General", "GCMPathes", "1");
+			SetConfig("General", "GCMPaths0", FileName);
+			
+			currentDir = new File(FileName);
+			Fill(currentDir);
+		}
+	}
+	
+	@Override
+	public void onCreate(Bundle savedInstanceState) 
+	{
+		super.onCreate(savedInstanceState);
+		me = this;
+		 
+		mDrawer = MenuDrawer.attach(this, MenuDrawer.MENU_DRAG_CONTENT);
+		 
+		String BrowseDir = GetConfig("General", "GCMPaths0", "");
+		if(currentDir == null)
+			currentDir = new File(BrowseDir);
+		Fill(currentDir);
+		 
+		List<SideMenuItem>dir = new ArrayList<SideMenuItem>();
+		dir.add(new SideMenuItem("Browse Folder", 0));
+
+		mList = new ListView(this);
+		mAdapter = new SideMenuAdapter(this,R.layout.sidemenu,dir);
+		mList.setAdapter(mAdapter);
+		mList.setOnItemClickListener(mItemClickListener);
+		
+		mDrawer.setMenuView(mList);
+	}
+    private AdapterView.OnItemClickListener mItemClickListener = new AdapterView.OnItemClickListener() {
+        public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+        	SideMenuItem o = mAdapter.getItem(position);
+        	
+        	switch(o.getID())
+        	{
+        		case 0:
+        			Toast.makeText(me, "Loading up the browser", Toast.LENGTH_SHORT).show();
+        			Intent ListIntent = new Intent(me, FolderBrowser.class);
+        			startActivityForResult(ListIntent, 1);
+        		break;
+        		default:
+        		break;
+        	}
+            mDrawer.closeMenu();
+        }
+    };
+    @Override
+    public void setContentView(int layoutResID) {
+        // This override is only needed when using MENU_DRAG_CONTENT.
+    	mDrawer.setContentView(layoutResID);
+        onContentChanged();
+    }
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case android.R.id.home:
+            	mDrawer.toggleMenu();
+                return true;
+        }
+
+        return super.onOptionsItemSelected(item);
+    }
+
+    @Override
+    public void onBackPressed() {
+        final int drawerState = mDrawer.getDrawerState();
+        if (drawerState == MenuDrawer.STATE_OPEN || drawerState == MenuDrawer.STATE_OPENING) {
+        	mDrawer.closeMenu();
+            return;
+        }
+
+        super.onBackPressed();
+    }
+}
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/NativeGLSurfaceView.java b/Source/Android/src/org/dolphinemu/dolphinemu/NativeGLSurfaceView.java
new file mode 100644
index 0000000000..25c7ace0a0
--- /dev/null
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/NativeGLSurfaceView.java
@@ -0,0 +1,81 @@
+package org.dolphinemu.dolphinemu;
+
+import android.content.Context;
+import android.opengl.GLSurfaceView;
+import android.util.Log;
+import android.view.Surface;
+import android.view.SurfaceHolder;
+import android.view.SurfaceView;
+
+public class NativeGLSurfaceView extends SurfaceView {
+	static private String FileName;
+	static private Thread myRun;
+	static private boolean Running = false;
+	static private boolean Created = false;
+	static private float width;
+	static private float height;
+	
+	public static native void main(String File, Surface surf, int width, int height);
+	public static native void UnPauseEmulation();
+	public static native void PauseEmulation();
+	public static native void StopEmulation();
+	
+	static
+	{
+		try
+		{
+			System.loadLibrary("dolphin-emu-nogui"); 
+		}
+		catch (Exception ex)
+		{
+			Log.w("me", ex.toString());
+		}
+	}
+
+	public NativeGLSurfaceView(Context context) {
+		super(context);
+		if (!Created)
+		{
+			myRun = new Thread() 
+			{
+				@Override
+	      		public void run() {
+	    	  		main(FileName, getHolder().getSurface(), (int)width, (int)height);
+	      		}	
+			};
+			getHolder().addCallback(new SurfaceHolder.Callback() {
+		            public void surfaceCreated(SurfaceHolder holder) {
+		                // TODO Auto-generated method stub
+		            	if (!Running)
+		            	{
+		            		myRun.start();
+		            		Running = true;
+		            	}
+		            }
+
+					public void surfaceChanged(SurfaceHolder arg0, int arg1,
+							int arg2, int arg3) {
+						// TODO Auto-generated method stub
+						
+					}
+
+					public void surfaceDestroyed(SurfaceHolder arg0) {
+						// TODO Auto-generated method stub
+						
+					}
+			 });
+			Created = true;
+		}
+	}
+	
+	public void SetFileName(String file)
+	{
+		FileName = file;
+	}
+	
+	public void SetDimensions(float screenWidth, float screenHeight)
+	{
+		width = screenWidth;
+		height = screenHeight;
+	}
+}
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/SideMenuAdapter.java b/Source/Android/src/org/dolphinemu/dolphinemu/SideMenuAdapter.java
new file mode 100644
index 0000000000..e1c0ed5e31
--- /dev/null
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/SideMenuAdapter.java
@@ -0,0 +1,49 @@
+package org.dolphinemu.dolphinemu;
+
+import java.util.List;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ArrayAdapter;
+import android.widget.TextView;
+
+public class SideMenuAdapter extends ArrayAdapter<SideMenuItem>{
+
+	private Context c;
+	private int id;
+	private List<SideMenuItem>items;
+	
+	public SideMenuAdapter(Context context, int textViewResourceId,
+			List<SideMenuItem> objects) {
+		super(context, textViewResourceId, objects);
+		c = context;
+		id = textViewResourceId;
+		items = objects;
+	}
+	public SideMenuItem getItem(int i)
+	 {
+		 return items.get(i);
+	 }
+	 @Override
+      public View getView(int position, View convertView, ViewGroup parent) {
+              View v = convertView;
+              if (v == null) {
+                  LayoutInflater vi = (LayoutInflater)c.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+                  v = vi.inflate(id, null);
+              }
+              final SideMenuItem o = items.get(position);
+              if (o != null) {
+                      TextView t1 = (TextView) v.findViewById(R.id.TextView01);
+                      
+                      if(t1!=null)
+                      	t1.setText(o.getName());
+              }
+              return v;
+      }
+
+
+
+}
+
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/SideMenuItem.java b/Source/Android/src/org/dolphinemu/dolphinemu/SideMenuItem.java
new file mode 100644
index 0000000000..80f3eaec64
--- /dev/null
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/SideMenuItem.java
@@ -0,0 +1,30 @@
+package org.dolphinemu.dolphinemu;
+
+public class SideMenuItem implements Comparable<SideMenuItem>{
+    private String m_name;
+    private int m_id;
+
+    public SideMenuItem(String n, int id)
+    {
+        m_name = n;
+        m_id = id;
+    }
+    
+    public String getName()
+    {
+        return m_name;
+    }
+    public int getID()
+    {
+    	return m_id;
+    }
+    
+    public int compareTo(SideMenuItem o) 
+    {
+        if(this.m_name != null)
+            return this.m_name.toLowerCase().compareTo(o.getName().toLowerCase()); 
+        else 
+            throw new IllegalArgumentException();
+    }
+}
+
diff --git a/Source/Core/AudioCommon/Src/AOSoundStream.cpp b/Source/Core/AudioCommon/Src/AOSoundStream.cpp
index 0ec6451666..5a657a5fd8 100644
--- a/Source/Core/AudioCommon/Src/AOSoundStream.cpp
+++ b/Source/Core/AudioCommon/Src/AOSoundStream.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include <functional>
 #include <string.h>
diff --git a/Source/Core/AudioCommon/Src/AOSoundStream.h b/Source/Core/AudioCommon/Src/AOSoundStream.h
index 0c11586b42..0b3cef9f0e 100644
--- a/Source/Core/AudioCommon/Src/AOSoundStream.h
+++ b/Source/Core/AudioCommon/Src/AOSoundStream.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _AOSOUNDSTREAM_H_
 #define _AOSOUNDSTREAM_H_
diff --git a/Source/Core/AudioCommon/Src/AudioCommon.cpp b/Source/Core/AudioCommon/Src/AudioCommon.cpp
index 2f299d0edb..8b343aa493 100644
--- a/Source/Core/AudioCommon/Src/AudioCommon.cpp
+++ b/Source/Core/AudioCommon/Src/AudioCommon.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "AudioCommon.h"
 #include "FileUtil.h"
diff --git a/Source/Core/AudioCommon/Src/AudioCommon.h b/Source/Core/AudioCommon/Src/AudioCommon.h
index b7b32e7498..cd1896396e 100644
--- a/Source/Core/AudioCommon/Src/AudioCommon.h
+++ b/Source/Core/AudioCommon/Src/AudioCommon.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _AUDIO_COMMON_H_
 #define _AUDIO_COMMON_H_
diff --git a/Source/Core/AudioCommon/Src/DPL2Decoder.cpp b/Source/Core/AudioCommon/Src/DPL2Decoder.cpp
index c33333fb47..5b41c605ce 100644
--- a/Source/Core/AudioCommon/Src/DPL2Decoder.cpp
+++ b/Source/Core/AudioCommon/Src/DPL2Decoder.cpp
@@ -1,24 +1,11 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 // 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
+//  * based on mplayer HRTF plugin by ylai
 
 #include <functional>
 #include <vector>
diff --git a/Source/Core/AudioCommon/Src/DPL2Decoder.h b/Source/Core/AudioCommon/Src/DPL2Decoder.h
index eee8fbf15e..8252918de3 100644
--- a/Source/Core/AudioCommon/Src/DPL2Decoder.h
+++ b/Source/Core/AudioCommon/Src/DPL2Decoder.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _DPL2DECODER_H_
 #define _DPL2DECODER_H_
diff --git a/Source/Core/AudioCommon/Src/DSoundStream.cpp b/Source/Core/AudioCommon/Src/DSoundStream.cpp
index 42c9f4f156..a81c3d2f26 100644
--- a/Source/Core/AudioCommon/Src/DSoundStream.cpp
+++ b/Source/Core/AudioCommon/Src/DSoundStream.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include <cmath>
 #include <functional>
diff --git a/Source/Core/AudioCommon/Src/DSoundStream.h b/Source/Core/AudioCommon/Src/DSoundStream.h
index f2b8276114..6145ea62e9 100644
--- a/Source/Core/AudioCommon/Src/DSoundStream.h
+++ b/Source/Core/AudioCommon/Src/DSoundStream.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _DSOUNDSTREAM_H_
 #define _DSOUNDSTREAM_H_
diff --git a/Source/Core/AudioCommon/Src/Mixer.cpp b/Source/Core/AudioCommon/Src/Mixer.cpp
index 6c5b6bcceb..146314088d 100644
--- a/Source/Core/AudioCommon/Src/Mixer.cpp
+++ b/Source/Core/AudioCommon/Src/Mixer.cpp
@@ -1,20 +1,6 @@
-// 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/
-
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "Atomic.h"
 #include "Mixer.h"
diff --git a/Source/Core/AudioCommon/Src/Mixer.h b/Source/Core/AudioCommon/Src/Mixer.h
index a9de2cee72..6dcbe78ece 100644
--- a/Source/Core/AudioCommon/Src/Mixer.h
+++ b/Source/Core/AudioCommon/Src/Mixer.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _MIXER_H_
 #define _MIXER_H_
@@ -76,7 +63,7 @@ public:
 			g_wave_writer.SetSkipSilence(false);
 			NOTICE_LOG(DSPHLE, "Starting Audio logging");
 		} else {
-			WARN_LOG(DSPHLE, "Audio logging already started");
+			WARN_LOG(DSPHLE, "Audio logging has already been started");
 		}
 	}
 
@@ -86,7 +73,7 @@ public:
 			g_wave_writer.Stop();
 			NOTICE_LOG(DSPHLE, "Stopping Audio logging");
 		} else {
-			WARN_LOG(DSPHLE, "Audio logging already stopped");
+			WARN_LOG(DSPHLE, "Audio logging has already been stopped");
 		}
 	}
 
diff --git a/Source/Core/AudioCommon/Src/NullSoundStream.cpp b/Source/Core/AudioCommon/Src/NullSoundStream.cpp
index db67b08a15..95a9da4349 100644
--- a/Source/Core/AudioCommon/Src/NullSoundStream.cpp
+++ b/Source/Core/AudioCommon/Src/NullSoundStream.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "AudioCommon.h"
 #include "NullSoundStream.h"
diff --git a/Source/Core/AudioCommon/Src/NullSoundStream.h b/Source/Core/AudioCommon/Src/NullSoundStream.h
index c0a5e8cb7c..a20c1e0d12 100644
--- a/Source/Core/AudioCommon/Src/NullSoundStream.h
+++ b/Source/Core/AudioCommon/Src/NullSoundStream.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _NULLSOUNDSTREAM_H_
 #define _NULLSOUNDSTREAM_H_
diff --git a/Source/Core/AudioCommon/Src/OpenALStream.cpp b/Source/Core/AudioCommon/Src/OpenALStream.cpp
index 83feb44364..b1e601dfe7 100644
--- a/Source/Core/AudioCommon/Src/OpenALStream.cpp
+++ b/Source/Core/AudioCommon/Src/OpenALStream.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "aldlist.h"
 #include "OpenALStream.h"
@@ -72,7 +59,7 @@ bool OpenALStream::Start()
 		PanicAlertT("OpenAL: can't find sound devices");
 	}
 
-	// Initialise DPL2 parameters
+	// Initialize DPL2 parameters
 	dpl2reset();
 
 	soundTouch.clear();
diff --git a/Source/Core/AudioCommon/Src/OpenALStream.h b/Source/Core/AudioCommon/Src/OpenALStream.h
index a808fcefc9..42371db045 100644
--- a/Source/Core/AudioCommon/Src/OpenALStream.h
+++ b/Source/Core/AudioCommon/Src/OpenALStream.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _OPENALSTREAM_H_
 #define _OPENALSTREAM_H_
diff --git a/Source/Core/AudioCommon/Src/SoundStream.h b/Source/Core/AudioCommon/Src/SoundStream.h
index 1322cc19ac..855a0cc4f0 100644
--- a/Source/Core/AudioCommon/Src/SoundStream.h
+++ b/Source/Core/AudioCommon/Src/SoundStream.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _SOUNDSTREAM_H_
 #define _SOUNDSTREAM_H_
diff --git a/Source/Core/AudioCommon/Src/WaveFile.cpp b/Source/Core/AudioCommon/Src/WaveFile.cpp
index 3cab3cea68..c6db942bc3 100644
--- a/Source/Core/AudioCommon/Src/WaveFile.cpp
+++ b/Source/Core/AudioCommon/Src/WaveFile.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "Common.h"
 #include "WaveFile.h"
@@ -73,7 +60,7 @@ bool WaveFileWriter::Start(const char *filename, unsigned int HLESampleRate)
 
 	// We are now at offset 44
 	if (file.Tell() != 44)
-		PanicAlert("wrong offset: %lld", (long long)file.Tell());
+		PanicAlert("Wrong offset: %lld", (long long)file.Tell());
 
 	return true;
 }
diff --git a/Source/Core/AudioCommon/Src/WaveFile.h b/Source/Core/AudioCommon/Src/WaveFile.h
index 11fbb4ced5..26f528aace 100644
--- a/Source/Core/AudioCommon/Src/WaveFile.h
+++ b/Source/Core/AudioCommon/Src/WaveFile.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 // ---------------------------------------------------------------------------------
 // Class: WaveFileWriter
diff --git a/Source/Core/AudioCommon/Src/XAudio2Stream.cpp b/Source/Core/AudioCommon/Src/XAudio2Stream.cpp
index 0537f183c6..59a826365c 100644
--- a/Source/Core/AudioCommon/Src/XAudio2Stream.cpp
+++ b/Source/Core/AudioCommon/Src/XAudio2Stream.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "AudioCommon.h"
 #include "XAudio2Stream.h"
@@ -107,7 +94,7 @@ bool XAudio2::Start()
 {
 	HRESULT hr;
 
-	// callback dosent seem to run on a speecific cpu anyways
+	// callback doesn't seem to run on a specific cpu anyways
 	IXAudio2* xaudptr;
 	if (FAILED(hr = XAudio2Create(&xaudptr, 0, XAUDIO2_DEFAULT_PROCESSOR)))
 	{
diff --git a/Source/Core/AudioCommon/Src/XAudio2Stream.h b/Source/Core/AudioCommon/Src/XAudio2Stream.h
index 658f73f48f..4310a46435 100644
--- a/Source/Core/AudioCommon/Src/XAudio2Stream.h
+++ b/Source/Core/AudioCommon/Src/XAudio2Stream.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _XAUDIO2STREAM_H_
 #define _XAUDIO2STREAM_H_
diff --git a/Source/Core/Common/Src/ArmEmitter.cpp b/Source/Core/Common/Src/ArmEmitter.cpp
index 9b738be030..a8d0fcc92a 100644
--- a/Source/Core/Common/Src/ArmEmitter.cpp
+++ b/Source/Core/Common/Src/ArmEmitter.cpp
@@ -83,6 +83,40 @@ bool TryMakeOperand2_AllowNegation(s32 imm, Operand2 &op2, bool *negated)
 	}
 }
 
+Operand2 AssumeMakeOperand2(u32 imm) {
+	Operand2 op2;
+	bool result = TryMakeOperand2(imm, op2);
+	_dbg_assert_msg_(JIT, result, "Could not make assumed Operand2.");
+	return op2;
+}
+
+bool ARMXEmitter::TrySetValue_TwoOp(ARMReg reg, u32 val)
+{
+	int ops = 0;
+	for (int i = 0; i < 16; i++)
+	{
+		if ((val >> (i*2)) & 0x3)
+		{
+			ops++;
+			i+=3;
+		}
+	}
+	if (ops > 2)
+		return false;
+	
+	bool first = true;
+	for (int i = 0; i < 16; i++, val >>=2) {
+		if (val & 0x3) {
+			first ? MOV(reg, Operand2((u8)val, (u8)((16-i) & 0xF)))
+				  : ORR(reg, reg, Operand2((u8)val, (u8)((16-i) & 0xF)));
+			first = false;
+			i+=3;
+			val >>= 6;
+		}
+	}
+	return true;
+}
+
 void ARMXEmitter::MOVI2F(ARMReg dest, float val, ARMReg tempReg)
 {
 	union {float f; u32 u;} conv;
@@ -93,6 +127,21 @@ void ARMXEmitter::MOVI2F(ARMReg dest, float val, ARMReg tempReg)
 	// Otherwise, use a literal pool and VLDR directly (+- 1020)
 }
 
+void ARMXEmitter::ADDI2R(ARMReg rd, ARMReg rs, u32 val, ARMReg scratch)
+{
+	Operand2 op2;
+	bool negated;
+	if (TryMakeOperand2_AllowNegation(val, op2, &negated)) {
+		if (!negated)
+			ADD(rd, rs, op2);
+		else
+			SUB(rd, rs, op2);
+	} else {
+		MOVI2R(scratch, val);
+		ADD(rd, rs, scratch);
+	}
+}
+
 void ARMXEmitter::ANDI2R(ARMReg rd, ARMReg rs, u32 val, ARMReg scratch)
 {
 	Operand2 op2;
@@ -109,6 +158,21 @@ void ARMXEmitter::ANDI2R(ARMReg rd, ARMReg rs, u32 val, ARMReg scratch)
 	}
 }
 
+void ARMXEmitter::CMPI2R(ARMReg rs, u32 val, ARMReg scratch)
+{
+	Operand2 op2;
+	bool negated;
+	if (TryMakeOperand2_AllowNegation(val, op2, &negated)) {
+		if (!negated)
+			CMP(rs, op2);
+		else
+			CMN(rs, op2);
+	} else {
+		MOVI2R(scratch, val);
+		CMP(rs, scratch);
+	}
+}
+
 void ARMXEmitter::ORI2R(ARMReg rd, ARMReg rs, u32 val, ARMReg scratch)
 {
 	Operand2 op2;
@@ -173,7 +237,7 @@ void ARMXEmitter::MOVI2R(ARMReg reg, u32 val, bool optimize)
 			MOVW(reg, val & 0xFFFF);
 			if(val & 0xFFFF0000)
 				MOVT(reg, val, true);
-		} else {
+		} else if (!TrySetValue_TwoOp(reg,val)) {
 			// Use literal pool for ARMv6.
 			AddNewLit(val);
 			LDR(reg, _PC); // To be backpatched later
@@ -190,9 +254,7 @@ void ARMXEmitter::SetCodePtr(u8 *ptr)
 {
 	code = ptr;
 	startcode = code;
-#ifdef IOS
 	lastCacheFlushEnd = ptr;
-#endif
 }
 
 const u8 *ARMXEmitter::GetCodePtr() const
@@ -236,14 +298,15 @@ void ARMXEmitter::FlushIcacheSection(u8 *start, u8 *end)
 #elif defined(BLACKBERRY)
 	msync(start, end - start, MS_SYNC | MS_INVALIDATE_ICACHE);
 #elif defined(IOS)
-	if (start != NULL)
-		sys_cache_control(kCacheFunctionPrepareForExecution, start, end - start);
+	// Header file says this is equivalent to: sys_icache_invalidate(start, end - start);
+	sys_cache_control(kCacheFunctionPrepareForExecution, start, end - start);
 #elif !defined(_WIN32)
-#ifndef ANDROID
-	start = startcode; // Should be Linux Only
-#endif
+#ifdef __clang__
+	__clear_cache(start, end);
+#else
 	__builtin___clear_cache(start, end);
 #endif
+#endif
 }
 
 void ARMXEmitter::SetCC(CCFlags cond)
@@ -628,38 +691,40 @@ void ARMXEmitter::SVC(Operand2 op)
 
 // IMM, REG, IMMSREG, RSR
 // -1 for invalid if the instruction doesn't support that
-const s32 LoadStoreOps[][4] = { {0x40, 0x60, 0x60, -1}, // STR
-				{0x41, 0x61, 0x61, -1}, // LDR
-				{0x44, 0x64, 0x64, -1}, // STRB
-				{0x45, 0x65, 0x65, -1}, // LDRB
-				// Special encodings
-				{ 0x4,  0x0,  -1, -1}, // STRH
-				{ 0x5,  0x1,  -1, -1}, // LDRH
-				{ 0x5,  0x1,  -1, -1}, // LDRSB
-				{ 0x5,  0x1,  -1, -1}, // LDRSH
-				};
-const char *LoadStoreNames[] = { "STR",
-				 "LDR",
-				 "STRB",
-				 "LDRB",
-				 "STRH",
-				 "LDRH",
-				 "LDRSB",
-				 "LDRSH",
-				};
+const s32 LoadStoreOps[][4] = {
+	{0x40, 0x60, 0x60, -1}, // STR
+	{0x41, 0x61, 0x61, -1}, // LDR
+	{0x44, 0x64, 0x64, -1}, // STRB
+	{0x45, 0x65, 0x65, -1}, // LDRB
+	// Special encodings
+	{ 0x4,  0x0,  -1, -1}, // STRH
+	{ 0x5,  0x1,  -1, -1}, // LDRH
+	{ 0x5,  0x1,  -1, -1}, // LDRSB
+	{ 0x5,  0x1,  -1, -1}, // LDRSH
+};
+const char *LoadStoreNames[] = {
+	"STR",
+	"LDR",
+	"STRB",
+	"LDRB",
+	"STRH",
+	"LDRH",
+	"LDRSB",
+	"LDRSH",
+};
 
 void ARMXEmitter::WriteStoreOp(u32 Op, ARMReg Rt, ARMReg Rn, Operand2 Rm, bool RegAdd)
 {
 	s32 op = LoadStoreOps[Op][Rm.GetType()]; // Type always decided by last operand
 	u32 Data;
-	
+
 	// Qualcomm chipsets get /really/ angry if you don't use index, even if the offset is zero.
 	// Some of these encodings require Index at all times anyway. Doesn't really matter.
 	// bool Index = op2 != 0 ? true : false;
 	bool Index = true;
-	bool Add = false; 	
+	bool Add = false;
 
-	// Special Encoding	
+	// Special Encoding (misc addressing mode)
 	bool SpecialOp = false;
 	bool Half = false;
 	bool SignedLoad = false;
@@ -699,10 +764,13 @@ void ARMXEmitter::WriteStoreOp(u32 Op, ARMReg Rt, ARMReg Rn, Operand2 Rm, bool R
 			// The offset is encoded differently on this one.
 			if (SpecialOp)
 				Data = (Data & 0xF0 << 4) | (Data & 0xF);
-			if (Temp >= 0) Add = true;	
+			if (Temp >= 0) Add = true;
 		}
 		break;
 		case TYPE_REG:
+			Data = Rm.GetData();
+			Add = RegAdd;
+			break;
 		case TYPE_IMMSREG:
 			if (!SpecialOp)
 			{
@@ -710,17 +778,18 @@ void ARMXEmitter::WriteStoreOp(u32 Op, ARMReg Rt, ARMReg Rn, Operand2 Rm, bool R
 				Add = RegAdd;
 				break;
 			}
+			// Intentional fallthrough: TYPE_IMMSREG not supported for misc addressing.
 		default:
 			// RSR not supported for any of these
 			// We already have the warning above
 			BKPT(0x2);
 			return;
-		break;  
+		break;
 	}
 	if (SpecialOp)
 	{
 		// Add SpecialOp things
-		Data = (0x5 << 4) | (SignedLoad << 6) | (Half << 5) | Data;
+		Data = (0x9 << 4) | (SignedLoad << 6) | (Half << 5) | Data;
 	}
 	Write32(condition | (op << 20) | (Index << 24) | (Add << 23) | (Rn << 16) | (Rt << 12) | Data);
 }
@@ -947,7 +1016,6 @@ void ARMXEmitter::VLDR(ARMReg Dest, ARMReg Base, s16 offset)
 	{
 		Write32(condition | (0xD << 24) | (Add << 23) | ((Dest & 0x1) << 22) | (1 << 20) | (Base << 16) \
 			| ((Dest & 0x1E) << 11) | (10 << 8) | (imm >> 2));	
-
 	}
 	else
 	{
diff --git a/Source/Core/Common/Src/ArmEmitter.h b/Source/Core/Common/Src/ArmEmitter.h
index fe64584e0c..b3fab39c40 100644
--- a/Source/Core/Common/Src/ArmEmitter.h
+++ b/Source/Core/Common/Src/ArmEmitter.h
@@ -320,6 +320,9 @@ bool TryMakeOperand2(u32 imm, Operand2 &op2);
 bool TryMakeOperand2_AllowInverse(u32 imm, Operand2 &op2, bool *inverse);
 bool TryMakeOperand2_AllowNegation(s32 imm, Operand2 &op2, bool *negated);
 
+// Use this only when you know imm can be made into an Operand2.
+Operand2 AssumeMakeOperand2(u32 imm);
+
 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); }
@@ -394,6 +397,7 @@ public:
 
 	void FlushLitPool();
 	void AddNewLit(u32 val);
+	bool TrySetValue_TwoOp(ARMReg reg, u32 val);
 
 	CCFlags GetCC() { return CCFlags(condition >> 28); }
 	void SetCC(CCFlags cond = CC_AL);
@@ -562,7 +566,9 @@ public:
 	void MOVI2R(ARMReg reg, u32 val, bool optimize = true);
 	void MOVI2F(ARMReg dest, float val, ARMReg tempReg);
 
+	void ADDI2R(ARMReg rd, ARMReg rs, u32 val, ARMReg scratch);
 	void ANDI2R(ARMReg rd, ARMReg rs, u32 val, ARMReg scratch);
+	void CMPI2R(ARMReg rs, u32 val, ARMReg scratch);
 	void ORI2R(ARMReg rd, ARMReg rs, u32 val, ARMReg scratch);
 
 
diff --git a/Source/Core/Common/Src/Atomic.h b/Source/Core/Common/Src/Atomic.h
index 5b37b79c3d..11ed451091 100644
--- a/Source/Core/Common/Src/Atomic.h
+++ b/Source/Core/Common/Src/Atomic.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _ATOMIC_H_
 #define _ATOMIC_H_
diff --git a/Source/Core/Common/Src/Atomic_GCC.h b/Source/Core/Common/Src/Atomic_GCC.h
index 8eb2f5d818..f923ba8b5e 100644
--- a/Source/Core/Common/Src/Atomic_GCC.h
+++ b/Source/Core/Common/Src/Atomic_GCC.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _ATOMIC_GCC_H_
 #define _ATOMIC_GCC_H_
diff --git a/Source/Core/Common/Src/Atomic_Win32.h b/Source/Core/Common/Src/Atomic_Win32.h
index 70d2f1c4a2..1b05f8e777 100644
--- a/Source/Core/Common/Src/Atomic_Win32.h
+++ b/Source/Core/Common/Src/Atomic_Win32.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _ATOMIC_WIN32_H_
 #define _ATOMIC_WIN32_H_
diff --git a/Source/Core/Common/Src/BreakPoints.cpp b/Source/Core/Common/Src/BreakPoints.cpp
index 62fadefd4f..57d1b06538 100644
--- a/Source/Core/Common/Src/BreakPoints.cpp
+++ b/Source/Core/Common/Src/BreakPoints.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "Common.h"
 #include "DebugInterface.h"
diff --git a/Source/Core/Common/Src/BreakPoints.h b/Source/Core/Common/Src/BreakPoints.h
index 1268b4e80a..cc4f1fcbfb 100644
--- a/Source/Core/Common/Src/BreakPoints.h
+++ b/Source/Core/Common/Src/BreakPoints.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _DEBUGGER_BREAKPOINTS_H
 #define _DEBUGGER_BREAKPOINTS_H
diff --git a/Source/Core/Common/Src/CPUDetect.h b/Source/Core/Common/Src/CPUDetect.h
index 5c2b33b4b3..be6ce34985 100644
--- a/Source/Core/Common/Src/CPUDetect.h
+++ b/Source/Core/Common/Src/CPUDetect.h
@@ -1,19 +1,7 @@
-// Copyright (C) 2003 Dolphin Project.
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
-// 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/
 
 // Detect the cpu, so we'll know which optimizations to use
 #ifndef _CPUDETECT_H_
diff --git a/Source/Core/Common/Src/ChunkFile.h b/Source/Core/Common/Src/ChunkFile.h
index ecf641a27b..6fed73a7ed 100644
--- a/Source/Core/Common/Src/ChunkFile.h
+++ b/Source/Core/Common/Src/ChunkFile.h
@@ -1,19 +1,7 @@
-// Copyright (C) 2003 Dolphin Project.
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
-// 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 _POINTERWRAP_H_
 #define _POINTERWRAP_H_
@@ -32,6 +20,7 @@
 #include <list>
 #include <deque>
 #include <string>
+#include <type_traits>
 
 #include "Common.h"
 #include "FileUtil.h"
@@ -139,11 +128,17 @@ public:
 	template <typename T>
 	void Do(T& x)
 	{
-		// TODO: Bad, Do(some_non_POD) will compile and fail at runtime
-		// type_traits are not fully supported everywhere yet
+		// Ideally this would be std::is_trivially_copyable, but not enough support yet
+		static_assert(std::is_pod<T>::value, "Only sane for POD types");
 		
 		DoVoid((void*)&x, sizeof(x));
 	}
+	
+	template <typename T>
+	void DoPOD(T& x)
+	{
+		DoVoid((void*)&x, sizeof(x));
+	}
 
 	template <typename T>
 	void DoPointer(T*& x, T* const base)
diff --git a/Source/Core/Common/Src/ColorUtil.cpp b/Source/Core/Common/Src/ColorUtil.cpp
index 52ffec0803..f338fb3f47 100644
--- a/Source/Core/Common/Src/ColorUtil.cpp
+++ b/Source/Core/Common/Src/ColorUtil.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "Common.h"
 #include "ColorUtil.h"
diff --git a/Source/Core/Common/Src/ColorUtil.h b/Source/Core/Common/Src/ColorUtil.h
index 93a16d24e6..8b666f1f5c 100644
--- a/Source/Core/Common/Src/ColorUtil.h
+++ b/Source/Core/Common/Src/ColorUtil.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _COLORUTIL_H_
 #define _COLORUTIL_H_
diff --git a/Source/Core/Common/Src/Common.h b/Source/Core/Common/Src/Common.h
index 904095e255..b197eb0ff5 100644
--- a/Source/Core/Common/Src/Common.h
+++ b/Source/Core/Common/Src/Common.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _COMMON_H_
 #define _COMMON_H_
diff --git a/Source/Core/Common/Src/CommonFuncs.h b/Source/Core/Common/Src/CommonFuncs.h
index f892769280..710c20955e 100644
--- a/Source/Core/Common/Src/CommonFuncs.h
+++ b/Source/Core/Common/Src/CommonFuncs.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _COMMONFUNCS_H_
 #define _COMMONFUNCS_H_
@@ -66,23 +53,26 @@ _mm_shuffle_epi8(__m128i a, __m128i mask)
 		#define Crash() {asm ("int $3");}
 	#endif
 	#define ARRAYSIZE(A) (sizeof(A)/sizeof((A)[0]))
-
+// GCC 4.8 defines all the rotate functions now
+// Small issue with GCC's lrotl/lrotr intrinsics is they are still 32bit while we require 64bit
+#ifndef _rotl
 inline u32 _rotl(u32 x, int shift) {
 	shift &= 31;
 	if (!shift) return x;
 	return (x << shift) | (x >> (32 - shift));
 }
 
-inline u64 _rotl64(u64 x, unsigned int shift){
-	unsigned int n = shift % 64;
-	return (x << n) | (x >> (64 - n));
-}
-
 inline u32 _rotr(u32 x, int shift) {
 	shift &= 31;
 	if (!shift) return x;
 	return (x >> shift) | (x << (32 - shift));
 }
+#endif
+
+inline u64 _rotl64(u64 x, unsigned int shift){
+	unsigned int n = shift % 64;
+	return (x << n) | (x >> (64 - n));
+}
 
 inline u64 _rotr64(u64 x, unsigned int shift){
 	unsigned int n = shift % 64;
diff --git a/Source/Core/Common/Src/CommonPaths.h b/Source/Core/Common/Src/CommonPaths.h
index 1628cd4dd8..1f3787daf4 100644
--- a/Source/Core/Common/Src/CommonPaths.h
+++ b/Source/Core/Common/Src/CommonPaths.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _COMMON_PATHS_H_
 #define _COMMON_PATHS_H_
@@ -57,6 +44,7 @@
 				DIR_SEP USERDATA_DIR DIR_SEP
 #elif defined ANDROID
 	#define SYSDATA_DIR "/sdcard/dolphin-emu"
+	#define SHARED_USER_DIR SYSDATA_DIR
 #else
 	#ifdef DATA_DIR
 		#define SYSDATA_DIR DATA_DIR "sys"
diff --git a/Source/Core/Common/Src/CommonTypes.h b/Source/Core/Common/Src/CommonTypes.h
index 71bc9386ac..600d5b7b72 100644
--- a/Source/Core/Common/Src/CommonTypes.h
+++ b/Source/Core/Common/Src/CommonTypes.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 
 // This header contains type definitions that are shared between the Dolphin core and
diff --git a/Source/Core/Common/Src/ConsoleListener.cpp b/Source/Core/Common/Src/ConsoleListener.cpp
index 934300f777..9a924d4beb 100644
--- a/Source/Core/Common/Src/ConsoleListener.cpp
+++ b/Source/Core/Common/Src/ConsoleListener.cpp
@@ -1,20 +1,6 @@
-// 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/
-
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include <algorithm>  // min
 #include <string> // System: To be able to add strings with "+"
diff --git a/Source/Core/Common/Src/ConsoleListener.h b/Source/Core/Common/Src/ConsoleListener.h
index b223f0df5d..84c379eb54 100644
--- a/Source/Core/Common/Src/ConsoleListener.h
+++ b/Source/Core/Common/Src/ConsoleListener.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _CONSOLELISTENER_H
 #define _CONSOLELISTENER_H
diff --git a/Source/Core/Common/Src/FifoQueue.h b/Source/Core/Common/Src/FifoQueue.h
index 2060ceee92..01f0e4dd3c 100644
--- a/Source/Core/Common/Src/FifoQueue.h
+++ b/Source/Core/Common/Src/FifoQueue.h
@@ -36,15 +36,16 @@ public:
 		return (0 == m_size);
 	}
 
-	const T& Front() const
+	T& Front() const
 	{
 		return *m_read_ptr->current;
 	}
 
-	void Push(const T& t)
+	template <typename Arg>
+	void Push(Arg&& t)
 	{
 		// create the element, add it to the queue
-		m_write_ptr->current = new T(t);
+		m_write_ptr->current = new T(std::forward<Arg>(t));
 		// set the next pointer to a new element ptr
 		// then advance the write pointer 
 		m_write_ptr = m_write_ptr->next = new ElementPtr();
@@ -67,7 +68,7 @@ public:
 		if (Empty())
 			return false;
 
-		t = Front();
+		t = std::move(Front());
 		Pop();
 
 		return true;
diff --git a/Source/Core/Common/Src/FileSearch.cpp b/Source/Core/Common/Src/FileSearch.cpp
index 674cf0e1d5..f790b68c4d 100644
--- a/Source/Core/Common/Src/FileSearch.cpp
+++ b/Source/Core/Common/Src/FileSearch.cpp
@@ -1,19 +1,7 @@
-// Copyright (C) 2003 Dolphin Project.
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
-// 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 "CommonPaths.h"
diff --git a/Source/Core/Common/Src/FileSearch.h b/Source/Core/Common/Src/FileSearch.h
index 6a73f92f99..55aaf4ebe6 100644
--- a/Source/Core/Common/Src/FileSearch.h
+++ b/Source/Core/Common/Src/FileSearch.h
@@ -1,19 +1,7 @@
-// Copyright (C) 2003 Dolphin Project.
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
-// 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 _FILESEARCH_H_
 #define _FILESEARCH_H_
diff --git a/Source/Core/Common/Src/FileUtil.cpp b/Source/Core/Common/Src/FileUtil.cpp
index e8a7540c0a..ebd73efe49 100644
--- a/Source/Core/Common/Src/FileUtil.cpp
+++ b/Source/Core/Common/Src/FileUtil.cpp
@@ -1,19 +1,7 @@
-// Copyright (C) 2003 Dolphin Project.
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
-// 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 "CommonPaths.h"
@@ -124,7 +112,7 @@ bool Delete(const std::string &filename)
 	// being there, not the actual delete.
 	if (!Exists(filename))
 	{
-		WARN_LOG(COMMON, "Delete: %s does not exists", filename.c_str());
+		WARN_LOG(COMMON, "Delete: %s does not exist", filename.c_str());
 		return true;
 	}
 
@@ -216,7 +204,7 @@ bool CreateFullPath(const std::string &fullPath)
 		panicCounter--;
 		if (panicCounter <= 0)
 		{
-			ERROR_LOG(COMMON, "CreateFullPath: directory structure too deep");
+			ERROR_LOG(COMMON, "CreateFullPath: directory structure is too deep");
 			return false;
 		}
 		position++;
@@ -324,7 +312,7 @@ bool Copy(const std::string &srcFilename, const std::string &destFilename)
 			goto bail;
 		}
 	}
-	// close flushs
+	// close files
 	fclose(input);
 	fclose(output);
 	return true;
@@ -669,7 +657,7 @@ std::string GetSysDirectory()
 
 // Returns a string with a Dolphin data dir or file in the user's home
 // directory. To be used in "multi-user" mode (that is, installed).
-std::string &GetUserPath(const unsigned int DirIDX, const std::string &newPath)
+const std::string& GetUserPath(const unsigned int DirIDX, const std::string &newPath)
 {
 	static std::string paths[NUM_PATH_INDICES];
 
@@ -723,11 +711,11 @@ std::string &GetUserPath(const unsigned int DirIDX, const std::string &newPath)
 	if (!newPath.empty())
 	{
 		if(DirIDX != D_WIIROOT_IDX)
-			PanicAlert("trying to change user path other than wii root");
+			PanicAlert("Trying to change user path other than Wii root");
 
 		if (!File::IsDirectory(newPath))
 		{
-			WARN_LOG(COMMON, "Invalid path specified %s, wii user path will be set to default", newPath.c_str());
+			WARN_LOG(COMMON, "Invalid path specified %s, Wii user path will be set to default", newPath.c_str());
 			paths[D_WIIROOT_IDX] = paths[D_USER_IDX] + WII_USER_DIR;
 		}
 		else
@@ -742,6 +730,19 @@ std::string &GetUserPath(const unsigned int DirIDX, const std::string &newPath)
 	return paths[DirIDX];
 }
 
+std::string GetThemeDir(const std::string& theme_name)
+{
+	std::string dir = File::GetUserPath(D_THEMES_IDX) + theme_name + "/";
+
+#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_name + "/";
+#endif
+	
+	return dir;
+}
+
 bool WriteStringToFile(bool text_file, const std::string &str, const char *filename)
 {
 	return File::IOFile(filename, text_file ? "w" : "wb").WriteBytes(str.data(), str.size());
diff --git a/Source/Core/Common/Src/FileUtil.h b/Source/Core/Common/Src/FileUtil.h
index 2747c50cf4..fdadb10b4d 100644
--- a/Source/Core/Common/Src/FileUtil.h
+++ b/Source/Core/Common/Src/FileUtil.h
@@ -1,19 +1,7 @@
-// Copyright (C) 2003 Dolphin Project.
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
-// 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 _FILEUTIL_H_
 #define _FILEUTIL_H_
@@ -132,7 +120,10 @@ bool SetCurrentDir(const std::string &directory);
 
 // Returns a pointer to a string with a Dolphin data dir in the user's home
 // directory. To be used in "multi-user" mode (that is, installed).
-std::string &GetUserPath(const unsigned int DirIDX, const std::string &newPath="");
+const std::string& GetUserPath(const unsigned int DirIDX, const std::string &newPath="");
+
+// probably doesn't belong here
+std::string GetThemeDir(const std::string& theme_name);
 
 // Returns the path to where the sys file are
 std::string GetSysDirectory();
diff --git a/Source/Core/Common/Src/FixedSizeQueue.h b/Source/Core/Common/Src/FixedSizeQueue.h
index a1bf2821c0..0fb625dd5a 100644
--- a/Source/Core/Common/Src/FixedSizeQueue.h
+++ b/Source/Core/Common/Src/FixedSizeQueue.h
@@ -1,19 +1,7 @@
-// Copyright (C) 2003 Dolphin Project.
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
-// 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 _FIXED_SIZE_QUEUE_H_
 #define _FIXED_SIZE_QUEUE_H_
diff --git a/Source/Core/Common/Src/Hash.cpp b/Source/Core/Common/Src/Hash.cpp
index bc72b16f2a..2e221ee396 100644
--- a/Source/Core/Common/Src/Hash.cpp
+++ b/Source/Core/Common/Src/Hash.cpp
@@ -1,19 +1,7 @@
-// Copyright (C) 2003 Dolphin Project.
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
-// 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 "Hash.h"
 #if _M_SSE >= 0x402
@@ -55,7 +43,7 @@ u32 HashFletcher(const u8* data_u8, size_t length)
 
 
 // Implementation from Wikipedia
-// Slightly slower than Fletcher above, but slighly more reliable.
+// Slightly slower than Fletcher above, but slightly more reliable.
 #define MOD_ADLER 65521
 // data: Pointer to the data to be summed; len is in bytes
 u32 HashAdler32(const u8* data, size_t len)
diff --git a/Source/Core/Common/Src/Hash.h b/Source/Core/Common/Src/Hash.h
index 0e385d4270..8bf76cbe88 100644
--- a/Source/Core/Common/Src/Hash.h
+++ b/Source/Core/Common/Src/Hash.h
@@ -1,19 +1,7 @@
-// Copyright (C) 2003 Dolphin Project.
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
-// 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 _HASH_H_
 #define _HASH_H_
diff --git a/Source/Core/Common/Src/IniFile.cpp b/Source/Core/Common/Src/IniFile.cpp
index da44855941..0b265543de 100644
--- a/Source/Core/Common/Src/IniFile.cpp
+++ b/Source/Core/Common/Src/IniFile.cpp
@@ -1,19 +1,8 @@
-// Copyright (C) 2003 Dolphin Project.
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
-// 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 IniFile.h
 
 #include <stdlib.h>
diff --git a/Source/Core/Common/Src/IniFile.h b/Source/Core/Common/Src/IniFile.h
index 31d410e44c..10e1cfdbb9 100644
--- a/Source/Core/Common/Src/IniFile.h
+++ b/Source/Core/Common/Src/IniFile.h
@@ -1,19 +1,7 @@
-// Copyright (C) 2003 Dolphin Project.
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
-// 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 _INIFILE_H_
 #define _INIFILE_H_
diff --git a/Source/Core/Common/Src/LinearDiskCache.h b/Source/Core/Common/Src/LinearDiskCache.h
index b60c849c8e..71ad169530 100644
--- a/Source/Core/Common/Src/LinearDiskCache.h
+++ b/Source/Core/Common/Src/LinearDiskCache.h
@@ -1,19 +1,7 @@
-// Copyright (C) 2003 Dolphin Project.
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
-// 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 _LINEAR_DISKCACHE
 #define _LINEAR_DISKCACHE
diff --git a/Source/Core/Common/Src/Log.h b/Source/Core/Common/Src/Log.h
index e24fd8583c..602d398b63 100644
--- a/Source/Core/Common/Src/Log.h
+++ b/Source/Core/Common/Src/Log.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _LOG_H_
 #define _LOG_H_
diff --git a/Source/Core/Common/Src/LogManager.cpp b/Source/Core/Common/Src/LogManager.cpp
index 8bb204c4e9..49ce8ed9fd 100644
--- a/Source/Core/Common/Src/LogManager.cpp
+++ b/Source/Core/Common/Src/LogManager.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include <algorithm>
 
@@ -116,6 +103,7 @@ LogManager::~LogManager()
 
 	delete m_fileLog;
 	delete m_consoleLog;
+	delete m_debuggerLog;
 }
 
 void LogManager::Log(LogTypes::LOG_LEVELS level, LogTypes::LOG_TYPE type, 
diff --git a/Source/Core/Common/Src/LogManager.h b/Source/Core/Common/Src/LogManager.h
index f7ccb15034..f704a5d44b 100644
--- a/Source/Core/Common/Src/LogManager.h
+++ b/Source/Core/Common/Src/LogManager.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _LOGMANAGER_H_
 #define _LOGMANAGER_H_
@@ -46,7 +33,7 @@ public:
 
 	void Log(LogTypes::LOG_LEVELS, const char *msg);
 
-	bool IsValid() { return (m_logfile != NULL); }
+	bool IsValid() { return (bool)m_logfile; }
 	bool IsEnabled() const { return m_enable; }
 	void SetEnable(bool enable) { m_enable = enable; }
 
diff --git a/Source/Core/Common/Src/MathUtil.cpp b/Source/Core/Common/Src/MathUtil.cpp
index d5be1c3bb1..0e90328ee0 100644
--- a/Source/Core/Common/Src/MathUtil.cpp
+++ b/Source/Core/Common/Src/MathUtil.cpp
@@ -1,19 +1,7 @@
-// Copyright (C) 2003 Dolphin Project.
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
-// 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 "MathUtil.h"
diff --git a/Source/Core/Common/Src/MathUtil.h b/Source/Core/Common/Src/MathUtil.h
index ccb9a95e81..c0221836e3 100644
--- a/Source/Core/Common/Src/MathUtil.h
+++ b/Source/Core/Common/Src/MathUtil.h
@@ -1,19 +1,7 @@
-// Copyright (C) 2003 Dolphin Project.
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
-// 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 _MATH_UTIL_H_
 #define _MATH_UTIL_H_
diff --git a/Source/Core/Common/Src/MemArena.cpp b/Source/Core/Common/Src/MemArena.cpp
index 26ce81f578..487788dc45 100644
--- a/Source/Core/Common/Src/MemArena.cpp
+++ b/Source/Core/Common/Src/MemArena.cpp
@@ -1,19 +1,7 @@
-// Copyright (C) 2003 Dolphin Project.
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
-// 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 "MemoryUtil.h"
@@ -153,7 +141,12 @@ u8* MemArena::Find4GBBase()
 	}
 	return base;
 #else
-	void* base = mmap(0, 0x31000000, PROT_NONE, MAP_ANON | MAP_PRIVATE, -1, 0);
+#ifdef ANDROID
+	const u32 MemSize = 0x04000000;
+#else
+	const u32 MemSize = 0x31000000; 
+#endif
+	void* base = mmap(0, MemSize, 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/MemArena.h b/Source/Core/Common/Src/MemArena.h
index 6951082723..25d5c3ccbe 100644
--- a/Source/Core/Common/Src/MemArena.h
+++ b/Source/Core/Common/Src/MemArena.h
@@ -1,19 +1,7 @@
-// Copyright (C) 2003 Dolphin Project.
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
-// 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 _MEMARENA_H_
 #define _MEMARENA_H_
@@ -25,7 +13,7 @@
 #include "Common.h"
 
 // This class lets you create a block of anonymous RAM, and then arbitrarily map views into it.
-// Multiple views can mirror the same section of the block, which makes it very convient for emulating
+// Multiple views can mirror the same section of the block, which makes it very convenient for emulating
 // memory mirrors.
 
 class MemArena
diff --git a/Source/Core/Common/Src/MemoryUtil.cpp b/Source/Core/Common/Src/MemoryUtil.cpp
index d788783c5a..ce1c5d8a54 100644
--- a/Source/Core/Common/Src/MemoryUtil.cpp
+++ b/Source/Core/Common/Src/MemoryUtil.cpp
@@ -1,19 +1,7 @@
-// Copyright (C) 2003 Dolphin Project.
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
-// 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 "MemoryUtil.h"
diff --git a/Source/Core/Common/Src/MemoryUtil.h b/Source/Core/Common/Src/MemoryUtil.h
index 9df44169c0..49b2589da3 100644
--- a/Source/Core/Common/Src/MemoryUtil.h
+++ b/Source/Core/Common/Src/MemoryUtil.h
@@ -1,19 +1,7 @@
-// Copyright (C) 2003 Dolphin Project.
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
-// 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 _MEMORYUTIL_H
 #define _MEMORYUTIL_H
diff --git a/Source/Core/Common/Src/Misc.cpp b/Source/Core/Common/Src/Misc.cpp
index 8364bda48d..ce42deb4d2 100644
--- a/Source/Core/Common/Src/Misc.cpp
+++ b/Source/Core/Common/Src/Misc.cpp
@@ -1,23 +1,11 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "Common.h"
 
-#ifdef __APPLE__
+// Neither Android nor OS X support TLS
+#if  defined(__APPLE__) || (ANDROID && __clang__)
 #define __thread
 #endif
 
diff --git a/Source/Core/Common/Src/MsgHandler.cpp b/Source/Core/Common/Src/MsgHandler.cpp
index 90369df1ae..0fa1cf39b8 100644
--- a/Source/Core/Common/Src/MsgHandler.cpp
+++ b/Source/Core/Common/Src/MsgHandler.cpp
@@ -1,20 +1,6 @@
-// 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/
-
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include <stdio.h> // System
 
diff --git a/Source/Core/Common/Src/MsgHandler.h b/Source/Core/Common/Src/MsgHandler.h
index 38ee246b4b..7de10c7b0a 100644
--- a/Source/Core/Common/Src/MsgHandler.h
+++ b/Source/Core/Common/Src/MsgHandler.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _MSGHANDLER_H_
 #define _MSGHANDLER_H_
diff --git a/Source/Core/Common/Src/NandPaths.cpp b/Source/Core/Common/Src/NandPaths.cpp
index eb0673afe0..601d2a51ee 100644
--- a/Source/Core/Common/Src/NandPaths.cpp
+++ b/Source/Core/Common/Src/NandPaths.cpp
@@ -1,19 +1,6 @@
-// Copyright (C) 2010 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "CommonPaths.h"
 #include "FileUtil.h"
diff --git a/Source/Core/Common/Src/NandPaths.h b/Source/Core/Common/Src/NandPaths.h
index b45686976c..19228d3176 100644
--- a/Source/Core/Common/Src/NandPaths.h
+++ b/Source/Core/Common/Src/NandPaths.h
@@ -1,19 +1,6 @@
-// Copyright (C) 2010 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef __NANDPATHS_H__
 #define __NANDPATHS_H__
diff --git a/Source/Core/Common/Src/SDCardUtil.h b/Source/Core/Common/Src/SDCardUtil.h
index 96456bd282..4c88c0b30b 100644
--- a/Source/Core/Common/Src/SDCardUtil.h
+++ b/Source/Core/Common/Src/SDCardUtil.h
@@ -12,7 +12,7 @@
 // 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 "Common.h"
diff --git a/Source/Core/Common/Src/StdConditionVariable.h b/Source/Core/Common/Src/StdConditionVariable.h
index 6530712c8f..63f4551950 100644
--- a/Source/Core/Common/Src/StdConditionVariable.h
+++ b/Source/Core/Common/Src/StdConditionVariable.h
@@ -5,9 +5,26 @@
 #define GCC_VER(x,y,z)	((x) * 10000 + (y) * 100 + (z))
 #define GCC_VERSION GCC_VER(__GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__)
 
+#ifndef __has_include
+#define __has_include(s) 0
+#endif
+
 #if GCC_VERSION >= GCC_VER(4,4,0) && __GXX_EXPERIMENTAL_CXX0X__ && !ANDROID
+
 // GCC 4.4 provides <condition_variable>
 #include <condition_variable>
+
+#elif __has_include(<condition_variable>) && !ANDROID
+
+// clang and libc++ provide <condition_variable> on OSX. However, the version
+// of libc++ bundled with OSX 10.7 and 10.8 is buggy: it uses _ as a variable.
+//
+// We work around this issue by undefining and redefining _.
+
+#undef _
+#include <condition_variable>
+#define _(s) wxGetTranslation((s))
+
 #else
 
 // partial std::condition_variable implementation for win32/pthread
diff --git a/Source/Core/Common/Src/StdMutex.h b/Source/Core/Common/Src/StdMutex.h
index 8a5d22f928..f66a5d1b2e 100644
--- a/Source/Core/Common/Src/StdMutex.h
+++ b/Source/Core/Common/Src/StdMutex.h
@@ -5,9 +5,16 @@
 #define GCC_VER(x,y,z)	((x) * 10000 + (y) * 100 + (z))
 #define GCC_VERSION GCC_VER(__GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__)
 
+#ifndef __has_include
+#define __has_include(s) 0
+#endif
+
 #if GCC_VERSION >= GCC_VER(4,4,0) && __GXX_EXPERIMENTAL_CXX0X__ && !ANDROID
 // GCC 4.4 provides <mutex>
 #include <mutex>
+#elif __has_include(<mutex>) && !ANDROID
+// Clang + libc++
+#include <mutex>
 #else
 
 // partial <mutex> implementation for win32/pthread
diff --git a/Source/Core/Common/Src/StdThread.h b/Source/Core/Common/Src/StdThread.h
index 8893c36204..134bbb2fc0 100644
--- a/Source/Core/Common/Src/StdThread.h
+++ b/Source/Core/Common/Src/StdThread.h
@@ -5,12 +5,19 @@
 #define GCC_VER(x,y,z)	((x) * 10000 + (y) * 100 + (z))
 #define GCC_VERSION GCC_VER(__GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__)
 
+#ifndef __has_include
+#define __has_include(s) 0
+#endif
+
 #if GCC_VERSION >= GCC_VER(4,4,0) && __GXX_EXPERIMENTAL_CXX0X__ && !ANDROID
 // GCC 4.4 provides <thread>
 #ifndef _GLIBCXX_USE_SCHED_YIELD
 #define _GLIBCXX_USE_SCHED_YIELD
 #endif
 #include <thread>
+#elif __has_include(<thread>) && !ANDROID
+// Clang + libc++
+#include <thread>
 #else
 
 // partial std::thread implementation for win32/pthread
diff --git a/Source/Core/Common/Src/StringUtil.cpp b/Source/Core/Common/Src/StringUtil.cpp
index 43c4aebf12..99bc2ae6ca 100644
--- a/Source/Core/Common/Src/StringUtil.cpp
+++ b/Source/Core/Common/Src/StringUtil.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -437,8 +424,7 @@ std::string CodeToUTF8(const char* fromcode, const std::basic_string<T>& input)
 	std::string result;
 
 #if defined(ANDROID)
-	result = "Not implemented on Android!";
-
+	result = (char*)input.c_str();
 #else
 	iconv_t const conv_desc = iconv_open("UTF-8", fromcode);
 	if ((iconv_t)-1 == conv_desc)
diff --git a/Source/Core/Common/Src/StringUtil.h b/Source/Core/Common/Src/StringUtil.h
index 9463db5bb1..56c223641b 100644
--- a/Source/Core/Common/Src/StringUtil.h
+++ b/Source/Core/Common/Src/StringUtil.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _STRINGUTIL_H_
 #define _STRINGUTIL_H_
diff --git a/Source/Core/Common/Src/SymbolDB.cpp b/Source/Core/Common/Src/SymbolDB.cpp
index ca71e9bb24..2dd4ee7473 100644
--- a/Source/Core/Common/Src/SymbolDB.cpp
+++ b/Source/Core/Common/Src/SymbolDB.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "SymbolDB.h"
 
diff --git a/Source/Core/Common/Src/SymbolDB.h b/Source/Core/Common/Src/SymbolDB.h
index 00452edb15..e189ca24fa 100644
--- a/Source/Core/Common/Src/SymbolDB.h
+++ b/Source/Core/Common/Src/SymbolDB.h
@@ -1,20 +1,6 @@
-// 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/
-
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 // This file contains a generic symbol map implementation. For CPU-specific
 // magic, derive and extend.
diff --git a/Source/Core/Common/Src/SysConf.cpp b/Source/Core/Common/Src/SysConf.cpp
index 97170e5ff1..9f2581845e 100644
--- a/Source/Core/Common/Src/SysConf.cpp
+++ b/Source/Core/Common/Src/SysConf.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "FileUtil.h"
 #include "SysConf.h"
diff --git a/Source/Core/Common/Src/SysConf.h b/Source/Core/Common/Src/SysConf.h
index fb9c775828..30b5632cf5 100644
--- a/Source/Core/Common/Src/SysConf.h
+++ b/Source/Core/Common/Src/SysConf.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef __SYSCONF_MANAGER_h__
 #define __SYSCONF_MANAGER_h__
diff --git a/Source/Core/Common/Src/Thread.cpp b/Source/Core/Common/Src/Thread.cpp
index 3e8440b74f..14eb832240 100644
--- a/Source/Core/Common/Src/Thread.cpp
+++ b/Source/Core/Common/Src/Thread.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "Thread.h"
 #include "Common.h"
@@ -101,18 +88,18 @@ void SetCurrentThreadName(const char* szThreadName)
 #else // !WIN32, so must be POSIX threads
 
 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) && !(defined ANDROID)
 	cpu_set_t cpu_set;
 	CPU_ZERO(&cpu_set);
-                
+
 	for (int i = 0; i != sizeof(mask) * 8; ++i)
 		if ((mask >> i) & 1)
 			CPU_SET(i, &cpu_set);
-                
+
 	pthread_setaffinity_np(thread, sizeof(cpu_set), &cpu_set);
 #endif
 }
diff --git a/Source/Core/Common/Src/Thread.h b/Source/Core/Common/Src/Thread.h
index b5f899c43b..b0328f7a1f 100644
--- a/Source/Core/Common/Src/Thread.h
+++ b/Source/Core/Common/Src/Thread.h
@@ -1,26 +1,13 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _THREAD_H_
 #define _THREAD_H_
 
-#include "StdThread.h"
-#include "StdMutex.h"
 #include "StdConditionVariable.h"
+#include "StdMutex.h"
+#include "StdThread.h"
 
 // Don't include common.h here as it will break LogManager
 #include "CommonTypes.h"
diff --git a/Source/Core/Common/Src/Thunk.h b/Source/Core/Common/Src/Thunk.h
index ac40babe4c..b1487badf8 100644
--- a/Source/Core/Common/Src/Thunk.h
+++ b/Source/Core/Common/Src/Thunk.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _THUNK_H_
 #define _THUNK_H_
diff --git a/Source/Core/Common/Src/Timer.cpp b/Source/Core/Common/Src/Timer.cpp
index b1beed2066..926de59917 100644
--- a/Source/Core/Common/Src/Timer.cpp
+++ b/Source/Core/Common/Src/Timer.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include <time.h>
 
diff --git a/Source/Core/Common/Src/Timer.h b/Source/Core/Common/Src/Timer.h
index 152d4c60e6..d230c73608 100644
--- a/Source/Core/Common/Src/Timer.h
+++ b/Source/Core/Common/Src/Timer.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _TIMER_H_
 #define _TIMER_H_
diff --git a/Source/Core/Common/Src/Version.cpp b/Source/Core/Common/Src/Version.cpp
index a668d24e1b..f2ed26b75a 100644
--- a/Source/Core/Common/Src/Version.cpp
+++ b/Source/Core/Common/Src/Version.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "Common.h"
 #include "scmrev.h"
diff --git a/Source/Core/Common/Src/VideoBackendBase.cpp b/Source/Core/Common/Src/VideoBackendBase.cpp
index a5aa572039..8db4e2ff79 100644
--- a/Source/Core/Common/Src/VideoBackendBase.cpp
+++ b/Source/Core/Common/Src/VideoBackendBase.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "VideoBackendBase.h"
 
diff --git a/Source/Core/Common/Src/VideoBackendBase.h b/Source/Core/Common/Src/VideoBackendBase.h
index c4455b3234..9c591d05a5 100644
--- a/Source/Core/Common/Src/VideoBackendBase.h
+++ b/Source/Core/Common/Src/VideoBackendBase.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef VIDEO_BACKEND_H_
 #define VIDEO_BACKEND_H_
diff --git a/Source/Core/Common/Src/stdafx.cpp b/Source/Core/Common/Src/stdafx.cpp
index 31f734b17a..b602b39925 100644
--- a/Source/Core/Common/Src/stdafx.cpp
+++ b/Source/Core/Common/Src/stdafx.cpp
@@ -1,18 +1,5 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "stdafx.h"
diff --git a/Source/Core/Common/Src/stdafx.h b/Source/Core/Common/Src/stdafx.h
index 821cd30cea..1a2e716e34 100644
--- a/Source/Core/Common/Src/stdafx.h
+++ b/Source/Core/Common/Src/stdafx.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #pragma once
 
diff --git a/Source/Core/Common/Src/x64ABI.cpp b/Source/Core/Common/Src/x64ABI.cpp
index 468d02d9b9..c47ea02fb4 100644
--- a/Source/Core/Common/Src/x64ABI.cpp
+++ b/Source/Core/Common/Src/x64ABI.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "Common.h"
 #include "x64Emitter.h"
diff --git a/Source/Core/Common/Src/x64ABI.h b/Source/Core/Common/Src/x64ABI.h
index 7226870e58..837e4ec3d8 100644
--- a/Source/Core/Common/Src/x64ABI.h
+++ b/Source/Core/Common/Src/x64ABI.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _JIT_ABI_H_
 #define _JIT_ABI_H_
diff --git a/Source/Core/Common/Src/x64Analyzer.cpp b/Source/Core/Common/Src/x64Analyzer.cpp
index 37a9030a4b..456830e467 100644
--- a/Source/Core/Common/Src/x64Analyzer.cpp
+++ b/Source/Core/Common/Src/x64Analyzer.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "x64Analyzer.h"
 
@@ -33,7 +20,7 @@ bool DisassembleMov(const unsigned char *codePtr, InstructionInfo &info, int acc
 
 	u8 modRMbyte = 0;
 	u8 sibByte = 0;
-    bool hasModRM = false;
+	bool hasModRM = false;
 
 	int displacementSize = 0;
 
@@ -63,10 +50,10 @@ bool DisassembleMov(const unsigned char *codePtr, InstructionInfo &info, int acc
 	// Skip two-byte opcode byte 
 	bool twoByte = false; 
 	if(codeByte == 0x0F) 
-	{ 
+	{
 		twoByte = true; 
 		codeByte2 = *codePtr++;
-	} 
+	}
 
 	if (!twoByte)
 	{
diff --git a/Source/Core/Common/Src/x64Analyzer.h b/Source/Core/Common/Src/x64Analyzer.h
index e9676ec250..705bcd0e9c 100644
--- a/Source/Core/Common/Src/x64Analyzer.h
+++ b/Source/Core/Common/Src/x64Analyzer.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _X64ANALYZER_H_
 #define _X64ANALYZER_H_
diff --git a/Source/Core/Common/Src/x64CPUDetect.cpp b/Source/Core/Common/Src/x64CPUDetect.cpp
index dcde313630..d225262f81 100644
--- a/Source/Core/Common/Src/x64CPUDetect.cpp
+++ b/Source/Core/Common/Src/x64CPUDetect.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include <memory.h>
 
@@ -74,7 +61,7 @@ static inline void do_cpuid(unsigned int *eax, unsigned int *ebx,
 static void __cpuid(int info[4], int x)
 {
 #if defined __FreeBSD__
-    do_cpuid((unsigned int)x, (unsigned int*)info);
+	do_cpuid((unsigned int)x, (unsigned int*)info);
 #else
 	unsigned int eax = x, ebx = 0, ecx = 0, edx = 0;
 	do_cpuid(&eax, &ebx, &ecx, &edx);
diff --git a/Source/Core/Common/Src/x64Emitter.cpp b/Source/Core/Common/Src/x64Emitter.cpp
index 1a74eaef80..7725b63fd8 100644
--- a/Source/Core/Common/Src/x64Emitter.cpp
+++ b/Source/Core/Common/Src/x64Emitter.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "Common.h"
 #include "x64Emitter.h"
@@ -768,6 +755,10 @@ void XEmitter::MOVZX(int dbits, int sbits, X64Reg dest, OpArg src)
 		Write8(0x0F);
 		Write8(0xB7);
 	}
+	else if (sbits == 32 && dbits == 64)
+	{
+		Write8(0x8B);
+	}
 	else
 	{
 		Crash();
@@ -1068,10 +1059,8 @@ 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);
-#endif
+				 code); 
 #endif
 	WriteNormalOp(this, bits, nrmMOV, a1, a2);
 }
@@ -1328,7 +1317,7 @@ void XEmitter::MOVDDUP(X64Reg regOp, OpArg arg)
 
 //There are a few more left
 
-// Also some integer instrucitons are missing
+// Also some integer instructions are missing
 void XEmitter::PACKSSDW(X64Reg dest, OpArg arg) {WriteSSEOp(64, 0x6B, true, dest, arg);}
 void XEmitter::PACKSSWB(X64Reg dest, OpArg arg) {WriteSSEOp(64, 0x63, true, dest, arg);}
 //void PACKUSDW(X64Reg dest, OpArg arg) {WriteSSEOp(64, 0x66, true, dest, arg);} // WRONG
diff --git a/Source/Core/Common/Src/x64Emitter.h b/Source/Core/Common/Src/x64Emitter.h
index 97ba080790..b068579a3a 100644
--- a/Source/Core/Common/Src/x64Emitter.h
+++ b/Source/Core/Common/Src/x64Emitter.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 // WARNING - THIS LIBRARY IS NOT THREAD SAFE!!!
 
@@ -120,7 +107,7 @@ struct OpArg
 		scale = (u8)_scale;
 		offsetOrBaseReg = (u16)rmReg;
 		indexReg = (u16)scaledReg;
-		//if scale == 0 never mind offseting
+		//if scale == 0 never mind offsetting
 		offset = _offset;
 	}
 	void WriteRex(XEmitter *emit, int opBits, int bits, int customOp = -1) const;
@@ -650,7 +637,7 @@ public:
 	void ABI_CallFunctionAC(void *func, const Gen::OpArg &arg1, u32 param2);
 	void ABI_CallFunctionA(void *func, const Gen::OpArg &arg1);
 
-	// Pass a register as a paremeter.
+	// Pass a register as a parameter.
 	void ABI_CallFunctionR(void *func, Gen::X64Reg reg1);
 	void ABI_CallFunctionRR(void *func, Gen::X64Reg reg1, Gen::X64Reg reg2);
 
diff --git a/Source/Core/Common/Src/x64FPURoundMode.cpp b/Source/Core/Common/Src/x64FPURoundMode.cpp
index 41363f7999..903d58e499 100644
--- a/Source/Core/Common/Src/x64FPURoundMode.cpp
+++ b/Source/Core/Common/Src/x64FPURoundMode.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "Common.h"
 #include "FPURoundMode.h"
diff --git a/Source/Core/Common/Src/x64Thunk.cpp b/Source/Core/Common/Src/x64Thunk.cpp
index b9fd54f354..efb876ce81 100644
--- a/Source/Core/Common/Src/x64Thunk.cpp
+++ b/Source/Core/Common/Src/x64Thunk.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include <map>
 
diff --git a/Source/Core/Core/CMakeLists.txt b/Source/Core/Core/CMakeLists.txt
index b8976f42ea..0fed2e0b8a 100644
--- a/Source/Core/Core/CMakeLists.txt
+++ b/Source/Core/Core/CMakeLists.txt
@@ -69,8 +69,7 @@ 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_NewAXWii.cpp
+			Src/HW/DSPHLE/UCodes/UCode_AXWii.cpp
 			Src/HW/DSPHLE/UCodes/UCode_CARD.cpp
 			Src/HW/DSPHLE/UCodes/UCode_InitAudioSystem.cpp
 			Src/HW/DSPHLE/UCodes/UCode_ROM.cpp
@@ -162,11 +161,8 @@ 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)
+			Src/PowerPC/JitCommon/JitCache.cpp)
 
 if(NOT _M_GENERIC)
 	set(SRCS ${SRCS}
@@ -195,7 +191,10 @@ if(NOT _M_GENERIC)
 			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/Jit64/Jit_SystemRegisters.cpp
+			Src/PowerPC/JitCommon/JitBackpatch.cpp
+			Src/PowerPC/JitCommon/JitAsmCommon.cpp
+			Src/PowerPC/JitCommon/Jit_Util.cpp)
 endif()
 if(_M_ARM)
 	set(SRCS ${SRCS}
diff --git a/Source/Core/Core/Core.vcxproj b/Source/Core/Core/Core.vcxproj
index 17495de740..5d0d3b2754 100644
--- a/Source/Core/Core/Core.vcxproj
+++ b/Source/Core/Core/Core.vcxproj
@@ -34,12 +34,12 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <UseDebugLibraries>true</UseDebugLibraries>
     <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <UseDebugLibraries>true</UseDebugLibraries>
     <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <UseDebugLibraries>false</UseDebugLibraries>
@@ -49,7 +49,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <UseDebugLibraries>false</UseDebugLibraries>
@@ -59,7 +59,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -261,7 +261,6 @@
     <ClCompile Include="Src\HW\DSPHLE\UCodes\UCodes.cpp" />
     <ClCompile Include="Src\HW\DSPHLE\UCodes\UCode_AX.cpp" />
     <ClCompile Include="Src\HW\DSPHLE\UCodes\UCode_AXWii.cpp" />
-    <ClCompile Include="Src\HW\DSPHLE\UCodes\UCode_NewAXWii.cpp" />
     <ClCompile Include="Src\HW\DSPHLE\UCodes\UCode_CARD.cpp" />
     <ClCompile Include="Src\HW\DSPHLE\UCodes\UCode_GBA.cpp" />
     <ClCompile Include="Src\HW\DSPHLE\UCodes\UCode_InitAudioSystem.cpp" />
@@ -421,7 +420,6 @@
     <ClInclude Include="Src\Debugger\Dump.h" />
     <ClInclude Include="Src\Debugger\GCELF.h" />
     <ClInclude Include="Src\Debugger\PPCDebugInterface.h" />
-    <ClInclude Include="Src\DolLoader.h" />
     <ClInclude Include="Src\DSP\assemble.h" />
     <ClInclude Include="Src\DSP\disassemble.h" />
     <ClInclude Include="Src\DSP\DSPAccelerator.h" />
@@ -465,11 +463,8 @@
     <ClInclude Include="Src\HW\DSPHLE\MailHandler.h" />
     <ClInclude Include="Src\HW\DSPHLE\UCodes\UCodes.h" />
     <ClInclude Include="Src\HW\DSPHLE\UCodes\UCode_AX.h" />
-    <ClInclude Include="Src\HW\DSPHLE\UCodes\UCode_AX_Structs.h" />
+    <ClInclude Include="Src\HW\DSPHLE\UCodes\UCode_AXStructs.h" />
     <ClInclude Include="Src\HW\DSPHLE\UCodes\UCode_AXWii.h" />
-    <ClInclude Include="Src\HW\DSPHLE\UCodes\UCode_AXWii_Structs.h" />
-    <ClInclude Include="Src\HW\DSPHLE\UCodes\UCode_AXWii_Voice.h" />
-    <ClInclude Include="Src\HW\DSPHLE\UCodes\UCode_NewAXWii.h" />
     <ClInclude Include="Src\HW\DSPHLE\UCodes\UCode_AX_Voice.h" />
     <ClInclude Include="Src\HW\DSPHLE\UCodes\UCode_CARD.h" />
     <ClInclude Include="Src\HW\DSPHLE\UCodes\UCode_GBA.h" />
diff --git a/Source/Core/Core/Core.vcxproj.filters b/Source/Core/Core/Core.vcxproj.filters
index b4f3f47be7..c38d68c303 100644
--- a/Source/Core/Core/Core.vcxproj.filters
+++ b/Source/Core/Core/Core.vcxproj.filters
@@ -196,9 +196,6 @@
     <ClCompile Include="Src\HW\DSPHLE\UCodes\UCode_AXWii.cpp">
       <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
     </ClCompile>
-    <ClCompile Include="Src\HW\DSPHLE\UCodes\UCode_NewAXWii.cpp">
-      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
-    </ClCompile>
     <ClCompile Include="Src\HW\DSPHLE\UCodes\UCode_CARD.cpp">
       <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
     </ClCompile>
@@ -738,21 +735,12 @@
     <ClInclude Include="Src\HW\DSPHLE\UCodes\UCode_AX_Voice.h">
       <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
     </ClInclude>
-    <ClInclude Include="Src\HW\DSPHLE\UCodes\UCode_AX_Structs.h">
+    <ClInclude Include="Src\HW\DSPHLE\UCodes\UCode_AXStructs.h">
       <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
     </ClInclude>
     <ClInclude Include="Src\HW\DSPHLE\UCodes\UCode_AXWii.h">
       <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
     </ClInclude>
-    <ClInclude Include="Src\HW\DSPHLE\UCodes\UCode_AXWii_Structs.h">
-      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\DSPHLE\UCodes\UCode_AXWii_Voice.h">
-      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HW\DSPHLE\UCodes\UCode_NewAXWii.h">
-      <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
-    </ClInclude>
     <ClInclude Include="Src\HW\DSPHLE\UCodes\UCode_CARD.h">
       <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
     </ClInclude>
@@ -1020,7 +1008,6 @@
     <ClInclude Include="Src\PowerPC\CPUCoreBase.h">
       <Filter>PowerPC</Filter>
     </ClInclude>
-    <ClInclude Include="Src\DolLoader.h" />
     <ClInclude Include="Src\NetPlay.h">
       <Filter>NetPlay</Filter>
     </ClInclude>
@@ -1194,4 +1181,4 @@
       <UniqueIdentifier>{3e9e6e83-c1bf-45f9-aeff-231f98f60d29}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/Source/Core/Core/Src/ARDecrypt.cpp b/Source/Core/Core/Src/ARDecrypt.cpp
index 04072cebcb..db3134acb0 100644
--- a/Source/Core/Core/Src/ARDecrypt.cpp
+++ b/Source/Core/Core/Src/ARDecrypt.cpp
@@ -1,23 +1,11 @@
-// Copyright (C) 2003 Dolphin Project.
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 // Most of the code in this file is from:
-//	GCNcrypt - Gamecube AR Crypto Program
-//	Copyright (C) 2003-2004 Parasyte
+// GCNcrypt - Gamecube AR Crypto Program
+// Copyright (C) 2003-2004 Parasyte
 
-// 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 "ARDecrypt.h"
 #include <algorithm>
diff --git a/Source/Core/Core/Src/ARDecrypt.h b/Source/Core/Core/Src/ARDecrypt.h
index 5a9fcbce88..45004edfa3 100644
--- a/Source/Core/Core/Src/ARDecrypt.h
+++ b/Source/Core/Core/Src/ARDecrypt.h
@@ -1,19 +1,7 @@
-// Copyright (C) 2003 Dolphin Project.
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
-// 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 _ARDECRYPT_H_
 #define _ARDECRYPT_H_
 
diff --git a/Source/Core/Core/Src/ActionReplay.cpp b/Source/Core/Core/Src/ActionReplay.cpp
index 98857fae97..7c1742a1cb 100644
--- a/Source/Core/Core/Src/ActionReplay.cpp
+++ b/Source/Core/Core/Src/ActionReplay.cpp
@@ -1,19 +1,7 @@
-// Copyright (C) 2003 Dolphin Project.
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
-// 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/
 
 // -----------------------------------------------------------------------------------------
 // Partial Action Replay code system implementation.
@@ -26,7 +14,7 @@
 
 // -------------------------------------------------------------------------------------------------------------
 // Code Types:
-// (Unconditonal) Normal Codes (0): this one has subtypes inside
+// (Unconditional) Normal Codes (0): this one has subtypes inside
 // (Conditional) Normal Codes (1 - 7): these just compare values and set the line skip info
 // Zero Codes: any code with no address.  These codes are used to do special operations like memory copy, etc
 // -------------------------------------------------------------------------------------------------------------
@@ -54,7 +42,7 @@ enum
 	ZCODE_ROW	= 0x03, 
 	ZCODE_04	= 0x04,
 
-	// Conditonal Codes
+	// Conditional Codes
 	CONDTIONAL_EQUAL				= 0x01,
 	CONDTIONAL_NOT_EQUAL			= 0x02, 
 	CONDTIONAL_LESS_THAN_SIGNED		= 0x03,
@@ -191,14 +179,16 @@ void LoadCodes(IniFile &ini, bool forceLoad)
 		{
 			AREntry op;
 			bool success_addr = TryParse(std::string("0x") + pieces[0], &op.cmd_addr);
-   			bool success_val = TryParse(std::string("0x") + pieces[1], &op.value);
+			bool success_val = TryParse(std::string("0x") + pieces[1], &op.value);
 			if (!(success_addr | success_val)) {
 				PanicAlertT("Action Replay Error: invalid AR code line: %s", line.c_str());
 				if (!success_addr) PanicAlertT("The address is invalid");
 				if (!success_val) PanicAlertT("The value is invalid");
 			}
 			else
+			{
 				currentCode.ops.push_back(op);
+			}
 		}
 		else
 		{
@@ -535,7 +525,7 @@ bool Subtype_RamWriteAndFill(const ARAddr addr, const u32 data)
 
 	case DATATYPE_32BIT_FLOAT:
 	case DATATYPE_32BIT: // Dword write
-		LogInfo("32bit Write");
+		LogInfo("32-bit Write");
 		LogInfo("--------");
 		Memory::Write_U32(data, new_addr);
 		LogInfo("Wrote %08x to address %08x", data, new_addr);
diff --git a/Source/Core/Core/Src/ActionReplay.h b/Source/Core/Core/Src/ActionReplay.h
index e9f389b591..42c40f08c4 100644
--- a/Source/Core/Core/Src/ActionReplay.h
+++ b/Source/Core/Core/Src/ActionReplay.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _ACTIONREPLAY_H_
 #define _ACTIONREPLAY_H_
diff --git a/Source/Core/Core/Src/Boot/Boot.cpp b/Source/Core/Core/Src/Boot/Boot.cpp
index aaaa4dd39a..6f8f67bf11 100644
--- a/Source/Core/Core/Src/Boot/Boot.cpp
+++ b/Source/Core/Core/Src/Boot/Boot.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 
 #include "Common.h" // Common
@@ -53,7 +40,8 @@
 
 void CBoot::Load_FST(bool _bIsWii)
 {
-	if (!VolumeHandler::IsValid()) return;
+	if (!VolumeHandler::IsValid())
+		return;
 
 	// copy first 20 bytes of disc to start of Mem 1
 	VolumeHandler::ReadToPtr(Memory::GetPointer(0x80000000), 0, 0x20);		
@@ -108,7 +96,7 @@ std::string CBoot::GenerateMapFilename()
 		return File::GetUserPath(D_MAPS_IDX) + _StartupPara.GetUniqueID() + ".map";
 	}
 
-    return std::string("unknown map");
+	return std::string("unknown map");
 }
 
 bool CBoot::LoadMapFromFilename(const std::string &_rFilename, const char *_gameID)
@@ -119,7 +107,7 @@ bool CBoot::LoadMapFromFilename(const std::string &_rFilename, const char *_game
 	std::string strMapFilename = GenerateMapFilename();
 
 	bool success = false;
-    if (!g_symbolDB.LoadMap(strMapFilename.c_str()))
+	if (!g_symbolDB.LoadMap(strMapFilename.c_str()))
 	{
 		if (_gameID != NULL)
 		{
@@ -176,7 +164,7 @@ bool CBoot::Load_BS2(const std::string& _rBootROMFilename)
 
 	std::string BootRegion = _rBootROMFilename.substr(_rBootROMFilename.find_last_of(DIR_SEP) - 3, 3);
 	if (BootRegion != ipl_region)
-		PanicAlert("%s ipl found in %s directory, the disc may not be recognized", ipl_region.c_str(), BootRegion.c_str());
+		PanicAlert("%s IPL found in %s directory. The disc may not be recognized", ipl_region.c_str(), BootRegion.c_str());
 
 	// Run the descrambler over the encrypted section containing BS1/BS2
 	CEXIIPL::Descrambler((u8*)data.data()+0x100, 0x1AFE00);
@@ -184,7 +172,7 @@ bool CBoot::Load_BS2(const std::string& _rBootROMFilename)
 	Memory::WriteBigEData((const u8*)data.data() + 0x100, 0x81200000, 0x700);
 	Memory::WriteBigEData((const u8*)data.data() + 0x820, 0x81300000, 0x1AFE00);
 	PC = 0x81200000;
-    return true;
+	return true;
 }
 
 
@@ -321,7 +309,7 @@ bool CBoot::BootUp()
 		if (LoadMapFromFilename(_StartupPara.m_strFilename))
 			HLE::PatchFunctions();
 
-        break;
+		break;
 	}
 
 	// ELF
diff --git a/Source/Core/Core/Src/Boot/Boot.h b/Source/Core/Core/Src/Boot/Boot.h
index e1cf191672..69053b0f71 100644
--- a/Source/Core/Core/Src/Boot/Boot.h
+++ b/Source/Core/Core/Src/Boot/Boot.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _BOOT_H
 #define _BOOT_H
@@ -43,10 +30,10 @@ private:
 	static bool EmulatedBS2_GC();
 	static bool EmulatedBS2_Wii();
 	static bool EmulatedBS2(bool _bIsWii);
-    static bool Load_BS2(const std::string& _rBootROMFilename);
+	static bool Load_BS2(const std::string& _rBootROMFilename);
 	static void Load_FST(bool _bIsWii);
 
-    static bool SetupWiiMemory(unsigned int _CountryCode);
+	static bool SetupWiiMemory(unsigned int _CountryCode);
 };
 
 #endif
diff --git a/Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp b/Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp
index 5011543448..004c40b576 100644
--- a/Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp
+++ b/Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "Common.h"
 #include "CommonPaths.h"
@@ -187,10 +174,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;
+		region_filename = File::GetSysDirectory() + WII_SYS_DIR + DIR_SEP + WII_KOR_SETTING;
+		break;
 	case DiscIO::IVolume::COUNTRY_TAIWAN: 
-        // TODO: Determine if Taiwan has 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;
@@ -234,7 +221,7 @@ bool CBoot::SetupWiiMemory(unsigned int _CountryCode)
 	0x80000038	Start of FST
 	0x8000003c	Size of FST Size
 	0x80000060	Copyright code
-	*/	
+	*/
 
 	DVDInterface::DVDRead(0x00000000, 0x00000000, 0x20); // Game Code
 	Memory::Write_U32(0x0D15EA5E, 0x00000020);		// Another magic word
@@ -297,7 +284,7 @@ bool CBoot::SetupWiiMemory(unsigned int _CountryCode)
 // copy the apploader to 0x81200000
 // execute the apploader
 bool CBoot::EmulatedBS2_Wii()
-{	
+{
 	INFO_LOG(BOOT, "Faking Wii BS2...");
 
 	// setup wii memory
diff --git a/Source/Core/Core/Src/Boot/Boot_DOL.cpp b/Source/Core/Core/Src/Boot/Boot_DOL.cpp
index ee0b1b3505..b1476f82d0 100644
--- a/Source/Core/Core/Src/Boot/Boot_DOL.cpp
+++ b/Source/Core/Core/Src/Boot/Boot_DOL.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "Boot_DOL.h"
 #include "FileUtil.h"
diff --git a/Source/Core/Core/Src/Boot/Boot_DOL.h b/Source/Core/Core/Src/Boot/Boot_DOL.h
index 76a8c6d17b..690a58eefd 100644
--- a/Source/Core/Core/Src/Boot/Boot_DOL.h
+++ b/Source/Core/Core/Src/Boot/Boot_DOL.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _BOOT_DOL_H
 #define _BOOT_DOL_H
diff --git a/Source/Core/Core/Src/Boot/Boot_ELF.cpp b/Source/Core/Core/Src/Boot/Boot_ELF.cpp
index 9fa86a9183..06e4a33bd8 100644
--- a/Source/Core/Core/Src/Boot/Boot_ELF.cpp
+++ b/Source/Core/Core/Src/Boot/Boot_ELF.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "../PowerPC/PowerPC.h"
 #include "Boot.h"
@@ -63,7 +50,7 @@ bool CBoot::IsElfWii(const char *filename)
 	}
 
 	delete[] mem;
-    return isWii;
+	return isWii;
 }
 
 
@@ -92,5 +79,5 @@ bool CBoot::Boot_ELF(const char *filename)
 	PC = reader.GetEntryPoint();
 	delete[] mem;
 
-    return true;
+	return true;
 }
diff --git a/Source/Core/Core/Src/Boot/Boot_ELF.h b/Source/Core/Core/Src/Boot/Boot_ELF.h
index 0933990d5c..013cbd45db 100644
--- a/Source/Core/Core/Src/Boot/Boot_ELF.h
+++ b/Source/Core/Core/Src/Boot/Boot_ELF.h
@@ -1,18 +1,5 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #pragma once
diff --git a/Source/Core/Core/Src/Boot/Boot_WiiWAD.cpp b/Source/Core/Core/Src/Boot/Boot_WiiWAD.cpp
index a86c38286d..dd4d8e2f2f 100644
--- a/Source/Core/Core/Src/Boot/Boot_WiiWAD.cpp
+++ b/Source/Core/Core/Src/Boot/Boot_WiiWAD.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "Boot.h"
 #include "../PowerPC/PowerPC.h"
diff --git a/Source/Core/Core/Src/Boot/ElfReader.cpp b/Source/Core/Core/Src/Boot/ElfReader.cpp
index 30585ff553..5aa0e2b78d 100644
--- a/Source/Core/Core/Src/Boot/ElfReader.cpp
+++ b/Source/Core/Core/Src/Boot/ElfReader.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include <string>
 
diff --git a/Source/Core/Core/Src/Boot/ElfReader.h b/Source/Core/Core/Src/Boot/ElfReader.h
index 6a3c559296..de071572a6 100644
--- a/Source/Core/Core/Src/Boot/ElfReader.h
+++ b/Source/Core/Core/Src/Boot/ElfReader.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _ELFREADER_H
 #define _ELFREADER_H
diff --git a/Source/Core/Core/Src/Boot/ElfTypes.h b/Source/Core/Core/Src/Boot/ElfTypes.h
index 941f825cb2..c696b24a07 100644
--- a/Source/Core/Core/Src/Boot/ElfTypes.h
+++ b/Source/Core/Core/Src/Boot/ElfTypes.h
@@ -1,3 +1,7 @@
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
+
 #ifndef _ELFTYPES_H
 #define _ELFTYPES_H
 
@@ -189,59 +193,59 @@ typedef unsigned int  Elf32_Word;
 // ELF file header
 struct Elf32_Ehdr 
 {
-    unsigned char e_ident[EI_NIDENT];
-    Elf32_Half    e_type;
-    Elf32_Half    e_machine;
-    Elf32_Word    e_version;
-    Elf32_Addr    e_entry;
-    Elf32_Off     e_phoff;
-    Elf32_Off     e_shoff;
-    Elf32_Word    e_flags;
-    Elf32_Half    e_ehsize;
-    Elf32_Half    e_phentsize;
-    Elf32_Half    e_phnum;
-    Elf32_Half    e_shentsize;
-    Elf32_Half    e_shnum;
-    Elf32_Half    e_shstrndx;
+	unsigned char e_ident[EI_NIDENT];
+	Elf32_Half    e_type;
+	Elf32_Half    e_machine;
+	Elf32_Word    e_version;
+	Elf32_Addr    e_entry;
+	Elf32_Off     e_phoff;
+	Elf32_Off     e_shoff;
+	Elf32_Word    e_flags;
+	Elf32_Half    e_ehsize;
+	Elf32_Half    e_phentsize;
+	Elf32_Half    e_phnum;
+	Elf32_Half    e_shentsize;
+	Elf32_Half    e_shnum;
+	Elf32_Half    e_shstrndx;
 };
 
 // Section header
 struct Elf32_Shdr 
 {
-    Elf32_Word sh_name;
-    Elf32_Word sh_type;
-    Elf32_Word sh_flags;
-    Elf32_Addr sh_addr;
-    Elf32_Off  sh_offset;
-    Elf32_Word sh_size;
-    Elf32_Word sh_link;
-    Elf32_Word sh_info;
-    Elf32_Word sh_addralign;
-    Elf32_Word sh_entsize;
+	Elf32_Word sh_name;
+	Elf32_Word sh_type;
+	Elf32_Word sh_flags;
+	Elf32_Addr sh_addr;
+	Elf32_Off  sh_offset;
+	Elf32_Word sh_size;
+	Elf32_Word sh_link;
+	Elf32_Word sh_info;
+	Elf32_Word sh_addralign;
+	Elf32_Word sh_entsize;
 };
 
 // Segment header
 struct Elf32_Phdr 
 {
-    Elf32_Word p_type;
-    Elf32_Off  p_offset;
-    Elf32_Addr p_vaddr;
-    Elf32_Addr p_paddr;
-    Elf32_Word p_filesz;
-    Elf32_Word p_memsz;
-    Elf32_Word p_flags;
-    Elf32_Word p_align;
+	Elf32_Word p_type;
+	Elf32_Off  p_offset;
+	Elf32_Addr p_vaddr;
+	Elf32_Addr p_paddr;
+	Elf32_Word p_filesz;
+	Elf32_Word p_memsz;
+	Elf32_Word p_flags;
+	Elf32_Word p_align;
 };
 
 // Symbol table entry
 struct Elf32_Sym 
 {
-    Elf32_Word    st_name;
-    Elf32_Addr    st_value;
-    Elf32_Word    st_size;
-    unsigned char st_info;
-    unsigned char st_other;
-    Elf32_Half    st_shndx;
+	Elf32_Word    st_name;
+	Elf32_Addr    st_value;
+	Elf32_Word    st_size;
+	unsigned char st_info;
+	unsigned char st_other;
+	Elf32_Half    st_shndx;
 };
 
 #define ELF32_ST_BIND(i)   ((i)>>4)
@@ -251,15 +255,15 @@ struct Elf32_Sym
 // Relocation entries
 struct Elf32_Rel 
 {
-    Elf32_Addr r_offset;
-    Elf32_Word r_info;
+	Elf32_Addr r_offset;
+	Elf32_Word r_info;
 };
 
 struct Elf32_Rela 
 {
-    Elf32_Addr  r_offset;
-    Elf32_Word  r_info;
-    Elf32_Sword r_addend;
+	Elf32_Addr  r_offset;
+	Elf32_Word  r_info;
+	Elf32_Sword r_addend;
 };
 
 #define ELF32_R_SYM(i) ((i)>>8)
@@ -273,8 +277,8 @@ struct Elf32_Dyn
 	union 
 	{
 		Elf32_Word d_val;
-        Elf32_Addr d_ptr; 
-    } d_un;
+		Elf32_Addr d_ptr; 
+	} d_un;
 };
 
 #endif
diff --git a/Source/Core/Core/Src/BootManager.cpp b/Source/Core/Core/Src/BootManager.cpp
index 88e0cebcb6..f829f3f4d6 100644
--- a/Source/Core/Core/Src/BootManager.cpp
+++ b/Source/Core/Core/Src/BootManager.cpp
@@ -1,19 +1,7 @@
-// Copyright (C) 2003 Dolphin Project.
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
-// 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/
 
 // File description
 // -------------
@@ -55,7 +43,7 @@ namespace BootManager
 struct ConfigCache
 {
 	bool valid, bCPUThread, bSkipIdle, bEnableFPRF, bMMU, bDCBZOFF,
-		bVBeam, bSyncGPU, bFastDiscSpeed, bMergeBlocks, bDSPHLE, bHLE_BS2;
+		bVBeamSpeedHack, bSyncGPU, bFastDiscSpeed, bMergeBlocks, bDSPHLE, bHLE_BS2;
 	int iTLBHack, iCPUCore;
 	std::string strBackend;
 };
@@ -78,7 +66,8 @@ bool BootCore(const std::string& _rFilename)
 	StartUp.hInstance = Host_GetInstance();
 
 	// If for example the ISO file is bad we return here
-	if (!StartUp.AutoSetup(SCoreStartupParameter::BOOT_DEFAULT)) return false;
+	if (!StartUp.AutoSetup(SCoreStartupParameter::BOOT_DEFAULT))
+		return false;
 
 	// Load game specific settings
 	IniFile game_ini;
@@ -94,7 +83,7 @@ bool BootCore(const std::string& _rFilename)
 		config_cache.bMMU = StartUp.bMMU;
 		config_cache.bDCBZOFF = StartUp.bDCBZOFF;
 		config_cache.iTLBHack = StartUp.iTLBHack;
-		config_cache.bVBeam = StartUp.bVBeam;
+		config_cache.bVBeamSpeedHack = StartUp.bVBeamSpeedHack;
 		config_cache.bSyncGPU = StartUp.bSyncGPU;
 		config_cache.bFastDiscSpeed = StartUp.bFastDiscSpeed;
 		config_cache.bMergeBlocks = StartUp.bMergeBlocks;
@@ -109,7 +98,7 @@ bool BootCore(const std::string& _rFilename)
 		game_ini.Get("Core", "MMU",					&StartUp.bMMU, StartUp.bMMU);
 		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", "VBeam",				&StartUp.bVBeamSpeedHack, StartUp.bVBeamSpeedHack);
 		game_ini.Get("Core", "SyncGPU",				&StartUp.bSyncGPU, StartUp.bSyncGPU);
 		game_ini.Get("Core", "FastDiscSpeed",		&StartUp.bFastDiscSpeed, StartUp.bFastDiscSpeed);
 		game_ini.Get("Core", "BlockMerging",		&StartUp.bMergeBlocks, StartUp.bMergeBlocks);
@@ -169,7 +158,7 @@ void Stop()
 		StartUp.bMMU = config_cache.bMMU;
 		StartUp.bDCBZOFF = config_cache.bDCBZOFF;
 		StartUp.iTLBHack = config_cache.iTLBHack;
-		StartUp.bVBeam = config_cache.bVBeam;
+		StartUp.bVBeamSpeedHack = config_cache.bVBeamSpeedHack;
 		StartUp.bSyncGPU = config_cache.bSyncGPU;
 		StartUp.bFastDiscSpeed = config_cache.bFastDiscSpeed;
 		StartUp.bMergeBlocks = config_cache.bMergeBlocks;
diff --git a/Source/Core/Core/Src/BootManager.h b/Source/Core/Core/Src/BootManager.h
index c688dd3994..41f3b3f8d0 100644
--- a/Source/Core/Core/Src/BootManager.h
+++ b/Source/Core/Core/Src/BootManager.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _BOOTMANAGER_H
 #define _BOOTMANAGER_H
diff --git a/Source/Core/Core/Src/ConfigManager.cpp b/Source/Core/Core/Src/ConfigManager.cpp
index ab0fef3498..485c1ab259 100644
--- a/Source/Core/Core/Src/ConfigManager.cpp
+++ b/Source/Core/Core/Src/ConfigManager.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include <string>
 
@@ -37,17 +24,17 @@ static const struct {
 	{ "RefreshList",	0,			0 /* wxMOD_NONE */ },
 
 	{ "PlayPause",		80 /* 'P' */,		2 /* wxMOD_CMD */ },
-	{ "Stop",		87 /* 'W' */,		2 /* wxMOD_CMD */ },
-	{ "Reset",		0,			0 /* wxMOD_NONE */ },
+	{ "Stop",			87 /* 'W' */,		2 /* wxMOD_CMD */ },
+	{ "Reset",			0,			0 /* wxMOD_NONE */ },
 	{ "FrameAdvance",	0,			0 /* wxMOD_NONE */ },
 
 	{ "StartRecording",	0,			0 /* wxMOD_NONE */ },
 	{ "PlayRecording",	0,			0 /* wxMOD_NONE */ },
-	{ "ExportRecording",	0,			0 /* wxMOD_NONE */ },
+	{ "ExportRecording",	0,		0 /* wxMOD_NONE */ },
 	{ "Readonlymode",	0,			0 /* wxMOD_NONE */ },
 
 	{ "ToggleFullscreen",	70 /* 'F' */,		2 /* wxMOD_CMD */ },
-	{ "Screenshot",		83 /* 'S' */,		2 /* wxMOD_CMD */ },
+	{ "Screenshot",			83 /* 'S' */,		2 /* wxMOD_CMD */ },
 
 	{ "Wiimote1Connect",	49 /* '1' */,		2 /* wxMOD_CMD */ },
 	{ "Wiimote2Connect",	50 /* '2' */,		2 /* wxMOD_CMD */ },
@@ -60,12 +47,12 @@ static const struct {
 
 	{ "PlayPause",		349 /* WXK_F10 */,	0 /* wxMOD_NONE */ },
 	{ "Stop",		27 /* WXK_ESCAPE */,	0 /* wxMOD_NONE */ },
-	{ "Reset",		0,			0 /* wxMOD_NONE */ },
+	{ "Reset",			0,			0 /* wxMOD_NONE */ },
 	{ "FrameAdvance",	0,			0 /* wxMOD_NONE */ },
 
 	{ "StartRecording",	0,			0 /* wxMOD_NONE */ },
 	{ "PlayRecording",	0,			0 /* wxMOD_NONE */ },
-	{ "ExportRecording",	0,			0 /* wxMOD_NONE */ },
+	{ "ExportRecording",0,			0 /* wxMOD_NONE */ },
 	{ "Readonlymode",	0,			0 /* wxMOD_NONE */ },
 
 	{ "ToggleFullscreen",	13 /* WXK_RETURN */,	1 /* wxMOD_ALT */ },
@@ -155,7 +142,7 @@ void SConfig::SaveSettings()
 	ini.Set("General", "NANDRoot",			m_NANDPath);
 	ini.Set("General", "WirelessMac",		m_WirelessMac);
 
-	// Interface		
+	// Interface
 	ini.Set("Interface", "ConfirmStop",			m_LocalCoreStartupParameter.bConfirmStop);
 	ini.Set("Interface", "UsePanicHandlers",	m_LocalCoreStartupParameter.bUsePanicHandlers);
 	ini.Set("Interface", "OnScreenDisplayMessages",	m_LocalCoreStartupParameter.bOnScreenDisplayMessages);
@@ -214,6 +201,7 @@ void SConfig::SaveSettings()
 	// Core
 	ini.Set("Core", "HLE_BS2",			m_LocalCoreStartupParameter.bHLE_BS2);
 	ini.Set("Core", "CPUCore",			m_LocalCoreStartupParameter.iCPUCore);
+	ini.Set("Core", "Fastmem",			m_LocalCoreStartupParameter.bFastmem);
 	ini.Set("Core", "CPUThread",		m_LocalCoreStartupParameter.bCPUThread);
 	ini.Set("Core", "DSPThread",		m_LocalCoreStartupParameter.bDSPThread);
 	ini.Set("Core", "DSPHLE",			m_LocalCoreStartupParameter.bDSPHLE);
@@ -367,6 +355,7 @@ void SConfig::LoadSettings()
 #else
 		ini.Get("Core", "CPUCore",		&m_LocalCoreStartupParameter.iCPUCore,		1);
 #endif
+		ini.Get("Core", "Fastmem",		&m_LocalCoreStartupParameter.bFastmem,		true);
 		ini.Get("Core", "DSPThread",	&m_LocalCoreStartupParameter.bDSPThread,	false);
 		ini.Get("Core", "DSPHLE",		&m_LocalCoreStartupParameter.bDSPHLE,		true);
 		ini.Get("Core", "CPUThread",	&m_LocalCoreStartupParameter.bCPUThread,	true);
@@ -403,7 +392,7 @@ void SConfig::LoadSettings()
 		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", "VBeam",			&m_LocalCoreStartupParameter.bVBeamSpeedHack,			false);
 		ini.Get("Core", "SyncGPU",			&m_LocalCoreStartupParameter.bSyncGPU,			false);
 		ini.Get("Core", "FastDiscSpeed",	&m_LocalCoreStartupParameter.bFastDiscSpeed,	false);
 		ini.Get("Core", "DCBZ",				&m_LocalCoreStartupParameter.bDCBZOFF,			false);
@@ -426,6 +415,8 @@ void SConfig::LoadSettings()
 		ini.Get("DSP", "Backend", &sBackend, BACKEND_COREAUDIO);
 	#elif defined _WIN32
 		ini.Get("DSP", "Backend", &sBackend, BACKEND_DIRECTSOUND);
+	#elif defined ANDROID
+		ini.Get("DSP", "Backend", &sBackend, BACKEND_OPENSLES);
 	#else
 		ini.Get("DSP", "Backend", &sBackend, BACKEND_NULLSOUND);
 	#endif
diff --git a/Source/Core/Core/Src/ConfigManager.h b/Source/Core/Core/Src/ConfigManager.h
index 4a36b37335..badd90e4d6 100644
--- a/Source/Core/Core/Src/ConfigManager.h
+++ b/Source/Core/Core/Src/ConfigManager.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _CONFIGMANAGER_H
 #define _CONFIGMANAGER_H
@@ -27,7 +14,7 @@
 #include "SysConf.h"
 
 // DSP Backend Types
-#define BACKEND_NULLSOUND	"No audio output"
+#define BACKEND_NULLSOUND	_trans("No audio output")
 #define BACKEND_ALSA		"ALSA"
 #define BACKEND_AOSOUND		"AOSound"
 #define BACKEND_COREAUDIO	"CoreAudio"
diff --git a/Source/Core/Core/Src/Console.cpp b/Source/Core/Core/Src/Console.cpp
index b0ef416a84..15a19b4b74 100644
--- a/Source/Core/Core/Src/Console.cpp
+++ b/Source/Core/Core/Src/Console.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include <iostream>
 #include <cstring>
@@ -38,12 +25,12 @@ void Console_Submit(const char *cmd)
 	CASE1("r")
 	{
 		Core::StartTrace(false);
-		INFO_LOG(CONSOLE, "read tracing started.");
+		INFO_LOG(CONSOLE, "Read tracing started.");
 	}
 	CASE1("w")
 	{
 		Core::StartTrace(true);
-		INFO_LOG(CONSOLE, "write tracing started.");
+		INFO_LOG(CONSOLE, "Write tracing started.");
 	}
 	CASE("trans")
 	{
@@ -150,5 +137,7 @@ void Console_Submit(const char *cmd)
 		g_symbolDB.List();
 	}
 	else
+	{
 		ERROR_LOG(CONSOLE, "Invalid command");
+	}
 }
diff --git a/Source/Core/Core/Src/Console.h b/Source/Core/Core/Src/Console.h
index 0245eeb749..00b0a83f71 100644
--- a/Source/Core/Core/Src/Console.h
+++ b/Source/Core/Core/Src/Console.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 
 // Simple debugging console currently residing in the Logging window. Not used much.
diff --git a/Source/Core/Core/Src/Core.cpp b/Source/Core/Core/Src/Core.cpp
index 7c0015dbbb..0d8752195f 100644
--- a/Source/Core/Core/Src/Core.cpp
+++ b/Source/Core/Core/Src/Core.cpp
@@ -1,20 +1,6 @@
-// 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/
-
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifdef _WIN32
 #include <windows.h>
@@ -143,7 +129,9 @@ void DisplayMessage(const char *message, int time_in_ms)
 			Host_UpdateStatusBar(message);
 	}
 	else
+	{
 		Host_UpdateTitle(message);
+	}
 }
 
 void Callback_DebuggerBreak()
@@ -311,6 +299,7 @@ void CpuThread()
 	}
 
 	#if defined(_M_X64) || _M_ARM
+	if (_CoreParameter.bFastmem)
 		EMM::InstallExceptionHandler(); // Let's run under memory watch
 	#endif
 
@@ -555,7 +544,9 @@ static std::string GenerateScreenshotName()
 
 	std::string name;
 	for (int i = 1; File::Exists(name = StringFromFormat("%s-%d.png", path.c_str(), i)); ++i)
-	{}
+	{
+		// TODO?
+	}
 
 	return name;
 }
@@ -614,7 +605,8 @@ void VideoThrottle()
 		u32 frametime = ((SConfig::GetInstance().b_UseFPS)? Common::AtomicLoad(DrawnFrame) : DrawnVideo) * 1000 / TargetVPS;
 
 		u32 timeDifference = (u32)Timer.GetTimeDifference();
-		if (timeDifference < frametime) {
+		if (timeDifference < frametime)
+		{
 			Common::SleepCurrentThread(frametime - timeDifference - 1);
 		}
 
@@ -670,7 +662,7 @@ const char *Callback_ISOName()
 		SConfig::GetInstance().m_LocalCoreStartupParameter;
 	if (params.m_strName.length() > 0)
 		return params.m_strName.c_str();
-	else	
+	else
 		return "";
 }
 
@@ -742,10 +734,12 @@ void UpdateTitle()
 	}
 
 	if (_CoreParameter.bRenderToMain &&
-		SConfig::GetInstance().m_InterfaceStatusbar) {
+		SConfig::GetInstance().m_InterfaceStatusbar)
+	{
 		Host_UpdateStatusBar(SMessage.c_str());
 		Host_UpdateTitle(scm_rev_str);
-	} else
+	}
+	else
 		Host_UpdateTitle(TMessage.c_str());
 	}
 
diff --git a/Source/Core/Core/Src/Core.h b/Source/Core/Core/Src/Core.h
index 2b88b16510..0fe904ffc1 100644
--- a/Source/Core/Core/Src/Core.h
+++ b/Source/Core/Core/Src/Core.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 
 // Core
@@ -44,9 +31,9 @@ void Callback_VideoCopiedToXFB(bool video_update);
 
 enum EState
 {
-    CORE_UNINITIALIZED,
-    CORE_PAUSE,
-    CORE_RUN,
+	CORE_UNINITIALIZED,
+	CORE_PAUSE,
+	CORE_RUN,
 	CORE_STOPPING
 };
 
@@ -69,7 +56,7 @@ void SaveScreenShot();
 void Callback_WiimoteInterruptChannel(int _number, u16 _channelID, const void* _pData, u32 _Size);
 
 void* GetWindowHandle();
-    
+
 void StartTrace(bool write);
 
 // This displays messages in a user-visible way.
@@ -82,7 +69,7 @@ inline void DisplayMessage(const std::string &message, int time_in_ms)
 	
 std::string GetStateFileName();
 void SetStateFileName(std::string val);
-    
+
 int SyncTrace();
 void SetBlockStart(u32 addr);
 void StopTrace();
diff --git a/Source/Core/Core/Src/CoreParameter.cpp b/Source/Core/Core/Src/CoreParameter.cpp
index 0a6bb795d5..e05816cb64 100644
--- a/Source/Core/Core/Src/CoreParameter.cpp
+++ b/Source/Core/Core/Src/CoreParameter.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "Common.h"
 #include "CommonPaths.h"
@@ -46,10 +33,10 @@ SCoreStartupParameter::SCoreStartupParameter()
   bCPUThread(true), bDSPThread(false), bDSPHLE(true),
   bSkipIdle(true), bNTSC(false), bForceNTSCJ(false),
   bHLE_BS2(true), bEnableCheats(false),
-  bMergeBlocks(false),
+  bMergeBlocks(false), bEnableMemcardSaving(true),
   bDPL2Decoder(false), iLatency(14),
   bRunCompareServer(false), bRunCompareClient(false),
-  bMMU(false), bDCBZOFF(false), iTLBHack(0), bVBeam(false),
+  bMMU(false), bDCBZOFF(false), iTLBHack(0), bVBeamSpeedHack(false),
   bSyncGPU(false), bFastDiscSpeed(false),
   SelectedLanguage(0), bWii(false),
   bConfirmStop(false), bHideCursor(false),
@@ -73,14 +60,16 @@ void SCoreStartupParameter::LoadDefaults()
 	bRunCompareServer = false;
 	bDSPHLE = true;
 	bDSPThread = true;
+	bFastmem = true;
 	bEnableFPRF = false;
 	bMMU = false;
 	bDCBZOFF = false;
 	iTLBHack = 0;
-	bVBeam = false;
+	bVBeamSpeedHack = false;
 	bSyncGPU = false;
 	bFastDiscSpeed = false;
 	bMergeBlocks = false;
+	bEnableMemcardSaving = true;
 	SelectedLanguage = 0;
 	bWii = false;
 	bDPL2Decoder = false;
@@ -326,7 +315,7 @@ bool SCoreStartupParameter::AutoSetup(EBootBS2 _BootBS2)
 		{
 			if (!File::Exists(m_strBootROM))
 			{
-				WARN_LOG(BOOT, "bootrom file %s not found - using HLE.", m_strBootROM.c_str());
+				WARN_LOG(BOOT, "Bootrom file %s not found - using HLE.", m_strBootROM.c_str());
 				bHLE_BS2 = true;
 			}
 		}
diff --git a/Source/Core/Core/Src/CoreParameter.h b/Source/Core/Core/Src/CoreParameter.h
index 896f111ab7..9652b84618 100644
--- a/Source/Core/Core/Src/CoreParameter.h
+++ b/Source/Core/Core/Src/CoreParameter.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _COREPARAMETER_H
 #define _COREPARAMETER_H
@@ -21,7 +8,8 @@
 #include "IniFile.h"
 #include <string>
 
-enum Hotkey {
+enum Hotkey
+{
 	HK_OPEN,
 	HK_CHANGE_DISC,
 	HK_REFRESH_LIST,
@@ -94,6 +82,7 @@ struct SCoreStartupParameter
 	bool bJITILTimeProfiling;
 	bool bJITILOutputIR;
 
+	bool bFastmem;
 	bool bEnableFPRF;
 
 	bool bCPUThread;
@@ -105,6 +94,7 @@ struct SCoreStartupParameter
 	bool bHLE_BS2;
 	bool bEnableCheats;
 	bool bMergeBlocks;
+	bool bEnableMemcardSaving;
 
 	bool bDPL2Decoder;
 	int iLatency;
@@ -115,7 +105,7 @@ struct SCoreStartupParameter
 	bool bMMU;
 	bool bDCBZOFF;
 	int iTLBHack;
-	bool bVBeam;
+	bool bVBeamSpeedHack;
 	bool bSyncGPU;
 	bool bFastDiscSpeed;
 
diff --git a/Source/Core/Core/Src/CoreTiming.cpp b/Source/Core/Core/Src/CoreTiming.cpp
index ff9488b4fe..af56ab25bb 100644
--- a/Source/Core/Core/Src/CoreTiming.cpp
+++ b/Source/Core/Core/Src/CoreTiming.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include <vector>
 
@@ -76,36 +63,36 @@ void (*advanceCallback)(int cyclesExecuted) = NULL;
 
 Event* GetNewEvent()
 {
-    if(!eventPool)
-        return new Event;
+	if(!eventPool)
+		return new Event;
 
-    Event* ev = eventPool;
-    eventPool = ev->next;
-    return ev;
+	Event* ev = eventPool;
+	eventPool = ev->next;
+	return ev;
 }
 
 Event* GetNewTsEvent()
 {
-    allocatedTsEvents++;
+	allocatedTsEvents++;
 
-    if(!eventTsPool)
-        return new Event;
+	if(!eventTsPool)
+		return new Event;
 
-    Event* ev = eventTsPool;
-    eventTsPool = ev->next;
-    return ev;
+	Event* ev = eventTsPool;
+	eventTsPool = ev->next;
+	return ev;
 }
 
 void FreeEvent(Event* ev)
 {
-    ev->next = eventPool;
-    eventPool = ev;
+	ev->next = eventPool;
+	eventPool = ev;
 }
 
 void FreeTsEvent(Event* ev)
 {
-    ev->next = eventTsPool;
-    eventTsPool = ev;
+	ev->next = eventTsPool;
+	eventTsPool = ev;
 	allocatedTsEvents--;
 }
 
@@ -158,20 +145,20 @@ void Shutdown()
 	ClearPendingEvents();
 	UnregisterAllEvents();
 
-    while(eventPool)
-    {
-        Event *ev = eventPool;
-        eventPool = ev->next;
-        delete ev;
-    }
+	while(eventPool)
+	{
+		Event *ev = eventPool;
+		eventPool = ev->next;
+		delete ev;
+	}
 
-    std::lock_guard<std::recursive_mutex> lk(externalEventSection);
-    while(eventTsPool)
-    {
-        Event *ev = eventTsPool;
-        eventTsPool = ev->next;
-        delete ev;
-    }
+	std::lock_guard<std::recursive_mutex> lk(externalEventSection);
+	while(eventTsPool)
+	{
+		Event *ev = eventTsPool;
+		eventTsPool = ev->next;
+		delete ev;
+	}
 }
 
 void EventDoState(PointerWrap &p, BaseEvent* ev)
@@ -227,7 +214,7 @@ void DoState(PointerWrap &p)
 
 u64 GetTicks()
 {
-    return (u64)globalTimer; 
+	return (u64)globalTimer; 
 }
 
 u64 GetIdleTicks()
@@ -262,7 +249,9 @@ void ScheduleEvent_Threadsafe_Immediate(int event_type, u64 userdata)
 		event_types[event_type].callback(userdata, 0);
 	}
 	else
+	{
 		ScheduleEvent_Threadsafe(0, event_type, userdata);
+	}
 }
 
 void ClearPendingEvents()
@@ -327,6 +316,7 @@ void RemoveEvent(int event_type)
 {
 	if (!first)
 		return;
+
 	while(first)
 	{
 		if (first->type == event_type)
@@ -340,8 +330,10 @@ void RemoveEvent(int event_type)
 			break;
 		}
 	}
+	
 	if (!first)
 		return;
+
 	Event *prev = first;
 	Event *ptr = prev->next;
 	while (ptr)
@@ -367,6 +359,7 @@ void RemoveThreadsafeEvent(int event_type)
 	{
 		return;
 	}
+
 	while(tsFirst)
 	{
 		if (tsFirst->type == event_type)
@@ -380,16 +373,18 @@ void RemoveThreadsafeEvent(int event_type)
 			break;
 		}
 	}
+
 	if (!tsFirst)
 	{
 		return;
 	}
+
 	Event *prev = tsFirst;
 	Event *ptr = prev->next;
 	while (ptr)
 	{
 		if (ptr->type == event_type)
-		{	
+		{
 			prev->next = ptr->next;
 			FreeTsEvent(ptr);
 			ptr = prev->next;
@@ -455,7 +450,7 @@ void ProcessFifoWaitEvents()
 void MoveEvents()
 {
 	std::lock_guard<std::recursive_mutex> lk(externalEventSection);
-    // Move events from async queue into main queue
+	// Move events from async queue into main queue
 	while (tsFirst)
 	{
 		Event *next = tsFirst->next;
@@ -464,20 +459,20 @@ void MoveEvents()
 	}
 	tsLast = NULL;
 
-    // Move free events to threadsafe pool
-    while(allocatedTsEvents > 0 && eventPool)
-    {        
-        Event *ev = eventPool;
-        eventPool = ev->next;
-        ev->next = eventTsPool;
-        eventTsPool = ev;
-        allocatedTsEvents--;
-    }
+	// Move free events to threadsafe pool
+	while(allocatedTsEvents > 0 && eventPool)
+	{
+		Event *ev = eventPool;
+		eventPool = ev->next;
+		ev->next = eventTsPool;
+		eventTsPool = ev;
+		allocatedTsEvents--;
+	}
 }
 
 void Advance()
 {	
-	MoveEvents();		
+	MoveEvents();
 
 	int cyclesExecuted = slicelength - downcount;
 	globalTimer += cyclesExecuted;
@@ -499,6 +494,7 @@ void Advance()
 			break;
 		}
 	}
+
 	if (!first) 
 	{
 		WARN_LOG(POWERPC, "WARNING - no events in queue. Setting downcount to 10000");
@@ -511,6 +507,7 @@ void Advance()
 			slicelength = maxSliceLength;
 		downcount = slicelength;
 	}
+
 	if (advanceCallback)
 		advanceCallback(cyclesExecuted);
 }
@@ -534,7 +531,7 @@ void Idle()
 	//while we process only the events required by the FIFO.
 	while (g_video_backend->Video_IsPossibleWaitingSetDrawDone())
 	{
-		ProcessFifoWaitEvents();		
+		ProcessFifoWaitEvents();
 		Common::YieldCPU();
 	}
 
@@ -554,9 +551,11 @@ std::string GetScheduledEventsSummary()
 		unsigned int t = ptr->type;
 		if (t >= event_types.size())
 			PanicAlertT("Invalid event type %i", t);
+		
 		const char *name = event_types[ptr->type].name;
 		if (!name)
 			name = "[unknown]";
+		
 		text += StringFromFormat("%s : %i %08x%08x\n", event_types[ptr->type].name, ptr->time, ptr->userdata >> 32, ptr->userdata);
 		ptr = ptr->next;
 	}
diff --git a/Source/Core/Core/Src/CoreTiming.h b/Source/Core/Core/Src/CoreTiming.h
index 8e00b303f0..bbb35f33b2 100644
--- a/Source/Core/Core/Src/CoreTiming.h
+++ b/Source/Core/Core/Src/CoreTiming.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _CORETIMING_H
 #define _CORETIMING_H
diff --git a/Source/Core/Core/Src/DSP/DSPAccelerator.cpp b/Source/Core/Core/Src/DSP/DSPAccelerator.cpp
index f625f1ddf6..71b3f91294 100644
--- a/Source/Core/Core/Src/DSP/DSPAccelerator.cpp
+++ b/Source/Core/Core/Src/DSP/DSPAccelerator.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "Common.h"
 
@@ -60,7 +47,7 @@ static s16 ADPCM_Step(u32& _rSamplePos)
 
 	_rSamplePos++;
 
-    // The advanced interpolation (linear, polyphase,...) is done by the UCode,
+	// The advanced interpolation (linear, polyphase,...) is done by the UCode,
 	// so we don't need to bother with it here.
 	return val;
 }
@@ -78,7 +65,7 @@ u16 dsp_read_aram_d3()
 			Address++;
 			break;
 		case 0x6:   // u16 reads
-		    val = (DSPHost_ReadHostMemory(Address*2) << 8) | DSPHost_ReadHostMemory(Address*2 + 1);
+			val = (DSPHost_ReadHostMemory(Address*2) << 8) | DSPHost_ReadHostMemory(Address*2 + 1);
 			Address++;
 			break;
 		default:
@@ -134,25 +121,25 @@ u16 dsp_read_accelerator()
 	// address" and 0xd3.
 	switch (g_dsp.ifx_regs[DSP_FORMAT])
 	{
-	    case 0x00:  // ADPCM audio
-		    val = ADPCM_Step(Address);
-		    break;
-	    case 0x0A:  // 16-bit PCM audio
-		    val = (DSPHost_ReadHostMemory(Address*2) << 8) | DSPHost_ReadHostMemory(Address*2 + 1);
-		    g_dsp.ifx_regs[DSP_YN2] = g_dsp.ifx_regs[DSP_YN1];
-		    g_dsp.ifx_regs[DSP_YN1] = val;
-		    Address++;
-		    break;
-	    case 0x19:  // 8-bit PCM audio
-		    val = DSPHost_ReadHostMemory(Address) << 8; 
-		    g_dsp.ifx_regs[DSP_YN2] = g_dsp.ifx_regs[DSP_YN1];
-		    g_dsp.ifx_regs[DSP_YN1] = val;
-		    Address++;
+		case 0x00:  // ADPCM audio
+			val = ADPCM_Step(Address);
 			break;
-	    default:
-		    ERROR_LOG(DSPLLE, "dsp_read_accelerator() - unknown format 0x%x", g_dsp.ifx_regs[DSP_FORMAT]);
-		    Address++;
-		    val = 0;
+		case 0x0A:  // 16-bit PCM audio
+			val = (DSPHost_ReadHostMemory(Address*2) << 8) | DSPHost_ReadHostMemory(Address*2 + 1);
+			g_dsp.ifx_regs[DSP_YN2] = g_dsp.ifx_regs[DSP_YN1];
+			g_dsp.ifx_regs[DSP_YN1] = val;
+			Address++;
+			break;
+		case 0x19:  // 8-bit PCM audio
+			val = DSPHost_ReadHostMemory(Address) << 8; 
+			g_dsp.ifx_regs[DSP_YN2] = g_dsp.ifx_regs[DSP_YN1];
+			g_dsp.ifx_regs[DSP_YN1] = val;
+			Address++;
+			break;
+		default:
+			ERROR_LOG(DSPLLE, "dsp_read_accelerator() - unknown format 0x%x", g_dsp.ifx_regs[DSP_FORMAT]);
+			Address++;
+			val = 0;
 			break;
 	}
 
@@ -165,14 +152,11 @@ u16 dsp_read_accelerator()
 	// Somehow, YN1 and YN2 must be initialized with their "loop" values,
 	// so yeah, it seems likely that we should raise an exception to let
 	// the DSP program do that, at least if DSP_FORMAT == 0x0A.
-	if (Address >= EndAddress)
+	if ((Address & ~1) == (EndAddress & ~1))
 	{
 		// Set address back to start address.
-		if (DSPHost_Wii() || (Address == EndAddress))
-		{
-			Address = (g_dsp.ifx_regs[DSP_ACSAH] << 16) | g_dsp.ifx_regs[DSP_ACSAL];
-			DSPCore_SetException(EXP_ACCOV);
-		}
+		Address = (g_dsp.ifx_regs[DSP_ACSAH] << 16) | g_dsp.ifx_regs[DSP_ACSAL];
+		DSPCore_SetException(EXP_ACCOV);
 	}
 
 	g_dsp.ifx_regs[DSP_ACCAH] = Address >> 16;
diff --git a/Source/Core/Core/Src/DSP/DSPAccelerator.h b/Source/Core/Core/Src/DSP/DSPAccelerator.h
index a64516a036..05a8db63b2 100644
--- a/Source/Core/Core/Src/DSP/DSPAccelerator.h
+++ b/Source/Core/Core/Src/DSP/DSPAccelerator.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _DSP_ACCELERATOR_H
 #define _DSP_ACCELERATOR_H
diff --git a/Source/Core/Core/Src/DSP/DSPAnalyzer.cpp b/Source/Core/Core/Src/DSP/DSPAnalyzer.cpp
index 8f6b0d4e35..1e5f727fa1 100644
--- a/Source/Core/Core/Src/DSP/DSPAnalyzer.cpp
+++ b/Source/Core/Core/Src/DSP/DSPAnalyzer.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "DSPAnalyzer.h"
 #include "DSPInterpreter.h"
diff --git a/Source/Core/Core/Src/DSP/DSPAnalyzer.h b/Source/Core/Core/Src/DSP/DSPAnalyzer.h
index 9c05dae708..82cfab9ecc 100644
--- a/Source/Core/Core/Src/DSP/DSPAnalyzer.h
+++ b/Source/Core/Core/Src/DSP/DSPAnalyzer.h
@@ -1,19 +1,7 @@
-// Copyright (C) 2003 Dolphin Project.
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
-// 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/
 
 // Basic code analysis.
 
diff --git a/Source/Core/Core/Src/DSP/DSPBreakpoints.h b/Source/Core/Core/Src/DSP/DSPBreakpoints.h
index b366e760a7..96c116f5a1 100644
--- a/Source/Core/Core/Src/DSP/DSPBreakpoints.h
+++ b/Source/Core/Core/Src/DSP/DSPBreakpoints.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _DSP_BREAKPOINTS
 #define _DSP_BREAKPOINTS
@@ -21,38 +8,53 @@
 #include "Common.h"
 
 // super fast breakpoints for a limited range.
-// To be used interchangably with the BreakPoints class.
+// To be used interchangeably with the BreakPoints class.
 class DSPBreakpoints
 {
 public:
-	DSPBreakpoints() {Clear();}
+	DSPBreakpoints()
+	{
+		Clear();
+	}
+	
 	// is address breakpoint
-	bool IsAddressBreakPoint(u32 addr) {
+	bool IsAddressBreakPoint(u32 addr)
+	{
 		return b[addr] != 0;
 	}
 
 	// AddBreakPoint
-	bool Add(u32 addr, bool temp=false) {
+	bool Add(u32 addr, bool temp=false)
+	{
 		bool was_one = b[addr] != 0;
-		if (!was_one) {
+		
+		if (!was_one)
+		{
 			b[addr] = temp ? 2 : 1;
 			return true;
-		} else {
+		}
+		else
+		{
 			return false;
 		}
 	}
+
 	// Remove Breakpoint
-	bool Remove(u32 addr) {
+	bool Remove(u32 addr)
+	{
 		bool was_one = b[addr] != 0;
 		b[addr] = 0;
 		return was_one;
 	}
-	void Clear() {
+
+	void Clear()
+	{
 		for (int i = 0; i < 65536; i++)
 			b[i] = 0;
 	}
 
-	void DeleteByAddress(u32 addr) {
+	void DeleteByAddress(u32 addr)
+	{
 		b[addr] = 0;
 	}
 
diff --git a/Source/Core/Core/Src/DSP/DSPCodeUtil.cpp b/Source/Core/Core/Src/DSP/DSPCodeUtil.cpp
index 7f2cc8e2e6..73e2c1f8b4 100644
--- a/Source/Core/Core/Src/DSP/DSPCodeUtil.cpp
+++ b/Source/Core/Core/Src/DSP/DSPCodeUtil.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include <iostream>
 #include <vector>
@@ -38,7 +25,8 @@ bool Assemble(const char *text, std::vector<u16> &code, bool force)
 
 	// TODO: fix the terrible api of the assembler.
 	DSPAssembler assembler(settings);
-	if (!assembler.Assemble(text, code)) {
+	if (!assembler.Assemble(text, code))
+	{
 		std::cerr << assembler.GetErrorString() << std::endl;
 		return false;
 	}
@@ -77,7 +65,9 @@ bool Compare(const std::vector<u16> &code1, const std::vector<u16> &code2)
 	for (int i = 0; i < min_size; i++)
 	{
 		if (code1[i] == code2[i])
+		{
 			count_equal++;
+		}
 		else
 		{
 			std::string line1, line2;
diff --git a/Source/Core/Core/Src/DSP/DSPCodeUtil.h b/Source/Core/Core/Src/DSP/DSPCodeUtil.h
index 525e21a9fb..b1b05c5329 100644
--- a/Source/Core/Core/Src/DSP/DSPCodeUtil.h
+++ b/Source/Core/Core/Src/DSP/DSPCodeUtil.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _DSPCODEUTIL_H
 #define _DSPCODEUTIL_H
diff --git a/Source/Core/Core/Src/DSP/DSPCommon.h b/Source/Core/Core/Src/DSP/DSPCommon.h
index 8133cdc54e..f8abd6ed8a 100644
--- a/Source/Core/Core/Src/DSP/DSPCommon.h
+++ b/Source/Core/Core/Src/DSP/DSPCommon.h
@@ -1,8 +1,11 @@
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
+
 #ifndef __DSPCOMMON_H
 #define __DSPCOMMON_H
+
 #include "CommonTypes.h"
 typedef u16 UDSPInstruction;
 
-
-
 #endif
diff --git a/Source/Core/Core/Src/DSP/DSPCore.cpp b/Source/Core/Core/Src/DSP/DSPCore.cpp
index 2594a27eef..59e5063af6 100644
--- a/Source/Core/Core/Src/DSP/DSPCore.cpp
+++ b/Source/Core/Core/Src/DSP/DSPCore.cpp
@@ -89,7 +89,7 @@ static bool VerifyRoms(const char *irom_filename, const char *coef_filename)
 		{ 0x9c8f593c, 0x10000001 },
 
 		// delroth's improvement on LM1234 replacement ROM (Zelda and AX only,
-        // IPL/Card/GBA still broken)
+		// IPL/Card/GBA still broken)
 		{ 0xd9907f71, 0xb019c2fb }
 	};
 
@@ -220,7 +220,7 @@ void DSPCore_Shutdown()
 
 void DSPCore_Reset()
 {
-    g_dsp.pc = DSP_RESET_VECTOR;
+	g_dsp.pc = DSP_RESET_VECTOR;
 
 	g_dsp.r.wr[0] = 0xffff;
 	g_dsp.r.wr[1] = 0xffff;
@@ -260,11 +260,13 @@ void DSPCore_CheckExceptions()
 	if (g_dsp.exceptions == 0)
 		return;
 
-	for (int i = 7; i > 0; i--) {
+	for (int i = 7; i > 0; i--)
+	{
 		// Seems exp int are not masked by sr_int_enable
-		if (g_dsp.exceptions & (1 << i)) {
-			if (dsp_SR_is_flag_set(SR_INT_ENABLE) || (i == EXP_INT)) {
-
+		if (g_dsp.exceptions & (1 << i))
+		{
+			if (dsp_SR_is_flag_set(SR_INT_ENABLE) || (i == EXP_INT))
+			{
 				// store pc and sr until RTI
 				dsp_reg_store_stack(DSP_STACK_C, g_dsp.pc);
 				dsp_reg_store_stack(DSP_STACK_D, g_dsp.r.sr);
@@ -276,7 +278,9 @@ void DSPCore_CheckExceptions()
 				else
 					g_dsp.r.sr &= ~SR_INT_ENABLE;
 				break;
-			} else {
+			}
+			else
+			{
 #if defined(_DEBUG) || defined(DEBUGFAST)
 				ERROR_LOG(DSPLLE, "Firing exception %d failed", i);
 #endif
@@ -381,8 +385,10 @@ void CompileCurrent()
 	}
 }
 
-u16 DSPCore_ReadRegister(int reg) {
-	switch(reg) {
+u16 DSPCore_ReadRegister(int reg)
+{
+	switch(reg)
+	{
 	case DSP_REG_AR0:
 	case DSP_REG_AR1:
 	case DSP_REG_AR2:
@@ -430,8 +436,10 @@ u16 DSPCore_ReadRegister(int reg) {
 	}
 }
 
-void DSPCore_WriteRegister(int reg, u16 val) {
-	switch(reg) {
+void DSPCore_WriteRegister(int reg, u16 val)
+{
+	switch(reg)
+	{
 	case DSP_REG_AR0:
 	case DSP_REG_AR1:
 	case DSP_REG_AR2:
diff --git a/Source/Core/Core/Src/DSP/DSPCore.h b/Source/Core/Core/Src/DSP/DSPCore.h
index 34466ea4ad..de5b309e13 100644
--- a/Source/Core/Core/Src/DSP/DSPCore.h
+++ b/Source/Core/Core/Src/DSP/DSPCore.h
@@ -155,14 +155,14 @@
 #define SR_OVERFLOW			0x0002
 #define SR_ARITH_ZERO		0x0004
 #define SR_SIGN				0x0008
-#define SR_OVER_S32			0x0010 // set when there there was mod/tst/cmp on accu and result is over s32
+#define SR_OVER_S32			0x0010 // set when there was mod/tst/cmp on accu and result is over s32
 #define SR_TOP2BITS			0x0020 // if the upper (ac?.m/ax?.h) 2 bits are equal
 #define SR_LOGIC_ZERO		0x0040
 #define SR_OVERFLOW_STICKY	0x0080 // set at the same time as 0x2 (under same conditions) - but not cleared the same
 #define SR_100				0x0100 // unknown
 #define SR_INT_ENABLE		0x0200 // Not 100% sure but duddie says so. This should replace the hack, if so.
 #define SR_400				0x0400 // unknown
-#define SR_EXT_INT_ENABLE	0x0800 // Appears in zelda - seems to disable external interupts
+#define SR_EXT_INT_ENABLE	0x0800 // Appears in zelda - seems to disable external interrupts
 #define SR_1000				0x1000 // unknown
 #define SR_MUL_MODIFY		0x2000 // 1 = normal. 0 = x2   (M0, M2) (Free mul by 2)
 #define SR_40_MODE_BIT		0x4000 // 0 = "16", 1 = "40"  (SET16, SET40)  Controls sign extension when loading mid accums and data saturation for stores from mid accums.
diff --git a/Source/Core/Core/Src/DSP/DSPEmitter.cpp b/Source/Core/Core/Src/DSP/DSPEmitter.cpp
index 12dac52e31..704a170bfc 100644
--- a/Source/Core/Core/Src/DSP/DSPEmitter.cpp
+++ b/Source/Core/Core/Src/DSP/DSPEmitter.cpp
@@ -1,19 +1,6 @@
-// Copyright (C) 2010 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include <cstring>
 
@@ -147,28 +134,38 @@ void DSPEmitter::EmitInstruction(UDSPInstruction inst)
 	bool ext_is_jit = false;
 
 	// Call extended
-	if (tinst->extended) {
-		if ((inst >> 12) == 0x3) {
-			if (! extOpTable[inst & 0x7F]->jitFunc) {
+	if (tinst->extended)
+	{
+		if ((inst >> 12) == 0x3)
+		{
+			if (! extOpTable[inst & 0x7F]->jitFunc)
+			{
 				// Fall back to interpreter
 				gpr.pushRegs();
 				ABI_CallFunctionC16((void*)extOpTable[inst & 0x7F]->intFunc, inst);
 				gpr.popRegs();
 				INFO_LOG(DSPLLE, "Instruction not JITed(ext part): %04x\n", inst);
 				ext_is_jit = false;
-			} else {
+			}
+			else
+			{
 				(this->*extOpTable[inst & 0x7F]->jitFunc)(inst);
 				ext_is_jit = true;
 			}
-		} else {
-			if (!extOpTable[inst & 0xFF]->jitFunc) {
+		}
+		else
+		{
+			if (!extOpTable[inst & 0xFF]->jitFunc)
+			{
 				// Fall back to interpreter
 				gpr.pushRegs();
 				ABI_CallFunctionC16((void*)extOpTable[inst & 0xFF]->intFunc, inst);
 				gpr.popRegs();
 				INFO_LOG(DSPLLE, "Instruction not JITed(ext part): %04x\n", inst);
 				ext_is_jit = false;
-			} else {
+			}
+			else
+			{
 				(this->*extOpTable[inst & 0xFF]->jitFunc)(inst);
 				ext_is_jit = true;
 			}
@@ -176,7 +173,8 @@ void DSPEmitter::EmitInstruction(UDSPInstruction inst)
 	}
 	
 	// Main instruction
-	if (!opTable[inst]->jitFunc) {
+	if (!opTable[inst]->jitFunc)
+	{
 		Default(inst);
 		INFO_LOG(DSPLLE, "Instruction not JITed(main part): %04x\n", inst);
 	}
@@ -186,14 +184,18 @@ void DSPEmitter::EmitInstruction(UDSPInstruction inst)
 	}
 
 	// Backlog
-	if (tinst->extended) {
-		if (!ext_is_jit) {
+	if (tinst->extended)
+	{
+		if (!ext_is_jit)
+		{
 			//need to call the online cleanup function because
 			//the writeBackLog gets populated at runtime
 			gpr.pushRegs();
 			ABI_CallFunction((void*)::applyWriteBackLog);
 			gpr.popRegs();
-		} else {
+		}
+		else
+		{
 			popExtValueToReg();
 		}
 	}
@@ -322,7 +324,8 @@ void DSPEmitter::Compile(u16 start_addr)
 		}
 	}
 
-	if (fixup_pc) {
+	if (fixup_pc)
+	{
 		MOV(16, M(&(g_dsp.pc)), Imm16(compilePC));
 	}
 
diff --git a/Source/Core/Core/Src/DSP/DSPEmitter.h b/Source/Core/Core/Src/DSP/DSPEmitter.h
index 7fcb9a74f6..acf0ab0fd2 100644
--- a/Source/Core/Core/Src/DSP/DSPEmitter.h
+++ b/Source/Core/Core/Src/DSP/DSPEmitter.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _DSPEMITTER_H
 #define _DSPEMITTER_H
@@ -120,8 +107,8 @@ public:
 	void dsp_op_write_reg_imm(int reg, u16 val);
 	void dsp_conditional_extend_accum(int reg);
 	void dsp_conditional_extend_accum_imm(int reg, u16 val);
+	void dsp_op_read_reg_dont_saturate(int reg, Gen::X64Reg host_dreg, DSPJitSignExtend extend = NONE);
 	void dsp_op_read_reg(int reg, Gen::X64Reg host_dreg, DSPJitSignExtend extend = NONE);
-	void dsp_op_read_reg_and_saturate(int reg, Gen::X64Reg host_dreg, DSPJitSignExtend extend = NONE);
 
 	// Commands
 	void dar(const UDSPInstruction opc);
diff --git a/Source/Core/Core/Src/DSP/DSPHWInterface.cpp b/Source/Core/Core/Src/DSP/DSPHWInterface.cpp
index e4c81e4a7a..371bec572c 100644
--- a/Source/Core/Core/Src/DSP/DSPHWInterface.cpp
+++ b/Source/Core/Core/Src/DSP/DSPHWInterface.cpp
@@ -117,71 +117,76 @@ void gdsp_ifx_write(u32 addr, u32 val)
 {
 	switch (addr & 0xff)
 	{
-	    case DSP_DIRQ:
-		    if (val & 0x1)
-			    DSPHost_InterruptRequest();
+		case DSP_DIRQ:
+			if (val & 0x1)
+				DSPHost_InterruptRequest();
 			else 
 				INFO_LOG(DSPLLE, "Unknown Interrupt Request pc=%04x (%04x)", g_dsp.pc, val);
-		    break;
+			break;
 
-	    case DSP_DMBH:
-		    gdsp_mbox_write_h(GDSP_MBOX_DSP, val);
-		    break;
+		case DSP_DMBH:
+			gdsp_mbox_write_h(GDSP_MBOX_DSP, val);
+			break;
 
-	    case DSP_DMBL:
-		    gdsp_mbox_write_l(GDSP_MBOX_DSP, val);
-		    break;
+		case DSP_DMBL:
+			gdsp_mbox_write_l(GDSP_MBOX_DSP, val);
+			break;
 
-	    case DSP_CMBH:
-		    return gdsp_mbox_write_h(GDSP_MBOX_CPU, val);
+		case DSP_CMBH:
+			return gdsp_mbox_write_h(GDSP_MBOX_CPU, val);
 
-	    case DSP_CMBL:
-		    return gdsp_mbox_write_l(GDSP_MBOX_CPU, val);
+		case DSP_CMBL:
+			return gdsp_mbox_write_l(GDSP_MBOX_CPU, val);
 
-	    case DSP_DSBL:
-		    g_dsp.ifx_regs[DSP_DSBL] = val;
+		case DSP_DSBL:
+			g_dsp.ifx_regs[DSP_DSBL] = val;
 			g_dsp.ifx_regs[DSP_DSCR] |= 4; // Doesn't really matter since we do DMA instantly
-		    if (!g_dsp.ifx_regs[DSP_AMDM])
+			if (!g_dsp.ifx_regs[DSP_AMDM])
 				gdsp_do_dma();
 			else
 				NOTICE_LOG(DSPLLE, "Masked DMA skipped");
-		    g_dsp.ifx_regs[DSP_DSCR] &= ~4;
+			g_dsp.ifx_regs[DSP_DSCR] &= ~4;
 			g_dsp.ifx_regs[DSP_DSBL] = 0;
-		    break;
+			break;
 
 		case DSP_ACDATA1: // Accelerator write (Zelda type) - "UnkZelda"
 			dsp_write_aram_d3(val);
 			break;
 
 		case DSP_GAIN:
-			if (val) {
+			if (val)
+			{
 				INFO_LOG(DSPLLE,"Gain Written: 0x%04x", val); 
 			}
-	    case DSP_DSPA:
-	    case DSP_DSMAH:
-	    case DSP_DSMAL:
-	    case DSP_DSCR:
-		    g_dsp.ifx_regs[addr & 0xFF] = val;
-		    break;
+		case DSP_DSPA:
+		case DSP_DSMAH:
+		case DSP_DSMAL:
+		case DSP_DSCR:
+			g_dsp.ifx_regs[addr & 0xFF] = val;
+			break;
 /*
 		case DSP_ACCAL:
 			dsp_step_accelerator();
 			break;
 */
-	    default:
-			if ((addr & 0xff) >= 0xa0) {
-				if (pdlabels[(addr & 0xFF) - 0xa0].name && pdlabels[(addr & 0xFF) - 0xa0].description) {
-		   			INFO_LOG(DSPLLE, "%04x MW %s (%04x)", g_dsp.pc, pdlabels[(addr & 0xFF) - 0xa0].name, val);
+		default:
+			if ((addr & 0xff) >= 0xa0)
+			{
+				if (pdlabels[(addr & 0xFF) - 0xa0].name && pdlabels[(addr & 0xFF) - 0xa0].description)
+				{
+					INFO_LOG(DSPLLE, "%04x MW %s (%04x)", g_dsp.pc, pdlabels[(addr & 0xFF) - 0xa0].name, val);
 				}
-				else {
-		   			ERROR_LOG(DSPLLE, "%04x MW %04x (%04x)", g_dsp.pc, addr, val);
+				else
+				{
+					ERROR_LOG(DSPLLE, "%04x MW %04x (%04x)", g_dsp.pc, addr, val);
 				}
 			}
-			else {
-		   	    ERROR_LOG(DSPLLE, "%04x MW %04x (%04x)", g_dsp.pc, addr, val);
+			else
+			{
+				ERROR_LOG(DSPLLE, "%04x MW %04x (%04x)", g_dsp.pc, addr, val);
 			}
-		    g_dsp.ifx_regs[addr & 0xFF] = val;
-		    break;
+			g_dsp.ifx_regs[addr & 0xFF] = val;
+			break;
 	}
 }
 
@@ -189,40 +194,44 @@ u16 gdsp_ifx_read(u16 addr)
 {
 	switch (addr & 0xff)
 	{
-	    case DSP_DMBH:
-		    return gdsp_mbox_read_h(GDSP_MBOX_DSP);
+		case DSP_DMBH:
+			return gdsp_mbox_read_h(GDSP_MBOX_DSP);
 
-	    case DSP_DMBL:
-		    return gdsp_mbox_read_l(GDSP_MBOX_DSP);
+		case DSP_DMBL:
+			return gdsp_mbox_read_l(GDSP_MBOX_DSP);
 
-	    case DSP_CMBH:
-		    return gdsp_mbox_read_h(GDSP_MBOX_CPU);
+		case DSP_CMBH:
+			return gdsp_mbox_read_h(GDSP_MBOX_CPU);
 
-	    case DSP_CMBL:
-		    return gdsp_mbox_read_l(GDSP_MBOX_CPU);
+		case DSP_CMBL:
+			return gdsp_mbox_read_l(GDSP_MBOX_CPU);
 
-	    case DSP_DSCR:
-		    return g_dsp.ifx_regs[addr & 0xFF];
+		case DSP_DSCR:
+			return g_dsp.ifx_regs[addr & 0xFF];
 
- 	    case DSP_ACCELERATOR:  // ADPCM Accelerator reads
- 		    return dsp_read_accelerator();
+		case DSP_ACCELERATOR:  // ADPCM Accelerator reads
+			return dsp_read_accelerator();
 
-	    case DSP_ACDATA1: // Accelerator reads (Zelda type) - "UnkZelda"
-		    return dsp_read_aram_d3();
+		case DSP_ACDATA1: // Accelerator reads (Zelda type) - "UnkZelda"
+			return dsp_read_aram_d3();
 
-	    default:
-			if ((addr & 0xff) >= 0xa0) {
-				if (pdlabels[(addr & 0xFF) - 0xa0].name && pdlabels[(addr & 0xFF) - 0xa0].description) {
-	   				INFO_LOG(DSPLLE, "%04x MR %s (%04x)", g_dsp.pc, pdlabels[(addr & 0xFF) - 0xa0].name, g_dsp.ifx_regs[addr & 0xFF]);
+		default:
+			if ((addr & 0xff) >= 0xa0)
+			{
+				if (pdlabels[(addr & 0xFF) - 0xa0].name && pdlabels[(addr & 0xFF) - 0xa0].description)
+				{
+					INFO_LOG(DSPLLE, "%04x MR %s (%04x)", g_dsp.pc, pdlabels[(addr & 0xFF) - 0xa0].name, g_dsp.ifx_regs[addr & 0xFF]);
 				}
-				else {
-	   				ERROR_LOG(DSPLLE, "%04x MR %04x (%04x)", g_dsp.pc, addr, g_dsp.ifx_regs[addr & 0xFF]);
+				else
+				{
+					ERROR_LOG(DSPLLE, "%04x MR %04x (%04x)", g_dsp.pc, addr, g_dsp.ifx_regs[addr & 0xFF]);
 				}
 			}
-			else {
-   				ERROR_LOG(DSPLLE, "%04x MR %04x (%04x)", g_dsp.pc, addr, g_dsp.ifx_regs[addr & 0xFF]);
+			else
+			{
+				ERROR_LOG(DSPLLE, "%04x MR %04x (%04x)", g_dsp.pc, addr, g_dsp.ifx_regs[addr & 0xFF]);
 			}
-		    return g_dsp.ifx_regs[addr & 0xFF];
+			return g_dsp.ifx_regs[addr & 0xFF];
 	}
 }
 
@@ -318,28 +327,28 @@ static void gdsp_do_dma()
 
 	if (len > 0x4000)
 	{
-		ERROR_LOG(DSPLLE, "DMA ERROR pc: %04x ctl: %04x addr: %08x da: %04x size: %04x", g_dsp.pc, ctl, addr, dsp_addr, len);
+		ERROR_LOG(DSPLLE, "DMA ERROR: PC: %04x, Control: %04x, Address: %08x, DSP Address: %04x, Size: %04x", g_dsp.pc, ctl, addr, dsp_addr, len);
 		exit(0);
 	}
 #if defined(_DEBUG) || defined(DEBUGFAST)
-	DEBUG_LOG(DSPLLE, "DMA pc: %04x ctl: %04x addr: %08x da: %04x size: %04x", g_dsp.pc, ctl, addr, dsp_addr, len);
+	DEBUG_LOG(DSPLLE, "DMA pc: %04x, Control: %04x, Address: %08x, DSP Address: %04x, Size: %04x", g_dsp.pc, ctl, addr, dsp_addr, len);
 #endif
 	switch (ctl & 0x3)
 	{
-	    case (DSP_CR_DMEM | DSP_CR_TO_CPU):
-		    gdsp_ddma_out(dsp_addr, addr, len);
-		    break;
+		case (DSP_CR_DMEM | DSP_CR_TO_CPU):
+			gdsp_ddma_out(dsp_addr, addr, len);
+			break;
 
-	    case (DSP_CR_DMEM | DSP_CR_FROM_CPU):
-		    gdsp_ddma_in(dsp_addr, addr, len);
-		    break;
+		case (DSP_CR_DMEM | DSP_CR_FROM_CPU):
+			gdsp_ddma_in(dsp_addr, addr, len);
+			break;
 
-	    case (DSP_CR_IMEM | DSP_CR_TO_CPU):
-		    gdsp_idma_out(dsp_addr, addr, len);
-		    break;
+		case (DSP_CR_IMEM | DSP_CR_TO_CPU):
+			gdsp_idma_out(dsp_addr, addr, len);
+			break;
 
-	    case (DSP_CR_IMEM | DSP_CR_FROM_CPU):
-		    gdsp_idma_in(dsp_addr, addr, len);
-		    break;
+		case (DSP_CR_IMEM | DSP_CR_FROM_CPU):
+			gdsp_idma_in(dsp_addr, addr, len);
+			break;
 	}
 }
diff --git a/Source/Core/Core/Src/DSP/DSPHost.h b/Source/Core/Core/Src/DSP/DSPHost.h
index 8ee90477d6..86033b0724 100644
--- a/Source/Core/Core/Src/DSP/DSPHost.h
+++ b/Source/Core/Core/Src/DSP/DSPHost.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _DSPHOST_H
 #define _DSPHOST_H
diff --git a/Source/Core/Core/Src/DSP/DSPIntCCUtil.cpp b/Source/Core/Core/Src/DSP/DSPIntCCUtil.cpp
index 644ce60663..af75aedcc3 100644
--- a/Source/Core/Core/Src/DSP/DSPIntCCUtil.cpp
+++ b/Source/Core/Core/Src/DSP/DSPIntCCUtil.cpp
@@ -1,20 +1,7 @@
-// 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/
-
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
+//
 // Additional copyrights go to Duddie and Tratax (c) 2004
 
 
diff --git a/Source/Core/Core/Src/DSP/DSPIntCCUtil.h b/Source/Core/Core/Src/DSP/DSPIntCCUtil.h
index 0684cea2ba..e98c0d905d 100644
--- a/Source/Core/Core/Src/DSP/DSPIntCCUtil.h
+++ b/Source/Core/Core/Src/DSP/DSPIntCCUtil.h
@@ -1,20 +1,7 @@
-// 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/
-
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
+//
 // Additional copyrights go to Duddie and Tratax (c) 2004
 
 #ifndef _GDSP_CONDITION_CODES_H
diff --git a/Source/Core/Core/Src/DSP/DSPIntExtOps.cpp b/Source/Core/Core/Src/DSP/DSPIntExtOps.cpp
index 76032165e1..bc448233ba 100644
--- a/Source/Core/Core/Src/DSP/DSPIntExtOps.cpp
+++ b/Source/Core/Core/Src/DSP/DSPIntExtOps.cpp
@@ -1,19 +1,7 @@
-// Copyright (C) 2003 Dolphin Project.
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
-// 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 "DSPIntUtil.h"
 #include "DSPMemoryMap.h"
 #include "DSPIntExtOps.h"
@@ -56,22 +44,25 @@ inline bool IsSameMemArea(u16 a, u16 b)
 // DR $arR
 // xxxx xxxx 0000 01rr
 // Decrement addressing register $arR.
-void dr(const UDSPInstruction opc) {
+void dr(const UDSPInstruction opc)
+{
 	writeToBackLog(0, opc & 0x3, dsp_decrement_addr_reg(opc & 0x3));
 }
 
 // IR $arR
 // xxxx xxxx 0000 10rr
 // Increment addressing register $arR.
-void ir(const UDSPInstruction opc) {
+void ir(const UDSPInstruction opc)
+{
 	writeToBackLog(0, opc & 0x3, dsp_increment_addr_reg(opc & 0x3));
 }
 
 // NR $arR
 // xxxx xxxx 0000 11rr
 // Add corresponding indexing register $ixR to addressing register $arR.
-void nr(const UDSPInstruction opc) {
-	u8 reg = opc & 0x3;	
+void nr(const UDSPInstruction opc)
+{
+	u8 reg = opc & 0x3;
 	
 	writeToBackLog(0, reg, dsp_increase_addr_reg(reg, (s16)g_dsp.r.ix[reg]));
 }
@@ -81,10 +72,11 @@ void nr(const UDSPInstruction opc) {
 // Move value of $acS.S to the $axD.D.
 void mv(const UDSPInstruction opc)
 {
- 	u8 sreg = (opc & 0x3) + DSP_REG_ACL0;
+	u8 sreg = (opc & 0x3) + DSP_REG_ACL0;
 	u8 dreg = ((opc >> 2) & 0x3);
 
-	switch(sreg) {
+	switch(sreg)
+	{
 	case DSP_REG_ACL0:
 	case DSP_REG_ACL1:
 		writeToBackLog(0, dreg + DSP_REG_AXL0, g_dsp.r.ac[sreg-DSP_REG_ACL0].l);
@@ -105,7 +97,8 @@ void s(const UDSPInstruction opc)
 	u8 dreg = opc & 0x3;
 	u8 sreg = ((opc >> 3) & 0x3) + DSP_REG_ACL0;
 
-	switch(sreg) {
+	switch(sreg)
+	{
 	case DSP_REG_ACL0:
 	case DSP_REG_ACL1:
 		dsp_dmem_write(g_dsp.r.ar[dreg], g_dsp.r.ac[sreg-DSP_REG_ACL0].l);
@@ -115,7 +108,7 @@ void s(const UDSPInstruction opc)
 		dsp_dmem_write(g_dsp.r.ar[dreg], dsp_op_read_reg_and_saturate(sreg-DSP_REG_ACM0));
 		break;
 	}
-	writeToBackLog(0, dreg,	dsp_increment_addr_reg(dreg));
+	writeToBackLog(0, dreg, dsp_increment_addr_reg(dreg));
 }
 
 // SN @$arD, $acS.S
@@ -127,7 +120,8 @@ void sn(const UDSPInstruction opc)
 	u8 dreg = opc & 0x3;
 	u8 sreg = ((opc >> 3) & 0x3) + DSP_REG_ACL0;
 
-	switch(sreg) {
+	switch(sreg)
+	{
 	case DSP_REG_ACL0:
 	case DSP_REG_ACL1:
 		dsp_dmem_write(g_dsp.r.ar[dreg], g_dsp.r.ac[sreg-DSP_REG_ACL0].l);
@@ -137,7 +131,7 @@ void sn(const UDSPInstruction opc)
 		dsp_dmem_write(g_dsp.r.ar[dreg], dsp_op_read_reg_and_saturate(sreg-DSP_REG_ACM0));
 		break;
 	}
-	writeToBackLog(0, dreg,	dsp_increase_addr_reg(dreg, (s16)g_dsp.r.ix[dreg]));
+	writeToBackLog(0, dreg, dsp_increase_addr_reg(dreg, (s16)g_dsp.r.ix[dreg]));
 }
 
 // L $axD.D, @$arS
@@ -153,13 +147,13 @@ void l(const UDSPInstruction opc)
 	{
 		u16 val = dsp_dmem_read(g_dsp.r.ar[sreg]);
 		writeToBackLog(0, dreg - DSP_REG_ACM0 + DSP_REG_ACH0, (val & 0x8000) ? 0xFFFF : 0x0000);
-		writeToBackLog(1, dreg,	val);
+		writeToBackLog(1, dreg, val);
 		writeToBackLog(2, dreg - DSP_REG_ACM0 + DSP_REG_ACL0, 0);
 		writeToBackLog(3, sreg, dsp_increment_addr_reg(sreg));
 	}
 	else
 	{
-		writeToBackLog(0, dreg,	dsp_dmem_read(g_dsp.r.ar[sreg]));
+		writeToBackLog(0, dreg, dsp_dmem_read(g_dsp.r.ar[sreg]));
 		writeToBackLog(1, sreg, dsp_increment_addr_reg(sreg));
 	}
 }
@@ -167,7 +161,7 @@ void l(const UDSPInstruction opc)
 // LN $axD.D, @$arS
 // xxxx xxxx 01dd d0ss
 // Load $axD.D/$acD.D with value from memory pointed by register $arS. 
-// Add indexing register register $ixS to register $arS.
+// Add indexing register $ixS to register $arS.
 void ln(const UDSPInstruction opc)
 {
 	u8 sreg = opc & 0x3;
@@ -177,13 +171,13 @@ void ln(const UDSPInstruction opc)
 	{
 		u16 val = dsp_dmem_read(g_dsp.r.ar[sreg]);
 		writeToBackLog(0, dreg - DSP_REG_ACM0 + DSP_REG_ACH0, (val & 0x8000) ? 0xFFFF : 0x0000);
-		writeToBackLog(1, dreg,	val);
+		writeToBackLog(1, dreg, val);
 		writeToBackLog(2, dreg - DSP_REG_ACM0 + DSP_REG_ACL0, 0);
 		writeToBackLog(3, sreg, dsp_increase_addr_reg(sreg, (s16)g_dsp.r.ix[sreg]));
 	}
 	else
 	{
-		writeToBackLog(0, dreg,	dsp_dmem_read(g_dsp.r.ar[sreg]));
+		writeToBackLog(0, dreg, dsp_dmem_read(g_dsp.r.ar[sreg]));
 		writeToBackLog(1, sreg, dsp_increase_addr_reg(sreg, (s16)g_dsp.r.ix[sreg]));
 	}
 }
@@ -200,7 +194,7 @@ void ls(const UDSPInstruction opc)
 
 	dsp_dmem_write(g_dsp.r.ar[3], dsp_op_read_reg_and_saturate(sreg));
 
-	writeToBackLog(0, dreg,	dsp_dmem_read(g_dsp.r.ar[0]));
+	writeToBackLog(0, dreg, dsp_dmem_read(g_dsp.r.ar[0]));
 	writeToBackLog(1, DSP_REG_AR3, dsp_increment_addr_reg(DSP_REG_AR3));
 	writeToBackLog(2, DSP_REG_AR0, dsp_increment_addr_reg(DSP_REG_AR0)); 
 }
@@ -219,7 +213,7 @@ void lsn(const UDSPInstruction opc)
 
 	dsp_dmem_write(g_dsp.r.ar[3], dsp_op_read_reg_and_saturate(sreg));
 
-	writeToBackLog(0, dreg,	dsp_dmem_read(g_dsp.r.ar[0]));
+	writeToBackLog(0, dreg, dsp_dmem_read(g_dsp.r.ar[0]));
 	writeToBackLog(1, DSP_REG_AR3, dsp_increment_addr_reg(DSP_REG_AR3));
 	writeToBackLog(2, DSP_REG_AR0, dsp_increase_addr_reg(DSP_REG_AR0, (s16)g_dsp.r.ix[0]));
 }
@@ -237,7 +231,7 @@ void lsm(const UDSPInstruction opc)
 
 	dsp_dmem_write(g_dsp.r.ar[3], dsp_op_read_reg_and_saturate(sreg));
 
-	writeToBackLog(0, dreg,	dsp_dmem_read(g_dsp.r.ar[0]));
+	writeToBackLog(0, dreg, dsp_dmem_read(g_dsp.r.ar[0]));
 	writeToBackLog(1, DSP_REG_AR3, dsp_increase_addr_reg(DSP_REG_AR3, (s16)g_dsp.r.ix[3]));
 	writeToBackLog(2, DSP_REG_AR0, dsp_increment_addr_reg(DSP_REG_AR0));
 }
@@ -256,7 +250,7 @@ void lsnm(const UDSPInstruction opc)
 
 	dsp_dmem_write(g_dsp.r.ar[3], dsp_op_read_reg_and_saturate(sreg));
 
-	writeToBackLog(0, dreg,	dsp_dmem_read(g_dsp.r.ar[0]));
+	writeToBackLog(0, dreg, dsp_dmem_read(g_dsp.r.ar[0]));
 	writeToBackLog(1, DSP_REG_AR3, dsp_increase_addr_reg(DSP_REG_AR3, (s16)g_dsp.r.ix[3]));
 	writeToBackLog(2, DSP_REG_AR0, dsp_increase_addr_reg(DSP_REG_AR0, (s16)g_dsp.r.ix[0]));
 }
@@ -273,7 +267,7 @@ void sl(const UDSPInstruction opc)
 
 	dsp_dmem_write(g_dsp.r.ar[0], dsp_op_read_reg_and_saturate(sreg));
 
-	writeToBackLog(0, dreg,	dsp_dmem_read(g_dsp.r.ar[3]));
+	writeToBackLog(0, dreg, dsp_dmem_read(g_dsp.r.ar[3]));
 	writeToBackLog(1, DSP_REG_AR3, dsp_increment_addr_reg(DSP_REG_AR3));
 	writeToBackLog(2, DSP_REG_AR0, dsp_increment_addr_reg(DSP_REG_AR0)); 
 }
@@ -291,7 +285,7 @@ void sln(const UDSPInstruction opc)
 
 	dsp_dmem_write(g_dsp.r.ar[0], dsp_op_read_reg_and_saturate(sreg));
 
-	writeToBackLog(0, dreg,	dsp_dmem_read(g_dsp.r.ar[3]));
+	writeToBackLog(0, dreg, dsp_dmem_read(g_dsp.r.ar[3]));
 	writeToBackLog(1, DSP_REG_AR3, dsp_increment_addr_reg(DSP_REG_AR3));
 	writeToBackLog(2, DSP_REG_AR0, dsp_increase_addr_reg(DSP_REG_AR0, (s16)g_dsp.r.ix[0]));
 }
@@ -309,7 +303,7 @@ void slm(const UDSPInstruction opc)
 
 	dsp_dmem_write(g_dsp.r.ar[0], dsp_op_read_reg_and_saturate(sreg));
 
-	writeToBackLog(0, dreg,	dsp_dmem_read(g_dsp.r.ar[3]));
+	writeToBackLog(0, dreg, dsp_dmem_read(g_dsp.r.ar[3]));
 	writeToBackLog(1, DSP_REG_AR3, dsp_increase_addr_reg(DSP_REG_AR3, (s16)g_dsp.r.ix[3]));
 	writeToBackLog(2, DSP_REG_AR0, dsp_increment_addr_reg(DSP_REG_AR0));
 }
@@ -327,7 +321,7 @@ void slnm(const UDSPInstruction opc)
 
 	dsp_dmem_write(g_dsp.r.ar[0], dsp_op_read_reg_and_saturate(sreg));
 
-	writeToBackLog(0, dreg,	dsp_dmem_read(g_dsp.r.ar[3]));
+	writeToBackLog(0, dreg, dsp_dmem_read(g_dsp.r.ar[3]));
 	writeToBackLog(1, DSP_REG_AR3, dsp_increase_addr_reg(DSP_REG_AR3, (s16)g_dsp.r.ix[3]));
 	writeToBackLog(2, DSP_REG_AR0, dsp_increase_addr_reg(DSP_REG_AR0, (s16)g_dsp.r.ix[0]));
 }
@@ -354,7 +348,7 @@ void ld(const UDSPInstruction opc)
 	else
 		writeToBackLog(1, (rreg << 1) + DSP_REG_AXL1, dsp_dmem_read(g_dsp.r.ar[3]));
 
-	writeToBackLog(2, sreg,	dsp_increment_addr_reg(sreg));
+	writeToBackLog(2, sreg, dsp_increment_addr_reg(sreg));
 
 	writeToBackLog(3, DSP_REG_AR3, dsp_increment_addr_reg(DSP_REG_AR3));
 }
@@ -373,7 +367,7 @@ void ldax(const UDSPInstruction opc)
 	else
 		writeToBackLog(1, rreg + DSP_REG_AXL0, dsp_dmem_read(g_dsp.r.ar[3]));
 
-	writeToBackLog(2, sreg,	dsp_increment_addr_reg(sreg));
+	writeToBackLog(2, sreg, dsp_increment_addr_reg(sreg));
 
 	writeToBackLog(3, DSP_REG_AR3, dsp_increment_addr_reg(DSP_REG_AR3));
 }
@@ -393,7 +387,7 @@ void ldn(const UDSPInstruction opc)
 	else
 		writeToBackLog(1, (rreg << 1) + DSP_REG_AXL1, dsp_dmem_read(g_dsp.r.ar[3]));
 
-	writeToBackLog(2, sreg,	dsp_increase_addr_reg(sreg, (s16)g_dsp.r.ix[sreg]));
+	writeToBackLog(2, sreg, dsp_increase_addr_reg(sreg, (s16)g_dsp.r.ix[sreg]));
 
 	writeToBackLog(3, DSP_REG_AR3, dsp_increment_addr_reg(DSP_REG_AR3));
 }
@@ -412,7 +406,7 @@ void ldaxn(const UDSPInstruction opc)
 	else
 		writeToBackLog(1, rreg + DSP_REG_AXL0, dsp_dmem_read(g_dsp.r.ar[3]));
 
-	writeToBackLog(2, sreg,	dsp_increase_addr_reg(sreg, (s16)g_dsp.r.ix[sreg]));
+	writeToBackLog(2, sreg, dsp_increase_addr_reg(sreg, (s16)g_dsp.r.ix[sreg]));
 
 	writeToBackLog(3, DSP_REG_AR3, dsp_increment_addr_reg(DSP_REG_AR3));
 }
@@ -432,7 +426,7 @@ void ldm(const UDSPInstruction opc)
 	else
 		writeToBackLog(1, (rreg << 1) + DSP_REG_AXL1, dsp_dmem_read(g_dsp.r.ar[3]));
 
-	writeToBackLog(2, sreg,	dsp_increment_addr_reg(sreg));
+	writeToBackLog(2, sreg, dsp_increment_addr_reg(sreg));
 
 	writeToBackLog(3, DSP_REG_AR3,
 		       dsp_increase_addr_reg(DSP_REG_AR3, (s16)g_dsp.r.ix[3]));
@@ -452,7 +446,7 @@ void ldaxm(const UDSPInstruction opc)
 	else
 		writeToBackLog(1, rreg + DSP_REG_AXL0, dsp_dmem_read(g_dsp.r.ar[3]));
 
-	writeToBackLog(2, sreg,	dsp_increment_addr_reg(sreg));
+	writeToBackLog(2, sreg, dsp_increment_addr_reg(sreg));
 
 	writeToBackLog(3, DSP_REG_AR3,
 		       dsp_increase_addr_reg(DSP_REG_AR3, (s16)g_dsp.r.ix[3]));
@@ -473,7 +467,7 @@ void ldnm(const UDSPInstruction opc)
 	else
 		writeToBackLog(1, (rreg << 1) + DSP_REG_AXL1, dsp_dmem_read(g_dsp.r.ar[3]));
 
-	writeToBackLog(2, sreg,	dsp_increase_addr_reg(sreg, (s16)g_dsp.r.ix[sreg]));
+	writeToBackLog(2, sreg, dsp_increase_addr_reg(sreg, (s16)g_dsp.r.ix[sreg]));
 
 	writeToBackLog(3, DSP_REG_AR3,
 		       dsp_increase_addr_reg(DSP_REG_AR3, (s16)g_dsp.r.ix[3]));
@@ -493,7 +487,7 @@ void ldaxnm(const UDSPInstruction opc)
 	else
 		writeToBackLog(1, rreg + DSP_REG_AXL0, dsp_dmem_read(g_dsp.r.ar[3]));
 
-	writeToBackLog(2, sreg,	dsp_increase_addr_reg(sreg, (s16)g_dsp.r.ix[sreg]));
+	writeToBackLog(2, sreg, dsp_increase_addr_reg(sreg, (s16)g_dsp.r.ix[sreg]));
 
 	writeToBackLog(3, DSP_REG_AR3,
 		       dsp_increase_addr_reg(DSP_REG_AR3, (s16)g_dsp.r.ix[3]));
@@ -520,7 +514,8 @@ void applyWriteBackLog()
 {
 	// always make sure to have an extra entry at the end w/ -1 to avoid
 	// infinitive loops
-	for (int i = 0; writeBackLogIdx[i] != -1; i++) {
+	for (int i = 0; writeBackLogIdx[i] != -1; i++)
+	{
 #ifdef PRECISE_BACKLOG
 		dsp_op_write_reg(writeBackLogIdx[i], dsp_op_read_reg(writeBackLogIdx[i]) | writeBackLog[i]);
 #else
@@ -536,14 +531,15 @@ void applyWriteBackLog()
 // apply the ext command output, because if the main op didn't change the value
 // then 0 | ext output = ext output and if it did then bitwise or is still the
 // right thing to do
-// Only needed for cases when when mainop and extended are modifying the same ACC
+// Only needed for cases when mainop and extended are modifying the same ACC
 // Games are not doing that + in motorola (similar dsp) dox this is forbidden to do.
 void zeroWriteBackLog()
 {
 #ifdef PRECISE_BACKLOG
 	// always make sure to have an extra entry at the end w/ -1 to avoid
 	// infinitive loops
-	for (int i = 0; writeBackLogIdx[i] != -1; i++) {
+	for (int i = 0; writeBackLogIdx[i] != -1; i++)
+	{
 		dsp_op_write_reg(writeBackLogIdx[i], 0);
 	}
 #endif
@@ -552,8 +548,8 @@ void zeroWriteBackLog()
 void zeroWriteBackLogPreserveAcc(u8 acc) 
 {
 #ifdef PRECISE_BACKLOG
-	for (int i = 0; writeBackLogIdx[i] != -1; i++) {
-		
+	for (int i = 0; writeBackLogIdx[i] != -1; i++)
+	{
 		// acc0
 		if ((acc == 0) &&  
 			((writeBackLogIdx[i] == DSP_REG_ACL0) || (writeBackLogIdx[i] == DSP_REG_ACM0) || (writeBackLogIdx[i] == DSP_REG_ACH0)))
diff --git a/Source/Core/Core/Src/DSP/DSPIntUtil.h b/Source/Core/Core/Src/DSP/DSPIntUtil.h
index 49f8c209c2..7299d7e8c9 100644
--- a/Source/Core/Core/Src/DSP/DSPIntUtil.h
+++ b/Source/Core/Core/Src/DSP/DSPIntUtil.h
@@ -130,7 +130,9 @@ static inline u16 dsp_decrement_addr_reg(u16 reg)
 static inline u16 dsp_op_read_reg(int _reg)
 {
 	int reg = _reg & 0x1f;
-	switch (reg) {
+
+	switch (reg)
+	{
 	case DSP_REG_ST0:
 	case DSP_REG_ST1:
 	case DSP_REG_ST2:
@@ -181,7 +183,9 @@ static inline u16 dsp_op_read_reg(int _reg)
 static inline void dsp_op_write_reg(int _reg, u16 val)
 {
 	int reg = _reg & 0x1f;
-	switch (reg) {
+
+	switch (reg)
+	{
 	// 8-bit sign extended registers. Should look at prod.h too...
 	case DSP_REG_ACH0:
 	case DSP_REG_ACH1:
@@ -349,10 +353,14 @@ inline u16 dsp_op_read_reg_and_saturate(u8 _reg)
 				return 0x8000;
 		}
 		else
+		{
 			return g_dsp.r.ac[_reg].m;
+		}
 	}
 	else
+	{
 		return g_dsp.r.ac[_reg].m;
+	}
 }
 
 // ---------------------------------------------------------------------------------------
diff --git a/Source/Core/Core/Src/DSP/DSPInterpreter.h b/Source/Core/Core/Src/DSP/DSPInterpreter.h
index 916d43d8b4..c2e144a682 100644
--- a/Source/Core/Core/Src/DSP/DSPInterpreter.h
+++ b/Source/Core/Core/Src/DSP/DSPInterpreter.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _DSPINTERPRETER_H
 #define _DSPINTERPRETER_H
@@ -48,9 +35,9 @@ typedef void (*DSPInterpreterFunc)(const UDSPInstruction opc);
 void call(const UDSPInstruction opc);
 void callr(const UDSPInstruction opc);
 void ifcc(const UDSPInstruction opc);
-void jcc(const UDSPInstruction opc);	
+void jcc(const UDSPInstruction opc);
 void jmprcc(const UDSPInstruction opc);
-void ret(const UDSPInstruction opc);	
+void ret(const UDSPInstruction opc);
 void halt(const UDSPInstruction opc);
 void loop(const UDSPInstruction opc);
 void loopi(const UDSPInstruction opc);
diff --git a/Source/Core/Core/Src/DSP/DSPMemoryMap.cpp b/Source/Core/Core/Src/DSP/DSPMemoryMap.cpp
index 1cbced0713..7a56c2618f 100644
--- a/Source/Core/Core/Src/DSP/DSPMemoryMap.cpp
+++ b/Source/Core/Core/Src/DSP/DSPMemoryMap.cpp
@@ -52,7 +52,7 @@ u16 dsp_dmem_read(u16 addr)
 		return g_dsp.dram[addr & DSP_DRAM_MASK];
 		
 	case 0x1:  // 1xxx COEF
-		DEBUG_LOG(DSPLLE, "%04x : Coef Read @ %04x", g_dsp.pc, addr);
+		DEBUG_LOG(DSPLLE, "%04x : Coefficient Read @ %04x", g_dsp.pc, addr);
 		return g_dsp.coef[addr & DSP_COEF_MASK];
 
 	case 0xf:  // Fxxx HW regs
diff --git a/Source/Core/Core/Src/DSP/DSPTables.cpp b/Source/Core/Core/Src/DSP/DSPTables.cpp
index c8f4135bec..bc2cbf1488 100644
--- a/Source/Core/Core/Src/DSP/DSPTables.cpp
+++ b/Source/Core/Core/Src/DSP/DSPTables.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 // Additional copyrights go to Duddie (c) 2005 (duddie@walla.com)
 
@@ -27,7 +14,8 @@
 void nop(const UDSPInstruction opc)
 {
 	// The real nop is 0. Anything else is bad.
-	if (opc) {
+	if (opc)
+	{
 		ERROR_LOG(DSPLLE, "LLE: Unrecognized opcode 0x%04x", opc);
 	}
 }
@@ -536,7 +524,7 @@ void InitInstructionTable()
 		extOpTable[i] = &cw;
 
 	for (int i = 0; i < EXT_OPTABLE_SIZE; i++)
-    {
+	{
 		for (int j = 0; j < opcodes_ext_size; j++)
 		{
 			u16 mask = opcodes_ext[j].opcode_mask;
@@ -576,4 +564,4 @@ void InitInstructionTable()
 
 	for (int i=0; i < WRITEBACKLOGSIZE; i++)
 		writeBackLogIdx[i] = -1;
-}	
+}
diff --git a/Source/Core/Core/Src/DSP/DSPTables.h b/Source/Core/Core/Src/DSP/DSPTables.h
index 56ad885d23..fdad92bc2b 100644
--- a/Source/Core/Core/Src/DSP/DSPTables.h
+++ b/Source/Core/Core/Src/DSP/DSPTables.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 // Additional copyrights go to Duddie (c) 2005 (duddie@walla.com)
 
@@ -34,14 +21,14 @@
 enum partype_t
 {
 	P_NONE		= 0x0000,
-	P_VAL       = 0x0001,
+	P_VAL		= 0x0001,
 	P_IMM		= 0x0002,
 	P_MEM		= 0x0003,
 	P_STR		= 0x0004,
 	P_ADDR_I	= 0x0005,
 	P_ADDR_D	= 0x0006,
 	P_REG		= 0x8000,
-	P_REG04     = P_REG | 0x0400, // IX
+	P_REG04		= P_REG | 0x0400, // IX
 	P_REG08		= P_REG | 0x0800, 
 	P_REG18		= P_REG | 0x1800,
 	P_REGM18	= P_REG | 0x1810, // used in multiply instructions
@@ -58,8 +45,8 @@ enum partype_t
 	P_ACC_D		= P_REG | 0x2080,
 	P_AX		= P_REG | 0x2200,
 	P_REGS_MASK	= 0x03f80, // gcdsptool's value = 0x01f80
-	P_REF       = P_REG | 0x4000,
-	P_PRG       = P_REF | P_REG,
+	P_REF		= P_REG | 0x4000,
+	P_PRG		= P_REF | P_REG,
 
 	// The following seem like junk:
 	//	P_REG10		= P_REG | 0x1000,
@@ -143,14 +130,18 @@ inline void ExecuteInstruction(const UDSPInstruction inst)
 {
 	const DSPOPCTemplate *tinst = GetOpTemplate(inst);
 
-	if (tinst->extended) {
+	if (tinst->extended)
+	{
 		if ((inst >> 12) == 0x3)
 			extOpTable[inst & 0x7F]->intFunc(inst);
 		else
 			extOpTable[inst & 0xFF]->intFunc(inst);
 	}
+
 	tinst->intFunc(inst);
-	if (tinst->extended) {
+
+	if (tinst->extended)
+	{
 		applyWriteBackLog();
 	}
 }
diff --git a/Source/Core/Core/Src/DSP/DspIntArithmetic.cpp b/Source/Core/Core/Src/DSP/DspIntArithmetic.cpp
index f9627f2176..4d2b5be3ac 100644
--- a/Source/Core/Core/Src/DSP/DspIntArithmetic.cpp
+++ b/Source/Core/Core/Src/DSP/DspIntArithmetic.cpp
@@ -1,20 +1,7 @@
-// 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/
-
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
+//
 // Additional copyrights go to Duddie and Tratax (c) 2004
 
 #include "DSPInterpreter.h"
@@ -464,7 +451,7 @@ void addp(const UDSPInstruction opc)
 
 	dsp_set_long_acc(dreg, res);
 	res = dsp_get_long_acc(dreg);
-	Update_SR_Register64(res, isCarry2(acc, res), isOverflow(acc, prod, res));
+	Update_SR_Register64(res, isCarry(acc, res), isOverflow(acc, prod, res));
 }
 
 // ADDAXL $acD, $axS.l
@@ -695,7 +682,7 @@ void dec(const UDSPInstruction opc)
 {
 	u8 dreg = (opc >> 8) & 0x01;
 
-	s64 acc = dsp_get_long_acc(dreg); 
+	s64 acc = dsp_get_long_acc(dreg);
 	s64 res = acc - 1;
 
 	zeroWriteBackLog();
@@ -734,7 +721,7 @@ void abs(const UDSPInstruction opc)
 {
 	u8 dreg = (opc >> 11) & 0x1;
 
-	s64 acc = dsp_get_long_acc(dreg); 	
+	s64 acc = dsp_get_long_acc(dreg);
 
 	if (acc < 0)
 		acc = 0 - acc;
@@ -756,9 +743,10 @@ void movr(const UDSPInstruction opc)
 {
 	u8 areg = (opc >> 8) & 0x1;
 	u8 sreg = ((opc >> 9) & 0x3) + DSP_REG_AXL0;
- 		
+
 	s64 ax = 0;
-	switch(sreg) {
+	switch(sreg)
+	{
 	case DSP_REG_AXL0:
 	case DSP_REG_AXL1:
 		ax = (s16)g_dsp.r.ax[sreg-DSP_REG_AXL0].l;
@@ -973,9 +961,12 @@ void lsrn(const UDSPInstruction opc)
 	else
 		shift = accm & 0x3f;
 
-	if (shift > 0) {
+	if (shift > 0)
+	{
 		acc >>= shift;
-	} else if (shift < 0) {
+	}
+	else if (shift < 0)
+	{
 		acc <<= -shift;
 	}
 
@@ -1002,9 +993,12 @@ void asrn(const UDSPInstruction opc)
 	else
 		shift = accm & 0x3f;
 
-	if (shift > 0) {
+	if (shift > 0)
+	{
 		acc >>= shift;
-	} else if (shift < 0) {
+	}
+	else if (shift < 0)
+	{
 		acc <<= -shift;
 	}
 
@@ -1035,9 +1029,12 @@ void lsrnrx(const UDSPInstruction opc)
 	else
 		shift = axh & 0x3f;
 
-	if (shift > 0) {
+	if (shift > 0)
+	{
 		acc <<= shift;
-	} else if (shift < 0) {
+	}
+	else if (shift < 0)
+	{
 		acc >>= -shift;
 	}
 
@@ -1069,9 +1066,12 @@ void asrnrx(const UDSPInstruction opc)
 	else
 		shift = axh & 0x3f;
 
-	if (shift > 0) {
+	if (shift > 0)
+	{
 		acc <<= shift;
-	} else if (shift < 0) {
+	}
+	else if (shift < 0)
+	{
 		acc >>= -shift;
 	}
 
@@ -1116,7 +1116,7 @@ void lsrnr(const UDSPInstruction opc)
 
 // ASRNR  $acD
 // 0011 111d 1xxx xxxx
-// Arithmeticaly shift left/right accumulator $ACC[D] by lower 7-bit (signed) value in $AC[1-D].M
+// Arithmetically shift left/right accumulator $ACC[D] by lower 7-bit (signed) value in $AC[1-D].M
 // x = extension (7 bits!!)
 //
 // flags out: --xx xx00
diff --git a/Source/Core/Core/Src/DSP/DspIntBranch.cpp b/Source/Core/Core/Src/DSP/DspIntBranch.cpp
index 80809aaae6..a4c861c814 100644
--- a/Source/Core/Core/Src/DSP/DspIntBranch.cpp
+++ b/Source/Core/Core/Src/DSP/DspIntBranch.cpp
@@ -1,20 +1,7 @@
-// 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/
-
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
+//
 // Additional copyrights go to Duddie and Tratax (c) 2004
 
 #include "DSPInterpreter.h"
@@ -194,7 +181,9 @@ void loop(const UDSPInstruction opc)
 		dsp_reg_store_stack(3, cnt);
 	}
 	else
+	{
 		dsp_skip_inst();
+	}
 }
 
 // LOOPI #I
@@ -217,7 +206,9 @@ void loopi(const UDSPInstruction opc)
 		dsp_reg_store_stack(3, cnt);
 	}
 	else
+	{
 		dsp_skip_inst();
+	}
 }
 
 
diff --git a/Source/Core/Core/Src/DSP/DspIntLoadStore.cpp b/Source/Core/Core/Src/DSP/DspIntLoadStore.cpp
index 3b301277ae..b1a8f1b868 100644
--- a/Source/Core/Core/Src/DSP/DspIntLoadStore.cpp
+++ b/Source/Core/Core/Src/DSP/DspIntLoadStore.cpp
@@ -1,20 +1,7 @@
-// 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/
-
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
+//
 // Additional copyrights go to Duddie and Tratax (c) 2004
 
 #include "DSPInterpreter.h"
diff --git a/Source/Core/Core/Src/DSP/DspIntMisc.cpp b/Source/Core/Core/Src/DSP/DspIntMisc.cpp
index 7db4eec1eb..93d04d15b0 100644
--- a/Source/Core/Core/Src/DSP/DspIntMisc.cpp
+++ b/Source/Core/Core/Src/DSP/DspIntMisc.cpp
@@ -1,20 +1,7 @@
-// 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/
-
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
+//
 // Additional copyrights go to Duddie and Tratax (c) 2004
 
 
diff --git a/Source/Core/Core/Src/DSP/DspIntMultiplier.cpp b/Source/Core/Core/Src/DSP/DspIntMultiplier.cpp
index fbde7a645c..5a1b98e4b7 100644
--- a/Source/Core/Core/Src/DSP/DspIntMultiplier.cpp
+++ b/Source/Core/Core/Src/DSP/DspIntMultiplier.cpp
@@ -1,20 +1,7 @@
-// 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/
-
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
+//
 // Additional copyrights go to Duddie and Tratax (c) 2004
 
 
@@ -203,7 +190,7 @@ void mulaxh(const UDSPInstruction opc)
 
 	zeroWriteBackLog();
 	
-	dsp_set_long_prod(prod);		
+	dsp_set_long_prod(prod);
 }
 
 //----
@@ -241,7 +228,7 @@ void mulac(const UDSPInstruction opc)
 	u16 axl = dsp_get_ax_l(sreg);
 	u16 axh = dsp_get_ax_h(sreg);
 	s64 prod = dsp_multiply(axl, axh);
-												
+
 	zeroWriteBackLog();
 
 	dsp_set_long_prod(prod);
@@ -265,7 +252,7 @@ void mulmv(const UDSPInstruction opc)
 	u16 axl = dsp_get_ax_l(sreg);
 	u16 axh = dsp_get_ax_h(sreg);
 	s64 prod = dsp_multiply(axl, axh);
-												
+
 	zeroWriteBackLog();
 
 	dsp_set_long_prod(prod);
@@ -335,7 +322,7 @@ void mulxac(const UDSPInstruction opc)
 	u16 val1 = (sreg == 0) ? dsp_get_ax_l(0) : dsp_get_ax_h(0);
 	u16 val2 = (treg == 0) ? dsp_get_ax_l(1) : dsp_get_ax_h(1);
 	s64 prod = dsp_multiply_mulx(sreg, treg, val1, val2);
-	
+
 	zeroWriteBackLog();
 
 	dsp_set_long_prod(prod);
@@ -408,7 +395,7 @@ void mulc(const UDSPInstruction opc)
 	u16 accm = dsp_get_acc_m(sreg);
 	u16 axh = dsp_get_ax_h(treg);
 	s64 prod = dsp_multiply(accm, axh);
-												
+
 	zeroWriteBackLog();
 
 	dsp_set_long_prod(prod);
@@ -484,7 +471,7 @@ void mulcmvz(const UDSPInstruction opc)
 	u16 accm = dsp_get_acc_m(sreg);
 	u16 axh = dsp_get_ax_h(treg);
 	s64 prod = dsp_multiply(accm, axh);
-											
+
 	zeroWriteBackLog();
 
 	dsp_set_long_prod(prod);
@@ -582,7 +569,7 @@ void madd(const UDSPInstruction opc)
 	u16 axl = dsp_get_ax_l(sreg);
 	u16 axh = dsp_get_ax_h(sreg);
 	s64 prod = dsp_multiply_add(axl, axh);
-												
+
 	zeroWriteBackLog();
 
 	dsp_set_long_prod(prod);
@@ -600,7 +587,7 @@ void msub(const UDSPInstruction opc)
 	u16 axl = dsp_get_ax_l(sreg);
 	u16 axh = dsp_get_ax_h(sreg);
 	s64 prod = dsp_multiply_sub(axl, axh);
-												
+
 	zeroWriteBackLog();
 
 	dsp_set_long_prod(prod);
diff --git a/Source/Core/Core/Src/DSP/Jit/DSPJitArithmetic.cpp b/Source/Core/Core/Src/DSP/Jit/DSPJitArithmetic.cpp
index 185ada8ba3..04cc3aa753 100644
--- a/Source/Core/Core/Src/DSP/Jit/DSPJitArithmetic.cpp
+++ b/Source/Core/Core/Src/DSP/Jit/DSPJitArithmetic.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 // Additional copyrights go to Duddie and Tratax (c) 2004
 
@@ -299,7 +286,7 @@ void DSPEmitter::cmpi(const UDSPInstruction opc)
 
 // CMPIS $acD, #I
 // 0000 011d iiii iiii
-// Compares accumulator with short immediate. Comaprison is executed
+// Compares accumulator with short immediate. Comparison is executed
 // by subtracting short immediate (8bit sign extended) from mid accumulator
 // $acD.hm and computing flags based on whole accumulator $acD.
 //
@@ -750,12 +737,12 @@ void DSPEmitter::addp(const UDSPInstruction opc)
 	ADD(64, R(RAX), R(RDX));
 //	dsp_set_long_acc(dreg, res);
 //	res = dsp_get_long_acc(dreg);
-//	Update_SR_Register64(res, isCarry2(acc, res), isOverflow(acc, prod, res));
+//	Update_SR_Register64(res, isCarry(acc, res), isOverflow(acc, prod, res));
 	if (FlagsNeeded())
 	{
 		MOV(64, R(RCX), R(RAX));
 		set_long_acc(dreg, RCX);
-		Update_SR_Register64_Carry2(EAX, tmp1);
+		Update_SR_Register64_Carry(EAX, tmp1);
 	}
 	else
 	{
@@ -1570,16 +1557,17 @@ void DSPEmitter::lsrn(const UDSPInstruction opc)
 	//		acc <<= -shift;
 	//	}
 
-	CMP(64, R(RDX), Imm8(0));
+	CMP(64, R(RDX), Imm8(0));//is this actually worth the branch cost?
 	FixupBranch zero = J_CC(CC_E);
-	TEST(16, R(RAX), Imm16(0x3f));
+	TEST(16, R(RAX), Imm16(0x3f));//is this actually worth the branch cost?
 	FixupBranch noShift = J_CC(CC_Z);
-	MOVZX(64, 16, RCX, R(RAX));
-	AND(16, R(RCX), Imm16(0x3f));
+//CL gets automatically masked with 0x3f on IA32/AMD64
+	//MOVZX(64, 16, RCX, R(RAX));
+	//AND(16, R(RCX), Imm16(0x3f));
 	TEST(16, R(RAX), Imm16(0x40));
 	FixupBranch shiftLeft = J_CC(CC_Z);
 	NEG(16, R(RCX));
-	ADD(16, R(RCX), Imm16(0x40));
+	//ADD(16, R(RCX), Imm16(0x40));
 	SHL(64, R(RDX), R(RCX));
 	FixupBranch exit = J();
 	SetJumpTarget(shiftLeft);
diff --git a/Source/Core/Core/Src/DSP/Jit/DSPJitBranch.cpp b/Source/Core/Core/Src/DSP/Jit/DSPJitBranch.cpp
index 252550b84c..70bb3618e6 100644
--- a/Source/Core/Core/Src/DSP/Jit/DSPJitBranch.cpp
+++ b/Source/Core/Core/Src/DSP/Jit/DSPJitBranch.cpp
@@ -1,19 +1,6 @@
-// Copyright (C) 2010 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "../DSPMemoryMap.h"
 #include "../DSPEmitter.h"
@@ -29,7 +16,8 @@ template <void(*jitCode)(const UDSPInstruction, DSPEmitter&)>
 static void ReJitConditional(const UDSPInstruction opc, DSPEmitter& emitter)
 {
 	u8 cond = opc & 0xf;
-	if (cond == 0xf) {// Always true.
+	if (cond == 0xf) // Always true.
+	{
 		jitCode(opc,emitter);
 		return;
 	}
@@ -334,7 +322,8 @@ void DSPEmitter::loop(const UDSPInstruction opc)
 {
 	u16 reg = opc & 0x1f;
 //	u16 cnt = g_dsp.r[reg];
-	dsp_op_read_reg(reg, RDX, ZERO);
+//todo: check if we can use normal variant here
+	dsp_op_read_reg_dont_saturate(reg, RDX, ZERO);
 	u16 loop_pc = compilePC + 1;
 
 	CMP(16, R(EDX), Imm16(0));
@@ -403,7 +392,8 @@ void DSPEmitter::bloop(const UDSPInstruction opc)
 {
 	u16 reg = opc & 0x1f;
 //	u16 cnt = g_dsp.r[reg];
-	dsp_op_read_reg(reg, RDX, ZERO);
+//todo: check if we can use normal variant here
+	dsp_op_read_reg_dont_saturate(reg, RDX, ZERO);
 	u16 loop_pc = dsp_imem_read(compilePC + 1);
 
 	CMP(16, R(EDX), Imm16(0));
diff --git a/Source/Core/Core/Src/DSP/Jit/DSPJitCCUtil.cpp b/Source/Core/Core/Src/DSP/Jit/DSPJitCCUtil.cpp
index be7675378d..ff3180e92c 100644
--- a/Source/Core/Core/Src/DSP/Jit/DSPJitCCUtil.cpp
+++ b/Source/Core/Core/Src/DSP/Jit/DSPJitCCUtil.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 // Additional copyrights go to Duddie and Tratax (c) 2004
 
diff --git a/Source/Core/Core/Src/DSP/Jit/DSPJitExtOps.cpp b/Source/Core/Core/Src/DSP/Jit/DSPJitExtOps.cpp
index 40e39a89e9..149387db6d 100644
--- a/Source/Core/Core/Src/DSP/Jit/DSPJitExtOps.cpp
+++ b/Source/Core/Core/Src/DSP/Jit/DSPJitExtOps.cpp
@@ -1,19 +1,7 @@
-// Copyright (C) 2010 Dolphin Project.
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
-// 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 "../DSPMemoryMap.h"
 #include "../DSPEmitter.h"
 #include "DSPJitUtil.h"
@@ -41,21 +29,24 @@ using namespace Gen;
 // DR $arR
 // xxxx xxxx 0000 01rr
 // Decrement addressing register $arR.
-void DSPEmitter::dr(const UDSPInstruction opc) {
+void DSPEmitter::dr(const UDSPInstruction opc)
+{
 	decrement_addr_reg(opc & 0x3);
 }
 
 // IR $arR
 // xxxx xxxx 0000 10rr
 // Increment addressing register $arR.
-void DSPEmitter::ir(const UDSPInstruction opc) {
+void DSPEmitter::ir(const UDSPInstruction opc)
+{
 	increment_addr_reg(opc & 0x3);
 }
 
 // NR $arR
 // xxxx xxxx 0000 11rr
 // Add corresponding indexing register $ixR to addressing register $arR.
-void DSPEmitter::nr(const UDSPInstruction opc) {
+void DSPEmitter::nr(const UDSPInstruction opc)
+{
 	u8 reg = opc & 0x3;	
 	
 	increase_addr_reg(reg, reg);
@@ -66,15 +57,12 @@ void DSPEmitter::nr(const UDSPInstruction opc) {
 // Move value of $acS.S to the $axD.D.
 void DSPEmitter::mv(const UDSPInstruction opc)
 {
- 	u8 sreg = (opc & 0x3) + DSP_REG_ACL0;
+	u8 sreg = (opc & 0x3) + DSP_REG_ACL0;
 	u8 dreg = ((opc >> 2) & 0x3);
-	if (sreg >= DSP_REG_ACM0) {
-		dsp_op_read_reg_and_saturate(sreg, RBX, ZERO);
-		storeIndex = dreg + DSP_REG_AXL0;
-	} else
-		pushExtValueFromReg(dreg + DSP_REG_AXL0, sreg);
+	dsp_op_read_reg(sreg, RBX, ZERO);
+	storeIndex = dreg + DSP_REG_AXL0;
 }
-	
+
 // S @$arD, $acS.S
 // xxxx xxxx 001s s0dd
 // Store value of $acS.S in the memory pointed by register $arD.
@@ -89,10 +77,7 @@ void DSPEmitter::s(const UDSPInstruction opc)
 	X64Reg tmp1;
 	gpr.getFreeXReg(tmp1);
 
-	if (sreg >= DSP_REG_ACM0)
-		dsp_op_read_reg_and_saturate(sreg, tmp1, ZERO);
-	else
-		dsp_op_read_reg(sreg, tmp1, ZERO);
+	dsp_op_read_reg(sreg, tmp1, ZERO);
 	//	u16 val = g_dsp.r[src];
 	dmem_write(tmp1);
 
@@ -114,10 +99,7 @@ void DSPEmitter::sn(const UDSPInstruction opc)
 	X64Reg tmp1;
 	gpr.getFreeXReg(tmp1);
 
-	if (sreg >= DSP_REG_ACM0)
-		dsp_op_read_reg_and_saturate(sreg, tmp1, ZERO);
-	else
-		dsp_op_read_reg(sreg, tmp1, ZERO);
+	dsp_op_read_reg(sreg, tmp1, ZERO);
 	dmem_write(tmp1);
 
 	gpr.putXReg(tmp1);
@@ -152,7 +134,7 @@ void DSPEmitter::l(const UDSPInstruction opc)
 // LN $axD.D, @$arS
 // xxxx xxxx 01dd d0ss
 // Load $axD.D/$acD.D with value from memory pointed by register $arS. 
-// Add indexing register register $ixS to register $arS.
+// Add indexing register $ixS to register $arS.
 void DSPEmitter::ln(const UDSPInstruction opc)
 {
 	u8 sreg = opc & 0x3;
@@ -187,7 +169,7 @@ void DSPEmitter::ls(const UDSPInstruction opc)
 	X64Reg tmp1;
 	gpr.getFreeXReg(tmp1);
 
-	dsp_op_read_reg_and_saturate(sreg + DSP_REG_ACM0, tmp1, ZERO);
+	dsp_op_read_reg(sreg + DSP_REG_ACM0, tmp1, ZERO);
 	dmem_write(tmp1);
 
 	gpr.putXReg(tmp1);
@@ -214,7 +196,7 @@ void DSPEmitter::lsn(const UDSPInstruction opc)
 	X64Reg tmp1;
 	gpr.getFreeXReg(tmp1);
 
-	dsp_op_read_reg_and_saturate(sreg + DSP_REG_ACM0, tmp1, ZERO);
+	dsp_op_read_reg(sreg + DSP_REG_ACM0, tmp1, ZERO);
 	dmem_write(tmp1);
 
 	gpr.putXReg(tmp1);
@@ -240,7 +222,7 @@ void DSPEmitter::lsm(const UDSPInstruction opc)
 	X64Reg tmp1;
 	gpr.getFreeXReg(tmp1);
 
-	dsp_op_read_reg_and_saturate(sreg + DSP_REG_ACM0, tmp1, ZERO);
+	dsp_op_read_reg(sreg + DSP_REG_ACM0, tmp1, ZERO);
 	dmem_write(tmp1);
 
 	gpr.putXReg(tmp1);
@@ -267,7 +249,7 @@ void DSPEmitter::lsnm(const UDSPInstruction opc)
 	X64Reg tmp1;
 	gpr.getFreeXReg(tmp1);
 
-	dsp_op_read_reg_and_saturate(sreg + DSP_REG_ACM0, tmp1, ZERO);
+	dsp_op_read_reg(sreg + DSP_REG_ACM0, tmp1, ZERO);
 	dmem_write(tmp1);
 
 	gpr.putXReg(tmp1);
@@ -292,7 +274,7 @@ void DSPEmitter::sl(const UDSPInstruction opc)
 	X64Reg tmp1;
 	gpr.getFreeXReg(tmp1);
 
-	dsp_op_read_reg_and_saturate(sreg + DSP_REG_ACM0, tmp1, ZERO);
+	dsp_op_read_reg(sreg + DSP_REG_ACM0, tmp1, ZERO);
 	dmem_write(tmp1);
 
 	gpr.putXReg(tmp1);
@@ -318,7 +300,7 @@ void DSPEmitter::sln(const UDSPInstruction opc)
 	X64Reg tmp1;
 	gpr.getFreeXReg(tmp1);
 
-	dsp_op_read_reg_and_saturate(sreg + DSP_REG_ACM0, tmp1, ZERO);
+	dsp_op_read_reg(sreg + DSP_REG_ACM0, tmp1, ZERO);
 	dmem_write(tmp1);
 
 	gpr.putXReg(tmp1);
@@ -344,7 +326,7 @@ void DSPEmitter::slm(const UDSPInstruction opc)
 	X64Reg tmp1;
 	gpr.getFreeXReg(tmp1);
 
-	dsp_op_read_reg_and_saturate(sreg + DSP_REG_ACM0, tmp1, ZERO);
+	dsp_op_read_reg(sreg + DSP_REG_ACM0, tmp1, ZERO);
 	dmem_write(tmp1);
 
 	gpr.putXReg(tmp1);
@@ -370,7 +352,7 @@ void DSPEmitter::slnm(const UDSPInstruction opc)
 	X64Reg tmp1;
 	gpr.getFreeXReg(tmp1);
 
-	dsp_op_read_reg_and_saturate(sreg + DSP_REG_ACM0, tmp1, ZERO);
+	dsp_op_read_reg(sreg + DSP_REG_ACM0, tmp1, ZERO);
 	dmem_write(tmp1);
 
 	gpr.putXReg(tmp1);
@@ -649,15 +631,10 @@ void DSPEmitter::ldaxnm(const UDSPInstruction opc)
 	increase_addr_reg(DSP_REG_AR3, DSP_REG_AR3);
 }
 
-
-// Push value from g_dsp.r[sreg] into EBX and stores the destinationindex in
-// storeIndex
-void DSPEmitter::pushExtValueFromReg(u16 dreg, u16 sreg) {
-	dsp_op_read_reg(sreg, RBX, ZERO);
-	storeIndex = dreg;
-}
-
-void DSPEmitter::pushExtValueFromMem(u16 dreg, u16 sreg) {
+// Push value from address in g_dsp.r[sreg] into EBX and stores the
+// destinationindex in storeIndex
+void DSPEmitter::pushExtValueFromMem(u16 dreg, u16 sreg)
+{
 	//	u16 addr = g_dsp.r[addr];
 
 	X64Reg tmp1;
@@ -673,7 +650,8 @@ void DSPEmitter::pushExtValueFromMem(u16 dreg, u16 sreg) {
 	storeIndex = dreg;
 }
 
-void DSPEmitter::pushExtValueFromMem2(u16 dreg, u16 sreg) {
+void DSPEmitter::pushExtValueFromMem2(u16 dreg, u16 sreg)
+{
 	//	u16 addr = g_dsp.r[addr];
 
 	X64Reg tmp1;
@@ -690,17 +668,20 @@ void DSPEmitter::pushExtValueFromMem2(u16 dreg, u16 sreg) {
 	storeIndex2 = dreg;
 }
 
-void DSPEmitter::popExtValueToReg() {
-	// in practise, we rarely ever have a non-NX main op
+void DSPEmitter::popExtValueToReg()
+{
+	// in practice, we rarely ever have a non-NX main op
 	// with an extended op, so the OR here is either
 	// not run (storeIndex == -1) or ends up OR'ing
 	// EBX with 0 (becoming the MOV we have here)
 	// nakee wants to keep it clean, so lets do that.
 	// [nakeee] the or case never happens in real
 	// [nakeee] it's just how the hardware works so we added it
-	if (storeIndex != -1) {
+	if (storeIndex != -1)
+	{
 		dsp_op_write_reg(storeIndex, RBX);
-		if (storeIndex  >= DSP_REG_ACM0 && storeIndex2 == -1) {
+		if (storeIndex  >= DSP_REG_ACM0 && storeIndex2 == -1)
+		{
 			TEST(32, R(EBX), Imm32(SR_40_MODE_BIT << 16));
 			FixupBranch not_40bit = J_CC(CC_Z, true);
 			DSPJitRegCache c(gpr);
@@ -722,9 +703,11 @@ void DSPEmitter::popExtValueToReg() {
 
 	storeIndex = -1;
 
-	if (storeIndex2 != -1) {
+	if (storeIndex2 != -1)
+	{
 		SHR(32, R(EBX), Imm8(16));
 		dsp_op_write_reg(storeIndex2, RBX);
 	}
+
 	storeIndex2 = -1;
 }
diff --git a/Source/Core/Core/Src/DSP/Jit/DSPJitLoadStore.cpp b/Source/Core/Core/Src/DSP/Jit/DSPJitLoadStore.cpp
index 248ed8f945..9197659aaf 100644
--- a/Source/Core/Core/Src/DSP/Jit/DSPJitLoadStore.cpp
+++ b/Source/Core/Core/Src/DSP/Jit/DSPJitLoadStore.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 // Additional copyrights go to Duddie and Tratax (c) 2004
 
@@ -39,17 +26,13 @@ void DSPEmitter::srs(const UDSPInstruction opc)
 	X64Reg tmp1;
 	gpr.getFreeXReg(tmp1);
 
-	if (reg >= DSP_REG_ACM0)
-		dsp_op_read_reg_and_saturate(reg, tmp1, ZERO);
-	else
-		dsp_op_read_reg(reg, tmp1, ZERO);
+	dsp_op_read_reg(reg, tmp1, ZERO);
 	dsp_op_read_reg(DSP_REG_CR, RAX, ZERO);
 	SHL(16, R(EAX), Imm8(8));
 	OR(16, R(EAX), Imm16(opc & 0xFF));
 	dmem_write(tmp1);
 
 	gpr.putXReg(tmp1);
-
 }
 
 // LRS $(0x18+D), @M
@@ -101,10 +84,7 @@ void DSPEmitter::sr(const UDSPInstruction opc)
 	X64Reg tmp1;
 	gpr.getFreeXReg(tmp1);
 
-	if (reg >= DSP_REG_ACM0)
-		dsp_op_read_reg_and_saturate(reg, tmp1);
-	else
-		dsp_op_read_reg(reg, tmp1);
+	dsp_op_read_reg(reg, tmp1);
 	dmem_write_imm(address, tmp1);
 
 	gpr.putXReg(tmp1);
@@ -227,10 +207,7 @@ void DSPEmitter::srr(const UDSPInstruction opc)
 	X64Reg tmp1;
 	gpr.getFreeXReg(tmp1);
 
-	if (sreg >= DSP_REG_ACM0)
-		dsp_op_read_reg_and_saturate(sreg, tmp1);
-	else
-		dsp_op_read_reg(sreg, tmp1);
+	dsp_op_read_reg(sreg, tmp1);
 	dsp_op_read_reg(dreg, RAX, ZERO);
 	dmem_write(tmp1);
 
@@ -249,10 +226,7 @@ void DSPEmitter::srrd(const UDSPInstruction opc)
 	X64Reg tmp1;
 	gpr.getFreeXReg(tmp1);
 
-	if (sreg >= DSP_REG_ACM0)
-		dsp_op_read_reg_and_saturate(sreg, tmp1);
-	else
-		dsp_op_read_reg(sreg, tmp1);
+	dsp_op_read_reg(sreg, tmp1);
 	dsp_op_read_reg(dreg, RAX, ZERO);
 	dmem_write(tmp1);
 
@@ -273,10 +247,7 @@ void DSPEmitter::srri(const UDSPInstruction opc)
 	X64Reg tmp1;
 	gpr.getFreeXReg(tmp1);
 
-	if (sreg >= DSP_REG_ACM0)
-		dsp_op_read_reg_and_saturate(sreg, tmp1);
-	else
-		dsp_op_read_reg(sreg, tmp1);
+	dsp_op_read_reg(sreg, tmp1);
 	dsp_op_read_reg(dreg, RAX, ZERO);
 	dmem_write(tmp1);
 
@@ -297,10 +268,7 @@ void DSPEmitter::srrn(const UDSPInstruction opc)
 	X64Reg tmp1;
 	gpr.getFreeXReg(tmp1);
 
-	if (sreg >= DSP_REG_ACM0)
-		dsp_op_read_reg_and_saturate(sreg, tmp1);
-	else
-		dsp_op_read_reg(sreg, tmp1);
+	dsp_op_read_reg(sreg, tmp1);
 	dsp_op_read_reg(dreg, RAX, ZERO);
 	dmem_write(tmp1);
 
diff --git a/Source/Core/Core/Src/DSP/Jit/DSPJitMisc.cpp b/Source/Core/Core/Src/DSP/Jit/DSPJitMisc.cpp
index d0bf7a3822..09b87be54a 100644
--- a/Source/Core/Core/Src/DSP/Jit/DSPJitMisc.cpp
+++ b/Source/Core/Core/Src/DSP/Jit/DSPJitMisc.cpp
@@ -1,20 +1,6 @@
-// Copyright (C) 2010 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/
-
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "../DSPIntUtil.h"
 #include "../DSPEmitter.h"
@@ -23,309 +9,6 @@
 #include "x64ABI.h"
 using namespace Gen;
 
-//clobbers:
-//EAX = (s8)g_dsp.reg_stack_ptr[stack_reg]
-//expects:
-void DSPEmitter::dsp_reg_stack_push(int stack_reg)
-{
-	//g_dsp.reg_stack_ptr[stack_reg]++;
-	//g_dsp.reg_stack_ptr[stack_reg] &= DSP_STACK_MASK;
-	MOV(8, R(AL), M(&g_dsp.reg_stack_ptr[stack_reg]));
-	ADD(8, R(AL), Imm8(1));
-	AND(8, R(AL), Imm8(DSP_STACK_MASK));
-	MOV(8, M(&g_dsp.reg_stack_ptr[stack_reg]), R(AL));
-
-	X64Reg tmp1;
-	gpr.getFreeXReg(tmp1);
-	//g_dsp.reg_stack[stack_reg][g_dsp.reg_stack_ptr[stack_reg]] = g_dsp.r[DSP_REG_ST0 + stack_reg];
-	MOV(16, R(tmp1), M(&g_dsp.r.st[stack_reg]));
-#ifdef _M_IX86 // All32
-	MOVZX(32, 8, EAX, R(AL));
-#else
-	MOVZX(64, 8, RAX, R(AL));
-#endif
-	MOV(16, MComplex(EAX, EAX, 1,
-			 PtrOffset(&g_dsp.reg_stack[stack_reg][0],0)), R(tmp1));
-	gpr.putXReg(tmp1);
-}
-
-//clobbers:
-//EAX = (s8)g_dsp.reg_stack_ptr[stack_reg]
-//expects:
-void DSPEmitter::dsp_reg_stack_pop(int stack_reg)
-{
-	//g_dsp.r[DSP_REG_ST0 + stack_reg] = g_dsp.reg_stack[stack_reg][g_dsp.reg_stack_ptr[stack_reg]];
-	MOV(8, R(AL), M(&g_dsp.reg_stack_ptr[stack_reg]));
-	X64Reg tmp1;
-	gpr.getFreeXReg(tmp1);
-#ifdef _M_IX86 // All32
-	MOVZX(32, 8, EAX, R(AL));
-#else
-	MOVZX(64, 8, RAX, R(AL));
-#endif
-	MOV(16, R(tmp1), MComplex(EAX, EAX, 1,
-				  PtrOffset(&g_dsp.reg_stack[stack_reg][0],0)));
-	MOV(16, M(&g_dsp.r.st[stack_reg]), R(tmp1));
-	gpr.putXReg(tmp1);
-
-	//g_dsp.reg_stack_ptr[stack_reg]--;
-	//g_dsp.reg_stack_ptr[stack_reg] &= DSP_STACK_MASK;
-	SUB(8, R(AL), Imm8(1));
-	AND(8, R(AL), Imm8(DSP_STACK_MASK));
-	MOV(8, M(&g_dsp.reg_stack_ptr[stack_reg]), R(AL));
-}
-
-
-void DSPEmitter::dsp_reg_store_stack(int stack_reg, Gen::X64Reg host_sreg)
-{
-	if (host_sreg != EDX) {
-		MOV(16, R(EDX), R(host_sreg));
-	}
-	dsp_reg_stack_push(stack_reg);
-	//g_dsp.r[DSP_REG_ST0 + stack_reg] = val;
-	MOV(16, M(&g_dsp.r.st[stack_reg]), R(EDX));
-}
-
-void DSPEmitter::dsp_reg_load_stack(int stack_reg, Gen::X64Reg host_dreg)
-{
-	//u16 val = g_dsp.r[DSP_REG_ST0 + stack_reg];
-	MOV(16, R(EDX), M(&g_dsp.r.st[stack_reg]));
-	dsp_reg_stack_pop(stack_reg);
-	if (host_dreg != EDX) {
-		MOV(16, R(host_dreg), R(EDX));
-	}
-}
-
-void DSPEmitter::dsp_reg_store_stack_imm(int stack_reg, u16 val)
-{
-	dsp_reg_stack_push(stack_reg);
-	//g_dsp.r[DSP_REG_ST0 + stack_reg] = val;
-	MOV(16, M(&g_dsp.r.st[stack_reg]), Imm16(val));
-}
-
-void DSPEmitter::dsp_op_write_reg(int reg, Gen::X64Reg host_sreg)
-{
-	switch (reg & 0x1f) {
-	// 8-bit sign extended registers.
-	case DSP_REG_ACH0:
-	case DSP_REG_ACH1:
-		gpr.writeReg(reg, R(host_sreg));
-		break;
-
-	// Stack registers.
-	case DSP_REG_ST0:
-	case DSP_REG_ST1:
-	case DSP_REG_ST2:
-	case DSP_REG_ST3:
-		dsp_reg_store_stack(reg - DSP_REG_ST0, host_sreg);
-		break;
-
-	default:
-		gpr.writeReg(reg, R(host_sreg));
-		break;
-	}
-}
-
-void DSPEmitter::dsp_op_write_reg_imm(int reg, u16 val)
-{
-	switch (reg & 0x1f) {
-	// 8-bit sign extended registers. Should look at prod.h too...
-	case DSP_REG_ACH0:
-	case DSP_REG_ACH1:
-		gpr.writeReg(reg, Imm16((u16)(s16)(s8)(u8)val));
-		break;
-	// Stack registers.
-	case DSP_REG_ST0:
-	case DSP_REG_ST1:
-	case DSP_REG_ST2:
-	case DSP_REG_ST3:
-		dsp_reg_store_stack_imm(reg - DSP_REG_ST0, val);
-		break;
-
-	default:
-		gpr.writeReg(reg, Imm16(val));
-		break;
-	}
-}
-
-void DSPEmitter::dsp_conditional_extend_accum(int reg)
-{
-	switch (reg)
-	{
-	case DSP_REG_ACM0:
-	case DSP_REG_ACM1:
-	{
-		OpArg sr_reg;
-		gpr.getReg(DSP_REG_SR,sr_reg);
-		DSPJitRegCache c(gpr);
-		TEST(16, sr_reg, Imm16(SR_40_MODE_BIT));
-		FixupBranch not_40bit = J_CC(CC_Z,true);
-		//if (g_dsp.r[DSP_REG_SR] & SR_40_MODE_BIT)
-		//{
-		// Sign extend into whole accum.
-		//u16 val = g_dsp.r[reg];
-		get_acc_m(reg - DSP_REG_ACM0, EAX);
-		SHR(32, R(EAX), Imm8(16));
-		//g_dsp.r[reg - DSP_REG_ACM0 + DSP_REG_ACH0] = (val & 0x8000) ? 0xFFFF : 0x0000;
-		//g_dsp.r[reg - DSP_REG_ACM0 + DSP_REG_ACL0] = 0;
-		set_acc_h(reg - DSP_REG_ACM0, R(RAX));
-		set_acc_l(reg - DSP_REG_ACM0, Imm16(0));
-		//}
-		gpr.flushRegs(c);
-		SetJumpTarget(not_40bit);
-		gpr.putReg(DSP_REG_SR, false);
-	}
-	}
-}
-
-void DSPEmitter::dsp_conditional_extend_accum_imm(int reg, u16 val)
-{
-	switch (reg)
-	{
-	case DSP_REG_ACM0:
-	case DSP_REG_ACM1:
-	{
-		OpArg sr_reg;
-		gpr.getReg(DSP_REG_SR,sr_reg);
-		DSPJitRegCache c(gpr);
-		TEST(16, sr_reg, Imm16(SR_40_MODE_BIT));
-		FixupBranch not_40bit = J_CC(CC_Z, true);
-		//if (g_dsp.r[DSP_REG_SR] & SR_40_MODE_BIT)
-		//{
-		// Sign extend into whole accum.
-		//g_dsp.r[reg - DSP_REG_ACM0 + DSP_REG_ACH0] = (val & 0x8000) ? 0xFFFF : 0x0000;
-		//g_dsp.r[reg - DSP_REG_ACM0 + DSP_REG_ACL0] = 0;
-		set_acc_h(reg - DSP_REG_ACM0, Imm16((val & 0x8000)?0xffff:0x0000));
-		set_acc_l(reg - DSP_REG_ACM0, Imm16(0));
-		//}
-		gpr.flushRegs(c);
-		SetJumpTarget(not_40bit);
-		gpr.putReg(DSP_REG_SR, false);
-	}
-	}
-}
-
-void DSPEmitter::dsp_op_read_reg(int reg, Gen::X64Reg host_dreg, DSPJitSignExtend extend)
-{
-	switch (reg & 0x1f) {
-	case DSP_REG_ST0:
-	case DSP_REG_ST1:
-	case DSP_REG_ST2:
-	case DSP_REG_ST3:
-		dsp_reg_load_stack(reg - DSP_REG_ST0, host_dreg);
-		switch(extend) {
-		case SIGN:
-#ifdef _M_IX86 // All32
-			MOVSX(32, 16, host_dreg, R(host_dreg));
-#else
-			MOVSX(64, 16, host_dreg, R(host_dreg));
-#endif
-			break;
-		case ZERO:
-#ifdef _M_IX86 // All32
-			MOVZX(32, 16, host_dreg, R(host_dreg));
-#else
-			MOVZX(64, 16, host_dreg, R(host_dreg));
-#endif
-			break;
-		case NONE:
-		default:
-			break;
-		}
-		return;
-	default:
-		gpr.readReg(reg, host_dreg, extend);
-		return;
-	}
-}
-
-void DSPEmitter::dsp_op_read_reg_and_saturate(int reg, Gen::X64Reg host_dreg, DSPJitSignExtend extend)
-{
-	//we already know this is ACCM0 or ACCM1
-#ifdef _M_IX86 // All32
-	gpr.readReg(reg, host_dreg, extend);
-#else
-	OpArg acc_reg;
-	gpr.getReg(reg-DSP_REG_ACM0+DSP_REG_ACC0_64, acc_reg);
-#endif
-	OpArg sr_reg;
-	gpr.getReg(DSP_REG_SR,sr_reg);
-
-	DSPJitRegCache c(gpr);
-	TEST(16, sr_reg, Imm16(SR_40_MODE_BIT));
-	FixupBranch not_40bit = J_CC(CC_Z, true);
-
-#ifdef _M_IX86 // All32
-	DSPJitRegCache c2(gpr);
-	gpr.putReg(DSP_REG_SR, false);
-	X64Reg tmp1;
-	gpr.getFreeXReg(tmp1);
-	gpr.readReg(reg-DSP_REG_ACM0+DSP_REG_ACH0, tmp1, NONE);
-	MOVSX(32,16,host_dreg,R(host_dreg));
-	SHL(32, R(tmp1), Imm8(16));
-	MOV(16,R(tmp1),R(host_dreg));
-	CMP(32,R(host_dreg), R(tmp1));
-
-	FixupBranch no_saturate = J_CC(CC_Z);
-
-	CMP(32,R(tmp1),Imm32(0));
-	FixupBranch negative = J_CC(CC_LE);
-
-	MOV(32,R(host_dreg),Imm32(0x7fff));//this works for all extend modes
-	FixupBranch done_positive = J();
-
-	SetJumpTarget(negative);
-	if (extend == NONE || extend == ZERO)
-		MOV(32,R(host_dreg),Imm32(0x00008000));
-	else
-		MOV(32,R(host_dreg),Imm32(0xffff8000));
-	FixupBranch done_negative = J();
-
-	SetJumpTarget(no_saturate);
-	if (extend == ZERO)
-		MOVZX(32,16,host_dreg,R(host_dreg));
-	SetJumpTarget(done_positive);
-	SetJumpTarget(done_negative);
-	gpr.putXReg(tmp1);
-	gpr.flushRegs(c2);
-	SetJumpTarget(not_40bit);
-	gpr.flushRegs(c);
-#else
-
-	MOVSX(64,32,host_dreg,acc_reg);
-	CMP(64,R(host_dreg),acc_reg);
-	FixupBranch no_saturate = J_CC(CC_Z);
-
-	CMP(64,acc_reg,Imm32(0));
-	FixupBranch negative = J_CC(CC_LE);
-
-	MOV(64,R(host_dreg),Imm32(0x7fff));//this works for all extend modes
-	FixupBranch done_positive = J();
-
-	SetJumpTarget(negative);
-	if (extend == NONE || extend == ZERO)
-		MOV(64,R(host_dreg),Imm32(0x00008000));
-	else
-		MOV(64,R(host_dreg),Imm32(0xffff8000));
-	FixupBranch done_negative = J();
-
-	SetJumpTarget(no_saturate);
-	SetJumpTarget(not_40bit);
-
-	MOV(64, R(host_dreg), acc_reg);
-	if (extend == NONE || extend == ZERO)
-		SHR(64, R(host_dreg), Imm8(16));
-	else
-		SAR(64, R(host_dreg), Imm8(16));
-	SetJumpTarget(done_positive);
-	SetJumpTarget(done_negative);
-	gpr.flushRegs(c);
-	gpr.putReg(reg-DSP_REG_ACM0+DSP_REG_ACC0_64, false);
-#endif
-
-	gpr.putReg(DSP_REG_SR, false);
-}
-
 // MRR $D, $S
 // 0001 11dd ddds ssss
 // Move value from register $S to register $D.
@@ -334,10 +17,7 @@ void DSPEmitter::mrr(const UDSPInstruction opc)
 	u8 sreg = opc & 0x1f;
 	u8 dreg = (opc >> 5) & 0x1f;
 
-	if (sreg >= DSP_REG_ACM0)
-		dsp_op_read_reg_and_saturate(sreg, EDX);
-	else
-		dsp_op_read_reg(sreg, EDX);
+	dsp_op_read_reg(sreg, EDX);
 	dsp_op_write_reg(dreg, EDX);
 	dsp_conditional_extend_accum(dreg);
 }
@@ -424,13 +104,14 @@ void DSPEmitter::addarn(const UDSPInstruction opc)
 	//	g_dsp.r[dreg] = dsp_increase_addr_reg(dreg, (s16)g_dsp.r[DSP_REG_IX0 + sreg]);
 
 	// From looking around it is always called with the matching index register
-    increase_addr_reg(opc & 0x3, (opc >> 2) & 0x3);
+	increase_addr_reg(opc & 0x3, (opc >> 2) & 0x3);
 }
 
 //----
 
 
-void DSPEmitter::setCompileSR(u16 bit) {
+void DSPEmitter::setCompileSR(u16 bit)
+{
 	
 	//	g_dsp.r[DSP_REG_SR] |= bit
 	OpArg sr_reg;
@@ -441,7 +122,8 @@ void DSPEmitter::setCompileSR(u16 bit) {
 	compileSR |= bit;
 }
 
-void DSPEmitter::clrCompileSR(u16 bit) {
+void DSPEmitter::clrCompileSR(u16 bit)
+{
 	
 	//	g_dsp.r[DSP_REG_SR] &= bit
 	OpArg sr_reg;
@@ -498,7 +180,7 @@ void DSPEmitter::srbith(const UDSPInstruction opc)
 		break;
 
 	// Automatic 40-bit sign extension when loading ACx.M.
-    // SET40 changes something very important: see the LRI instruction above.
+	// SET40 changes something very important: see the LRI instruction above.
 	case 0xe:  // SET16 (CLR40)
 		clrCompileSR(SR_40_MODE_BIT);
 		break;
diff --git a/Source/Core/Core/Src/DSP/Jit/DSPJitMultiplier.cpp b/Source/Core/Core/Src/DSP/Jit/DSPJitMultiplier.cpp
index 0dcbf41877..bfdba2ed7e 100644
--- a/Source/Core/Core/Src/DSP/Jit/DSPJitMultiplier.cpp
+++ b/Source/Core/Core/Src/DSP/Jit/DSPJitMultiplier.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 // Additional copyrights go to Duddie and Tratax (c) 2004
 
diff --git a/Source/Core/Core/Src/DSP/Jit/DSPJitRegCache.cpp b/Source/Core/Core/Src/DSP/Jit/DSPJitRegCache.cpp
index 687982cfb9..1a693ede34 100644
--- a/Source/Core/Core/Src/DSP/Jit/DSPJitRegCache.cpp
+++ b/Source/Core/Core/Src/DSP/Jit/DSPJitRegCache.cpp
@@ -1,19 +1,6 @@
-// Copyright (C) 2011 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "DSPJitRegCache.h"
 #include "../DSPEmitter.h"
@@ -21,8 +8,10 @@
 
 using namespace Gen;
 
-static void *reg_ptr(int reg) {
-	switch(reg) {
+static void *reg_ptr(int reg)
+{
+	switch(reg)
+	{
 	case DSP_REG_AR0:
 	case DSP_REG_AR1:
 	case DSP_REG_AR2:
@@ -84,11 +73,14 @@ static void *reg_ptr(int reg) {
 //#undef STATIC_REG_ACCS
 
 DSPJitRegCache::DSPJitRegCache(DSPEmitter &_emitter)
-	: emitter(_emitter), temporary(false), merged(false) {
-	for(unsigned int i = 0; i < NUMXREGS; i++) {
+	: emitter(_emitter), temporary(false), merged(false)
+{
+	for(unsigned int i = 0; i < NUMXREGS; i++)
+	{
 		xregs[i].guest_reg = DSP_REG_STATIC;
 		xregs[i].pushed = false;
 	}
+
 	xregs[RAX].guest_reg = DSP_REG_STATIC;// reserved for MUL/DIV
 	xregs[RDX].guest_reg = DSP_REG_STATIC;// reserved for MUL/DIV
 	xregs[RCX].guest_reg = DSP_REG_STATIC;// reserved for shifts
@@ -98,7 +90,7 @@ DSPJitRegCache::DSPJitRegCache(DSPEmitter &_emitter)
 	xregs[RSP].guest_reg = DSP_REG_STATIC;//stack pointer
 
 	xregs[RBP].guest_reg = DSP_REG_NONE;//definitely usable in dsplle because
-	                                    //all external calls are protected
+										//all external calls are protected
 
 	xregs[RSI].guest_reg = DSP_REG_NONE;
 	xregs[RDI].guest_reg = DSP_REG_NONE;
@@ -119,7 +111,8 @@ DSPJitRegCache::DSPJitRegCache(DSPEmitter &_emitter)
 	xregs[R15].guest_reg = DSP_REG_NONE;
 #endif
 
-	for(unsigned int i = 0; i <= DSP_REG_MAX_MEM_BACKED; i++) {
+	for(unsigned int i = 0; i <= DSP_REG_MAX_MEM_BACKED; i++)
+	{
 		regs[i].mem = reg_ptr(i);
 		regs[i].size = 0;
 		regs[i].dirty = false;
@@ -140,7 +133,8 @@ DSPJitRegCache::DSPJitRegCache(DSPEmitter &_emitter)
 	regs[DSP_REG_ACC0_64].host_reg = R8;
 	regs[DSP_REG_ACC1_64].host_reg = R9;
 #endif
-	for(unsigned int i = 0; i < 2; i++) {
+	for(unsigned int i = 0; i < 2; i++)
+	{
 		regs[i+DSP_REG_ACC0_64].size = 8;
 		regs[i+DSP_REG_ACL0].parentReg = i+DSP_REG_ACC0_64;
 		regs[i+DSP_REG_ACM0].parentReg = i+DSP_REG_ACC0_64;
@@ -149,6 +143,7 @@ DSPJitRegCache::DSPJitRegCache(DSPEmitter &_emitter)
 		regs[i+DSP_REG_ACM0].shift = 16;
 		regs[i+DSP_REG_ACH0].shift = 32;
 	}
+
 	regs[DSP_REG_PROD_64].size = 8;
 	regs[DSP_REG_PRODL].parentReg = DSP_REG_PROD_64;
 	regs[DSP_REG_PRODM].parentReg = DSP_REG_PROD_64;
@@ -160,7 +155,8 @@ DSPJitRegCache::DSPJitRegCache(DSPEmitter &_emitter)
 	regs[DSP_REG_PRODM2].shift = 48;
 #endif
 
-	for(unsigned int i = 0; i < 2; i++) {
+	for(unsigned int i = 0; i < 2; i++)
+	{
 		regs[i+DSP_REG_AX0_32].size = 4;
 		regs[i+DSP_REG_AXL0].parentReg = i+DSP_REG_AX0_32;
 		regs[i+DSP_REG_AXH0].parentReg = i+DSP_REG_AX0_32;
@@ -206,22 +202,25 @@ void DSPJitRegCache::flushRegs(DSPJitRegCache &cache, bool emit)
 	unsigned int i;
 
 	//drop all guest register not used by cache
-	for(i = 0; i <= DSP_REG_MAX_MEM_BACKED; i++) {
+	for(i = 0; i <= DSP_REG_MAX_MEM_BACKED; i++)
+	{
 		regs[i].used = false;//used is restored later
 		if (regs[i].loc.IsSimpleReg() &&
-		    !cache.regs[i].loc.IsSimpleReg())
+			!cache.regs[i].loc.IsSimpleReg())
 			movToMemory(i);
 	}
 
 	//try to move guest regs in the wrong host reg to the correct one
 	int movcnt;
-	do {
+	do
+	{
 		movcnt = 0;
-		for(i = 0; i <= DSP_REG_MAX_MEM_BACKED; i++) {
+		for(i = 0; i <= DSP_REG_MAX_MEM_BACKED; i++)
+		{
 			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)
+
+			if (simple_cache != simple && xregs[simple_cache].guest_reg == DSP_REG_NONE)
 			{
 				movToHostReg(i, simple_cache, true);
 				movcnt++;
@@ -230,35 +229,54 @@ void DSPJitRegCache::flushRegs(DSPJitRegCache &cache, bool emit)
 	} while (movcnt != 0);
 
 	//free all host regs that are not used for the same guest reg
-	for(i = 0; i <= DSP_REG_MAX_MEM_BACKED; i++) {
+	for(i = 0; i <= DSP_REG_MAX_MEM_BACKED; i++)
+	{
 		if (cache.regs[i].loc.GetSimpleReg() !=
-		    regs[i].loc.GetSimpleReg() &&
-		    regs[i].loc.IsSimpleReg())
+			regs[i].loc.GetSimpleReg() &&
+			regs[i].loc.IsSimpleReg())
 			movToMemory(i);
 	}
 
 	//load all guest regs that are in memory and should be in host reg
-	for(i = 0; i <= DSP_REG_MAX_MEM_BACKED; i++) {
-		if (cache.regs[i].loc.IsSimpleReg()) {
-			movToHostReg(i, cache.regs[i].loc.GetSimpleReg(),
-				     true);
+	for(i = 0; i <= DSP_REG_MAX_MEM_BACKED; i++)
+	{
+		if (cache.regs[i].loc.IsSimpleReg())
+		{
+			movToHostReg(i, cache.regs[i].loc.GetSimpleReg(), true);
 			rotateHostReg(i, cache.regs[i].shift, true);
-		} else if(cache.regs[i].loc.IsImm()) {
-			//todo: immediates?
 		}
+		else if(cache.regs[i].loc.IsImm())
+		{
+			// TODO: Immediates?
+		}
+
 		regs[i].used = cache.regs[i].used;
 		regs[i].dirty |= cache.regs[i].dirty;
 		regs[i].last_use_ctr = cache.regs[i].last_use_ctr;
 	}
 
+	//sync the freely used xregs
+	if (!emit) {
+		for(i = 0; i < NUMXREGS; i++) {
+			if (cache.xregs[i].guest_reg == DSP_REG_USED &&
+			    xregs[i].guest_reg == DSP_REG_NONE)
+				xregs[i].guest_reg = DSP_REG_USED;
+			if (cache.xregs[i].guest_reg == DSP_REG_NONE &&
+			    xregs[i].guest_reg == DSP_REG_USED)
+				xregs[i].guest_reg = DSP_REG_NONE;
+		}
+	}
+
 	//consistency checks
-	for(i = 0; i < NUMXREGS; i++) {
+	for(i = 0; i < NUMXREGS; i++)
+	{
 		_assert_msg_(DSPLLE,
 			     xregs[i].guest_reg == cache.xregs[i].guest_reg,
 			     "cache and current xreg guest_reg mismatch for %d", i);
 	}
 
-	for(i = 0; i <= DSP_REG_MAX_MEM_BACKED; i++) {
+	for(i = 0; i <= DSP_REG_MAX_MEM_BACKED; i++)
+	{
 		_assert_msg_(DSPLLE,
 			     regs[i].loc.IsImm() == cache.regs[i].loc.IsImm(),
 			     "cache and current reg loc mismatch for %x", i);
@@ -285,16 +303,21 @@ void DSPJitRegCache::flushMemBackedRegs()
 	//this should have the same effect as
 	//merge(DSPJitRegCache(emitter));
 
-	unsigned int i;
-	for(i = 0; i <= DSP_REG_MAX_MEM_BACKED; i++) {
+	for(unsigned int i = 0; i <= DSP_REG_MAX_MEM_BACKED; i++)
+	{
 		_assert_msg_(DSPLLE, !regs[i].used,
 			     "register %x still in use", i);
+
 		if (regs[i].used)
 			emitter.INT3();
-		if (regs[i].host_reg != INVALID_REG) {
+
+		if (regs[i].host_reg != INVALID_REG)
+		{
 			movToHostReg(i,regs[i].host_reg,true);
 			rotateHostReg(i, 0, true);
-		} else if (regs[i].parentReg == DSP_REG_NONE) {
+		}
+		else if (regs[i].parentReg == DSP_REG_NONE)
+		{
 			movToMemory(i);
 		}
 	}
@@ -304,12 +327,14 @@ void DSPJitRegCache::flushRegs()
 {
 	flushMemBackedRegs();
 
-	for(unsigned int i = 0; i <= DSP_REG_MAX_MEM_BACKED; i++) {
+	for(unsigned int i = 0; i <= DSP_REG_MAX_MEM_BACKED; i++)
+	{
 		if (regs[i].host_reg != INVALID_REG)
 			movToMemory(i);
 	}
 
-	for(unsigned int i = 0; i <= DSP_REG_MAX_MEM_BACKED; i++) {
+	for(unsigned int i = 0; i <= DSP_REG_MAX_MEM_BACKED; i++)
+	{
 		_assert_msg_(DSPLLE,
 			     !regs[i].loc.IsSimpleReg(),
 			     "register %x is still a simple reg", i);
@@ -373,12 +398,14 @@ static u64 ebp_store;
 
 void DSPJitRegCache::loadRegs(bool emit)
 {
-	for(unsigned int i = 0; i <= DSP_REG_MAX_MEM_BACKED; i++) {
+	for(unsigned int i = 0; i <= DSP_REG_MAX_MEM_BACKED; i++)
+	{
 		if (regs[i].host_reg != INVALID_REG)
-			movToHostReg(i,regs[i].host_reg);
+			movToHostReg(i,regs[i].host_reg, emit);
 	}
 
-	if (emit) {
+	if (emit)
+	{
 #ifdef _M_X64
 		emitter.MOV(64, M(&ebp_store), R(RBP));
 #else
@@ -391,12 +418,14 @@ void DSPJitRegCache::saveRegs()
 {
 	flushRegs();
 
-	for(unsigned int i = 0; i <= DSP_REG_MAX_MEM_BACKED; i++) {
+	for(unsigned int i = 0; i <= DSP_REG_MAX_MEM_BACKED; i++)
+	{
 		if (regs[i].host_reg != INVALID_REG)
 			movToMemory(i);
 	}
 
-	for(unsigned int i = 0; i <= DSP_REG_MAX_MEM_BACKED; i++) {
+	for(unsigned int i = 0; i <= DSP_REG_MAX_MEM_BACKED; i++)
+	{
 		_assert_msg_(DSPLLE,
 			     !regs[i].loc.IsSimpleReg(),
 			     "register %x is still a simple reg", i);
@@ -409,16 +438,19 @@ void DSPJitRegCache::saveRegs()
 #endif
 }
 
-void DSPJitRegCache::pushRegs() {
+void DSPJitRegCache::pushRegs()
+{
 	flushMemBackedRegs();
 
-	for(unsigned int i = 0; i <= DSP_REG_MAX_MEM_BACKED; i++) {
+	for(unsigned int i = 0; i <= DSP_REG_MAX_MEM_BACKED; i++)
+	{
 		if (regs[i].host_reg != INVALID_REG)
 			movToMemory(i);
 	}
 
 	int push_count = 0;
-	for(unsigned int i = 0; i < NUMXREGS; i++) {
+	for(unsigned int i = 0; i < NUMXREGS; i++)
+	{
 		if (xregs[i].guest_reg == DSP_REG_USED)
 			push_count++;
 	}
@@ -432,21 +464,25 @@ void DSPJitRegCache::pushRegs() {
 		emitter.SUB(32,R(ESP),Imm32(16 - 4 * (push_count & 3)));
 #endif
 
-	for(unsigned int i = 0; i < NUMXREGS; i++) {
-		if (xregs[i].guest_reg == DSP_REG_USED) {
+	for(unsigned int i = 0; i < NUMXREGS; i++)
+	{
+		if (xregs[i].guest_reg == DSP_REG_USED)
+		{
 			emitter.PUSH((X64Reg)i);
 			xregs[i].pushed = true;
 			xregs[i].guest_reg = DSP_REG_NONE;
 		}
 	}
 
-	for(unsigned int i = 0; i <= DSP_REG_MAX_MEM_BACKED; i++) {
+	for(unsigned int i = 0; i <= DSP_REG_MAX_MEM_BACKED; i++)
+	{
 		_assert_msg_(DSPLLE,
 			     !regs[i].loc.IsSimpleReg(),
 			     "register %x is still a simple reg", i);
 	}
 
-	for(unsigned int i = 0; i < NUMXREGS; i++) {
+	for(unsigned int i = 0; i < NUMXREGS; i++)
+	{
 		_assert_msg_(DSPLLE,
 			     xregs[i].guest_reg == DSP_REG_NONE ||
 			     xregs[i].guest_reg == DSP_REG_STATIC,
@@ -467,13 +503,16 @@ void DSPJitRegCache::popRegs() {
 	emitter.MOV(32, M(&ebp_store), R(EBP));
 #endif
 	int push_count = 0;
-	for(unsigned int i = 0; i < NUMXREGS; i++) {
+	for(unsigned int i = 0; i < NUMXREGS; i++)
+	{
 		if (xregs[i].pushed)
 			push_count++;
 	}
 
-	for(int i = NUMXREGS-1; i >= 0; i--) {
-		if (xregs[i].pushed) {
+	for(int i = NUMXREGS-1; i >= 0; i--)
+	{
+		if (xregs[i].pushed)
+		{
 			emitter.POP((X64Reg)i);
 			xregs[i].pushed = false;
 			xregs[i].guest_reg = DSP_REG_USED;
@@ -489,14 +528,17 @@ void DSPJitRegCache::popRegs() {
 		emitter.ADD(32,R(ESP),Imm32(16 - 4 * (push_count & 3)));
 #endif
 
-	for(unsigned int i = 0; i <= DSP_REG_MAX_MEM_BACKED; i++) {
+	for(unsigned int i = 0; i <= DSP_REG_MAX_MEM_BACKED; i++)
+	{
 		if (regs[i].host_reg != INVALID_REG)
-			movToHostReg(i,regs[i].host_reg);
+			movToHostReg(i,regs[i].host_reg, true);
 	}
 }
 
-X64Reg DSPJitRegCache::makeABICallSafe(X64Reg reg) {
-	if (reg != RBP) {
+X64Reg DSPJitRegCache::makeABICallSafe(X64Reg reg)
+{
+	if (reg != RBP)
+	{
 		return reg;
 	}
 
@@ -530,8 +572,10 @@ void DSPJitRegCache::movToHostReg(int reg, X64Reg host_reg, bool load)
 	if (xregs[host_reg].guest_reg != DSP_REG_STATIC)
 		xregs[host_reg].guest_reg = reg;
 
-	if (load) {
-		switch(regs[reg].size) {
+	if (load)
+	{
+		switch(regs[reg].size)
+		{
 		case 2:
 			emitter.MOV(16, R(host_reg), regs[reg].loc); break;
 		case 4:
@@ -545,9 +589,10 @@ void DSPJitRegCache::movToHostReg(int reg, X64Reg host_reg, bool load)
 			break;
 		}
 	}
+
 	regs[reg].loc = R(host_reg);
 	if (old_reg != INVALID_REG &&
-	    xregs[old_reg].guest_reg != DSP_REG_STATIC)
+		xregs[old_reg].guest_reg != DSP_REG_STATIC)
 		xregs[old_reg].guest_reg = DSP_REG_NONE;
 }
 
@@ -562,13 +607,16 @@ void DSPJitRegCache::movToHostReg(int reg, bool load)
 
 	if (regs[reg].loc.IsSimpleReg())
 		return;
+
 	X64Reg tmp;
 	if (regs[reg].host_reg != INVALID_REG)
 		tmp = regs[reg].host_reg;
 	else
 		tmp = findSpillFreeXReg();
+	
 	if (tmp == INVALID_REG)
 		return;
+
 	movToHostReg(reg, tmp, load);
 }
 
@@ -582,37 +630,43 @@ void DSPJitRegCache::rotateHostReg(int reg, int shift, bool emit)
 		     "register %x is not a simple reg", reg);
 	_assert_msg_(DSPLLE, !regs[reg].used,
 		     "rotating in use guest reg %x!", reg);
-	if (shift > regs[reg].shift && emit) {
-		switch(regs[reg].size) {
+
+	if (shift > regs[reg].shift && emit)
+	{
+		switch(regs[reg].size)
+		{
 		case 2:
 			emitter.ROR(16, regs[reg].loc,
-				    Imm8(shift - regs[reg].shift));
+					Imm8(shift - regs[reg].shift));
 			break;
 		case 4:
 			emitter.ROR(32, regs[reg].loc,
-				    Imm8(shift - regs[reg].shift));
+					Imm8(shift - regs[reg].shift));
 			break;
 #ifdef _M_X64
 		case 8:
 			emitter.ROR(64, regs[reg].loc,
-				    Imm8(shift - regs[reg].shift));
+					Imm8(shift - regs[reg].shift));
 			break;
 #endif
 		}
-	} else if (shift < regs[reg].shift && emit) {
-		switch(regs[reg].size) {
+	}
+	else if (shift < regs[reg].shift && emit)
+	{
+		switch(regs[reg].size)
+		{
 		case 2:
 			emitter.ROL(16, regs[reg].loc,
-				    Imm8(regs[reg].shift - shift));
+					Imm8(regs[reg].shift - shift));
 			break;
 		case 4:
 			emitter.ROL(32, regs[reg].loc,
-				    Imm8(regs[reg].shift - shift));
+					Imm8(regs[reg].shift - shift));
 			break;
 #ifdef _M_X64
 		case 8:
 			emitter.ROL(64, regs[reg].loc,
-				    Imm8(regs[reg].shift - shift));
+					Imm8(regs[reg].shift - shift));
 			break;
 #endif
 		}
@@ -638,16 +692,23 @@ void DSPJitRegCache::movToMemory(int reg)
 
 	//but first, check for any needed rotations
 	if (regs[reg].loc.IsSimpleReg())
+	{
 		rotateHostReg(reg, 0, true);
-	else {} //todo: immediates?
+	}
+	else
+	{
+		// TODO: Immediates?
+	}
 
 	_assert_msg_(DSPLLE, regs[reg].shift == 0, "still shifted??");
 
 	//move to mem
 	OpArg tmp = M(regs[reg].mem);
 
-	if (regs[reg].dirty) {
-		switch(regs[reg].size) {
+	if (regs[reg].dirty)
+	{
+		switch(regs[reg].size)
+		{
 		case 2:
 			emitter.MOV(16, tmp, regs[reg].loc); break;
 		case 4:
@@ -663,7 +724,8 @@ void DSPJitRegCache::movToMemory(int reg)
 		regs[reg].dirty = false;
 	}
 
-	if (regs[reg].loc.IsSimpleReg()) {
+	if (regs[reg].loc.IsSimpleReg())
+	{
 		X64Reg hostreg = regs[reg].loc.GetSimpleReg();
 		if (xregs[hostreg].guest_reg != DSP_REG_STATIC)
 			xregs[hostreg].guest_reg = DSP_REG_NONE;
@@ -677,7 +739,8 @@ void DSPJitRegCache::getReg(int reg, OpArg &oparg, bool load)
 {
 	int real_reg;
 	int shift;
-	if (regs[reg].parentReg != DSP_REG_NONE) {
+	if (regs[reg].parentReg != DSP_REG_NONE)
+	{
 		real_reg = regs[reg].parentReg;
 
 		// always load and rotate since we need the other
@@ -685,7 +748,9 @@ void DSPJitRegCache::getReg(int reg, OpArg &oparg, bool load)
 		load = true;
 
 		shift = regs[reg].shift;
-	} else {
+	}
+	else
+	{
 		real_reg = reg;
 		shift = 0;
 	}
@@ -698,20 +763,24 @@ void DSPJitRegCache::getReg(int reg, OpArg &oparg, bool load)
 	// no nead to actually emit code for load or rotate if caller doesn't
 	// use the contents, but see above for a reason to force the load
 	movToHostReg(real_reg, load);
-	//todo: actually handle INVALID_REG
+
+	// TODO: actually handle INVALID_REG
 	_assert_msg_(DSPLLE, regs[real_reg].loc.IsSimpleReg(),
 		     "did not get host reg for %x", reg);
+
 	rotateHostReg(real_reg, shift, load);
 	oparg = regs[real_reg].loc;
 	regs[real_reg].used = true;
 
 	//do some register specific fixup
-	switch(reg) {
+	switch(reg)
+	{
 #ifdef _M_X64
 	case DSP_REG_ACC0_64:
 	case DSP_REG_ACC1_64:
 	{
-		if (load) {
+		if (load)
+		{
 			//need to do this because interpreter only does 48 bits
 			//(and putReg does the same)
 			emitter.SHL(64, oparg, Imm8(64-40));//sign extend
@@ -730,15 +799,20 @@ void DSPJitRegCache::putReg(int reg, bool dirty)
 	int real_reg = reg;
 	if (regs[reg].parentReg != DSP_REG_NONE)
 		real_reg = regs[reg].parentReg;
+
 	OpArg oparg = regs[real_reg].loc;
-	switch(reg) {
+
+	switch(reg)
+	{
 	case DSP_REG_ACH0:
 	case DSP_REG_ACH1:
 	{
-		if (dirty) {
+		if (dirty)
+		{
 			//no need to extend to full 64bit here until interpreter
 			//uses that
-			if (oparg.IsSimpleReg()) {
+			if (oparg.IsSimpleReg())
+			{
 				//register is already shifted correctly
 				//(if at all)
 
@@ -747,9 +821,9 @@ void DSPJitRegCache::putReg(int reg, bool dirty)
 				//cannot use movsx with SPL, BPL, SIL or DIL
 				//on 32 bit
 				if (oparg.GetSimpleReg() == RSP ||
-				    oparg.GetSimpleReg() == RBP ||
-				    oparg.GetSimpleReg() == RSI ||
-				    oparg.GetSimpleReg() == RDI)
+					oparg.GetSimpleReg() == RBP ||
+					oparg.GetSimpleReg() == RSI ||
+					oparg.GetSimpleReg() == RDI)
 				{
 					emitter.SHL(16,oparg,Imm8(8));
 					emitter.SAR(16,oparg,Imm8(8));
@@ -758,12 +832,16 @@ void DSPJitRegCache::putReg(int reg, bool dirty)
 #endif
 				{
 					emitter.MOVSX(16, 8,
-						      oparg.GetSimpleReg(),
-						      oparg);
+								oparg.GetSimpleReg(),
+								oparg);
 				}
-			} else if (oparg.IsImm()) {
-				//todo: immediates?
-			} else {
+			}
+			else if (oparg.IsImm())
+			{
+				// TODO: Immediates?
+			}
+			else
+			{
 				//this works on the memory, so use reg instead
 				//of real_reg, since it has the right loc
 				X64Reg tmp;
@@ -780,7 +858,8 @@ void DSPJitRegCache::putReg(int reg, bool dirty)
 	case DSP_REG_ACC0_64:
 	case DSP_REG_ACC1_64:
 	{
-		if (dirty) {
+		if (dirty)
+		{
 			emitter.SHL(64, oparg, Imm8(64-40));//sign extend
 			emitter.SAR(64, oparg, Imm8(64-40));
 		}
@@ -790,8 +869,11 @@ void DSPJitRegCache::putReg(int reg, bool dirty)
 	default:
 		break;
 	}
+
 	regs[real_reg].used = false;
-	if (regs[real_reg].loc.IsSimpleReg()) {
+
+	if (regs[real_reg].loc.IsSimpleReg())
+	{
 		regs[real_reg].dirty |= dirty;
 		regs[real_reg].last_use_ctr = use_ctr;
 		use_ctr++;
@@ -802,9 +884,12 @@ void DSPJitRegCache::readReg(int sreg, X64Reg host_dreg, DSPJitSignExtend extend
 {
 	OpArg reg;
 	getReg(sreg, reg);
-	switch(regs[sreg].size) {
+
+	switch(regs[sreg].size)
+	{
 	case 2:
-		switch(extend) {
+		switch(extend)
+		{
 #ifdef _M_X64
 		case SIGN: emitter.MOVSX(64, 16, host_dreg, reg); break;
 		case ZERO: emitter.MOVZX(64, 16, host_dreg, reg); break;
@@ -817,7 +902,8 @@ void DSPJitRegCache::readReg(int sreg, X64Reg host_dreg, DSPJitSignExtend extend
 		break;
 	case 4:
 #ifdef _M_X64
-		switch(extend) {
+		switch(extend)
+		{
 		case SIGN: emitter.MOVSX(64, 32, host_dreg, reg); break;
 		case ZERO: emitter.MOVZX(64, 32, host_dreg, reg); break;
 		case NONE: emitter.MOV(32, R(host_dreg), reg); break;
@@ -842,15 +928,38 @@ void DSPJitRegCache::writeReg(int dreg, OpArg arg)
 {
 	OpArg reg;
 	getReg(dreg, reg, false);
-	switch(regs[dreg].size) {
-	case 2: emitter.MOV(16, reg, arg); break;
-	case 4: emitter.MOV(32, reg, arg); break;
+	if (arg.IsImm())
+	{
+		switch(regs[dreg].size)
+		{
+		case 2: emitter.MOV(16, reg, Imm16(arg.offset)); break;
+		case 4: emitter.MOV(32, reg, Imm32(arg.offset)); break;
 #ifdef _M_X64
-	case 8: emitter.MOV(64, reg, arg); break;
+		case 8:
+			if ((s32)arg.offset == (s64)arg.offset)
+				emitter.MOV(64, reg, Imm32(arg.offset));
+			else
+				emitter.MOV(64, reg, Imm64(arg.offset));
+			break;
 #endif
-	default:
-		_assert_msg_(DSPLLE, 0, "unsupported memory size");
-		break;
+		default:
+			_assert_msg_(DSPLLE, 0, "unsupported memory size");
+			break;
+		}
+	}
+	else
+	{
+		switch(regs[dreg].size)
+		{
+		case 2: emitter.MOV(16, reg, arg); break;
+		case 4: emitter.MOV(32, reg, arg); break;
+#ifdef _M_X64
+		case 8: emitter.MOV(64, reg, arg); break;
+#endif
+		default:
+			_assert_msg_(DSPLLE, 0, "unsupported memory size");
+			break;
+		}
 	}
 	putReg(dreg, true);
 }
@@ -870,29 +979,36 @@ X64Reg DSPJitRegCache::spillXReg()
 	unsigned int i;
 	unsigned int max_use_ctr_diff = 0;
 	X64Reg least_recent_use_reg = INVALID_REG;
-	for(i = 0; i < sizeof(alloc_order)/sizeof(alloc_order[0]); i++) {
+	for(i = 0; i < sizeof(alloc_order)/sizeof(alloc_order[0]); i++)
+	{
 		X64Reg reg = alloc_order[i];
 		if (xregs[reg].guest_reg <= DSP_REG_MAX_MEM_BACKED &&
-		    !regs[xregs[reg].guest_reg].used) {
+			!regs[xregs[reg].guest_reg].used)
+		{
 			unsigned int use_ctr_diff = use_ctr -
 				regs[xregs[reg].guest_reg].last_use_ctr;
-			if (use_ctr_diff >= max_use_ctr_diff) {
+
+			if (use_ctr_diff >= max_use_ctr_diff)
+			{
 				max_use_ctr_diff = use_ctr_diff;
 				least_recent_use_reg = reg;
 			}
 		}
 	}
 
-	if (least_recent_use_reg != INVALID_REG) {
+	if (least_recent_use_reg != INVALID_REG)
+	{
 		movToMemory(xregs[least_recent_use_reg].guest_reg);
 		return least_recent_use_reg;
 	}
 
 	//just choose one.
-	for(i = 0; i < sizeof(alloc_order)/sizeof(alloc_order[0]); i++) {
+	for(i = 0; i < sizeof(alloc_order)/sizeof(alloc_order[0]); i++)
+	{
 		X64Reg reg = alloc_order[i];
 		if (xregs[reg].guest_reg <= DSP_REG_MAX_MEM_BACKED &&
-		    !regs[xregs[reg].guest_reg].used) {
+			!regs[xregs[reg].guest_reg].used)
+		{
 			movToMemory(xregs[reg].guest_reg);
 			return reg;
 		}
@@ -903,12 +1019,16 @@ X64Reg DSPJitRegCache::spillXReg()
 
 void DSPJitRegCache::spillXReg(X64Reg reg)
 {
-	if (xregs[reg].guest_reg <= DSP_REG_MAX_MEM_BACKED) {
+	if (xregs[reg].guest_reg <= DSP_REG_MAX_MEM_BACKED)
+	{
 		_assert_msg_(DSPLLE, !regs[xregs[reg].guest_reg].used,
 			     "to be spilled host reg %x(guest reg %x) still in use!",
 			     reg, xregs[reg].guest_reg);
+
 		movToMemory(xregs[reg].guest_reg);
-	} else {
+	}
+	else
+	{
 		_assert_msg_(DSPLLE, xregs[reg].guest_reg == DSP_REG_NONE,
 			     "to be spilled host reg %x still in use!",
 			     reg);
@@ -917,9 +1037,10 @@ void DSPJitRegCache::spillXReg(X64Reg reg)
 
 X64Reg DSPJitRegCache::findFreeXReg()
 {
-	unsigned int i;
-	for(i = 0; i < sizeof(alloc_order)/sizeof(alloc_order[0]); i++) {
-		if (xregs[alloc_order[i]].guest_reg == DSP_REG_NONE) {
+	for(unsigned int i = 0; i < sizeof(alloc_order)/sizeof(alloc_order[0]); i++)
+	{
+		if (xregs[alloc_order[i]].guest_reg == DSP_REG_NONE)
+		{
 			return alloc_order[i];
 		}
 	}
@@ -946,23 +1067,28 @@ void DSPJitRegCache::getFreeXReg(X64Reg &reg)
 
 void DSPJitRegCache::getXReg(X64Reg reg)
 {
-	if (xregs[reg].guest_reg == DSP_REG_STATIC) {
+	if (xregs[reg].guest_reg == DSP_REG_STATIC)
+	{
 		ERROR_LOG(DSPLLE, "Trying to get statically used XReg %d", reg);
 		return;
 	}
+
 	if (xregs[reg].guest_reg != DSP_REG_NONE)
 		spillXReg(reg);
-	_assert_msg_(DSPLLE, xregs[reg].guest_reg != DSP_REG_NONE, "register already in use");
+	_assert_msg_(DSPLLE, xregs[reg].guest_reg == DSP_REG_NONE, "register already in use");
 	xregs[reg].guest_reg = DSP_REG_USED;
 }
 
 void DSPJitRegCache::putXReg(X64Reg reg)
 {
-	if (xregs[reg].guest_reg == DSP_REG_STATIC) {
+	if (xregs[reg].guest_reg == DSP_REG_STATIC)
+	{
 		ERROR_LOG(DSPLLE, "Trying to put statically used XReg %d", reg);
 		return;
 	}
+
 	_assert_msg_(DSPLLE, xregs[reg].guest_reg == DSP_REG_USED,
 		     "putXReg without get(Free)XReg");
+
 	xregs[reg].guest_reg = DSP_REG_NONE;
 }
diff --git a/Source/Core/Core/Src/DSP/Jit/DSPJitRegCache.h b/Source/Core/Core/Src/DSP/Jit/DSPJitRegCache.h
index e9ec61d123..77cc7ace1e 100644
--- a/Source/Core/Core/Src/DSP/Jit/DSPJitRegCache.h
+++ b/Source/Core/Core/Src/DSP/Jit/DSPJitRegCache.h
@@ -1,19 +1,6 @@
-// Copyright (C) 2011 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _DSPJITREGCACHE_H
 #define _DSPJITREGCACHE_H
@@ -22,7 +9,8 @@
 
 class DSPEmitter;
 
-enum DSPJitRegSpecial {
+enum DSPJitRegSpecial
+{
 	DSP_REG_AX0_32   =32,
 	DSP_REG_AX1_32   =33,
 #ifdef _M_X64
@@ -39,8 +27,11 @@ enum DSPJitRegSpecial {
 	DSP_REG_NONE     =255
 };
 
-enum DSPJitSignExtend {
-    SIGN, ZERO, NONE
+enum DSPJitSignExtend
+{
+	SIGN,
+	ZERO,
+	NONE
 };
 
 #ifdef _M_X64
@@ -49,14 +40,17 @@ enum DSPJitSignExtend {
 #define NUMXREGS 8
 #endif
 
-class DSPJitRegCache {
+class DSPJitRegCache
+{
 private:
 	struct X64CachedReg
 	{
 		int guest_reg; //including DSPJitRegSpecial
 		bool pushed;
 	};
-	struct DynamicReg {
+	
+	struct DynamicReg
+	{
 		Gen::OpArg loc;
 		void *mem;
 		size_t size;
@@ -67,7 +61,7 @@ private:
 		int shift;//current shift if parentReg == DSP_REG_NONE
 		          //otherwise the shift this part can be found at
 		Gen::X64Reg host_reg;
-/* todo:
+/* TODO:
    + drop sameReg
    + add parentReg
    + add shift:
diff --git a/Source/Core/Core/Src/DSP/Jit/DSPJitUtil.cpp b/Source/Core/Core/Src/DSP/Jit/DSPJitUtil.cpp
index 2fb18f83da..e313920361 100644
--- a/Source/Core/Core/Src/DSP/Jit/DSPJitUtil.cpp
+++ b/Source/Core/Core/Src/DSP/Jit/DSPJitUtil.cpp
@@ -1,19 +1,6 @@
-// Copyright (C) 2010 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "../DSPMemoryMap.h"
 #include "../DSPHWInterface.h"
@@ -24,6 +11,352 @@
 
 using namespace Gen;
 
+//clobbers:
+//EAX = (s8)g_dsp.reg_stack_ptr[stack_reg]
+//expects:
+void DSPEmitter::dsp_reg_stack_push(int stack_reg)
+{
+	//g_dsp.reg_stack_ptr[stack_reg]++;
+	//g_dsp.reg_stack_ptr[stack_reg] &= DSP_STACK_MASK;
+	MOV(8, R(AL), M(&g_dsp.reg_stack_ptr[stack_reg]));
+	ADD(8, R(AL), Imm8(1));
+	AND(8, R(AL), Imm8(DSP_STACK_MASK));
+	MOV(8, M(&g_dsp.reg_stack_ptr[stack_reg]), R(AL));
+
+	X64Reg tmp1;
+	gpr.getFreeXReg(tmp1);
+	//g_dsp.reg_stack[stack_reg][g_dsp.reg_stack_ptr[stack_reg]] = g_dsp.r[DSP_REG_ST0 + stack_reg];
+	MOV(16, R(tmp1), M(&g_dsp.r.st[stack_reg]));
+#ifdef _M_IX86 // All32
+	MOVZX(32, 8, EAX, R(AL));
+#else
+	MOVZX(64, 8, RAX, R(AL));
+#endif
+	MOV(16, MComplex(EAX, EAX, 1,
+			 PtrOffset(&g_dsp.reg_stack[stack_reg][0],0)), R(tmp1));
+	gpr.putXReg(tmp1);
+}
+
+//clobbers:
+//EAX = (s8)g_dsp.reg_stack_ptr[stack_reg]
+//expects:
+void DSPEmitter::dsp_reg_stack_pop(int stack_reg)
+{
+	//g_dsp.r[DSP_REG_ST0 + stack_reg] = g_dsp.reg_stack[stack_reg][g_dsp.reg_stack_ptr[stack_reg]];
+	MOV(8, R(AL), M(&g_dsp.reg_stack_ptr[stack_reg]));
+	X64Reg tmp1;
+	gpr.getFreeXReg(tmp1);
+#ifdef _M_IX86 // All32
+	MOVZX(32, 8, EAX, R(AL));
+#else
+	MOVZX(64, 8, RAX, R(AL));
+#endif
+	MOV(16, R(tmp1), MComplex(EAX, EAX, 1,
+				  PtrOffset(&g_dsp.reg_stack[stack_reg][0],0)));
+	MOV(16, M(&g_dsp.r.st[stack_reg]), R(tmp1));
+	gpr.putXReg(tmp1);
+
+	//g_dsp.reg_stack_ptr[stack_reg]--;
+	//g_dsp.reg_stack_ptr[stack_reg] &= DSP_STACK_MASK;
+	SUB(8, R(AL), Imm8(1));
+	AND(8, R(AL), Imm8(DSP_STACK_MASK));
+	MOV(8, M(&g_dsp.reg_stack_ptr[stack_reg]), R(AL));
+}
+
+
+void DSPEmitter::dsp_reg_store_stack(int stack_reg, Gen::X64Reg host_sreg)
+{
+	if (host_sreg != EDX)
+	{
+		MOV(16, R(EDX), R(host_sreg));
+	}
+	dsp_reg_stack_push(stack_reg);
+	//g_dsp.r[DSP_REG_ST0 + stack_reg] = val;
+	MOV(16, M(&g_dsp.r.st[stack_reg]), R(EDX));
+}
+
+void DSPEmitter::dsp_reg_load_stack(int stack_reg, Gen::X64Reg host_dreg)
+{
+	//u16 val = g_dsp.r[DSP_REG_ST0 + stack_reg];
+	MOV(16, R(EDX), M(&g_dsp.r.st[stack_reg]));
+	dsp_reg_stack_pop(stack_reg);
+	if (host_dreg != EDX)
+	{
+		MOV(16, R(host_dreg), R(EDX));
+	}
+}
+
+void DSPEmitter::dsp_reg_store_stack_imm(int stack_reg, u16 val)
+{
+	dsp_reg_stack_push(stack_reg);
+	//g_dsp.r[DSP_REG_ST0 + stack_reg] = val;
+	MOV(16, M(&g_dsp.r.st[stack_reg]), Imm16(val));
+}
+
+void DSPEmitter::dsp_op_write_reg(int reg, Gen::X64Reg host_sreg)
+{
+	switch (reg & 0x1f)
+	{
+	// 8-bit sign extended registers.
+	case DSP_REG_ACH0:
+	case DSP_REG_ACH1:
+		gpr.writeReg(reg, R(host_sreg));
+		break;
+
+	// Stack registers.
+	case DSP_REG_ST0:
+	case DSP_REG_ST1:
+	case DSP_REG_ST2:
+	case DSP_REG_ST3:
+		dsp_reg_store_stack(reg - DSP_REG_ST0, host_sreg);
+		break;
+
+	default:
+		gpr.writeReg(reg, R(host_sreg));
+		break;
+	}
+}
+
+void DSPEmitter::dsp_op_write_reg_imm(int reg, u16 val)
+{
+	switch (reg & 0x1f)
+	{
+	// 8-bit sign extended registers. Should look at prod.h too...
+	case DSP_REG_ACH0:
+	case DSP_REG_ACH1:
+		gpr.writeReg(reg, Imm16((u16)(s16)(s8)(u8)val));
+		break;
+	// Stack registers.
+	case DSP_REG_ST0:
+	case DSP_REG_ST1:
+	case DSP_REG_ST2:
+	case DSP_REG_ST3:
+		dsp_reg_store_stack_imm(reg - DSP_REG_ST0, val);
+		break;
+
+	default:
+		gpr.writeReg(reg, Imm16(val));
+		break;
+	}
+}
+
+void DSPEmitter::dsp_conditional_extend_accum(int reg)
+{
+	switch (reg)
+	{
+	case DSP_REG_ACM0:
+	case DSP_REG_ACM1:
+	{
+		OpArg sr_reg;
+		gpr.getReg(DSP_REG_SR,sr_reg);
+		DSPJitRegCache c(gpr);
+		TEST(16, sr_reg, Imm16(SR_40_MODE_BIT));
+		FixupBranch not_40bit = J_CC(CC_Z,true);
+		//if (g_dsp.r[DSP_REG_SR] & SR_40_MODE_BIT)
+		//{
+		// Sign extend into whole accum.
+		//u16 val = g_dsp.r[reg];
+		get_acc_m(reg - DSP_REG_ACM0, EAX);
+		SHR(32, R(EAX), Imm8(16));
+		//g_dsp.r[reg - DSP_REG_ACM0 + DSP_REG_ACH0] = (val & 0x8000) ? 0xFFFF : 0x0000;
+		//g_dsp.r[reg - DSP_REG_ACM0 + DSP_REG_ACL0] = 0;
+		set_acc_h(reg - DSP_REG_ACM0, R(RAX));
+		set_acc_l(reg - DSP_REG_ACM0, Imm16(0));
+		//}
+		gpr.flushRegs(c);
+		SetJumpTarget(not_40bit);
+		gpr.putReg(DSP_REG_SR, false);
+	}
+	}
+}
+
+void DSPEmitter::dsp_conditional_extend_accum_imm(int reg, u16 val)
+{
+	switch (reg)
+	{
+	case DSP_REG_ACM0:
+	case DSP_REG_ACM1:
+	{
+		OpArg sr_reg;
+		gpr.getReg(DSP_REG_SR,sr_reg);
+		DSPJitRegCache c(gpr);
+		TEST(16, sr_reg, Imm16(SR_40_MODE_BIT));
+		FixupBranch not_40bit = J_CC(CC_Z, true);
+		//if (g_dsp.r[DSP_REG_SR] & SR_40_MODE_BIT)
+		//{
+		// Sign extend into whole accum.
+		//g_dsp.r[reg - DSP_REG_ACM0 + DSP_REG_ACH0] = (val & 0x8000) ? 0xFFFF : 0x0000;
+		//g_dsp.r[reg - DSP_REG_ACM0 + DSP_REG_ACL0] = 0;
+		set_acc_h(reg - DSP_REG_ACM0, Imm16((val & 0x8000)?0xffff:0x0000));
+		set_acc_l(reg - DSP_REG_ACM0, Imm16(0));
+		//}
+		gpr.flushRegs(c);
+		SetJumpTarget(not_40bit);
+		gpr.putReg(DSP_REG_SR, false);
+	}
+	}
+}
+
+void DSPEmitter::dsp_op_read_reg_dont_saturate(int reg, Gen::X64Reg host_dreg, DSPJitSignExtend extend)
+{
+	switch (reg & 0x1f)
+	{
+	case DSP_REG_ST0:
+	case DSP_REG_ST1:
+	case DSP_REG_ST2:
+	case DSP_REG_ST3:
+		dsp_reg_load_stack(reg - DSP_REG_ST0, host_dreg);
+		switch(extend)
+		{
+		case SIGN:
+#ifdef _M_IX86 // All32
+			MOVSX(32, 16, host_dreg, R(host_dreg));
+#else
+			MOVSX(64, 16, host_dreg, R(host_dreg));
+#endif
+			break;
+		case ZERO:
+#ifdef _M_IX86 // All32
+			MOVZX(32, 16, host_dreg, R(host_dreg));
+#else
+			MOVZX(64, 16, host_dreg, R(host_dreg));
+#endif
+			break;
+		case NONE:
+		default:
+			break;
+		}
+		return;
+	default:
+		gpr.readReg(reg, host_dreg, extend);
+		return;
+	}
+}
+
+void DSPEmitter::dsp_op_read_reg(int reg, Gen::X64Reg host_dreg, DSPJitSignExtend extend)
+{
+	switch (reg & 0x1f)
+	{
+	case DSP_REG_ST0:
+	case DSP_REG_ST1:
+	case DSP_REG_ST2:
+	case DSP_REG_ST3:
+		dsp_reg_load_stack(reg - DSP_REG_ST0, host_dreg);
+		switch(extend)
+		{
+		case SIGN:
+#ifdef _M_IX86 // All32
+			MOVSX(32, 16, host_dreg, R(host_dreg));
+#else
+			MOVSX(64, 16, host_dreg, R(host_dreg));
+#endif
+			break;
+		case ZERO:
+#ifdef _M_IX86 // All32
+			MOVZX(32, 16, host_dreg, R(host_dreg));
+#else
+			MOVZX(64, 16, host_dreg, R(host_dreg));
+#endif
+			break;
+		case NONE:
+		default:
+			break;
+		}
+		return;
+	case DSP_REG_ACM0:
+	case DSP_REG_ACM1:
+	{
+		//we already know this is ACCM0 or ACCM1
+#ifdef _M_IX86 // All32
+		gpr.readReg(reg, host_dreg, extend);
+#else
+		OpArg acc_reg;
+		gpr.getReg(reg-DSP_REG_ACM0+DSP_REG_ACC0_64, acc_reg);
+#endif
+		OpArg sr_reg;
+		gpr.getReg(DSP_REG_SR,sr_reg);
+
+		DSPJitRegCache c(gpr);
+		TEST(16, sr_reg, Imm16(SR_40_MODE_BIT));
+		FixupBranch not_40bit = J_CC(CC_Z, true);
+
+#ifdef _M_IX86 // All32
+		DSPJitRegCache c2(gpr);
+		gpr.putReg(DSP_REG_SR, false);
+		X64Reg tmp1;
+		gpr.getFreeXReg(tmp1);
+		gpr.readReg(reg-DSP_REG_ACM0+DSP_REG_ACH0, tmp1, NONE);
+		MOVSX(32,16,host_dreg,R(host_dreg));
+		SHL(32, R(tmp1), Imm8(16));
+		MOV(16,R(tmp1),R(host_dreg));
+		CMP(32,R(host_dreg), R(tmp1));
+
+		FixupBranch no_saturate = J_CC(CC_Z);
+
+		CMP(32,R(tmp1),Imm32(0));
+		FixupBranch negative = J_CC(CC_LE);
+
+		MOV(32,R(host_dreg),Imm32(0x7fff));//this works for all extend modes
+		FixupBranch done_positive = J();
+
+		SetJumpTarget(negative);
+		if (extend == NONE || extend == ZERO)
+			MOV(32,R(host_dreg),Imm32(0x00008000));
+		else
+			MOV(32,R(host_dreg),Imm32(0xffff8000));
+		FixupBranch done_negative = J();
+
+		SetJumpTarget(no_saturate);
+		if (extend == ZERO)
+			MOVZX(32,16,host_dreg,R(host_dreg));
+		SetJumpTarget(done_positive);
+		SetJumpTarget(done_negative);
+		gpr.putXReg(tmp1);
+		gpr.flushRegs(c2);
+		SetJumpTarget(not_40bit);
+		gpr.flushRegs(c);
+#else
+
+		MOVSX(64,32,host_dreg,acc_reg);
+		CMP(64,R(host_dreg),acc_reg);
+		FixupBranch no_saturate = J_CC(CC_Z);
+
+		CMP(64,acc_reg,Imm32(0));
+		FixupBranch negative = J_CC(CC_LE);
+
+		MOV(64,R(host_dreg),Imm32(0x7fff));//this works for all extend modes
+		FixupBranch done_positive = J();
+
+		SetJumpTarget(negative);
+		if (extend == NONE || extend == ZERO)
+			MOV(64,R(host_dreg),Imm32(0x00008000));
+		else
+			MOV(64,R(host_dreg),Imm32(0xffff8000));
+		FixupBranch done_negative = J();
+
+		SetJumpTarget(no_saturate);
+		SetJumpTarget(not_40bit);
+
+		MOV(64, R(host_dreg), acc_reg);
+		if (extend == NONE || extend == ZERO)
+			SHR(64, R(host_dreg), Imm8(16));
+		else
+			SAR(64, R(host_dreg), Imm8(16));
+		SetJumpTarget(done_positive);
+		SetJumpTarget(done_negative);
+		gpr.flushRegs(c);
+		gpr.putReg(reg-DSP_REG_ACM0+DSP_REG_ACC0_64, false);
+#endif
+
+		gpr.putReg(DSP_REG_SR, false);
+	}
+		return;
+	default:
+		gpr.readReg(reg, host_dreg, extend);
+		return;
+	}
+}
+
 // addr math
 //
 // These functions detect overflow by checking if
@@ -132,13 +465,14 @@ void DSPEmitter::increase_addr_reg(int reg, int _ix_reg)
 	//eax = dar
 	XOR(32, R(EAX), R(ECX));
 	XOR(32, R(EAX), R(tmp1));
-	LEA(32, ECX, MRegSum(EDX, EDX));
-	OR(32, R(ECX), Imm8(2));
-	AND(32, R(EAX), R(ECX));
 
 	//if (ix >= 0)
 	TEST(32, R(ECX), R(ECX));
 	FixupBranch negative = J_CC(CC_S);
+		LEA(32, ECX, MRegSum(EDX, EDX));
+		OR(32, R(ECX), Imm8(2));
+		AND(32, R(EAX), R(ECX));
+
 		//if (dar > wr)
 		CMP(32, R(EAX), R(EDX));
 		FixupBranch done = J_CC(CC_BE);
@@ -149,6 +483,10 @@ void DSPEmitter::increase_addr_reg(int reg, int _ix_reg)
 
 	//else
 	SetJumpTarget(negative);
+		LEA(32, ECX, MRegSum(EDX, EDX));
+		OR(32, R(ECX), Imm8(2));
+		AND(32, R(EAX), R(ECX));
+
 		//if ((((nar + wr + 1) ^ nar) & dar) <= wr)
 		LEA(32, ECX, MComplex(tmp1, EDX, 1, 1));
 		XOR(32, R(ECX), R(tmp1));
@@ -197,13 +535,14 @@ void DSPEmitter::decrease_addr_reg(int reg)
 	//eax = dar
 	XOR(32, R(EAX), R(ECX));
 	XOR(32, R(EAX), R(tmp1));
-	LEA(32, ECX, MRegSum(EDX, EDX));
-	OR(32, R(ECX), Imm8(2));
-	AND(32, R(EAX), R(ECX));
 
 	//if ((u32)ix > 0xFFFF8000)  ==> (~ix < 0x00007FFF)
 	CMP(32, R(ECX), Imm32(0x00007FFF));
 	FixupBranch positive = J_CC(CC_AE);
+		LEA(32, ECX, MRegSum(EDX, EDX));
+		OR(32, R(ECX), Imm8(2));
+		AND(32, R(EAX), R(ECX));
+
 		//if (dar > wr)
 		CMP(32, R(EAX), R(EDX));
 		FixupBranch done = J_CC(CC_BE);
@@ -214,6 +553,10 @@ void DSPEmitter::decrease_addr_reg(int reg)
 
 	//else
 	SetJumpTarget(positive);
+		LEA(32, ECX, MRegSum(EDX, EDX));
+		OR(32, R(ECX), Imm8(2));
+		AND(32, R(EAX), R(ECX));
+
 		//if ((((nar + wr + 1) ^ nar) & dar) <= wr)
 		LEA(32, ECX, MComplex(tmp1, EDX, 1, 1));
 		XOR(32, R(ECX), R(tmp1));
diff --git a/Source/Core/Core/Src/DSP/Jit/DSPJitUtil.h b/Source/Core/Core/Src/DSP/Jit/DSPJitUtil.h
index 2d28b6d520..a1a43e7047 100644
--- a/Source/Core/Core/Src/DSP/Jit/DSPJitUtil.h
+++ b/Source/Core/Core/Src/DSP/Jit/DSPJitUtil.h
@@ -1,19 +1,6 @@
-// Copyright (C) 2010 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef __DSPJITUTIL_H__
 #define __DSPJITUTIL_H__
diff --git a/Source/Core/Core/Src/DSP/LabelMap.cpp b/Source/Core/Core/Src/DSP/LabelMap.cpp
index bc6b8d7ba2..a5e6e1b6dd 100644
--- a/Source/Core/Core/Src/DSP/LabelMap.cpp
+++ b/Source/Core/Core/Src/DSP/LabelMap.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "LabelMap.h"
 #include "DSPTables.h"
@@ -68,10 +55,13 @@ bool LabelMap::GetLabelValue(const std::string &label, u16 *value, LabelType typ
 	{
 		if (!label.compare(labels[i].name))
 		{
-			if (type & labels[i].type) {
+			if (type & labels[i].type)
+			{
 				*value = labels[i].addr;
 				return true;
-			} else {
+			}
+			else
+			{
 				printf("WARNING: Wrong label type requested. %s\n", label.c_str());
 			}
 		}
diff --git a/Source/Core/Core/Src/DSP/LabelMap.h b/Source/Core/Core/Src/DSP/LabelMap.h
index 2bdaee9049..908b3bd7c9 100644
--- a/Source/Core/Core/Src/DSP/LabelMap.h
+++ b/Source/Core/Core/Src/DSP/LabelMap.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _LABELMAP_H
 #define _LABELMAP_H
diff --git a/Source/Core/Core/Src/DSP/assemble.cpp b/Source/Core/Core/Src/DSP/assemble.cpp
index 248b0d8ba8..8deef98ed9 100644
--- a/Source/Core/Core/Src/DSP/assemble.cpp
+++ b/Source/Core/Core/Src/DSP/assemble.cpp
@@ -752,7 +752,7 @@ void DSPAssembler::InitPass(int pass)
 
 bool DSPAssembler::AssembleFile(const char *fname, int pass)
 {
-    int disable_text = 0; // modified by Hermes
+	int disable_text = 0; // modified by Hermes
 
 	std::ifstream fsrc;
 	OpenFStream(fsrc, fname, std::ios_base::in);
diff --git a/Source/Core/Core/Src/DSPEmulator.cpp b/Source/Core/Core/Src/DSPEmulator.cpp
index 907eb225b3..96e1a1107e 100644
--- a/Source/Core/Core/Src/DSPEmulator.cpp
+++ b/Source/Core/Core/Src/DSPEmulator.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "DSPEmulator.h"
 
diff --git a/Source/Core/Core/Src/DSPEmulator.h b/Source/Core/Core/Src/DSPEmulator.h
index 30de180cf3..6df274d757 100644
--- a/Source/Core/Core/Src/DSPEmulator.h
+++ b/Source/Core/Core/Src/DSPEmulator.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _DSPEMULATOR_H_
 #define _DSPEMULATOR_H_
@@ -44,11 +31,12 @@ public:
 	virtual void DSP_Update(int cycles) = 0;
 	virtual void DSP_StopSoundStream() = 0;
 	virtual void DSP_ClearAudioBuffer(bool mute) = 0;
+	virtual u32 DSP_UpdateRate() = 0;
 
 protected:
 	SoundStream *soundStream;
 };
 
-DSPEmulator *CreateDSPEmulator(bool LLE);
+DSPEmulator *CreateDSPEmulator(bool HLE);
 
 #endif // _DSPEMULATOR_H_
diff --git a/Source/Core/Core/Src/Debugger/Debugger_SymbolMap.cpp b/Source/Core/Core/Src/Debugger/Debugger_SymbolMap.cpp
index 3edde92883..2b84297832 100644
--- a/Source/Core/Core/Src/Debugger/Debugger_SymbolMap.cpp
+++ b/Source/Core/Core/Src/Debugger/Debugger_SymbolMap.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "Common.h"
 #include "StringUtil.h"
@@ -40,7 +27,7 @@ void AddAutoBreakpoints()
 	{
 		Symbol *symbol = g_symbolDB.GetSymbolFromName(bps[i]);
 		if (symbol)
-		    PowerPC::breakpoints.Add(symbol->address, false);
+			PowerPC::breakpoints.Add(symbol->address, false);
 	}
 #endif
 #endif
@@ -54,15 +41,15 @@ bool GetCallstack(std::vector<CallstackEntry> &output)
 	if (Core::GetState() == Core::CORE_UNINITIALIZED)
 		return false;
 
-    if (!Memory::IsRAMAddress(PowerPC::ppcState.gpr[1]))
-        return false;
+	if (!Memory::IsRAMAddress(PowerPC::ppcState.gpr[1]))
+		return false;
 
 	u32 addr = Memory::ReadUnchecked_U32(PowerPC::ppcState.gpr[1]);  // SP
 	if (LR == 0)
 	{
-        CallstackEntry entry;
-        entry.Name = "(error: LR=0)";
-        entry.vAddress = 0x0;
+		CallstackEntry entry;
+		entry.Name = "(error: LR=0)";
+		entry.vAddress = 0x0;
 		output.push_back(entry);
 		return false;
 	}
@@ -78,31 +65,31 @@ bool GetCallstack(std::vector<CallstackEntry> &output)
 	//walk the stack chain
 	while ((addr != 0xFFFFFFFF) && (addr != 0) && (count++ < 20) && (PowerPC::ppcState.gpr[1] != 0))
 	{
-        if (!Memory::IsRAMAddress(addr + 4))
-            return false;
+		if (!Memory::IsRAMAddress(addr + 4))
+			return false;
 
 		u32 func = Memory::ReadUnchecked_U32(addr + 4);
 		const char *str = g_symbolDB.GetDescription(func);
 		if (!str || strlen(str) == 0 || !strcmp(str, "Invalid"))
 			str = "(unknown)";
 
-        entry.Name = StringFromFormat(" * %s [ addr = %08x ]\n", str, func - 4);
-        entry.vAddress = func - 4;
+		entry.Name = StringFromFormat(" * %s [ addr = %08x ]\n", str, func - 4);
+		entry.vAddress = func - 4;
 		output.push_back(entry);
 
-        if (!Memory::IsRAMAddress(addr))
-            return false;
+		if (!Memory::IsRAMAddress(addr))
+			return false;
 
-	    addr = Memory::ReadUnchecked_U32(addr);
+		addr = Memory::ReadUnchecked_U32(addr);
 	}
 
-    return true;
+	return true;
 }
 
 void PrintCallstack()
 {
 	u32 addr = Memory::ReadUnchecked_U32(PowerPC::ppcState.gpr[1]);  // SP
-	
+
 	printf("== STACK TRACE - SP = %08x ==", PowerPC::ppcState.gpr[1]);
 	
 	if (LR == 0) {
@@ -114,7 +101,7 @@ void PrintCallstack()
 		printf(" * %s  [ LR = %08x ]", g_symbolDB.GetDescription(LR), LR);
 		count++;
 	}
-	
+
 	//walk the stack chain
 	while ((addr != 0xFFFFFFFF) && (addr != 0) && (count++ < 20) && (PowerPC::ppcState.gpr[1] != 0))
 	{
diff --git a/Source/Core/Core/Src/Debugger/Debugger_SymbolMap.h b/Source/Core/Core/Src/Debugger/Debugger_SymbolMap.h
index 5ce7144540..fac79b2959 100644
--- a/Source/Core/Core/Src/Debugger/Debugger_SymbolMap.h
+++ b/Source/Core/Core/Src/Debugger/Debugger_SymbolMap.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _DEBUGGER_SYMBOLMAP_H
 #define _DEBUGGER_SYMBOLMAP_H
diff --git a/Source/Core/Core/Src/Debugger/Dump.cpp b/Source/Core/Core/Src/Debugger/Dump.cpp
index 8d70c72c2b..8d784cf8b0 100644
--- a/Source/Core/Core/Src/Debugger/Dump.cpp
+++ b/Source/Core/Core/Src/Debugger/Dump.cpp
@@ -1,19 +1,7 @@
-// Copyright (C) 2003 Dolphin Project.
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
-// 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 <stdio.h>
 
 #include "Common.h"
diff --git a/Source/Core/Core/Src/Debugger/Dump.h b/Source/Core/Core/Src/Debugger/Dump.h
index 6cc5dbbf4e..ae94b6571e 100644
--- a/Source/Core/Core/Src/Debugger/Dump.h
+++ b/Source/Core/Core/Src/Debugger/Dump.h
@@ -1,20 +1,9 @@
-// Copyright (C) 2003 Dolphin Project.
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
-// 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/
-// uncompress the dumps from costis GC-Debugger tool
+// Purpose: uncompress the dumps from costis GC-Debugger tool
 //
 //
 #ifndef _DUMP_H
diff --git a/Source/Core/Core/Src/Debugger/GCELF.h b/Source/Core/Core/Src/Debugger/GCELF.h
index f6325d001b..f47c9bf6a5 100644
--- a/Source/Core/Core/Src/Debugger/GCELF.h
+++ b/Source/Core/Core/Src/Debugger/GCELF.h
@@ -1,3 +1,7 @@
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
+
 #ifndef GCELF_H
 #define GCELF_H
 
@@ -43,12 +47,12 @@
 
 typedef struct
 {
-  	unsigned char ID[4];
-  	unsigned char clazz;
-  	unsigned char data;
-  	unsigned char version;
-  	unsigned char pad[9];
-  	unsigned short e_type; // ELF file type
+	unsigned char ID[4];
+	unsigned char clazz;
+	unsigned char data;
+	unsigned char version;
+	unsigned char pad[9];
+	unsigned short e_type; // ELF file type
 	unsigned short e_machine; // ELF target machine
 	unsigned int e_version; // ELF file version number
 	unsigned int e_entry;
@@ -63,15 +67,16 @@ typedef struct
 	unsigned short e_shtrndx;
 } ELF_Header;
 
-typedef struct {
-  unsigned int type;
-  unsigned int offset;
-  unsigned int vaddr;
-  unsigned int paddr;
-  unsigned int filesz;
-  unsigned int memsz;
-  unsigned int flags;
-  unsigned int align;
+typedef struct
+{
+	unsigned int type;
+	unsigned int offset;
+	unsigned int vaddr;
+	unsigned int paddr;
+	unsigned int filesz;
+	unsigned int memsz;
+	unsigned int flags;
+	unsigned int align;
 } Program_Header;
 
 typedef struct
@@ -88,16 +93,18 @@ typedef struct
 	unsigned int entsize;
 } Section_Header;
 
-typedef struct {
-  unsigned int name;
-  unsigned int value;
-  unsigned int size;
-  unsigned char info;
-  unsigned char other;
-  unsigned short shndx;
+typedef struct
+{
+	unsigned int name;
+	unsigned int value;
+	unsigned int size;
+	unsigned char info;
+	unsigned char other;
+	unsigned short shndx;
 } Symbol_Header;
 
-typedef struct {
+typedef struct
+{
 	unsigned int offset;
 	unsigned int info;
 	signed int addend;
diff --git a/Source/Core/Core/Src/Debugger/PPCDebugInterface.cpp b/Source/Core/Core/Src/Debugger/PPCDebugInterface.cpp
index 30450f9ac7..f2e36ee1ee 100644
--- a/Source/Core/Core/Src/Debugger/PPCDebugInterface.cpp
+++ b/Source/Core/Core/Src/Debugger/PPCDebugInterface.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "Debugger_SymbolMap.h"
 #include "DebugInterface.h"
diff --git a/Source/Core/Core/Src/Debugger/PPCDebugInterface.h b/Source/Core/Core/Src/Debugger/PPCDebugInterface.h
index 5f9e41bb39..e7d08ddd3a 100644
--- a/Source/Core/Core/Src/Debugger/PPCDebugInterface.h
+++ b/Source/Core/Core/Src/Debugger/PPCDebugInterface.h
@@ -1,3 +1,7 @@
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
+
 #ifndef _PPCDEBUGINTERFACE_H
 #define _PPCDEBUGINTERFACE_H
 
diff --git a/Source/Core/Core/Src/DolLoader.h b/Source/Core/Core/Src/DolLoader.h
deleted file mode 100644
index 96bf3f04cc..0000000000
--- a/Source/Core/Core/Src/DolLoader.h
+++ /dev/null
@@ -1,118 +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/
-
-// M O D U L E  B E G I N 
-
-
-#pragma once
-
-#include "Common.h"
-#include "FileUtil.h"
-
-// C L A S S
-
-
-class CDolLoader
-{
-public:
-
-	CDolLoader(const char* _szFilename) :
-		m_bInit(false)
-	{
-		// try to open file
-		File::IOFile pStream(_szFilename, "rb");
-		if (pStream)
-		{
-			pStream.ReadArray(&m_dolheader, 1);
-
-			// swap memory
-			u32* p = (u32*)&m_dolheader;
-			for (int i=0; i<(sizeof(SDolHeader)>>2); i++)	
-				p[i] = Common::swap32(p[i]);
-
-			// load all text (code) sections
-			for(int i=0; i<DOL_NUM_TEXT; i++)
-			{
-				if(m_dolheader.textOffset[i] != 0)
-				{
-					u8* pTemp = new u8[m_dolheader.textSize[i]];
-
-					pStream.Seek(m_dolheader.textOffset[i], SEEK_SET);
-					pStream.ReadArray(pTemp, m_dolheader.textSize[i]);
-
-					for (size_t num=0; num<m_dolheader.textSize[i]; num++)
-						CMemory::Write_U8(pTemp[num], m_dolheader.textAddress[i] + num);
-
-					delete[] pTemp;
-				}
-			}
-
-			// load all data sections
-			for(int i=0; i<DOL_NUM_DATA; i++)
-			{
-				if(m_dolheader.dataOffset[i] != 0)
-				{
-					u8* pTemp = new u8[m_dolheader.dataSize[i]];
-
-					pStream.Seek(m_dolheader.dataOffset[i], SEEK_SET);
-					pStream.ReadArray(pTemp, m_dolheader.dataSize[i]);
-
-					for (size_t num=0; num<m_dolheader.dataSize[i]; num++)
-						CMemory::Write_U8(pTemp[num], m_dolheader.dataAddress[i] + num);
-
-					delete[] pTemp;
-				}
-			}
-
-			m_bInit = true;
-		}
-	}
-
-	_u32 GetEntryPoint(void)
-	{
-		return m_dolheader.entryPoint;
-	}
-	
-private:
-
-	enum
-	{
-		DOL_NUM_TEXT	= 7,
-		DOL_NUM_DATA	= 11
-	};
-
-	struct SDolHeader
-	{
-		_u32     textOffset[DOL_NUM_TEXT];
-		_u32     dataOffset[DOL_NUM_DATA];
-
-		_u32     textAddress[DOL_NUM_TEXT];
-		_u32     dataAddress[DOL_NUM_DATA];
-
-		_u32     textSize[DOL_NUM_TEXT];
-		_u32     dataSize[DOL_NUM_DATA];
-
-		_u32     bssAddress;
-		_u32     bssSize;
-		_u32     entryPoint;
-		_u32     padd[7];
-	};
-
-	SDolHeader m_dolheader;
-
-	bool m_bInit;
-};
diff --git a/Source/Core/Core/Src/FifoPlayer/FifoAnalyzer.cpp b/Source/Core/Core/Src/FifoPlayer/FifoAnalyzer.cpp
index 383fcb555d..233dbbbb4a 100644
--- a/Source/Core/Core/Src/FifoPlayer/FifoAnalyzer.cpp
+++ b/Source/Core/Core/Src/FifoPlayer/FifoAnalyzer.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "FifoAnalyzer.h"
 
@@ -35,21 +22,21 @@ void Init()
 }
 
 u8 ReadFifo8(u8 *&data)
-{	
+{
 	u8 value = data[0];
 	data += 1;
 	return value;
 }
 
 u16 ReadFifo16(u8 *&data)
-{	
+{
 	u16 value = Common::swap16(data);
 	data += 2;
 	return value;
 }
 
 u32 ReadFifo32(u8 *&data)
-{	
+{
 	u32 value = Common::swap32(data);
 	data += 4;
 	return value;
@@ -57,13 +44,13 @@ u32 ReadFifo32(u8 *&data)
 
 void InitBPMemory(BPMemory *bpMem)
 {
-    memset(bpMem, 0, sizeof(BPMemory));
-    bpMem->bpMask = 0x00FFFFFF;
+	memset(bpMem, 0, sizeof(BPMemory));
+	bpMem->bpMask = 0x00FFFFFF;
 }
 
 BPCmd DecodeBPCmd(u32 value, const BPMemory &bpMem)
 {
-    //handle the mask register
+	//handle the mask register
 	int opcode = value >> 24;
 	int oldval = ((u32*)&bpMem)[opcode];
 	int newval = (oldval & ~bpMem.bpMask) | (value & bpMem.bpMask);
@@ -71,7 +58,7 @@ BPCmd DecodeBPCmd(u32 value, const BPMemory &bpMem)
 
 	BPCmd bp = {opcode, changes, newval};
 
-    return bp;
+	return bp;
 }
 
 void LoadBPReg(const BPCmd &bp, BPMemory &bpMem)
@@ -152,23 +139,23 @@ void CalculateVertexElementSizes(int sizes[], int vatIndex, const CPMemory &cpMe
 	const TVtxDesc &vtxDesc = cpMem.vtxDesc;
 	const VAT &vtxAttr = cpMem.vtxAttr[vatIndex];
 
-    // Colors
+	// Colors
 	const u32 colDesc[2] = {vtxDesc.Color0, vtxDesc.Color1};
 	const u32 colComp[2] = {vtxAttr.g0.Color0Comp, vtxAttr.g0.Color1Comp};
-	
-    const u32 tcElements[8] =
-	{
-        vtxAttr.g0.Tex0CoordElements, vtxAttr.g1.Tex1CoordElements, vtxAttr.g1.Tex2CoordElements, 
-        vtxAttr.g1.Tex3CoordElements, vtxAttr.g1.Tex4CoordElements, vtxAttr.g2.Tex5CoordElements,
-        vtxAttr.g2.Tex6CoordElements, vtxAttr.g2.Tex7CoordElements
-    };
 
-    const u32 tcFormat[8] =
+	const u32 tcElements[8] =
 	{
-        vtxAttr.g0.Tex0CoordFormat, vtxAttr.g1.Tex1CoordFormat, vtxAttr.g1.Tex2CoordFormat, 
-        vtxAttr.g1.Tex3CoordFormat, vtxAttr.g1.Tex4CoordFormat, vtxAttr.g2.Tex5CoordFormat,
-        vtxAttr.g2.Tex6CoordFormat, vtxAttr.g2.Tex7CoordFormat
-    };
+		vtxAttr.g0.Tex0CoordElements, vtxAttr.g1.Tex1CoordElements, vtxAttr.g1.Tex2CoordElements, 
+		vtxAttr.g1.Tex3CoordElements, vtxAttr.g1.Tex4CoordElements, vtxAttr.g2.Tex5CoordElements,
+		vtxAttr.g2.Tex6CoordElements, vtxAttr.g2.Tex7CoordElements
+	};
+
+	const u32 tcFormat[8] =
+	{
+		vtxAttr.g0.Tex0CoordFormat, vtxAttr.g1.Tex1CoordFormat, vtxAttr.g1.Tex2CoordFormat, 
+		vtxAttr.g1.Tex3CoordFormat, vtxAttr.g1.Tex4CoordFormat, vtxAttr.g2.Tex5CoordFormat,
+		vtxAttr.g2.Tex6CoordFormat, vtxAttr.g2.Tex7CoordFormat
+	};
 
 	// Add position and texture matrix indices
 	u64 vtxDescHex = cpMem.vtxDesc.Hex;
@@ -178,14 +165,14 @@ void CalculateVertexElementSizes(int sizes[], int vatIndex, const CPMemory &cpMe
 		vtxDescHex >>= 1;
 	}
 
-    // Position
+	// Position
 	sizes[9] = VertexLoader_Position::GetSize(vtxDesc.Position, vtxAttr.g0.PosFormat, vtxAttr.g0.PosElements);
 
 	// Normals
 	if (vtxDesc.Normal != NOT_PRESENT)
 	{
 		sizes[10] = VertexLoader_Normal::GetSize(vtxDesc.Normal, vtxAttr.g0.NormalFormat, vtxAttr.g0.NormalElements, vtxAttr.g0.NormalIndex3);		
-    }
+	}
 	else
 	{
 		sizes[10] = 0;
@@ -212,11 +199,11 @@ void CalculateVertexElementSizes(int sizes[], int vatIndex, const CPMemory &cpMe
 			default: _assert_(0); break;
 			}
 			break;
-		case INDEX8:	
-			size = 1;			
+		case INDEX8:
+			size = 1;
 			break;
 		case INDEX16:
-			size = 2;			
+			size = 2;
 			break;
 		}
 
@@ -229,7 +216,7 @@ void CalculateVertexElementSizes(int sizes[], int vatIndex, const CPMemory &cpMe
 	{
 		sizes[13 + i] = VertexLoader_TextCoord::GetSize(vtxDescHex & 3, tcFormat[i], tcElements[i]);
 		vtxDescHex >>= 2;
-    }
+	}
 }
 
 }
diff --git a/Source/Core/Core/Src/FifoPlayer/FifoAnalyzer.h b/Source/Core/Core/Src/FifoPlayer/FifoAnalyzer.h
index ba2051f848..fea45007b8 100644
--- a/Source/Core/Core/Src/FifoPlayer/FifoAnalyzer.h
+++ b/Source/Core/Core/Src/FifoPlayer/FifoAnalyzer.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _FIFOANALYZER_H
 #define _FIFOANALYZER_H
diff --git a/Source/Core/Core/Src/FifoPlayer/FifoDataFile.cpp b/Source/Core/Core/Src/FifoPlayer/FifoDataFile.cpp
index cf252f5f82..ebf19a07f8 100644
--- a/Source/Core/Core/Src/FifoPlayer/FifoDataFile.cpp
+++ b/Source/Core/Core/Src/FifoPlayer/FifoDataFile.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "FifoDataFile.h"
 #include "FifoFileStruct.h"
@@ -38,7 +25,7 @@ FifoDataFile::~FifoDataFile()
 			delete []frame.memoryUpdates[i].data;
 
 		delete []frame.fifoData;
-	}		
+	}
 }
 
 void FifoDataFile::SetIsWii(bool isWii)
diff --git a/Source/Core/Core/Src/FifoPlayer/FifoDataFile.h b/Source/Core/Core/Src/FifoPlayer/FifoDataFile.h
index d1ae9ee886..d13568a21b 100644
--- a/Source/Core/Core/Src/FifoPlayer/FifoDataFile.h
+++ b/Source/Core/Core/Src/FifoPlayer/FifoDataFile.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _FIFODATAFILE_H_
 #define _FIFODATAFILE_H_
diff --git a/Source/Core/Core/Src/FifoPlayer/FifoFileStruct.h b/Source/Core/Core/Src/FifoPlayer/FifoFileStruct.h
index 97e84e7660..0e606cc465 100644
--- a/Source/Core/Core/Src/FifoPlayer/FifoFileStruct.h
+++ b/Source/Core/Core/Src/FifoPlayer/FifoFileStruct.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _FIFOFILESTRUCT_H_
 #define _FIFOFILESTRUCT_H_
@@ -37,8 +24,8 @@ union FileHeader
 	struct 
 	{
 		u32 fileId;
-		u32 file_version;		
-		u32 min_loader_version;		
+		u32 file_version;
+		u32 min_loader_version;
 		u64 bpMemOffset;
 		u32 bpMemSize;
 		u64 cpMemOffset;
diff --git a/Source/Core/Core/Src/FifoPlayer/FifoPlaybackAnalyzer.cpp b/Source/Core/Core/Src/FifoPlayer/FifoPlaybackAnalyzer.cpp
index a8ba627019..1ea80c8699 100644
--- a/Source/Core/Core/Src/FifoPlayer/FifoPlaybackAnalyzer.cpp
+++ b/Source/Core/Core/Src/FifoPlayer/FifoPlaybackAnalyzer.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "FifoAnalyzer.h"
 #include "FifoDataFile.h"
@@ -57,7 +44,7 @@ void FifoPlaybackAnalyzer::AnalyzeFrames(FifoDataFile *file, std::vector<Analyze
 		FifoAnalyzer::LoadCPReg(0x70 + i, cpMem[0x70 + i], m_CpMem);
 		FifoAnalyzer::LoadCPReg(0x80 + i, cpMem[0x80 + i], m_CpMem);
 		FifoAnalyzer::LoadCPReg(0x90 + i, cpMem[0x90 + i], m_CpMem);
-	}	
+	}
 	
 	frameInfo.clear();
 	frameInfo.resize(file->GetFrameCount());
@@ -77,12 +64,12 @@ void FifoPlaybackAnalyzer::AnalyzeFrames(FifoDataFile *file, std::vector<Analyze
 
 		while (cmdStart < frame.fifoDataSize)
 		{
-			// Add memory updates that have occured before this point in the frame
+			// Add memory updates that have occurred before this point in the frame
 			while (nextMemUpdate < frame.memoryUpdates.size() && frame.memoryUpdates[nextMemUpdate].fifoPosition <= cmdStart)
 			{
 				AddMemoryUpdate(frame.memoryUpdates[nextMemUpdate], analyzed);
 				++nextMemUpdate;
-			}			
+			}
 
 			bool wasDrawing = m_DrawingObject;
 
@@ -112,7 +99,7 @@ void FifoPlaybackAnalyzer::AnalyzeFrames(FifoDataFile *file, std::vector<Analyze
 					analyzed.objectStarts.push_back(cmdStart);
 				else
 					analyzed.objectEnds.push_back(cmdStart);
-			}		
+			}
 
 			cmdStart += cmdSize;
 		}
@@ -149,7 +136,7 @@ void FifoPlaybackAnalyzer::AddMemoryUpdate(MemoryUpdate memUpdate, AnalyzedFrame
 				u32 bytesToRangeEnd = range.end - memUpdate.address;
 				memUpdate.data += bytesToRangeEnd;
 				memUpdate.size = postSize;
-				memUpdate.address = range.end;				
+				memUpdate.address = range.end;
 			}
 			else if (preSize > 0)
 			{
@@ -172,50 +159,50 @@ u32 FifoPlaybackAnalyzer::DecodeCommand(u8 *data)
 
 	int cmd = ReadFifo8(data);
 
-    switch(cmd)
-    {
-    case GX_NOP:
+	switch(cmd)
+	{
+	case GX_NOP:
 	case 0x44:
 	case GX_CMD_INVL_VC:
-        break;
+		break;
 
-    case GX_LOAD_CP_REG:
-        {
-            m_DrawingObject = false;
+	case GX_LOAD_CP_REG:
+		{
+			m_DrawingObject = false;
 
 			u32 cmd2 = ReadFifo8(data);
 			u32 value = ReadFifo32(data);
-			FifoAnalyzer::LoadCPReg(cmd2, value, m_CpMem);	
-        }
-        break;
+			FifoAnalyzer::LoadCPReg(cmd2, value, m_CpMem);
+		}
+		break;
 
-    case GX_LOAD_XF_REG:
-        {
-            m_DrawingObject = false;
+	case GX_LOAD_XF_REG:
+		{
+			m_DrawingObject = false;
 
 			u32 cmd2 = ReadFifo32(data);
-            u8 streamSize = ((cmd2 >> 16) & 15) + 1;
+			u8 streamSize = ((cmd2 >> 16) & 15) + 1;
 
-			data += streamSize * 4;			
-        }
-        break;
+			data += streamSize * 4;
+		}
+		break;
 
-    case GX_LOAD_INDX_A:
-    case GX_LOAD_INDX_B:
-    case GX_LOAD_INDX_C:
-    case GX_LOAD_INDX_D:		
+	case GX_LOAD_INDX_A:
+	case GX_LOAD_INDX_B:
+	case GX_LOAD_INDX_C:
+	case GX_LOAD_INDX_D:
 		m_DrawingObject = false;
-		data += 4;		
-        break;
+		data += 4;
+		break;
 
-    case GX_CMD_CALL_DL:
+	case GX_CMD_CALL_DL:
 		// The recorder should have expanded display lists into the fifo stream and skipped the call to start them
 		// That is done to make it easier to track where memory is updated
 		_assert_(false);
 		data += 8;
-        break;
+		break;
 
-    case GX_LOAD_BP_REG:
+	case GX_LOAD_BP_REG:
 		{
 			m_DrawingObject = false;
 
@@ -227,11 +214,11 @@ u32 FifoPlaybackAnalyzer::DecodeCommand(u8 *data)
 			if (bp.address == BPMEM_TRIGGER_EFB_COPY)
 				StoreEfbCopyRegion();
 		}
-        break;
+		break;
 
-    default:
-        if (cmd & 0x80)
-        {
+	default:
+		if (cmd & 0x80)
+		{
 			m_DrawingObject = true;
 
 			u32 vtxAttrGroup = cmd & GX_VAT_MASK;
@@ -239,15 +226,15 @@ u32 FifoPlaybackAnalyzer::DecodeCommand(u8 *data)
 
 			u16 streamSize = ReadFifo16(data);
 
-			data += streamSize * vertexSize;			
-        }
-        else
-        {
-            PanicAlert("FifoPlayer: Unknown Opcode (0x%x).\nAborting frame analysis.\n", cmd);            
-            return 0;
-        }
-        break;
-    }
+			data += streamSize * vertexSize;
+		}
+		else
+		{
+			PanicAlert("FifoPlayer: Unknown Opcode (0x%x).\nAborting frame analysis.\n", cmd);
+			return 0;
+		}
+		break;
+	}
 
 	return data - dataStart;
 }
@@ -326,8 +313,8 @@ void FifoPlaybackAnalyzer::StoreWrittenRegion(u32 address, u32 size)
 				used.end = std::max(used.end, range.end);
 
 				// Remove this entry
-				iter = m_WrittenMemory.erase(iter);				
-			}			
+				iter = m_WrittenMemory.erase(iter);
+			}
 		}
 		else
 		{
diff --git a/Source/Core/Core/Src/FifoPlayer/FifoPlaybackAnalyzer.h b/Source/Core/Core/Src/FifoPlayer/FifoPlaybackAnalyzer.h
index 7e345dd7f7..f6df506947 100644
--- a/Source/Core/Core/Src/FifoPlayer/FifoPlaybackAnalyzer.h
+++ b/Source/Core/Core/Src/FifoPlayer/FifoPlaybackAnalyzer.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _FIFOPLAYBACKANALYZER_H_
 #define _FIFOPLAYBACKANALYZER_H_
@@ -43,7 +30,7 @@ private:
 	{
 		u32 begin;
 		u32 end;
-	};	
+	};
 
 	void AddMemoryUpdate(MemoryUpdate memUpdate, AnalyzedFrameInfo &frameInfo);
 	
@@ -58,7 +45,7 @@ private:
 	std::vector<MemoryRange> m_WrittenMemory;
 
 	BPMemory m_BpMem;
-	FifoAnalyzer::CPMemory m_CpMem;	
+	FifoAnalyzer::CPMemory m_CpMem;
 };
 
 #endif
diff --git a/Source/Core/Core/Src/FifoPlayer/FifoPlayer.cpp b/Source/Core/Core/Src/FifoPlayer/FifoPlayer.cpp
index ff90736fec..45455683be 100644
--- a/Source/Core/Core/Src/FifoPlayer/FifoPlayer.cpp
+++ b/Source/Core/Core/Src/FifoPlayer/FifoPlayer.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "FifoDataFile.h"
 #include "FifoPlayer.h"
@@ -194,7 +181,7 @@ void FifoPlayer::WriteFrame(const FifoFrameInfo &frame, const AnalyzedFrameInfo
 			WriteFramePart(position, info.objectStarts[objectNum], memoryUpdate, frame, info);
 
 			position = info.objectEnds[objectNum];
-			++objectNum;		
+			++objectNum;
 		}
 
 		// Write objects in draw range
@@ -290,7 +277,7 @@ void FifoPlayer::WriteFifo(u8 *data, u32 start, u32 end)
 		u32 burstEnd = std::min(written + 255, lastBurstEnd);
 
 		while (written < burstEnd)
-			GPFifo::FastWrite8(data[written++]);			
+			GPFifo::FastWrite8(data[written++]);
 
 		GPFifo::Write8(data[written++], 0);
 
diff --git a/Source/Core/Core/Src/FifoPlayer/FifoPlayer.h b/Source/Core/Core/Src/FifoPlayer/FifoPlayer.h
index 9db6c0d980..5d23e109f8 100644
--- a/Source/Core/Core/Src/FifoPlayer/FifoPlayer.h
+++ b/Source/Core/Core/Src/FifoPlayer/FifoPlayer.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _FIFOPLAYER_H_
 #define _FIFOPLAYER_H_
diff --git a/Source/Core/Core/Src/FifoPlayer/FifoRecordAnalyzer.cpp b/Source/Core/Core/Src/FifoPlayer/FifoRecordAnalyzer.cpp
index dd94295859..293e062b2c 100644
--- a/Source/Core/Core/Src/FifoPlayer/FifoRecordAnalyzer.cpp
+++ b/Source/Core/Core/Src/FifoPlayer/FifoRecordAnalyzer.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "FifoAnalyzer.h"
 #include "FifoRecordAnalyzer.h"
@@ -63,7 +50,7 @@ void FifoRecordAnalyzer::DecodeOpcode(u8 *data)
 	case GX_NOP:
 	case 0x44:
 	case GX_CMD_INVL_VC:
-        break;
+		break;
 
 	case GX_LOAD_CP_REG:
 		{
@@ -84,28 +71,28 @@ void FifoRecordAnalyzer::DecodeOpcode(u8 *data)
 		m_DrawingObject = false;
 		ProcessLoadIndexedXf(ReadFifo32(data), 0xc);
 		break;
-    case GX_LOAD_INDX_B:
+	case GX_LOAD_INDX_B:
 		m_DrawingObject = false;
 		ProcessLoadIndexedXf(ReadFifo32(data), 0xd);
 		break;
-    case GX_LOAD_INDX_C:
+	case GX_LOAD_INDX_C:
 		m_DrawingObject = false;
 		ProcessLoadIndexedXf(ReadFifo32(data), 0xe);
 		break;
-    case GX_LOAD_INDX_D:
+	case GX_LOAD_INDX_D:
 		m_DrawingObject = false;
 		ProcessLoadIndexedXf(ReadFifo32(data), 0xf);
-        break;
+		break;
 
-    case GX_CMD_CALL_DL:
+	case GX_CMD_CALL_DL:
 		{
 			// The recorder should have expanded display lists into the fifo stream and skipped the call to start them
 			// That is done to make it easier to track where memory is updated
 			_assert_(false);
 		}
-        break;
+		break;
 
-    case GX_LOAD_BP_REG:
+	case GX_LOAD_BP_REG:
 		{
 			m_DrawingObject = false;
 
@@ -117,10 +104,10 @@ void FifoRecordAnalyzer::DecodeOpcode(u8 *data)
 			if (bp.address == BPMEM_PRELOAD_MODE)
 				ProcessPreloadTexture();
 		}
-        break;
+		break;
 
-    default:
-        if (cmd & 0x80)
+	default:
+		if (cmd & 0x80)
 		{
 			if (!m_DrawingObject)
 			{
@@ -131,9 +118,9 @@ void FifoRecordAnalyzer::DecodeOpcode(u8 *data)
 			ProcessVertexArrays(data, cmd & GX_VAT_MASK);
 		}
 		else
-        {
-            PanicAlert("FifoRecordAnalyzer: Unknown Opcode (0x%x).\n", cmd);
-        }
+		{
+			PanicAlert("FifoRecordAnalyzer: Unknown Opcode (0x%x).\n", cmd);
+		}
 	}
 }
 
@@ -160,7 +147,7 @@ void FifoRecordAnalyzer::ProcessPreloadTexture()
 void FifoRecordAnalyzer::ProcessLoadIndexedXf(u32 val, int array)
 {
 	int index = val >> 16;
-    int size = ((val >> 12) & 0xF) + 1;
+	int size = ((val >> 12) & 0xF) + 1;
 
 	u32 address = m_CpMem.arrayBases[array] + m_CpMem.arrayStrides[array] * index;
 
@@ -216,7 +203,7 @@ void FifoRecordAnalyzer::WriteVertexArray(int arrayIndex, u8 *vertexData, int ve
 				if (index > maxIndex)
 					maxIndex = index;
 			}
-		}		
+		}
 	}
 	else
 	{
@@ -257,8 +244,8 @@ void FifoRecordAnalyzer::ProcessTexMaps()
 	{
 		int stageNum2 = i >> 1;
 		int stageOdd = i & 1;
-        TwoTevStageOrders &order = m_BpMem->tevorders[stageNum2];
-        int texMap = order.getTexMap(stageOdd);
+		TwoTevStageOrders &order = m_BpMem->tevorders[stageNum2];
+		int texMap = order.getTexMap(stageOdd);
 
 		if (order.getEnable(stageOdd))
 			WriteTexMapMemory(texMap, writtenTexMaps);
@@ -301,7 +288,7 @@ void FifoRecordAnalyzer::WriteTexMapMemory(int texMap, u32 &writtenTexMaps)
 	while (mip)
 	{
 		width >>= 1;
-		height >>= 1;		
+		height >>= 1;
 
 		width = max(width, fmtWidth);
 		height = max(height, fmtHeight);
diff --git a/Source/Core/Core/Src/FifoPlayer/FifoRecordAnalyzer.h b/Source/Core/Core/Src/FifoPlayer/FifoRecordAnalyzer.h
index 8ef3360ce7..94e53b17ed 100644
--- a/Source/Core/Core/Src/FifoPlayer/FifoRecordAnalyzer.h
+++ b/Source/Core/Core/Src/FifoPlayer/FifoRecordAnalyzer.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _FIFORECORDANALYZER_H_
 #define _FIFORECORDANALYZER_H_
diff --git a/Source/Core/Core/Src/FifoPlayer/FifoRecorder.cpp b/Source/Core/Core/Src/FifoPlayer/FifoRecorder.cpp
index b369823c3d..5f3861fd66 100644
--- a/Source/Core/Core/Src/FifoPlayer/FifoRecorder.cpp
+++ b/Source/Core/Core/Src/FifoPlayer/FifoRecorder.cpp
@@ -1,16 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "ConfigManager.h"
 #include "Core.h"
@@ -182,11 +172,11 @@ void FifoRecorder::EndFrame(u32 fifoStart, u32 fifoEnd)
 
 		m_FifoData.reserve(1024 * 1024 * 4);
 		m_FifoData.clear();
-	}	
+	}
 
 	if (m_RequestedRecordingEnd)
 	{
-		// Skip data after the next time WriteFifoData is called		
+		// Skip data after the next time WriteFifoData is called
 		m_SkipFutureData = true;
 		// Signal video backend that it should not call this function when the next frame ends
 		m_IsRecording = false;
diff --git a/Source/Core/Core/Src/FifoPlayer/FifoRecorder.h b/Source/Core/Core/Src/FifoPlayer/FifoRecorder.h
index a07ba1fd15..7641a9d7f1 100644
--- a/Source/Core/Core/Src/FifoPlayer/FifoRecorder.h
+++ b/Source/Core/Core/Src/FifoPlayer/FifoRecorder.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _FIFORECORDER_H_
 #define _FIFORECORDER_H_
@@ -43,7 +30,7 @@ public:
 	
 	void EndFrame(u32 fifoStart, u32 fifoEnd);
 
-	// This function must be called before writting GP commands
+	// This function must be called before writing GP commands
 	// bpMem must point to the actual bp mem array used by the plugin because it will be read as fifo data is recorded
 	void SetVideoMemory(u32 *bpMem, u32 *cpMem, u32 *xfMem, u32 *xfRegs, u32 xfRegsSize);
 
diff --git a/Source/Core/Core/Src/GeckoCode.cpp b/Source/Core/Core/Src/GeckoCode.cpp
index a42f6629ad..f93bbd1b4c 100644
--- a/Source/Core/Core/Src/GeckoCode.cpp
+++ b/Source/Core/Core/Src/GeckoCode.cpp
@@ -1,16 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "GeckoCode.h"
 
@@ -28,14 +18,14 @@ namespace Gecko
 enum
 {
 	// Code Types
-	CODETYPE_WRITE_FILL =	0x0,
-	CODETYPE_IF =			0x1,
-	CODETYPE_BA_PO_OPS =	0x2,
-	CODETYPE_FLOW_CONTROL =	0x3,
-	CODETYPE_REGISTER_OPS =	0x4,
-	CODETYPE_SPECIAL_IF =	0x5,
+	CODETYPE_WRITE_FILL =		0x0,
+	CODETYPE_IF =				0x1,
+	CODETYPE_BA_PO_OPS =		0x2,
+	CODETYPE_FLOW_CONTROL =		0x3,
+	CODETYPE_REGISTER_OPS =		0x4,
+	CODETYPE_SPECIAL_IF =		0x5,
 	CODETYPE_ASM_SWITCH_RANGE =	0x6,
-	CODETYPE_END_CODES =	0x7,
+	CODETYPE_END_CODES =		0x7,
 
 	// Data Types
 	DATATYPE_8BIT =		0x0,
@@ -104,12 +94,14 @@ void SetActiveCodes(const std::vector<GeckoCode>& gcodes)
 		gcodes_iter = gcodes.begin(),
 		gcodes_end = gcodes.end();
 	for (; gcodes_iter!=gcodes_end; ++gcodes_iter)
+	{
 		if (gcodes_iter->enabled)
 		{
 			// TODO: apply modifiers
 			// TODO: don't need description or creator string, just takin up memory
 			active_codes.push_back(*gcodes_iter);
 		}
+	}
 
 	inserted_asm_codes.clear();
 
@@ -289,7 +281,8 @@ void RunCodeHandler()
 	}
 }
 
-const std::map<u32, std::vector<u32> >& GetInsertedAsmCodes() {
+const std::map<u32, std::vector<u32> >& GetInsertedAsmCodes()
+{
 	return inserted_asm_codes;
 }
 
@@ -365,7 +358,7 @@ bool RamWriteAndFill()
 		const u8 data_type = current_code->address >> 28;
 		const u32 data_inc = current_code->data;	// amount to increment the data
 		const u16 addr_inc = (u16)current_code->address;	// amount to increment the address
-		count =	((current_code->address >> 16) & 0xFFF) + 1;	// count is different from the other subtypes, note: +1
+		count = ((current_code->address >> 16) & 0xFFF) + 1;	// count is different from the other subtypes, note: +1
 		while (count--)
 		{
 			// switch inside the loop, :/ o well
@@ -470,7 +463,7 @@ bool RegularIf()
 			// CST7 : 16bits (endif, then) If lower
 		case 0x3 :
 			result = (read_value < data_value);
-			break;	
+			break;
 		}
 	}
 
@@ -591,7 +584,9 @@ bool FlowControl()
 				current_code = target_code - 1;
 			}
 			else
+			{
 				return false;	// trying to GOTO to bad address
+			}
 		}
 		break;
 
@@ -608,7 +603,9 @@ bool FlowControl()
 				current_code = target_code - 1;
 			}
 			else
+			{
 				return false;	// trying to GOSUB to bad address
+			}
 		}
 		break;
 
@@ -919,14 +916,14 @@ bool SpecialIf()
 
 // CT6 ASM Codes, On/Off switch and Address Range Check
 // NOT COMPLETE, asm stuff not started
-// fix the uglyness
+// TODO: Fix the ugliness
 bool AsmSwitchRange()
 {
 	// the switch subtype modifies the code :/
 	GeckoCode::Code& code = *current_code;
 
 	// only run if code_execution is set or this code is a switch or rangecheck subtype
-	// the switch and rangecheck run if exectution_counter is 1 (directly inside the failed if) if they are an endif
+	// the switch and rangecheck run if execution_counter is 1 (directly inside the failed if) if they are an endif
 	if (false == CodeExecution())
 	{
 		if (code.subtype < 0x6)
@@ -965,7 +962,7 @@ bool AsmSwitchRange()
 			}
 
 			// Though the next code starts at current_code+number_of_codes+1,
-			// we add only number_of_codes. It is because the for statemet in
+			// we add only number_of_codes. It is because the for statement in
 			// RunGeckoCode() increments current_code.
 			current_code += number_of_codes;
 
diff --git a/Source/Core/Core/Src/GeckoCode.h b/Source/Core/Core/Src/GeckoCode.h
index d9a53dcfc3..42ac941523 100644
--- a/Source/Core/Core/Src/GeckoCode.h
+++ b/Source/Core/Core/Src/GeckoCode.h
@@ -1,16 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef __GECKOCODE_h__
 #define __GECKOCODE_h__
diff --git a/Source/Core/Core/Src/GeckoCodeConfig.cpp b/Source/Core/Core/Src/GeckoCodeConfig.cpp
index 10c2068e3e..6d5b1f782f 100644
--- a/Source/Core/Core/Src/GeckoCodeConfig.cpp
+++ b/Source/Core/Core/Src/GeckoCodeConfig.cpp
@@ -1,16 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "GeckoCodeConfig.h"
 
@@ -55,7 +45,7 @@ void LoadCodes(const IniFile& inifile, std::vector<GeckoCode>& gcodes)
 			gcode.enabled = (1 == ss.tellg());	// silly
 			ss.seekg(1, std::ios_base::cur);
 			// read the code name
-			std::getline(ss, gcode.name, '[');	// stop at [ character (begining of contributer name)
+			std::getline(ss, gcode.name, '[');	// stop at [ character (beginning of contributor name)
 			gcode.name = StripSpaces(gcode.name);
 			// read the code creator name
 			std::getline(ss, gcode.creator, ']');
diff --git a/Source/Core/Core/Src/GeckoCodeConfig.h b/Source/Core/Core/Src/GeckoCodeConfig.h
index 0ae630f784..1b3d5e5bf9 100644
--- a/Source/Core/Core/Src/GeckoCodeConfig.h
+++ b/Source/Core/Core/Src/GeckoCodeConfig.h
@@ -1,16 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef __GECKOCODECONFIG_h__
 #define __GECKOCODECONFIG_h__
diff --git a/Source/Core/Core/Src/HLE/HLE.cpp b/Source/Core/Core/Src/HLE/HLE.cpp
index ae25060c64..852cb756bf 100644
--- a/Source/Core/Core/Src/HLE/HLE.cpp
+++ b/Source/Core/Core/Src/HLE/HLE.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "Common.h"
 
diff --git a/Source/Core/Core/Src/HLE/HLE.h b/Source/Core/Core/Src/HLE/HLE.h
index 9318d34197..32b79268b7 100644
--- a/Source/Core/Core/Src/HLE/HLE.h
+++ b/Source/Core/Core/Src/HLE/HLE.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _HLE_H
 #define _HLE_H
@@ -25,18 +12,18 @@ 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
+		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
+		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();
diff --git a/Source/Core/Core/Src/HLE/HLE_Misc.cpp b/Source/Core/Core/Src/HLE/HLE_Misc.cpp
index 7e23798df1..a37fc44a97 100644
--- a/Source/Core/Core/Src/HLE/HLE_Misc.cpp
+++ b/Source/Core/Core/Src/HLE/HLE_Misc.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include <cmath>
 #include "Common.h"
@@ -59,33 +46,33 @@ inline void FW(u32 addr, float x)
 // According to the PPC ABI, the return value is always in r3.
 void UnimplementedFunction()
 {
-    NPC = LR;
+	NPC = LR;
 }
 
 void UnimplementedFunctionTrue()
 {
-    GPR(3) = 1;
-    NPC = LR;
+	GPR(3) = 1;
+	NPC = LR;
 }
 
 void UnimplementedFunctionFalse()
 {
-    GPR(3) = 0;
-    NPC = LR;
+	GPR(3) = 0;
+	NPC = LR;
 }
 
 void GXPeekZ()
 {
 	// Just some fake Z value.
-    Memory::Write_U32(0xFFFFFF, GPR(5));
-    NPC = LR;
+	Memory::Write_U32(0xFFFFFF, GPR(5));
+	NPC = LR;
 }
 
 void GXPeekARGB()
 {
 	// Just some fake color value.
-    Memory::Write_U32(0xFFFFFFFF, GPR(5));
-    NPC = LR;
+	Memory::Write_U32(0xFFFFFFFF, GPR(5));
+	NPC = LR;
 }
 
 // If you want a function to panic, you can rename it PanicAlert :p
@@ -116,7 +103,7 @@ void SMB_EvilVecCosine()
 	float dot = x1*x2 + y1*y2 + z1*z2;
 
 	rPS0(1) = dot / sqrtf(s1 * s2);
-    NPC = LR;
+	NPC = LR;
 }
 
 // Normalizes the vector pointed at by r3.
@@ -130,7 +117,7 @@ void SMB_EvilNormalize()
 	float inv_len;
 	if (len <= 0)
 		inv_len = 0;
-	else 
+	else
 		inv_len = 1.0f / sqrtf(len);
 	x *= inv_len;
 	y *= inv_len;
diff --git a/Source/Core/Core/Src/HLE/HLE_Misc.h b/Source/Core/Core/Src/HLE/HLE_Misc.h
index d0d098835f..e83805d23a 100644
--- a/Source/Core/Core/Src/HLE/HLE_Misc.h
+++ b/Source/Core/Core/Src/HLE/HLE_Misc.h
@@ -1,38 +1,25 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef HLE_MISC_H
 #define HLE_MISC_H
 
 namespace HLE_Misc
 {
-    void Pass();
-    void HLEPanicAlert();
-    void UnimplementedFunction();
-    void UnimplementedFunctionTrue();
-    void UnimplementedFunctionFalse();
-    void GXPeekZ();
-    void GXPeekARGB();
-    void SMB_EvilVecCosine();
-    void SMB_EvilNormalize();
-    void SMB_sqrt_internal();
-    void SMB_rsqrt_internal();
-    void SMB_atan2();
-    void SMB_evil_vec_setlength();
+	void Pass();
+	void HLEPanicAlert();
+	void UnimplementedFunction();
+	void UnimplementedFunctionTrue();
+	void UnimplementedFunctionFalse();
+	void GXPeekZ();
+	void GXPeekARGB();
+	void SMB_EvilVecCosine();
+	void SMB_EvilNormalize();
+	void SMB_sqrt_internal();
+	void SMB_rsqrt_internal();
+	void SMB_atan2();
+	void SMB_evil_vec_setlength();
 	void FZero_kill_infinites();
 	void FZero_evil_vec_normalize();
 	void FZ_sqrt();
diff --git a/Source/Core/Core/Src/HLE/HLE_OS.cpp b/Source/Core/Core/Src/HLE/HLE_OS.cpp
index 3ced001268..3b2e7a1533 100644
--- a/Source/Core/Core/Src/HLE/HLE_OS.cpp
+++ b/Source/Core/Core/Src/HLE/HLE_OS.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "StringUtil.h"
 #include <string>
diff --git a/Source/Core/Core/Src/HLE/HLE_OS.h b/Source/Core/Core/Src/HLE/HLE_OS.h
index 01ed59a667..59e3cf021a 100644
--- a/Source/Core/Core/Src/HLE/HLE_OS.h
+++ b/Source/Core/Core/Src/HLE/HLE_OS.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef HLE_OS_H
 #define HLE_OS_H
@@ -22,9 +9,9 @@
 
 namespace HLE_OS
 {
-    void HLE_GeneralDebugPrint();
+	void HLE_GeneralDebugPrint();
 	void HLE_write_console();
-    void HLE_OSPanic();
+	void HLE_OSPanic();
 }
 
 #endif
diff --git a/Source/Core/Core/Src/HW/AudioInterface.cpp b/Source/Core/Core/Src/HW/AudioInterface.cpp
index 15e1f0bb29..e9ef2eed03 100644
--- a/Source/Core/Core/Src/HW/AudioInterface.cpp
+++ b/Source/Core/Core/Src/HW/AudioInterface.cpp
@@ -12,7 +12,7 @@
 // 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/
 
 /*
@@ -97,7 +97,7 @@ union AICR
 		u32 AIINTVLD	: 1;  // This bit controls whether AIINT is affected by the Interrupt Timing register 
                               // matching the sample counter. Once set, AIINT will hold its last value
 		u32 SCRESET		: 1;  // write to reset counter
-        u32 AIDFR		: 1;  // AID Frequency (0=48khz 1=32khz)
+		u32 AIDFR		: 1;  // AID Frequency (0=48khz 1=32khz)
 		u32				:25;
 	};
 	u32 hex;
@@ -131,8 +131,8 @@ static unsigned int g_AIDSampleRate = 32000;
 
 void DoState(PointerWrap &p)
 {
-	p.Do(m_Control);
-	p.Do(m_Volume);
+	p.DoPOD(m_Control);
+	p.DoPOD(m_Volume);
 	p.Do(m_SampleCounter);
 	p.Do(m_InterruptTiming);
 	p.Do(g_LastCPUTime);
@@ -183,7 +183,7 @@ void Read32(u32& _rReturnValue, const u32 _Address)
 
 	case AI_SAMPLE_COUNTER:
 		Update(0, 0);
-        _rReturnValue = m_SampleCounter;
+		_rReturnValue = m_SampleCounter;
 		break;
 
 	case AI_INTERRUPT_TIMING:
@@ -191,7 +191,7 @@ void Read32(u32& _rReturnValue, const u32 _Address)
 		break;
 
 	default:
-        ERROR_LOG(AUDIO_INTERFACE, "unknown read 0x%08x", _Address);
+		ERROR_LOG(AUDIO_INTERFACE, "Unknown read 0x%08x", _Address);
 		_dbg_assert_msg_(AUDIO_INTERFACE, 0, "AudioInterface - Read from 0x%08x", _Address);
 		_rReturnValue = 0;
 		return;
@@ -210,18 +210,18 @@ void Write32(const u32 _Value, const u32 _Address)
 			m_Control.AIINTMSK	= tmpAICtrl.AIINTMSK;
 			m_Control.AIINTVLD	= tmpAICtrl.AIINTVLD;
 
-            // Set frequency of streaming audio
-            if (tmpAICtrl.AISFR != m_Control.AISFR)
-            {	
-                DEBUG_LOG(AUDIO_INTERFACE, "Change AISFR to %s", tmpAICtrl.AISFR ? "48khz":"32khz");
-                m_Control.AISFR = tmpAICtrl.AISFR;
-            }
+			// Set frequency of streaming audio
+			if (tmpAICtrl.AISFR != m_Control.AISFR)
+			{
+				DEBUG_LOG(AUDIO_INTERFACE, "Change AISFR to %s", tmpAICtrl.AISFR ? "48khz":"32khz");
+				m_Control.AISFR = tmpAICtrl.AISFR;
+			}
 			// Set frequency of DMA
-            if (tmpAICtrl.AIDFR != m_Control.AIDFR)
-            {	
-                DEBUG_LOG(AUDIO_INTERFACE, "Change AIDFR to %s", tmpAICtrl.AIDFR ? "32khz":"48khz");
-                m_Control.AIDFR = tmpAICtrl.AIDFR;
-            }
+			if (tmpAICtrl.AIDFR != m_Control.AIDFR)
+			{
+				DEBUG_LOG(AUDIO_INTERFACE, "Change AIDFR to %s", tmpAICtrl.AIDFR ? "32khz":"48khz");
+				m_Control.AIDFR = tmpAICtrl.AIDFR;
+			}
 
 			g_AISSampleRate = tmpAICtrl.AISFR ? 48000 : 32000;
 			g_AIDSampleRate = tmpAICtrl.AIDFR ? 32000 : 48000;
@@ -229,36 +229,36 @@ void Write32(const u32 _Value, const u32 _Address)
 			g_CPUCyclesPerSample = SystemTimers::GetTicksPerSecond() / g_AISSampleRate;
 
 			// Streaming counter
-            if (tmpAICtrl.PSTAT != m_Control.PSTAT)
-            {
-                DEBUG_LOG(AUDIO_INTERFACE, "%s streaming audio", tmpAICtrl.PSTAT ? "start":"stop");
-                m_Control.PSTAT	= tmpAICtrl.PSTAT;
-                g_LastCPUTime = CoreTiming::GetTicks();
+			if (tmpAICtrl.PSTAT != m_Control.PSTAT)
+			{
+				DEBUG_LOG(AUDIO_INTERFACE, "%s streaming audio", tmpAICtrl.PSTAT ? "start":"stop");
+				m_Control.PSTAT	= tmpAICtrl.PSTAT;
+				g_LastCPUTime = CoreTiming::GetTicks();
 
 				// Tell Drive Interface to start/stop streaming
 				DVDInterface::g_bStream = tmpAICtrl.PSTAT;
 
 				CoreTiming::RemoveEvent(et_AI);
 				CoreTiming::ScheduleEvent(((int)GetAIPeriod() / 2), et_AI);
-            }
+			}
 
-            // AI Interrupt
+			// AI Interrupt
 			if (tmpAICtrl.AIINT)
-            {
-                DEBUG_LOG(AUDIO_INTERFACE, "Clear AIS Interrupt");
-                m_Control.AIINT = 0;
-            }
+			{
+				DEBUG_LOG(AUDIO_INTERFACE, "Clear AIS Interrupt");
+				m_Control.AIINT = 0;
+			}
 
-            // Sample Count Reset
-            if (tmpAICtrl.SCRESET)	
-            {
-                DEBUG_LOG(AUDIO_INTERFACE, "Reset AIS sample counter");
-                m_SampleCounter = 0;
+			// Sample Count Reset
+			if (tmpAICtrl.SCRESET)	
+			{
+				DEBUG_LOG(AUDIO_INTERFACE, "Reset AIS sample counter");
+				m_SampleCounter = 0;
 
-                g_LastCPUTime = CoreTiming::GetTicks();
-            }
+				g_LastCPUTime = CoreTiming::GetTicks();
+			}
 
-            UpdateInterrupts();
+			UpdateInterrupts();
 		}
 		break;
 
@@ -273,7 +273,7 @@ void Write32(const u32 _Value, const u32 _Address)
 		m_SampleCounter = _Value;
 		break;
 
-	case AI_INTERRUPT_TIMING:		
+	case AI_INTERRUPT_TIMING:
 		m_InterruptTiming = _Value;
 		CoreTiming::RemoveEvent(et_AI);
 		CoreTiming::ScheduleEvent(((int)GetAIPeriod() / 2), et_AI);
@@ -281,7 +281,7 @@ void Write32(const u32 _Value, const u32 _Address)
 		break;
 
 	default:
-		ERROR_LOG(AUDIO_INTERFACE, "unknown write %08x @ %08x", _Value, _Address);
+		ERROR_LOG(AUDIO_INTERFACE, "Unknown write %08x @ %08x", _Value, _Address);
 		_dbg_assert_msg_(AUDIO_INTERFACE,0,"AIS - Write %08x to %08x", _Value, _Address);
 		break;
 	}
@@ -294,7 +294,7 @@ static void UpdateInterrupts()
 }
 
 static void GenerateAudioInterrupt()
-{		
+{
 	m_Control.AIINT = 1;
 	UpdateInterrupts();
 }
@@ -315,7 +315,7 @@ void Callback_GetSampleRate(unsigned int &_AISampleRate, unsigned int &_DACSampl
 unsigned int Callback_GetStreaming(short* _pDestBuffer, unsigned int _numSamples, unsigned int _sampleRate)
 {
 	if (m_Control.PSTAT && !CCPU::IsStepping())
-	{		
+	{
 		static int pos = 0;
 		static short pcm[NGCADPCM::SAMPLES_PER_BLOCK*2];
 		const int lvolume = m_Volume.left;
@@ -390,12 +390,12 @@ unsigned int Callback_GetStreaming(short* _pDestBuffer, unsigned int _numSamples
 			else //1:1 no resampling
 			{ 
 				pcm_l = (((int)pcm[pos*2] * lvolume) >> 8) + (int)(*_pDestBuffer);
-				if (pcm_l > 32767)			pcm_l = 32767;
+				if (pcm_l > 32767)		pcm_l = 32767;
 				else if (pcm_l < -32767)	pcm_l = -32767;
 				*_pDestBuffer++ = pcm_l;
 
 				pcm_r = (((int)pcm[pos*2+1] * rvolume) >> 8) + (int)(*_pDestBuffer);
-				if (pcm_r > 32767)			pcm_r = 32767;
+				if (pcm_r > 32767)		pcm_r = 32767;
 				else if (pcm_r < -32767)	pcm_r = -32767;
 				*_pDestBuffer++ = pcm_r;
 				
@@ -443,7 +443,7 @@ static void IncreaseSampleCount(const u32 _iAmount)
 	{
 		m_SampleCounter += _iAmount;
 		if (m_Control.AIINTVLD && (m_SampleCounter >= m_InterruptTiming))
-		{			
+		{
 			GenerateAudioInterrupt();
 		}
 	}
@@ -456,17 +456,17 @@ unsigned int GetAIDSampleRate()
 
 void Update(u64 userdata, int cyclesLate)
 {
-    if (m_Control.PSTAT)
-    {
-        const u64 Diff = CoreTiming::GetTicks() - g_LastCPUTime;
-        if (Diff > g_CPUCyclesPerSample)
-        {            
-            const u32 Samples = static_cast<u32>(Diff / g_CPUCyclesPerSample);
-            g_LastCPUTime += Samples * g_CPUCyclesPerSample;
+	if (m_Control.PSTAT)
+	{
+		const u64 Diff = CoreTiming::GetTicks() - g_LastCPUTime;
+		if (Diff > g_CPUCyclesPerSample)
+		{
+			const u32 Samples = static_cast<u32>(Diff / g_CPUCyclesPerSample);
+			g_LastCPUTime += Samples * g_CPUCyclesPerSample;
 			IncreaseSampleCount(Samples);
-        }
+		}
 		CoreTiming::ScheduleEvent(((int)GetAIPeriod() / 2) - cyclesLate, et_AI);
-    }
+	}
 }
 
 u64 GetAIPeriod()
diff --git a/Source/Core/Core/Src/HW/AudioInterface.h b/Source/Core/Core/Src/HW/AudioInterface.h
index 06fd3aec79..6893cff20f 100644
--- a/Source/Core/Core/Src/HW/AudioInterface.h
+++ b/Source/Core/Core/Src/HW/AudioInterface.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 // See CPP file for comments.
 
@@ -28,7 +15,7 @@ namespace AudioInterface
 {
 
 void Init();
-void Shutdown();	
+void Shutdown();
 void DoState(PointerWrap &p);
 
 void Update(u64 userdata, int cyclesLate);
diff --git a/Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp b/Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp
index 03332d3012..e5d2b7be64 100644
--- a/Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp
+++ b/Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "StringUtil.h"
 #include "../Memmap.h"
diff --git a/Source/Core/Core/Src/HW/CPU.cpp b/Source/Core/Core/Src/HW/CPU.cpp
index 610042c66d..15d1cf12f2 100644
--- a/Source/Core/Core/Src/HW/CPU.cpp
+++ b/Source/Core/Core/Src/HW/CPU.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "Common.h"
 #include "Thread.h"
@@ -78,7 +65,8 @@ reswitch:
 			PowerPC::SingleStep();
 
 			//4: update disasm dialog
-			if (m_SyncEvent) {
+			if (m_SyncEvent)
+			{
 				m_SyncEvent->Set();
 				m_SyncEvent = 0;
 			}
@@ -106,7 +94,7 @@ bool CCPU::IsStepping()
 void CCPU::Reset()
 {
 
-} 
+}
 
 void CCPU::StepOpcode(Common::Event *event) 
 {
@@ -157,6 +145,7 @@ bool CCPU::PauseAndLock(bool doLock, bool unpauseOnUnlock)
 			PowerPC::Start();
 			m_StepEvent.Set();
 		}
+
 		if (!Core::IsCPUThread())
 			m_csCpuOccupied.unlock();
 	}
diff --git a/Source/Core/Core/Src/HW/CPU.h b/Source/Core/Core/Src/HW/CPU.h
index 188ef2ff0f..0b5508a94a 100644
--- a/Source/Core/Core/Src/HW/CPU.h
+++ b/Source/Core/Core/Src/HW/CPU.h
@@ -1,19 +1,7 @@
-// Copyright (C) 2003 Dolphin Project.
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
-// 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 _CPU_H
 #define _CPU_H
 
diff --git a/Source/Core/Core/Src/HW/DSP.cpp b/Source/Core/Core/Src/HW/DSP.cpp
index a9acf6aedc..809128225e 100644
--- a/Source/Core/Core/Src/HW/DSP.cpp
+++ b/Source/Core/Core/Src/HW/DSP.cpp
@@ -1,19 +1,7 @@
-// Copyright (C) 2003 Dolphin Project.
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
-// 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/
 
 // AID / AUDIO_DMA controls pushing audio out to the SRC and then the speakers.
 // The audio DMA pushes audio through a small FIFO 32 bytes at a time, as
@@ -59,7 +47,7 @@ enum
 	DSP_MAIL_FROM_DSP_HI	= 0x5004,
 	DSP_MAIL_FROM_DSP_LO	= 0x5006,
 	DSP_CONTROL				= 0x500A,
-	DSP_INTERRUPT_CONTROL   = 0x5010,
+	DSP_INTERRUPT_CONTROL	= 0x5010,
 	AR_INFO					= 0x5012,  // These names are a good guess at best
 	AR_MODE					= 0x5016,  //
 	AR_REFRESH				= 0x501a,
@@ -128,15 +116,15 @@ struct DSPState
 // Blocks are 32 bytes.
 union UAudioDMAControl
 {
-    u16 Hex;
-    struct  
-    {        
-        u16 NumBlocks  : 15;
+	u16 Hex;
+	struct
+	{
+		u16 NumBlocks  : 15;
 		u16 Enable     : 1;
-    };
+	};
 
-    UAudioDMAControl(u16 _Hex = 0) : Hex(_Hex)
-    {}
+	UAudioDMAControl(u16 _Hex = 0) : Hex(_Hex)
+	{}
 };
 
 // AudioDMA
@@ -160,7 +148,7 @@ struct AudioDMA
 struct ARAM_DMA
 {
 	u32 MMAddr;
-	u32 ARAddr;		
+	u32 ARAddr;
 	UARAMCount Cnt;
 
 	ARAM_DMA()
@@ -180,7 +168,8 @@ struct ARAMInfo
 	u8* ptr; // aka audio ram, auxiliary ram, MEM2, EXRAM, etc...
 
 	// Default to GC mode
-	ARAMInfo() {
+	ARAMInfo()
+	{
 		wii_mode = false;
 		size = ARAM_SIZE;
 		mask = ARAM_MASK;
@@ -223,9 +212,9 @@ void DoState(PointerWrap &p)
 {
 	if (!g_ARAM.wii_mode)
 		p.DoArray(g_ARAM.ptr, g_ARAM.size);
-	p.Do(g_dspState);
-	p.Do(g_audioDMA);
-	p.Do(g_arDMA);
+	p.DoPOD(g_dspState);
+	p.DoPOD(g_audioDMA);
+	p.DoPOD(g_arDMA);
 	p.Do(g_ARAM_Info);
 	p.Do(g_AR_MODE);
 	p.Do(g_AR_REFRESH);
@@ -278,8 +267,8 @@ void Init(bool hle)
 	memset(&g_arDMA, 0, sizeof(g_arDMA));
 
 	g_dspState.DSPControl.Hex = 0;
-    g_dspState.DSPControl.DSPHalt = 1;
-	
+	g_dspState.DSPControl.DSPHalt = 1;
+
 	g_ARAM_Info.Hex = 0;
 	g_AR_MODE = 1; // ARAM Controller has init'd
 	g_AR_REFRESH = 156; // 156MHz
@@ -334,7 +323,7 @@ void Read16(u16& _uReturnValue, const u32 _iAddress)
 
 		// ARAM
 	case AR_INFO:
-		//PanicAlert("read %x %x", g_ARAM_Info.Hex,PowerPC::ppcState.pc);
+		//PanicAlert("Read %x %x", g_ARAM_Info.Hex,PowerPC::ppcState.pc);
 		_uReturnValue = g_ARAM_Info.Hex;
 		break;
 
@@ -424,7 +413,7 @@ void Write16(const u16 _Value, const u32 _Address)
 			g_dspState.DSPControl.DSPReset		= tmpControl.DSPReset;
 			g_dspState.DSPControl.DSPAssertInt	= tmpControl.DSPAssertInt;
 			g_dspState.DSPControl.DSPHalt		= tmpControl.DSPHalt;
-			g_dspState.DSPControl.DSPInit       = tmpControl.DSPInit;
+			g_dspState.DSPControl.DSPInit		= tmpControl.DSPInit;
 
 			// Interrupt (mask)
 			g_dspState.DSPControl.AID_mask	= tmpControl.AID_mask;
@@ -438,14 +427,14 @@ void Write16(const u16 _Value, const u32 _Address)
 
 			// unknown
 			g_dspState.DSPControl.unk3	= tmpControl.unk3;
-			g_dspState.DSPControl.pad   = tmpControl.pad;
+			g_dspState.DSPControl.pad	= tmpControl.pad;
 			if (g_dspState.DSPControl.pad != 0)
 			{
 				PanicAlert("DSPInterface (w) g_dspState.DSPControl (CC00500A) gets a value with junk in the padding %08x", _Value);
 			}
 
 			UpdateInterrupts();
-		}			
+		}
 		break;
 
 	// ARAM
@@ -635,7 +624,7 @@ void GenerateDSPInterrupt(DSPInterruptType type, bool _bSet)
 	switch (type)
 	{
 	case INT_DSP:	g_dspState.DSPControl.DSP		= _bSet ? 1 : 0; break;
-	case INT_ARAM:	g_dspState.DSPControl.ARAM	    = _bSet ? 1 : 0; if (_bSet) g_dspState.DSPControl.DMAState = 0; break;
+	case INT_ARAM:	g_dspState.DSPControl.ARAM		= _bSet ? 1 : 0; if (_bSet) g_dspState.DSPControl.DMAState = 0; break;
 	case INT_AID:	g_dspState.DSPControl.AID		= _bSet ? 1 : 0; break;
 	}
 
@@ -647,17 +636,22 @@ void GenerateDSPInterruptFromDSPEmu(DSPInterruptType type, bool _bSet)
 {
 	CoreTiming::ScheduleEvent_Threadsafe(
 		0, et_GenerateDSPInterrupt, type | (_bSet<<16));
+	CoreTiming::ForceExceptionCheck(100);
 }
 
 // called whenever SystemTimers thinks the dsp deserves a few more cycles
-void UpdateDSPSlice(int cycles) {
-	if (dsp_is_lle) {
+void UpdateDSPSlice(int cycles)
+{
+	if (dsp_is_lle)
+	{
 		//use up the rest of the slice(if any)
 		dsp_emulator->DSP_Update(dsp_slice);
 		dsp_slice %= 6;
 		//note the new budget
 		dsp_slice += cycles;
-	} else {
+	}
+	else
+	{
 		dsp_emulator->DSP_Update(cycles);
 	}
 }
@@ -696,8 +690,8 @@ void Do_ARAM_DMA()
 	g_dspState.DSPControl.DMAState = 1;
 	CoreTiming::ScheduleEvent_Threadsafe(0, et_GenerateDSPInterrupt, INT_ARAM | (1<<16));
 
-	// Force an early exception check. Fixes RE2 audio.
-	if (g_arDMA.Cnt.count == 4096)
+	// Force an early exception check on large transfers. Fixes RE2 audio.
+	if (g_arDMA.Cnt.count > 2048 && g_arDMA.Cnt.count <= 6144)
 		CoreTiming::ForceExceptionCheck(100);
 
 	// Real hardware DMAs in 32byte chunks, but we can get by with 8byte chunks
@@ -726,7 +720,10 @@ void Do_ARAM_DMA()
 					Memory::Write_U64_Swap(*(u64*)&g_ARAM.ptr[g_arDMA.ARAddr & g_ARAM.mask], g_arDMA.MMAddr);
 				}
 				else
+				{
 					Memory::Write_U64_Swap(*(u64*)&g_ARAM.ptr[g_arDMA.ARAddr & g_ARAM.mask], g_arDMA.MMAddr);
+				}
+
 				g_arDMA.MMAddr += 8;
 				g_arDMA.ARAddr += 8;
 				g_arDMA.Cnt.count -= 8;
@@ -771,7 +768,9 @@ void Do_ARAM_DMA()
 					*(u64*)&g_ARAM.ptr[g_arDMA.ARAddr & g_ARAM.mask] = Common::swap64(Memory::Read_U64(g_arDMA.MMAddr));
 				}
 				else
+				{
 					*(u64*)&g_ARAM.ptr[g_arDMA.ARAddr & g_ARAM.mask] = Common::swap64(Memory::Read_U64(g_arDMA.MMAddr));
+				}
 
 				g_arDMA.MMAddr += 8;
 				g_arDMA.ARAddr += 8;
@@ -802,7 +801,9 @@ u8 ReadARAM(u32 _iAddress)
 			return Memory::Read_U8(_iAddress & Memory::RAM_MASK);
 	}
 	else
+	{
 		return g_ARAM.ptr[_iAddress & g_ARAM.mask];
+	}
 }
 
 void WriteARAM(u8 value, u32 _uAddress)
diff --git a/Source/Core/Core/Src/HW/DSP.h b/Source/Core/Core/Src/HW/DSP.h
index 63a8ab6a2d..68d83edabb 100644
--- a/Source/Core/Core/Src/HW/DSP.h
+++ b/Source/Core/Core/Src/HW/DSP.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _DSPINTERFACE_H
 #define _DSPINTERFACE_H
diff --git a/Source/Core/Core/Src/HW/DSPHLE/DSPHLE.cpp b/Source/Core/Core/Src/HW/DSPHLE/DSPHLE.cpp
index 6d2a1f9097..71c43a0302 100644
--- a/Source/Core/Core/Src/HW/DSPHLE/DSPHLE.cpp
+++ b/Source/Core/Core/Src/HW/DSPHLE/DSPHLE.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include <iostream>
 
@@ -28,8 +15,11 @@
 #include "../AudioInterface.h"
 #include "ConfigManager.h"
 #include "Core.h"
+#include "HW/SystemTimers.h"
+#include "HW/VideoInterface.h"
 
-DSPHLE::DSPHLE() {
+DSPHLE::DSPHLE()
+{
 	m_InitMixer = false;
 	soundStream = NULL;
 }
@@ -40,7 +30,8 @@ struct DSPState
 	u32 CPUMailbox;
 	u32 DSPMailbox;
 
-	void Reset() {
+	void Reset()
+	{
 		CPUMailbox = 0x00000000;
 		DSPMailbox = 0x00000000;
 	}
@@ -87,6 +78,16 @@ void DSPHLE::DSP_Update(int cycles)
 		m_pUCode->Update(cycles / 6);
 }
 
+u32 DSPHLE::DSP_UpdateRate()
+{
+	// AX HLE uses 3ms (Wii) or 5ms (GC) timing period
+	int fields = VideoInterface::GetNumFields();
+	if (m_pUCode != NULL)
+		return (SystemTimers::GetTicksPerSecond() / 1000) * m_pUCode->GetUpdateMs() / fields;
+	else
+		return SystemTimers::GetTicksPerSecond() / 1000;
+}
+
 void DSPHLE::SendMailToDSP(u32 _uMail)
 {
 	if (m_pUCode != NULL) {
@@ -157,8 +158,8 @@ void DSPHLE::DoState(PointerWrap &p)
 		}
 	}
 
-	p.Do(m_DSPControl);
-	p.Do(m_dspState);
+	p.DoPOD(m_DSPControl);
+	p.DoPOD(m_dspState);
 
 	int ucode_crc = IUCode::GetCRC(m_pUCode);
 	int ucode_crc_beforeLoad = ucode_crc;
@@ -183,7 +184,9 @@ void DSPHLE::DoState(PointerWrap &p)
 	if (ucode != m_pUCode)
 	{
 		if (p.GetMode() != PointerWrap::MODE_READ)
+		{
 			delete ucode;
+		}
 		else
 		{
 			delete m_pUCode;
@@ -193,7 +196,9 @@ void DSPHLE::DoState(PointerWrap &p)
 	if (lastucode != m_lastUCode)
 	{
 		if (p.GetMode() != PointerWrap::MODE_READ)
+		{
 			delete lastucode;
+		}
 		else
 		{
 			delete m_lastUCode;
@@ -273,7 +278,7 @@ u16 DSPHLE::DSP_WriteControlRegister(unsigned short _Value)
 	UDSPControl Temp(_Value);
 	if (!m_InitMixer)
 	{
-		if (!Temp.DSPHalt && Temp.DSPInit)
+		if (!Temp.DSPHalt)
 		{
 			InitMixer();
 		}
diff --git a/Source/Core/Core/Src/HW/DSPHLE/DSPHLE.h b/Source/Core/Core/Src/HW/DSPHLE/DSPHLE.h
index 6ad20115b4..f53d4f7d1b 100644
--- a/Source/Core/Core/Src/HW/DSPHLE/DSPHLE.h
+++ b/Source/Core/Core/Src/HW/DSPHLE/DSPHLE.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _DSPHLE_H
 #define _DSPHLE_H
@@ -46,6 +33,7 @@ public:
 	virtual void DSP_Update(int cycles);
 	virtual void DSP_StopSoundStream();
 	virtual void DSP_ClearAudioBuffer(bool mute);
+	virtual u32 DSP_UpdateRate();
 
 	CMailHandler& AccessMailHandler() { return m_MailHandler; }
 
@@ -70,7 +58,8 @@ private:
 		u32 CPUMailbox;
 		u32 DSPMailbox;
 
-		void Reset() {
+		void Reset()
+		{
 			CPUMailbox = 0x00000000;
 			DSPMailbox = 0x00000000;
 		}
diff --git a/Source/Core/Core/Src/HW/DSPHLE/HLEMixer.cpp b/Source/Core/Core/Src/HW/DSPHLE/HLEMixer.cpp
index 69c4b6aee6..3b4e53c735 100644
--- a/Source/Core/Core/Src/HW/DSPHLE/HLEMixer.cpp
+++ b/Source/Core/Core/Src/HW/DSPHLE/HLEMixer.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "DSPHLE.h"
 #include "HLEMixer.h"
diff --git a/Source/Core/Core/Src/HW/DSPHLE/HLEMixer.h b/Source/Core/Core/Src/HW/DSPHLE/HLEMixer.h
index 80274090c0..3d0369d452 100644
--- a/Source/Core/Core/Src/HW/DSPHLE/HLEMixer.h
+++ b/Source/Core/Core/Src/HW/DSPHLE/HLEMixer.h
@@ -1,3 +1,7 @@
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
+
 #ifndef HLEMIXER_H
 #define HLEMIXER_H
 #include "AudioCommon.h"
diff --git a/Source/Core/Core/Src/HW/DSPHLE/MailHandler.cpp b/Source/Core/Core/Src/HW/DSPHLE/MailHandler.cpp
index 248b7b0436..bcbc696186 100644
--- a/Source/Core/Core/Src/HW/DSPHLE/MailHandler.cpp
+++ b/Source/Core/Core/Src/HW/DSPHLE/MailHandler.cpp
@@ -1,24 +1,12 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "MailHandler.h"
 
 CMailHandler::CMailHandler()
-{}
+{
+}
 
 CMailHandler::~CMailHandler()
 {
@@ -48,7 +36,7 @@ u16 CMailHandler::ReadDSPMailboxLow()
 	if (!m_Mails.empty())
 	{
 		u16 result = m_Mails.front() & 0xFFFF;
-        m_Mails.pop();
+		m_Mails.pop();
 		return result;
 	}
 	return 0x00;
diff --git a/Source/Core/Core/Src/HW/DSPHLE/MailHandler.h b/Source/Core/Core/Src/HW/DSPHLE/MailHandler.h
index 6c025fe34e..efc512012f 100644
--- a/Source/Core/Core/Src/HW/DSPHLE/MailHandler.h
+++ b/Source/Core/Core/Src/HW/DSPHLE/MailHandler.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _MAILHANDLER_H
 #define _MAILHANDLER_H
@@ -41,7 +28,9 @@ public:
 	u32 GetNextMail()
 	{ 
 		if (m_Mails.size())
+		{
 			return m_Mails.front();
+		}
 		else
 		{
 			// WARN_LOG(DSPHLE, "GetNextMail: No mails");
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 81ef7c6482..f7387154b2 100644
--- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp
+++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp
@@ -1,45 +1,81 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "UCode_AX.h"
 #include "../../DSP.h"
+#include "FileUtil.h"
+#include "ConfigManager.h"
 
 #define AX_GC
 #include "UCode_AX_Voice.h"
 
 CUCode_AX::CUCode_AX(DSPHLE* dsp_hle, u32 crc)
 	: IUCode(dsp_hle, crc)
+	, m_work_available(false)
 	, m_cmdlist_size(0)
-	, m_axthread(&SpawnAXThread, this)
+	, m_run_on_thread(SConfig::GetInstance().m_LocalCoreStartupParameter.bDSPThread)
 {
 	WARN_LOG(DSPHLE, "Instantiating CUCode_AX: crc=%08x", crc);
 	m_rMailHandler.PushMail(DSP_INIT);
 	DSP::GenerateDSPInterruptFromDSPEmu(DSP::INT_DSP);
+
+	LoadResamplingCoefficients();
+
+	if (m_run_on_thread)
+		m_axthread = std::thread(SpawnAXThread, this);
 }
 
 CUCode_AX::~CUCode_AX()
 {
-	m_cmdlist_size = (u16)-1;	// Special value to signal end
-	NotifyAXThread();
-	m_axthread.join();
+	if (m_run_on_thread)
+	{
+		m_cmdlist_size = (u16)-1;	// Special value to signal end
+		NotifyAXThread();
+		m_axthread.join();
+	}
 
 	m_rMailHandler.Clear();
 }
 
+void CUCode_AX::LoadResamplingCoefficients()
+{
+	m_coeffs_available = false;
+
+	std::string filenames[] = {
+		File::GetUserPath(D_GCUSER_IDX) + "dsp_coef.bin",
+		File::GetSysDirectory() + "/GC/dsp_coef.bin"
+	};
+
+	size_t fidx;
+	std::string filename;
+	for (fidx = 0; fidx < sizeof (filenames) / sizeof (filenames[0]); ++fidx)
+	{
+		filename = filenames[fidx];
+		if (!File::Exists(filename))
+			continue;
+
+		if (File::GetSize(filename) != 0x1000)
+			continue;
+
+		break;
+	}
+
+	if (fidx >= sizeof (filenames) / sizeof (filenames[0]))
+		return;
+
+	WARN_LOG(DSPHLE, "Loading polyphase resampling coeffs from %s", filename.c_str());
+
+	FILE* fp = fopen(filename.c_str(), "rb");
+	fread(m_coeffs, 1, 0x1000, fp);
+	fclose(fp);
+
+	for (u32 i = 0; i < 0x800; ++i)
+		m_coeffs[i] = Common::swap16(m_coeffs[i]);
+
+	m_coeffs_available = true;
+}
+
 void CUCode_AX::SpawnAXThread(CUCode_AX* self)
 {
 	self->AXThread();
@@ -61,20 +97,32 @@ void CUCode_AX::AXThread()
 		m_processing.lock();
 		HandleCommandList();
 		m_cmdlist_size = 0;
-
-		// Signal end of processing
-		m_rMailHandler.PushMail(DSP_YIELD);
-		DSP::GenerateDSPInterruptFromDSPEmu(DSP::INT_DSP);
+		SignalWorkEnd();
 		m_processing.unlock();
 	}
 }
 
+void CUCode_AX::SignalWorkEnd()
+{
+	// Signal end of processing
+	m_rMailHandler.PushMail(DSP_YIELD);
+	DSP::GenerateDSPInterruptFromDSPEmu(DSP::INT_DSP);
+}
+
 void CUCode_AX::NotifyAXThread()
 {
 	std::unique_lock<std::mutex> lk(m_cmdlist_mutex);
 	m_cmdlist_cv.notify_one();
 }
 
+void CUCode_AX::StartWorking()
+{
+	if (m_run_on_thread)
+		NotifyAXThread();
+	else
+		m_work_available = true;
+}
+
 void CUCode_AX::HandleCommandList()
 {
 	// Temp variables for addresses computation
@@ -200,11 +248,9 @@ void CUCode_AX::HandleCommandList()
 				u16 idx = m_cmdlist[curr_idx++];
 				addr_hi = m_cmdlist[curr_idx++];
 				addr_lo = m_cmdlist[curr_idx++];
-
 				// TODO
-				(void)samp_val;
-				(void)idx;
-
+				// suppress warnings:
+				(void)samp_val; (void)idx;
 				break;
 			}
 
@@ -243,26 +289,25 @@ void CUCode_AX::HandleCommandList()
 			}
 
 			default:
-				ERROR_LOG(DSPHLE, "Unknown command in AX cmdlist: %04x", cmd);
+				ERROR_LOG(DSPHLE, "Unknown command in AX command list: %04x", cmd);
 				end = true;
 				break;
 		}
 	}
 }
 
-static void ApplyUpdatesForMs(AXPB& pb, int curr_ms)
+void CUCode_AX::ApplyUpdatesForMs(int curr_ms, u16* pb, u16* num_updates, u16* updates)
 {
 	u32 start_idx = 0;
 	for (int i = 0; i < curr_ms; ++i)
-		start_idx += pb.updates.num_updates[i];
+		start_idx += 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 (u32 i = start_idx; i < start_idx + num_updates[curr_ms]; ++i)
 	{
-		u16 update_off = HLEMemory_Read_U16(update_addr + 4 * i);
-		u16 update_val = HLEMemory_Read_U16(update_addr + 4 * i + 2);
+		u16 update_off = Common::swap16(updates[2 * i]);
+		u16 update_val = Common::swap16(updates[2 * i + 1]);
 
-		((u16*)&pb)[update_off] = update_val;
+		pb[update_off] = update_val;
 	}
 }
 
@@ -343,7 +388,9 @@ void CUCode_AX::SetupProcessing(u32 init_addr)
 		init_idx += 3;
 
 		if (!init_val)
+		{
 			memset(buffers[i], 0, 5 * 32 * sizeof (int));
+		}
 		else
 		{
 			for (u32 j = 0; j < 32 * 5; ++j)
@@ -405,11 +452,15 @@ void CUCode_AX::ProcessPBList(u32 pb_addr)
 		if (!ReadPB(pb_addr, pb))
 			break;
 
+		u32 updates_addr = HILO_TO_32(pb.updates.data);
+		u16* updates = (u16*)HLEMemory_Get_Pointer(updates_addr);
+
 		for (int curr_ms = 0; curr_ms < 5; ++curr_ms)
 		{
-			ApplyUpdatesForMs(pb, curr_ms);
+			ApplyUpdatesForMs(curr_ms, (u16*)&pb, pb.updates.num_updates, updates);
 
-			Process1ms(pb, buffers, ConvertMixerControl(pb.mixer_control));
+			ProcessVoice(pb, buffers, spms, ConvertMixerControl(pb.mixer_control),
+			             m_coeffs_available ? m_coeffs : NULL);
 
 			// Forward the buffers
 			for (u32 i = 0; i < sizeof (buffers.ptrs) / sizeof (buffers.ptrs[0]); ++i)
@@ -599,6 +650,7 @@ void CUCode_AX::HandleMail(u32 mail)
 	if (next_is_cmdlist)
 	{
 		CopyCmdList(mail, cmdlist_size);
+		StartWorking();
 		NotifyAXThread();
 	}
 	else if (m_UploadSetupInProgress)
@@ -667,6 +719,17 @@ void CUCode_AX::Update(int cycles)
 		m_rMailHandler.PushMail(DSP_RESUME);
 		DSP::GenerateDSPInterruptFromDSPEmu(DSP::INT_DSP);
 	}
+	else if (m_work_available)
+	{
+		HandleCommandList();
+		m_cmdlist_size = 0;
+		SignalWorkEnd();
+	}
+}
+
+u32 CUCode_AX::GetUpdateMs()
+{
+	return 5;
 }
 
 void CUCode_AX::DoAXState(PointerWrap& 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 8fd2a2af5f..ae2ada78fd 100644
--- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.h
+++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 // High-level emulation for the AX Gamecube UCode.
 //
@@ -27,7 +14,7 @@
 #define _UCODE_AX_H
 
 #include "UCodes.h"
-#include "UCode_AX_Structs.h"
+#include "UCode_AXStructs.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
@@ -73,9 +60,10 @@ public:
 	virtual void MixAdd(short* out_buffer, int nsamples);
 	virtual void Update(int cycles);
 	virtual void DoState(PointerWrap& p);
+	u32 GetUpdateMs();
 
 	// Needed because StdThread.h std::thread implem does not support member
-	// pointers.
+	// pointers. TODO(delroth): obsolete.
 	static void SpawnAXThread(CUCode_AX* self);
 
 protected:
@@ -102,18 +90,31 @@ protected:
 	int m_samples_auxB_right[32 * 5];
 	int m_samples_auxB_surround[32 * 5];
 
+	// This flag is set if there is anything to process.
+	bool m_work_available;
+
 	// 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;
+	bool m_run_on_thread;
 
 	// Sync objects
 	std::mutex m_processing;
 	std::condition_variable m_cmdlist_cv;
 	std::mutex m_cmdlist_mutex;
 
+	std::thread m_axthread;
+
+	// Table of coefficients for polyphase sample rate conversion.
+	// The coefficients aren't always available (they are part of the DSP DROM)
+	// so we also need to know if they are valid or not.
+	bool m_coeffs_available;
+	s16 m_coeffs[0x800];
+
+	void LoadResamplingCoefficients();
+
 	// Copy a command list from memory to our temp buffer
 	void CopyCmdList(u32 addr, u16 size);
 
@@ -122,13 +123,21 @@ protected:
 	// versions of AX.
 	AXMixControl ConvertMixerControl(u32 mixer_control);
 
-	// Send a notification to the AX thread to tell him a new cmdlist addr is
+	// Apply updates to a PB. Generic, used in AX GC and AX Wii.
+	void ApplyUpdatesForMs(int curr_ms, u16* pb, u16* num_updates, u16* updates);
+
+	// Signal that we should start handling a command list. Dispatches to the
+	// AX thread if using a thread, else just sets a boolean flag.
+	void StartWorking();
+
+	// Send a notification to the AX thread to tell it a new cmdlist addr is
 	// available for processing.
 	void NotifyAXThread();
 
 	void AXThread();
 
 	virtual void HandleCommandList();
+	void SignalWorkEnd();
 
 	void SetupProcessing(u32 init_addr);
 	void DownloadAndMixWithVolume(u32 addr, u16 vol_main, u16 vol_auxa, u16 vol_auxb);
diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Structs.h b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXStructs.h
similarity index 73%
rename from Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Structs.h
rename to Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXStructs.h
index c92196dd49..54a7dce6e9 100644
--- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Structs.h
+++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXStructs.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _UCODE_AX_STRUCTS_H
 #define _UCODE_AX_STRUCTS_H
@@ -161,15 +148,15 @@ struct PBDpopWii
 
 struct PBDpopWM
 {
-	s16 aMain0;
-	s16 aMain1;
-	s16 aMain2;
-	s16 aMain3;
+	s16 main0;
+	s16 main1;
+	s16 main2;
+	s16 main3;
 
-	s16 aAux0;
-	s16 aAux1;
-	s16 aAux2;
-	s16 aAux3;
+	s16 aux0;
+	s16 aux1;
+	s16 aux2;
+	s16 aux3;
 };
 
 struct PBVolumeEnvelope
@@ -211,13 +198,13 @@ struct PBSampleRateConverter
 	u16 ratio_hi; // integer part of sampling ratio
 	u16 ratio_lo; // fraction part of sampling ratio
 	u16 cur_addr_frac;
-	u16 last_samples[4];
+	s16 last_samples[4];
 };
 
 struct PBSampleRateConverterWM
 {
-	u16 currentAddressFrac;
-	u16 last_samples[4];
+	u16 cur_addr_frac;
+	s16 last_samples[4];
 };
 
 struct PBADPCMLoopInfo
@@ -230,7 +217,7 @@ struct PBADPCMLoopInfo
 struct PBLowPassFilter
 {
 	u16 enabled;
-	u16 yn1;
+	s16 yn1;
 	u16 a0;
 	u16 b0;
 };
@@ -324,67 +311,24 @@ struct AXPBWii
 	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,
+enum
+{
+	AUDIOFORMAT_ADPCM = 0,
+	AUDIOFORMAT_PCM8  = 0x19,
 	AUDIOFORMAT_PCM16 = 0xA,
 };
 
-enum {
+enum
+{
 	SRCTYPE_POLYPHASE = 0,
 	SRCTYPE_LINEAR  = 1,
 	SRCTYPE_NEAREST = 2,
 };
 
 // Both may be used at once
-enum {
+enum
+{
 	FILTER_LOWPASS = 1,
 	FILTER_BIQUAD = 2,
 };
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 f4effbba6d..63f29c5a33 100644
--- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXWii.cpp
+++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXWii.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "StringUtil.h"
 
@@ -21,247 +8,685 @@
 #include "Mixer.h"
 
 #include "UCodes.h"
-#include "UCode_AXWii_Structs.h"
-#include "UCode_AX.h" // for some functions in CUCode_AX
+#include "UCode_AXStructs.h"
 #include "UCode_AXWii.h"
-#include "UCode_AXWii_Voice.h"
+
+#define AX_WII
+#include "UCode_AX_Voice.h"
 
 
 CUCode_AXWii::CUCode_AXWii(DSPHLE *dsp_hle, u32 l_CRC)
-	: IUCode(dsp_hle, l_CRC)
-	, m_addressPBs(0xFFFFFFFF)
+	: CUCode_AX(dsp_hle, l_CRC),
+	  m_last_main_volume(0x8000)
 {
-	// we got loaded
-	m_rMailHandler.PushMail(DSP_INIT);
+	for (int i = 0; i < 3; ++i)
+		m_last_aux_volumes[i] = 0x8000;
+	WARN_LOG(DSPHLE, "Instantiating CUCode_AXWii");
 
-	templbuffer = new int[1024 * 1024];
-	temprbuffer = new int[1024 * 1024];
-
-	wiisportsHack = m_CRC == 0xfa450138;
+	m_old_axwii = (l_CRC == 0xfa450138);
 }
 
 CUCode_AXWii::~CUCode_AXWii()
 {
-	m_rMailHandler.Clear();
-	delete [] templbuffer;
-	delete [] temprbuffer;
 }
 
-void CUCode_AXWii::HandleMail(u32 _uMail)
+void CUCode_AXWii::HandleCommandList()
 {
-	if (m_UploadSetupInProgress) 
+	// Temp variables for addresses computation
+	u16 addr_hi, addr_lo;
+	u16 addr2_hi, addr2_lo;
+	u16 volume;
+
+	u32 pb_addr = 0;
+
+//	WARN_LOG(DSPHLE, "Command list:");
+//	for (u32 i = 0; m_cmdlist[i] != CMD_END; ++i)
+//		WARN_LOG(DSPHLE, "%04x", m_cmdlist[i]);
+//	WARN_LOG(DSPHLE, "-------------");
+
+	u32 curr_idx = 0;
+	bool end = false;
+	while (!end)
 	{
-		PrepareBootUCode(_uMail);
-		return;
-	}
-	else if ((_uMail & 0xFFFF0000) == MAIL_AX_ALIST)
-	{
-		// We are expected to get a new CmdBlock
-		DEBUG_LOG(DSPHLE, "GetNextCmdBlock (%ibytes)", (u16)_uMail);
-	}
-	else switch(_uMail)
-	{
-		case 0xCDD10000: // Action 0 - AX_ResumeTask()
-			m_rMailHandler.PushMail(DSP_RESUME);
-			break;
+		u16 cmd = m_cmdlist[curr_idx++];
 
-		case 0xCDD10001: // Action 1 - new ucode upload
-			DEBUG_LOG(DSPHLE,"DSP IROM - New Ucode!");
-			// TODO find a better way to protect from HLEMixer?
-			soundStream->GetMixer()->SetHLEReady(false);
-			m_UploadSetupInProgress = true;
-			break;
+		if (m_old_axwii)
+		{
+			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 0xCDD10002: // Action 2 - IROM_Reset(); ( WII: De Blob, Cursed Mountain,...)
-			DEBUG_LOG(DSPHLE,"DSP IROM - Reset!");
-			m_DSPHLE->SetUCode(UCODE_ROM);
-			return;
+				case CMD_SETUP_OLD:
+					addr_hi = m_cmdlist[curr_idx++];
+					addr_lo = m_cmdlist[curr_idx++];
+					SetupProcessing(HILO_TO_32(addr));
+					break;
 
-		case 0xCDD10003: // Action 3 - AX_GetNextCmdBlock()
-			break;
+				case CMD_ADD_TO_LR_OLD:
+				case CMD_SUB_TO_LR_OLD:
+					addr_hi = m_cmdlist[curr_idx++];
+					addr_lo = m_cmdlist[curr_idx++];
+					AddToLR(HILO_TO_32(addr), cmd == CMD_SUB_TO_LR_OLD);
+					break;
 
-		default:
-			DEBUG_LOG(DSPHLE, " >>>> u32 MAIL : AXTask Mail (%08x)", _uMail);
-			AXTask(_uMail);
-			break;
-	}
-}
+				case CMD_ADD_SUB_TO_LR_OLD:
+					addr_hi = m_cmdlist[curr_idx++];
+					addr_lo = m_cmdlist[curr_idx++];
+					AddSubToLR(HILO_TO_32(addr));
+					break;
 
-void CUCode_AXWii::MixAdd(short* _pBuffer, int _iSize)
-{
-	AXPBWii PB;
+				case CMD_PB_ADDR_OLD:
+					addr_hi = m_cmdlist[curr_idx++];
+					addr_lo = m_cmdlist[curr_idx++];
+					pb_addr = HILO_TO_32(addr);
+					break;
 
-	if (_iSize > 1024 * 1024)
-		_iSize = 1024 * 1024;
+				case CMD_PROCESS_OLD:
+					ProcessPBList(pb_addr);
+					break;
 
-	memset(templbuffer, 0, _iSize * sizeof(int));
-	memset(temprbuffer, 0, _iSize * sizeof(int));
+				case CMD_MIX_AUXA_OLD:
+				case CMD_MIX_AUXB_OLD:
+				case CMD_MIX_AUXC_OLD:
+					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_OLD, HILO_TO_32(addr), HILO_TO_32(addr2), volume);
+					break;
 
-	u32 blockAddr = m_addressPBs;
-	if (!blockAddr)
-		return;
+				case CMD_UPL_AUXA_MIX_LRSC_OLD:
+				case CMD_UPL_AUXB_MIX_LRSC_OLD:
+				{
+					volume = m_cmdlist[curr_idx++];
+					u32 addresses[6] = {
+						(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],
+						(u32)(m_cmdlist[curr_idx + 8] << 16) | m_cmdlist[curr_idx + 9],
+						(u32)(m_cmdlist[curr_idx + 10] << 16) | m_cmdlist[curr_idx + 11],
+					};
+					curr_idx += 12;
+					UploadAUXMixLRSC(cmd == CMD_UPL_AUXB_MIX_LRSC_OLD, addresses, volume);
+					break;
+				}
 
-	for (int i = 0; i < NUMBER_OF_PBS; i++)
-	{
-		if (!ReadPB(blockAddr, PB))
-			break;
+				// TODO(delroth): figure this one out, it's used by almost every
+				// game I've tested so far.
+				case CMD_UNK_0B_OLD: curr_idx += 4; break;
 
-		if (wiisportsHack)
-			MixAddVoice(*(AXPBWiiSports*)&PB, templbuffer, temprbuffer, _iSize);
+				case CMD_OUTPUT_OLD:
+				case CMD_OUTPUT_DPL2_OLD:
+					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), 0x8000,
+					             cmd == CMD_OUTPUT_DPL2_OLD);
+					break;
+
+				case CMD_WM_OUTPUT_OLD:
+				{
+					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_OLD:
+					end = true;
+					break;
+			}
+		}
 		else
-			MixAddVoice(PB, templbuffer, temprbuffer, _iSize);
-
-		if (!WritePB(blockAddr, PB))
-			break;
-		
-		// next PB, or done
-		blockAddr = (PB.next_pb_hi << 16) | PB.next_pb_lo;
-		if (!blockAddr)
-			break;
-	}		
-
-	// We write the sound to _pBuffer
-	if (_pBuffer)
-	{
-		for (int i = 0; i < _iSize; i++)
 		{
-			// Clamp into 16-bit. Maybe we should add a volume compressor here.
-			int left  = templbuffer[i] + _pBuffer[0];
-			int right = temprbuffer[i] + _pBuffer[1];
-			if (left  < -32767)  left = -32767;
-			else if (left  >  32767)  left =  32767;
-			if (right < -32767) right = -32767;
-			else if (right >  32767) right =  32767;
-			*_pBuffer++ = left;
-			*_pBuffer++ = right;
+			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_ADD_TO_LR:
+				case CMD_SUB_TO_LR:
+					addr_hi = m_cmdlist[curr_idx++];
+					addr_lo = m_cmdlist[curr_idx++];
+					AddToLR(HILO_TO_32(addr), cmd == CMD_SUB_TO_LR);
+					break;
+
+				case CMD_ADD_SUB_TO_LR:
+					addr_hi = m_cmdlist[curr_idx++];
+					addr_lo = m_cmdlist[curr_idx++];
+					AddSubToLR(HILO_TO_32(addr));
+					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;
+
+				case CMD_UPL_AUXA_MIX_LRSC:
+				case CMD_UPL_AUXB_MIX_LRSC:
+				{
+					volume = m_cmdlist[curr_idx++];
+					u32 addresses[6] = {
+						(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],
+						(u32)(m_cmdlist[curr_idx + 8] << 16) | m_cmdlist[curr_idx + 9],
+						(u32)(m_cmdlist[curr_idx + 10] << 16) | m_cmdlist[curr_idx + 11],
+					};
+					curr_idx += 12;
+					UploadAUXMixLRSC(cmd == CMD_UPL_AUXB_MIX_LRSC, addresses, volume);
+					break;
+				}
+
+				// TODO(delroth): figure this one out, it's used by almost every
+				// game I've tested so far.
+				case CMD_UNK_0A: curr_idx += 4; break;
+
+				case CMD_OUTPUT:
+				case CMD_OUTPUT_DPL2:
+					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,
+					              cmd == CMD_OUTPUT_DPL2);
+					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_AXWii::Update(int cycles)
+void CUCode_AXWii::SetupProcessing(u32 init_addr)
 {
-	if (NeedsResumeMail())
+	// TODO: should be easily factorizable with AX
+	s16 init_data[60];
+
+	for (u32 i = 0; i < 60; ++i)
+		init_data[i] = HLEMemory_Read_U16(init_addr + 2 * i);
+
+	// List of all buffers we have to initialize
+	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)
 	{
-		m_rMailHandler.PushMail(DSP_RESUME);
-		DSP::GenerateDSPInterruptFromDSPEmu(DSP::INT_DSP);
-	}
-	// check if we have to send something
-	else if (!m_rMailHandler.IsEmpty())
-	{
-		DSP::GenerateDSPInterruptFromDSPEmu(DSP::INT_DSP);
+		s32 init_val = (s32)((init_data[init_idx] << 16) | init_data[init_idx + 1]);
+		s16 delta = (s16)init_data[init_idx + 2];
+
+		init_idx += 3;
+
+		if (!init_val)
+		{
+			memset(buffers[i].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;
+			}
+		}
 	}
 }
 
-// AX seems to bootup one task only and waits for resume-callbacks
-// everytime the DSP has "spare time" it sends a resume-mail to the CPU
-// and the __DSPHandler calls a AX-Callback which generates a new AXFrame
-bool CUCode_AXWii::AXTask(u32& _uMail)
+void CUCode_AXWii::AddToLR(u32 val_addr, bool neg)
 {
-	u32 uAddress = _uMail;
-	//u32 Addr__AXStudio;
-	//u32 Addr__AXOutSBuffer;
-	bool bExecuteList = true;
-
-/*
-	for (int i=0;i<64;i++) {
-		NOTICE_LOG(DSPHLE,"%x - %08x",uAddress+(i*4),HLEMemory_Read_U32(uAddress+(i*4)));
-	}
-*/
-
-	while (bExecuteList)
+	int* ptr = (int*)HLEMemory_Get_Pointer(val_addr);
+	for (int i = 0; i < 32 * 3; ++i)
 	{
-		u16 iCommand = HLEMemory_Read_U16(uAddress);
-		uAddress += 2;
-		//NOTICE_LOG(DSPHLE,"AXWII - AXLIST CMD %X",iCommand);
+		int val = (int)Common::swap32(*ptr++);
+		if (neg)
+			val = -val;
 
-		switch (iCommand)
-		{
-	    case 0x0000: 
-		    //Addr__AXStudio = HLEMemory_Read_U32(uAddress);
-		    uAddress += 4;
-		    break;
+		m_samples_left[i] += val;
+		m_samples_right[i] += val;
+	}
+}
 
-	    case 0x0001:
-		    uAddress += 4;
-		    break;
+void CUCode_AXWii::AddSubToLR(u32 val_addr)
+{
+	int* ptr = (int*)HLEMemory_Get_Pointer(val_addr);
+	for (int i = 0; i < 32 * 3; ++i)
+	{
+		int val = (int)Common::swap32(*ptr++);
+		m_samples_left[i] += val;
+	}
+	for (int i = 0; i < 32 * 3; ++i)
+	{
+		int val = (int)Common::swap32(*ptr++);
+		m_samples_right[i] -= val;
+	}
+}
 
-		case 0x0003:
-		    uAddress += 4;
-		    break;
+AXMixControl CUCode_AXWii::ConvertMixerControl(u32 mixer_control)
+{
+	u32 ret = 0;
 
-	    case 0x0004: 
-			// PBs are here now
-			m_addressPBs = HLEMemory_Read_U32(uAddress);
-			if (soundStream)
-				soundStream->GetMixer()->SetHLEReady(true);
-//			soundStream->Update();
-			uAddress += 4;
-		    break;
+	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;
 
-	    case 0x0005:
-			if (!wiisportsHack)
-				uAddress += 10;
-		    break;
+	return (AXMixControl)ret;
+}
 
-	    case 0x0006:
-		    uAddress += 10;
-		    break; 
+void CUCode_AXWii::GenerateVolumeRamp(u16* output, u16 vol1, u16 vol2, size_t nvals)
+{
+	float curr = vol1;
+	for (size_t i = 0; i < nvals; ++i)
+	{
+		curr += (vol2 - vol1) / (float)nvals;
+		output[i] = curr;
+	}
+}
 
-		case 0x0007:   // AXLIST_SBUFFER
-		    //Addr__AXOutSBuffer = HLEMemory_Read_U32(uAddress);
-		    uAddress += 10;
-		    break;
+bool CUCode_AXWii::ExtractUpdatesFields(AXPBWii& pb, u16* num_updates, u16* updates,
+                                        u32* updates_addr)
+{
+	u16* pb_mem = (u16*)&pb;
 
-		case 0x0008:
-		    uAddress += 26;
-			break;
+	if (!m_old_axwii)
+		return false;
 
-		case 0x000a:
-			uAddress += wiisportsHack ? 4 : 8; // AXLIST_COMPRESSORTABLE
-		    break;
+	// Copy the num_updates field.
+	memcpy(num_updates, pb_mem + 41, 6);
 
-		case 0x000b:
-			uAddress += wiisportsHack ? 2 : 10;
-			break;
+	// Get the address of the updates data
+	u16 addr_hi = pb_mem[44];
+	u16 addr_lo = pb_mem[45];
+	u32 addr = HILO_TO_32(addr);
+	u16* ptr = (u16*)HLEMemory_Get_Pointer(addr);
 
-		case 0x000c:
-			uAddress += wiisportsHack ? 8 : 10;
-			break;
+	*updates_addr = addr;
 
-		case 0x000d:
-			uAddress += 16;
-			break;
+	// Copy the updates data and change the offset to match a PB without
+	// updates data.
+	u32 updates_count = num_updates[0] + num_updates[1] + num_updates[2];
+	for (u32 i = 0; i < updates_count; ++i)
+	{
+		u16 update_off = Common::swap16(ptr[2 * i]);
+		u16 update_val = Common::swap16(ptr[2 * i + 1]);
 
-	    case 0x000e:
-			if (wiisportsHack) 
-				uAddress += 16;
-			else
-				bExecuteList = false;
-			break;
+		if (update_off > 45)
+			update_off -= 5;
 
-	    case 0x000f: // only for Wii Sports uCode
-			bExecuteList = false;
-			break;
-
-	    default:
-			INFO_LOG(DSPHLE,"DSPHLE - AXwii - AXLIST - Unknown CMD: %x",iCommand);
-		    // unknown command so stop the execution of this TaskList
-		    bExecuteList = false;
-			break;
-		}
+		updates[2 * i] = update_off;
+		updates[2 * i + 1] = update_val;
 	}
 
-	m_rMailHandler.PushMail(DSP_YIELD); //its here in case there is a CMD fuckup
+	// Remove the updates data from the PB
+	memmove(pb_mem + 41, pb_mem + 46, sizeof (pb) - 2 * 46);
+
 	return true;
 }
 
+void CUCode_AXWii::ReinjectUpdatesFields(AXPBWii& pb, u16* num_updates, u32 updates_addr)
+{
+	u16* pb_mem = (u16*)&pb;
+
+	// Make some space
+	memmove(pb_mem + 46, pb_mem + 41, sizeof (pb) - 2 * 46);
+
+	// Reinsert previous values
+	pb_mem[41] = num_updates[0];
+	pb_mem[42] = num_updates[1];
+	pb_mem[43] = num_updates[2];
+	pb_mem[44] = updates_addr >> 16;
+	pb_mem[45] = updates_addr & 0xFFFF;
+}
+
+void CUCode_AXWii::ProcessPBList(u32 pb_addr)
+{
+	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,
+			m_samples_wm0,
+			m_samples_aux0,
+			m_samples_wm1,
+			m_samples_aux1,
+			m_samples_wm2,
+			m_samples_aux2,
+			m_samples_wm3,
+			m_samples_aux3
+		}};
+
+		if (!ReadPB(pb_addr, pb))
+			break;
+
+		u16 num_updates[3];
+		u16 updates[1024];
+		u32 updates_addr;
+		if (ExtractUpdatesFields(pb, num_updates, updates, &updates_addr))
+		{
+			for (int curr_ms = 0; curr_ms < 3; ++curr_ms)
+			{
+				ApplyUpdatesForMs(curr_ms, (u16*)&pb, num_updates, updates);
+				ProcessVoice(pb, buffers, 32,
+				             ConvertMixerControl(HILO_TO_32(pb.mixer_control)),
+				             m_coeffs_available ? m_coeffs : NULL);
+
+				// Forward the buffers
+				for (u32 i = 0; i < sizeof (buffers.ptrs) / sizeof (buffers.ptrs[0]); ++i)
+					buffers.ptrs[i] += 32;
+			}
+			ReinjectUpdatesFields(pb, num_updates, updates_addr);
+		}
+		else
+		{
+			ProcessVoice(pb, buffers, 96,
+			             ConvertMixerControl(HILO_TO_32(pb.mixer_control)),
+			             m_coeffs_available ? m_coeffs : NULL);
+		}
+
+		WritePB(pb_addr, pb);
+		pb_addr = HILO_TO_32(pb.next_pb);
+	}
+}
+
+void CUCode_AXWii::MixAUXSamples(int aux_id, u32 write_addr, u32 read_addr, u16 volume)
+{
+	u16 volume_ramp[96];
+	GenerateVolumeRamp(volume_ramp, m_last_aux_volumes[aux_id], volume, 96);
+	m_last_aux_volumes[aux_id] = 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 sample = (s64)(s32)Common::swap32(*ptr++);
+			sample *= volume_ramp[j];
+			main_buffers[i][j] += (s32)(sample >> 15);
+		}
+}
+
+void CUCode_AXWii::UploadAUXMixLRSC(int aux_id, u32* addresses, u16 volume)
+{
+	int* aux_left = aux_id ? m_samples_auxB_left : m_samples_auxA_left;
+	int* aux_right = aux_id ? m_samples_auxB_right : m_samples_auxA_right;
+	int* aux_surround = aux_id ? m_samples_auxB_surround : m_samples_auxA_surround;
+	int* auxc_buffer = aux_id ? m_samples_auxC_surround : m_samples_auxC_right;
+
+	int* upload_ptr = (int*)HLEMemory_Get_Pointer(addresses[0]);
+	for (u32 i = 0; i < 96; ++i)
+		*upload_ptr++ = Common::swap32(aux_left[i]);
+	for (u32 i = 0; i < 96; ++i)
+		*upload_ptr++ = Common::swap32(aux_right[i]);
+	for (u32 i = 0; i < 96; ++i)
+		*upload_ptr++ = Common::swap32(aux_surround[i]);
+
+	upload_ptr = (int*)HLEMemory_Get_Pointer(addresses[1]);
+	for (u32 i = 0; i < 96; ++i)
+		*upload_ptr++ = Common::swap32(auxc_buffer[i]);
+
+	u16 volume_ramp[96];
+	GenerateVolumeRamp(volume_ramp, m_last_aux_volumes[aux_id], volume, 96);
+	m_last_aux_volumes[aux_id] = volume;
+
+	int* mix_dest[4] = {
+		m_samples_left,
+		m_samples_right,
+		m_samples_surround,
+		m_samples_auxC_left
+	};
+	for (u32 mix_i = 0; mix_i < 4; ++mix_i)
+	{
+		int* dl_ptr = (int*)HLEMemory_Get_Pointer(addresses[2 + mix_i]);
+		for (u32 i = 0; i < 96; ++i)
+			aux_left[i] = Common::swap32(dl_ptr[i]);
+
+		for (u32 i = 0; i < 96; ++i)
+		{
+			s64 sample = (s64)(s32)aux_left[i];
+			sample *= volume_ramp[i];
+			mix_dest[mix_i][i] += (s32)(sample >> 15);
+		}
+	}
+}
+
+void CUCode_AXWii::OutputSamples(u32 lr_addr, u32 surround_addr, u16 volume,
+                                 bool upload_auxc)
+{
+	u16 volume_ramp[96];
+	GenerateVolumeRamp(volume_ramp, m_last_main_volume, volume, 96);
+	m_last_main_volume = volume;
+
+	int upload_buffer[3 * 32] = { 0 };
+
+	for (u32 i = 0; i < 3 * 32; ++i)
+		upload_buffer[i] = Common::swap32(m_samples_surround[i]);
+	memcpy(HLEMemory_Get_Pointer(surround_addr), upload_buffer, sizeof (upload_buffer));
+
+	if (upload_auxc)
+	{
+		surround_addr += sizeof (upload_buffer);
+		for (u32 i = 0; i < 3 * 32; ++i)
+			upload_buffer[i] = Common::swap32(m_samples_auxC_left[i]);
+		memcpy(HLEMemory_Get_Pointer(surround_addr), upload_buffer, sizeof (upload_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_ramp[i]) >> 15;
+		right = ((s64)right * volume_ramp[i]) >> 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_right[i]);
+		buffer[2 * i + 1] = Common::swap16(m_samples_left[i]);
+	}
+
+	memcpy(HLEMemory_Get_Pointer(lr_addr), buffer, sizeof (buffer));
+
+	// There should be a DSP_SYNC message sent here. However, it looks like not
+	// sending it does not cause any issue, and sending it actually causes some
+	// sounds to go at half speed. I have no idea why.
+}
+
+void CUCode_AXWii::OutputWMSamples(u32* addresses)
+{
+	int* buffers[] = {
+		m_samples_wm0,
+		m_samples_wm1,
+		m_samples_wm2,
+		m_samples_wm3
+	};
+
+	for (u32 i = 0; i < 4; ++i)
+	{
+		int* in = buffers[i];
+		u16* out = (u16*)HLEMemory_Get_Pointer(addresses[i]);
+		for (u32 j = 0; j < 3 * 6; ++j)
+		{
+			int sample = in[j];
+			if (sample < -32767) sample = -32767;
+			if (sample > 32767) sample = 32767;
+			out[j] = Common::swap16((u16)sample);
+		}
+	}
+}
+
+u32 CUCode_AXWii::GetUpdateMs()
+{
+	return 3;
+}
+
 void CUCode_AXWii::DoState(PointerWrap &p)
 {
-	std::lock_guard<std::mutex> lk(m_csMix);
-
-	p.Do(m_addressPBs);
-	p.Do(wiisportsHack);
+	std::lock_guard<std::mutex> 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);
+
+	p.Do(m_last_main_volume);
+	p.Do(m_last_aux_volumes);
 }
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 dc07e71a63..5e8080b97a 100644
--- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXWii.h
+++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXWii.h
@@ -1,55 +1,115 @@
-// Copyright (C) 2003 Dolphin Project.
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
-// 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.
+#ifndef _UCODE_AXWII_H
+#define _UCODE_AXWII_H
 
-// 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.
+#include "UCode_AX.h"
 
-// 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
-#define _UCODE_AXWII
-
-#include "UCode_AXWii_Structs.h"
-
-#define NUMBER_OF_PBS 128
-
-class CUCode_AXWii : public IUCode
+class CUCode_AXWii : public CUCode_AX
 {
 public:
 	CUCode_AXWii(DSPHLE *dsp_hle, u32 _CRC);
 	virtual ~CUCode_AXWii();
+	u32 GetUpdateMs();
 
-	void HandleMail(u32 _uMail);
-	void MixAdd(short* _pBuffer, int _iSize);
-	void Update(int cycles);
-	void DoState(PointerWrap &p);
+	virtual void DoState(PointerWrap &p);
+
+protected:
+	// Additional AUX buffers
+	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];
+
+	// Are we implementing an old version of AXWii which still has updates?
+	bool m_old_axwii;
+
+	// Last volume values for MAIN and AUX. Used to generate volume ramps to
+	// interpolate nicely between old and new volume values.
+	u16 m_last_main_volume;
+	u16 m_last_aux_volumes[3];
+
+	// If needed, extract the updates related fields from a PB. We need to
+	// reinject them afterwards so that the correct PB typs is written to RAM.
+	bool ExtractUpdatesFields(AXPBWii& pb, u16* num_updates, u16* updates,
+	                          u32* updates_addr);
+	void ReinjectUpdatesFields(AXPBWii& pb, u16* num_updates, u32 updates_addr);
+
+	// 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);
+
+	// Generate a volume ramp from vol1 to vol2, interpolating n volume values.
+	// Uses floating point arithmetic, which isn't exactly what the UCode does,
+	// but this gives better precision and nicer code.
+	void GenerateVolumeRamp(u16* output, u16 vol1, u16 vol2, size_t nvals);
+
+	virtual void HandleCommandList();
+
+	void SetupProcessing(u32 init_addr);
+	void AddToLR(u32 val_addr, bool neg);
+	void AddSubToLR(u32 val_addr);
+	void ProcessPBList(u32 pb_addr);
+	void MixAUXSamples(int aux_id, u32 write_addr, u32 read_addr, u16 volume);
+	void UploadAUXMixLRSC(int aux_id, u32* addresses, u16 volume);
+	void OutputSamples(u32 lr_addr, u32 surround_addr, u16 volume,
+	                   bool upload_auxc);
+	void OutputWMSamples(u32* addresses);	// 4 addresses
 
 private:
-	enum
+	enum CmdType
 	{
-		MAIL_AX_ALIST = 0xBABE0000,
+		CMD_SETUP = 0x00,
+		CMD_ADD_TO_LR = 0x01,
+		CMD_SUB_TO_LR = 0x02,
+		CMD_ADD_SUB_TO_LR = 0x03,
+		CMD_PROCESS = 0x04,
+		CMD_MIX_AUXA = 0x05,
+		CMD_MIX_AUXB = 0x06,
+		CMD_MIX_AUXC = 0x07,
+		CMD_UPL_AUXA_MIX_LRSC = 0x08,
+		CMD_UPL_AUXB_MIX_LRSC = 0x09,
+		CMD_UNK_0A = 0x0A,
+		CMD_OUTPUT = 0x0B,
+		CMD_OUTPUT_DPL2 = 0x0C,
+		CMD_WM_OUTPUT = 0x0D,
+		CMD_END = 0x0E,
 	};
 
-	// PBs
-	u32 m_addressPBs;
-
-	bool wiisportsHack;
-
-	int *templbuffer;
-	int *temprbuffer;
-
-	// ax task message handler
-	bool AXTask(u32& _uMail);
-	void SendMail(u32 _uMail);
+	// A lot of these are similar to the new version, but there is an offset in
+	// the command ids due to the PB_ADDR command (which was removed from the
+	// new AXWii).
+	enum CmdTypeOld
+	{
+		CMD_SETUP_OLD = 0x00,
+		CMD_ADD_TO_LR_OLD = 0x01,
+		CMD_SUB_TO_LR_OLD = 0x02,
+		CMD_ADD_SUB_TO_LR_OLD = 0x03,
+		CMD_PB_ADDR_OLD = 0x04,
+		CMD_PROCESS_OLD = 0x05,
+		CMD_MIX_AUXA_OLD = 0x06,
+		CMD_MIX_AUXB_OLD = 0x07,
+		CMD_MIX_AUXC_OLD = 0x08,
+		CMD_UPL_AUXA_MIX_LRSC_OLD = 0x09,
+		CMD_UPL_AUXB_MIX_LRSC_OLD = 0x0a,
+		CMD_UNK_0B_OLD = 0x0B,
+		CMD_OUTPUT_OLD = 0x0C,	// no volume!
+		CMD_OUTPUT_DPL2_OLD = 0x0D,
+		CMD_WM_OUTPUT_OLD = 0x0E,
+		CMD_END_OLD = 0x0F
+	};
 };
 
 #endif  // _UCODE_AXWII
diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXWii_ADPCM.h b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXWii_ADPCM.h
deleted file mode 100644
index 9130bb9da4..0000000000
--- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXWii_ADPCM.h
+++ /dev/null
@@ -1,92 +0,0 @@
-// Copyright (C) 2003 Dolphin Project.
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, version 2.0.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License 2.0 for more details.
-
-// A copy of the GPL 2.0 should have been included with the program.
-// If not, see http://www.gnu.org/licenses/
-
-// Official SVN repository and contact information can be found at
-// http://code.google.com/p/dolphin-emu/
-
-#ifndef _UCODE_AX_ADPCM_H
-#define _UCODE_AX_ADPCM_H
-
-#include "../../DSP.h"
-
-static inline s16 ADPCM_Step(PBADPCMInfo &adpcm, u32& samplePos, u32 newSamplePos, u16 frac)
-{
-	while (samplePos < newSamplePos)
-	{
-		if ((samplePos & 15) == 0)
-		{
-			adpcm.pred_scale = DSP::ReadARAM((samplePos & ~15) >> 1);
-			samplePos    += 2;
-			newSamplePos += 2;
-		}
-
-		int scale = 1 << (adpcm.pred_scale & 0xF);
-		int coef_idx = (adpcm.pred_scale >> 4) & 7;
-
-		s32 coef1 = adpcm.coefs[coef_idx * 2 + 0];
-		s32 coef2 = adpcm.coefs[coef_idx * 2 + 1];
-
-		int temp = (samplePos & 1) ?
-			   (DSP::ReadARAM(samplePos >> 1) & 0xF) :
-			   (DSP::ReadARAM(samplePos >> 1) >> 4);
-
-		if (temp >= 8)
-			temp -= 16;
-
-		// 0x400 = 0.5 in 11-bit fixed point
-		int val = (scale * temp) + ((0x400 + coef1 * adpcm.yn1 + coef2 * adpcm.yn2) >> 11);
-
-		if (val > 0x7FFF)
-			val = 0x7FFF;
-		else if (val < -0x7FFF)
-			val = -0x7FFF;
-		
-		adpcm.yn2 = adpcm.yn1;
-		adpcm.yn1 = val;
-
-		samplePos++;
-	}
-
-	return adpcm.yn1;
-}
-
-// TODO: WTF is going on here?!?
-// Volume control (ramping)
-static inline u16 ADPCM_Vol(u16 vol, u16 delta)
-{
-	int x = vol;
-	if (delta && delta < 0x5000)
-		x += delta * 20 * 8; // unsure what the right step is
-		//x += 1 * 20 * 8;
-	else if (delta && delta > 0x5000)
-		//x -= (0x10000 - delta); // this is to small, it's often 1
-		x -= (0x10000 - delta) * 20 * 16; // if this was 20 * 8 the sounds in Fire Emblem and Paper Mario
-			// did not have time to go to zero before the were closed
-		//x -= 1 * 20 * 16;
-
-	 // make lower limits
-	if (x < 0) x = 0;	
-	//if (pb.mixer_control < 1000 && x < pb.mixer_control) x = pb.mixer_control; // does this make
-		// any sense?
-
-	// make upper limits
-	//if (mixer_control > 1000 && x > mixer_control) x = mixer_control; // maybe mixer_control also
-		// has a volume target?
-	//if (x >= 0x7fff) x = 0x7fff; // this seems a little high
-	//if (x >= 0x4e20) x = 0x4e20; // add a definitive limit at 20 000
-	if (x >= 0x8000) x = 0x8000; // clamp to 32768;
-	return x; // update volume
-}
-
-#endif  // _UCODE_AX_ADPCM_H
diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXWii_Structs.h b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXWii_Structs.h
deleted file mode 100644
index 7f082740de..0000000000
--- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXWii_Structs.h
+++ /dev/null
@@ -1,365 +0,0 @@
-// Copyright (C) 2003 Dolphin Project.
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, version 2.0.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License 2.0 for more details.
-
-// A copy of the GPL 2.0 should have been included with the program.
-// If not, see http://www.gnu.org/licenses/
-
-// Official SVN repository and contact information can be found at
-// http://code.google.com/p/dolphin-emu/
-
-#ifndef _UCODE_AX_STRUCTS_H
-#define _UCODE_AX_STRUCTS_H
-
-struct PBMixer
-{
-	u16 left;
-	u16 left_delta;
-	u16 right;
-	u16 right_delta;
-
-	u16 unknown3[8];
-	u16 unknown4[6];
-};
-
-struct PBMixerWii
-{
-	// volume mixing values in .15, 0x8000 = ca. 1.0
-	u16 left;
-	u16 left_delta;
-	u16 right;
-	u16 right_delta;
-
-	u16 auxA_left;
-	u16 auxA_left_delta;
-	u16 auxA_right;
-	u16 auxA_right_delta;
-
-	u16 auxB_left;
-	u16 auxB_left_delta;
-	u16 auxB_right;
-	u16 auxB_right_delta;
-
-	// Note: the following elements usage changes a little in DPL2 mode
-	// TODO: implement and comment it in the mixer
-	u16 auxC_left;
-	u16 auxC_left_delta;
-	u16 auxC_right;
-	u16 auxC_right_delta;
-
-	u16 surround;
-	u16 surround_delta;
-	u16 auxA_surround;
-	u16 auxA_surround_delta;
-	u16 auxB_surround;
-	u16 auxB_surround_delta;
-	u16 auxC_surround;
-	u16 auxC_surround_delta;
-};
-
-struct PBMixerWM
-{
-	u16 main0;
-	u16 main0_delta;
-	u16 aux0;
-	u16 aux0_delta;
-
-	u16 main1;
-	u16 main1_delta;
-	u16 aux1;
-	u16 aux1_delta;
-
-	u16 main2;
-	u16 main2_delta;
-	u16 aux2;
-	u16 aux2_delta;
-
-	u16 main3;
-	u16 main3_delta;
-	u16 aux3;
-	u16 aux3_delta;
-};
-
-struct PBInitialTimeDelay
-{
-	u16 on;
-	u16 addrMemHigh;
-	u16 addrMemLow;
-	u16 offsetLeft;
-	u16 offsetRight;
-	u16 targetLeft;
-	u16 targetRight;
-};
-
-// Update data - read these each 1ms subframe and use them!
-// It seems that to provide higher time precisions for MIDI events, some games
-// use this thing to update the parameter blocks per 1ms sub-block (a block is 5ms).
-// Using this data should fix games that are missing MIDI notes.
-struct PBUpdates
-{
-	u16 num_updates[5];
-	u16 data_hi;  // These point to main RAM. Not sure about the structure of the data.
-	u16 data_lo;
-};
-
-// The DSP stores the final sample values for each voice after every frame of processing.
-// The values are then accumulated for all dropped voices, added to the next frame of audio,
-// and ramped down on a per-sample basis to provide a gentle "roll off."
-struct PBDpop
-{
-	s16 unknown[9];
-};
-
-struct PBDpopWii
-{
-	s16 left;
-	s16 auxA_left;
-	s16 auxB_left;
-	s16 auxC_left;
-
-	s16 right;
-	s16 auxA_right;
-	s16 auxB_right;
-	s16 auxC_right;
-
-	s16 surround;
-	s16 auxA_surround;
-	s16 auxB_surround;
-	s16 auxC_surround;
-};
-
-struct PBDpopWM
-{
-	s16 aMain0;
-	s16 aMain1;
-	s16 aMain2;
-	s16 aMain3;
-
-	s16 aAux0;
-	s16 aAux1;
-	s16 aAux2;
-	s16 aAux3;
-};
-
-struct PBVolumeEnvelope
-{
-	u16 cur_volume;			// volume at start of frame
-	s16 cur_volume_delta;	// signed per sample delta (96 samples per frame)
-};
-
-struct PBUnknown2
-{
-	u16 unknown_reserved[3];
-};
-
-struct PBAudioAddr
-{
-	u16 looping;
-	u16 sample_format;
-	u16 loop_addr_hi;  // Start of loop (this will point to a shared "zero" buffer if one-shot mode is active)
-	u16 loop_addr_lo;
-	u16 end_addr_hi;   // End of sample (and loop), inclusive
-	u16 end_addr_lo;
-	u16 cur_addr_hi;
-	u16 cur_addr_lo;
-};
-
-struct PBADPCMInfo
-{
-	s16 coefs[16];
-	u16 gain;
-	u16 pred_scale;
-	s16 yn1;
-	s16 yn2;
-};
-
-struct PBSampleRateConverter
-{
-	// ratio = (f32)ratio * 0x10000;
-	// valid range is 1/512 to 4.0000
-	u16 ratio_hi; // integer part of sampling ratio
-	u16 ratio_lo; // fraction part of sampling ratio
-	u16 cur_addr_frac;
-	u16 last_samples[4];
-};
-
-struct PBSampleRateConverterWM
-{
-	u16 currentAddressFrac;
-	u16 last_samples[4];
-};
-
-struct PBADPCMLoopInfo
-{
-	u16 pred_scale;
-	u16 yn1;
-	u16 yn2;
-};
-
-struct AXPB
-{
-	u16 next_pb_hi;
-	u16 next_pb_lo;
-	u16 this_pb_hi;
-	u16 this_pb_lo;
-
-	u16 src_type;     // Type of sample rate converter (none, ?, linear)
-	u16 coef_select;
-	u16 mixer_control;
-
-	u16 running;       // 1=RUN 0=STOP
-	u16 is_stream;     // 1 = stream, 0 = one shot
-
-	PBMixer mixer;
-	PBInitialTimeDelay initial_time_delay;  
-	PBUpdates updates;
-	PBDpop dpop;
-	PBVolumeEnvelope vol_env;
-	PBUnknown2 unknown3;
-	PBAudioAddr audio_addr;
-	PBADPCMInfo adpcm;
-	PBSampleRateConverter src;
-	PBADPCMLoopInfo adpcm_loop_info;
-	u16 unknown_maybe_padding[3];
-};
-
-struct PBLowPassFilter
-{
-	u16 enabled;
-	u16 yn1;
-	u16 a0;
-	u16 b0;
-};
-
-struct PBBiquadFilter
-{
-
-	u16 on;		// on = 2, off = 0
-	u16 xn1;	// History data
-	u16 xn2;
-	u16 yn1;
-	u16 yn2;
-	u16 b0;		// Filter coefficients
-	u16 b1;
-	u16 b2;
-	u16 a1;
-	u16 a2;
-
-};
-
-union PBInfImpulseResponseWM
-{
-	PBLowPassFilter lpf;
-	PBBiquadFilter biquad;
-};
-
-struct AXPBWii
-{
-	u16 next_pb_hi;
-	u16 next_pb_lo;
-	u16 this_pb_hi;
-	u16 this_pb_lo;
-
-	u16 src_type;		// Type of sample rate converter (none, 4-tap, linear)
-	u16 coef_select;	// coef for the 4-tap src
-	u32 mixer_control;
-
-	u16 running;		// 1=RUN   0=STOP
-	u16 is_stream;		// 1 = stream, 0 = one shot
-
-	PBMixerWii mixer;
-	PBInitialTimeDelay initial_time_delay;
-	PBDpopWii dpop;
-	PBVolumeEnvelope vol_env;
-	PBAudioAddr audio_addr;
-	PBADPCMInfo adpcm;
-	PBSampleRateConverter src;
-	PBADPCMLoopInfo adpcm_loop_info;
-	PBLowPassFilter lpf;
-	PBBiquadFilter biquad;
-
-	// WIIMOTE :D
-	u16 remote;
-	u16 remote_mixer_control;
-
-	PBMixerWM remote_mixer;
-	PBDpopWM remote_dpop;
-	PBSampleRateConverterWM remote_src;
-	PBInfImpulseResponseWM remote_iir;
-
-	u16 pad[12]; // align us, captain! (32B)
-};
-
-// Seems like nintendo used an early version of AXWii and forgot to remove the update functionality ;p
-struct PBUpdatesWiiSports
-{
-	u16 num_updates[3];
-	u16 data_hi;
-	u16 data_lo;
-};
-
-struct AXPBWiiSports
-{
-	u16 next_pb_hi;
-	u16 next_pb_lo;
-	u16 this_pb_hi;
-	u16 this_pb_lo;
-
-	u16 src_type;		// Type of sample rate converter (none, 4-tap, linear)
-	u16 coef_select;	// coef for the 4-tap src
-	u32 mixer_control;
-
-	u16 running;		// 1=RUN   0=STOP
-	u16 is_stream;		// 1 = stream, 0 = one shot
-
-	PBMixerWii mixer;
-	PBInitialTimeDelay initial_time_delay;
-	PBUpdatesWiiSports updates;
-	PBDpopWii dpop;
-	PBVolumeEnvelope vol_env;
-	PBAudioAddr audio_addr;
-	PBADPCMInfo adpcm;
-	PBSampleRateConverter src;
-	PBADPCMLoopInfo adpcm_loop_info;
-	PBLowPassFilter lpf;
-	PBBiquadFilter biquad;
-
-	// WIIMOTE :D
-	u16 remote;
-	u16 remote_mixer_control;
-
-	PBMixerWM remote_mixer;
-	PBDpopWM remote_dpop;
-	PBSampleRateConverterWM remote_src;
-	PBInfImpulseResponseWM remote_iir;
-
-	u16 pad[7]; // align us, captain! (32B)
-};
-
-// TODO: All these enums have changed a lot for wii
-enum {
-    AUDIOFORMAT_ADPCM = 0,
-    AUDIOFORMAT_PCM8  = 0x19,
-	AUDIOFORMAT_PCM16 = 0xA,
-};
-
-enum {
-	SRCTYPE_LINEAR  = 1,
-	SRCTYPE_NEAREST = 2,
-	MIXCONTROL_RAMPING = 8,
-};
-
-// Both may be used at once
-enum {
-	FILTER_LOWPASS = 1,
-	FILTER_BIQUAD = 2,
-};
-
-#endif  // _UCODE_AX_STRUCTS_H
diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXWii_Voice.h b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXWii_Voice.h
deleted file mode 100644
index 55f7face27..0000000000
--- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXWii_Voice.h
+++ /dev/null
@@ -1,271 +0,0 @@
-// Copyright (C) 2003 Dolphin Project.
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, version 2.0.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License 2.0 for more details.
-
-// A copy of the GPL 2.0 should have been included with the program.
-// If not, see http://www.gnu.org/licenses/
-
-// Official SVN repository and contact information can be found at
-// http://code.google.com/p/dolphin-emu/
-
-#ifndef _UCODE_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<class ParamBlockType>
-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_Voice.h b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h
index 76c67d0952..56d736c399 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
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 // 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
@@ -27,15 +14,17 @@
 #endif
 
 #include "Common.h"
-#include "UCode_AX_Structs.h"
+#include "UCode_AXStructs.h"
 #include "../../DSP.h"
-#include "CoreTiming.h"
-#include "Core.h"
+
+#include <functional>
 
 #ifdef AX_GC
 # define PB_TYPE AXPB
+# define MAX_SAMPLES_PER_FRAME 32
 #else
 # define PB_TYPE AXPBWii
+# define MAX_SAMPLES_PER_FRAME 96
 #endif
 
 // Put all of that in an anonymous namespace to avoid stupid compilers merging
@@ -67,13 +56,22 @@ union AXBuffers
 		int* auxC_left;
 		int* auxC_right;
 		int* auxC_surround;
+
+		int* wm_main0;
+		int* wm_aux0;
+		int* wm_main1;
+		int* wm_aux1;
+		int* wm_main2;
+		int* wm_aux2;
+		int* wm_main3;
+		int* wm_aux3;
 #endif
 	};
 
 #ifdef AX_GC
 	int* ptrs[9];
 #else
-	int* ptrs[12];
+	int* ptrs[20];
 #endif
 };
 
@@ -129,6 +127,7 @@ void DumpPB(const PB_TYPE& pb)
 static u32 acc_loop_addr, acc_end_addr;
 static u32* acc_cur_addr;
 static PB_TYPE* acc_pb;
+static bool acc_end_reached;
 
 // Sets up the simulated accelerator.
 void AcceleratorSetup(PB_TYPE* pb, u32* cur_addr)
@@ -137,6 +136,7 @@ void AcceleratorSetup(PB_TYPE* pb, u32* cur_addr)
 	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;
+	acc_end_reached = false;
 }
 
 // Reads a sample from the simulated accelerator. Also handles looping and
@@ -146,6 +146,49 @@ u16 AcceleratorGetSample()
 {
 	u16 ret;
 
+	// 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 & ~1) == (acc_end_addr & ~1))
+	{
+		// loop back to loop_addr.
+		*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;
+
+#ifdef AX_WII
+			// One of the few meaningful differences between AXGC and AXWii:
+			// while AXGC handles non looping voices ending by having 0000
+			// samples at the loop address, AXWii has the 0000 samples
+			// internally in DRAM and use an internal pointer to it (loop addr
+			// does not contain 0000 samples on AXWii!).
+			acc_end_reached = true;
+#endif
+		}
+	}
+
+	// See above for explanations about acc_end_reached.
+	if (acc_end_reached)
+		return 0;
+
 	switch (acc_pb->audio_addr.sample_format)
 	{
 		case 0x00:	// ADPCM
@@ -201,105 +244,159 @@ u16 AcceleratorGetSample()
 			return 0;
 	}
 
-	// Have we reached the end address?
-	//
-	// On real hardware, this would raise an interrupt that is handled by the
-	// UCode. We simulate what this interrupt does here.
-	if (*acc_cur_addr >= acc_end_addr)
-	{
-		// loop back to loop_addr.
-		if (Core::g_CoreStartupParameter.bWii || *acc_cur_addr == acc_end_addr)
-			*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)
+// Reads samples from the input callback, resamples them to <count> samples at
+// the wanted sample rate (computed from the ratio, see below).
+//
+// If srctype is SRCTYPE_POLYPHASE, coefficients need to be provided as well
+// (or the srctype will automatically be changed to LINEAR).
+//
+// Returns the current position after resampling (including fractional part).
+//
+// The input to output ratio is set in <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
+//
+// <curr_pos> is a 32b integer structured in the same way as the ratio: the
+// upper 16 bits are the integer part of the current position in the input
+// stream, and the lower 16 bits are the decimal part.
+//
+// We start getting samples not from sample 0, but 0.<curr_pos_frac>. This
+// avoids discontinuities in the audio stream, especially with very low ratios
+// which interpolate a lot of values between two "real" samples.
+u32 ResampleAudio(std::function<s16(u32)> input_callback, s16* output, u32 count,
+                  s16* last_samples, u32 curr_pos, u32 ratio, int srctype,
+                  const s16* coeffs)
+{
+	int read_samples_count = 0;
+
+	// TODO(delroth): find out why the polyphase resampling algorithm causes
+	// audio glitches in Wii games with non integral ratios.
+
+	// If DSP DROM coefficients are available, support polyphase resampling.
+	if (0) // if (coeffs && srctype == SRCTYPE_POLYPHASE)
+	{
+		s16 temp[4];
+		u32 idx = 0;
+
+		temp[idx++ & 3] = last_samples[0];
+		temp[idx++ & 3] = last_samples[1];
+		temp[idx++ & 3] = last_samples[2];
+		temp[idx++ & 3] = last_samples[3];
+
+		for (u32 i = 0; i < count; ++i)
+		{
+			curr_pos += ratio;
+			while (curr_pos >= 0x10000)
+			{
+				temp[idx++ & 3] = input_callback(read_samples_count++);
+				curr_pos -= 0x10000;
+			}
+
+			u16 curr_pos_frac = ((curr_pos & 0xFFFF) >> 9) << 2;
+			const s16* c = &coeffs[curr_pos_frac];
+
+			s64 t0 = temp[idx++ & 3];
+			s64 t1 = temp[idx++ & 3];
+			s64 t2 = temp[idx++ & 3];
+			s64 t3 = temp[idx++ & 3];
+
+			s64 samp = (t0 * c[0] + t1 * c[1] + t2 * c[2] + t3 * c[3]) >> 15;
+
+			output[i] = (s16)samp;
+		}
+
+		last_samples[3] = temp[--idx & 3];
+		last_samples[2] = temp[--idx & 3];
+		last_samples[1] = temp[--idx & 3];
+		last_samples[0] = temp[--idx & 3];
+	}
+	else if (srctype == SRCTYPE_LINEAR || srctype == SRCTYPE_POLYPHASE)
+	{
+		// This is the circular buffer containing samples to use for the
+		// interpolation. It is initialized with the values from the PB, and it
+		// will be stored back to the PB at the end.
+		s16 temp[4];
+		u32 idx = 0;
+
+		temp[idx++ & 3] = last_samples[0];
+		temp[idx++ & 3] = last_samples[1];
+		temp[idx++ & 3] = last_samples[2];
+		temp[idx++ & 3] = last_samples[3];
+
+		for (u32 i = 0; i < count; ++i)
+		{
+			curr_pos += ratio;
+
+			// While our current position is >= 1.0, push new samples to the
+			// circular buffer.
+			while (curr_pos >= 0x10000)
+			{
+				temp[idx++ & 3] = input_callback(read_samples_count++);
+				curr_pos -= 0x10000;
+			}
+
+			// Get our current fractional position, used to know how much of
+			// curr0 and how much of curr1 the output sample should be.
+			u16 curr_frac = curr_pos & 0xFFFF;
+			u16 inv_curr_frac = -curr_frac;
+
+			// Interpolate! If curr_frac is 0, we can simply take the last
+			// sample without any multiplying.
+			s16 sample;
+			if (curr_frac)
+			{
+				s32 s0 = temp[idx++ & 3];
+				s32 s1 = temp[idx++ & 3];
+
+				sample = ((s0 * inv_curr_frac) + (s1 * curr_frac)) >> 16;
+				idx += 2;
+			}
+			else
+			{
+				sample = temp[idx++ & 3];
+				idx += 3;
+			}
+
+			output[i] = sample;
+		}
+
+		// Update the four last_samples values.
+		last_samples[3] = temp[--idx & 3];
+		last_samples[2] = temp[--idx & 3];
+		last_samples[1] = temp[--idx & 3];
+		last_samples[0] = temp[--idx & 3];
+	}
+	else // SRCTYPE_NEAREST
+	{
+		// No sample rate conversion here: simply read samples from the
+		// accelerator to the output buffer.
+		for (u32 i = 0; i < count; ++i)
+			output[i] = input_callback(i);
+
+		memcpy(last_samples, output + count - 4, 4 * sizeof (u16));
+	}
+
+	return curr_pos;
+}
+
+// Read <count> input samples from ARAM, decoding and converting rate
+// if required.
+void GetInputSamples(PB_TYPE& pb, s16* samples, u16 count, const s16* coeffs)
 {
 	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.<cur_addr_frac>.
-		// 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));
-	}
+	if (coeffs)
+		coeffs += pb.coef_select * 0x200;
+	u32 curr_pos = ResampleAudio([](u32) { return AcceleratorGetSample(); },
+	                             samples, count, pb.src.last_samples,
+	                             pb.src.cur_addr_frac, HILO_TO_32(pb.src.ratio),
+	                             pb.src_type, coeffs);
+	pb.src.cur_addr_frac = (curr_pos & 0xFFFF);
 
 	// Update current position in the PB.
 	pb.audio_addr.cur_addr_hi = (u16)(cur_addr >> 16);
@@ -307,7 +404,7 @@ void GetInputSamples(PB_TYPE& pb, s16* samples)
 }
 
 // Add samples to an output buffer, with optional volume ramping.
-void MixAdd(int* out, const s16* input, u16* pvol, s16* dpop, bool ramp)
+void MixAdd(int* out, const s16* input, u32 count, u16* pvol, s16* dpop, bool ramp)
 {
 	u16& volume = pvol[0];
 	u16 volume_delta = pvol[1];
@@ -318,7 +415,7 @@ void MixAdd(int* out, const s16* input, u16* pvol, s16* dpop, bool ramp)
 	if (!ramp)
 		volume_delta = 0;
 
-	for (u32 i = 0; i < 32; ++i)
+	for (u32 i = 0; i < count; ++i)
 	{
 		s64 sample = input[i];
 		sample *= volume;
@@ -331,62 +428,69 @@ void MixAdd(int* out, const s16* input, u16* pvol, s16* dpop, bool ramp)
 	}
 }
 
-// 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)
+// Execute a low pass filter on the samples using one history value. Returns
+// the new history value.
+s16 LowPassFilter(s16* samples, u32 count, s16 yn1, u16 a0, u16 b0)
+{
+	for (u32 i = 0; i < count; ++i)
+		yn1 = samples[i] = (a0 * (s32)samples[i] + b0 * (s32)yn1) >> 15;
+	return yn1;
+}
+
+// Process 1ms of audio (for AX GC) or 3ms of audio (for AX Wii) from a PB and
+// mix it to the output buffers.
+void ProcessVoice(PB_TYPE& pb, const AXBuffers& buffers, u16 count, AXMixControl mctrl, const s16* coeffs)
 {
 	// 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);
+	s16 samples[MAX_SAMPLES_PER_FRAME];
+	GetInputSamples(pb, samples, count, coeffs);
 
 	// Apply a global volume ramp using the volume envelope parameters.
-	for (u32 i = 0; i < 32; ++i)
+	for (u32 i = 0; i < count; ++i)
 	{
-		s64 sample = 2 * (s16)samples[i] * (s16)pb.vol_env.cur_volume;
-		samples[i] = (s16)(sample >> 16);
+		samples[i] = ((s32)samples[i] * pb.vol_env.cur_volume) >> 15;
 		pb.vol_env.cur_volume += pb.vol_env.cur_volume_delta;
 	}
 
 	// Optionally, execute a low pass filter
 	if (pb.lpf.enabled)
-	{
-		// TODO
-	}
+		pb.lpf.yn1 = LowPassFilter(samples, count, pb.lpf.yn1, pb.lpf.a0, pb.lpf.b0);
 
 	// 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);
+		MixAdd(buffers.left, samples, count, &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);
+		MixAdd(buffers.right, samples, count, &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);
+		MixAdd(buffers.surround, samples, count, &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);
+		MixAdd(buffers.auxA_left, samples, count, &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);
+		MixAdd(buffers.auxA_right, samples, count, &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);
+		MixAdd(buffers.auxA_surround, samples, count, &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);
+		MixAdd(buffers.auxB_left, samples, count, &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);
+		MixAdd(buffers.auxB_right, samples, count, &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);
+		MixAdd(buffers.auxB_surround, samples, count, &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);
+		MixAdd(buffers.auxC_left, samples, count, &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);
+		MixAdd(buffers.auxC_right, samples, count, &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);
+		MixAdd(buffers.auxC_surround, samples, count, &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.
@@ -394,6 +498,47 @@ void Process1ms(PB_TYPE& pb, const AXBuffers& buffers, AXMixControl mctrl)
 	{
 		// TODO
 	}
+
+#ifdef AX_WII
+	// Wiimote mixing.
+	if (pb.remote)
+	{
+		// Old AXWii versions process ms per ms.
+		u16 wm_count = count == 96 ? 18 : 6;
+
+		// Interpolate at most 18 samples from the 96 samples we read before.
+		s16 wm_samples[18];
+
+		// We use ratio 0x55555 == (5 * 65536 + 21845) / 65536 == 5.3333 which
+		// is the nearest we can get to 96/18
+		u32 curr_pos = ResampleAudio([&samples](u32 i) { return samples[i]; },
+		                             wm_samples, wm_count, pb.remote_src.last_samples,
+		                             pb.remote_src.cur_addr_frac, 0x55555,
+		                             SRCTYPE_POLYPHASE, coeffs);
+		pb.remote_src.cur_addr_frac = curr_pos & 0xFFFF;
+
+		// Mix to main[0-3] and aux[0-3]
+#define WMCHAN_MIX_ON(n) ((pb.remote_mixer_control >> (2 * n)) & 3)
+#define WMCHAN_MIX_RAMP(n) ((pb.remote_mixer_control >> (2 * n)) & 2)
+
+		if (WMCHAN_MIX_ON(0))
+			MixAdd(buffers.wm_main0, wm_samples, wm_count, &pb.remote_mixer.main0, &pb.remote_dpop.main0, WMCHAN_MIX_RAMP(0));
+		if (WMCHAN_MIX_ON(1))
+			MixAdd(buffers.wm_aux0, wm_samples, wm_count, &pb.remote_mixer.aux0, &pb.remote_dpop.aux0, WMCHAN_MIX_RAMP(1));
+		if (WMCHAN_MIX_ON(2))
+			MixAdd(buffers.wm_main1, wm_samples, wm_count, &pb.remote_mixer.main1, &pb.remote_dpop.main1, WMCHAN_MIX_RAMP(2));
+		if (WMCHAN_MIX_ON(3))
+			MixAdd(buffers.wm_aux1, wm_samples, wm_count, &pb.remote_mixer.aux1, &pb.remote_dpop.aux1, WMCHAN_MIX_RAMP(3));
+		if (WMCHAN_MIX_ON(4))
+			MixAdd(buffers.wm_main2, wm_samples, wm_count, &pb.remote_mixer.main2, &pb.remote_dpop.main2, WMCHAN_MIX_RAMP(4));
+		if (WMCHAN_MIX_ON(5))
+			MixAdd(buffers.wm_aux2, wm_samples, wm_count, &pb.remote_mixer.aux2, &pb.remote_dpop.aux2, WMCHAN_MIX_RAMP(5));
+		if (WMCHAN_MIX_ON(6))
+			MixAdd(buffers.wm_main3, wm_samples, wm_count, &pb.remote_mixer.main3, &pb.remote_dpop.main3, WMCHAN_MIX_RAMP(6));
+		if (WMCHAN_MIX_ON(7))
+			MixAdd(buffers.wm_aux3, wm_samples, wm_count, &pb.remote_mixer.aux3, &pb.remote_dpop.aux3, WMCHAN_MIX_RAMP(7));
+	}
+#endif
 }
 
 } // namespace
diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_CARD.cpp b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_CARD.cpp
index dcd4e24e3f..bb0d858548 100644
--- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_CARD.cpp
+++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_CARD.cpp
@@ -1,24 +1,12 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "../DSPHLE.h"
 #include "UCodes.h"
 #include "UCode_CARD.h"
 #include "../../DSP.h"
+#include "ConfigManager.h"
 
 
 CUCode_CARD::CUCode_CARD(DSPHLE *dsp_hle, u32 crc)
@@ -44,15 +32,20 @@ void CUCode_CARD::Update(int cycles)
 	}
 }
 
+u32 CUCode_CARD::GetUpdateMs()
+{
+	return SConfig::GetInstance().m_LocalCoreStartupParameter.bWii ? 3 : 5;
+}
+
 void CUCode_CARD::HandleMail(u32 _uMail)
 {
 	if (_uMail == 0xFF000000) // unlock card
 	{
-		//	m_Mails.push(0x00000001); // ACK (actualy anything != 0)
+		//	m_Mails.push(0x00000001); // ACK (actually anything != 0)
 	}
 	else
 	{
-		DEBUG_LOG(DSPHLE, "CUCode_CARD - unknown cmd: %x", _uMail);
+		DEBUG_LOG(DSPHLE, "CUCode_CARD - unknown command: %x", _uMail);
 	}
 
 	m_rMailHandler.PushMail(DSP_DONE);
diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_CARD.h b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_CARD.h
index a6f90124ad..831bf63c8e 100644
--- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_CARD.h
+++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_CARD.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _UCODE_CARD_H
 #define _UCODE_CARD_H
@@ -25,6 +12,7 @@ class CUCode_CARD : public IUCode
 public:
 	CUCode_CARD(DSPHLE *dsp_hle, u32 crc);
 	virtual ~CUCode_CARD();
+	u32 GetUpdateMs();
 
 	void HandleMail(u32 _uMail);
 	void Update(int cycles);
diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_GBA.cpp b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_GBA.cpp
index 42bc18ff49..6490dd9c66 100644
--- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_GBA.cpp
+++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_GBA.cpp
@@ -1,24 +1,12 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "UCodes.h"
 #include "UCode_GBA.h"
 
 #include "../../DSP.h"
+#include "ConfigManager.h"
 
 CUCode_GBA::CUCode_GBA(DSPHLE *dsp_hle, u32 crc)
 : IUCode(dsp_hle, crc)
@@ -40,6 +28,11 @@ void CUCode_GBA::Update(int cycles)
 	}
 }
 
+u32 CUCode_GBA::GetUpdateMs()
+{
+	return SConfig::GetInstance().m_LocalCoreStartupParameter.bWii ? 3 : 5;
+}
+
 void CUCode_GBA::HandleMail(u32 _uMail)
 {
 	static bool nextmail_is_mramaddr = false;
@@ -58,7 +51,8 @@ void CUCode_GBA::HandleMail(u32 _uMail)
 		nextmail_is_mramaddr = false;
 		u32 mramaddr = _uMail;
 
-		struct sec_params_t {
+		struct sec_params_t
+		{
 			u16 key[2];
 			u16 unk1[2];
 			u16 unk2[2];
@@ -122,8 +116,8 @@ void CUCode_GBA::HandleMail(u32 _uMail)
 		*(u32*)HLEMemory_Get_Pointer(sec_params.dest_addr+4) = Common::swap32((x22 << 16) | x23);
 
 		// Done!
-		DEBUG_LOG(DSPHLE, "\n%08x -> key %08x len %08x dest_addr %08x unk1 %08x unk2 %08x"
-			" 22 %04x 23 %04x",
+		DEBUG_LOG(DSPHLE, "\n%08x -> key: %08x, len: %08x, dest_addr: %08x, unk1: %08x, unk2: %08x"
+			" 22: %04x, 23: %04x",
 			mramaddr,
 			*(u32*)sec_params.key, sec_params.length, sec_params.dest_addr,
 			*(u32*)sec_params.unk1, *(u32*)sec_params.unk2,
@@ -143,12 +137,12 @@ void CUCode_GBA::HandleMail(u32 _uMail)
 			m_DSPHLE->SetUCode(UCODE_ROM);
 			break;
 		default:
-			DEBUG_LOG(DSPHLE, "CUCode_GBA - unknown 0xcdd1 cmd: %08x", _uMail);
+			DEBUG_LOG(DSPHLE, "CUCode_GBA - unknown 0xcdd1 command: %08x", _uMail);
 			break;
 		}
 	}
 	else
 	{
-		DEBUG_LOG(DSPHLE, "CUCode_GBA - unknown cmd: %08x", _uMail);
+		DEBUG_LOG(DSPHLE, "CUCode_GBA - unknown command: %08x", _uMail);
 	}
 }
diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_GBA.h b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_GBA.h
index c61917339f..e2e5ddd8bb 100644
--- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_GBA.h
+++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_GBA.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #pragma once
 
@@ -23,6 +10,7 @@ struct CUCode_GBA : public IUCode
 {
 	CUCode_GBA(DSPHLE *dsp_hle, u32 crc);
 	virtual ~CUCode_GBA();
+	u32 GetUpdateMs();
 
 	void HandleMail(u32 _uMail);
 	void Update(int cycles);
diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_InitAudioSystem.cpp b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_InitAudioSystem.cpp
index ae7716012a..1d54f7075c 100644
--- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_InitAudioSystem.cpp
+++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_InitAudioSystem.cpp
@@ -1,22 +1,10 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "UCodes.h"
 #include "UCode_InitAudioSystem.h"
+#include "ConfigManager.h"
 
 CUCode_InitAudioSystem::CUCode_InitAudioSystem(DSPHLE *dsp_hle, u32 crc)
 	: IUCode(dsp_hle, crc)
@@ -26,11 +14,13 @@ CUCode_InitAudioSystem::CUCode_InitAudioSystem(DSPHLE *dsp_hle, u32 crc)
 
 
 CUCode_InitAudioSystem::~CUCode_InitAudioSystem()
-{}
+{
+}
 
 
 void CUCode_InitAudioSystem::Init()
-{}
+{
+}
 
 
 void CUCode_InitAudioSystem::Update(int cycles)
@@ -42,7 +32,13 @@ void CUCode_InitAudioSystem::Update(int cycles)
 	}
 }
 
+u32 CUCode_InitAudioSystem::GetUpdateMs()
+{
+	return SConfig::GetInstance().m_LocalCoreStartupParameter.bWii ? 3 : 5;
+}
+
 void CUCode_InitAudioSystem::HandleMail(u32 _uMail)
-{}
+{
+}
 
 
diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_InitAudioSystem.h b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_InitAudioSystem.h
index 8dc237f1d0..17b74d4b59 100644
--- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_InitAudioSystem.h
+++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_InitAudioSystem.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _UCODE_INITAUDIOSYSTEM
 #define _UCODE_INITAUDIOSYSTEM
@@ -25,6 +12,7 @@ class CUCode_InitAudioSystem : public IUCode
 public:
 	CUCode_InitAudioSystem(DSPHLE *dsp_hle, u32 crc);
 	virtual ~CUCode_InitAudioSystem();
+	u32 GetUpdateMs();
 
 	void HandleMail(u32 _uMail);
 	void Update(int cycles);
diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAXWii.cpp b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAXWii.cpp
deleted file mode 100644
index 40ad6e1947..0000000000
--- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAXWii.cpp
+++ /dev/null
@@ -1,383 +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 "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<std::mutex> 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
deleted file mode 100644
index 4c9bc5757c..0000000000
--- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAXWii.h
+++ /dev/null
@@ -1,80 +0,0 @@
-// Copyright (C) 2003 Dolphin Project.
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, version 2.0.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License 2.0 for more details.
-
-// A copy of the GPL 2.0 should have been included with the program.
-// If not, see http://www.gnu.org/licenses/
-
-// Official Git repository and contact information can be found at
-// http://code.google.com/p/dolphin-emu/
-
-#ifndef _UCODE_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/UCode_ROM.cpp b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_ROM.cpp
index b94486fe9e..1c89a1f8f7 100644
--- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_ROM.cpp
+++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_ROM.cpp
@@ -1,24 +1,12 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "UCodes.h"
 #include "UCode_ROM.h"
 #include "Hash.h"
 #include "../../Memmap.h"
+#include "ConfigManager.h"
 
 CUCode_Rom::CUCode_Rom(DSPHLE *dsp_hle, u32 crc)
 	: IUCode(dsp_hle, crc)
@@ -56,32 +44,32 @@ void CUCode_Rom::HandleMail(u32 _uMail)
 	{
 		switch (m_NextParameter)
 		{
-		    case 0x80F3A001:
-			    m_CurrentUCode.m_RAMAddress = _uMail;
-			    break;
+			case 0x80F3A001:
+				m_CurrentUCode.m_RAMAddress = _uMail;
+				break;
 
-		    case 0x80F3A002:
-			    m_CurrentUCode.m_Length = _uMail & 0xffff;
-			    break;
+			case 0x80F3A002:
+				m_CurrentUCode.m_Length = _uMail & 0xffff;
+				break;
 
-		    case 0x80F3C002:
-			    m_CurrentUCode.m_IMEMAddress = _uMail & 0xffff;
-			    break;
+			case 0x80F3C002:
+				m_CurrentUCode.m_IMEMAddress = _uMail & 0xffff;
+				break;
 
-		    case 0x80F3B002:
-			    m_CurrentUCode.m_DMEMLength = _uMail & 0xffff;
+			case 0x80F3B002:
+				m_CurrentUCode.m_DMEMLength = _uMail & 0xffff;
 				if (m_CurrentUCode.m_DMEMLength) {
 					NOTICE_LOG(DSPHLE,"m_CurrentUCode.m_DMEMLength = 0x%04x.", m_CurrentUCode.m_DMEMLength);
 				}
-			    break;
+				break;
 
-		    case 0x80F3D001:
-		    {
-			    m_CurrentUCode.m_StartPC = _uMail & 0xffff;
-			    BootUCode();
+			case 0x80F3D001:
+			{
+				m_CurrentUCode.m_StartPC = _uMail & 0xffff;
+				BootUCode();
 				return;  // Important! BootUCode indirectly does "delete this;". Must exit immediately.
-		    }
-		    break;
+			}
+			break;
 
 			default:
 			break;
@@ -117,6 +105,11 @@ void CUCode_Rom::BootUCode()
 	m_DSPHLE->SetUCode(ector_crc);
 }
 
+u32 CUCode_Rom::GetUpdateMs()
+{
+	return SConfig::GetInstance().m_LocalCoreStartupParameter.bWii ? 3 : 5;
+}
+
 void CUCode_Rom::DoState(PointerWrap &p)
 {
 	p.Do(m_CurrentUCode);
diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_ROM.h b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_ROM.h
index f1e7b8ec7a..e6dbe80f1e 100644
--- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_ROM.h
+++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_ROM.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _UCODE_ROM
 #define _UCODE_ROM
@@ -25,6 +12,7 @@ class CUCode_Rom : public IUCode
 public:
 	CUCode_Rom(DSPHLE *dsp_hle, u32 _crc);
 	virtual ~CUCode_Rom();
+	u32 GetUpdateMs();
 
 	void HandleMail(u32 _uMail);
 	void Update(int cycles);
diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_Zelda.cpp b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_Zelda.cpp
index 89d0d6dcb2..b1627a0cd7 100644
--- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_Zelda.cpp
+++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_Zelda.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 // Games that uses this UCode:
 // Zelda: The Windwaker, Mario Sunshine, Mario Kart, Twilight Princess,
@@ -27,6 +14,7 @@
 
 #include "WaveFile.h"
 #include "../../DSP.h"
+#include "ConfigManager.h"
 
 
 CUCode_Zelda::CUCode_Zelda(DSPHLE *dsp_hle, u32 _CRC)
@@ -112,7 +100,7 @@ u8 *CUCode_Zelda::GetARAMPointer(u32 address)
 
 void CUCode_Zelda::Update(int cycles)
 {
-	if (!IsLightVersion()) 
+	if (!IsLightVersion())
 	{
 		if (m_rMailHandler.GetNextMail() == DSP_FRAME_END)
 			DSP::GenerateDSPInterruptFromDSPEmu(DSP::INT_DSP);
@@ -227,7 +215,7 @@ void CUCode_Zelda::HandleMail_SMSVersion(u32 _uMail)
 		}
 
 		return;
-    }
+	}
 
 	if (m_bListInProgress)
 	{
@@ -357,7 +345,7 @@ void CUCode_Zelda::HandleMail_NormalVersion(u32 _uMail)
 		}
 
 		return;
-    }
+	}
 
 	if (m_bListInProgress)
 	{
@@ -445,7 +433,7 @@ void CUCode_Zelda::ExecuteList()
 		Sync = CmdMail >> 16;
 
 	DEBUG_LOG(DSPHLE, "==============================================================================");
-	DEBUG_LOG(DSPHLE, "Zelda UCode - execute dlist (cmd: 0x%04x : sync: 0x%04x)", Command, Sync);
+	DEBUG_LOG(DSPHLE, "Zelda UCode - execute dlist (command: 0x%04x : sync: 0x%04x)", Command, Sync);
 
 	switch (Command)
 	{
@@ -453,8 +441,8 @@ void CUCode_Zelda::ExecuteList()
 		case 0x00: break;
 
 		// DsetupTable ... zelda ww jumps to 0x0095
-	    case 0x01:
-	    {
+		case 0x01:
+		{
 			m_NumVoices = ExtraData;
 			m_VoicePBsAddr = Read32() & 0x7FFFFFFF;
 			m_UnkTableAddr = Read32() & 0x7FFFFFFF;
@@ -471,17 +459,17 @@ void CUCode_Zelda::ExecuteList()
 			for (int i = 0; i < 32; i++)
 				m_AFCCoefTable[i] = (s16)Common::swap16(TempPtr[i]);
 
-		    DEBUG_LOG(DSPHLE, "DsetupTable");
+			DEBUG_LOG(DSPHLE, "DsetupTable");
 			DEBUG_LOG(DSPHLE, "Num voice param blocks:             %i", m_NumVoices);
 			DEBUG_LOG(DSPHLE, "Voice param blocks address:         0x%08x", m_VoicePBsAddr);
 
 			// This points to some strange data table. Don't know yet what it's for. Reverb coefs?
-		    DEBUG_LOG(DSPHLE, "DSPRES_FILTER   (size: 0x40):       0x%08x", m_UnkTableAddr);
+			DEBUG_LOG(DSPHLE, "DSPRES_FILTER   (size: 0x40):       0x%08x", m_UnkTableAddr);
 
 			// Zelda WW: This points to a 64-byte array of coefficients, which are EXACTLY the same
 			// as the AFC ADPCM coef array in decode.c of the in_cube winamp plugin,
 			// which can play Zelda audio. So, these should definitely be used when decoding AFC.
-		    DEBUG_LOG(DSPHLE, "DSPADPCM_FILTER (size: 0x500):      0x%08x", m_AFCCoefTableAddr);
+			DEBUG_LOG(DSPHLE, "DSPADPCM_FILTER (size: 0x500):      0x%08x", m_AFCCoefTableAddr);
 			DEBUG_LOG(DSPHLE, "Reverb param blocks address:        0x%08x", m_ReverbPBsAddr);
 		}
 			break;
@@ -500,11 +488,11 @@ void CUCode_Zelda::ExecuteList()
 			m_RightBuffersAddr = Read32() & 0x7FFFFFFF;
 			m_LeftBuffersAddr = Read32() & 0x7FFFFFFF;
 
-		    DEBUG_LOG(DSPHLE, "DsyncFrame");
+			DEBUG_LOG(DSPHLE, "DsyncFrame");
 			// These alternate between three sets of mixing buffers. They are all three fairly near,
 			// but not at, the ADMA read addresses.
-		    DEBUG_LOG(DSPHLE, "Right buffer address:               0x%08x", m_RightBuffersAddr);
-		    DEBUG_LOG(DSPHLE, "Left buffer address:                0x%08x", m_LeftBuffersAddr);
+			DEBUG_LOG(DSPHLE, "Right buffer address:               0x%08x", m_RightBuffersAddr);
+			DEBUG_LOG(DSPHLE, "Left buffer address:                0x%08x", m_LeftBuffersAddr);
 
 			if (IsLightVersion())
 				break;
@@ -525,28 +513,28 @@ void CUCode_Zelda::ExecuteList()
  */
 
 		// DsetDolbyDelay ... zelda ww jumps to 0x00b2
-	    case 0x0d:
-	    {
-		    u32 tmp = Read32();
-		    DEBUG_LOG(DSPHLE, "DSetDolbyDelay");
-		    DEBUG_LOG(DSPHLE, "DOLBY2_DELAY_BUF (size 0x960):      0x%08x", tmp);
-	    }
-		    break;
+		case 0x0d:
+		{
+			u32 tmp = Read32();
+			DEBUG_LOG(DSPHLE, "DSetDolbyDelay");
+			DEBUG_LOG(DSPHLE, "DOLBY2_DELAY_BUF (size 0x960):      0x%08x", tmp);
+		}
+			break;
 
 			// This opcode, in the SMG ucode, sets the base address for audio data transfers from main memory (using DMA).
 			// In the Zelda ucode, it is dummy, because this ucode uses accelerator for audio data transfers.
-	    case 0x0e:
+		case 0x0e:
 			{
 				m_DMABaseAddr = Read32() & 0x7FFFFFFF;
 				DEBUG_LOG(DSPHLE, "DsetDMABaseAddr");
 				DEBUG_LOG(DSPHLE, "DMA base address:                   0x%08x", m_DMABaseAddr);
 			}
-		    break;
+			break;
 
 		// default ... zelda ww jumps to 0x0043
-	    default:
-		    PanicAlert("Zelda UCode - unknown cmd: %x (size %i)", Command, m_numSteps);
-		    break;
+		default:
+			PanicAlert("Zelda UCode - unknown command: %x (size %i)", Command, m_numSteps);
+			break;
 	}
 
 	// sync, we are ready
@@ -565,6 +553,10 @@ void CUCode_Zelda::ExecuteList()
 	}
 }
 
+u32 CUCode_Zelda::GetUpdateMs()
+{
+	return SConfig::GetInstance().m_LocalCoreStartupParameter.bWii ? 3 : 5;
+}
 
 void CUCode_Zelda::DoState(PointerWrap &p)
 {
diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_Zelda.h b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_Zelda.h
index f8a69536c2..29a9678ed2 100644
--- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_Zelda.h
+++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_Zelda.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _UCODE_ZELDA_H
 #define _UCODE_ZELDA_H
@@ -45,30 +32,30 @@ union ZeldaVoicePB
 		u16 volumeLeft2;				// 0x0A | Left Volume 2
 		u16 Unk0B;						// 0x0B | unknown
 
-		u16 SoundType2;                 // 0x0C | "Sound type" 2   (not really sound type)
+		u16 SoundType2;					// 0x0C | "Sound type" 2   (not really sound type)
 		u16 volumeRight1;				// 0x0D | Right Volume 1
 		u16 volumeRight2;				// 0x0E | Right Volume 2
 		u16 Unk0F;						// 0x0F | unknown
 
-		u16 SoundType3;                 // 0x10 | "Sound type" 3   (not really sound type)
+		u16 SoundType3;					// 0x10 | "Sound type" 3   (not really sound type)
 		u16 volumeUnknown1_1;			// 0x11 | Unknown Volume 1
 		u16 volumeUnknown1_2;			// 0x12 | Unknown Volume 1
 		u16 Unk13;						// 0x13 | unknown
 
-		u16 SoundType4;                 // 0x14 | "Sound type" 4   (not really sound type)
+		u16 SoundType4;					// 0x14 | "Sound type" 4   (not really sound type)
 		u16 volumeUnknown2_1;			// 0x15 | Unknown Volume 2
 		u16 volumeUnknown2_2;			// 0x16 | Unknown Volume 2
-		u16 Unk17;                      // 0x17 | unknown
+		u16 Unk17;						// 0x17 | unknown
 
-		u16 Unk18[0x10];                // 0x18 | unknown
-		u16 Unk28;      				// 0x28 | unknown  
-		u16 Unk29;      				// 0x29 | unknown  // multiplied by 0x2a @ 0d21/ZWW
-		u16 Unk2a;      				// 0x2A | unknown  // loaded at 0d2e/ZWW
-		u16 Unk2b;      				// 0x2B | unknown  
-		u16 VolumeMode;      			// 0x2C | unknown  // See 0337/ZWW
-		u16 Unk2D;      				// 0x2D | unknown
-		u16 Unk2E;      				// 0x2E | unknown
-		u16 Unk2F;      				// 0x2F | unknown
+		u16 Unk18[0x10];				// 0x18 | unknown
+		u16 Unk28;						// 0x28 | unknown  
+		u16 Unk29;						// 0x29 | unknown  // multiplied by 0x2a @ 0d21/ZWW
+		u16 Unk2a;						// 0x2A | unknown  // loaded at 0d2e/ZWW
+		u16 Unk2b;						// 0x2B | unknown  
+		u16 VolumeMode;					// 0x2C | unknown  // See 0337/ZWW
+		u16 Unk2D;						// 0x2D | unknown
+		u16 Unk2E;						// 0x2E | unknown
+		u16 Unk2F;						// 0x2F | unknown
 		u16 CurSampleFrac;				// 0x30 | Fractional part of the current sample position
 		u16 Unk31;						// 0x31 | unknown / unused
 		u16 CurBlock;					// 0x32 | current block? used by zelda's AFC decoder. we don't need it.
@@ -85,14 +72,14 @@ union ZeldaVoicePB
 		u16 YN2;						// 0x66 | YN2
 		u16 YN1;						// 0x67 | YN1
 		u16 Unk68[0x10];				// 0x68 | Saved samples from last decode?
-		u16 FilterState1;  				// 0x78 | unknown  // ZWW: 0c84_FilterBufferInPlace loads and stores. Simply, the filter state.
-		u16 FilterState2; 				// 0x79 | unknown  // ZWW: same as above.  these two are active if 0x04a8 != 0.
-		u16 Unk7A;      				// 0x7A | unknown
-		u16 Unk7B;      				// 0x7B | unknown  
-		u16 Unk7C;      				// 0x7C | unknown
-		u16 Unk7D;      				// 0x7D | unknown
-		u16 Unk7E;      				// 0x7E | unknown
-		u16 Unk7F;      				// 0x7F | unknown
+		u16 FilterState1;				// 0x78 | unknown  // ZWW: 0c84_FilterBufferInPlace loads and stores. Simply, the filter state.
+		u16 FilterState2;				// 0x79 | unknown  // ZWW: same as above.  these two are active if 0x04a8 != 0.
+		u16 Unk7A;						// 0x7A | unknown
+		u16 Unk7B;						// 0x7B | unknown  
+		u16 Unk7C;						// 0x7C | unknown
+		u16 Unk7D;						// 0x7D | unknown
+		u16 Unk7E;						// 0x7E | unknown
+		u16 Unk7F;						// 0x7F | unknown
 
 		// Read-only part
 		u16 Format;						// 0x80 | audio format
@@ -109,8 +96,8 @@ union ZeldaVoicePB
 		u32 UnkAddr;					// 0x8E | ???
 		u16 Padding[0x10];				// 0x90 | padding
 		u16 Padding2[0x8];				// 0xa0 | FIR filter coefs of some sort (0xa4 controls the appearance of 0xa5-0xa7 and is almost always 0x7FFF)
-		u16 FilterEnable;               // 0xa8 | FilterBufferInPlace enable
-		u16 Padding3[0x7];              // 0xa9 | padding
+		u16 FilterEnable;				// 0xa8 | FilterBufferInPlace enable
+		u16 Padding3[0x7];				// 0xa9 | padding
 		u16 Padding4[0x10];				// 0xb0 | padding
 	};
 	u16 raw[0xc0]; // WARNING-do not use on parts of the 32-bit values - they are swapped!
@@ -133,6 +120,7 @@ class CUCode_Zelda : public IUCode
 public:
 	CUCode_Zelda(DSPHLE *dsp_hle, u32 _CRC);
 	virtual ~CUCode_Zelda();
+	u32 GetUpdateMs();
 
 	void HandleMail(u32 _uMail);
 	void HandleMail_LightVersion(u32 _uMail);
@@ -142,16 +130,16 @@ public:
 	void Update(int cycles);
 	void MixAdd(short* buffer, int size);
 
-    void CopyPBsFromRAM();
-    void CopyPBsToRAM();
+	void CopyPBsFromRAM();
+	void CopyPBsToRAM();
 
 	void DoState(PointerWrap &p);
 
-    int *templbuffer;
-    int *temprbuffer;
+	int *templbuffer;
+	int *temprbuffer;
 
-    // Simple dump ...
-    int DumpAFC(u8* pIn, const int size, const int srate);
+	// Simple dump ...
+	int DumpAFC(u8* pIn, const int size, const int srate);
 
 	u32 Read32()
 	{
@@ -218,7 +206,6 @@ private:
 	s32* m_LeftBuffer;
 	s32* m_RightBuffer;
 
-
 	// If you add variables, remember to keep DoState() and the constructor up to date.
 
 	s16 m_AFCCoefTable[32];
@@ -261,20 +248,20 @@ private:
 
 	u32 m_readOffset;
 
-    enum EMailState  
-    {
-        WaitForMail,
-        ReadingFrameSync,
-        ReadingMessage,
-        ReadingSystemMsg
-    };
+	enum EMailState
+	{
+		WaitForMail,
+		ReadingFrameSync,
+		ReadingMessage,
+		ReadingSystemMsg
+	};
 
-    EMailState m_MailState;
-    u16 m_PBMask[0x10];
+	EMailState m_MailState;
+	u16 m_PBMask[0x10];
 
-    u32 m_NumPBs;
-    u32 m_PBAddress;   // The main param block array
-    u32 m_PBAddress2;  // 4 smaller param blocks
+	u32 m_NumPBs;
+	u32 m_PBAddress;   // The main param block array
+	u32 m_PBAddress2;  // 4 smaller param blocks
 
 	void ExecuteList();
 
diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_Zelda_ADPCM.cpp b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_Zelda_ADPCM.cpp
index ab808003c1..1fbfaebaba 100644
--- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_Zelda_ADPCM.cpp
+++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_Zelda_ADPCM.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "Common.h"
 #include "UCode_Zelda.h"
@@ -21,61 +8,61 @@
 void CUCode_Zelda::AFCdecodebuffer(const s16 *coef, const char *src, signed short *out, short *histp, short *hist2p, int type)
 {
 	// First 2 nibbles are ADPCM scale etc.
-    short delta = 1 << (((*src) >> 4) & 0xf);
-    short idx = (*src) & 0xf;
-    src++;
+	short delta = 1 << (((*src) >> 4) & 0xf);
+	short idx = (*src) & 0xf;
+	src++;
 
 	short nibbles[16];
-    if (type == 9)
-    {
-        for (int i = 0; i < 16; i += 2)
+	if (type == 9)
+	{
+		for (int i = 0; i < 16; i += 2)
 		{
-            nibbles[i + 0] = *src >> 4;
-            nibbles[i + 1] = *src & 15;
-            src++;
-        }
-        for (int i = 0; i < 16; i++) {
-            if (nibbles[i] >= 8) 
-                nibbles[i] = nibbles[i] - 16;
+			nibbles[i + 0] = *src >> 4;
+			nibbles[i + 1] = *src & 15;
+			src++;
+		}
+		for (int i = 0; i < 16; i++) {
+			if (nibbles[i] >= 8) 
+				nibbles[i] = nibbles[i] - 16;
 			nibbles[i] <<= 11;
-        }
-    }
-    else
-    {
+		}
+	}
+	else
+	{
 		// In Pikmin, Dolphin's engine sound is using AFC type 5, even though such a sound is hard
 		// to compare, it seems like to sound exactly like a real GC
 		// In Super Mario Sunshine, you can get such a sound by talking to/jumping on anyone
-        for (int i = 0; i < 16; i += 4)
-        {
-            nibbles[i + 0] = (*src >> 6) & 0x03;
-            nibbles[i + 1] = (*src >> 4) & 0x03;
-            nibbles[i + 2] = (*src >> 2) & 0x03;
-            nibbles[i + 3] = (*src >> 0) & 0x03;
-            src++;
-        }
+		for (int i = 0; i < 16; i += 4)
+		{
+			nibbles[i + 0] = (*src >> 6) & 0x03;
+			nibbles[i + 1] = (*src >> 4) & 0x03;
+			nibbles[i + 2] = (*src >> 2) & 0x03;
+			nibbles[i + 3] = (*src >> 0) & 0x03;
+			src++;
+		}
 
-        for (int i = 0; i < 16; i++) 
-        {
-            if (nibbles[i] >= 2) 
-                nibbles[i] = nibbles[i] - 4;
+		for (int i = 0; i < 16; i++) 
+		{
+			if (nibbles[i] >= 2) 
+				nibbles[i] = nibbles[i] - 4;
 			nibbles[i] <<= 13;
-        }
-    }
+		}
+	}
 
 	short hist = *histp;
-    short hist2 = *hist2p;
-    for (int i = 0; i < 16; i++)
+	short hist2 = *hist2p;
+	for (int i = 0; i < 16; i++)
 	{
-        int sample = delta * nibbles[i] + ((int)hist * coef[idx * 2]) + ((int)hist2 * coef[idx * 2 + 1]);
-        sample >>= 11;
-        if (sample > 32767)
-            sample = 32767;
-        if (sample < -32768)
-            sample = -32768;
-        out[i] = sample;
-        hist2 = hist;
-        hist = (short)sample;
-    }
+		int sample = delta * nibbles[i] + ((int)hist * coef[idx * 2]) + ((int)hist2 * coef[idx * 2 + 1]);
+		sample >>= 11;
+		if (sample > 32767)
+			sample = 32767;
+		if (sample < -32768)
+			sample = -32768;
+		out[i] = sample;
+		hist2 = hist;
+		hist = (short)sample;
+	}
 	*histp = hist;
-    *hist2p = hist2;
+	*hist2p = hist2;
 } 
diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_Zelda_Synth.cpp b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_Zelda_Synth.cpp
index 9b9da85492..cc7fd68ea0 100644
--- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_Zelda_Synth.cpp
+++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_Zelda_Synth.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include <math.h>
 
@@ -90,7 +77,9 @@ _lRestart:
 		PB.ReachedEnd = 1;
 	}
 	else
+	{
 		PB.RemLength -= pos[1];
+	}
 
 	PB.CurSampleFrac = TrueSamplePosition & 0xFFFF;
 }
@@ -141,7 +130,9 @@ inline u16 AddValueToReg(u32 ar, s32 ix)
 void CUCode_Zelda::RenderSynth_WaveTable(ZeldaVoicePB &PB, s32* _Buffer, int _Size)
 {
 	u16 address;
-	switch(PB.Format) {
+
+	switch(PB.Format)
+	{
 	default:
 	case 0x0004:
 		address = 0x140;
diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_Zelda_Voice.cpp b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_Zelda_Voice.cpp
index 67f354007e..6e590d1a83 100644
--- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_Zelda_Voice.cpp
+++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_Zelda_Voice.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include <sstream>
 
@@ -130,7 +117,8 @@ void CUCode_Zelda::RenderVoice_PCM16(ZeldaVoicePB &PB, s16 *_Buffer, int _Size)
 	{
 		PB.ReachedEnd = 0;
 reached_end:
-		if (!PB.RepeatMode) {
+		if (!PB.RepeatMode)
+		{
 			// One shot - play zeros the rest of the buffer.
 clear_buffer:
 			for (u32 i = 0; i < rem_samples; i++)
@@ -235,7 +223,8 @@ void PrintObject(const T &Obj)
 	CompileTimeAssert<sizeof(ZeldaVoicePB) == 0x180> ensure_zpb_size_correct;
 	(void)ensure_zpb_size_correct;
 
-	for (size_t i = 0; i < sizeof(T); i++) {
+	for (size_t i = 0; i < sizeof(T); i++)
+	{
 		if((i > 0) && ((i & 1) == 0))
 			ss << " ";
 
@@ -256,48 +245,51 @@ void CUCode_Zelda::RenderVoice_AFC(ZeldaVoicePB &PB, s16 *_Buffer, int _Size)
 	int _RealSize = SizeForResampling(PB, _Size, PB.RatioInt);
 
 	// initialize "decoder" if the sample is played the first time
-    if (PB.NeedsReset != 0)
-    {
+	if (PB.NeedsReset != 0)
+	{
 		// This is 0717_ReadOutPBStuff
 		// increment 4fb
-        // zelda: 
-        // perhaps init or "has played before"
-        PB.CurBlock = 0x00;
+		// zelda: 
+		// perhaps init or "has played before"
+		PB.CurBlock = 0x00;
 		PB.YN2 = 0x00;     // history1 
-        PB.YN1 = 0x00;     // history2 
+		PB.YN1 = 0x00;     // history2 
 
 		// Length in samples.
-        PB.RemLength = PB.Length;
-        // Copy ARAM addr from r to rw area.
-        PB.CurAddr = PB.StartAddr;
+		PB.RemLength = PB.Length;
+		// Copy ARAM addr from r to rw area.
+		PB.CurAddr = PB.StartAddr;
 		PB.ReachedEnd = 0;
 		PB.CurSampleFrac = 0;
 
 		for (int i = 0; i < 4; i++) 
 			PB.ResamplerOldData[i] = 0;
-    }
+	}
 
-    if (PB.KeyOff != 0)  // 0747 early out... i dunno if this can happen because we filter it above
+	if (PB.KeyOff != 0)  // 0747 early out... i dunno if this can happen because we filter it above
 	{
 		for (int i = 0; i < _RealSize; i++)
 			*_Buffer++ = 0;
-        return;
+		return;
 	}
 
 	// Round upwards how many samples we need to copy, 0759
-    // u32 frac = NumberOfSamples & 0xF;
-    // NumberOfSamples = (NumberOfSamples + 0xf) >> 4;   // i think the lower 4 are the fraction
+	// u32 frac = NumberOfSamples & 0xF;
+	// NumberOfSamples = (NumberOfSamples + 0xf) >> 4;   // i think the lower 4 are the fraction
 
 	const u8 *source;
 	u32 ram_mask = 1024 * 1024 * 16 - 1;
-	if (IsDMAVersion()) {
+	if (IsDMAVersion())
+	{
 		source = Memory::GetPointer(m_DMABaseAddr);
 		ram_mask = 1024 * 1024 * 64 - 1;
 	}
 	else
+	{
 		source = DSP::GetARAMPtr();
+	}
 
-    int sampleCount = 0;  // must be above restart.
+	int sampleCount = 0;  // must be above restart.
 
 restart:
 	if (PB.ReachedEnd)
@@ -338,17 +330,17 @@ restart:
 	u32 prev_addr = PB.CurAddr;
 
 	// Prefill the decode buffer.
-    AFCdecodebuffer(m_AFCCoefTable, (char*)(source + (PB.CurAddr & ram_mask)), outbuf, (short*)&PB.YN2, (short*)&PB.YN1, PB.Format);
+	AFCdecodebuffer(m_AFCCoefTable, (char*)(source + (PB.CurAddr & ram_mask)), outbuf, (short*)&PB.YN2, (short*)&PB.YN1, PB.Format);
 	PB.CurAddr += PB.Format;  // 9 or 5
 
 	u32 SamplePosition = PB.Length - PB.RemLength;
-    while (sampleCount < _RealSize)
-    {
+	while (sampleCount < _RealSize)
+	{
 		_Buffer[sampleCount] = outbuf[SamplePosition & 15];
 		sampleCount++;
 
 		SamplePosition++;
-	    PB.RemLength--;
+		PB.RemLength--;
 		if (PB.RemLength == 0)
 		{
 			PB.ReachedEnd = 1;
@@ -356,7 +348,8 @@ restart:
 		}
 
 		// Need new samples!
-		if ((SamplePosition & 15) == 0) {
+		if ((SamplePosition & 15) == 0)
+		{
 			prev_yn1 = PB.YN1;
 			prev_yn2 = PB.YN2;
 			prev_addr = PB.CurAddr;
@@ -364,7 +357,7 @@ restart:
 			AFCdecodebuffer(m_AFCCoefTable, (char*)(source + (PB.CurAddr & ram_mask)), outbuf, (short*)&PB.YN2, (short*)&PB.YN1, PB.Format);
 			PB.CurAddr += PB.Format;  // 9 or 5
 		}
-    }
+	}
 
 	// Here we should back off to the previous addr/yn1/yn2, since we didn't consume the full last block.
 	// We'll re-decode it the next time around.
@@ -372,16 +365,16 @@ restart:
 	PB.YN1 = prev_yn1;
 	PB.CurAddr = prev_addr;
 
-    PB.NeedsReset = 0;
+	PB.NeedsReset = 0;
 	// PB.CurBlock = 0x10 - (PB.LoopStartPos & 0xf);
 	// write back
-    // NumberOfSamples = (NumberOfSamples << 4) | frac;    // missing fraction
+	// NumberOfSamples = (NumberOfSamples << 4) | frac;    // missing fraction
 
-    // i think  pTest[0x3a] and pTest[0x3b] got an update after you have decoded some samples...
-    // just decrement them with the number of samples you have played
-    // and increase the ARAM Offset in pTest[0x38], pTest[0x39]
+	// i think  pTest[0x3a] and pTest[0x3b] got an update after you have decoded some samples...
+	// just decrement them with the number of samples you have played
+	// and increase the ARAM Offset in pTest[0x38], pTest[0x39]
 
-    // end of block (Zelda 03b2)
+	// end of block (Zelda 03b2)
 }
 
 void Decoder21_ReadAudio(ZeldaVoicePB &PB, int size, s16 *_Buffer);
@@ -513,7 +506,7 @@ void CUCode_Zelda::RenderAddVoice(ZeldaVoicePB &PB, s32* _LeftBuffer, s32* _Righ
 		Resample(PB, _Size, m_ResampleBuffer + 4, m_VoiceBuffer, true);
 		break;
 
-	case 0x0008:        // PCM8 - normal PCM 8-bit audio. Used in Mario Kart DD + very little in Zelda WW.
+	case 0x0008:		// PCM8 - normal PCM 8-bit audio. Used in Mario Kart DD + very little in Zelda WW.
 		RenderVoice_PCM8(PB, m_ResampleBuffer + 4, _Size);
 		Resample(PB, _Size, m_ResampleBuffer + 4, m_VoiceBuffer, true);
 		break;
@@ -563,12 +556,12 @@ void CUCode_Zelda::RenderAddVoice(ZeldaVoicePB &PB, s32* _LeftBuffer, s32* _Righ
 			WARN_LOG(DSPHLE, "Synthesizing 0x0006 (constant sound)");
 			RenderSynth_Constant(PB, m_VoiceBuffer, _Size);
 			break;
-                        
-  		// These are more "synth" formats - square wave, saw wave etc.
+
+		// These are more "synth" formats - square wave, saw wave etc.
 		case 0x0002:
 			WARN_LOG(DSPHLE, "PB Format 0x02 used!");
 			break;
-                    
+
 		case 0x0004: // Example: Big Pikmin onion mothership landing/building a bridge in Pikmin
 		case 0x0007: // Example: "success" SFX in Pikmin 1, Pikmin 2 in a cave, not sure what sound it is.
 		case 0x000b: // Example: SFX in area selection menu in Pikmin
@@ -596,7 +589,7 @@ ContinueWithBlock:
 
 	for (int i = 0; i < _Size; i++)
 	{
-		
+		// TODO?
 	}
 	
 	// Apply volume. There are two different modes.
@@ -625,12 +618,14 @@ ContinueWithBlock:
 		b00[2] = AX0H * AX1L >> 16;
 		b00[3] = AX0L * AX0H >> 16;
 
-		for (int i = 0; i < 4; i++) {
+		for (int i = 0; i < 4; i++)
+		{
 			b00[i + 4] = (s16)b00[i] * (s16)PB.raw[0x2a] >> 16;
 		}
 
 		int prod = ((s16)PB.raw[0x2a] * (s16)PB.raw[0x29] * 2) >> 16;
-		for (int i = 0; i < 4; i++) {
+		for (int i = 0; i < 4; i++)
+		{
 			b00[i + 8] = (s16)b00[i + 4] * prod;
 		}
 
@@ -639,11 +634,13 @@ ContinueWithBlock:
 		int diff = (s16)PB.raw[0x2b] - (s16)PB.raw[0x2a];
 		PB.raw[0x2a] = PB.raw[0x2b];
 
-		for (int i = 0; i < 4; i++) {
+		for (int i = 0; i < 4; i++)
+		{
 			b00[i + 0xc] = (unsigned short)b00[i] * diff >> 16;
 		}
 
-		for (int i = 0; i < 4; i++) {
+		for (int i = 0; i < 4; i++)
+		{
 			b00[i + 0x10] = (s16)b00[i + 0xc] * PB.raw[0x29];
 		}
 
@@ -682,7 +679,9 @@ ContinueWithBlock:
 				sum += value;
 				addr += 5;
 			}
-			if (sum == 0) {
+
+			if (sum == 0)
+			{
 				PB.KeyOff = 1;
 			}
 		}
@@ -719,7 +718,9 @@ ContinueWithBlock:
 						case 0: _LeftBuffer[i] += (u64)value * ramp >> 29; break;
 						case 1: _RightBuffer[i] += (u64)value * ramp >> 29; break;
 					}
-					if (((i & 1) == 0) && i < 64) {
+
+					if (((i & 1) == 0) && i < 64)
+					{
 						ramp += delta;
 					}
 				}
diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCodes.cpp b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCodes.cpp
index 86773ad020..47981192f3 100644
--- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCodes.cpp
+++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCodes.cpp
@@ -1,25 +1,11 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "UCodes.h"
 
 #include "UCode_AX.h"
 #include "UCode_AXWii.h"
-#include "UCode_NewAXWii.h"
 #include "UCode_Zelda.h"
 #include "UCode_ROM.h"
 #include "UCode_CARD.h"
@@ -27,12 +13,6 @@
 #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)
@@ -40,7 +20,7 @@ IUCode* UCodeFactory(u32 _CRC, DSPHLE *dsp_hle, bool bWii)
 	case UCODE_ROM:
 		INFO_LOG(DSPHLE, "Switching to ROM ucode");
 		return new CUCode_Rom(dsp_hle, _CRC);
-      
+
 	case UCODE_INIT_AUDIO_SYSTEM:
 		INFO_LOG(DSPHLE, "Switching to INIT ucode");
 		return new CUCode_InitAudioSystem(dsp_hle, _CRC);
@@ -81,11 +61,11 @@ IUCode* UCodeFactory(u32 _CRC, DSPHLE *dsp_hle, bool bWii)
 		INFO_LOG(DSPHLE, "CRC %08x: Zelda ucode chosen", _CRC);
 		return new CUCode_Zelda(dsp_hle, _CRC);
 
-      // WII CRCs
+	// WII CRCs
 	case 0xb7eb9a9c: // Wii Pikmin - PAL
 	case 0xeaeb38cc: // Wii Pikmin 2 - PAL
 	case 0x6c3f6f94: // Zelda TP - PAL
-	case 0xd643001f: // Mario Galaxy - PAL / WII DK Jungle Beat - PAL    
+	case 0xd643001f: // Mario Galaxy - PAL / WII DK Jungle Beat - PAL
 		INFO_LOG(DSPHLE, "CRC %08x: Zelda Wii ucode chosen\n", _CRC);
 		return new CUCode_Zelda(dsp_hle, _CRC);
 
@@ -94,16 +74,16 @@ IUCode* UCodeFactory(u32 _CRC, DSPHLE *dsp_hle, bool bWii)
 	case 0x347112ba: // raving rabbits
 	case 0xfa450138: // wii sports - PAL
 	case 0xadbc06bd: // Elebits
-	case 0x4cc52064: // Bleach: Versus Crusade    
-    case 0xd9c4bf34: // WiiMenu
+	case 0x4cc52064: // Bleach: Versus Crusade
+	case 0xd9c4bf34: // WiiMenu
 		INFO_LOG(DSPHLE, "CRC %08x: Wii - AXWii chosen", _CRC);
-		return new AXWII(dsp_hle, _CRC);
+		return new CUCode_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 AXWII(dsp_hle, _CRC);
+			return new CUCode_AXWii(dsp_hle, _CRC);
 		}
 		else
 		{
diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCodes.h b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCodes.h
index 225ac731c0..cd8e8f9552 100644
--- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCodes.h
+++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCodes.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _UCODES_H
 #define _UCODES_H
@@ -92,6 +79,7 @@ public:
 	// Cycles are out of the 81/121mhz the DSP runs at.
 	virtual void Update(int cycles) = 0;
 	virtual void MixAdd(short* buffer, int size) {}
+	virtual u32 GetUpdateMs() = 0;
 
 	virtual void DoState(PointerWrap &p) { DoStateShared(p); }
 
diff --git a/Source/Core/Core/Src/HW/DSPLLE/DSPDebugInterface.cpp b/Source/Core/Core/Src/HW/DSPLLE/DSPDebugInterface.cpp
index 58534f137a..1aa64aa190 100644
--- a/Source/Core/Core/Src/HW/DSPLLE/DSPDebugInterface.cpp
+++ b/Source/Core/Core/Src/HW/DSPLLE/DSPDebugInterface.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "DSPDebugInterface.h"
 
@@ -38,9 +25,11 @@ void DSPDebugInterface::getRawMemoryString(int memory, unsigned int address, cha
 		return;
 	}
 
-	switch (memory) {
+	switch (memory)
+	{
 	case 0:  // IMEM
-		switch (address >> 12) {
+		switch (address >> 12)
+		{
 		case 0:
 		case 0x8:
 			sprintf(dest, "%04x", dsp_imem_read(address));
@@ -51,7 +40,8 @@ void DSPDebugInterface::getRawMemoryString(int memory, unsigned int address, cha
 		}
 		break;
 	case 1:  // DMEM
-		switch (address >> 12) {
+		switch (address >> 12)
+		{
 		case 0:
 		case 1:
 			sprintf(dest, "%04x (DMEM)", dsp_dmem_read(address));
@@ -94,29 +84,39 @@ bool DSPDebugInterface::isBreakpoint(unsigned int address)
 void DSPDebugInterface::setBreakpoint(unsigned int address)
 {
 	int real_addr = DSPSymbols::Line2Addr(address);
-	if (real_addr >= 0) {
+
+	if (real_addr >= 0)
+	{
 		if (dsp_breakpoints.Add(real_addr))
-		{}
+		{
+
+		}
 	}
 }
 
 void DSPDebugInterface::clearBreakpoint(unsigned int address)
 {
 	int real_addr = DSPSymbols::Line2Addr(address);
-	if (real_addr >= 0) {
+	
+	if (real_addr >= 0)
+	{
 		if (dsp_breakpoints.Remove(real_addr))
-		{}
+		{
+
+		}
 	}
 }
 
-void DSPDebugInterface::clearAllBreakpoints() {
+void DSPDebugInterface::clearAllBreakpoints()
+{
 	dsp_breakpoints.Clear();
 }
 
 void DSPDebugInterface::toggleBreakpoint(unsigned int address)
 {
 	int real_addr = DSPSymbols::Line2Addr(address);
-	if (real_addr >= 0) {
+	if (real_addr >= 0)
+	{
 		if (dsp_breakpoints.IsAddressBreakPoint(real_addr))
 			dsp_breakpoints.Remove(real_addr);
 		else
diff --git a/Source/Core/Core/Src/HW/DSPLLE/DSPDebugInterface.h b/Source/Core/Core/Src/HW/DSPLLE/DSPDebugInterface.h
index dafe91f28b..d1d204c9bb 100644
--- a/Source/Core/Core/Src/HW/DSPLLE/DSPDebugInterface.h
+++ b/Source/Core/Core/Src/HW/DSPLLE/DSPDebugInterface.h
@@ -1,3 +1,7 @@
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
+
 #ifndef _DSPDEBUGINTERFACE_H
 #define _DSPDEBUGINTERFACE_H
 
diff --git a/Source/Core/Core/Src/HW/DSPLLE/DSPHost.cpp b/Source/Core/Core/Src/HW/DSPLLE/DSPHost.cpp
index c3bbeb3afb..9349820450 100644
--- a/Source/Core/Core/Src/HW/DSPLLE/DSPHost.cpp
+++ b/Source/Core/Core/Src/HW/DSPLLE/DSPHost.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "Common.h"
 #include "Hash.h"
@@ -89,7 +76,8 @@ u32 DSPHost_CodeLoaded(const u8 *ptr, int size)
 		default: success = false; break;
 	}
 
-	if (!success) {
+	if (!success)
+	{
 		DSPSymbols::AutoDisassembly(0x0, 0x1000);
 	}
 
diff --git a/Source/Core/Core/Src/HW/DSPLLE/DSPLLE.cpp b/Source/Core/Core/Src/HW/DSPLLE/DSPLLE.cpp
index 0b1dfe524d..df43441c03 100644
--- a/Source/Core/Core/Src/HW/DSPLLE/DSPLLE.cpp
+++ b/Source/Core/Core/Src/HW/DSPLLE/DSPLLE.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 
 #include "Common.h"
@@ -74,9 +61,12 @@ void DSPLLE::DoState(PointerWrap &p)
 	p.Do(g_dsp.reg_stack_ptr);
 	p.Do(g_dsp.exceptions);
 	p.Do(g_dsp.external_interrupt_waiting);
-	for (int i = 0; i < 4; i++) {
+
+	for (int i = 0; i < 4; i++)
+	{
 		p.Do(g_dsp.reg_stack[i]);
 	}
+
 	p.Do(g_dsp.iram_crc);
 	p.Do(g_dsp.step_counter);
 	p.Do(g_dsp.ifx_regs);
@@ -270,7 +260,7 @@ void DSPLLE::DSP_WriteMailBoxHigh(bool _CPUMailbox, u16 _uHighMail)
 	}
 	else
 	{
-		ERROR_LOG(DSPLLE, "CPU cant write to DSP mailbox");
+		ERROR_LOG(DSPLLE, "CPU can't write to DSP mailbox");
 	}
 }
 
@@ -282,7 +272,7 @@ void DSPLLE::DSP_WriteMailBoxLow(bool _CPUMailbox, u16 _uLowMail)
 	}
 	else
 	{
-		ERROR_LOG(DSPLLE, "CPU cant write to DSP mailbox");
+		ERROR_LOG(DSPLLE, "CPU can't write to DSP mailbox");
 	}
 }
 
@@ -326,6 +316,11 @@ void DSPLLE::DSP_Update(int cycles)
 	}
 }
 
+u32 DSPLLE::DSP_UpdateRate()
+{
+	return 12600; // TO BE TWEAKED
+}
+
 void DSPLLE::DSP_SendAIBuffer(unsigned int address, unsigned int num_samples)
 {
 	if (!soundStream)
diff --git a/Source/Core/Core/Src/HW/DSPLLE/DSPLLE.h b/Source/Core/Core/Src/HW/DSPLLE/DSPLLE.h
index 456d038c96..05321aee06 100644
--- a/Source/Core/Core/Src/HW/DSPLLE/DSPLLE.h
+++ b/Source/Core/Core/Src/HW/DSPLLE/DSPLLE.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _DSPLLE_H
 #define _DSPLLE_H
@@ -44,6 +31,7 @@ public:
 	virtual void DSP_Update(int cycles);
 	virtual void DSP_StopSoundStream();
 	virtual void DSP_ClearAudioBuffer(bool mute);
+	virtual u32 DSP_UpdateRate();
 
 private:
 	static void dsp_thread(DSPLLE* lpParameter);
diff --git a/Source/Core/Core/Src/HW/DSPLLE/DSPLLEGlobals.cpp b/Source/Core/Core/Src/HW/DSPLLE/DSPLLEGlobals.cpp
index fd05d069e3..a132d10654 100644
--- a/Source/Core/Core/Src/HW/DSPLLE/DSPLLEGlobals.cpp
+++ b/Source/Core/Core/Src/HW/DSPLLE/DSPLLEGlobals.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "Common.h" // for Common::swap
 #include "FileUtil.h"
@@ -37,7 +24,7 @@ void ProfilerAddDelta(int _addr, int _delta)
 	if (g_profile)
 	{
 		g_profileMap[_addr] += _delta;
-	}	
+	}
 }
 
 void ProfilerInit()
diff --git a/Source/Core/Core/Src/HW/DSPLLE/DSPLLEGlobals.h b/Source/Core/Core/Src/HW/DSPLLE/DSPLLEGlobals.h
index 87cb817b9e..eca1e8a245 100644
--- a/Source/Core/Core/Src/HW/DSPLLE/DSPLLEGlobals.h
+++ b/Source/Core/Core/Src/HW/DSPLLE/DSPLLEGlobals.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _GLOBALS_H
 #define _GLOBALS_H
diff --git a/Source/Core/Core/Src/HW/DSPLLE/DSPLLETools.cpp b/Source/Core/Core/Src/HW/DSPLLE/DSPLLETools.cpp
index f025175974..3bc919a17b 100644
--- a/Source/Core/Core/Src/HW/DSPLLE/DSPLLETools.cpp
+++ b/Source/Core/Core/Src/HW/DSPLLE/DSPLLETools.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -43,7 +30,7 @@ bool DumpDSPCode(const u8 *code_be, int size_in_bytes, u32 crc)
 	}
 	else
 	{
-		PanicAlert("Cant open file (%s) to dump UCode!!", binFile);
+		PanicAlert("Can't open file (%s) to dump UCode!!", binFile);
 		return false;
 	}
 
diff --git a/Source/Core/Core/Src/HW/DSPLLE/DSPLLETools.h b/Source/Core/Core/Src/HW/DSPLLE/DSPLLETools.h
index 6593d0ccec..80545a0b25 100644
--- a/Source/Core/Core/Src/HW/DSPLLE/DSPLLETools.h
+++ b/Source/Core/Core/Src/HW/DSPLLE/DSPLLETools.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _DSPLLE_TOOLS_H
 #define _DSPLLE_TOOLS_H
diff --git a/Source/Core/Core/Src/HW/DSPLLE/DSPSymbols.cpp b/Source/Core/Core/Src/HW/DSPLLE/DSPSymbols.cpp
index d682c01381..a813d3c019 100644
--- a/Source/Core/Core/Src/HW/DSPLLE/DSPSymbols.cpp
+++ b/Source/Core/Core/Src/HW/DSPLLE/DSPSymbols.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include <stdarg.h>
 
@@ -64,14 +51,19 @@ const char *GetLineText(int line)
 		return lines[line].c_str();
 	}
 	else
+	{
 		return "----";
+	}
 }
 
 Symbol *DSPSymbolDB::GetSymbolFromAddr(u32 addr)
 {
 	XFuncMap::iterator it = functions.find(addr);
+
 	if (it != functions.end())
+	{
 		return &it->second;
+	}
 	else
 	{
 		for (XFuncMap::iterator iter = functions.begin(); iter != functions.end(); ++iter)
@@ -84,8 +76,10 @@ Symbol *DSPSymbolDB::GetSymbolFromAddr(u32 addr)
 }
 
 // lower case only
-bool IsHexDigit(char c) {
-	switch (c) {
+bool IsHexDigit(char c)
+{
+	switch (c)
+	{
 		case '0':
 		case '1':
 		case '2':
@@ -108,7 +102,8 @@ bool IsHexDigit(char c) {
 	}
 }
 
-bool IsAlpha(char c) {
+bool IsAlpha(char c)
+{
 	return (c >= 'A' && c <= 'Z') ||
 		   (c >= 'a' && c <= 'z');
 }
@@ -165,7 +160,9 @@ bool ReadAnnotatedAssembly(const char *filename)
 						break;
 					}
 				}
-			} else {
+			}
+			else
+			{
 				if (i - first_hex < 3)
 				{
 					first_hex = -1;
@@ -176,10 +173,13 @@ bool ReadAnnotatedAssembly(const char *filename)
 		}
 
 		// Scan for function starts
-		if (!memcmp(line, "void", 4)) {
+		if (!memcmp(line, "void", 4))
+		{
 			char temp[256];
-			for (size_t i = 6; i < len; i++) {
-				if (line[i] == '(') {
+			for (size_t i = 6; i < len; i++)
+			{
+				if (line[i] == '(')
+				{
 					// Yep, got one.
 					memcpy(temp, line + 5, i - 5);
 					temp[i - 5] = 0;
@@ -197,13 +197,15 @@ bool ReadAnnotatedAssembly(const char *filename)
 		}
 
 		// Scan for braces
-		for (size_t i = 0; i < len; i++) {
+		for (size_t i = 0; i < len; i++)
+		{
 			if (line[i] == '{')
 				brace_count++;
 			if (line[i] == '}')
 			{
 				brace_count--;
-				if (brace_count == 0 && symbol_in_progress) {
+				if (brace_count == 0 && symbol_in_progress)
+				{
 					// Commit this symbol.
 					current_symbol.size = last_addr - current_symbol.address + 1;
 					g_dsp_symbol_db.AddCompleteSymbol(current_symbol);
@@ -219,7 +221,8 @@ bool ReadAnnotatedAssembly(const char *filename)
 			sscanf(line + first_hex, "%04x", &hex);
 
 			// Sanity check
-			if (hex > last_addr + 3 || hex < last_addr - 3) {
+			if (hex > last_addr + 3 || hex < last_addr - 3)
+			{
 				static int errors = 0;
 				INFO_LOG(DSPLLE, "Got Insane Hex Digit %04x (%04x) from %s", hex, last_addr, line);
 				errors++;
@@ -269,7 +272,7 @@ void AutoDisassembly(u16 start_addr, u16 end_addr)
 			break;
 		}
 
-		//NOTICE_LOG(DSPLLE, "added %04x %i %s", addr, line_counter, buf.c_str());
+		//NOTICE_LOG(DSPLLE, "Added %04x %i %s", addr, line_counter, buf.c_str());
 		lines.push_back(buf);
 		line_counter++;
 	}
diff --git a/Source/Core/Core/Src/HW/DSPLLE/DSPSymbols.h b/Source/Core/Core/Src/HW/DSPLLE/DSPSymbols.h
index 126bf36386..003475b956 100644
--- a/Source/Core/Core/Src/HW/DSPLLE/DSPSymbols.h
+++ b/Source/Core/Core/Src/HW/DSPLLE/DSPSymbols.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _DSPSYMBOLS_H
 #define _DSPSYMBOLS_H
diff --git a/Source/Core/Core/Src/HW/DVDInterface.cpp b/Source/Core/Core/Src/HW/DVDInterface.cpp
index 57c85a82ed..03a856662e 100644
--- a/Source/Core/Core/Src/HW/DVDInterface.cpp
+++ b/Source/Core/Core/Src/HW/DVDInterface.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "Common.h" // Common
 #include "ChunkFile.h"
@@ -59,7 +46,7 @@ enum DI_InterruptType
 	INT_DEINT		= 0,
 	INT_TCINT		= 1,
 	INT_BRKINT		= 2,
-	INT_CVRINT      = 3,
+	INT_CVRINT		= 3,
 };
 
 // debug commands which may be ORd
@@ -77,14 +64,14 @@ union UDISR
 	u32 Hex;
 	struct
 	{
-		u32 BREAK          :  1;	// Stop the Device + Interrupt
-		u32 DEINITMASK     :  1;	// Access Device Error Int Mask
-		u32 DEINT          :  1;	// Access Device Error Int
-		u32 TCINTMASK      :  1;	// Transfer Complete Int Mask
-		u32 TCINT          :  1;	// Transfer Complete Int
-		u32 BRKINTMASK     :  1;
-		u32 BRKINT         :  1;	// w 1: clear brkint
-		u32                : 25;
+		u32 BREAK			:  1;	// Stop the Device + Interrupt
+		u32 DEINITMASK		:  1;	// Access Device Error Int Mask
+		u32 DEINT			:  1;	// Access Device Error Int
+		u32 TCINTMASK		:  1;	// Transfer Complete Int Mask
+		u32 TCINT			:  1;	// Transfer Complete Int
+		u32 BRKINTMASK		:  1;
+		u32 BRKINT			:  1;	// w 1: clear brkint
+		u32					: 25;
 	};
 	UDISR() {Hex = 0;}
 	UDISR(u32 _hex) {Hex = _hex;}
@@ -96,10 +83,10 @@ union UDICVR
 	u32 Hex;
 	struct
 	{
-		u32 CVR            :  1;	// 0: Cover closed	1: Cover open
-		u32 CVRINTMASK	   :  1;	// 1: Interrupt enabled
-		u32 CVRINT         :  1;	// r 1: Interrupt requested w 1: Interrupt clear
-		u32                : 29;
+		u32 CVR				:  1;	// 0: Cover closed	1: Cover open
+		u32 CVRINTMASK		:  1;	// 1: Interrupt enabled
+		u32 CVRINT			:  1;	// r 1: Interrupt requested w 1: Interrupt clear
+		u32					: 29;
 	};
 	UDICVR() {Hex = 0;}
 	UDICVR(u32 _hex) {Hex = _hex;}
@@ -229,14 +216,14 @@ void ExecuteCommand(UDICR& _DICR);
 
 void DoState(PointerWrap &p)
 {
-	p.Do(m_DISR);
-	p.Do(m_DICVR);
+	p.DoPOD(m_DISR);
+	p.DoPOD(m_DICVR);
 	p.DoArray(m_DICMDBUF, 3);
 	p.Do(m_DIMAR);
 	p.Do(m_DILENGTH);
 	p.Do(m_DICR);
 	p.Do(m_DIIMMBUF);
-	p.Do(m_DICFG);
+	p.DoPOD(m_DICFG);
 
 	p.Do(LoopStart);
 	p.Do(AudioPos);
@@ -409,7 +396,9 @@ bool DVDReadADPCM(u8* _pDestBuffer, u32 _iNumSamples)
 		return true;
 	}
 	else
+	{
 		return false;
+	}
 }
 
 void Read32(u32& _uReturnValue, const u32 _iAddress)
@@ -428,7 +417,7 @@ void Read32(u32& _uReturnValue, const u32 _iAddress)
 	case DI_CONFIG_REGISTER:		_uReturnValue = m_DICFG.Hex; break;
 
 	default:
-		_dbg_assert_(DVDINTERFACE, 0);		
+		_dbg_assert_(DVDINTERFACE, 0);
 		_uReturnValue = 0;
 		break;
 	}
@@ -450,9 +439,14 @@ void Write32(const u32 _iValue, const u32 _iAddress)
 			m_DISR.BRKINTMASK	= tmpStatusReg.BRKINTMASK;
 			m_DISR.BREAK		= tmpStatusReg.BREAK;
 
-			if (tmpStatusReg.DEINT)		m_DISR.DEINT = 0;
-			if (tmpStatusReg.TCINT)		m_DISR.TCINT = 0;
-			if (tmpStatusReg.BRKINT)	m_DISR.BRKINT = 0;
+			if (tmpStatusReg.DEINT)
+				m_DISR.DEINT = 0;
+
+			if (tmpStatusReg.TCINT)
+				m_DISR.TCINT = 0;
+
+			if (tmpStatusReg.BRKINT)
+				m_DISR.BRKINT = 0;
 
 			if (m_DISR.BREAK)
 			{
@@ -463,21 +457,22 @@ void Write32(const u32 _iValue, const u32 _iAddress)
 		}
 		break;
 
-	case DI_COVER_REGISTER:	
+	case DI_COVER_REGISTER:
 		{
 			UDICVR tmpCoverReg(_iValue);
 
 			m_DICVR.CVRINTMASK = tmpCoverReg.CVRINTMASK;
 
-			if (tmpCoverReg.CVRINT)	m_DICVR.CVRINT = 0;
+			if (tmpCoverReg.CVRINT)
+				m_DICVR.CVRINT = 0;
 
 			UpdateInterrupts();
 		}
 		break;
 
-	case DI_COMMAND_0:				m_DICMDBUF[0].Hex = _iValue; break;
-	case DI_COMMAND_1:				m_DICMDBUF[1].Hex = _iValue; break;
-	case DI_COMMAND_2:				m_DICMDBUF[2].Hex = _iValue; break;
+	case DI_COMMAND_0:		m_DICMDBUF[0].Hex = _iValue; break;
+	case DI_COMMAND_1:		m_DICMDBUF[1].Hex = _iValue; break;
+	case DI_COMMAND_2:		m_DICMDBUF[2].Hex = _iValue; break;
 
 	case DI_DMA_ADDRESS_REGISTER:
 		{
@@ -671,7 +666,7 @@ void ExecuteCommand(UDICR& _DICR)
 					// Here is the actual Disk Reading
 					if (!DVDRead(iDVDOffset, m_DIMAR.Address, m_DILENGTH.Length))
 					{
-						PanicAlertT("Cant read from DVD_Plugin - DVD-Interface: Fatal Error");
+						PanicAlertT("Can't read from DVD_Plugin - DVD-Interface: Fatal Error");
 					}
 				}
 				break;
@@ -681,7 +676,7 @@ void ExecuteCommand(UDICR& _DICR)
 				_dbg_assert_(DVDINTERFACE, m_DICMDBUF[2].Hex == m_DILENGTH.Length);
 				_dbg_assert_(DVDINTERFACE, m_DILENGTH.Length == 0x20);
 				if (!DVDRead(m_DICMDBUF[1].Hex, m_DIMAR.Address, m_DILENGTH.Length))
-					PanicAlertT("Cant read from DVD_Plugin - DVD-Interface: Fatal Error");
+					PanicAlertT("Can't read from DVD_Plugin - DVD-Interface: Fatal Error");
 				WARN_LOG(DVDINTERFACE, "Read DiscID %08x", Memory::Read_U32(m_DIMAR.Address));
 				break;
 
@@ -712,17 +707,21 @@ void ExecuteCommand(UDICR& _DICR)
 			/*
 			if (iDVDOffset == 0x84800000)
 			{
-				ERROR_LOG(DVDINTERFACE, "firmware upload");
+				ERROR_LOG(DVDINTERFACE, "Firmware upload");
 			}
 			else*/
 			if ((offset < 0) || ((offset + len) > 0x40) || len > 0x40)
 			{
 				u32 addr = m_DIMAR.Address;
-				if (iDVDOffset == 0x84800000) {
+				if (iDVDOffset == 0x84800000)
+				{
 					ERROR_LOG(DVDINTERFACE, "FIRMWARE UPLOAD");
-				} else {
+				}
+				else
+				{
 					ERROR_LOG(DVDINTERFACE, "ILLEGAL MEDIA WRITE");
 				}
+
 				while (len >= 4)
 				{
 					ERROR_LOG(DVDINTERFACE, "GC-AM Media Board WRITE (0xAA): %08x: %08x", iDVDOffset, Memory::Read_U32(addr));
diff --git a/Source/Core/Core/Src/HW/DVDInterface.h b/Source/Core/Core/Src/HW/DVDInterface.h
index 1fa4d32dec..2eb3b7e377 100644
--- a/Source/Core/Core/Src/HW/DVDInterface.h
+++ b/Source/Core/Core/Src/HW/DVDInterface.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _DVDINTERFACE_H
 #define _DVDINTERFACE_H
diff --git a/Source/Core/Core/Src/HW/EXI.cpp b/Source/Core/Core/Src/HW/EXI.cpp
index 1e86bd1b90..aa3e42c160 100644
--- a/Source/Core/Core/Src/HW/EXI.cpp
+++ b/Source/Core/Core/Src/HW/EXI.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "Common.h"
 #include "ChunkFile.h"
diff --git a/Source/Core/Core/Src/HW/EXI.h b/Source/Core/Core/Src/HW/EXI.h
index 86134eb087..013a049010 100644
--- a/Source/Core/Core/Src/HW/EXI.h
+++ b/Source/Core/Core/Src/HW/EXI.h
@@ -1,19 +1,7 @@
-// Copyright (C) 2003 Dolphin Project.
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
-// 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 _EXIINTERFACE_H
 #define _EXIINTERFACE_H
 
diff --git a/Source/Core/Core/Src/HW/EXI_Channel.cpp b/Source/Core/Core/Src/HW/EXI_Channel.cpp
index f31fc59b3f..13784b4011 100644
--- a/Source/Core/Core/Src/HW/EXI_Channel.cpp
+++ b/Source/Core/Core/Src/HW/EXI_Channel.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "EXI_Channel.h"
 #include "EXI_Device.h"
@@ -149,7 +136,9 @@ void CEXIChannel::Read32(u32& _uReturnValue, const u32 _iRegister)
 			// check if external device is present
 			// pretty sure it is memcard only, not entirely sure
 			if (m_ChannelId == 2)
+			{
 				m_Status.EXT = 0;
+			}
 			else
 			{
 				m_Status.EXT = GetDevice(1)->IsPresent() ? 1 : 0;
@@ -180,13 +169,13 @@ void CEXIChannel::Read32(u32& _uReturnValue, const u32 _iRegister)
 		_uReturnValue = 0xDEADBEEF;
 	}
 
-	DEBUG_LOG(EXPANSIONINTERFACE, "(r32) 0x%08x channel: %i  reg: %s",
+	DEBUG_LOG(EXPANSIONINTERFACE, "(r32) 0x%08x channel: %i  register: %s",
 		_uReturnValue, m_ChannelId, Debug_GetRegisterName(_iRegister));
 }
 
 void CEXIChannel::Write32(const u32 _iValue, const u32 _iRegister)
 {
-	DEBUG_LOG(EXPANSIONINTERFACE, "(w32) 0x%08x channel: %i  reg: %s",
+	DEBUG_LOG(EXPANSIONINTERFACE, "(w32) 0x%08x channel: %i  register: %s",
 		_iValue, m_ChannelId, Debug_GetRegisterName(_iRegister));
 
 	switch (_iRegister)
@@ -195,25 +184,29 @@ void CEXIChannel::Write32(const u32 _iValue, const u32 _iRegister)
 		{
 			UEXI_STATUS newStatus(_iValue);
 
-			m_Status.EXIINTMASK		= newStatus.EXIINTMASK;
-			if (newStatus.EXIINT)	m_Status.EXIINT = 0;
+			m_Status.EXIINTMASK = newStatus.EXIINTMASK;
+			if (newStatus.EXIINT)
+				m_Status.EXIINT = 0;
 
-			m_Status.TCINTMASK		= newStatus.TCINTMASK;
-			if (newStatus.TCINT)	m_Status.TCINT = 0;
+			m_Status.TCINTMASK = newStatus.TCINTMASK;
+			if (newStatus.TCINT)
+				m_Status.TCINT = 0;
 
-			m_Status.CLK			= newStatus.CLK;
+			m_Status.CLK = newStatus.CLK;
 
 			if (m_ChannelId == 0 || m_ChannelId == 1)
 			{
-				m_Status.EXTINTMASK	= newStatus.EXTINTMASK;
-				if (newStatus.EXTINT)	m_Status.EXTINT = 0;
+				m_Status.EXTINTMASK = newStatus.EXTINTMASK;
+
+				if (newStatus.EXTINT)
+					m_Status.EXTINT = 0;
 			}
 
 			if (m_ChannelId == 0)
-				m_Status.ROMDIS		= newStatus.ROMDIS;
+				m_Status.ROMDIS = newStatus.ROMDIS;
 
 			IEXIDevice* pDevice = GetDevice(m_Status.CHIP_SELECT ^ newStatus.CHIP_SELECT);
-			m_Status.CHIP_SELECT	= newStatus.CHIP_SELECT;
+			m_Status.CHIP_SELECT = newStatus.CHIP_SELECT;
 			if (pDevice != NULL)
 				pDevice->SetCS(m_Status.CHIP_SELECT);
 
@@ -222,17 +215,17 @@ void CEXIChannel::Write32(const u32 _iValue, const u32 _iRegister)
 		break;
 
 	case EXI_DMAADDR:
-		INFO_LOG(EXPANSIONINTERFACE, "Wrote DMAAddr, chan %i", m_ChannelId);
+		INFO_LOG(EXPANSIONINTERFACE, "Wrote DMAAddr, channel %i", m_ChannelId);
 		m_DMAMemoryAddress = _iValue;
 		break;
 
 	case EXI_DMALENGTH:
-		INFO_LOG(EXPANSIONINTERFACE, "Wrote DMALength, chan %i", m_ChannelId);
+		INFO_LOG(EXPANSIONINTERFACE, "Wrote DMALength, channel %i", m_ChannelId);
 		m_DMALength = _iValue;
 		break;
 
 	case EXI_DMACONTROL:
-		INFO_LOG(EXPANSIONINTERFACE, "Wrote DMAControl, chan %i", m_ChannelId);
+		INFO_LOG(EXPANSIONINTERFACE, "Wrote DMAControl, channel %i", m_ChannelId);
 		m_Control.Hex = _iValue;
 
 		if (m_Control.TSTART)
@@ -274,7 +267,7 @@ void CEXIChannel::Write32(const u32 _iValue, const u32 _iRegister)
 		break;
 
 	case EXI_IMMDATA:
-		INFO_LOG(EXPANSIONINTERFACE, "Wrote IMMData, chan %i", m_ChannelId);
+		INFO_LOG(EXPANSIONINTERFACE, "Wrote IMMData, channel %i", m_ChannelId);
 		m_ImmData = _iValue;
 		break;
 	}
@@ -282,7 +275,7 @@ void CEXIChannel::Write32(const u32 _iValue, const u32 _iRegister)
 
 void CEXIChannel::DoState(PointerWrap &p)
 {
-	p.Do(m_Status);
+	p.DoPOD(m_Status);
 	p.Do(m_DMAMemoryAddress);
 	p.Do(m_DMALength);
 	p.Do(m_Control);
diff --git a/Source/Core/Core/Src/HW/EXI_Channel.h b/Source/Core/Core/Src/HW/EXI_Channel.h
index dfbd8558f9..ca6cb1e176 100644
--- a/Source/Core/Core/Src/HW/EXI_Channel.h
+++ b/Source/Core/Core/Src/HW/EXI_Channel.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _EXICHANNEL_H
 #define _EXICHANNEL_H
diff --git a/Source/Core/Core/Src/HW/EXI_Device.cpp b/Source/Core/Core/Src/HW/EXI_Device.cpp
index 9fdd9a0cd0..b956859c76 100644
--- a/Source/Core/Core/Src/HW/EXI_Device.cpp
+++ b/Source/Core/Core/Src/HW/EXI_Device.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "Memmap.h"
 
diff --git a/Source/Core/Core/Src/HW/EXI_Device.h b/Source/Core/Core/Src/HW/EXI_Device.h
index 630d6d224a..e2a39154f5 100644
--- a/Source/Core/Core/Src/HW/EXI_Device.h
+++ b/Source/Core/Core/Src/HW/EXI_Device.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _EXIDEVICE_H
 #define _EXIDEVICE_H
diff --git a/Source/Core/Core/Src/HW/EXI_DeviceAD16.cpp b/Source/Core/Core/Src/HW/EXI_DeviceAD16.cpp
index f65749865b..f0e0f96724 100644
--- a/Source/Core/Core/Src/HW/EXI_DeviceAD16.cpp
+++ b/Source/Core/Core/Src/HW/EXI_DeviceAD16.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "../Core.h"
 
diff --git a/Source/Core/Core/Src/HW/EXI_DeviceAD16.h b/Source/Core/Core/Src/HW/EXI_DeviceAD16.h
index 62b7da0592..de97d0d590 100644
--- a/Source/Core/Core/Src/HW/EXI_DeviceAD16.h
+++ b/Source/Core/Core/Src/HW/EXI_DeviceAD16.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _EXIDEVICE_AD16_H
 #define _EXIDEVICE_AD16_H
diff --git a/Source/Core/Core/Src/HW/EXI_DeviceAMBaseboard.cpp b/Source/Core/Core/Src/HW/EXI_DeviceAMBaseboard.cpp
index 762c87a7d4..756fa85f62 100644
--- a/Source/Core/Core/Src/HW/EXI_DeviceAMBaseboard.cpp
+++ b/Source/Core/Core/Src/HW/EXI_DeviceAMBaseboard.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "../Core.h"
 
@@ -70,7 +57,9 @@ void CEXIAMBaseboard::TransferByte(u8& _byte)
 	}
 
 	if ((m_position >= 2) && (m_command[0] == 0 && m_command[1] == 0))
+	{
 		_byte = "\x06\x04\x10\x00"[(m_position-2)&3];
+	}
 	else if (m_position == 3)
 	{
 		unsigned int checksum = (m_command[0] << 24) | (m_command[1] << 16) | (m_command[2] << 8);
@@ -83,6 +72,7 @@ void CEXIAMBaseboard::TransferByte(u8& _byte)
 			check >>= 1;
 			bit >>= 1;
 		}
+
 		if (m_command[3] != (checksum & 0xFF))
 			ERROR_LOG(SP1, "AM-BB cs: %02x, w: %02x", m_command[3], checksum & 0xFF);
 	}
@@ -92,6 +82,7 @@ void CEXIAMBaseboard::TransferByte(u8& _byte)
 		{
 			_byte = 4;
 			ERROR_LOG(SP1, "AM-BB COMMAND: %02x %02x %02x", m_command[0], m_command[1], m_command[2]);
+
 			if ((m_command[0] == 0xFF) && (m_command[1] == 0) && (m_command[2] == 0))
 				m_have_irq = true;
 			else if (m_command[0] == 0x82)
@@ -111,12 +102,14 @@ void CEXIAMBaseboard::TransferByte(u8& _byte)
 				_byte = m_have_irq ? 0xFF : 0;
 				break;
 			default:
-				_dbg_assert_msg_(SP1, 0, "Unknown AM-BB cmd");
+				_dbg_assert_msg_(SP1, 0, "Unknown AM-BB command");
 				break;
 			}
 		}
 		else
+		{
 			_byte = 0xFF;
+		}
 	}
 	DEBUG_LOG(SP1, "AM-BB < %02x", _byte);
 	m_position++;
diff --git a/Source/Core/Core/Src/HW/EXI_DeviceAMBaseboard.h b/Source/Core/Core/Src/HW/EXI_DeviceAMBaseboard.h
index 92a2ac4a8f..7a51a81baa 100644
--- a/Source/Core/Core/Src/HW/EXI_DeviceAMBaseboard.h
+++ b/Source/Core/Core/Src/HW/EXI_DeviceAMBaseboard.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _EXIDEVICE_AMBASEBOARD_H
 #define _EXIDEVICE_AMBASEBOARD_H
diff --git a/Source/Core/Core/Src/HW/EXI_DeviceEthernet.cpp b/Source/Core/Core/Src/HW/EXI_DeviceEthernet.cpp
index 50c7de4cd2..cfb8f37188 100644
--- a/Source/Core/Core/Src/HW/EXI_DeviceEthernet.cpp
+++ b/Source/Core/Core/Src/HW/EXI_DeviceEthernet.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "Memmap.h"
 #include "EXI_Device.h"
@@ -87,11 +74,16 @@ CEXIETHERNET::CEXIETHERNET()
 		for (size_t i = 0; i < mac_addr_setting.size() && x < 12; i++)
 		{
 			char c = mac_addr_setting.at(i);
-			if (c >= '0' && c <= '9') {
+			if (c >= '0' && c <= '9')
+			{
 				mac_addr[x / 2] |= (c - '0') << ((x & 1) ? 0 : 4); x++;
-			} else if (c >= 'A' && c <= 'F') {
+			}
+			else if (c >= 'A' && c <= 'F')
+			{
 				mac_addr[x / 2] |= (c - 'A' + 10) << ((x & 1) ? 0 : 4); x++;
-			} else if (c >= 'a' && c <= 'f') {
+			}
+			else if (c >= 'a' && c <= 'f')
+			{
 				mac_addr[x / 2] |= (c - 'a' + 10) << ((x & 1) ? 0 : 4); x++;
 			}
 		}
@@ -113,7 +105,7 @@ CEXIETHERNET::CEXIETHERNET()
 		memcpy(&mBbaMem[BBA_NAFR_PAR0], mac_addr, 6);
 	}
 
-	// hax .. fully established 100BASE-T link
+	// HACK: .. fully established 100BASE-T link
 	mBbaMem[BBA_NWAYS] = NWAYS_LS100 | NWAYS_LPNWAY | NWAYS_100TXF | NWAYS_ANCLPT;
 
 #if defined(_WIN32)
@@ -175,7 +167,7 @@ void CEXIETHERNET::ImmWrite(u32 data,  u32 size)
 
 		if (transfer.address == BBA_IOB && transfer.region == transfer.MX)
 		{
-			ERROR_LOG(SP1, "Usage of BBA_IOB indicates that the rx packet descriptor has been corrupted, killing dolphin...");
+			ERROR_LOG(SP1, "Usage of BBA_IOB indicates that the rx packet descriptor has been corrupted. Killing Dolphin...");
 			exit(0);
 		}
 
@@ -248,7 +240,7 @@ u32 CEXIETHERNET::ImmRead(u32 size)
 
 void CEXIETHERNET::DMAWrite(u32 addr, u32 size)
 {
-	DEBUG_LOG(SP1, "dma w: %08x %x", addr, size);
+	DEBUG_LOG(SP1, "DMA write: %08x %x", addr, size);
 
 	if (transfer.region == transfer.MX &&
 		transfer.direction == transfer.WRITE &&
@@ -258,7 +250,7 @@ void CEXIETHERNET::DMAWrite(u32 addr, u32 size)
 	}
 	else
 	{
-		ERROR_LOG(SP1, "dma w in %s %s mode - not implemented",
+		ERROR_LOG(SP1, "DMA write in %s %s mode - not implemented",
 			transfer.region == transfer.EXI ? "exi" : "mx",
 			transfer.direction == transfer.READ ? "read" : "write");
 	}
@@ -266,7 +258,7 @@ void CEXIETHERNET::DMAWrite(u32 addr, u32 size)
 
 void CEXIETHERNET::DMARead(u32 addr, u32 size)
 {
-	DEBUG_LOG(SP1, "dma r: %08x %x", addr, size);
+	DEBUG_LOG(SP1, "DMA read: %08x %x", addr, size);
 	
 	memcpy(Memory::GetPointer(addr), &mBbaMem[transfer.address], size);
 
@@ -382,7 +374,7 @@ void CEXIETHERNET::MXCommandHandler(u32 data, u32 size)
 	case BBA_NCRA:
 		if (data & NCRA_RESET)
 		{
-			DEBUG_LOG(SP1, "software reset");
+			DEBUG_LOG(SP1, "Software reset");
 			//MXSoftReset();
 			Activate();
 		}
@@ -400,16 +392,16 @@ void CEXIETHERNET::MXCommandHandler(u32 data, u32 size)
 		// Only start transfer if there isn't one currently running
 		if (!(mBbaMem[BBA_NCRA] & (NCRA_ST0 | NCRA_ST1)))
 		{
-			// Technically transfer dma status is kept in TXDMA - not implemented
+			// Technically transfer DMA status is kept in TXDMA - not implemented
 
 			if (data & NCRA_ST0)
 			{
-				WARN_LOG(SP1, "start tx - local dma");
+				WARN_LOG(SP1, "start tx - local DMA");
 				SendFromPacketBuffer();
 			}
 			else if (data & NCRA_ST1)
 			{
-				DEBUG_LOG(SP1, "start tx - direct fifo");
+				DEBUG_LOG(SP1, "start tx - direct FIFO");
 				SendFromDirectFIFO();
 				// Kind of a hack: send completes instantly, so we don't
 				// actually write the "send in status" bit to the register
@@ -451,7 +443,7 @@ void CEXIETHERNET::DirectFIFOWrite(u8 *data, u32 size)
 	memcpy(tx_fifo + *tx_fifo_count, data, size);
 
 	*tx_fifo_count += size;
-	// TODO not sure this mask is correct.
+	// TODO: not sure this mask is correct.
 	// However, BBA_TXFIFOCNT should never get even close to this amount,
 	// so it shouldn't matter
 	*tx_fifo_count &= (1 << 12) - 1;
@@ -464,7 +456,7 @@ void CEXIETHERNET::SendFromDirectFIFO()
 
 void CEXIETHERNET::SendFromPacketBuffer()
 {
-	ERROR_LOG(SP1, "tx packet buffer not implemented");
+	ERROR_LOG(SP1, "tx packet buffer not implemented.");
 }
 
 void CEXIETHERNET::SendComplete()
@@ -484,7 +476,7 @@ void CEXIETHERNET::SendComplete()
 
 inline u8 CEXIETHERNET::HashIndex(u8 *dest_eth_addr)
 {
-	// Calculate crc
+	// Calculate CRC
 	u32 crc = 0xffffffff;
 
 	for (size_t byte_num = 0; byte_num < 6; ++byte_num)
@@ -496,7 +488,7 @@ inline u8 CEXIETHERNET::HashIndex(u8 *dest_eth_addr)
 			crc <<= 1;
 			cur_byte >>= 1;
 			if (carry)
-				crc = (crc ^ 0x4c11db6) | carry;			
+				crc = (crc ^ 0x4c11db6) | carry;
 		}
 	}
 
@@ -545,7 +537,7 @@ inline void CEXIETHERNET::inc_rwp()
 		(*rwp)++;
 }
 
-// This function is on the critical path for recving data.
+// This function is on the critical path for receiving data.
 // Be very careful about calling into the logger and other slow things
 bool CEXIETHERNET::RecvHandlePacket()
 {
@@ -601,7 +593,7 @@ bool CEXIETHERNET::RecvHandlePacket()
 			if (AUTORCVR)
 				discard bad packet
 			else
-				inc MPC instad of recving packets
+				inc MPC instead of receiving packets
 			*/
 			status |= DESC_FO | DESC_BF;
 			mBbaMem[BBA_IR] |= mBbaMem[BBA_IMR] & INT_RBF;
diff --git a/Source/Core/Core/Src/HW/EXI_DeviceEthernet.h b/Source/Core/Core/Src/HW/EXI_DeviceEthernet.h
index 0ee352eea5..7fb9a5775e 100644
--- a/Source/Core/Core/Src/HW/EXI_DeviceEthernet.h
+++ b/Source/Core/Core/Src/HW/EXI_DeviceEthernet.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _EXIDEVICE_ETHERNET_H
 #define _EXIDEVICE_ETHERNET_H
diff --git a/Source/Core/Core/Src/HW/EXI_DeviceGecko.cpp b/Source/Core/Core/Src/HW/EXI_DeviceGecko.cpp
index 26e220d7cf..2f2d380366 100644
--- a/Source/Core/Core/Src/HW/EXI_DeviceGecko.cpp
+++ b/Source/Core/Core/Src/HW/EXI_DeviceGecko.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include <functional>
 
@@ -222,7 +209,7 @@ void CEXIGecko::ImmReadWrite(u32 &_uData, u32 _uSize)
 		}
 
 	default:
-		ERROR_LOG(EXPANSIONINTERFACE, "Uknown USBGecko command %x", _uData);
+		ERROR_LOG(EXPANSIONINTERFACE, "Unknown USBGecko command %x", _uData);
 		break;
 	}
 }
diff --git a/Source/Core/Core/Src/HW/EXI_DeviceGecko.h b/Source/Core/Core/Src/HW/EXI_DeviceGecko.h
index da055b3c8a..f720a83a5d 100644
--- a/Source/Core/Core/Src/HW/EXI_DeviceGecko.h
+++ b/Source/Core/Core/Src/HW/EXI_DeviceGecko.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _EXIDEVICE_GECKO_H
 #define _EXIDEVICE_GECKO_H
diff --git a/Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp b/Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp
index ec8c29cc77..9402b7bbab 100644
--- a/Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp
+++ b/Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "Common.h"
 #include "CommonPaths.h"
@@ -128,7 +115,7 @@ CEXIIPL::CEXIIPL() :
 	memset(m_RTC, 0, sizeof(m_RTC));
 
 
-    // We Overwrite language selection here since it's possible on the GC to change the language as you please
+	// We Overwrite language selection here since it's possible on the GC to change the language as you please
 	g_SRAM.lang = SConfig::GetInstance().m_LocalCoreStartupParameter.SelectedLanguage;
 
 	WriteProtectMemory(m_pIPL, ROM_SIZE);
diff --git a/Source/Core/Core/Src/HW/EXI_DeviceIPL.h b/Source/Core/Core/Src/HW/EXI_DeviceIPL.h
index bce8fee9ed..3198d0b1bd 100644
--- a/Source/Core/Core/Src/HW/EXI_DeviceIPL.h
+++ b/Source/Core/Core/Src/HW/EXI_DeviceIPL.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _EXIDEVICE_IPL_H
 #define _EXIDEVICE_IPL_H
diff --git a/Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp b/Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp
index 8307c8c3bc..51b3a3a2d6 100644
--- a/Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp
+++ b/Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "Common.h"
 #include "FileUtil.h"
@@ -40,7 +27,7 @@
 
 void CEXIMemoryCard::FlushCallback(u64 userdata, int cyclesLate)
 {
-	// note that userdata is forbidden to be a pointer, due to the implemenation of EventDoState
+	// note that userdata is forbidden to be a pointer, due to the implementation of EventDoState
 	int card_index = (int)userdata;
 	CEXIMemoryCard* pThis = (CEXIMemoryCard*)ExpansionInterface::FindDevice(EXIDEVICE_MEMORYCARD, card_index);
 	if (pThis)
@@ -86,7 +73,7 @@ CEXIMemoryCard::CEXIMemoryCard(const int index)
 	//0x00000510 16Mb "bigben" card
 	//card_id = 0xc243;
  
-	card_id = 0xc221; // It's a nintendo brand memcard
+	card_id = 0xc221; // It's a Nintendo brand memcard
  
 	File::IOFile pFile(m_strFilename, "rb");
 	if (pFile)
@@ -110,7 +97,7 @@ CEXIMemoryCard::CEXIMemoryCard(const int index)
 		memory_card_content = new u8[memory_card_size];
 		GCMemcard::Format(memory_card_content, m_strFilename.find(".JAP.raw") != std::string::npos, nintendo_card_id);
 		memset(memory_card_content+MC_HDR_SIZE, 0xFF, memory_card_size-MC_HDR_SIZE); 
-		WARN_LOG(EXPANSIONINTERFACE, "No memory card found. Will create new.");
+		WARN_LOG(EXPANSIONINTERFACE, "No memory card found. Will create a new one.");
 	}
 	SetCardFlashID(memory_card_content, card_index);
 }
@@ -130,7 +117,9 @@ void innerFlush(FlushData* data)
 	if (!pFile) // Note - pFile changed inside above if
 	{
 		PanicAlertT("Could not write memory card file %s.\n\n"
-			"Are you running Dolphin from a CD/DVD, or is the save file maybe write protected?", data->filename.c_str());
+			"Are you running Dolphin from a CD/DVD, or is the save file maybe write protected?\n\n"
+			"Are you receiving this after moving the emulator directory?\nIf so, then you may "
+			"need to re-specify your memory card location in the options.", data->filename.c_str());
 		return;
 	}
 
@@ -148,6 +137,9 @@ void CEXIMemoryCard::Flush(bool exiting)
 	if(!m_bDirty)
 		return;
 
+	if (!Core::g_CoreStartupParameter.bEnableMemcardSaving)
+		return;
+
 	if (flushThread.joinable())
 	{
 		flushThread.join();
@@ -211,7 +203,9 @@ void CEXIMemoryCard::SetCS(int cs)
 	}
 
 	if (cs)  // not-selected to selected
+	{
 		m_uPosition = 0;
+	}
 	else
 	{	
 		switch (command)
@@ -337,11 +331,11 @@ void CEXIMemoryCard::TransferByte(u8 &byte)
 		{
 		case cmdNintendoID:
 			//
-			// nintendo card:
+			// Nintendo card:
 			// 00 | 80 00 00 00 10 00 00 00 
 			// "bigben" card:
 			// 00 | ff 00 00 05 10 00 00 00 00 00 00 00 00 00 00
-			// we do it the nintendo way.
+			// we do it the Nintendo way.
 			if (m_uPosition == 1)
 				byte = 0x80; // dummy cycle
 			else
diff --git a/Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.h b/Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.h
index 33b94ca530..2ccef0aeab 100644
--- a/Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.h
+++ b/Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _EXI_DEVICEMEMORYCARD_H
 #define _EXI_DEVICEMEMORYCARD_H
diff --git a/Source/Core/Core/Src/HW/EXI_DeviceMic.cpp b/Source/Core/Core/Src/HW/EXI_DeviceMic.cpp
index f1266d4c45..4a5b3cc0ae 100644
--- a/Source/Core/Core/Src/HW/EXI_DeviceMic.cpp
+++ b/Source/Core/Core/Src/HW/EXI_DeviceMic.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "Common.h"
 
diff --git a/Source/Core/Core/Src/HW/EXI_DeviceMic.h b/Source/Core/Core/Src/HW/EXI_DeviceMic.h
index b9596ba85a..093424df25 100644
--- a/Source/Core/Core/Src/HW/EXI_DeviceMic.h
+++ b/Source/Core/Core/Src/HW/EXI_DeviceMic.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _EXI_DEVICEMIC_H
 #define _EXI_DEVICEMIC_H
diff --git a/Source/Core/Core/Src/HW/GCMemcard.cpp b/Source/Core/Core/Src/HW/GCMemcard.cpp
index a2c9690b4e..a13cdb4a2c 100644
--- a/Source/Core/Core/Src/HW/GCMemcard.cpp
+++ b/Source/Core/Core/Src/HW/GCMemcard.cpp
@@ -1,19 +1,7 @@
-// Copyright (C) 2003 Dolphin Project.
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
-// 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 "GCMemcard.h"
 #include "ColorUtil.h"
 static void ByteSwap(u8 *valueA, u8 *valueB)
@@ -63,7 +51,7 @@ void decodeCI8image(u32* dst, u8* src, u16* pal, int width, int height)
 GCMemcard::GCMemcard(const char *filename, bool forceCreation, bool sjis)
 	: m_valid(false)
 	, m_fileName(filename)
-{ 
+{
 	File::IOFile mcdFile(m_fileName, "r+b");
 	if (!mcdFile.IsOpen())
 	{
@@ -303,19 +291,24 @@ u32  GCMemcard::TestChecksums() const
 	u32 results = 0;
 
 	calc_checksumsBE((u16*)&hdr, 0xFE , &csum, &csum_inv);
-	if ((hdr.Checksum != csum) || (hdr.Checksum_Inv != csum_inv)) results |= 1;
+	if ((hdr.Checksum != csum) || (hdr.Checksum_Inv != csum_inv))
+		results |= 1;
 
 	calc_checksumsBE((u16*)&dir, 0xFFE, &csum, &csum_inv);
-	if ((dir.Checksum != csum) || (dir.Checksum_Inv != csum_inv)) results |= 2;
+	if ((dir.Checksum != csum) || (dir.Checksum_Inv != csum_inv))
+		results |= 2;
 
 	calc_checksumsBE((u16*)&dir_backup, 0xFFE, &csum, &csum_inv);
-	if ((dir_backup.Checksum != csum) || (dir_backup.Checksum_Inv != csum_inv)) results |= 4;
+	if ((dir_backup.Checksum != csum) || (dir_backup.Checksum_Inv != csum_inv))
+		results |= 4;
 
 	calc_checksumsBE((u16*)(((u8*)&bat)+4), 0xFFE, &csum, &csum_inv);
-	if ((bat.Checksum != csum) || (bat.Checksum_Inv != csum_inv)) results |= 8;
+	if ((bat.Checksum != csum) || (bat.Checksum_Inv != csum_inv))
+		results |= 8;
 
 	calc_checksumsBE((u16*)(((u8*)&bat_backup)+4), 0xFFE, &csum, &csum_inv);
-	if ((bat_backup.Checksum != csum) || (bat_backup.Checksum_Inv != csum_inv)) results |= 16;
+	if ((bat_backup.Checksum != csum) || (bat_backup.Checksum_Inv != csum_inv))
+		results |= 16;
 
 	return results;
 }
@@ -352,7 +345,6 @@ u8 GCMemcard::GetFileIndex(u8 fileNumber) const
 {
 	if (m_valid)
 	{
-
 		u8 j = 0;
 		for (u8 i = 0; i < DIRLEN; i++)
 		{
@@ -399,6 +391,7 @@ bool GCMemcard::GCI_FileName(u8 index, std::string &filename) const
 {
 	if (!m_valid || index > DIRLEN || (BE32(CurrentDir->Dir[index].Gamecode) == 0xFFFFFFFF))
 		return false;
+
 	filename = std::string((char*)CurrentDir->Dir[index].Gamecode, 4) + '_' + (char*)CurrentDir->Dir[index].Filename + ".gci";
 	return true;
 }
@@ -410,6 +403,7 @@ std::string GCMemcard::DEntry_GameCode(u8 index) const
 {
 	if (!m_valid || index > DIRLEN)
 		return "";
+
 	return std::string((const char*)CurrentDir->Dir[index].Gamecode, 4);
 }
 
@@ -439,6 +433,7 @@ std::string GCMemcard::DEntry_FileName(u8 index) const
 {
 	if (!m_valid || index > DIRLEN)
 		return "";
+
 	return std::string((const char*)CurrentDir->Dir[index].Filename, DENTRY_STRLEN);
 }
 
@@ -446,6 +441,7 @@ u32 GCMemcard::DEntry_ModTime(u8 index) const
 {
 	if (!m_valid || index > DIRLEN)
 		return 0xFFFFFFFF;
+
 	return BE32(CurrentDir->Dir[index].ModTime);
 }
 
@@ -453,6 +449,7 @@ u32 GCMemcard::DEntry_ImageOffset(u8 index) const
 {
 	if (!m_valid || index > DIRLEN)
 		return 0xFFFFFFFF;
+
 	return BE32(CurrentDir->Dir[index].ImageOffset);
 }
 
@@ -460,6 +457,7 @@ std::string GCMemcard::DEntry_IconFmt(u8 index) const
 {
 	if (!m_valid || index > DIRLEN)
 		return "";
+
 	int x = CurrentDir->Dir[index].IconFmt[0];
 	std::string format;
 	for(int i = 0; i < 16; i++)
@@ -475,6 +473,7 @@ std::string GCMemcard::DEntry_AnimSpeed(u8 index) const
 {
 	if (!m_valid || index > DIRLEN)
 		return "";
+
 	int x = CurrentDir->Dir[index].AnimSpeed[0];
 	std::string speed;
 	for(int i = 0; i < 16; i++)
@@ -490,6 +489,7 @@ std::string GCMemcard::DEntry_Permissions(u8 index) const
 {
 	if (!m_valid || index > DIRLEN)
 		return "";
+
 	u8 Permissions = CurrentDir->Dir[index].Permissions;
 	std::string permissionsString;
 	permissionsString.push_back((Permissions & 16) ? 'x' : 'M');
@@ -502,6 +502,7 @@ u8 GCMemcard::DEntry_CopyCounter(u8 index) const
 {
 	if (!m_valid || index > DIRLEN)
 		return 0xFF;
+
 	return CurrentDir->Dir[index].CopyCounter;
 }
 
@@ -529,6 +530,7 @@ u32 GCMemcard::DEntry_CommentsAddress(u8 index) const
 {
 	if (!m_valid || index > DIRLEN)
 		return 0xFFFF;
+
 	return BE32(CurrentDir->Dir[index].CommentsAddr);
 }
 
@@ -565,6 +567,7 @@ bool GCMemcard::GetDEntry(u8 index, DEntry &dest) const
 {
 	if (!m_valid || index > DIRLEN)
 		return false;
+
 	dest = CurrentDir->Dir[index];
 	return true;
 }
@@ -573,6 +576,7 @@ u16 GCMemcard::BlockAlloc::GetNextBlock(u16 Block) const
 {
 	if ((Block < MC_FST_BLOCKS) || (Block > 4091))
 		return 0;
+
 	return Common::swap16(Map[Block-MC_FST_BLOCKS]);
 }
 
@@ -583,6 +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 = MC_FST_BLOCKS; i < StartingBlock; ++i)
 			if (Map[i-MC_FST_BLOCKS] == 0)
 				return i;
@@ -1328,8 +1333,11 @@ void GCMemcard::CARD_GetSerialNo(u32 *serial1,u32 *serial2)
 /* FZEROGX_MakeSaveGameValid                                 */
 /* (use just before writing a F-Zero GX system .gci file)    */
 /*                                                           */
-/* chn: Destination memory card port                         */
-/* ret: Error code                                           */
+/* Parameters:                                               */
+/*    direntry:   [Description needed]                       */
+/*    FileBuffer: [Description needed]                       */
+/*                                                           */
+/* Returns: Error code                                       */
 /*************************************************************/
 
 s32 GCMemcard::FZEROGX_MakeSaveGameValid(DEntry& direntry, std::vector<GCMBlock> &FileBuffer)
@@ -1346,7 +1354,7 @@ s32 GCMemcard::FZEROGX_MakeSaveGameValid(DEntry& direntry, std::vector<GCMBlock>
 	CARD_GetSerialNo(&serial1,&serial2);
 
 	// set new serial numbers
-	*(u16*)&FileBuffer[1].block[0x0066] = BE16(BE32(serial1) >> 16);			
+	*(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);
@@ -1364,17 +1372,20 @@ s32 GCMemcard::FZEROGX_MakeSaveGameValid(DEntry& direntry, std::vector<GCMBlock>
 	}
 
 	// set new checksum
-	*(u16*)&FileBuffer[0].block[0x00] = BE16(~chksum);				
+	*(u16*)&FileBuffer[0].block[0x00] = BE16(~chksum);
 
 	return 1;
 }
 
 /***********************************************************/
-/* PSO_MakeSaveGameValid	                           */
+/* PSO_MakeSaveGameValid                                   */
 /* (use just before writing a PSO system .gci file)        */
 /*                                                         */
-/* chn: Destination memory card port                       */
-/* ret: Error code                                         */
+/* Parameters:                                             */
+/*    direntry:   [Description needed]                     */
+/*    FileBuffer: [Description needed]                     */
+/*                                                         */
+/* Returns: Error code                                     */
 /***********************************************************/
 
 s32 GCMemcard::PSO_MakeSaveGameValid(DEntry& direntry, std::vector<GCMBlock> &FileBuffer)
@@ -1391,13 +1402,13 @@ s32 GCMemcard::PSO_MakeSaveGameValid(DEntry& direntry, std::vector<GCMBlock> &Fi
 		// check for PSO3 system file
 		if (strcmp((char*)direntry.Filename,"PSO3_SYSTEM")==0)
 		{
-			// PSO3 data block size adjustment				
+			// PSO3 data block size adjustment
 			pso3offset = 0x10;
 		}
 		else
 		{
 			// nothing to do
-			return 0;							
+			return 0;
 		}
 	}
 
@@ -1410,28 +1421,30 @@ s32 GCMemcard::PSO_MakeSaveGameValid(DEntry& direntry, std::vector<GCMBlock> &Fi
 
 	// generate crc32 LUT
 	for (i=0; i < 256; i++)
-	{								
+	{
 		chksum = i;
-       		for (j=8; j > 0; j--)
+			for (j=8; j > 0; j--)
 			{
-				if (chksum&1) chksum = (chksum>>1)^0xEDB88320;
-       			else chksum >>= 1;
+				if (chksum & 1)
+					chksum = (chksum>>1)^0xEDB88320;
+				else
+					chksum >>= 1;
 			}
 
-       		crc32LUT[i] = chksum;
+			crc32LUT[i] = chksum;
 	}
 
 	// PSO initial crc32 value
-	chksum = 0xDEBB20E3;								
+	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);			
+	*(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 557187b384..a25d8daacb 100644
--- a/Source/Core/Core/Src/HW/GCMemcard.h
+++ b/Source/Core/Core/Src/HW/GCMemcard.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef __GCMEMCARD_h__
 #define __GCMEMCARD_h__
@@ -104,7 +91,8 @@ private:
 		u8 Unused2[7680];	//0x0200	0x1e00	unused (0xff)
 	} hdr;
 
-	struct DEntry {
+	struct DEntry
+	{
 		u8 Gamecode[4];		//0x00		0x04	Gamecode
 		u8 Makercode[2];	//0x04		0x02	Makercode
 		u8 Unused1;			//0x06		0x01	reserved/unused (always 0xff, has no effect)
@@ -113,12 +101,12 @@ private:
 							//		2		Icon Animation 0: forward 1: ping-pong
 							//		1		[--0: No Banner 1: Banner present--] WRONG! YAGCD LIES!
 							//		0		[--Banner Color 0: RGB5A3 1: CI8--]  WRONG! YAGCD LIES!
-							//      bits 0 and 1: image format
+							//		bits 0 and 1: image format
 							//		00 no banner
 							//		01 CI8 banner
 							//		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
 		u8 ImageOffset[4];	//0x2c		0x04	image data offset
@@ -128,20 +116,20 @@ private:
 							//		01	CI8 with a shared color palette after the last frame
 							//		10	RGB5A3
 							//		11	CI8 with a unique color palette after itself
-							// 	 	
+							//
 		u8 AnimSpeed[2];	//0x32		0x02	animation speed (2bits per icon) (*1)
 							//		bits	Description
 							//		00	no icon
 							//		01	Icon lasts for 4 frames
 							//		10	Icon lasts for 8 frames
 							//		11	Icon lasts for 12 frames
-							// 	 	
+							//
 		u8 Permissions;		//0x34		0x01	file-permissions
 							//		bit	permission	Description
 							//		4	no move		File cannot be moved by the IPL
 							//		3	no copy		File cannot be copied by the IPL
 							//		2	public		Can be read by any game
-							//	 	
+							//
 		u8 CopyCounter;		//0x35		0x01	copy counter (*2)
 		u8 FirstBlock[2];	//0x36		0x02	block no of first block of file (0 == offset 0)
 		u8 BlockCount[2];	//0x38		0x02	file-length (number of blocks in file)
@@ -149,8 +137,9 @@ private:
 		u8 CommentsAddr[4];	//0x3c		0x04	Address of the two comments within the file data (*3)
 	};
 
-	struct Directory {
-		DEntry Dir[DIRLEN];	//0x0000	 	Directory Entries (max 127)
+	struct Directory
+	{
+		DEntry Dir[DIRLEN];	//0x0000		Directory Entries (max 127)
 		u8 Padding[0x3a];
 		u16 UpdateCounter;	//0x1ffa	2	update Counter
 		u16 Checksum;		//0x1ffc	2	Additive Checksum
@@ -158,7 +147,8 @@ private:
 	} dir, dir_backup;
 
 	Directory *CurrentDir, *PreviousDir;
-	struct BlockAlloc {
+	struct BlockAlloc
+	{
 		u16 Checksum;			//0x0000	2	Additive Checksum
 		u16 Checksum_Inv;		//0x0002	2	Inverse Checksum
 		u16 UpdateCounter;		//0x0004	2	update Counter
diff --git a/Source/Core/Core/Src/HW/GCPad.cpp b/Source/Core/Core/Src/HW/GCPad.cpp
index c4798b3964..9862c1b347 100644
--- a/Source/Core/Core/Src/HW/GCPad.cpp
+++ b/Source/Core/Core/Src/HW/GCPad.cpp
@@ -1,19 +1,6 @@
-// Copyright (C) 2010 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "Common.h"
 #include "GCPadStatus.h"
@@ -23,6 +10,7 @@
 #include "../ConfigManager.h"
 
 #include "../../InputCommon/Src/InputConfig.h"
+#include "Host.h"
 
 namespace Pad
 {
@@ -89,9 +77,11 @@ void GetStatus(u8 _numPAD, SPADStatus* _pPADStatus)
 }
 
 // __________________________________________________________________________________________________
-// Function: PAD_Rumble
+// Function: Rumble
 // Purpose:  Pad rumble!
-// input:	 PAD number, Command type (Stop=0, Rumble=1, Stop Hard=2) and strength of Rumble
+// input:    _numPad    - Which pad to rumble.
+//           _uType     - Command type (Stop=0, Rumble=1, Stop Hard=2).
+//           _uStrength - Strength of the Rumble
 // output:   none
 //
 void Rumble(u8 _numPAD, unsigned int _uType, unsigned int _uStrength)
@@ -116,8 +106,9 @@ void Rumble(u8 _numPAD, unsigned int _uType, unsigned int _uStrength)
 // __________________________________________________________________________________________________
 // 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
+// input:    _numPAD    - The pad to operate on 
+//           _uType     - 06 = Motor On, 04 = Motor Off
+//           _uStrength - 00 = Left Strong, 127 = Left Weak, 128 = Right Weak, 255 = Right Strong
 // output:   none
 //
 void Motor(u8 _numPAD, unsigned int _uType, unsigned int _uStrength)
diff --git a/Source/Core/Core/Src/HW/GCPad.h b/Source/Core/Core/Src/HW/GCPad.h
index fb07e82ccc..c4ddb2d96c 100644
--- a/Source/Core/Core/Src/HW/GCPad.h
+++ b/Source/Core/Core/Src/HW/GCPad.h
@@ -1,19 +1,6 @@
-// Copyright (C) 2010 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "CommonTypes.h"
 #include "GCPadStatus.h"
diff --git a/Source/Core/Core/Src/HW/GCPadEmu.cpp b/Source/Core/Core/Src/HW/GCPadEmu.cpp
index a2c0c2afa9..af4130b1bc 100644
--- a/Source/Core/Core/Src/HW/GCPadEmu.cpp
+++ b/Source/Core/Core/Src/HW/GCPadEmu.cpp
@@ -1,19 +1,6 @@
-// Copyright (C) 2010 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "GCPadEmu.h"
 #include "../Host.h"
@@ -56,11 +43,11 @@ const char* const named_triggers[] =
 	// i18n:  Left
 	_trans("L"),
 	// i18n:  Right
-   	_trans("R"),
+	_trans("R"),
 	// i18n:  Left-Analog
-   	_trans("L-Analog"),
+	_trans("L-Analog"),
 	// i18n:  Right-Analog
-   	_trans("R-Analog")
+	_trans("R-Analog")
 };
 
 GCPad::GCPad(const unsigned int index) : m_index(index)
@@ -93,7 +80,6 @@ GCPad::GCPad(const unsigned int index) : m_index(index)
 	// options
 	groups.push_back(m_options = new ControlGroup(_trans("Options")));
 	m_options->settings.push_back(new ControlGroup::Setting(_trans("Background Input"), false));
-
 }
 
 std::string GCPad::GetName() const
diff --git a/Source/Core/Core/Src/HW/GCPadEmu.h b/Source/Core/Core/Src/HW/GCPadEmu.h
index e57e6b0b68..aa5b33d252 100644
--- a/Source/Core/Core/Src/HW/GCPadEmu.h
+++ b/Source/Core/Core/Src/HW/GCPadEmu.h
@@ -1,19 +1,6 @@
-// Copyright (C) 2010 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _CONEMU_GCPAD_H_
 #define _CONEMU_GCPAD_H_
diff --git a/Source/Core/Core/Src/HW/GPFifo.cpp b/Source/Core/Core/Src/HW/GPFifo.cpp
index ab3058bd8d..c889466938 100644
--- a/Source/Core/Core/Src/HW/GPFifo.cpp
+++ b/Source/Core/Core/Src/HW/GPFifo.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "Common.h"
 #include "ChunkFile.h"
@@ -74,14 +61,14 @@ void STACKALIGN CheckGatherPipe()
 		u32 cnt;
 		u8* curMem = Memory::GetPointer(ProcessorInterface::Fifo_CPUWritePointer);
 		for (cnt = 0; m_gatherPipeCount >= GATHER_PIPE_SIZE; cnt += GATHER_PIPE_SIZE)
-		{	
+		{
 			// copy the GatherPipe
 			memcpy(curMem, m_gatherPipe + cnt, GATHER_PIPE_SIZE);
 			m_gatherPipeCount -= GATHER_PIPE_SIZE;
 
 			// increase the CPUWritePointer
 			if (ProcessorInterface::Fifo_CPUWritePointer == ProcessorInterface::Fifo_CPUEnd)
-			{				
+			{
 				ProcessorInterface::Fifo_CPUWritePointer = ProcessorInterface::Fifo_CPUBase;
 				curMem = Memory::GetPointer(ProcessorInterface::Fifo_CPUWritePointer);
 			}
@@ -96,6 +83,20 @@ void STACKALIGN CheckGatherPipe()
 		
 		// move back the spill bytes
 		memmove(m_gatherPipe, m_gatherPipe + cnt, m_gatherPipeCount);
+		
+		// Profile where the FIFO writes are occurring.
+		if (jit && PC != 0 && (jit->js.fifoWriteAddresses.find(PC)) == (jit->js.fifoWriteAddresses.end()))
+		{
+			// Log only stores, fp stores and ps stores, filtering out other instructions arrived via optimizeGatherPipe
+			int type = GetOpInfo(Memory::ReadUnchecked_U32(PC))->type;
+			if (type == OPTYPE_STORE || type == OPTYPE_STOREFP || (type == OPTYPE_PS && !strcmp(GetOpInfo(Memory::ReadUnchecked_U32(PC))->opname, "psq_st")))
+			{
+				jit->js.fifoWriteAddresses.insert(PC);
+
+				// Invalidate the JIT block so that it gets recompiled with the external exception check included.
+				jit->GetBlockCache()->InvalidateICache(PC, 4);
+			}
+		}
 	}
 }
 
diff --git a/Source/Core/Core/Src/HW/GPFifo.h b/Source/Core/Core/Src/HW/GPFifo.h
index efd9108c3d..973d4eabab 100644
--- a/Source/Core/Core/Src/HW/GPFifo.h
+++ b/Source/Core/Core/Src/HW/GPFifo.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _GPFIFO_H
 #define _GPFIFO_H
diff --git a/Source/Core/Core/Src/HW/HW.cpp b/Source/Core/Core/Src/HW/HW.cpp
index 070c043166..cef3666d59 100644
--- a/Source/Core/Core/Src/HW/HW.cpp
+++ b/Source/Core/Core/Src/HW/HW.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "Common.h"
 #include "Thunk.h"
@@ -59,6 +46,7 @@ namespace HW
 		ExpansionInterface::Init();
 		CCPU::Init(SConfig::GetInstance().m_LocalCoreStartupParameter.iCPUCore);
 		SystemTimers::Init();
+
 		if (SConfig::GetInstance().m_LocalCoreStartupParameter.bWii)
 		{
 			WII_IPCInterface::Init();
@@ -70,7 +58,7 @@ namespace HW
 	{
 		SystemTimers::Shutdown();
 		CCPU::Shutdown();
-		ExpansionInterface::Shutdown();		
+		ExpansionInterface::Shutdown();
 		DVDInterface::Shutdown();
 		DSP::Shutdown();
 		Memory::Shutdown();
@@ -82,7 +70,7 @@ namespace HW
 			WII_IPCInterface::Shutdown();
 			WII_IPC_HLE_Interface::Shutdown();
 		}
-		
+
 		State::Shutdown();
 		CoreTiming::Shutdown();
 	}
@@ -107,6 +95,7 @@ namespace HW
 		p.DoMarker("ExpansionInterface");
 		AudioInterface::DoState(p);
 		p.DoMarker("AudioInterface");
+
 		if (SConfig::GetInstance().m_LocalCoreStartupParameter.bWii)
 		{
 			WII_IPCInterface::DoState(p);
@@ -114,6 +103,7 @@ namespace HW
 			WII_IPC_HLE_Interface::DoState(p);
 			p.DoMarker("WII_IPC_HLE_Interface");
 		}
+
 		p.DoMarker("WIIHW");
 	}
 }
diff --git a/Source/Core/Core/Src/HW/HW.h b/Source/Core/Core/Src/HW/HW.h
index cd3375d3ac..1fb760dbf4 100644
--- a/Source/Core/Core/Src/HW/HW.h
+++ b/Source/Core/Core/Src/HW/HW.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _HW_H
 #define _HW_H
diff --git a/Source/Core/Core/Src/HW/Memmap.cpp b/Source/Core/Core/Src/HW/Memmap.cpp
index 6a6fb14212..170b67de5b 100644
--- a/Source/Core/Core/Src/HW/Memmap.cpp
+++ b/Source/Core/Core/Src/HW/Memmap.cpp
@@ -1,25 +1,13 @@
-// Copyright (C) 2003 Dolphin Project.
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
-// 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.
+// NOTE:
+// These functions are primarily used by the interpreter versions of the LoadStore instructions.
+// However, if a JITed instruction (for example lwz) wants to access a bad memory area that call
+// may be redirected here (for example to Read_U32()).
 
-// 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/
-
-/*
-These functions are primarily used by the interpreter versions of the LoadStore instructions.
-However, if a JITed instruction (for example lwz) wants to access a bad memory area that call
-may be redirected here (for example to Read_U32()).
-*/
 
 #include "Common.h"
 #include "MemoryUtil.h"
@@ -129,10 +117,13 @@ void HW_Default_Read(T _Data, const u32 _Address){	ERROR_LOG(MASTER_LOG, "Illega
 #define PAGE_SIZE (1 << PAGE_SHIFT)
 #define PAGE_MASK (PAGE_SHIFT - 1)
 
-template <class T, u8 *P> void HW_Read_Memory(T &_Data, const u32 _Address) {
+template <class T, u8 *P> void HW_Read_Memory(T &_Data, const u32 _Address)
+{
 	_Data = *(T *)&P[_Address & PAGE_MASK];
 }
-template <class T, u8 *P> void HW_Write_Memory(T _Data, const u32 _Address) {
+
+template <class T, u8 *P> void HW_Write_Memory(T _Data, const u32 _Address)
+{
 	*(T *)&P[_Address & PAGE_MASK] = _Data;
 }
 
@@ -181,7 +172,7 @@ void InitHWMemFuncs()
 	{
 		hwRead16 [CP_START+i] = g_video_backend->Video_CPRead16();
 		hwWrite16[CP_START+i] = g_video_backend->Video_CPWrite16();
- 
+
 		hwRead16 [PE_START+i] = g_video_backend->Video_PERead16();
 		hwWrite16[PE_START+i] = g_video_backend->Video_PEWrite16();
 		hwWrite32[PE_START+i] = g_video_backend->Video_PEWrite32();
@@ -254,7 +245,7 @@ void InitHWMemFuncsWii()
 	{
 		hwRead16 [CP_START+i] = g_video_backend->Video_CPRead16();
 		hwWrite16[CP_START+i] = g_video_backend->Video_CPWrite16();
- 
+
 		hwRead16 [PE_START+i] = g_video_backend->Video_PERead16();
 		hwWrite16[PE_START+i] = g_video_backend->Video_PEWrite16();
 		hwWrite32[PE_START+i] = g_video_backend->Video_PEWrite32();
@@ -425,17 +416,17 @@ void WriteBigEData(const u8 *_pData, const u32 _Address, const u32 _iSize)
 }
 
 void Memset(const u32 _Address, const u8 _iValue, const u32 _iLength)
-{	
-    u8 *ptr = GetPointer(_Address);
-    if (ptr != NULL)
-    {
-	    memset(ptr,_iValue,_iLength);
-    }
-    else
-    {
-        for (u32 i = 0; i < _iLength; i++)
-            Write_U8(_iValue, _Address + i);
-    }
+{
+	u8 *ptr = GetPointer(_Address);
+	if (ptr != NULL)
+	{
+		memset(ptr,_iValue,_iLength);
+	}
+	else
+	{
+		for (u32 i = 0; i < _iLength; i++)
+			Write_U8(_iValue, _Address + i);
+	}
 }
 
 void DMA_LCToMemory(const u32 _MemAddr, const u32 _CacheAddr, const u32 _iNumBlocks)
@@ -443,18 +434,18 @@ void DMA_LCToMemory(const u32 _MemAddr, const u32 _CacheAddr, const u32 _iNumBlo
 	const u8 *src = GetCachePtr() + (_CacheAddr & 0x3FFFF);
 	u8 *dst = GetPointer(_MemAddr);
 
-    if ((dst != NULL) && (src != NULL) && (_MemAddr & 3) == 0 && (_CacheAddr & 3) == 0)
-    {
-	    memcpy(dst, src, 32 * _iNumBlocks);
-    }
-    else
-    {
-        for (u32 i = 0; i < 32 * _iNumBlocks; i++)
-        {
-            u8 Temp = Read_U8(_CacheAddr + i);
-            Write_U8(Temp, _MemAddr + i);
-        }
-    }
+	if ((dst != NULL) && (src != NULL) && (_MemAddr & 3) == 0 && (_CacheAddr & 3) == 0)
+	{
+		memcpy(dst, src, 32 * _iNumBlocks);
+	}
+	else
+	{
+		for (u32 i = 0; i < 32 * _iNumBlocks; i++)
+		{
+			u8 Temp = Read_U8(_CacheAddr + i);
+			Write_U8(Temp, _MemAddr + i);
+		}
+	}
 }
 
 void DMA_MemoryToLC(const u32 _CacheAddr, const u32 _MemAddr, const u32 _iNumBlocks)
@@ -462,18 +453,18 @@ void DMA_MemoryToLC(const u32 _CacheAddr, const u32 _MemAddr, const u32 _iNumBlo
 	const u8 *src = GetPointer(_MemAddr);
 	u8 *dst = GetCachePtr() + (_CacheAddr & 0x3FFFF);
 
-    if ((dst != NULL) && (src != NULL) && (_MemAddr & 3) == 0 && (_CacheAddr & 3) == 0)
-    {
-        memcpy(dst, src, 32 * _iNumBlocks);
-    }
-    else
-    {
-        for (u32 i = 0; i < 32 * _iNumBlocks; i++)
-        {
-            u8 Temp = Read_U8(_MemAddr + i);
-            Write_U8(Temp, _CacheAddr + i);
-        }
-    }
+	if ((dst != NULL) && (src != NULL) && (_MemAddr & 3) == 0 && (_CacheAddr & 3) == 0)
+	{
+		memcpy(dst, src, 32 * _iNumBlocks);
+	}
+	else
+	{
+		for (u32 i = 0; i < 32 * _iNumBlocks; i++)
+		{
+			u8 Temp = Read_U8(_MemAddr + i);
+			Write_U8(Temp, _CacheAddr + i);
+		}
+	}
 }
 
 void ReadBigEData(u8 *data, const u32 em_address, const u32 size)
diff --git a/Source/Core/Core/Src/HW/Memmap.h b/Source/Core/Core/Src/HW/Memmap.h
index 8662804185..85deac8fce 100644
--- a/Source/Core/Core/Src/HW/Memmap.h
+++ b/Source/Core/Core/Src/HW/Memmap.h
@@ -12,7 +12,7 @@
 // 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 _MEMMAP_H
@@ -70,11 +70,11 @@ enum
 	FAKEVMEM_MASK	= FAKEVMEM_SIZE - 1,
 	L1_CACHE_SIZE	= 0x40000,
 	L1_CACHE_MASK	= L1_CACHE_SIZE - 1,
-	EFB_SIZE	    = 0x200000,
-	EFB_MASK	    = EFB_SIZE - 1,
-	IO_SIZE         = 0x10000,
-	EXRAM_SIZE      = 0x4000000,
-	EXRAM_MASK      = EXRAM_SIZE - 1,
+	EFB_SIZE		= 0x200000,
+	EFB_MASK		= EFB_SIZE - 1,
+	IO_SIZE			= 0x10000,
+	EXRAM_SIZE		= 0x4000000,
+	EXRAM_MASK		= EXRAM_SIZE - 1,
 
 	ADDR_MASK_HW_ACCESS	= 0x0c000000,
 	ADDR_MASK_MEM1		= 0x20000000,
diff --git a/Source/Core/Core/Src/HW/MemmapFunctions.cpp b/Source/Core/Core/Src/HW/MemmapFunctions.cpp
index e01eedaaab..39c852ec22 100644
--- a/Source/Core/Core/Src/HW/MemmapFunctions.cpp
+++ b/Source/Core/Core/Src/HW/MemmapFunctions.cpp
@@ -12,7 +12,7 @@
 // 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 "Common.h"
@@ -227,11 +227,15 @@ inline void WriteToHardware(u32 em_address, const T data, u32 effective_address,
 		{
 			int x = (em_address & 0xfff) >> 2;
 			int y = (em_address >> 12) & 0x3ff;
+
 			// TODO figure out a way to send data without falling into the template trap
-			if (em_address & 0x00400000) {
+			if (em_address & 0x00400000)
+			{
 				g_video_backend->Video_AccessEFB(POKE_Z, x, y, (u32)data);
 				DEBUG_LOG(MEMMAP, "EFB Z Write %08x @ %i, %i", (u32)data, x, y);
-			} else {
+			}
+			else
+			{
 				g_video_backend->Video_AccessEFB(POKE_COLOR, x, y,(u32)data);
 				DEBUG_LOG(MEMMAP, "EFB Color Write %08x @ %i, %i", (u32)data, x, y);
 			}
@@ -331,18 +335,20 @@ u32 Read_Opcode(u32 _Address)
 			return 0;
 		}
 		else
+		{
 			_Address = tlb_addr;
+		}
 	}
 
 	return PowerPC::ppcState.iCache.ReadInstruction(_Address);
 }
 
 u8 Read_U8(const u32 _Address)
-{    
+{
 	u8 _var = 0;
 	ReadFromHardware<u8>(_var, _Address, _Address, FLAG_READ);
 #ifdef ENABLE_MEM_CHECK
-    TMemCheck *mc = PowerPC::memchecks.GetMemCheck(_Address);
+	TMemCheck *mc = PowerPC::memchecks.GetMemCheck(_Address);
 	if (mc)
 	{
 		mc->numHits++;
@@ -369,7 +375,7 @@ u16 Read_U16(const u32 _Address)
 
 u32 Read_U32(const u32 _Address)
 {
-	u32 _var = 0;	
+	u32 _var = 0;
 	ReadFromHardware<u32>(_var, _Address, _Address, FLAG_READ);
 #ifdef ENABLE_MEM_CHECK
 	TMemCheck *mc = PowerPC::memchecks.GetMemCheck(_Address);
@@ -451,14 +457,15 @@ void Write_U32(const u32 _Data, const u32 _Address)
 #endif
 	WriteToHardware<u32>(_Address, _Data, _Address, FLAG_WRITE);
 }
-void Write_U32_Swap(const u32 _Data, const u32 _Address) {
+void Write_U32_Swap(const u32 _Data, const u32 _Address)
+{
 	Write_U32(Common::swap32(_Data), _Address);
 }
 
 void Write_U64(const u64 _Data, const u32 _Address)
 {
 #ifdef ENABLE_MEM_CHECK
-    TMemCheck *mc = PowerPC::memchecks.GetMemCheck(_Address);
+	TMemCheck *mc = PowerPC::memchecks.GetMemCheck(_Address);
 	if (mc)
 	{
 		mc->numHits++;
@@ -491,7 +498,7 @@ void WriteUnchecked_U8(const u8 _iValue, const u32 _Address)
 {
 	WriteToHardware<u8>(_Address, _iValue, _Address, FLAG_NO_EXCEPTION);
 }
- 
+
 
 void WriteUnchecked_U32(const u32 _iValue, const u32 _Address)
 {
@@ -571,7 +578,7 @@ union UPTE1
 		u32 API    : 6;
 		u32 H      : 1;
 		u32 VSID   : 24;
-		u32 V      : 1;        
+		u32 V      : 1;
 	};
 	u32 Hex;
 };
@@ -817,8 +824,8 @@ u32 TranslatePageAddress(const u32 _Address, const XCheckTLBFlag _Flag)
 	u32 pteg_addr = ((hash1 & pagetable_hashmask) << 6) | pagetable_base;
 
 	// hash1
-	for (int i = 0; i < 8; i++) 
-	{ 
+	for (int i = 0; i < 8; i++)
+	{
 		UPTE1 PTE1;
 		PTE1.Hex = bswap(*(u32*)&pRAM[pteg_addr]);
 
@@ -838,7 +845,7 @@ u32 TranslatePageAddress(const u32 _Address, const XCheckTLBFlag _Flag)
 				case FLAG_WRITE:    PTE2.C = 1; break;
 				case FLAG_NO_EXCEPTION: break;
 				case FLAG_OPCODE: break;
-				}              
+				}
 				*(u32*)&pRAM[(pteg_addr + 4)] = bswap(PTE2.Hex);
 
 				return ((PTE2.RPN << 12) | offset);
@@ -851,11 +858,11 @@ u32 TranslatePageAddress(const u32 _Address, const XCheckTLBFlag _Flag)
 	hash1 = ~hash1;
 	pteg_addr = ((hash1 & pagetable_hashmask) << 6) | pagetable_base;
 	for (int i = 0; i < 8; i++) 
-	{ 
+	{
 		u32 pte = bswap(*(u32*)&pRAM[pteg_addr]);
-		if ((pte & PTE1_V) && (pte & PTE1_H)) 
+		if ((pte & PTE1_V) && (pte & PTE1_H))
 		{
-			if (VSID == PTE1_VSID(pte) && (api == PTE1_API(pte))) 
+			if (VSID == PTE1_VSID(pte) && (api == PTE1_API(pte)))
 			{
 				UPTE2 PTE2;
 				PTE2.Hex = bswap((*(u32*)&pRAM[(pteg_addr + 4)]));
@@ -898,7 +905,8 @@ u32 TranslateBlockAddress(const u32 addr, const XCheckTLBFlag _Flag)
 	// Check for enhanced mode (secondary BAT enable) using 8 BATs
 	int bats = (Core::g_CoreStartupParameter.bWii && HID4.SBE)?8:4;
 
-	for (int i = 0; i < bats; i++) {
+	for (int i = 0; i < bats; i++)
+	{
 		if (_Flag != FLAG_OPCODE)
 		{
 			u32 bl17 = ~(BATU_BL(PowerPC::ppcState.spr[SPR_DBAT0U + i * 2]) << 17);
@@ -966,7 +974,9 @@ u32 TranslateAddress(const u32 _Address, const XCheckTLBFlag _Flag)
 		}
 	}
 	else
+	{
 		return tlb_addr;
+	}
 
 	return 0;
 }
diff --git a/Source/Core/Core/Src/HW/MemoryInterface.cpp b/Source/Core/Core/Src/HW/MemoryInterface.cpp
index f2d298036c..9eb833cbc0 100644
--- a/Source/Core/Core/Src/HW/MemoryInterface.cpp
+++ b/Source/Core/Core/Src/HW/MemoryInterface.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "Common.h"
 #include "ChunkFile.h"
diff --git a/Source/Core/Core/Src/HW/MemoryInterface.h b/Source/Core/Core/Src/HW/MemoryInterface.h
index 3b1470fcc9..ffa255b4b2 100644
--- a/Source/Core/Core/Src/HW/MemoryInterface.h
+++ b/Source/Core/Core/Src/HW/MemoryInterface.h
@@ -1,19 +1,7 @@
-// Copyright (C) 2003 Dolphin Project.
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
-// 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 _MEMORYINTERFACE_H
 #define _MEMORYINTERFACE_H
 
diff --git a/Source/Core/Core/Src/HW/ProcessorInterface.cpp b/Source/Core/Core/Src/HW/ProcessorInterface.cpp
index d4142efaae..273ee32231 100644
--- a/Source/Core/Core/Src/HW/ProcessorInterface.cpp
+++ b/Source/Core/Core/Src/HW/ProcessorInterface.cpp
@@ -1,19 +1,7 @@
-// Copyright (C) 2003 Dolphin Project.
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
-// 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 <stdio.h>
 
 #include "Common.h"
@@ -34,13 +22,13 @@ namespace ProcessorInterface
 enum
 {
 	PI_INTERRUPT_CAUSE		= 0x00,
-	PI_INTERRUPT_MASK       = 0x04,
-	PI_FIFO_BASE            = 0x0C,
-	PI_FIFO_END             = 0x10,
-	PI_FIFO_WPTR            = 0x14,
-	PI_FIFO_RESET           = 0x18, // ??? - GXAbortFrame writes to it
-	PI_RESET_CODE           = 0x24,
-	PI_FLIPPER_REV          = 0x2C,
+	PI_INTERRUPT_MASK		= 0x04,
+	PI_FIFO_BASE			= 0x0C,
+	PI_FIFO_END				= 0x10,
+	PI_FIFO_WPTR			= 0x14,
+	PI_FIFO_RESET			= 0x18, // ??? - GXAbortFrame writes to it
+	PI_RESET_CODE			= 0x24,
+	PI_FLIPPER_REV			= 0x2C,
 	PI_FLIPPER_UNK			= 0x30 // BS1 writes 0x0245248A to it - prolly some bootstrap thing
 };
 
@@ -74,9 +62,9 @@ void DoState(PointerWrap &p)
 	p.Do(Fifo_CPUBase);
 	p.Do(Fifo_CPUEnd);
 	p.Do(Fifo_CPUWritePointer);
- 	p.Do(m_Fifo_Reset);
- 	p.Do(m_ResetCode);
- 	p.Do(m_FlipperRev);
+	p.Do(m_Fifo_Reset);
+	p.Do(m_ResetCode);
+	p.Do(m_FlipperRev);
 	p.Do(m_Unknown);
 }
 
@@ -124,28 +112,28 @@ void Read32(u32& _uReturnValue, const u32 _iAddress)
 		return;
 
 	case PI_FIFO_BASE:
-		DEBUG_LOG(PROCESSORINTERFACE, "read cpu fifo base, value = %08x", Fifo_CPUBase);
+		DEBUG_LOG(PROCESSORINTERFACE, "Read CPU FIFO base, value = %08x", Fifo_CPUBase);
 		_uReturnValue = Fifo_CPUBase;
 		return;
 
 	case PI_FIFO_END:
-		DEBUG_LOG(PROCESSORINTERFACE, "read cpu fifo end, value = %08x", Fifo_CPUEnd);
+		DEBUG_LOG(PROCESSORINTERFACE, "Read CPU FIFO end, value = %08x", Fifo_CPUEnd);
 		_uReturnValue = Fifo_CPUEnd;
 		return;
 
 	case PI_FIFO_WPTR:
-		DEBUG_LOG(PROCESSORINTERFACE, "read writepointer, value = %08x", Fifo_CPUWritePointer);
+		DEBUG_LOG(PROCESSORINTERFACE, "Read writepointer, value = %08x", Fifo_CPUWritePointer);
 		_uReturnValue = Fifo_CPUWritePointer;  //really writes in 32-byte chunks
 		// Monk's gcube does some crazy align trickery here.
 		return;
 
 	case PI_RESET_CODE:
-		INFO_LOG(PROCESSORINTERFACE, "read reset code, 0x%08x", m_ResetCode);
+		INFO_LOG(PROCESSORINTERFACE, "Read reset code, 0x%08x", m_ResetCode);
 		_uReturnValue = m_ResetCode;
 		return;
 
 	case PI_FLIPPER_REV:
-		INFO_LOG(PROCESSORINTERFACE, "read flipper rev, 0x%08x", m_FlipperRev);
+		INFO_LOG(PROCESSORINTERFACE, "Read flipper rev, 0x%08x", m_FlipperRev);
 		_uReturnValue = m_FlipperRev;
 		return;
 		
@@ -188,13 +176,13 @@ void Write32(const u32 _uValue, const u32 _iAddress)
 		DEBUG_LOG(PROCESSORINTERFACE,"Fifo writeptr = %08x", _uValue);
 		break;
 
-    case PI_FIFO_RESET:
+	case PI_FIFO_RESET:
 		//Abort the actual frame
 		//g_video_backend->Video_AbortFrame();
-        //Fifo_CPUWritePointer = Fifo_CPUBase; ??
+		//Fifo_CPUWritePointer = Fifo_CPUBase; ??
 		//PanicAlert("Unknown write to PI_FIFO_RESET (%08x)", _uValue);
 		WARN_LOG(PROCESSORINTERFACE, "Fifo reset (%08x)", _uValue);
-        break;
+		break;
 
 	case PI_RESET_CODE:
 		DEBUG_LOG(PROCESSORINTERFACE, "Write %08x to PI_RESET_CODE", _uValue);
@@ -202,7 +190,7 @@ void Write32(const u32 _uValue, const u32 _iAddress)
 		break;
 
 	case PI_FLIPPER_UNK:
-		DEBUG_LOG(PROCESSORINTERFACE, "write %08x to unknown PI reg %08x", _uValue, _iAddress);
+		DEBUG_LOG(PROCESSORINTERFACE, "Write %08x to unknown PI register %08x", _uValue, _iAddress);
 		break;
 
 	default:
@@ -237,9 +225,9 @@ static const char *Debug_GetInterruptName(u32 _causemask)
 	case INT_CAUSE_PE_FINISH:		return "INT_CAUSE_PE_FINISH";
 	case INT_CAUSE_CP:				return "INT_CAUSE_CP";
 	case INT_CAUSE_DEBUG:			return "INT_CAUSE_DEBUG";
-    case INT_CAUSE_WII_IPC:			return "INT_CAUSE_WII_IPC";
+	case INT_CAUSE_WII_IPC:			return "INT_CAUSE_WII_IPC";
 	case INT_CAUSE_HSP:				return "INT_CAUSE_HSP";
-	case INT_CAUSE_RST_BUTTON:      return "INT_CAUSE_RST_BUTTON";
+	case INT_CAUSE_RST_BUTTON:		return "INT_CAUSE_RST_BUTTON";
 	default:						return "!!! ERROR-unknown Interrupt !!!";
 	}
 }
@@ -248,15 +236,15 @@ void SetInterrupt(u32 _causemask, bool _bSet)
 {
 	// TODO(ector): add sanity check that current thread id is cpu thread
 
-    if (_bSet && !(m_InterruptCause & _causemask))
-    {
-        DEBUG_LOG(PROCESSORINTERFACE, "Setting Interrupt %s (set)", Debug_GetInterruptName(_causemask));
-    }
+	if (_bSet && !(m_InterruptCause & _causemask))
+	{
+		DEBUG_LOG(PROCESSORINTERFACE, "Setting Interrupt %s (set)", Debug_GetInterruptName(_causemask));
+	}
 
 	if (!_bSet && (m_InterruptCause & _causemask))
-    {
-        DEBUG_LOG(PROCESSORINTERFACE, "Setting Interrupt %s (clear)", Debug_GetInterruptName(_causemask));
-    }
+	{
+		DEBUG_LOG(PROCESSORINTERFACE, "Setting Interrupt %s (clear)", Debug_GetInterruptName(_causemask));
+	}
 	
 	if (_bSet)
 		Common::AtomicOr(m_InterruptCause, _causemask);
diff --git a/Source/Core/Core/Src/HW/ProcessorInterface.h b/Source/Core/Core/Src/HW/ProcessorInterface.h
index 38301984b2..2ca2d74219 100644
--- a/Source/Core/Core/Src/HW/ProcessorInterface.h
+++ b/Source/Core/Core/Src/HW/ProcessorInterface.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _PROCESSORINTERFACE_H
 #define _PROCESSORINTERFACE_H
diff --git a/Source/Core/Core/Src/HW/SI.cpp b/Source/Core/Core/Src/HW/SI.cpp
index 0f563806ce..f4fcec5743 100644
--- a/Source/Core/Core/Src/HW/SI.cpp
+++ b/Source/Core/Core/Src/HW/SI.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "Common.h"
 #include "ChunkFile.h"
@@ -75,8 +62,8 @@ enum
 union USIChannelOut
 {
 	u32 Hex;
-	struct  
-	{		
+	struct
+	{
 		u32 OUTPUT1	:	8;
 		u32 OUTPUT0	:	8;
 		u32 CMD		:	8;
@@ -88,8 +75,8 @@ union USIChannelOut
 union USIChannelIn_Hi
 {
 	u32 Hex;
-	struct  
-	{		
+	struct
+	{
 		u32 INPUT3		:	8;
 		u32 INPUT2		:	8;
 		u32 INPUT1		:	8;
@@ -103,7 +90,7 @@ union USIChannelIn_Hi
 union USIChannelIn_Lo
 {
 	u32 Hex;
-	struct  
+	struct
 	{
 		u32 INPUT7		:	8;
 		u32 INPUT6		:	8;
@@ -115,7 +102,7 @@ union USIChannelIn_Lo
 // SI Channel
 struct SSIChannel
 {
-	USIChannelOut	m_Out;		
+	USIChannelOut	m_Out;
 	USIChannelIn_Hi m_InHi;
 	USIChannelIn_Lo m_InLo;
 	ISIDevice*		m_pDevice;
@@ -127,16 +114,16 @@ union USIPoll
 	u32 Hex;
 	struct
 	{
-		u32 VBCPY3	:	1; // 1: write to output buffer only on vblank
+		u32 VBCPY3	:	1;  // 1: write to output buffer only on vblank
 		u32 VBCPY2	:	1;
 		u32 VBCPY1	:	1;
 		u32 VBCPY0	:	1;
-		u32 EN3		:	1; // Enable polling of channel
-		u32 EN2		:	1; //  does not affect communication RAM transfers
+		u32 EN3		:	1;  // Enable polling of channel
+		u32 EN2		:	1;  //  does not affect communication RAM transfers
 		u32 EN1		:	1;
 		u32 EN0		:	1;
-		u32 Y		:   8; // Polls per frame
-		u32 X		:  10; // Polls per X lines. begins at vsync, min 7, max depends on video mode
+		u32 Y		:	8;  // Polls per frame
+		u32 X		:	10; // Polls per X lines. begins at vsync, min 7, max depends on video mode
 		u32			:	6;
 	};
 };
@@ -220,12 +207,12 @@ union USIEXIClockCount
 };
 
 // STATE_TO_SAVE
-static SSIChannel         g_Channel[NUMBER_OF_CHANNELS];
-static USIPoll            g_Poll;
-static USIComCSR          g_ComCSR;
-static USIStatusReg       g_StatusReg;
-static USIEXIClockCount   g_EXIClockCount;
-static u8                 g_SIBuffer[128];
+static SSIChannel			g_Channel[NUMBER_OF_CHANNELS];
+static USIPoll				g_Poll;
+static USIComCSR			g_ComCSR;
+static USIStatusReg			g_StatusReg;
+static USIEXIClockCount		g_EXIClockCount;
+static u8					g_SIBuffer[128];
 
 void DoState(PointerWrap &p)
 {
@@ -257,8 +244,8 @@ void DoState(PointerWrap &p)
 		}
 	}
 	p.Do(g_Poll);
-	p.Do(g_ComCSR);
-	p.Do(g_StatusReg);
+	p.DoPOD(g_ComCSR);
+	p.DoPOD(g_StatusReg);
 	p.Do(g_EXIClockCount);
 	p.Do(g_SIBuffer);
 }	
@@ -318,7 +305,7 @@ void Read32(u32& _uReturnValue, const u32 _iAddress)
 	//////////////////////////////////////////////////////////////////////////
 	// Channel 0
 	//////////////////////////////////////////////////////////////////////////
-	case SI_CHANNEL_0_OUT:		
+	case SI_CHANNEL_0_OUT:
 		_uReturnValue = g_Channel[0].m_Out.Hex;
 		break;
 
@@ -337,7 +324,7 @@ void Read32(u32& _uReturnValue, const u32 _iAddress)
 	//////////////////////////////////////////////////////////////////////////
 	// Channel 1
 	//////////////////////////////////////////////////////////////////////////
-	case SI_CHANNEL_1_OUT:		
+	case SI_CHANNEL_1_OUT:
 		_uReturnValue = g_Channel[1].m_Out.Hex;
 		break;
 
@@ -356,7 +343,7 @@ void Read32(u32& _uReturnValue, const u32 _iAddress)
 	//////////////////////////////////////////////////////////////////////////
 	// Channel 2
 	//////////////////////////////////////////////////////////////////////////
-	case SI_CHANNEL_2_OUT:		
+	case SI_CHANNEL_2_OUT:
 		_uReturnValue = g_Channel[2].m_Out.Hex;
 		break;
 
@@ -375,7 +362,7 @@ void Read32(u32& _uReturnValue, const u32 _iAddress)
 	//////////////////////////////////////////////////////////////////////////
 	// Channel 3
 	//////////////////////////////////////////////////////////////////////////
-	case SI_CHANNEL_3_OUT:		
+	case SI_CHANNEL_3_OUT:
 		_uReturnValue = g_Channel[3].m_Out.Hex;
 		break;
 
@@ -402,7 +389,7 @@ void Read32(u32& _uReturnValue, const u32 _iAddress)
 
 	default:
 		INFO_LOG(SERIALINTERFACE, "(r32-unk): 0x%08x", _iAddress);
-		_dbg_assert_(SERIALINTERFACE,0);			
+		_dbg_assert_(SERIALINTERFACE,0);
 		break;
 	}
 
@@ -447,7 +434,7 @@ void Write32(const u32 _iValue, const u32 _iAddress)
 		g_Poll.Hex = _iValue;
 		break;
 
-	case SI_COM_CSR:			
+	case SI_COM_CSR:
 		{
 			USIComCSR tmpComCSR(_iValue);
 
diff --git a/Source/Core/Core/Src/HW/SI.h b/Source/Core/Core/Src/HW/SI.h
index 26ec8f1218..c5c8b0dbca 100644
--- a/Source/Core/Core/Src/HW/SI.h
+++ b/Source/Core/Core/Src/HW/SI.h
@@ -1,19 +1,7 @@
-// Copyright (C) 2003 Dolphin Project.
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
-// 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 _SERIALINTERFACE_H
 #define _SERIALINTERFACE_H
 
diff --git a/Source/Core/Core/Src/HW/SI_Device.cpp b/Source/Core/Core/Src/HW/SI_Device.cpp
index 062499f16f..baa144c83d 100644
--- a/Source/Core/Core/Src/HW/SI_Device.cpp
+++ b/Source/Core/Core/Src/HW/SI_Device.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "SI_Device.h"
 #include "SI_DeviceGCController.h"
diff --git a/Source/Core/Core/Src/HW/SI_Device.h b/Source/Core/Core/Src/HW/SI_Device.h
index ee7357f84e..bf3e1fc506 100644
--- a/Source/Core/Core/Src/HW/SI_Device.h
+++ b/Source/Core/Core/Src/HW/SI_Device.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _SIDEVICE_H
 #define _SIDEVICE_H
diff --git a/Source/Core/Core/Src/HW/SI_DeviceAMBaseboard.cpp b/Source/Core/Core/Src/HW/SI_DeviceAMBaseboard.cpp
index 3537ed3747..83af23b7a7 100644
--- a/Source/Core/Core/Src/HW/SI_DeviceAMBaseboard.cpp
+++ b/Source/Core/Core/Src/HW/SI_DeviceAMBaseboard.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 
 #include "SI.h"
@@ -76,8 +63,12 @@ public:
 			{
 				m_msg[m_ptr++] = 0xD0;
 				m_msg[m_ptr++] = c - 1;
-			} else
+			}
+			else
+			{
 				m_msg[m_ptr++] = c;
+			}
+
 			if (!sync)
 				m_csum += c;
 			sync = 0;
@@ -104,7 +95,7 @@ int CSIDevice_AMBaseboard::RunBuffer(u8* _pBuffer, int _iLength)
 	{	
 		// read the command
 		EBufferCommands command = static_cast<EBufferCommands>(_pBuffer[iPosition ^ 3]);
-		iPosition ++;
+		iPosition++;
 
 		// handle it
 		switch(command)
@@ -143,7 +134,7 @@ int CSIDevice_AMBaseboard::RunBuffer(u8* _pBuffer, int _iLength)
 					{
 					case 0x10:
 						{
-							DEBUG_LOG(AMBASEBOARDDEBUG, "GC-AM: CMD 10, %02x (READ STATUS&SWITCHES)", ptr(1));
+							DEBUG_LOG(AMBASEBOARDDEBUG, "GC-AM: Command 10, %02x (READ STATUS&SWITCHES)", ptr(1));
 							SPADStatus PadStatus;
 							memset(&PadStatus, 0 ,sizeof(PadStatus));
 							Pad::GetStatus(ISIDevice::m_iDeviceNumber, &PadStatus);
@@ -161,13 +152,13 @@ int CSIDevice_AMBaseboard::RunBuffer(u8* _pBuffer, int _iLength)
 							break;
 						}
 					case 0x12:
-						ERROR_LOG(AMBASEBOARDDEBUG, "GC-AM: CMD 12, %02x %02x", ptr(1), ptr(2));
+						ERROR_LOG(AMBASEBOARDDEBUG, "GC-AM: Command 12, %02x %02x", ptr(1), ptr(2));
 						res[resp++] = 0x12;
 						res[resp++] = 0x00;
 						break;
 					case 0x11:
 						{
-							ERROR_LOG(AMBASEBOARDDEBUG, "GC-AM: CMD 11, %02x (READ SERIAL NR)", ptr(1));
+							ERROR_LOG(AMBASEBOARDDEBUG, "GC-AM: Command 11, %02x (READ SERIAL NR)", ptr(1));
 							char string[] = "AADE-01A14964511";
 							res[resp++] = 0x11;
 							res[resp++] = 0x10;
@@ -183,7 +174,7 @@ int CSIDevice_AMBaseboard::RunBuffer(u8* _pBuffer, int _iLength)
 						res[resp++] = 0x29; // FIRM VERSION
 						break;
 					case 0x16:
-						ERROR_LOG(AMBASEBOARDDEBUG, "GC-AM: CMD 16, %02x (READ FPGA VERSION)", ptr(1));
+						ERROR_LOG(AMBASEBOARDDEBUG, "GC-AM: Command 16, %02x (READ FPGA VERSION)", ptr(1));
 						res[resp++] = 0x16;
 						res[resp++] = 0x02;
 						res[resp++] = 0x07;
@@ -196,7 +187,7 @@ int CSIDevice_AMBaseboard::RunBuffer(u8* _pBuffer, int _iLength)
 						break;
 					case 0x1f:
 						{
-							ERROR_LOG(AMBASEBOARDDEBUG, "GC-AM: CMD 1f, %02x %02x %02x %02x %02x (REGION)", ptr(1), ptr(2), ptr(3), ptr(4), ptr(5));
+							ERROR_LOG(AMBASEBOARDDEBUG, "GC-AM: Command 1f, %02x %02x %02x %02x %02x (REGION)", ptr(1), ptr(2), ptr(3), ptr(4), ptr(5));
 							unsigned char string[] =  
 								"\x00\x00\x30\x00"
 								//"\x01\xfe\x00\x00" // JAPAN
@@ -211,14 +202,14 @@ int CSIDevice_AMBaseboard::RunBuffer(u8* _pBuffer, int _iLength)
 							break;
 						}
 					case 0x31:
-						ERROR_LOG(AMBASEBOARDDEBUG, "GC-AM: CMD 31 (UNKNOWN)");
+						ERROR_LOG(AMBASEBOARDDEBUG, "GC-AM: Command 31 (UNKNOWN)");
 						res[resp++] = 0x31;
 						res[resp++] = 0x02;
 						res[resp++] = 0x00;
 						res[resp++] = 0x00;
 						break;
 					case 0x32:
-						ERROR_LOG(AMBASEBOARDDEBUG, "GC-AM: CMD 32 (UNKNOWN)");
+						ERROR_LOG(AMBASEBOARDDEBUG, "GC-AM: Command 32 (UNKNOWN)");
 						res[resp++] = 0x32;
 						res[resp++] = 0x02;
 						res[resp++] = 0x00;
@@ -241,7 +232,7 @@ int CSIDevice_AMBaseboard::RunBuffer(u8* _pBuffer, int _iLength)
 					case 0x4e:
 					case 0x4f:
 						{
-							DEBUG_LOG(AMBASEBOARDDEBUG, "GC-AM: CMD %02x, %02x %02x %02x %02x %02x %02x %02x (JVS IO)", 
+							DEBUG_LOG(AMBASEBOARDDEBUG, "GC-AM: Command %02x, %02x %02x %02x %02x %02x %02x %02x (JVS IO)", 
 								ptr(0), ptr(1), ptr(2), ptr(3), ptr(4), ptr(5), ptr(6), ptr(7));
 							int pptr = 2;
 							JVSIOMessage msg;
@@ -262,7 +253,7 @@ int CSIDevice_AMBaseboard::RunBuffer(u8* _pBuffer, int _iLength)
 							{
 
 								int cmd = *jvs_io++;
-								DEBUG_LOG(AMBASEBOARDDEBUG, "JVS IO, node=%d, cmd=%02x", node, cmd);
+								DEBUG_LOG(AMBASEBOARDDEBUG, "JVS IO, node=%d, command=%02x", node, cmd);
 
 								switch (cmd)
 								{
@@ -342,7 +333,7 @@ int CSIDevice_AMBaseboard::RunBuffer(u8* _pBuffer, int _iLength)
 										}
 										break;
 									}
-								case 0x21: // coin	
+								case 0x21: // coin
 									{
 										int slots = *jvs_io++;
 										msg.addData(1);
@@ -391,10 +382,10 @@ int CSIDevice_AMBaseboard::RunBuffer(u8* _pBuffer, int _iLength)
 							break;
 						}
 					case 0x60:
-						ERROR_LOG(AMBASEBOARDDEBUG, "GC-AM: CMD 60, %02x %02x %02x", ptr(1), ptr(2), ptr(3));
+						ERROR_LOG(AMBASEBOARDDEBUG, "GC-AM: Command 60, %02x %02x %02x", ptr(1), ptr(2), ptr(3));
 						break;
 					default:
-						ERROR_LOG(AMBASEBOARDDEBUG, "GC-AM: CMD %02x (unknown) %02x %02x %02x %02x %02x", ptr(0), ptr(1), ptr(2), ptr(3), ptr(4), ptr(5));
+						ERROR_LOG(AMBASEBOARDDEBUG, "GC-AM: Command %02x (unknown) %02x %02x %02x %02x %02x", ptr(0), ptr(1), ptr(2), ptr(3), ptr(4), ptr(5));
 						break;
 					}
 					p += ptr(1) + 2;
@@ -414,7 +405,7 @@ int CSIDevice_AMBaseboard::RunBuffer(u8* _pBuffer, int _iLength)
 					log += sprintf(log, "%02x ", ptr(i));
 				}
 				ptr(0x7f) = ~csum;
-				DEBUG_LOG(AMBASEBOARDDEBUG, "command send back: %s", logptr);
+				DEBUG_LOG(AMBASEBOARDDEBUG, "Command send back: %s", logptr);
 #undef ptr
 
 
@@ -438,10 +429,10 @@ int CSIDevice_AMBaseboard::RunBuffer(u8* _pBuffer, int _iLength)
 			// DEFAULT
 		default:
 			{
-				ERROR_LOG(SERIALINTERFACE, "unknown SI command     (0x%x)", command);
+				ERROR_LOG(SERIALINTERFACE, "Unknown SI command     (0x%x)", command);
 				PanicAlert("SI: Unknown command");
 				iPosition = _iLength;
-			}			
+			}
 			break;
 		}
 	}
@@ -460,6 +451,6 @@ bool CSIDevice_AMBaseboard::GetData(u32& _Hi, u32& _Low)
 
 void CSIDevice_AMBaseboard::SendCommand(u32 _Cmd, u8 _Poll)
 {
-	ERROR_LOG(SERIALINTERFACE, "unknown direct command     (0x%x)", _Cmd);
+	ERROR_LOG(SERIALINTERFACE, "Unknown direct command     (0x%x)", _Cmd);
 	PanicAlert("SI: (GCAM) Unknown direct command");
 }
diff --git a/Source/Core/Core/Src/HW/SI_DeviceAMBaseboard.h b/Source/Core/Core/Src/HW/SI_DeviceAMBaseboard.h
index f2c8b1e8a9..8c135ca980 100644
--- a/Source/Core/Core/Src/HW/SI_DeviceAMBaseboard.h
+++ b/Source/Core/Core/Src/HW/SI_DeviceAMBaseboard.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _SIDEVICE_AMBASEBOARD_H
 #define _SIDEVICE_AMBASEBOARD_H
diff --git a/Source/Core/Core/Src/HW/SI_DeviceGBA.cpp b/Source/Core/Core/Src/HW/SI_DeviceGBA.cpp
index 3818c5bd12..937bf45036 100644
--- a/Source/Core/Core/Src/HW/SI_DeviceGBA.cpp
+++ b/Source/Core/Core/Src/HW/SI_DeviceGBA.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "SI_Device.h"
 #include "SI_DeviceGBA.h"
@@ -107,7 +94,7 @@ void GBASockServer::Transfer(char* si_buffer)
 	else
 		client.Send(current_data, 1);
 
-	DEBUG_LOG(SERIALINTERFACE, "> cmd %02x %02x%02x%02x%02x",
+	DEBUG_LOG(SERIALINTERFACE, "> command %02x %02x%02x%02x%02x",
 		(u8)current_data[0], (u8)current_data[1], (u8)current_data[2],
 		(u8)current_data[3], (u8)current_data[4]);
 
diff --git a/Source/Core/Core/Src/HW/SI_DeviceGBA.h b/Source/Core/Core/Src/HW/SI_DeviceGBA.h
index 58d5a4f153..7783d06285 100644
--- a/Source/Core/Core/Src/HW/SI_DeviceGBA.h
+++ b/Source/Core/Core/Src/HW/SI_DeviceGBA.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _SI_DEVICEGBA_H
 #define _SI_DEVICEGBA_H
@@ -38,7 +25,7 @@ private:
 		CMD_RESET	= 0xff,
 		CMD_STATUS	= 0x00,
 		CMD_READ	= 0x14,
-		CMD_WRITE	= 0x15		
+		CMD_WRITE	= 0x15
 	};
 
 	sf::SocketTCP client;
diff --git a/Source/Core/Core/Src/HW/SI_DeviceGCController.cpp b/Source/Core/Core/Src/HW/SI_DeviceGCController.cpp
index f6af63da53..f6e0846b51 100644
--- a/Source/Core/Core/Src/HW/SI_DeviceGCController.cpp
+++ b/Source/Core/Core/Src/HW/SI_DeviceGCController.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -108,7 +95,7 @@ int CSIDevice_GCController::RunBuffer(u8* _pBuffer, int _iLength)
 	// DEFAULT
 	default:
 		{
-			ERROR_LOG(SERIALINTERFACE, "unknown SI command     (0x%x)", command);
+			ERROR_LOG(SERIALINTERFACE, "Unknown SI command     (0x%x)", command);
 			PanicAlert("SI: Unknown command (0x%x)", command);
 		}			
 		break;
@@ -153,7 +140,9 @@ bool CSIDevice_GCController::GetData(u32& _Hi, u32& _Low)
 		Movie::InputUpdate();
 	}
 	else
+	{
 		Movie::CheckPadStatus(&PadStatus, ISIDevice::m_iDeviceNumber);
+	}
 
 	// Thankfully changing mode does not change the high bits ;)
 	_Hi  = (u32)((u8)PadStatus.stickY);
@@ -275,9 +264,9 @@ void CSIDevice_GCController::SendCommand(u32 _Cmd, u8 _Poll)
 
 	default:
 		{
-			ERROR_LOG(SERIALINTERFACE, "unknown direct command     (0x%x)", _Cmd);
+			ERROR_LOG(SERIALINTERFACE, "Unknown direct command     (0x%x)", _Cmd);
 			PanicAlert("SI: Unknown direct command");
-		}			
+		}
 		break;
 	}
 }
diff --git a/Source/Core/Core/Src/HW/SI_DeviceGCController.h b/Source/Core/Core/Src/HW/SI_DeviceGCController.h
index b89f433331..a43e5027ce 100644
--- a/Source/Core/Core/Src/HW/SI_DeviceGCController.h
+++ b/Source/Core/Core/Src/HW/SI_DeviceGCController.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _SI_DEVICEGCCONTROLLER_H
 #define _SI_DEVICEGCCONTROLLER_H
@@ -68,7 +55,7 @@ private:
 			u32				:	8;
 		};
 		UCommand()				{Hex = 0;}
-		UCommand(u32 _iValue)	{Hex = _iValue;}		
+		UCommand(u32 _iValue)	{Hex = _iValue;}
 	};
 
 	enum EButtonCombo
diff --git a/Source/Core/Core/Src/HW/SI_DeviceGCSteeringWheel.cpp b/Source/Core/Core/Src/HW/SI_DeviceGCSteeringWheel.cpp
index ade19b758e..562a450422 100644
--- a/Source/Core/Core/Src/HW/SI_DeviceGCSteeringWheel.cpp
+++ b/Source/Core/Core/Src/HW/SI_DeviceGCSteeringWheel.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -88,7 +75,7 @@ int CSIDevice_GCSteeringWheel::RunBuffer(u8* _pBuffer, int _iLength)
 			for (int i = 0; i < (int)sizeof(SOrigin); i++)
 			{
 				_pBuffer[i ^ 3] = *pCalibration++;
-			}				
+			}
 		}
 		break;
 
@@ -99,8 +86,8 @@ int CSIDevice_GCSteeringWheel::RunBuffer(u8* _pBuffer, int _iLength)
 	// DEFAULT
 	default:
 		{
-			ERROR_LOG(SERIALINTERFACE, "unknown SI command     (0x%x)", command);
-		}			
+			ERROR_LOG(SERIALINTERFACE, "Unknown SI command     (0x%x)", command);
+		}
 		break;
 	}
 
@@ -143,7 +130,9 @@ bool CSIDevice_GCSteeringWheel::GetData(u32& _Hi, u32& _Low)
 		Movie::InputUpdate();
 	}
 	else
+	{
 		Movie::CheckPadStatus(&PadStatus, ISIDevice::m_iDeviceNumber);
+	}
 
 	// Thankfully changing mode does not change the high bits ;)
 	_Hi  = (u32)((u8)PadStatus.stickX); // Steering
@@ -228,7 +217,9 @@ bool CSIDevice_GCSteeringWheel::GetData(u32& _Hi, u32& _Low)
 		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;
@@ -297,8 +288,8 @@ void CSIDevice_GCSteeringWheel::SendCommand(u32 _Cmd, u8 _Poll)
 
 	default:
 		{
-			ERROR_LOG(SERIALINTERFACE, "unknown direct command     (0x%x)", _Cmd);
-		}			
+			ERROR_LOG(SERIALINTERFACE, "Unknown direct command     (0x%x)", _Cmd);
+		}
 		break;
 	}
 }
diff --git a/Source/Core/Core/Src/HW/SI_DeviceGCSteeringWheel.h b/Source/Core/Core/Src/HW/SI_DeviceGCSteeringWheel.h
index 2245765863..2c539e56d4 100644
--- a/Source/Core/Core/Src/HW/SI_DeviceGCSteeringWheel.h
+++ b/Source/Core/Core/Src/HW/SI_DeviceGCSteeringWheel.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _SI_DEVICEGCSTEERINGWHEEL_H
 #define _SI_DEVICEGCSTEERINGWHEEL_H
@@ -69,7 +56,7 @@ private:
 			u32				:	8;
 		};
 		UCommand()				{Hex = 0;}
-		UCommand(u32 _iValue)	{Hex = _iValue;}		
+		UCommand(u32 _iValue)	{Hex = _iValue;}
 	};
 
 	enum EButtonCombo
diff --git a/Source/Core/Core/Src/HW/Sram.cpp b/Source/Core/Core/Src/HW/Sram.cpp
index ae811b0bd1..ba2fa12957 100644
--- a/Source/Core/Core/Src/HW/Sram.cpp
+++ b/Source/Core/Core/Src/HW/Sram.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "Sram.h"
 #include "../ConfigManager.h"
diff --git a/Source/Core/Core/Src/HW/Sram.h b/Source/Core/Core/Src/HW/Sram.h
index 51cbefabb6..91e8b2a8b9 100644
--- a/Source/Core/Core/Src/HW/Sram.h
+++ b/Source/Core/Core/Src/HW/Sram.h
@@ -1,19 +1,7 @@
-// Copyright (C) 2003 Dolphin Project.
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
-// 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/
 
 // Modified code taken from libogc
 /*-------------------------------------------------------------
diff --git a/Source/Core/Core/Src/HW/StreamADPCM.cpp b/Source/Core/Core/Src/HW/StreamADPCM.cpp
index da0fac6868..91e4763ed2 100644
--- a/Source/Core/Core/Src/HW/StreamADPCM.cpp
+++ b/Source/Core/Core/Src/HW/StreamADPCM.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 // Adapted from in_cube by hcs & destop
 
diff --git a/Source/Core/Core/Src/HW/StreamADPCM.h b/Source/Core/Core/Src/HW/StreamADPCM.h
index 324ee249ae..797eca1d5f 100644
--- a/Source/Core/Core/Src/HW/StreamADPCM.h
+++ b/Source/Core/Core/Src/HW/StreamADPCM.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 // Adapted from in_cube by hcs & destop
 
diff --git a/Source/Core/Core/Src/HW/SystemTimers.cpp b/Source/Core/Core/Src/HW/SystemTimers.cpp
index 27ba4a62f9..bf77060c83 100644
--- a/Source/Core/Core/Src/HW/SystemTimers.cpp
+++ b/Source/Core/Core/Src/HW/SystemTimers.cpp
@@ -12,7 +12,7 @@
 // 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/
 
 
@@ -23,7 +23,7 @@
 of frames. So if a game runs slow, on a slow computer for example, these updates will occur
 less frequently. This makes sense because almost all console games are controlled by frames
 rather than time, so if a game can't keep up with the normal framerate all animations and
-actions slows down and the game runs to slow. This is different from PC games that are are
+actions slows down and the game runs to slow. This is different from PC games that are
 often controlled by time instead and may not have maximum framerates.
 
 However, I'm not sure if the Bluetooth communication for the Wiimote is entirely frame
@@ -119,9 +119,6 @@ int et_PatchEngine;	// PatchEngine updates every 1/60th of a second by default
 // These are badly educated guesses
 // Feel free to experiment. Set these in Init below.
 int
-	// These shouldn't be period controlled either, most likely.
-	DSP_PERIOD,
-
 	// This is a fixed value, don't change it 
 	AUDIO_DMA_PERIOD,
 
@@ -149,13 +146,13 @@ void DSPCallback(u64 userdata, int cyclesLate)
 {
 	//splits up the cycle budget in case lle is used
 	//for hle, just gives all of the slice to hle
-	DSP::UpdateDSPSlice(DSP_PERIOD - cyclesLate);
-	CoreTiming::ScheduleEvent(DSP_PERIOD - cyclesLate, et_DSP);
+	DSP::UpdateDSPSlice(DSP::GetDSPEmulator()->DSP_UpdateRate() - cyclesLate);
+	CoreTiming::ScheduleEvent(DSP::GetDSPEmulator()->DSP_UpdateRate() - cyclesLate, et_DSP);
 }
 
 void AudioDMACallback(u64 userdata, int cyclesLate)
 {
-	int fields = SConfig::GetInstance().m_LocalCoreStartupParameter.bVBeam?2:1;
+	int fields = VideoInterface::GetNumFields();
 	int period = CPU_CORE_CLOCK / (AudioInterface::GetAIDSampleRate() * 4 / 32 * fields);
 	DSP::UpdateAudioDMA();  // Push audio to speakers.
 	CoreTiming::ScheduleEvent(period - cyclesLate, et_AudioDMA);
@@ -245,27 +242,14 @@ void Init()
 {
 	if (SConfig::GetInstance().m_LocalCoreStartupParameter.bWii)
 	{
-		if (!DSP::GetDSPEmulator()->IsLLE())
-			DSP_PERIOD = (int)(GetTicksPerSecond() * 0.003f);
-
 		// AyuanX: TO BE TWEAKED
 		// Now the 1500 is a pure assumption
 		// We need to figure out the real frequency though
 
 		// FYI, WII_IPC_HLE_Interface::Update is also called in WII_IPCInterface::Write32
 		const int freq = 1500;
-		const int fields = SConfig::GetInstance().m_LocalCoreStartupParameter.
-				bVBeam ? 2 : 1;
-		IPC_HLE_PERIOD = GetTicksPerSecond() / (freq * fields);
+		IPC_HLE_PERIOD = GetTicksPerSecond() / (freq * VideoInterface::GetNumFields());
 	}
-	else
-	{
-		if (!DSP::GetDSPEmulator()->IsLLE())
-			DSP_PERIOD = (int)(GetTicksPerSecond() * 0.005f);
-	}
-
-	if (DSP::GetDSPEmulator()->IsLLE())
-		DSP_PERIOD = 12000; // TO BE TWEAKED
 
 	// System internal sample rate is fixed at 32KHz * 4 (16bit Stereo) / 32 bytes DMA
 	AUDIO_DMA_PERIOD = CPU_CORE_CLOCK / (AudioInterface::GetAIDSampleRate() * 4 / 32);
@@ -292,7 +276,7 @@ void Init()
 	et_PatchEngine = CoreTiming::RegisterEvent("PatchEngine", PatchEngineCallback);
 
 	CoreTiming::ScheduleEvent(VideoInterface::GetTicksPerLine(), et_VI);
-	CoreTiming::ScheduleEvent(DSP_PERIOD, et_DSP);
+	CoreTiming::ScheduleEvent(0, et_DSP);
 	CoreTiming::ScheduleEvent(VideoInterface::GetTicksPerFrame(), et_SI);
 	CoreTiming::ScheduleEvent(AUDIO_DMA_PERIOD, et_AudioDMA);
 	if (SConfig::GetInstance().m_LocalCoreStartupParameter.bSyncGPU)
diff --git a/Source/Core/Core/Src/HW/SystemTimers.h b/Source/Core/Core/Src/HW/SystemTimers.h
index 629593bc1d..331dbf8c85 100644
--- a/Source/Core/Core/Src/HW/SystemTimers.h
+++ b/Source/Core/Core/Src/HW/SystemTimers.h
@@ -12,7 +12,7 @@
 // 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 _SYSTEMTIMERS_H
diff --git a/Source/Core/Core/Src/HW/VideoInterface.cpp b/Source/Core/Core/Src/HW/VideoInterface.cpp
index bf9f7f8b84..5e7299586c 100644
--- a/Source/Core/Core/Src/HW/VideoInterface.cpp
+++ b/Source/Core/Core/Src/HW/VideoInterface.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "Common.h"
 #include "ChunkFile.h"
@@ -68,12 +55,12 @@ static u32 TicksPerFrame = 0;
 static u32 s_lineCount = 0;
 static u32 s_upperFieldBegin = 0;
 static u32 s_lowerFieldBegin = 0;
-static int fields = 2;
+static int fields = 1;
 
 void DoState(PointerWrap &p)
 {
-	p.Do(m_VerticalTimingRegister);
-	p.Do(m_DisplayControlRegister);
+	p.DoPOD(m_VerticalTimingRegister);
+	p.DoPOD(m_DisplayControlRegister);
 	p.Do(m_HTiming0);
 	p.Do(m_HTiming1);
 	p.Do(m_VBlankTimingOdd);
@@ -89,7 +76,7 @@ void DoState(PointerWrap &p)
 	p.DoArray(m_InterruptRegister, 4);
 	p.DoArray(m_LatchRegister, 2);
 	p.Do(m_HorizontalStepping);
-	p.Do(m_HorizontalScaling);
+	p.DoPOD(m_HorizontalScaling);
 	p.Do(m_FilterCoefTables);
 	p.Do(m_UnkAARegister);
 	p.Do(m_Clock);
@@ -181,7 +168,7 @@ void Init()
 	m_BorderHBlank.Hex = 0;
 	memset(&m_FilterCoefTables, 0, sizeof(m_FilterCoefTables));
 
-	fields = Core::g_CoreStartupParameter.bVBeam ? 1 : 2;
+	fields = 1;
 
 	m_DTVStatus.ntsc_j = Core::g_CoreStartupParameter.bForceNTSCJ;
 
@@ -304,11 +291,11 @@ void Read16(u16& _uReturnValue, const u32 _iAddress)
 		break;
 
 	case VI_VERTICAL_BEAM_POSITION:
-    	_uReturnValue = m_VBeamPos;
+		_uReturnValue = m_VBeamPos;
 		return;
 
 	case VI_HORIZONTAL_BEAM_POSITION:
-        _uReturnValue = m_HBeamPos;
+		_uReturnValue = m_HBeamPos;
 		return;
 
 	// RETRACE STUFF ...
@@ -407,11 +394,11 @@ void Read16(u16& _uReturnValue, const u32 _iAddress)
 
 	case VI_UNK_AA_REG_HI:
 		_uReturnValue = (m_UnkAARegister & 0xffff0000) >> 16;
-		WARN_LOG(VIDEOINTERFACE, "(r16) unknown AA reg, not sure what it does :)");
+		WARN_LOG(VIDEOINTERFACE, "(r16) unknown AA register, not sure what it does :)");
 		break;
 	case VI_UNK_AA_REG_LO:
 		_uReturnValue = m_UnkAARegister & 0x0000ffff;
-		WARN_LOG(VIDEOINTERFACE, "(r16) unknown AA reg, not sure what it does :)");
+		WARN_LOG(VIDEOINTERFACE, "(r16) unknown AA register, not sure what it does :)");
 		break;
 
 	case VI_CLOCK:
@@ -434,7 +421,7 @@ void Read16(u16& _uReturnValue, const u32 _iAddress)
 		break;
 
 	default:
-		ERROR_LOG(VIDEOINTERFACE, "(r16) unk reg %x", _iAddress & 0xfff);
+		ERROR_LOG(VIDEOINTERFACE, "(r16) unknown reg %x", _iAddress & 0xfff);
 		_uReturnValue = 0x0;
 		break;
 	}
@@ -659,11 +646,11 @@ void Write16(const u16 _iValue, const u32 _iAddress)
 
 	case VI_UNK_AA_REG_HI:
 		m_UnkAARegister = (m_UnkAARegister & 0x0000ffff) | (u32)(_iValue << 16);
-		WARN_LOG(VIDEOINTERFACE, "(w16) to unknown AA reg, not sure what it does :)");
+		WARN_LOG(VIDEOINTERFACE, "(w16) to unknown AA register, not sure what it does :)");
 		break;
 	case VI_UNK_AA_REG_LO:
 		m_UnkAARegister = (m_UnkAARegister & 0xffff0000) | _iValue;
-		WARN_LOG(VIDEOINTERFACE, "(w16) to unknown AA reg, not sure what it does :)");
+		WARN_LOG(VIDEOINTERFACE, "(w16) to unknown AA register, not sure what it does :)");
 		break;
 
 	case VI_CLOCK:
@@ -686,7 +673,7 @@ void Write16(const u16 _iValue, const u32 _iAddress)
 		break;
 
 	default:
-		ERROR_LOG(VIDEOINTERFACE, "(w16) %04x to unk reg %x", _iValue, _iAddress & 0xfff);
+		ERROR_LOG(VIDEOINTERFACE, "(w16) %04x to unknown register %x", _iValue, _iAddress & 0xfff);
 		break;
 	}
 }
@@ -746,40 +733,50 @@ u32 GetXFBAddressBottom()
 
 void UpdateParameters()
 {
-    switch (m_DisplayControlRegister.FMT)
-    {
-    case 0: // NTSC
+	fields = m_DisplayControlRegister.NIN ? 2 : 1;
+
+	switch (m_DisplayControlRegister.FMT)
+	{
+	case 0: // NTSC
 		TargetRefreshRate = NTSC_FIELD_RATE;
-		TicksPerFrame = SystemTimers::GetTicksPerSecond() / (NTSC_FIELD_RATE / fields);
+		TicksPerFrame = SystemTimers::GetTicksPerSecond() / NTSC_FIELD_RATE;
 		s_lineCount = NTSC_LINE_COUNT;
 		s_upperFieldBegin = NTSC_UPPER_BEGIN;
 		s_lowerFieldBegin = NTSC_LOWER_BEGIN;
 		break;
 
-    case 2: // PAL-M
+	case 2: // PAL-M
 		TargetRefreshRate = NTSC_FIELD_RATE;
-		TicksPerFrame = SystemTimers::GetTicksPerSecond() / (NTSC_FIELD_RATE / fields);
+		TicksPerFrame = SystemTimers::GetTicksPerSecond() / NTSC_FIELD_RATE;
 		s_lineCount = PAL_LINE_COUNT;
 		s_upperFieldBegin = PAL_UPPER_BEGIN;
 		s_lowerFieldBegin = PAL_LOWER_BEGIN;
-        break;
+		break;
 
-    case 1: // PAL
+	case 1: // PAL
 		TargetRefreshRate = PAL_FIELD_RATE;
-		TicksPerFrame = SystemTimers::GetTicksPerSecond() / (PAL_FIELD_RATE / fields);
+		TicksPerFrame = SystemTimers::GetTicksPerSecond() / PAL_FIELD_RATE;
 		s_lineCount = PAL_LINE_COUNT;
 		s_upperFieldBegin = PAL_UPPER_BEGIN;
 		s_lowerFieldBegin = PAL_LOWER_BEGIN;
-        break;
+		break;
 
 	case 3: // Debug
 		PanicAlert("Debug video mode not implemented");
 		break;
 
-    default:
-        PanicAlert("Unknown Video Format - CVideoInterface");
-        break;
-    }
+	default:
+		PanicAlert("Unknown Video Format - CVideoInterface");
+		break;
+	}
+}
+
+int GetNumFields()
+{
+	if (Core::g_CoreStartupParameter.bVBeamSpeedHack)
+		return (2 / fields);
+	else
+		return 1;
 }
 
 unsigned int GetTicksPerLine()
@@ -790,7 +787,10 @@ unsigned int GetTicksPerLine()
 	}
 	else
 	{
-		return TicksPerFrame / (s_lineCount * fields);
+		if (Core::g_CoreStartupParameter.bVBeamSpeedHack)
+			return TicksPerFrame / s_lineCount;
+		else
+			return TicksPerFrame / (s_lineCount / (2 / fields)) ;
 	}
 }
 
@@ -812,7 +812,7 @@ static void BeginField(FieldType field)
 
 	static const char* const fieldTypeNames[] = { "Progressive", "Upper", "Lower" };
 
-	DEBUG_LOG(VIDEOINTERFACE, "(VI->BeginField): addr: %.08X | FieldSteps %u | FbSteps %u | ACV %u | Field %s",
+	DEBUG_LOG(VIDEOINTERFACE, "(VI->BeginField): Address: %.08X | FieldSteps %u | FbSteps %u | ACV %u | Field %s",
 		xfbAddr, m_HorizontalStepping.FieldSteps, m_HorizontalStepping.FbSteps, m_VerticalTimingRegister.ACV,
 		fieldTypeNames[field]
 	);
@@ -831,39 +831,27 @@ static void EndField()
 // Run when: When a frame is scanned (progressive/interlace)
 void Update()
 {
-	u16 NewVBeamPos = 0;
-
 	if (m_DisplayControlRegister.NIN)
 	{
 		// Progressive
-		NewVBeamPos = s_lineCount + 1;
 		if (m_VBeamPos == 1)
 			BeginField(FIELD_PROGRESSIVE);
 	}
 	else if (m_VBeamPos == s_upperFieldBegin)
 	{
 		// Interlace Upper
-		NewVBeamPos = s_lineCount * 2;
 		BeginField(FIELD_UPPER);
 	}
 	else if (m_VBeamPos == s_lowerFieldBegin)
 	{
 		// Interlace Lower
-		NewVBeamPos = s_lineCount;
 		BeginField(FIELD_LOWER);
 	}
 
-	if (m_DisplayControlRegister.NIN)
+	if (m_VBeamPos == s_upperFieldBegin + m_VerticalTimingRegister.ACV)
 	{
-		// Progressive
-		if (m_VBeamPos == s_lineCount)
-			EndField();
-	}
-	else if (m_VBeamPos == s_upperFieldBegin + m_VerticalTimingRegister.ACV)
-	{
-		// Interlace Upper.  Do not EndField (swapBuffer) at the end of the upper field.
-		if (Core::g_CoreStartupParameter.bVBeam)
-			EndField();
+		// Interlace Upper.
+		EndField();
 	}
 	else if (m_VBeamPos == s_lowerFieldBegin + m_VerticalTimingRegister.ACV)
 	{
@@ -871,8 +859,8 @@ void Update()
 		EndField();
 	}
 
-	if (++m_VBeamPos > s_lineCount)
-		m_VBeamPos = (NewVBeamPos > s_lineCount || Core::g_CoreStartupParameter.bVBeam) ? 1 : NewVBeamPos;
+	if (++m_VBeamPos > s_lineCount * fields)
+		m_VBeamPos = 1;
 
 	for (int i = 0; i < 4; i++)
 	{
diff --git a/Source/Core/Core/Src/HW/VideoInterface.h b/Source/Core/Core/Src/HW/VideoInterface.h
index 0eba189851..325d43f080 100644
--- a/Source/Core/Core/Src/HW/VideoInterface.h
+++ b/Source/Core/Core/Src/HW/VideoInterface.h
@@ -1,19 +1,7 @@
-// Copyright (C) 2003 Dolphin Project.
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, version 2.0.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License 2.0 for more details.
-
-// A copy of the GPL 2.0 should have been included with the program.
-// If not, see http://www.gnu.org/licenses/
-
-// Official SVN repository and contact information can be found at
-// http://code.google.com/p/dolphin-emu/
 #ifndef _VIDEOINTERFACE_H
 #define _VIDEOINTERFACE_H
 
@@ -33,8 +21,8 @@ namespace VideoInterface
 // These line numbers indicate the beginning of the "active video" in a frame.
 // An NTSC frame has the lower field first followed by the upper field.
 // TODO: Is this true for PAL-M? Is this true for EURGB60?
-#define NTSC_LOWER_BEGIN		21
-#define NTSC_UPPER_BEGIN		283
+#define NTSC_LOWER_BEGIN	21
+#define NTSC_UPPER_BEGIN	283
 
 //#define PAL_FIELD_RATE		50.0f
 #define PAL_FIELD_RATE		50
@@ -48,7 +36,7 @@ namespace VideoInterface
 enum
 {
 	VI_VERTICAL_TIMING					= 0x00,
-	VI_CONTROL_REGISTER	                = 0x02,
+	VI_CONTROL_REGISTER					= 0x02,
 	VI_HORIZONTAL_TIMING_0_HI			= 0x04,
 	VI_HORIZONTAL_TIMING_0_LO			= 0x06,
 	VI_HORIZONTAL_TIMING_1_HI			= 0x08,
@@ -83,8 +71,8 @@ enum
 	VI_DISPLAY_LATCH_0_LO				= 0x42,
 	VI_DISPLAY_LATCH_1_HI				= 0x44,
 	VI_DISPLAY_LATCH_1_LO				= 0x46,
-	VI_HSCALEW                          = 0x48,
-	VI_HSCALER                          = 0x4a,
+	VI_HSCALEW							= 0x48,
+	VI_HSCALER							= 0x4a,
 	VI_FILTER_COEF_0_HI					= 0x4c,
 	VI_FILTER_COEF_0_LO					= 0x4e,
 	VI_FILTER_COEF_1_HI					= 0x50,
@@ -340,7 +328,7 @@ union UVIDTVStatus
 	void Read8(u8& _uReturnValue, const u32 _uAddress);
 	void Read16(u16& _uReturnValue, const u32 _uAddress);
 	void Read32(u32& _uReturnValue, const u32 _uAddress);
-				
+
 	void Write16(const u16 _uValue, const u32 _uAddress);
 	void Write32(const u32 _uValue, const u32 _uAddress);
 
@@ -348,17 +336,19 @@ union UVIDTVStatus
 	u8* GetXFBPointerTop();
 	u8* GetXFBPointerBottom();
 
-    // Update and draw framebuffer
-    void Update();
+	// Update and draw framebuffer
+	void Update();
 
 	// UpdateInterrupts: check if we have to generate a new VI Interrupt
 	void UpdateInterrupts();
 
-    // Change values pertaining to video mode
-    void UpdateParameters();
+	// Change values pertaining to video mode
+	void UpdateParameters();
 
 	unsigned int GetTicksPerLine();
 	unsigned int GetTicksPerFrame();
+
+	int GetNumFields();
 };
 
 #endif // _VIDEOINTERFACE_H
diff --git a/Source/Core/Core/Src/HW/WII_IOB.cpp b/Source/Core/Core/Src/HW/WII_IOB.cpp
index 843c6bb24a..59d610afec 100644
--- a/Source/Core/Core/Src/HW/WII_IOB.cpp
+++ b/Source/Core/Core/Src/HW/WII_IOB.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "Common.h"
 #include "ChunkFile.h"
@@ -36,42 +23,42 @@ void Read32(u32& _rReturnValue, const u32 _Address)
 {
 	switch (_Address & 0xFFFF)
 	{
-    // NAND Loader ... no idea
-    case 0x018:
-        ERROR_LOG(WII_IOB, "IOP: Read32 from 0x18 = 0x%08x (NANDLoader)",  _Address);
-        break;
-    // WiiMenu... no idea
-    case 0x24:
-        ERROR_LOG(WII_IOB, "IOP: Read32 from 0x18 = 0x%08x (WiiMenu)",  _Address);
-        break;
+	// NAND Loader ... no idea
+	case 0x018:
+		ERROR_LOG(WII_IOB, "IOP: Read32 from 0x18 = 0x%08x (NANDLoader)",  _Address);
+		break;
+	// WiiMenu... no idea
+	case 0x24:
+		ERROR_LOG(WII_IOB, "IOP: Read32 from 0x18 = 0x%08x (WiiMenu)",  _Address);
+		break;
 
 
-	case 0xc0:					// __VISendI2CData		
+	case 0xc0:					// __VISendI2CData
 		_rReturnValue = 0;
 		INFO_LOG(WII_IOB, "IOP: Read32 from 0xc0 = 0x%08x (__VISendI2CData)", _rReturnValue);
 		break;
 
-	case 0xc4:					// __VISendI2CData		
+	case 0xc4:					// __VISendI2CData
 		_rReturnValue = 0;
 		INFO_LOG(WII_IOB, "IOP: Read32 from 0xc4 = 0x%08x (__VISendI2CData)", _rReturnValue);
 		break;
 
-	case 0xc8:					// __VISendI2CData		
+	case 0xc8:					// __VISendI2CData
 		_rReturnValue = 0;
 		INFO_LOG(WII_IOB, "IOP: Read32 from 0xc8 = 0x%08x (__VISendI2CData)", _rReturnValue);
 		break;
 
-	case 0x180:					// __AIClockInit		
+	case 0x180:					// __AIClockInit
 		_rReturnValue = 0;
 		INFO_LOG(WII_IOB, "IOP: Read32 from 0x180 = 0x%08x (__AIClockInit)", _rReturnValue);
 		return;
 
-	case 0x1CC:					// __AIClockInit		
+	case 0x1CC:					// __AIClockInit
 		_rReturnValue = 0;
 		INFO_LOG(WII_IOB, "IOP: Read32 from 0x1CC = 0x%08x (__AIClockInit)", _rReturnValue);
 		return;
 
-	case 0x1D0:					// __AIClockInit		
+	case 0x1D0:					// __AIClockInit
 		_rReturnValue = 0;
 		INFO_LOG(WII_IOB, "IOP: Read32 from 0x1D0 = 0x%08x (__AIClockInit)", _rReturnValue);
 		return;
@@ -79,7 +66,7 @@ void Read32(u32& _rReturnValue, const u32 _Address)
 	default:
 		_dbg_assert_msg_(WII_IOB, 0, "IOP: Read32 from 0x%08x", _Address);
 		break;
-	}	
+	}
 }
 
 void Read64(u64& _rReturnValue, const u32 _Address)
@@ -101,43 +88,43 @@ void Write32(const u32 _Value, const u32 _Address)
 {
 	switch(_Address & 0xFFFF)
 	{
-    // NANDLoader ... no idea
-    case 0x18:
-        ERROR_LOG(WII_IOB, "IOP: Write32 0x%08x to 0x%08x (NANDLoader)", _Value, _Address);
-        break;
-    // WiiMenu... no idea
-    case 0x24:
-        ERROR_LOG(WII_IOB, "IOP: Write32 0x%08x to 0x%08x (WiiMenu)", _Value, _Address);
-        break;
+	// NANDLoader ... no idea
+	case 0x18:
+		ERROR_LOG(WII_IOB, "IOP: Write32 0x%08x to 0x%08x (NANDLoader)", _Value, _Address);
+		break;
+	// WiiMenu... no idea
+	case 0x24:
+		ERROR_LOG(WII_IOB, "IOP: Write32 0x%08x to 0x%08x (WiiMenu)", _Value, _Address);
+		break;
 
-	case 0xc0:					// __VISendI2CData		
+	case 0xc0:					// __VISendI2CData
 		INFO_LOG(WII_IOB, "IOP: Write32 to 0xc0 = 0x%08x (__VISendI2CData)", _Value);
 		break;
 
-	case 0xc4:					// __VISendI2CData		
+	case 0xc4:					// __VISendI2CData
 		INFO_LOG(WII_IOB, "IOP: Write32 to 0xc4 = 0x%08x (__VISendI2CData)", _Value);
 		break;
 
-	case 0xc8:					// __VISendI2CData		
+	case 0xc8:					// __VISendI2CData
 		INFO_LOG(WII_IOB, "IOP: Write32 to 0xc8 = 0x%08x (__VISendI2CData)", _Value);
 		break;
 
-	case 0x180:					// __AIClockInit		
+	case 0x180:					// __AIClockInit
 		INFO_LOG(WII_IOB, "IOP: Write32 to 0x180 = 0x%08x (__AIClockInit)", _Value);
 		return;
 
-	case 0x1CC:					// __AIClockInit		
+	case 0x1CC:					// __AIClockInit
 		INFO_LOG(WII_IOB, "IOP: Write32 to 0x1D0 = 0x%08x (__AIClockInit)", _Value);
 		return;
 
-	case 0x1D0:					// __AIClockInit		
+	case 0x1D0:					// __AIClockInit
 		INFO_LOG(WII_IOB, "IOP: Write32 to 0x1D0 = 0x%08x (__AIClockInit)", _Value);
 		return;
 
 	default:
 		_dbg_assert_msg_(WII_IOB, 0, "IOP: Write32 to 0x%08x", _Address);
 		break;
-	}	
+	}
 }
 
 void Write64(const u64 _Value, const u32 _Address)
diff --git a/Source/Core/Core/Src/HW/WII_IOB.h b/Source/Core/Core/Src/HW/WII_IOB.h
index 3547ea3688..cdca7f6c8f 100644
--- a/Source/Core/Core/Src/HW/WII_IOB.h
+++ b/Source/Core/Core/Src/HW/WII_IOB.h
@@ -1,19 +1,7 @@
-// Copyright (C) 2003 Dolphin Project.
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
-// 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 _WII_IOBRIDGE_H_
 #define _WII_IOBRIDGE_H_
 
@@ -24,7 +12,7 @@ namespace WII_IOBridge
 {
 
 void Init();
-void Shutdown();	
+void Shutdown();
 void DoState(PointerWrap &p);
 
 void Update();
diff --git a/Source/Core/Core/Src/HW/WII_IPC.cpp b/Source/Core/Core/Src/HW/WII_IPC.cpp
index 3d269d0fcd..b09d83f44b 100644
--- a/Source/Core/Core/Src/HW/WII_IPC.cpp
+++ b/Source/Core/Core/Src/HW/WII_IPC.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include <map>
 #include <queue>
@@ -111,7 +98,7 @@ void DoState(PointerWrap &p)
 {
 	p.Do(ppc_msg);
 	p.Do(arm_msg);
-	p.Do(ctrl);
+	p.DoPOD(ctrl);
 	p.Do(ppc_irq_flags);
 	p.Do(ppc_irq_masks);
 	p.Do(arm_irq_flags);
@@ -152,7 +139,7 @@ void Read32(u32& _rReturnValue, const u32 _Address)
 {
 	switch(_Address & 0xFFFF)
 	{
-	case IPC_PPCCTRL:	
+	case IPC_PPCCTRL:
 		_rReturnValue = ctrl.ppc();
 		DEBUG_LOG(WII_IPC, "r32 IPC_PPCCTRL %03x [R:%i A:%i E:%i]",
 			ctrl.ppc(), ctrl.Y1, ctrl.Y2, ctrl.X1);
@@ -194,12 +181,12 @@ void Write32(const u32 _Value, const u32 _Address)
 				_Value, ctrl.ppc(), ctrl.Y1, ctrl.Y2, ctrl.X1);
 			if (ctrl.X1)
 			{
-				INFO_LOG(WII_IPC, "new pointer available: %08x", ppc_msg);
+				INFO_LOG(WII_IPC, "New pointer available: %08x", ppc_msg);
 				// Let the HLE handle the request on it's own time
 				WII_IPC_HLE_Interface::EnqRequest(ppc_msg);
 			}
 		}
-		break;  
+		break;
 
 	case PPC_IRQFLAG:	// ACR REGISTER IT IS CALLED IN DEBUG
 		{
@@ -224,8 +211,8 @@ void Write32(const u32 _Value, const u32 _Address)
 	default:
 		_dbg_assert_msg_(WII_IPC, 0, "w32 %08x @ %08x", _Value, _Address);
 		break;
-	}	
-
+	}
+	
 	WII_IPC_HLE_Interface::Update();
 	CoreTiming::ScheduleEvent_Threadsafe(0, updateInterrupts, 0);
 }
diff --git a/Source/Core/Core/Src/HW/WII_IPC.h b/Source/Core/Core/Src/HW/WII_IPC.h
index 3d4e416c42..3e5ec1c88d 100644
--- a/Source/Core/Core/Src/HW/WII_IPC.h
+++ b/Source/Core/Core/Src/HW/WII_IPC.h
@@ -1,19 +1,7 @@
-// Copyright (C) 2003 Dolphin Project.
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
-// 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 _WII_IPC_H_
 #define _WII_IPC_H_
 
@@ -46,7 +34,7 @@ enum StarletInterruptCause
 
 void Init();
 void Reset();
-void Shutdown();	
+void Shutdown();
 void DoState(PointerWrap &p);
 
 void Read32(u32& _rReturnValue, const u32 _Address);
diff --git a/Source/Core/Core/Src/HW/Wiimote.cpp b/Source/Core/Core/Src/HW/Wiimote.cpp
index e45856f5f5..20e10b5fb8 100644
--- a/Source/Core/Core/Src/HW/Wiimote.cpp
+++ b/Source/Core/Core/Src/HW/Wiimote.cpp
@@ -1,3 +1,6 @@
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "Common.h"
 
@@ -55,11 +58,16 @@ void Initialize(void* const hwnd)
 }
 
 // __________________________________________________________________________________________________
-// Function: Wiimote_Output
+// Function: ControlChannel
 // Purpose:  An L2CAP packet is passed from the Core to the Wiimote,
 //           on the HID CONTROL channel.
-// input:    Da pakket.
-// output:   none
+//
+// Inputs:   _number    [Description needed]
+//           _channelID [Description needed]
+//           _pData     [Description needed]
+//           _Size      [Description needed]
+//
+// Output:   none
 //
 void ControlChannel(int _number, u16 _channelID, const void* _pData, u32 _Size)
 {
@@ -71,11 +79,16 @@ void ControlChannel(int _number, u16 _channelID, const void* _pData, u32 _Size)
 }
 
 // __________________________________________________________________________________________________
-// Function: Wiimote_InterruptChannel
+// Function: InterruptChannel
 // Purpose:  An L2CAP packet is passed from the Core to the Wiimote,
 //           on the HID INTERRUPT channel.
-// input:    Da pakket.
-// output:   none
+//
+// Inputs:   _number    [Description needed]
+//           _channelID [Description needed]
+//           _pData     [Description needed]
+//           _Size      [Description needed]
+//
+// Output:   none
 //
 void InterruptChannel(int _number, u16 _channelID, const void* _pData, u32 _Size)
 {
@@ -86,9 +99,9 @@ void InterruptChannel(int _number, u16 _channelID, const void* _pData, u32 _Size
 }
 
 // __________________________________________________________________________________________________
-// Function: Wiimote_Update
-// Purpose:  This function is called periodically by the Core.
-// input:    none
+// Function: Update
+// Purpose:  This function is called periodically by the Core. // TODO: Explain why.
+// input:    _number: [Description needed]
 // output:   none
 //
 void Update(int _number)
@@ -113,10 +126,10 @@ void Update(int _number)
 }
 
 // __________________________________________________________________________________________________
-// Function: PAD_GetAttachedPads
+// Function: GetAttached
 // Purpose:  Get mask of attached pads (eg: controller 1 & 4 -> 0x9)
-// input:	 none
-// output:   number of pads
+// input:    none
+// output:   The number of attached pads
 //
 unsigned int GetAttached()
 {
@@ -130,8 +143,8 @@ unsigned int GetAttached()
 // ___________________________________________________________________________
 // Function: DoState
 // Purpose:  Saves/load state
-// input/output: ptr
-// input: mode
+// input/output: ptr: [Description Needed]
+// input: mode        [Description needed]
 //
 void DoState(u8 **ptr, PointerWrap::Mode mode)
 {
@@ -145,7 +158,7 @@ void DoState(u8 **ptr, PointerWrap::Mode mode)
 // ___________________________________________________________________________
 // Function: EmuStateChange
 // Purpose: Notifies the plugin of a change in emulation state
-// input:    newState
+// input:    newState - The new state for the Wiimote to change to.
 // output:   none
 //
 void EmuStateChange(EMUSTATE_CHANGE newState)
diff --git a/Source/Core/Core/Src/HW/Wiimote.h b/Source/Core/Core/Src/HW/Wiimote.h
index 6b758abb5a..fa4ec895bd 100644
--- a/Source/Core/Core/Src/HW/Wiimote.h
+++ b/Source/Core/Core/Src/HW/Wiimote.h
@@ -1,3 +1,6 @@
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _WIIMOTE_H_
 #define _WIIMOTE_H_
diff --git a/Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Attachment.cpp b/Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Attachment.cpp
index e600f6be67..93e5a22a9e 100644
--- a/Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Attachment.cpp
+++ b/Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Attachment.cpp
@@ -1,3 +1,6 @@
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "Attachment.h"
 
diff --git a/Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Attachment.h b/Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Attachment.h
index 3b8f9166b1..777c0e158e 100644
--- a/Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Attachment.h
+++ b/Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Attachment.h
@@ -1,3 +1,7 @@
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
+
 #ifndef _ATTACHMENT_EMU_H_
 #define _ATTACHMENT_EMU_H_
 
diff --git a/Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp b/Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp
index ab54555aeb..3de2951de3 100644
--- a/Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp
+++ b/Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp
@@ -1,3 +1,7 @@
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
+
 #include "Classic.h"
 
 
diff --git a/Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.h b/Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.h
index d87c3a8d05..852eb74b81 100644
--- a/Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.h
+++ b/Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.h
@@ -1,3 +1,7 @@
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
+
 #include "Attachment.h"
 
 namespace WiimoteEmu
diff --git a/Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp b/Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp
index 9dfb874791..066843b3e4 100644
--- a/Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp
+++ b/Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp
@@ -1,3 +1,7 @@
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
+
 #include "Drums.h"
 
 
diff --git a/Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.h b/Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.h
index eeef2fde57..fc0d4851a5 100644
--- a/Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.h
+++ b/Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.h
@@ -1,3 +1,7 @@
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
+
 #include "Attachment.h"
 
 namespace WiimoteEmu
diff --git a/Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp b/Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp
index b3871701cb..918236c10e 100644
--- a/Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp
+++ b/Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp
@@ -1,3 +1,7 @@
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
+
 #include "Guitar.h"
 
 
diff --git a/Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.h b/Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.h
index 6b96800915..8d1e718337 100644
--- a/Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.h
+++ b/Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.h
@@ -1,3 +1,7 @@
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
+
 #include "Attachment.h"
 
 namespace WiimoteEmu
diff --git a/Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp b/Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp
index 87752e8372..0abe0d4b9c 100644
--- a/Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp
+++ b/Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp
@@ -1,3 +1,7 @@
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
+
 #include "Nunchuk.h"
 
 #include "UDPWrapper.h"
diff --git a/Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.h b/Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.h
index 0e1c037db4..b465283e61 100644
--- a/Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.h
+++ b/Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.h
@@ -1,3 +1,7 @@
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
+
 #ifndef NUNCHUCK_H
 #define NUNCHUCK_H
 
diff --git a/Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp b/Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp
index 182170f501..21489548fa 100644
--- a/Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp
+++ b/Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp
@@ -1,3 +1,7 @@
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
+
 #include "Turntable.h"
 
 
diff --git a/Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.h b/Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.h
index 18d8124105..b2d2458312 100644
--- a/Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.h
+++ b/Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.h
@@ -1,3 +1,7 @@
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
+
 #include "Attachment.h"
 
 namespace WiimoteEmu
diff --git a/Source/Core/Core/Src/HW/WiimoteEmu/EmuSubroutines.cpp b/Source/Core/Core/Src/HW/WiimoteEmu/EmuSubroutines.cpp
index 5710fd4f25..d3eab89c18 100644
--- a/Source/Core/Core/Src/HW/WiimoteEmu/EmuSubroutines.cpp
+++ b/Source/Core/Core/Src/HW/WiimoteEmu/EmuSubroutines.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 
 /* HID reports access guide. */
@@ -163,7 +150,7 @@ void Wiimote::HidOutputReport(const wm_report* const sr, const bool send_ack)
 	case WM_IR_LOGIC: // 0x1a
 		// comment from old plugin:
 		// This enables or disables the IR lights, we update the global variable g_IR
-	    // so that WmRequestStatus() knows about it
+		// so that WmRequestStatus() knows about it
 		//INFO_LOG(WIIMOTE, "WM IR Enable: 0x%02x", sr->data[0]);
 		m_status.ir = sr->enable;
 		if (false == sr->ack)
@@ -360,7 +347,7 @@ void Wiimote::WriteData(const wm_write_data* const wd)
 			/* TODO?
 			if (region_ptr == &m_reg_speaker)
 			{
-				ERROR_LOG(WIIMOTE, "Write to speaker reg %x %s", address,
+				ERROR_LOG(WIIMOTE, "Write to speaker register %x %s", address,
 					ArrayToString(wd->data, wd->size, 100, false).c_str());
 			}
 			*/
@@ -511,7 +498,7 @@ void Wiimote::ReadData(const wm_read_data* const rd)
 		break;
 
 	default :
-		PanicAlert("WmReadData: unimplemented parameters (size: %i, addr: 0x%x)!", size, rd->space);
+		PanicAlert("WmReadData: unimplemented parameters (size: %i, address: 0x%x)!", size, rd->space);
 		break;
 	}
 
diff --git a/Source/Core/Core/Src/HW/WiimoteEmu/Encryption.cpp b/Source/Core/Core/Src/HW/WiimoteEmu/Encryption.cpp
index 44ea0b3f7d..70efdf2803 100644
--- a/Source/Core/Core/Src/HW/WiimoteEmu/Encryption.cpp
+++ b/Source/Core/Core/Src/HW/WiimoteEmu/Encryption.cpp
@@ -1,21 +1,9 @@
-// Copyright (C) 2003 Dolphin Project.
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
+//
 // Copyright (C) Hector Martin "marcan" (hector@marcansoft.com)
 
-// 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 "Encryption.h"
diff --git a/Source/Core/Core/Src/HW/WiimoteEmu/Encryption.h b/Source/Core/Core/Src/HW/WiimoteEmu/Encryption.h
index 92a06ad2a4..7088367d51 100644
--- a/Source/Core/Core/Src/HW/WiimoteEmu/Encryption.h
+++ b/Source/Core/Core/Src/HW/WiimoteEmu/Encryption.h
@@ -1,21 +1,9 @@
-// Copyright (C) 2003 Dolphin Project.
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
+//
 // Copyright (C) Hector Martin "marcan" (hector@marcansoft.com)
 
-// 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 WIIMOTE_EXTENSION_ENCRYPTION_H
 #define WIIMOTE_EXTENSION_ENCRYPTION_H
diff --git a/Source/Core/Core/Src/HW/WiimoteEmu/MatrixMath.h b/Source/Core/Core/Src/HW/WiimoteEmu/MatrixMath.h
index 3f6348cb1b..b8abafbb3a 100644
--- a/Source/Core/Core/Src/HW/WiimoteEmu/MatrixMath.h
+++ b/Source/Core/Core/Src/HW/WiimoteEmu/MatrixMath.h
@@ -1,3 +1,7 @@
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
+
 #ifndef MATRIXMATH_H
 #define MATRIXMATH_H
 
diff --git a/Source/Core/Core/Src/HW/WiimoteEmu/Speaker.cpp b/Source/Core/Core/Src/HW/WiimoteEmu/Speaker.cpp
index c743c80294..fdf3af9358 100644
--- a/Source/Core/Core/Src/HW/WiimoteEmu/Speaker.cpp
+++ b/Source/Core/Core/Src/HW/WiimoteEmu/Speaker.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "WiimoteEmu.h"
 
diff --git a/Source/Core/Core/Src/HW/WiimoteEmu/UDPTLayer.h b/Source/Core/Core/Src/HW/WiimoteEmu/UDPTLayer.h
index d0decc7c8f..e7d9cb94f8 100644
--- a/Source/Core/Core/Src/HW/WiimoteEmu/UDPTLayer.h
+++ b/Source/Core/Core/Src/HW/WiimoteEmu/UDPTLayer.h
@@ -1,3 +1,7 @@
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
+
 //UDP Wiimote Translation Layer
 
 #ifndef UDPTLAYER_H
@@ -41,7 +45,7 @@ namespace UDPTLayer
 	{
 		if (!(m->inst)) return;
 		if (!(m->updIR)) return;
-		if ((*x >= -0.999) && (*x <= 0.999) && (*y >= -0.999) && (*y <= 0.999)) return; //the recieved values are used ONLY when the normal pointer is offscreen
+		if ((*x >= -0.999) && (*x <= 0.999) && (*y >= -0.999) && (*y <= 0.999)) return; //the received values are used ONLY when the normal pointer is offscreen
 		float _x, _y;
 		m->inst->getIR(_x, _y);
 		*x = _x * 2 - 1;
diff --git a/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp b/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp
index 92018f7c21..196b38ab57 100644
--- a/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp
+++ b/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include <cmath>
 
@@ -74,27 +61,27 @@ static const u8 eeprom_data_16D0[] = {
 
 const ReportFeatures reporting_mode_features[] = 
 {
-    //0x30: Core Buttons
+	//0x30: Core Buttons
 	{ 2, 0, 0, 0, 4 },
-    //0x31: Core Buttons and Accelerometer
+	//0x31: Core Buttons and Accelerometer
 	{ 2, 4, 0, 0, 7 },
-    //0x32: Core Buttons with 8 Extension bytes
+	//0x32: Core Buttons with 8 Extension bytes
 	{ 2, 0, 0, 4, 12 },
-    //0x33: Core Buttons and Accelerometer with 12 IR bytes
+	//0x33: Core Buttons and Accelerometer with 12 IR bytes
 	{ 2, 4, 7, 0, 19 },
-    //0x34: Core Buttons with 19 Extension bytes
+	//0x34: Core Buttons with 19 Extension bytes
 	{ 2, 0, 0, 4, 23 },
-    //0x35: Core Buttons and Accelerometer with 16 Extension Bytes
+	//0x35: Core Buttons and Accelerometer with 16 Extension Bytes
 	{ 2, 4, 0, 7, 23 },
-    //0x36: Core Buttons with 10 IR bytes and 9 Extension Bytes
+	//0x36: Core Buttons with 10 IR bytes and 9 Extension Bytes
 	{ 2, 0, 4, 14, 23 },
-    //0x37: Core Buttons and Accelerometer with 10 IR bytes and 6 Extension Bytes
+	//0x37: Core Buttons and Accelerometer with 10 IR bytes and 6 Extension Bytes
 	{ 2, 4, 7, 17, 23 },
 
 	// UNSUPPORTED:
-    //0x3d: 21 Extension Bytes
+	//0x3d: 21 Extension Bytes
 	{ 0, 0, 0, 2, 23 },
-    //0x3e / 0x3f: Interleaved Core Buttons and Accelerometer with 36 IR bytes
+	//0x3e / 0x3f: Interleaved Core Buttons and Accelerometer with 36 IR bytes
 	{ 0, 0, 0, 0, 23 },
 };
 
@@ -478,7 +465,8 @@ void Wiimote::GetIRData(u8* const data, bool use_accel)
 				az/=len; //normalizing the vector
 				nsin=ax;
 				ncos=az;
-			} else
+			}
+			else
 			{
 				nsin=0;
 				ncos=1;
@@ -486,7 +474,8 @@ void Wiimote::GetIRData(u8* const data, bool use_accel)
 		//	PanicAlert("%d %d %d\nx:%f\nz:%f\nsin:%f\ncos:%f",accel->x,accel->y,accel->z,ax,az,sin,cos);
 			//PanicAlert("%d %d %d\n%d %d %d\n%d %d %d",accel->x,accel->y,accel->z,calib->zero_g.x,calib->zero_g.y,calib->zero_g.z,
 			//	calib->one_g.x,calib->one_g.y,calib->one_g.z);
-		} else
+		}
+		else
 		{
 			nsin=0; //m_tilt stuff here (can't figure it out yet....)
 			ncos=1;
@@ -707,10 +696,10 @@ void Wiimote::Update()
 			std::lock_guard<std::recursive_mutex> lk(g_refresh_lock);
 			if (g_wiimotes[m_index])
 			{
-				Report rpt = g_wiimotes[m_index]->ProcessReadQueue();
-				const u8 *real_data = rpt.first;
-				if (real_data)
+				const Report& rpt = g_wiimotes[m_index]->ProcessReadQueue();
+				if (!rpt.empty())
 				{
+					const u8 *real_data = rpt.data();
 					switch (real_data[1])
 					{
 						// use data reports
@@ -770,13 +759,9 @@ void Wiimote::Update()
 					// copy over report from real-wiimote
 					if (-1 == rptf_size)
 					{
-						memcpy(data, real_data, rpt.second);
-						rptf_size = rpt.second;
+						std::copy(rpt.begin(), rpt.end(), data);
+						rptf_size = rpt.size();
 					}
-	
-					if (real_data != g_wiimotes[m_index]->\
-						m_last_data_report.first)
-						delete[] real_data;
 				}
 			}
 		}
@@ -934,14 +919,14 @@ void Wiimote::LoadDefaults(const ControllerInterface& ciface)
 
 	// DPad
 #ifdef _WIN32
-	set_control(m_dpad, 0, "UP");			// Up
+	set_control(m_dpad, 0, "UP");		// Up
 	set_control(m_dpad, 1, "DOWN");		// Down
 	set_control(m_dpad, 2, "LEFT");		// Left
-	set_control(m_dpad, 3, "RIGHT");		// Right
+	set_control(m_dpad, 3, "RIGHT");	// Right
 #elif __APPLE__
 	set_control(m_dpad, 0, "Up Arrow");		// Up
-	set_control(m_dpad, 1, "Down Arrow");		// Down
-	set_control(m_dpad, 2, "Left Arrow");		// Left
+	set_control(m_dpad, 1, "Down Arrow");	// Down
+	set_control(m_dpad, 2, "Left Arrow");	// Left
 	set_control(m_dpad, 3, "Right Arrow");	// Right
 #else
 	set_control(m_dpad, 0, "Up");		// Up
diff --git a/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.h b/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.h
index 36f0da406b..05045de32a 100644
--- a/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.h
+++ b/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _CONEMU_WIIMOTE_H_
 #define _CONEMU_WIIMOTE_H_
@@ -42,7 +29,7 @@ namespace WiimoteEmu
 
 struct ReportFeatures
 {
-	u8		core, accel, ir, ext, size;
+	u8 core, accel, ir, ext, size;
 };
 
 struct AccelData
@@ -176,7 +163,7 @@ private:
 	ADPCMState m_adpcm_state;
 
 	// read data request queue
-	// maybe it isn't actualy a queue
+	// maybe it isn't actually a queue
 	// maybe read requests cancel any current requests
 	std::queue< ReadRequest >	m_read_requests;
 
diff --git a/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteHid.h b/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteHid.h
index 9d1a2092a0..7c6d4de8a6 100644
--- a/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteHid.h
+++ b/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteHid.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef WIIMOTE_HID_H
 #define WIIMOTE_HID_H
@@ -28,7 +15,8 @@
 
 // Source: HID_010_SPC_PFL/1.0 (official HID specification)
 
-struct hid_packet {
+struct hid_packet
+{
 	u8 param : 4;
 	u8 type : 4;
 	u8 data[0];
@@ -199,7 +187,8 @@ struct wm_report
 #define WM_RUMBLE 0x10
 
 #define WM_LEDS 0x11
-struct wm_leds {
+struct wm_leds
+{
 	u8 rumble : 1;
 	// real wii also sets bit 0x2 (unknown purpose)
 	u8 : 3;
@@ -207,7 +196,8 @@ struct wm_leds {
 };
 
 #define WM_REPORT_MODE 0x12
-struct wm_report_mode {
+struct wm_report_mode
+{
 	u8 rumble : 1;
 	// unsure what "all_the_time" actually is, the real wii does set it (bit 0x2)
 	u8 all_the_time : 1;
@@ -220,13 +210,15 @@ struct wm_report_mode {
 #define WM_IR_LOGIC 0x1A
 
 #define WM_REQUEST_STATUS 0x15
-struct wm_request_status {
+struct wm_request_status
+{
 	u8 rumble : 1;
 	u8 : 7;
 };
 
 #define WM_STATUS_REPORT 0x20
-struct wm_status_report {
+struct wm_status_report
+{
 	wm_core buttons;
 	u8 battery_low : 1;
 	u8 extension : 1;
@@ -257,7 +249,8 @@ struct wm_acknowledge
 };
 
 #define WM_READ_DATA 0x17
-struct wm_read_data {
+struct wm_read_data
+{
 	u8 rumble : 1;
 	u8 space : 2;	//see WM_SPACE_*
 	u8 : 5;
@@ -271,7 +264,8 @@ struct wm_read_data {
 #define WM_SPACE_INVALID 3
 
 #define WM_READ_DATA_REPLY 0x21
-struct wm_read_data_reply {
+struct wm_read_data_reply
+{
 	wm_core buttons;
 	u8 error : 4;	//see WM_RDERR_*
 	u8 size : 4;
@@ -286,12 +280,14 @@ struct wm_read_data_reply {
 // Data reports
 
 #define WM_REPORT_CORE 0x30
-struct wm_report_core {
+struct wm_report_core
+{
 	wm_core c;
 };
 
 #define WM_REPORT_CORE_ACCEL 0x31
-struct wm_report_core_accel {
+struct wm_report_core_accel
+{
 	wm_core c;
 	wm_accel a;
 };
@@ -299,7 +295,8 @@ struct wm_report_core_accel {
 #define WM_REPORT_CORE_EXT8 0x32
 
 #define WM_REPORT_CORE_ACCEL_IR12 0x33
-struct wm_report_core_accel_ir12 {
+struct wm_report_core_accel_ir12
+{
 	wm_core c;
 	wm_accel a;
 	wm_ir_extended ir[4];
@@ -341,7 +338,8 @@ struct wm_report_ext21
 #define WM_SPEAKER_ENABLE 0x14
 #define WM_SPEAKER_MUTE 0x19 
 #define WM_WRITE_SPEAKER_DATA 0x18
-struct wm_speaker_data {
+struct wm_speaker_data
+{
 	u8 unknown : 3;
 	u8 length : 5;
 	u8 data[20];
@@ -372,28 +370,34 @@ struct accel_cal
 	} one_g;
 };
 
-struct nu_js {
+struct nu_js
+{
 	u8 max, min, center;
 };
-struct cc_trigger {
+
+struct cc_trigger
+{
 	u8 neutral;
 };
+
 struct nu_cal
 {
-	wm_accel cal_zero;		// zero calibratio
+	wm_accel cal_zero;		// zero calibration
 	wm_accel cal_g;			// g size
 	nu_js jx;				//
 	nu_js jy;				//
 };
+
 struct cc_cal
 {
 	nu_js Lx;				//
 	nu_js Ly;				//
 	nu_js Rx;				//
 	nu_js Ry;				//
-	cc_trigger Tl;				//
-	cc_trigger Tr;				//
+	cc_trigger Tl;			//
+	cc_trigger Tr;			//
 };
+
 struct gh3_cal
 {
 	nu_js Lx;
diff --git a/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp b/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp
index b80bbc2315..aa5b022a44 100644
--- a/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp
+++ b/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -300,7 +287,7 @@ bool Wiimote::Connect()
 	TCHAR name[128] = {};
 	HidD_GetProductString(dev_handle, name, 128);
 
-	//ERROR_LOG(WIIMOTE, "product string: %s", TStrToUTF8(name).c_str());
+	//ERROR_LOG(WIIMOTE, "Product string: %s", TStrToUTF8(name).c_str());
 
 	if (!IsValidBluetoothName(TStrToUTF8(name)))
 	{
@@ -333,7 +320,7 @@ bool Wiimote::Connect()
 /*
 	if (!SetThreadPriority(m_wiimote_thread.native_handle(), THREAD_PRIORITY_TIME_CRITICAL))
 	{
-		ERROR_LOG(WIIMOTE, "Failed to set wiimote thread priority");
+		ERROR_LOG(WIIMOTE, "Failed to set Wiimote thread priority");
 	}
 */
 #ifdef SHARE_WRITE_WIIMOTES
@@ -370,73 +357,55 @@ bool Wiimote::IsConnected() const
 // zero = error
 int Wiimote::IORead(u8* buf)
 {
-	// used below for a warning
-	*buf = 0;
+	// Add data report indicator byte (here, 0xa1)
+	buf[0] = 0xa1;
+	// Used below for a warning
+	buf[1] = 0;
 	
-	DWORD bytes;
+	DWORD bytes = 0;
 	ResetEvent(hid_overlap_read.hEvent);
-	if (!ReadFile(dev_handle, buf, MAX_PAYLOAD - 1, &bytes, &hid_overlap_read))
+	if (!ReadFile(dev_handle, buf + 1, MAX_PAYLOAD - 1, &bytes, &hid_overlap_read))
 	{
-		auto const err = GetLastError();
+		auto const read_err = GetLastError();
 
-		if (ERROR_IO_PENDING == err)
+		if (ERROR_IO_PENDING == read_err)
 		{
-			auto const r = WaitForSingleObject(hid_overlap_read.hEvent, WIIMOTE_DEFAULT_TIMEOUT);
-			if (WAIT_TIMEOUT == r)
+			auto const wait_result = WaitForSingleObject(hid_overlap_read.hEvent, WIIMOTE_DEFAULT_TIMEOUT);
+			if (WAIT_TIMEOUT == wait_result)
 			{
-				// Timeout - cancel and continue
-				if (*buf)
-					WARN_LOG(WIIMOTE, "Packet ignored.  This may indicate a problem (timeout is %i ms).",
+				CancelIo(dev_handle);
+			}
+			else if (WAIT_FAILED == wait_result)
+			{
+				WARN_LOG(WIIMOTE, "A wait error occurred on reading from Wiimote %i.", index + 1);
+				CancelIo(dev_handle);
+			}
+
+			if (!GetOverlappedResult(dev_handle, &hid_overlap_read, &bytes, TRUE))
+			{
+				auto const overlapped_err = GetLastError();
+
+				if (ERROR_OPERATION_ABORTED == overlapped_err)
+				{
+					if (buf[1] != 0)
+						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;
+					return -1;
 				}
+
+				WARN_LOG(WIIMOTE, "GetOverlappedResult error %d on Wiimote %i.", overlapped_err, index + 1);
+				return 0;
 			}
-			else
-			{
-				bytes =  0;
-			}
-		}
-		else if (ERROR_HANDLE_EOF == err)
-		{
-			// Remote disconnect
-			bytes = 0;
-		}
-		else if (ERROR_DEVICE_NOT_CONNECTED == err)
-		{
-			// Remote disconnect
-			bytes = 0;
 		}
 		else
 		{
-			bytes = 0;
+			WARN_LOG(WIIMOTE, "ReadFile error %d on Wiimote %i.", read_err, index + 1);
+			return 0;
 		}
 	}
 
-	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;
-
-		// TODO: is this really needed?
-		bytes = MAX_PAYLOAD;
-	}
-
-	return bytes;
+	return bytes + 1;
 }
 
 int Wiimote::IOWrite(const u8* buf, int len)
@@ -468,7 +437,7 @@ int Wiimote::IOWrite(const u8* buf, int len)
 			if (err == 121)
 			{
 				// Semaphore timeout
-				NOTICE_LOG(WIIMOTE, "WiimoteIOWrite[MSBT_STACK_MS]:  Unable to send data to wiimote");
+				NOTICE_LOG(WIIMOTE, "WiimoteIOWrite[MSBT_STACK_MS]:  Unable to send data to the Wiimote");
 			}
 			else
 			{
@@ -553,8 +522,8 @@ void ProcessWiimotes(bool new_scan, T& callback)
 			HBLUETOOTH_DEVICE_FIND hFindDevice = Bth_BluetoothFindFirstDevice(&srch, &btdi);
 			while (hFindDevice)
 			{
-				// btdi.szName is sometimes missings it's content - it's a bt feature..
-				DEBUG_LOG(WIIMOTE, "authed %i connected %i remembered %i ",
+				// btdi.szName is sometimes missing it's content - it's a bt feature..
+				DEBUG_LOG(WIIMOTE, "Authenticated %i connected %i remembered %i ",
 						btdi.fAuthenticated, btdi.fConnected, btdi.fRemembered);
 
 				if (IsValidBluetoothName(UTF16ToUTF8(btdi.szName)))
@@ -597,7 +566,7 @@ bool AttachWiimote(HANDLE hRadio, const BLUETOOTH_RADIO_INFO& radio_info, BLUETO
 	{
 		auto const& wm_addr = btdi.Address.rgBytes;
 
-		NOTICE_LOG(WIIMOTE, "Found wiimote (%02x:%02x:%02x:%02x:%02x:%02x). Enabling HID service.",
+		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)
@@ -647,7 +616,7 @@ bool ForgetWiimote(BLUETOOTH_DEVICE_INFO_STRUCT& btdi)
 		{
 			// 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.");
+			NOTICE_LOG(WIIMOTE, "Removing remembered Wiimote.");
 			Bth_BluetoothRemoveDevice(&btdi.Address);
 			return true;
 		}
diff --git a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp
index 131befc3ae..aaaaff6301 100644
--- a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp
+++ b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include <queue>
 #include <algorithm>
@@ -57,8 +44,10 @@ Wiimote::Wiimote()
 #elif defined(_WIN32)
 	, dev_handle(0), stack(MSBT_STACK_UNKNOWN)
 #endif
-	, m_last_data_report(Report((u8 *)NULL, 0))
-	, m_channel(0), m_run_thread(false)
+	, m_last_input_report()
+	, m_channel(0)
+	, m_rumble_state()
+	, m_run_thread(false)
 {
 #if defined(__linux__) && HAVE_BLUEZ
 	bdaddr = (bdaddr_t){{0, 0, 0, 0, 0, 0}};
@@ -73,11 +62,27 @@ Wiimote::~Wiimote()
 		Disconnect();
 	
 	ClearReadQueue();
+	m_write_reports.Clear();
+}
 
-	// clear write queue
-	Report rpt;
-	while (m_write_reports.Pop(rpt))
-		delete[] rpt.first;
+// to be called from CPU thread
+void Wiimote::WriteReport(Report rpt)
+{
+	if (rpt.size() >= 3)
+	{
+		bool const new_rumble_state = (rpt[2] & 0x1) != 0;
+		
+		if (WM_RUMBLE == rpt[1] && new_rumble_state == m_rumble_state)
+		{
+			// If this is a rumble report and the rumble state didn't change, ignore
+			//ERROR_LOG(WIIMOTE, "Ignoring rumble report.");
+			return;
+		}
+		
+		m_rumble_state = new_rumble_state;
+	}
+
+	m_write_reports.Push(std::move(rpt));
 }
 
 // to be called from CPU thread
@@ -85,17 +90,18 @@ void Wiimote::QueueReport(u8 rpt_id, const void* _data, unsigned int size)
 {
 	auto const data = static_cast<const u8*>(_data);
 	
-	Report rpt;
-	rpt.second = size + 2;
-	rpt.first = new u8[rpt.second];
-	rpt.first[0] = WM_SET_REPORT | WM_BT_OUTPUT;
-	rpt.first[1] = rpt_id;
-	std::copy(data, data + size, rpt.first + 2);
-	m_write_reports.Push(rpt);
+	Report rpt(size + 2);
+	rpt[0] = WM_SET_REPORT | WM_BT_OUTPUT;
+	rpt[1] = rpt_id;
+	std::copy_n(data, size, rpt.begin() + 2);
+	WriteReport(std::move(rpt));
 }
 
 void Wiimote::DisableDataReporting()
 {
+	m_last_input_report.clear();
+	
+	// This probably accomplishes nothing.
 	wm_report_mode rpt = {};
 	rpt.mode = WM_REPORT_CORE;
 	rpt.all_the_time = 0;
@@ -107,22 +113,19 @@ void Wiimote::DisableDataReporting()
 void Wiimote::ClearReadQueue()
 {
 	Report rpt;
-
-	if (m_last_data_report.first)
-	{
-		delete[] m_last_data_report.first;
-		m_last_data_report.first = NULL;
-	}
-
+	
+	// The "Clear" function isn't thread-safe :/
 	while (m_read_reports.Pop(rpt))
-		delete[] rpt.first;
+	{}
 }
 
 void Wiimote::ControlChannel(const u16 channel, const void* const data, const u32 size)
 {
 	// Check for custom communication
 	if (99 == channel)
+	{
 		EmuStop();
+	}
 	else
 	{
 		InterruptChannel(channel, data, size);
@@ -148,65 +151,58 @@ void Wiimote::InterruptChannel(const u16 channel, const void* const _data, const
 	}
 	
 	auto const data = static_cast<const u8*>(_data);
-
-	Report rpt;
-	rpt.first = new u8[size];
-	rpt.second = (u8)size;
-	std::copy(data, data + size, rpt.first);
+	Report rpt(data, data + size);
 
 	// Convert output DATA packets to SET_REPORT packets.
 	// Nintendo Wiimotes work without this translation, but 3rd
 	// party ones don't.
- 	if (rpt.first[0] == 0xa2)
+	if (rpt[0] == 0xa2)
 	{
-		rpt.first[0] = WM_SET_REPORT | WM_BT_OUTPUT;
- 	}
- 	
- 	// Disallow games from turning off all of the LEDs.
- 	// It makes wiimote connection status confusing.
- 	if (rpt.first[1] == WM_LEDS)
+		rpt[0] = WM_SET_REPORT | WM_BT_OUTPUT;
+	}
+	
+	// Disallow games from turning off all of the LEDs.
+	// It makes Wiimote connection status confusing.
+	if (rpt[1] == WM_LEDS)
 	{
-		auto& leds_rpt = *reinterpret_cast<wm_leds*>(&rpt.first[2]);
+		auto& leds_rpt = *reinterpret_cast<wm_leds*>(&rpt[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
+	else if (rpt[1] == WM_WRITE_SPEAKER_DATA
 		&& !SConfig::GetInstance().m_WiimoteEnableSpeaker)
 	{
 		// Translate speaker data reports into rumble reports.
-		rpt.first[1] = WM_CMD_RUMBLE;
+		rpt[1] = WM_RUMBLE;
 		// Keep only the rumble bit.
-		rpt.first[2] &= 0x1;
-		rpt.second = 3;
+		rpt[2] &= 0x1;
+		rpt.resize(3);
 	}
 
-	m_write_reports.Push(rpt);
+	WriteReport(std::move(rpt));
 }
 
 bool Wiimote::Read()
 {
-	Report rpt;
-	
-	rpt.first = new unsigned char[MAX_PAYLOAD];
-	rpt.second = IORead(rpt.first);
+	Report rpt(MAX_PAYLOAD);
+	auto const result = IORead(rpt.data());
 
-	if (0 == rpt.second)
+	if (result > 0 && m_channel > 0)
 	{
-		WARN_LOG(WIIMOTE, "Wiimote::IORead failed. Disconnecting wiimote %d.", index + 1);
+		// Add it to queue
+		rpt.resize(result);
+		m_read_reports.Push(std::move(rpt));
+		return true;
+	}
+	else if (0 == result)
+	{
+		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;
 	return false;
 }
 
@@ -216,16 +212,15 @@ bool Wiimote::Write()
 	{
 		Report const& rpt = m_write_reports.Front();
 		
-		bool const is_speaker_data = rpt.first[1] == WM_WRITE_SPEAKER_DATA;
+		bool const is_speaker_data = rpt[1] == WM_WRITE_SPEAKER_DATA;
 		
 		if (!is_speaker_data || m_last_audio_report.GetTimeDifference() > 5)
 		{
-			IOWrite(rpt.first, rpt.second);
+			IOWrite(rpt.data(), rpt.size());
 			
 			if (is_speaker_data)
 				m_last_audio_report.Update();
 			
-			delete[] rpt.first;
 			m_write_reports.Pop();
 			return true;
 		}
@@ -234,23 +229,35 @@ bool Wiimote::Write()
 	return false;
 }
 
+bool IsDataReport(const Report& rpt)
+{
+	return rpt.size() >= 2 && rpt[1] >= WM_REPORT_CORE;
+}
+
 // Returns the next report that should be sent
-Report Wiimote::ProcessReadQueue()
+const Report& Wiimote::ProcessReadQueue()
 {
 	// Pop through the queued reports
-	Report rpt = m_last_data_report;
-	while (m_read_reports.Pop(rpt))
+	while (m_read_reports.Pop(m_last_input_report))
 	{
-		if (rpt.first[1] >= WM_REPORT_CORE)
-			// A data report
-			m_last_data_report = rpt;
-		else
-			// Some other kind of report
-			return rpt;
+		if (!IsDataReport(m_last_input_report))
+		{
+			// A non-data report, use it.
+			return m_last_input_report;
+			
+			// Forget the last data report as it may be of the wrong type
+			// or contain outdated button data
+			// or it's not supposed to be sent at this time
+			// It's just easier to be correct this way and it's probably not horrible.
+		}
 	}
 
-	// The queue was empty, or there were only data reports
-	return rpt;
+	// If the last report wasn't a data report it's irrelevant.
+	if (!IsDataReport(m_last_input_report))
+		m_last_input_report.clear();
+	
+	// If it was a data report, we repeat that until something else comes in.
+	return m_last_input_report;
 }
 
 void Wiimote::Update()
@@ -262,16 +269,12 @@ void Wiimote::Update()
 	}
 
 	// Pop through the queued reports
-	Report const rpt = ProcessReadQueue();
+	const Report& rpt = ProcessReadQueue();
 
 	// Send the report
-	if (rpt.first != NULL && m_channel > 0)
+	if (!rpt.empty() && m_channel > 0)
 		Core::Callback_WiimoteInterruptChannel(index, m_channel,
-			rpt.first, rpt.second);
-
-	// Delete the data if it isn't also the last data rpt
-	if (rpt != m_last_data_report)
-		delete[] rpt.first;
+			rpt.data(), rpt.size());
 }
 
 bool Wiimote::Prepare(int _index)
@@ -279,13 +282,13 @@ 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};
+	u8 const mode_report[] = {WM_SET_REPORT | WM_BT_OUTPUT, WM_REPORT_MODE, 0, WM_REPORT_CORE};
 	
 	// Set the active LEDs and turn on rumble.
-	u8 const led_report[] = {WM_SET_REPORT | WM_BT_OUTPUT, WM_CMD_LED, u8(WIIMOTE_LED_1 << index | 0x1)};
+	u8 const led_report[] = {WM_SET_REPORT | WM_BT_OUTPUT, WM_LEDS, u8(WIIMOTE_LED_1 << index | 0x1)};
 
 	// Turn off rumble
-	u8 rumble_report[] = {WM_SET_REPORT | WM_BT_OUTPUT, WM_CMD_RUMBLE, 0};
+	u8 rumble_report[] = {WM_SET_REPORT | WM_BT_OUTPUT, WM_RUMBLE, 0};
 	
 	// Request status report
 	u8 const req_status_report[] = {WM_SET_REPORT | WM_BT_OUTPUT, WM_REQUEST_STATUS, 0};
@@ -308,12 +311,12 @@ void Wiimote::EmuStop()
 
 	DisableDataReporting();
 
-	NOTICE_LOG(WIIMOTE, "Stopping wiimote data reporting");
+	NOTICE_LOG(WIIMOTE, "Stopping Wiimote data reporting.");
 }
 
 unsigned int CalculateWantedWiimotes()
 {
-	// Figure out how many real wiimotes are required
+	// 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])
@@ -329,7 +332,7 @@ void WiimoteScanner::WantWiimotes(bool do_want)
 
 void WiimoteScanner::StartScanning()
 {
-	if (!m_run_thread && IsReady())
+	if (!m_run_thread)
 	{
 		m_run_thread = true;
 		m_scan_thread = std::thread(std::mem_fun(&WiimoteScanner::ThreadFunc), this);
@@ -358,23 +361,25 @@ void WiimoteScanner::ThreadFunc()
 {
 	Common::SetCurrentThreadName("Wiimote Scanning Thread");
 
-	NOTICE_LOG(WIIMOTE, "Wiimote scanning has started");
+	NOTICE_LOG(WIIMOTE, "Wiimote scanning has started.");
 
 	while (m_run_thread)
 	{
 		std::vector<Wiimote*> found_wiimotes;
 
-		//NOTICE_LOG(WIIMOTE, "in loop");
+		//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");
+		//NOTICE_LOG(WIIMOTE, "After update");
 
 		// TODO: this is a fairly lame place for this
 		CheckForDisconnectedWiimotes();
@@ -385,7 +390,7 @@ void WiimoteScanner::ThreadFunc()
 		Common::SleepCurrentThread(500);
 	}
 	
-	NOTICE_LOG(WIIMOTE, "Wiimote scanning has stopped");
+	NOTICE_LOG(WIIMOTE, "Wiimote scanning has stopped.");
 }
 
 void Wiimote::StartThread()
@@ -485,7 +490,7 @@ void ChangeWiimoteSource(unsigned int index, int source)
 	DoneWithWiimote(index);
 	}
 
-	// reconnect to emu
+	// reconnect to the emulator
 	Host_ConnectWiimote(index, false);
 	if (WIIMOTE_SRC_EMU & source)
 		Host_ConnectWiimote(index, true);
@@ -502,7 +507,7 @@ void TryToConnectWiimote(Wiimote* wm)
 		{
 			if (wm->Connect() && wm->Prepare(i))
 			{
-				NOTICE_LOG(WIIMOTE, "Connected to wiimote %i.", i + 1);
+				NOTICE_LOG(WIIMOTE, "Connected to Wiimote %i.", i + 1);
 				
 				std::swap(g_wiimotes[i], wm);
 				g_wiimotes[i]->StartThread();
@@ -528,7 +533,7 @@ void DoneWithWiimote(int index)
 	{
 		g_wiimotes[index]->StopThread();
 		
-		// First see if we can use this real wiimote in another slot.
+		// 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]
@@ -546,7 +551,7 @@ void DoneWithWiimote(int index)
 		}
 	}
 	
-	// else, just disconnect the wiimote
+	// else, just disconnect the Wiimote
 	HandleWiimoteDisconnect(index);
 }
 
@@ -563,7 +568,7 @@ void HandleWiimoteDisconnect(int index)
 	if (wm)
 	{
 		delete wm;
-		NOTICE_LOG(WIIMOTE, "Disconnected wiimote %i.", index + 1);
+		NOTICE_LOG(WIIMOTE, "Disconnected Wiimote %i.", index + 1);
 	}
 }
 
@@ -583,7 +588,7 @@ void Refresh()
 	
 	if (0 != CalculateWantedWiimotes())
 	{
-		// Don't hang dolphin when searching
+		// Don't hang Dolphin when searching
 		lk.unlock();
 		found_wiimotes = g_wiimote_scanner.FindWiimotes();
 		lk.lock();
@@ -591,7 +596,7 @@ void Refresh()
 
 	CheckForDisconnectedWiimotes();
 
-	// Brief rumble for already connected wiimotes.
+	// Brief rumble for already connected Wiimotes.
 	for (int i = 0; i != MAX_WIIMOTES; ++i)
 	{
 		if (g_wiimotes[i])
@@ -633,7 +638,7 @@ void Update(int _WiimoteNumber)
 	if (g_wiimotes[_WiimoteNumber])
 		g_wiimotes[_WiimoteNumber]->Update();
 
-	// Wiimote::Update() may remove the wiimote if it was disconnected.
+	// Wiimote::Update() may remove the Wiimote if it was disconnected.
 	if (!g_wiimotes[_WiimoteNumber])
 	{
 		Host_ConnectWiimote(_WiimoteNumber, false);
diff --git a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.h b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.h
index cfc66106b4..b57e1be2f4 100644
--- a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.h
+++ b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 
 #ifndef WIIMOTE_REAL_H
@@ -33,8 +20,7 @@
 
 #include "../../InputCommon/Src/InputConfig.h"
 
-// Pointer to data, and size of data
-typedef std::pair<u8*,u8> Report;
+typedef std::vector<u8> Report;
 
 namespace WiimoteReal
 {
@@ -50,7 +36,7 @@ public:
 	void InterruptChannel(const u16 channel, const void* const data, const u32 size);
 	void Update();
 
-	Report ProcessReadQueue();
+	const Report& ProcessReadQueue();
 
 	bool Read();
 	bool Write();
@@ -99,17 +85,20 @@ public:
 #endif
 
 protected:
-	Report	m_last_data_report;
+	Report m_last_input_report;
 	u16	m_channel;
 
 private:
 	void ClearReadQueue();
+	void WriteReport(Report rpt);
 	
 	int IORead(u8* buf);
 	int IOWrite(u8 const* buf, int len);
 
 	void ThreadFunc();
 
+	bool m_rumble_state;
+	
 	bool				m_run_thread;
 	std::thread			m_wiimote_thread;
 	
diff --git a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteRealBase.h b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteRealBase.h
index 1a1f6676cf..0ad78610fe 100644
--- a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteRealBase.h
+++ b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteRealBase.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef WIIMOTE_COMM_H
 #define WIIMOTE_COMM_H
@@ -41,20 +28,6 @@
 #define WM_SET_REPORT				0xA0
 #endif
 
-// TODO: duplicated in WiimoteHid.h
-// Commands
-#define WM_CMD_RUMBLE				0x10
-#define WM_CMD_LED					0x11
-#define WM_CMD_REPORT_TYPE			0x12
-#define WM_CMD_IR					0x13
-#define WM_CMD_SPEAKER_ENABLE		0x14
-#define WM_CMD_CTRL_STATUS			0x15
-#define WM_CMD_WRITE_DATA			0x16
-#define WM_CMD_READ_DATA			0x17
-#define WM_CMD_SPEAKER_DATA			0x18
-#define WM_CMD_SPEAKER_MUTE			0x19
-#define WM_CMD_IR_2					0x1A
-
 #define WM_BT_INPUT					0x01
 #define WM_BT_OUTPUT				0x02
 
@@ -73,12 +46,12 @@
 
 #ifdef _WIN32
 // Available bluetooth stacks for Windows.
-typedef enum win_bt_stack_t
+enum win_bt_stack_t
 {
 	MSBT_STACK_UNKNOWN,
 	MSBT_STACK_MS,
 	MSBT_STACK_BLUESOLEIL
-} win_bt_stack_t;
+};
 #endif
 
 #endif // WIIMOTE_COMM_H
diff --git a/Source/Core/Core/Src/Host.h b/Source/Core/Core/Src/Host.h
index a8e77b86ec..bb2c9af8aa 100644
--- a/Source/Core/Core/Src/Host.h
+++ b/Source/Core/Core/Src/Host.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _HOST_H
 #define _HOST_H
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 2d5c86f800..439d37c5d9 100644
--- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp
+++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 /*
 This is the main Wii IPC file that handles all incoming IPC calls and directs them
@@ -93,9 +80,8 @@ void EnqueReplyCallback(u64 userdata, int)
 
 void Init()
 {
-	enque_reply = CoreTiming::RegisterEvent("IPCReply", EnqueReplyCallback);
 	
-    _dbg_assert_msg_(WII_IPC_HLE, g_DeviceMap.empty(), "DeviceMap isnt empty on init");
+	_dbg_assert_msg_(WII_IPC_HLE, g_DeviceMap.empty(), "DeviceMap isn't empty on init");
 	CWII_IPC_HLE_Device_es::m_ContentFile = "";
 	u32 i;
 	for (i=0; i<IPC_MAX_FDS; i++)
@@ -129,11 +115,15 @@ void Init()
 	g_DeviceMap[i] = new CWII_IPC_HLE_Device_stub(i, std::string("/dev/usb/hid")); i++;
 	g_DeviceMap[i] = new CWII_IPC_HLE_Device_stub(i, std::string("/dev/usb/oh1")); i++;
 	g_DeviceMap[i] = new IWII_IPC_HLE_Device(i, std::string("_Unimplemented_Device_")); i++;
+	
+	enque_reply = CoreTiming::RegisterEvent("IPCReply", EnqueReplyCallback);
 }
 
 void Reset(bool _bHard)
 {
-
+	
+	CoreTiming::RemoveAllEvents(enque_reply);
+	
 	u32 i;
 	for (i=0; i<IPC_MAX_FDS; i++)
 	{
@@ -146,9 +136,9 @@ void Reset(bool _bHard)
 		g_FdMap[i] = NULL;
 	}
 
-    TDeviceMap::iterator itr = g_DeviceMap.begin();
-    while (itr != g_DeviceMap.end())
-    {
+	TDeviceMap::iterator itr = g_DeviceMap.begin();
+	while (itr != g_DeviceMap.end())
+	{
 		if (itr->second)
 		{
 			// Force close
@@ -158,7 +148,7 @@ void Reset(bool _bHard)
 				delete itr->second;
 		}
 		++itr;
-    }
+	}
 	if (_bHard)
 	{
 		g_DeviceMap.erase(g_DeviceMap.begin(), g_DeviceMap.end());
@@ -170,20 +160,20 @@ void Reset(bool _bHard)
 
 void Shutdown()
 {
-    Reset(true);
+	Reset(true);
 }
 
 void SetDefaultContentFile(const std::string& _rFilename)
 {
 	TDeviceMap::const_iterator itr = g_DeviceMap.begin();
-    while (itr != g_DeviceMap.end())
-    {
-        if (itr->second && itr->second->GetDeviceName().find(std::string("/dev/es")) == 0)
+	while (itr != g_DeviceMap.end())
+	{
+		if (itr->second && itr->second->GetDeviceName().find(std::string("/dev/es")) == 0)
 		{
 			((CWII_IPC_HLE_Device_es*)itr->second)->LoadWAD(_rFilename);
 		}
-        ++itr;
-    }
+		++itr;
+	}
 }
 
 void ES_DIVerify(u8 *_pTMD, u32 _sz)
@@ -213,23 +203,23 @@ int getFreeDeviceId()
 
 IWII_IPC_HLE_Device* GetDeviceByName(const std::string& _rDeviceName)
 {
-    TDeviceMap::const_iterator itr = g_DeviceMap.begin();
-    while (itr != g_DeviceMap.end())
-    {
-        if (itr->second && itr->second->GetDeviceName() == _rDeviceName)
-            return itr->second;
-        ++itr;
-    }
+	TDeviceMap::const_iterator itr = g_DeviceMap.begin();
+	while (itr != g_DeviceMap.end())
+	{
+		if (itr->second && itr->second->GetDeviceName() == _rDeviceName)
+			return itr->second;
+		++itr;
+	}
 
-    return NULL;
+	return NULL;
 }
 
 IWII_IPC_HLE_Device* AccessDeviceByID(u32 _ID)
 {
-    if (g_DeviceMap.find(_ID) != g_DeviceMap.end())
-        return g_DeviceMap[_ID];
+	if (g_DeviceMap.find(_ID) != g_DeviceMap.end())
+		return g_DeviceMap[_ID];
 
-        return NULL;
+		return NULL;
 }
 
 // This is called from ExecuteCommand() COMMAND_OPEN_DEVICE
@@ -253,15 +243,15 @@ void DoState(PointerWrap &p)
 
 	TDeviceMap::const_iterator itr;
 
-    itr = g_DeviceMap.begin();
-    while (itr != g_DeviceMap.end())
-    {
-            if (itr->second->IsHardware())
+	itr = g_DeviceMap.begin();
+	while (itr != g_DeviceMap.end())
+	{
+			if (itr->second->IsHardware())
 			{
 				itr->second->DoState(p);
 			}
 			++itr;
-    }
+	}
 
 	if (p.GetMode() == PointerWrap::MODE_READ)
 	{
@@ -333,19 +323,19 @@ void DoState(PointerWrap &p)
 
 void ExecuteCommand(u32 _Address)
 {
-    bool CmdSuccess = false;
+	bool CmdSuccess = false;
 
-    ECommandType Command = static_cast<ECommandType>(Memory::Read_U32(_Address));
+	ECommandType Command = static_cast<ECommandType>(Memory::Read_U32(_Address));
 	volatile s32 DeviceID = Memory::Read_U32(_Address + 8);
 
 	IWII_IPC_HLE_Device* pDevice = (DeviceID >= 0 && DeviceID < IPC_MAX_FDS) ? g_FdMap[DeviceID] : NULL;
 
 	INFO_LOG(WII_IPC_HLE, "-->> Execute Command Address: 0x%08x (code: %x, device: %x) %p", _Address, Command, DeviceID, pDevice);
 
-    switch (Command)
-    {
-    case COMMAND_OPEN_DEVICE:
-	{		
+	switch (Command)
+	{
+	case COMMAND_OPEN_DEVICE:
+	{
 		u32 Mode = Memory::Read_U32(_Address + 0x10);
 		DeviceID = getFreeDeviceId();
 		
@@ -419,13 +409,13 @@ void ExecuteCommand(u32 _Address)
 			Memory::Write_U32(FS_EFDEXHAUSTED, _Address + 4);
 			CmdSuccess = true;
 		}
-        break;
-    }
-    case COMMAND_CLOSE_DEVICE:
+		break;
+	}
+	case COMMAND_CLOSE_DEVICE:
 	{
 		if (pDevice)
 		{
-            CmdSuccess = pDevice->Close(_Address);
+			CmdSuccess = pDevice->Close(_Address);
 
 			u32 j;
 			for (j=0; j<ES_MAX_COUNT; j++)
@@ -450,9 +440,9 @@ void ExecuteCommand(u32 _Address)
 			Memory::Write_U32(FS_EINVAL, _Address + 4);
 			CmdSuccess = true;
 		}
-        break;
+		break;
 	}
-    case COMMAND_READ:
+	case COMMAND_READ:
 	{
 		if (pDevice)
 		{
@@ -463,9 +453,9 @@ void ExecuteCommand(u32 _Address)
 			Memory::Write_U32(FS_EINVAL, _Address + 4);
 			CmdSuccess = true;
 		}
-        break;
+		break;
 	}
-    case COMMAND_WRITE:
+	case COMMAND_WRITE:
 	{
 		if (pDevice)
 		{
@@ -476,9 +466,9 @@ void ExecuteCommand(u32 _Address)
 			Memory::Write_U32(FS_EINVAL, _Address + 4);
 			CmdSuccess = true;
 		}
-        break;
+		break;
 	}
-    case COMMAND_SEEK:
+	case COMMAND_SEEK:
 	{
 		if (pDevice)
 		{
@@ -489,41 +479,41 @@ void ExecuteCommand(u32 _Address)
 			Memory::Write_U32(FS_EINVAL, _Address + 4);
 			CmdSuccess = true;
 		}
-        break;
+		break;
 	}
-    case COMMAND_IOCTL:
+	case COMMAND_IOCTL:
 	{
 		if (pDevice)
 		{
 			CmdSuccess = pDevice->IOCtl(_Address);
 		}
-        break;
+		break;
 	}
-    case COMMAND_IOCTLV:
+	case COMMAND_IOCTLV:
 	{
 		if (pDevice)
 		{
 			CmdSuccess = pDevice->IOCtlV(_Address);
 		}
-        break;
+		break;
 	}
-    default:
+	default:
 	{
-        _dbg_assert_msg_(WII_IPC_HLE, 0, "Unknown IPC Command %i (0x%08x)", Command, _Address);
-        break;
+		_dbg_assert_msg_(WII_IPC_HLE, 0, "Unknown IPC Command %i (0x%08x)", Command, _Address);
+		break;
+	}
 	}
-    }
 
-    // It seems that the original hardware overwrites the command after it has been
+	// It seems that the original hardware overwrites the command after it has been
 	// executed. We write 8 which is not any valid command, and what IOS does 
 	Memory::Write_U32(8, _Address);
 	// IOS seems to write back the command that was responded to
 	Memory::Write_U32(Command, _Address + 8);
 
-    if (CmdSuccess)
-    {
+	if (CmdSuccess)
+	{
 		// Ensure replies happen in order, fairly ugly
-		// Without this, tons of games fail now that DI commads have different reply delays
+		// Without this, tons of games fail now that DI commands have different reply delays
 		int reply_delay = pDevice ? pDevice->GetCmdDelay(_Address) : 0;
 		
 		const s64 ticks_til_last_reply = last_reply_time - CoreTiming::GetTicks();
@@ -535,7 +525,7 @@ void ExecuteCommand(u32 _Address)
 	
 		// Generate a reply to the IPC command
 		EnqReply(_Address, reply_delay);
-    }
+	}
 	else
 	{
 		if (pDevice)
@@ -574,9 +564,9 @@ void Update()
 	{
 		WII_IPCInterface::GenerateAck(request_queue.front());
 		INFO_LOG(WII_IPC_HLE, "||-- Acknowledge IPC Request @ 0x%08x", request_queue.front());
-
-		ExecuteCommand(request_queue.front());
+		u32 command = request_queue.front();
 		request_queue.pop_front();
+		ExecuteCommand(command);
 
 #if MAX_LOGLEVEL >= DEBUG_LEVEL
 		Dolphin_Debugger::PrintCallstack(LogTypes::WII_IPC_HLE, LogTypes::LDEBUG);
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 65244836cc..051baf978c 100644
--- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.h
+++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _WII_IPC_HLE_H_
 #define _WII_IPC_HLE_H_
diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device.h b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device.h
index d52bd4f1e3..3fd1a8dd0b 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
@@ -1,19 +1,7 @@
-// Copyright (C) 2003 Dolphin Project.
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
-// 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 _WII_IPC_HLE_DEVICE_H_
 #define _WII_IPC_HLE_DEVICE_H_
 
@@ -29,23 +17,23 @@
 #define	FS_EINVAL		(u32)-4		// Invalid argument Invalid FD
 #define	FS_ENOENT		(u32)-6		// File not found 
 #define	FS_EBUSY		(u32)-8		// Resource busy 
-#define	FS_EIO			(u32)-12	// returned on ECC error 
-#define	FS_ENOMEM		(u32)-22	// Alloc failed during request 
+#define	FS_EIO			(u32)-12		// Returned on ECC error 
+#define	FS_ENOMEM		(u32)-22		// Alloc failed during request 
 #define	FS_EFATAL		(u32)-101	// Fatal error 
 #define	FS_EACCESS		(u32)-102	// Permission denied 
 #define	FS_ECORRUPT		(u32)-103	// returned for "corrupted" NAND 
 #define	FS_EEXIST2		(u32)-105	// File exists 
 #define	FS_ENOENT2		(u32)-106	// File not found 
 #define	FS_ENFILE		(u32)-107	// Too many fds open 
-#define	FS_EFBIG		(u32)-108	// max block count reached? 
+#define	FS_EFBIG		(u32)-108	// Max block count reached? 
 #define	FS_EFDEXHAUSTED	(u32)-109	// Too many fds open 
-#define	FS_ENAMELEN		(u32)-110	// pathname is too long 
+#define	FS_ENAMELEN		(u32)-110	// Pathname is too long 
 #define	FS_EFDOPEN		(u32)-111	// FD is already open 
-#define	FS_EIO2			(u32)-114	// returned on ECC error 
+#define	FS_EIO2			(u32)-114	// Returned on ECC error 
 #define	FS_ENOTEMPTY 	(u32)-115	// Directory not empty 
-#define	FS_EDIRDEPTH	(u32)-116	// max directory depth exceeded 
+#define	FS_EDIRDEPTH	(u32)-116	// Max directory depth exceeded 
 #define	FS_EBUSY2		(u32)-118	// Resource busy 
-//#define	FS_EFATAL		(u32)-119		// fatal error not used by IOS as fatal ERROR
+//#define	FS_EFATAL		(u32)-119		// Fatal error not used by IOS as fatal ERROR
 #define	FS_EESEXHAUSTED	(u32)-1016	// Max of 2 ES handles at a time
 
 class IWII_IPC_HLE_Device
@@ -53,13 +41,16 @@ class IWII_IPC_HLE_Device
 public:
 
 	IWII_IPC_HLE_Device(u32 _DeviceID, const std::string& _rName, bool _Hardware = true) :
-        m_Name(_rName),
+		m_Name(_rName),
 		m_DeviceID(_DeviceID),
 		m_Hardware(_Hardware),
 		m_Active(false)
-	{}
+	{
+	}
 
-	virtual ~IWII_IPC_HLE_Device() { }
+	virtual ~IWII_IPC_HLE_Device()
+	{
+	}
 
 	virtual void DoState(PointerWrap& p) 
 	{
@@ -70,16 +61,19 @@ public:
 	void DoStateShared(PointerWrap& p);
 
 	const std::string& GetDeviceName() const { return m_Name; }
-    u32 GetDeviceID() const { return m_DeviceID; }
+	u32 GetDeviceID() const { return m_DeviceID; }
 
-    virtual bool Open(u32 _CommandAddress, u32 _Mode) {
+	virtual bool Open(u32 _CommandAddress, u32 _Mode)
+	{
 		(void)_Mode;
 		WARN_LOG(WII_IPC_HLE, "%s does not support Open()", m_Name.c_str());
 		Memory::Write_U32(FS_ENOENT, _CommandAddress + 4);
 		m_Active = true;
 		return true;
 	}
-    virtual bool Close(u32 _CommandAddress, bool _bForce = false) {
+
+	virtual bool Close(u32 _CommandAddress, bool _bForce = false)
+	{
 		WARN_LOG(WII_IPC_HLE, "%s does not support Close()", m_Name.c_str());
 		if (!_bForce)
 			Memory::Write_U32(FS_EINVAL, _CommandAddress + 4);
@@ -111,116 +105,116 @@ protected:
 	bool m_Active;
 
 	// A struct for IOS ioctlv calls
-    struct SIOCtlVBuffer
-    {
-        SIOCtlVBuffer(u32 _Address) : m_Address(_Address)
-        {
+	struct SIOCtlVBuffer
+	{
+		SIOCtlVBuffer(u32 _Address) : m_Address(_Address)
+		{
 			// These are the Ioctlv parameters in the IOS communication. The BufferVector
 			// is a memory address offset at where the in and out buffer addresses are
 			// stored.
-            Parameter			= Memory::Read_U32(m_Address + 0x0C); // command 3, arg0
-            NumberInBuffer		= Memory::Read_U32(m_Address + 0x10); // 4, arg1
-            NumberPayloadBuffer	= Memory::Read_U32(m_Address + 0x14); // 5, arg2
-            BufferVector		= Memory::Read_U32(m_Address + 0x18); // 6, arg3
+			Parameter			= Memory::Read_U32(m_Address + 0x0C); // command 3, arg0
+			NumberInBuffer		= Memory::Read_U32(m_Address + 0x10); // 4, arg1
+			NumberPayloadBuffer	= Memory::Read_U32(m_Address + 0x14); // 5, arg2
+			BufferVector		= Memory::Read_U32(m_Address + 0x18); // 6, arg3
 
 			// The start of the out buffer
-            u32 BufferVectorOffset = BufferVector;
+			u32 BufferVectorOffset = BufferVector;
 
 			// Write the address and size for all in messages
-            for (u32 i = 0; i < NumberInBuffer; i++)
-            {
-                SBuffer Buffer;
-                Buffer.m_Address	= Memory::Read_U32(BufferVectorOffset);
+			for (u32 i = 0; i < NumberInBuffer; i++)
+			{
+				SBuffer Buffer;
+				Buffer.m_Address	= Memory::Read_U32(BufferVectorOffset);
 				BufferVectorOffset += 4;
-                Buffer.m_Size		= Memory::Read_U32(BufferVectorOffset);
+				Buffer.m_Size		= Memory::Read_U32(BufferVectorOffset);
 				BufferVectorOffset += 4;
 				InBuffer.push_back(Buffer);
 				DEBUG_LOG(WII_IPC_HLE, "SIOCtlVBuffer in%i: 0x%08x, 0x%x",
-						  i, Buffer.m_Address, Buffer.m_Size);
-            }
+							i, Buffer.m_Address, Buffer.m_Size);
+			}
 
 			// Write the address and size for all out or in-out messages
-            for (u32 i = 0; i < NumberPayloadBuffer; i++)
-            {
-                SBuffer Buffer;
-                Buffer.m_Address	= Memory::Read_U32(BufferVectorOffset);
+			for (u32 i = 0; i < NumberPayloadBuffer; i++)
+			{
+				SBuffer Buffer;
+				Buffer.m_Address	= Memory::Read_U32(BufferVectorOffset);
 				BufferVectorOffset += 4;
-                Buffer.m_Size		= Memory::Read_U32(BufferVectorOffset);
+				Buffer.m_Size		= Memory::Read_U32(BufferVectorOffset);
 				BufferVectorOffset += 4;
 				PayloadBuffer.push_back(Buffer);
 				DEBUG_LOG(WII_IPC_HLE, "SIOCtlVBuffer io%i: 0x%08x, 0x%x",
-						  i, Buffer.m_Address, Buffer.m_Size);
-            }
-        }
+							i, Buffer.m_Address, Buffer.m_Size);
+			}
+		}
 
-        const u32 m_Address;
+		const u32 m_Address;
 
-        u32 Parameter;
-        u32 NumberInBuffer;
-        u32 NumberPayloadBuffer;
-        u32 BufferVector;
+		u32 Parameter;
+		u32 NumberInBuffer;
+		u32 NumberPayloadBuffer;
+		u32 BufferVector;
 
-        struct SBuffer { u32 m_Address, m_Size; };
-        std::vector<SBuffer> InBuffer;
-        std::vector<SBuffer> PayloadBuffer;
-    };
+		struct SBuffer { u32 m_Address, m_Size; };
+		std::vector<SBuffer> InBuffer;
+		std::vector<SBuffer> PayloadBuffer;
+	};
 
 	// Write out the IPC struct from _CommandAddress to _NumberOfCommands numbers
 	// of 4 byte commands.
-    void DumpCommands(u32 _CommandAddress, size_t _NumberOfCommands = 8,
+	void DumpCommands(u32 _CommandAddress, size_t _NumberOfCommands = 8,
 		LogTypes::LOG_TYPE LogType = LogTypes::WII_IPC_HLE,
 		LogTypes::LOG_LEVELS Verbosity = LogTypes::LDEBUG)
-    {
+	{
 		GENERIC_LOG(LogType, Verbosity, "CommandDump of %s", 
 					GetDeviceName().c_str());
 		for (u32 i = 0; i < _NumberOfCommands; i++)
-		{            
+		{
 			GENERIC_LOG(LogType, Verbosity, "    Command%02i: 0x%08x", i,
 						Memory::Read_U32(_CommandAddress + i*4));	
 		}
-    }
+	}
 	
-    void DumpAsync(u32 BufferVector, u32 NumberInBuffer, u32 NumberOutBuffer,
+	void DumpAsync(u32 BufferVector, u32 NumberInBuffer, u32 NumberOutBuffer,
 		LogTypes::LOG_TYPE LogType = LogTypes::WII_IPC_HLE,
 		LogTypes::LOG_LEVELS Verbosity = LogTypes::LDEBUG)
-    {
+	{
 		GENERIC_LOG(LogType, Verbosity, "======= DumpAsync ======");
 
-        u32 BufferOffset = BufferVector;
-        for (u32 i = 0; i < NumberInBuffer; i++)
-        {            
-            u32 InBuffer        = Memory::Read_U32(BufferOffset); BufferOffset += 4;
-            u32 InBufferSize    = Memory::Read_U32(BufferOffset); BufferOffset += 4;
+		u32 BufferOffset = BufferVector;
+		for (u32 i = 0; i < NumberInBuffer; i++)
+		{
+			u32 InBuffer        = Memory::Read_U32(BufferOffset); BufferOffset += 4;
+			u32 InBufferSize    = Memory::Read_U32(BufferOffset); BufferOffset += 4;
 
-            GENERIC_LOG(LogType, LogTypes::LINFO, "%s - IOCtlV InBuffer[%i]:",
+			GENERIC_LOG(LogType, LogTypes::LINFO, "%s - IOCtlV InBuffer[%i]:",
 				GetDeviceName().c_str(), i);
 
-            std::string Temp;
-            for (u32 j = 0; j < InBufferSize; j++)
-            {
-                char Buffer[128];
-                sprintf(Buffer, "%02x ", Memory::Read_U8(InBuffer+j));
-                Temp.append(Buffer);
-            }
+			std::string Temp;
+			for (u32 j = 0; j < InBufferSize; j++)
+			{
+				char Buffer[128];
+				sprintf(Buffer, "%02x ", Memory::Read_U8(InBuffer+j));
+				Temp.append(Buffer);
+			}
 
-            GENERIC_LOG(LogType, LogTypes::LDEBUG, "    Buffer: %s", Temp.c_str());
-        }
+			GENERIC_LOG(LogType, LogTypes::LDEBUG, "    Buffer: %s", Temp.c_str());
+		}
 
-        for (u32 i = 0; i < NumberOutBuffer; i++)
-        {
+		for (u32 i = 0; i < NumberOutBuffer; i++)
+		{
 			u32 OutBuffer        = Memory::Read_U32(BufferOffset); BufferOffset += 4;
 			u32 OutBufferSize    = Memory::Read_U32(BufferOffset); BufferOffset += 4;
 
-            GENERIC_LOG(LogType, LogTypes::LINFO, "%s - IOCtlV OutBuffer[%i]:",
+			GENERIC_LOG(LogType, LogTypes::LINFO, "%s - IOCtlV OutBuffer[%i]:",
 				GetDeviceName().c_str(), i);
-            GENERIC_LOG(LogType, LogTypes::LINFO, "    OutBuffer: 0x%08x (0x%x):",
+			GENERIC_LOG(LogType, LogTypes::LINFO, "    OutBuffer: 0x%08x (0x%x):",
 				OutBuffer, OutBufferSize);
 
 			#if defined(MAX_LOGLEVEL) && MAX_LOGLEVEL >= INFO_LEVEL
 			DumpCommands(OutBuffer, OutBufferSize, LogType, Verbosity);
 			#endif
-       }
-    }
+		}
+	}
 };
 
 class CWII_IPC_HLE_Device_stub : public IWII_IPC_HLE_Device
@@ -228,16 +222,19 @@ class CWII_IPC_HLE_Device_stub : public IWII_IPC_HLE_Device
 public:
 	CWII_IPC_HLE_Device_stub(u32 DeviceID, const std::string& Name)
 		: IWII_IPC_HLE_Device(DeviceID, Name)
-	{}
+	{
+	}
 
-	bool Open(u32 CommandAddress, u32 Mode) {
+	bool Open(u32 CommandAddress, u32 Mode)
+	{
 		(void)Mode;
 		WARN_LOG(WII_IPC_HLE, "%s faking Open()", m_Name.c_str());
 		Memory::Write_U32(GetDeviceID(), CommandAddress + 4);
 		m_Active = true;
 		return true;
 	}
-	bool Close(u32 CommandAddress, bool bForce = false) {
+	bool Close(u32 CommandAddress, bool bForce = false)
+	{
 		WARN_LOG(WII_IPC_HLE, "%s faking Close()", m_Name.c_str());
 		if (!bForce)
 			Memory::Write_U32(FS_SUCCESS, CommandAddress + 4);
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 5d49f34488..659807dcc4 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
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "Common.h"
 
@@ -39,8 +26,8 @@ using namespace DVDInterface;
 #define DI_COVER_REG_NO_DISC		1
 
 CWII_IPC_HLE_Device_di::CWII_IPC_HLE_Device_di(u32 _DeviceID, const std::string& _rDeviceName )
-    : IWII_IPC_HLE_Device(_DeviceID, _rDeviceName)
-    , m_pFileSystem(NULL)
+	: IWII_IPC_HLE_Device(_DeviceID, _rDeviceName)
+	, m_pFileSystem(NULL)
 	, m_ErrorStatus(0)
 	, m_CoverStatus(DI_COVER_REG_NO_DISC)
 {}
@@ -58,13 +45,13 @@ bool CWII_IPC_HLE_Device_di::Open(u32 _CommandAddress, u32 _Mode)
 {
 	if (VolumeHandler::IsValid())
 	{
-        m_pFileSystem = DiscIO::CreateFileSystem(VolumeHandler::GetVolume());
+		m_pFileSystem = DiscIO::CreateFileSystem(VolumeHandler::GetVolume());
 		m_CoverStatus |= DI_COVER_REG_INITIALIZED;
 		m_CoverStatus &= ~DI_COVER_REG_NO_DISC;
 	}
 	Memory::Write_U32(GetDeviceID(), _CommandAddress + 4);
-    m_Active = true;
-    return true;
+	m_Active = true;
+	return true;
 }
 
 bool CWII_IPC_HLE_Device_di::Close(u32 _CommandAddress, bool _bForce)
@@ -77,29 +64,29 @@ bool CWII_IPC_HLE_Device_di::Close(u32 _CommandAddress, bool _bForce)
 	m_ErrorStatus = 0;
 	if (!_bForce)
 		Memory::Write_U32(0, _CommandAddress + 4);
-    m_Active = false;
-    return true;
+	m_Active = false;
+	return true;
 }
 
 bool CWII_IPC_HLE_Device_di::IOCtl(u32 _CommandAddress) 
 {
 	u32 BufferIn		= Memory::Read_U32(_CommandAddress + 0x10);
 	u32 BufferInSize	= Memory::Read_U32(_CommandAddress + 0x14);
-    u32 BufferOut		= Memory::Read_U32(_CommandAddress + 0x18);
-    u32 BufferOutSize	= Memory::Read_U32(_CommandAddress + 0x1C);
+	u32 BufferOut		= Memory::Read_U32(_CommandAddress + 0x18);
+	u32 BufferOutSize	= Memory::Read_U32(_CommandAddress + 0x1C);
 	u32 Command			= Memory::Read_U32(BufferIn) >> 24;
 
-    DEBUG_LOG(WII_IPC_DVD, "IOCtl Command(0x%08x) BufferIn(0x%08x, 0x%x) BufferOut(0x%08x, 0x%x)",
+	DEBUG_LOG(WII_IPC_DVD, "IOCtl Command(0x%08x) BufferIn(0x%08x, 0x%x) BufferOut(0x%08x, 0x%x)",
 		Command, BufferIn, BufferInSize, BufferOut, BufferOutSize);
 
 	u32 ReturnValue = ExecuteCommand(BufferIn, BufferInSize, BufferOut, BufferOutSize);
-    Memory::Write_U32(ReturnValue, _CommandAddress + 0x4);
+	Memory::Write_U32(ReturnValue, _CommandAddress + 0x4);
 
-    return true;
+	return true;
 }
 
 bool CWII_IPC_HLE_Device_di::IOCtlV(u32 _CommandAddress) 
-{  
+{
 	SIOCtlVBuffer CommandBuffer(_CommandAddress);
 
 	// Prepare the out buffer(s) with zeros as a safety precaution
@@ -143,12 +130,12 @@ bool CWII_IPC_HLE_Device_di::IOCtlV(u32 _CommandAddress)
 	}
 
 	Memory::Write_U32(ReturnValue, _CommandAddress + 4);
-    return true;
+	return true;
 }
 
 u32 CWII_IPC_HLE_Device_di::ExecuteCommand(u32 _BufferIn, u32 _BufferInSize, u32 _BufferOut, u32 _BufferOutSize)
-{    
-    u32 Command = Memory::Read_U32(_BufferIn) >> 24;
+{
+	u32 Command = Memory::Read_U32(_BufferIn) >> 24;
 
 	// TATSUNOKO VS CAPCOM: Gets here with _BufferOut == 0!!!
 	if (_BufferOut != 0)
@@ -223,7 +210,7 @@ u32 CWII_IPC_HLE_Device_di::ExecuteCommand(u32 _BufferIn, u32 _BufferInSize, u32
 				}
 				else
 				{
-					INFO_LOG(WII_IPC_DVD, "DVDLowRead: file unkw - (DVDAddr: 0x%llx, Size: 0x%x)",
+					INFO_LOG(WII_IPC_DVD, "DVDLowRead: file unknown - (DVDAddr: 0x%llx, Size: 0x%x)",
 						DVDAddress, Size);
 				}
 			}
@@ -241,13 +228,13 @@ u32 CWII_IPC_HLE_Device_di::ExecuteCommand(u32 _BufferIn, u32 _BufferInSize, u32
 		}
 		break;
 
-    case DVDLowWaitForCoverClose:
-        {
+	case DVDLowWaitForCoverClose:
+		{
 			INFO_LOG(WII_IPC_DVD, "DVDLowWaitForCoverClose (Buffer 0x%08x, 0x%x)",
 				_BufferOut, _BufferOutSize);
 			return 4; // ???
-        }
-        break;
+		}
+		break;
 
 	case DVDLowGetCoverReg:
 		Memory::Write_U32(m_CoverStatus, _BufferOut);
@@ -347,7 +334,7 @@ u32 CWII_IPC_HLE_Device_di::ExecuteCommand(u32 _BufferIn, u32 _BufferInSize, u32
 		return 2;
 		break;
 
-    case DVDLowSeek:
+	case DVDLowSeek:
 		{
 			u64 DVDAddress = Memory::Read_U32(_BufferIn + 0x4) << 2;
 			const char *pFilename = NULL;
@@ -360,11 +347,11 @@ u32 CWII_IPC_HLE_Device_di::ExecuteCommand(u32 _BufferIn, u32 _BufferInSize, u32
 			}
 			else
 			{
-				INFO_LOG(WII_IPC_DVD, "DVDLowSeek: file unkw - (DVDAddr: 0x%llx)",
+				INFO_LOG(WII_IPC_DVD, "DVDLowSeek: file unknown - (DVDAddr: 0x%llx)",
 					DVDAddress);
 			}
 		}
-        break;
+		break;
 
 	case DVDLowReadDvd:
 		ERROR_LOG(WII_IPC_DVD, "DVDLowReadDvd");
@@ -446,20 +433,20 @@ u32 CWII_IPC_HLE_Device_di::ExecuteCommand(u32 _BufferIn, u32 _BufferInSize, u32
 	// but it seems we don't need to implement anything
 	case 0x95:
 	case 0x96:
-		WARN_LOG(WII_IPC_DVD, "unimplemented cmd 0x%08x (Buffer 0x%08x, 0x%x)",
+		WARN_LOG(WII_IPC_DVD, "Unimplemented command 0x%08x (Buffer 0x%08x, 0x%x)",
 			Command, _BufferOut, _BufferOutSize);
 		break;
 
 	default:
-		ERROR_LOG(WII_IPC_DVD, "unknown cmd 0x%08x (Buffer 0x%08x, 0x%x)",
+		ERROR_LOG(WII_IPC_DVD, "Unknown command 0x%08x (Buffer 0x%08x, 0x%x)",
 			Command, _BufferOut, _BufferOutSize);
 
-        PanicAlertT("unknown cmd 0x%08x", Command);
+		PanicAlertT("Unknown command 0x%08x", Command);
 		break;
 	}
 
-    // i dunno but prolly 1 is okay all the time :)
-    return 1;
+	// i dunno but prolly 1 is okay all the time :)
+	return 1;
 }
 
 int CWII_IPC_HLE_Device_di::GetCmdDelay(u32 _CommandAddress)
@@ -497,7 +484,7 @@ int CWII_IPC_HLE_Device_di::GetCmdDelay(u32 _CommandAddress)
 //	case DVDLowReset:
 //	case DVDLowClosePartition:
 	default:
-		// ranom numbers here!
+		// random 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 0b62daefa3..64be42f978 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
@@ -1,19 +1,7 @@
-// Copyright (C) 2003 Dolphin Project.
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
-// 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 _WII_IPC_HLE_DEVICE_DI_H_
 #define _WII_IPC_HLE_DEVICE_DI_H_
 
@@ -21,8 +9,8 @@
 
 namespace DiscIO
 {
-    class IVolume;
-    class IFileSystem;
+	class IVolume;
+	class IFileSystem;
 }
 
 class CWII_IPC_HLE_Device_di : public IWII_IPC_HLE_Device
@@ -33,7 +21,7 @@ public:
 
 	virtual ~CWII_IPC_HLE_Device_di();
 
-    bool Open(u32 _CommandAddress, u32 _Mode);
+	bool Open(u32 _CommandAddress, u32 _Mode);
 	bool Close(u32 _CommandAddress, bool _bForce);
 
 	bool IOCtl(u32 _CommandAddress); 
@@ -45,7 +33,7 @@ private:
 
 	u32 ExecuteCommand(u32 BufferIn, u32 BufferInSize, u32 _BufferOut, u32 BufferOutSize);
 
-    DiscIO::IFileSystem* m_pFileSystem;
+	DiscIO::IFileSystem* m_pFileSystem;
 	u32 m_ErrorStatus;
 	// This flag seems to only be reset with poweron/off, not sure
 	u32 m_CoverStatus;
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 acf5c921e9..4f45d6abed 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
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "Common.h"
 #include "FileUtil.h"
@@ -103,36 +90,27 @@ bool CWII_IPC_HLE_Device_FileIO::Open(u32 _CommandAddress, u32 _Mode)
 	return true;
 }
 
-// Opens file if needed.
-// Clears any error state.
-// Seeks to proper position position.
-void CWII_IPC_HLE_Device_FileIO::PrepareFile()
+File::IOFile CWII_IPC_HLE_Device_FileIO::OpenFile()
 {
-	if (!m_file.IsOpen())
+	const char* open_mode = "";
+	
+	switch (m_Mode)
 	{
-		const char* open_mode = "";
-		
-		switch (m_Mode)
-		{
-		case ISFS_OPEN_READ:
-			open_mode = "rb";
-			break;
-		
-		case ISFS_OPEN_WRITE:
-		case ISFS_OPEN_RW:
-			open_mode = "r+b";
-			break;
-		
-		default:
-			PanicAlertT("FileIO: Unknown open mode : 0x%02x", m_Mode);
-			break;
-		}
-		
-		m_file.Open(m_filepath, open_mode);
+	case ISFS_OPEN_READ:
+		open_mode = "rb";
+		break;
+	
+	case ISFS_OPEN_WRITE:
+	case ISFS_OPEN_RW:
+		open_mode = "r+b";
+		break;
+	
+	default:
+		PanicAlertT("FileIO: Unknown open mode : 0x%02x", m_Mode);
+		break;
 	}
 	
-	m_file.Clear();
-	m_file.Seek(m_SeekPos, SEEK_SET);
+	return File::IOFile(m_filepath, open_mode);
 }
 
 bool CWII_IPC_HLE_Device_FileIO::Seek(u32 _CommandAddress)
@@ -141,12 +119,11 @@ bool CWII_IPC_HLE_Device_FileIO::Seek(u32 _CommandAddress)
 	const u32 SeekOffset = Memory::Read_U32(_CommandAddress + 0xC);
 	const u32 Mode = Memory::Read_U32(_CommandAddress + 0x10);
 
-	PrepareFile();
-	if (m_file)
+	if (auto file = OpenFile())
 	{
 		ReturnValue = FS_RESULT_FATAL;
 
-		const u64 fileSize = m_file.GetSize();
+		const u64 fileSize = file.GetSize();
 		INFO_LOG(WII_IPC_FILEIO, "FileIO: Seek Pos: 0x%08x, Mode: %i (%s, Length=0x%08llx)", SeekOffset, Mode, m_Name.c_str(), fileSize);
 		u64 wantedPos = 0;
 		switch (Mode)
@@ -156,7 +133,7 @@ bool CWII_IPC_HLE_Device_FileIO::Seek(u32 _CommandAddress)
 			break;
 			
 		case 1:
-			wantedPos = m_SeekPos + (s32)SeekOffset;
+			wantedPos = m_SeekPos + SeekOffset;
 			break;
 			
 		case 2:
@@ -190,19 +167,20 @@ bool CWII_IPC_HLE_Device_FileIO::Read(u32 _CommandAddress)
 	u32 ReturnValue = FS_EACCESS;
 	const u32 Address	= Memory::Read_U32(_CommandAddress + 0xC); // Read to this memory address
 	const u32 Size	= Memory::Read_U32(_CommandAddress + 0x10);
-	
-	PrepareFile();
-	if (m_file)
+
+
+	if (auto file = OpenFile())
 	{
 		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());
+			WARN_LOG(WII_IPC_FILEIO, "FileIO: Attempted to read 0x%x bytes to 0x%08x on a write-only file %s", Size, Address, m_Name.c_str());
 		}
 		else
 		{
 			INFO_LOG(WII_IPC_FILEIO, "FileIO: Read 0x%x bytes to 0x%08x from %s", Size, Address, m_Name.c_str());
-			ReturnValue = (u32)fread(Memory::GetPointer(Address), 1, Size, m_file.GetHandle());
-			if (ReturnValue != Size && ferror(m_file.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;
 			}
@@ -229,17 +207,18 @@ bool CWII_IPC_HLE_Device_FileIO::Write(u32 _CommandAddress)
 	const u32 Address	= Memory::Read_U32(_CommandAddress + 0xC); // Write data from this memory address
 	const u32 Size	= Memory::Read_U32(_CommandAddress + 0x10);
 
-	PrepareFile();
-	if (m_file)
+
+	if (auto file = OpenFile())
 	{
 		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());
+			WARN_LOG(WII_IPC_FILEIO, "FileIO: Attempted to write 0x%x bytes from 0x%08x to a 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());
-			if (m_file.WriteBytes(Memory::GetPointer(Address), Size))
+			file.Seek(m_SeekPos, SEEK_SET);
+			if (file.WriteBytes(Memory::GetPointer(Address), Size))
 			{
 				ReturnValue = Size;
 				m_SeekPos += Size;
@@ -269,10 +248,9 @@ bool CWII_IPC_HLE_Device_FileIO::IOCtl(u32 _CommandAddress)
 	{
 	case ISFS_IOCTL_GETFILESTATS:
 		{
-			PrepareFile();
-			if (m_file)
+			if (auto file = OpenFile())
 			{
-				u32 m_FileLength = (u32)m_file.GetSize();
+				u32 m_FileLength = (u32)file.GetSize();
 
 				const u32 BufferOut = Memory::Read_U32(_CommandAddress + 0x18);
 				INFO_LOG(WII_IPC_FILEIO, "FileIO: ISFS_IOCTL_GETFILESTATS");
@@ -307,7 +285,6 @@ void CWII_IPC_HLE_Device_FileIO::DoState(PointerWrap &p)
 
 	p.Do(m_Mode);
 	p.Do(m_SeekPos);
-
-	m_file.Close();
+	
 	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 fd33d7d69c..0cbfb70022 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
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _WII_IPC_HLE_DEVICE_FILEIO_H_
 #define _WII_IPC_HLE_DEVICE_FILEIO_H_
@@ -31,16 +18,16 @@ public:
 	virtual ~CWII_IPC_HLE_Device_FileIO();
 
 	bool Close(u32 _CommandAddress, bool _bForce);
-    bool Open(u32 _CommandAddress, u32 _Mode);
+	bool Open(u32 _CommandAddress, u32 _Mode);
 	bool Seek(u32 _CommandAddress);
 	bool Read(u32 _CommandAddress);
 	bool Write(u32 _CommandAddress);
-    bool IOCtl(u32 _CommandAddress);
+	bool IOCtl(u32 _CommandAddress);
 	void DoState(PointerWrap &p);
 
+	File::IOFile OpenFile();
+
 private:
-	void PrepareFile();
-	
 	enum
 	{
 		ISFS_OPEN_READ				= 1,
@@ -48,35 +35,34 @@ private:
 		ISFS_OPEN_RW				= (ISFS_OPEN_READ | ISFS_OPEN_WRITE)
 	};
 
-    enum
-    {
-        ISFS_FUNCNULL				= 0,
-        ISFS_FUNCGETSTAT,
-        ISFS_FUNCREADDIR,
-        ISFS_FUNCGETATTR,
-        ISFS_FUNCGETUSAGE
-    };
+	enum
+	{
+		ISFS_FUNCNULL				= 0,
+		ISFS_FUNCGETSTAT,
+		ISFS_FUNCREADDIR,
+		ISFS_FUNCGETATTR,
+		ISFS_FUNCGETUSAGE
+	};
 
-    enum
-    {
-        ISFS_IOCTL_FORMAT			= 1,
-        ISFS_IOCTL_GETSTATS,
-        ISFS_IOCTL_CREATEDIR,
-        ISFS_IOCTL_READDIR,
-        ISFS_IOCTL_SETATTR,
-        ISFS_IOCTL_GETATTR,
-        ISFS_IOCTL_DELETE,
-        ISFS_IOCTL_RENAME,
-        ISFS_IOCTL_CREATEFILE,
-        ISFS_IOCTL_SETFILEVERCTRL,
-        ISFS_IOCTL_GETFILESTATS,
-        ISFS_IOCTL_GETUSAGE,
-        ISFS_IOCTL_SHUTDOWN
-    };
+	enum
+	{
+		ISFS_IOCTL_FORMAT			= 1,
+		ISFS_IOCTL_GETSTATS,
+		ISFS_IOCTL_CREATEDIR,
+		ISFS_IOCTL_READDIR,
+		ISFS_IOCTL_SETATTR,
+		ISFS_IOCTL_GETATTR,
+		ISFS_IOCTL_DELETE,
+		ISFS_IOCTL_RENAME,
+		ISFS_IOCTL_CREATEFILE,
+		ISFS_IOCTL_SETFILEVERCTRL,
+		ISFS_IOCTL_GETFILESTATS,
+		ISFS_IOCTL_GETUSAGE,
+		ISFS_IOCTL_SHUTDOWN
+	};
 
 	u32 m_Mode;
 	u32 m_SeekPos;
-	File::IOFile m_file;
 	
 	std::string m_filepath;
 };
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 363176e18a..3514f45ebd 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
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 
 
@@ -67,10 +54,10 @@
 std::string CWII_IPC_HLE_Device_es::m_ContentFile;
 
 CWII_IPC_HLE_Device_es::CWII_IPC_HLE_Device_es(u32 _DeviceID, const std::string& _rDeviceName) 
-    : IWII_IPC_HLE_Device(_DeviceID, _rDeviceName)
-    , m_pContentLoader(NULL)
-    , m_TitleID(-1)
-    , AccessIdentID(0x6000000)
+	: IWII_IPC_HLE_Device(_DeviceID, _rDeviceName)
+	, m_pContentLoader(NULL)
+	, m_TitleID(-1)
+	, AccessIdentID(0x6000000)
 {}
 
 CWII_IPC_HLE_Device_es::~CWII_IPC_HLE_Device_es()
@@ -83,52 +70,52 @@ void CWII_IPC_HLE_Device_es::LoadWAD(const std::string& _rContentFile)
 
 bool CWII_IPC_HLE_Device_es::Open(u32 _CommandAddress, u32 _Mode)
 {
-    m_pContentLoader = &DiscIO::CNANDContentManager::Access().GetNANDLoader(m_ContentFile);
+	m_pContentLoader = &DiscIO::CNANDContentManager::Access().GetNANDLoader(m_ContentFile);
 
-    // check for cd ...
-    if (m_pContentLoader->IsValid())
-    {
-        m_TitleID = m_pContentLoader->GetTitleID();
+	// check for cd ...
+	if (m_pContentLoader->IsValid())
+	{
+		m_TitleID = m_pContentLoader->GetTitleID();
 
 		m_TitleIDs.clear();
 		DiscIO::cUIDsys::AccessInstance().GetTitleIDs(m_TitleIDs);
 		// uncomment if  ES_GetOwnedTitlesCount / ES_GetOwnedTitles is implemented
 		// m_TitleIDsOwned.clear();
 		// DiscIO::cUIDsys::AccessInstance().GetTitleIDs(m_TitleIDsOwned, true);
-    }
-    else if (VolumeHandler::IsValid())
-    {
+	}
+	else if (VolumeHandler::IsValid())
+	{
 		// blindly grab the titleID from the disc - it's unencrypted at:
 		// offset 0x0F8001DC and 0x0F80044C
 		VolumeHandler::GetVolume()->GetTitleID((u8*)&m_TitleID);
 		m_TitleID = Common::swap64(m_TitleID);
-    }
-    else
-    {
-        m_TitleID = ((u64)0x00010000 << 32) | 0xF00DBEEF;
-    }   
+	}
+	else
+	{
+		m_TitleID = ((u64)0x00010000 << 32) | 0xF00DBEEF;
+	}
 
-    INFO_LOG(WII_IPC_ES, "Set default title to %08x/%08x", (u32)(m_TitleID>>32), (u32)m_TitleID);
+	INFO_LOG(WII_IPC_ES, "Set default title to %08x/%08x", (u32)(m_TitleID>>32), (u32)m_TitleID);
 
 	Memory::Write_U32(GetDeviceID(), _CommandAddress+4);
 	if (m_Active)
-		INFO_LOG(WII_IPC_ES, "Device was ReOpened");
+		INFO_LOG(WII_IPC_ES, "Device was re-opened.");
 	m_Active = true;
-    return true;
+	return true;
 }
 
 bool CWII_IPC_HLE_Device_es::Close(u32 _CommandAddress, bool _bForce)
 {
-    // Leave deletion of the INANDContentLoader objects to CNANDContentManager, don't do it here!
-    m_NANDContent.clear();
+	// Leave deletion of the INANDContentLoader objects to CNANDContentManager, don't do it here!
+	m_NANDContent.clear();
 	m_ContentAccessMap.clear();
 	m_pContentLoader = NULL;
 	m_TitleIDs.clear();
-    m_TitleID = -1;
+	m_TitleID = -1;
 	AccessIdentID = 0x6000000;
 
-    INFO_LOG(WII_IPC_ES, "ES: Close");
-    if (!_bForce)
+	INFO_LOG(WII_IPC_ES, "ES: Close");
+	if (!_bForce)
 		Memory::Write_U32(0, _CommandAddress + 4);
 	m_Active = false;
 	return true;
@@ -136,17 +123,17 @@ bool CWII_IPC_HLE_Device_es::Close(u32 _CommandAddress, bool _bForce)
 
 bool CWII_IPC_HLE_Device_es::IOCtlV(u32 _CommandAddress) 
 {
-    SIOCtlVBuffer Buffer(_CommandAddress);
+	SIOCtlVBuffer Buffer(_CommandAddress);
 
-    DEBUG_LOG(WII_IPC_ES, "%s (0x%x)", GetDeviceName().c_str(), Buffer.Parameter);
+	DEBUG_LOG(WII_IPC_ES, "%s (0x%x)", GetDeviceName().c_str(), Buffer.Parameter);
 
-    // Prepare the out buffer(s) with zeroes as a safety precaution
-    // to avoid returning bad values
-    for (u32 i = 0; i < Buffer.NumberPayloadBuffer; i++)
-    {
-        Memory::Memset(Buffer.PayloadBuffer[i].m_Address, 0,
-            Buffer.PayloadBuffer[i].m_Size);
-    }
+	// Prepare the out buffer(s) with zeroes as a safety precaution
+	// to avoid returning bad values
+	for (u32 i = 0; i < Buffer.NumberPayloadBuffer; i++)
+	{
+		Memory::Memset(Buffer.PayloadBuffer[i].m_Address, 0,
+			Buffer.PayloadBuffer[i].m_Size);
+	}
 
 	// Uhh just put this here for now
 	u8 keyTable[11][16] = {
@@ -164,7 +151,7 @@ bool CWII_IPC_HLE_Device_es::IOCtlV(u32 _CommandAddress)
 	};
 
 	switch (Buffer.Parameter)
-    {
+	{
 	case IOCTL_ES_GETDEVICEID:
 		{
 			_dbg_assert_msg_(WII_IPC_ES, Buffer.NumberPayloadBuffer == 1, "IOCTL_ES_GETDEVICEID no out buffer");
@@ -207,10 +194,10 @@ bool CWII_IPC_HLE_Device_es::IOCtlV(u32 _CommandAddress)
 		}
 		break;
 
-    case IOCTL_ES_GETTITLECONTENTS:
-        {
-            _dbg_assert_msg_(WII_IPC_ES, Buffer.NumberInBuffer == 2, "IOCTL_ES_GETTITLECONTENTS bad in buffer");
-            _dbg_assert_msg_(WII_IPC_ES, Buffer.NumberPayloadBuffer == 1, "IOCTL_ES_GETTITLECONTENTS bad out buffer");
+	case IOCTL_ES_GETTITLECONTENTS:
+		{
+			_dbg_assert_msg_(WII_IPC_ES, Buffer.NumberInBuffer == 2, "IOCTL_ES_GETTITLECONTENTS bad in buffer");
+			_dbg_assert_msg_(WII_IPC_ES, Buffer.NumberPayloadBuffer == 1, "IOCTL_ES_GETTITLECONTENTS bad out buffer");
 
 			u64 TitleID = Memory::Read_U64(Buffer.InBuffer[0].m_Address);
 
@@ -234,32 +221,32 @@ bool CWII_IPC_HLE_Device_es::IOCtlV(u32 _CommandAddress)
 						GetContentSize());
 			}
 
-            return true;
-        }
-        break;
+			return true;
+		}
+		break;
 
 
-    case IOCTL_ES_OPENTITLECONTENT:
-        {
-            _dbg_assert_(WII_IPC_ES, Buffer.NumberInBuffer == 3);
-            _dbg_assert_(WII_IPC_ES, Buffer.NumberPayloadBuffer == 0);
-            
-            u64 TitleID = Memory::Read_U64(Buffer.InBuffer[0].m_Address);
-            u32 Index = Memory::Read_U32(Buffer.InBuffer[2].m_Address);
+	case IOCTL_ES_OPENTITLECONTENT:
+		{
+			_dbg_assert_(WII_IPC_ES, Buffer.NumberInBuffer == 3);
+			_dbg_assert_(WII_IPC_ES, Buffer.NumberPayloadBuffer == 0);
 
-            u32 CFD = AccessIdentID++;
-            m_ContentAccessMap[CFD].m_Position = 0;
-            m_ContentAccessMap[CFD].m_pContent = AccessContentDevice(TitleID).GetContentByIndex(Index);
-            _dbg_assert_msg_(WII_IPC_ES, m_ContentAccessMap[CFD].m_pContent != NULL, "No Content for TitleID: %08x/%08x at Index %x", (u32)(TitleID>>32), (u32)TitleID, Index);
+			u64 TitleID = Memory::Read_U64(Buffer.InBuffer[0].m_Address);
+			u32 Index = Memory::Read_U32(Buffer.InBuffer[2].m_Address);
+
+			u32 CFD = AccessIdentID++;
+			m_ContentAccessMap[CFD].m_Position = 0;
+			m_ContentAccessMap[CFD].m_pContent = AccessContentDevice(TitleID).GetContentByIndex(Index);
+			_dbg_assert_msg_(WII_IPC_ES, m_ContentAccessMap[CFD].m_pContent != NULL, "No Content for TitleID: %08x/%08x at Index %x", (u32)(TitleID>>32), (u32)TitleID, Index);
 			// Fix for DLC by itsnotmailmail
 			if (m_ContentAccessMap[CFD].m_pContent == NULL)
 				CFD = 0xffffffff; //TODO: what is the correct error value here?
-            Memory::Write_U32(CFD, _CommandAddress + 0x4);
+			Memory::Write_U32(CFD, _CommandAddress + 0x4);
 
-            INFO_LOG(WII_IPC_ES, "IOCTL_ES_OPENTITLECONTENT: TitleID: %08x/%08x  Index %i -> got CFD %x", (u32)(TitleID>>32), (u32)TitleID, Index, CFD);
-            return true;
-        }
-        break;
+			INFO_LOG(WII_IPC_ES, "IOCTL_ES_OPENTITLECONTENT: TitleID: %08x/%08x  Index %i -> got CFD %x", (u32)(TitleID>>32), (u32)TitleID, Index, CFD);
+			return true;
+		}
+		break;
 
 	case IOCTL_ES_OPENCONTENT:
 		{
@@ -282,177 +269,177 @@ bool CWII_IPC_HLE_Device_es::IOCtlV(u32 _CommandAddress)
 		}
 		break;
 
-    case IOCTL_ES_READCONTENT:
-        {
-            _dbg_assert_(WII_IPC_ES, Buffer.NumberInBuffer == 1);
-            _dbg_assert_(WII_IPC_ES, Buffer.NumberPayloadBuffer == 1);
+	case IOCTL_ES_READCONTENT:
+		{
+			_dbg_assert_(WII_IPC_ES, Buffer.NumberInBuffer == 1);
+			_dbg_assert_(WII_IPC_ES, Buffer.NumberPayloadBuffer == 1);
 
-            u32 CFD = Memory::Read_U32(Buffer.InBuffer[0].m_Address);
-            u32 Size = Buffer.PayloadBuffer[0].m_Size;
-            u32 Addr = Buffer.PayloadBuffer[0].m_Address;
+			u32 CFD = Memory::Read_U32(Buffer.InBuffer[0].m_Address);
+			u32 Size = Buffer.PayloadBuffer[0].m_Size;
+			u32 Addr = Buffer.PayloadBuffer[0].m_Address;
 
-            _dbg_assert_(WII_IPC_ES, m_ContentAccessMap.find(CFD) != m_ContentAccessMap.end());
-            SContentAccess& rContent = m_ContentAccessMap[CFD];
+			_dbg_assert_(WII_IPC_ES, m_ContentAccessMap.find(CFD) != m_ContentAccessMap.end());
+			SContentAccess& rContent = m_ContentAccessMap[CFD];
 
-            _dbg_assert_(WII_IPC_ES, rContent.m_pContent->m_pData != NULL);
+			_dbg_assert_(WII_IPC_ES, rContent.m_pContent->m_pData != NULL);
 
-            u8* pSrc = &rContent.m_pContent->m_pData[rContent.m_Position];
-            u8* pDest = Memory::GetPointer(Addr);
+			u8* pSrc = &rContent.m_pContent->m_pData[rContent.m_Position];
+			u8* pDest = Memory::GetPointer(Addr);
 
-            if (rContent.m_Position + Size > rContent.m_pContent->m_Size) 
-            {
-                Size = rContent.m_pContent->m_Size-rContent.m_Position;
-            }
+			if (rContent.m_Position + Size > rContent.m_pContent->m_Size) 
+			{
+				Size = rContent.m_pContent->m_Size-rContent.m_Position;
+			}
 
-            if (Size > 0)
-            {
+			if (Size > 0)
+			{
 				if (pDest) {
 					memcpy(pDest, pSrc, Size);
 					rContent.m_Position += Size;
 				} else {
 					PanicAlertT("IOCTL_ES_READCONTENT - bad destination");
 				}
-            }
+			}
 
-            INFO_LOG(WII_IPC_ES, "IOCTL_ES_READCONTENT: CFD %x, Addr 0x%x, Size %i -> stream pos %i (Index %i)", CFD, Addr, Size, rContent.m_Position, rContent.m_pContent->m_Index);
+			INFO_LOG(WII_IPC_ES, "IOCTL_ES_READCONTENT: CFD %x, Address 0x%x, Size %i -> stream pos %i (Index %i)", CFD, Addr, Size, rContent.m_Position, rContent.m_pContent->m_Index);
 
-            Memory::Write_U32(Size, _CommandAddress + 0x4);
-            return true;
-        }
-        break;
+			Memory::Write_U32(Size, _CommandAddress + 0x4);
+			return true;
+		}
+		break;
 
-    case IOCTL_ES_CLOSECONTENT:
-        {
-            _dbg_assert_(WII_IPC_ES, Buffer.NumberInBuffer == 1);
-            _dbg_assert_(WII_IPC_ES, Buffer.NumberPayloadBuffer == 0);
+	case IOCTL_ES_CLOSECONTENT:
+		{
+			_dbg_assert_(WII_IPC_ES, Buffer.NumberInBuffer == 1);
+			_dbg_assert_(WII_IPC_ES, Buffer.NumberPayloadBuffer == 0);
 
-            u32 CFD = Memory::Read_U32(Buffer.InBuffer[0].m_Address);
+			u32 CFD = Memory::Read_U32(Buffer.InBuffer[0].m_Address);
 
-            CContentAccessMap::iterator itr = m_ContentAccessMap.find(CFD);
-            m_ContentAccessMap.erase(itr);
+			CContentAccessMap::iterator itr = m_ContentAccessMap.find(CFD);
+			m_ContentAccessMap.erase(itr);
 
-            INFO_LOG(WII_IPC_ES, "IOCTL_ES_CLOSECONTENT: CFD %x", CFD);
+			INFO_LOG(WII_IPC_ES, "IOCTL_ES_CLOSECONTENT: CFD %x", CFD);
 
-            Memory::Write_U32(0, _CommandAddress + 0x4);
-            return true;
-        }
-        break;
+			Memory::Write_U32(0, _CommandAddress + 0x4);
+			return true;
+		}
+		break;
 
-    case IOCTL_ES_SEEKCONTENT:
-        {	
-            _dbg_assert_(WII_IPC_ES, Buffer.NumberInBuffer == 3);
-            _dbg_assert_(WII_IPC_ES, Buffer.NumberPayloadBuffer == 0);
+	case IOCTL_ES_SEEKCONTENT:
+		{
+			_dbg_assert_(WII_IPC_ES, Buffer.NumberInBuffer == 3);
+			_dbg_assert_(WII_IPC_ES, Buffer.NumberPayloadBuffer == 0);
 
-            u32 CFD = Memory::Read_U32(Buffer.InBuffer[0].m_Address);
-            u32 Addr = Memory::Read_U32(Buffer.InBuffer[1].m_Address);
-            u32 Mode = Memory::Read_U32(Buffer.InBuffer[2].m_Address);
+			u32 CFD = Memory::Read_U32(Buffer.InBuffer[0].m_Address);
+			u32 Addr = Memory::Read_U32(Buffer.InBuffer[1].m_Address);
+			u32 Mode = Memory::Read_U32(Buffer.InBuffer[2].m_Address);
 
-            _dbg_assert_(WII_IPC_ES, m_ContentAccessMap.find(CFD) != m_ContentAccessMap.end());
-            SContentAccess& rContent = m_ContentAccessMap[CFD];
+			_dbg_assert_(WII_IPC_ES, m_ContentAccessMap.find(CFD) != m_ContentAccessMap.end());
+			SContentAccess& rContent = m_ContentAccessMap[CFD];
 
-            switch (Mode)
-            {
-            case 0:  // SET
-                rContent.m_Position = Addr;
-                break;
+			switch (Mode)
+			{
+			case 0:  // SET
+				rContent.m_Position = Addr;
+				break;
 
-            case 1:  // CUR
-                rContent.m_Position += Addr;
-                break;
+			case 1:  // CUR
+				rContent.m_Position += Addr;
+				break;
 
-            case 2:  // END
-                rContent.m_Position = rContent.m_pContent->m_Size + Addr;
-                break;
-            }
+			case 2:  // END
+				rContent.m_Position = rContent.m_pContent->m_Size + Addr;
+				break;
+			}
 
-            INFO_LOG(WII_IPC_ES, "IOCTL_ES_SEEKCONTENT: CFD %x, Addr 0x%x, Mode %i -> Pos %i", CFD, Addr, Mode, rContent.m_Position);
+			INFO_LOG(WII_IPC_ES, "IOCTL_ES_SEEKCONTENT: CFD %x, Address 0x%x, Mode %i -> Pos %i", CFD, Addr, Mode, rContent.m_Position);
 
-            Memory::Write_U32(rContent.m_Position, _CommandAddress + 0x4);
-            return true;
-        }
-        break;
+			Memory::Write_U32(rContent.m_Position, _CommandAddress + 0x4);
+			return true;
+		}
+		break;
 
-    case IOCTL_ES_GETTITLEDIR:
-        {          
-            _dbg_assert_(WII_IPC_ES, Buffer.NumberInBuffer == 1);
-            _dbg_assert_(WII_IPC_ES, Buffer.NumberPayloadBuffer == 1);
+	case IOCTL_ES_GETTITLEDIR:
+		{
+			_dbg_assert_(WII_IPC_ES, Buffer.NumberInBuffer == 1);
+			_dbg_assert_(WII_IPC_ES, Buffer.NumberPayloadBuffer == 1);
 
-            u64 TitleID = Memory::Read_U64(Buffer.InBuffer[0].m_Address);
+			u64 TitleID = Memory::Read_U64(Buffer.InBuffer[0].m_Address);
 
-            char* Path = (char*)Memory::GetPointer(Buffer.PayloadBuffer[0].m_Address);
-            sprintf(Path, "/title/%08x/%08x/data", (u32)(TitleID >> 32), (u32)TitleID);
+			char* Path = (char*)Memory::GetPointer(Buffer.PayloadBuffer[0].m_Address);
+			sprintf(Path, "/title/%08x/%08x/data", (u32)(TitleID >> 32), (u32)TitleID);
 
-            INFO_LOG(WII_IPC_ES, "IOCTL_ES_GETTITLEDIR: %s", Path);
-        }
-        break;
+			INFO_LOG(WII_IPC_ES, "IOCTL_ES_GETTITLEDIR: %s", Path);
+		}
+		break;
 
-    case IOCTL_ES_GETTITLEID:
-        {
-            _dbg_assert_(WII_IPC_ES, Buffer.NumberInBuffer == 0);
-            _dbg_assert_msg_(WII_IPC_ES, Buffer.NumberPayloadBuffer == 1, "IOCTL_ES_GETTITLEID no out buffer");
+	case IOCTL_ES_GETTITLEID:
+		{
+			_dbg_assert_(WII_IPC_ES, Buffer.NumberInBuffer == 0);
+			_dbg_assert_msg_(WII_IPC_ES, Buffer.NumberPayloadBuffer == 1, "IOCTL_ES_GETTITLEID no out buffer");
 
-            Memory::Write_U64(m_TitleID, Buffer.PayloadBuffer[0].m_Address);
-            INFO_LOG(WII_IPC_ES, "IOCTL_ES_GETTITLEID: %08x/%08x", (u32)(m_TitleID>>32), (u32)m_TitleID);
-        }
-        break;
+			Memory::Write_U64(m_TitleID, Buffer.PayloadBuffer[0].m_Address);
+			INFO_LOG(WII_IPC_ES, "IOCTL_ES_GETTITLEID: %08x/%08x", (u32)(m_TitleID>>32), (u32)m_TitleID);
+		}
+		break;
 
-    case IOCTL_ES_SETUID:
-        {
-            _dbg_assert_msg_(WII_IPC_ES, Buffer.NumberInBuffer == 1, "IOCTL_ES_SETUID no in buffer");
-            _dbg_assert_(WII_IPC_ES, Buffer.NumberPayloadBuffer == 0);
+	case IOCTL_ES_SETUID:
+		{
+			_dbg_assert_msg_(WII_IPC_ES, Buffer.NumberInBuffer == 1, "IOCTL_ES_SETUID no in buffer");
+			_dbg_assert_(WII_IPC_ES, Buffer.NumberPayloadBuffer == 0);
 			// TODO: fs permissions based on this
-            u64 TitleID = Memory::Read_U64(Buffer.InBuffer[0].m_Address);
-            INFO_LOG(WII_IPC_ES, "IOCTL_ES_SETUID titleID: %08x/%08x", (u32)(TitleID>>32), (u32)TitleID);
-        }
-        break;
+			u64 TitleID = Memory::Read_U64(Buffer.InBuffer[0].m_Address);
+			INFO_LOG(WII_IPC_ES, "IOCTL_ES_SETUID titleID: %08x/%08x", (u32)(TitleID>>32), (u32)TitleID);
+		}
+		break;
 
-    case IOCTL_ES_GETTITLECNT:
-        {
-            _dbg_assert_msg_(WII_IPC_ES, Buffer.NumberInBuffer == 0, "IOCTL_ES_GETTITLECNT has an in buffer");
-            _dbg_assert_msg_(WII_IPC_ES, Buffer.NumberPayloadBuffer == 1, "IOCTL_ES_GETTITLECNT has no out buffer");
-            _dbg_assert_msg_(WII_IPC_ES, Buffer.PayloadBuffer[0].m_Size == 4, "IOCTL_ES_GETTITLECNT payload[0].size != 4");
+	case IOCTL_ES_GETTITLECNT:
+		{
+			_dbg_assert_msg_(WII_IPC_ES, Buffer.NumberInBuffer == 0, "IOCTL_ES_GETTITLECNT has an in buffer");
+			_dbg_assert_msg_(WII_IPC_ES, Buffer.NumberPayloadBuffer == 1, "IOCTL_ES_GETTITLECNT has no out buffer");
+			_dbg_assert_msg_(WII_IPC_ES, Buffer.PayloadBuffer[0].m_Size == 4, "IOCTL_ES_GETTITLECNT payload[0].size != 4");
 
-            Memory::Write_U32((u32)m_TitleIDs.size(), Buffer.PayloadBuffer[0].m_Address);
+			Memory::Write_U32((u32)m_TitleIDs.size(), Buffer.PayloadBuffer[0].m_Address);
 
-            INFO_LOG(WII_IPC_ES, "IOCTL_ES_GETTITLECNT: Number of Titles %lu",
-                (unsigned long)m_TitleIDs.size());
+			INFO_LOG(WII_IPC_ES, "IOCTL_ES_GETTITLECNT: Number of Titles %lu",
+				(unsigned long)m_TitleIDs.size());
 
-            Memory::Write_U32(0, _CommandAddress + 0x4);
+			Memory::Write_U32(0, _CommandAddress + 0x4);
 
-            return true;
-        }
-        break;
+			return true;
+		}
+		break;
 
 
-    case IOCTL_ES_GETTITLES:
-        {
-            _dbg_assert_msg_(WII_IPC_ES, Buffer.NumberInBuffer == 1, "IOCTL_ES_GETTITLES has an in buffer");
-            _dbg_assert_msg_(WII_IPC_ES, Buffer.NumberPayloadBuffer == 1, "IOCTL_ES_GETTITLES has no out buffer");
+	case IOCTL_ES_GETTITLES:
+		{
+			_dbg_assert_msg_(WII_IPC_ES, Buffer.NumberInBuffer == 1, "IOCTL_ES_GETTITLES has an in buffer");
+			_dbg_assert_msg_(WII_IPC_ES, Buffer.NumberPayloadBuffer == 1, "IOCTL_ES_GETTITLES has no out buffer");
 
-            u32 MaxCount = Memory::Read_U32(Buffer.InBuffer[0].m_Address);
-            u32 Count = 0;
-            for (int i = 0; i < (int)m_TitleIDs.size(); i++)
-            {
-                Memory::Write_U64(m_TitleIDs[i], Buffer.PayloadBuffer[0].m_Address + i*8);
-                INFO_LOG(WII_IPC_ES, "IOCTL_ES_GETTITLES: %08x/%08x", (u32)(m_TitleIDs[i] >> 32), (u32)m_TitleIDs[i]);
-                Count++;
-                if (Count >= MaxCount)
-                    break;
-            }
+			u32 MaxCount = Memory::Read_U32(Buffer.InBuffer[0].m_Address);
+			u32 Count = 0;
+			for (int i = 0; i < (int)m_TitleIDs.size(); i++)
+			{
+				Memory::Write_U64(m_TitleIDs[i], Buffer.PayloadBuffer[0].m_Address + i*8);
+				INFO_LOG(WII_IPC_ES, "IOCTL_ES_GETTITLES: %08x/%08x", (u32)(m_TitleIDs[i] >> 32), (u32)m_TitleIDs[i]);
+				Count++;
+				if (Count >= MaxCount)
+					break;
+			}
 
-            INFO_LOG(WII_IPC_ES, "IOCTL_ES_GETTITLES: Number of titles returned %i", Count);
-            Memory::Write_U32(0, _CommandAddress + 0x4);
-            return true;
-        }
-        break;
+			INFO_LOG(WII_IPC_ES, "IOCTL_ES_GETTITLES: Number of titles returned %i", Count);
+			Memory::Write_U32(0, _CommandAddress + 0x4);
+			return true;
+		}
+		break;
 
 
-    case IOCTL_ES_GETVIEWCNT:
-        {
-            _dbg_assert_msg_(WII_IPC_ES, Buffer.NumberInBuffer == 1, "IOCTL_ES_GETVIEWCNT no in buffer");
-            _dbg_assert_msg_(WII_IPC_ES, Buffer.NumberPayloadBuffer == 1, "IOCTL_ES_GETVIEWCNT no out buffer");
+	case IOCTL_ES_GETVIEWCNT:
+		{
+			_dbg_assert_msg_(WII_IPC_ES, Buffer.NumberInBuffer == 1, "IOCTL_ES_GETVIEWCNT no in buffer");
+			_dbg_assert_msg_(WII_IPC_ES, Buffer.NumberPayloadBuffer == 1, "IOCTL_ES_GETVIEWCNT no out buffer");
 
-            u64 TitleID = Memory::Read_U64(Buffer.InBuffer[0].m_Address);
+			u64 TitleID = Memory::Read_U64(Buffer.InBuffer[0].m_Address);
 
 			u32 retVal = 0;
 			const DiscIO::INANDContentLoader& Loader = AccessContentDevice(TitleID);
@@ -479,16 +466,16 @@ bool CWII_IPC_HLE_Device_es::IOCtlV(u32 _CommandAddress)
 					//retVal = ES_NO_TICKET_INSTALLED;
 				}
 			}
-            
-            INFO_LOG(WII_IPC_ES, "IOCTL_ES_GETVIEWCNT for titleID: %08x/%08x (View Count = %i)", (u32)(TitleID>>32), (u32)TitleID, ViewCount);
 
-            Memory::Write_U32(ViewCount, Buffer.PayloadBuffer[0].m_Address);
-            Memory::Write_U32(retVal, _CommandAddress + 0x4);
-            return true;
-        }
-        break;
+			INFO_LOG(WII_IPC_ES, "IOCTL_ES_GETVIEWCNT for titleID: %08x/%08x (View Count = %i)", (u32)(TitleID>>32), (u32)TitleID, ViewCount);
 
-    case IOCTL_ES_GETVIEWS:
+			Memory::Write_U32(ViewCount, Buffer.PayloadBuffer[0].m_Address);
+			Memory::Write_U32(retVal, _CommandAddress + 0x4);
+			return true;
+		}
+		break;
+
+	case IOCTL_ES_GETVIEWS:
 		{
 			_dbg_assert_msg_(WII_IPC_ES, Buffer.NumberInBuffer == 2, "IOCTL_ES_GETVIEWS no in buffer");
 			_dbg_assert_msg_(WII_IPC_ES, Buffer.NumberPayloadBuffer == 1, "IOCTL_ES_GETVIEWS no out buffer");
@@ -537,73 +524,73 @@ bool CWII_IPC_HLE_Device_es::IOCtlV(u32 _CommandAddress)
 			Memory::Write_U32(retVal, _CommandAddress + 0x4);
 			return true;
 		}
-        break;
+		break;
 
-    case IOCTL_ES_GETTMDVIEWCNT:
-        {
-            _dbg_assert_msg_(WII_IPC_ES, Buffer.NumberInBuffer == 1, "IOCTL_ES_GETTMDVIEWCNT no in buffer");
-            _dbg_assert_msg_(WII_IPC_ES, Buffer.NumberPayloadBuffer == 1, "IOCTL_ES_GETTMDVIEWCNT no out buffer");
+	case IOCTL_ES_GETTMDVIEWCNT:
+		{
+			_dbg_assert_msg_(WII_IPC_ES, Buffer.NumberInBuffer == 1, "IOCTL_ES_GETTMDVIEWCNT no in buffer");
+			_dbg_assert_msg_(WII_IPC_ES, Buffer.NumberPayloadBuffer == 1, "IOCTL_ES_GETTMDVIEWCNT no out buffer");
 
-            u64 TitleID = Memory::Read_U64(Buffer.InBuffer[0].m_Address);
+			u64 TitleID = Memory::Read_U64(Buffer.InBuffer[0].m_Address);
 
 			const DiscIO::INANDContentLoader& Loader = AccessContentDevice(TitleID);
 
-            u32 TMDViewCnt = 0;
-            if (Loader.IsValid())
-            {
-                TMDViewCnt += DiscIO::INANDContentLoader::TMD_VIEW_SIZE; 
-                TMDViewCnt += 2; // title version
-                TMDViewCnt += 2; // num entries
-                TMDViewCnt += (u32)Loader.GetContentSize() * (4+2+2+8); // content id, index, type, size
-            }
-            Memory::Write_U32(TMDViewCnt, Buffer.PayloadBuffer[0].m_Address);
+			u32 TMDViewCnt = 0;
+			if (Loader.IsValid())
+			{
+				TMDViewCnt += DiscIO::INANDContentLoader::TMD_VIEW_SIZE; 
+				TMDViewCnt += 2; // title version
+				TMDViewCnt += 2; // num entries
+				TMDViewCnt += (u32)Loader.GetContentSize() * (4+2+2+8); // content id, index, type, size
+			}
+			Memory::Write_U32(TMDViewCnt, Buffer.PayloadBuffer[0].m_Address);
 
-            Memory::Write_U32(0, _CommandAddress + 0x4);
+			Memory::Write_U32(0, _CommandAddress + 0x4);
 
-            INFO_LOG(WII_IPC_ES, "IOCTL_ES_GETTMDVIEWCNT: title: %08x/%08x (view size %i)", (u32)(TitleID >> 32), (u32)TitleID, TMDViewCnt);
-            return true;
-        }
-        break;
+			INFO_LOG(WII_IPC_ES, "IOCTL_ES_GETTMDVIEWCNT: title: %08x/%08x (view size %i)", (u32)(TitleID >> 32), (u32)TitleID, TMDViewCnt);
+			return true;
+		}
+		break;
 
-    case IOCTL_ES_GETTMDVIEWS:
-        {
-            _dbg_assert_msg_(WII_IPC_ES, Buffer.NumberInBuffer == 2, "IOCTL_ES_GETTMDVIEWCNT no in buffer");
-            _dbg_assert_msg_(WII_IPC_ES, Buffer.NumberPayloadBuffer == 1, "IOCTL_ES_GETTMDVIEWCNT no out buffer");
+	case IOCTL_ES_GETTMDVIEWS:
+		{
+			_dbg_assert_msg_(WII_IPC_ES, Buffer.NumberInBuffer == 2, "IOCTL_ES_GETTMDVIEWCNT no in buffer");
+			_dbg_assert_msg_(WII_IPC_ES, Buffer.NumberPayloadBuffer == 1, "IOCTL_ES_GETTMDVIEWCNT no out buffer");
 
-            u64 TitleID = Memory::Read_U64(Buffer.InBuffer[0].m_Address);
-            u32 MaxCount = Memory::Read_U32(Buffer.InBuffer[1].m_Address);
+			u64 TitleID = Memory::Read_U64(Buffer.InBuffer[0].m_Address);
+			u32 MaxCount = Memory::Read_U32(Buffer.InBuffer[1].m_Address);
 
 			const DiscIO::INANDContentLoader& Loader = AccessContentDevice(TitleID);
 
-            INFO_LOG(WII_IPC_ES, "IOCTL_ES_GETTMDVIEWCNT: title: %08x/%08x   buffersize: %i", (u32)(TitleID >> 32), (u32)TitleID, MaxCount);
+			INFO_LOG(WII_IPC_ES, "IOCTL_ES_GETTMDVIEWCNT: title: %08x/%08x   buffer size: %i", (u32)(TitleID >> 32), (u32)TitleID, MaxCount);
 
-            if (Loader.IsValid())
-            {
-                u32 Address = Buffer.PayloadBuffer[0].m_Address;
+			if (Loader.IsValid())
+			{
+				u32 Address = Buffer.PayloadBuffer[0].m_Address;
 
-                Memory::WriteBigEData(Loader.GetTMDView(), Address, DiscIO::INANDContentLoader::TMD_VIEW_SIZE);
-                Address += DiscIO::INANDContentLoader::TMD_VIEW_SIZE;
-                
-                Memory::Write_U16(Loader.GetTitleVersion(), Address); Address += 2;
-                Memory::Write_U16(Loader.GetNumEntries(), Address); Address += 2;
+				Memory::WriteBigEData(Loader.GetTMDView(), Address, DiscIO::INANDContentLoader::TMD_VIEW_SIZE);
+				Address += DiscIO::INANDContentLoader::TMD_VIEW_SIZE;
 
-                const std::vector<DiscIO::SNANDContent>& rContent = Loader.GetContent();
-                for (size_t i=0; i<Loader.GetContentSize(); i++)
-                {
-                    Memory::Write_U32(rContent[i].m_ContentID,  Address); Address += 4;
-                    Memory::Write_U16(rContent[i].m_Index,      Address); Address += 2;
-                    Memory::Write_U16(rContent[i].m_Type,       Address); Address += 2;
-                    Memory::Write_U64(rContent[i].m_Size,       Address); Address += 8;
-                }
+				Memory::Write_U16(Loader.GetTitleVersion(), Address); Address += 2;
+				Memory::Write_U16(Loader.GetNumEntries(), Address); Address += 2;
 
-                _dbg_assert_(WII_IPC_ES, (Address-Buffer.PayloadBuffer[0].m_Address) == Buffer.PayloadBuffer[0].m_Size);
-            }
-            Memory::Write_U32(0, _CommandAddress + 0x4);
+				const std::vector<DiscIO::SNANDContent>& rContent = Loader.GetContent();
+				for (size_t i=0; i<Loader.GetContentSize(); i++)
+				{
+					Memory::Write_U32(rContent[i].m_ContentID,  Address); Address += 4;
+					Memory::Write_U16(rContent[i].m_Index,      Address); Address += 2;
+					Memory::Write_U16(rContent[i].m_Type,       Address); Address += 2;
+					Memory::Write_U64(rContent[i].m_Size,       Address); Address += 8;
+				}
 
-            INFO_LOG(WII_IPC_ES, "IOCTL_ES_GETTMDVIEWS: title: %08x/%08x (buffer size: %i)", (u32)(TitleID >> 32), (u32)TitleID, MaxCount);
-            return true;
-        }
-        break;
+				_dbg_assert_(WII_IPC_ES, (Address-Buffer.PayloadBuffer[0].m_Address) == Buffer.PayloadBuffer[0].m_Size);
+			}
+			Memory::Write_U32(0, _CommandAddress + 0x4);
+
+			INFO_LOG(WII_IPC_ES, "IOCTL_ES_GETTMDVIEWS: title: %08x/%08x (buffer size: %i)", (u32)(TitleID >> 32), (u32)TitleID, MaxCount);
+			return true;
+		}
+		break;
 
 	case IOCTL_ES_GETCONSUMPTION: // This is at least what crediar's ES module does
 		Memory::Write_U32(0, Buffer.PayloadBuffer[1].m_Address);
@@ -641,34 +628,34 @@ bool CWII_IPC_HLE_Device_es::IOCtlV(u32 _CommandAddress)
 			}
 				
 		} 
-    case IOCTL_ES_GETSTOREDTMDSIZE:
-        {
-            _dbg_assert_msg_(WII_IPC_ES, Buffer.NumberInBuffer == 1, "IOCTL_ES_GETSTOREDTMDSIZE no in buffer");
-           // _dbg_assert_msg_(WII_IPC_ES, Buffer.NumberPayloadBuffer == 1, "IOCTL_ES_ES_GETSTOREDTMDSIZE no out buffer");
+	case IOCTL_ES_GETSTOREDTMDSIZE:
+		{
+			_dbg_assert_msg_(WII_IPC_ES, Buffer.NumberInBuffer == 1, "IOCTL_ES_GETSTOREDTMDSIZE no in buffer");
+			// _dbg_assert_msg_(WII_IPC_ES, Buffer.NumberPayloadBuffer == 1, "IOCTL_ES_ES_GETSTOREDTMDSIZE no out buffer");
 
-            u64 TitleID = Memory::Read_U64(Buffer.InBuffer[0].m_Address);
+			u64 TitleID = Memory::Read_U64(Buffer.InBuffer[0].m_Address);
 			const DiscIO::INANDContentLoader& Loader = AccessContentDevice(TitleID);
 
-            _dbg_assert_(WII_IPC_ES, Loader.IsValid());
-            u32 TMDCnt = 0;
-            if (Loader.IsValid())
-            {
+			_dbg_assert_(WII_IPC_ES, Loader.IsValid());
+			u32 TMDCnt = 0;
+			if (Loader.IsValid())
+			{
 				TMDCnt += DiscIO::INANDContentLoader::TMD_HEADER_SIZE;
-                TMDCnt += (u32)Loader.GetContentSize() * DiscIO::INANDContentLoader::CONTENT_HEADER_SIZE; 
-            }
-            if(Buffer.NumberPayloadBuffer)
+				TMDCnt += (u32)Loader.GetContentSize() * DiscIO::INANDContentLoader::CONTENT_HEADER_SIZE; 
+			}
+			if(Buffer.NumberPayloadBuffer)
 				Memory::Write_U32(TMDCnt, Buffer.PayloadBuffer[0].m_Address);
 
-            Memory::Write_U32(0, _CommandAddress + 0x4);
+			Memory::Write_U32(0, _CommandAddress + 0x4);
 
-            INFO_LOG(WII_IPC_ES, "IOCTL_ES_GETSTOREDTMDSIZE: title: %08x/%08x (view size %i)", (u32)(TitleID >> 32), (u32)TitleID, TMDCnt);
-            return true;
-        }
-        break;
+			INFO_LOG(WII_IPC_ES, "IOCTL_ES_GETSTOREDTMDSIZE: title: %08x/%08x (view size %i)", (u32)(TitleID >> 32), (u32)TitleID, TMDCnt);
+			return true;
+		}
+		break;
 	case IOCTL_ES_GETSTOREDTMD:
-        {
-            _dbg_assert_msg_(WII_IPC_ES, Buffer.NumberInBuffer > 0, "IOCTL_ES_GETSTOREDTMD no in buffer");
-            // requires 1 inbuffer and no outbuffer, presumably outbuffer required when second inbuffer is used for maxcount (allocated mem?)
+		{
+			_dbg_assert_msg_(WII_IPC_ES, Buffer.NumberInBuffer > 0, "IOCTL_ES_GETSTOREDTMD no in buffer");
+			// requires 1 inbuffer and no outbuffer, presumably outbuffer required when second inbuffer is used for maxcount (allocated mem?)
 			// called with 1 inbuffer after deleting a titleid
 			//_dbg_assert_msg_(WII_IPC_ES, Buffer.NumberPayloadBuffer == 1, "IOCTL_ES_GETSTOREDTMD no out buffer");
 
@@ -682,30 +669,30 @@ bool CWII_IPC_HLE_Device_es::IOCtlV(u32 _CommandAddress)
 			const DiscIO::INANDContentLoader& Loader = AccessContentDevice(TitleID);
 
 
-            INFO_LOG(WII_IPC_ES, "IOCTL_ES_GETSTOREDTMD: title: %08x/%08x   buffersize: %i", (u32)(TitleID >> 32), (u32)TitleID, MaxCount);
+			INFO_LOG(WII_IPC_ES, "IOCTL_ES_GETSTOREDTMD: title: %08x/%08x   buffer size: %i", (u32)(TitleID >> 32), (u32)TitleID, MaxCount);
 
-            if (Loader.IsValid() && Buffer.NumberPayloadBuffer)
-            {
-                u32 Address = Buffer.PayloadBuffer[0].m_Address;
+			if (Loader.IsValid() && Buffer.NumberPayloadBuffer)
+			{
+				u32 Address = Buffer.PayloadBuffer[0].m_Address;
 
 				Memory::WriteBigEData(Loader.GetTMDHeader(), Address, DiscIO::INANDContentLoader::TMD_HEADER_SIZE);
-                Address += DiscIO::INANDContentLoader::TMD_HEADER_SIZE;
-                
-                const std::vector<DiscIO::SNANDContent>& rContent = Loader.GetContent();
-                for (size_t i=0; i<Loader.GetContentSize(); i++)
-                {
+				Address += DiscIO::INANDContentLoader::TMD_HEADER_SIZE;
+
+				const std::vector<DiscIO::SNANDContent>& rContent = Loader.GetContent();
+				for (size_t i=0; i<Loader.GetContentSize(); i++)
+				{
 					Memory::WriteBigEData(rContent[i].m_Header, Address, DiscIO::INANDContentLoader::CONTENT_HEADER_SIZE); 
 					Address += DiscIO::INANDContentLoader::CONTENT_HEADER_SIZE;
-                }
+				}
 
-                _dbg_assert_(WII_IPC_ES, (Address-Buffer.PayloadBuffer[0].m_Address) == Buffer.PayloadBuffer[0].m_Size);
-            }
-            Memory::Write_U32(0, _CommandAddress + 0x4);
+				_dbg_assert_(WII_IPC_ES, (Address-Buffer.PayloadBuffer[0].m_Address) == Buffer.PayloadBuffer[0].m_Size);
+			}
+			Memory::Write_U32(0, _CommandAddress + 0x4);
 
-            INFO_LOG(WII_IPC_ES, "IOCTL_ES_GETSTOREDTMD: title: %08x/%08x (buffer size: %i)", (u32)(TitleID >> 32), (u32)TitleID, MaxCount);
-            return true;
-        }
-        break;
+			INFO_LOG(WII_IPC_ES, "IOCTL_ES_GETSTOREDTMD: title: %08x/%08x (buffer size: %i)", (u32)(TitleID >> 32), (u32)TitleID, MaxCount);
+			return true;
+		}
+		break;
 
 	case IOCTL_ES_ENCRYPT:
 		{
@@ -741,17 +728,17 @@ bool CWII_IPC_HLE_Device_es::IOCtlV(u32 _CommandAddress)
 
 
 	case IOCTL_ES_LAUNCH:
-        {
-            _dbg_assert_(WII_IPC_ES, Buffer.NumberInBuffer == 2);
+		{
+			_dbg_assert_(WII_IPC_ES, Buffer.NumberInBuffer == 2);
 			bool bSuccess = false;
 			u16 IOSv = 0xffff;
 
-            u64 TitleID		= Memory::Read_U64(Buffer.InBuffer[0].m_Address);
-            u32 view		= Memory::Read_U32(Buffer.InBuffer[1].m_Address);
-            u64 ticketid	= Memory::Read_U64(Buffer.InBuffer[1].m_Address+4);
-            u32 devicetype	= Memory::Read_U32(Buffer.InBuffer[1].m_Address+12);
-            u64 titleid		= Memory::Read_U64(Buffer.InBuffer[1].m_Address+16);
-            u16 access		= Memory::Read_U16(Buffer.InBuffer[1].m_Address+24);
+			u64 TitleID		= Memory::Read_U64(Buffer.InBuffer[0].m_Address);
+			u32 view		= Memory::Read_U32(Buffer.InBuffer[1].m_Address);
+			u64 ticketid	= Memory::Read_U64(Buffer.InBuffer[1].m_Address+4);
+			u32 devicetype	= Memory::Read_U32(Buffer.InBuffer[1].m_Address+12);
+			u64 titleid		= Memory::Read_U64(Buffer.InBuffer[1].m_Address+16);
+			u16 access		= Memory::Read_U16(Buffer.InBuffer[1].m_Address+24);
 
 
 			if ((u32)(TitleID>>32) != 0x00000001 || TitleID == TITLEID_SYSMENU)
@@ -777,14 +764,14 @@ bool CWII_IPC_HLE_Device_es::IOCtlV(u32 _CommandAddress)
 			{
 				//TODO: fixme
 				// The following is obviously a hack
-				// Lie to mem about loading a different ios
+				// Lie to mem about loading a different IOS
 				// someone with an affected game should test
 				IOSv = TitleID & 0xffff;
 			}
 			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);
+				PanicAlertT("IOCTL_ES_LAUNCH: Game tried to reload an IOS or a title that is not available in your NAND dump\n"
+					"TitleID %016llx.\n Dolphin will likely hang now.", TitleID);
 			}
 			else
 			{
@@ -795,6 +782,7 @@ bool CWII_IPC_HLE_Device_es::IOCtlV(u32 _CommandAddress)
 					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();
 				s_Usb = GetUsbPointer();
@@ -826,66 +814,78 @@ bool CWII_IPC_HLE_Device_es::IOCtlV(u32 _CommandAddress)
 			//TODO: provide correct return code when bSuccess= false
 			Memory::Write_U32(0, _CommandAddress + 0x4);
 
-            ERROR_LOG(WII_IPC_ES, "IOCTL_ES_LAUNCH %016llx %08x %016llx %08x %016llx %04x", TitleID,view,ticketid,devicetype,titleid,access);
+			ERROR_LOG(WII_IPC_ES, "IOCTL_ES_LAUNCH %016llx %08x %016llx %08x %016llx %04x", TitleID,view,ticketid,devicetype,titleid,access);
 			//					   IOCTL_ES_LAUNCH 0001000248414341 00000001 0001c0fef3df2cfa 00000000 0001000248414341 ffff
 
-            return true;
-        }
-        break;
+			//We have to handle the reply ourselves as this handle is not valid anymore
+			
+			
+			// It seems that the original hardware overwrites the command after it has been
+			// executed. We write 8 which is not any valid command, and what IOS does 
+			Memory::Write_U32(8, _CommandAddress);
+			// IOS seems to write back the command that was responded to
+			Memory::Write_U32(6, _CommandAddress + 8);
+			
+			// Generate a reply to the IPC command
+			WII_IPC_HLE_Interface::EnqReply(_CommandAddress, 0);
+			
+			return false;
+		}
+		break;
 
 	case IOCTL_ES_CHECKKOREAREGION: //note by DacoTaco : name is unknown, i just tried to name it SOMETHING
 		//IOS70 has this to let system menu 4.2 check if the console is region changed. it returns -1017
-		//if the IOS didn't find the korean keys and 0 if it does. 0 leads to a error 003
-		WARN_LOG(WII_IPC_ES,"IOCTL_ES_CHECKKOREAREGION: Title Checked for korean Keys");
+		//if the IOS didn't find the Korean keys and 0 if it does. 0 leads to a error 003
+		WARN_LOG(WII_IPC_ES,"IOCTL_ES_CHECKKOREAREGION: Title checked for Korean keys.");
 		Memory::Write_U32(ES_PARAMTER_SIZE_OR_ALIGNMENT , _CommandAddress + 0x4);
 		return true;
 
-    // ===============================================================================================
-    // unsupported functions 
-    // ===============================================================================================
-     case IOCTL_ES_DIGETTICKETVIEW: // (Input: none, Output: 216 bytes) bug crediar :D
-        WARN_LOG(WII_IPC_ES, "IOCTL_ES_DIGETTICKETVIEW: this looks really wrong...");
-        break;
+	// ===============================================================================================
+	// unsupported functions 
+	// ===============================================================================================
+		case IOCTL_ES_DIGETTICKETVIEW: // (Input: none, Output: 216 bytes) bug crediar :D
+		WARN_LOG(WII_IPC_ES, "IOCTL_ES_DIGETTICKETVIEW: this looks really wrong...");
+		break;
 
-    case IOCTL_ES_GETDEVICECERT: // (Input: none, Output: 384 bytes)
-        WARN_LOG(WII_IPC_ES, "IOCTL_ES_GETDEVICECERT: this looks really wrong...");
-        break;
+	case IOCTL_ES_GETDEVICECERT: // (Input: none, Output: 384 bytes)
+		WARN_LOG(WII_IPC_ES, "IOCTL_ES_GETDEVICECERT: this looks really wrong...");
+		break;
 
-    default:
-        WARN_LOG(WII_IPC_ES, "CWII_IPC_HLE_Device_es: 0x%x", Buffer.Parameter);
+	default:
+		WARN_LOG(WII_IPC_ES, "CWII_IPC_HLE_Device_es: 0x%x", Buffer.Parameter);
 
 		DumpCommands(_CommandAddress, 8, LogTypes::WII_IPC_ES);
-        INFO_LOG(WII_IPC_ES, "command.Parameter: 0x%08x", Buffer.Parameter);
-        break;
-    }
+		INFO_LOG(WII_IPC_ES, "command.Parameter: 0x%08x", Buffer.Parameter);
+		break;
+	}
 
-    // Write return value (0 means OK)
-    Memory::Write_U32(0, _CommandAddress + 0x4);
+	// Write return value (0 means OK)
+	Memory::Write_U32(0, _CommandAddress + 0x4);
 
-    return true;
+	return true;
 }
 
 const DiscIO::INANDContentLoader& CWII_IPC_HLE_Device_es::AccessContentDevice(u64 _TitleID)
 {
-    if (m_pContentLoader->IsValid() && m_pContentLoader->GetTitleID() == _TitleID)
-        return* m_pContentLoader;
-    
-    CTitleToContentMap::iterator itr = m_NANDContent.find(_TitleID);
-    if (itr != m_NANDContent.end())
-        return *itr->second;
+	if (m_pContentLoader->IsValid() && m_pContentLoader->GetTitleID() == _TitleID)
+		return* m_pContentLoader;
 
-    m_NANDContent[_TitleID] = &DiscIO::CNANDContentManager::Access().GetNANDLoader(_TitleID);
+	CTitleToContentMap::iterator itr = m_NANDContent.find(_TitleID);
+	if (itr != m_NANDContent.end())
+		return *itr->second;
 
-    _dbg_assert_msg_(WII_IPC_ES, ((u32)(_TitleID >> 32) == 0x00010000) || m_NANDContent[_TitleID]->IsValid(), "NandContent not valid for TitleID %08x/%08x", (u32)(_TitleID >> 32), (u32)_TitleID);
-    return *m_NANDContent[_TitleID];
+	m_NANDContent[_TitleID] = &DiscIO::CNANDContentManager::Access().GetNANDLoader(_TitleID);
+
+	_dbg_assert_msg_(WII_IPC_ES, ((u32)(_TitleID >> 32) == 0x00010000) || m_NANDContent[_TitleID]->IsValid(), "NandContent not valid for TitleID %08x/%08x", (u32)(_TitleID >> 32), (u32)_TitleID);
+	return *m_NANDContent[_TitleID];
 }
 
 bool CWII_IPC_HLE_Device_es::IsValid(u64 _TitleID) const
 {
-    if (m_pContentLoader->IsValid() && m_pContentLoader->GetTitleID() == _TitleID)
-        return true;
+	if (m_pContentLoader->IsValid() && m_pContentLoader->GetTitleID() == _TitleID)
+		return true;
 
-    return false;
+	return false;
 }
 
 
@@ -933,7 +933,7 @@ u32 CWII_IPC_HLE_Device_es::ES_DIVerify(u8* _pTMD, u32 _sz)
 					File::DeleteDirRecursively(savePath.c_str());
 				#endif
 			}
-		}		
+		}
 	}
 	else if (File::Exists((savePath + "../backup/").c_str()))
 	{
@@ -952,7 +952,7 @@ u32 CWII_IPC_HLE_Device_es::ES_DIVerify(u8* _pTMD, u32 _sz)
 	{
 		File::IOFile _pTMDFile(tmdPath, "wb");
 		if (!_pTMDFile.WriteBytes(_pTMD, _sz))
-			ERROR_LOG(WII_IPC_ES, "DIVerify failed to write disc tmd to nand");
+			ERROR_LOG(WII_IPC_ES, "DIVerify failed to write disc TMD to NAND.");
 	}
 	DiscIO::cUIDsys::AccessInstance().AddTitle(tmdTitleID);
 	return 0;
diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.h b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.h
index 58393a07a5..d6603f0b9d 100644
--- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.h
+++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _WII_IPC_HLE_DEVICE_ES_H_
 #define _WII_IPC_HLE_DEVICE_ES_H_
@@ -26,123 +13,123 @@ class CWII_IPC_HLE_Device_es : public IWII_IPC_HLE_Device
 {
 public:
 
-    CWII_IPC_HLE_Device_es(u32 _DeviceID, const std::string& _rDeviceName);    
+	CWII_IPC_HLE_Device_es(u32 _DeviceID, const std::string& _rDeviceName);
 
-    virtual ~CWII_IPC_HLE_Device_es();
+	virtual ~CWII_IPC_HLE_Device_es();
 
-    void LoadWAD(const std::string& _rContentFile);
+	void LoadWAD(const std::string& _rContentFile);
 
-    virtual bool Open(u32 _CommandAddress, u32 _Mode);
+	virtual bool Open(u32 _CommandAddress, u32 _Mode);
 
-    virtual bool Close(u32 _CommandAddress, bool _bForce);
+	virtual bool Close(u32 _CommandAddress, bool _bForce);
 
-    virtual bool IOCtlV(u32 _CommandAddress);
+	virtual bool IOCtlV(u32 _CommandAddress);
 	static u32 ES_DIVerify(u8 *_pTMD, u32 _sz);
-	
+
 	// This should only be cleared on power reset
 	static std::string m_ContentFile;
 private:
 
-    enum
-    {
-        IOCTL_ES_ADDTICKET				= 0x01,
-        IOCTL_ES_ADDTITLESTART			= 0x02,
-        IOCTL_ES_ADDCONTENTSTART		= 0x03,
-        IOCTL_ES_ADDCONTENTDATA		    = 0x04,
-        IOCTL_ES_ADDCONTENTFINISH		= 0x05,
-        IOCTL_ES_ADDTITLEFINISH		    = 0x06,
-        IOCTL_ES_GETDEVICEID			= 0x07,
-        IOCTL_ES_LAUNCH				    = 0x08,
-        IOCTL_ES_OPENCONTENT			= 0x09,
-        IOCTL_ES_READCONTENT			= 0x0A,
-        IOCTL_ES_CLOSECONTENT			= 0x0B,
-        IOCTL_ES_GETOWNEDTITLECNT		= 0x0C,
-        IOCTL_ES_GETOWNEDTITLES		    = 0x0D,
-        IOCTL_ES_GETTITLECNT			= 0x0E,
-        IOCTL_ES_GETTITLES				= 0x0F,
-        IOCTL_ES_GETTITLECONTENTSCNT	= 0x10,
-        IOCTL_ES_GETTITLECONTENTS		= 0x11,
-        IOCTL_ES_GETVIEWCNT			    = 0x12,
-        IOCTL_ES_GETVIEWS				= 0x13,
-        IOCTL_ES_GETTMDVIEWCNT			= 0x14,
-        IOCTL_ES_GETTMDVIEWS			= 0x15,
-        IOCTL_ES_GETCONSUMPTION		    = 0x16,
-        IOCTL_ES_DELETETITLE			= 0x17,
-        IOCTL_ES_DELETETICKET			= 0x18,
-        // IOCTL_ES_DIGETTMDVIEWSIZE	= 0x19,
-        // IOCTL_ES_DIGETTMDVIEW		= 0x1A,
-        IOCTL_ES_DIGETTICKETVIEW		= 0x1B,
-        IOCTL_ES_DIVERIFY				= 0x1C,
-        IOCTL_ES_GETTITLEDIR			= 0x1D,
-        IOCTL_ES_GETDEVICECERT			= 0x1E,
-        IOCTL_ES_IMPORTBOOT			    = 0x1F,
-        IOCTL_ES_GETTITLEID			    = 0x20,
-        IOCTL_ES_SETUID				    = 0x21,
-        IOCTL_ES_DELETETITLECONTENT	    = 0x22,
-        IOCTL_ES_SEEKCONTENT			= 0x23,
-        IOCTL_ES_OPENTITLECONTENT		= 0x24,
-        // IOCTL_ES_LAUNCHBC			= 0x25,
-        // IOCTL_ES_EXPORTTITLEINIT		= 0x26,
-        // IOCTL_ES_EXPORTCONTENTBEGIN	= 0x27,
-        // IOCTL_ES_EXPORTCONTENTDATA	= 0x28,
-        // IOCTL_ES_EXPORTCONTENTEND	= 0x29,
-        // IOCTL_ES_EXPORTTITLEDONE		= 0x2A,
-        IOCTL_ES_ADDTMD				    = 0x2B,
-        IOCTL_ES_ENCRYPT			    = 0x2C,
-        IOCTL_ES_DECRYPT				= 0x2D,
-        IOCTL_ES_GETBOOT2VERSION		= 0x2E,
-        IOCTL_ES_ADDTITLECANCEL		    = 0x2F,
-        IOCTL_ES_SIGN					= 0x30,
-        // IOCTL_ES_VERIFYSIGN			= 0x31,
-        IOCTL_ES_GETSTOREDCONTENTCNT	= 0x32,
-        IOCTL_ES_GETSTOREDCONTENTS		= 0x33,
-        IOCTL_ES_GETSTOREDTMDSIZE		= 0x34,
-        IOCTL_ES_GETSTOREDTMD			= 0x35,
-        IOCTL_ES_GETSHAREDCONTENTCNT	= 0x36,
-        IOCTL_ES_GETSHAREDCONTENTS		= 0x37,
+	enum
+	{
+		IOCTL_ES_ADDTICKET				= 0x01,
+		IOCTL_ES_ADDTITLESTART			= 0x02,
+		IOCTL_ES_ADDCONTENTSTART		= 0x03,
+		IOCTL_ES_ADDCONTENTDATA			= 0x04,
+		IOCTL_ES_ADDCONTENTFINISH		= 0x05,
+		IOCTL_ES_ADDTITLEFINISH			= 0x06,
+		IOCTL_ES_GETDEVICEID			= 0x07,
+		IOCTL_ES_LAUNCH					= 0x08,
+		IOCTL_ES_OPENCONTENT			= 0x09,
+		IOCTL_ES_READCONTENT			= 0x0A,
+		IOCTL_ES_CLOSECONTENT			= 0x0B,
+		IOCTL_ES_GETOWNEDTITLECNT		= 0x0C,
+		IOCTL_ES_GETOWNEDTITLES			= 0x0D,
+		IOCTL_ES_GETTITLECNT			= 0x0E,
+		IOCTL_ES_GETTITLES				= 0x0F,
+		IOCTL_ES_GETTITLECONTENTSCNT	= 0x10,
+		IOCTL_ES_GETTITLECONTENTS		= 0x11,
+		IOCTL_ES_GETVIEWCNT				= 0x12,
+		IOCTL_ES_GETVIEWS				= 0x13,
+		IOCTL_ES_GETTMDVIEWCNT			= 0x14,
+		IOCTL_ES_GETTMDVIEWS			= 0x15,
+		IOCTL_ES_GETCONSUMPTION			= 0x16,
+		IOCTL_ES_DELETETITLE			= 0x17,
+		IOCTL_ES_DELETETICKET			= 0x18,
+		// IOCTL_ES_DIGETTMDVIEWSIZE	= 0x19,
+		// IOCTL_ES_DIGETTMDVIEW		= 0x1A,
+		IOCTL_ES_DIGETTICKETVIEW		= 0x1B,
+		IOCTL_ES_DIVERIFY				= 0x1C,
+		IOCTL_ES_GETTITLEDIR			= 0x1D,
+		IOCTL_ES_GETDEVICECERT			= 0x1E,
+		IOCTL_ES_IMPORTBOOT				= 0x1F,
+		IOCTL_ES_GETTITLEID				= 0x20,
+		IOCTL_ES_SETUID					= 0x21,
+		IOCTL_ES_DELETETITLECONTENT		= 0x22,
+		IOCTL_ES_SEEKCONTENT			= 0x23,
+		IOCTL_ES_OPENTITLECONTENT		= 0x24,
+		// IOCTL_ES_LAUNCHBC			= 0x25,
+		// IOCTL_ES_EXPORTTITLEINIT		= 0x26,
+		// IOCTL_ES_EXPORTCONTENTBEGIN	= 0x27,
+		// IOCTL_ES_EXPORTCONTENTDATA	= 0x28,
+		// IOCTL_ES_EXPORTCONTENTEND	= 0x29,
+		// IOCTL_ES_EXPORTTITLEDONE		= 0x2A,
+		IOCTL_ES_ADDTMD					= 0x2B,
+		IOCTL_ES_ENCRYPT				= 0x2C,
+		IOCTL_ES_DECRYPT				= 0x2D,
+		IOCTL_ES_GETBOOT2VERSION		= 0x2E,
+		IOCTL_ES_ADDTITLECANCEL			= 0x2F,
+		IOCTL_ES_SIGN					= 0x30,
+		// IOCTL_ES_VERIFYSIGN			= 0x31,
+		IOCTL_ES_GETSTOREDCONTENTCNT	= 0x32,
+		IOCTL_ES_GETSTOREDCONTENTS		= 0x33,
+		IOCTL_ES_GETSTOREDTMDSIZE		= 0x34,
+		IOCTL_ES_GETSTOREDTMD			= 0x35,
+		IOCTL_ES_GETSHAREDCONTENTCNT	= 0x36,
+		IOCTL_ES_GETSHAREDCONTENTS		= 0x37,
 		IOCTL_ES_DELETESHAREDCONTENT	= 0x38,
 		IOCTL_ES_CHECKKOREAREGION		= 0x45,
-    };
+	};
 
-    enum EErrorCodes
-    {
-       ES_INVALID_TMD                       = -106,   // or access denied
-       ES_READ_LESS_DATA_THAN_EXPECTED      = -1009, 
-       ES_UNK_1                             = -1010,
-       ES_PARAMTER_SIZE_OR_ALIGNMENT        = -1017,
-       ES_HASH_DOESNT_MATCH                 = -1022,
-       ES_MEM_ALLOC_FAILED                  = -1024,
-       ES_INCORRECT_ACCESS_RIGHT            = -1026,
-       ES_NO_TICKET_INSTALLED               = -1028,
-       ES_INSTALLED_TICKET_INVALID          = -1029,
-       ES_INVALID_PARAMETR                  = -2008,
-       ES_SIGNATURE_CHECK_FAILED            = -2011,
-       ES_HASH_SIZE_WRONG                   = -2014, // HASH !=20
-    };
+	enum EErrorCodes
+	{
+		ES_INVALID_TMD						= -106,   // or access denied
+		ES_READ_LESS_DATA_THAN_EXPECTED		= -1009, 
+		ES_UNK_1							= -1010,
+		ES_PARAMTER_SIZE_OR_ALIGNMENT		= -1017,
+		ES_HASH_DOESNT_MATCH				= -1022,
+		ES_MEM_ALLOC_FAILED					= -1024,
+		ES_INCORRECT_ACCESS_RIGHT			= -1026,
+		ES_NO_TICKET_INSTALLED				= -1028,
+		ES_INSTALLED_TICKET_INVALID			= -1029,
+		ES_INVALID_PARAMETR					= -2008,
+		ES_SIGNATURE_CHECK_FAILED			= -2011,
+		ES_HASH_SIZE_WRONG					= -2014, // HASH !=20
+	};
 
-    struct SContentAccess 
-    {
-        u32 m_Position;
-        const DiscIO::SNANDContent* m_pContent;
-    };
+	struct SContentAccess 
+	{
+		u32 m_Position;
+		const DiscIO::SNANDContent* m_pContent;
+	};
 
-    typedef std::map<u32, SContentAccess> CContentAccessMap;
-    CContentAccessMap m_ContentAccessMap;
+	typedef std::map<u32, SContentAccess> CContentAccessMap;
+	CContentAccessMap m_ContentAccessMap;
 
-    typedef std::map<u64, const DiscIO::INANDContentLoader*> CTitleToContentMap;
-    CTitleToContentMap m_NANDContent;
+	typedef std::map<u64, const DiscIO::INANDContentLoader*> CTitleToContentMap;
+	CTitleToContentMap m_NANDContent;
 
-    const DiscIO::INANDContentLoader* m_pContentLoader;
+	const DiscIO::INANDContentLoader* m_pContentLoader;
 
-    std::vector<u64> m_TitleIDs;
-    u64 m_TitleID;
-    u32 AccessIdentID;
+	std::vector<u64> m_TitleIDs;
+	u64 m_TitleID;
+	u32 AccessIdentID;
 
-    u64 GetCurrentTitleID() const;
+	u64 GetCurrentTitleID() const;
 
-    const DiscIO::INANDContentLoader& AccessContentDevice(u64 _TitleID);
+	const DiscIO::INANDContentLoader& AccessContentDevice(u64 _TitleID);
 
-    bool IsValid(u64 _TitleID) const;
+	bool IsValid(u64 _TitleID) const;
 };
 
 #endif
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 5424542a73..2e90d77740 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
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "Common.h"
 #include "CommonPaths.h"
@@ -49,8 +36,8 @@ bool CWII_IPC_HLE_Device_fs::Open(u32 _CommandAddress, u32 _Mode)
 	// clear tmp folder
 	{
 		std::string Path = File::GetUserPath(D_WIIUSER_IDX) + "tmp";
-	    File::DeleteDirRecursively(Path);
-	    File::CreateDir(Path.c_str());
+		File::DeleteDirRecursively(Path);
+		File::CreateDir(Path.c_str());
 	}
 
 	Memory::Write_U32(GetDeviceID(), _CommandAddress+4);
@@ -136,7 +123,7 @@ bool CWII_IPC_HLE_Device_fs::IOCtlV(u32 _CommandAddress)
 			if ((CommandBuffer.InBuffer.size() == 1) && (CommandBuffer.PayloadBuffer.size() == 1))
 			{
 				size_t numFile = FileSearch.GetFileNames().size();
-				INFO_LOG(WII_IPC_FILEIO, "\t%lu Files found", (unsigned long)numFile);
+				INFO_LOG(WII_IPC_FILEIO, "\t%lu files found", (unsigned long)numFile);
 
 				Memory::Write_U32((u32)numFile, CommandBuffer.PayloadBuffer[0].m_Address);
 			}
@@ -227,7 +214,7 @@ bool CWII_IPC_HLE_Device_fs::IOCtlV(u32 _CommandAddress)
 				fsBlocks = 0;
 				iNodes = 0;
 				ReturnValue = FS_RESULT_OK;
-				WARN_LOG(WII_IPC_FILEIO, "FS: fsBlock failed, cannot find directoy: %s", path.c_str());
+				WARN_LOG(WII_IPC_FILEIO, "FS: fsBlock failed, cannot find directory: %s", path.c_str());
 			}
 
 			Memory::Write_U32(fsBlocks, CommandBuffer.PayloadBuffer[0].m_Address);
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 17a574da64..6a93c9f2f2 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
@@ -1,19 +1,7 @@
-// Copyright (C) 2003 Dolphin Project.
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
-// 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 _WII_IPC_HLE_DEVICE_FS_H_
 #define _WII_IPC_HLE_DEVICE_FS_H_
 
@@ -45,7 +33,7 @@ class CWII_IPC_HLE_Device_fs : public IWII_IPC_HLE_Device
 {
 public:
 
-    CWII_IPC_HLE_Device_fs(u32 _DeviceID, const std::string& _rDeviceName);
+	CWII_IPC_HLE_Device_fs(u32 _DeviceID, const std::string& _rDeviceName);
 	virtual ~CWII_IPC_HLE_Device_fs();
 
 	virtual void DoState(PointerWrap& p);
@@ -60,7 +48,7 @@ public:
 
 private:
 
-	enum 
+	enum
 	{
 		IOCTL_GET_STATS		= 0x02,
 		IOCTL_CREATE_DIR	= 0x03,
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 0ac752e867..47bb9e7e52 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
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 
 /*
@@ -409,26 +396,34 @@ bool CWII_IPC_HLE_Device_net_ip_top::IOCtl(u32 _CommandAddress)
 
 	return true;
 }
-struct bind_params {
+struct bind_params
+{
 	u32 socket;
 	u32 has_name;
 	u8 name[28];
 };
-struct GC_sockaddr {
+
+struct GC_sockaddr
+{
 	u8 sa_len;
 	u8 sa_family;
 	s8 sa_data[14];
 };
-struct GC_in_addr {
+
+struct GC_in_addr
+{
 	u32 s_addr_;    // this cannot be named s_addr under windows - collides with some crazy define.
 };
-struct GC_sockaddr_in {
+
+struct GC_sockaddr_in
+{
 	u8 sin_len;
 	u8 sin_family;
 	u16 sin_port;
 	struct GC_in_addr sin_addr;
 	s8 sin_zero[8];
 };
+
 u32 CWII_IPC_HLE_Device_net_ip_top::ExecuteCommand(u32 _Command, u32 _BufferIn, u32 BufferInSize, u32 BufferOut, u32 BufferOutSize)
 {
 	// Clean the location of the output buffer to zeros as a safety precaution */
diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net.h b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net.h
index 29769e5b85..1769e6e16f 100644
--- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net.h
+++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _WII_IPC_HLE_DEVICE_NET_H_
 #define _WII_IPC_HLE_DEVICE_NET_H_
@@ -121,31 +108,31 @@ public:
 	virtual bool IOCtl(u32 _CommandAddress);
 
 private:
-    enum
-    {
-        IOCTL_NWC24_SUSPEND_SCHEDULAR               = 0x01,
-        IOCTL_NWC24_EXEC_TRY_SUSPEND_SCHEDULAR      = 0x02,
-        IOCTL_NWC24_UNK_3                           = 0x03,
-        IOCTL_NWC24_UNK_4                           = 0x04,
-        IOCTL_NWC24_UNK_5                           = 0x05,
-        IOCTL_NWC24_STARTUP_SOCKET                  = 0x06,
-        IOCTL_NWC24_CLEANUP_SOCKET                  = 0x07,
-        IOCTL_NWC24_LOCK_SOCKET                     = 0x08,
-        IOCTL_NWC24_UNLOCK_SOCKET                   = 0x09,
-        IOCTL_NWC24_UNK_A                           = 0x0A,
-        IOCTL_NWC24_UNK_B                           = 0x0B,
-        IOCTL_NWC24_UNK_C                           = 0x0C,
-        IOCTL_NWC24_SAVE_MAIL_NOW                   = 0x0D,
-        IOCTL_NWC24_DOWNLOAD_NOW_EX                 = 0x0E,
-        IOCTL_NWC24_REQUEST_GENERATED_USER_ID       = 0x0F,
-        IOCTL_NWC24_REQUEST_REGISTER_USER_ID        = 0x10,
-        IOCTL_NWC24_GET_SCHEDULAR_STAT              = 0x1E,
-        IOCTL_NWC24_UNK_1F                          = 0x1F,
-        IOCTL_NWC24_UNK_20                          = 0x20,
-        IOCTL_NWC24_UNK_21                          = 0x21,
-        IOCTL_NWC24_SET_SCRIPT_MODE                 = 0x22,
-        IOCTL_NWC24_REQUEST_SHUTDOWN                = 0x28,
-    };
+	enum
+	{
+		IOCTL_NWC24_SUSPEND_SCHEDULAR               = 0x01,
+		IOCTL_NWC24_EXEC_TRY_SUSPEND_SCHEDULAR      = 0x02,
+		IOCTL_NWC24_UNK_3                           = 0x03,
+		IOCTL_NWC24_UNK_4                           = 0x04,
+		IOCTL_NWC24_UNK_5                           = 0x05,
+		IOCTL_NWC24_STARTUP_SOCKET                  = 0x06,
+		IOCTL_NWC24_CLEANUP_SOCKET                  = 0x07,
+		IOCTL_NWC24_LOCK_SOCKET                     = 0x08,
+		IOCTL_NWC24_UNLOCK_SOCKET                   = 0x09,
+		IOCTL_NWC24_UNK_A                           = 0x0A,
+		IOCTL_NWC24_UNK_B                           = 0x0B,
+		IOCTL_NWC24_UNK_C                           = 0x0C,
+		IOCTL_NWC24_SAVE_MAIL_NOW                   = 0x0D,
+		IOCTL_NWC24_DOWNLOAD_NOW_EX                 = 0x0E,
+		IOCTL_NWC24_REQUEST_GENERATED_USER_ID       = 0x0F,
+		IOCTL_NWC24_REQUEST_REGISTER_USER_ID        = 0x10,
+		IOCTL_NWC24_GET_SCHEDULAR_STAT              = 0x1E,
+		IOCTL_NWC24_UNK_1F                          = 0x1F,
+		IOCTL_NWC24_UNK_20                          = 0x20,
+		IOCTL_NWC24_UNK_21                          = 0x21,
+		IOCTL_NWC24_SET_SCRIPT_MODE                 = 0x22,
+		IOCTL_NWC24_REQUEST_SHUTDOWN                = 0x28,
+	};
 
 	// Max size 32 Bytes
 	std::string m_UserID;
@@ -164,14 +151,14 @@ public:
 
 	virtual bool Open(u32 _CommandAddress, u32 _Mode)
 	{
-        INFO_LOG(WII_IPC_NET, "NET_KD_TIME: Open");
+		INFO_LOG(WII_IPC_NET, "NET_KD_TIME: Open");
 		Memory::Write_U32(GetDeviceID(), _CommandAddress+4);
 		return true;
 	}
 
 	virtual bool Close(u32 _CommandAddress, bool _bForce)
 	{
-        INFO_LOG(WII_IPC_NET, "NET_KD_TIME: Close");
+		INFO_LOG(WII_IPC_NET, "NET_KD_TIME: Close");
 		if (!_bForce)
 			Memory::Write_U32(0, _CommandAddress + 4);
 		return true;
@@ -179,45 +166,45 @@ public:
 
 	virtual bool IOCtl(u32 _CommandAddress) 
 	{
-        u32 Parameter		= Memory::Read_U32(_CommandAddress + 0x0C);
-        u32 BufferIn		= Memory::Read_U32(_CommandAddress + 0x10);
-        u32 BufferInSize	= Memory::Read_U32(_CommandAddress + 0x14);
-        u32 BufferOut		= Memory::Read_U32(_CommandAddress + 0x18);
-        u32 BufferOutSize	= Memory::Read_U32(_CommandAddress + 0x1C);		
+		u32 Parameter		= Memory::Read_U32(_CommandAddress + 0x0C);
+		u32 BufferIn		= Memory::Read_U32(_CommandAddress + 0x10);
+		u32 BufferInSize	= Memory::Read_U32(_CommandAddress + 0x14);
+		u32 BufferOut		= Memory::Read_U32(_CommandAddress + 0x18);
+		u32 BufferOutSize	= Memory::Read_U32(_CommandAddress + 0x1C);		
 
-        switch (Parameter)
-        {
-        case IOCTL_NW24_SET_RTC_COUNTER: // NWC24iSetRtcCounter (but prolly just the first 4 bytes are intresting...)
-            _dbg_assert_msg_(WII_IPC_NET, BufferInSize==0x20, "NET_KD_TIME: Set RTC Counter BufferIn to small");
-            _dbg_assert_msg_(WII_IPC_NET, BufferOutSize==0x20, "NET_KD_TIME: Set RTC Counter BufferOut to small");            
+		switch (Parameter)
+		{
+		case IOCTL_NW24_SET_RTC_COUNTER: // NWC24iSetRtcCounter (but prolly just the first 4 bytes are intresting...)
+			_dbg_assert_msg_(WII_IPC_NET, BufferInSize==0x20, "NET_KD_TIME: Set RTC Counter BufferIn to small");
+			_dbg_assert_msg_(WII_IPC_NET, BufferOutSize==0x20, "NET_KD_TIME: Set RTC Counter BufferOut to small");
 
-            for (int i=0; i<0x20; i++)
-            {
-                m_RtcCounter[i] = Memory::Read_U8(BufferIn+i);
-            }
-            
-            // send back for sync?? at least there is a out buffer...
-            for (int i=0; i<0x20; i++)
-            {
-                Memory::Write_U8(m_RtcCounter[i], BufferOut+i);
-            }
+			for (int i=0; i<0x20; i++)
+			{
+				m_RtcCounter[i] = Memory::Read_U8(BufferIn+i);
+			}
 
-            INFO_LOG(WII_IPC_NET, "NET_KD_TIME: Set RTC Counter");
+			// send back for sync?? at least there is a out buffer...
+			for (int i=0; i<0x20; i++)
+			{
+				Memory::Write_U8(m_RtcCounter[i], BufferOut+i);
+			}
 
-            Memory::Write_U32(0, _CommandAddress + 0x4);
-            return true;
+			INFO_LOG(WII_IPC_NET, "NET_KD_TIME: Set RTC Counter");
+
+			Memory::Write_U32(0, _CommandAddress + 0x4);
+			return true;
 
 		case IOCTL_NW24_GET_TIME_DIFF: // Input: none, Output: 32
-        default:
-            ERROR_LOG(WII_IPC_NET, "%s - IOCtl:\n"
-                "    Parameter: 0x%x   (0x17 NWC24iSetRtcCounter) \n"
-                "    BufferIn: 0x%08x\n"
-                "    BufferInSize: 0x%08x\n"
-                "    BufferOut: 0x%08x\n"
-                "    BufferOutSize: 0x%08x\n",
-                GetDeviceName().c_str(), Parameter, BufferIn, BufferInSize, BufferOut, BufferOutSize);
-            break;
-        }
+		default:
+			ERROR_LOG(WII_IPC_NET, "%s - IOCtl:\n"
+				"    Parameter: 0x%x   (0x17 NWC24iSetRtcCounter) \n"
+				"    BufferIn: 0x%08x\n"
+				"    BufferInSize: 0x%08x\n"
+				"    BufferOut: 0x%08x\n"
+				"    BufferOutSize: 0x%08x\n",
+				GetDeviceName().c_str(), Parameter, BufferIn, BufferInSize, BufferOut, BufferOutSize);
+			break;
+		}
 
 		// write return value
 		Memory::Write_U32(0, _CommandAddress + 0x4);
@@ -225,13 +212,13 @@ public:
 	}
 
 private:
-    enum
-    {
-        IOCTL_NW24_SET_RTC_COUNTER      = 0x17,
-        IOCTL_NW24_GET_TIME_DIFF        = 0x18,
-    };
+	enum
+	{
+		IOCTL_NW24_SET_RTC_COUNTER      = 0x17,
+		IOCTL_NW24_GET_TIME_DIFF        = 0x18,
+	};
 
-    u8 m_RtcCounter[0x20];
+	u8 m_RtcCounter[0x20];
 };
 
 // **********************************************************************************
@@ -248,43 +235,44 @@ public:
 	virtual bool IOCtlV(u32 _CommandAddress);
 	
 private:
-    enum {
-        IOCTL_SO_ACCEPT = 1,
-        IOCTL_SO_BIND,
-        IOCTL_SO_CLOSE,
-        IOCTL_SO_CONNECT,
-        IOCTL_SO_FCNTL,
-        IOCTL_SO_GETPEERNAME,
-        IOCTL_SO_GETSOCKNAME,
-        IOCTL_SO_GETSOCKOPT,
-        IOCTL_SO_SETSOCKOPT,  
-        IOCTL_SO_LISTEN,
-        IOCTL_SO_POLL,
-        IOCTLV_SO_RECVFROM,
-        IOCTLV_SO_SENDTO,
-        IOCTL_SO_SHUTDOWN,
-        IOCTL_SO_SOCKET,
-        IOCTL_SO_GETHOSTID,
-        IOCTL_SO_GETHOSTBYNAME,
-        IOCTL_SO_GETHOSTBYADDR,
-        IOCTLV_SO_GETNAMEINFO,
-        IOCTL_SO_UNK14,
-        IOCTL_SO_INETATON,
-        IOCTL_SO_INETPTON,
-        IOCTL_SO_INETNTOP,
-        IOCTLV_SO_GETADDRINFO,
-        IOCTL_SO_SOCKATMARK,
-        IOCTLV_SO_UNK1A,
-        IOCTLV_SO_UNK1B,
-        IOCTLV_SO_GETINTERFACEOPT,
-        IOCTLV_SO_SETINTERFACEOPT,
-        IOCTL_SO_SETINTERFACE,
-        IOCTL_SO_STARTUP,
-        IOCTL_SO_ICMPSOCKET = 0x30,
-        IOCTLV_SO_ICMPPING,
-        IOCTL_SO_ICMPCANCEL,
-        IOCTL_SO_ICMPCLOSE
-    };
+	enum
+	{
+		IOCTL_SO_ACCEPT = 1,
+		IOCTL_SO_BIND,
+		IOCTL_SO_CLOSE,
+		IOCTL_SO_CONNECT,
+		IOCTL_SO_FCNTL,
+		IOCTL_SO_GETPEERNAME,
+		IOCTL_SO_GETSOCKNAME,
+		IOCTL_SO_GETSOCKOPT,
+		IOCTL_SO_SETSOCKOPT,  
+		IOCTL_SO_LISTEN,
+		IOCTL_SO_POLL,
+		IOCTLV_SO_RECVFROM,
+		IOCTLV_SO_SENDTO,
+		IOCTL_SO_SHUTDOWN,
+		IOCTL_SO_SOCKET,
+		IOCTL_SO_GETHOSTID,
+		IOCTL_SO_GETHOSTBYNAME,
+		IOCTL_SO_GETHOSTBYADDR,
+		IOCTLV_SO_GETNAMEINFO,
+		IOCTL_SO_UNK14,
+		IOCTL_SO_INETATON,
+		IOCTL_SO_INETPTON,
+		IOCTL_SO_INETNTOP,
+		IOCTLV_SO_GETADDRINFO,
+		IOCTL_SO_SOCKATMARK,
+		IOCTLV_SO_UNK1A,
+		IOCTLV_SO_UNK1B,
+		IOCTLV_SO_GETINTERFACEOPT,
+		IOCTLV_SO_SETINTERFACEOPT,
+		IOCTL_SO_SETINTERFACE,
+		IOCTL_SO_STARTUP,
+		IOCTL_SO_ICMPSOCKET = 0x30,
+		IOCTLV_SO_ICMPPING,
+		IOCTL_SO_ICMPCANCEL,
+		IOCTL_SO_ICMPCLOSE
+	};
 
 	u32 ExecuteCommand(u32 _Parameter, u32 _BufferIn, u32 _BufferInSize, u32 _BufferOut, u32 _BufferOutSize);
 };
diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.cpp
index 891a4cc61f..68b38633ac 100644
--- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.cpp
+++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "Common.h"
 #include "../ConfigManager.h"
@@ -158,7 +145,7 @@ bool CWII_IPC_HLE_Device_sdio_slot0::IOCtl(u32 _CommandAddress)
 		break;
 
 	case IOCTL_SENDCMD:
-		INFO_LOG(WII_IPC_SD, "IOCTL_SENDCMD %x ipc:%08x",
+		INFO_LOG(WII_IPC_SD, "IOCTL_SENDCMD %x IPC:%08x",
 			Memory::Read_U32(BufferIn), _CommandAddress);
 		ReturnValue = ExecuteCommand(BufferIn, BufferInSize, 0, 0, BufferOut, BufferOutSize);
 		break;
@@ -242,7 +229,7 @@ bool CWII_IPC_HLE_Device_sdio_slot0::IOCtlV(u32 _CommandAddress)
 		break;
 
 	default:
-		ERROR_LOG(WII_IPC_SD, "unknown SD IOCtlV command 0x%08x", CommandBuffer.Parameter);
+		ERROR_LOG(WII_IPC_SD, "Unknown SD IOCtlV command 0x%08x", CommandBuffer.Parameter);
 		break;
 	}
 
@@ -376,7 +363,7 @@ u32 CWII_IPC_HLE_Device_sdio_slot0::ExecuteCommand(u32 _BufferIn, u32 _BufferInS
 				{
 					Memory::Write_U8((u8)buffer[i], req.addr++);
 				}
-				DEBUG_LOG(WII_IPC_SD, "outbuffer size %i got %i", _rwBufferSize, i);
+				DEBUG_LOG(WII_IPC_SD, "Outbuffer size %i got %i", _rwBufferSize, i);
 			}
 			else
 			{
diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.h b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.h
index c9ef463576..74ffe13410 100644
--- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.h
+++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 // PRELIMINARY - seems to fully work with libogc, writing has yet to be tested
 
@@ -28,8 +15,8 @@ public:
 
 	CWII_IPC_HLE_Device_sdio_slot0(u32 _DeviceID, const std::string& _rDeviceName);
 
-    bool Open(u32 _CommandAddress, u32 _Mode);
-    bool Close(u32 _CommandAddress, bool _bForce);
+	bool Open(u32 _CommandAddress, u32 _Mode);
+	bool Close(u32 _CommandAddress, bool _bForce);
 	bool IOCtl(u32 _CommandAddress); 
 	bool IOCtlV(u32 _CommandAddress);
 
diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_stm.h b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_stm.h
index e28a9d92d5..d4b26bcac2 100644
--- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_stm.h
+++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_stm.h
@@ -1,19 +1,7 @@
-// Copyright (C) 2003 Dolphin Project.
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
-// 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 _WII_IPC_HLE_DEVICE_STM_H_
 #define _WII_IPC_HLE_DEVICE_STM_H_
 
@@ -21,20 +9,20 @@
 
 enum
 {
-    IOCTL_STM_EVENTHOOK			= 0x1000,
-    IOCTL_STM_GET_IDLEMODE		= 0x3001,
-    IOCTL_STM_RELEASE_EH		= 0x3002,
-    IOCTL_STM_HOTRESET			= 0x2001,
-    IOCTL_STM_HOTRESET_FOR_PD	= 0x2002,
-    IOCTL_STM_SHUTDOWN			= 0x2003,
-    IOCTL_STM_IDLE				= 0x2004,
-    IOCTL_STM_WAKEUP			= 0x2005,
-    IOCTL_STM_VIDIMMING			= 0x5001,
-    IOCTL_STM_LEDFLASH			= 0x6001,
-    IOCTL_STM_LEDMODE			= 0x6002,
-    IOCTL_STM_READVER			= 0x7001,
-    IOCTL_STM_READDDRREG		= 0x4001,
-    IOCTL_STM_READDDRREG2		= 0x4002,
+	IOCTL_STM_EVENTHOOK			= 0x1000,
+	IOCTL_STM_GET_IDLEMODE		= 0x3001,
+	IOCTL_STM_RELEASE_EH		= 0x3002,
+	IOCTL_STM_HOTRESET			= 0x2001,
+	IOCTL_STM_HOTRESET_FOR_PD	= 0x2002,
+	IOCTL_STM_SHUTDOWN			= 0x2003,
+	IOCTL_STM_IDLE				= 0x2004,
+	IOCTL_STM_WAKEUP			= 0x2005,
+	IOCTL_STM_VIDIMMING			= 0x5001,
+	IOCTL_STM_LEDFLASH			= 0x6001,
+	IOCTL_STM_LEDMODE			= 0x6002,
+	IOCTL_STM_READVER			= 0x7001,
+	IOCTL_STM_READDDRREG		= 0x4001,
+	IOCTL_STM_READDDRREG2		= 0x4002,
 };
 
 // The /dev/stm/immediate
@@ -66,9 +54,9 @@ public:
 		return true;
 	}
 
-    virtual bool IOCtl(u32 _CommandAddress) 
-    {
-        u32 Parameter		= Memory::Read_U32(_CommandAddress + 0x0C);
+	virtual bool IOCtl(u32 _CommandAddress) 
+	{
+		u32 Parameter		= Memory::Read_U32(_CommandAddress + 0x0C);
 		u32 BufferIn		= Memory::Read_U32(_CommandAddress + 0x10);
 		u32 BufferInSize	= Memory::Read_U32(_CommandAddress + 0x14);
 		u32 BufferOut		= Memory::Read_U32(_CommandAddress + 0x18);
@@ -79,8 +67,8 @@ public:
 		Memory::Memset(BufferOut, 0, BufferOutSize);
 		u32 ReturnValue = 0;
 
-        switch(Parameter)
-        {
+		switch(Parameter)
+		{
 		case IOCTL_STM_RELEASE_EH:
 			INFO_LOG(WII_IPC_STM, "%s - IOCtl:", GetDeviceName().c_str());
 			INFO_LOG(WII_IPC_STM, "    IOCTL_STM_RELEASE_EH");
@@ -91,37 +79,37 @@ public:
 			INFO_LOG(WII_IPC_STM, "    IOCTL_STM_HOTRESET");
 			break;
 
-        case IOCTL_STM_VIDIMMING: // (Input: 20 bytes, Output: 20 bytes)
-            INFO_LOG(WII_IPC_STM, "%s - IOCtl:", GetDeviceName().c_str());
-            INFO_LOG(WII_IPC_STM, "    IOCTL_STM_VIDIMMING");
+		case IOCTL_STM_VIDIMMING: // (Input: 20 bytes, Output: 20 bytes)
+			INFO_LOG(WII_IPC_STM, "%s - IOCtl:", GetDeviceName().c_str());
+			INFO_LOG(WII_IPC_STM, "    IOCTL_STM_VIDIMMING");
 			//DumpCommands(BufferIn, BufferInSize / 4, LogTypes::WII_IPC_STM);
 			//Memory::Write_U32(1, BufferOut);
 			//ReturnValue = 1;
-            break;
+			break;
 
-        case IOCTL_STM_LEDMODE:  // (Input: 20 bytes, Output: 20 bytes)
-            INFO_LOG(WII_IPC_STM, "%s - IOCtl:", GetDeviceName().c_str());
-            INFO_LOG(WII_IPC_STM, "    IOCTL_STM_LEDMODE");
-            break;
+		case IOCTL_STM_LEDMODE:  // (Input: 20 bytes, Output: 20 bytes)
+			INFO_LOG(WII_IPC_STM, "%s - IOCtl:", GetDeviceName().c_str());
+			INFO_LOG(WII_IPC_STM, "    IOCTL_STM_LEDMODE");
+			break;
 
-        default:
-            {
-                _dbg_assert_msg_(WII_IPC_STM, 0, "CWII_IPC_HLE_Device_stm_immediate: 0x%x", Parameter);
+		default:
+			{
+				_dbg_assert_msg_(WII_IPC_STM, 0, "CWII_IPC_HLE_Device_stm_immediate: 0x%x", Parameter);
 
-                INFO_LOG(WII_IPC_STM, "%s - IOCtl:", GetDeviceName().c_str());
-                DEBUG_LOG(WII_IPC_STM, "    Parameter: 0x%x", Parameter);
-                DEBUG_LOG(WII_IPC_STM, "    InBuffer: 0x%08x", BufferIn);
-                DEBUG_LOG(WII_IPC_STM, "    InBufferSize: 0x%08x", BufferInSize);
-                DEBUG_LOG(WII_IPC_STM, "    OutBuffer: 0x%08x", BufferOut);
-                DEBUG_LOG(WII_IPC_STM, "    OutBufferSize: 0x%08x", BufferOutSize);
-            }
-            break;
-        }
+				INFO_LOG(WII_IPC_STM, "%s - IOCtl:", GetDeviceName().c_str());
+				DEBUG_LOG(WII_IPC_STM, "    Parameter: 0x%x", Parameter);
+				DEBUG_LOG(WII_IPC_STM, "    InBuffer: 0x%08x", BufferIn);
+				DEBUG_LOG(WII_IPC_STM, "    InBufferSize: 0x%08x", BufferInSize);
+				DEBUG_LOG(WII_IPC_STM, "    OutBuffer: 0x%08x", BufferOut);
+				DEBUG_LOG(WII_IPC_STM, "    OutBufferSize: 0x%08x", BufferOutSize);
+			}
+			break;
+		}
 
 		// Write return value to the IPC call
-        Memory::Write_U32(ReturnValue, _CommandAddress + 0x4);
-        return true;
-    }
+		Memory::Write_U32(ReturnValue, _CommandAddress + 0x4);
+		return true;
+	}
 };
 
 // The /dev/stm/eventhook
@@ -129,20 +117,21 @@ class CWII_IPC_HLE_Device_stm_eventhook : public IWII_IPC_HLE_Device
 {
 public:
 
-    CWII_IPC_HLE_Device_stm_eventhook(u32 _DeviceID, const std::string& _rDeviceName) 
+	CWII_IPC_HLE_Device_stm_eventhook(u32 _DeviceID, const std::string& _rDeviceName) 
 		: IWII_IPC_HLE_Device(_DeviceID, _rDeviceName)
 		, m_EventHookAddress(0)
-    {}
+	{}
 
-    virtual ~CWII_IPC_HLE_Device_stm_eventhook()
-    {}
+	virtual ~CWII_IPC_HLE_Device_stm_eventhook()
+	{
+	}
 
-    virtual bool Open(u32 _CommandAddress, u32 _Mode)
-    {
-        Memory::Write_U32(GetDeviceID(), _CommandAddress + 4);
+	virtual bool Open(u32 _CommandAddress, u32 _Mode)
+	{
+		Memory::Write_U32(GetDeviceID(), _CommandAddress + 4);
 		m_Active = true;
 		return true;
-    }
+	}
 
 	virtual bool Close(u32 _CommandAddress, bool _bForce)
 	{
@@ -155,46 +144,46 @@ public:
 		return true;
 	}
 
-    virtual bool IOCtl(u32 _CommandAddress) 
-    {
-        u32 Parameter		= Memory::Read_U32(_CommandAddress + 0x0C);
-        u32 BufferIn		= Memory::Read_U32(_CommandAddress + 0x10);
-        u32 BufferInSize	= Memory::Read_U32(_CommandAddress + 0x14);
-        u32 BufferOut		= Memory::Read_U32(_CommandAddress + 0x18);
-        u32 BufferOutSize	= Memory::Read_U32(_CommandAddress + 0x1C);
+	virtual bool IOCtl(u32 _CommandAddress) 
+	{
+		u32 Parameter		= Memory::Read_U32(_CommandAddress + 0x0C);
+		u32 BufferIn		= Memory::Read_U32(_CommandAddress + 0x10);
+		u32 BufferInSize	= Memory::Read_U32(_CommandAddress + 0x14);
+		u32 BufferOut		= Memory::Read_U32(_CommandAddress + 0x18);
+		u32 BufferOutSize	= Memory::Read_U32(_CommandAddress + 0x1C);
 
 		// Prepare the out buffer(s) with zeros as a safety precaution
 		// to avoid returning bad values
 		Memory::Memset(BufferOut, 0, BufferOutSize);
 		u32 ReturnValue = 0;
 
-        // write return value
-        switch (Parameter)
-        {
-        case IOCTL_STM_EVENTHOOK:
+		// write return value
+		switch (Parameter)
+		{
+		case IOCTL_STM_EVENTHOOK:
 			{
 				m_EventHookAddress = _CommandAddress;
 
-                INFO_LOG(WII_IPC_STM, "%s registers event hook:", GetDeviceName().c_str());
-                DEBUG_LOG(WII_IPC_STM, "%x - IOCTL_STM_EVENTHOOK", Parameter);
-                DEBUG_LOG(WII_IPC_STM, "BufferIn: 0x%08x", BufferIn);
-                DEBUG_LOG(WII_IPC_STM, "BufferInSize: 0x%08x", BufferInSize);
-                DEBUG_LOG(WII_IPC_STM, "BufferOut: 0x%08x", BufferOut);
-                DEBUG_LOG(WII_IPC_STM, "BufferOutSize: 0x%08x", BufferOutSize);
+				INFO_LOG(WII_IPC_STM, "%s registers event hook:", GetDeviceName().c_str());
+				DEBUG_LOG(WII_IPC_STM, "%x - IOCTL_STM_EVENTHOOK", Parameter);
+				DEBUG_LOG(WII_IPC_STM, "BufferIn: 0x%08x", BufferIn);
+				DEBUG_LOG(WII_IPC_STM, "BufferInSize: 0x%08x", BufferInSize);
+				DEBUG_LOG(WII_IPC_STM, "BufferOut: 0x%08x", BufferOut);
+				DEBUG_LOG(WII_IPC_STM, "BufferOutSize: 0x%08x", BufferOutSize);
 
 				DumpCommands(BufferIn, BufferInSize/4, LogTypes::WII_IPC_STM);
-            }
-            break;
+			}
+			break;
 
-        default:
+		default:
 			_dbg_assert_msg_(WII_IPC_STM, 0, "unknown %s ioctl %x",
 				GetDeviceName().c_str(), Parameter);
-            break;
-        }
+			break;
+		}
 
 		// Write return value to the IPC call, 0 means success
-        Memory::Write_U32(ReturnValue, _CommandAddress + 0x4);
-        return false;
+		Memory::Write_U32(ReturnValue, _CommandAddress + 0x4);
+		return false;
 	}
 
 	// STATE_TO_SAVE
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 e3c0247b46..41f751cb77 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
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "../Core.h"
 #include "../Debugger/Debugger_SymbolMap.h"
@@ -109,34 +96,36 @@ void CWII_IPC_HLE_Device_usb_oh1_57e_305::DoState(PointerWrap &p)
 	p.Do(m_ControllerBD);
 	p.Do(m_CtrlSetup);
 	p.Do(m_ACLSetup);
-	p.Do(m_HCIEndpoint);
-	p.Do(m_ACLEndpoint);
+	p.DoPOD(m_HCIEndpoint);
+	p.DoPOD(m_ACLEndpoint);
 	p.Do(m_last_ticks);
 	p.DoArray(m_PacketCount,4);
 	p.Do(m_ScanEnable);
 	p.Do(m_EventQueue);
 	m_acl_pool.DoState(p);
 
-    for (unsigned int i = 0; i < 4; i++)
+	for (unsigned int i = 0; i < 4; i++)
 		m_WiiMotes[i].DoState(p);
 
 	// Reset the connection of real and hybrid wiimotes
 	if (p.GetMode() == PointerWrap::MODE_READ && SConfig::GetInstance().m_WiimoteReconnectOnLoad)
 	{
-        for (unsigned int i = 0; i < 4; i++)
-	    {
+		for (unsigned int i = 0; i < 4; i++)
+		{
 			if (WIIMOTE_SRC_EMU == g_wiimote_sources[i] || WIIMOTE_SRC_NONE == g_wiimote_sources[i])
 				continue;
 			// TODO: Selectively clear real wiimote messages if possible. Or create a real wiimote channel and reporting mode pre-setup to vacate the need for m_WiimoteReconnectOnLoad.
 			m_EventQueue.clear();
 			if (!m_WiiMotes[i].IsInactive())
-            {
+			{
 				m_WiiMotes[i].Activate(false);
 				m_WiiMotes[i].Activate(true);
-	        }
+			}
 			else
+			{
 				m_WiiMotes[i].Activate(false);
-        }
+			}
+		}
 	}
 }
 
@@ -178,7 +167,7 @@ bool CWII_IPC_HLE_Device_usb_oh1_57e_305::Close(u32 _CommandAddress, bool _bForc
 
 bool CWII_IPC_HLE_Device_usb_oh1_57e_305::IOCtl(u32 _CommandAddress)
 {
-	//ERROR_LOG(WII_IPC_WIIMOTE, "passing ioctl to ioctlv");
+	//ERROR_LOG(WII_IPC_WIIMOTE, "Passing ioctl to ioctlv");
 	return IOCtlV(_CommandAddress);	//hack
 }
 
@@ -374,7 +363,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...");
+		DEBUG_LOG(WII_IPC_WIIMOTE, "ACL endpoint not currently valid, queuing...");
 		m_acl_pool.Store(_pData, _Size, _ConnectionHandle);
 	}
 }
@@ -422,7 +411,7 @@ void CWII_IPC_HLE_Device_usb_oh1_57e_305::AddEventToQueue(const SQueuedEvent& _e
 	else
 	{
 		DEBUG_LOG(WII_IPC_WIIMOTE, "HCI endpoint not currently valid, "
-			"queueing(%lu)...", (unsigned long)m_EventQueue.size());
+			"queuing(%lu)...", (unsigned long)m_EventQueue.size());
 		m_EventQueue.push_back(_event);
 	}
 }
@@ -431,7 +420,7 @@ u32 CWII_IPC_HLE_Device_usb_oh1_57e_305::Update()
 {
 	bool packet_transferred = false;
 
-	// check hci queue
+	// check HCI queue
 	if (!m_EventQueue.empty() && m_HCIEndpoint.IsValid())
 	{
 		// an endpoint has become available, and we have a stored response.
@@ -450,7 +439,7 @@ u32 CWII_IPC_HLE_Device_usb_oh1_57e_305::Update()
 		packet_transferred = true;
 	}
 
-	// check acl queue
+	// check ACL queue
 	if (!m_acl_pool.IsEmpty() && m_ACLEndpoint.IsValid() && m_EventQueue.empty())
 	{
 		m_acl_pool.WriteToEndpoint(m_ACLEndpoint);
@@ -517,7 +506,7 @@ void CWII_IPC_HLE_Device_usb_oh1_57e_305::ACLPool::Store(const u8* data, const u
 	}
 	
 	_dbg_assert_msg_(WII_IPC_WIIMOTE,
-		size < m_acl_pkt_size, "acl packet too large for pool");
+		size < m_acl_pkt_size, "ACL packet too large for pool");
 	
 	m_queue.push_back(Packet());
 	auto& packet = m_queue.back();
@@ -557,7 +546,7 @@ bool CWII_IPC_HLE_Device_usb_oh1_57e_305::SendEventInquiryComplete()
 {
 	SQueuedEvent Event(sizeof(SHCIEventInquiryComplete), 0);
 
-	SHCIEventInquiryComplete* pInquiryComplete = (SHCIEventInquiryComplete*)Event.m_buffer;    
+	SHCIEventInquiryComplete* pInquiryComplete = (SHCIEventInquiryComplete*)Event.m_buffer;
 	pInquiryComplete->EventType = HCI_EVENT_INQUIRY_COMPL;
 	pInquiryComplete->PayloadLength = sizeof(SHCIEventInquiryComplete) - 2;
 	pInquiryComplete->EventStatus = 0x00;
@@ -570,7 +559,7 @@ bool CWII_IPC_HLE_Device_usb_oh1_57e_305::SendEventInquiryComplete()
 }
 
 bool CWII_IPC_HLE_Device_usb_oh1_57e_305::SendEventInquiryResponse()
-{    
+{
 	if (m_WiiMotes.empty())
 		return false;
 
@@ -602,7 +591,7 @@ bool CWII_IPC_HLE_Device_usb_oh1_57e_305::SendEventInquiryResponse()
 		pResponse->page_scan_mode = 0;
 		pResponse->clock_offset = 0x3818;
 
-		INFO_LOG(WII_IPC_WIIMOTE, "Event: Send Fake Inquriy of one controller");
+		INFO_LOG(WII_IPC_WIIMOTE, "Event: Send Fake Inquiry of one controller");
 		INFO_LOG(WII_IPC_WIIMOTE, "  bd: %02x:%02x:%02x:%02x:%02x:%02x",
 			pResponse->bdaddr.b[0], pResponse->bdaddr.b[1], pResponse->bdaddr.b[2],
 			pResponse->bdaddr.b[3], pResponse->bdaddr.b[4], pResponse->bdaddr.b[5]);
@@ -621,7 +610,7 @@ bool CWII_IPC_HLE_Device_usb_oh1_57e_305::SendEventConnectionComplete(const bdad
 
 	SQueuedEvent Event(sizeof(SHCIEventConnectionComplete), 0);
 
-	SHCIEventConnectionComplete* pConnectionComplete = (SHCIEventConnectionComplete*)Event.m_buffer;    
+	SHCIEventConnectionComplete* pConnectionComplete = (SHCIEventConnectionComplete*)Event.m_buffer;
 
 	pConnectionComplete->EventType = HCI_EVENT_CON_COMPL;
 	pConnectionComplete->PayloadLength = sizeof(SHCIEventConnectionComplete) - 2;
@@ -738,7 +727,7 @@ bool CWII_IPC_HLE_Device_usb_oh1_57e_305::SendEventAuthenticationCompleted(u16 _
 }
 
 bool CWII_IPC_HLE_Device_usb_oh1_57e_305::SendEventRemoteNameReq(const bdaddr_t& _bd)
-{    
+{
 	CWII_IPC_HLE_WiiMote* pWiiMote = AccessWiiMote(_bd);
 	if (pWiiMote == NULL)
 		return false;
@@ -807,7 +796,7 @@ bool CWII_IPC_HLE_Device_usb_oh1_57e_305::SendEventReadRemoteVerInfo(u16 _connec
 
 	SQueuedEvent Event(sizeof(SHCIEventReadRemoteVerInfo), _connectionHandle);
 
-	SHCIEventReadRemoteVerInfo* pReadRemoteVerInfo = (SHCIEventReadRemoteVerInfo*)Event.m_buffer;    
+	SHCIEventReadRemoteVerInfo* pReadRemoteVerInfo = (SHCIEventReadRemoteVerInfo*)Event.m_buffer;
 	pReadRemoteVerInfo->EventType = HCI_EVENT_READ_REMOTE_VER_INFO_COMPL;
 	pReadRemoteVerInfo->PayloadLength = sizeof(SHCIEventReadRemoteVerInfo) - 2;
 	pReadRemoteVerInfo->EventStatus = 0x00;
@@ -833,10 +822,10 @@ void CWII_IPC_HLE_Device_usb_oh1_57e_305::SendEventCommandComplete(u16 _OpCode,
 
 	SQueuedEvent Event(sizeof(SHCIEventCommand) + _DataSize, 0);
 
-	SHCIEventCommand* pHCIEvent = (SHCIEventCommand*)Event.m_buffer;    
-	pHCIEvent->EventType = HCI_EVENT_COMMAND_COMPL;          
+	SHCIEventCommand* pHCIEvent = (SHCIEventCommand*)Event.m_buffer;
+	pHCIEvent->EventType = HCI_EVENT_COMMAND_COMPL;
 	pHCIEvent->PayloadLength = (u8)(sizeof(SHCIEventCommand) - 2 + _DataSize);
-	pHCIEvent->PacketIndicator = 0x01;     
+	pHCIEvent->PacketIndicator = 0x01;
 	pHCIEvent->Opcode = _OpCode;
 
 	// add the payload
@@ -870,14 +859,14 @@ bool CWII_IPC_HLE_Device_usb_oh1_57e_305::SendEventCommandStatus(u16 _Opcode)
 }
 
 bool CWII_IPC_HLE_Device_usb_oh1_57e_305::SendEventRoleChange(bdaddr_t _bd, bool _master)
-{    
+{
 	CWII_IPC_HLE_WiiMote* pWiiMote = AccessWiiMote(_bd);
 	if (pWiiMote == NULL)
 		return false;
 
 	SQueuedEvent Event(sizeof(SHCIEventRoleChange), 0);
 
-	SHCIEventRoleChange* pRoleChange = (SHCIEventRoleChange*)Event.m_buffer;    
+	SHCIEventRoleChange* pRoleChange = (SHCIEventRoleChange*)Event.m_buffer;
 
 	pRoleChange->EventType = HCI_EVENT_ROLE_CHANGE;
 	pRoleChange->PayloadLength = sizeof(SHCIEventRoleChange) - 2;
@@ -928,7 +917,9 @@ bool CWII_IPC_HLE_Device_usb_oh1_57e_305::SendEventNumberOfCompletedPackets()
 	}
 
 	if (acc)
+	{
 		AddEventToQueue(Event);
+	}
 	else
 	{
 		INFO_LOG(WII_IPC_WIIMOTE, "SendEventNumberOfCompletedPackets: no packets; no event");
@@ -1139,7 +1130,7 @@ void CWII_IPC_HLE_Device_usb_oh1_57e_305::ExecuteHCICommandMessage(const SHCICom
 		break;
 
 	case HCI_CMD_SET_EVENT_FILTER:
-		CommandSetEventFilter(pInput);        
+		CommandSetEventFilter(pInput);
 		break;
 
 	case HCI_CMD_INQUIRY:
@@ -1147,10 +1138,10 @@ void CWII_IPC_HLE_Device_usb_oh1_57e_305::ExecuteHCICommandMessage(const SHCICom
 		break;
 
 	case HCI_CMD_WRITE_INQUIRY_SCAN_TYPE:
-		CommandWriteInquiryScanType(pInput);        
+		CommandWriteInquiryScanType(pInput);
 		break;
 
-		// vendor specific...
+	// vendor specific...
 	case 0xFC4C:
 		CommandVendorSpecific_FC4C(pInput, _rHCICommandMessage.m_PayLoadSize - 3);
 		break;
@@ -1160,7 +1151,7 @@ void CWII_IPC_HLE_Device_usb_oh1_57e_305::ExecuteHCICommandMessage(const SHCICom
 		break;
 
 	case HCI_CMD_INQUIRY_CANCEL:
-		CommandInquiryCancel(pInput);        
+		CommandInquiryCancel(pInput);
 		break;
 
 	case HCI_CMD_REMOTE_NAME_REQ:
@@ -1190,7 +1181,7 @@ void CWII_IPC_HLE_Device_usb_oh1_57e_305::ExecuteHCICommandMessage(const SHCICom
 	case HCI_CMD_READ_REMOTE_FEATURES:
 		CommandReadRemoteFeatures(pInput);
 		break;
-		
+
 	case HCI_CMD_WRITE_LINK_POLICY_SETTINGS:
 		CommandWriteLinkPolicy(pInput);
 		break;
@@ -1219,9 +1210,9 @@ void CWII_IPC_HLE_Device_usb_oh1_57e_305::ExecuteHCICommandMessage(const SHCICom
 		CommandLinkKeyRep(pInput);
 		break;
 
-    case HCI_CMD_DELETE_STORED_LINK_KEY:
-        CommandDeleteStoredLinkKey(pInput);
-        break;
+	case HCI_CMD_DELETE_STORED_LINK_KEY:
+		CommandDeleteStoredLinkKey(pInput);
+		break;
 
 	default:
 		// send fake okay msg...
@@ -1529,7 +1520,7 @@ void CWII_IPC_HLE_Device_usb_oh1_57e_305::CommandReadStoredLinkKey(u8* _Input)
 {
 	hci_read_stored_link_key_cp* ReadStoredLinkKey = (hci_read_stored_link_key_cp*)_Input;
 
-	hci_read_stored_link_key_rp Reply;    
+	hci_read_stored_link_key_rp Reply;
 	Reply.status = 0x00;
 	Reply.max_num_keys = 255;
 
@@ -1735,7 +1726,7 @@ void CWII_IPC_HLE_Device_usb_oh1_57e_305::CommandReadLocalVer(u8* _Input)
 	Reply.status = 0x00;
 	Reply.hci_version = 0x03;        // HCI version: 1.1
 	Reply.hci_revision = 0x40a7;     // current revision (?)
-	Reply.lmp_version = 0x03;        // LMP version: 1.1    
+	Reply.lmp_version = 0x03;        // LMP version: 1.1
 	Reply.manufacturer = 0x000F;     // manufacturer: reserved for tests
 	Reply.lmp_subversion = 0x430e;   // LMP subversion
 
@@ -1752,7 +1743,7 @@ void CWII_IPC_HLE_Device_usb_oh1_57e_305::CommandReadLocalVer(u8* _Input)
 
 void CWII_IPC_HLE_Device_usb_oh1_57e_305::CommandReadLocalFeatures(u8* _Input)
 {
-	hci_read_local_features_rp Reply;    
+	hci_read_local_features_rp Reply;
 	Reply.status = 0x00;
 	Reply.features[0] = 0xFF;
 	Reply.features[1] = 0xFF;
@@ -1778,7 +1769,7 @@ void CWII_IPC_HLE_Device_usb_oh1_57e_305::CommandReadBufferSize(u8* _Input)
 	hci_read_buffer_size_rp Reply;
 	Reply.status = 0x00;
 	Reply.max_acl_size = m_acl_pkt_size;
-	// Due to how the widcomm stack which nintendo uses is coded, we must never
+	// Due to how the widcomm stack which Nintendo uses is coded, we must never
 	// let the stack think the controller is buffering more than 10 data packets
 	// - it will cause a u8 underflow and royally screw things up.
 	Reply.num_acl_pkts = m_acl_pkts_num;
@@ -1823,7 +1814,7 @@ void CWII_IPC_HLE_Device_usb_oh1_57e_305::CommandVendorSpecific_FC4F(u8* _Input,
 	Reply.status = 0x00;
 
 	INFO_LOG(WII_IPC_WIIMOTE, "Command: CommandVendorSpecific_FC4F: (callstack WUDiRemovePatch)");
-	INFO_LOG(WII_IPC_WIIMOTE, "input (size 0x%x):", _Size);
+	INFO_LOG(WII_IPC_WIIMOTE, "Input (size 0x%x):", _Size);
 
 	Dolphin_Debugger::PrintDataBuffer(LogTypes::WII_IPC_WIIMOTE, _Input, _Size, "Data: ");
 
@@ -1836,7 +1827,7 @@ void CWII_IPC_HLE_Device_usb_oh1_57e_305::CommandVendorSpecific_FC4C(u8* _Input,
 	Reply.status = 0x00;
 
 	INFO_LOG(WII_IPC_WIIMOTE, "Command: CommandVendorSpecific_FC4C:");
-	INFO_LOG(WII_IPC_WIIMOTE, "input (size 0x%x):", _Size);
+	INFO_LOG(WII_IPC_WIIMOTE, "Input (size 0x%x):", _Size);
 	Dolphin_Debugger::PrintDataBuffer(LogTypes::WII_IPC_WIIMOTE, _Input, _Size, "Data: ");
 
 	SendEventCommandComplete(0xFC4C, &Reply, sizeof(hci_status_rp));
@@ -1862,9 +1853,9 @@ CWII_IPC_HLE_WiiMote* CWII_IPC_HLE_Device_usb_oh1_57e_305::AccessWiiMote(const b
 			return &m_WiiMotes[i];
 	}
 
-	ERROR_LOG(WII_IPC_WIIMOTE,"Cant find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x",
+	ERROR_LOG(WII_IPC_WIIMOTE,"Can't find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x",
 		_rAddr.b[0], _rAddr.b[1], _rAddr.b[2], _rAddr.b[3], _rAddr.b[4], _rAddr.b[5]); 
-	PanicAlertT("Cant find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x",
+	PanicAlertT("Can't find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x",
 		_rAddr.b[0], _rAddr.b[1], _rAddr.b[2], _rAddr.b[3], _rAddr.b[4], _rAddr.b[5]);
 	return NULL;
 }
@@ -1877,17 +1868,17 @@ CWII_IPC_HLE_WiiMote* CWII_IPC_HLE_Device_usb_oh1_57e_305::AccessWiiMote(u16 _Co
 			return &m_WiiMotes[i];
 	}
 
-	ERROR_LOG(WII_IPC_WIIMOTE, "Cant find WiiMote by connection handle %02x", _ConnectionHandle);
-	PanicAlertT("Cant find WiiMote by connection handle %02x", _ConnectionHandle);
+	ERROR_LOG(WII_IPC_WIIMOTE, "Can't find WiiMote by connection handle %02x", _ConnectionHandle);
+	PanicAlertT("Can't find WiiMote by connection handle %02x", _ConnectionHandle);
 	return NULL;
 }
 
 void CWII_IPC_HLE_Device_usb_oh1_57e_305::LOG_LinkKey(const u8* _pLinkKey)
 {
 	DEBUG_LOG(WII_IPC_WIIMOTE, "  link key: "
-				 "0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x "
-				 "0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x "
-				 , _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]);
+				"0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x "
+				"0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x "
+				, _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]);
 
 }
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 eb091b1ff9..f3d79b0fb8 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
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #pragma once
 
@@ -51,6 +38,12 @@ struct SQueuedEvent
 	}
 };
 
+// Hacks for ChunkFile to accept SQueuedEvent as POD
+namespace std
+{
+template <>
+struct is_pod<SQueuedEvent> : std::true_type {};
+}
 
 // Important to remember that this class is for /dev/usb/oh1/57e/305 ONLY
 // /dev/usb/oh1 -> internal usb bus
@@ -96,7 +89,7 @@ private:
 
 	enum USBEndpoint
 	{
-		HCI_CTRL		= 0x00,	
+		HCI_CTRL		= 0x00,
 		HCI_EVENT		= 0x81,
 		ACL_DATA_IN		= 0x82,
 		ACL_DATA_OUT	= 0x02
@@ -247,7 +240,7 @@ private:
 	void CommandDisconnect(u8* _Input);
 	void CommandLinkKeyNegRep(u8* _Input);
 	void CommandLinkKeyRep(u8* _Input);
-    void CommandDeleteStoredLinkKey(u8* _Input);
+	void CommandDeleteStoredLinkKey(u8* _Input);
 	void CommandChangeConPacketType(u8* _Input);
 
 	// OGF 0x02	Link policy commands and return parameters
diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb_kbd.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb_kbd.cpp
index 60f1f95c19..bfe0df8743 100644
--- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb_kbd.cpp
+++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb_kbd.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "../ConfigManager.h"
 #include "../Core.h" // Local core functions
@@ -227,7 +214,7 @@ u8 CWII_IPC_HLE_Device_usb_kbd::m_KeyCodesQWERTY[256] = {
 	0x55, // Multiply
 	0x57, // Add
 	0x00, // Separator
-	0x56, // Substract
+	0x56, // Subtract
 	0x63, // Decimal
 	0x54, // Divide
 	// F1 -> F12
diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb_kbd.h b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb_kbd.h
index 29197f81b7..28844fac78 100644
--- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb_kbd.h
+++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb_kbd.h
@@ -1,3 +1,7 @@
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
+
 #ifndef _WII_IPC_HLE_DEVICE_USB_KBD_H_
 #define _WII_IPC_HLE_DEVICE_USB_KBD_H_
 
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 b3449ec059..22930eb94c 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
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "Common.h" // Common
 #include "StringUtil.h"
@@ -309,7 +296,7 @@ void CWII_IPC_HLE_WiiMote::ExecuteL2capCmd(u8* _pData, u32 _Size)
 					break;
 
 				default:
-					ERROR_LOG(WII_IPC_WIIMOTE, "channel 0x04%x has unknown PSM %x", pHeader->dcid, rChannel.PSM);
+					ERROR_LOG(WII_IPC_WIIMOTE, "Channel 0x04%x has unknown PSM %x", pHeader->dcid, rChannel.PSM);
 					break;
 				}
 			}
@@ -319,7 +306,7 @@ void CWII_IPC_HLE_WiiMote::ExecuteL2capCmd(u8* _pData, u32 _Size)
 }
 
 void CWII_IPC_HLE_WiiMote::SignalChannel(u8* _pData, u32 _Size)
-{    
+{
 	while (_Size >= sizeof(l2cap_cmd_hdr_t))
 	{
 		l2cap_cmd_hdr_t* cmd_hdr = (l2cap_cmd_hdr_t*)_pData;
@@ -333,7 +320,7 @@ void CWII_IPC_HLE_WiiMote::SignalChannel(u8* _pData, u32 _Size)
 				"Try to replace your SYSCONF file with a new copy.");
 			break;
 
-		case L2CAP_CONNECT_REQ:            
+		case L2CAP_CONNECT_REQ:
 			ReceiveConnectionReq(cmd_hdr->ident, _pData, cmd_hdr->length);
 			break;
 
@@ -341,7 +328,7 @@ void CWII_IPC_HLE_WiiMote::SignalChannel(u8* _pData, u32 _Size)
 			ReceiveConnectionResponse(cmd_hdr->ident, _pData, cmd_hdr->length);
 			break;
 
-		case L2CAP_CONFIG_REQ:            
+		case L2CAP_CONFIG_REQ:
 			ReceiveConfigurationReq(cmd_hdr->ident, _pData, cmd_hdr->length);
 			break;
 
@@ -664,8 +651,8 @@ void CWII_IPC_HLE_WiiMote::SDPSendServiceSearchResponse(u16 cid, u16 Transaction
 	// verify block... we handle search pattern for HID service only
 	{
 		CBigEndianBuffer buffer(pServiceSearchPattern);		
-		_dbg_assert_(WII_IPC_WIIMOTE, buffer.Read8(0) == SDP_SEQ8);       // data sequence
-		_dbg_assert_(WII_IPC_WIIMOTE, buffer.Read8(1) == 0x03);		  // sequence size
+		_dbg_assert_(WII_IPC_WIIMOTE, buffer.Read8(0) == SDP_SEQ8);   // data sequence
+		_dbg_assert_(WII_IPC_WIIMOTE, buffer.Read8(1) == 0x03);       // sequence size
 
 		// HIDClassID
 		_dbg_assert_(WII_IPC_WIIMOTE, buffer.Read8(2) == 0x19);
@@ -696,7 +683,7 @@ static u32 ParseCont(u8* pCont)
 {
 	u32 attribOffset = 0;
 	CBigEndianBuffer attribList(pCont);
-	u8 typeID      = attribList.Read8(attribOffset);		attribOffset++;
+	u8 typeID		= attribList.Read8(attribOffset);		attribOffset++;
 
 	if (typeID == 0x02)
 	{
@@ -719,7 +706,7 @@ int ParseAttribList(u8* pAttribIDList, u16& _startID, u16& _endID)
 
 	u8 sequence		= attribList.Read8(attribOffset);		attribOffset++;
 	u8 seqSize		= attribList.Read8(attribOffset);		attribOffset++;
-	u8 typeID      		= attribList.Read8(attribOffset);		attribOffset++;
+	u8 typeID		= attribList.Read8(attribOffset);		attribOffset++;
 
 #if MAX_LOGLEVEL >= DEBUG_LEVEL
 	_dbg_assert_(WII_IPC_WIIMOTE, sequence == SDP_SEQ8);
@@ -751,8 +738,8 @@ void CWII_IPC_HLE_WiiMote::SDPSendServiceAttributeResponse(u16 cid, u16 Transact
 {
 	if (ServiceHandle != 0x10000)
 	{
-		ERROR_LOG(WII_IPC_WIIMOTE, "unknown service handle %x" , ServiceHandle);
-		PanicAlert("unknown service handle %x" , ServiceHandle);
+		ERROR_LOG(WII_IPC_WIIMOTE, "Unknown service handle %x" , ServiceHandle);
+		PanicAlert("Unknown service handle %x" , ServiceHandle);
 	}
 
 
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 5373f68c0a..691fc84011 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
@@ -1,19 +1,7 @@
-// Copyright (C) 2003 Dolphin Project.
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
-// 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 _WII_IPC_HLE_WII_MOTE_
 #define _WII_IPC_HLE_WII_MOTE_
 
diff --git a/Source/Core/Core/Src/IPC_HLE/WiiMote_HID_Attr.cpp b/Source/Core/Core/Src/IPC_HLE/WiiMote_HID_Attr.cpp
index 90ee35c16a..e96bb5d7da 100644
--- a/Source/Core/Core/Src/IPC_HLE/WiiMote_HID_Attr.cpp
+++ b/Source/Core/Core/Src/IPC_HLE/WiiMote_HID_Attr.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "Common.h"
 #include <vector>
diff --git a/Source/Core/Core/Src/IPC_HLE/WiiMote_HID_Attr.h b/Source/Core/Core/Src/IPC_HLE/WiiMote_HID_Attr.h
index ff9d4ff1ad..a9350ec532 100644
--- a/Source/Core/Core/Src/IPC_HLE/WiiMote_HID_Attr.h
+++ b/Source/Core/Core/Src/IPC_HLE/WiiMote_HID_Attr.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef WIIMOTE_HID_ATTR_H_
 #define WIIMOTE_HID_ATTR_H_
diff --git a/Source/Core/Core/Src/MemTools.h b/Source/Core/Core/Src/MemTools.h
index 6acab1935b..a791684c41 100644
--- a/Source/Core/Core/Src/MemTools.h
+++ b/Source/Core/Core/Src/MemTools.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _MEMTOOLS_H
 #define _MEMTOOLS_H
diff --git a/Source/Core/Core/Src/Movie.cpp b/Source/Core/Core/Src/Movie.cpp
index e72163cddb..c57ce8d4cc 100644
--- a/Source/Core/Core/Src/Movie.cpp
+++ b/Source/Core/Core/Src/Movie.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "Movie.h"
 
@@ -94,6 +81,7 @@ void EnsureTmpInputSize(size_t bound)
 	size_t newAlloc = DTM_BASE_LENGTH;
 	while (newAlloc < bound)
 		newAlloc *= 2;
+	
 	u8* newTmpInput = new u8[newAlloc];
 	tmpInputAllocated = newAlloc;
 	if (tmpInput != NULL)
@@ -118,10 +106,12 @@ std::string GetInputDisplay()
 				g_numPads |= (1 << (i + 4));
 		}
 	}
+
 	std::string inputDisplay = "";
 	for (int i = 0; i < 8; ++i)
 		if ((g_numPads & (1 << i)) != 0)
 			inputDisplay.append(g_InputDisplay[i]);
+	
 	return inputDisplay; 
 }
 
@@ -177,6 +167,7 @@ void Init()
 			EndPlayInput(false);
 		}
 	}
+
 	if (IsRecordingInput())
 	{
 		GetSettings();
diff --git a/Source/Core/Core/Src/Movie.h b/Source/Core/Core/Src/Movie.h
index 79b5e72f29..a29b47ae79 100644
--- a/Source/Core/Core/Src/Movie.h
+++ b/Source/Core/Core/Src/Movie.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef __MOVIE_H
 #define __MOVIE_H
@@ -86,19 +73,19 @@ struct DTMHeader {
 	u8 gameID[6];			// The Game ID
 	bool bWii;				// Wii game
 
-    u8  numControllers;		// The number of connected controllers (1-4)
+	u8  numControllers;		// The number of connected controllers (1-4)
 
-    bool bFromSaveState;	// false indicates that the recording started from bootup, true for savestate
-    u64 frameCount;			// Number of frames in the recording
+	bool bFromSaveState;	// false indicates that the recording started from bootup, true for savestate
+	u64 frameCount;			// Number of frames in the recording
 	u64 inputCount;			// Number of input frames in recording
-    u64 lagCount;			// Number of lag frames in the recording
-    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)
+	u64 lagCount;			// Number of lag frames in the recording
+	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
-    unsigned char  md5[16];	// MD5 of game iso
+	u8  videoBackend[16];	// UTF-8 representation of the video backend
+	u8  audioEmulator[16];	// UTF-8 representation of the audio emulator
+	unsigned char  md5[16];	// MD5 of game iso
 
 	u64 recordingStartTime; // seconds since 1970 that recording started (used for RTC)
 
diff --git a/Source/Core/Core/Src/NetPlay.cpp b/Source/Core/Core/Src/NetPlay.cpp
index 05331bc6cc..96c4a69f98 100644
--- a/Source/Core/Core/Src/NetPlay.cpp
+++ b/Source/Core/Core/Src/NetPlay.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "NetPlay.h"
 
@@ -271,6 +258,16 @@ bool NetPlay::StopGame()
 	return true;
 }
 
+void NetPlay::SetMemcardWriteEnabled(bool enabled)
+{
+	std::lock_guard<std::recursive_mutex> lkg(m_crit.game);
+
+	if (m_is_running)
+	{
+		Core::g_CoreStartupParameter.bEnableMemcardSaving = enabled;
+	}
+}
+
 // called from ---CPU--- thread
 u8 NetPlay::GetPadNum(u8 numPAD)
 {
diff --git a/Source/Core/Core/Src/NetPlay.h b/Source/Core/Core/Src/NetPlay.h
index 96ff78995a..ab0d0cc848 100644
--- a/Source/Core/Core/Src/NetPlay.h
+++ b/Source/Core/Core/Src/NetPlay.h
@@ -1,3 +1,7 @@
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
+
 #ifndef _NETPLAY_H
 #define _NETPLAY_H
 
@@ -34,7 +38,7 @@ struct Rpt : public std::vector<u8>
 
 typedef std::vector<Rpt>	NetWiimote;
 
-#define NETPLAY_VERSION		"Dolphin NetPlay 2013-03-03"
+#define NETPLAY_VERSION		"Dolphin NetPlay 2013-04-11"
 
 // messages
 enum
@@ -111,6 +115,7 @@ public:
 	virtual bool StartGame(const std::string &path);
 	virtual bool StopGame();
 
+	virtual void SetMemcardWriteEnabled(bool enabled);
 	//void PushPadStates(unsigned int count);
 
 	u8 GetPadNum(u8 numPAD);
diff --git a/Source/Core/Core/Src/NetPlayClient.cpp b/Source/Core/Core/Src/NetPlayClient.cpp
index ef1edeeb7f..aa7a678230 100644
--- a/Source/Core/Core/Src/NetPlayClient.cpp
+++ b/Source/Core/Core/Src/NetPlayClient.cpp
@@ -1,3 +1,7 @@
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
+
 #include "NetPlay.h"
 
 // called from ---GUI--- thread
diff --git a/Source/Core/Core/Src/NetPlayServer.cpp b/Source/Core/Core/Src/NetPlayServer.cpp
index 61a61d00ae..4677894f72 100644
--- a/Source/Core/Core/Src/NetPlayServer.cpp
+++ b/Source/Core/Core/Src/NetPlayServer.cpp
@@ -1,3 +1,7 @@
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
+
 #include "NetPlay.h"
 
 // called from ---GUI--- thread
@@ -52,7 +56,7 @@ void NetPlayServer::ThreadFunc()
 		// update pings every so many seconds
 		if ((m_ping_timer.GetTimeElapsed() > (10 * 1000)) || m_update_pings)
 		{
-			//PanicAlertT("sending pings");
+			//PanicAlertT("Sending pings");
 
 			m_ping_key = Common::Timer::GetTimeMs();
 
@@ -103,7 +107,7 @@ void NetPlayServer::ThreadFunc()
 				switch (ready_socket.Receive(rpac))
 				{
 				case sf::Socket::Done :
-					// if a bad packet is recieved, disconnect the client
+					// if a bad packet is received, disconnect the client
 					if (0 == OnData(rpac, ready_socket))
 						break;
 
@@ -263,7 +267,7 @@ unsigned int NetPlayServer::OnDisconnect(sf::SocketTCP& socket)
 
 		sf::Packet spac;
 		spac << (MessageId)NP_MSG_DISABLE_GAME;
-		// this thread doesnt need players lock
+		// this thread doesn't need players lock
 		std::lock_guard<std::recursive_mutex> lks(m_crit.send);
 		SendToClients(spac);
 	}
@@ -461,7 +465,7 @@ unsigned int NetPlayServer::OnData(sf::Packet& packet, sf::SocketTCP& socket)
 				map = -1;
 			
 			// if not, they are hacking, so disconnect them
-			// this could happen right after a pad map change, but that isn't implimented yet
+			// this could happen right after a pad map change, but that isn't implemented yet
 			if (map < 0)
 				return 1;
 				
@@ -487,7 +491,7 @@ unsigned int NetPlayServer::OnData(sf::Packet& packet, sf::SocketTCP& socket)
 
 			if (m_ping_key == ping_key)
 			{
-				//PanicAlertT("good pong");
+				//PanicAlertT("Good pong");
 				player.ping = ping;
 			}
 			m_dialog->Update();
diff --git a/Source/Core/Core/Src/PatchEngine.cpp b/Source/Core/Core/Src/PatchEngine.cpp
index 74e778c916..ad990d8fed 100644
--- a/Source/Core/Core/Src/PatchEngine.cpp
+++ b/Source/Core/Core/Src/PatchEngine.cpp
@@ -1,19 +1,7 @@
-// Copyright (C) 2003 Dolphin Project.
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
-// 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/
 
 // PatchEngine
 // Supports simple memory patches, and has a partial Action Replay implementation
@@ -55,7 +43,7 @@ const char *PatchTypeStrings[] =
 std::vector<Patch> onFrame;
 std::map<u32, int> speedHacks;
 std::vector<std::string> discList;
-    
+
 void LoadPatchSection(const char *section, std::vector<Patch> &patches, IniFile &ini)
 {
 	std::vector<std::string> lines;
@@ -113,22 +101,23 @@ void LoadPatchSection(const char *section, std::vector<Patch> &patches, IniFile
 	if (currentPatch.name.size() && currentPatch.entries.size())
 		patches.push_back(currentPatch);
 }
-    
-static void LoadDiscList(const char *section, std::vector<std::string> &_discList, IniFile &ini) {
 
-    std::vector<std::string> lines;
-    if (!ini.GetLines(section, lines))
-	return;
-    
-    for (std::vector<std::string>::const_iterator iter = lines.begin(); iter != lines.end(); ++iter)
+static void LoadDiscList(const char *section, std::vector<std::string> &_discList, IniFile &ini)
+{
+	std::vector<std::string> lines;
+	if (!ini.GetLines(section, lines))
+		return;
+
+	for (std::vector<std::string>::const_iterator iter = lines.begin(); iter != lines.end(); ++iter)
 	{
-	    std::string line = *iter;
-	    if (line.size())
-		_discList.push_back(line);
-	}	    
+		std::string line = *iter;
+		if (line.size())
+			_discList.push_back(line);
+	}
 }
 
-static void LoadSpeedhacks(const char *section, std::map<u32, int> &hacks, IniFile &ini) {
+static void LoadSpeedhacks(const char *section, std::map<u32, int> &hacks, IniFile &ini)
+{
 	std::vector<std::string> keys;
 	ini.GetKeys(section, keys);
 	for (std::vector<std::string>::const_iterator iter = keys.begin(); iter != keys.end(); ++iter)
@@ -163,7 +152,9 @@ void LoadPatches(const char *gameID)
 {
 	IniFile ini;
 	std::string filename = File::GetUserPath(D_GAMECONFIG_IDX) + gameID + ".ini";
-	if (ini.Load(filename.c_str())) {
+
+	if (ini.Load(filename.c_str()))
+	{
 		LoadPatchSection("OnFrame", onFrame, ini);
 		ActionReplay::LoadCodes(ini, false);
 		
diff --git a/Source/Core/Core/Src/PatchEngine.h b/Source/Core/Core/Src/PatchEngine.h
index 9b029f943f..700f311b7c 100644
--- a/Source/Core/Core/Src/PatchEngine.h
+++ b/Source/Core/Core/Src/PatchEngine.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _PATCHENGINE_H
 #define _PATCHENGINE_H
diff --git a/Source/Core/Core/Src/PowerPC/CPUCoreBase.h b/Source/Core/Core/Src/PowerPC/CPUCoreBase.h
index d7d412701d..c8465f7707 100644
--- a/Source/Core/Core/Src/PowerPC/CPUCoreBase.h
+++ b/Source/Core/Core/Src/PowerPC/CPUCoreBase.h
@@ -1,19 +1,6 @@
-// Copyright (C) 2010 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _CPUCOREBASE_H
 #define _CPUCOREBASE_H
diff --git a/Source/Core/Core/Src/PowerPC/Gekko.h b/Source/Core/Core/Src/PowerPC/Gekko.h
index 8615acd5ed..3dd2def297 100644
--- a/Source/Core/Core/Src/PowerPC/Gekko.h
+++ b/Source/Core/Core/Src/PowerPC/Gekko.h
@@ -1,21 +1,9 @@
-// Copyright (C) 2003 Dolphin Project.
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
-// 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/
 // Gekko related unions, structs, ...
-//
 
 #ifndef _GEKKO_H
 #define _GEKKO_H
diff --git a/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter.cpp b/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter.cpp
index be68d357a3..fe4c65b3e2 100644
--- a/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter.cpp
+++ b/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "../../HW/Memmap.h"
 #include "../../HW/CPU.h"
@@ -82,14 +69,16 @@ void Trace( UGeckoInstruction &instCode )
 {
 	char reg[25]="";
 	std::string regs = "";
-	for (int i=0; i<32; i++) {
+	for (int i=0; i<32; i++)
+	{
 		sprintf(reg, "r%02d: %08x ", i, PowerPC::ppcState.gpr[i]);
 		regs.append(reg);
 	}
 
 	char freg[25]="";
 	std::string fregs = "";
-	for (int i=0; i<32; i++) {
+	for (int i=0; i<32; i++)
+	{
 		sprintf(freg, "f%02d: %08llx %08llx ", i, PowerPC::ppcState.ps[i][0], PowerPC::ppcState.ps[i][1]);
 		fregs.append(freg);
 	}
@@ -182,7 +171,7 @@ int Interpreter::SingleStepInner(void)
 	}
 	PowerPC::ppcState.DebugCount++;
 #endif
-    patches();
+	patches();
 
 	GekkoOPInfo *opinfo = GetOpInfo(instCode);
 	return opinfo->numCyclesMinusOne + 1;
@@ -306,7 +295,7 @@ void Interpreter::unknown_instruction(UGeckoInstruction _inst)
 		DisassembleGekko(Memory::ReadUnchecked_U32(last_pc), last_pc, disasm, 256);
 		NOTICE_LOG(POWERPC, "Last PC = %08x : %s", last_pc, disasm);
 		Dolphin_Debugger::PrintCallstack();
-		_dbg_assert_msg_(POWERPC, 0, "\nIntCPU: Unknown instr %08x at PC = %08x  last_PC = %08x  LR = %08x\n", _inst.hex, PC, last_pc, LR);
+		_dbg_assert_msg_(POWERPC, 0, "\nIntCPU: Unknown instruction %08x at PC = %08x  last_PC = %08x  LR = %08x\n", _inst.hex, PC, last_pc, LR);
 	}
 
 }
diff --git a/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter.h b/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter.h
index 41c81abe86..c61fa6a573 100644
--- a/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter.h
+++ b/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _INTERPRETER_H
 #define _INTERPRETER_H
@@ -27,9 +14,9 @@ class Interpreter : public CPUCoreBase
 public:
 	void Init();
 	void Shutdown();
-	void Reset();	
-	void SingleStep();	
-	int SingleStepInner();	
+	void Reset();
+	void SingleStep();
+	int SingleStepInner();
 
 	void Run();
 	void ClearCache();
diff --git a/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_Branch.cpp b/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_Branch.cpp
index 0a14573b49..0b0aa1ba98 100644
--- a/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_Branch.cpp
+++ b/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_Branch.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "Interpreter.h"
 #include "../../HW/CPU.h"
diff --git a/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_FPUtils.h b/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_FPUtils.h
index 5dd96ed6e7..16e5dbc635 100644
--- a/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_FPUtils.h
+++ b/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_FPUtils.h
@@ -1,19 +1,6 @@
-// Copyright (C) 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _INTERPRETER_FPUTILS_H
 #define _INTERPRETER_FPUTILS_H
@@ -70,8 +57,8 @@ inline void SetFI(int FI)
 {
 	if (FI)
 	{
-		SetFPException(FPSCR_XX);		
-	}	
+		SetFPException(FPSCR_XX);
+	}
 	FPSCR.FI = FI;
 }
 
@@ -112,13 +99,13 @@ inline double ForceDouble(double d)
 // also, these may be used to set flags like FR, FI, OX, UX
 
 inline double NI_mul(const double a, const double b)
-{	
+{
 #ifdef VERY_ACCURATE_FP
 	if (a != a) return a;
 	if (b != b) return b;
 	double t = a * b;
 	if (t != t)
-	{		
+	{
 		SetFPException(FPSCR_VXIMZ);
 		return PPC_NAN;
 	}
@@ -248,7 +235,7 @@ inline u32 ConvertToSingleFTZ(u64 x)
 	}
 	else
 	{
-		return (x >> 32) & 0x80000000;		
+		return (x >> 32) & 0x80000000;
 	}
 }
 
diff --git a/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_FloatingPoint.cpp b/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_FloatingPoint.cpp
index ffaea0e868..2f4dc4d493 100644
--- a/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_FloatingPoint.cpp
+++ b/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_FloatingPoint.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include <math.h>
 #include <limits>
@@ -49,7 +36,7 @@ void Interpreter::Helper_UpdateCR1(double _fValue)
 }
 
 void Interpreter::fcmpo(UGeckoInstruction _inst)
-{	
+{
 	double fa = rPS0(_inst.FA);
 	double fb = rPS0(_inst.FB);
 
@@ -64,7 +51,7 @@ void Interpreter::fcmpo(UGeckoInstruction _inst)
 		compareResult = 1;
 		if (IsSNAN(fa) || IsSNAN(fb))
 		{
-			SetFPException(FPSCR_VXSNAN);			
+			SetFPException(FPSCR_VXSNAN);
 			if (FPSCR.VE == 0)
 				SetFPException(FPSCR_VXVC);
 		}
@@ -80,7 +67,7 @@ void Interpreter::fcmpo(UGeckoInstruction _inst)
 }
 
 void Interpreter::fcmpu(UGeckoInstruction _inst)
-{	
+{
 	double fa = rPS0(_inst.FA);
 	double fb = rPS0(_inst.FB);
 
@@ -94,7 +81,7 @@ void Interpreter::fcmpu(UGeckoInstruction _inst)
 		compareResult = 1; 
 		if (IsSNAN(fa) || IsSNAN(fb))
 		{
-			SetFPException(FPSCR_VXSNAN);			
+			SetFPException(FPSCR_VXSNAN);
 		}
 	}
 	FPSCR.FPRF = compareResult;
@@ -108,7 +95,7 @@ void Interpreter::fctiwx(UGeckoInstruction _inst)
 	u32 value;
 	if (b > (double)0x7fffffff)
 	{
-		value = 0x7fffffff;		
+		value = 0x7fffffff;
 		SetFPException(FPSCR_VXCVI);
 		FPSCR.FI = 0;
 		FPSCR.FR = 0;
@@ -135,11 +122,11 @@ void Interpreter::fctiwx(UGeckoInstruction _inst)
 		case 1: // zero
 			i = (s32)b;
 			break;
-		case 2: // +inf			
+		case 2: // +inf
 			i = (s32)b;
 			if (b - i > 0) i++;
 			break;
-		case 3: // -inf			
+		case 3: // -inf
 			i = (s32)b;
 			if (b - i < 0) i--;
 			break;
@@ -153,7 +140,7 @@ void Interpreter::fctiwx(UGeckoInstruction _inst)
 		}
 		else
 		{
-			SetFI(1);			
+			SetFI(1);
 			FPSCR.FR = fabs(di) > fabs(b);
 		}
 	}	
@@ -229,7 +216,7 @@ void Interpreter::fnabsx(UGeckoInstruction _inst)
 	riPS0(_inst.FD) = riPS0(_inst.FB) | (1ULL << 63);
 	// This is a binary instruction. Does not alter FPSCR
 	if (_inst.Rc) Helper_UpdateCR1(rPS0(_inst.FD));	
-}	
+}
 
 void Interpreter::fnegx(UGeckoInstruction _inst)
 {
@@ -293,7 +280,7 @@ void Interpreter::fmaddsx(UGeckoInstruction _inst)
 	rPS0(_inst.FD) = rPS1(_inst.FD) = ForceSingle(d_value);
 	FPSCR.FI = d_value != rPS0(_inst.FD);
 	FPSCR.FR = 0;
- 	UpdateFPRF(rPS0(_inst.FD));
+	UpdateFPRF(rPS0(_inst.FD));
 	if (_inst.Rc) Helper_UpdateCR1(rPS0(_inst.FD));
 }
 
@@ -301,13 +288,13 @@ void Interpreter::fmaddsx(UGeckoInstruction _inst)
 void Interpreter::faddx(UGeckoInstruction _inst)
 {
 	rPS0(_inst.FD) = ForceDouble(NI_add(rPS0(_inst.FA), rPS0(_inst.FB)));
- 	UpdateFPRF(rPS0(_inst.FD));
+	UpdateFPRF(rPS0(_inst.FD));
 	if (_inst.Rc) Helper_UpdateCR1(rPS0(_inst.FD));
 }
 void Interpreter::faddsx(UGeckoInstruction _inst)
 {
 	rPS0(_inst.FD) = rPS1(_inst.FD) = ForceSingle(NI_add(rPS0(_inst.FA), rPS0(_inst.FB)));
- 	UpdateFPRF(rPS0(_inst.FD));
+	UpdateFPRF(rPS0(_inst.FD));
 	if (_inst.Rc) Helper_UpdateCR1(rPS0(_inst.FD)); 
 }
 
@@ -321,9 +308,9 @@ void Interpreter::fdivx(UGeckoInstruction _inst)
 	{
 		rPS0(_inst.FD) = ForceDouble(a / b);
 		if (b == 0.0) 
-		{		
+		{
 			if (a == 0.0)
-			{	
+			{
 				SetFPException(FPSCR_VXZDZ);
 				rPS0(_inst.FD) = PPC_NAN;
 			}
@@ -338,7 +325,7 @@ void Interpreter::fdivx(UGeckoInstruction _inst)
 			}
 		}
 	}
- 	UpdateFPRF(rPS0(_inst.FD));
+	UpdateFPRF(rPS0(_inst.FD));
 	// FR,FI,OX,UX???
 	if (_inst.Rc) Helper_UpdateCR1(rPS0(_inst.FD));
 }
@@ -353,12 +340,12 @@ void Interpreter::fdivsx(UGeckoInstruction _inst)
 	{
 		res = ForceSingle(a / b);
 		if (b == 0.0)
-		{					
+		{
 			if (a == 0.0)
-			{					
+			{
 				SetFPException(FPSCR_VXZDZ);
-				res = PPC_NAN;				
-			}			
+				res = PPC_NAN;
+			}
 			SetFPException(FPSCR_ZX);
 		}
 		else
@@ -371,7 +358,7 @@ void Interpreter::fdivsx(UGeckoInstruction _inst)
 		}
 	}
 	rPS0(_inst.FD) = rPS1(_inst.FD) = res;
- 	UpdateFPRF(rPS0(_inst.FD));
+	UpdateFPRF(rPS0(_inst.FD));
 	if (_inst.Rc) Helper_UpdateCR1(rPS0(_inst.FD));
 }
 
@@ -396,7 +383,7 @@ void Interpreter::fresx(UGeckoInstruction _inst)
 	{
 		SetFPException(FPSCR_ZX);
 	}
- 	UpdateFPRF(rPS0(_inst.FD));
+	UpdateFPRF(rPS0(_inst.FD));
 	if (_inst.Rc) Helper_UpdateCR1(rPS0(_inst.FD));
 }
 
@@ -407,11 +394,12 @@ void Interpreter::frsqrtex(UGeckoInstruction _inst)
 	{
 		SetFPException(FPSCR_VXSQRT);
 		rPS0(_inst.FD) = PPC_NAN;
-	} 
-	else 
+	}
+	else
 	{
 #ifdef VERY_ACCURATE_FP
-		if (b == 0.0) {
+		if (b == 0.0)
+		{
 			SetFPException(FPSCR_ZX);
 			riPS0(_inst.FD) = 0x7ff0000000000000;
 		}
@@ -438,14 +426,14 @@ void Interpreter::frsqrtex(UGeckoInstruction _inst)
 		rPS0(_inst.FD) = ForceDouble(1.0 / sqrt(b));
 #endif
 	}
- 	UpdateFPRF(rPS0(_inst.FD));
+	UpdateFPRF(rPS0(_inst.FD));
 	if (_inst.Rc) Helper_UpdateCR1(rPS0(_inst.FD));
 }
 
 void Interpreter::fmsubx(UGeckoInstruction _inst)
 {
 	rPS0(_inst.FD) = ForceDouble(NI_msub( rPS0(_inst.FA), rPS0(_inst.FC), rPS0(_inst.FB) ));
- 	UpdateFPRF(rPS0(_inst.FD));
+	UpdateFPRF(rPS0(_inst.FD));
 	if (_inst.Rc) Helper_UpdateCR1(rPS0(_inst.FD)); 
 }
 
@@ -453,28 +441,28 @@ void Interpreter::fmsubsx(UGeckoInstruction _inst)
 {
 	rPS0(_inst.FD) = rPS1(_inst.FD) =
 		ForceSingle( NI_msub(rPS0(_inst.FA), rPS0(_inst.FC), rPS0(_inst.FB) ));
- 	UpdateFPRF(rPS0(_inst.FD));
+	UpdateFPRF(rPS0(_inst.FD));
 	if (_inst.Rc) Helper_UpdateCR1(rPS0(_inst.FD)); 
 }
 
 void Interpreter::fnmaddx(UGeckoInstruction _inst)
 {
 	rPS0(_inst.FD) = ForceDouble(-NI_madd(rPS0(_inst.FA), rPS0(_inst.FC), rPS0(_inst.FB)));
- 	UpdateFPRF(rPS0(_inst.FD));
+	UpdateFPRF(rPS0(_inst.FD));
 	if (_inst.Rc) Helper_UpdateCR1(rPS0(_inst.FD));
 }
 void Interpreter::fnmaddsx(UGeckoInstruction _inst)
 {
 	rPS0(_inst.FD) = rPS1(_inst.FD) = 
 		ForceSingle(-NI_madd(rPS0(_inst.FA), rPS0(_inst.FC), rPS0(_inst.FB)));
- 	UpdateFPRF(rPS0(_inst.FD));
+	UpdateFPRF(rPS0(_inst.FD));
 	if (_inst.Rc) Helper_UpdateCR1(rPS0(_inst.FD)); 
 }
 
 void Interpreter::fnmsubx(UGeckoInstruction _inst)
 {
 	rPS0(_inst.FD) = ForceDouble(-NI_msub(rPS0(_inst.FA), rPS0(_inst.FC), rPS0(_inst.FB)));
- 	UpdateFPRF(rPS0(_inst.FD));
+	UpdateFPRF(rPS0(_inst.FD));
 	if (_inst.Rc) Helper_UpdateCR1(rPS0(_inst.FD));
 }
 
@@ -483,14 +471,14 @@ void Interpreter::fnmsubsx(UGeckoInstruction _inst)
 {
 	rPS0(_inst.FD) = rPS1(_inst.FD) =
 		ForceSingle(-NI_msub(rPS0(_inst.FA), rPS0(_inst.FC), rPS0(_inst.FB)));
- 	UpdateFPRF(rPS0(_inst.FD));
+	UpdateFPRF(rPS0(_inst.FD));
 	if (_inst.Rc) Helper_UpdateCR1(rPS0(_inst.FD)); 
 }
 
 void Interpreter::fsubx(UGeckoInstruction _inst)
 {
 	rPS0(_inst.FD) = ForceDouble(NI_sub(rPS0(_inst.FA), rPS0(_inst.FB)));
- 	UpdateFPRF(rPS0(_inst.FD));
+	UpdateFPRF(rPS0(_inst.FD));
 	if (_inst.Rc) Helper_UpdateCR1(rPS0(_inst.FD));
 }
 
@@ -510,6 +498,6 @@ void Interpreter::fsqrtx(UGeckoInstruction _inst)
 		FPSCR.VXSQRT = 1;
 	}
 	rPS0(_inst.FD) = sqrt(b);
- 	UpdateFPRF(rPS0(_inst.FD));
+	UpdateFPRF(rPS0(_inst.FD));
 	if (_inst.Rc) Helper_UpdateCR1(rPS0(_inst.FD));
 }
diff --git a/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_Integer.cpp b/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_Integer.cpp
index 743ff86431..71ea36eedd 100644
--- a/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_Integer.cpp
+++ b/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_Integer.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "Interpreter.h"
 #include "../../Core.h"
diff --git a/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_LoadStore.cpp b/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_LoadStore.cpp
index 8e406dbfab..54e1246095 100644
--- a/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_LoadStore.cpp
+++ b/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_LoadStore.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "Common.h"
 #include "Atomic.h"
@@ -394,7 +381,7 @@ void Interpreter::dcbtst(UGeckoInstruction _inst)
 }
 
 void Interpreter::dcbz(UGeckoInstruction _inst)
-{	
+{
 	// HACK but works... we think
 	if (!Core::g_CoreStartupParameter.bDCBZOFF)
 		Memory::Memset(Helper_Get_EA_X(_inst) & (~31), 0, 32);
@@ -457,7 +444,7 @@ void Interpreter::eieio(UGeckoInstruction _inst)
 }
 
 void Interpreter::icbi(UGeckoInstruction _inst)
-{	
+{
 	u32 address = Helper_Get_EA_X(_inst);	
 	PowerPC::ppcState.iCache.Invalidate(address);
 }
@@ -730,7 +717,7 @@ void Interpreter::stswi(UGeckoInstruction _inst)
 		EA = 0;
 	else
 		EA = m_GPR[_inst.RA];
-    
+
 	u32 n;
 	if (_inst.NB == 0)
 		n = 32;
@@ -792,7 +779,7 @@ void Interpreter::stwbrx(UGeckoInstruction _inst)
 
 // The following two instructions are for SMP communications. On a single
 // CPU, they cannot fail unless an interrupt happens in between.
-    
+
 void Interpreter::lwarx(UGeckoInstruction _inst)
 {
 	u32 uAddress = Helper_Get_EA_X(_inst);
diff --git a/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_LoadStorePaired.cpp b/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_LoadStorePaired.cpp
index ed15500260..caaff00373 100644
--- a/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_LoadStorePaired.cpp
+++ b/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_LoadStorePaired.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include <math.h>
 #include "Interpreter.h"
diff --git a/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_Paired.cpp b/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_Paired.cpp
index 923443186c..54baf2e0c2 100644
--- a/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_Paired.cpp
+++ b/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_Paired.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include <math.h>
 #include "Common.h"
diff --git a/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_SystemRegisters.cpp b/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_SystemRegisters.cpp
index 7847496b6e..b55cbd6b45 100644
--- a/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_SystemRegisters.cpp
+++ b/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_SystemRegisters.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include <float.h>
 #ifdef _WIN32
@@ -446,7 +433,7 @@ void Interpreter::mcrf(UGeckoInstruction _inst)
 
 void Interpreter::isync(UGeckoInstruction _inst)
 {
-	//shouldnt do anything
+	//shouldn't do anything
 }
 
 // the following commands read from FPSCR
diff --git a/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_Tables.cpp b/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_Tables.cpp
index fee8ed70d8..f1403bed87 100644
--- a/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_Tables.cpp
+++ b/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_Tables.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "Interpreter_Tables.h"
 
diff --git a/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_Tables.h b/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_Tables.h
index e532345b7c..c9f193b4df 100644
--- a/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_Tables.h
+++ b/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_Tables.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef INTERPRETER_TABLES_H
 #define INTERPRETER_TABLES_H
diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp
index 3995fc9299..50266d7f84 100644
--- a/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp
+++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include <map>
 
@@ -611,6 +598,30 @@ const u8* Jit64::DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitBloc
 				js.firstFPInstructionFound = true;
 			}
 
+			// Add an external exception check if the instruction writes to the FIFO.
+			if (jit->js.fifoWriteAddresses.find(ops[i].address) != jit->js.fifoWriteAddresses.end())
+			{
+				gpr.Flush(FLUSH_ALL);
+				fpr.Flush(FLUSH_ALL);
+
+				TEST(32, M((void *)&PowerPC::ppcState.Exceptions), Imm32(EXCEPTION_ISI | EXCEPTION_PROGRAM | EXCEPTION_SYSCALL | EXCEPTION_FPU_UNAVAILABLE | EXCEPTION_DSI | EXCEPTION_ALIGNMENT));
+				FixupBranch clearInt = J_CC(CC_NZ, true);
+				TEST(32, M((void *)&PowerPC::ppcState.Exceptions), Imm32(EXCEPTION_EXTERNAL_INT));
+				FixupBranch noExtException = J_CC(CC_Z, true);
+				TEST(32, M((void *)&PowerPC::ppcState.msr), Imm32(0x0008000));
+				FixupBranch noExtIntEnable = J_CC(CC_Z, true);
+				TEST(32, M((void *)&ProcessorInterface::m_InterruptCause), Imm32(ProcessorInterface::INT_CAUSE_CP | ProcessorInterface::INT_CAUSE_PE_TOKEN | ProcessorInterface::INT_CAUSE_PE_FINISH));
+				FixupBranch noCPInt = J_CC(CC_Z, true);
+
+				MOV(32, M(&PC), Imm32(ops[i].address));
+				WriteExternalExceptionExit();
+
+				SetJumpTarget(noCPInt);
+				SetJumpTarget(noExtIntEnable);
+				SetJumpTarget(noExtException);
+				SetJumpTarget(clearInt);
+			}
+
 			if (Core::g_CoreStartupParameter.bEnableDebugging && breakpoints.IsAddressBreakPoint(ops[i].address) && GetState() != CPU_STEPPING)
 			{
 				gpr.Flush(FLUSH_ALL);
@@ -655,7 +666,7 @@ const u8* Jit64::DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitBloc
 		{
 			char ppcInst[256];
 			DisassembleGekko(ops[i].inst.hex, em_address, ppcInst, 256);
-			NOTICE_LOG(DYNA_REC, "Unflushed reg: %s", ppcInst);
+			NOTICE_LOG(DYNA_REC, "Unflushed register: %s", ppcInst);
 		}
 #endif
 		if (js.skipnext) {
diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit.h b/Source/Core/Core/Src/PowerPC/Jit64/Jit.h
index 1d856d6291..885f7f3c4a 100644
--- a/Source/Core/Core/Src/PowerPC/Jit64/Jit.h
+++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 // ========================
 // See comments in Jit.cpp.
diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit64_Tables.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit64_Tables.cpp
index cee1f4d048..268e2562d6 100644
--- a/Source/Core/Core/Src/PowerPC/Jit64/Jit64_Tables.cpp
+++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit64_Tables.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "Jit.h"
 #include "Jit64_Tables.h"
diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit64_Tables.h b/Source/Core/Core/Src/PowerPC/Jit64/Jit64_Tables.h
index c2049593c4..e77343c496 100644
--- a/Source/Core/Core/Src/PowerPC/Jit64/Jit64_Tables.h
+++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit64_Tables.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef JIT64_TABLES_H
 #define JIT64_TABLES_H
diff --git a/Source/Core/Core/Src/PowerPC/Jit64/JitAsm.cpp b/Source/Core/Core/Src/PowerPC/Jit64/JitAsm.cpp
index df27a3a641..7403ead883 100644
--- a/Source/Core/Core/Src/PowerPC/Jit64/JitAsm.cpp
+++ b/Source/Core/Core/Src/PowerPC/Jit64/JitAsm.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "x64ABI.h"
 #include "x64Emitter.h"
diff --git a/Source/Core/Core/Src/PowerPC/Jit64/JitAsm.h b/Source/Core/Core/Src/PowerPC/Jit64/JitAsm.h
index 19e1f41ba8..8835a07bcc 100644
--- a/Source/Core/Core/Src/PowerPC/Jit64/JitAsm.h
+++ b/Source/Core/Core/Src/PowerPC/Jit64/JitAsm.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _JIT64ASM_H
 #define _JIT64ASM_H
diff --git a/Source/Core/Core/Src/PowerPC/Jit64/JitRegCache.cpp b/Source/Core/Core/Src/PowerPC/Jit64/JitRegCache.cpp
index 27ae341b0a..39c05f88e9 100644
--- a/Source/Core/Core/Src/PowerPC/Jit64/JitRegCache.cpp
+++ b/Source/Core/Core/Src/PowerPC/Jit64/JitRegCache.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "../PowerPC.h"
 #include "../PPCTables.h"
@@ -25,7 +12,8 @@
 using namespace Gen;
 using namespace PowerPC;
 
-RegCache::RegCache() : emit(0) {
+RegCache::RegCache() : emit(0)
+{
 	memset(locks, 0, sizeof(locks));
 	memset(xlocks, 0, sizeof(xlocks));
 	memset(saved_locks, 0, sizeof(saved_locks));
@@ -165,9 +153,12 @@ void RegCache::FlushR(X64Reg reg)
 
 int RegCache::SanityCheck() const
 {
-	for (int i = 0; i < 32; i++) {
-		if (regs[i].away) {
-			if (regs[i].location.IsSimpleReg()) {
+	for (int i = 0; i < 32; i++)
+	{
+		if (regs[i].away)
+		{
+			if (regs[i].location.IsSimpleReg())
+			{
 				Gen::X64Reg simple = regs[i].location.GetSimpleReg();
 				if (xlocks[simple])
 					return 1;
@@ -298,7 +289,9 @@ void GPRRegCache::BindToRegister(int i, bool doLoad, bool makeDirty)
 		// and immediates are taken care of above.
 		xregs[RX(i)].dirty |= makeDirty;
 	}
-	if (xlocks[RX(i)]) {
+
+	if (xlocks[RX(i)])
+	{
 		PanicAlert("Seriously WTF, this reg should have been flushed");
 	}
 }
@@ -351,7 +344,9 @@ void FPURegCache::BindToRegister(int i, bool doLoad, bool makeDirty)
 		}
 		regs[i].location = newloc;
 		regs[i].away = true;
-	} else {
+	}
+	else
+	{
 		// There are no immediates in the FPR reg file, so we already had this in a register. Make dirty as necessary.
 		xregs[RX(i)].dirty |= makeDirty;
 	}
@@ -380,15 +375,17 @@ void FPURegCache::StoreFromRegister(int i)
 
 void RegCache::Flush(FlushMode mode)
 {
-	for (int i = 0; i < NUMXREGS; i++) {
+	for (int i = 0; i < NUMXREGS; i++)
+	{
 		if (xlocks[i])
 			PanicAlert("Someone forgot to unlock X64 reg %i.", i);
 	}
+
 	for (int i = 0; i < 32; i++)
 	{
 		if (locks[i])
 		{
-			PanicAlert("Somebody forgot to unlock PPC reg %i.", i);
+			PanicAlert("Someone forgot to unlock PPC reg %i.", i);
 		}
 		if (regs[i].away)
 		{
diff --git a/Source/Core/Core/Src/PowerPC/Jit64/JitRegCache.h b/Source/Core/Core/Src/PowerPC/Jit64/JitRegCache.h
index cefa0e13f7..73df8c8672 100644
--- a/Source/Core/Core/Src/PowerPC/Jit64/JitRegCache.h
+++ b/Source/Core/Core/Src/PowerPC/Jit64/JitRegCache.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _JIT64REGCACHE_H
 #define _JIT64REGCACHE_H
diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit_Branch.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit_Branch.cpp
index 12c47fd41a..762b6fe5d4 100644
--- a/Source/Core/Core/Src/PowerPC/Jit64/Jit_Branch.cpp
+++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit_Branch.cpp
@@ -1,19 +1,7 @@
-// Copyright (C) 2003 Dolphin Project.
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
-// 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"
 
diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit_FloatingPoint.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit_FloatingPoint.cpp
index fd197d0e84..87fe51382d 100644
--- a/Source/Core/Core/Src/PowerPC/Jit64/Jit_FloatingPoint.cpp
+++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit_FloatingPoint.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "Common.h"
 
diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp
index 3d88d687e0..54fa742148 100644
--- a/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp
+++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "../../Core.h" // include "Common.h", "CoreParameter.h", SCoreStartupParameter
 #include "../PowerPC.h"
@@ -121,7 +108,8 @@ void Jit64::FinalizeCarryGenerateOverflowEAX(bool oe, bool inv)
 }
 
 // Assumes that the flags were just set through an addition.
-void Jit64::GenerateCarry() {
+void Jit64::GenerateCarry()
+{
 	// USES_XER
 	FixupBranch pNoCarry = J_CC(CC_NC);
 	OR(32, M(&PowerPC::ppcState.spr[SPR_XER]), Imm32(XER_CA_MASK));
@@ -132,7 +120,8 @@ void Jit64::GenerateCarry() {
 }
 
 // Assumes that Sign and Zero flags were set by the last operation. Preserves all flags and registers.
-void Jit64::GenerateRC() {
+void Jit64::GenerateRC()
+{
 	FixupBranch pZero  = J_CC(CC_Z);
 	FixupBranch pNegative = J_CC(CC_S);
 	MOV(8, M(&PowerPC::ppcState.cr_fast[0]), Imm8(0x4)); // Result > 0
@@ -149,7 +138,8 @@ void Jit64::GenerateRC() {
 	SetJumpTarget(continue2);
 }
 
-void Jit64::ComputeRC(const Gen::OpArg & arg) {
+void Jit64::ComputeRC(const Gen::OpArg & arg)
+{
 	if( arg.IsImm() )
 	{
 		s32 value = (s32)arg.offset;
@@ -252,28 +242,36 @@ void Jit64::reg_imm(UGeckoInstruction inst)
 	{
 	case 14:  // addi
 		// occasionally used as MOV - emulate, with immediate propagation
-		if (gpr.R(a).IsImm() && d != a && a != 0) {
+		if (gpr.R(a).IsImm() && d != a && a != 0)
+		{
 			gpr.SetImmediate32(d, (u32)gpr.R(a).offset + (u32)(s32)(s16)inst.SIMM_16);
-		} else if (inst.SIMM_16 == 0 && d != a && a != 0) {
+		}
+		else if (inst.SIMM_16 == 0 && d != a && a != 0)
+		{
 			gpr.Lock(a, d);
 			gpr.BindToRegister(d, false, true);
 			MOV(32, gpr.R(d), gpr.R(a));
 			gpr.UnlockAll();
-		} else {
+		}
+		else
+		{
 			regimmop(d, a, false, (u32)(s32)inst.SIMM_16,  Add, &XEmitter::ADD); //addi
 		}
 		break;
 	case 15:
 		if (a == 0) {	// lis
 			// Merge with next instruction if loading a 32-bits immediate value (lis + addi, lis + ori)
-			if (!js.isLastInstruction && !Core::g_CoreStartupParameter.bEnableDebugging) {
-				if ((js.next_inst.OPCD == 14) && (js.next_inst.RD == d) && (js.next_inst.RA == d)) {      // addi
+			if (!js.isLastInstruction && !Core::g_CoreStartupParameter.bEnableDebugging)
+			{
+				if ((js.next_inst.OPCD == 14) && (js.next_inst.RD == d) && (js.next_inst.RA == d)) // addi
+				{
 					gpr.SetImmediate32(d, ((u32)inst.SIMM_16 << 16) + (u32)(s32)js.next_inst.SIMM_16);
 					js.downcountAmount++;
 					js.skipnext = true;
 					break;
 				}
-				else if ((js.next_inst.OPCD == 24) && (js.next_inst.RA == d) && (js.next_inst.RS == d))	{ // ori
+				else if ((js.next_inst.OPCD == 24) && (js.next_inst.RA == d) && (js.next_inst.RS == d)) // ori
+				{
 					gpr.SetImmediate32(d, ((u32)inst.SIMM_16 << 16) | (u32)js.next_inst.UIMM);
 					js.downcountAmount++;
 					js.skipnext = true;
@@ -284,7 +282,8 @@ void Jit64::reg_imm(UGeckoInstruction inst)
 			// Not merged
 			regimmop(d, a, false, (u32)inst.SIMM_16 << 16, Add, &XEmitter::ADD);
 		}
-		else {	// addis
+		else // addis
+		{
 			regimmop(d, a, false, (u32)inst.SIMM_16 << 16, Add, &XEmitter::ADD);
 		}
 		break;
@@ -338,17 +337,23 @@ void Jit64::cmpXX(UGeckoInstruction inst)
 		comparand = gpr.R(b);
 		signedCompare = (inst.SUBOP10 == 0);
 	}
-	else {
+	else
+	{
 		gpr.Lock(a);
-		if (inst.OPCD == 10) {
+		if (inst.OPCD == 10)
+		{
 			//cmpli
 			comparand = Imm32((u32)inst.UIMM);
 			signedCompare = false;
-		} else if (inst.OPCD == 11) {
+		}
+		else if (inst.OPCD == 11)
+		{
 			//cmpi
 			comparand = Imm32((u32)(s32)(s16)inst.UIMM);
 			signedCompare = true;
-		} else {
+		}
+		else
+		{
 			signedCompare = false;	// silence compiler warning
 			PanicAlert("cmpXX");
 		}
@@ -469,7 +474,9 @@ void Jit64::cmpXX(UGeckoInstruction inst)
 			SetJumpTarget(continue2);
 			// TODO: If we ever care about SO, borrow a trick from 
 			// http://maws.mameworld.info/maws/mamesrc/src/emu/cpu/powerpc/drc_ops.c : bt, adc
-		} else {
+		}
+		else
+		{
 			js.downcountAmount++;
 			int test_bit = 8 >> (js.next_inst.BI & 3);
 			bool condition = (js.next_inst.BO & BO_BRANCH_IF_TRUE) ? false : true;
@@ -982,10 +989,10 @@ void Jit64::subfex(UGeckoInstruction inst)
 
 void Jit64::subfmex(UGeckoInstruction inst)
 {
-    // USES_XER
-    INSTRUCTION_START
-    JITDISABLE(Integer)
-    int a = inst.RA, d = inst.RD;
+	// USES_XER
+	INSTRUCTION_START
+	JITDISABLE(Integer)
+	int a = inst.RA, d = inst.RD;
 	gpr.Lock(a, d);
 	gpr.BindToRegister(d, d == a);
 
@@ -1006,10 +1013,10 @@ void Jit64::subfmex(UGeckoInstruction inst)
 
 void Jit64::subfzex(UGeckoInstruction inst)
 {
-    // USES_XER
-    INSTRUCTION_START
-    JITDISABLE(Integer)
-    int a = inst.RA, d = inst.RD;
+	// USES_XER
+	INSTRUCTION_START
+	JITDISABLE(Integer)
+	int a = inst.RA, d = inst.RD;
 	
 	gpr.Lock(a, d);
 	gpr.BindToRegister(d, d == a);
@@ -1096,7 +1103,9 @@ void Jit64::mulli(UGeckoInstruction inst)
 		gpr.Lock(a, d);
 		gpr.BindToRegister(d, (d == a), true);
 		if (imm == 0)
+		{
 			XOR(32, gpr.R(d), gpr.R(d));
+		}
 		else if(imm == (u32)-1)
 		{
 			if (d != a)
@@ -1117,7 +1126,10 @@ void Jit64::mulli(UGeckoInstruction inst)
 				SHL(32, gpr.R(d), Imm8(shift));
 		}
 		else
+		{
 			IMUL(32, gpr.RX(d), gpr.R(a), Imm32(imm));
+		}
+
 		gpr.UnlockAll();
 	}
 }
@@ -1146,7 +1158,9 @@ void Jit64::mullwx(UGeckoInstruction inst)
 			u32 imm = gpr.R(a).IsImm() ? (u32)gpr.R(a).offset : (u32)gpr.R(b).offset;
 			int src = gpr.R(a).IsImm() ? b : a;
 			if (imm == 0)
+			{
 				XOR(32, gpr.R(d), gpr.R(d));
+			}
 			else if(imm == (u32)-1)
 			{
 				if (d != src)
@@ -1167,16 +1181,22 @@ void Jit64::mullwx(UGeckoInstruction inst)
 					SHL(32, gpr.R(d), Imm8(shift));
 			}
 			else
+			{
 				IMUL(32, gpr.RX(d), gpr.R(src), Imm32(imm));
+			}
 		}
 		else if (d == a)
+		{
 			IMUL(32, gpr.RX(d), gpr.R(b));
+		}
 		else if (d == b)
+		{
 			IMUL(32, gpr.RX(d), gpr.R(a));
+		}
 		else
 		{
-				MOV(32, gpr.R(d), gpr.R(b));
-				IMUL(32, gpr.RX(d), gpr.R(a));
+			MOV(32, gpr.R(d), gpr.R(b));
+			IMUL(32, gpr.RX(d), gpr.R(a));
 		}
 		if (inst.OE)
 		{
@@ -1454,9 +1474,9 @@ void Jit64::divwx(UGeckoInstruction inst)
 
 void Jit64::addx(UGeckoInstruction inst)
 {
-    INSTRUCTION_START
-    JITDISABLE(Integer)
-    int a = inst.RA, b = inst.RB, d = inst.RD;
+	INSTRUCTION_START
+	JITDISABLE(Integer)
+	int a = inst.RA, b = inst.RB, d = inst.RD;
 	
 	if (gpr.R(a).IsImm() && gpr.R(b).IsImm())
 	{
@@ -1514,10 +1534,10 @@ void Jit64::addx(UGeckoInstruction inst)
 
 void Jit64::addex(UGeckoInstruction inst)
 {
-    // USES_XER
-    INSTRUCTION_START
-    JITDISABLE(Integer)
-    int a = inst.RA, b = inst.RB, d = inst.RD;
+	// USES_XER
+	INSTRUCTION_START
+	JITDISABLE(Integer)
+	int a = inst.RA, b = inst.RB, d = inst.RD;
 	
 	if ((d == a) || (d == b))
 	{
@@ -1552,9 +1572,9 @@ void Jit64::addex(UGeckoInstruction inst)
 
 void Jit64::addcx(UGeckoInstruction inst)
 {
-    INSTRUCTION_START
-    JITDISABLE(Integer)
-    int a = inst.RA, b = inst.RB, d = inst.RD;
+	INSTRUCTION_START
+	JITDISABLE(Integer)
+	int a = inst.RA, b = inst.RB, d = inst.RD;
 	
 	if ((d == a) || (d == b))
 	{
@@ -1588,10 +1608,10 @@ void Jit64::addcx(UGeckoInstruction inst)
 
 void Jit64::addmex(UGeckoInstruction inst)
 {
-    // USES_XER
-    INSTRUCTION_START
-    JITDISABLE(Integer)
-    int a = inst.RA, d = inst.RD;
+	// USES_XER
+	INSTRUCTION_START
+	JITDISABLE(Integer)
+	int a = inst.RA, d = inst.RD;
 	
 	if (d == a)
 	{
@@ -1626,10 +1646,10 @@ void Jit64::addmex(UGeckoInstruction inst)
 
 void Jit64::addzex(UGeckoInstruction inst)
 {
-    // USES_XER
-    INSTRUCTION_START
-    JITDISABLE(Integer)
-    int a = inst.RA, d = inst.RD;
+	// USES_XER
+	INSTRUCTION_START
+	JITDISABLE(Integer)
+	int a = inst.RA, d = inst.RD;
 	
 	if (d == a)
 	{
@@ -1977,7 +1997,7 @@ void Jit64::slwx(UGeckoInstruction inst)
 		}
 		else
 		{
-			MOV(32, gpr.R(a), gpr.R(a));
+			MOVZX(64, 32, gpr.R(a).GetSimpleReg(), gpr.R(a));
 		}
 		gpr.UnlockAll();
 		gpr.UnlockAllX();
diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStore.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStore.cpp
index 29d17dc875..53ab412070 100644
--- a/Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStore.cpp
+++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStore.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 // TODO(ector): Tons of pshufb optimization of the loads/stores, for SSSE3+, possibly SSE4, only.
 // Should give a very noticable speed boost to paired single heavy code.
diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStoreFloating.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStoreFloating.cpp
index 5766eb3177..04085cb34a 100644
--- a/Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStoreFloating.cpp
+++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStoreFloating.cpp
@@ -1,22 +1,9 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 // TODO(ector): Tons of pshufb optimization of the loads/stores, for SSSE3+, possibly SSE4, only.
-// Should give a very noticable speed boost to paired single heavy code.
+// Should give a very noticeable speed boost to paired single heavy code.
 
 #include "Common.h"
 
diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStorePaired.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStorePaired.cpp
index a6f57796e4..e89f414150 100644
--- a/Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStorePaired.cpp
+++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStorePaired.cpp
@@ -1,22 +1,9 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 // TODO(ector): Tons of pshufb optimization of the loads/stores, for SSSE3+, possibly SSE4, only.
-// Should give a very noticable speed boost to paired single heavy code.
+// Should give a very noticeable speed boost to paired single heavy code.
 
 #include "Common.h"
  
diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit_Paired.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit_Paired.cpp
index fcd04f4970..b028c77298 100644
--- a/Source/Core/Core/Src/PowerPC/Jit64/Jit_Paired.cpp
+++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit_Paired.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "Common.h"
 
diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit_SystemRegisters.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit_SystemRegisters.cpp
index 7c3766c69a..9475be947b 100644
--- a/Source/Core/Core/Src/PowerPC/Jit64/Jit_SystemRegisters.cpp
+++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit_SystemRegisters.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "Common.h"
 
@@ -176,10 +163,13 @@ void Jit64::mfcr(UGeckoInstruction inst)
 	gpr.Lock(d);
 	gpr.KillImmediate(d, false, true);
 	MOV(8, R(EAX), M(&PowerPC::ppcState.cr_fast[0]));
-	for (int i = 1; i < 8; i++) {
+
+	for (int i = 1; i < 8; i++)
+	{
 		SHL(32, R(EAX), Imm8(4));
 		OR(8, R(EAX), M(&PowerPC::ppcState.cr_fast[i]));
 	}
+
 	MOV(32, gpr.R(d), R(EAX));
 	gpr.UnlockAll();
 }
diff --git a/Source/Core/Core/Src/PowerPC/Jit64IL/IR.cpp b/Source/Core/Core/Src/PowerPC/Jit64IL/IR.cpp
index fdec5b747d..82beace052 100644
--- a/Source/Core/Core/Src/PowerPC/Jit64IL/IR.cpp
+++ b/Source/Core/Core/Src/PowerPC/Jit64IL/IR.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 /*
 
@@ -1269,7 +1256,7 @@ static const unsigned alwaysUsedList[] = {
 	Store16, Store32, StoreSingle, StoreDouble, StorePaired, StoreFReg, FDCmpCR,
 	BlockStart, BlockEnd, IdleBranch, BranchCond, BranchUncond, ShortIdleLoop,
 	SystemCall, InterpreterBranch, RFIExit, FPExceptionCheck,
-	DSIExceptionCheck, ISIException, BreakPointCheck,
+	DSIExceptionCheck, ISIException, ExtExceptionCheck, BreakPointCheck,
 	Int3, Tramp, Nop
 };
 static const unsigned extra8RegList[] = {
diff --git a/Source/Core/Core/Src/PowerPC/Jit64IL/IR.h b/Source/Core/Core/Src/PowerPC/Jit64IL/IR.h
index 5bc7da9d8d..cce9c3ae3c 100644
--- a/Source/Core/Core/Src/PowerPC/Jit64IL/IR.h
+++ b/Source/Core/Core/Src/PowerPC/Jit64IL/IR.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef IR_H
 #define IR_H
@@ -168,7 +155,7 @@ enum Opcode {
 	// used for exception checking, at least until someone
 	// has a better idea of integrating it
 	FPExceptionCheck, DSIExceptionCheck,
-	ISIException, BreakPointCheck,
+	ISIException, ExtExceptionCheck, BreakPointCheck,
 	// "Opcode" representing a register too far away to
 	// reference directly; this is a size optimization
 	Tramp,
@@ -411,6 +398,9 @@ public:
 	InstLoc EmitISIException(InstLoc dest) {
 		return EmitUOp(ISIException, dest);
 	}
+	InstLoc EmitExtExceptionCheck(InstLoc pc) {
+		return EmitUOp(ExtExceptionCheck, pc);
+	}
 	InstLoc EmitBreakPointCheck(InstLoc pc) {
 		return EmitUOp(BreakPointCheck, pc);
 	}
diff --git a/Source/Core/Core/Src/PowerPC/Jit64IL/IR_X86.cpp b/Source/Core/Core/Src/PowerPC/Jit64IL/IR_X86.cpp
index 88d815e33d..78bf1db57c 100644
--- a/Source/Core/Core/Src/PowerPC/Jit64IL/IR_X86.cpp
+++ b/Source/Core/Core/Src/PowerPC/Jit64IL/IR_X86.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 /*
 For a more general explanation of the IR, see IR.cpp.
@@ -762,6 +749,7 @@ static void DoWriteCode(IRBuilder* ibuild, JitIL* Jit, bool UseProfile, bool Mak
 		case FPExceptionCheck:
 		case DSIExceptionCheck:
 		case ISIException:
+		case ExtExceptionCheck:
 		case BreakPointCheck:
 		case Int3:
 		case Tramp:
@@ -1940,6 +1928,27 @@ static void DoWriteCode(IRBuilder* ibuild, JitIL* Jit, bool UseProfile, bool Mak
 			Jit->WriteExceptionExit();
 			break;
 		}
+		case ExtExceptionCheck: {
+			unsigned InstLoc = ibuild->GetImmValue(getOp1(I));
+
+			Jit->TEST(32, M((void *)&PowerPC::ppcState.Exceptions), Imm32(EXCEPTION_ISI | EXCEPTION_PROGRAM | EXCEPTION_SYSCALL | EXCEPTION_FPU_UNAVAILABLE | EXCEPTION_DSI | EXCEPTION_ALIGNMENT));
+			FixupBranch clearInt = Jit->J_CC(CC_NZ);
+			Jit->TEST(32, M((void *)&PowerPC::ppcState.Exceptions), Imm32(EXCEPTION_EXTERNAL_INT));
+			FixupBranch noExtException = Jit->J_CC(CC_Z);
+			Jit->TEST(32, M((void *)&PowerPC::ppcState.msr), Imm32(0x0008000));
+			FixupBranch noExtIntEnable = Jit->J_CC(CC_Z);
+			Jit->TEST(32, M((void *)&ProcessorInterface::m_InterruptCause), Imm32(ProcessorInterface::INT_CAUSE_CP | ProcessorInterface::INT_CAUSE_PE_TOKEN | ProcessorInterface::INT_CAUSE_PE_FINISH));
+			FixupBranch noCPInt = Jit->J_CC(CC_Z);
+
+			Jit->MOV(32, M(&PC), Imm32(InstLoc));
+			Jit->WriteExceptionExit();
+
+			Jit->SetJumpTarget(noCPInt);
+			Jit->SetJumpTarget(noExtIntEnable);
+			Jit->SetJumpTarget(noExtException);
+			Jit->SetJumpTarget(clearInt);
+			break;
+		}
 		case BreakPointCheck: {
 			unsigned InstLoc = ibuild->GetImmValue(getOp1(I));
 
diff --git a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL.cpp b/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL.cpp
index f10df33d99..4b04415add 100644
--- a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL.cpp
+++ b/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include <map>
 
@@ -679,6 +666,11 @@ const u8* JitIL::DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitBloc
 				ibuild.EmitFPExceptionCheck(ibuild.EmitIntConst(ops[i].address));
 			}
 
+			if (jit->js.fifoWriteAddresses.find(js.compilerPC) != jit->js.fifoWriteAddresses.end())
+			{
+				ibuild.EmitExtExceptionCheck(ibuild.EmitIntConst(ops[i].address));
+			}
+
 			if (Core::g_CoreStartupParameter.bEnableDebugging && breakpoints.IsAddressBreakPoint(ops[i].address) && GetState() != CPU_STEPPING)
 			{
 				ibuild.EmitBreakPointCheck(ibuild.EmitIntConst(ops[i].address));
diff --git a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL.h b/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL.h
index 8c579fa4bd..34290d4567 100644
--- a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL.h
+++ b/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 // ========================
 // See comments in Jit.cpp.
diff --git a/Source/Core/Core/Src/PowerPC/Jit64IL/JitILAsm.cpp b/Source/Core/Core/Src/PowerPC/Jit64IL/JitILAsm.cpp
index aaa155072e..15786980fa 100644
--- a/Source/Core/Core/Src/PowerPC/Jit64IL/JitILAsm.cpp
+++ b/Source/Core/Core/Src/PowerPC/Jit64IL/JitILAsm.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "x64ABI.h"
 #include "x64Emitter.h"
diff --git a/Source/Core/Core/Src/PowerPC/Jit64IL/JitILAsm.h b/Source/Core/Core/Src/PowerPC/Jit64IL/JitILAsm.h
index 718894e04a..8222e897c3 100644
--- a/Source/Core/Core/Src/PowerPC/Jit64IL/JitILAsm.h
+++ b/Source/Core/Core/Src/PowerPC/Jit64IL/JitILAsm.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _JITASM_H
 #define _JITASM_H
diff --git a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_Branch.cpp b/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_Branch.cpp
index 207ac60a5f..d0ea86225d 100644
--- a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_Branch.cpp
+++ b/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_Branch.cpp
@@ -1,19 +1,7 @@
-// Copyright (C) 2003 Dolphin Project.
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
-// 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"
 
diff --git a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_FloatingPoint.cpp b/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_FloatingPoint.cpp
index 81dfa96373..9a0207f85c 100644
--- a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_FloatingPoint.cpp
+++ b/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_FloatingPoint.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "Common.h"
 
diff --git a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_Integer.cpp b/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_Integer.cpp
index 379aaca48a..0734bea7e0 100644
--- a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_Integer.cpp
+++ b/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_Integer.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifdef _MSC_VER
 #pragma warning(disable:4146)  // unary minus operator applied to unsigned type, result still unsigned
diff --git a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_LoadStore.cpp b/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_LoadStore.cpp
index 96902434a6..70ccb9d509 100644
--- a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_LoadStore.cpp
+++ b/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_LoadStore.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 // TODO(ector): Tons of pshufb optimization of the loads/stores, for SSSE3+, possibly SSE4, only.
 // Should give a very noticable speed boost to paired single heavy code.
diff --git a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_LoadStoreFloating.cpp b/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_LoadStoreFloating.cpp
index c74abfd8e9..8f8297706c 100644
--- a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_LoadStoreFloating.cpp
+++ b/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_LoadStoreFloating.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 // TODO(ector): Tons of pshufb optimization of the loads/stores, for SSSE3+, possibly SSE4, only.
 // Should give a very noticable speed boost to paired single heavy code.
diff --git a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_LoadStorePaired.cpp b/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_LoadStorePaired.cpp
index 6e86804bec..1ff392d731 100644
--- a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_LoadStorePaired.cpp
+++ b/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_LoadStorePaired.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "Common.h"
 
diff --git a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_Paired.cpp b/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_Paired.cpp
index 628c323f95..671e022b31 100644
--- a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_Paired.cpp
+++ b/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_Paired.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "Common.h"
 
diff --git a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_SystemRegisters.cpp b/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_SystemRegisters.cpp
index 4a1b26a1d6..0fb9d68f81 100644
--- a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_SystemRegisters.cpp
+++ b/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_SystemRegisters.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "Common.h"
 
diff --git a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_Tables.cpp b/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_Tables.cpp
index fd920c4a48..7ca1ad5a53 100644
--- a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_Tables.cpp
+++ b/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_Tables.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "JitIL_Tables.h"
 
diff --git a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_Tables.h b/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_Tables.h
index a07adb2fb9..7225bf8abc 100644
--- a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_Tables.h
+++ b/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_Tables.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef JITIL_TABLES_H
 #define JITIL_TABLES_H
diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h b/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h
index 7067e3a3a4..b610ec1eec 100644
--- a/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h
+++ b/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h
@@ -171,6 +171,9 @@ public:
 	void lhz(UGeckoInstruction _inst);
 	void lwz(UGeckoInstruction _inst);
 	void lwzx(UGeckoInstruction _inst);
+	void stbu(UGeckoInstruction _inst);
+	void sth(UGeckoInstruction _inst);
+	void sthu(UGeckoInstruction _inst);
 	void stw(UGeckoInstruction _inst);
 	void stwu(UGeckoInstruction _inst);
 
diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArmCache.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArmCache.cpp
index 1706efafb0..82956364de 100644
--- a/Source/Core/Core/Src/PowerPC/JitArm32/JitArmCache.cpp
+++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArmCache.cpp
@@ -33,6 +33,7 @@ using namespace ArmGen;
 	{
 		ARMXEmitter emit(location);
 		emit.B(address);
+		emit.FlushIcache();
 	}
 	void JitArmBlockCache::WriteDestroyBlock(const u8* location, u32 address)
 	{
@@ -41,6 +42,7 @@ using namespace ArmGen;
 		emit.MOVI2R(R12, (u32)jit->GetAsmRoutines()->dispatcher);
 		emit.STR(R11, R9, PPCSTATE_OFF(pc));
 		emit.B(R12);
+		emit.FlushIcache();
 	}
 
 
diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_BackPatch.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_BackPatch.cpp
index 677dc238a8..9d01332f57 100644
--- a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_BackPatch.cpp
+++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_BackPatch.cpp
@@ -50,39 +50,48 @@ static void BackPatchError(const std::string &text, u8 *codePtr, u32 emAddress)
 bool DisamLoadStore(const u32 inst, ARMReg &rD, u8 &accessSize, bool &Store)
 {
 	u8 op = (inst >> 20) & 0xFF;
-	printf("op: 0x%08x\n", op);
+	rD = (ARMReg)((inst >> 12) & 0xF);
+
 	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
+		case 0x1D: // LDRH
 		{
-			rD = (ARMReg)((inst >> 16) & 0xF);
 			Store = false;
 			accessSize = 16;
 		}
 		break;
 		case 0x45 + 0x18: // LDRB
 		{
-			rD = (ARMReg)((inst >> 16) & 0xF);
 			Store = false;
-			accessSize  = 8;
+			accessSize = 8;
+		}
+		break;
+		case 0x5C: // STRB
+		{
+			Store = true;
+			accessSize = 8;
+		}
+		break;
+		case 0x1C: // STRH
+		{
+			Store = true;
+			accessSize = 16;
 		}
 		break;
-		case 0x44 + 0x18: // STRB
 		default:
+			printf("Op is 0x%02x\n", op);
 			return false;
 	}
 	return true;
@@ -111,11 +120,11 @@ const u8 *JitArm::BackPatch(u8 *codePtr, int accessType, u32 emAddress, void *ct
 		switch (accessSize)
 		{
 			case 8: // 8bit
-				//emitter.MOVI2R(R14, (u32)&Memory::Write_U8, false); // 1-2
+				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
+				emitter.MOVI2R(R14, (u32)&Memory::Write_U16, false); // 1-2
 				return 0;
 			break;
 			case 32: // 32bit
diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStore.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStore.cpp
index 1617b0fef6..11433477e0 100644
--- a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStore.cpp
+++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStore.cpp
@@ -36,13 +36,44 @@
 #else
 #define FASTMEM 0
 #endif
-void JitArm::stw(UGeckoInstruction inst)
+void JitArm::stbu(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 for DSI exception prior to writing back address
+	LDR(Function, R9, PPCSTATE_OFF(Exceptions));
+	CMP(Function, EXCEPTION_DSI);
+	FixupBranch DoNotWrite = B_CC(CC_EQ);
+	MOV(RA, Addr);
+	SetJumpTarget(DoNotWrite);
+
+	MOV(ValueReg, RS);
+	
+	MOVI2R(Function, (u32)&Memory::Write_U8);	
+	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::sth(UGeckoInstruction inst)
 {
 	INSTRUCTION_START
 	JITDISABLE(LoadStore)
 
 	ARMReg RS = gpr.R(inst.RS);
-#if FASTMEM
+#if 0 // FASTMEM
 	// R10 contains the dest address
 	ARMReg Value = R11;
 	ARMReg RA;
@@ -59,7 +90,7 @@ void JitArm::stw(UGeckoInstruction inst)
 		MOVI2R(R10, (u32)inst.SIMM_16, false);
 		NOP(1);
 	}
-	StoreFromReg(R10, Value, 32, 0);
+	StoreFromReg(R10, Value, 16, 0);
 #else
 	ARMReg ValueReg = gpr.GetReg();
 	ARMReg Addr = gpr.GetReg();
@@ -75,7 +106,7 @@ void JitArm::stw(UGeckoInstruction inst)
 	else
 		MOVI2R(Addr, (u32)inst.SIMM_16);
 	
-	MOVI2R(Function, (u32)&Memory::Write_U32);	
+	MOVI2R(Function, (u32)&Memory::Write_U16);	
 	PUSH(4, R0, R1, R2, R3);
 	MOV(R0, ValueReg);
 	MOV(R1, Addr);
@@ -84,6 +115,92 @@ void JitArm::stw(UGeckoInstruction inst)
 	gpr.Unlock(ValueReg, Addr, Function);
 #endif
 }
+void JitArm::sthu(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 for DSI exception prior to writing back address
+	LDR(Function, R9, PPCSTATE_OFF(Exceptions));
+	CMP(Function, EXCEPTION_DSI);
+	FixupBranch DoNotWrite = B_CC(CC_EQ);
+	MOV(RA, Addr);
+	SetJumpTarget(DoNotWrite);
+
+	MOV(ValueReg, RS);
+	
+	MOVI2R(Function, (u32)&Memory::Write_U16);	
+	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::stw(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(LoadStore)
+
+	ARMReg RS = gpr.R(inst.RS);
+#if FASTMEM
+	// R10 contains the dest address
+	if (Core::g_CoreStartupParameter.bFastmem)
+	{
+		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
+#endif
+	{
+		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);
+	}
+}
 void JitArm::stwu(UGeckoInstruction inst)
 {
 	INSTRUCTION_START
@@ -98,8 +215,7 @@ void JitArm::stwu(UGeckoInstruction inst)
 	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.
+	// Check for DSI exception prior to writing back address
 	LDR(Function, R9, PPCSTATE_OFF(Exceptions));
 	CMP(Function, EXCEPTION_DSI);
 	FixupBranch DoNotWrite = B_CC(CC_EQ);
@@ -144,10 +260,10 @@ void JitArm::StoreFromReg(ARMReg dest, ARMReg value, int accessSize, s32 offset)
 			STR(value, dest); // 8
 		break;
 		case 16:
-			// Not implemented
+			STRH(value, dest);
 		break;
 		case 8:
-			// Not implemented
+			STRB(value, dest);
 		break;
 	}
 	gpr.Unlock(rA);
@@ -205,35 +321,39 @@ void JitArm::lbz(UGeckoInstruction inst)
 	// Backpatch route
 	// Gets loaded in to RD
 	// Address is in R10
-	gpr.Unlock(rA, rB);
-	if (inst.RA)
+	if (Core::g_CoreStartupParameter.bFastmem)
 	{
-		ARMReg RA = gpr.R(inst.RA);
-		MOV(R10, RA); // - 4
+		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
-		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
+	{
+		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);
+	}
 	SetJumpTarget(DoNotLoad);
 }
 
@@ -256,14 +376,11 @@ void JitArm::lhz(UGeckoInstruction inst)
 	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
 
@@ -303,34 +420,39 @@ void JitArm::lwz(UGeckoInstruction inst)
 	// Backpatch route
 	// Gets loaded in to RD
 	// Address is in R10
-	gpr.Unlock(rA, rB);
-	if (inst.RA)
+	if (Core::g_CoreStartupParameter.bFastmem)
 	{
-		ARMReg RA = gpr.R(inst.RA);
-		MOV(R10, RA); // - 4
+		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
-		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
+	{
+		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);
+	}
 	SetJumpTarget(DoNotLoad);
 	if (SConfig::GetInstance().m_LocalCoreStartupParameter.bSkipIdle &&
 		(inst.hex & 0xFFFF0000) == 0x800D0000 &&
@@ -376,33 +498,38 @@ void JitArm::lwzx(UGeckoInstruction inst)
 	// Backpatch route
 	// Gets loaded in to RD
 	// Address is in R10
-	gpr.Unlock(rA, rB);
-	if (inst.RA)
+	if (Core::g_CoreStartupParameter.bFastmem)
 	{
-		ARMReg RA = gpr.R(inst.RA);
-		ADD(R10, RA, RB); // - 4
+		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
-		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
+	{
+		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);
+	}
 	SetJumpTarget(DoNotLoad);
 	////	u32 temp = Memory::Read_U32(_inst.RA ? (m_GPR[_inst.RA] + m_GPR[_inst.RB]) : m_GPR[_inst.RB]);
 }
diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp
index 1929705df2..7a873f724b 100644
--- a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp
+++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp
@@ -87,12 +87,12 @@ static GekkoOPTemplate primarytable[] =
 	{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}},
+	{44, &JitArm::sth}, //"sth",  OPTYPE_STORE, FL_IN_A | FL_IN_S}},
+	{45, &JitArm::sthu}, //"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}},
+	{39, &JitArm::stbu}, //"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}},
diff --git a/Source/Core/Core/Src/PowerPC/JitCommon/JitAsmCommon.cpp b/Source/Core/Core/Src/PowerPC/JitCommon/JitAsmCommon.cpp
index 8514450cb8..5187ef1478 100644
--- a/Source/Core/Core/Src/PowerPC/JitCommon/JitAsmCommon.cpp
+++ b/Source/Core/Core/Src/PowerPC/JitCommon/JitAsmCommon.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "x64ABI.h"
 #include "Thunk.h"
diff --git a/Source/Core/Core/Src/PowerPC/JitCommon/JitAsmCommon.h b/Source/Core/Core/Src/PowerPC/JitCommon/JitAsmCommon.h
index a610a03326..58d7c5fe6e 100644
--- a/Source/Core/Core/Src/PowerPC/JitCommon/JitAsmCommon.h
+++ b/Source/Core/Core/Src/PowerPC/JitCommon/JitAsmCommon.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _JITASMCOMMON_H
 #define _JITASMCOMMON_H
diff --git a/Source/Core/Core/Src/PowerPC/JitCommon/JitBackpatch.cpp b/Source/Core/Core/Src/PowerPC/JitCommon/JitBackpatch.cpp
index 76e791a94c..c92d05d9d3 100644
--- a/Source/Core/Core/Src/PowerPC/JitCommon/JitBackpatch.cpp
+++ b/Source/Core/Core/Src/PowerPC/JitCommon/JitBackpatch.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include <string>
 
@@ -51,9 +38,9 @@ static void BackPatchError(const std::string &text, u8 *codePtr, u32 emAddress)
 	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);
+		"Error encountered accessing emulated address %08x.\n"
+		"Culprit instruction: \n%s\nat %#llx",
+		text.c_str(), emAddress, disbuf, code_addr);
 	return;
 }
 #endif
@@ -86,7 +73,8 @@ const u8 *TrampolineCache::GetReadTrampoline(const InstructionInfo &info)
 	if (info.displacement) {
 		ADD(32, R(ABI_PARAM1), Imm32(info.displacement));
 	}
-	switch (info.operandSize) {
+	switch (info.operandSize)
+	{
 	case 4:
 		CALL(thunks.ProtectFunction((void *)&Memory::Read_U32, 1));
 		break;
@@ -98,10 +86,14 @@ const u8 *TrampolineCache::GetReadTrampoline(const InstructionInfo &info)
 		CALL(thunks.ProtectFunction((void *)&Memory::Read_U8, 1));
 		break;
 	}
+
 	ABI_PopAllCallerSavedRegsAndAdjustStack();
-	if (dataReg != EAX) {
+
+	if (dataReg != EAX)
+	{
 		MOV(32, R(dataReg), R(EAX));
 	}
+
 	RET();
 #endif
 	return trampoline;
@@ -125,7 +117,7 @@ const u8 *TrampolineCache::GetWriteTrampoline(const InstructionInfo &info)
 	// It's a write. Yay. Remember that we don't have to be super efficient since it's "just" a 
 	// hardware access - we can take shortcuts.
 	//if (emAddress == 0xCC008000)
-	//	PanicAlert("caught a fifo write");
+	//	PanicAlert("Caught a FIFO write");
 	CMP(32, R(addrReg), Imm32(0xCC008000));
 	FixupBranch skip_fast = J_CC(CC_NE, false);
 	MOV(32, R(ABI_PARAM1), R((X64Reg)dataReg));
@@ -133,17 +125,25 @@ const u8 *TrampolineCache::GetWriteTrampoline(const InstructionInfo &info)
 	RET();
 	SetJumpTarget(skip_fast);
 	ABI_PushAllCallerSavedRegsAndAdjustStack();
-	if (addrReg != ABI_PARAM1) {
+
+	if (addrReg != ABI_PARAM1)
+	{
 		MOV(32, R(ABI_PARAM1), R((X64Reg)dataReg));
 		MOV(32, R(ABI_PARAM2), R((X64Reg)addrReg));
-	} else {
+	}
+	else
+	{
 		MOV(32, R(ABI_PARAM2), R((X64Reg)addrReg));
 		MOV(32, R(ABI_PARAM1), R((X64Reg)dataReg));
 	}
-	if (info.displacement) {
+
+	if (info.displacement)
+	{
 		ADD(32, R(ABI_PARAM2), Imm32(info.displacement));
 	}
-	switch (info.operandSize) {
+
+	switch (info.operandSize)
+	{
 	case 4:
 		CALL(thunks.ProtectFunction((void *)&Memory::Write_U32, 2));
 		break;
@@ -215,7 +215,7 @@ const u8 *Jitx86Base::BackPatch(u8 *codePtr, int accessType, u32 emAddress, void
 		emitter.CALL((void *)trampoline);
 		emitter.NOP((int)info.instructionSize - 3);
 		if (info.instructionSize < 3)
-			PanicAlert("instruction too small");
+			PanicAlert("Instruction too small");
 		// We entered here with a BSWAP-ed EAX. We'll have to swap it back.
 		ctx->Rax = Common::swap32((u32)ctx->Rax);
 		return codePtr - 2;
diff --git a/Source/Core/Core/Src/PowerPC/JitCommon/JitBackpatch.h b/Source/Core/Core/Src/PowerPC/JitCommon/JitBackpatch.h
index 871a112c6c..e3e60a8d94 100644
--- a/Source/Core/Core/Src/PowerPC/JitCommon/JitBackpatch.h
+++ b/Source/Core/Core/Src/PowerPC/JitCommon/JitBackpatch.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _JITBACKPATCH_H
 #define _JITBACKPATCH_H
diff --git a/Source/Core/Core/Src/PowerPC/JitCommon/JitBase.cpp b/Source/Core/Core/Src/PowerPC/JitCommon/JitBase.cpp
index 6203a81e15..6390b3ea5d 100644
--- a/Source/Core/Core/Src/PowerPC/JitCommon/JitBase.cpp
+++ b/Source/Core/Core/Src/PowerPC/JitCommon/JitBase.cpp
@@ -1,16 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "JitBase.h"
 #include "PowerPCDisasm.h"
diff --git a/Source/Core/Core/Src/PowerPC/JitCommon/JitBase.h b/Source/Core/Core/Src/PowerPC/JitCommon/JitBase.h
index 9b8c67474c..826369e604 100644
--- a/Source/Core/Core/Src/PowerPC/JitCommon/JitBase.h
+++ b/Source/Core/Core/Src/PowerPC/JitCommon/JitBase.h
@@ -1,19 +1,6 @@
-// Copyright (C) 2010 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _JITBASE_H
 #define _JITBASE_H
@@ -74,6 +61,8 @@ protected:
 		u8* rewriteStart;
 
 		JitBlock *curBlock;
+
+		std::set<u32> fifoWriteAddresses;
 	};
 
 public:
diff --git a/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.cpp b/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.cpp
index 415b37ca61..889c51520c 100644
--- a/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.cpp
+++ b/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 // Enable define below to enable oprofile integration. For this to work,
 // it requires at least oprofile version 0.9.4, and changing the build
diff --git a/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.h b/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.h
index b148cb8090..a09eb3ebba 100644
--- a/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.h
+++ b/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _JITCACHE_H
 #define _JITCACHE_H
@@ -134,7 +121,7 @@ public:
 	// Fast way to get a block. Only works on the first ppc instruction of a block.
 	int GetBlockNumberFromStartAddress(u32 em_address);
 
-    // slower, but can get numbers from within blocks, not just the first instruction.
+	// slower, but can get numbers from within blocks, not just the first instruction.
 	// WARNING! WILL NOT WORK WITH INLINING ENABLED (not yet a feature but will be soon)
 	// Returns a list of block numbers - only one block can start at a particular address, but they CAN overlap.
 	// This one is slow so should only be used for one-shots from the debugger UI, not for anything during runtime.
diff --git a/Source/Core/Core/Src/PowerPC/JitCommon/Jit_Util.cpp b/Source/Core/Core/Src/PowerPC/JitCommon/Jit_Util.cpp
index f5c4cb022b..18c8044385 100644
--- a/Source/Core/Core/Src/PowerPC/JitCommon/Jit_Util.cpp
+++ b/Source/Core/Core/Src/PowerPC/JitCommon/Jit_Util.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "Common.h"
 #include "Thunk.h"
@@ -57,7 +44,7 @@ void EmuCodeBlock::UnsafeLoadRegToReg(X64Reg reg_addr, X64Reg reg_value, int acc
 	else if (signExtend)
 	{
 		// TODO: bake 8-bit into the original load.
-		MOVSX(32, accessSize, reg_value, R(reg_value));   
+		MOVSX(32, accessSize, reg_value, R(reg_value));
 	}
 }
 
@@ -116,7 +103,7 @@ void EmuCodeBlock::UnsafeLoadToEAX(const Gen::OpArg & opAddress, int accessSize,
 	else if (signExtend)
 	{
 		// TODO: bake 8-bit into the original load.
-		MOVSX(32, accessSize, EAX, R(EAX));   
+		MOVSX(32, accessSize, EAX, R(EAX));
 	}
 }
 
@@ -124,9 +111,9 @@ void EmuCodeBlock::SafeLoadToEAX(const Gen::OpArg & opAddress, int accessSize, s
 {
 #if defined(_M_X64)
 #ifdef ENABLE_MEM_CHECK
-	if (!Core::g_CoreStartupParameter.bMMU && !Core::g_CoreStartupParameter.bEnableDebugging)
+	if (!Core::g_CoreStartupParameter.bMMU && !Core::g_CoreStartupParameter.bEnableDebugging && Core::g_CoreStartupParameter.bFastmem)
 #else
-	if (!Core::g_CoreStartupParameter.bMMU)
+	if (!Core::g_CoreStartupParameter.bMMU && Core::g_CoreStartupParameter.bFastmem)
 #endif
 	{
 		UnsafeLoadToEAX(opAddress, accessSize, offset, signExtend);
diff --git a/Source/Core/Core/Src/PowerPC/JitCommon/Jit_Util.h b/Source/Core/Core/Src/PowerPC/JitCommon/Jit_Util.h
index e151c5e914..7708ab8598 100644
--- a/Source/Core/Core/Src/PowerPC/JitCommon/Jit_Util.h
+++ b/Source/Core/Core/Src/PowerPC/JitCommon/Jit_Util.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included./
 
 #ifndef _JITUTIL_H
 #define _JITUTIL_H
diff --git a/Source/Core/Core/Src/PowerPC/JitInterface.cpp b/Source/Core/Core/Src/PowerPC/JitInterface.cpp
index 2f56f013be..1ca5626b1e 100644
--- a/Source/Core/Core/Src/PowerPC/JitInterface.cpp
+++ b/Source/Core/Core/Src/PowerPC/JitInterface.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include <algorithm>
 
@@ -159,7 +146,7 @@ namespace JitInterface
 		File::IOFile f(filename, "w");
 		if (!f)
 		{
-			PanicAlert("failed to open %s", filename);
+			PanicAlert("Failed to open %s", filename);
 			return;
 		}
 		fprintf(f.GetHandle(), "origAddr\tblkName\tcost\ttimeCost\tpercent\ttimePercent\tOvAllinBlkTime(ms)\tblkCodeSize\n");
diff --git a/Source/Core/Core/Src/PowerPC/JitInterface.h b/Source/Core/Core/Src/PowerPC/JitInterface.h
index 9213072ab9..bf5d750a1f 100644
--- a/Source/Core/Core/Src/PowerPC/JitInterface.h
+++ b/Source/Core/Core/Src/PowerPC/JitInterface.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "ChunkFile.h"
 #include "CPUCoreBase.h"
diff --git a/Source/Core/Core/Src/PowerPC/LUT_frsqrtex.cpp b/Source/Core/Core/Src/PowerPC/LUT_frsqrtex.cpp
index 4f4751ae18..89aaf33eb2 100644
--- a/Source/Core/Core/Src/PowerPC/LUT_frsqrtex.cpp
+++ b/Source/Core/Core/Src/PowerPC/LUT_frsqrtex.cpp
@@ -1,21 +1,9 @@
-// Copyright (C) 2003 Dolphin Project.
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
-// 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/
 // Gekko related unions, structs, ...
-//
 
 #include "LUT_frsqrtex.h"
 
diff --git a/Source/Core/Core/Src/PowerPC/LUT_frsqrtex.h b/Source/Core/Core/Src/PowerPC/LUT_frsqrtex.h
index f987dba4a6..4785eda56f 100644
--- a/Source/Core/Core/Src/PowerPC/LUT_frsqrtex.h
+++ b/Source/Core/Core/Src/PowerPC/LUT_frsqrtex.h
@@ -1,21 +1,9 @@
-// Copyright (C) 2003 Dolphin Project.
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
-// 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/
 // Gekko related unions, structs, ...
-//
 
 #ifndef _LUT_frsqrtex_h_
 #define _LUT_frsqrtex_h_
diff --git a/Source/Core/Core/Src/PowerPC/PPCAnalyst.cpp b/Source/Core/Core/Src/PowerPC/PPCAnalyst.cpp
index 15a85568de..8299bc0b82 100644
--- a/Source/Core/Core/Src/PowerPC/PPCAnalyst.cpp
+++ b/Source/Core/Core/Src/PowerPC/PPCAnalyst.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include <string>
 #include <queue>
@@ -264,15 +251,15 @@ bool CanSwapAdjacentOps(const CodeOp &a, const CodeOp &b)
 		int regInA = a.regsIn[j];
 		int regInB = b.regsIn[j];
 		if (regInA >= 0 && 
-		    (b.regsOut[0] == regInA ||
-		     b.regsOut[1] == regInA))
+			(b.regsOut[0] == regInA ||
+			 b.regsOut[1] == regInA))
 		{
 			// reg collision! don't swap
 			return false;
 		}
 		if (regInB >= 0 &&
-		    (a.regsOut[0] == regInB ||
-		     a.regsOut[1] == regInB))
+			(a.regsOut[0] == regInB ||
+			 a.regsOut[1] == regInB))
 		{
 			// reg collision! don't swap
 			return false;
@@ -290,7 +277,7 @@ u32 Flatten(u32 address, int *realsize, BlockStats *st, BlockRegStats *gpa,
 			int capacity_of_merged_addresses, int& size_of_merged_addresses)
 {
 	if (capacity_of_merged_addresses < FUNCTION_FOLLOWING_THRESHOLD) {
-		PanicAlert("capacity of merged_addresses is too small!");
+		PanicAlert("Capacity of merged_addresses is too small!");
 	}
 	std::fill_n(merged_addresses, capacity_of_merged_addresses, 0);
 	merged_addresses[0] = address;
@@ -342,7 +329,7 @@ u32 Flatten(u32 address, int *realsize, BlockStats *st, BlockRegStats *gpa,
 		if (!cst1_instructions.empty())
 		{
 			// If the Gecko CST1 instruction queue is not empty,
-			// we comsume the first instruction.
+			// we consume the first instruction.
 			inst = UGeckoInstruction(cst1_instructions.front());
 			cst1_instructions.pop();
 			address -= 4;
@@ -697,7 +684,7 @@ void FindFunctions(u32 startAddr, u32 endAddr, PPCSymbolDB *func_db)
 	{
 		if (iter->second.address == 4)
 		{
-			WARN_LOG(OSHLE, "weird function");
+			WARN_LOG(OSHLE, "Weird function");
 			continue;
 		}
 		AnalyzeFunction2(&(iter->second));
@@ -740,7 +727,7 @@ void FindFunctions(u32 startAddr, u32 endAddr, PPCSymbolDB *func_db)
 	if (numNice == 0)
 		niceSize = 0;
 	else
-        niceSize /= numNice;
+		niceSize /= numNice;
 
 	if (numUnNice == 0)
 		unniceSize = 0;
diff --git a/Source/Core/Core/Src/PowerPC/PPCAnalyst.h b/Source/Core/Core/Src/PowerPC/PPCAnalyst.h
index be1b6b7d6a..e184486f3e 100644
--- a/Source/Core/Core/Src/PowerPC/PPCAnalyst.h
+++ b/Source/Core/Core/Src/PowerPC/PPCAnalyst.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _PPCANALYST_H
 #define _PPCANALYST_H
diff --git a/Source/Core/Core/Src/PowerPC/PPCCache.cpp b/Source/Core/Core/Src/PowerPC/PPCCache.cpp
index a0e4c666a4..4ead232b18 100644
--- a/Source/Core/Core/Src/PowerPC/PPCCache.cpp
+++ b/Source/Core/Core/Src/PowerPC/PPCCache.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "PPCCache.h"
 #include "../HW/Memmap.h"
@@ -122,11 +109,11 @@ namespace PowerPC
 		u32 t;
 		if (addr & ICACHE_VMEM_BIT)
 		{
-			t = lookup_table_vmem[(addr>>5) & 0xfffff];			
+			t = lookup_table_vmem[(addr>>5) & 0xfffff];
 		}
 		else if (addr & ICACHE_EXRAM_BIT)
 		{
-			t = lookup_table_ex[(addr>>5) & 0x1fffff];			
+			t = lookup_table_ex[(addr>>5) & 0x1fffff];
 		}
 		else
 		{
@@ -163,6 +150,7 @@ namespace PowerPC
 				else
 					lookup_table[((tags[set][t] << 7) | set) & 0xfffff] = 0xff;
 			}
+
 			if (addr & ICACHE_VMEM_BIT)
 				lookup_table_vmem[(addr>>5) & 0xfffff] = t;
 			else if (addr & ICACHE_EXRAM_BIT)
diff --git a/Source/Core/Core/Src/PowerPC/PPCCache.h b/Source/Core/Core/Src/PowerPC/PPCCache.h
index 6d62720d43..21ff0f64d5 100644
--- a/Source/Core/Core/Src/PowerPC/PPCCache.h
+++ b/Source/Core/Core/Src/PowerPC/PPCCache.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _PPCCACHE_H
 #define _PPCCACHE_H
diff --git a/Source/Core/Core/Src/PowerPC/PPCSymbolDB.cpp b/Source/Core/Core/Src/PowerPC/PPCSymbolDB.cpp
index 2cfdc48e33..e9f821eeed 100644
--- a/Source/Core/Core/Src/PowerPC/PPCSymbolDB.cpp
+++ b/Source/Core/Core/Src/PowerPC/PPCSymbolDB.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include <map>
 #include <string>
@@ -99,9 +86,12 @@ Symbol *PPCSymbolDB::GetSymbolFromAddr(u32 addr)
 {
 	if (!Memory::IsRAMAddress(addr))
 		return 0;
+
 	XFuncMap::iterator it = functions.find(addr);
 	if (it != functions.end())
+	{
 		return &it->second;
+	}
 	else
 	{
 		for (XFuncMap::iterator iter = functions.begin(); iter != functions.end(); ++iter)
@@ -133,22 +123,22 @@ void PPCSymbolDB::FillInCallers()
 	{
 		Symbol &f = iter->second;
 		for (size_t i = 0; i < f.calls.size(); i++)
-        {
-            SCall NewCall(iter->first, f.calls[i].callAddress);
-            u32 FunctionAddress = f.calls[i].function;
+		{
+			SCall NewCall(iter->first, f.calls[i].callAddress);
+			u32 FunctionAddress = f.calls[i].function;
 
-            XFuncMap::iterator FuncIterator = functions.find(FunctionAddress);
-            if (FuncIterator != functions.end())
-            {
-                Symbol& rCalledFunction = FuncIterator->second;
-                rCalledFunction.callers.push_back(NewCall);
-            }
-            else
-            {
-                //LOG(OSHLE, "FillInCallers tries to fill data in an unknown function 0x%08x.", FunctionAddress);
+			XFuncMap::iterator FuncIterator = functions.find(FunctionAddress);
+			if (FuncIterator != functions.end())
+			{
+				Symbol& rCalledFunction = FuncIterator->second;
+				rCalledFunction.callers.push_back(NewCall);
+			}
+			else
+			{
+				//LOG(OSHLE, "FillInCallers tries to fill data in an unknown function 0x%08x.", FunctionAddress);
 				// TODO - analyze the function instead.
-            }
-        }
+			}
+		}
 	}
 }
 
@@ -241,27 +231,27 @@ bool PPCSymbolDB::LoadMap(const char *filename)
 
 		if (!started) continue;
 
-        u32 address, vaddress, size, unknown;
-        char name[512];
-        sscanf(line, "%08x %08x %08x %i %s", &address, &size, &vaddress, &unknown, name);
+		u32 address, vaddress, size, unknown;
+		char name[512];
+		sscanf(line, "%08x %08x %08x %i %s", &address, &size, &vaddress, &unknown, name);
 
-        const char *namepos = strstr(line, name);
-        if (namepos != 0) //would be odd if not :P
-            strcpy(name, namepos);
-        name[strlen(name) - 1] = 0;
-        
-        // we want the function names only .... TODO: or do we really? aren't we wasting information here?
-        for (size_t i = 0; i < strlen(name); i++)
-        {
-            if (name[i] == ' ') name[i] = 0x00;
-            if (name[i] == '(') name[i] = 0x00;
-        }
+		const char *namepos = strstr(line, name);
+		if (namepos != 0) //would be odd if not :P
+			strcpy(name, namepos);
+		name[strlen(name) - 1] = 0;
 
-        // Check if this is a valid entry.
-        if (strcmp(name, ".text") != 0 || strcmp(name, ".init") != 0 || strlen(name) > 0)
-        {            
-            AddKnownSymbol(vaddress | 0x80000000, size, name); // ST_FUNCTION
-        }
+		// we want the function names only .... TODO: or do we really? aren't we wasting information here?
+		for (size_t i = 0; i < strlen(name); i++)
+		{
+			if (name[i] == ' ') name[i] = 0x00;
+			if (name[i] == '(') name[i] = 0x00;
+		}
+
+		// Check if this is a valid entry.
+		if (strcmp(name, ".text") != 0 || strcmp(name, ".init") != 0 || strlen(name) > 0)
+		{
+			AddKnownSymbol(vaddress | 0x80000000, size, name); // ST_FUNCTION
+		}
 	}
 
 	Index();
@@ -297,13 +287,13 @@ bool PPCSymbolDB::SaveMap(const char *filename, bool WithCodes) const
 	// Walk through every code row
 	// -------------------------
 	fprintf(f.GetHandle(), ".text\n"); // Write ".text" at the top
-    XFuncMap::const_iterator itr = functions.begin();
+	XFuncMap::const_iterator itr = functions.begin();
 	u32 LastAddress = 0x80004000;
 	std::string LastSymbolName;
-    while (itr != functions.end())
-    {
+	while (itr != functions.end())
+	{
 		// Save a map file
-        const Symbol &rSymbol = itr->second;
+		const Symbol &rSymbol = itr->second;
 		if (!WithCodes)
 		{
 			fprintf(f.GetHandle(),"%08x %08x %08x %i %s\n", rSymbol.address, rSymbol.size, rSymbol.address,
@@ -323,7 +313,7 @@ bool PPCSymbolDB::SaveMap(const char *filename, bool WithCodes) const
 			   all names longer than 25 letters */
 			std::string TempSym;
 			for (u32 i = 0; i < 25; i++)
-			{			
+			{
 				if (i < LastSymbolName.size())
 					TempSym += LastSymbolName[i];
 				else
@@ -347,7 +337,7 @@ bool PPCSymbolDB::SaveMap(const char *filename, bool WithCodes) const
 			// Write a blank line after each block
 			fprintf(f.GetHandle(), "\n");
 		}
-    }
+	}
 	// ---------------
 	Host_UpdateStatusBar(StringFromFormat("Saved %s", mapFile.c_str()).c_str());
 
diff --git a/Source/Core/Core/Src/PowerPC/PPCSymbolDB.h b/Source/Core/Core/Src/PowerPC/PPCSymbolDB.h
index ebd1c39d19..40d606ae97 100644
--- a/Source/Core/Core/Src/PowerPC/PPCSymbolDB.h
+++ b/Source/Core/Core/Src/PowerPC/PPCSymbolDB.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "Common.h"
 
diff --git a/Source/Core/Core/Src/PowerPC/PPCTables.cpp b/Source/Core/Core/Src/PowerPC/PPCTables.cpp
index a6975f5860..9b3d74ffff 100644
--- a/Source/Core/Core/Src/PowerPC/PPCTables.cpp
+++ b/Source/Core/Core/Src/PowerPC/PPCTables.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include <algorithm>
 #include <vector>
@@ -28,12 +15,12 @@
 
 struct op_inf
 {
-    const char *name;
-    int count;
-    bool operator < (const op_inf &o) const
-    {
+	const char *name;
+	int count;
+	bool operator < (const op_inf &o) const
+	{
 		return count > o.count;
-    }
+	}
 };
  GekkoOPInfo *m_infoTable[64];
  GekkoOPInfo *m_infoTable4[1024];
@@ -212,7 +199,7 @@ void PrintInstructionRunCounts()
 	{
 		if (temp[i].count == 0) 
 			break;
-        DEBUG_LOG(POWERPC, "%s : %i", temp[i].name,temp[i].count);
+		DEBUG_LOG(POWERPC, "%s : %i", temp[i].name,temp[i].count);
 		//PanicAlert("%s : %i", temp[i].name,temp[i].count);
 	}
 }
@@ -224,7 +211,8 @@ void LogCompiledInstructions()
 	File::IOFile f(StringFromFormat("%sinst_log%i.txt", File::GetUserPath(D_LOGS_IDX).c_str(), time), "w");
 	for (int i = 0; i < m_numInstructions; i++)
 	{
-		if (m_allInstructions[i]->compileCount > 0) {
+		if (m_allInstructions[i]->compileCount > 0)
+		{
 			fprintf(f.GetHandle(), "%s\t%i\t%i\t%08x\n", m_allInstructions[i]->opname,
 				m_allInstructions[i]->compileCount, m_allInstructions[i]->runCount, m_allInstructions[i]->lastUse);
 		}
@@ -233,7 +221,8 @@ void LogCompiledInstructions()
 	f.Open(StringFromFormat("%sinst_not%i.txt", File::GetUserPath(D_LOGS_IDX).c_str(), time), "w");
 	for (int i = 0; i < m_numInstructions; i++)
 	{
-		if (m_allInstructions[i]->compileCount == 0) {
+		if (m_allInstructions[i]->compileCount == 0)
+		{
 			fprintf(f.GetHandle(), "%s\t%i\t%i\n", m_allInstructions[i]->opname,
 				m_allInstructions[i]->compileCount, m_allInstructions[i]->runCount);
 		}
@@ -241,7 +230,8 @@ void LogCompiledInstructions()
 
 #ifdef OPLOG
 	f.Open(StringFromFormat("%s" OP_TO_LOG "_at.txt", File::GetUserPath(D_LOGS_IDX).c_str(), time), "w");
-	for (size_t i = 0; i < rsplocations.size(); i++) {
+	for (size_t i = 0; i < rsplocations.size(); i++)
+	{
 		fprintf(f.GetHandle(), OP_TO_LOG ": %08x\n", rsplocations[i]);
 	}
 #endif
diff --git a/Source/Core/Core/Src/PowerPC/PPCTables.h b/Source/Core/Core/Src/PowerPC/PPCTables.h
index 2e4ac0e755..f47df6e552 100644
--- a/Source/Core/Core/Src/PowerPC/PPCTables.h
+++ b/Source/Core/Core/Src/PowerPC/PPCTables.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _PPCTABLES_H
 #define _PPCTABLES_H
diff --git a/Source/Core/Core/Src/PowerPC/PowerPC.cpp b/Source/Core/Core/Src/PowerPC/PowerPC.cpp
index e65b310f5a..7628e1298e 100644
--- a/Source/Core/Core/Src/PowerPC/PowerPC.cpp
+++ b/Source/Core/Core/Src/PowerPC/PowerPC.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include <float.h>
 
@@ -80,7 +67,7 @@ void DoState(PointerWrap &p)
 //	rSPR(SPR_DEC) = SystemTimers::GetFakeDecrementer();
 //	*((u64 *)&TL) = SystemTimers::GetFakeTimeBase(); //works since we are little endian and TL comes first :)
 
-	p.Do(ppcState);
+	p.DoPOD(ppcState);
 
 //	SystemTimers::DecrementerSet();
 //	SystemTimers::TimeBaseSet();
diff --git a/Source/Core/Core/Src/PowerPC/PowerPC.h b/Source/Core/Core/Src/PowerPC/PowerPC.h
index e0b4bfaa16..219dcc192f 100644
--- a/Source/Core/Core/Src/PowerPC/PowerPC.h
+++ b/Source/Core/Core/Src/PowerPC/PowerPC.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _POWERPC_H
 #define _POWERPC_H
diff --git a/Source/Core/Core/Src/PowerPC/Profiler.cpp b/Source/Core/Core/Src/PowerPC/Profiler.cpp
index fc8942f09b..77da606e52 100644
--- a/Source/Core/Core/Src/PowerPC/Profiler.cpp
+++ b/Source/Core/Core/Src/PowerPC/Profiler.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "JitInterface.h"
 
diff --git a/Source/Core/Core/Src/PowerPC/Profiler.h b/Source/Core/Core/Src/PowerPC/Profiler.h
index b8beeaae72..b15d911a97 100644
--- a/Source/Core/Core/Src/PowerPC/Profiler.h
+++ b/Source/Core/Core/Src/PowerPC/Profiler.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 
 #ifndef _PROFILER_H
diff --git a/Source/Core/Core/Src/PowerPC/SignatureDB.cpp b/Source/Core/Core/Src/PowerPC/SignatureDB.cpp
index d2ff6c557c..1292f1e6c3 100644
--- a/Source/Core/Core/Src/PowerPC/SignatureDB.cpp
+++ b/Source/Core/Core/Src/PowerPC/SignatureDB.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "Common.h"
 #include "PPCAnalyst.h"
@@ -45,15 +32,15 @@ bool SignatureDB::Load(const char *filename)
 	for (size_t i = 0; i < fcount; i++)
 	{
 		FuncDesc temp;
-        memset(&temp, 0, sizeof(temp));
+		memset(&temp, 0, sizeof(temp));
 
-        f.ReadArray(&temp, 1);
+		f.ReadArray(&temp, 1);
 		temp.name[sizeof(temp.name)-1] = 0;
 
 		DBFunc dbf;
 		dbf.name = temp.name;
 		dbf.size = temp.size;
-	    database[temp.checkSum] = dbf;
+		database[temp.checkSum] = dbf;
 	}
 
 	return true;
@@ -204,7 +191,7 @@ void SignatureDB::Initialize(PPCSymbolDB *symbol_db, const char *prefix)
 			break;
 		}
 		// Checksum only uses opcode, not opcode data, because opcode data changes 
-		// in all compilations, but opcodes dont!
+		// in all compilations, but opcodes don't!
 		sum = ( ( (sum << 17 ) & 0xFFFE0000 ) | ( (sum >> 15) & 0x0001FFFF ) );
 		sum = sum ^ (op | op2 | op3);
 	}
diff --git a/Source/Core/Core/Src/PowerPC/SignatureDB.h b/Source/Core/Core/Src/PowerPC/SignatureDB.h
index fbee2f7e63..181a76ce38 100644
--- a/Source/Core/Core/Src/PowerPC/SignatureDB.h
+++ b/Source/Core/Core/Src/PowerPC/SignatureDB.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "Common.h"
 
diff --git a/Source/Core/Core/Src/State.cpp b/Source/Core/Core/Src/State.cpp
index e0a9ab7858..3be8470d14 100644
--- a/Source/Core/Core/Src/State.cpp
+++ b/Source/Core/Core/Src/State.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "Common.h"
 #include "State.h"
@@ -97,7 +84,7 @@ void DoState(PointerWrap &p)
 {
 	u32 version = STATE_VERSION;
 	{
- 		static const u32 COOKIE_BASE = 0xBAADBABE;
+		static const u32 COOKIE_BASE = 0xBAADBABE;
 		u32 cookie = version + COOKIE_BASE;
 		p.Do(cookie);
 		version = cookie - COOKIE_BASE;
@@ -204,6 +191,7 @@ void CompressAndDumpState(CompressAndDumpState_args save_args)
 		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())
@@ -551,10 +539,14 @@ void UndoLoadState()
 				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!");
+	}
 }
 
 // Load the state that the last save state overwritten on
diff --git a/Source/Core/Core/Src/State.h b/Source/Core/Core/Src/State.h
index 0cc0fb502e..db88cef766 100644
--- a/Source/Core/Core/Src/State.h
+++ b/Source/Core/Core/Src/State.h
@@ -1,19 +1,7 @@
-// Copyright (C) 2003 Dolphin Project.
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
-// 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/
 
 // Emulator state saving support.
 
diff --git a/Source/Core/Core/Src/Tracer.cpp b/Source/Core/Core/Src/Tracer.cpp
index 22098f1991..a57d40b006 100644
--- a/Source/Core/Core/Src/Tracer.cpp
+++ b/Source/Core/Core/Src/Tracer.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include <stdlib.h>
 
@@ -101,11 +88,11 @@ int SyncTrace()
 			LOG(GEKKO, "DIFFERENCE - PC (local %08x, remote %08x)", PowerPC::ppcState.pc, state.pc);
 			difference = true;
 		}
-		//if (PowerPC::ppcState.npc != state.npc)
-		///{
-		//	LOG(GEKKO, "DIFFERENCE - NPC (local %08x, remote %08x)", PowerPC::ppcState.npc, state.npc);
-		//	difference = true;
-		//}
+		if (PowerPC::ppcState.npc != state.npc)
+		{
+			LOG(GEKKO, "DIFFERENCE - NPC (local %08x, remote %08x)", PowerPC::ppcState.npc, state.npc);
+			difference = true;
+		}
 		if (PowerPC::ppcState.msr != state.msr)
 		{
 			LOG(GEKKO, "DIFFERENCE - MSR (local %08x, remote %08x)", PowerPC::ppcState.msr, state.msr);
diff --git a/Source/Core/Core/Src/Tracer.h b/Source/Core/Core/Src/Tracer.h
index 5750b1b118..8f06a8966b 100644
--- a/Source/Core/Core/Src/Tracer.h
+++ b/Source/Core/Core/Src/Tracer.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _TRACER_H_
 #define _TRACER_H_
diff --git a/Source/Core/Core/Src/VolumeHandler.cpp b/Source/Core/Core/Src/VolumeHandler.cpp
index c26aaf10ec..19058cd354 100644
--- a/Source/Core/Core/Src/VolumeHandler.cpp
+++ b/Source/Core/Core/Src/VolumeHandler.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "VolumeHandler.h"
 #include "VolumeCreator.h"
@@ -43,47 +30,47 @@ void EjectVolume()
 
 bool SetVolumeName(const std::string& _rFullPath)
 {
-    if (g_pVolume)
-    {
-        delete g_pVolume;
-        g_pVolume = NULL;
-    }
+	if (g_pVolume)
+	{
+		delete g_pVolume;
+		g_pVolume = NULL;
+	}
 
-    g_pVolume = DiscIO::CreateVolumeFromFilename(_rFullPath);
+	g_pVolume = DiscIO::CreateVolumeFromFilename(_rFullPath);
 
 	return (g_pVolume != NULL);
 }
 
 void SetVolumeDirectory(const std::string& _rFullPath, bool _bIsWii, const std::string& _rApploader, const std::string& _rDOL)
 {
-    if (g_pVolume)
-    {
-        delete g_pVolume;
-        g_pVolume = NULL;
-    }
+	if (g_pVolume)
+	{
+		delete g_pVolume;
+		g_pVolume = NULL;
+	}
 
-    g_pVolume = DiscIO::CreateVolumeFromDirectory(_rFullPath, _bIsWii, _rApploader, _rDOL);
+	g_pVolume = DiscIO::CreateVolumeFromDirectory(_rFullPath, _bIsWii, _rApploader, _rDOL);
 }
 
 u32 Read32(u64 _Offset)
 {
-    if (g_pVolume != NULL)
-    {
-        u32 Temp;
-        g_pVolume->Read(_Offset, 4, (u8*)&Temp);
-        return Common::swap32(Temp);
-    }
-    return 0;
+	if (g_pVolume != NULL)
+	{
+		u32 Temp;
+		g_pVolume->Read(_Offset, 4, (u8*)&Temp);
+		return Common::swap32(Temp);
+	}
+	return 0;
 }
 
 bool ReadToPtr(u8* ptr, u64 _dwOffset, u64 _dwLength)
 {
-    if (g_pVolume != NULL && ptr)
-    {
-        g_pVolume->Read(_dwOffset, _dwLength, ptr);
-        return true;
-    }
-    return false;
+	if (g_pVolume != NULL && ptr)
+	{
+		g_pVolume->Read(_dwOffset, _dwLength, ptr);
+		return true;
+	}
+	return false;
 }
 
 bool RAWReadToPtr( u8* ptr, u64 _dwOffset, u64 _dwLength )
@@ -98,7 +85,7 @@ bool RAWReadToPtr( u8* ptr, u64 _dwOffset, u64 _dwLength )
 
 bool IsValid()
 {
-    return (g_pVolume != NULL);
+	return (g_pVolume != NULL);
 }
 
 bool IsWii()
@@ -106,7 +93,7 @@ bool IsWii()
 	if (g_pVolume)
 		return IsVolumeWiiDisc(g_pVolume);
 
-    return false;
+	return false;
 }
 
 } // end of namespace VolumeHandler
diff --git a/Source/Core/Core/Src/VolumeHandler.h b/Source/Core/Core/Src/VolumeHandler.h
index 44a002f768..11387d115c 100644
--- a/Source/Core/Core/Src/VolumeHandler.h
+++ b/Source/Core/Core/Src/VolumeHandler.h
@@ -1,19 +1,7 @@
-// Copyright (C) 2003 Dolphin Project.
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
-// 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/
 
 // Disc volume handler. It's here because Wii discs can consist of multiple volumes.
 // GC discs are seen as one big volume.
diff --git a/Source/Core/Core/Src/stdafx.cpp b/Source/Core/Core/Src/stdafx.cpp
index 31f734b17a..b602b39925 100644
--- a/Source/Core/Core/Src/stdafx.cpp
+++ b/Source/Core/Core/Src/stdafx.cpp
@@ -1,18 +1,5 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "stdafx.h"
diff --git a/Source/Core/Core/Src/stdafx.h b/Source/Core/Core/Src/stdafx.h
index 7ec8dff5a8..ef9e560412 100644
--- a/Source/Core/Core/Src/stdafx.h
+++ b/Source/Core/Core/Src/stdafx.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #pragma once
 
diff --git a/Source/Core/Core/Src/x64MemTools.cpp b/Source/Core/Core/Src/x64MemTools.cpp
index fff26b3cb3..dad10d9e56 100644
--- a/Source/Core/Core/Src/x64MemTools.cpp
+++ b/Source/Core/Core/Src/x64MemTools.cpp
@@ -1,20 +1,6 @@
-// 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/
-
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifdef _WIN32
 #include <windows.h>
@@ -79,7 +65,8 @@ LONG NTAPI Handler(PEXCEPTION_POINTERS pPtrs)
 			PVOID codeAddr = pPtrs->ExceptionRecord->ExceptionAddress;
 			unsigned char *codePtr = (unsigned char*)codeAddr;
 			
-			if (!JitInterface::IsInCodeSpace(codePtr)) {
+			if (!JitInterface::IsInCodeSpace(codePtr))
+			{
 				// Let's not prevent debugging.
 				return (DWORD)EXCEPTION_CONTINUE_SEARCH;
 			}
@@ -94,7 +81,8 @@ LONG NTAPI Handler(PEXCEPTION_POINTERS pPtrs)
 #else
 			u64 memspaceTop = memspaceBottom + 0x40000000;
 #endif
-			if (badAddress < memspaceBottom || badAddress >= memspaceTop) {
+			if (badAddress < memspaceBottom || badAddress >= memspaceTop)
+			{
 				return (DWORD)EXCEPTION_CONTINUE_SEARCH;
 				//PanicAlert("Exception handler - access outside memory space. %08x%08x",
 				//	badAddress >> 32, badAddress);
@@ -206,7 +194,8 @@ void sigsegv_handler(int signal, siginfo_t *info, void *raw_context)
 #else
 	u8 *fault_instruction_ptr = (u8 *)CREG_EIP(ctx);
 #endif
-	if (!JitInterface::IsInCodeSpace(fault_instruction_ptr)) {
+	if (!JitInterface::IsInCodeSpace(fault_instruction_ptr))
+	{
 		// Let's not prevent debugging.
 		return;
 	}
@@ -234,7 +223,8 @@ void sigsegv_handler(int signal, siginfo_t *info, void *raw_context)
 	fake_ctx.Eip = CREG_EIP(ctx);
 #endif
 	const u8 *new_rip = jit->BackPatch(fault_instruction_ptr, access_type, em_address, &fake_ctx);
-	if (new_rip) {
+	if (new_rip)
+	{
 #ifdef _M_X64
 		CREG_RAX(ctx) = fake_ctx.Rax;
 		CREG_RIP(ctx) = fake_ctx.Rip;
diff --git a/Source/Core/DiscIO/Src/BannerLoader.cpp b/Source/Core/DiscIO/Src/BannerLoader.cpp
index d38c7e9ea4..11f9697ba9 100644
--- a/Source/Core/DiscIO/Src/BannerLoader.cpp
+++ b/Source/Core/DiscIO/Src/BannerLoader.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "BannerLoader.h"
 #include "BannerLoaderWii.h"
diff --git a/Source/Core/DiscIO/Src/BannerLoader.h b/Source/Core/DiscIO/Src/BannerLoader.h
index b30ee17a46..7fec9c57bd 100644
--- a/Source/Core/DiscIO/Src/BannerLoader.h
+++ b/Source/Core/DiscIO/Src/BannerLoader.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _BANNER_LOADER_H_
 #define _BANNER_LOADER_H_
diff --git a/Source/Core/DiscIO/Src/BannerLoaderGC.cpp b/Source/Core/DiscIO/Src/BannerLoaderGC.cpp
index d8ae259b16..3585835443 100644
--- a/Source/Core/DiscIO/Src/BannerLoaderGC.cpp
+++ b/Source/Core/DiscIO/Src/BannerLoaderGC.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 // HyperIris: need clean code
 #include "../../Core/Src/ConfigManager.h"
diff --git a/Source/Core/DiscIO/Src/BannerLoaderGC.h b/Source/Core/DiscIO/Src/BannerLoaderGC.h
index 8b14a45d43..b9674feb58 100644
--- a/Source/Core/DiscIO/Src/BannerLoaderGC.h
+++ b/Source/Core/DiscIO/Src/BannerLoaderGC.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _BANNER_LOADER_GC_H_
 #define _BANNER_LOADER_GC_H_
diff --git a/Source/Core/DiscIO/Src/BannerLoaderWii.cpp b/Source/Core/DiscIO/Src/BannerLoaderWii.cpp
index f606ed8876..e682ca13c6 100644
--- a/Source/Core/DiscIO/Src/BannerLoaderWii.cpp
+++ b/Source/Core/DiscIO/Src/BannerLoaderWii.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include <stdio.h>
 #include <algorithm>
diff --git a/Source/Core/DiscIO/Src/BannerLoaderWii.h b/Source/Core/DiscIO/Src/BannerLoaderWii.h
index 036eeeacbd..33a1dce6ae 100644
--- a/Source/Core/DiscIO/Src/BannerLoaderWii.h
+++ b/Source/Core/DiscIO/Src/BannerLoaderWii.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _BANNER_LOADER_WII_H_
 #define _BANNER_LOADER_WII_H_
diff --git a/Source/Core/DiscIO/Src/Blob.cpp b/Source/Core/DiscIO/Src/Blob.cpp
index 115145e290..ba02e98b3c 100644
--- a/Source/Core/DiscIO/Src/Blob.cpp
+++ b/Source/Core/DiscIO/Src/Blob.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "Common.h"
 #include "FileUtil.h"
diff --git a/Source/Core/DiscIO/Src/Blob.h b/Source/Core/DiscIO/Src/Blob.h
index 556ba23402..c332257c8f 100644
--- a/Source/Core/DiscIO/Src/Blob.h
+++ b/Source/Core/DiscIO/Src/Blob.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _BLOB_H
 #define _BLOB_H
diff --git a/Source/Core/DiscIO/Src/CISOBlob.cpp b/Source/Core/DiscIO/Src/CISOBlob.cpp
index 8d267c15fb..c4b3c60143 100644
--- a/Source/Core/DiscIO/Src/CISOBlob.cpp
+++ b/Source/Core/DiscIO/Src/CISOBlob.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include <algorithm>
 #include <cmath>
@@ -72,7 +59,7 @@ bool CISOFileReader::Read(u64 offset, u64 nbytes, u8* out_ptr)
 		auto const bytes_to_read = std::min(m_block_size - data_offset, nbytes);
 		if (block < CISO_MAP_SIZE && UNUSED_BLOCK_ID != m_ciso_map[block])
 		{
-			// calcualte the base address
+			// calculate the base address
 			auto const file_off = CISO_HEADER_SIZE + m_ciso_map[block] * m_block_size + data_offset;
 
 			if (!(m_file.Seek(file_off, SEEK_SET) && m_file.ReadArray(out_ptr, bytes_to_read)))
diff --git a/Source/Core/DiscIO/Src/CISOBlob.h b/Source/Core/DiscIO/Src/CISOBlob.h
index 9b490f0638..8c580b0ce1 100644
--- a/Source/Core/DiscIO/Src/CISOBlob.h
+++ b/Source/Core/DiscIO/Src/CISOBlob.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _CISO_BLOB_H
 #define _CISO_BLOB_H
diff --git a/Source/Core/DiscIO/Src/CompressedBlob.cpp b/Source/Core/DiscIO/Src/CompressedBlob.cpp
index 2bc4a93ede..b469dedc9c 100644
--- a/Source/Core/DiscIO/Src/CompressedBlob.cpp
+++ b/Source/Core/DiscIO/Src/CompressedBlob.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifdef _WIN32
 #include <io.h>
@@ -301,10 +288,10 @@ bool DecompressBlobToFile(const char* infile, const char* outfile, CompressCB ca
 
 	File::IOFile f(outfile, "wb");
 	if (!f)
-    {
-        delete reader;
+	{
+		delete reader;
 		return false;
-    }
+	}
 
 	const CompressedBlobHeader &header = reader->GetHeader();
 	u8* buffer = new u8[header.block_size];
diff --git a/Source/Core/DiscIO/Src/CompressedBlob.h b/Source/Core/DiscIO/Src/CompressedBlob.h
index 1458ff4d80..843054442f 100644
--- a/Source/Core/DiscIO/Src/CompressedBlob.h
+++ b/Source/Core/DiscIO/Src/CompressedBlob.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 
 // WARNING Code not big-endian safe.
diff --git a/Source/Core/DiscIO/Src/DiscScrubber.cpp b/Source/Core/DiscIO/Src/DiscScrubber.cpp
index 9ea4a1911d..fc4c01be31 100644
--- a/Source/Core/DiscIO/Src/DiscScrubber.cpp
+++ b/Source/Core/DiscIO/Src/DiscScrubber.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "Filesystem.h"
 #include "VolumeCreator.h"
@@ -93,7 +80,7 @@ bool SetupScrub(const char* filename, int block_size)
 
 	if (CLUSTER_SIZE % m_BlockSize != 0)
 	{
-		ERROR_LOG(DISCIO, "block size %i is not a factor of 0x8000, scrubbing not possible", m_BlockSize);
+		ERROR_LOG(DISCIO, "Block size %i is not a factor of 0x8000, scrubbing not possible", m_BlockSize);
 		return false;
 	}
 
@@ -106,7 +93,7 @@ bool SetupScrub(const char* filename, int block_size)
 
 	// Warn if not DVD5 or DVD9 size
 	if (numClusters != 0x23048 && numClusters != 0x46090)
-		WARN_LOG(DISCIO, "%s is not a standard sized wii disc! (%x blocks)", filename, numClusters);
+		WARN_LOG(DISCIO, "%s is not a standard sized Wii disc! (%x blocks)", filename, numClusters);
 
 	// Table of free blocks
 	m_FreeTable = new u8[numClusters];
diff --git a/Source/Core/DiscIO/Src/DiscScrubber.h b/Source/Core/DiscIO/Src/DiscScrubber.h
index d1d053f734..01ea1d8393 100644
--- a/Source/Core/DiscIO/Src/DiscScrubber.h
+++ b/Source/Core/DiscIO/Src/DiscScrubber.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 
 // DiscScrubber removes the garbage data from discs (currently wii only) which
diff --git a/Source/Core/DiscIO/Src/DriveBlob.cpp b/Source/Core/DiscIO/Src/DriveBlob.cpp
index 2638f3fac4..dc2c58f066 100644
--- a/Source/Core/DiscIO/Src/DriveBlob.cpp
+++ b/Source/Core/DiscIO/Src/DriveBlob.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "DriveBlob.h"
 #include "StringUtil.h"
diff --git a/Source/Core/DiscIO/Src/DriveBlob.h b/Source/Core/DiscIO/Src/DriveBlob.h
index f1c83530f8..cb1c7f8f08 100644
--- a/Source/Core/DiscIO/Src/DriveBlob.h
+++ b/Source/Core/DiscIO/Src/DriveBlob.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _DRIVE_BLOB_H
 #define _DRIVE_BLOB_H
diff --git a/Source/Core/DiscIO/Src/FileBlob.cpp b/Source/Core/DiscIO/Src/FileBlob.cpp
index f00228772d..42ea73c78d 100644
--- a/Source/Core/DiscIO/Src/FileBlob.cpp
+++ b/Source/Core/DiscIO/Src/FileBlob.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "FileBlob.h"
 
diff --git a/Source/Core/DiscIO/Src/FileBlob.h b/Source/Core/DiscIO/Src/FileBlob.h
index 2e1fdcbb2e..464c5daa64 100644
--- a/Source/Core/DiscIO/Src/FileBlob.h
+++ b/Source/Core/DiscIO/Src/FileBlob.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _FILE_BLOB_H
 #define _FILE_BLOB_H
diff --git a/Source/Core/DiscIO/Src/FileHandlerARC.cpp b/Source/Core/DiscIO/Src/FileHandlerARC.cpp
index 63a4876718..d295986f9e 100644
--- a/Source/Core/DiscIO/Src/FileHandlerARC.cpp
+++ b/Source/Core/DiscIO/Src/FileHandlerARC.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "Common.h"
 
diff --git a/Source/Core/DiscIO/Src/FileHandlerARC.h b/Source/Core/DiscIO/Src/FileHandlerARC.h
index 65d4b77d9e..9b5797e902 100644
--- a/Source/Core/DiscIO/Src/FileHandlerARC.h
+++ b/Source/Core/DiscIO/Src/FileHandlerARC.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _ARC_FILE_H
 #define _ARC_FILE_H
@@ -30,7 +17,7 @@ class CARCFile
 {
 	public:
 
-        CARCFile(const std::string& _rFilename);
+		CARCFile(const std::string& _rFilename);
 
 		CARCFile(const std::string& _rFilename, u32 offset);
 
diff --git a/Source/Core/DiscIO/Src/FileMonitor.cpp b/Source/Core/DiscIO/Src/FileMonitor.cpp
index 4c23df182d..26a24046b5 100644
--- a/Source/Core/DiscIO/Src/FileMonitor.cpp
+++ b/Source/Core/DiscIO/Src/FileMonitor.cpp
@@ -1,19 +1,6 @@
-// Copyright (C) 2003-2008 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include <iostream>
 #include <vector>
@@ -46,7 +33,7 @@ bool ShowSound(std::string FileName)
 	SplitPath(FileName, NULL, NULL, &Ending);
 	std::transform(Ending.begin(),Ending.end(),Ending.begin(),::tolower);
 
-	if (  
+	if (
 		   (Ending == ".adp") // 1080 Avalanche, Crash Bandicoot, etc
 		|| (Ending == ".afc") // Zelda WW
 		|| (Ending == ".ast") // Zelda TP, Mario Kart
@@ -76,6 +63,7 @@ void ReadGC(std::string FileName)
 		delete pFileSystem;
 		pFileSystem = NULL;
 	}
+
 	// GCFiles' pointers are no longer valid after pFileSystem is cleared
 	GCFiles.clear();
 	OpenISO = DiscIO::CreateVolumeFromFilename(FileName);
@@ -99,7 +87,9 @@ void CheckFile(std::string File, u64 Size)
 	if (CurrentFile == File)
 		return;
 
-	if (Size > 0) Size = (Size / 1000);
+	if (Size > 0)
+		Size = (Size / 1000);
+
 	std::string Str = StringFromFormat("%s kB %s", ThousandSeparate(Size, 7).c_str(), File.c_str());
 	if (ShowSound(File))
 	{
@@ -119,10 +109,16 @@ void CheckFile(std::string File, u64 Size)
 void FindFilename(u64 offset)
 {
 	// Don't do anything if a game is not running
-	if (Core::GetState() != Core::CORE_RUN) return;
+	if (Core::GetState() != Core::CORE_RUN)
+		return;
+
 	// Or if the log is unselected
-	if (!LogManager::GetInstance()->IsEnabled(LogTypes::FILEMON)) return;
-	if (!FileAccess) return;
+	if (!LogManager::GetInstance()->IsEnabled(LogTypes::FILEMON))
+		return;
+
+	// Or if we don't have file access
+	if (!FileAccess)
+		return;
 
 	if (!pFileSystem || ISOFile != SConfig::GetInstance().m_LastFilename)
 	{
diff --git a/Source/Core/DiscIO/Src/FileMonitor.h b/Source/Core/DiscIO/Src/FileMonitor.h
index dbd1ca6da7..3b40332eea 100644
--- a/Source/Core/DiscIO/Src/FileMonitor.h
+++ b/Source/Core/DiscIO/Src/FileMonitor.h
@@ -1,20 +1,6 @@
-// Copyright (C) 2003-2008 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/
-
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include <iostream> // System: For std
 
diff --git a/Source/Core/DiscIO/Src/FileSystemGCWii.cpp b/Source/Core/DiscIO/Src/FileSystemGCWii.cpp
index 93b569e043..69d250e523 100644
--- a/Source/Core/DiscIO/Src/FileSystemGCWii.cpp
+++ b/Source/Core/DiscIO/Src/FileSystemGCWii.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "Common.h"
 #include "FileUtil.h"
diff --git a/Source/Core/DiscIO/Src/FileSystemGCWii.h b/Source/Core/DiscIO/Src/FileSystemGCWii.h
index 9054ade272..8817e44153 100644
--- a/Source/Core/DiscIO/Src/FileSystemGCWii.h
+++ b/Source/Core/DiscIO/Src/FileSystemGCWii.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _FILESYSTEM_GC_WII_H
 #define _FILESYSTEM_GC_WII_H
diff --git a/Source/Core/DiscIO/Src/Filesystem.cpp b/Source/Core/DiscIO/Src/Filesystem.cpp
index bff8b804f9..cdf6288a54 100644
--- a/Source/Core/DiscIO/Src/Filesystem.cpp
+++ b/Source/Core/DiscIO/Src/Filesystem.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "Filesystem.h"
 
diff --git a/Source/Core/DiscIO/Src/Filesystem.h b/Source/Core/DiscIO/Src/Filesystem.h
index 8bc98e6a77..6995eec5fa 100644
--- a/Source/Core/DiscIO/Src/Filesystem.h
+++ b/Source/Core/DiscIO/Src/Filesystem.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _FILESYSTEM_H
 #define _FILESYSTEM_H
diff --git a/Source/Core/DiscIO/Src/NANDContentLoader.cpp b/Source/Core/DiscIO/Src/NANDContentLoader.cpp
index 110efd6fa9..0cc71bafb8 100644
--- a/Source/Core/DiscIO/Src/NANDContentLoader.cpp
+++ b/Source/Core/DiscIO/Src/NANDContentLoader.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "NANDContentLoader.h"
 
@@ -260,17 +247,18 @@ bool CNANDContentLoader::Initialize(const std::string& _rName)
 		rContent.m_Size= (u32)Common::swap64(pTMD + 0x01ec + 0x24*i);
 		memcpy(rContent.m_SHA1Hash, pTMD + 0x01f4 + 0x24*i, 20);
 		memcpy(rContent.m_Header, pTMD + 0x01e4 + 0x24*i, 36);
+
 		if (m_isWAD)
 		{
-		u32 RoundedSize = ROUND_UP(rContent.m_Size, 0x40);
-		rContent.m_pData = new u8[RoundedSize];
+			u32 RoundedSize = ROUND_UP(rContent.m_Size, 0x40);
+			rContent.m_pData = new u8[RoundedSize];
 		
-		memset(IV, 0, sizeof IV);
-		memcpy(IV, pTMD + 0x01e8 + 0x24*i, 2);
-		AESDecode(DecryptTitleKey, IV, pDataApp, RoundedSize, rContent.m_pData);
+			memset(IV, 0, sizeof IV);
+			memcpy(IV, pTMD + 0x01e8 + 0x24*i, 2);
+			AESDecode(DecryptTitleKey, IV, pDataApp, RoundedSize, rContent.m_pData);
 
-		pDataApp += RoundedSize;
-		continue;
+			pDataApp += RoundedSize;
+			continue;
 		}
 
 		rContent.m_pData = NULL;
@@ -282,7 +270,9 @@ bool CNANDContentLoader::Initialize(const std::string& _rName)
 			strcpy(szFilename, Filename.c_str());
 		}
 		else
+		{
 			sprintf(szFilename, "%s/%08x.app", m_Path.c_str(), rContent.m_ContentID);
+		}
 
 		INFO_LOG(DISCIO, "NANDContentLoader: load %s", szFilename);
 
diff --git a/Source/Core/DiscIO/Src/NANDContentLoader.h b/Source/Core/DiscIO/Src/NANDContentLoader.h
index f95ae6586c..66d6a4880c 100644
--- a/Source/Core/DiscIO/Src/NANDContentLoader.h
+++ b/Source/Core/DiscIO/Src/NANDContentLoader.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _NAND_CONTENT_LOADER_H
 #define _NAND_CONTENT_LOADER_H
@@ -62,7 +49,7 @@ public:
 	virtual const u8* GetTMDHeader() const = 0;
 	virtual u32 GetTIKSize() const = 0;
 	virtual const u8* GetTIK() const = 0;
-	virtual const std::vector<SNANDContent>& GetContent() const = 0;    
+	virtual const std::vector<SNANDContent>& GetContent() const = 0;
 	virtual u16 GetTitleVersion() const = 0;
 	virtual u16 GetNumEntries() const = 0;
 	virtual DiscIO::IVolume::ECountry GetCountry() const = 0;
diff --git a/Source/Core/DiscIO/Src/Volume.h b/Source/Core/DiscIO/Src/Volume.h
index c19aaf93a8..454319c876 100644
--- a/Source/Core/DiscIO/Src/Volume.h
+++ b/Source/Core/DiscIO/Src/Volume.h
@@ -1,19 +1,7 @@
-// Copyright (C) 2003 Dolphin Project.
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
-// 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 _VOLUME_H
 #define _VOLUME_H
@@ -38,6 +26,7 @@ public:
 	virtual void GetTMD(u8*, u32 *_sz) const { *_sz=0; }
 	virtual std::string GetUniqueID() const = 0;
 	virtual std::string GetMakerID() const = 0;
+	virtual int GetRevision() const { return 0; }
 	// TODO: eliminate?
 	virtual std::string GetName() const;
 	virtual std::vector<std::string> GetNames() const = 0;
@@ -65,6 +54,9 @@ public:
 
 	virtual ECountry GetCountry() const = 0;
 	virtual u64 GetSize() const = 0;
+	
+	// Size on disc (compressed size)
+	virtual u64 GetRawSize() const = 0;
 };
 
 // Generic Switch function for all volumes
diff --git a/Source/Core/DiscIO/Src/VolumeCommon.cpp b/Source/Core/DiscIO/Src/VolumeCommon.cpp
index 4ab433680d..07a514a2ea 100644
--- a/Source/Core/DiscIO/Src/VolumeCommon.cpp
+++ b/Source/Core/DiscIO/Src/VolumeCommon.cpp
@@ -1,19 +1,7 @@
-// Copyright (C) 2003 Dolphin Project.
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
-// 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 "Volume.h"
 
 namespace DiscIO
@@ -69,7 +57,7 @@ IVolume::ECountry CountrySwitch(u8 CountryCode)
 		case 'T': // Korea with English language
 		case 'Q': // Korea with Japanese language
 			return IVolume::COUNTRY_KOREA;
-			break;			
+			break;
 
 		case 'O':
 			return IVolume::COUNTRY_SDK;
diff --git a/Source/Core/DiscIO/Src/VolumeCreator.cpp b/Source/Core/DiscIO/Src/VolumeCreator.cpp
index d8ee65d26f..6cf5ea836e 100644
--- a/Source/Core/DiscIO/Src/VolumeCreator.cpp
+++ b/Source/Core/DiscIO/Src/VolumeCreator.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include <vector>
 
diff --git a/Source/Core/DiscIO/Src/VolumeCreator.h b/Source/Core/DiscIO/Src/VolumeCreator.h
index 732370307d..1e290f3cc5 100644
--- a/Source/Core/DiscIO/Src/VolumeCreator.h
+++ b/Source/Core/DiscIO/Src/VolumeCreator.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _VOLUME_CREATOR_H
 #define _VOLUME_CREATOR_H
diff --git a/Source/Core/DiscIO/Src/VolumeDirectory.cpp b/Source/Core/DiscIO/Src/VolumeDirectory.cpp
index be7cdeb565..f095201aff 100644
--- a/Source/Core/DiscIO/Src/VolumeDirectory.cpp
+++ b/Source/Core/DiscIO/Src/VolumeDirectory.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "Common.h"
 #include "MathUtil.h"
@@ -240,6 +227,10 @@ u64 CVolumeDirectory::GetSize() const
 	return 0;
 }
 
+u64 CVolumeDirectory::GetRawSize() const
+{
+	return GetSize();
+}
 
 std::string CVolumeDirectory::ExtractDirectoryName(const std::string& _rDirectory)
 {
@@ -465,7 +456,7 @@ void CVolumeDirectory::WriteEntry(const File::FSTEntry& entry, u32& fstOffset, u
 	if(entry.isDirectory)
 	{
 		u32 myOffset = fstOffset;
-		u32 myEntryNum = myOffset / ENTRY_SIZE;		
+		u32 myEntryNum = myOffset / ENTRY_SIZE;
 		WriteEntryData(fstOffset, DIRECTORY_ENTRY, nameOffset, parentEntryNum, (u32)(myEntryNum + entry.size + 1));
 		WriteEntryName(nameOffset, entry.virtualName);
 
diff --git a/Source/Core/DiscIO/Src/VolumeDirectory.h b/Source/Core/DiscIO/Src/VolumeDirectory.h
index 4e28d6460f..e37eb9275c 100644
--- a/Source/Core/DiscIO/Src/VolumeDirectory.h
+++ b/Source/Core/DiscIO/Src/VolumeDirectory.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _VOLUME_DIRECTORY
 #define _VOLUME_DIRECTORY
@@ -60,6 +47,7 @@ public:
 	ECountry GetCountry() const;
 
 	u64 GetSize() const;
+	u64 GetRawSize() const;
 
 	void BuildFST();
 
diff --git a/Source/Core/DiscIO/Src/VolumeGC.cpp b/Source/Core/DiscIO/Src/VolumeGC.cpp
index 6210172790..ba858467fc 100644
--- a/Source/Core/DiscIO/Src/VolumeGC.cpp
+++ b/Source/Core/DiscIO/Src/VolumeGC.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "stdafx.h"
 
@@ -91,6 +78,18 @@ std::string CVolumeGC::GetMakerID() const
 	return makerID;
 }
 
+int CVolumeGC::GetRevision() const
+{
+	if (!m_pReader)
+		return 0;
+
+	u8 Revision;
+	if (!Read(7, 1, &Revision))
+		return 0;
+
+	return Revision;
+}
+
 std::vector<std::string> CVolumeGC::GetNames() const
 {
 	std::vector<std::string> names;
@@ -138,6 +137,14 @@ u64 CVolumeGC::GetSize() const
 		return 0;
 }
 
+u64 CVolumeGC::GetRawSize() const
+{
+	if (m_pReader)
+		return m_pReader->GetRawSize();
+	else
+		return 0;
+}
+
 bool CVolumeGC::IsDiscTwo() const
 {
 	bool discTwo;
diff --git a/Source/Core/DiscIO/Src/VolumeGC.h b/Source/Core/DiscIO/Src/VolumeGC.h
index d7729ee04c..fcc7aec611 100644
--- a/Source/Core/DiscIO/Src/VolumeGC.h
+++ b/Source/Core/DiscIO/Src/VolumeGC.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _VOLUME_GC
 #define _VOLUME_GC
@@ -34,11 +21,13 @@ public:
 	bool RAWRead(u64 _Offset, u64 _Length, u8* _pBuffer) const;
 	std::string GetUniqueID() const;
 	std::string GetMakerID() const;
+	int GetRevision() const;
 	std::vector<std::string> GetNames() const;
 	u32 GetFSTSize() const;
 	std::string GetApploaderDate() const;
 	ECountry GetCountry() const;
 	u64 GetSize() const;
+	u64 GetRawSize() const;
 	bool IsDiscTwo() const;
 	
 	typedef std::string(*StringDecoder)(const std::string&);
diff --git a/Source/Core/DiscIO/Src/VolumeWad.cpp b/Source/Core/DiscIO/Src/VolumeWad.cpp
index a10e5bdb42..e3356ad5b4 100644
--- a/Source/Core/DiscIO/Src/VolumeWad.cpp
+++ b/Source/Core/DiscIO/Src/VolumeWad.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include <algorithm>
 #include <math.h>
@@ -149,7 +136,15 @@ std::vector<std::string> CVolumeWAD::GetNames() const
 u64 CVolumeWAD::GetSize() const
 {
 	if (m_pReader)
-		return (size_t)m_pReader->GetDataSize();
+		return m_pReader->GetDataSize();
+	else
+		return 0;
+}
+
+u64 CVolumeWAD::GetRawSize() const
+{
+	if (m_pReader)
+		return m_pReader->GetRawSize();
 	else
 		return 0;
 }
diff --git a/Source/Core/DiscIO/Src/VolumeWad.h b/Source/Core/DiscIO/Src/VolumeWad.h
index afc16766a2..d22e7a2c9e 100644
--- a/Source/Core/DiscIO/Src/VolumeWad.h
+++ b/Source/Core/DiscIO/Src/VolumeWad.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _VOLUME_WAD
 #define _VOLUME_WAD
@@ -43,6 +30,7 @@ public:
 	std::string GetApploaderDate() const	{ return "0"; }	
 	ECountry GetCountry() const;
 	u64 GetSize() const;
+	u64 GetRawSize() const;
 
 private:
 	IBlobReader* m_pReader;
diff --git a/Source/Core/DiscIO/Src/VolumeWiiCrypted.cpp b/Source/Core/DiscIO/Src/VolumeWiiCrypted.cpp
index 32aa92bd08..84b5b24f6b 100644
--- a/Source/Core/DiscIO/Src/VolumeWiiCrypted.cpp
+++ b/Source/Core/DiscIO/Src/VolumeWiiCrypted.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "VolumeWiiCrypted.h"
 #include "VolumeGC.h"
@@ -230,6 +217,18 @@ u64 CVolumeWiiCrypted::GetSize() const
 	}
 }
 
+u64 CVolumeWiiCrypted::GetRawSize() const
+{
+	if (m_pReader)
+	{
+		return m_pReader->GetRawSize();
+	}
+	else
+	{
+		return 0;
+	}
+}
+
 bool CVolumeWiiCrypted::CheckIntegrity() const
 {
 	// Get partition data size
diff --git a/Source/Core/DiscIO/Src/VolumeWiiCrypted.h b/Source/Core/DiscIO/Src/VolumeWiiCrypted.h
index 56c2a8a363..457774628e 100644
--- a/Source/Core/DiscIO/Src/VolumeWiiCrypted.h
+++ b/Source/Core/DiscIO/Src/VolumeWiiCrypted.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _VOLUME_WII_CRYPTED
 #define _VOLUME_WII_CRYPTED
@@ -42,6 +29,7 @@ public:
 	std::string GetApploaderDate() const;
 	ECountry GetCountry() const;
 	u64 GetSize() const;
+	u64 GetRawSize() const;
 
 	bool SupportsIntegrityCheck() const { return true; }
 	bool CheckIntegrity() const;
diff --git a/Source/Core/DiscIO/Src/WbfsBlob.cpp b/Source/Core/DiscIO/Src/WbfsBlob.cpp
index 0fd89243e3..3983bd5ff6 100644
--- a/Source/Core/DiscIO/Src/WbfsBlob.cpp
+++ b/Source/Core/DiscIO/Src/WbfsBlob.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "WbfsBlob.h"
 #include "FileUtil.h"
@@ -133,7 +120,7 @@ bool WbfsFileReader::Read(u64 offset, u64 nbytes, u8* out_ptr)
 {
 	while(nbytes)
 	{
-		u64 read_size;
+		u64 read_size = 0;
 		File::IOFile& data_file = SeekToCluster(offset, &read_size);
 		read_size = (read_size > nbytes) ? nbytes : read_size;
 
diff --git a/Source/Core/DiscIO/Src/WbfsBlob.h b/Source/Core/DiscIO/Src/WbfsBlob.h
index acae008fc2..c59eb84173 100644
--- a/Source/Core/DiscIO/Src/WbfsBlob.h
+++ b/Source/Core/DiscIO/Src/WbfsBlob.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _WBFS_BLOB_H
 #define _WBFS_BLOB_H
diff --git a/Source/Core/DiscIO/Src/WiiWad.cpp b/Source/Core/DiscIO/Src/WiiWad.cpp
index d718436905..ed58977670 100644
--- a/Source/Core/DiscIO/Src/WiiWad.cpp
+++ b/Source/Core/DiscIO/Src/WiiWad.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "NANDContentLoader.h"
 
@@ -112,10 +99,11 @@ bool WiiWAD::ParseWAD(DiscIO::IBlobReader& _rReader)
 	m_TMDSize                 = ReaderBig.Read32(0x14);
 	m_DataAppSize             = ReaderBig.Read32(0x18);
 	m_FooterSize              = ReaderBig.Read32(0x1C);
+
 #if MAX_LOGLEVEL >= DEBUG_LEVEL
-    _dbg_assert_msg_(BOOT, Reserved==0x00, "WiiWAD: Reserved must be 0x00");
+	_dbg_assert_msg_(BOOT, Reserved==0x00, "WiiWAD: Reserved must be 0x00");
 #else
-    (void)Reserved;
+	(void)Reserved;
 #endif
 
 	u32 Offset = 0x40;
diff --git a/Source/Core/DiscIO/Src/WiiWad.h b/Source/Core/DiscIO/Src/WiiWad.h
index 3b0bad1ed9..6f75585ecf 100644
--- a/Source/Core/DiscIO/Src/WiiWad.h
+++ b/Source/Core/DiscIO/Src/WiiWad.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _WII_WAD_H
 #define _WII_WAD_H
diff --git a/Source/Core/DiscIO/Src/stdafx.cpp b/Source/Core/DiscIO/Src/stdafx.cpp
index 6fec708afd..89b047311e 100644
--- a/Source/Core/DiscIO/Src/stdafx.cpp
+++ b/Source/Core/DiscIO/Src/stdafx.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "stdafx.h"
 
diff --git a/Source/Core/DiscIO/Src/stdafx.h b/Source/Core/DiscIO/Src/stdafx.h
index 4a94d1510d..5d6c2c1c42 100644
--- a/Source/Core/DiscIO/Src/stdafx.h
+++ b/Source/Core/DiscIO/Src/stdafx.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #pragma once
 
diff --git a/Source/Core/DolphinWX/CMakeLists.txt b/Source/Core/DolphinWX/CMakeLists.txt
index 1256890eb5..9508f75a36 100644
--- a/Source/Core/DolphinWX/CMakeLists.txt
+++ b/Source/Core/DolphinWX/CMakeLists.txt
@@ -7,10 +7,19 @@ set(LIBS	core
 			audiocommon
 			z
 			sfml-network
-			${GTK2_LIBRARIES}
-			${XRANDR_LIBRARIES}
-			${X11_LIBRARIES})
+			${GTK2_LIBRARIES})
 if(NOT ANDROID)
+	if(USE_X11)
+	  set(LIBS  ${LIBS} ${X11_LIBRARIES}
+	      ${XRANDR_LIBRARIES})
+	endif()
+	if(USE_WAYLAND)
+	  set(LIBS  ${LIBS} ${WAYLAND_LIBRARIES}
+		${XKBCOMMON_LIBRARIES})
+	endif()
+
+	link_directories(${CMAKE_PREFIX_PATH}/lib)
+
 	if(SDL2_FOUND)
 		# Using shared SDL2
 		set(LIBS	${LIBS} ${SDL2_LIBRARY})
@@ -23,6 +32,8 @@ if(NOT ANDROID)
 			set(LIBS	${LIBS} SDL)
 		endif()
 	endif()
+else()
+	set(LIBS ${LIBS} png)
 endif()
 
 if(LIBAV_FOUND)
@@ -80,20 +91,25 @@ if(wxWidgets_FOUND)
 	set(WXLIBS ${wxWidgets_LIBRARIES})
 else()
 	if(ANDROID)
-		set(SRCS Src/MainAndroid.cpp)
+		set(SRCS Src/Android/TextureLoader.cpp
+			 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)
+	set(SRCS ${SRCS} Src/GLInterface/Platform.cpp
+		Src/GLInterface/EGL.cpp)	
+	if(USE_WAYLAND)
+		set(SRCS ${SRCS} Src/GLInterface/Wayland_Util.cpp)
+	endif()
+	if(USE_X11)
+		set(SRCS ${SRCS} Src/GLInterface/X11_Util.cpp)
 	endif()
 else()
 	if(WIN32)
-		set(SRCS ${SRCS} Src/GLInterface/GLW.cpp)
+		set(SRCS ${SRCS} Src/GLInterface/WGL.cpp)
 	elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
 		set(SRCS ${SRCS} Src/GLInterface/AGL.cpp)
 	else()
@@ -127,10 +143,8 @@ elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
 	list(APPEND SRCS ${RESOURCES})
 	set_source_files_properties(${RESOURCES} PROPERTIES
 		MACOSX_PACKAGE_LOCATION Resources)
-else()
-	if(NOT ANDROID)
-		set(SRCS ${SRCS} Src/X11Utils.cpp)
-	endif()
+elseif(USE_X11)
+	set(SRCS ${SRCS} Src/X11Utils.cpp)
 endif()
 
 if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD" OR
diff --git a/Source/Core/DolphinWX/Info.plist.in b/Source/Core/DolphinWX/Info.plist.in
index 9a05a972c8..c23ae1e40e 100644
--- a/Source/Core/DolphinWX/Info.plist.in
+++ b/Source/Core/DolphinWX/Info.plist.in
@@ -57,6 +57,8 @@
 	<string>${OSX_MIN_VERSION}</string>
 	<key>LSRequiresCarbon</key>
 	<true/>
+	<key>NSHighResolutionCapable</key>
+	<true/>
 	<key>CSResourcesFileMapped</key>
 	<true/>
 </dict>
diff --git a/Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp b/Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp
index e08753f40f..f0fd91abdb 100644
--- a/Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp
+++ b/Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "ARCodeAddEdit.h"
 #include "ARDecrypt.h"
@@ -170,8 +157,12 @@ void CARCodeAddEdit::UpdateTextCtrl(ActionReplay::ARCode arCode)
 	EditCheatCode->Clear();
 
 	if (arCode.name != "")
+	{
 		for (u32 i = 0; i < arCode.ops.size(); i++)
 			EditCheatCode->AppendText(wxString::Format(wxT("%08X %08X\n"), arCode.ops.at(i).cmd_addr, arCode.ops.at(i).value));
+	}
 	else
+	{
 		EditCheatCode->SetValue(_("Insert Encrypted or Decrypted code here..."));
+	}
 }
diff --git a/Source/Core/DolphinWX/Src/ARCodeAddEdit.h b/Source/Core/DolphinWX/Src/ARCodeAddEdit.h
index 2702dfb888..cdc9e95077 100644
--- a/Source/Core/DolphinWX/Src/ARCodeAddEdit.h
+++ b/Source/Core/DolphinWX/Src/ARCodeAddEdit.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef __ARCODE_ADDEDIT_h__
 #define __ARCODE_ADDEDIT_h__
diff --git a/Source/Core/DolphinWX/Src/AboutDolphin.cpp b/Source/Core/DolphinWX/Src/AboutDolphin.cpp
index 5126274601..72d488e7af 100644
--- a/Source/Core/DolphinWX/Src/AboutDolphin.cpp
+++ b/Source/Core/DolphinWX/Src/AboutDolphin.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "Common.h"
 #include "AboutDolphin.h"
diff --git a/Source/Core/DolphinWX/Src/AboutDolphin.h b/Source/Core/DolphinWX/Src/AboutDolphin.h
index 1fa44b53ec..4c31f6493a 100644
--- a/Source/Core/DolphinWX/Src/AboutDolphin.h
+++ b/Source/Core/DolphinWX/Src/AboutDolphin.h
@@ -1,19 +1,7 @@
-// Copyright (C) 2003 Dolphin Project.
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
-// 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 _ABOUTDOLPHIN_H_
 #define _ABOUTDOLPHIN_H_
 
diff --git a/Source/Core/DolphinWX/Src/Android/TextureLoader.cpp b/Source/Core/DolphinWX/Src/Android/TextureLoader.cpp
new file mode 100644
index 0000000000..077cf32a1a
--- /dev/null
+++ b/Source/Core/DolphinWX/Src/Android/TextureLoader.cpp
@@ -0,0 +1,179 @@
+// Copyright (C) 2003 Dolphin Project.
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, version 2.0.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License 2.0 for more details.
+
+// A copy of the GPL 2.0 should have been included with the program.
+// If not, see http://www.gnu.org/licenses/
+
+// Official SVN repository and contact information can be found at
+// http://code.google.com/p/dolphin-emu/
+
+#include "GLInterface.h"
+#include <png.h>
+
+GLuint LoadPNG(const char *filename)
+{
+	FILE         *infile;         /* PNG file pointer */
+	png_structp   png_ptr;        /* internally used by libpng */
+	png_infop     info_ptr;       /* user requested transforms */
+
+	char         *image_data;      /* raw png image data */
+	char         sig[8];           /* PNG signature array */
+	/*char         **row_pointers;   */
+
+	int           bit_depth;
+	int           color_type;
+
+	png_uint_32 width;            /* PNG image width in pixels */
+	png_uint_32 height;           /* PNG image height in pixels */
+	unsigned int rowbytes;         /* raw bytes at row n in image */
+
+	image_data = NULL;
+	unsigned int i;
+	png_bytepp row_pointers = NULL;
+
+	/* Open the file. */
+	infile = fopen(filename, "rb");
+	if (!infile) 
+		return 0;
+
+	/*
+	*              13.3 readpng_init()
+	*/
+
+	/* Check for the 8-byte signature */
+	fread(sig, 1, 8, infile);
+
+	if (!png_check_sig((unsigned char *) sig, 8)) {
+		fclose(infile);
+		return 0;
+	}
+
+	/* 
+	* Set up the PNG structs 
+	*/
+	png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
+	if (!png_ptr) {
+		fclose(infile);
+		return 4;    /* out of memory */
+	}
+
+	info_ptr = png_create_info_struct(png_ptr);
+	if (!info_ptr) {
+		png_destroy_read_struct(&png_ptr, (png_infopp) NULL, (png_infopp) NULL);
+		fclose(infile);
+		return 4;    /* out of memory */
+	}
+
+
+	/*
+	* block to handle libpng errors, 
+	* then check whether the PNG file had a bKGD chunk
+	*/
+	if (setjmp(png_jmpbuf(png_ptr))) {
+		png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
+		fclose(infile);
+		return 0;
+	}
+
+	/* 
+	* takes our file stream pointer (infile) and 
+	* stores it in the png_ptr struct for later use.
+	*/
+	/* png_ptr->io_ptr = (png_voidp)infile;*/
+	png_init_io(png_ptr, infile);
+
+	/*
+	* lets libpng know that we already checked the 8 
+	* signature bytes, so it should not expect to find 
+	* them at the current file pointer location
+	*/
+	png_set_sig_bytes(png_ptr, 8);
+
+	/* Read the image */
+
+	/*
+	* reads and processes not only the PNG file's IHDR chunk 
+	* but also any other chunks up to the first IDAT 
+	* (i.e., everything before the image data).
+	*/
+
+	/* read all the info up to the image data  */
+	png_read_info(png_ptr, info_ptr);
+
+	png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth, 
+	&color_type, NULL, NULL, NULL);
+
+	/* Set up some transforms. */
+	if (bit_depth > 8) 
+		png_set_strip_16(png_ptr);
+	
+	if (color_type == PNG_COLOR_TYPE_GRAY || color_type == PNG_COLOR_TYPE_GRAY_ALPHA) 
+		png_set_gray_to_rgb(png_ptr);
+
+	if (color_type == PNG_COLOR_TYPE_PALETTE) 
+		png_set_palette_to_rgb(png_ptr);
+
+	/* Update the png info struct.*/
+	png_read_update_info(png_ptr, info_ptr);
+
+	/* Rowsize in bytes. */
+	rowbytes = png_get_rowbytes(png_ptr, info_ptr);
+
+
+	/* Allocate the image_data buffer. */
+	if ((image_data = (char *) malloc(rowbytes * height))==NULL) {
+		png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
+		return 4;
+	}
+
+	if ((row_pointers = (png_bytepp)malloc(height*sizeof(png_bytep))) == NULL) {
+		png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
+		free(image_data);
+		image_data = NULL;
+		return 4;
+	}
+
+
+	/* set the individual row_pointers to point at the correct offsets */
+
+	for (i = 0;  i < height;  ++i)
+		row_pointers[i] = (png_byte*)(image_data + i*rowbytes);
+
+
+	/* now we can go ahead and just read the whole image */
+	png_read_image(png_ptr, row_pointers);
+
+	/* and we're done!  (png_read_end() can be omitted if no processing of
+	* post-IDAT text/time/etc. is desired) */
+
+	/* Clean up. */
+	free(row_pointers);
+
+	/* Clean up. */
+	png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
+	fclose(infile);
+
+	GLuint Texture = 0;
+	glGenTextures(1, &Texture);
+
+	/* create a new texture object
+	* and bind it to texname (unsigned integer > 0)
+	*/
+	glBindTexture(GL_TEXTURE_2D, Texture);
+	glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+	glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, width, height, 0, 
+				GL_RGBA, GL_UNSIGNED_BYTE, image_data);
+	return Texture;
+}
diff --git a/Source/Core/DolphinWX/Src/Android/TextureLoader.h b/Source/Core/DolphinWX/Src/Android/TextureLoader.h
new file mode 100644
index 0000000000..69575807e6
--- /dev/null
+++ b/Source/Core/DolphinWX/Src/Android/TextureLoader.h
@@ -0,0 +1,21 @@
+// 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 "GLInterface.h"
+
+GLuint LoadPNG(const char *filename);
+
diff --git a/Source/Core/DolphinWX/Src/CheatsWindow.cpp b/Source/Core/DolphinWX/Src/CheatsWindow.cpp
index fb3c3cbb23..e3a51208b4 100644
--- a/Source/Core/DolphinWX/Src/CheatsWindow.cpp
+++ b/Source/Core/DolphinWX/Src/CheatsWindow.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "Globals.h"
 #include "CheatsWindow.h"
@@ -298,10 +285,11 @@ void wxCheatsWindow::OnEvent_CheatsList_ItemSelected(wxCommandEvent& WXUNUSED (e
 			sprintf(numcodes, "Number of Codes: %lu", (unsigned long)code.ops.size());
 			m_Label_NumCodes->SetLabel(StrToWxStr(numcodes));
 			m_ListBox_CodesList->Clear();
+
 			for (size_t j = 0; j < code.ops.size(); j++)
 			{
 				char text2[CHAR_MAX];
-			    char* ops = text2;
+				char* ops = text2;
 				sprintf(ops, "%08x %08x", code.ops[j].cmd_addr, code.ops[j].value);
 				m_ListBox_CodesList->Append(StrToWxStr(ops));
 			}
@@ -323,7 +311,7 @@ void wxCheatsWindow::OnEvent_CheatsList_ItemToggled(wxCommandEvent& WXUNUSED (ev
 
 void wxCheatsWindow::OnEvent_ApplyChanges_Press(wxCommandEvent& ev)
 {
-	// Appply AR Code changes
+	// Apply AR Code changes
 	for (size_t i = 0; i < indexList.size(); i++)
 	{
 		ActionReplay::SetARCode_IsActive(m_CheckListBox_CheatsList->IsChecked(indexList[i].uiIndex), indexList[i].index);
@@ -332,7 +320,7 @@ void wxCheatsWindow::OnEvent_ApplyChanges_Press(wxCommandEvent& ev)
 	// Apply Gecko Code changes
 	Gecko::SetActiveCodes(m_geckocode_panel->GetCodes());
 
-	// save gameini, with changed gecko codes
+	// Save gameini, with changed gecko codes
 	if (m_gameini_path.size())
 	{
 		Gecko::SaveCodes(m_gameini, m_geckocode_panel->GetCodes());
@@ -409,7 +397,7 @@ void CheatSearchTab::FilterCheatSearchResults(wxCommandEvent&)
 	filtered_results.reserve(search_results.size());
 
 
-	// determine the selected filter
+	// Determine the selected filter
 	// 1 : equal
 	// 2 : greater-than
 	// 4 : less-than
diff --git a/Source/Core/DolphinWX/Src/CheatsWindow.h b/Source/Core/DolphinWX/Src/CheatsWindow.h
index f1acc1c118..293236e005 100644
--- a/Source/Core/DolphinWX/Src/CheatsWindow.h
+++ b/Source/Core/DolphinWX/Src/CheatsWindow.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef __CHEATSWINDOW_H__
 #define __CHEATSWINDOW_H__
diff --git a/Source/Core/DolphinWX/Src/ConfigMain.cpp b/Source/Core/DolphinWX/Src/ConfigMain.cpp
index cbd780e6aa..edbc45a50d 100644
--- a/Source/Core/DolphinWX/Src/ConfigMain.cpp
+++ b/Source/Core/DolphinWX/Src/ConfigMain.cpp
@@ -1,23 +1,11 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include <string> // System
 #include <vector>
 #include <algorithm>
+#include <functional>
 #include <wx/spinbutt.h>
 
 #include "Common.h"
@@ -43,14 +31,6 @@
 #include "Main.h"
 #include "VideoBackendBase.h"
 
-#if defined(__APPLE__)
-#include <tr1/functional>
-using std::tr1::function;
-#else
-#include <functional>
-using std::function;
-#endif
-
 #define TEXT_BOX(page, text) new wxStaticText(page, wxID_ANY, text, wxDefaultPosition, wxDefaultSize)
 
 struct CPUCore
@@ -59,12 +39,12 @@ struct CPUCore
 	const char *name;
 };
 const CPUCore CPUCores[] = {
-	{0, "Interpreter (VERY slow)"},
+	{0, wxTRANSLATE("Interpreter (VERY slow)")},
 #ifdef _M_ARM
-	{3, "Arm JIT (experimental)"},
+	{3, wxTRANSLATE("Arm JIT (experimental)")},
 #else
-	{1, "JIT Recompiler (recommended)"},
-	{2, "JITIL experimental recompiler"},
+	{1, wxTRANSLATE("JIT Recompiler (recommended)")},
+	{2, wxTRANSLATE("JITIL experimental recompiler")},
 #endif
 };
 
@@ -97,6 +77,7 @@ static const wxLanguage langIds[] =
 	wxLANGUAGE_RUSSIAN,
 	wxLANGUAGE_SERBIAN,
 	wxLANGUAGE_SPANISH,
+	wxLANGUAGE_SWEDISH,
 	wxLANGUAGE_TURKISH,
 };
 
@@ -268,7 +249,7 @@ void CConfigMain::InitializeGUILists()
 
 	// Emulator Engine
 	for (unsigned int a = 0; a < (sizeof(CPUCores) / sizeof(CPUCore)); ++a)
-		arrayStringFor_CPUEngine.Add(_(CPUCores[a].name));
+		arrayStringFor_CPUEngine.Add(wxGetTranslation(CPUCores[a].name));
 		
 	// DSP Engine 
 	arrayStringFor_DSPEngine.Add(_("DSP HLE emulation (fast)"));
@@ -327,6 +308,7 @@ void CConfigMain::InitializeGUILists()
 	arrayStringFor_InterfaceLang.Add(_("Russian"));
 	arrayStringFor_InterfaceLang.Add(_("Serbian"));
 	arrayStringFor_InterfaceLang.Add(_("Spanish"));
+	arrayStringFor_InterfaceLang.Add(_("Swedish"));
 	arrayStringFor_InterfaceLang.Add(_("Turkish"));
 }
 
@@ -502,7 +484,7 @@ void CConfigMain::InitializeGUITooltips()
 {
 	// General - Basic
 	CPUThread->SetToolTip(_("This splits the Video and CPU threads, so they can be run on separate cores.\nCauses major speed improvements on PCs with more than one core, but can also cause occasional crashes/glitches."));
-	Framelimit->SetToolTip(_("If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use Audio to throttle using the DSP (might fix audio clicks but can also cause constant noise depending on the game)."));
+	Framelimit->SetToolTip(_("This limits the game speed to the specified number of frames per second (full speed is 60 for NTSC and 50 for PAL). Alternatively, use Audio to throttle using the DSP (might fix audio clicks but can also cause constant noise depending on the game)."));
 
 	// General - Advanced
 	_NTSCJ->SetToolTip(_("Forces NTSC-J mode for using the Japanese ROM font.\nLeft unchecked, dolphin defaults to NTSC-U and automatically enables this setting when playing Japanese games."));
@@ -515,7 +497,7 @@ void CConfigMain::InitializeGUITooltips()
 	InterfaceLang->SetToolTip(_("Change the language of the user interface.\nRequires restart."));
 
 	// Audio tooltips
-	DSPThread->SetToolTip(_("Run DSP LLE on a dedicated thread (not recommended)."));
+	DSPThread->SetToolTip(_("Run DSP HLE and LLE on a dedicated thread (not recommended: might cause audio glitches with HLE and freezes with LLE)."));
 	BackendSelection->SetToolTip(_("Changing this will have no effect while the emulator is running!"));
 
 	// Gamecube - Devices
@@ -624,16 +606,17 @@ void CConfigMain::CreateGUIControls()
 		SplitPath(filename, NULL, &name, &ext);
 
 		name += ext;
-		if (-1 == theme_selection->FindString(name))
-			theme_selection->Append(name);
+		auto const wxname = StrToWxStr(name);
+		if (-1 == theme_selection->FindString(wxname))
+			theme_selection->Append(wxname);
 	});
 	
-	theme_selection->SetStringSelection(SConfig::GetInstance().m_LocalCoreStartupParameter.theme_name);
+	theme_selection->SetStringSelection(StrToWxStr(SConfig::GetInstance().m_LocalCoreStartupParameter.theme_name));
 
 	// std::function = avoid error on msvc
-	theme_selection->Bind(wxEVT_COMMAND_CHOICE_SELECTED, function<void(wxEvent&)>([theme_selection](wxEvent&)
+	theme_selection->Bind(wxEVT_COMMAND_CHOICE_SELECTED, std::function<void(wxEvent&)>([theme_selection](wxEvent&)
 	{
-		SConfig::GetInstance().m_LocalCoreStartupParameter.theme_name = theme_selection->GetStringSelection();
+		SConfig::GetInstance().m_LocalCoreStartupParameter.theme_name = WxStrToStr(theme_selection->GetStringSelection());
 		main_frame->InitBitmaps();
 		main_frame->UpdateGameList();
 	}));
@@ -657,7 +640,7 @@ void CConfigMain::CreateGUIControls()
 	// Audio page
 	DSPEngine = new wxRadioBox(AudioPage, ID_DSPENGINE, _("DSP Emulator Engine"),
 				wxDefaultPosition, wxDefaultSize, arrayStringFor_DSPEngine, 0, wxRA_SPECIFY_ROWS);
-	DSPThread = new wxCheckBox(AudioPage, ID_DSPTHREAD, _("DSP LLE on Thread"));
+	DSPThread = new wxCheckBox(AudioPage, ID_DSPTHREAD, _("DSP on Dedicated 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"));
@@ -976,7 +959,9 @@ void CConfigMain::AudioSettingsChanged(wxCommandEvent& event)
 		VolumeSlider->Enable(SupportsVolumeChanges(WxStrToStr(BackendSelection->GetStringSelection())));
 		Latency->Enable(WxStrToStr(BackendSelection->GetStringSelection()) == BACKEND_OPENAL);
 		DPL2Decoder->Enable(WxStrToStr(BackendSelection->GetStringSelection()) == BACKEND_OPENAL);
-		SConfig::GetInstance().sBackend = WxStrToStr(BackendSelection->GetStringSelection());
+		// Don't save the translated BACKEND_NULLSOUND string
+		SConfig::GetInstance().sBackend = BackendSelection->GetSelection() ?
+			WxStrToStr(BackendSelection->GetStringSelection()) : BACKEND_NULLSOUND;
 		AudioCommon::UpdateSoundStream();
 		break;
 
@@ -997,8 +982,8 @@ void CConfigMain::AddAudioBackends()
 	for (std::vector<std::string>::const_iterator iter = backends.begin(); 
 		 iter != backends.end(); ++iter)
 	{
-		BackendSelection->Append(StrToWxStr(*iter));
-		int num = BackendSelection->\
+		BackendSelection->Append(wxGetTranslation(StrToWxStr(*iter)));
+		int num = BackendSelection->
 			FindString(StrToWxStr(SConfig::GetInstance().sBackend));
 		BackendSelection->SetSelection(num);
 	}
@@ -1239,7 +1224,9 @@ void CConfigMain::AddRemoveISOPaths(wxCommandEvent& event)
 		if (dialog.ShowModal() == wxID_OK)
 		{
 			if (ISOPaths->FindString(dialog.GetPath()) != -1)
+			{
 				wxMessageBox(_("The chosen directory is already in the list"), _("Error"), wxOK);
+			}
 			else
 			{
 				bRefreshList = true;
diff --git a/Source/Core/DolphinWX/Src/ConfigMain.h b/Source/Core/DolphinWX/Src/ConfigMain.h
index 4f8820e01b..094fb6df85 100644
--- a/Source/Core/DolphinWX/Src/ConfigMain.h
+++ b/Source/Core/DolphinWX/Src/ConfigMain.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef __CONFIG_MAIN_h__
 #define __CONFIG_MAIN_h__
diff --git a/Source/Core/DolphinWX/Src/Debugger/BreakpointDlg.cpp b/Source/Core/DolphinWX/Src/Debugger/BreakpointDlg.cpp
index 96dbac8ff8..64348e3cd4 100644
--- a/Source/Core/DolphinWX/Src/Debugger/BreakpointDlg.cpp
+++ b/Source/Core/DolphinWX/Src/Debugger/BreakpointDlg.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "BreakpointDlg.h"
 #include "StringUtil.h"
@@ -47,10 +34,12 @@ void BreakPointDlg::OnOK(wxCommandEvent& event)
 	{
 		PowerPC::breakpoints.Add(Address);
 		Parent->NotifyUpdate();
-		Close();		
+		Close();
 	}
 	else
+	{
 		PanicAlert("The address %s is invalid.", WxStrToStr(AddressString).c_str());
+	}
 
 	event.Skip();
 }
diff --git a/Source/Core/DolphinWX/Src/Debugger/BreakpointDlg.h b/Source/Core/DolphinWX/Src/Debugger/BreakpointDlg.h
index 8c2fc01846..b5d6248e6f 100644
--- a/Source/Core/DolphinWX/Src/Debugger/BreakpointDlg.h
+++ b/Source/Core/DolphinWX/Src/Debugger/BreakpointDlg.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef __BREAKPOINTDLG_h__
 #define __BREAKPOINTDLG_h__
diff --git a/Source/Core/DolphinWX/Src/Debugger/BreakpointView.cpp b/Source/Core/DolphinWX/Src/Debugger/BreakpointView.cpp
index a23e9194fd..c3d366c1dc 100644
--- a/Source/Core/DolphinWX/Src/Debugger/BreakpointView.cpp
+++ b/Source/Core/DolphinWX/Src/Debugger/BreakpointView.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include <wx/wx.h>
 
@@ -40,10 +27,10 @@ void CBreakPointView::Update()
 	InsertColumn(0, wxT("Active"));
 	InsertColumn(1, wxT("Type"));
 	InsertColumn(2, wxT("Function"));
-    InsertColumn(3, wxT("Address"));
-    InsertColumn(4, wxT("Flags"));
+	InsertColumn(3, wxT("Address"));
+	InsertColumn(4, wxT("Flags"));
 
-    char szBuffer[64];
+	char szBuffer[64];
 	const BreakPoints::TBreakPoints& rBreakPoints = PowerPC::breakpoints.GetBreakPoints();
 	for (size_t i = 0; i < rBreakPoints.size(); i++)
 	{
@@ -63,11 +50,11 @@ void CBreakPointView::Update()
 				SetItem(Item, 2, temp);
 			}
 			
-            sprintf(szBuffer, "%08x", rBP.iAddress);
-            temp = StrToWxStr(szBuffer);
+			sprintf(szBuffer, "%08x", rBP.iAddress);
+			temp = StrToWxStr(szBuffer);
 			SetItem(Item, 3, temp);
 
-            SetItemData(Item, rBP.iAddress);
+			SetItemData(Item, rBP.iAddress);
 		}
 	}
 
@@ -108,12 +95,12 @@ void CBreakPointView::Update()
 
 void CBreakPointView::DeleteCurrentSelection()
 {
-    int Item = GetNextItem(-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
-    if (Item >= 0)
-    {
-        u32 Address = (u32)GetItemData(Item);
-        PowerPC::breakpoints.Remove(Address);
-        PowerPC::memchecks.Remove(Address);
+	int Item = GetNextItem(-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
+	if (Item >= 0)
+	{
+		u32 Address = (u32)GetItemData(Item);
+		PowerPC::breakpoints.Remove(Address);
+		PowerPC::memchecks.Remove(Address);
 		Update();
-    }
+	}
 }
diff --git a/Source/Core/DolphinWX/Src/Debugger/BreakpointView.h b/Source/Core/DolphinWX/Src/Debugger/BreakpointView.h
index 8e454ee58d..08c38de97e 100644
--- a/Source/Core/DolphinWX/Src/Debugger/BreakpointView.h
+++ b/Source/Core/DolphinWX/Src/Debugger/BreakpointView.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef __BREAKPOINTVIEW_h__
 #define __BREAKPOINTVIEW_h__
diff --git a/Source/Core/DolphinWX/Src/Debugger/BreakpointWindow.cpp b/Source/Core/DolphinWX/Src/Debugger/BreakpointWindow.cpp
index 35f957d71a..a39196697c 100644
--- a/Source/Core/DolphinWX/Src/Debugger/BreakpointWindow.cpp
+++ b/Source/Core/DolphinWX/Src/Debugger/BreakpointWindow.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "BreakpointWindow.h"
 #include "BreakpointView.h"
diff --git a/Source/Core/DolphinWX/Src/Debugger/BreakpointWindow.h b/Source/Core/DolphinWX/Src/Debugger/BreakpointWindow.h
index 43c49d717b..4f54e823aa 100644
--- a/Source/Core/DolphinWX/Src/Debugger/BreakpointWindow.h
+++ b/Source/Core/DolphinWX/Src/Debugger/BreakpointWindow.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef __BREAKPOINTWINDOW_h__
 #define __BREAKPOINTWINDOW_h__
diff --git a/Source/Core/DolphinWX/Src/Debugger/CodeView.cpp b/Source/Core/DolphinWX/Src/Debugger/CodeView.cpp
index 31ad19d6da..619d4a75e9 100644
--- a/Source/Core/DolphinWX/Src/Debugger/CodeView.cpp
+++ b/Source/Core/DolphinWX/Src/Debugger/CodeView.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "Common.h"
 #include "StringUtil.h"
@@ -62,20 +49,20 @@ END_EVENT_TABLE()
 CCodeView::CCodeView(DebugInterface* debuginterface, SymbolDB *symboldb,
 		wxWindow* parent, wxWindowID Id)
 	: wxControl(parent, Id),
-      debugger(debuginterface),
+	  debugger(debuginterface),
 	  symbol_db(symboldb),
 	  plain(false),
 	  curAddress(debuginterface->getPC()),
 	  align(debuginterface->getInstructionSize(0)),
-      rowHeight(13),
-      selection(0),
-      oldSelection(0),
-      selectionChanged(false),
-      selecting(false),
-      hasFocus(false),
-      showHex(false),
-      lx(-1),
-      ly(-1)
+	  rowHeight(13),
+	  selection(0),
+	  oldSelection(0),
+	  selectionChanged(false),
+	  selecting(false),
+	  hasFocus(false),
+	  showHex(false),
+	  lx(-1),
+	  ly(-1)
 {
 }
 
@@ -104,7 +91,9 @@ void CCodeView::OnMouseDown(wxMouseEvent& event)
 			Refresh();
 	}
 	else
+	{
 		ToggleBreakpoint(YToAddress(y));
+	}
 
 	event.Skip(true);
 }
@@ -133,7 +122,9 @@ void CCodeView::OnMouseMove(wxMouseEvent& event)
 			Refresh();
 		}
 		else
+		{
 			OnMouseDown(event);
+		}
 	}
 
 	event.Skip(true);
@@ -176,14 +167,17 @@ u32 CCodeView::AddrToBranch(u32 addr)
 void CCodeView::InsertBlrNop(int Blr)
 {
 	// Check if this address has been modified
-	int find = -1;				
+	int find = -1;
 	for(u32 i = 0; i < BlrList.size(); i++)
 	{
 		if(BlrList.at(i).Address == selection)
-		{ find = i; break;  }					
+		{
+			find = i;
+			break;
+		}
 	}
 
-	// Save the old value				
+	// Save the old value
 	if (find >= 0)
 	{
 		debugger->writeExtraMemory(0, BlrList.at(find).OldValue, selection);
@@ -196,11 +190,11 @@ void CCodeView::InsertBlrNop(int Blr)
 		Temp.OldValue = debugger->readMemory(selection);
 		BlrList.push_back(Temp);
 		if (Blr == 0)
-			debugger->insertBLR(selection, 0x4e800020);			
+			debugger->insertBLR(selection, 0x4e800020);
 		else
-			debugger->insertBLR(selection, 0x60000000);	
+			debugger->insertBLR(selection, 0x60000000);
 	}
-	Refresh();	
+	Refresh();
 }
 
 void CCodeView::OnPopupMenu(wxCommandEvent& event)
@@ -211,14 +205,14 @@ void CCodeView::OnPopupMenu(wxCommandEvent& event)
 
 	switch (event.GetId())
 	{
-	    case IDM_GOTOINMEMVIEW:
-		    // CMemoryDlg::Goto(selection);
-		    break;
+		case IDM_GOTOINMEMVIEW:
+			// CMemoryDlg::Goto(selection);
+			break;
 
 #if wxUSE_CLIPBOARD
-	    case IDM_COPYADDRESS:
-		    wxTheClipboard->SetData(new wxTextDataObject(wxString::Format(_T("%08x"), selection)));
-		    break;
+		case IDM_COPYADDRESS:
+			wxTheClipboard->SetData(new wxTextDataObject(wxString::Format(_T("%08x"), selection)));
+			break;
 
 		case IDM_COPYCODE:
 			{
@@ -228,13 +222,13 @@ void CCodeView::OnPopupMenu(wxCommandEvent& event)
 			}
 			break;
 
-	    case IDM_COPYHEX:
-		    {
-		    char temp[24];
-		    sprintf(temp, "%08x", debugger->readInstruction(selection));
-		    wxTheClipboard->SetData(new wxTextDataObject(StrToWxStr(temp)));
-		    }
-		    break;
+		case IDM_COPYHEX:
+			{
+			char temp[24];
+			sprintf(temp, "%08x", debugger->readInstruction(selection));
+			wxTheClipboard->SetData(new wxTextDataObject(StrToWxStr(temp)));
+			}
+			break;
 
 
 		case IDM_COPYFUNCTION:
@@ -259,11 +253,11 @@ void CCodeView::OnPopupMenu(wxCommandEvent& event)
 			break;
 #endif
 
-	    case IDM_RUNTOHERE:
-		    debugger->setBreakpoint(selection);
-		    debugger->runToBreakpoint();
-		    Refresh();
-		    break;
+		case IDM_RUNTOHERE:
+			debugger->setBreakpoint(selection);
+			debugger->runToBreakpoint();
+			Refresh();
+			break;
 
 		// Insert blr or restore old value
 		case IDM_INSERTBLR:
@@ -275,9 +269,9 @@ void CCodeView::OnPopupMenu(wxCommandEvent& event)
 			Refresh();
 			break;
 
-	    case IDM_JITRESULTS:
+		case IDM_JITRESULTS:
 			debugger->showJitResults(selection);
-		    break;
+			break;
 			
 		case IDM_FOLLOWBRANCH:
 			{
@@ -366,7 +360,7 @@ void CCodeView::OnPaint(wxPaintEvent& event)
 	dc.GetTextExtent(_T("0WJyq"),&w,&h);
 
 	if (h > rowHeight)
-	    rowHeight = h;
+		rowHeight = h;
 
 	dc.GetTextExtent(_T("W"),&w,&h);
 	int charWidth = w;
@@ -507,7 +501,8 @@ void CCodeView::OnPaint(wxPaintEvent& event)
 				strcpy(desc, debugger->getDescription(address).c_str());
 			}
 
-			if (!plain) {
+			if (!plain)
+			{
 				dc.SetTextForeground(_T("#0000FF")); // blue
 
 				//char temp[256];
@@ -535,11 +530,11 @@ void CCodeView::OnPaint(wxPaintEvent& event)
 	
 	for (int i = 0; i < numBranches; i++)
 	{
-	    int x = 17 + 49 * charWidth + (branches[i].srcAddr % 9) * 8;
-	    _MoveTo(x-2, branches[i].src);
+		int x = 17 + 49 * charWidth + (branches[i].srcAddr % 9) * 8;
+		_MoveTo(x-2, branches[i].src);
 
 		if (branches[i].dst < rc.height + 400 && branches[i].dst > -400)
-	    {
+		{
 			_LineTo(dc, x+2, branches[i].src);
 			_LineTo(dc, x+2, branches[i].dst);
 			_LineTo(dc, x-4, branches[i].dst);
@@ -547,7 +542,7 @@ void CCodeView::OnPaint(wxPaintEvent& event)
 			_MoveTo(x, branches[i].dst - 4);
 			_LineTo(dc, x-4, branches[i].dst);
 			_LineTo(dc, x+1, branches[i].dst+5);
-	    }
+		}
 		//else
 		//{
 			// This can be re-enabled when there is a scrollbar or
diff --git a/Source/Core/DolphinWX/Src/Debugger/CodeView.h b/Source/Core/DolphinWX/Src/Debugger/CodeView.h
index a7da24f424..5f4c41eaf7 100644
--- a/Source/Core/DolphinWX/Src/Debugger/CodeView.h
+++ b/Source/Core/DolphinWX/Src/Debugger/CodeView.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef CODEVIEW_H_
 #define CODEVIEW_H_
diff --git a/Source/Core/DolphinWX/Src/Debugger/CodeWindow.cpp b/Source/Core/DolphinWX/Src/Debugger/CodeWindow.cpp
index 9172a3af9a..4853e0396b 100644
--- a/Source/Core/DolphinWX/Src/Debugger/CodeWindow.cpp
+++ b/Source/Core/DolphinWX/Src/Debugger/CodeWindow.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 // Include
 #include "Common.h"
@@ -138,16 +125,16 @@ void CCodeWindow::OnHostMessage(wxCommandEvent& event)
 {
 	switch (event.GetId())
 	{
-	    case IDM_NOTIFYMAPLOADED:
-		    NotifyMapLoaded();
+		case IDM_NOTIFYMAPLOADED:
+			NotifyMapLoaded();
 			if (m_BreakpointWindow) m_BreakpointWindow->NotifyUpdate();
-		    break;
+			break;
 
-	    case IDM_UPDATEDISASMDIALOG:
-		    Update();
+		case IDM_UPDATEDISASMDIALOG:
+			Update();
 			if (codeview) codeview->Center(PC);
-		    if (m_RegisterWindow) m_RegisterWindow->NotifyUpdate();
-		    break;
+			if (m_RegisterWindow) m_RegisterWindow->NotifyUpdate();
+			break;
 
 		case IDM_UPDATEBREAKPOINTS:
 			Update();
@@ -161,31 +148,31 @@ void CCodeWindow::OnCodeStep(wxCommandEvent& event)
 {
 	switch (event.GetId())
 	{
-	    case IDM_STEP:
+		case IDM_STEP:
 			SingleStep();
-		    break;
+			break;
 
-	    case IDM_STEPOVER:
+		case IDM_STEPOVER:
 			StepOver();
-		    break;
+			break;
 
 		case IDM_TOGGLE_BREAKPOINT:
 			ToggleBreakpoint();
 			break;
 
-	    case IDM_SKIP:
-		    PC += 4;
-		    Update();
-		    break;
+		case IDM_SKIP:
+			PC += 4;
+			Update();
+			break;
 
-	    case IDM_SETPC:
-		    PC = codeview->GetSelection();
-		    Update();
-		    break;
+		case IDM_SETPC:
+			PC = codeview->GetSelection();
+			Update();
+			break;
 
-	    case IDM_GOTOPC:
-		    JumpToAddress(PC);
-		    break;
+		case IDM_GOTOPC:
+			JumpToAddress(PC);
+			break;
 	}
 
 	UpdateButtonStates();
@@ -227,7 +214,7 @@ void CCodeWindow::OnCallstackListChange(wxCommandEvent& event)
 {
 	int index   = callstack->GetSelection();
 	if (index >= 0)
-   	{
+	{
 		u32 address = (u32)(u64)(callstack->GetClientData(index));
 		if (address)
 			JumpToAddress(address);
@@ -238,7 +225,7 @@ void CCodeWindow::OnCallersListChange(wxCommandEvent& event)
 {
 	int index = callers->GetSelection();
 	if (index >= 0)
-   	{
+	{
 		u32 address = (u32)(u64)(callers->GetClientData(index));
 		if (address)
 			JumpToAddress(address);
@@ -249,7 +236,7 @@ void CCodeWindow::OnCallsListChange(wxCommandEvent& event)
 {
 	int index = calls->GetSelection();
 	if (index >= 0)
-   	{
+	{
 		u32 address = (u32)(u64)(calls->GetClientData(index));
 		if (address)
 			JumpToAddress(address);
@@ -283,7 +270,9 @@ void CCodeWindow::StepOver()
 			Update();
 		}
 		else
+		{
 			SingleStep();
+		}
 
 		UpdateButtonStates();
 		// Update all toolbars in the aui manager
@@ -307,12 +296,13 @@ void CCodeWindow::UpdateLists()
 	Symbol *symbol = g_symbolDB.GetSymbolFromAddr(addr);
 	if (!symbol)
 		return;
+
 	for (int i = 0; i < (int)symbol->callers.size(); i++)
 	{
 		u32 caller_addr = symbol->callers[i].callAddress;
 		Symbol *caller_symbol = g_symbolDB.GetSymbolFromAddr(caller_addr);
 		if (caller_symbol)
-	   	{
+		{
 			int idx = callers->Append(StrToWxStr(StringFromFormat
 						("< %s (%08x)", caller_symbol->name.c_str(), caller_addr).c_str()));
 			callers->SetClientData(idx, (void*)(u64)caller_addr);
@@ -325,7 +315,7 @@ void CCodeWindow::UpdateLists()
 		u32 call_addr = symbol->calls[i].function;
 		Symbol *call_symbol = g_symbolDB.GetSymbolFromAddr(call_addr);
 		if (call_symbol)
-	   	{
+		{
 			int idx = calls->Append(StrToWxStr(StringFromFormat
 						("> %s (%08x)", call_symbol->name.c_str(), call_addr).c_str()));
 			calls->SetClientData(idx, (void*)(u64)call_addr);
@@ -354,8 +344,7 @@ void CCodeWindow::UpdateCallstack()
 }
 
 // Create CPU Mode menus
-void CCodeWindow::CreateMenu(const SCoreStartupParameter& _LocalCoreStartupParameter,
-	   	wxMenuBar *pMenuBar)
+void CCodeWindow::CreateMenu(const SCoreStartupParameter& _LocalCoreStartupParameter, wxMenuBar *pMenuBar)
 {
 	// CPU Mode
 	wxMenu* pCoreMenu = new wxMenu;
@@ -386,7 +375,7 @@ void CCodeWindow::CreateMenu(const SCoreStartupParameter& _LocalCoreStartupParam
 		_("Turn off all JIT functions, but still use the JIT core from Jit.cpp"),
 		wxITEM_CHECK);
 	pCoreMenu->Append(IDM_JITLSOFF, _("&JIT LoadStore off"),
-		   	wxEmptyString, wxITEM_CHECK);
+			wxEmptyString, wxITEM_CHECK);
 	pCoreMenu->Append(IDM_JITLSLBZXOFF, _("    &JIT LoadStore lbzx off"),
 			wxEmptyString, wxITEM_CHECK);
 	pCoreMenu->Append(IDM_JITLSLXZOFF, _("    &JIT LoadStore lXz off"),
@@ -394,17 +383,17 @@ void CCodeWindow::CreateMenu(const SCoreStartupParameter& _LocalCoreStartupParam
 	pCoreMenu->Append(IDM_JITLSLWZOFF, _("&JIT LoadStore lwz off"),
 			wxEmptyString, wxITEM_CHECK);
 	pCoreMenu->Append(IDM_JITLSFOFF, _("&JIT LoadStore Floating off"),
-		   	wxEmptyString, wxITEM_CHECK);
+			wxEmptyString, wxITEM_CHECK);
 	pCoreMenu->Append(IDM_JITLSPOFF, _("&JIT LoadStore Paired off"),
-		   	wxEmptyString, wxITEM_CHECK);
+			wxEmptyString, wxITEM_CHECK);
 	pCoreMenu->Append(IDM_JITFPOFF, _("&JIT FloatingPoint off"),
-		   	wxEmptyString, wxITEM_CHECK);
+			wxEmptyString, wxITEM_CHECK);
 	pCoreMenu->Append(IDM_JITIOFF, _("&JIT Integer off"),
-		   	wxEmptyString, wxITEM_CHECK);
+			wxEmptyString, wxITEM_CHECK);
 	pCoreMenu->Append(IDM_JITPOFF, _("&JIT Paired off"),
-		   	wxEmptyString, wxITEM_CHECK);
+			wxEmptyString, wxITEM_CHECK);
 	pCoreMenu->Append(IDM_JITSROFF, _("&JIT SystemRegisters off"),
-		   	wxEmptyString, wxITEM_CHECK);
+			wxEmptyString, wxITEM_CHECK);
 
 	pMenuBar->Append(pCoreMenu, _("&JIT"));
 
@@ -448,46 +437,46 @@ void CCodeWindow::OnCPUMode(wxCommandEvent& event)
 	{
 		case IDM_INTERPRETER:
 			PowerPC::SetMode(UseInterpreter() ? PowerPC::MODE_INTERPRETER : PowerPC::MODE_JIT);
-		   	break;
+			break;
 		case IDM_BOOTTOPAUSE:
 			bBootToPause = !bBootToPause;
-		   	return;
+			return;
 		case IDM_AUTOMATICSTART:
 			bAutomaticStart = !bAutomaticStart;
-		   	return;
+			return;
 		case IDM_JITOFF:
 			Core::g_CoreStartupParameter.bJITOff = event.IsChecked();
-		   	break;
+			break;
 		case IDM_JITLSOFF:
 			Core::g_CoreStartupParameter.bJITLoadStoreOff = event.IsChecked();
-		   	break;
+			break;
 		case IDM_JITLSLXZOFF:
 			Core::g_CoreStartupParameter.bJITLoadStorelXzOff = event.IsChecked();
-		   	break;
+			break;
 		case IDM_JITLSLWZOFF:
 			Core::g_CoreStartupParameter.bJITLoadStorelwzOff = event.IsChecked();
-		   	break;
+			break;
 		case IDM_JITLSLBZXOFF:
 			Core::g_CoreStartupParameter.bJITLoadStorelbzxOff = event.IsChecked();
-		   	break;
+			break;
 		case IDM_JITLSFOFF:
 			Core::g_CoreStartupParameter.bJITLoadStoreFloatingOff = event.IsChecked();
-		   	break;
+			break;
 		case IDM_JITLSPOFF:
 			Core::g_CoreStartupParameter.bJITLoadStorePairedOff = event.IsChecked();
-		   	break;
+			break;
 		case IDM_JITFPOFF:
 			Core::g_CoreStartupParameter.bJITFloatingPointOff = event.IsChecked();
-		   	break;
+			break;
 		case IDM_JITIOFF:
 			Core::g_CoreStartupParameter.bJITIntegerOff = event.IsChecked();
-		   	break;
+			break;
 		case IDM_JITPOFF:
 			Core::g_CoreStartupParameter.bJITPairedOff = event.IsChecked();
-		   	break;
+			break;
 		case IDM_JITSROFF:
 			Core::g_CoreStartupParameter.bJITSystemRegistersOff = event.IsChecked();
-		   	break;
+			break;
 	}
 
 	// Clear the JIT cache to enable these changes
@@ -503,22 +492,22 @@ void CCodeWindow::OnJitMenu(wxCommandEvent& event)
 	{
 		case IDM_LOGINSTRUCTIONS:
 			PPCTables::LogCompiledInstructions();
-		   	break;
+			break;
 
 		case IDM_CLEARCODECACHE:
 			JitInterface::ClearCache();
-		   	break;
+			break;
 
 		case IDM_SEARCHINSTRUCTION:
 		{
 			wxString str;
 			str = wxGetTextFromUser(_T(""), wxT("Op?"), wxEmptyString, this);
 			for (u32 addr = 0x80000000; addr < 0x80100000; addr += 4)
-		   	{
+			{
 				const char *name = PPCTables::GetInstructionName(Memory::ReadUnchecked_U32(addr));
 				auto const wx_name = WxStrToStr(str);
 				if (name && (wx_name == name))
-			   	{
+				{
 					NOTICE_LOG(POWERPC, "Found %s at %08x", wx_name.c_str(), addr);
 				}
 			}
@@ -575,10 +564,10 @@ void CCodeWindow::PopulateToolbar(wxAuiToolBar* toolBar)
 
 	toolBar->SetToolBitmapSize(wxSize(w, h));
 	toolBar->AddTool(IDM_STEP,		_("Step"),			m_Bitmaps[Toolbar_Step]);
-	toolBar->AddTool(IDM_STEPOVER,	_("Step Over"),     m_Bitmaps[Toolbar_StepOver]);
+	toolBar->AddTool(IDM_STEPOVER,	_("Step Over"),		m_Bitmaps[Toolbar_StepOver]);
 	toolBar->AddTool(IDM_SKIP,		_("Skip"),			m_Bitmaps[Toolbar_Skip]);
 	toolBar->AddSeparator();
-	toolBar->AddTool(IDM_GOTOPC,    _("Show PC"),		m_Bitmaps[Toolbar_GotoPC]);
+	toolBar->AddTool(IDM_GOTOPC,		_("Show PC"),		m_Bitmaps[Toolbar_GotoPC]);
 	toolBar->AddTool(IDM_SETPC,		_("Set PC"),		m_Bitmaps[Toolbar_SetPC]);
 	toolBar->AddSeparator();
 	toolBar->AddControl(new wxTextCtrl(toolBar, IDM_ADDRBOX, _T("")));
diff --git a/Source/Core/DolphinWX/Src/Debugger/CodeWindow.h b/Source/Core/DolphinWX/Src/Debugger/CodeWindow.h
index dd9cc6300e..2b5b24d6eb 100644
--- a/Source/Core/DolphinWX/Src/Debugger/CodeWindow.h
+++ b/Source/Core/DolphinWX/Src/Debugger/CodeWindow.h
@@ -1,20 +1,6 @@
-// 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/
-
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef CODEWINDOW_H_
 #define CODEWINDOW_H_
diff --git a/Source/Core/DolphinWX/Src/Debugger/CodeWindowFunctions.cpp b/Source/Core/DolphinWX/Src/Debugger/CodeWindowFunctions.cpp
index ef4622d14f..c8f7b63eb4 100644
--- a/Source/Core/DolphinWX/Src/Debugger/CodeWindowFunctions.cpp
+++ b/Source/Core/DolphinWX/Src/Debugger/CodeWindowFunctions.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "Common.h"
 #include "CommonPaths.h"
@@ -410,7 +397,7 @@ void CCodeWindow::OnChangeFont(wxCommandEvent& event)
 		DebuggerFont = dialog.GetFontData().GetChosenFont();
 }
 
-// Toogle windows
+// Toggle windows
 
 void CCodeWindow::OpenPages()
 {
diff --git a/Source/Core/DolphinWX/Src/Debugger/DSPDebugWindow.cpp b/Source/Core/DolphinWX/Src/Debugger/DSPDebugWindow.cpp
index e77b57399e..d5e589c09b 100644
--- a/Source/Core/DolphinWX/Src/Debugger/DSPDebugWindow.cpp
+++ b/Source/Core/DolphinWX/Src/Debugger/DSPDebugWindow.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "Common.h"
 #include <iostream>
@@ -36,13 +23,13 @@ BEGIN_EVENT_TABLE(DSPDebuggerLLE, wxPanel)
 	EVT_CLOSE(DSPDebuggerLLE::OnClose)
 	EVT_MENU_RANGE(ID_RUNTOOL, ID_SHOWPCTOOL, DSPDebuggerLLE::OnChangeState)
 	EVT_TEXT_ENTER(ID_ADDRBOX, DSPDebuggerLLE::OnAddrBoxChange)
-    EVT_LISTBOX(ID_SYMBOLLIST, DSPDebuggerLLE::OnSymbolListChange)
+	EVT_LISTBOX(ID_SYMBOLLIST, DSPDebuggerLLE::OnSymbolListChange)
 END_EVENT_TABLE()
 
 
 DSPDebuggerLLE::DSPDebuggerLLE(wxWindow* parent, wxWindowID id)
 	: wxPanel(parent, id, wxDefaultPosition, wxDefaultSize,
-		   	wxTAB_TRAVERSAL, _("DSP LLE Debugger"))
+			wxTAB_TRAVERSAL, _("DSP LLE Debugger"))
 	, m_CachedStepCounter(-1)
 {
 	m_DebuggerFrame = this;
@@ -184,14 +171,14 @@ void DSPDebuggerLLE::FocusOnPC()
 void DSPDebuggerLLE::UpdateState()
 {
 	if (DSPCore_GetState() == DSPCORE_RUNNING)
-   	{
+	{
 		m_Toolbar->SetToolLabel(ID_RUNTOOL, wxT("Pause"));
 		m_Toolbar->SetToolBitmap(ID_RUNTOOL,
 			wxArtProvider::GetBitmap(wxART_TICK_MARK, wxART_OTHER, wxSize(10,10)));
 		m_Toolbar->EnableTool(ID_STEPTOOL, false);
 	}
-   	else
-   	{
+	else
+	{
 		m_Toolbar->SetToolLabel(ID_RUNTOOL, wxT("Run"));
 		m_Toolbar->SetToolBitmap(ID_RUNTOOL,
 			wxArtProvider::GetBitmap(wxART_GO_FORWARD, wxART_OTHER, wxSize(10,10)));
diff --git a/Source/Core/DolphinWX/Src/Debugger/DSPDebugWindow.h b/Source/Core/DolphinWX/Src/Debugger/DSPDebugWindow.h
index 0e4feccef2..6f5f68a060 100644
--- a/Source/Core/DolphinWX/Src/Debugger/DSPDebugWindow.h
+++ b/Source/Core/DolphinWX/Src/Debugger/DSPDebugWindow.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _DSP_DEBUGGER_LLE_H
 #define _DSP_DEBUGGER_LLE_H
diff --git a/Source/Core/DolphinWX/Src/Debugger/DSPRegisterView.cpp b/Source/Core/DolphinWX/Src/Debugger/DSPRegisterView.cpp
index b8634e14dc..b3ad7dde8a 100644
--- a/Source/Core/DolphinWX/Src/Debugger/DSPRegisterView.cpp
+++ b/Source/Core/DolphinWX/Src/Debugger/DSPRegisterView.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "DSPDebugWindow.h"
 #include "DSPRegisterView.h"
diff --git a/Source/Core/DolphinWX/Src/Debugger/DSPRegisterView.h b/Source/Core/DolphinWX/Src/Debugger/DSPRegisterView.h
index 4fd5ebc018..fbafb08b03 100644
--- a/Source/Core/DolphinWX/Src/Debugger/DSPRegisterView.h
+++ b/Source/Core/DolphinWX/Src/Debugger/DSPRegisterView.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef __DSPREGISTERVIEW_h__
 #define __DSPREGISTERVIEW_h__
diff --git a/Source/Core/DolphinWX/Src/Debugger/DebuggerPanel.cpp b/Source/Core/DolphinWX/Src/Debugger/DebuggerPanel.cpp
index 7f978895b7..5a2e93166b 100644
--- a/Source/Core/DolphinWX/Src/Debugger/DebuggerPanel.cpp
+++ b/Source/Core/DolphinWX/Src/Debugger/DebuggerPanel.cpp
@@ -1,20 +1,6 @@
-// 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/
-
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "IniFile.h"
 #include "DebuggerPanel.h"
@@ -79,9 +65,10 @@ void GFXDebuggerPanel::SaveSettings() const
 
 	// TODO: make this work when we close the entire program too, currently on total close we get
 	// weird values, perhaps because of some conflict with the rendering window
+
 	// TODO: get the screen resolution and make limits from that
 	if (GetPosition().x < 1000 && GetPosition().y < 1000
-		                       && GetSize().GetWidth() < 1000 
+							   && GetSize().GetWidth() < 1000 
 							   && GetSize().GetHeight() < 1000)
 	{
 		file.Set("VideoWindow", "x", GetPosition().x);
diff --git a/Source/Core/DolphinWX/Src/Debugger/DebuggerPanel.h b/Source/Core/DolphinWX/Src/Debugger/DebuggerPanel.h
index 90e71dc059..eac6734bc9 100644
--- a/Source/Core/DolphinWX/Src/Debugger/DebuggerPanel.h
+++ b/Source/Core/DolphinWX/Src/Debugger/DebuggerPanel.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _GFX_DEBUGGER_PANEL_H_
 #define _GFX_DEBUGGER_PANEL_H_
@@ -92,7 +79,7 @@ private:
 
 	void GeneralSettings(wxCommandEvent& event);
 
-	// These set GFXDebuggerPauseFlag to true (either immediately or once the specified event has occured)
+	// These set GFXDebuggerPauseFlag to true (either immediately or once the specified event has occurred)
 	void OnPauseButton(wxCommandEvent& event);
 	void OnPauseAtNextButton(wxCommandEvent& event);
 
diff --git a/Source/Core/DolphinWX/Src/Debugger/DebuggerUIUtil.cpp b/Source/Core/DolphinWX/Src/Debugger/DebuggerUIUtil.cpp
index be99efdca4..db14859ff0 100644
--- a/Source/Core/DolphinWX/Src/Debugger/DebuggerUIUtil.cpp
+++ b/Source/Core/DolphinWX/Src/Debugger/DebuggerUIUtil.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 
 #include "DebuggerUIUtil.h"
diff --git a/Source/Core/DolphinWX/Src/Debugger/DebuggerUIUtil.h b/Source/Core/DolphinWX/Src/Debugger/DebuggerUIUtil.h
index 42cc2a7599..fb268fcd54 100644
--- a/Source/Core/DolphinWX/Src/Debugger/DebuggerUIUtil.h
+++ b/Source/Core/DolphinWX/Src/Debugger/DebuggerUIUtil.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _DEBUGGER_UI_UTIL_H
 #define _DEBUGGER_UI_UTIL_H
diff --git a/Source/Core/DolphinWX/Src/Debugger/JitWindow.cpp b/Source/Core/DolphinWX/Src/Debugger/JitWindow.cpp
index 7f98af6c57..a1df440b0f 100644
--- a/Source/Core/DolphinWX/Src/Debugger/JitWindow.cpp
+++ b/Source/Core/DolphinWX/Src/Debugger/JitWindow.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include <wx/button.h>
 #include <wx/textctrl.h>
@@ -59,15 +46,15 @@ BEGIN_EVENT_TABLE(CJitWindow, wxPanel)
 END_EVENT_TABLE()
 
 CJitWindow::CJitWindow(wxWindow* parent, wxWindowID id, const wxPoint& pos,
-	   	const wxSize& size, long style, const wxString& name)
+		const wxSize& size, long style, const wxString& name)
 : wxPanel(parent, id, pos, size, style, name)
 {
 	wxBoxSizer* sizerBig   = new wxBoxSizer(wxVERTICAL);
 	wxBoxSizer* sizerSplit = new wxBoxSizer(wxHORIZONTAL);
 	sizerSplit->Add(ppc_box = new wxTextCtrl(this, IDM_PPC_BOX, _T("(ppc)"),
-			   	wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE), 1, wxEXPAND);
+				wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE), 1, wxEXPAND);
 	sizerSplit->Add(x86_box = new wxTextCtrl(this, IDM_X86_BOX, _T("(x86)"),
-			   	wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE), 1, wxEXPAND);
+				wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE), 1, wxEXPAND);
 	sizerBig->Add(block_list = new JitBlockList(this, IDM_BLOCKLIST,
 				wxDefaultPosition, wxSize(100, 140),
 				wxLC_REPORT | wxSUNKEN_BORDER | wxLC_ALIGN_LEFT | wxLC_SINGLE_SEL | wxLC_SORT_ASCENDING),
@@ -107,21 +94,26 @@ void CJitWindow::Compare(u32 em_address)
 	int block_num = jit->GetBlockCache()->GetBlockNumberFromStartAddress(em_address);
 	if (block_num < 0)
 	{
-		for (int i = 0; i < 500; i++) {
+		for (int i = 0; i < 500; i++)
+		{
 			block_num = jit->GetBlockCache()->GetBlockNumberFromStartAddress(em_address - 4 * i);
 			if (block_num >= 0)
 				break;
 		}
-		if (block_num >= 0) {
+
+		if (block_num >= 0)
+		{
 			JitBlock *block = jit->GetBlockCache()->GetBlock(block_num);
 			if (!(block->originalAddress <= em_address &&
-					   	block->originalSize + block->originalAddress >= em_address))
+						block->originalSize + block->originalAddress >= em_address))
 				block_num = -1;
 		}
+
 		// Do not merge this "if" with the above - block_num changes inside it.
-		if (block_num < 0) {
+		if (block_num < 0)
+		{
 			ppc_box->SetValue(StrToWxStr(StringFromFormat("(non-code address: %08x)",
-						   	em_address)));
+							em_address)));
 			x86_box->SetValue(StrToWxStr(StringFromFormat("(no translation)")));
 			delete[] xDis;
 			return;
@@ -186,12 +178,14 @@ void CJitWindow::Compare(u32 em_address)
 		sptr += sprintf(sptr, "%i estimated cycles\n", st.numCycles);
 
 		sptr += sprintf(sptr, "Num instr: PPC: %i  x86: %i  (blowup: %i%%)\n",
-			   	size, num_x86_instructions, 100 * (num_x86_instructions / size - 1));
+				size, num_x86_instructions, 100 * (num_x86_instructions / size - 1));
 		sptr += sprintf(sptr, "Num bytes: PPC: %i  x86: %i  (blowup: %i%%)\n",
-			   	size * 4, block->codeSize, 100 * (block->codeSize / (4 * size) - 1));
+				size * 4, block->codeSize, 100 * (block->codeSize / (4 * size) - 1));
 
 		ppc_box->SetValue(StrToWxStr((char*)xDis));
-	} else {
+	}
+	else
+	{
 		ppc_box->SetValue(StrToWxStr(StringFromFormat(
 						"(non-code address: %08x)", em_address)));
 		x86_box->SetValue("---");
@@ -209,9 +203,9 @@ void CJitWindow::OnHostMessage(wxCommandEvent& event)
 {
 	switch (event.GetId())
 	{
-	    case IDM_NOTIFYMAPLOADED:
-		    //NotifyMapLoaded();
-		    break;
+		case IDM_NOTIFYMAPLOADED:
+			//NotifyMapLoaded();
+			break;
 	}
 }
 
@@ -229,7 +223,7 @@ enum {
 };
 
 JitBlockList::JitBlockList(wxWindow* parent, const wxWindowID id,
-	   	const wxPoint& pos, const wxSize& size, long style)
+		const wxPoint& pos, const wxSize& size, long style)
 	: wxListCtrl(parent, id, pos, size, style) // | wxLC_VIRTUAL)
 {
 	Init();
diff --git a/Source/Core/DolphinWX/Src/Debugger/JitWindow.h b/Source/Core/DolphinWX/Src/Debugger/JitWindow.h
index 63b50d4e84..3860241531 100644
--- a/Source/Core/DolphinWX/Src/Debugger/JitWindow.h
+++ b/Source/Core/DolphinWX/Src/Debugger/JitWindow.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef JITWINDOW_H_
 #define JITWINDOW_H_
diff --git a/Source/Core/DolphinWX/Src/Debugger/MemoryCheckDlg.cpp b/Source/Core/DolphinWX/Src/Debugger/MemoryCheckDlg.cpp
index 41e09a7451..821ca30af2 100644
--- a/Source/Core/DolphinWX/Src/Debugger/MemoryCheckDlg.cpp
+++ b/Source/Core/DolphinWX/Src/Debugger/MemoryCheckDlg.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "../WxUtils.h"
 #include "MemoryCheckDlg.h"
diff --git a/Source/Core/DolphinWX/Src/Debugger/MemoryCheckDlg.h b/Source/Core/DolphinWX/Src/Debugger/MemoryCheckDlg.h
index f32e907d9b..9783869ffe 100644
--- a/Source/Core/DolphinWX/Src/Debugger/MemoryCheckDlg.h
+++ b/Source/Core/DolphinWX/Src/Debugger/MemoryCheckDlg.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef __MEMORYCHECKDLG_h__
 #define __MEMORYCHECKDLG_h__
diff --git a/Source/Core/DolphinWX/Src/Debugger/MemoryView.cpp b/Source/Core/DolphinWX/Src/Debugger/MemoryView.cpp
index 14d1aed8c0..7c5225a05d 100644
--- a/Source/Core/DolphinWX/Src/Debugger/MemoryView.cpp
+++ b/Source/Core/DolphinWX/Src/Debugger/MemoryView.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "DebuggerUIUtil.h"
 #include "Common.h"
@@ -90,7 +77,7 @@ void CMemoryView::OnMouseDownL(wxMouseEvent& event)
 	}
 	else
 	{
- 		debugger->toggleMemCheck(YToAddress(y));
+		debugger->toggleMemCheck(YToAddress(y));
 
 		Refresh();
 		Host_UpdateBreakPointView();
@@ -143,17 +130,17 @@ void CMemoryView::OnPopupMenu(wxCommandEvent& event)
 	switch (event.GetId())
 	{
 #if wxUSE_CLIPBOARD
-	    case IDM_COPYADDRESS:
+		case IDM_COPYADDRESS:
 			wxTheClipboard->SetData(new wxTextDataObject(wxString::Format(_T("%08x"), selection)));
-	    break;
+			break;
 
-	    case IDM_COPYHEX:
-	    {
-		    char temp[24];
-		    sprintf(temp, "%08x", debugger->readExtraMemory(memory, selection));
-		    wxTheClipboard->SetData(new wxTextDataObject(StrToWxStr(temp)));
-	    }
-	    break;
+		case IDM_COPYHEX:
+			{
+			char temp[24];
+			sprintf(temp, "%08x", debugger->readExtraMemory(memory, selection));
+			wxTheClipboard->SetData(new wxTextDataObject(StrToWxStr(temp)));
+			}
+			break;
 #endif
 
 		case IDM_TOGGLEMEMORY:
@@ -197,7 +184,7 @@ void CMemoryView::OnMouseDownR(wxMouseEvent& event)
 	viewAsSubMenu->Append(IDM_VIEWASFP, StrToWxStr("FP value"));
 	viewAsSubMenu->Append(IDM_VIEWASASCII, StrToWxStr("ASCII"));
 	viewAsSubMenu->Append(IDM_VIEWASHEX, StrToWxStr("Hex"));
- 	menu->AppendSubMenu(viewAsSubMenu, StrToWxStr("View As:"));
+	menu->AppendSubMenu(viewAsSubMenu, StrToWxStr("View As:"));
 
 	PopupMenu(menu);
 }
@@ -212,10 +199,10 @@ void CMemoryView::OnPaint(wxPaintEvent& event)
 	wxCoord w,h;
 	dc.GetTextExtent(_T("0WJyq"),&w,&h,NULL,NULL,&hFont);
 	if (h > rowHeight)
-	    rowHeight = h;
+		rowHeight = h;
 	dc.GetTextExtent(_T("0WJyq"),&w,&h,NULL,NULL,&DebuggerFont);
 	if (h > rowHeight)
-	    rowHeight = h;
+		rowHeight = h;
 
 	if (viewAsType==VIEWAS_HEX)
 		dc.SetFont(hFont);
@@ -359,7 +346,9 @@ void CMemoryView::OnPaint(wxPaintEvent& event)
 				curAddress += 32;
 			}
 			else
+			{
 				sprintf(dis, "INVALID VIEWAS TYPE");
+			}
 
 			char desc[256] = "";
 			if (viewAsType != VIEWAS_HEX)
diff --git a/Source/Core/DolphinWX/Src/Debugger/MemoryView.h b/Source/Core/DolphinWX/Src/Debugger/MemoryView.h
index b1f4289316..3bfdc03db5 100644
--- a/Source/Core/DolphinWX/Src/Debugger/MemoryView.h
+++ b/Source/Core/DolphinWX/Src/Debugger/MemoryView.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef MEMORYVIEW_H_
 #define MEMORYVIEW_H_
diff --git a/Source/Core/DolphinWX/Src/Debugger/MemoryWindow.cpp b/Source/Core/DolphinWX/Src/Debugger/MemoryWindow.cpp
index 4b87cfa154..fa85ce808e 100644
--- a/Source/Core/DolphinWX/Src/Debugger/MemoryWindow.cpp
+++ b/Source/Core/DolphinWX/Src/Debugger/MemoryWindow.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include <wx/button.h>
 #include <wx/textctrl.h>
@@ -79,7 +66,7 @@ CMemoryWindow::CMemoryWindow(wxWindow* parent, wxWindowID id,
 {
 	wxBoxSizer* sizerBig   = new wxBoxSizer(wxHORIZONTAL);
 	wxBoxSizer* sizerRight = new wxBoxSizer(wxVERTICAL);
-	// Didn't see anything usefull in the left part
+	// Didn't see anything useful in the left part
 	//wxBoxSizer* sizerLeft  = new wxBoxSizer(wxVERTICAL);
 
 	DebugInterface* di = &PowerPC::debug_interface;
@@ -341,13 +328,13 @@ void CMemoryWindow::onSearch(wxCommandEvent& event)
 		newsize = rawData.size();
 
 		if (pad)
-	   	{
+		{
 			tmpstr = new char[newsize + 2];
 			memset(tmpstr, 0, newsize + 2);
 			tmpstr[0] = '0';
 		}
-	   	else
-	   	{
+		else
+		{
 			tmpstr = new char[newsize + 1];
 			memset(tmpstr, 0, newsize + 1);
 		}
@@ -368,7 +355,9 @@ void CMemoryWindow::onSearch(wxCommandEvent& event)
 			i += 1;
 		}
 		delete[] tmpstr;
-	} else {
+	}
+	else
+	{
 		//Looking for an ascii string
 		size = rawData.size();
 		Dest.resize(size+1);
diff --git a/Source/Core/DolphinWX/Src/Debugger/MemoryWindow.h b/Source/Core/DolphinWX/Src/Debugger/MemoryWindow.h
index f4237f2ca0..b480934526 100644
--- a/Source/Core/DolphinWX/Src/Debugger/MemoryWindow.h
+++ b/Source/Core/DolphinWX/Src/Debugger/MemoryWindow.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef MEMORYWINDOW_H_
 #define MEMORYWINDOW_H_
diff --git a/Source/Core/DolphinWX/Src/Debugger/RegisterView.cpp b/Source/Core/DolphinWX/Src/Debugger/RegisterView.cpp
index 0c414cb522..ac56b8e4cc 100644
--- a/Source/Core/DolphinWX/Src/Debugger/RegisterView.cpp
+++ b/Source/Core/DolphinWX/Src/Debugger/RegisterView.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "DebuggerUIUtil.h"
 #include "RegisterView.h"
@@ -31,8 +18,10 @@ static const char *special_reg_names[] = {
 	"PC", "LR", "CTR", "CR", "FPSCR", "MSR", "SRR0", "SRR1", "Exceptions", "Int Mask", "Int Cause",
 };
 
-static u32 GetSpecialRegValue(int reg) {
-	switch (reg) {
+static u32 GetSpecialRegValue(int reg)
+{
+	switch (reg)
+	{
 	case 0: return PowerPC::ppcState.pc;
 	case 1: return PowerPC::ppcState.spr[SPR_LR];
 	case 2: return PowerPC::ppcState.spr[SPR_CTR];
@@ -50,8 +39,10 @@ static u32 GetSpecialRegValue(int reg) {
 
 wxString CRegTable::GetValue(int row, int col)
 {
-	if (row < 32) {
-		switch (col) {
+	if (row < 32)
+	{
+		switch (col)
+		{
 		case 0: return StrToWxStr(GetGPRName(row));
 		case 1: return wxString::Format(wxT("%08x"), GPR(row));
 		case 2: return StrToWxStr(GetFPRName(row));
@@ -59,20 +50,26 @@ wxString CRegTable::GetValue(int row, int col)
 		case 4: return wxString::Format(wxT("%016llx"), riPS1(row));
 		default: return wxEmptyString;
 		}
-	} else {
-		if (row - 32 < NUM_SPECIALS) {
-			switch (col) {
+	}
+	else
+	{
+		if (row - 32 < NUM_SPECIALS)
+		{
+			switch (col)
+			{
 			case 0:	return StrToWxStr(special_reg_names[row - 32]);
 			case 1: return wxString::Format(wxT("%08x"), GetSpecialRegValue(row - 32));
 			default: return wxEmptyString;
-		    }
+			}
 		}
 	}
-    return wxEmptyString;
+	return wxEmptyString;
 }
 
-static void SetSpecialRegValue(int reg, u32 value) {
-	switch (reg) {
+static void SetSpecialRegValue(int reg, u32 value)
+{
+	switch (reg)
+	{
 	case 0: PowerPC::ppcState.pc = value; break;
 	case 1: PowerPC::ppcState.spr[SPR_LR] = value; break;
 	case 2: PowerPC::ppcState.spr[SPR_CTR] = value; break;
@@ -94,15 +91,19 @@ void CRegTable::SetValue(int row, int col, const wxString& strNewVal)
 	u32 newVal = 0;
 	if (TryParse(WxStrToStr(strNewVal), &newVal))
 	{
-		if (row < 32) {
+		if (row < 32)
+		{
 			if (col == 1)
 				GPR(row) = newVal;
 			else if (col == 3)
 				riPS0(row) = newVal;
 			else if (col == 4)
 				riPS1(row) = newVal;
-		} else {
-			if ((row - 32 < NUM_SPECIALS) && (col == 1)) {
+		}
+		else
+		{
+			if ((row - 32 < NUM_SPECIALS) && (col == 1))
+			{
 				SetSpecialRegValue(row - 32, newVal);
 			}
 		}
@@ -135,7 +136,8 @@ wxGridCellAttr *CRegTable::GetAttr(int row, int col, wxGridCellAttr::wxAttrKind)
 	attr->SetBackgroundColour(wxColour(wxT("#FFFFFF")));  //wxWHITE
 	attr->SetFont(DebuggerFont);
 
-	switch (col) {
+	switch (col)
+	{
 	case 1:
 		attr->SetAlignment(wxALIGN_CENTER, wxALIGN_CENTER);
 		break;
@@ -149,11 +151,13 @@ wxGridCellAttr *CRegTable::GetAttr(int row, int col, wxGridCellAttr::wxAttrKind)
 	}
 
 	bool red = false;
-	switch (col) {
+	switch (col)
+	{
 	case 1: red = row < 32 ? m_CachedRegHasChanged[row] : m_CachedSpecialRegHasChanged[row-32]; break;
 	case 3: 
 	case 4: red = row < 32 ? m_CachedFRegHasChanged[row][col-3] : false; break;
 	}
+
 	attr->SetTextColour(red ? wxColor(wxT("#FF0000")) : wxColor(wxT("#000000")));
 	attr->IncRef();
 	return attr;
diff --git a/Source/Core/DolphinWX/Src/Debugger/RegisterView.h b/Source/Core/DolphinWX/Src/Debugger/RegisterView.h
index 02ba090f8d..18b1d96bc3 100644
--- a/Source/Core/DolphinWX/Src/Debugger/RegisterView.h
+++ b/Source/Core/DolphinWX/Src/Debugger/RegisterView.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef __REGISTERVIEW_h__
 #define __REGISTERVIEW_h__
diff --git a/Source/Core/DolphinWX/Src/Debugger/RegisterWindow.cpp b/Source/Core/DolphinWX/Src/Debugger/RegisterWindow.cpp
index b770e78344..c8cb9d1433 100644
--- a/Source/Core/DolphinWX/Src/Debugger/RegisterWindow.cpp
+++ b/Source/Core/DolphinWX/Src/Debugger/RegisterWindow.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include <wx/wx.h>
 
@@ -28,8 +15,8 @@ END_EVENT_TABLE()
 
 
 CRegisterWindow::CRegisterWindow(wxWindow* parent, wxWindowID id,
-	   	const wxPoint& position, const wxSize& size,
-	   	long style, const wxString& name)
+		const wxPoint& position, const wxSize& size,
+		long style, const wxString& name)
 	: wxPanel(parent, id, position, size, style, name)
 	, m_GPRGridView(NULL)
 {
diff --git a/Source/Core/DolphinWX/Src/Debugger/RegisterWindow.h b/Source/Core/DolphinWX/Src/Debugger/RegisterWindow.h
index 8a2b04b748..dad48088ed 100644
--- a/Source/Core/DolphinWX/Src/Debugger/RegisterWindow.h
+++ b/Source/Core/DolphinWX/Src/Debugger/RegisterWindow.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef __REGISTERWINDOW_h__
 #define __REGISTERWINDOW_h__
diff --git a/Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp b/Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp
index 6e18c192eb..8b22166a81 100644
--- a/Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp
+++ b/Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "Common.h"
 #include "FifoPlayerDlg.h"
@@ -387,18 +374,23 @@ void FifoPlayerDlg::OnCheckEarlyMemoryUpdates(wxCommandEvent& event)
 
 void FifoPlayerDlg::OnSaveFile(wxCommandEvent& WXUNUSED(event))
 {
+	// Pointer to the file data that was created as a result of recording.
 	FifoDataFile *file = FifoRecorder::GetInstance().GetRecordedFile();
 
 	if (file)
-		{
+	{
+		// Bring up a save file dialog. The location the user chooses will be assigned to this variable.
 		wxString path = wxSaveFileSelector(_("Dolphin FIFO"), wxT("dff"), wxEmptyString, this);
 
+		// Has a valid file path
 		if (!path.empty())
 		{
+			// Attempt to save the file to the path the user chose
 			wxBeginBusyCursor();
 			bool result = file->Save(WxStrToStr(path).c_str());
 			wxEndBusyCursor();
 			
+			// Wasn't able to save the file, shit's whack, yo.
 			if (!result)
 				PanicAlert("Error saving file");
 		}
@@ -409,14 +401,21 @@ void FifoPlayerDlg::OnRecordStop(wxCommandEvent& WXUNUSED(event))
 {
 	FifoRecorder& recorder = FifoRecorder::GetInstance();
 
+	// Recorder is still recording
 	if (recorder.IsRecording())
 	{
+		// Then stop recording
 		recorder.StopRecording();
+
+		// and disable the button to stop recording
 		m_RecordStop->Disable();
 	}
-	else
+	else // Recorder is actually about to start recording
 	{
+		// So start recording
 		recorder.StartRecording(m_FramesToRecord, RecordingFinished);
+
+		// and change the button label accordingly.
 		m_RecordStop->SetLabel(_("Stop"));
 	}
 }
@@ -839,10 +838,12 @@ void FifoPlayerDlg::UpdateAnalyzerGui()
 	if ((int)m_framesList->GetCount() != num_frames)
 	{
 		m_framesList->Clear();
+
 		for (int i = 0; i < num_frames; ++i)
 		{
 			m_framesList->Append(wxString::Format(wxT("Frame %i"), i));
 		}
+
 		wxCommandEvent ev = wxCommandEvent(wxEVT_COMMAND_LISTBOX_SELECTED);
 		ev.SetInt(-1);
 		OnFrameListSelectionChanged(ev);
diff --git a/Source/Core/DolphinWX/Src/FifoPlayerDlg.h b/Source/Core/DolphinWX/Src/FifoPlayerDlg.h
index f00af6119b..9b0098a92e 100644
--- a/Source/Core/DolphinWX/Src/FifoPlayerDlg.h
+++ b/Source/Core/DolphinWX/Src/FifoPlayerDlg.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef __FIFO_PLAYER_DLG_h__
 #define __FIFO_PLAYER_DLG_h__
diff --git a/Source/Core/DolphinWX/Src/Frame.cpp b/Source/Core/DolphinWX/Src/Frame.cpp
index a0a030081e..2ed76f6214 100644
--- a/Source/Core/DolphinWX/Src/Frame.cpp
+++ b/Source/Core/DolphinWX/Src/Frame.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 
 // CFrame is the main parent window. Inside CFrame there is an m_Panel that is
@@ -56,7 +43,7 @@ extern "C" {
 
 
 #ifdef _WIN32
-// I could not use FindItemByHWND() instead of this, it crashed on that occation I used it */
+// I could not use FindItemByHWND() instead of this, it crashed on that occasion I used it */
 HWND MSWGetParent_(HWND Parent)
 {
 	return GetParent(Parent);
@@ -94,8 +81,7 @@ CPanel::CPanel(
 
 			case WM_USER_SETCURSOR:
 				if (SConfig::GetInstance().m_LocalCoreStartupParameter.bHideCursor &&
-						main_frame->RendererHasFocus() && Core::GetState() == Core::CORE_RUN &&
-						SConfig::GetInstance().m_LocalCoreStartupParameter.bHideCursor)
+						main_frame->RendererHasFocus() && Core::GetState() == Core::CORE_RUN)
 					SetCursor(wxCURSOR_BLANK);
 				else
 					SetCursor(wxNullCursor);
@@ -399,11 +385,24 @@ CFrame::~CFrame()
 
 bool CFrame::RendererIsFullscreen()
 {
+	bool fullscreen = false;
+
 	if (Core::GetState() == Core::CORE_RUN || Core::GetState() == Core::CORE_PAUSE)
 	{
-		return m_RenderFrame->IsFullScreen();
+		fullscreen = m_RenderFrame->IsFullScreen();
 	}
-	return false;
+
+#if defined(__APPLE__)
+	if (m_RenderFrame != NULL)
+	{
+		NSView *view = (NSView *) m_RenderFrame->GetHandle();
+		NSWindow *window = [view window];
+
+		fullscreen = (([window styleMask] & NSFullScreenWindowMask) == NSFullScreenWindowMask);
+	}
+#endif
+
+	return fullscreen;
 }
 
 void CFrame::OnQuit(wxCommandEvent& WXUNUSED (event))
@@ -456,10 +455,13 @@ void CFrame::OnClose(wxCloseEvent& event)
 	event.Skip();
 
 	// Save GUI settings
-	if (g_pCodeWindow) SaveIniPerspectives();
-	// Close the log window now so that its settings are saved
+	if (g_pCodeWindow)
+	{
+		SaveIniPerspectives();
+	}
 	else
 	{
+		// Close the log window now so that its settings are saved
 		m_LogWindow->Close();
 		m_LogWindow = NULL;
 	}
@@ -482,7 +484,9 @@ void CFrame::PostEvent(wxCommandEvent& event)
 		g_pCodeWindow->GetEventHandler()->AddPendingEvent(event);
 	}
 	else
+	{
 		event.Skip();
+	}
 }
 
 void CFrame::OnMove(wxMoveEvent& event)
@@ -694,16 +698,20 @@ void CFrame::OnGameListCtrl_ItemActivated(wxListEvent& WXUNUSED (event))
 		m_GameListCtrl->Update();
 	}
 	else if (!m_GameListCtrl->GetISO(0))
+	{
 		m_GameListCtrl->BrowseForDirectory();
+	}
 	else
+	{
 		// Game started by double click
 		BootGame(std::string(""));
+	}
 }
 
 bool IsHotkey(wxKeyEvent &event, int Id)
 {
 	return (event.GetKeyCode() != WXK_NONE &&
-	        event.GetKeyCode() == SConfig::GetInstance().m_LocalCoreStartupParameter.iHotkey[Id] &&
+			event.GetKeyCode() == SConfig::GetInstance().m_LocalCoreStartupParameter.iHotkey[Id] &&
 			event.GetModifiers() == SConfig::GetInstance().m_LocalCoreStartupParameter.iHotkeyModifier[Id]);
 }
 
@@ -841,7 +849,7 @@ void CFrame::OnKeyDown(wxKeyEvent& event)
 			DoFullscreen(!RendererIsFullscreen());
 		// Send Debugger keys to CodeWindow
 		else if (g_pCodeWindow && (event.GetKeyCode() >= WXK_F9 && event.GetKeyCode() <= WXK_F11))
- 			event.Skip();
+			event.Skip();
 		// Pause and Unpause
 		else if (IsHotkey(event, HK_PLAY_PAUSE))
 			DoPause();
@@ -952,7 +960,9 @@ void CFrame::OnKeyDown(wxKeyEvent& event)
 		}
 	}
 	else
+	{
 		event.Skip();
+	}
 }
 
 void CFrame::OnKeyUp(wxKeyEvent& event)
@@ -980,7 +990,18 @@ void CFrame::DoFullscreen(bool bF)
 {
 	ToggleDisplayMode(bF);
 
+#if defined(__APPLE__)
+	NSView *view = (NSView *) m_RenderFrame->GetHandle();
+	NSWindow *window = [view window];
+
+	if (bF != RendererIsFullscreen())
+	{
+		[window toggleFullScreen:nil];
+	}
+#else
 	m_RenderFrame->ShowFullScreen(bF, wxFULLSCREEN_ALL);
+#endif
+
 	if (SConfig::GetInstance().m_LocalCoreStartupParameter.bRenderToMain)
 	{
 		if (bF)
@@ -996,7 +1017,9 @@ void CFrame::DoFullscreen(bool bF)
 		}
 	}
 	else
+	{
 		m_RenderFrame->Raise();
+	}
 }
 
 const CGameListCtrl *CFrame::GetGameListCtrl() const
diff --git a/Source/Core/DolphinWX/Src/Frame.h b/Source/Core/DolphinWX/Src/Frame.h
index 45a0eb1ad4..6657c62013 100644
--- a/Source/Core/DolphinWX/Src/Frame.h
+++ b/Source/Core/DolphinWX/Src/Frame.h
@@ -1,20 +1,6 @@
-// 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/
-
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef __FRAME_H_
 #define __FRAME_H_
@@ -29,6 +15,10 @@
 #include <string>
 #include <vector>
 
+#ifdef __APPLE__
+#include <Cocoa/Cocoa.h>
+#endif
+
 #include "CDUtils.h"
 #include "Debugger/CodeWindow.h"
 #include "LogWindow.h"
@@ -116,7 +106,7 @@ public:
 		#endif
 	}
 
-	// These have to be public		
+	// These have to be public
 	CCodeWindow* g_pCodeWindow;
 	NetPlaySetupDiag* g_NetPlaySetupDiag;
 	wxCheatsWindow* g_CheatsWindow;
@@ -130,7 +120,7 @@ public:
 	void UpdateGameList();
 	void ToggleLogWindow(bool bShow);
 	void ToggleLogConfigWindow(bool bShow);
-	void ToggleConsole(bool bShow);		
+	void ToggleConsole(bool bShow);
 	void PostEvent(wxCommandEvent& event);
 	void StatusBarMessage(const char * Text, ...);
 	void ClearStatusBar();
@@ -205,7 +195,7 @@ private:
 		Toolbar_ConfigGFX,
 		Toolbar_ConfigDSP,
 		Toolbar_ConfigPAD,
-		Toolbar_Wiimote,			
+		Toolbar_Wiimote,
 		Toolbar_Help,
 		EToolbar_Max
 	};
@@ -301,10 +291,10 @@ private:
 	void OnLoadLastState(wxCommandEvent& event);
 	void OnUndoLoadState(wxCommandEvent& event);
 	void OnUndoSaveState(wxCommandEvent& event);
-		
+
 	void OnFrameSkip(wxCommandEvent& event);
 	void OnFrameStep(wxCommandEvent& event);
-		
+
 	void OnConfigMain(wxCommandEvent& event); // Options
 	void OnConfigGFX(wxCommandEvent& event);
 	void OnConfigDSP(wxCommandEvent& event);
@@ -328,7 +318,7 @@ private:
 	void OnKeyUp(wxKeyEvent& event);
 
 	void OnMouse(wxMouseEvent& event); // Mouse
-		
+
 	void OnHostMessage(wxCommandEvent& event);
 
 	void OnMemcard(wxCommandEvent& event); // Misc
diff --git a/Source/Core/DolphinWX/Src/FrameAui.cpp b/Source/Core/DolphinWX/Src/FrameAui.cpp
index 6f10d46722..5ba5d54b43 100644
--- a/Source/Core/DolphinWX/Src/FrameAui.cpp
+++ b/Source/Core/DolphinWX/Src/FrameAui.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "Common.h" // Common
 #include "ConsoleListener.h"
@@ -67,11 +54,15 @@ void CFrame::OnPaneClose(wxAuiManagerEvent& event)
 	else
 	{
 		if (GetNotebookCount() == 1)
+		{
 			wxMessageBox(_("At least one pane must remain open."),
 					_("Notice"), wxOK, this);
+		}
 		else if (nb->GetPageCount() != 0 && !nb->GetPageText(0).IsSameAs(wxT("<>")))
+		{
 			wxMessageBox(_("You can't close panes that have pages in them."),
 					_("Notice"), wxOK, this);
+		}
 		else
 		{
 			// Detach and delete the empty notebook
@@ -92,14 +83,21 @@ void CFrame::ToggleLogWindow(bool bShow)
 
 	if (bShow)
 	{
-		if (!m_LogWindow) m_LogWindow = new CLogWindow(this, IDM_LOGWINDOW);
+		// Create a new log window if it doesn't exist.
+		if (!m_LogWindow)
+		{
+			m_LogWindow = new CLogWindow(this, IDM_LOGWINDOW);
+		}
+
 		m_LogWindow->Enable();
+
 		DoAddPage(m_LogWindow,
 				g_pCodeWindow ? g_pCodeWindow->iNbAffiliation[0] : 0,
 				g_pCodeWindow ? bFloatWindow[0] : false);
 	}
 	else
 	{
+		// Hiding the log window, so disable it and remove it.
 		m_LogWindow->Disable();
 		DoRemovePage(m_LogWindow, true);
 	}
@@ -117,6 +115,7 @@ void CFrame::ToggleLogConfigWindow(bool bShow)
 	{
 		if (!m_LogConfigWindow)
 			m_LogConfigWindow = new LogConfigWindow(this, m_LogWindow, IDM_LOGCONFIGWINDOW);
+
 		const int nbIndex = IDM_LOGCONFIGWINDOW - IDM_LOGWINDOW;
 		DoAddPage(m_LogConfigWindow,
 				g_pCodeWindow ? g_pCodeWindow->iNbAffiliation[nbIndex] : 0,
@@ -147,7 +146,9 @@ void CFrame::ToggleConsole(bool bShow)
 			Console->Open();
 		}
 		else
+		{
 			ShowWindow(GetConsoleWindow(), SW_SHOW);
+		}
 
 		// Create the parent window if it doesn't exist
 		wxPanel *ConsoleParent = (wxPanel*)FindWindowById(IDM_CONSOLEWINDOW);
@@ -248,7 +249,9 @@ void CFrame::ClosePages()
 void CFrame::OnNotebookPageChanged(wxAuiNotebookEvent& event)
 {
 	event.Skip();
-	if (!g_pCodeWindow) return;
+
+	if (!g_pCodeWindow)
+		return;
 
 	// Remove the blank page if any
 	AddRemoveBlankPage();
@@ -364,6 +367,7 @@ void CFrame::OnTab(wxAuiNotebookEvent& event)
 	MenuPopup->Append(Item);
 	Item->Enable(false);
 	MenuPopup->Append(new wxMenuItem(MenuPopup));
+
 	for (int i = IDM_LOGWINDOW; i <= IDM_CODEWINDOW; i++)
 	{
 		wxWindow *Win = FindWindowById(i);
@@ -379,6 +383,7 @@ void CFrame::OnTab(wxAuiNotebookEvent& event)
 	// Line up our menu with the cursor
 	wxPoint Pt = ::wxGetMousePosition();
 	Pt = ScreenToClient(Pt);
+
 	// Show
 	PopupMenu(MenuPopup, Pt);
 }
@@ -425,6 +430,7 @@ void CFrame::TogglePane()
 		if (m_Mgr->GetAllPanes()[i].window->IsKindOf(CLASSINFO(wxAuiNotebook)))
 			NB = (wxAuiNotebook*)m_Mgr->GetAllPanes()[i].window;
 	}
+
 	if (NB)
 	{
 		if (NB->GetPageCount() == 0)
@@ -433,7 +439,9 @@ void CFrame::TogglePane()
 			m_Mgr->Update();
 		}
 		else
+		{
 			ShowResizePane();
+		}
 	}
 }
 
@@ -452,7 +460,10 @@ void CFrame::DoRemovePage(wxWindow *Win, bool bHide)
 			Win->Reparent(this);
 		}
 		else
+		{
 			Win->Destroy();
+		}
+
 		Parent->Destroy();
 	}
 	else
@@ -469,10 +480,13 @@ void CFrame::DoRemovePage(wxWindow *Win, bool bHide)
 					Win->Reparent(this);
 				}
 				else
+				{
 					Win->Destroy();
+				}
 			}
 		}
 	}
+
 	if (g_pCodeWindow)
 		AddRemoveBlankPage();
 }
@@ -480,8 +494,15 @@ void CFrame::DoRemovePage(wxWindow *Win, bool bHide)
 void CFrame::DoAddPage(wxWindow *Win, int i, bool Float)
 {
 	if (!Win) return;
-	if (i < 0 || i > GetNotebookCount()-1) i = 0;
-	if (Win && GetNotebookFromId(i)->GetPageIndex(Win) != wxNOT_FOUND) return;
+	
+	// Ensure accessor remains within valid bounds.
+	if (i < 0 || i > GetNotebookCount()-1)
+		i = 0;
+
+	// The page was already previously added, no need to add it again.
+	if (Win && GetNotebookFromId(i)->GetPageIndex(Win) != wxNOT_FOUND)
+		return;
+
 	if (!Float)
 		GetNotebookFromId(i)->AddPage(Win, Win->GetName(), true);
 	else
@@ -520,10 +541,15 @@ void CFrame::OnDropDownSettingsToolbar(wxAuiToolBarEvent& event)
 		wxRect rect = Tb->GetToolRect(event.GetId());
 		wxPoint Pt = Tb->ClientToScreen(rect.GetBottomLeft());
 		Pt = ScreenToClient(Pt);
+
 		// Show
 		PopupMenu(menuPopup, Pt);
+
 		// Make the button un-stuck again
-		if (!m_bEdit) Tb->SetToolSticky(event.GetId(), false);
+		if (!m_bEdit)
+		{
+			Tb->SetToolSticky(event.GetId(), false);
+		}
 	}
 }
 
@@ -551,8 +577,13 @@ void CFrame::OnDropDownToolbarItem(wxAuiToolBarEvent& event)
 				wxMenuItem* mItem = new wxMenuItem(menuPopup, IDM_PERSPECTIVES_0 + i,
 						StrToWxStr(Perspectives[i].Name),
 						wxT(""), wxITEM_CHECK);
+				
 				menuPopup->Append(mItem);
-				if (i == ActivePerspective) mItem->Check(true);
+
+				if (i == ActivePerspective)
+				{
+					mItem->Check(true);
+				}
 			}
 		}
 
@@ -560,8 +591,10 @@ void CFrame::OnDropDownToolbarItem(wxAuiToolBarEvent& event)
 		wxRect rect = tb->GetToolRect(event.GetId());
 		wxPoint pt = tb->ClientToScreen(rect.GetBottomLeft());
 		pt = ScreenToClient(pt);
+
 		// show
 		PopupMenu(menuPopup, pt);
+
 		// make sure the button is "un-stuck"
 		tb->SetToolSticky(event.GetId(), false);
 	}
@@ -609,12 +642,17 @@ void CFrame::OnDropDownToolbarSelect(wxCommandEvent& event)
 				wxString DefaultValue = wxString::Format(_("Perspective %d"),
 						Perspectives.size() + 1);
 				dlg.SetValue(DefaultValue);
-				bool DlgOk = false; int Return = 0;
+
+				int Return = 0;
+				bool DlgOk = false;
+
 				while (!DlgOk)
 				{
 					Return = dlg.ShowModal();
 					if (Return == wxID_CANCEL)
+					{
 						return;
+					}
 					else if (dlg.GetValue().Find(wxT(",")) != -1)
 					{
 						wxMessageBox(_("The name can not contain the character ','"),
@@ -630,7 +668,9 @@ void CFrame::OnDropDownToolbarSelect(wxCommandEvent& event)
 						dlg.SetValue(DefaultValue);
 					}
 					else
+					{
 						DlgOk = true;
+					}
 				}
 
 				SPerspectives Tmp;
@@ -663,9 +703,12 @@ void CFrame::ResetToolbarStyle()
 		if (Pane.window->IsKindOf(CLASSINFO(wxAuiToolBar)))
 		{
 			Pane.Show();
+
 			// Show all of it
 			if (Pane.rect.GetLeft() > GetClientSize().GetX() - 50)
+			{
 				Pane.Position(GetClientSize().GetX() - Pane.window->GetClientSize().GetX());
+			}
 		}
 	}
 	m_Mgr->Update();
@@ -765,22 +808,31 @@ static int Limit(int i, int Low, int High)
 
 void CFrame::SetPaneSize()
 {
-	if (Perspectives.size() <= ActivePerspective) return;
-	int iClientX = GetSize().GetX(), iClientY = GetSize().GetY();
+	if (Perspectives.size() <= ActivePerspective)
+		return;
+
+	int iClientX = GetSize().GetX();
+	int iClientY = GetSize().GetY();
 
 	for (u32 i = 0, j = 0; i < m_Mgr->GetAllPanes().GetCount(); i++)
 	{
 		if (!m_Mgr->GetAllPanes()[i].window->IsKindOf(CLASSINFO(wxAuiToolBar)))
 		{
-			if (!m_Mgr->GetAllPanes()[i].IsOk()) return;
+			if (!m_Mgr->GetAllPanes()[i].IsOk())
+				return;
+
 			if (Perspectives[ActivePerspective].Width.size() <= j ||
 					Perspectives[ActivePerspective].Height.size() <= j)
 				continue;
+
+			// Width and height of the active perspective
 			u32 W = Perspectives[ActivePerspective].Width[j],
 				H = Perspectives[ActivePerspective].Height[j];
+
 			// Check limits
 			W = Limit(W, 5, 95);
 			H = Limit(H, 5, 95);
+
 			// Convert percentages to pixel lengths
 			W = (W * iClientX) / 100;
 			H = (H * iClientY) / 100;
@@ -859,8 +911,10 @@ void CFrame::LoadIniPerspectives()
 		std::string _Section, _Perspective, _Width, _Height;
 		std::vector<std::string> _SWidth, _SHeight;
 		Tmp.Name = VPerspectives[i];
+
 		// Don't save a blank perspective
-		if (Tmp.Name.empty()) continue;
+		if (Tmp.Name.empty())
+			continue;
 
 		_Section = StringFromFormat("P - %s", Tmp.Name.c_str());
 		ini.Get(_Section.c_str(), "Perspective", &_Perspective,
@@ -984,10 +1038,12 @@ wxWindow * CFrame::GetNotebookPageFromId(wxWindowID Id)
 	{
 		if (!m_Mgr->GetAllPanes()[i].window->IsKindOf(CLASSINFO(wxAuiNotebook)))
 			continue;
+
 		wxAuiNotebook * NB = (wxAuiNotebook*)m_Mgr->GetAllPanes()[i].window;
 		for(u32 j = 0; j < NB->GetPageCount(); j++)
 		{
-			if (NB->GetPage(j)->GetId() == Id) return NB->GetPage(j);
+			if (NB->GetPage(j)->GetId() == Id)
+				return NB->GetPage(j);
 		}
 	}
 	return NULL;
@@ -1036,12 +1092,14 @@ void CFrame::AddRemoveBlankPage()
 	{
 		if (!m_Mgr->GetAllPanes()[i].window->IsKindOf(CLASSINFO(wxAuiNotebook)))
 			continue;
+
 		wxAuiNotebook * NB = (wxAuiNotebook*)m_Mgr->GetAllPanes()[i].window;
 		for(u32 j = 0; j < NB->GetPageCount(); j++)
 		{
 			if (NB->GetPageText(j).IsSameAs(wxT("<>")) && NB->GetPageCount() > 1)
 				NB->DeletePage(j);
 		}
+
 		if (NB->GetPageCount() == 0)
 			NB->AddPage(new wxPanel(this, wxID_ANY), wxT("<>"), true);
 	}
@@ -1053,6 +1111,7 @@ int CFrame::GetNotebookAffiliation(wxWindowID Id)
 	{
 		if (!m_Mgr->GetAllPanes()[i].window->IsKindOf(CLASSINFO(wxAuiNotebook)))
 			continue;
+
 		wxAuiNotebook * NB = (wxAuiNotebook*)m_Mgr->GetAllPanes()[i].window;
 		for(u32 k = 0; k < NB->GetPageCount(); k++)
 		{
diff --git a/Source/Core/DolphinWX/Src/FrameTools.cpp b/Source/Core/DolphinWX/Src/FrameTools.cpp
index f9d737d05e..ef0aa81e9d 100644
--- a/Source/Core/DolphinWX/Src/FrameTools.cpp
+++ b/Source/Core/DolphinWX/Src/FrameTools.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 
 /*
@@ -177,10 +164,12 @@ void CFrame::CreateMenu()
 	loadMenu->Append(IDM_UNDOLOADSTATE, _("Undo Load State") + wxString(wxT("\tShift+F12")));
 	loadMenu->AppendSeparator();
 
-	for (int i = 1; i <= 8; i++) {
+	for (int i = 1; i <= 8; i++)
+	{
 		loadMenu->Append(IDM_LOADSLOT1 + i - 1, GetMenuLabel(HK_LOAD_STATE_SLOT_1 + i - 1));
 		saveMenu->Append(IDM_SAVESLOT1 + i - 1, GetMenuLabel(HK_SAVE_STATE_SLOT_1 + i - 1));
 	}
+
 	m_MenuBar->Append(emulationMenu, _("&Emulation"));
 
 	// Options menu
@@ -297,7 +286,10 @@ void CFrame::CreateMenu()
 	viewMenu->Append(IDM_PURGECACHE, _("Purge Cache"));
 	m_MenuBar->Append(viewMenu, _("&View"));
 
-	if (g_pCodeWindow) g_pCodeWindow->CreateMenu(SConfig::GetInstance().m_LocalCoreStartupParameter, m_MenuBar);
+	if (g_pCodeWindow)
+	{
+		g_pCodeWindow->CreateMenu(SConfig::GetInstance().m_LocalCoreStartupParameter, m_MenuBar);
+	}
 
 	// Help menu
 	wxMenu* helpMenu = new wxMenu;
@@ -428,8 +420,8 @@ void CFrame::PopulateToolbar(wxAuiToolBar* ToolBar)
 {
 	int w = m_Bitmaps[Toolbar_FileOpen].GetWidth(),
 		h = m_Bitmaps[Toolbar_FileOpen].GetHeight();
-		ToolBar->SetToolBitmapSize(wxSize(w, h));
-		
+	ToolBar->SetToolBitmapSize(wxSize(w, h));
+
 
 	ToolBar->AddTool(wxID_OPEN,    _("Open"),    m_Bitmaps[Toolbar_FileOpen], _("Open file..."));
 	ToolBar->AddTool(wxID_REFRESH, _("Refresh"), m_Bitmaps[Toolbar_Refresh], _("Refresh game list"));
@@ -509,14 +501,7 @@ void CFrame::RecreateToolbar()
 
 void CFrame::InitBitmaps()
 {
-	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
+	auto const dir = StrToWxStr(File::GetThemeDir(SConfig::GetInstance().m_LocalCoreStartupParameter.theme_name));
 
 	m_Bitmaps[Toolbar_FileOpen].LoadFile(dir + "open.png", wxBITMAP_TYPE_PNG);
 	m_Bitmaps[Toolbar_Refresh].LoadFile(dir + "refresh.png", wxBITMAP_TYPE_PNG);
@@ -565,12 +550,16 @@ void CFrame::BootGame(const std::string& filename)
 		}
 		else if (!StartUp.m_strDefaultGCM.empty()
 				&&	wxFileExists(wxSafeConvertMB2WX(StartUp.m_strDefaultGCM.c_str())))
+		{
 			bootfile = StartUp.m_strDefaultGCM;
+		}
 		else
 		{
 			if (!SConfig::GetInstance().m_LastFilename.empty()
 					&& wxFileExists(wxSafeConvertMB2WX(SConfig::GetInstance().m_LastFilename.c_str())))
+			{
 				bootfile = SConfig::GetInstance().m_LastFilename;
+			}
 			else
 			{
 				m_GameListCtrl->BrowseForDirectory();
@@ -608,14 +597,16 @@ void CFrame::DoOpen(bool Boot)
 
 	if (currentDir != currentDir2)
 	{
-		PanicAlertT("Current dir changed from %s to %s after wxFileSelector!",
+		PanicAlertT("Current directory changed from %s to %s after wxFileSelector!",
 				currentDir.c_str(), currentDir2.c_str());
 		File::SetCurrentDir(currentDir);
 	}
 
 	// Should we boot a new game or just change the disc?
 	if (Boot && !path.IsEmpty())
+	{
 		BootGame(WxStrToStr(path));
+	}
 	else
 	{
 		DVDInterface::ChangeDisc(WxStrToStr(path).c_str());
@@ -673,7 +664,8 @@ void CFrame::OnRecord(wxCommandEvent& WXUNUSED (event))
 		GetMenuBar()->FindItem(IDM_RECORDREADONLY)->Check(false);
 	}
 
-	for (int i = 0; i < 4; i++) {
+	for (int i = 0; i < 4; i++)
+	{
 		if (SConfig::GetInstance().m_SIDevice[i] == SIDEVICE_GC_CONTROLLER || SConfig::GetInstance().m_SIDevice[i] == SIDEVICE_GC_TARUKONGA)
 			controllers |= (1 << i);
 
@@ -733,11 +725,15 @@ void CFrame::OnPlay(wxCommandEvent& WXUNUSED (event))
 			UpdateGUI();
 		}
 		else
+		{
 			DoPause();
+		}
 	}
 	else
+	{
 		// Core is uninitialized, start the game
 		BootGame(std::string(""));
+	}
 }
 
 void CFrame::OnRenderParentClose(wxCloseEvent& event)
@@ -764,7 +760,7 @@ void CFrame::OnRenderParentResize(wxSizeEvent& event)
 	{
 		int width, height;
 		if (!SConfig::GetInstance().m_LocalCoreStartupParameter.bRenderToMain &&
-		    !RendererIsFullscreen() && !m_RenderFrame->IsMaximized() && !m_RenderFrame->IsIconized())
+			!RendererIsFullscreen() && !m_RenderFrame->IsMaximized() && !m_RenderFrame->IsIconized())
 		{
 			m_RenderFrame->GetClientSize(&width, &height);
 			SConfig::GetInstance().m_LocalCoreStartupParameter.iRenderWindowWidth = width;
@@ -805,9 +801,6 @@ void CFrame::ToggleDisplayMode(bool bFullscreen)
 #elif defined(HAVE_XRANDR) && HAVE_XRANDR
 	m_XRRConfig->ToggleDisplayMode(bFullscreen);
 #elif defined __APPLE__
-	NSView* view = (NSView *)m_RenderFrame->GetHandle();
-	[[view window] toggleFullScreen:[view window]];
-	
 	if(bFullscreen)
 		CGDisplayHideCursor(CGMainDisplayID());
 	else
@@ -874,6 +867,13 @@ void CFrame::StartGame(const std::string& filename)
 		m_RenderFrame->Show();
 	}
 
+#if defined(__APPLE__)
+	NSView *view = (NSView *) m_RenderFrame->GetHandle();
+	NSWindow *window = [view window];
+
+	[window setCollectionBehavior:NSWindowCollectionBehaviorFullScreenPrimary];
+#endif
+
 	wxBeginBusyCursor();
 
 	DoFullscreen(SConfig::GetInstance().m_LocalCoreStartupParameter.bFullscreen);
@@ -923,13 +923,19 @@ void CFrame::OnBootDrive(wxCommandEvent& event)
 // Refresh the file list and browse for a favorites directory
 void CFrame::OnRefresh(wxCommandEvent& WXUNUSED (event))
 {
-	if (m_GameListCtrl) m_GameListCtrl->Update();
+	if (m_GameListCtrl)
+	{
+		m_GameListCtrl->Update();
+	}
 }
 
 
 void CFrame::OnBrowse(wxCommandEvent& WXUNUSED (event))
 {
-	if (m_GameListCtrl) m_GameListCtrl->BrowseForDirectory();
+	if (m_GameListCtrl)
+	{
+		m_GameListCtrl->BrowseForDirectory();
+	}
 }
 
 // Create screenshot
@@ -1029,10 +1035,22 @@ void CFrame::DoStop()
 			m_RenderParent->SetCursor(wxNullCursor);
 		DoFullscreen(false);
 		if (!SConfig::GetInstance().m_LocalCoreStartupParameter.bRenderToMain)
+		{
 			m_RenderFrame->Destroy();
+		}
 		else
+		{
+#if defined(__APPLE__)
+			// Disable the full screen button when not in a game.
+			NSView *view = (NSView *) m_RenderFrame->GetHandle();
+			NSWindow *window = [view window];
+
+			[window setCollectionBehavior:NSWindowCollectionBehaviorDefault];
+#endif
+
 			// 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.
@@ -1118,7 +1136,9 @@ void CFrame::OnConfigPAD(wxCommandEvent& WXUNUSED (event))
 	InputPlugin *const pad_plugin = Pad::GetPlugin();
 	bool was_init = false;
 	if (g_controller_interface.IsInit())	// check if game is running
+	{
 		was_init = true;
+	}
 	else
 	{
 #if defined(HAVE_X11) && HAVE_X11
@@ -1144,7 +1164,9 @@ void CFrame::OnConfigWiimote(wxCommandEvent& WXUNUSED (event))
 	InputPlugin *const wiimote_plugin = Wiimote::GetPlugin();
 	bool was_init = false;
 	if (g_controller_interface.IsInit())	// check if game is running
+	{
 		was_init = true;
+	}
 	else
 	{
 #if defined(HAVE_X11) && HAVE_X11
@@ -1195,7 +1217,10 @@ void CFrame::OnHelp(wxCommandEvent& event)
 
 void CFrame::ClearStatusBar()
 {
-	if (this->GetStatusBar()->IsEnabled()) this->GetStatusBar()->SetStatusText(wxT(""),0);
+	if (this->GetStatusBar()->IsEnabled())
+	{
+		this->GetStatusBar()->SetStatusText(wxT(""),0);
+	}
 }
 
 void CFrame::StatusBarMessage(const char * Text, ...)
@@ -1207,7 +1232,10 @@ void CFrame::StatusBarMessage(const char * Text, ...)
 	vsnprintf(Str, MAX_BYTES, Text, ArgPtr);
 	va_end(ArgPtr);
 
-	if (this->GetStatusBar()->IsEnabled()) this->GetStatusBar()->SetStatusText(StrToWxStr(Str),0);
+	if (this->GetStatusBar()->IsEnabled())
+	{
+		this->GetStatusBar()->SetStatusText(StrToWxStr(Str),0);
+	}
 }
 
 
@@ -1224,7 +1252,9 @@ void CFrame::OnNetPlay(wxCommandEvent& WXUNUSED (event))
 			g_NetPlaySetupDiag = new NetPlaySetupDiag(this, m_GameListCtrl);
 	}
 	else
+	{
 		g_NetPlaySetupDiag->Raise();
+	}
 }
 
 void CFrame::OnMemcard(wxCommandEvent& WXUNUSED (event))
@@ -1609,7 +1639,11 @@ void CFrame::UpdateGUI()
 		m_bGameLoading = false;
 	}
 
-	if (m_ToolBar) m_ToolBar->Refresh();
+	// Refresh toolbar
+	if (m_ToolBar)
+	{
+		m_ToolBar->Refresh();
+	}
 
 	// Commit changes to manager
 	m_Mgr->Update();
@@ -1676,7 +1710,11 @@ void CFrame::GameListChanged(wxCommandEvent& event)
 		break;
 	}
 	
-	if (m_GameListCtrl) m_GameListCtrl->Update();
+	// Update gamelist
+	if (m_GameListCtrl)
+	{
+		m_GameListCtrl->Update();
+	}
 }
 
 // Enable and disable the toolbar
diff --git a/Source/Core/DolphinWX/Src/GCMicDlg.cpp b/Source/Core/DolphinWX/Src/GCMicDlg.cpp
index ddf804b57b..8edc86d667 100644
--- a/Source/Core/DolphinWX/Src/GCMicDlg.cpp
+++ b/Source/Core/DolphinWX/Src/GCMicDlg.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include <wx/notebook.h>
 
@@ -22,7 +9,7 @@
 
 BEGIN_EVENT_TABLE(GCMicDialog,wxDialog)
 	EVT_COMMAND_RANGE(0, NUM_HOTKEYS - 1,
-		   	wxEVT_COMMAND_BUTTON_CLICKED, GCMicDialog::OnButtonClick)
+			wxEVT_COMMAND_BUTTON_CLICKED, GCMicDialog::OnButtonClick)
 	EVT_TIMER(wxID_ANY, GCMicDialog::OnButtonTimer)
 END_EVENT_TABLE()
 
@@ -86,8 +73,8 @@ void GCMicDialog::OnKeyDown(wxKeyEvent& event)
 		else
 		{
 			SetButtonText(ClickedButton->GetId(),
-				   	InputCommon::WXKeyToString(g_Pressed),
-				   	InputCommon::WXKeymodToString(g_Modkey));
+					InputCommon::WXKeyToString(g_Pressed),
+					InputCommon::WXKeymodToString(g_Modkey));
 			SaveButtonMapping(ClickedButton->GetId(), g_Pressed, g_Modkey);
 		}
 		EndGetButtons();
@@ -112,7 +99,7 @@ void GCMicDialog::DoGetButtons(int _GetId)
 		if(m_ButtonMappingTimer->IsRunning())
 			m_ButtonMappingTimer->Stop();
 
-		 // Save the button Id
+		// Save the button Id
 		GetButtonWaitingID = _GetId;
 		GetButtonWaitingTimer = 0;
 
@@ -149,7 +136,8 @@ void GCMicDialog::OnButtonClick(wxCommandEvent& event)
 {
 	event.Skip();
 
-	if (m_ButtonMappingTimer->IsRunning()) return;
+	if (m_ButtonMappingTimer->IsRunning())
+		return;
 
 	wxTheApp->Bind(wxEVT_KEY_DOWN, &GCMicDialog::OnKeyDown, this);
 
diff --git a/Source/Core/DolphinWX/Src/GCMicDlg.h b/Source/Core/DolphinWX/Src/GCMicDlg.h
index c817a67254..ee6933b7c5 100644
--- a/Source/Core/DolphinWX/Src/GCMicDlg.h
+++ b/Source/Core/DolphinWX/Src/GCMicDlg.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef __HOTKEYDIALOG_h__
 #define __HOTKEYDIALOG_h__
diff --git a/Source/Core/DolphinWX/Src/GLInterface.h b/Source/Core/DolphinWX/Src/GLInterface.h
index 2923ff7bf4..9ef6c9f0e2 100644
--- a/Source/Core/DolphinWX/Src/GLInterface.h
+++ b/Source/Core/DolphinWX/Src/GLInterface.h
@@ -1,28 +1,22 @@
-// Copyright (C) 2003 Dolphin Project.
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
-// 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_
 
+#if USE_EGL
+#include "GLInterface/Platform.h"
+#else
+
 #include "Thread.h"
 #ifdef ANDROID
 #include <GLES2/gl2.h>
-#include <GLInterface/InterfaceBase.h>
+#include <GLES2/gl2ext.h>
+#include <EGL/egl.h>
+#include "GLInterface/EGL.h"
 #elif defined(USE_EGL) && USE_EGL
-#include "GLInterface/EGL_X11.h"
+#include "GLInterface/EGL.h"
 #elif defined(__APPLE__)
 #include "GLInterface/AGL.h"
 #elif defined(_WIN32)
@@ -34,19 +28,11 @@
 #endif
 
 typedef struct {
-#ifdef ANDROID
-#elif defined(USE_EGL) && USE_EGL // This is currently a X11/EGL implementation for desktop
+#if 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(__APPLE__)
@@ -72,3 +58,4 @@ extern cInterfaceBase *GLInterface;
 extern GLWindow GLWin;
 
 #endif
+#endif
diff --git a/Source/Core/DolphinWX/Src/GLInterface/AGL.cpp b/Source/Core/DolphinWX/Src/GLInterface/AGL.cpp
index 2fa042daef..67f27a0ddb 100644
--- a/Source/Core/DolphinWX/Src/GLInterface/AGL.cpp
+++ b/Source/Core/DolphinWX/Src/GLInterface/AGL.cpp
@@ -38,6 +38,17 @@ bool cInterfaceAGL::Create(void *&window_handle)
 	int _tx, _ty, _twidth, _theight;
 	Host_GetRenderWindowSize(_tx, _ty, _twidth, _theight);
 
+	GLWin.cocoaWin = (NSView*)(((wxPanel*)window_handle)->GetHandle());
+
+	// Enable high-resolution display support.
+	[GLWin.cocoaWin setWantsBestResolutionOpenGLSurface:YES];
+
+	NSWindow *window = [GLWin.cocoaWin window];
+
+	float scale = [window backingScaleFactor];
+	_twidth *= scale;
+	_theight *= scale;
+
 	// Control window size and picture scaling
 	s_backbuffer_width = _twidth;
 	s_backbuffer_height = _theight;
@@ -58,16 +69,14 @@ bool cInterfaceAGL::Create(void *&window_handle)
 		return NULL;
 	}
 
-	
-	GLWin.cocoaWin = (NSView*)(((wxPanel*)window_handle)->GetHandle());;
 	if (GLWin.cocoaWin == nil) {
 		ERROR_LOG(VIDEO, "failed to create window");
 		return NULL;
 	}
 
-	[[GLWin.cocoaWin window] makeFirstResponder:GLWin.cocoaWin];
+	[window makeFirstResponder:GLWin.cocoaWin];
 	[GLWin.cocoaCtx setView: GLWin.cocoaWin];
-	[[GLWin.cocoaWin window] makeKeyAndOrderFront: nil];
+	[window makeKeyAndOrderFront: nil];
 
 	return true;
 }
@@ -78,6 +87,13 @@ bool cInterfaceAGL::MakeCurrent()
 	return true;
 }
 
+bool cInterfaceAGL::ClearCurrent()
+{
+	// not tested at all
+	//clearCurrentContext();
+	return true;
+}
+
 // Close backend
 void cInterfaceAGL::Shutdown()
 {
@@ -88,12 +104,19 @@ void cInterfaceAGL::Shutdown()
 
 void cInterfaceAGL::Update()
 {
-	if( s_backbuffer_width == [GLWin.cocoaWin frame].size.width
-	   && s_backbuffer_height == [GLWin.cocoaWin frame].size.height)
+	NSWindow *window = [GLWin.cocoaWin window];
+	NSSize size = [GLWin.cocoaWin frame].size;
+
+	float scale = [window backingScaleFactor];
+	size.width *= scale;
+	size.height *= scale;
+
+	if( s_backbuffer_width == size.width
+	   && s_backbuffer_height == size.height)
 		return;
 	
-	s_backbuffer_width = [GLWin.cocoaWin frame].size.width;
-	s_backbuffer_height = [GLWin.cocoaWin frame].size.height;
+	s_backbuffer_width = size.width;
+	s_backbuffer_height = size.height;
 	
 	[GLWin.cocoaCtx update];
 }
diff --git a/Source/Core/DolphinWX/Src/GLInterface/AGL.h b/Source/Core/DolphinWX/Src/GLInterface/AGL.h
index ea4ed66778..565d593948 100644
--- a/Source/Core/DolphinWX/Src/GLInterface/AGL.h
+++ b/Source/Core/DolphinWX/Src/GLInterface/AGL.h
@@ -30,6 +30,7 @@ public:
 	void Swap();
 	bool Create(void *&window_handle);
 	bool MakeCurrent();
+	bool ClearCurrent();
 	void Shutdown();
 	void Update();
 
diff --git a/Source/Core/DolphinWX/Src/GLInterface/EGL_X11.cpp b/Source/Core/DolphinWX/Src/GLInterface/EGL.cpp
similarity index 57%
rename from Source/Core/DolphinWX/Src/GLInterface/EGL_X11.cpp
rename to Source/Core/DolphinWX/Src/GLInterface/EGL.cpp
index ccb2fc04b8..aa26c40b6f 100644
--- a/Source/Core/DolphinWX/Src/GLInterface/EGL_X11.cpp
+++ b/Source/Core/DolphinWX/Src/GLInterface/EGL.cpp
@@ -19,59 +19,30 @@
 #include "RenderBase.h"
 
 #include "../GLInterface.h"
-#include "EGL_X11.h"
+#include "EGL.h"
 
 // Show the current FPS
 void cInterfaceEGL::UpdateFPSDisplay(const char *text)
 {
-	XStoreName(GLWin.dpy, GLWin.win, text);
+	Platform.UpdateFPSDisplay(text);
 }
-
-void cInterfaceEGL::SwapInterval(int Interval)
-{
-	eglSwapInterval(GLWin.egl_dpy, Interval);
-}
-
 void cInterfaceEGL::Swap()
 {
 	eglSwapBuffers(GLWin.egl_dpy, GLWin.egl_surf);
 }
+void cInterfaceEGL::SwapInterval(int Interval)
+{
+	eglSwapInterval(GLWin.egl_dpy, Interval);
+}
 
 // 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;
-
+	const char *s;
 	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));
+	EGLConfig config;
+	EGLint num_configs;
 
 	// attributes for a visual in RGBA format with at least
 	// 8 bits per color and a 24 bit depth buffer
@@ -93,70 +64,79 @@ bool cInterfaceEGL::Create(void *&window_handle)
 #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(!Platform.SelectDisplay())
+		return false;
 
-	if (!eglChooseConfig( GLWin.egl_dpy, attribs, &config, 1, &num_configs)) {
-		ERROR_LOG(VIDEO, "Error: couldn't get an EGL visual config\n");
+	GLWin.egl_dpy = Platform.EGLGetDisplay();
+
+	if (!GLWin.egl_dpy) {
+		INFO_LOG(VIDEO, "Error: eglGetDisplay() failed\n");
 		return false;
 	}
 
-	if (!eglGetConfigAttrib(GLWin.egl_dpy, config, EGL_NATIVE_VISUAL_ID, &vid)) {
-		ERROR_LOG(VIDEO, "Error: eglGetConfigAttrib() failed\n");
+	GLWin.platform = Platform.platform;
+
+	if (!eglInitialize(GLWin.egl_dpy, &egl_major, &egl_minor)) {
+		INFO_LOG(VIDEO, "Error: eglInitialize() 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;
+
+	if (!eglChooseConfig( GLWin.egl_dpy, attribs, &config, 1, &num_configs)) {
+		INFO_LOG(VIDEO, "Error: couldn't get an EGL visual config\n");
+		exit(1);
 	}
 
-	GLWin.egl_surf = eglCreateWindowSurface(GLWin.egl_dpy, config, (NativeWindowType)GLWin.win, NULL);
-	if (!GLWin.egl_surf) {
-		ERROR_LOG(VIDEO, "Error: eglCreateWindowSurface failed\n");
+	if (!Platform.Init(config))
 		return false;
+
+	s = eglQueryString(GLWin.egl_dpy, EGL_VERSION);
+	INFO_LOG(VIDEO, "EGL_VERSION = %s\n", s);
+
+	s = eglQueryString(GLWin.egl_dpy, EGL_VENDOR);
+	INFO_LOG(VIDEO, "EGL_VENDOR = %s\n", s);
+
+	s = eglQueryString(GLWin.egl_dpy, EGL_EXTENSIONS);
+	INFO_LOG(VIDEO, "EGL_EXTENSIONS = %s\n", s);
+
+	s = eglQueryString(GLWin.egl_dpy, EGL_CLIENT_APIS);
+	INFO_LOG(VIDEO, "EGL_CLIENT_APIS = %s\n", s);
+
+	GLWin.egl_ctx = eglCreateContext(GLWin.egl_dpy, config, EGL_NO_CONTEXT, ctx_attribs );
+	if (!GLWin.egl_ctx) {
+		INFO_LOG(VIDEO, "Error: eglCreateContext failed\n");
+		exit(1);
+	}
+
+	GLWin.native_window = Platform.CreateWindow();
+
+	GLWin.egl_surf = eglCreateWindowSurface(GLWin.egl_dpy, config,
+				GLWin.native_window, NULL);
+	if (!GLWin.egl_surf) {
+		INFO_LOG(VIDEO, "Error: eglCreateWindowSurface failed\n");
+		exit(1);
 	}
 
 	if (!eglMakeCurrent(GLWin.egl_dpy, GLWin.egl_surf, GLWin.egl_surf, GLWin.egl_ctx)) {
-		ERROR_LOG(VIDEO, "Error: eglMakeCurrent() failed\n");
+
+		INFO_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;
+
+	Platform.ToggleFullscreen(SConfig::GetInstance().m_LocalCoreStartupParameter.bFullscreen);
+
+	window_handle = (void *)GLWin.native_window;
 	return true;
 }
 
@@ -167,15 +147,18 @@ bool cInterfaceEGL::MakeCurrent()
 // Close backend
 void cInterfaceEGL::Shutdown()
 {
-	XWindow.DestroyXWindow();
+	Platform.DestroyWindow();
 	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);
+		eglMakeCurrent(GLWin.egl_dpy, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
+		if(!eglDestroyContext(GLWin.egl_dpy, GLWin.egl_ctx))
+			NOTICE_LOG(VIDEO, "Could not destroy drawing context.");
+		if(!eglDestroySurface(GLWin.egl_dpy, GLWin.egl_surf))
+			NOTICE_LOG(VIDEO, "Could not destroy window surface.");
+		if(!eglTerminate(GLWin.egl_dpy))
+			NOTICE_LOG(VIDEO, "Could not destroy display connection.");
 		GLWin.egl_ctx = NULL;
 	}
 }
-
diff --git a/Source/Core/DolphinWX/Src/GLInterface/EGL_X11.h b/Source/Core/DolphinWX/Src/GLInterface/EGL.h
similarity index 89%
rename from Source/Core/DolphinWX/Src/GLInterface/EGL_X11.h
rename to Source/Core/DolphinWX/Src/GLInterface/EGL.h
index e47573e4d8..cf218ad760 100644
--- a/Source/Core/DolphinWX/Src/GLInterface/EGL_X11.h
+++ b/Source/Core/DolphinWX/Src/GLInterface/EGL.h
@@ -17,24 +17,23 @@
 #ifndef _INTERFACEEGL_H_
 #define _INTERFACEEGL_H_
 
-#include <EGL/egl.h>
-#ifdef USE_GLES
+#if USE_GLES
 #include <GLES2/gl2.h>
-#include <X11/Xutil.h>
 #else
 #include <GL/glxew.h>
 #include <GL/gl.h>
 #endif
 
-#include "X11_Util.h"
 #include "InterfaceBase.h"
 
+class cPlatform;
+
 class cInterfaceEGL : public cInterfaceBase
 {
 private:
-	cX11Window XWindow;
+	cPlatform Platform;
 public:
-	friend class cX11Window;
+	friend class cPlatform;
 	void SwapInterval(int Interval);
 	void Swap();
 	void UpdateFPSDisplay(const char *Text);
diff --git a/Source/Core/DolphinWX/Src/GLInterface/GLX.cpp b/Source/Core/DolphinWX/Src/GLInterface/GLX.cpp
index 196830be66..84a753c784 100644
--- a/Source/Core/DolphinWX/Src/GLInterface/GLX.cpp
+++ b/Source/Core/DolphinWX/Src/GLInterface/GLX.cpp
@@ -141,12 +141,17 @@ bool cInterfaceGLX::MakeCurrent()
 	#endif
 	return glXMakeCurrent(GLWin.dpy, GLWin.win, GLWin.ctx);
 }
+
+bool cInterfaceGLX::ClearCurrent()
+{
+	return glXMakeCurrent(GLWin.dpy, None, NULL);
+}
+
+
 // 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);
diff --git a/Source/Core/DolphinWX/Src/GLInterface/GLX.h b/Source/Core/DolphinWX/Src/GLInterface/GLX.h
index 83bb14a507..ba8e6a9b82 100644
--- a/Source/Core/DolphinWX/Src/GLInterface/GLX.h
+++ b/Source/Core/DolphinWX/Src/GLInterface/GLX.h
@@ -36,6 +36,7 @@ public:
 	void UpdateFPSDisplay(const char *Text);
 	bool Create(void *&window_handle);
 	bool MakeCurrent();
+	bool ClearCurrent();
 	void Shutdown(); 
 };
 #endif
diff --git a/Source/Core/DolphinWX/Src/GLInterface/InterfaceBase.h b/Source/Core/DolphinWX/Src/GLInterface/InterfaceBase.h
index 1c00a1fd89..506adcbb6e 100644
--- a/Source/Core/DolphinWX/Src/GLInterface/InterfaceBase.h
+++ b/Source/Core/DolphinWX/Src/GLInterface/InterfaceBase.h
@@ -1,19 +1,7 @@
-// Copyright (C) 2003 Dolphin Project.
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
-// 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
@@ -27,6 +15,7 @@ public:
 	virtual void UpdateFPSDisplay(const char *Text) {}
 	virtual bool Create(void *&window_handle) { return true; }
 	virtual bool MakeCurrent() { return true; }
+	virtual bool ClearCurrent() { return true; }
 	virtual void Shutdown() {} 
 
 	virtual void SwapInterval(int Interval) { }
diff --git a/Source/Core/DolphinWX/Src/GLInterface/Platform.cpp b/Source/Core/DolphinWX/Src/GLInterface/Platform.cpp
new file mode 100644
index 0000000000..83f064615c
--- /dev/null
+++ b/Source/Core/DolphinWX/Src/GLInterface/Platform.cpp
@@ -0,0 +1,218 @@
+// Copyright (C) 2013 Scott Moreau <oreaus@gmail.com>
+
+// 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 "Platform.h"
+
+bool cPlatform::SelectDisplay(void)
+{
+	enum egl_platform selected_platform = EGL_PLATFORM_NONE;
+	enum egl_platform desired_platform = EGL_PLATFORM_NONE;
+	char *platform_env = getenv("DOLPHIN_EGL_PLATFORM");
+
+	if (platform_env)
+		platform_env = strdup(platform_env);
+
+	if (!platform_env)
+		printf("Running automatic platform detection\n");
+
+	// Try to select the platform set in the environment variable first
+#if HAVE_WAYLAND
+	bool wayland_possible = WaylandInterface.ServerConnect();
+
+	if (platform_env && !strcmp(platform_env, "wayland"))
+	{
+		desired_platform = EGL_PLATFORM_WAYLAND;
+		if (wayland_possible)
+			selected_platform = EGL_PLATFORM_WAYLAND;
+		else
+			printf("Wayland display server connection failed\n");
+	}
+#endif
+
+#if HAVE_X11
+	bool x11_possible = XInterface.ServerConnect();
+
+	if (platform_env && !strcmp(platform_env, "x11"))
+	{
+		desired_platform = EGL_PLATFORM_X11;
+		if ((selected_platform != EGL_PLATFORM_WAYLAND) && x11_possible)
+			selected_platform = EGL_PLATFORM_X11;
+		else
+			printf("X11 display server connection failed\n");
+	}
+#endif
+	// Fall back to automatic detection
+	if (selected_platform == EGL_PLATFORM_NONE)
+	{
+		if (platform_env && (desired_platform == EGL_PLATFORM_NONE)) {
+			printf("DOLPHIN_EGL_PLATFORM set to unrecognized platform \"%s\".\n"
+#if HAVE_WAYLAND && !HAVE_X11
+				"Note: Valid value is \"wayland\" (built without x11 support)\n",
+#endif
+#if HAVE_X11 && !HAVE_WAYLAND
+				"Note: Valid values is \"x11\" (built without wayland support)\n",
+#endif
+#if HAVE_WAYLAND && HAVE_X11
+				"Note: Valid values are \"wayland\" and \"x11\"\n",
+#endif
+#if !HAVE_WAYLAND && !HAVE_X11
+				"Note: No Valid platform. Must be Android\n",
+#endif
+			platform_env);
+			free(platform_env);
+			platform_env = NULL;
+		}
+#if HAVE_WAYLAND
+		if (wayland_possible)
+		{
+			selected_platform = EGL_PLATFORM_WAYLAND;
+			platform_env = strdup("wayland");
+		}
+#endif
+#if HAVE_X11
+		if ((selected_platform != EGL_PLATFORM_WAYLAND) && x11_possible)
+		{
+			selected_platform = EGL_PLATFORM_X11;
+			platform_env = strdup("x11");
+		}
+#endif
+#ifdef ANDROID
+		selected_platform = EGL_PLATFORM_ANDROID;
+#endif
+		if (selected_platform == EGL_PLATFORM_NONE)
+		{
+			printf("FATAL: Failed to find suitable platform for display connection\n");
+			goto out;
+		}
+	}
+
+	printf("Using EGL Native Display Platform: %s\n", platform_env);
+out:
+	cPlatform::platform = selected_platform;
+	free(platform_env);
+#if HAVE_WAYLAND
+	if (selected_platform != EGL_PLATFORM_WAYLAND) {
+		if (GLWin.wl_display)
+			wl_display_disconnect(GLWin.wl_display);
+	}
+		
+#endif
+#if HAVE_X11
+	if (selected_platform != EGL_PLATFORM_X11) {
+		if (GLWin.dpy)
+			XCloseDisplay(GLWin.dpy);
+	}
+#endif
+	if (selected_platform == EGL_PLATFORM_NONE)
+		return false;
+
+	return true;
+}
+
+bool cPlatform::Init(EGLConfig config)
+{
+#if HAVE_WAYLAND
+	if (cPlatform::platform == EGL_PLATFORM_WAYLAND)
+		if (!WaylandInterface.Initialize(config))
+			return false;
+#endif
+#if HAVE_X11
+	if (cPlatform::platform == EGL_PLATFORM_X11)
+		if (!XInterface.Initialize(config))
+			return false;
+#endif
+#ifdef ANDROID
+	EGLint format;
+	eglGetConfigAttrib(GLWin.egl_dpy, config, EGL_NATIVE_VISUAL_ID, &format);
+	ANativeWindow_setBuffersGeometry((EGLNativeWindowType)Host_GetRenderHandle(), 0, 0, format);
+	int none, width, height;
+	Host_GetRenderWindowSize(none, none, width, height);
+	GLWin.width = width;
+	GLWin.height = height;
+	GLInterface->SetBackBufferDimensions(width, height);
+#endif
+	return true;
+}
+
+EGLDisplay cPlatform::EGLGetDisplay(void)
+{
+#if HAVE_WAYLAND
+	if (cPlatform::platform == EGL_PLATFORM_WAYLAND)
+		return (EGLDisplay) WaylandInterface.EGLGetDisplay();
+#endif
+#if HAVE_X11
+	if (cPlatform::platform == EGL_PLATFORM_X11)
+		return (EGLDisplay) XInterface.EGLGetDisplay();
+#endif
+#ifdef ANDROID
+	return eglGetDisplay(EGL_DEFAULT_DISPLAY);
+#endif
+	return NULL;
+}
+
+EGLNativeWindowType cPlatform::CreateWindow(void)
+{
+#if HAVE_WAYLAND
+	if (cPlatform::platform == EGL_PLATFORM_WAYLAND)
+		return (EGLNativeWindowType) WaylandInterface.CreateWindow();
+#endif
+#if HAVE_X11
+	if (cPlatform::platform == EGL_PLATFORM_X11)
+		return (EGLNativeWindowType) XInterface.CreateWindow();
+#endif
+#ifdef ANDROID
+	return (EGLNativeWindowType)Host_GetRenderHandle(); 
+#endif
+	return 0;
+}
+
+void cPlatform::DestroyWindow(void)
+{
+#if HAVE_WAYLAND
+	if (cPlatform::platform == EGL_PLATFORM_WAYLAND)
+		WaylandInterface.DestroyWindow();
+#endif
+#if HAVE_X11
+	if (cPlatform::platform == EGL_PLATFORM_X11)
+		XInterface.DestroyWindow();
+#endif
+}
+
+void cPlatform::UpdateFPSDisplay(const char *text)
+{
+#if HAVE_WAYLAND
+	if (cPlatform::platform == EGL_PLATFORM_WAYLAND)
+		WaylandInterface.UpdateFPSDisplay(text);
+#endif
+#if HAVE_X11
+	if (cPlatform::platform == EGL_PLATFORM_X11)
+		XInterface.UpdateFPSDisplay(text);
+#endif
+}
+
+void
+cPlatform::ToggleFullscreen(bool fullscreen)
+{
+#if HAVE_WAYLAND
+	if (cPlatform::platform == EGL_PLATFORM_WAYLAND)
+		WaylandInterface.ToggleFullscreen(fullscreen);
+#endif
+#if HAVE_X11
+	// Only wayland uses this function
+#endif
+}
diff --git a/Source/Core/DolphinWX/Src/GLInterface/Platform.h b/Source/Core/DolphinWX/Src/GLInterface/Platform.h
new file mode 100644
index 0000000000..a6b9d59cff
--- /dev/null
+++ b/Source/Core/DolphinWX/Src/GLInterface/Platform.h
@@ -0,0 +1,161 @@
+// Copyright (C) 2013 Scott Moreau <oreaus@gmail.com>
+
+// 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 _EGLPLATFORM_H_
+#define _EGLPLATFORM_H_
+
+#include "Thread.h"
+#include "ConfigManager.h"
+
+#if USE_EGL
+// We must include wayland-egl.h before egl.h so our
+// native types are defined as wayland native types
+#if HAVE_WAYLAND && !HAVE_X11
+#include <wayland-egl.h>
+#endif
+#include <EGL/egl.h>
+#endif
+
+#if HAVE_X11
+#include "X11_Util.h"
+#endif
+#if HAVE_WAYLAND
+#include "Wayland_Util.h"
+#endif
+
+#if USE_EGL
+// There may be multiple EGL platforms
+enum egl_platform {
+	EGL_PLATFORM_NONE,
+	EGL_PLATFORM_WAYLAND,
+	EGL_PLATFORM_X11,
+	EGL_PLATFORM_ANDROID
+};
+
+class cPlatform
+{
+private:
+#if HAVE_X11
+	cXInterface XInterface;
+#endif
+#if HAVE_WAYLAND
+	cWaylandInterface WaylandInterface;
+#endif
+public:
+	enum egl_platform platform;
+	bool SelectDisplay(void);
+	bool Init(EGLConfig config);
+	EGLDisplay EGLGetDisplay(void);
+	EGLNativeWindowType CreateWindow(void);
+	void DestroyWindow(void);
+	void UpdateFPSDisplay(const char *text);
+	void ToggleFullscreen(bool fullscreen);
+};
+
+#include "GLInterface/EGL.h"
+
+#if HAVE_WAYLAND
+#include <wayland-egl.h>
+#endif
+#elif defined(__APPLE__)
+#include "GLInterface/AGL.h"
+#elif defined(_WIN32)
+#include "GLInterface/WGL.h"
+#elif HAVE_X11
+#include "GLInterface/GLX.h"
+#endif
+
+#if HAVE_WAYLAND
+struct geometry {
+	int width;
+	int height;
+};
+
+struct xkb {
+	struct xkb_context *context;
+	struct xkb_keymap *keymap;
+	struct xkb_state *state;
+	xkb_mod_mask_t control_mask;
+	xkb_mod_mask_t alt_mask;
+	xkb_mod_mask_t shift_mask;
+};
+#endif
+
+typedef struct {
+// Currently Wayland/EGL and X11/EGL platforms are supported.
+// The platform may be spelected at run time by setting the
+// environment variable DOLPHIN_EGL_PLATFORM to "wayland" or "x11".
+#if USE_EGL
+	EGLSurface egl_surf;
+	EGLContext egl_ctx;
+	EGLDisplay egl_dpy;
+	enum egl_platform platform;
+#endif
+	EGLNativeWindowType native_window;
+#if HAVE_WAYLAND
+	struct wl_display *wl_display;
+	struct wl_registry *wl_registry;
+	struct wl_compositor *wl_compositor;
+	struct wl_shell *wl_shell;
+	struct wl_seat *wl_seat;
+	struct {
+		struct wl_pointer *wl_pointer;
+		uint32_t serial;
+	} pointer;
+	struct {
+		struct wl_keyboard *wl_keyboard;
+		struct xkb xkb;
+		uint32_t modifiers;
+	} keyboard;
+	struct wl_shm *wl_shm;
+	struct wl_cursor_theme *wl_cursor_theme;
+	struct wl_cursor *wl_cursor;
+	struct wl_surface *wl_cursor_surface;
+	struct geometry geometry, window_size;
+	struct wl_egl_window *wl_egl_native;
+	struct wl_surface *wl_surface;
+	struct wl_shell_surface *wl_shell_surface;
+	struct wl_callback *wl_callback;
+	bool fullscreen, configured, frame_drawn, swap_complete, running;
+#endif
+#if HAVE_X11
+	int screen;
+	// dpy used for egl/glx stuff, evdpy for window events etc.
+	// evdpy is to be used by XEventThread only
+	Display *dpy;
+	Display *evdpy;
+#if !USE_EGL
+	GLXContext ctx;
+#endif
+	Window win;
+	Window parent;
+	XVisualInfo *vi;
+	XSetWindowAttributes attr;
+	std::thread xEventThread;
+	int x, y;
+	unsigned int width, height;
+#elif defined(ANDROID)
+	unsigned int width, height;
+#elif defined(__APPLE__)
+	NSWindow *cocoaWin;
+	NSOpenGLContext *cocoaCtx;
+#endif
+} GLWindow;
+
+extern cInterfaceBase *GLInterface;
+extern GLWindow GLWin;
+
+#endif
diff --git a/Source/Core/DolphinWX/Src/GLInterface/WGL.cpp b/Source/Core/DolphinWX/Src/GLInterface/WGL.cpp
index ce1bb3d946..7ba315a5b4 100644
--- a/Source/Core/DolphinWX/Src/GLInterface/WGL.cpp
+++ b/Source/Core/DolphinWX/Src/GLInterface/WGL.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "VideoConfig.h"
 #include "Host.h"
@@ -131,6 +118,11 @@ bool cInterfaceWGL::MakeCurrent()
 	return wglMakeCurrent(hDC, hRC) ? true : false;
 }
 
+bool cInterfaceWGL::ClearCurrent()
+{
+	return wglMakeCurrent(hDC, NULL) ? true : false;
+}
+
 // Update window width, size and etc. Called from Render.cpp
 void cInterfaceWGL::Update()
 {
@@ -171,14 +163,14 @@ void cInterfaceWGL::Shutdown()
 			NOTICE_LOG(VIDEO, "Could not release drawing context.");
 
 		if (!wglDeleteContext(hRC))
-			ERROR_LOG(VIDEO, "Release Rendering Context Failed.");
+			ERROR_LOG(VIDEO, "Attempt to release rendering context failed.");
 
 		hRC = NULL;
 	}
 
 	if (hDC && !ReleaseDC(EmuWindow::GetWnd(), hDC))
 	{
-		ERROR_LOG(VIDEO, "Release Device Context Failed.");
+		ERROR_LOG(VIDEO, "Attempt to release device context failed.");
 		hDC = NULL;
 	}
 }
diff --git a/Source/Core/DolphinWX/Src/GLInterface/WGL.h b/Source/Core/DolphinWX/Src/GLInterface/WGL.h
index 18b8b2afb0..5c968d963e 100644
--- a/Source/Core/DolphinWX/Src/GLInterface/WGL.h
+++ b/Source/Core/DolphinWX/Src/GLInterface/WGL.h
@@ -1,19 +1,7 @@
-// Copyright (C) 2003 Dolphin Project.
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
-// 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_
 
@@ -33,6 +21,7 @@ public:
 	void UpdateFPSDisplay(const char *Text);
 	bool Create(void *&window_handle);
 	bool MakeCurrent();
+	bool ClearCurrent();
 	void Shutdown(); 
 
 	void Update();
diff --git a/Source/Core/DolphinWX/Src/GLInterface/Wayland_Util.cpp b/Source/Core/DolphinWX/Src/GLInterface/Wayland_Util.cpp
new file mode 100644
index 0000000000..aa15917344
--- /dev/null
+++ b/Source/Core/DolphinWX/Src/GLInterface/Wayland_Util.cpp
@@ -0,0 +1,472 @@
+// Copyright (C) 2013 Scott Moreau <oreaus@gmail.com>
+
+// 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 "Core.h"
+#include "State.h"
+#include "../GLInterface.h"
+#include <linux/input.h>
+#include <sys/mman.h>
+
+
+static void
+redraw(void *data, struct wl_callback *callback, uint32_t time);
+
+static const struct wl_callback_listener frame_listener = {
+	redraw
+};
+
+static void
+redraw(void *data, struct wl_callback *callback, uint32_t time)
+{
+	if (GLWin.wl_callback != callback) {
+		printf("Got wrong callback from wayland server\n");
+		exit(-1);
+	}
+
+	GLWin.wl_callback = NULL;
+
+	if (callback)
+		wl_callback_destroy(callback);
+
+	if (!GLWin.configured)
+		return;
+
+	// Reset the frame callback
+	GLWin.wl_callback = wl_surface_frame(GLWin.wl_surface);
+	wl_callback_add_listener(GLWin.wl_callback, &frame_listener, 0);
+
+	// Present rendered buffer on screen
+	//eglSwapBuffers(GLWin.egl_dpy, GLWin.egl_surf);
+}
+
+static void
+hide_cursor(void)
+{
+	if (!GLWin.pointer.wl_pointer)
+		return;
+
+	wl_pointer_set_cursor(GLWin.pointer.wl_pointer,
+			      GLWin.pointer.serial, NULL, 0, 0);
+}
+
+static void
+configure_callback(void *data, struct wl_callback *callback, uint32_t  time)
+{
+	wl_callback_destroy(callback);
+
+	GLWin.configured = true;
+
+	if (GLWin.wl_callback == NULL)
+		redraw(data, NULL, time);
+}
+
+static struct wl_callback_listener configure_callback_listener = {
+	configure_callback,
+};
+
+static void
+handle_ping(void *data, struct wl_shell_surface *wl_shell_surface,
+	    uint32_t serial)
+{
+	wl_shell_surface_pong(wl_shell_surface, serial);
+}
+
+static void
+handle_configure(void *data, struct wl_shell_surface *wl_shell_surface,
+		 uint32_t edges, int32_t width, int32_t height)
+{
+
+	if (GLWin.wl_egl_native)
+		wl_egl_window_resize(GLWin.wl_egl_native, width, height, 0, 0);
+
+	GLWin.geometry.width = width;
+	GLWin.geometry.height = height;
+
+	GLInterface->SetBackBufferDimensions(width, height);
+
+	if (!GLWin.fullscreen)
+		GLWin.window_size = GLWin.geometry;
+}
+
+static void
+handle_popup_done(void *data, struct wl_shell_surface *wl_shell_surface)
+{
+}
+
+static const struct wl_shell_surface_listener shell_surface_listener = {
+	handle_ping,
+	handle_configure,
+	handle_popup_done
+};
+
+static void
+pointer_handle_enter(void *data, struct wl_pointer *pointer,
+		     uint32_t serial, struct wl_surface *surface,
+		     wl_fixed_t sx, wl_fixed_t sy)
+{
+	GLWin.pointer.serial = serial;
+
+	if (GLWin.fullscreen)
+		hide_cursor();
+}
+
+static void
+pointer_handle_leave(void *data, struct wl_pointer *pointer,
+		     uint32_t serial, struct wl_surface *surface)
+{
+}
+
+static void
+pointer_handle_motion(void *data, struct wl_pointer *pointer,
+		      uint32_t time, wl_fixed_t sx, wl_fixed_t sy)
+{
+}
+
+static void
+pointer_handle_button(void *data, struct wl_pointer *wl_pointer,
+		      uint32_t serial, uint32_t time, uint32_t button,
+		      uint32_t state)
+{
+}
+
+static void
+pointer_handle_axis(void *data, struct wl_pointer *wl_pointer,
+		    uint32_t time, uint32_t axis, wl_fixed_t value)
+{
+}
+
+static const struct wl_pointer_listener pointer_listener = {
+	pointer_handle_enter,
+	pointer_handle_leave,
+	pointer_handle_motion,
+	pointer_handle_button,
+	pointer_handle_axis,
+};
+
+void setup_callback_listener()
+{
+	struct wl_callback *callback;
+
+	callback = wl_display_sync(GLWin.wl_display);
+	wl_callback_add_listener(callback, &configure_callback_listener, 0);
+}
+
+static void
+toggle_fullscreen(bool fullscreen)
+{
+	GLWin.fullscreen = fullscreen;
+	GLWin.configured = false;
+
+	if (fullscreen) {
+		wl_shell_surface_set_fullscreen(GLWin.wl_shell_surface,
+						WL_SHELL_SURFACE_FULLSCREEN_METHOD_DEFAULT,
+						0, NULL);
+	} else {
+		wl_shell_surface_set_toplevel(GLWin.wl_shell_surface);
+		handle_configure(NULL, GLWin.wl_shell_surface, 0,
+				 GLWin.window_size.width,
+				 GLWin.window_size.height);
+	}
+
+	setup_callback_listener();
+}
+
+static void
+keyboard_handle_keymap(void *data, struct wl_keyboard *keyboard,
+		       uint32_t format, int fd, uint32_t size)
+{
+	char *map_str;
+
+	if (format != WL_KEYBOARD_KEYMAP_FORMAT_XKB_V1) {
+		close(fd);
+		return;
+	}
+
+	map_str = (char *) mmap(NULL, size, PROT_READ, MAP_SHARED, fd, 0);
+	if (map_str == MAP_FAILED) {
+		close(fd);
+		return;
+	}
+
+	GLWin.keyboard.xkb.keymap = xkb_map_new_from_string(GLWin.keyboard.xkb.context,
+						    map_str,
+						    XKB_KEYMAP_FORMAT_TEXT_V1,
+						    (xkb_keymap_compile_flags) 0);
+	munmap(map_str, size);
+	close(fd);
+
+	if (!GLWin.keyboard.xkb.keymap) {
+		fprintf(stderr, "failed to compile keymap\n");
+		return;
+	}
+
+	GLWin.keyboard.xkb.state = xkb_state_new(GLWin.keyboard.xkb.keymap);
+	if (!GLWin.keyboard.xkb.state) {
+		fprintf(stderr, "failed to create XKB state\n");
+		xkb_map_unref(GLWin.keyboard.xkb.keymap);
+		GLWin.keyboard.xkb.keymap = NULL;
+		return;
+	}
+
+	GLWin.keyboard.xkb.control_mask =
+		1 << xkb_map_mod_get_index(GLWin.keyboard.xkb.keymap, "Control");
+	GLWin.keyboard.xkb.alt_mask =
+		1 << xkb_map_mod_get_index(GLWin.keyboard.xkb.keymap, "Mod1");
+	GLWin.keyboard.xkb.shift_mask =
+		1 << xkb_map_mod_get_index(GLWin.keyboard.xkb.keymap, "Shift");
+}
+
+static void
+keyboard_handle_enter(void *data, struct wl_keyboard *keyboard,
+		      uint32_t serial, struct wl_surface *surface,
+		      struct wl_array *keys)
+{
+}
+
+static void
+keyboard_handle_leave(void *data, struct wl_keyboard *keyboard,
+		      uint32_t serial, struct wl_surface *surface)
+{
+}
+
+static void
+keyboard_handle_key(void *data, struct wl_keyboard *keyboard,
+		    uint32_t serial, uint32_t time, uint32_t key,
+		    uint32_t state)
+{
+	if (state == WL_KEYBOARD_KEY_STATE_RELEASED)
+		return;
+
+	if (key == KEY_ESC)
+		GLWin.running = false;
+	else if ((key == KEY_P) ||
+		((key == KEY_ENTER) && (GLWin.keyboard.modifiers == 0)))
+		Core::SetState((Core::GetState() == Core::CORE_RUN) ?
+				Core::CORE_PAUSE : Core::CORE_RUN);
+	else if (key == KEY_F)
+		toggle_fullscreen(!GLWin.fullscreen);
+	else if ((key == KEY_ENTER) && (GLWin.keyboard.modifiers == MOD_ALT_MASK))
+		toggle_fullscreen(!GLWin.fullscreen);
+	else if (key >= KEY_F1 && key <= KEY_F8) {
+		int slot_number = key - KEY_F1 + 1;
+		if (GLWin.keyboard.modifiers == MOD_SHIFT_MASK)
+			State::Save(slot_number);
+		else
+			State::Load(slot_number);
+	}
+	else if (key == KEY_F9)
+		Core::SaveScreenShot();
+	else if (key == KEY_F11)
+		State::LoadLastSaved();
+	else if (key == KEY_F12) {
+		if (GLWin.keyboard.modifiers == MOD_SHIFT_MASK)
+			State::UndoLoadState();
+		else
+			State::UndoSaveState();
+	}
+}
+
+static void
+keyboard_handle_modifiers(void *data, struct wl_keyboard *keyboard,
+			  uint32_t serial, uint32_t mods_depressed,
+			  uint32_t mods_latched, uint32_t mods_locked,
+			  uint32_t group)
+{
+	xkb_mod_mask_t mask;
+
+	xkb_state_update_mask(GLWin.keyboard.xkb.state, mods_depressed, mods_latched,
+			      mods_locked, 0, 0, group);
+	mask = xkb_state_serialize_mods(GLWin.keyboard.xkb.state,
+					(xkb_state_component)
+					(XKB_STATE_DEPRESSED |
+					 XKB_STATE_LATCHED));
+	GLWin.keyboard.modifiers = 0;
+	if (mask & GLWin.keyboard.xkb.control_mask)
+		GLWin.keyboard.modifiers |= MOD_CONTROL_MASK;
+	if (mask & GLWin.keyboard.xkb.alt_mask)
+		GLWin.keyboard.modifiers |= MOD_ALT_MASK;
+	if (mask & GLWin.keyboard.xkb.shift_mask)
+		GLWin.keyboard.modifiers |= MOD_SHIFT_MASK;
+}
+
+static const struct wl_keyboard_listener keyboard_listener = {
+	keyboard_handle_keymap,
+	keyboard_handle_enter,
+	keyboard_handle_leave,
+	keyboard_handle_key,
+	keyboard_handle_modifiers,
+};
+
+static void
+seat_handle_capabilities(void *data, struct wl_seat *seat,
+			 uint32_t caps)
+{
+	struct wl_pointer *wl_pointer = NULL;
+	struct wl_keyboard *wl_keyboard = NULL;
+
+	if ((caps & WL_SEAT_CAPABILITY_POINTER) && !wl_pointer) {
+		wl_pointer = wl_seat_get_pointer(seat);
+		wl_pointer_add_listener(wl_pointer, &pointer_listener, 0);
+	} else if (!(caps & WL_SEAT_CAPABILITY_POINTER) && wl_pointer) {
+		wl_pointer_destroy(wl_pointer);
+		wl_pointer = NULL;
+	}
+
+	GLWin.pointer.wl_pointer = wl_pointer;
+
+	if ((caps & WL_SEAT_CAPABILITY_KEYBOARD) && !wl_keyboard) {
+		wl_keyboard = wl_seat_get_keyboard(seat);
+		wl_keyboard_add_listener(wl_keyboard, &keyboard_listener, 0);
+	} else if (!(caps & WL_SEAT_CAPABILITY_KEYBOARD) && wl_keyboard) {
+		wl_keyboard_destroy(wl_keyboard);
+		wl_keyboard = NULL;
+	}
+
+	GLWin.keyboard.wl_keyboard = wl_keyboard;
+}
+
+static const struct wl_seat_listener seat_listener = {
+	seat_handle_capabilities,
+};
+
+static void
+registry_handle_global(void *data, struct wl_registry *registry,
+		       uint32_t name, const char *interface, uint32_t version)
+{
+	if (strcmp(interface, "wl_compositor") == 0) {
+		GLWin.wl_compositor = (wl_compositor *)
+			wl_registry_bind(registry, name,
+					 &wl_compositor_interface, 1);
+	} else if (strcmp(interface, "wl_shell") == 0) {
+		GLWin.wl_shell = (wl_shell *) wl_registry_bind(registry, name,
+					    &wl_shell_interface, 1);
+	} else if (strcmp(interface, "wl_seat") == 0) {
+		GLWin.wl_seat = (wl_seat *) wl_registry_bind(registry, name,
+					   &wl_seat_interface, 1);
+		wl_seat_add_listener(GLWin.wl_seat, &seat_listener, 0);
+	} else if (strcmp(interface, "wl_shm") == 0) {
+		GLWin.wl_shm = (wl_shm *) wl_registry_bind(registry, name,
+					  &wl_shm_interface, 1);
+		GLWin.wl_cursor_theme = (wl_cursor_theme *) wl_cursor_theme_load(NULL, 32, GLWin.wl_shm);
+		GLWin.wl_cursor = (wl_cursor *)
+			wl_cursor_theme_get_cursor(GLWin.wl_cursor_theme, "left_ptr");
+	}
+}
+
+static void
+registry_handle_global_remove(void *data, struct wl_registry *registry,
+			      uint32_t name)
+{
+}
+
+static const struct wl_registry_listener registry_listener = {
+	registry_handle_global,
+	registry_handle_global_remove
+};
+
+bool cWaylandInterface::ServerConnect(void)
+{
+	GLWin.wl_display = wl_display_connect(NULL);
+
+	if (!GLWin.wl_display)
+		return false;
+
+	return true;
+}
+
+bool cWaylandInterface::Initialize(void *config)
+{
+	if (!GLWin.wl_display) {
+		printf("Error: couldn't open wayland display\n");
+		return false;
+	}
+
+	GLWin.pointer.wl_pointer = NULL;
+	GLWin.keyboard.wl_keyboard = NULL;
+
+	GLWin.keyboard.xkb.context = xkb_context_new((xkb_context_flags) 0);
+	if (GLWin.keyboard.xkb.context == NULL) {
+		fprintf(stderr, "Failed to create XKB context\n");
+		return NULL;
+	}
+
+	GLWin.wl_registry = wl_display_get_registry(GLWin.wl_display);
+	wl_registry_add_listener(GLWin.wl_registry,
+				 &registry_listener, NULL);
+
+	wl_display_dispatch(GLWin.wl_display);
+
+	GLWin.wl_cursor_surface =
+		wl_compositor_create_surface(GLWin.wl_compositor);
+
+	return true;
+}
+
+void *cWaylandInterface::EGLGetDisplay(void)
+{
+#if HAVE_X11
+	return eglGetDisplay((_XDisplay *) GLWin.wl_display);
+#else
+	return eglGetDisplay(GLWin.wl_display);
+#endif
+}
+
+void *cWaylandInterface::CreateWindow(void)
+{
+	GLWin.window_size.width = 640;
+	GLWin.window_size.height = 480;
+	GLWin.fullscreen = true;
+	GLWin.frame_drawn = false;
+	GLWin.swap_complete = false;
+
+	GLWin.wl_surface = wl_compositor_create_surface(GLWin.wl_compositor);
+	GLWin.wl_shell_surface = wl_shell_get_shell_surface(GLWin.wl_shell,
+							   GLWin.wl_surface);
+
+	wl_shell_surface_add_listener(GLWin.wl_shell_surface,
+				      &shell_surface_listener, 0);
+
+	GLWin.wl_egl_native = wl_egl_window_create(GLWin.wl_surface,
+						   GLWin.window_size.width,
+						   GLWin.window_size.height);
+#if HAVE_X11
+	return GLWin.wl_egl_native;
+#else
+	return GLWin.wl_egl_native;
+#endif
+}
+
+void cWaylandInterface::DestroyWindow(void)
+{
+	wl_egl_window_destroy(GLWin.wl_egl_native);
+
+	wl_shell_surface_destroy(GLWin.wl_shell_surface);
+	wl_surface_destroy(GLWin.wl_surface);
+
+	if (GLWin.wl_callback)
+		wl_callback_destroy(GLWin.wl_callback);
+}
+
+void cWaylandInterface::UpdateFPSDisplay(const char *text)
+{
+	wl_shell_surface_set_title(GLWin.wl_shell_surface, text);
+}
+
+void cWaylandInterface::ToggleFullscreen(bool fullscreen)
+{
+	toggle_fullscreen(GLWin.fullscreen);
+}
diff --git a/Source/Core/DolphinWX/Src/GLInterface/Wayland_Util.h b/Source/Core/DolphinWX/Src/GLInterface/Wayland_Util.h
new file mode 100644
index 0000000000..db5504878a
--- /dev/null
+++ b/Source/Core/DolphinWX/Src/GLInterface/Wayland_Util.h
@@ -0,0 +1,42 @@
+// Copyright (C) 2013 Scott Moreau <oreaus@gmail.com>
+
+// 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 _WAYLAND_UTIL_H_
+#define _WAYLAND_UTIL_H_
+
+#include <wayland-client.h>
+#include <wayland-egl.h>
+#include <wayland-cursor.h>
+#include <xkbcommon/xkbcommon.h>
+
+#define MOD_SHIFT_MASK		0x01
+#define MOD_ALT_MASK		0x02
+#define MOD_CONTROL_MASK	0x04
+
+
+class cWaylandInterface
+{
+public:
+	bool ServerConnect(void);
+	bool Initialize(void *config);
+	void *EGLGetDisplay(void);
+	void *CreateWindow(void);
+	void DestroyWindow(void);
+	void UpdateFPSDisplay(const char *text);
+	void ToggleFullscreen(bool fullscreen);
+};
+
+#endif
diff --git a/Source/Core/DolphinWX/Src/GLInterface/X11_Util.cpp b/Source/Core/DolphinWX/Src/GLInterface/X11_Util.cpp
index 6a30bb90a6..dd04ee0c73 100644
--- a/Source/Core/DolphinWX/Src/GLInterface/X11_Util.cpp
+++ b/Source/Core/DolphinWX/Src/GLInterface/X11_Util.cpp
@@ -21,6 +21,115 @@
 #include "../GLInterface.h"
 #include "VertexShaderManager.h"
 
+#if USE_EGL
+bool cXInterface::ServerConnect(void)
+{
+	GLWin.evdpy = XOpenDisplay(NULL);
+
+	if (!GLWin.evdpy)
+		return false;
+
+	return true;
+}
+
+bool cXInterface::Initialize(void *config)
+{
+	int _tx, _ty, _twidth, _theight;
+	XVisualInfo  visTemplate;
+	int num_visuals;
+	EGLint vid;
+
+	if (!GLWin.evdpy) {
+		printf("Error: couldn't open X display\n");
+		return false;
+	}
+
+	if (!eglGetConfigAttrib(GLWin.egl_dpy, config, EGL_NATIVE_VISUAL_ID, &vid)) {
+		printf("Error: eglGetConfigAttrib() failed\n");
+		exit(1);
+	}
+
+	/* The X window visual must match the EGL config */
+	visTemplate.visualid = vid;
+	GLWin.vi = XGetVisualInfo(GLWin.evdpy, VisualIDMask, &visTemplate, &num_visuals);
+	if (!GLWin.vi) {
+		printf("Error: couldn't get X visual\n");
+		exit(1);
+	}
+
+	Host_GetRenderWindowSize(_tx, _ty, _twidth, _theight);
+
+	GLWin.x = _tx;
+	GLWin.y = _ty;
+	GLWin.width = _twidth;
+	GLWin.height = _theight;
+
+	GLWin.dpy = XOpenDisplay(NULL);
+	GLWin.parent = GLWin.win;
+	GLWin.screen = DefaultScreen(GLWin.evdpy);
+
+	if (GLWin.parent == 0)
+		GLWin.parent = RootWindow(GLWin.evdpy, GLWin.screen);
+
+	/* Set initial projection/viewing transformation.
+	 * We can't be sure we'll get a ConfigureNotify event when the window
+	 * first appears.
+	 */
+	glViewport(0, 0, (GLint) GLWin.width, (GLint) GLWin.height);
+
+	return true;
+}
+
+void *cXInterface::EGLGetDisplay(void)
+{
+	return eglGetDisplay(GLWin.evdpy);
+}
+
+void *cXInterface::CreateWindow(void)
+{
+	Atom wmProtocols[1];
+
+	// Setup window attributes
+	GLWin.attr.colormap = XCreateColormap(GLWin.dpy,
+			GLWin.parent, GLWin.vi->visual, AllocNone);
+	GLWin.attr.event_mask = KeyPressMask | StructureNotifyMask | FocusChangeMask;
+	GLWin.attr.background_pixel = BlackPixel(GLWin.dpy, GLWin.screen);
+	GLWin.attr.border_pixel = 0;
+
+	// Create the window
+	GLWin.win = XCreateWindow(GLWin.dpy, 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.dpy, "WM_DELETE_WINDOW", True);
+	XSetWMProtocols(GLWin.dpy, GLWin.win, wmProtocols, 1);
+	XSetStandardProperties(GLWin.dpy, GLWin.win, "GPU", "GPU", None, NULL, 0, NULL);
+	XMapRaised(GLWin.dpy, GLWin.win);
+	XSync(GLWin.dpy, True);
+
+	GLWin.xEventThread = std::thread(&cXInterface::XEventThread, this);
+	// Control window size and picture scaling
+	GLInterface->SetBackBufferDimensions(GLWin.width, GLWin.height);
+
+	return (void *) GLWin.win;
+}
+
+void cXInterface::DestroyWindow(void)
+{
+	XDestroyWindow(GLWin.dpy, GLWin.win);
+	GLWin.win = 0;
+	if (GLWin.xEventThread.joinable())
+		GLWin.xEventThread.join();
+	XFreeColormap(GLWin.dpy, GLWin.attr.colormap);
+}
+
+void cXInterface::UpdateFPSDisplay(const char *text)
+{
+	XStoreName(GLWin.dpy, GLWin.win, text);
+}
+
+void cXInterface::XEventThread()
+#else
 void cX11Window::CreateXWindow(void)
 {
 	Atom wmProtocols[1];
@@ -56,6 +165,7 @@ void cX11Window::DestroyXWindow(void)
 }
 
 void cX11Window::XEventThread()
+#endif
 {
 	// Free look variables
 	static bool mouseLookEnabled = false;
@@ -65,9 +175,9 @@ void cX11Window::XEventThread()
 	{
 		XEvent event;
 		KeySym key;
-		for (int num_events = XPending(GLWin.evdpy); num_events > 0; num_events--)
+		for (int num_events = XPending(GLWin.dpy); num_events > 0; num_events--)
 		{
-			XNextEvent(GLWin.evdpy, &event);
+			XNextEvent(GLWin.dpy, &event);
 			switch(event.type) {
 				case KeyPress:
 					key = XLookupKeysym((XKeyEvent*)&event, 0);
@@ -195,17 +305,17 @@ void cX11Window::XEventThread()
 				case ConfigureNotify:
 					Window winDummy;
 					unsigned int borderDummy, depthDummy;
-					XGetGeometry(GLWin.evdpy, GLWin.win, &winDummy, &GLWin.x, &GLWin.y,
+					XGetGeometry(GLWin.dpy, 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))
+							XInternAtom(GLWin.dpy, "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,
+							XInternAtom(GLWin.dpy, "RESIZE", False))
+						XMoveResizeWindow(GLWin.dpy, GLWin.win,
 								event.xclient.data.l[1], event.xclient.data.l[2],
 								event.xclient.data.l[3], event.xclient.data.l[4]);
 					break;
@@ -216,5 +326,3 @@ void cX11Window::XEventThread()
 		Common::SleepCurrentThread(20);
 	}
 }
-
-
diff --git a/Source/Core/DolphinWX/Src/GLInterface/X11_Util.h b/Source/Core/DolphinWX/Src/GLInterface/X11_Util.h
index 9e6f6d5e3c..321aa2a9b3 100644
--- a/Source/Core/DolphinWX/Src/GLInterface/X11_Util.h
+++ b/Source/Core/DolphinWX/Src/GLInterface/X11_Util.h
@@ -19,7 +19,22 @@
 
 #include <X11/Xlib.h>
 #include <X11/keysym.h>
+#include <X11/Xutil.h>
 
+#if USE_EGL
+class cXInterface
+{
+private:
+	void XEventThread();
+public:
+	bool ServerConnect(void);
+	bool Initialize(void *config);
+	void *EGLGetDisplay(void);
+	void *CreateWindow(void);
+	void DestroyWindow(void);
+	void UpdateFPSDisplay(const char *text);
+};
+#else
 class cX11Window
 {
 private:
@@ -29,3 +44,5 @@ public:
 	void DestroyXWindow(void);
 };
 #endif
+
+#endif
diff --git a/Source/Core/DolphinWX/Src/GameListCtrl.cpp b/Source/Core/DolphinWX/Src/GameListCtrl.cpp
index bf09161555..a3c6fbe59a 100644
--- a/Source/Core/DolphinWX/Src/GameListCtrl.cpp
+++ b/Source/Core/DolphinWX/Src/GameListCtrl.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "Globals.h"
 
@@ -61,7 +48,7 @@ bool sorted = false;
 extern CFrame* main_frame;
 
 static int CompareGameListItems(const GameListItem* iso1, const GameListItem* iso2,
-                                long sortData = CGameListCtrl::COLUMN_TITLE)
+								long sortData = CGameListCtrl::COLUMN_TITLE)
 {
 	int t = 1;
 
@@ -732,7 +719,9 @@ void CGameListCtrl::OnKeyPress(wxListEvent& event)
 				continue;
 			}
 			else if (lastKey != event.GetKeyCode())
+			{
 				sLoop = 0;
+			}
 
 			lastKey = event.GetKeyCode();
 			sLoop++;
@@ -801,7 +790,9 @@ void CGameListCtrl::OnMouseMotion(wxMouseEvent& event)
 				toolTip = new wxEmuStateTip(this, StrToWxStr(temp), &toolTip);
 			}
 			else
+			{
 				toolTip = new wxEmuStateTip(this, _("Not Set"), &toolTip);
+			}
 
 			// Get item Coords
 			GetItemRect(item, Rect);
@@ -891,8 +882,11 @@ void CGameListCtrl::OnRightClick(wxMouseEvent& event)
 				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
+			}
+			else
+			{
 				popupMenu->Append(IDM_LIST_INSTALLWAD, _("Install to Wii Menu"));
+			}
 
 			PopupMenu(popupMenu);
 		}
@@ -911,14 +905,20 @@ void CGameListCtrl::OnRightClick(wxMouseEvent& event)
 const GameListItem * CGameListCtrl::GetSelectedISO()
 {
 	if (m_ISOFiles.size() == 0)
+	{
 		return NULL;
+	}
 	else if (GetSelectedItemCount() == 0)
+	{
 		return NULL;
+	}
 	else
 	{
 		long item = GetNextItem(-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
 		if (item == wxNOT_FOUND)
+		{
 			return NULL;
+		}
 		else
 		{
 			// Here is a little workaround for multiselections:
@@ -988,7 +988,7 @@ void CGameListCtrl::OnSetDefaultGCM(wxCommandEvent& event)
 	}
 	else
 	{
-		// Othwerise blank the value and save it
+		// Otherwise blank the value and save it
 		SConfig::GetInstance().m_LocalCoreStartupParameter.m_strDefaultGCM = "";
 		SConfig::GetInstance().SaveSettings();
 	}
@@ -1030,6 +1030,7 @@ void CGameListCtrl::OnProperties(wxCommandEvent& WXUNUSED (event))
 	const GameListItem *iso = GetSelectedISO();
 	if (!iso)
 		return;
+
 	CISOProperties ISOProperties(iso->GetFileName(), this);
 	if(ISOProperties.ShowModal() == wxID_OK)
 		Update();
@@ -1249,7 +1250,9 @@ void CGameListCtrl::OnCompressGCM(wxCommandEvent& WXUNUSED (event))
 
 void CGameListCtrl::OnSize(wxSizeEvent& event)
 {
-	if (lastpos == event.GetSize()) return;
+	if (lastpos == event.GetSize())
+		return;
+
 	lastpos = event.GetSize();
 	AutomaticColumnWidth();
 
@@ -1261,7 +1264,9 @@ void CGameListCtrl::AutomaticColumnWidth()
 	wxRect rc(GetClientRect());
 
 	if (GetColumnCount() == 1)
+	{
 		SetColumnWidth(0, rc.GetWidth());
+	}
 	else if (GetColumnCount() > 4)
 	{
 		int resizable = rc.GetWidth() - (
@@ -1291,7 +1296,6 @@ void CGameListCtrl::UnselectAll()
 	{
 		SetItemState(i, 0, wxLIST_STATE_SELECTED);
 	}
-
 }
 
 
diff --git a/Source/Core/DolphinWX/Src/GameListCtrl.h b/Source/Core/DolphinWX/Src/GameListCtrl.h
index f1923e97c5..fbca71bed3 100644
--- a/Source/Core/DolphinWX/Src/GameListCtrl.h
+++ b/Source/Core/DolphinWX/Src/GameListCtrl.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef __GAMELIST_CTRL_H_
 #define __GAMELIST_CTRL_H_
diff --git a/Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp b/Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp
index 76d4833c0b..9f96956abc 100644
--- a/Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp
+++ b/Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp
@@ -1,16 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "GeckoCodeDiag.h"
 #include "WxUtils.h"
@@ -217,7 +207,7 @@ void CodeConfigPanel::DownloadCodes(wxCommandEvent&)
 			case 0 :
 			{
 				std::istringstream ssline(line);
-				// stop at [ character (begining of contributer name)
+				// stop at [ character (beginning of contributor name)
 				std::getline(ssline, gcode.name, '[');
 				gcode.name = StripSpaces(gcode.name);
 				// read the code creator name
@@ -301,10 +291,14 @@ void CodeConfigPanel::DownloadCodes(wxCommandEvent&)
 			UpdateCodeList();
 		}
 		else
+		{
 			PanicAlertT("File contained no codes.");
+		}
 	}
 	else
+	{
 		PanicAlertT("Failed to download codes.");
+	}
 }
 
 }
diff --git a/Source/Core/DolphinWX/Src/GeckoCodeDiag.h b/Source/Core/DolphinWX/Src/GeckoCodeDiag.h
index 338c57c6e9..8a59e09ce2 100644
--- a/Source/Core/DolphinWX/Src/GeckoCodeDiag.h
+++ b/Source/Core/DolphinWX/Src/GeckoCodeDiag.h
@@ -1,16 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef __GECKOCODEDIAG_h__
 #define __GECKOCODEDIAG_h__
diff --git a/Source/Core/DolphinWX/Src/Globals.h b/Source/Core/DolphinWX/Src/Globals.h
index 85ac104923..8229af059a 100644
--- a/Source/Core/DolphinWX/Src/Globals.h
+++ b/Source/Core/DolphinWX/Src/Globals.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 
 // This file holds global data for DolphinWx and DebuggerWx
@@ -185,7 +172,7 @@ enum
 	IDM_LOADMAPFILE,
 	IDM_SAVEMAPFILE, IDM_SAVEMAPFILEWITHCODES,
 	IDM_CREATESIGNATUREFILE,
-    IDM_RENAME_SYMBOLS,
+	IDM_RENAME_SYMBOLS,
 	IDM_USESIGNATUREFILE,
 	IDM_PATCHHLEFUNCTIONS,
 
diff --git a/Source/Core/DolphinWX/Src/HotkeyDlg.cpp b/Source/Core/DolphinWX/Src/HotkeyDlg.cpp
index c214fac466..f841b412c6 100644
--- a/Source/Core/DolphinWX/Src/HotkeyDlg.cpp
+++ b/Source/Core/DolphinWX/Src/HotkeyDlg.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include <wx/notebook.h>
 
@@ -22,7 +9,7 @@
 
 BEGIN_EVENT_TABLE(HotkeyConfigDialog,wxDialog)
 	EVT_COMMAND_RANGE(0, NUM_HOTKEYS - 1,
-		   	wxEVT_COMMAND_BUTTON_CLICKED, HotkeyConfigDialog::OnButtonClick)
+			wxEVT_COMMAND_BUTTON_CLICKED, HotkeyConfigDialog::OnButtonClick)
 	EVT_TIMER(wxID_ANY, HotkeyConfigDialog::OnButtonTimer)
 END_EVENT_TABLE()
 
@@ -86,8 +73,8 @@ void HotkeyConfigDialog::OnKeyDown(wxKeyEvent& event)
 		else
 		{
 			SetButtonText(ClickedButton->GetId(),
-				   	InputCommon::WXKeyToString(g_Pressed),
-				   	InputCommon::WXKeymodToString(g_Modkey));
+					InputCommon::WXKeyToString(g_Pressed),
+					InputCommon::WXKeymodToString(g_Modkey));
 			SaveButtonMapping(ClickedButton->GetId(), g_Pressed, g_Modkey);
 		}
 		EndGetButtons();
@@ -112,7 +99,7 @@ void HotkeyConfigDialog::DoGetButtons(int _GetId)
 		if(m_ButtonMappingTimer->IsRunning())
 			m_ButtonMappingTimer->Stop();
 
-		 // Save the button Id
+		// Save the button Id
 		GetButtonWaitingID = _GetId;
 		GetButtonWaitingTimer = 0;
 
@@ -149,7 +136,8 @@ void HotkeyConfigDialog::OnButtonClick(wxCommandEvent& event)
 {
 	event.Skip();
 
-	if (m_ButtonMappingTimer->IsRunning()) return;
+	if (m_ButtonMappingTimer->IsRunning())
+		return;
 
 	wxTheApp->Bind(wxEVT_KEY_DOWN, &HotkeyConfigDialog::OnKeyDown, this);
 
diff --git a/Source/Core/DolphinWX/Src/HotkeyDlg.h b/Source/Core/DolphinWX/Src/HotkeyDlg.h
index 2ea91eac4d..0bf31d4739 100644
--- a/Source/Core/DolphinWX/Src/HotkeyDlg.h
+++ b/Source/Core/DolphinWX/Src/HotkeyDlg.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef __HOTKEYDIALOG_h__
 #define __HOTKEYDIALOG_h__
diff --git a/Source/Core/DolphinWX/Src/ISOFile.cpp b/Source/Core/DolphinWX/Src/ISOFile.cpp
index 797780c32e..a763fad3fc 100644
--- a/Source/Core/DolphinWX/Src/ISOFile.cpp
+++ b/Source/Core/DolphinWX/Src/ISOFile.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include <string>
 #include <vector>
@@ -37,7 +24,7 @@
 #include "ChunkFile.h"
 #include "ConfigManager.h"
 
-#define CACHE_REVISION 0x112
+static const u32 CACHE_REVISION = 0x114;
 
 #define DVD_BANNER_WIDTH 96
 #define DVD_BANNER_HEIGHT 32
@@ -48,6 +35,7 @@ GameListItem::GameListItem(const std::string& _rFileName)
 	: m_FileName(_rFileName)
 	, m_emu_state(0)
 	, m_FileSize(0)
+	, m_Revision(0)
 	, m_Valid(false)
 	, m_BlobCompressed(false)
 {
@@ -71,14 +59,15 @@ GameListItem::GameListItem(const std::string& _rFileName)
 			m_volume_names = pVolume->GetNames();
 
 			m_Country  = pVolume->GetCountry();
-			m_FileSize = File::GetSize(_rFileName);
+			m_FileSize = pVolume->GetRawSize();
 			m_VolumeSize = pVolume->GetSize();
 
 			m_UniqueID = pVolume->GetUniqueID();
 			m_BlobCompressed = DiscIO::IsCompressedBlob(_rFileName.c_str());
 			m_IsDiscTwo = pVolume->IsDiscTwo();
+			m_Revision = pVolume->GetRevision();
 
-			// check if we can get some infos from the banner file too
+			// check if we can get some info from the banner file too
 			DiscIO::IFileSystem* pFileSystem = DiscIO::CreateFileSystem(pVolume);
 
 			if (pFileSystem != NULL || m_Platform == WII_WAD)
@@ -137,16 +126,8 @@ 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
-		m_Image = wxImage(dir + "nobanner.png", wxBITMAP_TYPE_PNG);
+		m_Image = wxImage(StrToWxStr(File::GetThemeDir(SConfig::GetInstance().m_LocalCoreStartupParameter.theme_name)) + "nobanner.png", wxBITMAP_TYPE_PNG);
 	}
 }
 
@@ -183,6 +164,7 @@ void GameListItem::DoState(PointerWrap &p)
 	p.Do(m_pImage);
 	p.Do(m_Platform);
 	p.Do(m_IsDiscTwo);
+	p.Do(m_Revision);
 }
 
 std::string GameListItem::CreateCacheFilename()
@@ -211,10 +193,10 @@ std::string GameListItem::GetCompany() const
 		return m_company;
 }
 
-// (-1 = Japanese, 0 = English, etc)
+// (-1 = Japanese, 0 = English, etc)?
 std::string GameListItem::GetDescription(int _index) const
 {
-	const u32 index = _index + 1;
+	const u32 index = _index;
 
 	if (index < m_descriptions.size())
 		return m_descriptions[index];
@@ -225,10 +207,10 @@ std::string GameListItem::GetDescription(int _index) const
 	return "";
 }
 
-// (-1 = Japanese, 0 = English, etc)
+// (-1 = Japanese, 0 = English, etc)?
 std::string GameListItem::GetVolumeName(int _index) const
 {
-	u32 const index = _index + 1;
+	u32 const index = _index;
 
 	if (index < m_volume_names.size() && !m_volume_names[index].empty())
 		return m_volume_names[index];
@@ -239,10 +221,10 @@ std::string GameListItem::GetVolumeName(int _index) const
 	return "";
 }
 
-// (-1 = Japanese, 0 = English, etc)
+// (-1 = Japanese, 0 = English, etc)?
 std::string GameListItem::GetBannerName(int _index) const
 {
-	u32 const index = _index + 1;
+	u32 const index = _index;
 
 	if (index < m_names.size() && !m_names[index].empty())
 		return m_names[index];
@@ -253,7 +235,7 @@ std::string GameListItem::GetBannerName(int _index) const
 	return "";
 }
 
-// (-1 = Japanese, 0 = English, etc)
+// (-1 = Japanese, 0 = English, etc)?
 std::string GameListItem::GetName(int _index) const
 {
 	// Prefer name from banner, fallback to name from volume, fallback to filename
diff --git a/Source/Core/DolphinWX/Src/ISOFile.h b/Source/Core/DolphinWX/Src/ISOFile.h
index 354a2f7fad..9c4fe15299 100644
--- a/Source/Core/DolphinWX/Src/ISOFile.h
+++ b/Source/Core/DolphinWX/Src/ISOFile.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef __ISOFILE_H_
 #define __ISOFILE_H_
@@ -42,6 +29,7 @@ public:
 	std::string GetName(int index) const;
 	std::string GetCompany() const;
 	std::string GetDescription(int index = 0) const;
+	int GetRevision() const { return m_Revision; }
 	const std::string& GetUniqueID() const {return m_UniqueID;}
 	const std::string GetWiiFSPath() const;
 	DiscIO::IVolume::ECountry GetCountry() const {return m_Country;}
@@ -87,6 +75,7 @@ private:
 
 	DiscIO::IVolume::ECountry m_Country;
 	int m_Platform;
+	int m_Revision;
 
 #if defined(HAVE_WX) && HAVE_WX
 	wxImage m_Image;
diff --git a/Source/Core/DolphinWX/Src/ISOProperties.cpp b/Source/Core/DolphinWX/Src/ISOProperties.cpp
index f765a7a8e0..3b2a79748d 100644
--- a/Source/Core/DolphinWX/Src/ISOProperties.cpp
+++ b/Source/Core/DolphinWX/Src/ISOProperties.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifdef __APPLE__
 #import <Cocoa/Cocoa.h>
@@ -98,7 +85,9 @@ CISOProperties::CISOProperties(const std::string fileName, wxWindow* parent, wxW
 				}
 			}
 			else
+			{
 				break;
+			}
 		}
 	}
 	else
@@ -131,9 +120,13 @@ CISOProperties::CISOProperties(const std::string fileName, wxWindow* parent, wxW
 			_iniFilename = tmp;
 		}
 	}
+
 	GameIniFile = File::GetUserPath(D_GAMECONFIG_IDX) + _iniFilename + ".ini";
+
 	if (GameIni.Load(GameIniFile.c_str()))
+	{
 		LoadGameConfig();
+	}
 	else
 	{
 		// Will fail out if GameConfig folder doesn't exist
@@ -148,6 +141,7 @@ CISOProperties::CISOProperties(const std::string fileName, wxWindow* parent, wxW
 				<< "[ActionReplay] Add action replay cheats here.\n";
 			f.close();
 		}
+
 		if (GameIni.Load(GameIniFile.c_str()))
 			LoadGameConfig();
 		else
@@ -201,6 +195,7 @@ CISOProperties::CISOProperties(const std::string fileName, wxWindow* parent, wxW
 	}
 	wxString temp = _T("0x") + StrToWxStr(OpenISO->GetMakerID());
 	m_MakerID->SetValue(temp);
+	m_Revision->SetValue(wxString::Format(wxT("%u"), OpenISO->GetRevision()));
 	m_Date->SetValue(StrToWxStr(OpenISO->GetApploaderDate()));
 	m_FST->SetValue(wxString::Format(wxT("%u"), OpenISO->GetFSTSize()));
 
@@ -226,7 +221,9 @@ CISOProperties::CISOProperties(const std::string fileName, wxWindow* parent, wxW
 			}
 		}
 		else if (!GCFiles.empty())
+		{
 			CreateDirectoryTree(RootId, GCFiles, 1, GCFiles.at(0)->m_FileSize);
+		}
 
 		m_Treectrl->Expand(RootId);
 	}
@@ -255,7 +252,11 @@ size_t CISOProperties::CreateDirectoryTree(wxTreeItemId& parent,
 		const DiscIO::SFileInfo *rFileInfo = fileInfos[CurrentIndex];
 		char *name = (char*)rFileInfo->m_FullPath;
 
-		if (rFileInfo->IsDirectory()) name[strlen(name) - 1] = '\0';
+		if (rFileInfo->IsDirectory())
+		{
+			name[strlen(name) - 1] = '\0';
+		}
+
 		char *itemName = strrchr(name, DIR_SEP_CHR);
 
 		if(!itemName)
@@ -314,10 +315,10 @@ void CISOProperties::CreateGUIControls(bool IsWad)
 	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)"));
-	SyncGPU = new wxCheckBox(m_GameConfig, ID_SYNCGPU, _("Synchronise GPU thread"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator);
-	SyncGPU->SetToolTip(_("Synchonises the GPU and CPU threads to help prevent random freezes in Dual Core mode. (ON = Compatible, OFF = Fast)"));
+	VBeam = new wxCheckBox(m_GameConfig, ID_VBEAM, _("VBeam Speed Hack"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator);
+	VBeam->SetToolTip(_("Doubles the emulated GPU clock rate. May speed up some games (ON = Fast, OFF = Compatible)"));
+	SyncGPU = new wxCheckBox(m_GameConfig, ID_SYNCGPU, _("Synchronize GPU thread"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator);
+	SyncGPU->SetToolTip(_("Synchronizes the GPU and CPU threads to help prevent random freezes in Dual Core mode. (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);
 	FastDiscSpeed->SetToolTip(_("Enable fast disc access.  Needed for a few games. (ON = Fast, OFF = Compatible)"));
 	BlockMerging = new wxCheckBox(m_GameConfig, ID_MERGEBLOCKS, _("Enable Block Merging"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator);
@@ -459,6 +460,10 @@ void CISOProperties::CreateGUIControls(bool IsWad)
 		new wxStaticText(m_Information, wxID_ANY, _("Maker ID:"));
 	m_MakerID = new wxTextCtrl(m_Information, ID_MAKERID, wxEmptyString,
 			wxDefaultPosition, wxDefaultSize, wxTE_READONLY);
+	wxStaticText * const m_RevisionText =
+		new wxStaticText(m_Information, wxID_ANY, _("Revision:"));
+	m_Revision = new wxTextCtrl(m_Information, ID_REVISION, wxEmptyString,
+			 wxDefaultPosition, wxDefaultSize, wxTE_READONLY);
 	wxStaticText * const m_DateText =
 		new wxStaticText(m_Information, wxID_ANY, _("Date:"));
 	m_Date = new wxTextCtrl(m_Information, ID_DATE, wxEmptyString,
@@ -496,10 +501,12 @@ void CISOProperties::CreateGUIControls(bool IsWad)
 	sISODetails->Add(m_Country, wxGBPosition(2, 1), wxGBSpan(1, 1), wxEXPAND|wxALL, 5);
 	sISODetails->Add(m_MakerIDText, wxGBPosition(3, 0), wxGBSpan(1, 1), wxALIGN_CENTER_VERTICAL|wxALL, 5);
 	sISODetails->Add(m_MakerID, wxGBPosition(3, 1), wxGBSpan(1, 1), wxEXPAND|wxALL, 5);
-	sISODetails->Add(m_DateText, wxGBPosition(4, 0), wxGBSpan(1, 1), wxALIGN_CENTER_VERTICAL|wxALL, 5);
-	sISODetails->Add(m_Date, wxGBPosition(4, 1), wxGBSpan(1, 1), wxEXPAND|wxALL, 5);
-	sISODetails->Add(m_FSTText, wxGBPosition(5, 0), wxGBSpan(1, 1), wxALIGN_CENTER_VERTICAL|wxALL, 5);
-	sISODetails->Add(m_FST, wxGBPosition(5, 1), wxGBSpan(1, 1), wxEXPAND|wxALL, 5);
+	sISODetails->Add(m_RevisionText, wxGBPosition(4, 0), wxGBSpan(1, 1), wxALIGN_CENTER_VERTICAL|wxALL, 5);
+	sISODetails->Add(m_Revision, wxGBPosition(4, 1), wxGBSpan(1, 1), wxEXPAND|wxALL, 5);
+	sISODetails->Add(m_DateText, wxGBPosition(5, 0), wxGBSpan(1, 1), wxALIGN_CENTER_VERTICAL|wxALL, 5);
+	sISODetails->Add(m_Date, wxGBPosition(5, 1), wxGBSpan(1, 1), wxEXPAND|wxALL, 5);
+	sISODetails->Add(m_FSTText, wxGBPosition(6, 0), wxGBSpan(1, 1), wxALIGN_CENTER_VERTICAL|wxALL, 5);
+	sISODetails->Add(m_FST, wxGBPosition(6, 1), wxGBSpan(1, 1), wxEXPAND|wxALL, 5);
 	sISODetails->AddGrowableCol(1);
 	wxStaticBoxSizer * const sbISODetails =
 		new wxStaticBoxSizer(wxVERTICAL, m_Information, _("ISO Details"));
@@ -664,7 +671,9 @@ void CISOProperties::OnExtractFile(wxCommandEvent& WXUNUSED (event))
 		WiiDisc.at(partitionNum).FileSystem->ExportFile(WxStrToStr(File).c_str(), WxStrToStr(Path).c_str());
 	}
 	else
+	{
 		pFileSystem->ExportFile(WxStrToStr(File).c_str(), WxStrToStr(Path).c_str());
+	}
 }
 
 void CISOProperties::ExportDir(const char* _rFullPath, const char* _rExportFolder, const int partitionNum)
@@ -679,7 +688,9 @@ void CISOProperties::ExportDir(const char* _rFullPath, const char* _rExportFolde
 		FS = WiiDisc.at(partitionNum).FileSystem;
 	}
 	else
+	{
 		FS = pFileSystem;
+	}
 
 	FS->GetFileList(fst);
 
@@ -698,13 +709,13 @@ void CISOProperties::ExportDir(const char* _rFullPath, const char* _rExportFolde
 		{
 			if (!strcmp(fst.at(index[0])->m_FullPath, _rFullPath))
 			{
-				DEBUG_LOG(DISCIO, "Found the Dir at %u", index[0]);
+				DEBUG_LOG(DISCIO, "Found the directory at %u", index[0]);
 				index[1] = (u32)fst.at(index[0])->m_FileSize;
 				break;
 			}
 		}
 
-		DEBUG_LOG(DISCIO,"Dir found from %u to %u\nextracting to:\n%s",index[0],index[1],_rExportFolder);
+		DEBUG_LOG(DISCIO,"Directory found from %u to %u\nextracting to:\n%s",index[0],index[1],_rExportFolder);
 	}
 
 	wxString dialogTitle = index[0] ? _("Extracting Directory") : _("Extracting All Files");
@@ -744,7 +755,7 @@ void CISOProperties::ExportDir(const char* _rFullPath, const char* _rExportFolde
 				if (!File::IsDirectory(exportName))
 					ERROR_LOG(DISCIO, "%s already exists and is not a directory", exportName);
 
-				DEBUG_LOG(DISCIO, "folder %s already exists", exportName);
+				DEBUG_LOG(DISCIO, "Folder %s already exists", exportName);
 			}
 		}
 		else
@@ -799,7 +810,9 @@ void CISOProperties::OnExtractDir(wxCommandEvent& event)
 		ExportDir(WxStrToStr(Directory).c_str(), WxStrToStr(Path).c_str(), partitionNum);
 	}
 	else
+	{
 		ExportDir(WxStrToStr(Directory).c_str(), WxStrToStr(Path).c_str());
+	}
 }
 
 void CISOProperties::OnExtractDataFromHeader(wxCommandEvent& event)
@@ -1334,7 +1347,7 @@ void CISOProperties::ChangeBannerDetails(int lang)
 	wxString const comment = StrToWxStr(OpenGameListItem->GetDescription(lang));
 	wxString const maker = StrToWxStr(OpenGameListItem->GetCompany());
 
-	// Updates the informations shown in the window
+	// Updates the information shown in the window
 	m_ShortName->SetValue(shortName);
 	m_Comment->SetValue(comment);
 	m_Maker->SetValue(maker);//dev too
diff --git a/Source/Core/DolphinWX/Src/ISOProperties.h b/Source/Core/DolphinWX/Src/ISOProperties.h
index 41e7d250a0..019992a9f3 100644
--- a/Source/Core/DolphinWX/Src/ISOProperties.h
+++ b/Source/Core/DolphinWX/Src/ISOProperties.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef __ISOPROPERTIES_h__
 #define __ISOPROPERTIES_h__
@@ -98,6 +85,7 @@ private:
 	wxTextCtrl *m_GameID;
 	wxTextCtrl *m_Country;
 	wxTextCtrl *m_MakerID;
+	wxTextCtrl *m_Revision;
 	wxTextCtrl *m_Date;
 	wxTextCtrl *m_FST;
 	wxArrayString arrayStringFor_Lang;
@@ -156,6 +144,7 @@ private:
 		ID_GAMEID,
 		ID_COUNTRY,
 		ID_MAKERID,
+		ID_REVISION,
 		ID_DATE,
 		ID_FST,
 		ID_VERSION,
diff --git a/Source/Core/DolphinWX/Src/InputConfigDiag.cpp b/Source/Core/DolphinWX/Src/InputConfigDiag.cpp
index 14772d8676..cd17c4c682 100644
--- a/Source/Core/DolphinWX/Src/InputConfigDiag.cpp
+++ b/Source/Core/DolphinWX/Src/InputConfigDiag.cpp
@@ -1,19 +1,6 @@
-// Copyright (C) 2010 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "InputConfigDiag.h"
 #include "UDPConfigDiag.h"
@@ -34,7 +21,7 @@ void GamepadPage::ConfigExtension(wxCommandEvent& event)
 	if (ex->switch_extension)
 	{
 		wxDialog dlg(this, -1,
-			StrToWxStr(ex->attachments[ex->switch_extension]->GetName()),
+			wxGetTranslation(StrToWxStr(ex->attachments[ex->switch_extension]->GetName())),
 			wxDefaultPosition, wxDefaultSize);
 
 		wxBoxSizer* const main_szr = new wxBoxSizer(wxVERTICAL);
@@ -64,7 +51,7 @@ PadSettingExtension::PadSettingExtension(wxWindow* const parent, ControllerEmu::
 		e = extension->attachments.end();
 
 	for (; i!=e; ++i)
-		((wxChoice*)wxcontrol)->Append(StrToWxStr((*i)->GetName()));
+		((wxChoice*)wxcontrol)->Append(wxGetTranslation(StrToWxStr((*i)->GetName())));
 
 	UpdateGUI();
 }
@@ -80,7 +67,7 @@ void PadSettingExtension::UpdateValue()
 }
 
 PadSettingCheckBox::PadSettingCheckBox(wxWindow* const parent, ControlState& _value, const char* const label)
-	: PadSetting(new wxCheckBox(parent, -1, StrToWxStr(label), wxDefaultPosition))
+	: PadSetting(new wxCheckBox(parent, -1, wxGetTranslation(StrToWxStr(label)), wxDefaultPosition))
 	, value(_value)
 {
 	UpdateGUI();
@@ -600,7 +587,9 @@ void GamepadPage::SaveProfile(wxCommandEvent&)
 		m_config_dialog->UpdateProfileComboBox();
 	}
 	else
+	{
 		PanicAlertT("You must enter a valid profile name.");
+	}
 }
 
 void GamepadPage::DeleteProfile(wxCommandEvent&)
@@ -677,7 +666,7 @@ ControlGroupBox::ControlGroupBox(ControllerEmu::ControlGroup* const group, wxWin
 	for (; ci != ce; ++ci)
 	{
 
-		wxStaticText* const label = new wxStaticText(parent, -1, StrToWxStr((*ci)->name));
+		wxStaticText* const label = new wxStaticText(parent, -1, wxGetTranslation(StrToWxStr((*ci)->name)));
 		
 		ControlButton* const control_button = new ControlButton(parent, (*ci)->control_ref, 80);
 		control_button->SetFont(m_SmallFont);
@@ -731,7 +720,7 @@ ControlGroupBox::ControlGroupBox(ControllerEmu::ControlGroup* const group, wxWin
 				PadSettingSpin* setting = new PadSettingSpin(parent, *i);
 				setting->wxcontrol->Bind(wxEVT_COMMAND_SPINCTRL_UPDATED, &GamepadPage::AdjustSetting, eventsink);
 				options.push_back(setting);
-				szr->Add(new wxStaticText(parent, -1, StrToWxStr((*i)->name)));
+				szr->Add(new wxStaticText(parent, -1, wxGetTranslation(StrToWxStr((*i)->name))));
 				szr->Add(setting->wxcontrol, 0, wxLEFT, 0);
 			}
 
@@ -757,7 +746,7 @@ ControlGroupBox::ControlGroupBox(ControllerEmu::ControlGroup* const group, wxWin
 			options.push_back(threshold_cbox);
 
 			wxBoxSizer* const szr = new wxBoxSizer(wxHORIZONTAL);
-			szr->Add(new wxStaticText(parent, -1, StrToWxStr(group->settings[0]->name)),
+			szr->Add(new wxStaticText(parent, -1, wxGetTranslation(StrToWxStr(group->settings[0]->name))),
 					0, wxCENTER|wxRIGHT, 3);
 			szr->Add(threshold_cbox->wxcontrol, 0, wxRIGHT, 3);
 
@@ -792,7 +781,7 @@ ControlGroupBox::ControlGroupBox(ControllerEmu::ControlGroup* const group, wxWin
 				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, StrToWxStr((*i)->name)), 0, wxCENTER|wxRIGHT, 3);
+				szr->Add(new wxStaticText(parent, -1, wxGetTranslation(StrToWxStr((*i)->name))), 0, wxCENTER|wxRIGHT, 3);
 				szr->Add(setting->wxcontrol, 0, wxRIGHT, 3);
 				Add(szr, 0, wxALL|wxCENTER, 3);
 			}
@@ -856,7 +845,7 @@ ControlGroupsSizer::ControlGroupsSizer(ControllerEmu* const controller, wxWindow
 	{
 		ControlGroupBox* control_group_box = new ControlGroupBox(controller->groups[i], parent, eventsink);
 		wxStaticBoxSizer *control_group =
-			new wxStaticBoxSizer(wxVERTICAL, parent, StrToWxStr(controller->groups[i]->name));
+			new wxStaticBoxSizer(wxVERTICAL, parent, wxGetTranslation(StrToWxStr(controller->groups[i]->name)));
 		control_group->Add(control_group_box);
 
 		const size_t grp_size = controller->groups[i]->controls.size() + controller->groups[i]->settings.size();
@@ -872,7 +861,9 @@ ControlGroupsSizer::ControlGroupsSizer(ControllerEmu* const controller, wxWindow
 			col_size = grp_size;
 		}
 		else
+		{
 			stacked_groups->Add(control_group, 0, wxEXPAND);
+		}
 
 		if (groups)
 			groups->push_back(control_group_box);
@@ -952,7 +943,7 @@ GamepadPage::GamepadPage(wxWindow* parent, InputPlugin& plugin, const unsigned i
 
 
 InputConfigDialog::InputConfigDialog(wxWindow* const parent, InputPlugin& plugin, const std::string& name, const int tab_num)
-	: wxDialog(parent, wxID_ANY, StrToWxStr(name), wxPoint(128,-1), wxDefaultSize)
+	: wxDialog(parent, wxID_ANY, wxGetTranslation(StrToWxStr(name)), wxPoint(128,-1), wxDefaultSize)
 	, m_plugin(plugin)
 {
 	m_pad_notebook = new wxNotebook(this, -1, wxDefaultPosition, wxDefaultSize, wxNB_DEFAULT);
@@ -960,7 +951,7 @@ InputConfigDialog::InputConfigDialog(wxWindow* const parent, InputPlugin& plugin
 	{
 		GamepadPage* gp = new GamepadPage(m_pad_notebook, m_plugin, i, this);
 		m_padpages.push_back(gp);
-		m_pad_notebook->AddPage(gp, wxString::Format(wxT("%s %u"), StrToWxStr(m_plugin.gui_name), 1+i));
+		m_pad_notebook->AddPage(gp, wxString::Format(wxT("%s %u"), wxGetTranslation(StrToWxStr(m_plugin.gui_name)), 1+i));
 	}
 
 	m_pad_notebook->SetSelection(tab_num);
diff --git a/Source/Core/DolphinWX/Src/InputConfigDiag.h b/Source/Core/DolphinWX/Src/InputConfigDiag.h
index 1be97bff14..882437452a 100644
--- a/Source/Core/DolphinWX/Src/InputConfigDiag.h
+++ b/Source/Core/DolphinWX/Src/InputConfigDiag.h
@@ -1,19 +1,6 @@
-// Copyright (C) 2010 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _CONFIGBOX_H_
 #define _CONFIGBOX_H_
diff --git a/Source/Core/DolphinWX/Src/InputConfigDiagBitmaps.cpp b/Source/Core/DolphinWX/Src/InputConfigDiagBitmaps.cpp
index efb7db59af..9561295cb3 100644
--- a/Source/Core/DolphinWX/Src/InputConfigDiagBitmaps.cpp
+++ b/Source/Core/DolphinWX/Src/InputConfigDiagBitmaps.cpp
@@ -1,19 +1,6 @@
-// Copyright (C) 2010 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "InputConfigDiag.h"
 #include "WxUtils.h"
@@ -111,7 +98,9 @@ void InputConfigDialog::UpdateBitmaps(wxTimerEvent& WXUNUSED(event))
 						dc.DrawCircle( 32, 32, 32);
 					}
 					else
+					{
 						dc.DrawRectangle( 16, 16, 32, 32 );
+					}
 
 					if ( GROUP_TYPE_CURSOR != (*g)->control_group->type )
 					{
@@ -217,7 +206,9 @@ void InputConfigDialog::UpdateBitmaps(wxTimerEvent& WXUNUSED(event))
 					for (unsigned int n = 0; n<button_count; ++n)
 					{
 						if ( buttons & bitmasks[n] )
+						{
 							dc.SetBrush( *wxRED_BRUSH );
+						}
 						else
 						{
 							unsigned char amt = 255 - (*g)->control_group->controls[n]->control_ref->State() * 128;
diff --git a/Source/Core/DolphinWX/Src/LogConfigWindow.cpp b/Source/Core/DolphinWX/Src/LogConfigWindow.cpp
index a4a5fa647a..1518acdf24 100644
--- a/Source/Core/DolphinWX/Src/LogConfigWindow.cpp
+++ b/Source/Core/DolphinWX/Src/LogConfigWindow.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "LogConfigWindow.h"
 #include "LogManager.h"
@@ -111,12 +98,20 @@ void LogConfigWindow::LoadSettings()
 	IniFile ini;
 	ini.Load(File::GetUserPath(F_LOGGERCONFIG_IDX));
 
+	// Retrieve the verbosity value from the config ini file.
 	int verbosity;
 	ini.Get("Options", "Verbosity", &verbosity, 0);
-	if (verbosity < 1) verbosity = 1;
-	if (verbosity > MAX_LOGLEVEL) verbosity = MAX_LOGLEVEL;
+	
+	// Ensure the verbosity level is valid.
+	if (verbosity < 1)
+		verbosity = 1;
+	if (verbosity > MAX_LOGLEVEL)
+		verbosity = MAX_LOGLEVEL;
+	
+	// Actually set the logging verbosity.
 	m_verbosity->SetSelection(verbosity - 1);
 
+	// Get the logger output settings from the config ini file.
 	ini.Get("Options", "WriteToFile", &m_writeFile, false);
 	m_writeFileCB->SetValue(m_writeFile);
 	ini.Get("Options", "WriteToConsole", &m_writeConsole, true);
@@ -134,11 +129,17 @@ void LogConfigWindow::LoadSettings()
 	{
 		m_writeDebugger = false;
 	}
+
+	// Run through all of the log types and check each checkbox for each logging type
+	// depending on its set value within the config ini.
 	for (int i = 0; i < LogTypes::NUMBER_OF_LOGS; ++i)
 	{
 		bool log_enabled;
 		ini.Get("Logs", m_LogManager->GetShortName((LogTypes::LOG_TYPE)i), &log_enabled, true);
-		if (log_enabled) enableAll = false;
+		
+		if (log_enabled)
+			enableAll = false;
+		
 		m_checks->Check(i, log_enabled);
 	}
 }
@@ -148,7 +149,10 @@ void LogConfigWindow::SaveSettings()
 	IniFile ini;
 	ini.Load(File::GetUserPath(F_LOGGERCONFIG_IDX));
 
+	// Save the verbosity level.
 	ini.Set("Options", "Verbosity", m_verbosity->GetSelection() + 1);
+
+	// Save the enabled/disabled states of the logger outputs to the config ini.
 	ini.Set("Options", "WriteToFile", m_writeFile);
 	ini.Set("Options", "WriteToConsole", m_writeConsole);
 	ini.Set("Options", "WriteToWindow", m_writeWindow);
@@ -156,16 +160,28 @@ void LogConfigWindow::SaveSettings()
 	if (IsDebuggerPresent())
 		ini.Set("Options", "WriteToDebugger", m_writeDebugger);
 #endif
+
+	// Save all enabled/disabled states of the log types to the config ini.
 	for (int i = 0; i < LogTypes::NUMBER_OF_LOGS; ++i)
+	{
 		ini.Set("Logs", m_LogManager->GetShortName((LogTypes::LOG_TYPE)i), m_checks->IsChecked(i));
+	}
+
 	ini.Save(File::GetUserPath(F_LOGGERCONFIG_IDX));
 }
 
+// If the verbosity changes while logging
 void LogConfigWindow::OnVerbosityChange(wxCommandEvent& event)
 {
+	// Get the new verbosity
 	int v = m_verbosity->GetSelection() + 1;
+	
+	// Set all log types to that verbosity level
 	for (int i = 0; i < LogTypes::NUMBER_OF_LOGS; i++)
+	{
 		m_LogManager->SetLogLevel((LogTypes::LOG_TYPE)i, (LogTypes::LOG_LEVELS)v);
+	}
+
 	event.Skip();
 }
 
diff --git a/Source/Core/DolphinWX/Src/LogConfigWindow.h b/Source/Core/DolphinWX/Src/LogConfigWindow.h
index 5a08486409..c246bb169c 100644
--- a/Source/Core/DolphinWX/Src/LogConfigWindow.h
+++ b/Source/Core/DolphinWX/Src/LogConfigWindow.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _LOG_CONFIG_DIAG_H_
 #define _LOG_CONFIG_DIAG_H_
diff --git a/Source/Core/DolphinWX/Src/LogWindow.cpp b/Source/Core/DolphinWX/Src/LogWindow.cpp
index 27e5856410..421ca9ae6b 100644
--- a/Source/Core/DolphinWX/Src/LogWindow.cpp
+++ b/Source/Core/DolphinWX/Src/LogWindow.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "LogWindow.h"
 #include "ConsoleListener.h"
@@ -38,7 +25,7 @@ BEGIN_EVENT_TABLE(CLogWindow, wxPanel)
 END_EVENT_TABLE()
 
 CLogWindow::CLogWindow(CFrame *parent, wxWindowID id, const wxPoint& pos,
-	   	const wxSize& size, long style, const wxString& name)
+		const wxSize& size, long style, const wxString& name)
 	: wxPanel(parent, id, pos, size, style, name)
 	, x(0), y(0), winpos(0)
 	, Parent(parent), m_ignoreLogTimer(false), m_LogAccess(true)
@@ -64,9 +51,14 @@ void CLogWindow::CreateGUIControls()
 	// Set up log listeners
 	int verbosity;
 	ini.Get("Options", "Verbosity", &verbosity, 0);
-	if (verbosity < 1) verbosity = 1;
-	if (verbosity > MAX_LOGLEVEL) verbosity = MAX_LOGLEVEL;
+	
+	// Ensure the verbosity level is valid
+	if (verbosity < 1)
+		verbosity = 1;
+	if (verbosity > MAX_LOGLEVEL)
+		verbosity = MAX_LOGLEVEL;
 
+	// Get the logger output settings from the config ini file.
 	ini.Get("Options", "WriteToFile", &m_writeFile, false);
 	ini.Get("Options", "WriteToConsole", &m_writeConsole, true);
 	ini.Get("Options", "WriteToWindow", &m_writeWindow, true);
@@ -80,6 +72,7 @@ void CLogWindow::CreateGUIControls()
 	{
 		m_writeDebugger = false;
 	}
+
 	for (int i = 0; i < LogTypes::NUMBER_OF_LOGS; ++i)
 	{
 		bool enable;
diff --git a/Source/Core/DolphinWX/Src/LogWindow.h b/Source/Core/DolphinWX/Src/LogWindow.h
index 54a59c4d91..93e965dbc5 100644
--- a/Source/Core/DolphinWX/Src/LogWindow.h
+++ b/Source/Core/DolphinWX/Src/LogWindow.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef LOGWINDOW_H_
 #define LOGWINDOW_H_
diff --git a/Source/Core/DolphinWX/Src/Main.cpp b/Source/Core/DolphinWX/Src/Main.cpp
index dace5a1928..8c31d99005 100644
--- a/Source/Core/DolphinWX/Src/Main.cpp
+++ b/Source/Core/DolphinWX/Src/Main.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include <vector>
 #include <string>
@@ -218,7 +205,7 @@ bool DolphinApp::OnInit()
 	RegisterMsgAlertHandler(&wxMsgAlert);
 	RegisterStringTranslator(&wxStringTranslator);
 
-	// "ExtendedTrace" looks freakin dangerous!!!
+	// "ExtendedTrace" looks freakin' dangerous!!!
 #ifdef _WIN32
 	EXTENDEDTRACEINITIALIZE(".");
 	SetUnhandledExceptionFilter(&MyUnhandledExceptionFilter);
@@ -239,7 +226,7 @@ bool DolphinApp::OnInit()
 #ifdef __APPLE__
 	if (floor(NSAppKitVersionNumber) < NSAppKitVersionNumber10_7)
 	{
-		PanicAlertT("Hi,\n\nDolphin requires OS X 10.7 or greater.\n"
+		PanicAlertT("Hi,\n\nDolphin requires Mac OS X 10.7 or greater.\n"
 				"Unfortunately you're running an old version of OS X.\n"
 				"The last Dolphin version to support OS X 10.6 is Dolphin 3.5\n"
 				"Please upgrade to 10.7 or greater to use the newest Dolphin version.\n\n"
@@ -251,7 +238,7 @@ bool DolphinApp::OnInit()
 #ifdef _WIN32
 	if (!wxSetWorkingDirectory(StrToWxStr(File::GetExeDirectory())))
 	{
-		INFO_LOG(CONSOLE, "set working directory failed");
+		INFO_LOG(CONSOLE, "Set working directory failed");
 	}
 #else
 	//create all necessary directories in user directory
@@ -313,7 +300,7 @@ bool DolphinApp::OnInit()
 		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);
+				   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);
 	}
@@ -376,7 +363,9 @@ void DolphinApp::AfterInit(wxTimerEvent& WXUNUSED(event))
 				main_frame->BootGame(WxStrToStr(FileToLoad));
 			}
 			else
+			{
 				main_frame->BootGame(std::string(""));
+			}
 		}
 	}
 
@@ -516,7 +505,7 @@ void* Host_GetInstance()
 
 void* Host_GetRenderHandle()
 {
-    return main_frame->GetRenderHandle();
+	return main_frame->GetRenderHandle();
 }
 
 // OK, this thread boundary is DANGEROUS on linux
@@ -627,7 +616,7 @@ void Host_SetStartupDebuggingParameters()
 {
 	SCoreStartupParameter& StartUp = SConfig::GetInstance().m_LocalCoreStartupParameter;
 	if (main_frame->g_pCodeWindow)
-	{    
+	{
 		StartUp.bBootToPause = main_frame->g_pCodeWindow->BootToPause();
 		StartUp.bAutomaticStart = main_frame->g_pCodeWindow->AutomaticStart();
 		StartUp.bJITNoBlockCache = main_frame->g_pCodeWindow->JITNoBlockCache();
diff --git a/Source/Core/DolphinWX/Src/Main.h b/Source/Core/DolphinWX/Src/Main.h
index d043a6c24e..d3e1493e58 100644
--- a/Source/Core/DolphinWX/Src/Main.h
+++ b/Source/Core/DolphinWX/Src/Main.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef __MAIN_H_
 #define __MAIN_H_
diff --git a/Source/Core/DolphinWX/Src/MainAndroid.cpp b/Source/Core/DolphinWX/Src/MainAndroid.cpp
index ca2119921d..4d623d5d0b 100644
--- a/Source/Core/DolphinWX/Src/MainAndroid.cpp
+++ b/Source/Core/DolphinWX/Src/MainAndroid.cpp
@@ -33,14 +33,22 @@
 #include "ConfigManager.h"
 #include "LogManager.h"
 #include "BootManager.h"
+#include "OnScreenDisplay.h"
+
+// Banner loading
+#include "Filesystem.h"
+#include "BannerLoader.h"
+#include "VolumeCreator.h"
+
+#include "Android/ButtonManager.h"
 
 #include <jni.h>
 #include <android/log.h>
+#include <android/native_window_jni.h>
+ANativeWindow* surf;
+int g_width, g_height;
 #define LOGI(...) ((void)__android_log_print(ANDROID_LOG_INFO, "Dolphinemu", __VA_ARGS__))
 
-bool rendererHasFocus = true;
-bool running = true;
-
 void Host_NotifyMapLoaded() {}
 void Host_RefreshDSPDebuggerWindow() {}
 
@@ -53,7 +61,7 @@ void Host_Message(int Id)
 
 void* Host_GetRenderHandle()
 {
-	return NULL;
+	return surf;
 }
 
 void* Host_GetInstance() { return NULL; }
@@ -79,8 +87,8 @@ 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;
+	width = g_width; 	
+	height = g_height; 
 }
 
 void Host_RequestRenderWindowSize(int width, int height) {}
@@ -118,25 +126,177 @@ void Host_SysMessage(const char *fmt, ...)
 
 void Host_SetWiiMoteConnectionState(int _State) {}
 
+void OSDCallbacks(u32 UserData)
+{
+	switch(UserData)
+	{
+		case 0: // Init
+			ButtonManager::Init();
+		break;
+		case 1: // Draw
+			ButtonManager::DrawButtons();
+		break;
+		case 2: // Shutdown
+			ButtonManager::Shutdown();
+		break;
+		default:
+			WARN_LOG(COMMON, "Error, wrong OSD type");
+		break;
+	}
+}
+
+#define DVD_BANNER_WIDTH 96
+#define DVD_BANNER_HEIGHT 32
+std::vector<std::string> m_volume_names;
+std::vector<std::string> m_names;
+
+bool LoadBanner(std::string filename, u32 *Banner)
+{
+	DiscIO::IVolume* pVolume = DiscIO::CreateVolumeFromFilename(filename);
+
+	if (pVolume != NULL)
+	{
+		bool bIsWad = false;
+		if (DiscIO::IsVolumeWadFile(pVolume))
+			bIsWad = true;
+
+		m_volume_names = pVolume->GetNames();
+
+		// check if we can get some info from the banner file too
+		DiscIO::IFileSystem* pFileSystem = DiscIO::CreateFileSystem(pVolume);
+
+		if (pFileSystem != NULL || bIsWad)
+		{
+			DiscIO::IBannerLoader* pBannerLoader = DiscIO::CreateBannerLoader(*pFileSystem, pVolume);
+
+			if (pBannerLoader != NULL)
+				if (pBannerLoader->IsValid())
+				{
+					m_names = pBannerLoader->GetNames();
+					if (pBannerLoader->GetBanner(Banner))
+						return true;
+				}
+		}
+	}
+
+	return false;
+}
+std::string GetName(std::string filename)
+{
+	if (!m_names.empty())
+		return m_names[0];
+
+	if (!m_volume_names.empty())
+		return m_volume_names[0];
+	// No usable name, return filename (better than nothing)
+	std::string name;
+	SplitPath(filename, NULL, &name, NULL);
+
+	return name;
+}
+
+
 #ifdef __cplusplus
 extern "C"
 {
 #endif
-JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_dolphinemuactivity_main(JNIEnv *env, jobject obj)
+JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeGLSurfaceView_UnPauseEmulation(JNIEnv *env, jobject obj)
 {
+	PowerPC::Start();
+}
+JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeGLSurfaceView_PauseEmulation(JNIEnv *env, jobject obj) 
+{
+	PowerPC::Pause();
+}
+
+JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeGLSurfaceView_StopEmulation(JNIEnv *env, jobject obj) 
+{
+	PowerPC::Stop();
+}
+JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_DolphinEmulator_onTouchEvent(JNIEnv *env, jobject obj, jint Action, jfloat X, jfloat Y)
+{
+	ButtonManager::TouchEvent(Action, X, Y);
+}
+
+
+JNIEXPORT jintArray JNICALL Java_org_dolphinemu_dolphinemu_GameListItem_GetBanner(JNIEnv *env, jobject obj, jstring jFile)
+{
+	const char *File = env->GetStringUTFChars(jFile, NULL);
+	jintArray Banner = env->NewIntArray(DVD_BANNER_WIDTH * DVD_BANNER_HEIGHT);
+	u32 uBanner[DVD_BANNER_WIDTH * DVD_BANNER_HEIGHT];
+	if (LoadBanner(File, uBanner))
+	{
+		env->SetIntArrayRegion(Banner, 0, DVD_BANNER_WIDTH * DVD_BANNER_HEIGHT, (jint*)uBanner);
+	}
+	env->ReleaseStringUTFChars(jFile, File);
+	return Banner;
+}
+JNIEXPORT jstring JNICALL Java_org_dolphinemu_dolphinemu_GameListItem_GetTitle(JNIEnv *env, jobject obj, jstring jFile)
+{
+	const char *File = env->GetStringUTFChars(jFile, NULL);
+	std::string Name = GetName(File);
+	m_names.clear();
+	m_volume_names.clear();
+
+	env->ReleaseStringUTFChars(jFile, File);
+	return env->NewStringUTF(Name.c_str());
+}
+JNIEXPORT jstring JNICALL Java_org_dolphinemu_dolphinemu_GameListView_GetConfig(JNIEnv *env, jobject obj, jstring jKey, jstring jValue, jstring jDefault)
+{
+	IniFile ini;
+	ini.Load(File::GetUserPath(F_DOLPHINCONFIG_IDX));
+	const char *Key = env->GetStringUTFChars(jKey, NULL);
+	const char *Value = env->GetStringUTFChars(jValue, NULL);
+	const char *Default = env->GetStringUTFChars(jDefault, NULL);
+	
+	std::string value;
+	
+	ini.Get(Key, Value, &value, Default);
+
+	env->ReleaseStringUTFChars(jKey, Key);
+	env->ReleaseStringUTFChars(jValue, Value);
+	env->ReleaseStringUTFChars(jDefault, Default);
+
+	return env->NewStringUTF(value.c_str());
+}
+JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_GameListView_SetConfig(JNIEnv *env, jobject obj, jstring jKey, jstring jValue, jstring jDefault)
+{
+	IniFile ini;
+	ini.Load(File::GetUserPath(F_DOLPHINCONFIG_IDX));
+	const char *Key = env->GetStringUTFChars(jKey, NULL);
+	const char *Value = env->GetStringUTFChars(jValue, NULL);
+	const char *Default = env->GetStringUTFChars(jDefault, NULL);
+	
+	ini.Set(Key, Value, Default);
+	ini.Save(File::GetUserPath(F_DOLPHINCONFIG_IDX));
+
+	env->ReleaseStringUTFChars(jKey, Key);
+	env->ReleaseStringUTFChars(jValue, Value);
+	env->ReleaseStringUTFChars(jDefault, Default);
+}
+
+JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeGLSurfaceView_main(JNIEnv *env, jobject obj, jstring jFile, jobject _surf, jint _width, jint _height)
+{
+	surf = ANativeWindow_fromSurface(env, _surf);
+	g_width = (int)_width;
+	g_height = (int)_height;
+
+	// Install our callbacks
+	OSD::AddCallback(OSD::OSD_INIT, OSDCallbacks, 0);
+	OSD::AddCallback(OSD::OSD_ONFRAME, OSDCallbacks, 1);
+	OSD::AddCallback(OSD::OSD_SHUTDOWN, OSDCallbacks, 2);
+
 	LogManager::Init();
 	SConfig::Init();
 	VideoBackend::PopulateList();
-	VideoBackend::ActivateBackend(SConfig::GetInstance().
-		m_LocalCoreStartupParameter.m_strVideoBackend);
+	VideoBackend::ActivateBackend(SConfig::GetInstance().m_LocalCoreStartupParameter.m_strVideoBackend);
 	WiimoteReal::LoadSettings();
 
+	const char *File = env->GetStringUTFChars(jFile, NULL);
 	// No use running the loop when booting fails
-	if (BootManager::BootCore(""))
-	{
+	if ( BootManager::BootCore( File ) )
 		while (PowerPC::GetState() != PowerPC::CPU_POWERDOWN)
 			updateMainFrameEvent.Wait();
-	}
 
 	WiimoteReal::Shutdown();
 	VideoBackend::ClearList();
diff --git a/Source/Core/DolphinWX/Src/MainNoGUI.cpp b/Source/Core/DolphinWX/Src/MainNoGUI.cpp
index a37406bbf6..ad1ac8120d 100644
--- a/Source/Core/DolphinWX/Src/MainNoGUI.cpp
+++ b/Source/Core/DolphinWX/Src/MainNoGUI.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/Source/Core/DolphinWX/Src/MemcardManager.cpp b/Source/Core/DolphinWX/Src/MemcardManager.cpp
index 0bbbbd0a7b..68f56c014c 100644
--- a/Source/Core/DolphinWX/Src/MemcardManager.cpp
+++ b/Source/Core/DolphinWX/Src/MemcardManager.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "MemcardManager.h"
 #include "Common.h"
@@ -466,7 +453,7 @@ bool CMemcardManager::CopyDeleteSwitch(u32 error, int slot)
 		break;
 	case DELETE_FAIL:
 		PanicAlertT("Order of files in the File Directory do not match the block order\n"
-				"Right click and export all of the saves,\nand import the the saves to a new memcard\n");
+				"Right click and export all of the saves,\nand import the saves to a new memcard\n");
 		break;
 	default:
 		PanicAlert(E_UNK);
@@ -508,7 +495,10 @@ void CMemcardManager::CopyDeleteClick(wxCommandEvent& event)
 		{
 			SuccessAlertT("The checksum was successfully fixed");
 		}
-		else PanicAlert(E_SAVEFAILED);
+		else
+		{
+			PanicAlert(E_SAVEFAILED);
+		}
 		break; 
 	case ID_CONVERTTOGCI:
 		fileName2 = "convert";
@@ -533,7 +523,10 @@ void CMemcardManager::CopyDeleteClick(wxCommandEvent& event)
 				wxEmptyString, wxEmptyString, wxT(".gci"),
 				_("GCI File(*.gci)") + wxString(_T("|*.gci")),
 				wxFD_OVERWRITE_PROMPT|wxFD_SAVE, this);
-			if (temp2.empty()) break;
+
+			if (temp2.empty())
+				break;
+
 			fileName2 = WxStrToStr(temp2);
 		}
 		if (fileName.length() > 0)
@@ -552,7 +545,7 @@ void CMemcardManager::CopyDeleteClick(wxCommandEvent& event)
 			std::string gciFilename;
 			if (!memoryCard[slot]->GCI_FileName(index, gciFilename))
 			{
-				PanicAlert("invalid index");
+				PanicAlert("Invalid index");
 				return;
 			}
 			wxString fileName = wxFileSelector(
@@ -610,7 +603,8 @@ bool CMemcardManager::ReloadMemcard(const char *fileName, int card)
 	// TODO: add error checking and animate icons
 	memoryCard[card] = new GCMemcard(fileName);
 
-	if (!memoryCard[card]->IsValid()) return false;
+	if (!memoryCard[card]->IsValid())
+		return false;
 
 	int j;
 
@@ -671,7 +665,10 @@ bool CMemcardManager::ReloadMemcard(const char *fileName, int card)
 		{
 			memset(pxdata,0,96*32*4);
 			int frames=3;
-			if (numFrames<frames) frames=numFrames;
+
+			if (numFrames<frames)
+				frames=numFrames;
+
 			for (int f=0;f<frames;f++)
 			{
 				for (int y=0;y<32;y++)
@@ -714,7 +711,10 @@ bool CMemcardManager::ReloadMemcard(const char *fileName, int card)
 		m_MemcardList[card]->SetItem(index, COLUMN_COMMENT, wxComment);
 
 		blocks = memoryCard[card]->DEntry_BlockCount(fileIndex);
-		if (blocks == 0xFFFF) blocks = 0;
+		
+		if (blocks == 0xFFFF)
+			blocks = 0;
+		
 		wxBlock.Printf(wxT("%10d"), blocks);
 		m_MemcardList[card]->SetItem(index,COLUMN_BLOCKS, wxBlock);
 		firstblock = memoryCard[card]->DEntry_FirstBlock(fileIndex);
@@ -801,7 +801,7 @@ void CMemcardManager::CMemcardListCtrl::OnRightClick(wxMouseEvent& event)
 		popupMenu->Append(ID_NEXTPAGE_A + slot, _("Next Page"));
 		popupMenu->Append(ID_MEMCARDPATH_A + slot, wxString::Format(_("Set as default Memcard %c"), 'A' + slot));
 		popupMenu->AppendCheckItem(ID_USEPAGES, _("Enable pages"));
-	
+
 		popupMenu->FindItem(ID_PREVPAGE_A + slot)->Enable(prevPage && __mcmSettings.usePages);
 		popupMenu->FindItem(ID_NEXTPAGE_A + slot)->Enable(nextPage && __mcmSettings.usePages);
 		popupMenu->FindItem(ID_USEPAGES)->Check(__mcmSettings.usePages);
diff --git a/Source/Core/DolphinWX/Src/MemcardManager.h b/Source/Core/DolphinWX/Src/MemcardManager.h
index 537b0eb111..9f2f8f0d9b 100644
--- a/Source/Core/DolphinWX/Src/MemcardManager.h
+++ b/Source/Core/DolphinWX/Src/MemcardManager.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef __MEMCARD_MANAGER_h__
 #define __MEMCARD_MANAGER_h__
diff --git a/Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp b/Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp
index 867d46c66d..cfdccf26c2 100644
--- a/Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp
+++ b/Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 // Based off of tachtig/twintig http://git.infradead.org/?p=users/segher/wii.git
 // Copyright 2007,2008  Segher Boessenkool  <segher@kernel.crashing.org>
@@ -43,7 +30,7 @@ CWiiSaveCrypted::CWiiSaveCrypted(const char* FileName, u64 TitleID)
 
 	if (!TitleID) // Import
 	{
-		AES_set_decrypt_key(SDKey, 128, &m_AES_KEY);		
+		AES_set_decrypt_key(SDKey, 128, &m_AES_KEY);
 		do
 		{
 			b_valid = true;
@@ -56,12 +43,15 @@ CWiiSaveCrypted::CWiiSaveCrypted(const char* FileName, u64 TitleID)
 				SuccessAlertT("Successfully imported save files");
 				b_tryAgain = false;
 			}
-			else b_tryAgain = AskYesNoT("Import failed, try again?");
-		}while(b_tryAgain);
+			else
+			{
+				b_tryAgain = AskYesNoT("Import failed, try again?");
+			}
+		} while(b_tryAgain);
 	}
 	else
 	{
-		AES_set_encrypt_key(SDKey, 128, &m_AES_KEY);		
+		AES_set_encrypt_key(SDKey, 128, &m_AES_KEY);
 		
 		if (getPaths(true))
 		{
@@ -77,8 +67,11 @@ CWiiSaveCrypted::CWiiSaveCrypted(const char* FileName, u64 TitleID)
 					SuccessAlertT("Successfully exported file to %s", pathData_bin);
 					b_tryAgain = false;
 				}
-				else b_tryAgain = AskYesNoT("Export failed, try again?");
-			}while(b_tryAgain);
+				else
+				{
+					b_tryAgain = AskYesNoT("Export failed, try again?");
+				}
+			} while(b_tryAgain);
 		}
 	}
 }
@@ -94,7 +87,7 @@ void CWiiSaveCrypted::ReadHDR()
 	}
 	if (!fpData_bin.ReadBytes(&_encryptedHeader, HEADER_SZ))
 	{
-		PanicAlertT("failed to read header");
+		PanicAlertT("Failed to read header");
 		b_valid = false;
 		return;
 	}
@@ -105,7 +98,7 @@ void CWiiSaveCrypted::ReadHDR()
 	if ((_bannerSize < FULL_BNR_MIN) || (_bannerSize > FULL_BNR_MAX) ||
 		(((_bannerSize - BNR_SZ) % ICON_SZ) != 0))
 	{
-		PanicAlertT("not a wii save or read failure for file header size %x", _bannerSize);
+		PanicAlertT("Not a Wii save or read failure for file header size %x", _bannerSize);
 		b_valid = false;
 		return;
 	}
@@ -127,7 +120,7 @@ void CWiiSaveCrypted::ReadHDR()
 	}
 	if (!File::Exists(BannerFilePath) || AskYesNoT("%s already exists, overwrite?", BannerFilePath.c_str()))
 	{
-		INFO_LOG(CONSOLE, "creating file %s", BannerFilePath.c_str());
+		INFO_LOG(CONSOLE, "Creating file %s", BannerFilePath.c_str());
 		File::IOFile fpBanner_bin(BannerFilePath, "wb");
 		fpBanner_bin.WriteBytes(_header.BNR, _bannerSize);
 	}
@@ -182,7 +175,7 @@ void CWiiSaveCrypted::ReadBKHDR()
 	fpData_bin.Seek(HEADER_SZ, SEEK_SET);
 	if (!fpData_bin.ReadBytes(&bkhdr, BK_SZ))
 	{
-		PanicAlertT("failed to read bk header");
+		PanicAlertT("Failed to read bk header");
 		b_valid = false;
 		return;
 	}
@@ -203,7 +196,7 @@ void CWiiSaveCrypted::ReadBKHDR()
 	if (_sizeOfFiles + FULL_CERT_SZ != _totalSize)
 		WARN_LOG(CONSOLE, "Size(%x) + cert(%x) does not equal totalsize(%x)", _sizeOfFiles, FULL_CERT_SZ, _totalSize);
 	if (m_TitleID != Common::swap64(bkhdr.SaveGameTitle))
-		WARN_LOG(CONSOLE, "encrypted title (%llx) does not match unencrypted title (%llx)", m_TitleID,  Common::swap64(bkhdr.SaveGameTitle));
+		WARN_LOG(CONSOLE, "Encrypted title (%llx) does not match unencrypted title (%llx)", m_TitleID,  Common::swap64(bkhdr.SaveGameTitle));
 }
 
 void CWiiSaveCrypted::WriteBKHDR()
@@ -253,7 +246,7 @@ void CWiiSaveCrypted::ImportWiiSaveFiles()
 		memset(IV, 0, 0x10);
 		_fileSize = 0;
 		
-		if (!fpData_bin.ReadBytes(&_tmpFileHDR, FILE_HDR_SZ))		
+		if (!fpData_bin.ReadBytes(&_tmpFileHDR, FILE_HDR_SZ))
 		{
 			PanicAlertT("Failed to write header for file %d", i);
 			b_valid = false;
@@ -295,11 +288,11 @@ void CWiiSaveCrypted::ImportWiiSaveFiles()
 	
 				if (!File::Exists(fullFilePath) || AskYesNoT("%s already exists, overwrite?", fullFilePath.c_str()))
 				{
-					INFO_LOG(CONSOLE, "creating file %s", fullFilePath.c_str());
+					INFO_LOG(CONSOLE, "Creating file %s", fullFilePath.c_str());
 	
 					File::IOFile fpRawSaveFile(fullFilePath, "wb");
 					fpRawSaveFile.WriteBytes(_data, _fileSize);
-				}			
+				}
 				delete []_data;
 			}
 		}	
@@ -333,7 +326,6 @@ void CWiiSaveCrypted::ExportWiiSaveFiles()
 		
 		for (Common::replace_v::const_iterator iter = replacements.begin(); iter != replacements.end(); ++iter)
 		{
-
 			for (size_t j = 0; (j = __name.find(iter->second, j)) != __name.npos; ++j)
 			{
 				__name.replace(j, iter->second.length(), 1, iter->first);
@@ -372,7 +364,7 @@ void CWiiSaveCrypted::ExportWiiSaveFiles()
 			memset(__data, 0, _roundedfileSize);
 			if (!fpRawSaveFile.ReadBytes(__data, _fileSize))
 			{
-				PanicAlertT("failed to read data from file: %s", FilesList[i].c_str());
+				PanicAlertT("Failed to read data from file: %s", FilesList[i].c_str());
 				b_valid = false;
 			}
 
@@ -472,7 +464,7 @@ void CWiiSaveCrypted::make_ec_cert(u8 *cert, u8 *sig, char *signer, char *name,
 {
 	memset(cert, 0, 0x180);
 	*(u32*)cert = Common::swap32(0x10002);
-	
+
 	memcpy(cert + 4, sig, 60);
 	strcpy((char*)cert + 0x80, signer);
 	*(u32*)(cert + 0xc0) = Common::swap32(2);
@@ -484,17 +476,18 @@ void CWiiSaveCrypted::make_ec_cert(u8 *cert, u8 *sig, char *signer, char *name,
 bool CWiiSaveCrypted::getPaths(bool forExport)
 {
 	if (m_TitleID)
-	{	
+	{
 		WiiTitlePath = Common::GetTitleDataPath(m_TitleID);
 		BannerFilePath = WiiTitlePath + "banner.bin";
 	}
+
 	if (forExport)
 	{
 		char GameID[5];
 		sprintf(GameID, "%c%c%c%c",
 			(u8)(m_TitleID >> 24) & 0xFF, (u8)(m_TitleID >> 16) & 0xFF,
 			(u8)(m_TitleID >>  8) & 0xFF, (u8)m_TitleID & 0xFF);
-	
+
 		if(!File::IsDirectory(WiiTitlePath))
 		{
 			b_valid = false;
@@ -530,7 +523,10 @@ void CWiiSaveCrypted::ScanForFiles(std::string savDir, std::vector<std::string>&
 	Directories.push_back(savDir);
 	for (u32 i = 0; i < Directories.size(); i++)
 	{
-		if (i) FileList.push_back(Directories[i]);//add dir to fst
+		if (i != 0)
+		{
+			FileList.push_back(Directories[i]);//add dir to fst
+		}
 
 		File::FSTEntry FST_Temp;
 		File::ScanDirectoryTree(Directories[i], FST_Temp);
diff --git a/Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.h b/Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.h
index b47a8ffc1d..c27ee58a19 100644
--- a/Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.h
+++ b/Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _WII_SAVE_CRYPTED
 #define _WII_SAVE_CRYPTED
@@ -26,7 +13,6 @@
 // --- this is used for encrypted Wii save files
 
 
-	
 class CWiiSaveCrypted
 {
 public:
@@ -40,8 +26,7 @@ public:
 	void ImportWiiSaveFiles();
 	void ExportWiiSaveFiles(); // To data.bin
 	void do_sig();
-	void make_ec_cert(u8 *cert, u8 *sig, char *signer, char *name, u8 *priv,
-                         u32 key_id);
+	void make_ec_cert(u8 *cert, u8 *sig, char *signer, char *name, u8 *priv, u32 key_id);
 	bool getPaths(bool forExport = false);
 	void ScanForFiles(std::string savDir, std::vector<std::string>&FilesList, u32 *_numFiles, u32 *_sizeFiles);
 
@@ -49,7 +34,7 @@ private:
 	AES_KEY m_AES_KEY;
 	u8 SD_IV[0x10];
 	std::vector<std::string> FilesList;
-		 
+
 	char pathData_bin[2048];
 
 	std::string BannerFilePath,
@@ -85,13 +70,12 @@ private:
 		BK_LISTED_SZ = 0x70,	// Size before rounding to nearest block
 		BK_SZ  = 0x80,
 		FILE_HDR_SZ = 0x80,
-		
+
 		SIG_SZ = 0x40,
 		NG_CERT_SZ = 0x180,
 		AP_CERT_SZ = 0x180,
 		FULL_CERT_SZ =  0x3C0,	// SIG_SZ +	NG_CERT_SZ + AP_CERT_SZ + 0x80?
-	
-	
+
 		BK_HDR_MAGIC   = 0x426B0001,
 		FILE_HDR_MAGIC = 0x03adf17e
 	};
@@ -107,7 +91,7 @@ private:
 		u8 Md5[0x10]; // md5 of plaintext header with md5 blanker applied
 		u16 unk2;
 	};
-	
+
 	struct HEADER
 	{
 		Data_Bin_HDR hdr;
diff --git a/Source/Core/DolphinWX/Src/NetWindow.cpp b/Source/Core/DolphinWX/Src/NetWindow.cpp
index 76bb76881b..d569ddc397 100644
--- a/Source/Core/DolphinWX/Src/NetWindow.cpp
+++ b/Source/Core/DolphinWX/Src/NetWindow.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include <FileUtil.h>
 #include <IniFile.h>
@@ -22,6 +9,7 @@
 #include "NetPlay.h"
 #include "NetWindow.h"
 #include "Frame.h"
+#include "Core.h"
 
 #include <sstream>
 #include <string>
@@ -44,8 +32,11 @@ std::string BuildGameName(const GameListItem& game)
 	std::string name(game.GetBannerName(lang));
 	if (name.empty())
 		name = game.GetVolumeName(lang);
-	
-	return name + " (" + game.GetUniqueID() + ")";
+
+	if (game.GetRevision() != 0)
+		return name + " (" + game.GetUniqueID() + ", Revision " + std::to_string((long long)game.GetRevision()) + ")";
+	else
+		return name + " (" + game.GetUniqueID() + ")";
 }
 
 void FillWithGameNames(wxListBox* game_lbox, const CGameListCtrl& game_list)
@@ -106,8 +97,20 @@ NetPlaySetupDiag::NetPlaySetupDiag(wxWindow* const parent, const CGameListCtrl*
 	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!!"),
-			wxDefaultPosition, wxDefaultSize);
+		_("ALERT:\n\n"
+		"Netplay will only work with the following settings:\n"
+		" - Enable Dual Core [OFF]\n"
+		" - DSP Emulator Engine Must be the same on all computers!\n"
+		" - DSP on Dedicated Thread [OFF]\n"
+		" - Framelimit NOT set to [Audio]\n"
+		" - Manually set the exact number of controllers to be used to [Standard Controller]\n"
+		"\n"
+		"All players should use the same Dolphin version and settings.\n"
+		"All memory cards must be identical between players or disabled.\n"
+		"Wiimote support has not been implemented!\n"
+		"\n"
+		"The host must have the chosen TCP port open/forwarded!\n"),
+		wxDefaultPosition, wxDefaultSize);
 
 	wxBoxSizer* const top_szr = new wxBoxSizer(wxHORIZONTAL);
 	top_szr->Add(ip_lbl, 0, wxCENTER | wxRIGHT, 5);
@@ -138,7 +141,7 @@ NetPlaySetupDiag::NetPlaySetupDiag(wxWindow* const parent, const CGameListCtrl*
 	wxButton* const host_btn = new wxButton(host_tab, wxID_ANY, _("Host"));
 	host_btn->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &NetPlaySetupDiag::OnHost, this);
 
-	m_game_lbox = new wxListBox(host_tab, wxID_ANY);
+	m_game_lbox = new wxListBox(host_tab, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, nullptr, wxLB_SORT);
 	m_game_lbox->Bind(wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, &NetPlaySetupDiag::OnHost, this);
 	
 	FillWithGameNames(m_game_lbox, *game_list);
@@ -296,7 +299,7 @@ NetPlayDiag::NetPlayDiag(wxWindow* const parent, const CGameListCtrl* const game
 	chat_szr->Add(m_chat_text, 1, wxEXPAND);
 	chat_szr->Add(chat_msg_szr, 0, wxEXPAND | wxTOP, 5);
 
-	m_player_lbox = new wxListBox(panel, wxID_ANY, wxDefaultPosition, wxSize(192,-1));
+	m_player_lbox = new wxListBox(panel, wxID_ANY, wxDefaultPosition, wxSize(256, -1));
 
 	wxStaticBoxSizer* const player_szr = new wxStaticBoxSizer(wxVERTICAL, panel, _("Players"));
 	player_szr->Add(m_player_lbox, 1, wxEXPAND);
@@ -329,12 +332,13 @@ NetPlayDiag::NetPlayDiag(wxWindow* const parent, const CGameListCtrl* const game
 		wxSpinCtrl* const padbuf_spin = new wxSpinCtrl(panel, wxID_ANY, wxT("20")
 			, wxDefaultPosition, wxSize(64, -1), wxSP_ARROW_KEYS, 0, 200, 20);
 		padbuf_spin->Bind(wxEVT_COMMAND_SPINCTRL_UPDATED, &NetPlayDiag::OnAdjustBuffer, this);
-		wxButton* const padbuf_btn = new wxButton(panel, wxID_ANY, wxT("?"), wxDefaultPosition, wxSize(22, -1));
-		padbuf_btn->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &NetPlayDiag::OnPadBuffHelp, this);
 		bottom_szr->Add(padbuf_spin, 0, wxCENTER);
-		bottom_szr->Add(padbuf_btn);
 	}
-		
+
+	m_memcard_write = new wxCheckBox(panel, wxID_ANY, _("Write memcards (GC)"));
+	m_memcard_write->Bind(wxEVT_COMMAND_CHECKBOX_CLICKED, &NetPlayDiag::OnMemcardWriteCheck, this);
+	bottom_szr->Add(m_memcard_write, 0, wxCENTER);
+
 	bottom_szr->AddStretchSpacer(1);
 	bottom_szr->Add(quit_btn);
 
@@ -397,6 +401,8 @@ void NetPlayDiag::OnStop(wxCommandEvent&)
 void NetPlayDiag::BootGame(const std::string& filename)
 {
 	main_frame->BootGame(filename);
+
+	Core::g_CoreStartupParameter.bEnableMemcardSaving = m_memcard_write->GetValue();
 }
 
 void NetPlayDiag::StopGame()
@@ -438,15 +444,9 @@ void NetPlayDiag::OnMsgStopGame()
 	GetEventHandler()->AddPendingEvent(evt);
 }
 
-void NetPlayDiag::OnPadBuffHelp(wxCommandEvent&)
+void NetPlayDiag::OnMemcardWriteCheck(wxCommandEvent &event)
 {
-	const u64 time = ((NetPlayServer*)netplay_ptr)->CalculateMinimumBufferTime();
-	std::ostringstream ss;
-	ss << "< Calculated from pings: required buffer: "
-		<< time * (60.0f/1000) << "(60fps) / "
-		<< time * (50.0f/1000) << "(50fps) >\n";
-
-	m_chat_text->AppendText(StrToWxStr(ss.str()));
+	netplay_ptr->SetMemcardWriteEnabled(m_memcard_write->GetValue());
 }
 
 void NetPlayDiag::OnAdjustBuffer(wxCommandEvent& event)
@@ -556,7 +556,7 @@ ChangeGameDiag::ChangeGameDiag(wxWindow* const parent, const CGameListCtrl* cons
 	: wxDialog(parent, wxID_ANY, _("Change Game"), wxDefaultPosition, wxDefaultSize)
 	, m_game_name(game_name)
 {
-	m_game_lbox = new wxListBox(this, wxID_ANY);
+	m_game_lbox = new wxListBox(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, nullptr, wxLB_SORT);
 	m_game_lbox->Bind(wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, &ChangeGameDiag::OnPick, this);
 
 	FillWithGameNames(m_game_lbox, *game_list);
diff --git a/Source/Core/DolphinWX/Src/NetWindow.h b/Source/Core/DolphinWX/Src/NetWindow.h
index ae27a75921..3c7cbe99a7 100644
--- a/Source/Core/DolphinWX/Src/NetWindow.h
+++ b/Source/Core/DolphinWX/Src/NetWindow.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _NETWINDOW_H_
 #define _NETWINDOW_H_
@@ -95,7 +82,7 @@ private:
 
 	void OnChat(wxCommandEvent& event);
 	void OnQuit(wxCommandEvent& event);
-	void OnPadBuffHelp(wxCommandEvent& event);
+	void OnMemcardWriteCheck(wxCommandEvent& event);
 	void OnThread(wxCommandEvent& event);
 	void OnChangeGame(wxCommandEvent& event);
 	void OnAdjustBuffer(wxCommandEvent& event);
@@ -104,6 +91,7 @@ private:
 	wxListBox*		m_player_lbox;
 	wxTextCtrl*		m_chat_text;
 	wxTextCtrl*		m_chat_msg_text;
+	wxCheckBox*		m_memcard_write;
 
 	std::string		m_selected_game;
 	wxButton*		m_game_btn;
diff --git a/Source/Core/DolphinWX/Src/PHackSettings.cpp b/Source/Core/DolphinWX/Src/PHackSettings.cpp
index dcfa1a8501..9fb93d3d73 100644
--- a/Source/Core/DolphinWX/Src/PHackSettings.cpp
+++ b/Source/Core/DolphinWX/Src/PHackSettings.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "PHackSettings.h"
 #include "ConfigManager.h"
diff --git a/Source/Core/DolphinWX/Src/PHackSettings.h b/Source/Core/DolphinWX/Src/PHackSettings.h
index a5f9e66240..336f26886d 100644
--- a/Source/Core/DolphinWX/Src/PHackSettings.h
+++ b/Source/Core/DolphinWX/Src/PHackSettings.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef __PHACK_SETTINGS_h__
 #define __PHACK_SETTINGS_h__
diff --git a/Source/Core/DolphinWX/Src/PatchAddEdit.cpp b/Source/Core/DolphinWX/Src/PatchAddEdit.cpp
index ead7918d34..e730b21afe 100644
--- a/Source/Core/DolphinWX/Src/PatchAddEdit.cpp
+++ b/Source/Core/DolphinWX/Src/PatchAddEdit.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "PatchAddEdit.h"
 #include "WxUtils.h"
@@ -49,8 +36,8 @@ void CPatchAddEdit::CreateGUIControls(int _selection)
 	}
 	else
 	{
-	    currentName = StrToWxStr(onFrame.at(_selection).name);
-	    tempEntries = onFrame.at(_selection).entries;
+		currentName = StrToWxStr(onFrame.at(_selection).name);
+		tempEntries = onFrame.at(_selection).entries;
 	}
 
 	itCurEntry = tempEntries.begin();
@@ -218,7 +205,9 @@ bool CPatchAddEdit::UpdateTempEntryData(std::vector<PatchEngine::PatchEntry>::it
 			parsed_ok = false;
 	}
 	else
+	{
 		parsed_ok = false;
+	}
 
 	if (!parsed_ok)
 	{
diff --git a/Source/Core/DolphinWX/Src/PatchAddEdit.h b/Source/Core/DolphinWX/Src/PatchAddEdit.h
index 1945d5e330..cb64c40c67 100644
--- a/Source/Core/DolphinWX/Src/PatchAddEdit.h
+++ b/Source/Core/DolphinWX/Src/PatchAddEdit.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef __PATCH_ADDEDIT_h__
 #define __PATCH_ADDEDIT_h__
diff --git a/Source/Core/DolphinWX/Src/TASInputDlg.cpp b/Source/Core/DolphinWX/Src/TASInputDlg.cpp
index 493fade776..0eb2336966 100644
--- a/Source/Core/DolphinWX/Src/TASInputDlg.cpp
+++ b/Source/Core/DolphinWX/Src/TASInputDlg.cpp
@@ -1,19 +1,6 @@
-// Copyright (C) 2011 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "TASInputDlg.h"
 #include "Movie.h"
@@ -73,7 +60,7 @@ TASInputDlg::TASInputDlg(wxWindow *parent, wxWindowID id, const wxString &title,
 	main_yslider_box->Add(wx_mainY_s, 0, wxALIGN_CENTER_VERTICAL);
 	main_yslider_box->Add(wx_mainY_t, 0, wxALIGN_CENTER_VERTICAL);
 	main_box->Add(main_yslider_box);
-    
+
 	wxStaticBoxSizer* const c_box = new wxStaticBoxSizer(wxHORIZONTAL, this, _("C Stick"));
 	wxBoxSizer* const c_xslider_box = new wxBoxSizer(wxHORIZONTAL);
 	wxBoxSizer* const c_yslider_box = new wxBoxSizer(wxVERTICAL);
@@ -686,13 +673,13 @@ bool TASInputDlg::HasFocus()
 	if(TextBoxHasFocus())
 		return false;
 
-    if (wxWindow::FindFocus() == this)
-        return true;
-    else if (wxWindow::FindFocus() != NULL &&
-             wxWindow::FindFocus()->GetParent() == this)
-        return true;
-    else
-        return false;
+	if (wxWindow::FindFocus() == this)
+		return true;
+	else if (wxWindow::FindFocus() != NULL &&
+				wxWindow::FindFocus()->GetParent() == this)
+		return true;
+	else
+		return false;
 }
 
 bool TASInputDlg::TextBoxHasFocus()
@@ -825,6 +812,7 @@ void TASInputDlg::SetTurboFalse(wxMouseEvent& event)
 		case ID_A:
 				A_turbo = false;
 			break;
+
 		case ID_B:
 				B_turbo = false;
 			break;
@@ -868,6 +856,7 @@ void TASInputDlg::SetTurboFalse(wxMouseEvent& event)
 		case ID_RIGHT:
 				DR_turbo = false;
 			break;
+
 		default:
 			return;
 	}
@@ -989,7 +978,6 @@ void TASInputDlg::ButtonTurbo()
 	{
 		if(wx_a_button->GetValue())
 			wx_a_button->SetValue(false);
-		
 		else
 			wx_a_button->SetValue(true);
 	}
@@ -998,42 +986,38 @@ void TASInputDlg::ButtonTurbo()
 	{
 		if(wx_b_button->GetValue())
 			wx_b_button->SetValue(false);
-		
 		else
 			wx_b_button->SetValue(true);
 	}
-	
+
 	if(X_turbo)
 	{
 		if(wx_x_button->GetValue())
 			wx_x_button->SetValue(false);
-		
 		else
 			wx_x_button->SetValue(true);
 	}
-	
+
 	if(Y_turbo)
 	{
 		if(wx_y_button->GetValue())
 			wx_y_button->SetValue(false);
-		
 		else
 			wx_y_button->SetValue(true);
 	}
-	
+
 	if(Z_turbo)
 	{
 		if(wx_z_button->GetValue())
 			wx_z_button->SetValue(false);
-	
 		else
 			wx_z_button->SetValue(true);
 	}
-			if(L_turbo)
+
+	if(L_turbo)
 	{
 		if(wx_l_button->GetValue())
 			wx_l_button->SetValue(false);
-	
 		else
 			wx_l_button->SetValue(true);
 	}
@@ -1042,7 +1026,6 @@ void TASInputDlg::ButtonTurbo()
 	{
 		if(wx_r_button->GetValue())
 			wx_r_button->SetValue(false);
-			
 		else
 			wx_r_button->SetValue(true);
 	}
@@ -1051,7 +1034,6 @@ void TASInputDlg::ButtonTurbo()
 	{
 		if(wx_start_button->GetValue())
 			wx_start_button->SetValue(false);
-		
 		else
 			wx_start_button->SetValue(true);
 		}
@@ -1060,7 +1042,6 @@ void TASInputDlg::ButtonTurbo()
 	{
 		if(wx_up_button->GetValue())
 			wx_up_button->SetValue(false);
-			
 		else
 			wx_up_button->SetValue(true);
 	}
@@ -1069,7 +1050,6 @@ void TASInputDlg::ButtonTurbo()
 	{
 		if(wx_down_button->GetValue())
 			wx_down_button->SetValue(false);
-		
 		else
 			wx_down_button->SetValue(true);
 	}
@@ -1078,7 +1058,6 @@ void TASInputDlg::ButtonTurbo()
 	{
 		if(wx_left_button->GetValue())
 			wx_left_button->SetValue(false);
-			
 		else
 			wx_left_button->SetValue(true);
 	}
@@ -1087,7 +1066,6 @@ void TASInputDlg::ButtonTurbo()
 	{
 		if(wx_right_button->GetValue())
 			wx_right_button->SetValue(false);
-	
 		else
 			wx_right_button->SetValue(true);
 	}
@@ -1097,13 +1075,13 @@ wxBitmap TASInputDlg::CreateStickBitmap(int x, int y)
 {
 	x = x/2;
 	y = y/2;
-    
+
 	wxMemoryDC memDC;
-    wxBitmap stick_bitmap(127, 127);
-    memDC.SelectObject(stick_bitmap);
-    memDC.SetBackground(*wxLIGHT_GREY_BRUSH);
-    memDC.Clear();
-    memDC.SetBrush(*wxWHITE_BRUSH);
+	wxBitmap stick_bitmap(127, 127);
+	memDC.SelectObject(stick_bitmap);
+	memDC.SetBackground(*wxLIGHT_GREY_BRUSH);
+	memDC.Clear();
+	memDC.SetBrush(*wxWHITE_BRUSH);
 	memDC.DrawCircle(65,65,64);
 	memDC.SetBrush(*wxRED_BRUSH);
 	memDC.DrawLine(64,64,x,y);
@@ -1115,6 +1093,6 @@ wxBitmap TASInputDlg::CreateStickBitmap(int x, int y)
 	memDC.CrossHair(64,64);
 	memDC.SetBrush(*wxBLUE_BRUSH);
 	memDC.DrawCircle(x,y,5);
-    memDC.SelectObject(wxNullBitmap);
-    return stick_bitmap;
+	memDC.SelectObject(wxNullBitmap);
+	return stick_bitmap;
 }
diff --git a/Source/Core/DolphinWX/Src/TASInputDlg.h b/Source/Core/DolphinWX/Src/TASInputDlg.h
index 6e901edee5..fa780081f0 100644
--- a/Source/Core/DolphinWX/Src/TASInputDlg.h
+++ b/Source/Core/DolphinWX/Src/TASInputDlg.h
@@ -1,19 +1,6 @@
-// Copyright (C) 2011 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef __TASINPUT_H__
 #define __TASINPUT_H__
@@ -93,7 +80,7 @@ class TASInputDlg : public wxDialog
 		bool A_turbo,B_turbo, X_turbo, Y_turbo, Z_turbo, L_turbo, R_turbo, START_turbo,DL_turbo,DR_turbo,DD_turbo,DU_turbo;
 		bool A_cont,B_cont, X_cont, Y_cont, Z_cont, L_cont, R_cont, START_cont,DL_cont,DR_cont,DD_cont,DU_cont,mstickx,msticky,cstickx,csticky;
 		int xaxis,yaxis,c_xaxis,c_yaxis,update,update_axis;
-				
+
 		DECLARE_EVENT_TABLE();
 };
 
diff --git a/Source/Core/DolphinWX/Src/VideoConfigDiag.cpp b/Source/Core/DolphinWX/Src/VideoConfigDiag.cpp
index 29f6ed109a..8ad34bed08 100644
--- a/Source/Core/DolphinWX/Src/VideoConfigDiag.cpp
+++ b/Source/Core/DolphinWX/Src/VideoConfigDiag.cpp
@@ -66,7 +66,11 @@ void VideoConfigDiag::Event_Close(wxCloseEvent& ev)
 	EndModal(wxID_OK);
 }
 
-wxString backend_desc = wxTRANSLATE("Selects what graphics API to use internally.\nDirect3D 9 usually is the fastest one. OpenGL is more accurate though. Direct3D 11 is somewhere between the two.\nNote that the Direct3D backends are only available on Windows.\n\nIf unsure, use Direct3D 9.");
+#if defined(_WIN32)
+wxString backend_desc = wxTRANSLATE("Selects what graphics API to use internally.\nDirect3D 9 usually is the fastest one. OpenGL is more accurate though. Direct3D 11 is somewhere between the two.\nNote that the Direct3D backends are only available on Windows.\n\nIf unsure, use Direct3D 11.");
+#else
+wxString backend_desc = wxTRANSLATE("Selects what graphics API to use internally.\nDirect3D 9 usually is the fastest one. OpenGL is more accurate though. Direct3D 11 is somewhere between the two.\nNote that the Direct3D backends are only available on Windows.\n\nIf unsure, use OpenGL.");
+#endif
 wxString adapter_desc = wxTRANSLATE("Select a hardware adapter to use.\n\nIf unsure, use the first one.");
 wxString display_res_desc = wxTRANSLATE("Selects the display resolution used in fullscreen mode.\nThis should always be bigger than or equal to the internal resolution. Performance impact is negligible.\n\nIf unsure, use your desktop resolution.\nIf still unsure, use the highest resolution which works for you.");
 wxString use_fullscreen_desc = wxTRANSLATE("Enable this if you want the whole screen to be used for rendering.\nIf this is disabled, a render window will be created instead.\n\nIf unsure, leave this unchecked.");
@@ -94,7 +98,7 @@ wxString efb_copy_ram_desc = wxTRANSLATE("Accurately emulate EFB copies.\nSome g
 wxString stc_desc = wxTRANSLATE("The safer you adjust this, the less likely the emulator will be missing any texture updates from RAM.\n\nIf unsure, use the rightmost value.");
 wxString wireframe_desc = wxTRANSLATE("Render the scene as a wireframe.\n\nIf unsure, leave this unchecked.");
 wxString disable_fog_desc = wxTRANSLATE("Makes distant objects more visible by removing fog, thus increasing the overall detail.\nDisabling fog will break some 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 disable_dstalpha_desc = wxTRANSLATE("Disables emulation of a hardware feature called destination alpha, which is 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.");
@@ -122,7 +126,7 @@ wxString cache_efb_copies_desc = wxTRANSLATE("Slightly speeds up EFB to RAM copi
 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.");
 
 
-// Search for avaliable resolutions - TODO: Move to Common?
+// Search for available resolutions - TODO: Move to Common?
 wxArrayString GetListOfResolutions()
 {
 	wxArrayString retlist;
@@ -249,6 +253,8 @@ VideoConfigDiag::VideoConfigDiag(wxWindow* parent, const std::string &title, con
 	wxFlexGridSizer* const szr_display = new wxFlexGridSizer(2, 5, 5);
 
 	{
+
+#if !defined(__APPLE__)
 	// display resolution
 	{
 		wxArrayString res_list = GetListOfResolutions();
@@ -270,6 +276,7 @@ VideoConfigDiag::VideoConfigDiag(wxWindow* parent, const std::string &title, con
 			choice_display_resolution->Disable();
 		}
 	}
+#endif
 
 	// aspect-ratio
 	{
@@ -336,8 +343,8 @@ VideoConfigDiag::VideoConfigDiag(wxWindow* parent, const std::string &title, con
 	// Internal resolution
 	{
 	const wxString efbscale_choices[] = { _("Auto (Window Size)"), _("Auto (Multiple of 640x528)"),
-		wxT("1x Native (640x528)"), wxT("1.5x Native (960x792)"), wxT("2x Native (1280x1056)"), 
-		wxT("2.5x Native (1600x1320)"), wxT("3x Native (1920x1584)"), wxT("4x Native (2560x2112)") };
+		_("1x Native (640x528)"), _("1.5x Native (960x792)"), _("2x Native (1280x1056)"), 
+		_("2.5x Native (1600x1320)"), _("3x Native (1920x1584)"), _("4x Native (2560x2112)") };
 
 	wxChoice *const choice_efbscale = CreateChoice(page_enh,
 		vconfig.iEFBScale, wxGetTranslation(internal_res_desc), sizeof(efbscale_choices)/sizeof(*efbscale_choices), efbscale_choices);
@@ -491,7 +498,7 @@ VideoConfigDiag::VideoConfigDiag(wxWindow* parent, const std::string &title, con
 	wxGridSizer* const szr_other = new wxGridSizer(2, 5, 5);
 	SettingCheckBox* hacked_buffer_upload_cb;
 	szr_other->Add(CreateCheckBox(page_hacks, _("Cache Display Lists"), wxGetTranslation(dlc_desc), vconfig.bDlistCachingEnable));
-	szr_other->Add(CreateCheckBox(page_hacks, _("Skip Dest. Alpha Pass"), wxGetTranslation(disable_alphapass_desc), vconfig.bDstAlphaPass));
+	szr_other->Add(CreateCheckBox(page_hacks, _("Disable Destination Alpha"), wxGetTranslation(disable_dstalpha_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));
 	szr_other->Add(hacked_buffer_upload_cb = CreateCheckBox(page_hacks, _("Hacked Buffer Upload"), wxGetTranslation(hacked_buffer_upload_desc), vconfig.bHackedBufferUpload));
diff --git a/Source/Core/DolphinWX/Src/WXInputBase.cpp b/Source/Core/DolphinWX/Src/WXInputBase.cpp
index 467371ae9c..fc05479752 100644
--- a/Source/Core/DolphinWX/Src/WXInputBase.cpp
+++ b/Source/Core/DolphinWX/Src/WXInputBase.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "WXInputBase.h"
 
diff --git a/Source/Core/DolphinWX/Src/WXInputBase.h b/Source/Core/DolphinWX/Src/WXInputBase.h
index da0743db47..4d6f57911d 100644
--- a/Source/Core/DolphinWX/Src/WXInputBase.h
+++ b/Source/Core/DolphinWX/Src/WXInputBase.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef WXINPUTBASE_H
 #define WXINPUTBASE_H
diff --git a/Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp b/Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp
index 475718ed2e..f039fe4938 100644
--- a/Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp
+++ b/Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp
@@ -23,7 +23,7 @@ WiimoteConfigDiag::WiimoteConfigDiag(wxWindow* const parent, InputPlugin& plugin
 		const wxString src_choices[] = { _("None"),
 		_("Emulated Wiimote"), _("Real Wiimote"), _("Hybrid Wiimote") };
 
-		// reserve four ids, so that we can calculate the index from the ids lateron
+		// reserve four ids, so that we can calculate the index from the ids later on
 		// Stupid wx 2.8 doesn't support reserving sequential IDs, so we need to do that more complicated..
 		int source_ctrl_id =  wxWindow::NewControlId();
 		m_wiimote_index_from_ctrl_id.insert(std::pair<wxWindowID, unsigned int>(source_ctrl_id, i));
diff --git a/Source/Core/DolphinWX/Src/WxUtils.cpp b/Source/Core/DolphinWX/Src/WxUtils.cpp
index 6856c96481..173c07fbcc 100644
--- a/Source/Core/DolphinWX/Src/WxUtils.cpp
+++ b/Source/Core/DolphinWX/Src/WxUtils.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "Common.h"
 
diff --git a/Source/Core/DolphinWX/Src/WxUtils.h b/Source/Core/DolphinWX/Src/WxUtils.h
index 61a16b298e..9dee725da3 100644
--- a/Source/Core/DolphinWX/Src/WxUtils.h
+++ b/Source/Core/DolphinWX/Src/WxUtils.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef WXUTILS_H
 #define WXUTILS_H
diff --git a/Source/Core/DolphinWX/Src/stdafx.cpp b/Source/Core/DolphinWX/Src/stdafx.cpp
index 31f734b17a..b602b39925 100644
--- a/Source/Core/DolphinWX/Src/stdafx.cpp
+++ b/Source/Core/DolphinWX/Src/stdafx.cpp
@@ -1,18 +1,5 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "stdafx.h"
diff --git a/Source/Core/DolphinWX/Src/stdafx.h b/Source/Core/DolphinWX/Src/stdafx.h
index 032dc317f4..63a82873e1 100644
--- a/Source/Core/DolphinWX/Src/stdafx.h
+++ b/Source/Core/DolphinWX/Src/stdafx.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef __STDAFX_H_
 #define __STDAFX_H_
diff --git a/Source/Core/InputCommon/CMakeLists.txt b/Source/Core/InputCommon/CMakeLists.txt
index 3a8ea1e7a2..8fc2a344c7 100644
--- a/Source/Core/InputCommon/CMakeLists.txt
+++ b/Source/Core/InputCommon/CMakeLists.txt
@@ -21,6 +21,10 @@ elseif(X11_FOUND)
 	set(SRCS	${SRCS}
 				Src/ControllerInterface/SDL/SDL.cpp
 				Src/ControllerInterface/Xlib/Xlib.cpp)
+elseif(ANDROID)
+	set(SRCS	${SRCS}
+				Src/ControllerInterface/Android/Android.cpp
+				Src/Android/ButtonManager.cpp)
 endif()
 
 add_library(inputcommon ${SRCS})
diff --git a/Source/Core/InputCommon/Src/Android/ButtonManager.cpp b/Source/Core/InputCommon/Src/Android/ButtonManager.cpp
new file mode 100644
index 0000000000..947f7b0081
--- /dev/null
+++ b/Source/Core/InputCommon/Src/Android/ButtonManager.cpp
@@ -0,0 +1,90 @@
+// 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 <vector>
+#include "GLInterface.h"
+#include "Android/TextureLoader.h"
+#include "Android/ButtonManager.h"
+
+extern void DrawButton(GLuint tex, float *coords);
+
+namespace ButtonManager
+{
+	std::vector<Button*> m_buttons;
+
+	// XXX: This needs to not be here so we can load the locations from file
+	// This will allow customizable button locations in the future
+	// These are the OpenGL on screen coordinates
+	float m_coords[][8] =	{ // X, Y, X, EY, EX, EY, EX, Y
+				{0.75f, -1.0f, 0.75f, -0.75f, 1.0f, -0.75f, 1.0f, -1.0f}, // A
+				{0.50f, -1.0f, 0.50f, -0.75f, 0.75f, -0.75f, 0.75f, -1.0f}, // B
+				{-0.10f, -1.0f, -0.10f, -0.80f, 0.10f, -0.80f, 0.10f, -1.0f}, // Start
+				};
+	
+	void Init()
+	{
+		glEnable(GL_BLEND);
+		glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
+		
+		// Initialize our buttons
+		m_buttons.push_back(new Button("ButtonA.png", BUTTON_A, m_coords[0]));
+		m_buttons.push_back(new Button("ButtonB.png", BUTTON_B, m_coords[1]));
+		m_buttons.push_back(new Button("ButtonStart.png", BUTTON_START, m_coords[2]));
+	}
+	bool GetButtonPressed(ButtonType button)
+	{
+		for (auto it = m_buttons.begin(); it != m_buttons.end(); ++it)
+			if ((*it)->GetButtonType() == button)
+				return (*it)->Pressed();
+		return false;
+	}
+	void TouchEvent(int action, float x, float y)
+	{
+		// Actions
+		// 0 is press
+		// 1 is let go
+		// 2 is move
+		for (auto it = m_buttons.begin(); it != m_buttons.end(); ++it)
+		{
+			float *coords = (*it)->GetCoords();
+			if (	x >= coords[0] &&
+				x <= coords[4] &&
+				y >= coords[1] &&
+				y <= coords[3])
+			{
+				if (action == 0)
+					(*it)->SetState(BUTTON_PRESSED);
+				if (action == 1)
+					(*it)->SetState(BUTTON_RELEASED);
+				if (action == 2)
+					; // XXX: Be used later for analog stick
+			}
+		}
+	}
+	void Shutdown()
+	{
+		for(auto it = m_buttons.begin(); it != m_buttons.end(); ++it)
+			delete *it;
+	}
+
+	void DrawButtons()
+	{
+		for(auto it = m_buttons.begin(); it != m_buttons.end(); ++it)
+			DrawButton((*it)->GetTexture(), (*it)->GetCoords());	
+	}
+
+}
diff --git a/Source/Core/InputCommon/Src/Android/ButtonManager.h b/Source/Core/InputCommon/Src/Android/ButtonManager.h
new file mode 100644
index 0000000000..f21ceedd98
--- /dev/null
+++ b/Source/Core/InputCommon/Src/Android/ButtonManager.h
@@ -0,0 +1,63 @@
+// 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 <string>
+#include "CommonPaths.h"
+#include "Android/TextureLoader.h"
+
+namespace ButtonManager
+{
+	enum ButtonType
+	{
+		BUTTON_A = 0,
+		BUTTON_B,
+		BUTTON_START,
+	};
+	enum ButtonState
+	{
+		BUTTON_RELEASED = 0,
+		BUTTON_PRESSED = 1
+	};
+	class Button
+	{
+	private:
+		GLuint m_tex;
+		ButtonType m_button;
+		ButtonState m_state;
+		float m_coords[8];
+	public:
+		Button(std::string filename, ButtonType button, float *coords)
+		{
+			m_tex = LoadPNG((std::string(DOLPHIN_DATA_DIR "/") + filename).c_str());
+			m_button = button;
+			memcpy(m_coords, coords, sizeof(float) * 8);
+			m_state = BUTTON_RELEASED;
+		}
+		void SetState(ButtonState state) { m_state = state; }
+		bool Pressed() { return m_state == BUTTON_PRESSED; }
+		ButtonType GetButtonType() { return m_button; }
+		GLuint GetTexture() { return m_tex; }
+		float *GetCoords() { return m_coords; }
+			
+		~Button() { glDeleteTextures(1, &m_tex); }
+	};
+	void Init();
+	void DrawButtons();
+	bool GetButtonPressed(ButtonType button);
+	void TouchEvent(int action, float x, float y);
+	void Shutdown();
+}
diff --git a/Source/Core/InputCommon/Src/ControllerEmu.cpp b/Source/Core/InputCommon/Src/ControllerEmu.cpp
index 2e6ad10617..b7eee1a143 100644
--- a/Source/Core/InputCommon/Src/ControllerEmu.cpp
+++ b/Source/Core/InputCommon/Src/ControllerEmu.cpp
@@ -1,19 +1,6 @@
-// Copyright (C) 2010 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "ControllerEmu.h"
 
diff --git a/Source/Core/InputCommon/Src/ControllerEmu.h b/Source/Core/InputCommon/Src/ControllerEmu.h
index 6084a610a1..33057434cd 100644
--- a/Source/Core/InputCommon/Src/ControllerEmu.h
+++ b/Source/Core/InputCommon/Src/ControllerEmu.h
@@ -1,19 +1,6 @@
-// Copyright (C) 2010 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _CONTROLLEREMU_H_
 #define _CONTROLLEREMU_H_
@@ -153,7 +140,7 @@ public:
 			// deadzone / square stick code
 			if (deadzone || square)
 			{
-				// this section might be all wrong, but its working good enough, i think
+				// this section might be all wrong, but its working good enough, I think
 
 				ControlState ang = atan2(yy, xx); 
 				ControlState ang_sin = sin(ang);
@@ -163,7 +150,7 @@ public:
 				ControlState square_full = std::min(ang_sin ? 1/fabsf(ang_sin) : 2, ang_cos ? 1/fabsf(ang_cos) : 2);
 
 				// the amt a full stick would have that was ( user setting squareness) at current angle
-				// i think this is more like a pointed circle rather than a rounded square like it should be
+				// I think this is more like a pointed circle rather than a rounded square like it should be
 				ControlState stick_full = (1 + (square_full - 1) * square);
 
 				ControlState dist = sqrt(xx*xx + yy*yy);
@@ -196,11 +183,15 @@ public:
 		template <typename C>
 		void GetState(C* const buttons, const C* bitmasks)
 		{
-			std::vector<Control*>::iterator i = controls.begin(),
+			std::vector<Control*>::iterator
+				i = controls.begin(),
 				e = controls.end();
+
 			for (; i!=e; ++i, ++bitmasks)
+			{
 				if ((*i)->control_ref->State() > settings[0]->value) // threshold
 					*buttons |= *bitmasks;
+			}
 		}
 
 	};
@@ -221,8 +212,9 @@ public:
 					*digital |= *bitmasks;
 				}
 				else
+				{
 					*analog = S(controls[i+trig_count]->control_ref->State() * range);
-					
+				}
 			}
 		}
 
@@ -320,7 +312,7 @@ public:
 			// deadzone / circle stick code
 			if (deadzone || circle)
 			{
-				// this section might be all wrong, but its working good enough, i think
+				// this section might be all wrong, but its working good enough, I think
 
 				ControlState ang = atan2(yy, xx); 
 				ControlState ang_sin = sin(ang);
@@ -330,7 +322,7 @@ public:
 				ControlState square_full = std::min(ang_sin ? 1/fabsf(ang_sin) : 2, ang_cos ? 1/fabsf(ang_cos) : 2);
 
 				// the amt a full stick would have that was (user setting circular) at current angle
-				// i think this is more like a pointed circle rather than a rounded square like it should be
+				// I think this is more like a pointed circle rather than a rounded square like it should be
 				ControlState stick_full = (square_full * (1 - circle)) + (circle);
 
 				ControlState dist = sqrt(xx*xx + yy*yy);
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/Android/Android.cpp b/Source/Core/InputCommon/Src/ControllerInterface/Android/Android.cpp
new file mode 100644
index 0000000000..2d01d38f23
--- /dev/null
+++ b/Source/Core/InputCommon/Src/ControllerInterface/Android/Android.cpp
@@ -0,0 +1,67 @@
+// 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 "Android.h"
+
+namespace ciface
+{
+
+namespace Android
+{
+
+void Init( std::vector<ControllerInterface::Device*>& devices )
+{
+	devices.push_back(new Touchscreen());
+}
+
+// Touchscreens and stuff
+std::string Touchscreen::GetName() const
+{
+	return "Touchscreen";
+}
+
+std::string Touchscreen::GetSource() const
+{
+	return "Android";
+}
+
+int Touchscreen::GetId() const
+{
+	return 0;
+}
+Touchscreen::Touchscreen()
+{
+	AddInput(new Button(ButtonManager::BUTTON_A));
+	AddInput(new Button(ButtonManager::BUTTON_B));
+	AddInput(new Button(ButtonManager::BUTTON_START));
+}
+// Buttons and stuff
+
+std::string Touchscreen::Button::GetName() const
+{
+	std::ostringstream ss;
+	ss << "Button " << (int)m_index;
+	return ss.str();
+}
+
+ControlState Touchscreen::Button::GetState() const
+{
+	return ButtonManager::GetButtonPressed(m_index);
+}
+
+}
+}
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/Android/Android.h b/Source/Core/InputCommon/Src/ControllerInterface/Android/Android.h
new file mode 100644
index 0000000000..9bdb52a61d
--- /dev/null
+++ b/Source/Core/InputCommon/Src/ControllerInterface/Android/Android.h
@@ -0,0 +1,57 @@
+// 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 _CIFACE_ANDROID_H_
+#define _CIFACE_ANDROID_H_
+
+#include "../ControllerInterface.h"
+#include "Android/ButtonManager.h"
+
+namespace ciface
+{
+namespace Android
+{
+
+void Init( std::vector<ControllerInterface::Device*>& devices );
+class Touchscreen : public ControllerInterface::Device
+{
+private:
+	class Button : public Input
+	{
+	public:
+		std::string GetName() const;
+		Button(ButtonManager::ButtonType index) : m_index(index) {}
+		ControlState GetState() const;
+	private:
+		 const ButtonManager::ButtonType m_index;
+	};
+
+public:
+	bool UpdateInput() { return true; }
+	bool UpdateOutput() { return true; }
+
+	Touchscreen();
+	~Touchscreen() {}
+
+	std::string GetName() const;
+	int GetId() const;
+	std::string GetSource() const;
+};
+
+}
+}
+
+#endif
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp b/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp
index 8e96231674..6db79605a7 100644
--- a/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp
+++ b/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp
@@ -15,6 +15,9 @@
 #ifdef CIFACE_USE_SDL
 	#include "SDL/SDL.h"
 #endif
+#ifdef CIFACE_USE_ANDROID
+	#include "Android/Android.h"
+#endif
 
 #include "Thread.h"
 
@@ -50,6 +53,9 @@ void ControllerInterface::Initialize()
 #ifdef CIFACE_USE_SDL
 	ciface::SDL::Init(m_devices);
 #endif
+#ifdef CIFACE_USE_ANDROID
+	ciface::Android::Init(m_devices);
+#endif
 
 	m_is_init = true;
 }
@@ -100,6 +106,9 @@ void ControllerInterface::Shutdown()
 	// TODO: there seems to be some sort of memory leak with SDL, quit isn't freeing everything up
 	SDL_Quit();
 #endif
+#ifdef CIFACE_USE_ANDROID
+	// nothing needed
+#endif
 
 	m_is_init = false;
 }
@@ -157,7 +166,7 @@ bool ControllerInterface::UpdateOutput(const bool force)
 	if (force)
 		lk.lock();
 	else if (!lk.try_lock())
-			return false;
+		return false;
 
 	size_t ok_count = 0;
 
@@ -173,7 +182,7 @@ bool ControllerInterface::UpdateOutput(const bool force)
 //
 //		Device :: ~Device
 //
-// dtor, delete all inputs/outputs on device destruction
+// Destructor, delete all inputs/outputs on device destruction
 //
 ControllerInterface::Device::~Device()
 {
@@ -209,9 +218,9 @@ void ControllerInterface::Device::AddOutput(Output* const o)
 //
 //		Device :: ClearInputState
 //
-// device classes should override this func
-// ControllerInterface will call this when the device returns failure durring UpdateInput
-// used to try to set all buttons and axes to their default state when user unplugs a gamepad durring play
+// Device classes should override this function
+// ControllerInterface will call this when the device returns failure during UpdateInput
+// used to try to set all buttons and axes to their default state when user unplugs a gamepad during play
 // buttons/axes that were held down at the time of unplugging should be seen as not pressed after unplugging
 //
 void ControllerInterface::Device::ClearInputState()
@@ -239,8 +248,10 @@ ControlState ControllerInterface::InputReference::State( const ControlState igno
 
 	// bit of hax for "NOT" to work at start of expression
 	if (ci != ce)
+	{
 		if (ci->mode == 2)
 			state = 1;
+	}
 
 	for (; ci!=ce; ++ci)
 	{
@@ -354,7 +365,8 @@ bool ControllerInterface::DeviceQualifier::operator==(const ControllerInterface:
 		if (name == devq.name)
 			if (source == devq.source)
 				return true;
-	return false;	
+
+	return false;
 }
 
 //
@@ -421,7 +433,9 @@ void ControllerInterface::UpdateReference(ControllerInterface::ControlReference*
 				break;	// no terminating '`' character
 		}
 		else
+		{
 			ctrl_str += c;
+		}
 	}
 }
 
@@ -478,7 +492,9 @@ ControllerInterface::Device::Control* ControllerInterface::InputReference::Detec
 					return *i;
 			}
 			else if ((*i)->GetState() < (1 - INPUT_DETECT_THRESHOLD))
+			{
 				*state = false;
+			}
 		}
 		Common::SleepCurrentThread(10); time += 10;
 	}
@@ -490,8 +506,8 @@ ControllerInterface::Device::Control* ControllerInterface::InputReference::Detec
 //
 //		OutputReference :: Detect
 //
-// totally different from the inputReference detect / i have them combined so it was simplier to make the gui.
-// the gui doesnt know the difference between an input and an output / its odd but i was lazy and it was easy
+// Totally different from the inputReference detect / I have them combined so it was simpler to make the GUI.
+// The GUI doesn't know the difference between an input and an output / it's odd but I was lazy and it was easy
 //
 // set all binded outputs to <range> power for x milliseconds return false
 //
@@ -499,7 +515,7 @@ ControllerInterface::Device::Control* ControllerInterface::OutputReference::Dete
 {
 	// ignore device
 
-	// dont hang if we dont even have any controls mapped
+	// don't hang if we don't even have any controls mapped
 	if (m_controls.size())
 	{
 		State(1);
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.h b/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.h
index b846bb56e8..8c1a044860 100644
--- a/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.h
+++ b/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.h
@@ -29,14 +29,17 @@
 #if defined(__APPLE__)
 	#define CIFACE_USE_OSX
 #endif
-
-// idk in case i wanted to change it to double or somethin, idk what's best
+#ifdef ANDROID
+	#define CIFACE_USE_ANDROID
+#endif
+		
+// idk in case I wanted to change it to double or something, idk what's best
 typedef float ControlState;
 
 //
 //		ControllerInterface
 //
-// some crazy shit i made to control different device inputs and outputs
+// some crazy shit I made to control different device inputs and outputs
 // from lots of different sources, hopefully more easily
 //
 class ControllerInterface
@@ -186,7 +189,7 @@ public:
 	//
 	// these are what you create to actually use the inputs, InputReference or OutputReference
 	//
-	// after being binded to devices and controls with ControllerInterface::UpdateReference,
+	// after being bound to devices and controls with ControllerInterface::UpdateReference,
 	//		each one can link to multiple devices and controls
 	//		when you change a ControlReference's expression,
 	//		you must use ControllerInterface::UpdateReference on it to rebind controls
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInputJoystick.cpp b/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInputJoystick.cpp
index 9bc5364e76..916d142149 100644
--- a/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInputJoystick.cpp
+++ b/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInputJoystick.cpp
@@ -22,13 +22,13 @@ static const struct
 } force_type_names[] =
 {
 	{GUID_ConstantForce, "Constant"},	// DICONSTANTFORCE
-	{GUID_RampForce, "Ramp"},	// DIRAMPFORCE
-	{GUID_Square, "Square"},	// DIPERIODIC ...
+	{GUID_RampForce, "Ramp"},			// DIRAMPFORCE
+	{GUID_Square, "Square"},			// DIPERIODIC ...
 	{GUID_Sine, "Sine"},
 	{GUID_Triangle, "Triangle"},
 	{GUID_SawtoothUp, "Sawtooth Up"},
 	{GUID_SawtoothDown, "Sawtooth Down"},
-	//{GUID_Spring, "Spring"},	// DICUSTOMFORCE ... < i think
+	//{GUID_Spring, "Spring"},			// DICUSTOMFORCE ... < I think
 	//{GUID_Damper, "Damper"},
 	//{GUID_Inertia, "Inertia"},
 	//{GUID_Friction, "Friction"},
@@ -70,9 +70,9 @@ void GetXInputGUIDS( std::vector<DWORD>& guids )
 	if( FAILED(hr) || pIWbemLocator == NULL )
 		goto LCleanup;
 
-	bstrNamespace = SysAllocString( L"\\\\.\\root\\cimv2" );if( bstrNamespace == NULL ) goto LCleanup;		
-	bstrClassName = SysAllocString( L"Win32_PNPEntity" );   if( bstrClassName == NULL ) goto LCleanup;		
-	bstrDeviceID  = SysAllocString( L"DeviceID" );			if( bstrDeviceID == NULL )  goto LCleanup;		
+	bstrNamespace = SysAllocString( L"\\\\.\\root\\cimv2" );if( bstrNamespace == NULL ) goto LCleanup;
+	bstrClassName = SysAllocString( L"Win32_PNPEntity" );   if( bstrClassName == NULL ) goto LCleanup;
+	bstrDeviceID  = SysAllocString( L"DeviceID" );			if( bstrDeviceID == NULL )  goto LCleanup;
 	
 	// Connect to WMI 
 	hr = pIWbemLocator->ConnectServer( bstrNamespace, NULL, NULL, 0L, 0L, NULL, NULL, &pIWbemServices );
@@ -81,7 +81,7 @@ void GetXInputGUIDS( std::vector<DWORD>& guids )
 
 	// Switch security level to IMPERSONATE. 
 	CoSetProxyBlanket( pIWbemServices, RPC_C_AUTHN_WINNT, RPC_C_AUTHZ_NONE, NULL, 
-					   RPC_C_AUTHN_LEVEL_CALL, RPC_C_IMP_LEVEL_IMPERSONATE, NULL, EOAC_NONE );					
+					   RPC_C_AUTHN_LEVEL_CALL, RPC_C_IMP_LEVEL_IMPERSONATE, NULL, EOAC_NONE );
 
 	hr = pIWbemServices->CreateInstanceEnum( bstrClassName, 0, NULL, &pEnumDevices ); 
 	if( FAILED(hr) || pEnumDevices == NULL )
@@ -184,7 +184,7 @@ void InitJoystick(IDirectInput8* const idi8, std::vector<ControllerInterface::De
 				}
 
 				Joystick* js = new Joystick(/*&*i, */js_device, name_counts[i->tszInstanceName]++);
-				// only add if it has some inputs/outpus
+				// only add if it has some inputs/outputs
 				if (js->Inputs().size() || js->Outputs().size())
 					devices.push_back(js);
 				else
@@ -196,7 +196,6 @@ void InitJoystick(IDirectInput8* const idi8, std::vector<ControllerInterface::De
 				js_device->Release();
 			}
 		}
-		
 	}
 }
 
@@ -226,7 +225,7 @@ Joystick::Joystick( /*const LPCDIDEVICEINSTANCE lpddi, */const LPDIRECTINPUTDEVI
 	if (FAILED(m_device->GetCapabilities(&js_caps)))
 		return;
 
-	// max of 32 buttons and 4 hats / the limit of the data format i am using
+	// max of 32 buttons and 4 hats / the limit of the data format I am using
 	js_caps.dwButtons = std::min((DWORD)32, js_caps.dwButtons);
 	js_caps.dwPOVs = std::min((DWORD)4, js_caps.dwPOVs);
 
@@ -258,9 +257,9 @@ Joystick::Joystick( /*const LPCDIDEVICEINSTANCE lpddi, */const LPDIRECTINPUTDEVI
 		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
-		// this also checks that the axis is present
+		// but I guess not all devices support setting range
+		// so I getproperty right afterward incase it didn't set.
+		// This also checks that the axis is present
 		if (SUCCEEDED(m_device->GetProperty(DIPROP_RANGE, &range.diph)))
 		{
 			const LONG base = (range.lMin + range.lMax) / 2;
@@ -319,9 +318,13 @@ Joystick::Joystick( /*const LPCDIDEVICEINSTANCE lpddi, */const LPDIRECTINPUTDEVI
 				eff.lpvTypeSpecificParams = &diCF;
 			}
 			else if (1 == f)
+			{
 				eff.cbTypeSpecificParams = sizeof(DIRAMPFORCE);
+			}
 			else
+			{
 				eff.cbTypeSpecificParams = sizeof(DIPERIODIC);
+			}
 			
 			LPDIRECTINPUTEFFECT pEffect;
 			if (SUCCEEDED(m_device->CreateEffect(force_type_names[f].guid, &eff, &pEffect, NULL)))
@@ -400,7 +403,7 @@ bool Joystick::UpdateInput()
 	HRESULT hr = 0;
 
 	// just always poll,
-	// msdn says if this isn't needed it doesnt do anything
+	// MSDN says if this isn't needed it doesn't do anything
 	m_device->Poll();
 
 	if (m_buffered)
@@ -427,7 +430,9 @@ bool Joystick::UpdateInput()
 		}
 	}
 	else
+	{
 		hr = m_device->GetDeviceState(sizeof(m_state_in), &m_state_in);
+	}
 
 	// try reacquire if input lost
 	if (DIERR_INPUTLOST == hr || DIERR_NOTACQUIRED == hr)
@@ -460,12 +465,16 @@ bool Joystick::UpdateOutput()
 				ok_count += SUCCEEDED(i->iface->SetParameters(&eff, DIEP_TYPESPECIFICPARAMS | DIEP_START));
 			}
 			else
+			{
 				ok_count += SUCCEEDED(i->iface->Stop());
+			}
 
 			i->params = NULL;
 		}
 		else
+		{
 			++ok_count;
+		}
 	}
 
 	return (m_state_out.size() == ok_count);
@@ -492,7 +501,9 @@ std::string Joystick::Axis::GetName() const
 	}
 	// slider
 	else
+	{
 		ss << "Slider " << (int)(m_index - 6);
+	}
 
 	ss << (m_range < 0 ? '-' : '+');
 	return ss.str();
@@ -527,7 +538,7 @@ ControlState Joystick::Button::GetState() const
 ControlState Joystick::Hat::GetState() const
 {
 	// can this func be simplified ?
-	// hat centered code from msdn
+	// hat centered code from MSDN
 	if (0xFFFF == LOWORD(m_hat))
 		return 0;
 	return (abs((int)(m_hat / 4500 - m_direction * 2 + 8) % 8 - 4) > 2);
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInputKeyboardMouse.cpp b/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInputKeyboardMouse.cpp
index aea12c065c..ea6452376d 100644
--- a/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInputKeyboardMouse.cpp
+++ b/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInputKeyboardMouse.cpp
@@ -6,7 +6,7 @@
 #include "DInput.h"
 
 	// (lower would be more sensitive) user can lower sensitivity by setting range
-	// seems decent here ( at 8 ), I dont think anyone would need more sensitive than this
+	// seems decent here ( at 8 ), I don't think anyone would need more sensitive than this
 	// and user can lower it much farther than they would want to with the range
 #define MOUSE_AXIS_SENSITIVITY		8
 
@@ -47,7 +47,7 @@ void InitKeyboardMouse(IDirectInput8* const idi8, std::vector<ControllerInterfac
 	hwnd = _hwnd;
 
 	// mouse and keyboard are a combined device, to allow shift+click and stuff
-	// if thats dumb, i will make a VirtualDevice class that just uses ranges of inputs/outputs from other devices
+	// if that's dumb, I will make a VirtualDevice class that just uses ranges of inputs/outputs from other devices
 	// so there can be a separated Keyboard and mouse, as well as combined KeyboardMouse
 
 	LPDIRECTINPUTDEVICE8 kb_device = NULL;
@@ -56,15 +56,19 @@ void InitKeyboardMouse(IDirectInput8* const idi8, std::vector<ControllerInterfac
 	if (SUCCEEDED(idi8->CreateDevice( GUID_SysKeyboard, &kb_device, NULL)))
 	{
 		if (SUCCEEDED(kb_device->SetDataFormat(&c_dfDIKeyboard)))
-		if (SUCCEEDED(kb_device->SetCooperativeLevel(NULL, DISCL_BACKGROUND | DISCL_NONEXCLUSIVE)))
 		{
-			if (SUCCEEDED(idi8->CreateDevice( GUID_SysMouse, &mo_device, NULL )))
+			if (SUCCEEDED(kb_device->SetCooperativeLevel(NULL, DISCL_BACKGROUND | DISCL_NONEXCLUSIVE)))
 			{
-				if (SUCCEEDED(mo_device->SetDataFormat(&c_dfDIMouse2)))
-				if (SUCCEEDED(mo_device->SetCooperativeLevel(NULL, DISCL_BACKGROUND | DISCL_NONEXCLUSIVE)))
+				if (SUCCEEDED(idi8->CreateDevice( GUID_SysMouse, &mo_device, NULL )))
 				{
-					devices.push_back(new KeyboardMouse(kb_device, mo_device));
-					return;
+					if (SUCCEEDED(mo_device->SetDataFormat(&c_dfDIMouse2)))
+					{
+						if (SUCCEEDED(mo_device->SetCooperativeLevel(NULL, DISCL_BACKGROUND | DISCL_NONEXCLUSIVE)))
+						{
+							devices.push_back(new KeyboardMouse(kb_device, mo_device));
+							return;
+						}
+					}
 				}
 			}
 		}
@@ -177,7 +181,7 @@ bool KeyboardMouse::UpdateInput()
 
 	if (SUCCEEDED(kb_hr) && SUCCEEDED(mo_hr))
 	{
-		// need to smooth out the axes, otherwise it doesnt work for shit
+		// need to smooth out the axes, otherwise it doesn't work for shit
 		for (unsigned int i = 0; i < 3; ++i)
 			((&m_state_in.mouse.lX)[i] += (&tmp_mouse.lX)[i]) /= 2;
 
@@ -203,7 +207,9 @@ bool KeyboardMouse::UpdateOutput()
 			memset( this, 0, sizeof(*this) );
 			type = INPUT_KEYBOARD;
 			ki.wVk = key;
-			if (up) ki.dwFlags = KEYEVENTF_KEYUP;
+
+			if (up)
+				ki.dwFlags = KEYEVENTF_KEYUP;
 		}
 	};
 
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/SDL/SDL.cpp b/Source/Core/InputCommon/Src/ControllerInterface/SDL/SDL.cpp
index c5ee3af23f..6c74c55d97 100644
--- a/Source/Core/InputCommon/Src/ControllerInterface/SDL/SDL.cpp
+++ b/Source/Core/InputCommon/Src/ControllerInterface/SDL/SDL.cpp
@@ -34,7 +34,7 @@ void Init( std::vector<ControllerInterface::Device*>& devices )
 	std::map<std::string, int>	name_counts;
 
 	if (SDL_Init( SDL_INIT_FLAGS ) >= 0)
-    {
+	{
 		// joysticks
 		for(int i = 0; i < SDL_NumJoysticks(); ++i)
 		{
@@ -49,7 +49,7 @@ void Init( std::vector<ControllerInterface::Device*>& devices )
 					delete js;
 			}
 		}
-    }
+	}
 }
 
 Joystick::Joystick(SDL_Joystick* const joystick, const int sdl_index, const unsigned int index)
@@ -63,7 +63,7 @@ Joystick::Joystick(SDL_Joystick* const joystick, const int sdl_index, const unsi
 	// "why don't my 360 gamepad triggers/rumble work correctly"
 #ifdef _WIN32
 	// checking the name is probably good (and hacky) enough
-	// but i'll double check with the num of buttons/axes
+	// but I'll double check with the num of buttons/axes
 	std::string lcasename = GetName();
 	std::transform(lcasename.begin(), lcasename.end(), lcasename.begin(), tolower);
 
@@ -204,7 +204,9 @@ void Joystick::ConstantEffect::SetState(const ControlState state)
 		m_effect.effect.constant.length = SDL_HAPTIC_INFINITY;
 	}
 	else
+	{
 		m_effect.effect.type = 0;
+	}
 
 	const Sint16 old = m_effect.effect.constant.level;
 	m_effect.effect.constant.level = state * 0x7FFF;
@@ -220,7 +222,9 @@ void Joystick::RampEffect::SetState(const ControlState state)
 		m_effect.effect.ramp.length = SDL_HAPTIC_INFINITY;
 	}
 	else
+	{
 		m_effect.effect.type = 0;
+	}
 
 	const Sint16 old = m_effect.effect.ramp.start;
 	m_effect.effect.ramp.start = state * 0x7FFF;
@@ -235,15 +239,17 @@ void Joystick::SineEffect::SetState(const ControlState state)
 		m_effect.effect.type = SDL_HAPTIC_SINE;
 		m_effect.effect.periodic.length = 250;
 	}
-	else {
+	else
+	{
 		m_effect.effect.type = 0;
 	}
 
 	const Sint16 old = m_effect.effect.periodic.magnitude;
-        m_effect.effect.periodic.period = 5;
+	m_effect.effect.periodic.period = 5;
 	m_effect.effect.periodic.magnitude = state * 0x5000;
-        m_effect.effect.periodic.attack_length = 0;
-        m_effect.effect.periodic.fade_length = 500;
+	m_effect.effect.periodic.attack_length = 0;
+	m_effect.effect.periodic.fade_length = 500;
+
 	if (old != m_effect.effect.periodic.magnitude)
 		m_effect.changed = true;
 }
@@ -255,15 +261,17 @@ void Joystick::SquareEffect::SetState(const ControlState state)
 		m_effect.effect.type = SDL_HAPTIC_SQUARE;
 		m_effect.effect.periodic.length = 250;
 	}
-	else {
+	else
+	{
 		m_effect.effect.type = 0;
 	}
 
 	const Sint16 old = m_effect.effect.periodic.magnitude;
-        m_effect.effect.periodic.period = 5;
+	m_effect.effect.periodic.period = 5;
 	m_effect.effect.periodic.magnitude = state * 0x5000;
-        m_effect.effect.periodic.attack_length = 0;
-        m_effect.effect.periodic.fade_length = 100;
+	m_effect.effect.periodic.attack_length = 0;
+	m_effect.effect.periodic.fade_length = 100;
+
 	if (old != m_effect.effect.periodic.magnitude)
 		m_effect.changed = true;
 }
@@ -275,15 +283,17 @@ void Joystick::TriangleEffect::SetState(const ControlState state)
 		m_effect.effect.type = SDL_HAPTIC_TRIANGLE;
 		m_effect.effect.periodic.length = 250;
 	}
-	else {
+	else
+	{
 		m_effect.effect.type = 0;
 	}
 
 	const Sint16 old = m_effect.effect.periodic.magnitude;
-        m_effect.effect.periodic.period = 5;
+	m_effect.effect.periodic.period = 5;
 	m_effect.effect.periodic.magnitude = state * 0x5000;
-        m_effect.effect.periodic.attack_length = 0;
-        m_effect.effect.periodic.fade_length = 100;
+	m_effect.effect.periodic.attack_length = 0;
+	m_effect.effect.periodic.fade_length = 100;
+
 	if (old != m_effect.effect.periodic.magnitude)
 		m_effect.changed = true;
 }
@@ -316,7 +326,9 @@ bool Joystick::UpdateOutput()
 			else	// effect is already uploaded
 			{
 				if (i->effect.type)	// if ouputstate >0
+				{
 					SDL_HapticUpdateEffect(m_haptic, i->id, &i->effect);	// update the effect
+				}
 				else
 				{
 					SDL_HapticStopEffect(m_haptic, i->id);	// else, stop and remove the effect
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/XInput/XInput.cpp b/Source/Core/InputCommon/Src/ControllerInterface/XInput/XInput.cpp
index 7fe54d0d09..3c7f3c48ae 100644
--- a/Source/Core/InputCommon/Src/ControllerInterface/XInput/XInput.cpp
+++ b/Source/Core/InputCommon/Src/ControllerInterface/XInput/XInput.cpp
@@ -31,13 +31,13 @@ static const struct
 	{ "Thumb R", XINPUT_GAMEPAD_RIGHT_THUMB }
 };
 
-static const char* const named_triggers[] =	
+static const char* const named_triggers[] =
 {
 	"Trigger L",
 	"Trigger R"
 };
 
-static const char* const named_axes[] =	
+static const char* const named_axes[] =
 {
 	"Left X",
 	"Left Y",
@@ -45,7 +45,7 @@ static const char* const named_axes[] =
 	"Right Y"
 };
 
-static const char* const named_motors[] =	
+static const char* const named_motors[] =
 {
 	"Motor L",
 	"Motor R"
@@ -66,17 +66,19 @@ Device::Device(const XINPUT_CAPABILITIES& caps, u8 index)
 	ZeroMemory(&m_current_state_out, sizeof(m_current_state_out));
 
 	// XInputGetCaps seems to always claim all capabilities are supported
-	// but i will leave all this stuff in, incase m$ fixes xinput up a bit
+	// but I will leave all this stuff in, incase m$ fixes xinput up a bit
 
 	// get supported buttons
 	for (int i = 0; i != sizeof(named_buttons)/sizeof(*named_buttons); ++i)
+	{
 		if (named_buttons[i].bitmask & caps.Gamepad.wButtons)
 			AddInput(new Button(i, m_state_in.Gamepad.wButtons));
+	}
 
 	// get supported triggers
 	for (int i = 0; i != sizeof(named_triggers)/sizeof(*named_triggers); ++i)
 	{
-		//BYTE val = (&caps.Gamepad.bLeftTrigger)[i];	// should be max value / msdn lies
+		//BYTE val = (&caps.Gamepad.bLeftTrigger)[i];	// should be max value / MSDN lies
 		if ((&caps.Gamepad.bLeftTrigger)[i])
 			AddInput(new Trigger(i, (&m_state_in.Gamepad.bLeftTrigger)[i], 255 ));
 	}
@@ -84,7 +86,7 @@ Device::Device(const XINPUT_CAPABILITIES& caps, u8 index)
 	// get supported axes
 	for (int i = 0; i != sizeof(named_axes)/sizeof(*named_axes); ++i)
 	{
-		//SHORT val = (&caps.Gamepad.sThumbLX)[i];  // xinput doesnt give the range / msdn is lier
+		//SHORT val = (&caps.Gamepad.sThumbLX)[i];  // xinput doesn't give the range / MSDN is a liar
 		if ((&caps.Gamepad.sThumbLX)[i])
 		{
 			const SHORT& ax = (&m_state_in.Gamepad.sThumbLX)[i];
@@ -114,8 +116,8 @@ void Device::ClearInputState()
 std::string Device::GetName() const
 {
 	// why aren't these defined
-	// subtype doesn't seem to work, i tested with 2 diff arcade sticks, both were shown as gamepad
-	// ill leave it in anyway, maybe m$ will fix it
+	// subtype doesn't seem to work, I tested with 2 different arcade sticks, both were shown as gamepad
+	// I'll leave it in anyway, maybe m$ will fix it
 
 	switch (m_subtype)
 	{
@@ -140,7 +142,7 @@ std::string Device::GetSource() const
 	return "XInput";
 }
 
-// update i/o
+// Update I/O
 
 bool Device::UpdateInput()
 {
@@ -157,7 +159,9 @@ bool Device::UpdateOutput()
 		return (ERROR_SUCCESS == XInputSetState(m_index, &m_state_out));
 	}
 	else
+	{
 		return true;
+	}
 }
 
 // GET name/source/id
diff --git a/Source/Core/InputCommon/Src/GCPadStatus.h b/Source/Core/InputCommon/Src/GCPadStatus.h
index 835089a70d..c94f0b7fe8 100644
--- a/Source/Core/InputCommon/Src/GCPadStatus.h
+++ b/Source/Core/InputCommon/Src/GCPadStatus.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _GCPAD_H_INCLUDED__
 #define _GCPAD_H_INCLUDED__
diff --git a/Source/Core/InputCommon/Src/InputConfig.cpp b/Source/Core/InputCommon/Src/InputConfig.cpp
index 1988a9ebb7..65529b0a3f 100644
--- a/Source/Core/InputCommon/Src/InputConfig.cpp
+++ b/Source/Core/InputCommon/Src/InputConfig.cpp
@@ -1,19 +1,6 @@
-// Copyright (C) 2010 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "InputConfig.h"
 #include "../../Core/Src/ConfigManager.h"
@@ -78,7 +65,10 @@ bool InputPlugin::LoadConfig(bool isGC)
 				(*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 71505bb935..0d14f325d1 100644
--- a/Source/Core/InputCommon/Src/InputConfig.h
+++ b/Source/Core/InputCommon/Src/InputConfig.h
@@ -1,19 +1,6 @@
-// Copyright (C) 2010 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _CONFIG_H_
 #define _CONFIG_H_
diff --git a/Source/Core/InputCommon/Src/UDPWiimote.cpp b/Source/Core/InputCommon/Src/UDPWiimote.cpp
index f14f9ed7e2..e0cf787e0f 100644
--- a/Source/Core/InputCommon/Src/UDPWiimote.cpp
+++ b/Source/Core/InputCommon/Src/UDPWiimote.cpp
@@ -96,32 +96,39 @@ UDPWiimote::UDPWiimote(const char *_port, const char * name, int _index) :
 	hints.ai_socktype = SOCK_DGRAM;
 	hints.ai_flags = AI_PASSIVE; // use my IP
 	
-	if (!int_port){
+	if (!int_port)
+	{
 		cleanup;
 		err=-1;
 		return;
 	}
 	
-	if ((rv = getaddrinfo(NULL, _port, &hints, &servinfo)) != 0) {
+	if ((rv = getaddrinfo(NULL, _port, &hints, &servinfo)) != 0)
+	{
 		cleanup;
 		err=-1;
 		return;
 	}
 
 	// loop through all the results and bind to everything we can
-	for(p = servinfo; p != NULL; p = p->ai_next) {
+	for(p = servinfo; p != NULL; p = p->ai_next)
+	{
 		sock_t sock;
-		if ((sock = socket(p->ai_family, p->ai_socktype, p->ai_protocol)) == BAD_SOCK) {
+		if ((sock = socket(p->ai_family, p->ai_socktype, p->ai_protocol)) == BAD_SOCK)
+		{
 			continue;
 		}
-		if (bind(sock, p->ai_addr, (int)p->ai_addrlen) == -1) {
+
+		if (bind(sock, p->ai_addr, (int)p->ai_addrlen) == -1)
+		{
 			close(sock);
 			continue;
 		}
 		d->sockfds.push_back(sock);
 	}
 	
-	if (d->sockfds.empty()) {
+	if (d->sockfds.empty())
+	{
 		cleanup;
 		err=-2;
 		return;
@@ -170,7 +177,9 @@ void UDPWiimote::mainThread()
 			timeout.tv_sec=1;
 			timeout.tv_usec=500000;
 			broadcastPresence();
-		} else {
+		}
+		else
+		{
 			tleft-=telapsed;
 			timeout.tv_sec=(long)(tleft/1000);
 			timeout.tv_usec=(tleft%1000)*1000;
@@ -186,6 +195,7 @@ void UDPWiimote::mainThread()
 		if (rt)
 		{
 			for (std::list<sock_t>::iterator i=d->sockfds.begin(); i!=d->sockfds.end(); i++)
+			{
 				if (FD_ISSET(*i,&fds))
 				{
 					sock_t fd=*i;
@@ -206,11 +216,14 @@ void UDPWiimote::mainThread()
 						if (pharsePacket(bf,size)==0)
 						{
 							//NOTICE_LOG(WIIMOTE,"UDPWII New pack");
-						} else {
+						}
+						else
+						{
 							//NOTICE_LOG(WIIMOTE,"UDPWII Wrong pack format... ignoring");
 						}
 					}
 				}
+			}
 		}
 	} while (!(d->exit));
 }
@@ -230,16 +243,18 @@ UDPWiimote::~UDPWiimote()
 	delete d;
 }
 
-#define ACCEL_FLAG (1<<0)
-#define BUTT_FLAG (1<<1)
-#define IR_FLAG (1<<2)
-#define NUN_FLAG (1<<3)
-#define NUNACCEL_FLAG (1<<4)
+#define ACCEL_FLAG    (1 << 0)
+#define BUTT_FLAG     (1 << 1)
+#define IR_FLAG       (1 << 2)
+#define NUN_FLAG      (1 << 3)
+#define NUNACCEL_FLAG (1 << 4)
 
 int UDPWiimote::pharsePacket(u8 * bf, size_t size)
 {
-	if (size<3) return -1;
-	if (bf[0]!=0xde)
+	if (size < 3)
+		return -1;
+
+	if (bf[0] != 0xde)
 		return -1;
 	//if (bf[1]==0)
 	//	time=0;
@@ -247,9 +262,11 @@ int UDPWiimote::pharsePacket(u8 * bf, size_t size)
 	//	return -1;
 	//time=bf[1];
 	u32 *p=(u32*)(&bf[3]);
-	if (bf[2]&ACCEL_FLAG)
+	if (bf[2] & ACCEL_FLAG)
 	{
-		if ((size-(((u8*)p)-bf))<12) return -1;
+		if ((size-(((u8*)p)-bf)) < 12)
+			return -1;
+
 		double ux,uy,uz;
 		ux=(double)((s32)ntohl(*p)); p++;
 		uy=(double)((s32)ntohl(*p)); p++;
@@ -258,27 +275,39 @@ int UDPWiimote::pharsePacket(u8 * bf, size_t size)
 		y=uy/1048576;
 		z=uz/1048576;
 	}
-	if (bf[2]&BUTT_FLAG)
+
+	if (bf[2] & BUTT_FLAG)
 	{
-		if ((size-(((u8*)p)-bf))<4) return -1;
+		if ((size-(((u8*)p)-bf)) < 4)
+			return -1;
+
 		mask=ntohl(*p); p++;
 	}
-	if (bf[2]&IR_FLAG)
+
+	if (bf[2] & IR_FLAG)
 	{
-		if ((size-(((u8*)p)-bf))<8) return -1;
+		if ((size-(((u8*)p)-bf)) < 8)
+			return -1;
+
 		pointerX=((double)((s32)ntohl(*p)))/1048576; p++;
 		pointerY=((double)((s32)ntohl(*p)))/1048576; p++;
 	}
-	if (bf[2]&NUN_FLAG)
+
+	if (bf[2] & NUN_FLAG)
 	{
-		if ((size-(((u8*)p)-bf))<9) return -1;
+		if ((size-(((u8*)p)-bf)) < 9)
+			return -1;
+
 		nunMask=*((u8*)p); p=(u32*)(((u8*)p)+1);
 		nunX=((double)((s32)ntohl(*p)))/1048576; p++;
 		nunY=((double)((s32)ntohl(*p)))/1048576; p++;
 	}
-	if (bf[2]&NUNACCEL_FLAG)
+
+	if (bf[2] & NUNACCEL_FLAG)
 	{
-		if ((size-(((u8*)p)-bf))<12) return -1;
+		if ((size-(((u8*)p)-bf)) < 12)
+			return -1;
+
 		double ux,uy,uz;
 		ux=(double)((s32)ntohl(*p)); p++;
 		uy=(double)((s32)ntohl(*p)); p++;
@@ -287,6 +316,7 @@ int UDPWiimote::pharsePacket(u8 * bf, size_t size)
 		naY=uy/1048576;
 		naZ=uz/1048576;
 	}
+
 	return 0;
 }
 
@@ -314,7 +344,7 @@ void UDPWiimote::broadcastIPv4(const void * data, size_t size)
 	their_addr.sin_family = AF_INET;
 	their_addr.sin_port = htons(4431);
 	their_addr.sin_addr.s_addr = INADDR_BROADCAST;
-    memset(their_addr.sin_zero, '\0', sizeof their_addr.sin_zero);
+	memset(their_addr.sin_zero, '\0', sizeof their_addr.sin_zero);
 	
 	int num;
 	if ((num=sendto(d->bipv4_fd,(const dataz)data,(int)size,0,(struct sockaddr *) &their_addr, sizeof their_addr)) == -1)
diff --git a/Source/Core/InputCommon/Src/UDPWiimote.h b/Source/Core/InputCommon/Src/UDPWiimote.h
index 1be83dbf74..01b9b11969 100644
--- a/Source/Core/InputCommon/Src/UDPWiimote.h
+++ b/Source/Core/InputCommon/Src/UDPWiimote.h
@@ -37,7 +37,7 @@ public:
 private:
 	std::string port,displayName;
 	int pharsePacket(u8 * data, size_t size);
-	struct _d; //using pimpl because Winsock2.h doesen't have include guards -_-
+	struct _d; //using pimpl because Winsock2.h doesn't have include guards -_-
 	_d *d; 
 	double x,y,z;
 	double naX,naY,naZ;
diff --git a/Source/Core/VideoCommon/Src/AVIDump.cpp b/Source/Core/VideoCommon/Src/AVIDump.cpp
index fefb09fecb..0910381d74 100644
--- a/Source/Core/VideoCommon/Src/AVIDump.cpp
+++ b/Source/Core/VideoCommon/Src/AVIDump.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #if defined(__FreeBSD__)
 #define __STDC_CONSTANT_MACROS 1
@@ -102,8 +89,10 @@ bool AVIDump::CreateFile()
 		return false;
 	}
 
-	if (!m_fileCount) {
-		if (!SetCompressionOptions()) {
+	if (!m_fileCount)
+	{
+		if (!SetCompressionOptions())
+		{
 			NOTICE_LOG(VIDEO, "SetCompressionOptions failed");
 			Stop();
 			return false;
diff --git a/Source/Core/VideoCommon/Src/AVIDump.h b/Source/Core/VideoCommon/Src/AVIDump.h
index 08ab6be254..dced69887e 100644
--- a/Source/Core/VideoCommon/Src/AVIDump.h
+++ b/Source/Core/VideoCommon/Src/AVIDump.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _AVIDUMP_H
 #define _AVIDUMP_H
diff --git a/Source/Core/VideoCommon/Src/BPFunctions.cpp b/Source/Core/VideoCommon/Src/BPFunctions.cpp
index 8dd24f4ed1..9f4f4f3060 100644
--- a/Source/Core/VideoCommon/Src/BPFunctions.cpp
+++ b/Source/Core/VideoCommon/Src/BPFunctions.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "BPFunctions.h"
 #include "Common.h"
diff --git a/Source/Core/VideoCommon/Src/BPFunctions.h b/Source/Core/VideoCommon/Src/BPFunctions.h
index e7a8b0aeb4..addf1cf741 100644
--- a/Source/Core/VideoCommon/Src/BPFunctions.h
+++ b/Source/Core/VideoCommon/Src/BPFunctions.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 
 // ------------------------------------------
diff --git a/Source/Core/VideoCommon/Src/BPMemory.cpp b/Source/Core/VideoCommon/Src/BPMemory.cpp
index 38489bcf7a..e917632e1f 100644
--- a/Source/Core/VideoCommon/Src/BPMemory.cpp
+++ b/Source/Core/VideoCommon/Src/BPMemory.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "Common.h"
 #include "BPMemory.h"
diff --git a/Source/Core/VideoCommon/Src/BPMemory.h b/Source/Core/VideoCommon/Src/BPMemory.h
index 5154e2f5b0..0ae29a3022 100644
--- a/Source/Core/VideoCommon/Src/BPMemory.h
+++ b/Source/Core/VideoCommon/Src/BPMemory.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _BPMEMORY_H
 #define _BPMEMORY_H
@@ -100,17 +87,17 @@
 #define BPMEM_FOGPARAM3        0xF1
 #define BPMEM_FOGCOLOR         0xF2
 #define BPMEM_ALPHACOMPARE     0xF3
-#define BPMEM_BIAS			   0xF4
-#define BPMEM_ZTEX2			   0xF5
+#define BPMEM_BIAS             0xF4
+#define BPMEM_ZTEX2            0xF5
 #define BPMEM_TEV_KSEL         0xF6 // 0xF6 + 8
 #define BPMEM_BP_MASK          0xFE
 
 
 // Tev/combiner things
 
-#define TEVSCALE_1 0
-#define TEVSCALE_2 1
-#define TEVSCALE_4 2
+#define TEVSCALE_1  0
+#define TEVSCALE_2  1
+#define TEVSCALE_4  2
 #define TEVDIVIDE_2 3
 
 #define TEVCMP_R8    0
@@ -149,27 +136,27 @@
 #define TEVCOLORARG_ZERO 15
 
 #define TEVALPHAARG_APREV 0
-#define TEVALPHAARG_A0 1
-#define TEVALPHAARG_A1 2
-#define TEVALPHAARG_A2 3
-#define TEVALPHAARG_TEXA 4
-#define TEVALPHAARG_RASA 5
+#define TEVALPHAARG_A0    1
+#define TEVALPHAARG_A1    2
+#define TEVALPHAARG_A2    3
+#define TEVALPHAARG_TEXA  4
+#define TEVALPHAARG_RASA  5
 #define TEVALPHAARG_KONST 6
-#define TEVALPHAARG_ZERO 7
+#define TEVALPHAARG_ZERO  7
 
-#define GX_TEVPREV              0
-#define GX_TEVREG0              1
-#define GX_TEVREG1              2
-#define GX_TEVREG2              3
+#define GX_TEVPREV       0
+#define GX_TEVREG0       1
+#define GX_TEVREG1       2
+#define GX_TEVREG2       3
 
-#define ALPHACMP_NEVER 0
-#define ALPHACMP_LESS 1
-#define ALPHACMP_EQUAL 2
-#define ALPHACMP_LEQUAL 3
+#define ALPHACMP_NEVER   0
+#define ALPHACMP_LESS    1
+#define ALPHACMP_EQUAL   2
+#define ALPHACMP_LEQUAL  3
 #define ALPHACMP_GREATER 4
-#define ALPHACMP_NEQUAL 5
-#define ALPHACMP_GEQUAL 6
-#define ALPHACMP_ALWAYS 7
+#define ALPHACMP_NEQUAL  5
+#define ALPHACMP_GEQUAL  6
+#define ALPHACMP_ALWAYS  7
 
 enum Compare
 {
@@ -331,26 +318,26 @@ struct TevStageCombiner
 #define ITF_3 3
 
 #define ITB_NONE 0
-#define ITB_S 1
-#define ITB_T 2
-#define ITB_ST 3
-#define ITB_U 4
-#define ITB_SU 5
-#define ITB_TU 6
-#define ITB_STU 7
+#define ITB_S    1
+#define ITB_T    2
+#define ITB_ST   3
+#define ITB_U    4
+#define ITB_SU   5
+#define ITB_TU   6
+#define ITB_STU  7
 
 #define ITBA_OFF 0
-#define ITBA_S 1
-#define ITBA_T 2
-#define ITBA_U 3
+#define ITBA_S   1
+#define ITBA_T   2
+#define ITBA_U   3
 
 #define ITW_OFF 0
 #define ITW_256 1
 #define ITW_128 2
-#define ITW_64 3
-#define ITW_32 4
-#define ITW_16 5
-#define ITW_0 6
+#define ITW_64  3
+#define ITW_32  4
+#define ITW_16  5
+#define ITW_0   6
 
 // several discoveries:
 // GXSetTevIndBumpST(tevstage, indstage, matrixind)
@@ -384,7 +371,7 @@ struct TevStageCombiner
 			u32 unused : 11;
 		};
 
-		bool IsActive() { return (hex&0x17fe00)!=0; }
+		bool IsActive() { return (hex & 0x17fe00) != 0; }
 	};
 
 	union TwoTevStageOrders
@@ -482,7 +469,7 @@ union TexImage0
 {
 	struct 
 	{
-		u32 width : 10; //actually w-1
+		u32 width  : 10; //actually w-1
 		u32 height : 10; //actually h-1
 		u32 format : 4;
 	};
@@ -560,14 +547,14 @@ union ZTex2
 
 struct FourTexUnits
 {
-	TexMode0 texMode0[4]; 
-	TexMode1 texMode1[4]; 
-	TexImage0 texImage0[4]; 
-	TexImage1 texImage1[4]; 
-	TexImage2 texImage2[4]; 
-	TexImage3 texImage3[4]; 
-	TexTLUT texTlut[4];   
-	u32 unknown[4];   
+	TexMode0 texMode0[4];
+	TexMode1 texMode1[4];
+	TexImage0 texImage0[4];
+	TexImage1 texImage1[4];
+	TexImage2 texImage2[4];
+	TexImage3 texImage3[4];
+	TexTLUT texTlut[4];
+	u32 unknown[4];
 };
 
 
@@ -626,6 +613,17 @@ union X10Y10
 
 // Framebuffer/pixel stuff (incl fog)
 
+#define GX_BL_ZERO         0
+#define GX_BL_ONE          1
+#define GX_BL_SRCCLR       2 // for dst factor
+#define GX_BL_INVSRCCLR    3 // for dst factor
+#define GX_BL_SRCALPHA     4
+#define GX_BL_INVSRCALPHA  5
+#define GX_BL_DSTALPHA     6
+#define GX_BL_INVDSTALPHA  7
+#define GX_BL_DSTCLR       GX_BL_SRCCLR // for src factor
+#define GX_BL_INVDSTCLR    GX_BL_INVSRCCLR // for src factor
+
 union BlendMode
 {
 	struct 
@@ -653,7 +651,8 @@ union FogParam0
 		u32 sign : 1;
 	};
 
-	float GetA() {
+	float GetA()
+	{
 		union { u32 i; float f; } dummy;
 		dummy.i = ((u32)sign << 31) | ((u32)exponent << 23) | ((u32)mantissa << 12); // scale mantissa from 11 to 23 bits
 		return dummy.f;
@@ -674,7 +673,8 @@ union FogParam3
 	};
 
 	// amount to subtract from eyespacez after range adjustment
-	float GetC() { 
+	float GetC()
+	{ 
 		union { u32 i; float f; } dummy;
 		dummy.i = ((u32)c_sign << 31) | ((u32)c_exp << 23) | ((u32)c_mant << 12); // scale mantissa from 11 to 23 bits
 		return dummy.f;
@@ -913,7 +913,8 @@ union UPE_Copy
 union BPU_PreloadTileInfo
 {
 	u32 hex;
-	struct {
+	struct
+	{
 		u32 count : 15;
 		u32 type : 2;
 	};
diff --git a/Source/Core/VideoCommon/Src/BPStructs.cpp b/Source/Core/VideoCommon/Src/BPStructs.cpp
index 9580eea447..314041f894 100644
--- a/Source/Core/VideoCommon/Src/BPStructs.cpp
+++ b/Source/Core/VideoCommon/Src/BPStructs.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include <cmath>
 
@@ -115,7 +102,9 @@ void BPWritten(const BPCmd& bp)
 		if (!mapTexFound)
 		{
 			if (bp.address != BPMEM_TEV_COLOR_ENV && bp.address != BPMEM_TEV_ALPHA_ENV)
+			{
 				numWrites = 0;
+			}
 			else if (++numWrites >= 100)	// seem that if 100 consecutive BP writes are called to either of these addresses in ZTP, 
 			{								// then it is safe to assume the map texture address is currently loaded into the BP memory
 				mapTexAddress = bpmem.tex[0].texImage3[0].hex << 5;
@@ -206,15 +195,19 @@ void BPWritten(const BPCmd& bp)
 				PRIM_LOG("blendmode: en=%d, open=%d, colupd=%d, alphaupd=%d, dst=%d, src=%d, sub=%d, mode=%d", 
 					bpmem.blendmode.blendenable, bpmem.blendmode.logicopenable, bpmem.blendmode.colorupdate, bpmem.blendmode.alphaupdate,
 					bpmem.blendmode.dstfactor, bpmem.blendmode.srcfactor, bpmem.blendmode.subtract, bpmem.blendmode.logicmode);
+
 				// Set LogicOp Blending Mode
 				if (bp.changes & 2)
 					SetLogicOpMode();
+
 				// Set Dithering Mode
 				if (bp.changes & 4)
 					SetDitherMode();
+
 				// Set Blending Mode
 				if (bp.changes & 0xFF1)
 					SetBlendMode();
+
 				// Set Color Mask
 				if (bp.changes & 0x18)
 					SetColorMask();
@@ -426,32 +419,35 @@ void BPWritten(const BPCmd& bp)
 	case BPMEM_CLEARBBOX1:
 	case BPMEM_CLEARBBOX2:
 		{
-		if(g_ActiveConfig.bUseBBox)
-		{
-			// Don't compute bounding box if this frame is being skipped!
-			// Wrong but valid values are better than bogus values...
-			if(g_bSkipCurrentFrame)
-				break;
+			if(g_ActiveConfig.bUseBBox)
+			{
+				// Don't compute bounding box if this frame is being skipped!
+				// Wrong but valid values are better than bogus values...
+				if(g_bSkipCurrentFrame)
+					break;
 
-			if (bp.address == BPMEM_CLEARBBOX1) {
-				int right = bp.newvalue >> 10;
-				int left = bp.newvalue & 0x3ff;
+				if (bp.address == BPMEM_CLEARBBOX1)
+				{
+					int right = bp.newvalue >> 10;
+					int left = bp.newvalue & 0x3ff;
 			
-				// We should only set these if bbox is calculated properly.
-				PixelEngine::bbox[0] = left;
-				PixelEngine::bbox[1] = right;
-				PixelEngine::bbox_active = true;
-			} else {
-				int bottom = bp.newvalue >> 10;
-				int top = bp.newvalue & 0x3ff;
+					// We should only set these if bbox is calculated properly.
+					PixelEngine::bbox[0] = left;
+					PixelEngine::bbox[1] = right;
+					PixelEngine::bbox_active = true;
+				}
+				else
+				{
+					int bottom = bp.newvalue >> 10;
+					int top = bp.newvalue & 0x3ff;
 
-				// We should only set these if bbox is calculated properly.
-				PixelEngine::bbox[2] = top;
-				PixelEngine::bbox[3] = bottom;
-				PixelEngine::bbox_active = true;
+					// We should only set these if bbox is calculated properly.
+					PixelEngine::bbox[2] = top;
+					PixelEngine::bbox[3] = bottom;
+					PixelEngine::bbox_active = true;
+				}
 			}
 		}
-		}
 		break;
 	case BPMEM_TEXINVALIDATE:
 		// TODO: Needs some restructuring in TextureCacheBase.
@@ -459,7 +455,8 @@ void BPWritten(const BPCmd& bp)
 
 	case BPMEM_ZCOMPARE:      // Set the Z-Compare and EFB pixel format
 		OnPixelFormatChange();
-		if(bp.changes & 7) {
+		if(bp.changes & 7)
+		{
 			SetBlendMode(); // dual source could be activated by changing to PIXELFMT_RGBA6_Z24
 			g_renderer->SetColorMask(); // alpha writing needs to be disabled if the new pixel format doesn't have an alpha channel
 		}
diff --git a/Source/Core/VideoCommon/Src/BPStructs.h b/Source/Core/VideoCommon/Src/BPStructs.h
index 38b3d3a3d4..72a0409f8b 100644
--- a/Source/Core/VideoCommon/Src/BPStructs.h
+++ b/Source/Core/VideoCommon/Src/BPStructs.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _BPSTRUCTS_H_
 #define _BPSTRUCTS_H_
diff --git a/Source/Core/VideoCommon/Src/CPMemory.cpp b/Source/Core/VideoCommon/Src/CPMemory.cpp
index abf69abc57..fd8874d156 100644
--- a/Source/Core/VideoCommon/Src/CPMemory.cpp
+++ b/Source/Core/VideoCommon/Src/CPMemory.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "Common.h"
 #include "CPMemory.h"
diff --git a/Source/Core/VideoCommon/Src/CPMemory.h b/Source/Core/VideoCommon/Src/CPMemory.h
index 145f18aca7..28bc3d7d95 100644
--- a/Source/Core/VideoCommon/Src/CPMemory.h
+++ b/Source/Core/VideoCommon/Src/CPMemory.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _CPMEMORY_H
 #define _CPMEMORY_H
@@ -101,7 +88,9 @@ union TVtxDesc
 		u32 Tex7Coord	: 2;
 		u32				:31;
 	};
-	struct {
+
+	struct
+	{
 		u32 Hex0, Hex1;
 	};
 };
diff --git a/Source/Core/VideoCommon/Src/CommandProcessor.cpp b/Source/Core/VideoCommon/Src/CommandProcessor.cpp
index dacec67823..5c3848de4f 100644
--- a/Source/Core/VideoCommon/Src/CommandProcessor.cpp
+++ b/Source/Core/VideoCommon/Src/CommandProcessor.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "Common.h"
 #include "VideoCommon.h"
@@ -80,9 +67,9 @@ void UpdateInterrupts_Wrapper(u64 userdata, int cyclesLate)
 
 void DoState(PointerWrap &p)
 {
-	p.Do(m_CPStatusReg);
-	p.Do(m_CPCtrlReg);
-	p.Do(m_CPClearReg);
+	p.DoPOD(m_CPStatusReg);
+	p.DoPOD(m_CPCtrlReg);
+	p.DoPOD(m_CPClearReg);
 	p.Do(m_bboxleft);
 	p.Do(m_bboxtop);
 	p.Do(m_bboxright);
@@ -128,13 +115,13 @@ void Init()
 	fifo.CPCmdIdle  = 1;
 	fifo.CPReadIdle = 1;
 	fifo.bFF_Breakpoint = 0;
-	fifo.bFF_HiWatermark = 0;    
+	fifo.bFF_HiWatermark = 0;
 	fifo.bFF_HiWatermarkInt = 0;
-	fifo.bFF_LoWatermark = 0;    
+	fifo.bFF_LoWatermark = 0;
 	fifo.bFF_LoWatermarkInt = 0;
 
 	interruptSet = false;
-    interruptWaiting = false;
+	interruptWaiting = false;
 	interruptFinishWaiting = false;
 	interruptTokenWaiting = false;
 
@@ -144,7 +131,7 @@ void Init()
 	isHiWatermarkActive = false;
 	isLoWatermarkActive = false;
 
-    et_UpdateInterrupts = CoreTiming::RegisterEvent("CPInterrupt", UpdateInterrupts_Wrapper);
+	et_UpdateInterrupts = CoreTiming::RegisterEvent("CPInterrupt", UpdateInterrupts_Wrapper);
 }
 
 void Read16(u16& _rReturnValue, const u32 _Address)
@@ -152,7 +139,7 @@ void Read16(u16& _rReturnValue, const u32 _Address)
 	INFO_LOG(COMMANDPROCESSOR, "(r): 0x%08x", _Address);
 	switch (_Address & 0xFFF)
 	{
-	case STATUS_REGISTER:		
+	case STATUS_REGISTER:
 		SetCpStatusRegister();
 		_rReturnValue = m_CPStatusReg.Hex;
 		return;
@@ -179,45 +166,53 @@ void Read16(u16& _rReturnValue, const u32 _Address)
 
 	case FIFO_RW_DISTANCE_LO:
 		if (IsOnThread())
+		{
 			if(fifo.CPWritePointer >= fifo.SafeCPReadPointer)
 				_rReturnValue = ReadLow (fifo.CPWritePointer - fifo.SafeCPReadPointer);
 			else
 				_rReturnValue = ReadLow (fifo.CPEnd - fifo.SafeCPReadPointer + fifo.CPWritePointer - fifo.CPBase + 32);
+		}
 		else
+		{
 			_rReturnValue = ReadLow (fifo.CPReadWriteDistance);
-		DEBUG_LOG(COMMANDPROCESSOR, "read FIFO_RW_DISTANCE_LO : %04x", _rReturnValue);
+		}
+		DEBUG_LOG(COMMANDPROCESSOR, "Read FIFO_RW_DISTANCE_LO : %04x", _rReturnValue);
 		return;
 	case FIFO_RW_DISTANCE_HI:
 		if (IsOnThread())
+		{
 			if(fifo.CPWritePointer >= fifo.SafeCPReadPointer)
 				_rReturnValue = ReadHigh (fifo.CPWritePointer - fifo.SafeCPReadPointer);
 			else
 				_rReturnValue = ReadHigh (fifo.CPEnd - fifo.SafeCPReadPointer + fifo.CPWritePointer - fifo.CPBase + 32);
+		}
 		else
+		{
 			_rReturnValue = ReadHigh(fifo.CPReadWriteDistance);
-		DEBUG_LOG(COMMANDPROCESSOR, "read FIFO_RW_DISTANCE_HI : %04x", _rReturnValue);
+		}
+		DEBUG_LOG(COMMANDPROCESSOR, "Read FIFO_RW_DISTANCE_HI : %04x", _rReturnValue);
 		return;
 	case FIFO_WRITE_POINTER_LO:
 		_rReturnValue = ReadLow (fifo.CPWritePointer);
-		DEBUG_LOG(COMMANDPROCESSOR, "read FIFO_WRITE_POINTER_LO : %04x", _rReturnValue);
+		DEBUG_LOG(COMMANDPROCESSOR, "Read FIFO_WRITE_POINTER_LO : %04x", _rReturnValue);
 		return;
 	case FIFO_WRITE_POINTER_HI:
 		_rReturnValue = ReadHigh(fifo.CPWritePointer);
-		DEBUG_LOG(COMMANDPROCESSOR, "read FIFO_WRITE_POINTER_HI : %04x", _rReturnValue);
+		DEBUG_LOG(COMMANDPROCESSOR, "Read FIFO_WRITE_POINTER_HI : %04x", _rReturnValue);
 		return;
 	case FIFO_READ_POINTER_LO:
 		if (IsOnThread())
 			_rReturnValue = ReadLow (fifo.SafeCPReadPointer);
 		else
 			_rReturnValue = ReadLow (fifo.CPReadPointer);
-		DEBUG_LOG(COMMANDPROCESSOR, "read FIFO_READ_POINTER_LO : %04x", _rReturnValue);
+		DEBUG_LOG(COMMANDPROCESSOR, "Read FIFO_READ_POINTER_LO : %04x", _rReturnValue);
 		return;
 	case FIFO_READ_POINTER_HI:
 		if (IsOnThread())
 			_rReturnValue = ReadHigh (fifo.SafeCPReadPointer);
 		else
 			_rReturnValue = ReadHigh (fifo.CPReadPointer);
-		DEBUG_LOG(COMMANDPROCESSOR, "read FIFO_READ_POINTER_HI : %04x", _rReturnValue);
+		DEBUG_LOG(COMMANDPROCESSOR, "Read FIFO_READ_POINTER_HI : %04x", _rReturnValue);
 		return;
 
 	case FIFO_BP_LO: _rReturnValue = ReadLow (fifo.CPBreakpoint); return;
@@ -326,83 +321,83 @@ void Write16(const u16 _Value, const u32 _Address)
 		{
 			UCPClearReg tmpCtrl(_Value);
 			m_CPClearReg.Hex = tmpCtrl.Hex;
-			DEBUG_LOG(COMMANDPROCESSOR,"\t write to CLEAR_REGISTER : %04x", _Value);
+			DEBUG_LOG(COMMANDPROCESSOR,"\t Write to CLEAR_REGISTER : %04x", _Value);
 			SetCpClearRegister();
 		}
 		break;
 
 	case PERF_SELECT:
 		// Seems to select which set of perf registers should be exposed.
-		DEBUG_LOG(COMMANDPROCESSOR, "write to PERF_SELECT: %04x", _Value);
+		DEBUG_LOG(COMMANDPROCESSOR, "Write to PERF_SELECT: %04x", _Value);
 		break;
 
 	// Fifo Registers
 	case FIFO_TOKEN_REGISTER:
 		m_tokenReg = _Value;
-		DEBUG_LOG(COMMANDPROCESSOR,"\t write to FIFO_TOKEN_REGISTER : %04x", _Value);
+		DEBUG_LOG(COMMANDPROCESSOR,"\t Write to FIFO_TOKEN_REGISTER : %04x", _Value);
 		break;
 	case FIFO_BASE_LO:
 		WriteLow ((u32 &)fifo.CPBase, _Value & 0xFFE0);
-		DEBUG_LOG(COMMANDPROCESSOR,"\t write to FIFO_BASE_LO : %04x", _Value);
+		DEBUG_LOG(COMMANDPROCESSOR,"\t Write to FIFO_BASE_LO : %04x", _Value);
 		break;
 	case FIFO_BASE_HI:
 		WriteHigh((u32 &)fifo.CPBase, _Value);
-		DEBUG_LOG(COMMANDPROCESSOR,"\t write to FIFO_BASE_HI : %04x", _Value);
+		DEBUG_LOG(COMMANDPROCESSOR,"\t Write to FIFO_BASE_HI : %04x", _Value);
 		break;
 
 	case FIFO_END_LO:
 		WriteLow ((u32 &)fifo.CPEnd,  _Value & 0xFFE0);
-		DEBUG_LOG(COMMANDPROCESSOR,"\t write to FIFO_END_LO : %04x", _Value);
+		DEBUG_LOG(COMMANDPROCESSOR,"\t Write to FIFO_END_LO : %04x", _Value);
 		break;
 	case FIFO_END_HI:
 		WriteHigh((u32 &)fifo.CPEnd,  _Value);
-		DEBUG_LOG(COMMANDPROCESSOR,"\t write to FIFO_END_HI : %04x", _Value);
+		DEBUG_LOG(COMMANDPROCESSOR,"\t Write to FIFO_END_HI : %04x", _Value);
 		break;
 
 	case FIFO_WRITE_POINTER_LO:
 		WriteLow ((u32 &)fifo.CPWritePointer, _Value & 0xFFE0);
-		DEBUG_LOG(COMMANDPROCESSOR,"\t write to FIFO_WRITE_POINTER_LO : %04x", _Value);
+		DEBUG_LOG(COMMANDPROCESSOR,"\t Write to FIFO_WRITE_POINTER_LO : %04x", _Value);
 		break;
 	case FIFO_WRITE_POINTER_HI:
 		WriteHigh((u32 &)fifo.CPWritePointer, _Value);
-		DEBUG_LOG(COMMANDPROCESSOR,"\t write to FIFO_WRITE_POINTER_HI : %04x", _Value);
+		DEBUG_LOG(COMMANDPROCESSOR,"\t Write to FIFO_WRITE_POINTER_HI : %04x", _Value);
 		break;
 
 	case FIFO_READ_POINTER_LO:
 		WriteLow ((u32 &)fifo.CPReadPointer, _Value & 0xFFE0);
-		DEBUG_LOG(COMMANDPROCESSOR,"\t write to FIFO_READ_POINTER_LO : %04x", _Value);
+		DEBUG_LOG(COMMANDPROCESSOR,"\t Write to FIFO_READ_POINTER_LO : %04x", _Value);
 		break;
 	case FIFO_READ_POINTER_HI:
 		WriteHigh((u32 &)fifo.CPReadPointer, _Value);
 		fifo.SafeCPReadPointer = fifo.CPReadPointer;
-		DEBUG_LOG(COMMANDPROCESSOR,"\t write to FIFO_READ_POINTER_HI : %04x", _Value);
+		DEBUG_LOG(COMMANDPROCESSOR,"\t Write to FIFO_READ_POINTER_HI : %04x", _Value);
 		break;
 
 	case FIFO_HI_WATERMARK_LO:
 		WriteLow ((u32 &)fifo.CPHiWatermark, _Value);
-		DEBUG_LOG(COMMANDPROCESSOR,"\t write to FIFO_HI_WATERMARK_LO : %04x", _Value);
+		DEBUG_LOG(COMMANDPROCESSOR,"\t Write to FIFO_HI_WATERMARK_LO : %04x", _Value);
 		break;
 	case FIFO_HI_WATERMARK_HI:
 		WriteHigh((u32 &)fifo.CPHiWatermark, _Value);
-		DEBUG_LOG(COMMANDPROCESSOR,"\t write to FIFO_HI_WATERMARK_HI : %04x", _Value);
+		DEBUG_LOG(COMMANDPROCESSOR,"\t Write to FIFO_HI_WATERMARK_HI : %04x", _Value);
 		break;
 
 	case FIFO_LO_WATERMARK_LO:
 		WriteLow ((u32 &)fifo.CPLoWatermark, _Value);
-		DEBUG_LOG(COMMANDPROCESSOR,"\t write to FIFO_LO_WATERMARK_LO : %04x", _Value);
+		DEBUG_LOG(COMMANDPROCESSOR,"\t Write to FIFO_LO_WATERMARK_LO : %04x", _Value);
 		break;
 	case FIFO_LO_WATERMARK_HI:
 		WriteHigh((u32 &)fifo.CPLoWatermark, _Value);
-		DEBUG_LOG(COMMANDPROCESSOR,"\t write to FIFO_LO_WATERMARK_HI : %04x", _Value);
+		DEBUG_LOG(COMMANDPROCESSOR,"\t Write to FIFO_LO_WATERMARK_HI : %04x", _Value);
 		break;
 
 	case FIFO_BP_LO:
 		WriteLow ((u32 &)fifo.CPBreakpoint, _Value & 0xFFE0);
-		DEBUG_LOG(COMMANDPROCESSOR,"write to FIFO_BP_LO : %04x", _Value);
+		DEBUG_LOG(COMMANDPROCESSOR,"Write to FIFO_BP_LO : %04x", _Value);
 		break;
 	case FIFO_BP_HI:
 		WriteHigh((u32 &)fifo.CPBreakpoint, _Value);
-		DEBUG_LOG(COMMANDPROCESSOR,"write to FIFO_BP_HI : %04x", _Value);
+		DEBUG_LOG(COMMANDPROCESSOR,"Write to FIFO_BP_HI : %04x", _Value);
 		break;
 
 	case FIFO_RW_DISTANCE_HI:
@@ -417,11 +412,11 @@ void Write16(const u16 _Value, const u32 _Address)
 			ResetVideoBuffer();
 		}
 		IncrementCheckContextId();
-		DEBUG_LOG(COMMANDPROCESSOR,"try to write to FIFO_RW_DISTANCE_HI : %04x", _Value);
+		DEBUG_LOG(COMMANDPROCESSOR,"Try to write to FIFO_RW_DISTANCE_HI : %04x", _Value);
 		break;
 	case FIFO_RW_DISTANCE_LO:
 		WriteLow((u32 &)fifo.CPReadWriteDistance, _Value & 0xFFE0);
-		DEBUG_LOG(COMMANDPROCESSOR,"try to write to FIFO_RW_DISTANCE_LO : %04x", _Value);
+		DEBUG_LOG(COMMANDPROCESSOR,"Try to write to FIFO_RW_DISTANCE_LO : %04x", _Value);
 		break;
 
 	default:
@@ -450,10 +445,12 @@ void STACKALIGN GatherPipeBursted()
 	if (!m_CPCtrlReg.GPLinkEnable)
 	{
 		if (!IsOnThread())
+		{
 			RunGpu();
+		}
 		else
 		{
-			// In multibuffer mode is not allowed write in the same fifo attached to the GPU.
+			// In multibuffer mode is not allowed write in the same FIFO attached to the GPU.
 			// Fix Pokemon XD in DC mode.
 			if((ProcessorInterface::Fifo_CPUEnd == fifo.CPEnd) && (ProcessorInterface::Fifo_CPUBase == fifo.CPBase)
 				 && fifo.CPReadWriteDistance > 0)
@@ -469,7 +466,7 @@ void STACKALIGN GatherPipeBursted()
 	if (IsOnThread())
 		SetCpStatus(true);
 
-	// update the fifo-pointer
+	// update the fifo pointer
 	if (fifo.CPWritePointer >= fifo.CPEnd)
 		fifo.CPWritePointer = fifo.CPBase;
 	else
@@ -480,8 +477,8 @@ void STACKALIGN GatherPipeBursted()
 	if (!IsOnThread())
 		RunGpu();
 
-	_assert_msg_(COMMANDPROCESSOR, fifo.CPReadWriteDistance	<= fifo.CPEnd - fifo.CPBase,
-	"FIFO is overflown by GatherPipe !\nCPU thread is too fast!");
+	_assert_msg_(COMMANDPROCESSOR, fifo.CPReadWriteDistance <= fifo.CPEnd - fifo.CPBase,
+	"FIFO is overflowed by GatherPipe !\nCPU thread is too fast!");
 
 	// check if we are in sync
 	_assert_msg_(COMMANDPROCESSOR, fifo.CPWritePointer	== ProcessorInterface::Fifo_CPUWritePointer, "FIFOs linked but out of sync");
@@ -495,13 +492,13 @@ void UpdateInterrupts(u64 userdata)
 	{
 		interruptSet = true;
 		INFO_LOG(COMMANDPROCESSOR,"Interrupt set");
-		ProcessorInterface::SetInterrupt(INT_CAUSE_CP, true);        
+		ProcessorInterface::SetInterrupt(INT_CAUSE_CP, true);
 	}
 	else
 	{
 		interruptSet = false;
 		INFO_LOG(COMMANDPROCESSOR,"Interrupt cleared");
-		ProcessorInterface::SetInterrupt(INT_CAUSE_CP, false);        
+		ProcessorInterface::SetInterrupt(INT_CAUSE_CP, false);
 	}
 	interruptWaiting = false;
 }
@@ -523,7 +520,7 @@ void SetCpStatus(bool isCPUThread)
 	fifo.bFF_HiWatermark = (fifo.CPReadWriteDistance > fifo.CPHiWatermark);
 	fifo.bFF_LoWatermark = (fifo.CPReadWriteDistance < fifo.CPLoWatermark);
 
-	// breakpoint     
+	// breakpoint
 	if (!isCPUThread)
 	{
 		if (fifo.bFF_BPEnable)
@@ -584,7 +581,9 @@ void SetCpStatus(bool isCPUThread)
 			}
 		}
 		else
+		{
 			CommandProcessor::UpdateInterrupts(userdata);
+		}
 	}
 }
 
diff --git a/Source/Core/VideoCommon/Src/CommandProcessor.h b/Source/Core/VideoCommon/Src/CommandProcessor.h
index 5aa49ac3e8..ce18da4686 100644
--- a/Source/Core/VideoCommon/Src/CommandProcessor.h
+++ b/Source/Core/VideoCommon/Src/CommandProcessor.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _COMMANDPROCESSOR_H
 #define _COMMANDPROCESSOR_H
@@ -88,7 +75,7 @@ enum
 enum
 {
 	GATHER_PIPE_SIZE = 32,
-    INT_CAUSE_CP =  0x800
+	INT_CAUSE_CP =  0x800
 };
 
 // Fifo Status Register
diff --git a/Source/Core/VideoCommon/Src/DLCache.h b/Source/Core/VideoCommon/Src/DLCache.h
index 3df0f4deab..3e12c24ad8 100644
--- a/Source/Core/VideoCommon/Src/DLCache.h
+++ b/Source/Core/VideoCommon/Src/DLCache.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _DLCACHE_H
 #define _DLCACHE_H
diff --git a/Source/Core/VideoCommon/Src/DataReader.h b/Source/Core/VideoCommon/Src/DataReader.h
index 03061229c0..3488642385 100644
--- a/Source/Core/VideoCommon/Src/DataReader.h
+++ b/Source/Core/VideoCommon/Src/DataReader.h
@@ -1,21 +1,6 @@
-// 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/
-
-
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _DATAREADER_H
 #define _DATAREADER_H
diff --git a/Source/Core/VideoCommon/Src/Debugger.cpp b/Source/Core/VideoCommon/Src/Debugger.cpp
index e0024db655..85a9ba61f6 100644
--- a/Source/Core/VideoCommon/Src/Debugger.cpp
+++ b/Source/Core/VideoCommon/Src/Debugger.cpp
@@ -1,20 +1,6 @@
-// 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/
-
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "IniFile.h"
 #include "Debugger.h"
diff --git a/Source/Core/VideoCommon/Src/Debugger.h b/Source/Core/VideoCommon/Src/Debugger.h
index fde31e4268..f8eb6105a1 100644
--- a/Source/Core/VideoCommon/Src/Debugger.h
+++ b/Source/Core/VideoCommon/Src/Debugger.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _GFX_DEBUGGER_H_
 #define _GFX_DEBUGGER_H_
diff --git a/Source/Core/VideoCommon/Src/EmuWindow.cpp b/Source/Core/VideoCommon/Src/EmuWindow.cpp
index bf9da4190b..e8fa26a38b 100644
--- a/Source/Core/VideoCommon/Src/EmuWindow.cpp
+++ b/Source/Core/VideoCommon/Src/EmuWindow.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include <windows.h>
 
@@ -81,6 +68,7 @@ void FreeLookInput( UINT iMsg, WPARAM wParam )
 	static bool mouseMoveEnabled = false;
 	static float lastMouse[2];
 	POINT point;
+
 	switch(iMsg)
 	{
 	case WM_USER_KEYDOWN:
@@ -112,14 +100,16 @@ void FreeLookInput( UINT iMsg, WPARAM wParam )
 		break;
 
 	case WM_MOUSEMOVE:
-		if (mouseLookEnabled) {
+		if (mouseLookEnabled)
+		{
 			GetCursorPos(&point);
 			VertexShaderManager::RotateView((point.x - lastMouse[0]) / 200.0f, (point.y - lastMouse[1]) / 200.0f);
 			lastMouse[0] = (float)point.x;
 			lastMouse[1] = (float)point.y;
 		}
 
-		if (mouseMoveEnabled) {
+		if (mouseMoveEnabled)
+		{
 			GetCursorPos(&point);
 			VertexShaderManager::TranslateView((point.x - lastMouse[0]) / 50.0f, (point.y - lastMouse[1]) / 50.0f);
 			lastMouse[0] = (float)point.x;
@@ -173,8 +163,8 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT iMsg, WPARAM wParam, LPARAM lParam )
 		s_sizing = false;
 		break;
 
-	/* Post the mouse events to the main window, it's nessesary because in difference to the
-	   keyboard inputs these events only appear here, not in the parent window or any other WndProc()*/
+	/* Post the mouse events to the main window, it's necessary, because the difference between the
+	   keyboard inputs is that these events only appear here, not in the parent window or any other WndProc()*/
 	case WM_LBUTTONDOWN:
 		if(g_ActiveConfig.backend_info.bSupports3DVision && g_ActiveConfig.b3DVision)
 		{
@@ -247,7 +237,7 @@ void OSDMenu(WPARAM wParam)
 		OSDChoice = 1;
 		// Toggle native resolution
 		g_Config.iEFBScale = g_Config.iEFBScale + 1;
-		if (g_Config.iEFBScale > 7) g_Config.iEFBScale = 0;
+		if (g_Config.iEFBScale > SCALE_4X) g_Config.iEFBScale = SCALE_AUTO;
 		break;
 	case '4':
 		OSDChoice = 2;
diff --git a/Source/Core/VideoCommon/Src/FPSCounter.cpp b/Source/Core/VideoCommon/Src/FPSCounter.cpp
index ea3f624c73..d9464afedc 100644
--- a/Source/Core/VideoCommon/Src/FPSCounter.cpp
+++ b/Source/Core/VideoCommon/Src/FPSCounter.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "FPSCounter.h"
 #include "FileUtil.h"
diff --git a/Source/Core/VideoCommon/Src/FPSCounter.h b/Source/Core/VideoCommon/Src/FPSCounter.h
index 314f4b0fc7..d90540bccf 100644
--- a/Source/Core/VideoCommon/Src/FPSCounter.h
+++ b/Source/Core/VideoCommon/Src/FPSCounter.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _FPS_COUNTER_H_
 #define _FPS_COUNTER_H_
diff --git a/Source/Core/VideoCommon/Src/Fifo.cpp b/Source/Core/VideoCommon/Src/Fifo.cpp
index c7d39844c8..5114e3fc2b 100644
--- a/Source/Core/VideoCommon/Src/Fifo.cpp
+++ b/Source/Core/VideoCommon/Src/Fifo.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "VideoConfig.h"
 #include "MemoryUtil.h"
@@ -125,7 +112,7 @@ void ReadDataFromFifo(u8* _uData, u32 len)
 		size -= pos;
 		if (size + len > FIFO_SIZE)
 		{
-			PanicAlert("FIFO out of bounds (sz = %i, len = %i at %08x)", size, len, pos);
+			PanicAlert("FIFO out of bounds (size = %i, len = %i at %08x)", size, len, pos);
 		}
 		memmove(&videoBuffer[0], &videoBuffer[pos], size);
 		g_pVideoData = videoBuffer;
@@ -164,7 +151,8 @@ void RunGpuLoop()
 		// check if we are able to run this buffer	
 		while (GpuRunningState && !CommandProcessor::interruptWaiting && fifo.bFF_GPReadEnable && fifo.CPReadWriteDistance && !AtBreakpoint())
 		{
-			if (!GpuRunningState) break;
+			if (!GpuRunningState)
+				break;
 
 			fifo.isGpuReadingData = true;
 			CommandProcessor::isPossibleWaitingSetDrawDone = fifo.bFF_GPLinkEnable ? true : false;
@@ -174,11 +162,13 @@ void RunGpuLoop()
 				u32 readPtr = fifo.CPReadPointer;
 				u8 *uData = Memory::GetPointer(readPtr);
 
-				if (readPtr == fifo.CPEnd) readPtr = fifo.CPBase;
-				else readPtr += 32;
+				if (readPtr == fifo.CPEnd)
+					readPtr = fifo.CPBase;
+				else
+					readPtr += 32;
 
 				_assert_msg_(COMMANDPROCESSOR, (s32)fifo.CPReadWriteDistance - 32 >= 0 ,
-					"Negative fifo.CPReadWriteDistance = %i in FIFO Loop !\nThat can produce instabilty in the game. Please report it.", fifo.CPReadWriteDistance - 32);
+					"Negative fifo.CPReadWriteDistance = %i in FIFO Loop !\nThat can produce instability in the game. Please report it.", fifo.CPReadWriteDistance - 32);
 
 				ReadDataFromFifo(uData, 32);
 
@@ -249,8 +239,10 @@ void RunGpu()
 
 		//DEBUG_LOG(COMMANDPROCESSOR, "Fifo wraps to base");
 
-		if (fifo.CPReadPointer == fifo.CPEnd) fifo.CPReadPointer = fifo.CPBase;
-			else fifo.CPReadPointer += 32;
+		if (fifo.CPReadPointer == fifo.CPEnd)
+			fifo.CPReadPointer = fifo.CPBase;
+		else
+			fifo.CPReadPointer += 32;
 
 		fifo.CPReadWriteDistance -= 32;
 	}
diff --git a/Source/Core/VideoCommon/Src/Fifo.h b/Source/Core/VideoCommon/Src/Fifo.h
index f465db8f85..229e2ff46d 100644
--- a/Source/Core/VideoCommon/Src/Fifo.h
+++ b/Source/Core/VideoCommon/Src/Fifo.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _FIFO_H
 #define _FIFO_H
diff --git a/Source/Core/VideoCommon/Src/FramebufferManagerBase.cpp b/Source/Core/VideoCommon/Src/FramebufferManagerBase.cpp
index 335344e229..a975da624c 100644
--- a/Source/Core/VideoCommon/Src/FramebufferManagerBase.cpp
+++ b/Source/Core/VideoCommon/Src/FramebufferManagerBase.cpp
@@ -36,7 +36,8 @@ FramebufferManagerBase::~FramebufferManagerBase()
 
 const XFBSourceBase* const* FramebufferManagerBase::GetXFBSource(u32 xfbAddr, u32 fbWidth, u32 fbHeight, u32 &xfbCount)
 {
-	if (!g_ActiveConfig.bUseXFB) return NULL;
+	if (!g_ActiveConfig.bUseXFB)
+		return NULL;
 
 	if (g_ActiveConfig.bUseRealXFB)
 		return GetRealXFBSource(xfbAddr, fbWidth, fbHeight, xfbCount);
@@ -237,7 +238,9 @@ int FramebufferManagerBase::ScaleToVirtualXfbWidth(int x, unsigned int backbuffe
 		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)
@@ -251,5 +254,7 @@ int FramebufferManagerBase::ScaleToVirtualXfbHeight(int y, unsigned int backbuff
 		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/HiresTextures.cpp b/Source/Core/VideoCommon/Src/HiresTextures.cpp
index 5a3fb051c3..80bc41f089 100644
--- a/Source/Core/VideoCommon/Src/HiresTextures.cpp
+++ b/Source/Core/VideoCommon/Src/HiresTextures.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "HiresTextures.h"
 
@@ -148,7 +135,7 @@ PC_TexFormat GetHiresTex(const char *fileName, unsigned int *pWidth, unsigned in
 		break;
 	}
 
-	INFO_LOG(VIDEO, "loading custom texture from %s", textureMap[key].c_str());
+	INFO_LOG(VIDEO, "Loading custom texture from %s", textureMap[key].c_str());
 cleanup:
 	SOIL_free_image_data(temp);
 	return returnTex;
diff --git a/Source/Core/VideoCommon/Src/HiresTextures.h b/Source/Core/VideoCommon/Src/HiresTextures.h
index 4b0db76fd9..f2249a3c18 100644
--- a/Source/Core/VideoCommon/Src/HiresTextures.h
+++ b/Source/Core/VideoCommon/Src/HiresTextures.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _HIRESTEXTURES_H
 #define _HIRESTEXTURES_H
diff --git a/Source/Core/VideoCommon/Src/ImageWrite.cpp b/Source/Core/VideoCommon/Src/ImageWrite.cpp
index 52d48fc547..e8f3f68123 100644
--- a/Source/Core/VideoCommon/Src/ImageWrite.cpp
+++ b/Source/Core/VideoCommon/Src/ImageWrite.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include <list>
 #include <vector>
diff --git a/Source/Core/VideoCommon/Src/ImageWrite.h b/Source/Core/VideoCommon/Src/ImageWrite.h
index 9ea6cab859..7d1d6fa1e8 100644
--- a/Source/Core/VideoCommon/Src/ImageWrite.h
+++ b/Source/Core/VideoCommon/Src/ImageWrite.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _IMAGEWRITE_H
 #define _IMAGEWRITE_H
diff --git a/Source/Core/VideoCommon/Src/IndexGenerator.cpp b/Source/Core/VideoCommon/Src/IndexGenerator.cpp
index aa1a971687..15b2311f89 100644
--- a/Source/Core/VideoCommon/Src/IndexGenerator.cpp
+++ b/Source/Core/VideoCommon/Src/IndexGenerator.cpp
@@ -1,34 +1,13 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include <cstddef>
 
 #include "Common.h"
+#include "VideoConfig.h"
 #include "IndexGenerator.h"
 
-/*
-*
-QUAD simulator
-
-0   1   4   5
-3   2   7   6
-012023 147172 ...
-*/
-
 //Init
 u16 *IndexGenerator::Tptr;
 u16 *IndexGenerator::BASETptr;
@@ -41,6 +20,32 @@ u32 IndexGenerator::numL;
 u32 IndexGenerator::numP;
 u32 IndexGenerator::index;
 
+static const u16 s_primitive_restart = -1;
+
+static void (*primitive_table[8])(u32);
+
+void IndexGenerator::Init()
+{
+	if(g_Config.backend_info.bSupportsPrimitiveRestart)
+	{
+		primitive_table[0] = IndexGenerator::AddQuads<true>;
+		primitive_table[2] = IndexGenerator::AddList<true>;
+		primitive_table[3] = IndexGenerator::AddStrip<true>;
+		primitive_table[4] = IndexGenerator::AddFan<true>;
+	}
+	else
+	{
+		primitive_table[0] = IndexGenerator::AddQuads<false>;
+		primitive_table[2] = IndexGenerator::AddList<false>;
+		primitive_table[3] = IndexGenerator::AddStrip<false>;
+		primitive_table[4] = IndexGenerator::AddFan<false>;
+	}
+	primitive_table[1] = NULL;
+	primitive_table[5] = &IndexGenerator::AddLineList;
+	primitive_table[6] = &IndexGenerator::AddLineStrip;
+	primitive_table[7] = &IndexGenerator::AddPoints;
+}
+
 void IndexGenerator::Start(u16* Triangleptr, u16* Lineptr, u16* Pointptr)
 {
 	Tptr = Triangleptr;
@@ -57,81 +62,161 @@ void IndexGenerator::Start(u16* Triangleptr, u16* Lineptr, u16* Pointptr)
 
 void IndexGenerator::AddIndices(int primitive, u32 numVerts)
 {
-	//switch (primitive)
-	//{
-	//case GX_DRAW_QUADS:          IndexGenerator::AddQuads(numVerts);		break;
-	//case GX_DRAW_TRIANGLES:      IndexGenerator::AddList(numVerts);		break;
-	//case GX_DRAW_TRIANGLE_STRIP: IndexGenerator::AddStrip(numVerts);		break;
-	//case GX_DRAW_TRIANGLE_FAN:   IndexGenerator::AddFan(numVerts);		break;
-	//case GX_DRAW_LINES:          IndexGenerator::AddLineList(numVerts);	break;
-	//case GX_DRAW_LINE_STRIP:     IndexGenerator::AddLineStrip(numVerts);	break;
-	//case GX_DRAW_POINTS:         IndexGenerator::AddPoints(numVerts);		break;
-	//}
-
-	static void (*const primitive_table[])(u32) =
-	{
-		IndexGenerator::AddQuads,
-		NULL,
-		IndexGenerator::AddList,
-		IndexGenerator::AddStrip,
-		IndexGenerator::AddFan,
-		IndexGenerator::AddLineList,
-		IndexGenerator::AddLineStrip,
-		IndexGenerator::AddPoints,
-	};
-
 	primitive_table[primitive](numVerts);
 	index += numVerts;
 }
 
 // Triangles
-__forceinline void IndexGenerator::WriteTriangle(u32 index1, u32 index2, u32 index3)
+template <bool pr> __forceinline void IndexGenerator::WriteTriangle(u32 index1, u32 index2, u32 index3)
 {
 	*Tptr++ = index1;
 	*Tptr++ = index2;
 	*Tptr++ = index3;
-
+	if(pr)
+		*Tptr++ = s_primitive_restart;
+	
 	++numT;
 }
 
-void IndexGenerator::AddList(u32 const numVerts)
+template <bool pr> void IndexGenerator::AddList(u32 const numVerts)
 {
 	auto const numTris = numVerts / 3;
 	for (u32 i = 0; i != numTris; ++i)
 	{
-		WriteTriangle(index + i * 3, index + i * 3 + 1, index + i * 3 + 2);
+		WriteTriangle<pr>(index + i * 3, index + i * 3 + 1, index + i * 3 + 2);
 	}
+	u32 remainingVerts = numVerts - numTris*3;
+	if(remainingVerts)
+		ERROR_LOG(VIDEO, "AddList: unknown count of vertices found");
 }
 
-void IndexGenerator::AddStrip(u32 const numVerts)
+template <bool pr> void IndexGenerator::AddStrip(u32 const numVerts)
 {
-	bool wind = false;
-	for (u32 i = 2; i < numVerts; ++i)
+	if(pr)
 	{
-		WriteTriangle(
-			index + i - 2,
-			index + i - !wind,
-			index + i - wind);
+		for (u32 i = 0; i < numVerts; ++i)
+		{
+			*Tptr++ = index + i;
+		}
+		*Tptr++ = s_primitive_restart;
+		numT += numVerts - 2;
+		
+	}
+	else
+	{
+		bool wind = false;
+		for (u32 i = 2; i < numVerts; ++i)
+		{
+			WriteTriangle<pr>(
+				index + i - 2,
+				index + i - !wind,
+				index + i - wind);
 
-		wind ^= true;
+			wind ^= true;
+		}
 	}
 }
 
-void IndexGenerator::AddFan(u32 numVerts)
+/**
+ * FAN simulator:
+ * 
+ *   2---3
+ *  / \ / \
+ * 1---0---4
+ * 
+ * would generate this triangles:
+ * 012, 023, 034
+ * 
+ * rotated (for better striping):
+ * 120, 302, 034
+ * 
+ * as odd ones have to winded, following strip is fine:
+ * 12034
+ * 
+ * so we use 6 indices for 3 triangles
+ */
+
+template <bool pr> void IndexGenerator::AddFan(u32 numVerts)
 {
-	for (u32 i = 2; i < numVerts; ++i)
+	u32 i = 2;
+	
+	if(pr)
 	{
-		WriteTriangle(index, index + i - 1, index + i);
+		for(; i<=numVerts-3; i+=3)
+		{
+			*Tptr++ = index + i - 1;
+			*Tptr++ = index + i + 0;
+			*Tptr++ = index;
+			*Tptr++ = index + i + 1;
+			*Tptr++ = index + i + 2;
+			*Tptr++ = s_primitive_restart;
+			numT += 3;
+		}
+		
+		for(; i<=numVerts-2; i+=2)
+		{
+			*Tptr++ = index + i - 1;
+			*Tptr++ = index + i + 0;
+			*Tptr++ = index;
+			*Tptr++ = index + i + 1;
+			*Tptr++ = s_primitive_restart;
+			numT += 2;
+		}
+	}
+	
+	for (; i < numVerts; ++i)
+	{
+		WriteTriangle<pr>(index, index + i - 1, index + i);
 	}
 }
 
-void IndexGenerator::AddQuads(u32 numVerts)
+/*
+ * QUAD simulator
+ * 
+ * 0---1   4---5
+ * |\  |   |\  |
+ * | \ |   | \ |
+ * |  \|   |  \|
+ * 3---2   7---6
+ * 
+ * 012,023, 456,467 ...
+ * or 120,302, 564,746
+ * or as strip: 1203, 5647
+ * 
+ * Warning: 
+ * A simple triangle has to be rendered for three vertices.
+ * ZWW do this for sun rays
+ */
+template <bool pr> void IndexGenerator::AddQuads(u32 numVerts)
 {
 	auto const numQuads = numVerts / 4;
 	for (u32 i = 0; i != numQuads; ++i)
 	{
-		WriteTriangle(index + i * 4, index + i * 4 + 1, index + i * 4 + 2);
-		WriteTriangle(index + i * 4, index + i * 4 + 2, index + i * 4 + 3);
+		if(pr)
+		{
+			*Tptr++ = index + i * 4 + 1;
+			*Tptr++ = index + i * 4 + 2;
+			*Tptr++ = index + i * 4 + 0;
+			*Tptr++ = index + i * 4 + 3;
+			*Tptr++ = s_primitive_restart;
+			numT += 2;
+		}
+		else
+		{
+			WriteTriangle<pr>(index + i * 4, index + i * 4 + 1, index + i * 4 + 2);
+			WriteTriangle<pr>(index + i * 4, index + i * 4 + 2, index + i * 4 + 3);
+		}
+	}
+
+	// three vertices remaining, so render a triangle
+	u32 remainingVerts = numVerts - numQuads*4;
+	if(remainingVerts == 3)
+	{
+		WriteTriangle<pr>(index+numVerts-3, index+numVerts-2, index+numVerts-1);
+	}
+	else if(remainingVerts)
+	{
+		ERROR_LOG(VIDEO, "AddQuads: unknown count of vertices found");
 	}
 }
 
@@ -145,8 +230,14 @@ void IndexGenerator::AddLineList(u32 numVerts)
 		*Lptr++ = index + i * 2 + 1;
 		++numL;
 	}
+	u32 remainingVerts = numVerts - numLines*2;
+	if(remainingVerts)
+		ERROR_LOG(VIDEO, "AddLineList: unknown count of vertices found");
+	
 }
 
+// shouldn't be used as strips as LineLists are much more common
+// so converting them to lists
 void IndexGenerator::AddLineStrip(u32 numVerts)
 {
 	for (u32 i = 1; i < numVerts; ++i)
@@ -170,6 +261,6 @@ void IndexGenerator::AddPoints(u32 numVerts)
 
 u32 IndexGenerator::GetRemainingIndices()
 {
-	u32 max_index = 65535;
+	u32 max_index = 65534; // -1 is reserved for primitive restart (ogl + dx11)
 	return max_index - index;
 }
diff --git a/Source/Core/VideoCommon/Src/IndexGenerator.h b/Source/Core/VideoCommon/Src/IndexGenerator.h
index f14d3ae026..1f25119bc0 100644
--- a/Source/Core/VideoCommon/Src/IndexGenerator.h
+++ b/Source/Core/VideoCommon/Src/IndexGenerator.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 // This is currently only used by the DX backend, but it may make sense to
 // use it in the GL backend or a future DX10 backend too.
@@ -26,6 +13,7 @@ class IndexGenerator
 {
 public:
 	// Init
+	static void Init();
 	static void Start(u16 *Triangleptr,u16 *Lineptr,u16 *Pointptr);
 
 	static void AddIndices(int primitive, u32 numVertices);
@@ -54,10 +42,10 @@ public:
 */
 private:
 	// Triangles
-	static void AddList(u32 numVerts);
-	static void AddStrip(u32 numVerts);
-	static void AddFan(u32 numVerts);
-	static void AddQuads(u32 numVerts);
+	template <bool pr> static void AddList(u32 numVerts);
+	template <bool pr> static void AddStrip(u32 numVerts);
+	template <bool pr> static void AddFan(u32 numVerts);
+	template <bool pr> static void AddQuads(u32 numVerts);
 
 	// Lines
 	static void AddLineList(u32 numVerts);
@@ -66,7 +54,7 @@ private:
 	// Points
 	static void AddPoints(u32 numVerts);
 
-	static void WriteTriangle(u32 index1, u32 index2, u32 index3);
+	template <bool pr> static void WriteTriangle(u32 index1, u32 index2, u32 index3);
 
 	static u16 *Tptr;
 	static u16 *BASETptr;
diff --git a/Source/Core/VideoCommon/Src/LightingShaderGen.cpp b/Source/Core/VideoCommon/Src/LightingShaderGen.cpp
index 963b2c529a..58da3612f5 100644
--- a/Source/Core/VideoCommon/Src/LightingShaderGen.cpp
+++ b/Source/Core/VideoCommon/Src/LightingShaderGen.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "LightingShaderGen.h"
 #include "NativeVertexFormat.h"
diff --git a/Source/Core/VideoCommon/Src/LightingShaderGen.h b/Source/Core/VideoCommon/Src/LightingShaderGen.h
index b534d767cc..fde60be891 100644
--- a/Source/Core/VideoCommon/Src/LightingShaderGen.h
+++ b/Source/Core/VideoCommon/Src/LightingShaderGen.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _LIGHTINGSHADERGEN_H_
 #define _LIGHTINGSHADERGEN_H_
@@ -62,14 +49,18 @@ static void GenerateLightShader(T& object, LightingUidData& uid_data, int index,
 {
 	const LitChannel& chan = (litchan_index > 1) ? xfregs.alpha[litchan_index-2] : xfregs.color[litchan_index];
 	const char* swizzle = "xyzw";
-	if (coloralpha == 1 ) swizzle = "xyz";
-	else if (coloralpha == 2 ) swizzle = "w";
+	if (coloralpha == 1)
+		swizzle = "xyz";
+	else if (coloralpha == 2)
+		swizzle = "w";
 
 	uid_data.lit_chans[litchan_index].attnfunc = chan.attnfunc;
 	uid_data.lit_chans[litchan_index].diffusefunc = chan.diffusefunc;
-	if (!(chan.attnfunc & 1)) {
+	if (!(chan.attnfunc & 1))
+	{
 		// atten disabled
-		switch (chan.diffusefunc) {
+		switch (chan.diffusefunc)
+		{
 			case LIGHTDIF_NONE:
 				object.Write("lacc.%s += %s;\n", swizzle, LightCol(lightsName, index, swizzle));
 				break;
@@ -82,8 +73,8 @@ static void GenerateLightShader(T& object, LightingUidData& uid_data, int index,
 			default: _assert_(0);
 		}
 	}
-	else { // spec and spot
-
+	else // spec and spot
+	{
 		if (chan.attnfunc == 3)
 		{ // spot
 			object.Write("ldir = %s.xyz - pos.xyz;\n", LightPos(lightsName, index));
@@ -134,7 +125,8 @@ static void GenerateLightingShader(T& object, LightingUidData& uid_data, int com
 		object.Write("{\n");
 
 		uid_data.lit_chans[j].matsource = xfregs.color[j].matsource;
-		if (color.matsource) {// from vertex
+		if (color.matsource) // from vertex
+		{
 			if (components & (VB_HAS_COL0 << j))
 				object.Write("mat = %s%d;\n", inColorName, j);
 			else if (components & VB_HAS_COL0)
@@ -143,12 +135,16 @@ static void GenerateLightingShader(T& object, LightingUidData& uid_data, int com
 				object.Write("mat = float4(1.0f, 1.0f, 1.0f, 1.0f);\n");
 		}
 		else // from color
+		{
 			object.Write("mat = %s[%d];\n", materialsName, j+2);
+		}
 
 		uid_data.lit_chans[j].enablelighting = xfregs.color[j].enablelighting;
-		if (color.enablelighting) {
+		if (color.enablelighting)
+		{
 			uid_data.lit_chans[j].ambsource = xfregs.color[j].ambsource;
-			if (color.ambsource) { // from vertex
+			if (color.ambsource) // from vertex
+			{
 				if (components & (VB_HAS_COL0<<j) )
 					object.Write("lacc = %s%d;\n", inColorName, j);
 				else if (components & VB_HAS_COL0 )
@@ -157,7 +153,9 @@ static void GenerateLightingShader(T& object, LightingUidData& uid_data, int com
 					object.Write("lacc = float4(0.0f, 0.0f, 0.0f, 0.0f);\n");
 			}
 			else // from color
+			{
 				object.Write("lacc = %s[%d];\n", materialsName, j);
+			}
 		}
 		else
 		{
@@ -166,8 +164,10 @@ static void GenerateLightingShader(T& object, LightingUidData& uid_data, int com
 
 		// check if alpha is different
 		uid_data.lit_chans[j+2].matsource = xfregs.alpha[j].matsource;
-		if (alpha.matsource != color.matsource) {
-			if (alpha.matsource) {// from vertex
+		if (alpha.matsource != color.matsource)
+		{
+			if (alpha.matsource) // from vertex
+			{
 				if (components & (VB_HAS_COL0<<j))
 					object.Write("mat.w = %s%d.w;\n", inColorName, j);
 				else if (components & VB_HAS_COL0)
@@ -175,14 +175,17 @@ static void GenerateLightingShader(T& object, LightingUidData& uid_data, int com
 				else object.Write("mat.w = 1.0f;\n");
 			}
 			else // from color
+			{
 				object.Write("mat.w = %s[%d].w;\n", materialsName, j+2);
+			}
 		}
 
 		uid_data.lit_chans[j+2].enablelighting = xfregs.alpha[j].enablelighting;
 		if (alpha.enablelighting)
 		{
 			uid_data.lit_chans[j+2].ambsource = xfregs.alpha[j].ambsource;
-			if (alpha.ambsource) {// from vertex
+			if (alpha.ambsource) // from vertex
+			{
 				if (components & (VB_HAS_COL0<<j) )
 					object.Write("lacc.w = %s%d.w;\n", inColorName, j);
 				else if (components & VB_HAS_COL0 )
@@ -191,7 +194,9 @@ static void GenerateLightingShader(T& object, LightingUidData& uid_data, int com
 					object.Write("lacc.w = 0.0f;\n");
 			}
 			else // from color
+			{
 				object.Write("lacc.w = %s[%d].w;\n", materialsName, j);
+			}
 		}
 		else
 		{
diff --git a/Source/Core/VideoCommon/Src/LookUpTables.h b/Source/Core/VideoCommon/Src/LookUpTables.h
index 815846218b..1d9153b2d1 100644
--- a/Source/Core/VideoCommon/Src/LookUpTables.h
+++ b/Source/Core/VideoCommon/Src/LookUpTables.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _LOOKUPTABLES_H
 #define _LOOKUPTABLES_H
diff --git a/Source/Core/VideoCommon/Src/MainBase.cpp b/Source/Core/VideoCommon/Src/MainBase.cpp
index 1472367f21..1739683562 100644
--- a/Source/Core/VideoCommon/Src/MainBase.cpp
+++ b/Source/Core/VideoCommon/Src/MainBase.cpp
@@ -230,9 +230,13 @@ 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");
 
@@ -255,7 +259,8 @@ void VideoBackendHardware::DoState(PointerWrap& p)
 	}
 }
 
-void VideoBackendHardware::CheckInvalidState() {
+void VideoBackendHardware::CheckInvalidState()
+{
 	if (m_invalid)
 	{
 		m_invalid = false;
diff --git a/Source/Core/VideoCommon/Src/NativeVertexFormat.h b/Source/Core/VideoCommon/Src/NativeVertexFormat.h
index 1340991b21..f97b493e67 100644
--- a/Source/Core/VideoCommon/Src/NativeVertexFormat.h
+++ b/Source/Core/VideoCommon/Src/NativeVertexFormat.h
@@ -21,7 +21,8 @@
 #include "Common.h"
 
 // m_components
-enum {
+enum
+{
 	VB_HAS_POSMTXIDX =(1<<1),
 	VB_HAS_TEXMTXIDX0=(1<<2),
 	VB_HAS_TEXMTXIDX1=(1<<3),
diff --git a/Source/Core/VideoCommon/Src/OnScreenDisplay.cpp b/Source/Core/VideoCommon/Src/OnScreenDisplay.cpp
index 10cf5b84af..29a3837a9a 100644
--- a/Source/Core/VideoCommon/Src/OnScreenDisplay.cpp
+++ b/Source/Core/VideoCommon/Src/OnScreenDisplay.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include <list>
 
@@ -24,13 +11,16 @@
 #include "RenderBase.h"
 #include "Timer.h"
 
+#include <vector>
+
 namespace OSD
 {
 
 struct MESSAGE
 {
 	MESSAGE() {}
-	MESSAGE(const char* p, u32 dw) {
+	MESSAGE(const char* p, u32 dw)
+	{
 		strncpy(str, p, 255);
 		str[255] = '\0';
 		dwTimeStamp = dw;
@@ -39,6 +29,28 @@ struct MESSAGE
 	u32 dwTimeStamp;
 };
 
+class OSDCALLBACK
+{
+private:
+	CallbackPtr m_functionptr;
+	CallbackType m_type;
+	u32 m_data;
+public:
+	OSDCALLBACK(CallbackType OnType, CallbackPtr FuncPtr, u32 UserData)
+	{
+		m_type = OnType;
+		m_functionptr = FuncPtr;
+		m_data = UserData; 
+	}
+	void Call()
+	{
+		m_functionptr(m_data);
+	}
+
+	CallbackType Type() { return m_type; }
+};
+
+std::vector<OSDCALLBACK> m_callbacks;
 static std::list<MESSAGE> s_listMsgs;
 
 void AddMessage(const char* pstr, u32 ms)
@@ -48,7 +60,8 @@ void AddMessage(const char* pstr, u32 ms)
 
 void DrawMessages()
 {
-	if(!SConfig::GetInstance().m_LocalCoreStartupParameter.bOnScreenDisplayMessages) return;
+	if(!SConfig::GetInstance().m_LocalCoreStartupParameter.bOnScreenDisplayMessages)
+		return;
 
 	if (s_listMsgs.size() > 0)
 	{
@@ -62,7 +75,8 @@ void DrawMessages()
 			if (time_left < 1024)
 			{
 				alpha = time_left >> 2;
-				if (time_left < 0) alpha = 0;
+				if (time_left < 0)
+					alpha = 0;
 			}
 
 			alpha <<= 24;
@@ -82,8 +96,26 @@ void DrawMessages()
 void ClearMessages()
 {
 	std::list<MESSAGE>::iterator it = s_listMsgs.begin();
-	while (it != s_listMsgs.end()) 
+
+	while (it != s_listMsgs.end())
+	{
 		it = s_listMsgs.erase(it);
+	}
+}
+
+// On-Screen Display Callbacks
+void AddCallback(CallbackType OnType, CallbackPtr FuncPtr, u32 UserData)
+{
+	m_callbacks.push_back(OSDCALLBACK(OnType, FuncPtr, UserData));
+}
+
+void DoCallbacks(CallbackType OnType)
+{
+	for (auto it = m_callbacks.begin(); it != m_callbacks.end(); ++it)
+	{
+		if (it->Type() == OnType)
+			it->Call();
+	}
 }
 
 }  // namespace
diff --git a/Source/Core/VideoCommon/Src/OnScreenDisplay.h b/Source/Core/VideoCommon/Src/OnScreenDisplay.h
index 80187b8ac3..ef7d899e1f 100644
--- a/Source/Core/VideoCommon/Src/OnScreenDisplay.h
+++ b/Source/Core/VideoCommon/Src/OnScreenDisplay.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _OSD_H_
 #define _OSD_H_
@@ -26,6 +13,18 @@ void AddMessage(const char* str, u32 ms = 2000);
 void DrawMessages(); // draw the current messages on the screen. Only call once per frame.
 void ClearMessages();
 
+// On-screen callbacks
+enum CallbackType
+{
+	OSD_INIT = 0,
+	OSD_ONFRAME,
+	OSD_SHUTDOWN
+};
+typedef void(*CallbackPtr)(u32);
+
+void AddCallback(CallbackType OnType, CallbackPtr FuncPtr, u32 UserData);
+
+void DoCallbacks(CallbackType OnType);
 }  // namespace
 
 #endif // _OSD_H_
diff --git a/Source/Core/VideoCommon/Src/OpcodeDecoding.cpp b/Source/Core/VideoCommon/Src/OpcodeDecoding.cpp
index 92d596b774..818a2365fe 100644
--- a/Source/Core/VideoCommon/Src/OpcodeDecoding.cpp
+++ b/Source/Core/VideoCommon/Src/OpcodeDecoding.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 //DL facts:
 //	Ikaruga uses (nearly) NO display lists!
diff --git a/Source/Core/VideoCommon/Src/OpcodeDecoding.h b/Source/Core/VideoCommon/Src/OpcodeDecoding.h
index b825809705..3263d2c7b0 100644
--- a/Source/Core/VideoCommon/Src/OpcodeDecoding.h
+++ b/Source/Core/VideoCommon/Src/OpcodeDecoding.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _OPCODE_DECODING_H
 #define _OPCODE_DECODING_H
@@ -44,7 +31,7 @@
 #define GX_DRAW_LINES               0x5   // 0xA8
 #define GX_DRAW_LINE_STRIP          0x6   // 0xB0
 #define GX_DRAW_POINTS              0x7   // 0xB8
-#define GX_DRAW_NONE                0x1;  //Tis is a fake value to used in the backends
+#define GX_DRAW_NONE                0x1;  // This is a fake value to used in the backends
 
 extern bool g_bRecordFifoData;
 
diff --git a/Source/Core/VideoCommon/Src/OpenCL.cpp b/Source/Core/VideoCommon/Src/OpenCL.cpp
index 202c0c4b41..6dac8725af 100644
--- a/Source/Core/VideoCommon/Src/OpenCL.cpp
+++ b/Source/Core/VideoCommon/Src/OpenCL.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 // TODO: Make a more centralized version of this (for now every backend that will use it will create its own context, which is weird). An object maybe?
 
diff --git a/Source/Core/VideoCommon/Src/OpenCL.h b/Source/Core/VideoCommon/Src/OpenCL.h
index f299e9ff1e..4ba172bb9c 100644
--- a/Source/Core/VideoCommon/Src/OpenCL.h
+++ b/Source/Core/VideoCommon/Src/OpenCL.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef __OPENCL_H__
 #define __OPENCL_H__
diff --git a/Source/Core/VideoCommon/Src/OpenCL/OCLTextureDecoder.cpp b/Source/Core/VideoCommon/Src/OpenCL/OCLTextureDecoder.cpp
index db70640fbb..a9c6977d42 100644
--- a/Source/Core/VideoCommon/Src/OpenCL/OCLTextureDecoder.cpp
+++ b/Source/Core/VideoCommon/Src/OpenCL/OCLTextureDecoder.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "OCLTextureDecoder.h"
 
diff --git a/Source/Core/VideoCommon/Src/OpenCL/OCLTextureDecoder.h b/Source/Core/VideoCommon/Src/OpenCL/OCLTextureDecoder.h
index c821f3132f..aacccd3885 100644
--- a/Source/Core/VideoCommon/Src/OpenCL/OCLTextureDecoder.h
+++ b/Source/Core/VideoCommon/Src/OpenCL/OCLTextureDecoder.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef OPENCL_TEXTURE_DECODER
 #define OPENCL_TEXTURE_DECODER
diff --git a/Source/Core/VideoCommon/Src/PixelEngine.cpp b/Source/Core/VideoCommon/Src/PixelEngine.cpp
index b014148d8d..5819f64a83 100644
--- a/Source/Core/VideoCommon/Src/PixelEngine.cpp
+++ b/Source/Core/VideoCommon/Src/PixelEngine.cpp
@@ -1,25 +1,11 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 
 // http://developer.nvidia.com/object/General_FAQ.html#t6 !!!!!
 
 
-
 #include "Common.h"
 #include "VideoCommon.h"
 #include "ChunkFile.h"
@@ -137,7 +123,7 @@ void DoState(PointerWrap &p)
 	p.Do(m_DstAlphaConf);
 	p.Do(m_AlphaModeConf);
 	p.Do(m_AlphaRead);
-	p.Do(m_Control);
+	p.DoPOD(m_Control);
 
 	p.Do(g_bSignalTokenInterrupt);
 	p.Do(g_bSignalFinishInterrupt);
@@ -464,7 +450,7 @@ void SetFinish()
 void ResetSetFinish()
 {
 	//if SetFinish happened but PE_CTRL_REGISTER not, I reset the interrupt else
-	//remove event from the queque
+	//remove event from the queue
 	if (g_bSignalFinishInterrupt)
 	{
 		UpdateFinishInterrupt(false);
diff --git a/Source/Core/VideoCommon/Src/PixelEngine.h b/Source/Core/VideoCommon/Src/PixelEngine.h
index f34621774c..65323590a1 100644
--- a/Source/Core/VideoCommon/Src/PixelEngine.h
+++ b/Source/Core/VideoCommon/Src/PixelEngine.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _PIXELENGINE_H
 #define _PIXELENGINE_H
diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
index 918b8237d6..4187c44d0f 100644
--- a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
+++ b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include <stdio.h>
 #include <cmath>
@@ -32,7 +19,7 @@
 //
 //   color for this stage (alpha, color) is given by bpmem.tevorders[0].colorchan0
 //   konstant for this stage (alpha, color) is given by bpmem.tevksel
-//   inputs are given by bpmem.combiners[0].colorC.a/b/c/d     << could be current chan color
+//   inputs are given by bpmem.combiners[0].colorC.a/b/c/d     << could be current channel color
 //   according to GXTevColorArg table above
 //   output is given by .outreg
 //   tevtemp is set according to swapmodetables and
@@ -44,7 +31,7 @@ template<class T> static void WriteFog(T& out, pixel_shader_uid_data& uid_data);
 
 static const char *tevKSelTableC[] = // KCSEL
 {
-	"1.0f,1.0f,1.0f",    // 1   = 0x00
+	"1.0f,1.0f,1.0f",       // 1   = 0x00
 	"0.875f,0.875f,0.875f", // 7_8 = 0x01
 	"0.75f,0.75f,0.75f",    // 3_4 = 0x02
 	"0.625f,0.625f,0.625f", // 5_8 = 0x03
@@ -153,7 +140,7 @@ static const char *tevCInputTable[] = // CC
 	"float3(0.5f, 0.5f, 0.5f)",              // HALF
 	"(konsttemp.rgb)", //"konsttemp.rgb",    // KONST
 	"float3(0.0f, 0.0f, 0.0f)",              // ZERO
-	///aded extra values to map clamped values
+	///added extra values to map clamped values
 	"(cprev.rgb)",        // CPREV,
 	"(cprev.aaa)",        // APREV,
 	"(cc0.rgb)",          // C0,
@@ -183,7 +170,7 @@ static const char *tevAInputTable[] = // CA
 	"rastemp",         // RASA,
 	"konsttemp",       // KONST,  (hw1 had quarter)
 	"float4(0.0f, 0.0f, 0.0f, 0.0f)", // ZERO
-	///aded extra values to map clamped values
+	///added extra values to map clamped values
 	"cprev",            // APREV,
 	"cc0",              // A0,
 	"cc1",              // A1,
@@ -346,10 +333,10 @@ void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u
 
 	if (ApiType == API_OPENGL)
 	{
-		out.Write("out float4 ocol0;\n");
+		out.Write("COLOROUT(ocol0);\n");
 		if (dstAlphaMode == DSTALPHA_DUAL_SOURCE_BLEND)
-			out.Write("out float4 ocol1;\n");
-		
+			out.Write("COLOROUT(ocol1);\n");
+
 		if (per_pixel_depth)
 			out.Write("#define depth gl_FragDepth\n");
 		out.Write("float4 rawpos = gl_FragCoord;\n");
@@ -416,17 +403,20 @@ void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u
 				per_pixel_depth ? "\n  out float depth : SV_Depth," : "");
 		}
 
-		out.Write("  in float4 colors_0 : COLOR0,\n");
-		out.Write("  in float4 colors_1 : COLOR1");
+		// "centroid" attribute is only supported by D3D11
+		const char* optCentroid = (ApiType == API_D3D11 ? "centroid" : "");
+
+		out.Write("  in %s float4 colors_0 : COLOR0,\n", optCentroid);
+		out.Write("  in %s float4 colors_1 : COLOR1", optCentroid);
 
 		// compute window position if needed because binding semantic WPOS is not widely supported
 		if (numTexgen < 7)
 		{
-			for (unsigned int i = 0; i < numTexgen; ++i)
-				out.Write(",\n  in float3 uv%d : TEXCOORD%d", i, i);
-			out.Write(",\n  in float4 clipPos : TEXCOORD%d", numTexgen);
+			for (int i = 0; i < numTexgen; ++i)
+				out.Write(",\n  in %s float3 uv%d : TEXCOORD%d", optCentroid, i, i);
+			out.Write(",\n  in %s float4 clipPos : TEXCOORD%d", optCentroid, numTexgen);
 			if(g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting)
-				out.Write(",\n  in float4 Normal : TEXCOORD%d", numTexgen + 1);
+				out.Write(",\n  in %s float4 Normal : TEXCOORD%d", optCentroid, numTexgen + 1);
 			out.Write("        ) {\n");
 		}
 		else
@@ -629,17 +619,25 @@ void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u
 		out.Write("\tocol0 = prev;\n");
 	}
 
-	// On D3D11, use dual-source color blending to perform dst alpha in a
-	// single pass
+	// Use dual-source color blending to perform dst alpha in a single pass
 	if (dstAlphaMode == DSTALPHA_DUAL_SOURCE_BLEND)
 	{
 		out.SetConstantsUsed(C_ALPHA, C_ALPHA);
-		// Colors will be blended against the alpha from ocol1...
-		out.Write("\tocol1 = prev;\n");
+		if(ApiType & API_D3D9)
+		{
+			// alpha component must be 0 or the shader will not compile (Direct3D 9Ex restriction)
+			// Colors will be blended against the color from ocol1 in D3D 9...
+			out.Write("\tocol1 = float4(prev.a, prev.a, prev.a, 0.0f);\n");
+		}
+		else
+		{
+			// Colors will be blended against the alpha from ocol1...
+			out.Write("\tocol1 = prev;\n");
+		}
 		// ...and the alpha from ocol0 will be written to the framebuffer.
 		out.Write("\tocol0.a = " I_ALPHA"[0].a;\n");
 	}
-	
+
 	out.Write("}\n");
 
 	if (text[sizeof(text) - 1] != 0x7C)
@@ -760,10 +758,14 @@ static void WriteStage(T& out, pixel_shader_uid_data& uid_data, int n, API_TYPE
 				out.Write("float2 indtevtrans%d = " I_INDTEXMTX"[%d].ww * uv%d.xy * indtevcrd%d.yy;\n", n, mtxidx, texcoord, n);
 			}
 			else
+			{
 				out.Write("float2 indtevtrans%d = float2(0.0f, 0.0f);\n", n);
+			}
 		}
 		else
+		{
 			out.Write("float2 indtevtrans%d = float2(0.0f, 0.0f);\n", n);
+		}
 
 		// ---------
 		// Wrapping
@@ -841,7 +843,9 @@ static void WriteStage(T& out, pixel_shader_uid_data& uid_data, int n, API_TYPE
 		SampleTexture<T>(out, "textemp", "tevcoord", texswap, texmap, ApiType);
 	}
 	else
+	{
 		out.Write("textemp = float4(1.0f, 1.0f, 1.0f, 1.0f);\n");
+	}
 
 
 	if (cc.a == TEVCOLORARG_KONST || cc.b == TEVCOLORARG_KONST || cc.c == TEVCOLORARG_KONST || cc.d == TEVCOLORARG_KONST
@@ -1124,7 +1128,7 @@ static void WriteAlphaTest(T& out, pixel_shader_uid_data& uid_data, API_TYPE Api
 	// 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
+	// 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
@@ -1143,14 +1147,14 @@ static void WriteAlphaTest(T& out, pixel_shader_uid_data& uid_data, API_TYPE Api
 
 static const char *tevFogFuncsTable[] =
 {
-	"",																//No Fog
-	"",																//?
-	"",																//Linear
-	"",																//?
-	"\tfog = 1.0f - pow(2.0f, -8.0f * fog);\n",						//exp
-	"\tfog = 1.0f - pow(2.0f, -8.0f * fog * fog);\n",					//exp2
-	"\tfog = pow(2.0f, -8.0f * (1.0f - fog));\n",						//backward exp
-	"\tfog = 1.0f - fog;\n   fog = pow(2.0f, -8.0f * fog * fog);\n"	//backward exp2
+	"",																// No Fog
+	"",																// ?
+	"",																// Linear
+	"",																// ?
+	"\tfog = 1.0f - pow(2.0f, -8.0f * fog);\n",						// exp
+	"\tfog = 1.0f - pow(2.0f, -8.0f * fog * fog);\n",				// exp2
+	"\tfog = pow(2.0f, -8.0f * (1.0f - fog));\n",					// backward exp
+	"\tfog = 1.0f - fog;\n   fog = pow(2.0f, -8.0f * fog * fog);\n"	// backward exp2
 };
 
 template<class T>
@@ -1180,7 +1184,7 @@ static void WriteFog(T& out, pixel_shader_uid_data& uid_data)
 	// ze *= x_adjust
 	// this is completely theoretical as the real hardware seems to use a table intead of calculating the values.
 	uid_data.fog.RangeBaseEnabled = bpmem.fogRange.Base.Enabled;
-	if(bpmem.fogRange.Base.Enabled)
+	if (bpmem.fogRange.Base.Enabled)
 	{
 		out.SetConstantsUsed(C_FOG+2, C_FOG+2);
 		out.Write("\tfloat x_adjust = (2.0f * (clipPos.x / " I_FOG"[2].y)) - 1.0f - " I_FOG"[2].x;\n");
diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.h b/Source/Core/VideoCommon/Src/PixelShaderGen.h
index 001ab53f0b..024bc170b5 100644
--- a/Source/Core/VideoCommon/Src/PixelShaderGen.h
+++ b/Source/Core/VideoCommon/Src/PixelShaderGen.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef GCOGL_PIXELSHADER_H
 #define GCOGL_PIXELSHADER_H
diff --git a/Source/Core/VideoCommon/Src/PixelShaderManager.cpp b/Source/Core/VideoCommon/Src/PixelShaderManager.cpp
index f63a1e59c6..9fbe096607 100644
--- a/Source/Core/VideoCommon/Src/PixelShaderManager.cpp
+++ b/Source/Core/VideoCommon/Src/PixelShaderManager.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include <cmath>
 
@@ -123,7 +110,7 @@ void PixelShaderManager::SetConstants(u32 components)
 	static int saved_updates = 0;
 	static int necessary_updates = 0;
 
-
+// TODO: Remove this!
 #define IncStuff() { \
 	saved_updates++; \
 	/*printf("Saved a constant update at line %d! Saved %d against %d now!\n", __LINE__, saved_updates, necessary_updates);*/ }
@@ -224,8 +211,10 @@ void PixelShaderManager::SetConstants(u32 components)
         }
         else if ((s_nIndTexScaleChanged & 0x03)) IncStuff();
 
-        if ((s_nIndTexScaleChanged & 0x0c) && constant_profile.ConstantIsUsed(C_INDTEXSCALE+1)) {
-            for (u32 i = 2; i < 4; ++i) {
+        if ((s_nIndTexScaleChanged & 0x0c) && constant_profile.ConstantIsUsed(C_INDTEXSCALE+1))
+		{
+            for (u32 i = 2; i < 4; ++i)
+			{
                 f[2 * i] = bpmem.texscale[1].getScaleS(i & 1);
                 f[2 * i + 1] = bpmem.texscale[1].getScaleT(i & 1);
                 PRIM_LOG("tex indscale%d: %f %f\n", i, f[2 * i], f[2 * i + 1]);
@@ -305,18 +294,20 @@ void PixelShaderManager::SetConstants(u32 components)
 		{
 			//bpmem.fogRange.Base.Center : center of the viewport in x axis. observation: bpmem.fogRange.Base.Center = realcenter + 342;
 			int center = ((u32)bpmem.fogRange.Base.Center) - 342;
-			// normalice center to make calculations easy
+			// normalize center to make calculations easy
 			float ScreenSpaceCenter = center / (2.0f * xfregs.viewport.wd);
 			ScreenSpaceCenter = (ScreenSpaceCenter * 2.0f) - 1.0f;
-			//bpmem.fogRange.K seems to be  a table of precalculated coeficients for the adjust factor
-			//observations: bpmem.fogRange.K[0].LO apears to be the lowest value and bpmem.fogRange.K[4].HI the largest
-			// they always seems to be larger than 256 so my teory is :
-			// they are the coeficients from the center to th e border of the screen
-			// so to simplify i use the hi coeficient as K in the shader taking 256 as the scale
+			//bpmem.fogRange.K seems to be  a table of precalculated coefficients for the adjust factor
+			//observations: bpmem.fogRange.K[0].LO appears to be the lowest value and bpmem.fogRange.K[4].HI the largest
+			// they always seems to be larger than 256 so my theory is :
+			// they are the coefficients from the center to the border of the screen
+			// so to simplify I use the hi coefficient as K in the shader taking 256 as the scale
 			SetPSConstant4f(C_FOG + 2, ScreenSpaceCenter, (float)Renderer::EFBToScaledX((int)(2.0f * xfregs.viewport.wd)), bpmem.fogRange.K[4].HI / 256.0f,0.0f);
 		}
 		else
+		{
 			SetPSConstant4f(C_FOG + 2, 0.0f, 1.0f, 1.0f, 0.0f); // Need to update these values for older hardware that fails to divide by zero in shaders.
+		}
 
 		s_bFogRangeAdjustChanged = false;
 	}else if ( s_bFogRangeAdjustChanged) IncStuff();
@@ -353,7 +344,9 @@ void PixelShaderManager::SetConstants(u32 components)
 						SetPSConstant4f(C_PLIGHTS+5*i+j+1, 0.00001f, xfmemptr[1], xfmemptr[2], 0);
 					}
 					else
+					{
 						SetPSConstant4fv(C_PLIGHTS+5*i+j+1, xfmemptr);
+					}
 				}
 			}
 
@@ -423,17 +416,22 @@ void PixelShaderManager::SetPSTextureDims(int texid)
 void PixelShaderManager::SetColorChanged(int type, int num, bool high)
 {
 	float *pf = &lastRGBAfull[type][num][0];
-	if (!high) {
+
+	if (!high)
+	{
 		int r = bpmem.tevregs[num].low.a;
 		int a = bpmem.tevregs[num].low.b;
 		pf[0] = (float)r * (1.0f / 255.0f);
 		pf[3] = (float)a * (1.0f / 255.0f);
-	} else {
+	}
+	else
+	{
 		int b = bpmem.tevregs[num].high.a;
 		int g = bpmem.tevregs[num].high.b;
 		pf[1] = (float)g * (1.0f / 255.0f);
 		pf[2] = (float)b * (1.0f / 255.0f);
 	}
+
 	s_nColorsChanged[type] |= 1 << num;
 	PRIM_LOG("pixel %scolor%d: %f %f %f %f\n", type?"k":"", num, pf[0], pf[1], pf[2], pf[3]);
 }
diff --git a/Source/Core/VideoCommon/Src/PixelShaderManager.h b/Source/Core/VideoCommon/Src/PixelShaderManager.h
index e19fefb685..7f63fb3f46 100644
--- a/Source/Core/VideoCommon/Src/PixelShaderManager.h
+++ b/Source/Core/VideoCommon/Src/PixelShaderManager.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _PIXELSHADERMANAGER_H
 #define _PIXELSHADERMANAGER_H
diff --git a/Source/Core/VideoCommon/Src/RenderBase.cpp b/Source/Core/VideoCommon/Src/RenderBase.cpp
index 90a09aec43..f514af0422 100644
--- a/Source/Core/VideoCommon/Src/RenderBase.cpp
+++ b/Source/Core/VideoCommon/Src/RenderBase.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 // ---------------------------------------------------------------------------------------------
 // GC graphics pipeline
@@ -144,7 +131,7 @@ int Renderer::EFBToScaledX(int x)
 {
 	switch (g_ActiveConfig.iEFBScale)
 	{
-		case 0: // fractional
+	case SCALE_AUTO: // fractional
 			return (int)ssaa_multiplier * FramebufferManagerBase::ScaleToVirtualXfbWidth(x, s_backbuffer_width);
 
 		default:
@@ -156,7 +143,7 @@ int Renderer::EFBToScaledY(int y)
 {
 	switch (g_ActiveConfig.iEFBScale)
 	{
-		case 0: // fractional
+		case SCALE_AUTO: // fractional
 			return (int)ssaa_multiplier * FramebufferManagerBase::ScaleToVirtualXfbHeight(y, s_backbuffer_height);
 
 		default:
@@ -166,7 +153,7 @@ int Renderer::EFBToScaledY(int y)
 
 void Renderer::CalculateTargetScale(int x, int y, int &scaledX, int &scaledY)
 {
-	if (g_ActiveConfig.iEFBScale == 0 || g_ActiveConfig.iEFBScale == 1)
+	if (g_ActiveConfig.iEFBScale == SCALE_AUTO || g_ActiveConfig.iEFBScale == SCALE_AUTO_INTEGRAL)
 	{
 		scaledX = x;
 		scaledY = y;
@@ -283,28 +270,28 @@ void Renderer::DrawDebugText()
 	const char* res_text = "";
 	switch (g_ActiveConfig.iEFBScale)
 	{
-	case 0:
+	case SCALE_AUTO:
 		res_text = "Auto (fractional)";
 		break;
-	case 1:
+	case SCALE_AUTO_INTEGRAL:
 		res_text = "Auto (integral)";
 		break;
-	case 2:
+	case SCALE_1X:
 		res_text = "Native";
 		break;
-	case 3:
+	case SCALE_1_5X:
 		res_text = "1.5x";
 		break;
-	case 4:
+	case SCALE_2X:
 		res_text = "2x";
 		break;
-	case 5:
+	case SCALE_2_5X:
 		res_text = "2.5x";
 		break;
-	case 6:
+	case SCALE_3X:
 		res_text = "3x";
 		break;
-	case 7:
+	case SCALE_4X:
 		res_text = "4x";
 		break;
 	}
diff --git a/Source/Core/VideoCommon/Src/RenderBase.h b/Source/Core/VideoCommon/Src/RenderBase.h
index 55678f3f5a..84849f476e 100644
--- a/Source/Core/VideoCommon/Src/RenderBase.h
+++ b/Source/Core/VideoCommon/Src/RenderBase.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 // ---------------------------------------------------------------------------------------------
 // GC graphics pipeline
diff --git a/Source/Core/VideoCommon/Src/Statistics.cpp b/Source/Core/VideoCommon/Src/Statistics.cpp
index 5f3240f44e..3dcd281b7f 100644
--- a/Source/Core/VideoCommon/Src/Statistics.cpp
+++ b/Source/Core/VideoCommon/Src/Statistics.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include <string.h>
 
@@ -46,8 +33,8 @@ void Statistics::SwapDL()
 char *Statistics::ToString(char *ptr)
 {
 	char *p = ptr;
-	ptr+=sprintf(ptr,"textures created: %i\n",stats.numTexturesCreated);
-	ptr+=sprintf(ptr,"textures alive: %i\n",stats.numTexturesAlive);
+	ptr+=sprintf(ptr,"Textures created: %i\n",stats.numTexturesCreated);
+	ptr+=sprintf(ptr,"Textures alive: %i\n",stats.numTexturesAlive);
 	ptr+=sprintf(ptr,"pshaders created: %i\n",stats.numPixelShadersCreated);
 	ptr+=sprintf(ptr,"pshaders alive: %i\n",stats.numPixelShadersAlive);
 	ptr+=sprintf(ptr,"pshaders (unique, delete cache first): %i\n",stats.numUniquePixelShaders);
@@ -56,12 +43,12 @@ char *Statistics::ToString(char *ptr)
 	ptr+=sprintf(ptr,"dlists called:    %i\n",stats.numDListsCalled);
 	ptr+=sprintf(ptr,"dlists called(f): %i\n",stats.thisFrame.numDListsCalled);
 	ptr+=sprintf(ptr,"dlists alive:     %i\n",stats.numDListsAlive);
-	ptr+=sprintf(ptr,"primitive joins: %i\n",stats.thisFrame.numPrimitiveJoins);
-	ptr+=sprintf(ptr,"draw calls:       %i\n",stats.thisFrame.numDrawCalls);
-	ptr+=sprintf(ptr,"indexed draw calls: %i\n",stats.thisFrame.numIndexedDrawCalls);
-	ptr+=sprintf(ptr,"buffer splits:    %i\n",stats.thisFrame.numBufferSplits);
-	ptr+=sprintf(ptr,"primitives: %i\n",stats.thisFrame.numPrims);
-	ptr+=sprintf(ptr,"primitives (DL): %i\n",stats.thisFrame.numDLPrims);
+	ptr+=sprintf(ptr,"Primitive joins: %i\n",stats.thisFrame.numPrimitiveJoins);
+	ptr+=sprintf(ptr,"Draw calls:       %i\n",stats.thisFrame.numDrawCalls);
+	ptr+=sprintf(ptr,"Indexed draw calls: %i\n",stats.thisFrame.numIndexedDrawCalls);
+	ptr+=sprintf(ptr,"Buffer splits:    %i\n",stats.thisFrame.numBufferSplits);
+	ptr+=sprintf(ptr,"Primitives: %i\n",stats.thisFrame.numPrims);
+	ptr+=sprintf(ptr,"Primitives (DL): %i\n",stats.thisFrame.numDLPrims);
 	ptr+=sprintf(ptr,"XF loads: %i\n",stats.thisFrame.numXFLoads);
 	ptr+=sprintf(ptr,"XF loads (DL): %i\n",stats.thisFrame.numXFLoadsInDL);
 	ptr+=sprintf(ptr,"CP loads: %i\n",stats.thisFrame.numCPLoads);
@@ -85,7 +72,8 @@ char *Statistics::ToString(char *ptr)
 }
 
 // Is this really needed?
-char *Statistics::ToStringProj(char *ptr) {
+char *Statistics::ToStringProj(char *ptr)
+{
 	char *p = ptr;
 	p+=sprintf(p,"Projection #: X for Raw 6=0 (X for Raw 6!=0)\n\n");
 	p+=sprintf(p,"Projection 0: %f (%f) Raw 0: %f\n", stats.gproj_0, stats.g2proj_0, stats.proj_0);
diff --git a/Source/Core/VideoCommon/Src/Statistics.h b/Source/Core/VideoCommon/Src/Statistics.h
index fac7691b35..cb8a3afdc5 100644
--- a/Source/Core/VideoCommon/Src/Statistics.h
+++ b/Source/Core/VideoCommon/Src/Statistics.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "CommonTypes.h"
 #include "VideoCommon.h"
diff --git a/Source/Core/VideoCommon/Src/TextureCacheBase.cpp b/Source/Core/VideoCommon/Src/TextureCacheBase.cpp
index 319c014f22..d5d21f89d0 100644
--- a/Source/Core/VideoCommon/Src/TextureCacheBase.cpp
+++ b/Source/Core/VideoCommon/Src/TextureCacheBase.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "MemoryUtil.h"
 
@@ -55,9 +42,12 @@ TextureCache::TextureCache()
 	temp_size = 2048 * 2048 * 4;
 	if (!temp)
 		temp = (u8*)AllocateAlignedMemory(temp_size, 16);
+
 	TexDecoder_SetTexFmtOverlayOptions(g_ActiveConfig.bTexFmtOverlayEnable, g_ActiveConfig.bTexFmtOverlayCenter);
+
 	if(g_ActiveConfig.bHiresTextures && !g_ActiveConfig.bDumpTextures)
 		HiresTextures::Init(SConfig::GetInstance().m_LocalCoreStartupParameter.m_strUniqueID.c_str());
+
 	SetHash64Function(g_ActiveConfig.bHiresTextures || g_ActiveConfig.bDumpTextures);
 }
 
@@ -138,7 +128,9 @@ void TextureCache::Cleanup()
 			textures.erase(iter++);
 		}
 		else
+		{
 			++iter;
+		}
 	}
 }
 
@@ -156,7 +148,9 @@ void TextureCache::InvalidateRange(u32 start_address, u32 size)
 			textures.erase(iter++);
 		}
 		else
+		{
 			++iter;
+		}
 	}
 }
 
@@ -214,7 +208,9 @@ void TextureCache::ClearRenderTargets()
 			textures.erase(iter++);
 		}
 		else
+		{
 			++iter;
+		}
 	}
 }
 
@@ -395,7 +391,7 @@ TextureCache::TCacheEntryBase* TextureCache::Load(unsigned int const stage,
 
 			// 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())
+			// (similar to what is already being done in Renderer::ReinterpretPixelFormat())
 			return ReturnEntry(stage, entry);
 		}
 
@@ -560,17 +556,20 @@ void TextureCache::CopyRenderTargetToTexture(u32 dstAddr, unsigned int dstFormat
 	const EFBRectangle& srcRect, bool isIntensity, bool scaleByHalf)
 {
 	// Emulation methods:
+	// 
 	// - EFB to RAM:
 	//		Encodes the requested EFB data at its native resolution to the emulated RAM using shaders.
 	//		Load() decodes the data from there again (using TextureDecoder) if the EFB copy is being used as a texture again.
 	//		Advantage: CPU can read data from the EFB copy and we don't lose any important updates to the texture
 	//		Disadvantage: Encoding+decoding steps often are redundant because only some games read or modify EFB copies before using them as textures.
+	// 
 	// - EFB to texture:
 	//		Copies the requested EFB data to a texture object in VRAM, performing any color conversion using shaders.
 	//		Advantage:	Works for many games, since in most cases EFB copies aren't read or modified at all before being used as a texture again.
 	//					Since we don't do any further encoding or decoding here, this method is much faster.
 	//					It also allows enhancing the visual quality by doing scaled EFB copies.
-	// - hybrid EFB copies:
+	// 
+	// - Hybrid EFB copies:
 	//		1a) Whenever this function gets called, encode the requested EFB data to RAM (like EFB to RAM)
 	//		1b) Set type to TCET_EC_DYNAMIC for all texture cache entries in the destination address range.
 	//			If EFB copy caching is enabled, further checks will (try to) prevent redundant EFB copies.
@@ -685,8 +684,8 @@ void TextureCache::CopyRenderTargetToTexture(u32 dstAddr, unsigned int dstFormat
 				}
 				else
 				{
-					cbufid = 9;	
-				}				
+					cbufid = 9;
+				}
 			}
 			else// alpha
 			{
diff --git a/Source/Core/VideoCommon/Src/TextureCacheBase.h b/Source/Core/VideoCommon/Src/TextureCacheBase.h
index 40441c2d70..acfb2e94b2 100644
--- a/Source/Core/VideoCommon/Src/TextureCacheBase.h
+++ b/Source/Core/VideoCommon/Src/TextureCacheBase.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _TEXTURECACHEBASE_H
 #define _TEXTURECACHEBASE_H
@@ -137,7 +124,8 @@ private:
 	static TexCache textures;
 
 	// Backup configuration values
-	static struct BackupConfig {
+	static struct BackupConfig
+	{
 		int s_colorsamples;
 		bool s_copy_efb_to_texture;
 		bool s_copy_efb_scaled;
diff --git a/Source/Core/VideoCommon/Src/TextureConversionShader.cpp b/Source/Core/VideoCommon/Src/TextureConversionShader.cpp
index 5a81c9e7d5..539d8799f9 100644
--- a/Source/Core/VideoCommon/Src/TextureConversionShader.cpp
+++ b/Source/Core/VideoCommon/Src/TextureConversionShader.cpp
@@ -1,19 +1,6 @@
-// Copyright (C) 2003-2000 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 
 #include <stdio.h>
@@ -39,7 +26,8 @@ namespace TextureConversionShader
 
 u16 GetEncodedSampleCount(u32 format)
 {
-	switch (format) {
+	switch (format)
+	{
 	case GX_TF_I4: return 8;
 	case GX_TF_I8: return 4;
 	case GX_TF_IA4: return 4;
@@ -105,8 +93,8 @@ void WriteSwizzler(char*& p, u32 format, API_TYPE ApiType)
 
 	if (ApiType == API_OPENGL)
 	{
-		WRITE(p, "  out float4 ocol0;\n");
-		WRITE(p, "  in float2 uv0;\n");
+		WRITE(p, "  COLOROUT(ocol0)\n");
+		WRITE(p, "  VARYIN float2 uv0;\n");
 		WRITE(p, "void main()\n");
 	}
 	else
@@ -187,7 +175,7 @@ void Write32BitSwizzler(char*& p, u32 format, API_TYPE ApiType)
 	if (ApiType == API_OPENGL)
 	{
 		WRITE(p, "  out float4 ocol0;\n");
-		WRITE(p, "  in float2 uv0;\n");
+		WRITE(p, "  VARYIN float2 uv0;\n");
 		WRITE(p, "void main()\n");
 	}
 	else
diff --git a/Source/Core/VideoCommon/Src/TextureConversionShader.h b/Source/Core/VideoCommon/Src/TextureConversionShader.h
index 10d80376ad..aa42726b2c 100644
--- a/Source/Core/VideoCommon/Src/TextureConversionShader.h
+++ b/Source/Core/VideoCommon/Src/TextureConversionShader.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _TEXTURECONVERSIONSHADER_H_
 #define _TEXTURECONVERSIONSHADER_H_
diff --git a/Source/Core/VideoCommon/Src/TextureDecoder.h b/Source/Core/VideoCommon/Src/TextureDecoder.h
index e9154763cb..968570a084 100644
--- a/Source/Core/VideoCommon/Src/TextureDecoder.h
+++ b/Source/Core/VideoCommon/Src/TextureDecoder.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _TEXTUREDECODER_H
 #define _TEXTUREDECODER_H
diff --git a/Source/Core/VideoCommon/Src/VertexLoader.cpp b/Source/Core/VideoCommon/Src/VertexLoader.cpp
index 5df495a44c..babaff83a5 100644
--- a/Source/Core/VideoCommon/Src/VertexLoader.cpp
+++ b/Source/Core/VideoCommon/Src/VertexLoader.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include <assert.h>
 
@@ -227,7 +214,7 @@ void VertexLoader::CompileVertexTranslator()
 
 #ifdef USE_JIT
 	if (m_compiledCode)
-		PanicAlert("trying to recompile a vtx translator");
+		PanicAlert("Trying to recompile a vertex translator");
 
 	m_compiledCode = GetCodePtr();
 	ABI_EmitPrologue(4);
@@ -237,14 +224,17 @@ void VertexLoader::CompileVertexTranslator()
 
 	// Reset component counters if present in vertex format only.
 	if (m_VtxDesc.Tex0Coord || m_VtxDesc.Tex1Coord || m_VtxDesc.Tex2Coord || m_VtxDesc.Tex3Coord ||
-		m_VtxDesc.Tex4Coord || m_VtxDesc.Tex5Coord || m_VtxDesc.Tex6Coord || m_VtxDesc.Tex7Coord) {
+		m_VtxDesc.Tex4Coord || m_VtxDesc.Tex5Coord || m_VtxDesc.Tex6Coord || m_VtxDesc.Tex7Coord)
+	{
 		WriteSetVariable(32, &tcIndex, Imm32(0));
 	}
-	if (m_VtxDesc.Color0 || m_VtxDesc.Color1) {
+	if (m_VtxDesc.Color0 || m_VtxDesc.Color1)
+	{
 		WriteSetVariable(32, &colIndex, Imm32(0));
 	}
 	if (m_VtxDesc.Tex0MatIdx || m_VtxDesc.Tex1MatIdx || m_VtxDesc.Tex2MatIdx || m_VtxDesc.Tex3MatIdx ||
-		m_VtxDesc.Tex4MatIdx || m_VtxDesc.Tex5MatIdx || m_VtxDesc.Tex6MatIdx || m_VtxDesc.Tex7MatIdx) {
+		m_VtxDesc.Tex4MatIdx || m_VtxDesc.Tex5MatIdx || m_VtxDesc.Tex6MatIdx || m_VtxDesc.Tex7MatIdx)
+	{
 		WriteSetVariable(32, &s_texmtxwrite, Imm32(0));
 		WriteSetVariable(32, &s_texmtxread, Imm32(0));
 	}
@@ -271,14 +261,16 @@ void VertexLoader::CompileVertexTranslator()
 	int nat_offset = 0;
 	PortableVertexDeclaration vtx_decl;
 	memset(&vtx_decl, 0, sizeof(vtx_decl));
-	for (int i = 0; i < 8; i++) {
+	for (int i = 0; i < 8; i++)
+	{
 		vtx_decl.texcoord_offset[i] = -1;
 	}
 
 	// m_VBVertexStride for texmtx and posmtx is computed later when writing.
 	
 	// Position Matrix Index
-	if (m_VtxDesc.PosMatIdx) {
+	if (m_VtxDesc.PosMatIdx)
+	{
 		WriteCall(PosMtx_ReadDirect_UByte);
 		m_NativeFmt->m_components |= VB_HAS_POSMTXIDX;
 		m_VertexSize += 1;
@@ -294,11 +286,14 @@ void VertexLoader::CompileVertexTranslator()
 	if (m_VtxDesc.Tex7MatIdx) {m_VertexSize += 1; m_NativeFmt->m_components |= VB_HAS_TEXMTXIDX7; WriteCall(TexMtx_ReadDirect_UByte); }
 
 	// Write vertex position loader
-	if(g_ActiveConfig.bUseBBox) {
+	if(g_ActiveConfig.bUseBBox)
+	{
 		WriteCall(UpdateBoundingBoxPrepare);
 		WriteCall(VertexLoader_Position::GetFunction(m_VtxDesc.Position, m_VtxAttr.PosFormat, m_VtxAttr.PosElements));
 		WriteCall(UpdateBoundingBox);
-	} else {
+	}
+	else
+	{
 		WriteCall(VertexLoader_Position::GetFunction(m_VtxDesc.Position, m_VtxAttr.PosFormat, m_VtxAttr.PosElements));
 	}
 	m_VertexSize += VertexLoader_Position::GetSize(m_VtxDesc.Position, m_VtxAttr.PosFormat, m_VtxAttr.PosElements);
@@ -330,7 +325,9 @@ void VertexLoader::CompileVertexTranslator()
 		vtx_decl.normal_gl_size = 3;
 		vtx_decl.normal_offset[0] = nat_offset;
 		nat_offset += 12;
-		if (vtx_attr.NormalElements) {
+
+		if (vtx_attr.NormalElements)
+		{
 			vtx_decl.normal_offset[1] = nat_offset;
 			nat_offset += 12;
 			vtx_decl.normal_offset[2] = nat_offset;
@@ -347,7 +344,8 @@ void VertexLoader::CompileVertexTranslator()
 	vtx_decl.color_gl_type = VAR_UNSIGNED_BYTE;
 	vtx_decl.color_offset[0] = -1;
 	vtx_decl.color_offset[1] = -1;
-	for (int i = 0; i < 2; i++) {
+	for (int i = 0; i < 2; i++)
+	{
 		m_NativeFmt->m_components |= VB_HAS_COL0 << i;
 		switch (col[i])
 		{
@@ -395,32 +393,39 @@ void VertexLoader::CompileVertexTranslator()
 			break;
 		}
 		// Common for the three bottom cases
-		if (col[i] != NOT_PRESENT) {
+		if (col[i] != NOT_PRESENT)
+		{
 			vtx_decl.color_offset[i] = nat_offset;
 			nat_offset += 4;
 		}
 	}
 
 	// Texture matrix indices (remove if corresponding texture coordinate isn't enabled)
-	for (int i = 0; i < 8; i++) {
+	for (int i = 0; i < 8; i++)
+	{
 		vtx_decl.texcoord_offset[i] = -1;
 		const int format = m_VtxAttr.texCoord[i].Format;
 		const int elements = m_VtxAttr.texCoord[i].Elements;
 
-		if (tc[i] == NOT_PRESENT) {
+		if (tc[i] == NOT_PRESENT)
+		{
 			m_NativeFmt->m_components &= ~(VB_HAS_UV0 << i);
-		} else {
+		}
+		else
+		{
 			_assert_msg_(VIDEO, DIRECT <= tc[i] && tc[i] <= INDEX16, "Invalid texture coordinates!\n(tc[i] = %d)", tc[i]);
 			_assert_msg_(VIDEO, FORMAT_UBYTE <= format && format <= FORMAT_FLOAT, "Invalid texture coordinates format!\n(format = %d)", format);
-			_assert_msg_(VIDEO, 0 <= elements && elements <= 1, "Invalid number of texture coordinates elemnts!\n(elements = %d)", elements);
+			_assert_msg_(VIDEO, 0 <= elements && elements <= 1, "Invalid number of texture coordinates elements!\n(elements = %d)", elements);
 
 			m_NativeFmt->m_components |= VB_HAS_UV0 << i;
 			WriteCall(VertexLoader_TextCoord::GetFunction(tc[i], format, elements));
 			m_VertexSize += VertexLoader_TextCoord::GetSize(tc[i], format, elements);
 		}
 
-		if (m_NativeFmt->m_components & (VB_HAS_TEXMTXIDX0 << i)) {
-			if (tc[i] != NOT_PRESENT) {
+		if (m_NativeFmt->m_components & (VB_HAS_TEXMTXIDX0 << i))
+		{
+			if (tc[i] != NOT_PRESENT)
+			{
 				// if texmtx is included, texcoord will always be 3 floats, z will be the texmtx index
 				vtx_decl.texcoord_offset[i] = nat_offset;
 				vtx_decl.texcoord_gl_type[i] = VAR_FLOAT;
@@ -428,7 +433,8 @@ void VertexLoader::CompileVertexTranslator()
 				nat_offset += 12;
 				WriteCall(m_VtxAttr.texCoord[i].Elements ? TexMtx_Write_Float : TexMtx_Write_Float2);
 			}
-			else {
+			else
+			{
 				m_NativeFmt->m_components |= VB_HAS_UV0 << i; // have to include since using now
 				vtx_decl.texcoord_offset[i] = nat_offset;
 				vtx_decl.texcoord_gl_type[i] = VAR_FLOAT;
@@ -437,8 +443,10 @@ void VertexLoader::CompileVertexTranslator()
 				WriteCall(TexMtx_Write_Float4);
 			}
 		}
-		else {
-			if (tc[i] != NOT_PRESENT) {
+		else
+		{
+			if (tc[i] != NOT_PRESENT)
+			{
 				vtx_decl.texcoord_offset[i] = nat_offset;
 				vtx_decl.texcoord_gl_type[i] = VAR_FLOAT;
 				vtx_decl.texcoord_size[i] = vtx_attr.texCoord[i].Elements ? 2 : 1;
@@ -446,28 +454,35 @@ void VertexLoader::CompileVertexTranslator()
 			}
 		}
 
-		if (tc[i] == NOT_PRESENT) {
+		if (tc[i] == NOT_PRESENT)
+		{
 			// if there's more tex coords later, have to write a dummy call 
 			int j = i + 1;
-			for (; j < 8; ++j) {
-				if (tc[j] != NOT_PRESENT) {
+			for (; j < 8; ++j)
+			{
+				if (tc[j] != NOT_PRESENT)
+				{
 					WriteCall(VertexLoader_TextCoord::GetDummyFunction()); // important to get indices right!
 					break;
 				}
 			}
 			// tricky!
-			if (j == 8 && !((m_NativeFmt->m_components & VB_HAS_TEXMTXIDXALL) & (VB_HAS_TEXMTXIDXALL << (i + 1)))) {
+			if (j == 8 && !((m_NativeFmt->m_components & VB_HAS_TEXMTXIDXALL) & (VB_HAS_TEXMTXIDXALL << (i + 1))))
+			{
 				// no more tex coords and tex matrices, so exit loop
 				break;
 			}
 		}
 	}
 
-	if (m_VtxDesc.PosMatIdx) {
+	if (m_VtxDesc.PosMatIdx)
+	{
 		WriteCall(PosMtx_Write);
 		vtx_decl.posmtx_offset = nat_offset;
 		nat_offset += 4;
-	} else {
+	}
+	else
+	{
 		vtx_decl.posmtx_offset = -1;
 	}
 
@@ -587,7 +602,8 @@ void VertexLoader::RunVertices(int vtx_attr_group, int primitive, int const coun
 void VertexLoader::ConvertVertices ( int count )
 {
 #ifdef USE_JIT
-	if (count > 0) {
+	if (count > 0)
+	{
 		loop_counter = count;
 		((void (*)())(void*)m_compiledCode)();
 	}
@@ -659,6 +675,10 @@ void VertexLoader::SetVAT(u32 _group0, u32 _group1, u32 _group2)
 	m_VtxAttr.texCoord[7].Elements	= vat.g2.Tex7CoordElements;
 	m_VtxAttr.texCoord[7].Format	= vat.g2.Tex7CoordFormat;
 	m_VtxAttr.texCoord[7].Frac		= vat.g2.Tex7Frac;
+	
+	if(!m_VtxAttr.ByteDequant) {
+		ERROR_LOG(VIDEO, "ByteDequant is set to zero");
+	}
 };
 
 void VertexLoader::AppendToString(std::string *dest) const
@@ -687,10 +707,13 @@ void VertexLoader::AppendToString(std::string *dest) const
 	dest->append(StringFromFormat("%ib skin: %i P: %i %s-%s ",
 		m_VertexSize, m_VtxDesc.PosMatIdx,
 		m_VtxAttr.PosElements ? 3 : 2, posMode[m_VtxDesc.Position], posFormats[m_VtxAttr.PosFormat]));
-	if (m_VtxDesc.Normal) {
+
+	if (m_VtxDesc.Normal)
+	{
 		dest->append(StringFromFormat("Nrm: %i %s-%s ",
 			m_VtxAttr.NormalElements, posMode[m_VtxDesc.Normal], posFormats[m_VtxAttr.NormalFormat]));
 	}
+
 	u32 color_mode[2] = {m_VtxDesc.Color0, m_VtxDesc.Color1};
 	for (int i = 0; i < 2; i++)
 	{
diff --git a/Source/Core/VideoCommon/Src/VertexLoader.h b/Source/Core/VideoCommon/Src/VertexLoader.h
index 862eabff3e..06c5508040 100644
--- a/Source/Core/VideoCommon/Src/VertexLoader.h
+++ b/Source/Core/VideoCommon/Src/VertexLoader.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _VERTEXLOADER_H
 #define _VERTEXLOADER_H
@@ -37,8 +24,12 @@ class VertexLoaderUID
 	u32 vid[5];
 	size_t hash;
 public:
-	VertexLoaderUID() {}
-	void InitFromCurrentState(int vtx_attr_group) {
+	VertexLoaderUID() 
+	{
+	}
+
+	void InitFromCurrentState(int vtx_attr_group)
+	{
 		vid[0] = g_VtxDesc.Hex & 0xFFFFFFFF;
 		vid[1] = g_VtxDesc.Hex >> 32;
 		vid[2] = g_VtxAttr[vtx_attr_group].g0.Hex & ~VAT_0_FRACBITS;
@@ -46,32 +37,47 @@ public:
 		vid[4] = g_VtxAttr[vtx_attr_group].g2.Hex & ~VAT_2_FRACBITS;
 		hash = CalculateHash();
 	}
-	bool operator < (const VertexLoaderUID &other) const {
+
+	bool operator < (const VertexLoaderUID &other) const
+	{
 		// This is complex because of speed.
 		if (vid[0] < other.vid[0])
 			return true;
 		else if (vid[0] > other.vid[0])
 			return false;
-		for (int i = 1; i < 5; ++i) {
+
+		for (int i = 1; i < 5; ++i)
+		{
 			if (vid[i] < other.vid[i])
 				return true;
 			else if (vid[i] > other.vid[i])
 				return false;
 		}
+
 		return false;
 	}
-	bool operator == (const VertexLoaderUID& rh) const {
+
+	bool operator == (const VertexLoaderUID& rh) const
+	{
 		return hash == rh.hash && std::equal(vid, vid + sizeof(vid) / sizeof(vid[0]), rh.vid);
 	}
-	size_t GetHash() const {
+
+	size_t GetHash() const
+	{
 		return hash;
 	}
+
 private:
-	size_t CalculateHash() {
+
+	size_t CalculateHash()
+	{
 		size_t h = -1;
-		for (unsigned int i = 0; i < sizeof(vid) / sizeof(vid[0]); ++i) {
+
+		for (unsigned int i = 0; i < sizeof(vid) / sizeof(vid[0]); ++i)
+		{
 			h = h * 137 + vid[i];
 		}
+
 		return h;
 	}
 };
diff --git a/Source/Core/VideoCommon/Src/VertexLoaderManager.cpp b/Source/Core/VideoCommon/Src/VertexLoaderManager.cpp
index 153e69a8c3..856b5d9fa5 100644
--- a/Source/Core/VideoCommon/Src/VertexLoaderManager.cpp
+++ b/Source/Core/VideoCommon/Src/VertexLoaderManager.cpp
@@ -1,32 +1,9 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include <algorithm>
-#ifdef _MSC_VER
-#include <hash_map>
-using stdext::hash_map;
-#elif defined __APPLE__
-#include <ext/hash_map>
-using __gnu_cxx::hash_map;
-#else
 #include <unordered_map>
-using std::unordered_map;
-#endif
-#include <map>
 #include <vector>
 
 #include "VideoCommon.h"
@@ -41,32 +18,21 @@ static int s_attr_dirty;  // bitfield
 
 static VertexLoader *g_VertexLoaders[8];
 
-#ifdef _MSC_VER
-namespace stdext {
-	inline size_t hash_value(const VertexLoaderUID& uid) {
+namespace std
+{
+
+template <>
+struct hash<VertexLoaderUID>
+{
+	size_t operator()(const VertexLoaderUID& uid) const
+	{
 		return uid.GetHash();
 	}
-}
-#else
-#ifdef __APPLE__
-namespace __gnu_cxx
-#else
-namespace std
-#endif
-{
-	template<> struct hash<VertexLoaderUID> {
-		size_t operator()(const VertexLoaderUID& uid) const {
-			return uid.GetHash();
-		}
-	};
-}
-#endif
+};
 
-#if defined _MSC_VER || defined __APPLE__
-typedef hash_map<VertexLoaderUID, VertexLoader*> VertexLoaderMap;
-#else
-typedef unordered_map<VertexLoaderUID, VertexLoader*> VertexLoaderMap;
-#endif
+}
+
+typedef std::unordered_map<VertexLoaderUID, VertexLoader*> VertexLoaderMap;
 
 namespace VertexLoaderManager
 {
@@ -91,11 +57,14 @@ void Shutdown()
 	g_VertexLoaderMap.clear();
 }
 
-namespace {
-struct entry {
+namespace
+{
+struct entry
+{
 	std::string text;
 	u64 num_verts;
-	bool operator < (const entry &other) const {
+	bool operator < (const entry &other) const
+	{
 		return num_verts > other.num_verts;
 	}
 };
@@ -116,7 +85,8 @@ void AppendListToString(std::string *dest)
 	}
 	sort(entries.begin(), entries.end());
 	dest->reserve(dest->size() + total_size);
-	for (std::vector<entry>::const_iterator iter = entries.begin(); iter != entries.end(); ++iter) {
+	for (std::vector<entry>::const_iterator iter = entries.begin(); iter != entries.end(); ++iter)
+	{
 		dest->append(iter->text);
 	}
 }
diff --git a/Source/Core/VideoCommon/Src/VertexLoaderManager.h b/Source/Core/VideoCommon/Src/VertexLoaderManager.h
index e61977b07e..ca795f0d18 100644
--- a/Source/Core/VideoCommon/Src/VertexLoaderManager.h
+++ b/Source/Core/VideoCommon/Src/VertexLoaderManager.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _VERTEXLOADERMANAGER_H
 #define _VERTEXLOADERMANAGER_H
diff --git a/Source/Core/VideoCommon/Src/VertexLoader_Color.cpp b/Source/Core/VideoCommon/Src/VertexLoader_Color.cpp
index fa1ecbe973..45af21138f 100644
--- a/Source/Core/VideoCommon/Src/VertexLoader_Color.cpp
+++ b/Source/Core/VideoCommon/Src/VertexLoader_Color.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "Common.h"
 #include "VideoCommon.h"
@@ -91,7 +78,8 @@ void LOADERDECL Color_ReadDirect_24b_888()
 	DataSkip(3);
 }
 
-void LOADERDECL Color_ReadDirect_32b_888x(){
+void LOADERDECL Color_ReadDirect_32b_888x()
+{
 	_SetCol(_Read24(DataGetPosition()));
 	DataSkip(4);
 }
diff --git a/Source/Core/VideoCommon/Src/VertexLoader_Color.h b/Source/Core/VideoCommon/Src/VertexLoader_Color.h
index 0c39d50203..ac590b4c0e 100644
--- a/Source/Core/VideoCommon/Src/VertexLoader_Color.h
+++ b/Source/Core/VideoCommon/Src/VertexLoader_Color.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _VERTEXLOADERCOLOR_H
 #define _VERTEXLOADERCOLOR_H
diff --git a/Source/Core/VideoCommon/Src/VertexLoader_Normal.cpp b/Source/Core/VideoCommon/Src/VertexLoader_Normal.cpp
index a5ea1981da..ba1219b2ee 100644
--- a/Source/Core/VideoCommon/Src/VertexLoader_Normal.cpp
+++ b/Source/Core/VideoCommon/Src/VertexLoader_Normal.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "Common.h"
 #include "VideoCommon.h"
@@ -53,7 +40,9 @@ __forceinline float FracAdjust(T val)
 
 template <>
 __forceinline float FracAdjust(float val)
-{ return val; }
+{
+	return val;
+}
 
 template <typename T, int N>
 __forceinline void ReadIndirect(const T* data)
@@ -200,5 +189,5 @@ TPipelineFunction VertexLoader_Normal::GetFunction(unsigned int _type,
 	unsigned int _format, unsigned int _elements, unsigned int _index3)
 {
 	TPipelineFunction pFunc = m_Table[_type][_index3][_elements][_format].function;
-    return pFunc;
+	return pFunc;
 }
diff --git a/Source/Core/VideoCommon/Src/VertexLoader_Normal.h b/Source/Core/VideoCommon/Src/VertexLoader_Normal.h
index a631ab9751..40fd8cac06 100644
--- a/Source/Core/VideoCommon/Src/VertexLoader_Normal.h
+++ b/Source/Core/VideoCommon/Src/VertexLoader_Normal.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _VERTEXLOADER_NORMAL_H
 #define _VERTEXLOADER_NORMAL_H
diff --git a/Source/Core/VideoCommon/Src/VertexLoader_Position.cpp b/Source/Core/VideoCommon/Src/VertexLoader_Position.cpp
index fd902767be..2b383fc3f8 100644
--- a/Source/Core/VideoCommon/Src/VertexLoader_Position.cpp
+++ b/Source/Core/VideoCommon/Src/VertexLoader_Position.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include <limits>
 
@@ -81,7 +68,9 @@ float PosScale(T val)
 
 template <>
 float PosScale(float val)
-{ return val; }
+{
+	return val;
+}
 
 template <typename T, int N>
 void LOADERDECL Pos_ReadDirect()
@@ -179,11 +168,13 @@ static int tableReadPositionVertexSize[4][8][2] = {
 };
 
 
-void VertexLoader_Position::Init(void) {
+void VertexLoader_Position::Init(void)
+{
 
 #if _M_SSE >= 0x301
 
-	if (cpu_info.bSSSE3) {
+	if (cpu_info.bSSSE3)
+	{
 		tableReadPosition[2][4][0] = Pos_ReadIndex_Float_SSSE3<u8, false>;
 		tableReadPosition[2][4][1] = Pos_ReadIndex_Float_SSSE3<u8, true>;
 		tableReadPosition[3][4][0] = Pos_ReadIndex_Float_SSSE3<u16, false>;
@@ -194,10 +185,12 @@ void VertexLoader_Position::Init(void) {
 
 }
 
-unsigned int VertexLoader_Position::GetSize(unsigned int _type, unsigned int _format, unsigned int _elements) {
+unsigned int VertexLoader_Position::GetSize(unsigned int _type, unsigned int _format, unsigned int _elements)
+{
 	return tableReadPositionVertexSize[_type][_format][_elements];
 }
 
-TPipelineFunction VertexLoader_Position::GetFunction(unsigned int _type, unsigned int _format, unsigned int _elements) {
+TPipelineFunction VertexLoader_Position::GetFunction(unsigned int _type, unsigned int _format, unsigned int _elements)
+{
 	return tableReadPosition[_type][_format][_elements];
 }
diff --git a/Source/Core/VideoCommon/Src/VertexLoader_Position.h b/Source/Core/VideoCommon/Src/VertexLoader_Position.h
index c659e05487..41e6028f13 100644
--- a/Source/Core/VideoCommon/Src/VertexLoader_Position.h
+++ b/Source/Core/VideoCommon/Src/VertexLoader_Position.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef VERTEXLOADER_POSITION_H
 #define VERTEXLOADER_POSITION_H
diff --git a/Source/Core/VideoCommon/Src/VertexLoader_TextCoord.cpp b/Source/Core/VideoCommon/Src/VertexLoader_TextCoord.cpp
index f914226a63..2d956b242a 100644
--- a/Source/Core/VideoCommon/Src/VertexLoader_TextCoord.cpp
+++ b/Source/Core/VideoCommon/Src/VertexLoader_TextCoord.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "Common.h"
 #include "VideoCommon.h"
@@ -61,7 +48,9 @@ float TCScale(T val)
 
 template <>
 float TCScale(float val)
-{ return val; }
+{
+	return val;
+}
 
 template <typename T, int N>
 void LOADERDECL TexCoord_ReadDirect()
@@ -179,7 +168,8 @@ static int tableReadTexCoordVertexSize[4][8][2] = {
 	},
 };
 
-void VertexLoader_TextCoord::Init(void) {
+void VertexLoader_TextCoord::Init(void)
+{
 
 #if _M_SSE >= 0x301
 
@@ -203,14 +193,17 @@ void VertexLoader_TextCoord::Init(void) {
 
 }
 
-unsigned int VertexLoader_TextCoord::GetSize(unsigned int _type, unsigned int _format, unsigned int _elements) {
+unsigned int VertexLoader_TextCoord::GetSize(unsigned int _type, unsigned int _format, unsigned int _elements)
+{
 	return tableReadTexCoordVertexSize[_type][_format][_elements];
 }
 
-TPipelineFunction VertexLoader_TextCoord::GetFunction(unsigned int _type, unsigned int _format, unsigned int _elements) {
+TPipelineFunction VertexLoader_TextCoord::GetFunction(unsigned int _type, unsigned int _format, unsigned int _elements)
+{
 	return tableReadTexCoord[_type][_format][_elements];
 }
 
-TPipelineFunction VertexLoader_TextCoord::GetDummyFunction() {
+TPipelineFunction VertexLoader_TextCoord::GetDummyFunction()
+{
 	return TexCoord_Read_Dummy;
 }
diff --git a/Source/Core/VideoCommon/Src/VertexLoader_TextCoord.h b/Source/Core/VideoCommon/Src/VertexLoader_TextCoord.h
index 8e9175d904..7bbafab8db 100644
--- a/Source/Core/VideoCommon/Src/VertexLoader_TextCoord.h
+++ b/Source/Core/VideoCommon/Src/VertexLoader_TextCoord.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef VERTEXLOADER_TEXCOORD_H
 #define VERTEXLOADER_TEXCOORD_H
diff --git a/Source/Core/VideoCommon/Src/VertexManagerBase.cpp b/Source/Core/VideoCommon/Src/VertexManagerBase.cpp
index 87856b5aeb..13fbd55641 100644
--- a/Source/Core/VideoCommon/Src/VertexManagerBase.cpp
+++ b/Source/Core/VideoCommon/Src/VertexManagerBase.cpp
@@ -35,7 +35,8 @@ VertexManager::VertexManager()
 }
 
 VertexManager::~VertexManager()
-{}
+{
+}
 
 void VertexManager::ResetBuffer()
 {
@@ -57,13 +58,13 @@ void VertexManager::PrepareForAdditionalData(int primitive, u32 count, u32 strid
 		Flush();
 		
 		if(count > IndexGenerator::GetRemainingIndices())
-			ERROR_LOG(VIDEO, "Too less index values. Use 32bit or reset them on flush.");
+			ERROR_LOG(VIDEO, "Too little remaining index values. Use 32-bit or reset them on flush.");
 		if (count > GetRemainingIndices(primitive))
 			ERROR_LOG(VIDEO, "VertexManager: Buffer not large enough for all indices! "
-				"Increase MAXIBUFFERSIZE or we need primitive breaking afterall.");
+				"Increase MAXIBUFFERSIZE or we need primitive breaking after all.");
 		if (needed_vertex_bytes > GetRemainingSize())
 			ERROR_LOG(VIDEO, "VertexManager: Buffer not large enough for all vertices! "
-				"Increase MAXVBUFFERSIZE or we need primitive breaking afterall.");
+				"Increase MAXVBUFFERSIZE or we need primitive breaking after all.");
 	}
 }
 
@@ -74,28 +75,57 @@ bool VertexManager::IsFlushed() const
 
 u32 VertexManager::GetRemainingIndices(int primitive)
 {
-	switch (primitive)
+	
+	if(g_Config.backend_info.bSupportsPrimitiveRestart)
 	{
-	case GX_DRAW_QUADS:
-		return (MAXIBUFFERSIZE - IndexGenerator::GetTriangleindexLen()) / 6 * 4;
-	case GX_DRAW_TRIANGLES:
-		return (MAXIBUFFERSIZE - IndexGenerator::GetTriangleindexLen());
-	case GX_DRAW_TRIANGLE_STRIP:
-		return (MAXIBUFFERSIZE - IndexGenerator::GetTriangleindexLen()) / 3 + 2;
-	case GX_DRAW_TRIANGLE_FAN:
-		return (MAXIBUFFERSIZE - IndexGenerator::GetTriangleindexLen()) / 3 + 2;
+		switch (primitive)
+		{
+		case GX_DRAW_QUADS:
+			return (MAXIBUFFERSIZE - IndexGenerator::GetTriangleindexLen()) / 5 * 4;
+		case GX_DRAW_TRIANGLES:
+			return (MAXIBUFFERSIZE - IndexGenerator::GetTriangleindexLen()) / 4 * 3;
+		case GX_DRAW_TRIANGLE_STRIP:
+			return (MAXIBUFFERSIZE - IndexGenerator::GetTriangleindexLen()) / 1 - 1;
+		case GX_DRAW_TRIANGLE_FAN:
+			return (MAXIBUFFERSIZE - IndexGenerator::GetTriangleindexLen()) / 6 * 4 + 1;
 
-	case GX_DRAW_LINES:
-		return (MAXIBUFFERSIZE - IndexGenerator::GetLineindexLen());
-	case GX_DRAW_LINE_STRIP:
-		return (MAXIBUFFERSIZE - IndexGenerator::GetLineindexLen()) / 2 + 1;
+		case GX_DRAW_LINES:
+			return (MAXIBUFFERSIZE - IndexGenerator::GetLineindexLen());
+		case GX_DRAW_LINE_STRIP:
+			return (MAXIBUFFERSIZE - IndexGenerator::GetLineindexLen()) / 2 + 1;
 
-	case GX_DRAW_POINTS:
-		return (MAXIBUFFERSIZE - IndexGenerator::GetPointindexLen());
+		case GX_DRAW_POINTS:
+			return (MAXIBUFFERSIZE - IndexGenerator::GetPointindexLen());
 
-	default:
-		return 0;
+		default:
+			return 0;
+		}
 	}
+	else
+	{
+		switch (primitive)
+		{
+		case GX_DRAW_QUADS:
+			return (MAXIBUFFERSIZE - IndexGenerator::GetTriangleindexLen()) / 6 * 4;
+		case GX_DRAW_TRIANGLES:
+			return (MAXIBUFFERSIZE - IndexGenerator::GetTriangleindexLen());
+		case GX_DRAW_TRIANGLE_STRIP:
+			return (MAXIBUFFERSIZE - IndexGenerator::GetTriangleindexLen()) / 3 + 2;
+		case GX_DRAW_TRIANGLE_FAN:
+			return (MAXIBUFFERSIZE - IndexGenerator::GetTriangleindexLen()) / 3 + 2;
+
+		case GX_DRAW_LINES:
+			return (MAXIBUFFERSIZE - IndexGenerator::GetLineindexLen());
+		case GX_DRAW_LINE_STRIP:
+			return (MAXIBUFFERSIZE - IndexGenerator::GetLineindexLen()) / 2 + 1;
+
+		case GX_DRAW_POINTS:
+			return (MAXIBUFFERSIZE - IndexGenerator::GetPointindexLen());
+
+		default:
+			return 0;
+		}
+	} 
 }
 
 void VertexManager::AddVertices(int primitive, u32 numVertices)
@@ -190,7 +220,9 @@ void VertexManager::Flush()
 				PixelShaderManager::SetTexDims(i, tentry->nativeW, tentry->nativeH, 0, 0);
 			}
 			else
-				ERROR_LOG(VIDEO, "error loading texture");
+			{
+				ERROR_LOG(VIDEO, "Error loading texture");
+			}
 		}
 	}
 
diff --git a/Source/Core/VideoCommon/Src/VertexShaderGen.cpp b/Source/Core/VideoCommon/Src/VertexShaderGen.cpp
index 294e363756..eac041d5c9 100644
--- a/Source/Core/VideoCommon/Src/VertexShaderGen.cpp
+++ b/Source/Core/VideoCommon/Src/VertexShaderGen.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include <math.h>
 #include <locale.h>
@@ -125,7 +112,7 @@ static void GenerateVertexShader(T& out, u32 components, API_TYPE api_type)
 	{
 		out.Write("ATTRIN float4 rawpos; // ATTR%d,\n", SHADER_POSITION_ATTRIB);
 		if (components & VB_HAS_POSMTXIDX)
-			out.Write("ATTRIN int posmtx; // ATTR%d,\n", SHADER_POSMTX_ATTRIB);
+			out.Write("ATTRIN float posmtx; // ATTR%d,\n", SHADER_POSMTX_ATTRIB);
 		if (components & VB_HAS_NRM0)
 			out.Write("ATTRIN float3 rawnorm0; // ATTR%d,\n", SHADER_NORM0_ATTRIB);
 		if (components & VB_HAS_NRM1)
@@ -138,7 +125,8 @@ static void GenerateVertexShader(T& out, u32 components, API_TYPE api_type)
 		if (components & VB_HAS_COL1)
 			out.Write("ATTRIN float4 color1; // ATTR%d,\n", SHADER_COLOR1_ATTRIB);
 
-		for (int i = 0; i < 8; ++i) {
+		for (int i = 0; i < 8; ++i)
+		{
 			u32 hastexmtx = (components & (VB_HAS_TEXMTXIDX0<<i));
 			if ((components & (VB_HAS_UV0<<i)) || hastexmtx)
 				out.Write("ATTRIN float%d tex%d; // ATTR%d,\n", hastexmtx ? 3 : 2, i, SHADER_TEXTURE0_ATTRIB + i);
@@ -179,13 +167,15 @@ static void GenerateVertexShader(T& out, u32 components, API_TYPE api_type)
 		// inputs
 		if (components & VB_HAS_NRM0)
 			out.Write("  float3 rawnorm0 : NORMAL0,\n");
-		if (components & VB_HAS_NRM1) {
+		if (components & VB_HAS_NRM1)
+		{
 			if (is_d3d)
 				out.Write("  float3 rawnorm1 : NORMAL1,\n");
 			else
 				out.Write("  float3 rawnorm1 : ATTR%d,\n", SHADER_NORM1_ATTRIB);
 		}
-		if (components & VB_HAS_NRM2) {
+		if (components & VB_HAS_NRM2)
+		{
 			if (is_d3d)
 				out.Write("  float3 rawnorm2 : NORMAL2,\n");
 			else
@@ -195,12 +185,14 @@ static void GenerateVertexShader(T& out, u32 components, API_TYPE api_type)
 			out.Write("  float4 color0 : COLOR0,\n");
 		if (components & VB_HAS_COL1)
 			out.Write("  float4 color1 : COLOR1,\n");
-		for (int i = 0; i < 8; ++i) {
+		for (int i = 0; i < 8; ++i)
+		{
 			u32 hastexmtx = (components & (VB_HAS_TEXMTXIDX0<<i));
 			if ((components & (VB_HAS_UV0<<i)) || hastexmtx)
 				out.Write("  float%d tex%d : TEXCOORD%d,\n", hastexmtx ? 3 : 2, i, i);
 		}
-		if (components & VB_HAS_POSMTXIDX) {
+		if (components & VB_HAS_POSMTXIDX)
+		{
 			if (is_d3d)
 				out.Write("  float4 blend_indices : BLENDINDICES,\n");
 			else
@@ -208,7 +200,7 @@ static void GenerateVertexShader(T& out, u32 components, API_TYPE api_type)
 		}
 		out.Write("  float4 rawpos : POSITION) {\n");
 	}
-	out.Write("VS_OUTPUT o;\n");	
+	out.Write("VS_OUTPUT o;\n");
 
 	// transforms
 	if (components & VB_HAS_POSMTXIDX)
@@ -222,6 +214,10 @@ static void GenerateVertexShader(T& out, u32 components, API_TYPE api_type)
 		{
 			out.Write("int posmtx = blend_indices.x * 255.0f;\n");
 		}
+		else
+		{
+			out.Write("int posmtx = int(fposmtx);\n");
+		}
 
 		out.Write("float4 pos = float4(dot(" I_TRANSFORMMATRICES"[posmtx], rawpos), dot(" I_TRANSFORMMATRICES"[posmtx+1], rawpos), dot(" I_TRANSFORMMATRICES"[posmtx+2], rawpos), 1);\n");		
 
@@ -288,19 +284,22 @@ static void GenerateVertexShader(T& out, u32 components, API_TYPE api_type)
 
 	// transform texcoords
 	out.Write("float4 coord = float4(0.0f, 0.0f, 1.0f, 1.0f);\n");
-	for (unsigned int i = 0; i < xfregs.numTexGen.numTexGens; ++i) {
+	for (unsigned int i = 0; i < xfregs.numTexGen.numTexGens; ++i)
+	{
 		TexMtxInfo& texinfo = xfregs.texMtxInfo[i];
 
 		out.Write("{\n");
 		out.Write("coord = float4(0.0f, 0.0f, 1.0f, 1.0f);\n");
 		uid_data.texMtxInfo[i].sourcerow = xfregs.texMtxInfo[i].sourcerow;
-		switch (texinfo.sourcerow) {
+		switch (texinfo.sourcerow)
+		{
 		case XF_SRCGEOM_INROW:
 			_assert_( texinfo.inputform == XF_TEXINPUT_ABC1 );
 			out.Write("coord = rawpos;\n"); // pos.w is 1
 			break;
 		case XF_SRCNORMAL_INROW:
-			if (components & VB_HAS_NRM0) {
+			if (components & VB_HAS_NRM0)
+			{
 				_assert_( texinfo.inputform == XF_TEXINPUT_ABC1 );
 				out.Write("coord = float4(rawnorm0.xyz, 1.0f);\n");
 			}
@@ -309,13 +308,15 @@ static void GenerateVertexShader(T& out, u32 components, API_TYPE api_type)
 			_assert_( texinfo.texgentype == XF_TEXGEN_COLOR_STRGBC0 || texinfo.texgentype == XF_TEXGEN_COLOR_STRGBC1 );
 			break;
 		case XF_SRCBINORMAL_T_INROW:
-			if (components & VB_HAS_NRM1) {
+			if (components & VB_HAS_NRM1)
+			{
 				_assert_( texinfo.inputform == XF_TEXINPUT_ABC1 );
 				out.Write("coord = float4(rawnorm1.xyz, 1.0f);\n");
 			}
 			break;
 		case XF_SRCBINORMAL_B_INROW:
-			if (components & VB_HAS_NRM2) {
+			if (components & VB_HAS_NRM2)
+			{
 				_assert_( texinfo.inputform == XF_TEXINPUT_ABC1 );
 				out.Write("coord = float4(rawnorm2.xyz, 1.0f);\n");
 			}
@@ -329,10 +330,12 @@ static void GenerateVertexShader(T& out, u32 components, API_TYPE api_type)
 
 		// first transformation
 		uid_data.texMtxInfo[i].texgentype = xfregs.texMtxInfo[i].texgentype;
-		switch (texinfo.texgentype) {
+		switch (texinfo.texgentype)
+		{
 			case XF_TEXGEN_EMBOSS_MAP: // calculate tex coords into bump map
 
-				if (components & (VB_HAS_NRM1|VB_HAS_NRM2)) {
+				if (components & (VB_HAS_NRM1|VB_HAS_NRM2))
+				{
 					// transform the light dir into tangent space
 					uid_data.texMtxInfo[i].embosslightshift = xfregs.texMtxInfo[i].embosslightshift;
 					uid_data.texMtxInfo[i].embosssourceshift = xfregs.texMtxInfo[i].embosssourceshift;
@@ -363,11 +366,11 @@ static void GenerateVertexShader(T& out, u32 components, API_TYPE api_type)
 					out.Write("int tmp = int(tex%d.z);\n", i);
 					if (texinfo.projection == XF_TEXPROJ_STQ)
 						out.Write("o.tex%d.xyz = float3(dot(coord, " I_TRANSFORMMATRICES"[tmp]), dot(coord, " I_TRANSFORMMATRICES"[tmp+1]), dot(coord, " I_TRANSFORMMATRICES"[tmp+2]));\n", i);
-					else {
+					else
 						out.Write("o.tex%d.xyz = float3(dot(coord, " I_TRANSFORMMATRICES"[tmp]), dot(coord, " I_TRANSFORMMATRICES"[tmp+1]), 1);\n", i);
-					}
 				}
-				else {
+				else
+				{
 					if (texinfo.projection == XF_TEXPROJ_STQ)
 						out.Write("o.tex%d.xyz = float3(dot(coord, " I_TEXMATRICES"[%d]), dot(coord, " I_TEXMATRICES"[%d]), dot(coord, " I_TEXMATRICES"[%d]));\n", i, 3*i, 3*i+1, 3*i+2);
 					else
@@ -377,7 +380,9 @@ static void GenerateVertexShader(T& out, u32 components, API_TYPE api_type)
 		}
 
 		uid_data.dualTexTrans.enabled = xfregs.dualTexTrans.enabled;
-		if (xfregs.dualTexTrans.enabled && texinfo.texgentype == XF_TEXGEN_REGULAR) { // only works for regular tex gen types?
+		// CHECKME: does this only work for regular tex gen types?
+		if (xfregs.dualTexTrans.enabled && texinfo.texgentype == XF_TEXGEN_REGULAR)
+		{
 			const PostMtxInfo& postInfo = xfregs.postMtxInfo[i];
 
 			uid_data.postMtxInfo[i].index = xfregs.postMtxInfo[i].index;
@@ -387,7 +392,8 @@ static void GenerateVertexShader(T& out, u32 components, API_TYPE api_type)
 				"float4 P2 = " I_POSTTRANSFORMMATRICES"[%d];\n",
 				postidx&0x3f, (postidx+1)&0x3f, (postidx+2)&0x3f);
 
-			if (texGenSpecialCase) {
+			if (texGenSpecialCase)
+			{
 				// no normalization
 				// q of input is 1
 				// q of output is unknown
@@ -410,9 +416,12 @@ static void GenerateVertexShader(T& out, u32 components, API_TYPE api_type)
 	}
 
 	// clipPos/w needs to be done in pixel shader, not here
-	if (xfregs.numTexGen.numTexGens < 7) {
+	if (xfregs.numTexGen.numTexGens < 7)
+	{
 		out.Write("o.clipPos = float4(pos.x,pos.y,o.pos.z,o.pos.w);\n");
-	} else {
+	}
+	else
+	{
 		out.Write("o.tex0.w = pos.x;\n");
 		out.Write("o.tex1.w = pos.y;\n");
 		out.Write("o.tex2.w = o.pos.z;\n");
@@ -421,9 +430,12 @@ static void GenerateVertexShader(T& out, u32 components, API_TYPE api_type)
 
 	if(g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting)
 	{
-		if (xfregs.numTexGen.numTexGens < 7) {
+		if (xfregs.numTexGen.numTexGens < 7)
+		{
 			out.Write("o.Normal = float4(_norm0.x,_norm0.y,_norm0.z,pos.z);\n");
-		} else {
+		}
+		else
+		{
 			out.Write("o.tex4.w = _norm0.x;\n");
 			out.Write("o.tex5.w = _norm0.y;\n");
 			out.Write("o.tex6.w = _norm0.z;\n");
@@ -432,6 +444,7 @@ static void GenerateVertexShader(T& out, u32 components, API_TYPE api_type)
 			else
 				out.Write("o.tex7.w = pos.z;\n");
 		}
+
 		if (components & VB_HAS_COL0)
 			out.Write("o.colors_0 = color0;\n");
 
@@ -483,16 +496,21 @@ static void GenerateVertexShader(T& out, u32 components, API_TYPE api_type)
 		// Will look better when we bind uniforms in GLSL 1.3
 		// clipPos/w needs to be done in pixel shader, not here
 
-		if (xfregs.numTexGen.numTexGens < 7) {
+		if (xfregs.numTexGen.numTexGens < 7)
+		{
 			for (unsigned int i = 0; i < 8; ++i)
+			{
 				if(i < xfregs.numTexGen.numTexGens)
 					out.Write(" uv%d_2.xyz =  o.tex%d;\n", i, i);
 				else
 					out.Write(" uv%d_2.xyz =  float3(0.0f, 0.0f, 0.0f);\n", i);
+			}
 			out.Write("  clipPos_2 = o.clipPos;\n");
 			if(g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting)
 				out.Write("  Normal_2 = o.Normal;\n");
-		} else {
+		}
+		else
+		{
 			// clip position is in w of first 4 texcoords
 			if (g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting)
 			{
@@ -511,7 +529,9 @@ static void GenerateVertexShader(T& out, u32 components, API_TYPE api_type)
 		out.Write("}\n");
 	}
 	else
+	{
 		out.Write("return o;\n}\n");
+	}
 
 	if (text[sizeof(text) - 1] != 0x7C)
 		PanicAlert("VertexShader generator - buffer too small, canary has been eaten!");
diff --git a/Source/Core/VideoCommon/Src/VertexShaderGen.h b/Source/Core/VideoCommon/Src/VertexShaderGen.h
index 9c44ba0448..eb7236678a 100644
--- a/Source/Core/VideoCommon/Src/VertexShaderGen.h
+++ b/Source/Core/VideoCommon/Src/VertexShaderGen.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef GCOGL_VERTEXSHADER_H
 #define GCOGL_VERTEXSHADER_H
@@ -74,7 +61,7 @@ const s_svar VSVar_Loc[] = {  {I_POSNORMALMATRIX, C_POSNORMALMATRIX, 6 },
 						{I_NORMALMATRICES , C_NORMALMATRICES, 32  },
 						{I_POSTTRANSFORMMATRICES, C_POSTTRANSFORMMATRICES, 64 },
 						{I_DEPTHPARAMS, C_DEPTHPARAMS, 1 },
-						};                                            
+						};
 
 #pragma pack(4)
 
diff --git a/Source/Core/VideoCommon/Src/VertexShaderManager.cpp b/Source/Core/VideoCommon/Src/VertexShaderManager.cpp
index a5e84ee69b..75e6735577 100644
--- a/Source/Core/VideoCommon/Src/VertexShaderManager.cpp
+++ b/Source/Core/VideoCommon/Src/VertexShaderManager.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "Common.h"
 #include "VideoConfig.h"
@@ -99,15 +86,18 @@ float PHackValue(std::string sValue)
 			c[i] = '\0';
 			break;
 		}
+
 		c[i] = (cStr[i] == ',') ? '.' : *(cStr+i);
 		if (c[i] == '.')
 			fp = true;
 	}
+
 	cStr = c;
 	sTof.str(cStr);
 	sTof >> f;
 
-	if (!fp) f /= 0xF4240;
+	if (!fp)
+		f /= 0xF4240;
 
 	delete [] c;
 	return f;
@@ -122,7 +112,7 @@ void UpdateProjectionHack(int iPhackvalue[], std::string sPhackvalue[])
 
 	if (iPhackvalue[0] == 1)
 	{
-		NOTICE_LOG(VIDEO, "\t\t--- Ortographic Projection Hack ON ---");
+		NOTICE_LOG(VIDEO, "\t\t--- Orthographic Projection Hack ON ---");
 
 		fhacksign1 *= (iPhackvalue[1] == 1) ? -1.0f : fhacksign1;
 		sTemp[0] = (iPhackvalue[1] == 1) ? " * (-1)" : "";
@@ -191,11 +181,12 @@ void VertexShaderManager::Dirty()
 }
 
 // Syncs the shader constant buffers with xfmem
-// TODO: A cleaner way to control the matricies without making a mess in the parameters field
+// TODO: A cleaner way to control the matrices without making a mess in the parameters field
 void VertexShaderManager::SetConstants()
 {
 	if (g_ActiveConfig.backend_info.APIType == API_OPENGL && !g_ActiveConfig.backend_info.bSupportsGLSLUBO)
 		Dirty();
+
 	if (nTransformMatricesChanged[0] >= 0)
 	{
 		int startn = nTransformMatricesChanged[0] / 4;
@@ -204,6 +195,7 @@ void VertexShaderManager::SetConstants()
 		SetMultiVSConstant4fv(C_TRANSFORMMATRICES + startn, endn - startn, pstart);
 		nTransformMatricesChanged[0] = nTransformMatricesChanged[1] = -1;
 	}
+
 	if (nNormalMatricesChanged[0] >= 0)
 	{
 		int startn = nNormalMatricesChanged[0] / 3;
@@ -251,7 +243,9 @@ void VertexShaderManager::SetConstants()
 					SetVSConstant4f(C_LIGHTS+5*i+j+1, 0.00001f, xfmemptr[1], xfmemptr[2], 0);
 				}
 				else
+				{
 					SetVSConstant4fv(C_LIGHTS+5*i+j+1, xfmemptr);
+				}
 			}
 		}
 
@@ -455,7 +449,7 @@ void VertexShaderManager::SetConstants()
 			break;
 
 		default:
-			ERROR_LOG(VIDEO, "unknown projection type: %d", xfregs.projection.type);
+			ERROR_LOG(VIDEO, "Unknown projection type: %d", xfregs.projection.type);
 		}
 
 		PRIM_LOG("Projection: %f %f %f %f %f %f\n", rawProjection[0], rawProjection[1], rawProjection[2], rawProjection[3], rawProjection[4], rawProjection[5]);
@@ -492,21 +486,24 @@ void VertexShaderManager::InvalidateXFRange(int start, int end)
 	if (((u32)start >= (u32)MatrixIndexA.PosNormalMtxIdx * 4 &&
 		 (u32)start <  (u32)MatrixIndexA.PosNormalMtxIdx * 4 + 12) ||
 		((u32)start >= XFMEM_NORMALMATRICES + ((u32)MatrixIndexA.PosNormalMtxIdx & 31) * 3 &&
-		 (u32)start <  XFMEM_NORMALMATRICES + ((u32)MatrixIndexA.PosNormalMtxIdx & 31) * 3 + 9)) {
+		 (u32)start <  XFMEM_NORMALMATRICES + ((u32)MatrixIndexA.PosNormalMtxIdx & 31) * 3 + 9))
+	{
 		bPosNormalMatrixChanged = true;
 	}
 
 	if (((u32)start >= (u32)MatrixIndexA.Tex0MtxIdx*4 && (u32)start < (u32)MatrixIndexA.Tex0MtxIdx*4+12) ||
 		((u32)start >= (u32)MatrixIndexA.Tex1MtxIdx*4 && (u32)start < (u32)MatrixIndexA.Tex1MtxIdx*4+12) ||
 		((u32)start >= (u32)MatrixIndexA.Tex2MtxIdx*4 && (u32)start < (u32)MatrixIndexA.Tex2MtxIdx*4+12) ||
-		((u32)start >= (u32)MatrixIndexA.Tex3MtxIdx*4 && (u32)start < (u32)MatrixIndexA.Tex3MtxIdx*4+12)) {
+		((u32)start >= (u32)MatrixIndexA.Tex3MtxIdx*4 && (u32)start < (u32)MatrixIndexA.Tex3MtxIdx*4+12))
+	{
 		bTexMatricesChanged[0] = true;
 	}
 
 	if (((u32)start >= (u32)MatrixIndexB.Tex4MtxIdx*4 && (u32)start < (u32)MatrixIndexB.Tex4MtxIdx*4+12) ||
 		((u32)start >= (u32)MatrixIndexB.Tex5MtxIdx*4 && (u32)start < (u32)MatrixIndexB.Tex5MtxIdx*4+12) ||
 		((u32)start >= (u32)MatrixIndexB.Tex6MtxIdx*4 && (u32)start < (u32)MatrixIndexB.Tex6MtxIdx*4+12) ||
-		((u32)start >= (u32)MatrixIndexB.Tex7MtxIdx*4 && (u32)start < (u32)MatrixIndexB.Tex7MtxIdx*4+12)) {
+		((u32)start >= (u32)MatrixIndexB.Tex7MtxIdx*4 && (u32)start < (u32)MatrixIndexB.Tex7MtxIdx*4+12))
+	{
 		bTexMatricesChanged[1] = true;
 	}
 
diff --git a/Source/Core/VideoCommon/Src/VertexShaderManager.h b/Source/Core/VideoCommon/Src/VertexShaderManager.h
index a0c89f1e60..c357b36e61 100644
--- a/Source/Core/VideoCommon/Src/VertexShaderManager.h
+++ b/Source/Core/VideoCommon/Src/VertexShaderManager.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _VERTEXSHADERMANAGER_H
 #define _VERTEXSHADERMANAGER_H
diff --git a/Source/Core/VideoCommon/Src/VideoCommon.h b/Source/Core/VideoCommon/Src/VideoCommon.h
index bf83235591..c85a6e382a 100644
--- a/Source/Core/VideoCommon/Src/VideoCommon.h
+++ b/Source/Core/VideoCommon/Src/VideoCommon.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _VIDEOCOMMON_H
 #define _VIDEOCOMMON_H
diff --git a/Source/Core/VideoCommon/Src/VideoConfig.cpp b/Source/Core/VideoCommon/Src/VideoConfig.cpp
index 60677ceeeb..0b70b5440f 100644
--- a/Source/Core/VideoCommon/Src/VideoConfig.cpp
+++ b/Source/Core/VideoCommon/Src/VideoConfig.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include <cmath>
 
@@ -49,7 +36,6 @@ VideoConfig::VideoConfig()
 
 void VideoConfig::Load(const char *ini_file)
 {
-	std::string temp;
 	IniFile iniFile;
 	iniFile.Load(ini_file);
 
@@ -80,7 +66,7 @@ void VideoConfig::Load(const char *ini_file)
 	iniFile.Get("Settings", "HackedBufferUpload", &bHackedBufferUpload, 0);
 
 	iniFile.Get("Settings", "MSAA", &iMultisampleMode, 0);
-	iniFile.Get("Settings", "EFBScale", &iEFBScale, 2); // native
+	iniFile.Get("Settings", "EFBScale", &iEFBScale, (int) SCALE_1X); // native
 
 	iniFile.Get("Settings", "DstAlphaPass", &bDstAlphaPass, false);
 
@@ -138,7 +124,33 @@ void VideoConfig::GameIniLoad(const char *ini_file)
 	iniFile.GetIfExists("Video_Settings", "EnablePixelLighting", &bEnablePixelLighting);
 	iniFile.GetIfExists("Video_Settings", "HackedBufferUpload", &bHackedBufferUpload);
 	iniFile.GetIfExists("Video_Settings", "MSAA", &iMultisampleMode);
-	iniFile.GetIfExists("Video_Settings", "EFBScale", &iEFBScale); // integral
+	int tmp = -9000;
+	iniFile.GetIfExists("Video_Settings", "EFBScale", &tmp); // integral
+	if (tmp != -9000)
+	{
+		if (tmp != SCALE_FORCE_INTEGRAL)
+		{
+			iEFBScale = tmp;
+		}
+		else // Round down to multiple of native IR
+		{
+			switch (iEFBScale)
+			{
+			case SCALE_AUTO:
+				iEFBScale = SCALE_AUTO_INTEGRAL;
+				break;
+			case SCALE_1_5X:
+				iEFBScale = SCALE_1X;
+				break;
+			case SCALE_2_5X:
+				iEFBScale = SCALE_2X;
+				break;
+			default:
+				break;
+			}
+		}
+	}
+
 	iniFile.GetIfExists("Video_Settings", "DstAlphaPass", &bDstAlphaPass);
 	iniFile.GetIfExists("Video_Settings", "DisableFog", &bDisableFog);
 	iniFile.GetIfExists("Video_Settings", "EnableOpenCL", &bEnableOpenCL);
diff --git a/Source/Core/VideoCommon/Src/VideoConfig.h b/Source/Core/VideoCommon/Src/VideoConfig.h
index 442e95f9bf..9b5076df8c 100644
--- a/Source/Core/VideoCommon/Src/VideoConfig.h
+++ b/Source/Core/VideoCommon/Src/VideoConfig.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 
 // IMPORTANT: UI etc should modify g_Config. Graphics code should read g_ActiveConfig.
@@ -44,6 +31,18 @@ enum AspectMode {
 	ASPECT_STRETCH = 3,
 };
 
+enum EFBScale {
+	SCALE_FORCE_INTEGRAL = -1,
+	SCALE_AUTO,
+	SCALE_AUTO_INTEGRAL,
+	SCALE_1X,
+	SCALE_1_5X,
+	SCALE_2X,
+	SCALE_2_5X,
+	SCALE_3X,
+	SCALE_4X,
+};
+
 class IniFile;
 
 // NEVER inherit from this class.
@@ -153,7 +152,8 @@ struct VideoConfig
 		bool bSupportsDualSourceBlend; // only supported by D3D11 and OpenGL
 		bool bSupportsFormatReinterpretation;
 		bool bSupportsPixelLighting;
-
+		bool bSupportsPrimitiveRestart;
+		bool bSupportsSeparateAlphaFunction;
 		bool bSupportsGLSLUBO; // needed by pixelShaderGen, so must stay in videoCommon
 	} backend_info;
 
diff --git a/Source/Core/VideoCommon/Src/VideoState.cpp b/Source/Core/VideoCommon/Src/VideoState.cpp
index 0d99d0378f..00d6eba320 100644
--- a/Source/Core/VideoCommon/Src/VideoState.cpp
+++ b/Source/Core/VideoCommon/Src/VideoState.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "VideoState.h"
 
diff --git a/Source/Core/VideoCommon/Src/VideoState.h b/Source/Core/VideoCommon/Src/VideoState.h
index e596d9ad05..2c18460ac8 100644
--- a/Source/Core/VideoCommon/Src/VideoState.h
+++ b/Source/Core/VideoCommon/Src/VideoState.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _VIDEOSTATE_H
 #define _VIDEOSTATE_H
diff --git a/Source/Core/VideoCommon/Src/XFMemory.cpp b/Source/Core/VideoCommon/Src/XFMemory.cpp
index f511494fd4..139cc35940 100644
--- a/Source/Core/VideoCommon/Src/XFMemory.cpp
+++ b/Source/Core/VideoCommon/Src/XFMemory.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "XFMemory.h"
 
diff --git a/Source/Core/VideoCommon/Src/XFMemory.h b/Source/Core/VideoCommon/Src/XFMemory.h
index 2ef3e41eb5..c350f67395 100644
--- a/Source/Core/VideoCommon/Src/XFMemory.h
+++ b/Source/Core/VideoCommon/Src/XFMemory.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _XFMEMORY_H
 #define _XFMEMORY_H
@@ -208,20 +195,24 @@ union DualTexInfo
 struct Light
 {
 	u32 useless[3]; 
-	u32 color;    //rgba
-	float a0;  //attenuation
+	u32 color; // rgba
+	float a0;  // attenuation
 	float a1; 
 	float a2; 
-	float k0;  //k stuff
+	float k0;  // k stuff
 	float k1; 
 	float k2; 
+
 	union
 	{
-		struct {
+		struct
+		{
 			float dpos[3];
 			float ddir[3]; // specular lights only
 		};
-		struct {
+
+		struct
+		{
 			float sdir[3];
 			float shalfangle[3]; // specular lights only
 		};
diff --git a/Source/Core/VideoCommon/Src/XFStructs.cpp b/Source/Core/VideoCommon/Src/XFStructs.cpp
index df9624b6f0..98bef38f00 100644
--- a/Source/Core/VideoCommon/Src/XFStructs.cpp
+++ b/Source/Core/VideoCommon/Src/XFStructs.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "Common.h"
 #include "VideoCommon.h"
@@ -212,7 +199,7 @@ void LoadXFReg(u32 transferSize, u32 baseAddress, u32 *pData)
 	// do not allow writes past registers
 	if (baseAddress + transferSize > 0x1058)
 	{
-		INFO_LOG(VIDEO, "xf load exceeds address space: %x %d bytes\n", baseAddress, transferSize);
+		INFO_LOG(VIDEO, "XF load exceeds address space: %x %d bytes\n", baseAddress, transferSize);
 
 		if (baseAddress >= 0x1058)
 			transferSize = 0;
diff --git a/Source/Core/VideoCommon/Src/XFStructs.h b/Source/Core/VideoCommon/Src/XFStructs.h
index 75c93ca33a..48b92a9741 100644
--- a/Source/Core/VideoCommon/Src/XFStructs.h
+++ b/Source/Core/VideoCommon/Src/XFStructs.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _XFSTRUCTS_H
 #define _XFSTRUCTS_H
diff --git a/Source/Core/VideoCommon/Src/x64DLCache.cpp b/Source/Core/VideoCommon/Src/x64DLCache.cpp
index 3e03271993..ae32ea5ea9 100644
--- a/Source/Core/VideoCommon/Src/x64DLCache.cpp
+++ b/Source/Core/VideoCommon/Src/x64DLCache.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 // TODO: Handle cache-is-full condition :p
 
@@ -106,7 +93,7 @@ struct CachedDisplayList
 	// Compile the commands themselves down to native code.
 	const u8* compiled_code;
 	u32 uncachable;  // if set, this DL will always be interpreted. This gets set if hash ever changes.
-	// Analitic data
+	// Analytic data
 	u32 num_xf_reg;
 	u32 num_cp_reg;
 	u32 num_bp_reg; 
@@ -182,7 +169,7 @@ struct CachedDisplayList
 		while(Current)
 		{
 			if(!Current->IntersectsMemoryRange(RegionStart, Regionsize))
-					return Current;
+				return Current;
 			Current = Current->NextRegion;
 		}
 		return Current;
@@ -611,14 +598,17 @@ void Shutdown()
 void Clear() 
 {
 	VDLMap::iterator iter = dl_map.begin();
-	while (iter != dl_map.end()) {
+	while (iter != dl_map.end())
+	{
 		VDlist &ParentEntry = iter->second;
 		DLMap::iterator childiter = ParentEntry.dl_map.begin();
-		while (childiter != ParentEntry.dl_map.end()) {
+		while (childiter != ParentEntry.dl_map.end())
+		{
 			CachedDisplayList &entry = childiter->second;
 			entry.ClearRegions();
 			childiter++;
 		}
+
 		ParentEntry.dl_map.clear();
 		iter++;
 	}
@@ -630,26 +620,33 @@ void Clear()
 void ProgressiveCleanup()
 {
 	VDLMap::iterator iter = dl_map.begin();
-	while (iter != dl_map.end()) {
+	while (iter != dl_map.end())
+	{
 		VDlist &ParentEntry = iter->second;
 		DLMap::iterator childiter = ParentEntry.dl_map.begin();
 		while (childiter != ParentEntry.dl_map.end()) 
 		{
 			CachedDisplayList &entry = childiter->second;
 			int limit = 3600;
-			if (entry.frame_count < frameCount - limit) {
+			if (entry.frame_count < frameCount - limit)
+			{
 				entry.ClearRegions();
 				ParentEntry.dl_map.erase(childiter++);  // (this is gcc standard!)
 			}
 			else
+			{
 				++childiter;
+			}
 		}
+
 		if(ParentEntry.dl_map.empty())
 		{
 			dl_map.erase(iter++);
 		}
 		else
+		{
 			iter++;
+		}
 	}
 }
 
@@ -666,10 +663,12 @@ bool HandleDisplayList(u32 address, u32 size)
 	//Fixed DlistCaching now is fully functional still some things to workout
 	if(!g_ActiveConfig.bDlistCachingEnable)
 		return false;
-	if(size == 0) return false;
+	if(size == 0)
+		return false;
 
-	// Is this thread safe?
-	if (DLCache::GetSpaceLeft() < DL_CODE_CLEAR_THRESHOLD) {
+	// TODO: Is this thread safe?
+	if (DLCache::GetSpaceLeft() < DL_CODE_CLEAR_THRESHOLD)
+	{
 		DLCache::Clear();
 	}
 
@@ -678,12 +677,14 @@ bool HandleDisplayList(u32 address, u32 size)
 	DLCache::VDLMap::iterator Parentiter = DLCache::dl_map.find(dl_id);
 	DLCache::DLMap::iterator iter;
 	bool childexist = false;
+
 	if (Parentiter != DLCache::dl_map.end())
 	{
 		vhash = DLCache::CreateVMapId(Parentiter->second.VATUsed);
 		iter = 	Parentiter->second.dl_map.find(vhash);
 		childexist = iter != Parentiter->second.dl_map.end();
 	}
+
 	if (Parentiter != DLCache::dl_map.end() && childexist)
 	{
 		DLCache::CachedDisplayList &dl = iter->second;
diff --git a/Source/Core/VideoCommon/Src/x64TextureDecoder.cpp b/Source/Core/VideoCommon/Src/x64TextureDecoder.cpp
index f5612f34a4..e12b62d5a7 100644
--- a/Source/Core/VideoCommon/Src/x64TextureDecoder.cpp
+++ b/Source/Core/VideoCommon/Src/x64TextureDecoder.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "Common.h"
 //#include "VideoCommon.h" // to get debug logs
@@ -688,7 +675,7 @@ PC_TexFormat GetPC_TexFormat(int texformat, int tlutfmt)
 inline void SetOpenMPThreadCount(int width, int height)
 {
 #ifdef _OPENMP
-	// Dont use multithreading in small Textures
+	// Don't use multithreading in small Textures
 	if (g_ActiveConfig.bOMPDecoder && width > 127 && height > 127)
 	{
 		// don't span to many threads they will kill the rest of the emu :)
diff --git a/Source/DSPTool/Src/DSPTool.cpp b/Source/DSPTool/Src/DSPTool.cpp
index 891729079a..ba0ce665ca 100644
--- a/Source/DSPTool/Src/DSPTool.cpp
+++ b/Source/DSPTool/Src/DSPTool.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "Common.h"
 #include "FileUtil.h"
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/D3DBase.cpp b/Source/Plugins/Plugin_VideoDX11/Src/D3DBase.cpp
index 873f3a47fd..209bfdb73f 100644
--- a/Source/Plugins/Plugin_VideoDX11/Src/D3DBase.cpp
+++ b/Source/Plugins/Plugin_VideoDX11/Src/D3DBase.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "StringUtil.h"
 #include "VideoConfig.h"
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/D3DBase.h b/Source/Plugins/Plugin_VideoDX11/Src/D3DBase.h
index d18bbaecf6..6361e3a5fa 100644
--- a/Source/Plugins/Plugin_VideoDX11/Src/D3DBase.h
+++ b/Source/Plugins/Plugin_VideoDX11/Src/D3DBase.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #pragma once
 
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/D3DBlob.cpp b/Source/Plugins/Plugin_VideoDX11/Src/D3DBlob.cpp
index 6700de5540..26c8c8ba85 100644
--- a/Source/Plugins/Plugin_VideoDX11/Src/D3DBlob.cpp
+++ b/Source/Plugins/Plugin_VideoDX11/Src/D3DBlob.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include <d3d11.h>
 #include "D3DBlob.h"
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/D3DBlob.h b/Source/Plugins/Plugin_VideoDX11/Src/D3DBlob.h
index b5c80662b8..b91907a1b3 100644
--- a/Source/Plugins/Plugin_VideoDX11/Src/D3DBlob.h
+++ b/Source/Plugins/Plugin_VideoDX11/Src/D3DBlob.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #pragma once
 
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/D3DShader.cpp b/Source/Plugins/Plugin_VideoDX11/Src/D3DShader.cpp
index c688228945..602dcf9807 100644
--- a/Source/Plugins/Plugin_VideoDX11/Src/D3DShader.cpp
+++ b/Source/Plugins/Plugin_VideoDX11/Src/D3DShader.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include <string>
 
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/D3DShader.h b/Source/Plugins/Plugin_VideoDX11/Src/D3DShader.h
index 8594e22851..84fb03aad8 100644
--- a/Source/Plugins/Plugin_VideoDX11/Src/D3DShader.h
+++ b/Source/Plugins/Plugin_VideoDX11/Src/D3DShader.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #pragma once
 
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/D3DTexture.cpp b/Source/Plugins/Plugin_VideoDX11/Src/D3DTexture.cpp
index 25e8d223a3..abf34b3cca 100644
--- a/Source/Plugins/Plugin_VideoDX11/Src/D3DTexture.cpp
+++ b/Source/Plugins/Plugin_VideoDX11/Src/D3DTexture.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "D3DBase.h"
 #include "D3DTexture.h"
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/D3DTexture.h b/Source/Plugins/Plugin_VideoDX11/Src/D3DTexture.h
index 9df78d31bb..5c2aa57f4a 100644
--- a/Source/Plugins/Plugin_VideoDX11/Src/D3DTexture.h
+++ b/Source/Plugins/Plugin_VideoDX11/Src/D3DTexture.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #pragma once
 
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/D3DUtil.cpp b/Source/Plugins/Plugin_VideoDX11/Src/D3DUtil.cpp
index 8ee8081b2c..687198b6a3 100644
--- a/Source/Plugins/Plugin_VideoDX11/Src/D3DUtil.cpp
+++ b/Source/Plugins/Plugin_VideoDX11/Src/D3DUtil.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include <list>
 
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/D3DUtil.h b/Source/Plugins/Plugin_VideoDX11/Src/D3DUtil.h
index 7f069164ea..6e47854164 100644
--- a/Source/Plugins/Plugin_VideoDX11/Src/D3DUtil.h
+++ b/Source/Plugins/Plugin_VideoDX11/Src/D3DUtil.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #pragma	once
 
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/FramebufferManager.cpp b/Source/Plugins/Plugin_VideoDX11/Src/FramebufferManager.cpp
index 199f063d40..6f64cea0ec 100644
--- a/Source/Plugins/Plugin_VideoDX11/Src/FramebufferManager.cpp
+++ b/Source/Plugins/Plugin_VideoDX11/Src/FramebufferManager.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "VideoConfig.h"
 
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/FramebufferManager.h b/Source/Plugins/Plugin_VideoDX11/Src/FramebufferManager.h
index 83db4370db..2b14ec2b66 100644
--- a/Source/Plugins/Plugin_VideoDX11/Src/FramebufferManager.h
+++ b/Source/Plugins/Plugin_VideoDX11/Src/FramebufferManager.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _FBMANAGER_D3D_H_
 #define _FBMANAGER_D3D_H_
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/GfxState.cpp b/Source/Plugins/Plugin_VideoDX11/Src/GfxState.cpp
index c5175d1275..cc0b74d1e1 100644
--- a/Source/Plugins/Plugin_VideoDX11/Src/GfxState.cpp
+++ b/Source/Plugins/Plugin_VideoDX11/Src/GfxState.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "Log.h"
 
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/GfxState.h b/Source/Plugins/Plugin_VideoDX11/Src/GfxState.h
index 4af093df9e..977b53dab6 100644
--- a/Source/Plugins/Plugin_VideoDX11/Src/GfxState.h
+++ b/Source/Plugins/Plugin_VideoDX11/Src/GfxState.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #pragma once
 
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/Globals.h b/Source/Plugins/Plugin_VideoDX11/Src/Globals.h
index 43f9263091..89800694e8 100644
--- a/Source/Plugins/Plugin_VideoDX11/Src/Globals.h
+++ b/Source/Plugins/Plugin_VideoDX11/Src/Globals.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _GLOBALS_H_
 #define _GLOBALS_H_
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/LineGeometryShader.cpp b/Source/Plugins/Plugin_VideoDX11/Src/LineGeometryShader.cpp
index 5d6b8eb5b5..9009d39029 100644
--- a/Source/Plugins/Plugin_VideoDX11/Src/LineGeometryShader.cpp
+++ b/Source/Plugins/Plugin_VideoDX11/Src/LineGeometryShader.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "LineGeometryShader.h"
 
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/LineGeometryShader.h b/Source/Plugins/Plugin_VideoDX11/Src/LineGeometryShader.h
index cec5a781c4..a92e7983fc 100644
--- a/Source/Plugins/Plugin_VideoDX11/Src/LineGeometryShader.h
+++ b/Source/Plugins/Plugin_VideoDX11/Src/LineGeometryShader.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _LINEGEOMETRYSHADER_H
 #define _LINEGEOMETRYSHADER_H
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/NativeVertexFormat.cpp b/Source/Plugins/Plugin_VideoDX11/Src/NativeVertexFormat.cpp
index bfa70948da..373026bcd3 100644
--- a/Source/Plugins/Plugin_VideoDX11/Src/NativeVertexFormat.cpp
+++ b/Source/Plugins/Plugin_VideoDX11/Src/NativeVertexFormat.cpp
@@ -1,20 +1,6 @@
-
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "D3DBase.h"
 #include "D3DBlob.h"
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/PSTextureEncoder.cpp b/Source/Plugins/Plugin_VideoDX11/Src/PSTextureEncoder.cpp
index d62517e99b..5282c4cbb7 100644
--- a/Source/Plugins/Plugin_VideoDX11/Src/PSTextureEncoder.cpp
+++ b/Source/Plugins/Plugin_VideoDX11/Src/PSTextureEncoder.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "PSTextureEncoder.h"
 
@@ -1140,9 +1127,9 @@ size_t PSTextureEncoder::Encode(u8* dst, unsigned int dstFormat,
 		ID3D11ShaderResourceView* pEFB = (srcFormat == PIXELFMT_Z24) ?
 			FramebufferManager::GetEFBDepthTexture()->GetSRV() :
 			// FIXME: Instead of resolving EFB, it would be better to pick out a
- 			// single sample from each pixel. The game may break if it isn't
- 			// expecting the blurred edges around multisampled shapes.
- 			FramebufferManager::GetResolvedEFBColorTexture()->GetSRV();
+			// single sample from each pixel. The game may break if it isn't
+			// expecting the blurred edges around multisampled shapes.
+			FramebufferManager::GetResolvedEFBColorTexture()->GetSRV();
 
 		D3D::context->PSSetConstantBuffers(0, 1, &m_encodeParams);
 		D3D::context->PSSetShaderResources(0, 1, &pEFB);
@@ -1351,7 +1338,7 @@ bool PSTextureEncoder::InitDynamicMode()
 	var = reflect->GetVariableByName("g_generator");
 	m_generatorSlot = var->GetInterfaceSlot(0);
 
-	INFO_LOG(VIDEO, "fetch slot %d, scaledFetch slot %d, intensity slot %d, generator slot %d",
+	INFO_LOG(VIDEO, "Fetch slot %d, scaledFetch slot %d, intensity slot %d, generator slot %d",
 		m_fetchSlot, m_scaledFetchSlot, m_intensitySlot, m_generatorSlot);
 
 	// Class instances will be created at the time they are used
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/PSTextureEncoder.h b/Source/Plugins/Plugin_VideoDX11/Src/PSTextureEncoder.h
index 490cd69ef5..14cdfa8bae 100644
--- a/Source/Plugins/Plugin_VideoDX11/Src/PSTextureEncoder.h
+++ b/Source/Plugins/Plugin_VideoDX11/Src/PSTextureEncoder.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _PSTEXTUREENCODER_H
 #define _PSTEXTUREENCODER_H
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/PerfQuery.cpp b/Source/Plugins/Plugin_VideoDX11/Src/PerfQuery.cpp
index b859d50ec6..c634593361 100644
--- a/Source/Plugins/Plugin_VideoDX11/Src/PerfQuery.cpp
+++ b/Source/Plugins/Plugin_VideoDX11/Src/PerfQuery.cpp
@@ -36,7 +36,7 @@ void PerfQuery::EnableQuery(PerfQueryGroup type)
 	{
 		// TODO
 		FlushOne();
-		ERROR_LOG(VIDEO, "flushed query buffer early!");
+		ERROR_LOG(VIDEO, "Flushed query buffer early!");
 	}
 
 	// start query
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/PixelShaderCache.cpp b/Source/Plugins/Plugin_VideoDX11/Src/PixelShaderCache.cpp
index 7237603eab..9db0a53d13 100644
--- a/Source/Plugins/Plugin_VideoDX11/Src/PixelShaderCache.cpp
+++ b/Source/Plugins/Plugin_VideoDX11/Src/PixelShaderCache.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "FileUtil.h"
 #include "LinearDiskCache.h"
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/PixelShaderCache.h b/Source/Plugins/Plugin_VideoDX11/Src/PixelShaderCache.h
index f08fa43142..ace3a9ac6a 100644
--- a/Source/Plugins/Plugin_VideoDX11/Src/PixelShaderCache.h
+++ b/Source/Plugins/Plugin_VideoDX11/Src/PixelShaderCache.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #pragma once
 
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/PointGeometryShader.cpp b/Source/Plugins/Plugin_VideoDX11/Src/PointGeometryShader.cpp
index 8f5300ff64..9d6e02104e 100644
--- a/Source/Plugins/Plugin_VideoDX11/Src/PointGeometryShader.cpp
+++ b/Source/Plugins/Plugin_VideoDX11/Src/PointGeometryShader.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "PointGeometryShader.h"
 
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/PointGeometryShader.h b/Source/Plugins/Plugin_VideoDX11/Src/PointGeometryShader.h
index f6da45e050..4fc59801c7 100644
--- a/Source/Plugins/Plugin_VideoDX11/Src/PointGeometryShader.h
+++ b/Source/Plugins/Plugin_VideoDX11/Src/PointGeometryShader.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _POINTGEOMETRYSHADER_H
 #define _POINTGEOMETRYSHADER_H
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp b/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp
index 2dcfcd041c..eab4ff08c2 100644
--- a/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp
+++ b/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include <math.h>
 
@@ -567,7 +554,7 @@ void Renderer::UpdateViewport(Matrix44& vpCorrection)
 		(float)X, (float)Y,
 		(float)Wd, (float)Ht);
 
-	// Some games set invalids values for z min and z max so fix them to the max an min alowed and let the shaders do this work
+	// Some games set invalid values for z-min and z-max so fix them to the max and min allowed and let the shaders do this work
 	D3D11_VIEWPORT vp = CD3D11_VIEWPORT((float)X, (float)Y,
 										(float)Wd, (float)Ht,
 										0.f,	// (xfregs.viewport.farZ - xfregs.viewport.zRange) / 16777216.0f;
@@ -688,7 +675,7 @@ 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;
+	bool target_has_alpha = bpmem.zcontrol.pixel_format == PIXELFMT_RGBA6_Z24;
 	const D3D11_BLEND d3dSrcFactors[8] =
 	{
 		D3D11_BLEND_ZERO,
@@ -715,12 +702,12 @@ void Renderer::SetBlendMode(bool forceUpdate)
 	if (bpmem.blendmode.logicopenable && !forceUpdate)
 		return;
 
-	if (bpmem.blendmode.subtract)  // enable blending src 1 dst 1
+	if (bpmem.blendmode.subtract)
 	{
 		gx_state.blenddc.RenderTarget[0].BlendEnable = true;
 		SetBlendOp(D3D11_BLEND_OP_REV_SUBTRACT);
-		SetSrcBlend(d3dSrcFactors[1]);
-		SetDestBlend(d3dDestFactors[1]);
+		SetSrcBlend(D3D11_BLEND_ONE);
+		SetDestBlend(D3D11_BLEND_ONE);
 	}
 	else
 	{
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/Television.cpp b/Source/Plugins/Plugin_VideoDX11/Src/Television.cpp
index bed7d8e632..e1feec595b 100644
--- a/Source/Plugins/Plugin_VideoDX11/Src/Television.cpp
+++ b/Source/Plugins/Plugin_VideoDX11/Src/Television.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "Television.h"
 
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/Television.h b/Source/Plugins/Plugin_VideoDX11/Src/Television.h
index 0b9a346a7c..163d9131a6 100644
--- a/Source/Plugins/Plugin_VideoDX11/Src/Television.h
+++ b/Source/Plugins/Plugin_VideoDX11/Src/Television.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _TELEVISION_H
 #define _TELEVISION_H
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/TextureCache.cpp b/Source/Plugins/Plugin_VideoDX11/Src/TextureCache.cpp
index c0474e5c67..e803f4a8f2 100644
--- a/Source/Plugins/Plugin_VideoDX11/Src/TextureCache.cpp
+++ b/Source/Plugins/Plugin_VideoDX11/Src/TextureCache.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "RenderBase.h"
 
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/TextureCache.h b/Source/Plugins/Plugin_VideoDX11/Src/TextureCache.h
index 7876cb79ee..94adfe8cce 100644
--- a/Source/Plugins/Plugin_VideoDX11/Src/TextureCache.h
+++ b/Source/Plugins/Plugin_VideoDX11/Src/TextureCache.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #pragma once
 
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/TextureEncoder.h b/Source/Plugins/Plugin_VideoDX11/Src/TextureEncoder.h
index 8cfa923911..d97434d380 100644
--- a/Source/Plugins/Plugin_VideoDX11/Src/TextureEncoder.h
+++ b/Source/Plugins/Plugin_VideoDX11/Src/TextureEncoder.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _TEXTUREENCODER_H
 #define _TEXTUREENCODER_H
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/VertexManager.cpp b/Source/Plugins/Plugin_VideoDX11/Src/VertexManager.cpp
index 36e2ed2a68..eee56f40c4 100644
--- a/Source/Plugins/Plugin_VideoDX11/Src/VertexManager.cpp
+++ b/Source/Plugins/Plugin_VideoDX11/Src/VertexManager.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "D3DBase.h"
 #include "PixelShaderCache.h"
@@ -154,7 +141,7 @@ void VertexManager::Draw(UINT stride)
 	
 	if (IndexGenerator::GetNumTriangles() > 0)
 	{
-		D3D::context->IASetPrimitiveTopology(D3D11_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
+		D3D::context->IASetPrimitiveTopology(D3D11_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP);
 		D3D::context->DrawIndexed(IndexGenerator::GetTriangleindexLen(), m_triangle_draw_index, 0);
 		INCSTAT(stats.thisFrame.numIndexedDrawCalls);
 	}
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/VertexManager.h b/Source/Plugins/Plugin_VideoDX11/Src/VertexManager.h
index b5d0d21757..889c2ee0eb 100644
--- a/Source/Plugins/Plugin_VideoDX11/Src/VertexManager.h
+++ b/Source/Plugins/Plugin_VideoDX11/Src/VertexManager.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _VERTEXMANAGER_H
 #define _VERTEXMANAGER_H
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/VertexShaderCache.cpp b/Source/Plugins/Plugin_VideoDX11/Src/VertexShaderCache.cpp
index 4ba720528e..19b276ddb6 100644
--- a/Source/Plugins/Plugin_VideoDX11/Src/VertexShaderCache.cpp
+++ b/Source/Plugins/Plugin_VideoDX11/Src/VertexShaderCache.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "FileUtil.h"
 #include "LinearDiskCache.h"
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/VertexShaderCache.h b/Source/Plugins/Plugin_VideoDX11/Src/VertexShaderCache.h
index 0c1dba790f..04f74bc055 100644
--- a/Source/Plugins/Plugin_VideoDX11/Src/VertexShaderCache.h
+++ b/Source/Plugins/Plugin_VideoDX11/Src/VertexShaderCache.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _VERTEXSHADERCACHE_H
 #define _VERTEXSHADERCACHE_H
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/XFBEncoder.cpp b/Source/Plugins/Plugin_VideoDX11/Src/XFBEncoder.cpp
index 991f1c31ed..bc6c66d29b 100644
--- a/Source/Plugins/Plugin_VideoDX11/Src/XFBEncoder.cpp
+++ b/Source/Plugins/Plugin_VideoDX11/Src/XFBEncoder.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "XFBEncoder.h"
 
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/XFBEncoder.h b/Source/Plugins/Plugin_VideoDX11/Src/XFBEncoder.h
index 000c833dbf..c96e683ceb 100644
--- a/Source/Plugins/Plugin_VideoDX11/Src/XFBEncoder.h
+++ b/Source/Plugins/Plugin_VideoDX11/Src/XFBEncoder.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _XFBENCODER_H
 #define _XFBENCODER_H
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/main.cpp b/Source/Plugins/Plugin_VideoDX11/Src/main.cpp
index 17bbdcf33c..5d9a93067c 100644
--- a/Source/Plugins/Plugin_VideoDX11/Src/main.cpp
+++ b/Source/Plugins/Plugin_VideoDX11/Src/main.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include <wx/wx.h>
 
@@ -35,6 +22,7 @@
 #include "Debugger/DebuggerPanel.h"
 #include "DLCache.h"
 #include "EmuWindow.h"
+#include "IndexGenerator.h"
 #include "FileUtil.h"
 #include "Globals.h"
 #include "IniFile.h"
@@ -96,6 +84,7 @@ void InitBackendInfo()
 	g_Config.backend_info.bSupportsDualSourceBlend = true;
 	g_Config.backend_info.bSupportsFormatReinterpretation = true;
 	g_Config.backend_info.bSupportsPixelLighting = true;
+	g_Config.backend_info.bSupportsPrimitiveRestart = true;
 
 	IDXGIFactory* factory;
 	IDXGIAdapter* ad;
@@ -119,9 +108,9 @@ void InitBackendInfo()
 			modes = DX11::D3D::EnumAAModes(ad);
 			for (unsigned int i = 0; i < modes.size(); ++i)
 			{
-				if (i == 0) sprintf_s(buf, 32, "None");
-				else if (modes[i].Quality) sprintf_s(buf, 32, "%d samples (quality level %d)", modes[i].Count, modes[i].Quality);
-				else sprintf_s(buf, 32, "%d samples", modes[i].Count);
+				if (i == 0) sprintf_s(buf, 32, _trans("None"));
+				else if (modes[i].Quality) sprintf_s(buf, 32, _trans("%d samples (quality level %d)"), modes[i].Count, modes[i].Quality);
+				else sprintf_s(buf, 32, _trans("%d samples"), modes[i].Count);
 				g_Config.backend_info.AAModes.push_back(buf);
 			}
 		}
@@ -192,6 +181,7 @@ void VideoBackend::Video_Prepare()
 	// VideoCommon
 	BPInit();
 	Fifo_Init();
+	IndexGenerator::Init();
 	VertexLoaderManager::Init();
 	OpcodeDecoder_Init();
 	VertexShaderManager::Init();
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/main.h b/Source/Plugins/Plugin_VideoDX11/Src/main.h
index d8c5ac4933..061ed8ef3f 100644
--- a/Source/Plugins/Plugin_VideoDX11/Src/main.h
+++ b/Source/Plugins/Plugin_VideoDX11/Src/main.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef MAIN_H
 #define MAIN_H
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/stdafx.cpp b/Source/Plugins/Plugin_VideoDX11/Src/stdafx.cpp
index 168ca738eb..7c408e10b9 100644
--- a/Source/Plugins/Plugin_VideoDX11/Src/stdafx.cpp
+++ b/Source/Plugins/Plugin_VideoDX11/Src/stdafx.cpp
@@ -1,18 +1,5 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "stdafx.h"
\ No newline at end of file
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/stdafx.h b/Source/Plugins/Plugin_VideoDX11/Src/stdafx.h
index 8ade6faa40..2431184aaf 100644
--- a/Source/Plugins/Plugin_VideoDX11/Src/stdafx.h
+++ b/Source/Plugins/Plugin_VideoDX11/Src/stdafx.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #pragma once
 #define _WIN32_WINNT 0x501
diff --git a/Source/Plugins/Plugin_VideoDX9/Plugin_VideoDX9.vcxproj b/Source/Plugins/Plugin_VideoDX9/Plugin_VideoDX9.vcxproj
index c152fcb630..02d39e314f 100644
--- a/Source/Plugins/Plugin_VideoDX9/Plugin_VideoDX9.vcxproj
+++ b/Source/Plugins/Plugin_VideoDX9/Plugin_VideoDX9.vcxproj
@@ -199,6 +199,7 @@
     <ClCompile Include="Src\FramebufferManager.cpp" />
     <ClCompile Include="Src\main.cpp" />
     <ClCompile Include="Src\NativeVertexFormat.cpp" />
+    <ClCompile Include="Src\PerfQuery.cpp" />
     <ClCompile Include="Src\PixelShaderCache.cpp" />
     <ClCompile Include="Src\Render.cpp" />
     <ClCompile Include="Src\stdafx.cpp">
@@ -222,6 +223,7 @@
     <ClInclude Include="Src\FramebufferManager.h" />
     <ClInclude Include="Src\Globals.h" />
     <ClInclude Include="Src\main.h" />
+    <ClInclude Include="Src\PerfQuery.h" />
     <ClInclude Include="Src\PixelShaderCache.h" />
     <ClInclude Include="Src\Render.h" />
     <ClInclude Include="Src\stdafx.h" />
diff --git a/Source/Plugins/Plugin_VideoDX9/Plugin_VideoDX9.vcxproj.filters b/Source/Plugins/Plugin_VideoDX9/Plugin_VideoDX9.vcxproj.filters
index 720e1983b0..c1d091c239 100644
--- a/Source/Plugins/Plugin_VideoDX9/Plugin_VideoDX9.vcxproj.filters
+++ b/Source/Plugins/Plugin_VideoDX9/Plugin_VideoDX9.vcxproj.filters
@@ -39,6 +39,9 @@
     <ClCompile Include="Src\TextureConverter.cpp">
       <Filter>D3D</Filter>
     </ClCompile>
+    <ClCompile Include="Src\PerfQuery.cpp">
+      <Filter>Render</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="Src\Globals.h" />
@@ -78,6 +81,9 @@
     <ClInclude Include="Src\TextureConverter.h">
       <Filter>D3D</Filter>
     </ClInclude>
+    <ClInclude Include="Src\PerfQuery.h">
+      <Filter>Render</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="D3D">
diff --git a/Source/Plugins/Plugin_VideoDX9/Src/D3DBase.cpp b/Source/Plugins/Plugin_VideoDX9/Src/D3DBase.cpp
index b3d241fe14..44e5abd317 100644
--- a/Source/Plugins/Plugin_VideoDX9/Src/D3DBase.cpp
+++ b/Source/Plugins/Plugin_VideoDX9/Src/D3DBase.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "D3DBase.h"
 #include "VideoConfig.h"
diff --git a/Source/Plugins/Plugin_VideoDX9/Src/D3DBase.h b/Source/Plugins/Plugin_VideoDX9/Src/D3DBase.h
index 7be482a55f..b5a6649989 100644
--- a/Source/Plugins/Plugin_VideoDX9/Src/D3DBase.h
+++ b/Source/Plugins/Plugin_VideoDX9/Src/D3DBase.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #pragma once
 
diff --git a/Source/Plugins/Plugin_VideoDX9/Src/D3DShader.cpp b/Source/Plugins/Plugin_VideoDX9/Src/D3DShader.cpp
index c7c4cf266a..8649ebfac2 100644
--- a/Source/Plugins/Plugin_VideoDX9/Src/D3DShader.cpp
+++ b/Source/Plugins/Plugin_VideoDX9/Src/D3DShader.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include <d3dx9.h>
 #include <string>
@@ -43,7 +30,7 @@ bool CompileVertexShader(const char *code, int len, u8 **bytecode, int *bytecode
 {
 	LPD3DXBUFFER shaderBuffer = NULL;
 	LPD3DXBUFFER errorBuffer = NULL;
- 	HRESULT hr = PD3DXCompileShader(code, len, 0, 0, "main", D3D::VertexShaderVersionString(),
+	HRESULT hr = PD3DXCompileShader(code, len, 0, 0, "main", D3D::VertexShaderVersionString(),
 						           0, &shaderBuffer, &errorBuffer, 0);
 	if (FAILED(hr))
 	{
diff --git a/Source/Plugins/Plugin_VideoDX9/Src/D3DShader.h b/Source/Plugins/Plugin_VideoDX9/Src/D3DShader.h
index 94e9a4a418..449f2dacea 100644
--- a/Source/Plugins/Plugin_VideoDX9/Src/D3DShader.h
+++ b/Source/Plugins/Plugin_VideoDX9/Src/D3DShader.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #pragma once
 
diff --git a/Source/Plugins/Plugin_VideoDX9/Src/D3DTexture.cpp b/Source/Plugins/Plugin_VideoDX9/Src/D3DTexture.cpp
index 25c1313ae8..f16e308eef 100644
--- a/Source/Plugins/Plugin_VideoDX9/Src/D3DTexture.cpp
+++ b/Source/Plugins/Plugin_VideoDX9/Src/D3DTexture.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "D3DBase.h"
 #include "D3DTexture.h"
diff --git a/Source/Plugins/Plugin_VideoDX9/Src/D3DTexture.h b/Source/Plugins/Plugin_VideoDX9/Src/D3DTexture.h
index c7ab754d6d..54ed57000a 100644
--- a/Source/Plugins/Plugin_VideoDX9/Src/D3DTexture.h
+++ b/Source/Plugins/Plugin_VideoDX9/Src/D3DTexture.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #pragma once
 
diff --git a/Source/Plugins/Plugin_VideoDX9/Src/D3DUtil.cpp b/Source/Plugins/Plugin_VideoDX9/Src/D3DUtil.cpp
index d24720e6f9..066f99ad3f 100644
--- a/Source/Plugins/Plugin_VideoDX9/Src/D3DUtil.cpp
+++ b/Source/Plugins/Plugin_VideoDX9/Src/D3DUtil.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "Common.h"
 #include "StringUtil.h"
diff --git a/Source/Plugins/Plugin_VideoDX9/Src/D3DUtil.h b/Source/Plugins/Plugin_VideoDX9/Src/D3DUtil.h
index 882f112ece..35cc63a5f0 100644
--- a/Source/Plugins/Plugin_VideoDX9/Src/D3DUtil.h
+++ b/Source/Plugins/Plugin_VideoDX9/Src/D3DUtil.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #pragma	once
 
diff --git a/Source/Plugins/Plugin_VideoDX9/Src/FramebufferManager.cpp b/Source/Plugins/Plugin_VideoDX9/Src/FramebufferManager.cpp
index 5dfcc51c66..6b83b0e0d6 100644
--- a/Source/Plugins/Plugin_VideoDX9/Src/FramebufferManager.cpp
+++ b/Source/Plugins/Plugin_VideoDX9/Src/FramebufferManager.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "D3DBase.h"
 #include "Render.h"
diff --git a/Source/Plugins/Plugin_VideoDX9/Src/FramebufferManager.h b/Source/Plugins/Plugin_VideoDX9/Src/FramebufferManager.h
index 5b5993a12b..66cdc2ec99 100644
--- a/Source/Plugins/Plugin_VideoDX9/Src/FramebufferManager.h
+++ b/Source/Plugins/Plugin_VideoDX9/Src/FramebufferManager.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #pragma once
 
@@ -114,9 +101,9 @@ private:
 				color_surface_Format(D3DFMT_UNKNOWN), depth_surface_Format(D3DFMT_UNKNOWN),
 				depth_ReadBuffer_Format(D3DFMT_UNKNOWN) {}
 
-		LPDIRECT3DTEXTURE9 color_texture;//Texture thats contains the color data of the render target
+		LPDIRECT3DTEXTURE9 color_texture;//Texture that contains the color data of the render target
 		LPDIRECT3DTEXTURE9 colorRead_texture;//1 pixel texture for temporal data store
-		LPDIRECT3DTEXTURE9 depth_texture;//Texture thats contains the depth data of the render target
+		LPDIRECT3DTEXTURE9 depth_texture;//Texture that contains the depth data of the render target
 		LPDIRECT3DTEXTURE9 depthRead_texture;//4 pixel texture for temporal data store
 
 		LPDIRECT3DTEXTURE9 color_reinterpret_texture;//buffer used for ReinterpretPixelData
@@ -126,8 +113,8 @@ private:
 		LPDIRECT3DSURFACE9 color_surface;//Color Surface
 		LPDIRECT3DSURFACE9 color_ReadBuffer;//Surface 0 of colorRead_texture
 		LPDIRECT3DSURFACE9 depth_ReadBuffer;//Surface 0 of depthRead_texture
-		LPDIRECT3DSURFACE9 color_OffScreenReadBuffer;//System memory Surface that can be locked to retriebe the data
-		LPDIRECT3DSURFACE9 depth_OffScreenReadBuffer;//System memory Surface that can be locked to retriebe the data
+		LPDIRECT3DSURFACE9 color_OffScreenReadBuffer;//System memory Surface that can be locked to retrieve the data
+		LPDIRECT3DSURFACE9 depth_OffScreenReadBuffer;//System memory Surface that can be locked to retrieve the data
 
 		D3DFORMAT color_surface_Format;//Format of the color Surface
 		D3DFORMAT depth_surface_Format;//Format of the Depth Surface
diff --git a/Source/Plugins/Plugin_VideoDX9/Src/Globals.h b/Source/Plugins/Plugin_VideoDX9/Src/Globals.h
index 43f9263091..89800694e8 100644
--- a/Source/Plugins/Plugin_VideoDX9/Src/Globals.h
+++ b/Source/Plugins/Plugin_VideoDX9/Src/Globals.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _GLOBALS_H_
 #define _GLOBALS_H_
diff --git a/Source/Plugins/Plugin_VideoDX9/Src/NativeVertexFormat.cpp b/Source/Plugins/Plugin_VideoDX9/Src/NativeVertexFormat.cpp
index d68228273c..69de7e0a58 100644
--- a/Source/Plugins/Plugin_VideoDX9/Src/NativeVertexFormat.cpp
+++ b/Source/Plugins/Plugin_VideoDX9/Src/NativeVertexFormat.cpp
@@ -1,20 +1,6 @@
-
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "D3DBase.h"
 
@@ -187,7 +173,7 @@ void D3DVertexFormat::SetupVertexPointers()
 	if (d3d_decl)
 		DX9::D3D::SetVertexDeclaration(d3d_decl);
 	else
-		ERROR_LOG(VIDEO, "invalid d3d decl");
+		ERROR_LOG(VIDEO, "Invalid D3D decl");
 }
 
 } // namespace DX9
diff --git a/Source/Plugins/Plugin_VideoDX9/Src/PerfQuery.cpp b/Source/Plugins/Plugin_VideoDX9/Src/PerfQuery.cpp
new file mode 100644
index 0000000000..8a1d5c59a9
--- /dev/null
+++ b/Source/Plugins/Plugin_VideoDX9/Src/PerfQuery.cpp
@@ -0,0 +1,155 @@
+#include "RenderBase.h"
+
+#include "D3DBase.h"
+#include "PerfQuery.h"
+
+namespace DX9 {
+
+PerfQuery::PerfQuery()
+	: m_query_read_pos()
+	, m_query_count()
+{
+	
+}
+
+PerfQuery::~PerfQuery()
+{
+	
+}
+
+void PerfQuery::CreateDeviceObjects()
+{
+	for (int i = 0; i != ARRAYSIZE(m_query_buffer); ++i)
+	{
+		D3D::dev->CreateQuery(D3DQUERYTYPE_OCCLUSION, &m_query_buffer[i].query);
+	}
+	ResetQuery();
+}
+void PerfQuery::DestroyDeviceObjects()
+{
+	for (int i = 0; i != ARRAYSIZE(m_query_buffer); ++i)
+	{
+		m_query_buffer[i].query->Release();
+	}
+}
+
+void PerfQuery::EnableQuery(PerfQueryGroup type)
+{
+	// Is this sane?
+	if (m_query_count > ARRAYSIZE(m_query_buffer) / 2)
+		WeakFlush();
+
+	if (ARRAYSIZE(m_query_buffer) == m_query_count)
+	{
+		// TODO
+		FlushOne();
+		ERROR_LOG(VIDEO, "Flushed query buffer early!");
+	}
+
+	// start query
+	if (type == PQG_ZCOMP_ZCOMPLOC || type == PQG_ZCOMP)
+	{
+		auto& entry = m_query_buffer[(m_query_read_pos + m_query_count) % ARRAYSIZE(m_query_buffer)];
+		entry.query->Issue(D3DISSUE_BEGIN);
+		entry.query_type = type;
+		++m_query_count;
+	}
+}
+
+void PerfQuery::DisableQuery(PerfQueryGroup type)
+{
+	// stop query
+	if (type == PQG_ZCOMP_ZCOMPLOC || type == PQG_ZCOMP)
+	{
+		auto& entry = m_query_buffer[(m_query_read_pos + m_query_count + ARRAYSIZE(m_query_buffer)-1) % ARRAYSIZE(m_query_buffer)];
+		entry.query->Issue(D3DISSUE_END);
+	}
+}
+
+void PerfQuery::ResetQuery()
+{
+	m_query_count = 0;
+	std::fill_n(m_results, ARRAYSIZE(m_results), 0);
+}
+
+u32 PerfQuery::GetQueryResult(PerfQueryType type)
+{
+	u32 result = 0;
+
+	if (type == PQ_ZCOMP_INPUT_ZCOMPLOC || type == PQ_ZCOMP_OUTPUT_ZCOMPLOC)
+	{
+		result = m_results[PQG_ZCOMP_ZCOMPLOC];
+	}
+	else if (type == PQ_ZCOMP_INPUT || type == PQ_ZCOMP_OUTPUT)
+	{
+		result = m_results[PQG_ZCOMP];
+	}
+	else if (type == PQ_BLEND_INPUT)
+	{
+		result = m_results[PQG_ZCOMP] + m_results[PQG_ZCOMP_ZCOMPLOC];
+	}
+	else if (type == PQ_EFB_COPY_CLOCKS)
+	{
+		result = m_results[PQG_EFB_COPY_CLOCKS];
+	}
+
+	return result / 4;
+}
+
+void PerfQuery::FlushOne()
+{
+	auto& entry = m_query_buffer[m_query_read_pos];
+
+	DWORD result = 0;
+	HRESULT hr = S_FALSE;
+	while (hr != S_OK && hr != D3DERR_DEVICELOST)
+	{
+		// TODO: Might cause us to be stuck in an infinite loop!
+		hr = entry.query->GetData(&result, sizeof(result), D3DGETDATA_FLUSH);
+	}
+
+	// NOTE: Reported pixel metrics should be referenced to native resolution
+	m_results[entry.query_type] += (u32)((u64)result * EFB_WIDTH / g_renderer->GetTargetWidth() * EFB_HEIGHT / g_renderer->GetTargetHeight());
+
+	m_query_read_pos = (m_query_read_pos + 1) % ARRAYSIZE(m_query_buffer);
+	--m_query_count;
+}
+
+// TODO: could selectively flush things, but I don't think that will do much
+void PerfQuery::FlushResults()
+{
+	while (!IsFlushed())
+		FlushOne();
+}
+
+void PerfQuery::WeakFlush()
+{
+	while (!IsFlushed())
+	{
+		auto& entry = m_query_buffer[m_query_read_pos];
+
+		DWORD result = 0;
+		HRESULT hr = entry.query->GetData(&result, sizeof(result), 0);
+
+		if (hr == S_OK)
+		{
+			// NOTE: Reported pixel metrics should be referenced to native resolution
+			m_results[entry.query_type] += (u32)((u64)result * EFB_WIDTH / g_renderer->GetTargetWidth() * EFB_HEIGHT / g_renderer->GetTargetHeight());
+
+			m_query_read_pos = (m_query_read_pos + 1) % ARRAYSIZE(m_query_buffer);
+			--m_query_count;
+		}
+		else
+		{
+			break;
+		}
+	}
+}
+
+bool PerfQuery::IsFlushed() const
+{
+	return 0 == m_query_count;
+}
+
+
+} // namespace
diff --git a/Source/Plugins/Plugin_VideoDX9/Src/PerfQuery.h b/Source/Plugins/Plugin_VideoDX9/Src/PerfQuery.h
new file mode 100644
index 0000000000..9b8f637655
--- /dev/null
+++ b/Source/Plugins/Plugin_VideoDX9/Src/PerfQuery.h
@@ -0,0 +1,47 @@
+#ifndef _PERFQUERY_H_
+#define _PERFQUERY_H_
+
+#include "PerfQueryBase.h"
+
+namespace DX9 {
+
+class PerfQuery : public PerfQueryBase
+{
+public:
+	PerfQuery();
+	~PerfQuery();
+
+	void EnableQuery(PerfQueryGroup type);
+	void DisableQuery(PerfQueryGroup type);
+	void ResetQuery();
+	u32 GetQueryResult(PerfQueryType type);
+	void FlushResults();
+	bool IsFlushed() const;
+	void CreateDeviceObjects();
+	void DestroyDeviceObjects();
+
+private:
+	struct ActiveQuery
+	{
+		IDirect3DQuery9* query;
+		PerfQueryGroup query_type;
+	};
+
+	void WeakFlush();	
+	// Only use when non-empty
+	void FlushOne();
+
+	// when testing in SMS: 64 was too small, 128 was ok
+	static const int PERF_QUERY_BUFFER_SIZE = 512;
+
+	ActiveQuery m_query_buffer[PERF_QUERY_BUFFER_SIZE];
+	int m_query_read_pos;
+
+	// TODO: sloppy
+	volatile int m_query_count;
+	volatile u32 m_results[PQG_NUM_MEMBERS];
+};
+
+} // namespace
+
+#endif // _PERFQUERY_H_
diff --git a/Source/Plugins/Plugin_VideoDX9/Src/PixelShaderCache.cpp b/Source/Plugins/Plugin_VideoDX9/Src/PixelShaderCache.cpp
index 7061ea8657..eb47614ae5 100644
--- a/Source/Plugins/Plugin_VideoDX9/Src/PixelShaderCache.cpp
+++ b/Source/Plugins/Plugin_VideoDX9/Src/PixelShaderCache.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include <map>
 #include <set>
diff --git a/Source/Plugins/Plugin_VideoDX9/Src/PixelShaderCache.h b/Source/Plugins/Plugin_VideoDX9/Src/PixelShaderCache.h
index 96d2c29cd9..aadd2c02f7 100644
--- a/Source/Plugins/Plugin_VideoDX9/Src/PixelShaderCache.h
+++ b/Source/Plugins/Plugin_VideoDX9/Src/PixelShaderCache.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #pragma once
 
diff --git a/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp b/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp
index 7a175fd443..be13911fe9 100644
--- a/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp
+++ b/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include <list>
 #include <d3dx9.h>
@@ -55,7 +42,7 @@
 #include "BPFunctions.h"
 #include "FPSCounter.h"
 #include "ConfigManager.h"
-
+#include "PerfQuery.h"
 #include <strsafe.h>
 
 
@@ -68,7 +55,7 @@ static u32 s_blendMode;
 static u32 s_LastAA;
 static bool IS_AMD;
 static float m_fMaxPointSize;
-
+static bool s_vsync;
 static char *st;
 
 static LPDIRECT3DSURFACE9 ScreenShootMEMSurface = NULL;
@@ -88,6 +75,7 @@ void SetupDeviceObjects()
 	VertexShaderCache::Init();
 	PixelShaderCache::Init();
 	g_vertex_manager->CreateDeviceObjects();
+	((PerfQuery*)g_perf_query)->CreateDeviceObjects();
 	// Texture cache will recreate themselves over time.
 }
 
@@ -100,6 +88,7 @@ void TeardownDeviceObjects()
 	D3D::dev->SetRenderTarget(0, D3D::GetBackBufferSurface());
 	D3D::dev->SetDepthStencilSurface(D3D::GetBackBufferDepthSurface());
 	delete g_framebuffer_manager;
+	((PerfQuery*)g_perf_query)->DestroyDeviceObjects();
 	D3D::font.Shutdown();
 	TextureCache::Invalidate();
 	VertexLoaderManager::Shutdown();
@@ -137,7 +126,7 @@ Renderer::Renderer()
 
 	IS_AMD = D3D::IsATIDevice();
 
-	// Decide frambuffer size
+	// Decide framebuffer size
 	s_backbuffer_width = D3D::GetBackBufferWidth();
 	s_backbuffer_height = D3D::GetBackBufferHeight();
 
@@ -190,7 +179,8 @@ Renderer::Renderer()
 	D3D::dev->CreateOffscreenPlainSurface(s_backbuffer_width,s_backbuffer_height, D3DFMT_X8R8G8B8, D3DPOOL_SYSTEMMEM, &ScreenShootMEMSurface, NULL );
 	D3D::SetRenderState(D3DRS_POINTSCALEENABLE,false);
 	m_fMaxPointSize = D3D::GetCaps().MaxPointSize;
-
+	// Handle VSync on/off 
+	s_vsync = g_ActiveConfig.IsVSync();
 }
 
 Renderer::~Renderer()
@@ -230,7 +220,7 @@ void formatBufferDump(const u8* in, u8* out, int w, int h, int p)
 			memcpy(out, line, 3);
 			out += 3;
 			line += 4;
-		}			
+		}
 	}
 }
 
@@ -452,7 +442,8 @@ u32 Renderer::AccessEFB(EFBAccessType type, u32 x, u32 y, u32 poke_data)
 	}
 	else if(type == PEEK_COLOR)
 	{
-		// TODO: Can't we directly StretchRect to System buf?
+		// We can't directly StretchRect to System buf because is not supported by all implementations
+		// this is the only safe path that works in most cases
 		hr = D3D::dev->StretchRect(pEFBSurf, &RectToLock, pBufferRT, NULL, D3DTEXF_NONE);
 		D3D::dev->GetRenderTargetData(pBufferRT, pSystemBuf);
 
@@ -579,7 +570,7 @@ void Renderer::UpdateViewport(Matrix44& vpCorrection)
 	vp.Y = Y;
 	vp.Width = Wd;
 	vp.Height = Ht;
-	
+
 	// Some games set invalids values for z min and z max so fix them to the max an min alowed and let the shaders do this work
 	vp.MinZ = 0.0f; // (xfregs.viewport.farZ - xfregs.viewport.zRange) / 16777216.0f;
 	vp.MaxZ = 1.0f; // xfregs.viewport.farZ / 16777216.0f;
@@ -605,7 +596,9 @@ void Renderer::ClearScreen(const EFBRectangle& rc, bool colorEnable, bool alphaE
 		D3D::ChangeRenderState(D3DRS_ZFUNC, D3DCMP_ALWAYS);
 	}
 	else
+	{
 		D3D::ChangeRenderState(D3DRS_ZENABLE, FALSE);
+	}
 
 	// Update the viewport for clearing the target EFB rect
 	TargetRectangle targetRc = ConvertEFBRectangle(rc);
@@ -661,14 +654,18 @@ 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;
+	//bDstAlphaPass is taken into account because the ability to disable alpha composition is
+	//really useful for debugging shader and blending errors
+	bool use_DstAlpha = !g_ActiveConfig.bDstAlphaPass && bpmem.dstalpha.enable && bpmem.blendmode.alphaupdate && target_has_alpha;
+	bool use_DualSource = use_DstAlpha && g_ActiveConfig.backend_info.bSupportsDualSourceBlend;
 	const D3DBLEND d3dSrcFactors[8] =
 	{
 		D3DBLEND_ZERO,
 		D3DBLEND_ONE,
 		D3DBLEND_DESTCOLOR,
 		D3DBLEND_INVDESTCOLOR,
-		D3DBLEND_SRCALPHA,
-		D3DBLEND_INVSRCALPHA, 
+		(use_DualSource) ? D3DBLEND_SRCCOLOR2 : D3DBLEND_SRCALPHA,
+		(use_DualSource) ? D3DBLEND_INVSRCCOLOR2 : D3DBLEND_INVSRCALPHA,
 		(target_has_alpha) ? D3DBLEND_DESTALPHA : D3DBLEND_ONE,
 		(target_has_alpha) ? D3DBLEND_INVDESTALPHA : D3DBLEND_ZERO
 	};
@@ -678,32 +675,57 @@ void Renderer::SetBlendMode(bool forceUpdate)
 		D3DBLEND_ONE,
 		D3DBLEND_SRCCOLOR,
 		D3DBLEND_INVSRCCOLOR,
-		D3DBLEND_SRCALPHA,
-		D3DBLEND_INVSRCALPHA, 
+		(use_DualSource) ? D3DBLEND_SRCCOLOR2 : D3DBLEND_SRCALPHA,
+		(use_DualSource) ? D3DBLEND_INVSRCCOLOR2 : D3DBLEND_INVSRCALPHA,
 		(target_has_alpha) ? D3DBLEND_DESTALPHA : D3DBLEND_ONE,
 		(target_has_alpha) ? D3DBLEND_INVDESTALPHA : D3DBLEND_ZERO
 	};
 
 	if (bpmem.blendmode.logicopenable && !forceUpdate)
+	{
+		D3D::SetRenderState(D3DRS_SEPARATEALPHABLENDENABLE , false);
 		return;
+	}
 
-	if (bpmem.blendmode.subtract && bpmem.blendmode.blendenable)
+	bool blend_enable = bpmem.blendmode.subtract || bpmem.blendmode.blendenable;
+	D3D::SetRenderState(D3DRS_ALPHABLENDENABLE, blend_enable);
+	D3D::SetRenderState(D3DRS_SEPARATEALPHABLENDENABLE, blend_enable && g_ActiveConfig.backend_info.bSupportsSeparateAlphaFunction);
+	if (blend_enable)
 	{
-		D3D::SetRenderState(D3DRS_ALPHABLENDENABLE, true);
-		D3D::SetRenderState(D3DRS_BLENDOP, D3DBLENDOP_REVSUBTRACT);
-		D3D::SetRenderState(D3DRS_SRCBLEND, d3dSrcFactors[1]);
-		D3D::SetRenderState(D3DRS_DESTBLEND, d3dDestFactors[1]);
-	}
-	else
-	{
-		D3D::SetRenderState(D3DRS_ALPHABLENDENABLE, bpmem.blendmode.blendenable);
-		if (bpmem.blendmode.blendenable)
+		D3DBLENDOP op = D3DBLENDOP_ADD;
+		u32 srcidx = bpmem.blendmode.srcfactor;
+		u32 dstidx = bpmem.blendmode.dstfactor;
+		if (bpmem.blendmode.subtract)
 		{
-			D3D::SetRenderState(D3DRS_BLENDOP, D3DBLENDOP_ADD);
-			D3D::SetRenderState(D3DRS_SRCBLEND, d3dSrcFactors[bpmem.blendmode.srcfactor]);
-			D3D::SetRenderState(D3DRS_DESTBLEND, d3dDestFactors[bpmem.blendmode.dstfactor]);
+			op = D3DBLENDOP_REVSUBTRACT;
+			srcidx = GX_BL_ONE;
+			dstidx = GX_BL_ONE;
 		}
-	}
+		D3D::SetRenderState(D3DRS_BLENDOP, op);
+		D3D::SetRenderState(D3DRS_SRCBLEND, d3dSrcFactors[srcidx]);
+		D3D::SetRenderState(D3DRS_DESTBLEND, d3dDestFactors[dstidx]);
+		if (g_ActiveConfig.backend_info.bSupportsSeparateAlphaFunction)
+		{
+			if (use_DualSource)
+			{			
+				op = D3DBLENDOP_ADD;
+				srcidx = GX_BL_ONE;
+				dstidx = GX_BL_ZERO;
+			}
+			else
+			{
+				// we can't use D3DBLEND_DESTCOLOR or D3DBLEND_INVDESTCOLOR for source in alpha channel so use their alpha equivalent instead
+				if (srcidx == GX_BL_DSTCLR) srcidx = GX_BL_DSTALPHA;
+				if (srcidx == GX_BL_INVDSTCLR) srcidx = GX_BL_INVDSTALPHA;
+				// we can't use D3DBLEND_SRCCOLOR or D3DBLEND_INVSRCCOLOR for destination in alpha channel so use their alpha equivalent instead
+				if (dstidx == GX_BL_SRCCLR) dstidx = GX_BL_SRCALPHA;
+				if (dstidx == GX_BL_INVSRCCLR) dstidx = GX_BL_INVSRCALPHA;
+			}
+			D3D::SetRenderState(D3DRS_BLENDOPALPHA, op);
+			D3D::SetRenderState(D3DRS_SRCBLENDALPHA, d3dSrcFactors[srcidx]);
+			D3D::SetRenderState(D3DRS_DESTBLENDALPHA, d3dDestFactors[dstidx]);
+		}		
+	}	
 }
 
 bool Renderer::SaveScreenshot(const std::string &filename, const TargetRectangle &dst_rect)
@@ -1008,7 +1030,8 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons
 
 	DLCache::ProgressiveCleanup();
 	TextureCache::Cleanup();
-
+	// Flip/present backbuffer to frontbuffer here
+	D3D::Present();
 	// Enable configuration changes
 	UpdateActiveConfig();
 	TextureCache::OnConfigChanged(g_ActiveConfig);
@@ -1067,8 +1090,15 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons
 	// New frame
 	stats.ResetFrame();
 
-	// Flip/present backbuffer to frontbuffer here
-	D3D::Present();
+	// Handle vsync changes during execution
+	if(s_vsync != g_ActiveConfig.IsVSync())
+	{
+		s_vsync = g_ActiveConfig.IsVSync();
+		TeardownDeviceObjects();
+		D3D::Reset();
+		// device objects lost, so recreate all of them
+		SetupDeviceObjects();
+	}
 	D3D::BeginFrame();
 	RestoreAPIState();
 
@@ -1084,14 +1114,16 @@ void Renderer::ApplyState(bool bUseDstAlpha)
 {
 	if (bUseDstAlpha)
 	{
-		// TODO: WTF is this crap? We're enabling color writing regardless of the actual GPU state here...
+		// If we get here we are sure that we are using dst alpha pass. (bpmem.dstalpha.enable)
+		// Alpha write is enabled. (because bpmem.blendmode.alphaupdate && bpmem.zcontrol.pixel_format == PIXELFMT_RGBA6_Z24)
+		// We must disable blend because we want to write alpha value directly to the alpha channel without modifications.
 		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
+			// This is needed to draw to the correct pixels in multi-pass algorithms
+			// to avoid z-fighting 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);
 		}
@@ -1284,7 +1316,7 @@ void Renderer::SetLineWidth()
 	// We can't change line width in D3D unless we use ID3DXLine
 	float fratio = xfregs.viewport.wd != 0 ? Renderer::EFBToScaledXf(1.f) : 1.0f;
 	float psize = bpmem.lineptwidth.linesize * fratio / 6.0f;
-	//little hack to compensate scalling problems in dx9 must be taken out when scalling is fixed.
+	//little hack to compensate scaling problems in dx9 must be taken out when scaling is fixed.
 	psize *= 2.0f;
 	if (psize > m_fMaxPointSize)
 	{
diff --git a/Source/Plugins/Plugin_VideoDX9/Src/TextureCache.cpp b/Source/Plugins/Plugin_VideoDX9/Src/TextureCache.cpp
index 0e7d82cf7a..ce8b1acaf5 100644
--- a/Source/Plugins/Plugin_VideoDX9/Src/TextureCache.cpp
+++ b/Source/Plugins/Plugin_VideoDX9/Src/TextureCache.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include <d3dx9.h>
 
diff --git a/Source/Plugins/Plugin_VideoDX9/Src/TextureCache.h b/Source/Plugins/Plugin_VideoDX9/Src/TextureCache.h
index fc338e623f..5c711129f1 100644
--- a/Source/Plugins/Plugin_VideoDX9/Src/TextureCache.h
+++ b/Source/Plugins/Plugin_VideoDX9/Src/TextureCache.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _TEXTURECACHE_H
 #define _TEXTURECACHE_H
diff --git a/Source/Plugins/Plugin_VideoDX9/Src/TextureConverter.cpp b/Source/Plugins/Plugin_VideoDX9/Src/TextureConverter.cpp
index 7c38b154b9..aff12af2c3 100644
--- a/Source/Plugins/Plugin_VideoDX9/Src/TextureConverter.cpp
+++ b/Source/Plugins/Plugin_VideoDX9/Src/TextureConverter.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 // Fast image conversion using OpenGL shaders.
 // This kind of stuff would be a LOT nicer with OpenCL.
@@ -85,8 +72,8 @@ void CreateRgbToYuyvProgram()
 
 	s_rgbToYuyvProgram = D3D::CompileAndCreatePixelShader(FProgram, (int)strlen(FProgram));
 	if (!s_rgbToYuyvProgram) {
-        ERROR_LOG(VIDEO, "Failed to create RGB to YUYV fragment program");
-    }
+		ERROR_LOG(VIDEO, "Failed to create RGB to YUYV fragment program");
+	}
 	delete [] FProgram;
 }
 
@@ -107,15 +94,15 @@ void CreateYuyvToRgbProgram()
 	"  float uComp = c0.g - 0.5f;\n"
 	"  float vComp = c0.a - 0.5f;\n"
 
-    "  ocol0 = float4(yComp + (1.596f * vComp),\n"
+	"  ocol0 = float4(yComp + (1.596f * vComp),\n"
 	"                 yComp - (0.813f * vComp) - (0.391f * uComp),\n"
 	"                 yComp + (2.018f * uComp),\n"
 	"                 1.0f);\n"
 	"}\n",C_COLORMATRIX,C_COLORMATRIX+1);
 	s_yuyvToRgbProgram = D3D::CompileAndCreatePixelShader(FProgram, (int)strlen(FProgram));
 	if (!s_yuyvToRgbProgram) {
-        ERROR_LOG(VIDEO, "Failed to create YUYV to RGB fragment program");
-    }
+		ERROR_LOG(VIDEO, "Failed to create YUYV to RGB fragment program");
+	}
 	delete [] FProgram;
 }
 
@@ -152,7 +139,7 @@ LPDIRECT3DPIXELSHADER9 GetOrCreateEncodingShader(u32 format)
 			ERROR_LOG(VIDEO, "Failed to create encoding fragment program");
 			s_encodingProgramsFailed[format] = true;
 		}
-    }
+	}
 	return s_encodingPrograms[format];
 }
 
@@ -213,7 +200,7 @@ void Shutdown()
 void EncodeToRamUsingShader(LPDIRECT3DPIXELSHADER9 shader, LPDIRECT3DTEXTURE9 srcTexture, const TargetRectangle& sourceRc,
 				            u8* destAddr, int dstWidth, int dstHeight, int readStride, bool toTexture, bool linearFilter,float Gamma)
 {
-	HRESULT hr;		
+	HRESULT hr;
 	u32 index =0;
 	while(index < WorkingBuffers && (TrnBuffers[index].Width != dstWidth || TrnBuffers[index].Height != dstHeight))
 		index++;
@@ -240,8 +227,8 @@ void EncodeToRamUsingShader(LPDIRECT3DPIXELSHADER9 shader, LPDIRECT3DTEXTURE9 sr
 		if (TrnBuffers[index].FBTexture != NULL)
 		{
 			TrnBuffers[index].FBTexture->Release();
-			TrnBuffers[index].FBTexture = NULL;		
-		}		
+			TrnBuffers[index].FBTexture = NULL;
+		}
 		TrnBuffers[index].Width = dstWidth;
 		TrnBuffers[index].Height = dstHeight;
 		D3D::dev->CreateTexture(dstWidth, dstHeight, 1, D3DUSAGE_RENDERTARGET, D3DFMT_A8R8G8B8,
@@ -326,8 +313,10 @@ int EncodeToRamFromTexture(u32 address,LPDIRECT3DTEXTURE9 source_texture, u32 So
 			format |= _GX_TF_CTF;
 	}
 	else
+	{
 		if (copyfmt > GX_TF_RGBA8 || (copyfmt < GX_TF_RGB565 && !bIsIntensityFmt))
 			format |= _GX_TF_CTF;
+	}
 
 	LPDIRECT3DPIXELSHADER9 texconv_shader = GetOrCreateEncodingShader(format);
 	if (!texconv_shader)
@@ -349,7 +338,7 @@ int EncodeToRamFromTexture(u32 address,LPDIRECT3DTEXTURE9 source_texture, u32 So
 	s32 expandedWidth = (width + blkW) & (~blkW);
 	s32 expandedHeight = (height + blkH) & (~blkH);
 
-    float sampleStride = bScaleByHalf ? 2.f : 1.f;
+	float sampleStride = bScaleByHalf ? 2.f : 1.f;
 	TextureConversionShader::SetShaderParameters(
 		(float)expandedWidth,
 		(float)Renderer::EFBToScaledY(expandedHeight), // TODO: Why do we scale this?
@@ -366,10 +355,10 @@ int EncodeToRamFromTexture(u32 address,LPDIRECT3DTEXTURE9 source_texture, u32 So
 	scaledSource.left = 0;
 	scaledSource.right = expandedWidth / samples;
 	int cacheBytes = 32;
-    if ((format & 0x0f) == 6)
-        cacheBytes = 64;
+	if ((format & 0x0f) == 6)
+		cacheBytes = 64;
 
-    int readStride = (expandedWidth * cacheBytes) / TexDecoder_GetBlockWidthInTexels(format);
+	int readStride = (expandedWidth * cacheBytes) / TexDecoder_GetBlockWidthInTexels(format);
 	EncodeToRamUsingShader(texconv_shader, source_texture, scaledSource, dest_ptr, expandedWidth / samples, expandedHeight, readStride, true, bScaleByHalf > 0,1.0f);
 	return size_in_bytes; // TODO: D3D11 is calculating this value differently!
 }
@@ -379,9 +368,9 @@ void EncodeToRamYUYV(LPDIRECT3DTEXTURE9 srcTexture, const TargetRectangle& sourc
 	TextureConversionShader::SetShaderParameters(
 		(float)dstWidth, 
 		(float)dstHeight, 
-		0.0f , 
-		0.0f, 
-		1.0f, 
+		0.0f,
+		0.0f,
+		1.0f,
 		1.0f,
 		(float)Renderer::GetTargetWidth(),
 		(float)Renderer::GetTargetHeight());
@@ -439,25 +428,25 @@ void DecodeToTexture(u32 xfbAddr, int srcWidth, int srcHeight, LPDIRECT3DTEXTURE
 	D3D::ChangeSamplerState(0, D3DSAMP_MAGFILTER, D3DTEXF_POINT);
 		
 	TextureConversionShader::SetShaderParameters(
-		(float)srcFmtWidth, 
-		(float)srcHeight, 
-		0.0f , 
-		0.0f, 
-		1.0f, 
+		(float)srcFmtWidth,
+		(float)srcHeight,
+		0.0f,
+		0.0f,
+		1.0f,
 		1.0f,
 		(float)srcFmtWidth,
 		(float)srcHeight);
 	D3D::drawShadedTexQuad(
 		s_srcTexture,
-		&sourcerect, 
-		1 , 
+		&sourcerect,
+		1,
 		1,
 		srcWidth,
 		srcHeight,
 		s_yuyvToRgbProgram,
 		VertexShaderCache::GetSimpleVertexShader(0));
-	
-	
+
+
 	D3D::RefreshSamplerState(0, D3DSAMP_MINFILTER);
 	D3D::RefreshSamplerState(0, D3DSAMP_MAGFILTER);
 	D3D::SetTexture(0,NULL);
diff --git a/Source/Plugins/Plugin_VideoDX9/Src/TextureConverter.h b/Source/Plugins/Plugin_VideoDX9/Src/TextureConverter.h
index 4036f21447..af23949f5c 100644
--- a/Source/Plugins/Plugin_VideoDX9/Src/TextureConverter.h
+++ b/Source/Plugins/Plugin_VideoDX9/Src/TextureConverter.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _TEXTURECONVERTER_H_
 #define _TEXTURECONVERTER_H_
diff --git a/Source/Plugins/Plugin_VideoDX9/Src/VertexManager.cpp b/Source/Plugins/Plugin_VideoDX9/Src/VertexManager.cpp
index d2fcd6164a..a9eb333836 100644
--- a/Source/Plugins/Plugin_VideoDX9/Src/VertexManager.cpp
+++ b/Source/Plugins/Plugin_VideoDX9/Src/VertexManager.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "Common.h"
 #include "FileUtil.h"
@@ -353,7 +340,7 @@ void VertexManager::vFlush()
 				PixelShaderManager::SetTexDims(i, tentry->native_width, tentry->native_height, 0, 0);
 			}
 			else
-				ERROR_LOG(VIDEO, "error loading texture");
+				ERROR_LOG(VIDEO, "Error loading texture");
 		}
 	}
 
@@ -361,7 +348,12 @@ void VertexManager::vFlush()
 	VertexShaderManager::SetConstants();
 	PixelShaderManager::SetConstants(g_nativeVertexFmt->m_components);
 	u32 stride = g_nativeVertexFmt->GetVertexStride();
-	if (!PixelShaderCache::SetShader(DSTALPHA_NONE,g_nativeVertexFmt->m_components))
+	bool useDstAlpha = !g_ActiveConfig.bDstAlphaPass && bpmem.dstalpha.enable && bpmem.blendmode.alphaupdate &&
+						bpmem.zcontrol.pixel_format == PIXELFMT_RGBA6_Z24;
+	bool useDualSource = useDstAlpha && g_ActiveConfig.backend_info.bSupportsDualSourceBlend;
+	DSTALPHA_MODE AlphaMode = useDualSource ? DSTALPHA_DUAL_SOURCE_BLEND : DSTALPHA_NONE;	
+
+	if (!PixelShaderCache::SetShader(AlphaMode ,g_nativeVertexFmt->m_components))
 	{
 		GFX_DEBUGGER_PAUSE_LOG_AT(NEXT_ERROR,true,{printf("Fail to set pixel shader\n");});
 		goto shader_fail;
@@ -373,7 +365,8 @@ void VertexManager::vFlush()
 
 	}
 	PrepareDrawBuffers(stride);
-	g_nativeVertexFmt->SetupVertexPointers();	
+	g_nativeVertexFmt->SetupVertexPointers();
+	g_perf_query->EnableQuery(bpmem.zcontrol.early_ztest ? PQG_ZCOMP_ZCOMPLOC : PQG_ZCOMP);
 	if(m_buffers_count)
 	{
 		DrawVertexBuffer(stride);
@@ -382,10 +375,8 @@ void VertexManager::vFlush()
 	{ 
 		DrawVertexArray(stride);
 	}
-
-	bool useDstAlpha = !g_ActiveConfig.bDstAlphaPass && bpmem.dstalpha.enable && bpmem.blendmode.alphaupdate &&
-						bpmem.zcontrol.pixel_format == PIXELFMT_RGBA6_Z24;
-	if (useDstAlpha)
+	g_perf_query->DisableQuery(bpmem.zcontrol.early_ztest ? PQG_ZCOMP_ZCOMPLOC : PQG_ZCOMP);
+	if (useDstAlpha && !useDualSource)
 	{
 		if (!PixelShaderCache::SetShader(DSTALPHA_ALPHA_PASS, g_nativeVertexFmt->m_components))
 		{
diff --git a/Source/Plugins/Plugin_VideoDX9/Src/VertexManager.h b/Source/Plugins/Plugin_VideoDX9/Src/VertexManager.h
index 2a165aa9af..81a1c58211 100644
--- a/Source/Plugins/Plugin_VideoDX9/Src/VertexManager.h
+++ b/Source/Plugins/Plugin_VideoDX9/Src/VertexManager.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _VERTEXMANAGER_H
 #define _VERTEXMANAGER_H
diff --git a/Source/Plugins/Plugin_VideoDX9/Src/VertexShaderCache.cpp b/Source/Plugins/Plugin_VideoDX9/Src/VertexShaderCache.cpp
index 05e034cedf..9223533b3a 100644
--- a/Source/Plugins/Plugin_VideoDX9/Src/VertexShaderCache.cpp
+++ b/Source/Plugins/Plugin_VideoDX9/Src/VertexShaderCache.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include <map>
 
@@ -111,8 +98,7 @@ void VertexShaderCache::Init()
 						"{\n"
 							"VSOUTPUT OUT;"
 							"OUT.vPosition = inPosition;\n"
-							// HACK: Scale the texture coordinate range from (0,width) to (0,width-1), otherwise the linear filter won't average our samples correctly
-							"OUT.vTexCoord  = inTEX0 * (float2(1.f,1.f) / inInvTexSize - float2(1.f,1.f)) * inInvTexSize;\n"
+							"OUT.vTexCoord  = inTEX0;\n"
 							"OUT.vTexCoord1 = inTEX2;\n"
 							"return OUT;\n"
 						"}\n");
diff --git a/Source/Plugins/Plugin_VideoDX9/Src/VertexShaderCache.h b/Source/Plugins/Plugin_VideoDX9/Src/VertexShaderCache.h
index 9b6ff0d863..88c295c435 100644
--- a/Source/Plugins/Plugin_VideoDX9/Src/VertexShaderCache.h
+++ b/Source/Plugins/Plugin_VideoDX9/Src/VertexShaderCache.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #pragma once
 
diff --git a/Source/Plugins/Plugin_VideoDX9/Src/main.cpp b/Source/Plugins/Plugin_VideoDX9/Src/main.cpp
index 4b4fc6608e..b7fb9c1d44 100644
--- a/Source/Plugins/Plugin_VideoDX9/Src/main.cpp
+++ b/Source/Plugins/Plugin_VideoDX9/Src/main.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "Common.h"
 #include "Atomic.h"
@@ -51,13 +38,14 @@
 #include "VideoState.h"
 #include "Render.h"
 #include "DLCache.h"
+#include "IndexGenerator.h"
 #include "IniFile.h"
 #include "Core.h"
 #include "Host.h"
 
 #include "ConfigManager.h"
 #include "VideoBackend.h"
-#include "PerfQueryBase.h"
+#include "PerfQuery.h"
 
 namespace DX9
 {
@@ -89,18 +77,22 @@ std::string VideoBackend::GetName()
 
 std::string VideoBackend::GetDisplayName()
 {
-	return "Direct3D9 (deprecated)";
+	return "Direct3D9";
 }
 
 void InitBackendInfo()
 {
 	DX9::D3D::Init();
-	const int shaderModel = ((DX9::D3D::GetCaps().PixelShaderVersion >> 8) & 0xFF);
+	D3DCAPS9 device_caps = DX9::D3D::GetCaps();
+	const int shaderModel = ((device_caps.PixelShaderVersion >> 8) & 0xFF);
 	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.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.bSupportsPrimitiveRestart = false; // TODO: figure out if it does
+	g_Config.backend_info.bSupportsSeparateAlphaFunction = device_caps.PrimitiveMiscCaps & D3DPMISCCAPS_SEPARATEALPHABLEND;
+	// Dual source blend disabled by default until a proper method to test for support is found	
 	g_Config.backend_info.bSupportsDualSourceBlend = false;
 	g_Config.backend_info.bSupportsFormatReinterpretation = true;
 	g_Config.backend_info.bSupportsPixelLighting = C_PLIGHTS + 40 <= maxConstants && C_PMATERIALS + 4 <= maxConstants;
@@ -174,20 +166,20 @@ void VideoBackend::Video_Prepare()
 
 	// internal interfaces
 	g_vertex_manager = new VertexManager;
+	g_perf_query = new PerfQuery;
 	g_renderer = new Renderer;
-	g_texture_cache = new TextureCache;		
-	g_perf_query = new PerfQueryBase;
+	g_texture_cache = new TextureCache;	
 	// VideoCommon
 	BPInit();
 	Fifo_Init();
+	IndexGenerator::Init();
 	VertexLoaderManager::Init();
 	OpcodeDecoder_Init();
 	VertexShaderManager::Init();
 	PixelShaderManager::Init();
 	CommandProcessor::Init();
 	PixelEngine::Init();
-	DLCache::Init();
-
+	DLCache::Init();	
 	// Notify the core that the video backend is ready
 	Host_Message(WM_USER_CREATE);
 }
@@ -215,9 +207,9 @@ void VideoBackend::Shutdown()
 		// internal interfaces
 		PixelShaderCache::Shutdown();
 		VertexShaderCache::Shutdown();
-		delete g_perf_query;
 		delete g_texture_cache;
 		delete g_renderer;
+		delete g_perf_query;
 		delete g_vertex_manager;
 		g_renderer = NULL;
 		g_texture_cache = NULL;
diff --git a/Source/Plugins/Plugin_VideoDX9/Src/main.h b/Source/Plugins/Plugin_VideoDX9/Src/main.h
index 069f72e951..07d615b6e1 100644
--- a/Source/Plugins/Plugin_VideoDX9/Src/main.h
+++ b/Source/Plugins/Plugin_VideoDX9/Src/main.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef MAIN_H
 #define MAIN_H
diff --git a/Source/Plugins/Plugin_VideoDX9/Src/stdafx.cpp b/Source/Plugins/Plugin_VideoDX9/Src/stdafx.cpp
index 168ca738eb..b602b39925 100644
--- a/Source/Plugins/Plugin_VideoDX9/Src/stdafx.cpp
+++ b/Source/Plugins/Plugin_VideoDX9/Src/stdafx.cpp
@@ -1,18 +1,5 @@
-// Copyright (C) 2003 Dolphin Project.
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
-// 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 "stdafx.h"
\ No newline at end of file
+#include "stdafx.h"
diff --git a/Source/Plugins/Plugin_VideoDX9/Src/stdafx.h b/Source/Plugins/Plugin_VideoDX9/Src/stdafx.h
index 8ade6faa40..2431184aaf 100644
--- a/Source/Plugins/Plugin_VideoDX9/Src/stdafx.h
+++ b/Source/Plugins/Plugin_VideoDX9/Src/stdafx.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #pragma once
 #define _WIN32_WINNT 0x501
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.cpp b/Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.cpp
index 27a88bf68a..f590208fc3 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "Globals.h"
 #include "FramebufferManager.h"
@@ -44,13 +31,13 @@ GLuint FramebufferManager::m_xfbFramebuffer;
 
 FramebufferManager::FramebufferManager(int targetWidth, int targetHeight, int msaaSamples, int msaaCoverageSamples)
 {
-    m_efbFramebuffer = 0;
-    m_efbColor = 0;
-    m_efbDepth = 0;
-    m_resolvedFramebuffer = 0;
-    m_resolvedColorTexture = 0;
-    m_resolvedDepthTexture = 0;
-    m_xfbFramebuffer = 0;
+	m_efbFramebuffer = 0;
+	m_efbColor = 0;
+	m_efbDepth = 0;
+	m_resolvedFramebuffer = 0;
+	m_resolvedColorTexture = 0;
+	m_resolvedDepthTexture = 0;
+	m_xfbFramebuffer = 0;
 	
 	m_targetWidth = targetWidth;
 	m_targetHeight = targetHeight;
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.h b/Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.h
index 2a7b20defd..e0c96ed8a6 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.h
+++ b/Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _FRAMEBUFFERMANAGER_H_
 #define _FRAMEBUFFERMANAGER_H_
@@ -95,7 +82,7 @@ public:
 
 	// Same as above but for the depth Target.
 	// After calling this, before you render anything else, you MUST bind the framebuffer you want to draw to.
-    static GLuint ResolveAndGetDepthTarget(const EFBRectangle &rect);
+	static GLuint ResolveAndGetDepthTarget(const EFBRectangle &rect);
 
 private:
 	XFBSourceBase* CreateXFBSource(unsigned int target_width, unsigned int target_height);
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp b/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp
index 4f71fb4a7d..d7a891ecd1 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "Globals.h"
 #include "VideoConfig.h"
@@ -51,9 +38,7 @@ void VideoBackend::UpdateFPSDisplay(const char *text)
 }
 void InitInterface()
 {
-	#ifdef ANDROID
-		GLInterface = new cInterfaceBase;
-	#elif defined(USE_EGL) && USE_EGL
+	#if defined(USE_EGL) && USE_EGL
 		GLInterface = new cInterfaceEGL;
 	#elif defined(__APPLE__)
 		GLInterface = new cInterfaceAGL;
@@ -147,7 +132,7 @@ void OpenGL_ReportARBProgramError()
 	{
 		GLint loc = 0;
 		glGetIntegerv(GL_PROGRAM_ERROR_POSITION_ARB, &loc);
-		ERROR_LOG(VIDEO, "program error at %d: ", loc);
+		ERROR_LOG(VIDEO, "Program error at %d: ", loc);
 		ERROR_LOG(VIDEO, "%s", (char*)pstr);
 		ERROR_LOG(VIDEO, "\n");
 	}
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h b/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h
index 7ebe9b3b23..6df5aa1524 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h
+++ b/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _GLINIT_H_
 #define _GLINIT_H_
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Globals.h b/Source/Plugins/Plugin_VideoOGL/Src/Globals.h
index 3d26e17b75..ab90d8e279 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/Globals.h
+++ b/Source/Plugins/Plugin_VideoOGL/Src/Globals.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _GLOBALS_H_
 #define _GLOBALS_H_
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/NativeVertexFormat.cpp b/Source/Plugins/Plugin_VideoOGL/Src/NativeVertexFormat.cpp
index acfdb7ee2e..293e674cbb 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/NativeVertexFormat.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/NativeVertexFormat.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "GLUtil.h"
 #include "x64Emitter.h"
@@ -100,7 +87,7 @@ void GLVertexFormat::Initialize(const PortableVertexDeclaration &_vtx_decl)
 
 	if (vtx_decl.posmtx_offset != -1) {
 		glEnableVertexAttribArray(SHADER_POSMTX_ATTRIB);
-		glVertexAttribIPointer(SHADER_POSMTX_ATTRIB, 4, GL_UNSIGNED_BYTE, vtx_decl.stride, (u8*)NULL + vtx_decl.posmtx_offset);
+		glVertexAttribPointer(SHADER_POSMTX_ATTRIB, 4, GL_UNSIGNED_BYTE, GL_FALSE, vtx_decl.stride, (u8*)NULL + vtx_decl.posmtx_offset);
 	}
 
 	vm->m_last_vao = VAO;
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/PerfQuery.cpp b/Source/Plugins/Plugin_VideoOGL/Src/PerfQuery.cpp
index db47217655..31d2af6107 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/PerfQuery.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/PerfQuery.cpp
@@ -30,7 +30,7 @@ void PerfQuery::EnableQuery(PerfQueryGroup type)
 	if (ARRAYSIZE(m_query_buffer) == m_query_count)
 	{
 		FlushOne();
-		//ERROR_LOG(VIDEO, "flushed query buffer early!");
+		//ERROR_LOG(VIDEO, "Flushed query buffer early!");
 	}
 	
 	// start query
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp b/Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp
index 1d3865851a..382784b502 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "Globals.h"
 
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/PostProcessing.cpp b/Source/Plugins/Plugin_VideoOGL/Src/PostProcessing.cpp
index 9a3e0b9bed..d5899038fc 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/PostProcessing.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/PostProcessing.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "FileUtil.h"
 #include "VideoCommon.h"
@@ -165,7 +152,7 @@ void ApplyShader()
 	std::string code;
 	std::string path = File::GetUserPath(D_SHADERS_IDX) + g_ActiveConfig.sPostProcessingShader + ".txt";
 	if(!File::ReadFileToString(true, path.c_str(), code)) {
-		ERROR_LOG(VIDEO, "post-processing shader not found: %s", path.c_str());
+		ERROR_LOG(VIDEO, "Post-processing shader not found: %s", path.c_str());
 		return;
 	}
 	
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/PostProcessing.h b/Source/Plugins/Plugin_VideoOGL/Src/PostProcessing.h
index 10a30d9e27..1deb050a75 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/PostProcessing.h
+++ b/Source/Plugins/Plugin_VideoOGL/Src/PostProcessing.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _POSTPROCESSING_H_
 #define _POSTPROCESSING_H_
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp b/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp
index 0d571c29a9..bab52073fb 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "ProgramShaderCache.h"
 #include "MathUtil.h"
@@ -123,8 +110,15 @@ void SHADER::SetProgramBindings()
 		glBindFragDataLocationIndexed(glprogid, 0, 0, "ocol0");
 		glBindFragDataLocationIndexed(glprogid, 0, 1, "ocol1");
 	}
-	else
+	else if(g_ogl_config.eSupportedGLSLVersion > GLSL_120)
+	{
 		glBindFragDataLocation(glprogid, 0, "ocol0");
+	}
+	else
+	{
+		// ogl2 shaders don't need to bind output colors.
+		// gl_FragColor already point to color channel
+	}
 
 	// Need to set some attribute locations
 	glBindAttribLocation(glprogid, SHADER_POSITION_ATTRIB, "rawpos");
@@ -465,31 +459,17 @@ void ProgramShaderCache::Shutdown(void)
 
 void ProgramShaderCache::CreateHeader ( void )
 {
-#ifdef _WIN32
-	// Intel Windows driver has a issue:
-	// their glsl doesn't know about the ubo extension, so we can't load it.
-	// but as version 140, ubo is in core and don't have to be loaded in glsl.
-	// as sandy do ogl3.1, glsl 140 is supported, so force it in this way. 
-	// TODO: remove this again when the issue is fixed:
-	// see http://communities.intel.com/thread/36084
-	bool glsl140_hack = strcmp(g_ogl_config.gl_vendor, "Intel") == 0;
-#elif __APPLE__
-	// as apple doesn't support glsl130 at all, we also have to use glsl140
-	bool glsl140_hack = true;
-#else
-	bool glsl140_hack = false;
-#endif
-	
+	GLSL_VERSION v = g_ogl_config.eSupportedGLSLVersion;
 	snprintf(s_glsl_header, sizeof(s_glsl_header), 
 		"#version %s\n"
 		"%s\n" // tex_rect
 		"%s\n" // ubo
 		
 		"\n"// A few required defines and ones that will make our lives a lot easier
-		"#define ATTRIN in\n"
-		"#define ATTROUT out\n"
-		"#define VARYIN centroid in\n"
-		"#define VARYOUT centroid out\n"
+		"#define ATTRIN %s\n"
+		"#define ATTROUT %s\n"
+		"#define VARYIN %s\n"
+		"#define VARYOUT %s\n"
 
 		// Silly differences
 		"#define float2 vec2\n"
@@ -501,10 +481,27 @@ void ProgramShaderCache::CreateHeader ( void )
 		"#define saturate(x) clamp(x, 0.0f, 1.0f)\n"
 		"#define lerp(x, y, z) mix(x, y, z)\n"
 		
+		// glsl 120 hack
+		"%s\n"
+		"%s\n"
+		"%s\n"
+		"%s\n"
+		"%s\n"
+		"#define COLOROUT(name) %s\n"
 		
-		, glsl140_hack ? "140" : "130"
-		, glsl140_hack ? "#define texture2DRect texture" : "#extension GL_ARB_texture_rectangle : enable"
-		, g_ActiveConfig.backend_info.bSupportsGLSLUBO && !glsl140_hack ? "#extension GL_ARB_uniform_buffer_object : enable" : "// ubo disabled"
+		, v==GLSL_120 ? "120" : v==GLSL_130 ? "130" : "140"
+		, v<=GLSL_130 ? "#extension GL_ARB_texture_rectangle : enable" : "#define texture2DRect texture"
+		, g_ActiveConfig.backend_info.bSupportsGLSLUBO && v!=GLSL_140 ? "#extension GL_ARB_uniform_buffer_object : enable" : ""
+		, v==GLSL_120 ? "attribute" : "in"
+		, v==GLSL_120 ? "attribute" : "out"
+		, v==GLSL_120 ? "varying" : "centroid in"
+		, v==GLSL_120 ? "varying" : "centroid out"
+		, v==GLSL_120 ? "#define texture texture2D" : ""
+		, v==GLSL_120 ? "#define round(x) floor((x)+0.5f)" : ""
+		, v==GLSL_120 ? "#define out " : ""
+		, v==GLSL_120 ? "#define ocol0 gl_FragColor" : ""
+		, v==GLSL_120 ? "#define ocol1 gl_FragColor" : "" //TODO: implement dual source blend
+		, v==GLSL_120 ? "" : "out vec4 name;"
 	);
 }
 
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.h b/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.h
index b7b757172a..9cd9a9b12c 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.h
+++ b/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef PROGRAM_SHADER_CACHE_H_
 #define PROGRAM_SHADER_CACHE_H_
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/RasterFont.cpp b/Source/Plugins/Plugin_VideoOGL/Src/RasterFont.cpp
index 0ba2a5b1ae..acc77d1f0e 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/RasterFont.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/RasterFont.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "GLUtil.h"
 
@@ -29,108 +16,108 @@ static const u32 char_offset = 32;
 static const u32 char_count = 95;
 
 const u8 rasters[char_count][char_height] = {
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, 
-    {0x00, 0x00, 0x18, 0x18, 0x00, 0x00, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18}, 
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x36, 0x36, 0x36, 0x36}, 
-    {0x00, 0x00, 0x00, 0x66, 0x66, 0xff, 0x66, 0x66, 0xff, 0x66, 0x66, 0x00, 0x00}, 
-    {0x00, 0x00, 0x18, 0x7e, 0xff, 0x1b, 0x1f, 0x7e, 0xf8, 0xd8, 0xff, 0x7e, 0x18}, 
-    {0x00, 0x00, 0x0e, 0x1b, 0xdb, 0x6e, 0x30, 0x18, 0x0c, 0x76, 0xdb, 0xd8, 0x70}, 
-    {0x00, 0x00, 0x7f, 0xc6, 0xcf, 0xd8, 0x70, 0x70, 0xd8, 0xcc, 0xcc, 0x6c, 0x38}, 
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x1c, 0x0c, 0x0e}, 
-    {0x00, 0x00, 0x0c, 0x18, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x18, 0x0c}, 
-    {0x00, 0x00, 0x30, 0x18, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x18, 0x30}, 
-    {0x00, 0x00, 0x00, 0x00, 0x99, 0x5a, 0x3c, 0xff, 0x3c, 0x5a, 0x99, 0x00, 0x00}, 
-    {0x00, 0x00, 0x00, 0x18, 0x18, 0x18, 0xff, 0xff, 0x18, 0x18, 0x18, 0x00, 0x00}, 
-    {0x00, 0x00, 0x30, 0x18, 0x1c, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, 
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00}, 
-    {0x00, 0x00, 0x00, 0x38, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, 
-    {0x00, 0x60, 0x60, 0x30, 0x30, 0x18, 0x18, 0x0c, 0x0c, 0x06, 0x06, 0x03, 0x03}, 
-    {0x00, 0x00, 0x3c, 0x66, 0xc3, 0xe3, 0xf3, 0xdb, 0xcf, 0xc7, 0xc3, 0x66, 0x3c}, 
-    {0x00, 0x00, 0x7e, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x78, 0x38, 0x18}, 
-    {0x00, 0x00, 0xff, 0xc0, 0xc0, 0x60, 0x30, 0x18, 0x0c, 0x06, 0x03, 0xe7, 0x7e}, 
-    {0x00, 0x00, 0x7e, 0xe7, 0x03, 0x03, 0x07, 0x7e, 0x07, 0x03, 0x03, 0xe7, 0x7e}, 
-    {0x00, 0x00, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0xff, 0xcc, 0x6c, 0x3c, 0x1c, 0x0c}, 
-    {0x00, 0x00, 0x7e, 0xe7, 0x03, 0x03, 0x07, 0xfe, 0xc0, 0xc0, 0xc0, 0xc0, 0xff}, 
-    {0x00, 0x00, 0x7e, 0xe7, 0xc3, 0xc3, 0xc7, 0xfe, 0xc0, 0xc0, 0xc0, 0xe7, 0x7e}, 
-    {0x00, 0x00, 0x30, 0x30, 0x30, 0x30, 0x18, 0x0c, 0x06, 0x03, 0x03, 0x03, 0xff}, 
-    {0x00, 0x00, 0x7e, 0xe7, 0xc3, 0xc3, 0xe7, 0x7e, 0xe7, 0xc3, 0xc3, 0xe7, 0x7e}, 
-    {0x00, 0x00, 0x7e, 0xe7, 0x03, 0x03, 0x03, 0x7f, 0xe7, 0xc3, 0xc3, 0xe7, 0x7e}, 
-    {0x00, 0x00, 0x00, 0x38, 0x38, 0x00, 0x00, 0x38, 0x38, 0x00, 0x00, 0x00, 0x00}, 
-    {0x00, 0x00, 0x30, 0x18, 0x1c, 0x1c, 0x00, 0x00, 0x1c, 0x1c, 0x00, 0x00, 0x00}, 
-    {0x00, 0x00, 0x06, 0x0c, 0x18, 0x30, 0x60, 0xc0, 0x60, 0x30, 0x18, 0x0c, 0x06}, 
-    {0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00}, 
-    {0x00, 0x00, 0x60, 0x30, 0x18, 0x0c, 0x06, 0x03, 0x06, 0x0c, 0x18, 0x30, 0x60}, 
-    {0x00, 0x00, 0x18, 0x00, 0x00, 0x18, 0x18, 0x0c, 0x06, 0x03, 0xc3, 0xc3, 0x7e}, 
-    {0x00, 0x00, 0x3f, 0x60, 0xcf, 0xdb, 0xd3, 0xdd, 0xc3, 0x7e, 0x00, 0x00, 0x00}, 
-    {0x00, 0x00, 0xc3, 0xc3, 0xc3, 0xc3, 0xff, 0xc3, 0xc3, 0xc3, 0x66, 0x3c, 0x18}, 
-    {0x00, 0x00, 0xfe, 0xc7, 0xc3, 0xc3, 0xc7, 0xfe, 0xc7, 0xc3, 0xc3, 0xc7, 0xfe}, 
-    {0x00, 0x00, 0x7e, 0xe7, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xe7, 0x7e}, 
-    {0x00, 0x00, 0xfc, 0xce, 0xc7, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc7, 0xce, 0xfc}, 
-    {0x00, 0x00, 0xff, 0xc0, 0xc0, 0xc0, 0xc0, 0xfc, 0xc0, 0xc0, 0xc0, 0xc0, 0xff}, 
-    {0x00, 0x00, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xfc, 0xc0, 0xc0, 0xc0, 0xff}, 
-    {0x00, 0x00, 0x7e, 0xe7, 0xc3, 0xc3, 0xcf, 0xc0, 0xc0, 0xc0, 0xc0, 0xe7, 0x7e}, 
-    {0x00, 0x00, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xff, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3}, 
-    {0x00, 0x00, 0x7e, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x7e}, 
-    {0x00, 0x00, 0x7c, 0xee, 0xc6, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06}, 
-    {0x00, 0x00, 0xc3, 0xc6, 0xcc, 0xd8, 0xf0, 0xe0, 0xf0, 0xd8, 0xcc, 0xc6, 0xc3}, 
-    {0x00, 0x00, 0xff, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0}, 
-    {0x00, 0x00, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xdb, 0xff, 0xff, 0xe7, 0xc3}, 
-    {0x00, 0x00, 0xc7, 0xc7, 0xcf, 0xcf, 0xdf, 0xdb, 0xfb, 0xf3, 0xf3, 0xe3, 0xe3}, 
-    {0x00, 0x00, 0x7e, 0xe7, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xe7, 0x7e}, 
-    {0x00, 0x00, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xfe, 0xc7, 0xc3, 0xc3, 0xc7, 0xfe}, 
-    {0x00, 0x00, 0x3f, 0x6e, 0xdf, 0xdb, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0x66, 0x3c}, 
-    {0x00, 0x00, 0xc3, 0xc6, 0xcc, 0xd8, 0xf0, 0xfe, 0xc7, 0xc3, 0xc3, 0xc7, 0xfe}, 
-    {0x00, 0x00, 0x7e, 0xe7, 0x03, 0x03, 0x07, 0x7e, 0xe0, 0xc0, 0xc0, 0xe7, 0x7e}, 
-    {0x00, 0x00, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0xff}, 
-    {0x00, 0x00, 0x7e, 0xe7, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3}, 
-    {0x00, 0x00, 0x18, 0x3c, 0x3c, 0x66, 0x66, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3}, 
-    {0x00, 0x00, 0xc3, 0xe7, 0xff, 0xff, 0xdb, 0xdb, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3}, 
-    {0x00, 0x00, 0xc3, 0x66, 0x66, 0x3c, 0x3c, 0x18, 0x3c, 0x3c, 0x66, 0x66, 0xc3}, 
-    {0x00, 0x00, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x3c, 0x66, 0x66, 0xc3}, 
-    {0x00, 0x00, 0xff, 0xc0, 0xc0, 0x60, 0x30, 0x7e, 0x0c, 0x06, 0x03, 0x03, 0xff}, 
-    {0x00, 0x00, 0x3c, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x3c}, 
-    {0x00, 0x03, 0x03, 0x06, 0x06, 0x0c, 0x0c, 0x18, 0x18, 0x30, 0x30, 0x60, 0x60}, 
-    {0x00, 0x00, 0x3c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x3c}, 
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc3, 0x66, 0x3c, 0x18}, 
-    {0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, 
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x38, 0x30, 0x70}, 
-    {0x00, 0x00, 0x7f, 0xc3, 0xc3, 0x7f, 0x03, 0xc3, 0x7e, 0x00, 0x00, 0x00, 0x00}, 
-    {0x00, 0x00, 0xfe, 0xc3, 0xc3, 0xc3, 0xc3, 0xfe, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0}, 
-    {0x00, 0x00, 0x7e, 0xc3, 0xc0, 0xc0, 0xc0, 0xc3, 0x7e, 0x00, 0x00, 0x00, 0x00}, 
-    {0x00, 0x00, 0x7f, 0xc3, 0xc3, 0xc3, 0xc3, 0x7f, 0x03, 0x03, 0x03, 0x03, 0x03}, 
-    {0x00, 0x00, 0x7f, 0xc0, 0xc0, 0xfe, 0xc3, 0xc3, 0x7e, 0x00, 0x00, 0x00, 0x00}, 
-    {0x00, 0x00, 0x30, 0x30, 0x30, 0x30, 0x30, 0xfc, 0x30, 0x30, 0x30, 0x33, 0x1e}, 
-    {0x7e, 0xc3, 0x03, 0x03, 0x7f, 0xc3, 0xc3, 0xc3, 0x7e, 0x00, 0x00, 0x00, 0x00}, 
-    {0x00, 0x00, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xfe, 0xc0, 0xc0, 0xc0, 0xc0}, 
-    {0x00, 0x00, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x00, 0x00, 0x18, 0x00}, 
-    {0x38, 0x6c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x00, 0x00, 0x0c, 0x00}, 
-    {0x00, 0x00, 0xc6, 0xcc, 0xf8, 0xf0, 0xd8, 0xcc, 0xc6, 0xc0, 0xc0, 0xc0, 0xc0}, 
-    {0x00, 0x00, 0x7e, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x78}, 
-    {0x00, 0x00, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xfe, 0x00, 0x00, 0x00, 0x00}, 
-    {0x00, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xfc, 0x00, 0x00, 0x00, 0x00}, 
-    {0x00, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00}, 
-    {0xc0, 0xc0, 0xc0, 0xfe, 0xc3, 0xc3, 0xc3, 0xc3, 0xfe, 0x00, 0x00, 0x00, 0x00}, 
-    {0x03, 0x03, 0x03, 0x7f, 0xc3, 0xc3, 0xc3, 0xc3, 0x7f, 0x00, 0x00, 0x00, 0x00}, 
-    {0x00, 0x00, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xe0, 0xfe, 0x00, 0x00, 0x00, 0x00}, 
-    {0x00, 0x00, 0xfe, 0x03, 0x03, 0x7e, 0xc0, 0xc0, 0x7f, 0x00, 0x00, 0x00, 0x00}, 
-    {0x00, 0x00, 0x1c, 0x36, 0x30, 0x30, 0x30, 0x30, 0xfc, 0x30, 0x30, 0x30, 0x00}, 
-    {0x00, 0x00, 0x7e, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00}, 
-    {0x00, 0x00, 0x18, 0x3c, 0x3c, 0x66, 0x66, 0xc3, 0xc3, 0x00, 0x00, 0x00, 0x00}, 
-    {0x00, 0x00, 0xc3, 0xe7, 0xff, 0xdb, 0xc3, 0xc3, 0xc3, 0x00, 0x00, 0x00, 0x00}, 
-    {0x00, 0x00, 0xc3, 0x66, 0x3c, 0x18, 0x3c, 0x66, 0xc3, 0x00, 0x00, 0x00, 0x00}, 
-    {0xc0, 0x60, 0x60, 0x30, 0x18, 0x3c, 0x66, 0x66, 0xc3, 0x00, 0x00, 0x00, 0x00}, 
-    {0x00, 0x00, 0xff, 0x60, 0x30, 0x18, 0x0c, 0x06, 0xff, 0x00, 0x00, 0x00, 0x00}, 
-    {0x00, 0x00, 0x0f, 0x18, 0x18, 0x18, 0x38, 0xf0, 0x38, 0x18, 0x18, 0x18, 0x0f}, 
-    {0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18}, 
-    {0x00, 0x00, 0xf0, 0x18, 0x18, 0x18, 0x1c, 0x0f, 0x1c, 0x18, 0x18, 0x18, 0xf0}, 
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x8f, 0xf1, 0x60, 0x00, 0x00, 0x00} 
+	{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, 
+	{0x00, 0x00, 0x18, 0x18, 0x00, 0x00, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18}, 
+	{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x36, 0x36, 0x36, 0x36}, 
+	{0x00, 0x00, 0x00, 0x66, 0x66, 0xff, 0x66, 0x66, 0xff, 0x66, 0x66, 0x00, 0x00}, 
+	{0x00, 0x00, 0x18, 0x7e, 0xff, 0x1b, 0x1f, 0x7e, 0xf8, 0xd8, 0xff, 0x7e, 0x18}, 
+	{0x00, 0x00, 0x0e, 0x1b, 0xdb, 0x6e, 0x30, 0x18, 0x0c, 0x76, 0xdb, 0xd8, 0x70}, 
+	{0x00, 0x00, 0x7f, 0xc6, 0xcf, 0xd8, 0x70, 0x70, 0xd8, 0xcc, 0xcc, 0x6c, 0x38}, 
+	{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x1c, 0x0c, 0x0e}, 
+	{0x00, 0x00, 0x0c, 0x18, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x18, 0x0c}, 
+	{0x00, 0x00, 0x30, 0x18, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x18, 0x30}, 
+	{0x00, 0x00, 0x00, 0x00, 0x99, 0x5a, 0x3c, 0xff, 0x3c, 0x5a, 0x99, 0x00, 0x00}, 
+	{0x00, 0x00, 0x00, 0x18, 0x18, 0x18, 0xff, 0xff, 0x18, 0x18, 0x18, 0x00, 0x00}, 
+	{0x00, 0x00, 0x30, 0x18, 0x1c, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, 
+	{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00}, 
+	{0x00, 0x00, 0x00, 0x38, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, 
+	{0x00, 0x60, 0x60, 0x30, 0x30, 0x18, 0x18, 0x0c, 0x0c, 0x06, 0x06, 0x03, 0x03}, 
+	{0x00, 0x00, 0x3c, 0x66, 0xc3, 0xe3, 0xf3, 0xdb, 0xcf, 0xc7, 0xc3, 0x66, 0x3c}, 
+	{0x00, 0x00, 0x7e, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x78, 0x38, 0x18}, 
+	{0x00, 0x00, 0xff, 0xc0, 0xc0, 0x60, 0x30, 0x18, 0x0c, 0x06, 0x03, 0xe7, 0x7e}, 
+	{0x00, 0x00, 0x7e, 0xe7, 0x03, 0x03, 0x07, 0x7e, 0x07, 0x03, 0x03, 0xe7, 0x7e}, 
+	{0x00, 0x00, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0xff, 0xcc, 0x6c, 0x3c, 0x1c, 0x0c}, 
+	{0x00, 0x00, 0x7e, 0xe7, 0x03, 0x03, 0x07, 0xfe, 0xc0, 0xc0, 0xc0, 0xc0, 0xff}, 
+	{0x00, 0x00, 0x7e, 0xe7, 0xc3, 0xc3, 0xc7, 0xfe, 0xc0, 0xc0, 0xc0, 0xe7, 0x7e}, 
+	{0x00, 0x00, 0x30, 0x30, 0x30, 0x30, 0x18, 0x0c, 0x06, 0x03, 0x03, 0x03, 0xff}, 
+	{0x00, 0x00, 0x7e, 0xe7, 0xc3, 0xc3, 0xe7, 0x7e, 0xe7, 0xc3, 0xc3, 0xe7, 0x7e}, 
+	{0x00, 0x00, 0x7e, 0xe7, 0x03, 0x03, 0x03, 0x7f, 0xe7, 0xc3, 0xc3, 0xe7, 0x7e}, 
+	{0x00, 0x00, 0x00, 0x38, 0x38, 0x00, 0x00, 0x38, 0x38, 0x00, 0x00, 0x00, 0x00}, 
+	{0x00, 0x00, 0x30, 0x18, 0x1c, 0x1c, 0x00, 0x00, 0x1c, 0x1c, 0x00, 0x00, 0x00}, 
+	{0x00, 0x00, 0x06, 0x0c, 0x18, 0x30, 0x60, 0xc0, 0x60, 0x30, 0x18, 0x0c, 0x06}, 
+	{0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00}, 
+	{0x00, 0x00, 0x60, 0x30, 0x18, 0x0c, 0x06, 0x03, 0x06, 0x0c, 0x18, 0x30, 0x60}, 
+	{0x00, 0x00, 0x18, 0x00, 0x00, 0x18, 0x18, 0x0c, 0x06, 0x03, 0xc3, 0xc3, 0x7e}, 
+	{0x00, 0x00, 0x3f, 0x60, 0xcf, 0xdb, 0xd3, 0xdd, 0xc3, 0x7e, 0x00, 0x00, 0x00}, 
+	{0x00, 0x00, 0xc3, 0xc3, 0xc3, 0xc3, 0xff, 0xc3, 0xc3, 0xc3, 0x66, 0x3c, 0x18}, 
+	{0x00, 0x00, 0xfe, 0xc7, 0xc3, 0xc3, 0xc7, 0xfe, 0xc7, 0xc3, 0xc3, 0xc7, 0xfe}, 
+	{0x00, 0x00, 0x7e, 0xe7, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xe7, 0x7e}, 
+	{0x00, 0x00, 0xfc, 0xce, 0xc7, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc7, 0xce, 0xfc}, 
+	{0x00, 0x00, 0xff, 0xc0, 0xc0, 0xc0, 0xc0, 0xfc, 0xc0, 0xc0, 0xc0, 0xc0, 0xff}, 
+	{0x00, 0x00, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xfc, 0xc0, 0xc0, 0xc0, 0xff}, 
+	{0x00, 0x00, 0x7e, 0xe7, 0xc3, 0xc3, 0xcf, 0xc0, 0xc0, 0xc0, 0xc0, 0xe7, 0x7e}, 
+	{0x00, 0x00, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xff, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3}, 
+	{0x00, 0x00, 0x7e, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x7e}, 
+	{0x00, 0x00, 0x7c, 0xee, 0xc6, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06}, 
+	{0x00, 0x00, 0xc3, 0xc6, 0xcc, 0xd8, 0xf0, 0xe0, 0xf0, 0xd8, 0xcc, 0xc6, 0xc3}, 
+	{0x00, 0x00, 0xff, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0}, 
+	{0x00, 0x00, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xdb, 0xff, 0xff, 0xe7, 0xc3}, 
+	{0x00, 0x00, 0xc7, 0xc7, 0xcf, 0xcf, 0xdf, 0xdb, 0xfb, 0xf3, 0xf3, 0xe3, 0xe3}, 
+	{0x00, 0x00, 0x7e, 0xe7, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xe7, 0x7e}, 
+	{0x00, 0x00, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xfe, 0xc7, 0xc3, 0xc3, 0xc7, 0xfe}, 
+	{0x00, 0x00, 0x3f, 0x6e, 0xdf, 0xdb, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0x66, 0x3c}, 
+	{0x00, 0x00, 0xc3, 0xc6, 0xcc, 0xd8, 0xf0, 0xfe, 0xc7, 0xc3, 0xc3, 0xc7, 0xfe}, 
+	{0x00, 0x00, 0x7e, 0xe7, 0x03, 0x03, 0x07, 0x7e, 0xe0, 0xc0, 0xc0, 0xe7, 0x7e}, 
+	{0x00, 0x00, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0xff}, 
+	{0x00, 0x00, 0x7e, 0xe7, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3}, 
+	{0x00, 0x00, 0x18, 0x3c, 0x3c, 0x66, 0x66, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3}, 
+	{0x00, 0x00, 0xc3, 0xe7, 0xff, 0xff, 0xdb, 0xdb, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3}, 
+	{0x00, 0x00, 0xc3, 0x66, 0x66, 0x3c, 0x3c, 0x18, 0x3c, 0x3c, 0x66, 0x66, 0xc3}, 
+	{0x00, 0x00, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x3c, 0x66, 0x66, 0xc3}, 
+	{0x00, 0x00, 0xff, 0xc0, 0xc0, 0x60, 0x30, 0x7e, 0x0c, 0x06, 0x03, 0x03, 0xff}, 
+	{0x00, 0x00, 0x3c, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x3c}, 
+	{0x00, 0x03, 0x03, 0x06, 0x06, 0x0c, 0x0c, 0x18, 0x18, 0x30, 0x30, 0x60, 0x60}, 
+	{0x00, 0x00, 0x3c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x3c}, 
+	{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc3, 0x66, 0x3c, 0x18}, 
+	{0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, 
+	{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x38, 0x30, 0x70}, 
+	{0x00, 0x00, 0x7f, 0xc3, 0xc3, 0x7f, 0x03, 0xc3, 0x7e, 0x00, 0x00, 0x00, 0x00}, 
+	{0x00, 0x00, 0xfe, 0xc3, 0xc3, 0xc3, 0xc3, 0xfe, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0}, 
+	{0x00, 0x00, 0x7e, 0xc3, 0xc0, 0xc0, 0xc0, 0xc3, 0x7e, 0x00, 0x00, 0x00, 0x00}, 
+	{0x00, 0x00, 0x7f, 0xc3, 0xc3, 0xc3, 0xc3, 0x7f, 0x03, 0x03, 0x03, 0x03, 0x03}, 
+	{0x00, 0x00, 0x7f, 0xc0, 0xc0, 0xfe, 0xc3, 0xc3, 0x7e, 0x00, 0x00, 0x00, 0x00}, 
+	{0x00, 0x00, 0x30, 0x30, 0x30, 0x30, 0x30, 0xfc, 0x30, 0x30, 0x30, 0x33, 0x1e}, 
+	{0x7e, 0xc3, 0x03, 0x03, 0x7f, 0xc3, 0xc3, 0xc3, 0x7e, 0x00, 0x00, 0x00, 0x00}, 
+	{0x00, 0x00, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xfe, 0xc0, 0xc0, 0xc0, 0xc0}, 
+	{0x00, 0x00, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x00, 0x00, 0x18, 0x00}, 
+	{0x38, 0x6c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x00, 0x00, 0x0c, 0x00}, 
+	{0x00, 0x00, 0xc6, 0xcc, 0xf8, 0xf0, 0xd8, 0xcc, 0xc6, 0xc0, 0xc0, 0xc0, 0xc0}, 
+	{0x00, 0x00, 0x7e, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x78}, 
+	{0x00, 0x00, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xfe, 0x00, 0x00, 0x00, 0x00}, 
+	{0x00, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xfc, 0x00, 0x00, 0x00, 0x00}, 
+	{0x00, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00}, 
+	{0xc0, 0xc0, 0xc0, 0xfe, 0xc3, 0xc3, 0xc3, 0xc3, 0xfe, 0x00, 0x00, 0x00, 0x00}, 
+	{0x03, 0x03, 0x03, 0x7f, 0xc3, 0xc3, 0xc3, 0xc3, 0x7f, 0x00, 0x00, 0x00, 0x00}, 
+	{0x00, 0x00, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xe0, 0xfe, 0x00, 0x00, 0x00, 0x00}, 
+	{0x00, 0x00, 0xfe, 0x03, 0x03, 0x7e, 0xc0, 0xc0, 0x7f, 0x00, 0x00, 0x00, 0x00}, 
+	{0x00, 0x00, 0x1c, 0x36, 0x30, 0x30, 0x30, 0x30, 0xfc, 0x30, 0x30, 0x30, 0x00}, 
+	{0x00, 0x00, 0x7e, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00}, 
+	{0x00, 0x00, 0x18, 0x3c, 0x3c, 0x66, 0x66, 0xc3, 0xc3, 0x00, 0x00, 0x00, 0x00}, 
+	{0x00, 0x00, 0xc3, 0xe7, 0xff, 0xdb, 0xc3, 0xc3, 0xc3, 0x00, 0x00, 0x00, 0x00}, 
+	{0x00, 0x00, 0xc3, 0x66, 0x3c, 0x18, 0x3c, 0x66, 0xc3, 0x00, 0x00, 0x00, 0x00}, 
+	{0xc0, 0x60, 0x60, 0x30, 0x18, 0x3c, 0x66, 0x66, 0xc3, 0x00, 0x00, 0x00, 0x00}, 
+	{0x00, 0x00, 0xff, 0x60, 0x30, 0x18, 0x0c, 0x06, 0xff, 0x00, 0x00, 0x00, 0x00}, 
+	{0x00, 0x00, 0x0f, 0x18, 0x18, 0x18, 0x38, 0xf0, 0x38, 0x18, 0x18, 0x18, 0x0f}, 
+	{0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18}, 
+	{0x00, 0x00, 0xf0, 0x18, 0x18, 0x18, 0x1c, 0x0f, 0x1c, 0x18, 0x18, 0x18, 0xf0}, 
+	{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x8f, 0xf1, 0x60, 0x00, 0x00, 0x00} 
 };
 
 static const char *s_vertexShaderSrc = 
 	"uniform vec2 charSize;\n"
-	"in vec2 rawpos;\n"
-	"in vec2 tex0;\n"
-	"out vec2 uv0;\n"
+	"ATTRIN vec2 rawpos;\n"
+	"ATTRIN vec2 tex0;\n"
+	"VARYOUT vec2 uv0;\n"
 	"void main(void) {\n"
 	"	gl_Position = vec4(rawpos,0,1);\n"
 	"	uv0 = tex0 * charSize;\n"
@@ -139,8 +126,8 @@ static const char *s_vertexShaderSrc =
 static const char *s_fragmentShaderSrc =
 	"uniform sampler2D samp8;\n"
 	"uniform vec4 color;\n"
-	"in vec2 uv0;\n"
-	"out vec4 ocol0;\n"
+	"VARYIN vec2 uv0;\n"
+	"COLOROUT(ocol0)\n"
 	"void main(void) {\n"
 	"	ocol0 = texture(samp8,uv0) * color;\n"
 	"}\n";
@@ -166,16 +153,16 @@ RasterFont::RasterFont()
 	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
 	glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, char_width*char_count, char_height, 0, GL_RGBA, GL_UNSIGNED_BYTE, texture_data);
 	delete [] texture_data;
-	
+
 	// generate shader
 	ProgramShaderCache::CompileShader(s_shader, s_vertexShaderSrc, s_fragmentShaderSrc);
-	
+
 	// bound uniforms
 	glUniform2f(glGetUniformLocation(s_shader.glprogid,"charSize"), 1.0f / GLfloat(char_count), 1.0f);
 	uniform_color_id = glGetUniformLocation(s_shader.glprogid,"color");
 	glUniform4f(uniform_color_id, 1.0f, 1.0f, 1.0f, 1.0f);
 	cached_color = -1;
-	
+
 	// generate VBO & VAO
 	glGenBuffers(1, &VBO);
 	glGenVertexArrays(1, &VAO);
@@ -199,71 +186,71 @@ void RasterFont::printMultilineText(const char *text, double start_x, double sta
 {
 	size_t length = strlen(text);
 	GLfloat *vertices = new GLfloat[length*6*4];
-	
+
 	int usage = 0;
 	GLfloat delta_x = GLfloat(2*char_width)/GLfloat(bbWidth);
 	GLfloat delta_y = GLfloat(2*char_height)/GLfloat(bbHeight);
 	GLfloat border_x = 2.0/GLfloat(bbWidth);
 	GLfloat border_y = 4.0/GLfloat(bbHeight);
-	
+
 	GLfloat x = GLfloat(start_x);
 	GLfloat y = GLfloat(start_y);
-	
+
 	for(size_t i=0; i<length; i++) {
 		u8 c = text[i];
-		
+
 		if(c == '\n') {
 			x = start_x;
 			y -= delta_y + border_y;
 			continue;
 		}
-		
-		// do not print spaces, they can be skipped easyly
+
+		// do not print spaces, they can be skipped easily
 		if(c == ' ') {
 			x += delta_x + border_x;
 			continue;
 		}
-		
+
 		if(c < char_offset || c >= char_count+char_offset) continue;
-		
+
 		vertices[usage++] = x;
 		vertices[usage++] = y;
 		vertices[usage++] = GLfloat(c-char_offset);
 		vertices[usage++] = 0.0f;
-		
+
 		vertices[usage++] = x+delta_x;
 		vertices[usage++] = y;
 		vertices[usage++] = GLfloat(c-char_offset+1);
 		vertices[usage++] = 0.0f;
-		
+
 		vertices[usage++] = x+delta_x;
 		vertices[usage++] = y+delta_y;
 		vertices[usage++] = GLfloat(c-char_offset+1);
 		vertices[usage++] = 1.0f;
-		
+
 		vertices[usage++] = x;
 		vertices[usage++] = y;
 		vertices[usage++] = GLfloat(c-char_offset);
 		vertices[usage++] = 0.0f;
-		
+
 		vertices[usage++] = x+delta_x;
 		vertices[usage++] = y+delta_y;
 		vertices[usage++] = GLfloat(c-char_offset+1);
 		vertices[usage++] = 1.0f;
-		
+
 		vertices[usage++] = x;
 		vertices[usage++] = y+delta_y;
 		vertices[usage++] = GLfloat(c-char_offset);
 		vertices[usage++] = 1.0f;
-		
+
 		x += delta_x + border_x;
 	}
-	
+
 	if(!usage) {
 		delete [] vertices;
 		return;
 	}
-	
+
 	glBindVertexArray(VAO);
 	glBindBuffer(GL_ARRAY_BUFFER, VBO);
 	glBufferData(GL_ARRAY_BUFFER, usage*sizeof(GLfloat), vertices, GL_STREAM_DRAW);
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/RasterFont.h b/Source/Plugins/Plugin_VideoOGL/Src/RasterFont.h
index 3715a91213..97ad877082 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/RasterFont.h
+++ b/Source/Plugins/Plugin_VideoOGL/Src/RasterFont.h
@@ -1,30 +1,17 @@
-// Copyright (C) 2003 Dolphin Project.
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, version 2.0.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License 2.0 for more details.
-
-// A copy of the GPL 2.0 should have been included with the program.
-// If not, see http://www.gnu.org/licenses/
-
-// Official SVN repository and contact information can be found at
-// http://code.google.com/p/dolphin-emu/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _RASTERFONT_H_
 #define _RASTERFONT_H_
 
 namespace OGL {
-	
+
 class RasterFont {
 public:
-    RasterFont();
-    ~RasterFont(void);
-    static int debug;
+	RasterFont();
+	~RasterFont(void);
+	static int debug;
 
 	void printMultilineText(const char *text, double x, double y, double z, int bbWidth, int bbHeight, u32 color);
 private:
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
index 97015db667..60b3f38079 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "Globals.h"
 #include "Thread.h"
@@ -81,6 +68,10 @@
 #include <wx/image.h>
 #endif
 
+// glew1.8 doesn't define KHR_debug
+#ifndef GL_DEBUG_OUTPUT
+#define GL_DEBUG_OUTPUT 0x92E0
+#endif
 
 
 void VideoConfig::UpdateProjectionHack()
@@ -136,6 +127,8 @@ static int s_LastMultisampleMode = 0;
 
 static u32 s_blendMode;
 
+static bool s_vsync;
+
 #if defined(HAVE_WX) && HAVE_WX
 static std::thread scrshotThread;
 #endif
@@ -179,7 +172,7 @@ int GetNumMSAASamples(int MSAAMode)
 	
 	if(samples <= g_ogl_config.max_samples) return samples;
 	
-	ERROR_LOG(VIDEO, "MSAA Bug: %d samples selected, but only %d supported by gpu.", samples, g_ogl_config.max_samples);
+	ERROR_LOG(VIDEO, "MSAA Bug: %d samples selected, but only %d supported by GPU.", samples, g_ogl_config.max_samples);
 	return g_ogl_config.max_samples;
 }
 
@@ -203,7 +196,7 @@ int GetNumMSAACoverageSamples(int MSAAMode)
 	}
 	if(g_ogl_config.bSupportCoverageMSAA || samples == 0) return samples;
 	
-	ERROR_LOG(VIDEO, "MSAA Bug: CSAA selected, but not supported by gpu.");
+	ERROR_LOG(VIDEO, "MSAA Bug: CSAA selected, but not supported by GPU.");
 	return 0;
 }
 
@@ -213,13 +206,47 @@ void ApplySSAASettings() {
 			glEnable(GL_SAMPLE_SHADING_ARB);
 			glMinSampleShadingARB(s_MSAASamples);
 		} else {
-			ERROR_LOG(VIDEO, "MSAA Bug: SSAA selected, but not supported by gpu.");
+			ERROR_LOG(VIDEO, "MSAA Bug: SSAA selected, but not supported by GPU.");
 		}
 	} else if(g_ogl_config.bSupportSampleShading) {
 		glDisable(GL_SAMPLE_SHADING_ARB);
 	}
 }
 
+void ErrorCallback( GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const char* message, void* userParam)
+{
+	const char *s_source;
+	const char *s_type;
+	
+	switch(source)
+	{
+		case GL_DEBUG_SOURCE_API_ARB:             s_source = "API"; break;
+		case GL_DEBUG_SOURCE_WINDOW_SYSTEM_ARB:   s_source = "Window System"; break;
+		case GL_DEBUG_SOURCE_SHADER_COMPILER_ARB: s_source = "Shader Compiler"; break;
+		case GL_DEBUG_SOURCE_THIRD_PARTY_ARB:     s_source = "Third Party"; break;
+		case GL_DEBUG_SOURCE_APPLICATION_ARB:     s_source = "Application"; break;
+		case GL_DEBUG_SOURCE_OTHER_ARB:           s_source = "Other"; break;
+		default:                                  s_source = "Unknown"; break;
+	}
+	switch(type)
+	{
+		case GL_DEBUG_TYPE_ERROR_ARB:               s_type = "Error"; break;
+		case GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR_ARB: s_type = "Deprecated"; break;
+		case GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR_ARB:  s_type = "Undefined"; break;
+		case GL_DEBUG_TYPE_PORTABILITY_ARB:         s_type = "Portability"; break;
+		case GL_DEBUG_TYPE_PERFORMANCE_ARB:         s_type = "Performance"; break;
+		case GL_DEBUG_TYPE_OTHER_ARB:               s_type = "Other"; break;
+		default:                                    s_type = "Unknown"; break;
+	}
+	switch(severity)
+	{
+		case GL_DEBUG_SEVERITY_HIGH_ARB:   ERROR_LOG(VIDEO, "id: %x, source: %s, type: %s - %s", id, s_source, s_type, message); break;
+		case GL_DEBUG_SEVERITY_MEDIUM_ARB: WARN_LOG(VIDEO, "id: %x, source: %s, type: %s - %s", id, s_source, s_type, message); break;
+		case GL_DEBUG_SEVERITY_LOW_ARB:    WARN_LOG(VIDEO, "id: %x, source: %s, type: %s - %s", id, s_source, s_type, message); break;
+		default:                           ERROR_LOG(VIDEO, "id: %x, source: %s, type: %s - %s", id, s_source, s_type, message); break;
+	}
+}
+
 // Init functions
 Renderer::Renderer()
 {
@@ -251,6 +278,15 @@ Renderer::Renderer()
 		ERROR_LOG(VIDEO, "glewInit() failed! Does your video card support OpenGL 2.x?");
 		return;	// TODO: fail
 	}
+	
+#if defined(_DEBUG) || defined(DEBUGFAST)
+	if (GLEW_ARB_debug_output)
+	{
+		glDebugMessageControlARB(GL_DONT_CARE, GL_DONT_CARE, GL_DONT_CARE, 0, NULL, true);
+		glDebugMessageCallbackARB( ErrorCallback, NULL );
+		glEnable( GL_DEBUG_OUTPUT );
+	}
+#endif
 
 	if (!GLEW_EXT_secondary_color)
 	{
@@ -261,7 +297,7 @@ Renderer::Renderer()
 
 	if (!GLEW_ARB_framebuffer_object)
 	{
-		ERROR_LOG(VIDEO, "GPU: ERROR: Need GL_ARB_framebufer_object for multiple render targets.\n"
+		ERROR_LOG(VIDEO, "GPU: ERROR: Need GL_ARB_framebuffer_object for multiple render targets.\n"
 				"GPU: Does your video card support OpenGL 3.0?");
 		bSuccess = false;
 	}
@@ -293,6 +329,7 @@ Renderer::Renderer()
 	
 	g_Config.backend_info.bSupportsDualSourceBlend = GLEW_ARB_blend_func_extended;
 	g_Config.backend_info.bSupportsGLSLUBO = GLEW_ARB_uniform_buffer_object;
+	g_Config.backend_info.bSupportsPrimitiveRestart = GLEW_VERSION_3_1 || GLEW_NV_primitive_restart;
 	
 	g_ogl_config.bSupportsGLSLCache = GLEW_ARB_get_program_binary;
 	g_ogl_config.bSupportsGLPinnedMemory = GLEW_AMD_pinned_memory;
@@ -300,12 +337,37 @@ Renderer::Renderer()
 	g_ogl_config.bSupportsGLBaseVertex = GLEW_ARB_draw_elements_base_vertex;
 	g_ogl_config.bSupportCoverageMSAA = GLEW_NV_framebuffer_multisample_coverage;
 	g_ogl_config.bSupportSampleShading = GLEW_ARB_sample_shading;
+	g_ogl_config.bSupportOGL31 = GLEW_VERSION_3_1;
 	
 	g_ogl_config.gl_vendor = (const char*)glGetString(GL_VENDOR);
 	g_ogl_config.gl_renderer = (const char*)glGetString(GL_RENDERER);
 	g_ogl_config.gl_version = (const char*)glGetString(GL_VERSION);
+	g_ogl_config.glsl_version = (const char*)glGetString(GL_SHADING_LANGUAGE_VERSION);
+	
+	if(strstr(g_ogl_config.glsl_version, "1.00") || strstr(g_ogl_config.glsl_version, "1.10"))
+	{
+		ERROR_LOG(VIDEO, "GPU: OGL ERROR: Need at least GLSL 1.20\n"
+				"GPU: Does your video card support OpenGL 2.1?\n"
+				"GPU: Your driver supports GLSL %s", g_ogl_config.glsl_version);
+		bSuccess = false;
+	}
+	else if(strstr(g_ogl_config.glsl_version, "1.20"))
+	{
+		g_ogl_config.eSupportedGLSLVersion = GLSL_120;
+		g_Config.backend_info.bSupportsDualSourceBlend = false; //TODO: implement dual source blend
+	}
+	else if(strstr(g_ogl_config.glsl_version, "1.30"))
+	{
+		g_ogl_config.eSupportedGLSLVersion = GLSL_130;
+	}
+	else
+	{
+		g_ogl_config.eSupportedGLSLVersion = GLSL_140;
+	}
 	
 	glGetIntegerv(GL_MAX_SAMPLES, &g_ogl_config.max_samples);
+	if(g_ogl_config.max_samples < 1) 
+		g_ogl_config.max_samples = 1;
 	
 	if(g_Config.backend_info.bSupportsGLSLUBO && (
 		// hd3000 get corruption, hd4000 also and a big slowdown
@@ -318,7 +380,7 @@ Renderer::Renderer()
 			!strcmp(g_ogl_config.gl_version, "3.0 Mesa 9.1.1") )
 	)) {
 		g_Config.backend_info.bSupportsGLSLUBO = false;
-		ERROR_LOG(VIDEO, "buggy driver detected. Disable UBO");
+		ERROR_LOG(VIDEO, "Buggy driver detected. Disable UBO");
 	}
 	
 	UpdateActiveConfig();
@@ -328,29 +390,30 @@ Renderer::Renderer()
 				g_ogl_config.gl_renderer,
 				g_ogl_config.gl_version).c_str(), 5000);
 	
-	OSD::AddMessage(StringFromFormat("Missing Extensions: %s%s%s%s%s%s%s%s",
+	WARN_LOG(VIDEO,"Missing OGL Extensions: %s%s%s%s%s%s%s%s%s",
 			g_ActiveConfig.backend_info.bSupportsDualSourceBlend ? "" : "DualSourceBlend ",
 			g_ActiveConfig.backend_info.bSupportsGLSLUBO ? "" : "UniformBuffer ",
+			g_ActiveConfig.backend_info.bSupportsPrimitiveRestart ? "" : "PrimitiveRestart ",
 			g_ogl_config.bSupportsGLPinnedMemory ? "" : "PinnedMemory ",
 			g_ogl_config.bSupportsGLSLCache ? "" : "ShaderCache ",
 			g_ogl_config.bSupportsGLBaseVertex ? "" : "BaseVertex ",
 			g_ogl_config.bSupportsGLSync ? "" : "Sync ",
 			g_ogl_config.bSupportCoverageMSAA ? "" : "CSAA ",
 			g_ogl_config.bSupportSampleShading ? "" : "SSAA "
-			).c_str(), 5000);
+			);
 			
 	s_LastMultisampleMode = g_ActiveConfig.iMultisampleMode;
 	s_MSAASamples = GetNumMSAASamples(s_LastMultisampleMode);
 	s_MSAACoverageSamples = GetNumMSAACoverageSamples(s_LastMultisampleMode);
 	ApplySSAASettings();
 	
-	// Decide frambuffer size
+	// Decide framebuffer size
 	s_backbuffer_width = (int)GLInterface->GetBackBufferWidth();
 	s_backbuffer_height = (int)GLInterface->GetBackBufferHeight();
 
 	// Handle VSync on/off
-	int swapInterval = g_ActiveConfig.IsVSync() ? 1 : 0;
-	GLInterface->SwapInterval(swapInterval);
+	s_vsync = g_ActiveConfig.IsVSync();
+	GLInterface->SwapInterval(s_vsync);
 
 	// check the max texture width and height
 	GLint max_texture_size;
@@ -406,6 +469,20 @@ Renderer::Renderer()
 	glScissor(0, 0, GetTargetWidth(), GetTargetHeight());
 	glBlendColor(0, 0, 0, 0.5f);
 	glClearDepth(1.0f);
+	
+	if(g_ActiveConfig.backend_info.bSupportsPrimitiveRestart)
+	{
+		if(g_ogl_config.bSupportOGL31)
+		{
+			glEnable(GL_PRIMITIVE_RESTART);
+			glPrimitiveRestartIndex(65535);
+		}
+		else
+		{
+			glEnableClientState(GL_PRIMITIVE_RESTART_NV);
+			glPrimitiveRestartIndexNV(65535);
+		}
+	}
 
 	UpdateActiveConfig();
 }
@@ -440,15 +517,15 @@ void Renderer::Init()
 	s_pfont = new RasterFont();
 	
 	ProgramShaderCache::CompileShader(s_ShowEFBCopyRegions, 
-		"in vec2 rawpos;\n"
-		"in vec3 color0;\n"
-		"out vec4 c;\n"
+		"ATTRIN vec2 rawpos;\n"
+		"ATTRIN vec3 color0;\n"
+		"VARYOUT vec4 c;\n"
 		"void main(void) {\n"
 		"	gl_Position = vec4(rawpos,0,1);\n"
 		"	c = vec4(color0, 1.0);\n"
 		"}\n",
-		"in vec4 c;\n"
-		"out vec4 ocol0;\n"
+		"VARYIN vec4 c;\n"
+		"COLOROUT(ocol0)\n"
 		"void main(void) {\n"
 		"	ocol0 = c;\n"
 		"}\n");
@@ -951,8 +1028,8 @@ void Renderer::SetBlendMode(bool forceUpdate)
 		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
+		(useDualSource)  ? GL_SRC1_ALPHA : (GLenum)GL_SRC_ALPHA,
+		(useDualSource)  ? GL_ONE_MINUS_SRC1_ALPHA : (GLenum)GL_ONE_MINUS_SRC_ALPHA,
 		(target_has_alpha) ? GL_DST_ALPHA : (GLenum)GL_ONE,
 		(target_has_alpha) ? GL_ONE_MINUS_DST_ALPHA : (GLenum)GL_ZERO
 	};
@@ -962,8 +1039,8 @@ void Renderer::SetBlendMode(bool forceUpdate)
 		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
+		(useDualSource)  ? GL_SRC1_ALPHA : (GLenum)GL_SRC_ALPHA,
+		(useDualSource)  ? GL_ONE_MINUS_SRC1_ALPHA : (GLenum)GL_ONE_MINUS_SRC_ALPHA,
 		(target_has_alpha) ? GL_DST_ALPHA : (GLenum)GL_ONE,
 		(target_has_alpha) ? GL_ONE_MINUS_DST_ALPHA : (GLenum)GL_ZERO
 	};
@@ -1004,30 +1081,32 @@ void Renderer::SetBlendMode(bool forceUpdate)
 
 	if (changes & 0x1FA)
 	{
-		GLenum srcFactor = glSrcFactors[(newval >> 3) & 7];
-		GLenum dstFactor = glDestFactors[(newval >> 6) & 7];
-		GLenum srcFactorAlpha = srcFactor;
-		GLenum dstFactorAlpha = dstFactor;
+		u32 srcidx = (newval >> 3) & 7;
+		u32 dstidx = (newval >> 6) & 7;
+		GLenum srcFactor = glSrcFactors[srcidx];
+		GLenum dstFactor = glDestFactors[dstidx];
+
+		// adjust alpha factors
 		if (useDualSource)
 		{
-			srcFactorAlpha = GL_ONE;
-			dstFactorAlpha = GL_ZERO;
+			srcidx = GX_BL_ONE;
+			dstidx = GX_BL_ZERO;
+		}	
+		else
+		{
+			// we can't use GL_DST_COLOR or GL_ONE_MINUS_DST_COLOR for source in alpha channel so use their alpha equivalent instead
+			if (srcidx == GX_BL_DSTCLR) srcidx = GX_BL_DSTALPHA;
+			if (srcidx == GX_BL_INVDSTCLR) srcidx = GX_BL_INVDSTALPHA;
 
-			if (srcFactor == GL_SRC_ALPHA)
-				srcFactor = GL_SRC1_ALPHA;
-			else if (srcFactor == GL_ONE_MINUS_SRC_ALPHA)
-				srcFactor = GL_ONE_MINUS_SRC1_ALPHA;
-
-			if (dstFactor == GL_SRC_ALPHA)
-				dstFactor = GL_SRC1_ALPHA;
-			else if (dstFactor == GL_ONE_MINUS_SRC_ALPHA)
-				dstFactor = GL_ONE_MINUS_SRC1_ALPHA;
-		}
-		
+			// we can't use GL_SRC_COLOR or GL_ONE_MINUS_SRC_COLOR for destination in alpha channel so use their alpha equivalent instead
+			if (dstidx == GX_BL_SRCCLR) dstidx = GX_BL_SRCALPHA;
+			if (dstidx == GX_BL_INVSRCCLR) dstidx = GX_BL_INVSRCALPHA;
+		}		
+		GLenum srcFactorAlpha = glSrcFactors[srcidx];
+		GLenum dstFactorAlpha = glDestFactors[dstidx];
 		// blend RGB change
 		glBlendFuncSeparate(srcFactor, dstFactor, srcFactorAlpha, dstFactorAlpha);
 	}
-
 	s_blendMode = newval;
 }
 
@@ -1321,7 +1400,9 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons
 	DrawDebugText();
 
 	GL_REPORT_ERRORD();
-
+	
+	// Do our OSD callbacks	
+	OSD::DoCallbacks(OSD::OSD_ONFRAME);
 	OSD::DrawMessages();
 	GL_REPORT_ERRORD();
 
@@ -1339,7 +1420,11 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons
 
 	GL_REPORT_ERRORD();
 
-	GLInterface->SwapInterval(g_ActiveConfig.IsVSync() ? 1 : 0);
+	if(s_vsync != g_ActiveConfig.IsVSync())
+	{
+		s_vsync = g_ActiveConfig.IsVSync();
+		GLInterface->SwapInterval(s_vsync);
+	}
 
 	// Clean out old stuff from caches. It's not worth it to clean out the shader caches.
 	DLCache::ProgressiveCleanup();
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Render.h b/Source/Plugins/Plugin_VideoOGL/Src/Render.h
index d5510753c2..61e820dad4 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/Render.h
+++ b/Source/Plugins/Plugin_VideoOGL/Src/Render.h
@@ -9,6 +9,12 @@ namespace OGL
 
 void ClearEFBCache();
 
+enum GLSL_VERSION {
+	GLSL_120,
+	GLSL_130,
+	GLSL_140 // and above
+};
+
 // ogl-only config, so not in VideoConfig.h
 extern struct VideoConfig {
 	bool bSupportsGLSLCache;
@@ -17,10 +23,13 @@ extern struct VideoConfig {
 	bool bSupportsGLBaseVertex;
 	bool bSupportCoverageMSAA;
 	bool bSupportSampleShading;
+	GLSL_VERSION eSupportedGLSLVersion;
+	bool bSupportOGL31;
 	
 	const char *gl_vendor;
 	const char *gl_renderer;
 	const char* gl_version;
+	const char* glsl_version;
 	
 	s32 max_samples;
 } g_ogl_config;
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/SamplerCache.cpp b/Source/Plugins/Plugin_VideoOGL/Src/SamplerCache.cpp
index b007f89796..87aac2da0c 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/SamplerCache.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/SamplerCache.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "SamplerCache.h"
 
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/StreamBuffer.cpp b/Source/Plugins/Plugin_VideoOGL/Src/StreamBuffer.cpp
index 24b6b7d9b4..7afc24950c 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/StreamBuffer.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/StreamBuffer.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "Globals.h"
 #include "GLUtil.h"
@@ -141,7 +128,7 @@ size_t StreamBuffer::Upload ( u8* data, size_t size )
 			memcpy(pointer, data, size);
 			glUnmapBuffer(m_buffertype);
 		} else {
-			ERROR_LOG(VIDEO, "buffer mapping failed");
+			ERROR_LOG(VIDEO, "Buffer mapping failed");
 		}
 		break;
 	case PINNED_MEMORY:
@@ -192,7 +179,7 @@ void StreamBuffer::Init()
 		
 		// on error, switch to another backend. some old catalyst seems to have broken pinned memory support
 		if(glGetError() != GL_NO_ERROR) {
-			ERROR_LOG(VIDEO, "pinned memory detected, but not working. Please report this: %s, %s, %s", g_ogl_config.gl_vendor, g_ogl_config.gl_renderer, g_ogl_config.gl_version);
+			ERROR_LOG(VIDEO, "Pinned memory detected, but not working. Please report this: %s, %s, %s", g_ogl_config.gl_vendor, g_ogl_config.gl_renderer, g_ogl_config.gl_version);
 			Shutdown();
 			m_uploadtype = MAP_AND_SYNC;
 			Init();
@@ -204,7 +191,7 @@ void StreamBuffer::Init()
 		pointer = (u8*)glMapBuffer(m_buffertype, GL_WRITE_ONLY);
 		glUnmapBuffer(m_buffertype);
 		if(!pointer)
-			ERROR_LOG(VIDEO, "buffer allocation failed");
+			ERROR_LOG(VIDEO, "Buffer allocation failed");
 		
 	case STREAM_DETECT:
 	case DETECT_MASK: // Just to shutup warnings
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/StreamBuffer.h b/Source/Plugins/Plugin_VideoOGL/Src/StreamBuffer.h
index fa3fd539ea..089639d01b 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/StreamBuffer.h
+++ b/Source/Plugins/Plugin_VideoOGL/Src/StreamBuffer.h
@@ -1,20 +1,6 @@
-// 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/
-
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef STREAMBUFFER_H
 #define STREAMBUFFER_H
@@ -32,7 +18,7 @@
 namespace OGL
 {
 enum StreamType {
-	DETECT_MASK = 0x1F,
+	DETECT_MASK = 0x3F,
 	STREAM_DETECT = (1 << 0),
 	MAP_AND_ORPHAN = (1 << 1),
 	MAP_AND_SYNC = (1 << 2),
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp b/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp
index b0bc682f29..c53bb2485a 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include <vector>
 #include <cmath>
@@ -74,8 +61,6 @@ struct VBOCache {
 };
 static std::map<u64,VBOCache> s_VBO;
 
-static u32 s_TempFramebuffer = 0;
-
 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);
@@ -86,7 +71,7 @@ bool SaveTexture(const char* filename, u32 textarget, u32 tex, int virtual_width
 	glGetTexImage(textarget, level, GL_BGRA, GL_UNSIGNED_BYTE, &data[0]);
 	glBindTexture(textarget, 0);
 	TextureCache::SetStage();
-	
+
 	const GLenum err = GL_REPORT_ERROR();
 	if (GL_NO_ERROR != err)
 	{
@@ -94,7 +79,7 @@ bool SaveTexture(const char* filename, u32 textarget, u32 tex, int virtual_width
 		return false;
 	}
 
-    return SaveTGA(filename, width, height, &data[0]);
+	return SaveTGA(filename, width, height, &data[0]);
 }
 
 TextureCache::TCacheEntry::~TCacheEntry()
@@ -107,12 +92,20 @@ TextureCache::TCacheEntry::~TCacheEntry()
 		glDeleteTextures(1, &texture);
 		texture = 0;
 	}
+
+	if (framebuffer)
+	{
+		glDeleteFramebuffers(1, &framebuffer);
+		framebuffer = 0;
+	}
 }
 
 TextureCache::TCacheEntry::TCacheEntry()
 {
 	glGenTextures(1, &texture);
 	GL_REPORT_ERRORD();
+
+	framebuffer = 0;
 }
 
 void TextureCache::TCacheEntry::Bind(unsigned int stage)
@@ -219,13 +212,13 @@ void TextureCache::TCacheEntry::Load(unsigned int width, unsigned int height,
 		glActiveTexture(GL_TEXTURE0 + s_NextStage);
 		s_ActiveTexture = s_NextStage;
 	}
-	
+
 	if (s_Textures[s_NextStage] != texture)
 	{
 		glBindTexture(GL_TEXTURE_2D, texture);
 		s_Textures[s_NextStage] = texture;
 	}
-	
+
 	// TODO: sloppy, just do this on creation?
 	if (level == 0)
 	{
@@ -234,7 +227,7 @@ void TextureCache::TCacheEntry::Load(unsigned int width, unsigned int height,
 
 	if (pcfmt != PC_TEX_FMT_DXT1)
 	{
-	    if (expanded_width != width)
+		if (expanded_width != width)
 			glPixelStorei(GL_UNPACK_ROW_LENGTH, expanded_width);
 
 		glTexImage2D(GL_TEXTURE_2D, level, gl_iformat, width, height, 0, gl_format, gl_type, temp);
@@ -263,16 +256,20 @@ TextureCache::TCacheEntryBase* TextureCache::CreateRenderTargetTexture(
 		gl_format = GL_RGBA,
 		gl_iformat = GL_RGBA,
 		gl_type = GL_UNSIGNED_BYTE;
-		
+
 	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, 0);
 	entry->m_tex_levels = 1;
 
 	glTexImage2D(GL_TEXTURE_2D, 0, gl_iformat, scaled_tex_w, scaled_tex_h, 0, gl_format, gl_type, NULL);
-	
 	glBindTexture(GL_TEXTURE_2D, 0);
 	
+	glGenFramebuffers(1, &entry->framebuffer);
+	FramebufferManager::SetFramebuffer(entry->framebuffer);
+	glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, entry->texture, 0);
+	GL_REPORT_FBO_ERROR();
+
 	SetStage();
-	
+
 	GL_REPORT_ERRORD();
 
 	return entry;
@@ -284,25 +281,20 @@ void TextureCache::TCacheEntry::FromRenderTarget(u32 dstAddr, unsigned int dstFo
 	const float *colmat)
 {
 	g_renderer->ResetAPIState(); // reset any game specific settings
-	
+
 	// Make sure to resolve anything we need to read from.
 	const GLuint read_texture = (srcFormat == PIXELFMT_Z24) ?
 		FramebufferManager::ResolveAndGetDepthTarget(srcRect) :
 		FramebufferManager::ResolveAndGetRenderTarget(srcRect);
 
-    GL_REPORT_ERRORD();
+	GL_REPORT_ERRORD();
 
 	if (type != TCET_EC_DYNAMIC || g_ActiveConfig.bCopyEFBToTexture)
 	{
-		if (s_TempFramebuffer == 0)
-			glGenFramebuffers(1, (GLuint*)&s_TempFramebuffer);
+		FramebufferManager::SetFramebuffer(framebuffer);
 
-		FramebufferManager::SetFramebuffer(s_TempFramebuffer);
-		// Bind texture to temporary framebuffer
-		glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, texture, 0);
-		GL_REPORT_FBO_ERROR();
 		GL_REPORT_ERRORD();
-		
+
 		glActiveTexture(GL_TEXTURE0+9);
 		glBindTexture(GL_TEXTURE_RECTANGLE, read_texture);
 
@@ -323,11 +315,11 @@ void TextureCache::TCacheEntry::FromRenderTarget(u32 dstAddr, unsigned int dstFo
 
 		TargetRectangle targetSource = g_renderer->ConvertEFBRectangle(srcRect);
 		GL_REPORT_ERRORD();
-		
+
 		// should be unique enough, if not, vbo will "only" be uploaded to much
 		u64 targetSourceHash = u64(targetSource.left)<<48 | u64(targetSource.top)<<32 | u64(targetSource.right)<<16 | u64(targetSource.bottom);
 		std::map<u64, VBOCache>::iterator vbo_it = s_VBO.find(targetSourceHash);
-		
+
 		if(vbo_it == s_VBO.end()) {
 			VBOCache item;
 			item.targetSource.bottom = -1;
@@ -336,15 +328,15 @@ void TextureCache::TCacheEntry::FromRenderTarget(u32 dstAddr, unsigned int dstFo
 			item.targetSource.right = -1;
 			glGenBuffers(1, &item.vbo);
 			glGenVertexArrays(1, &item.vao);
-			
+
 			glBindBuffer(GL_ARRAY_BUFFER, item.vbo);
 			glBindVertexArray(item.vao);
-			
+
 			glEnableVertexAttribArray(SHADER_POSITION_ATTRIB);
 			glVertexAttribPointer(SHADER_POSITION_ATTRIB, 2, GL_FLOAT, 0, sizeof(GLfloat)*4, (GLfloat*)NULL);
 			glEnableVertexAttribArray(SHADER_TEXTURE0_ATTRIB);
 			glVertexAttribPointer(SHADER_TEXTURE0_ATTRIB, 2, GL_FLOAT, 0, sizeof(GLfloat)*4, (GLfloat*)NULL+2);
-			
+
 			vbo_it = s_VBO.insert(std::pair<u64,VBOCache>(targetSourceHash, item)).first;
 		}
 		if(!(vbo_it->second.targetSource == targetSource)) {
@@ -353,27 +345,24 @@ void TextureCache::TCacheEntry::FromRenderTarget(u32 dstAddr, unsigned int dstFo
 				(GLfloat)targetSource.left, (GLfloat)targetSource.bottom,
 				-1.f, -1.f,
 				(GLfloat)targetSource.left, (GLfloat)targetSource.top,
-				1.f, -1.f,
-				(GLfloat)targetSource.right, (GLfloat)targetSource.top,
 				1.f, 1.f,
-				(GLfloat)targetSource.right, (GLfloat)targetSource.bottom
+				(GLfloat)targetSource.right, (GLfloat)targetSource.bottom,
+				1.f, -1.f,
+				(GLfloat)targetSource.right, (GLfloat)targetSource.top
 			};
-			
+
 			glBindBuffer(GL_ARRAY_BUFFER, vbo_it->second.vbo);
 			glBufferData(GL_ARRAY_BUFFER, 4*4*sizeof(GLfloat), vertices, GL_STREAM_DRAW);
 			
 			vbo_it->second.targetSource = targetSource;
-		} 
+		}
 
 		glBindVertexArray(vbo_it->second.vao);
-		glDrawArrays(GL_TRIANGLE_FAN, 0, 4);
+		glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
 
 		glBindTexture(GL_TEXTURE_RECTANGLE_ARB, 0);
 
 		GL_REPORT_ERRORD();
-
-		// Unbind texture from temporary framebuffer
-		glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, 0, 0);
 	}
 
 	if (false == g_ActiveConfig.bCopyEFBToTexture)
@@ -399,17 +388,17 @@ void TextureCache::TCacheEntry::FromRenderTarget(u32 dstAddr, unsigned int dstFo
 		hash = new_hash;
 	}
 
-    FramebufferManager::SetFramebuffer(0);
-    VertexShaderManager::SetViewportChanged();
+	FramebufferManager::SetFramebuffer(0);
+	VertexShaderManager::SetViewportChanged();
 
-    GL_REPORT_ERRORD();
+	GL_REPORT_ERRORD();
 
-    if (g_ActiveConfig.bDumpEFBTarget)
-    {
+	if (g_ActiveConfig.bDumpEFBTarget)
+	{
 		static int count = 0;
 		SaveTexture(StringFromFormat("%sefb_frame_%i.tga", File::GetUserPath(D_DUMPTEXTURES_IDX).c_str(),
 			count++).c_str(), GL_TEXTURE_2D, texture, virtual_width, virtual_height, 0);
-    }
+	}
 
 	g_renderer->RestoreAPIState();
 }
@@ -419,8 +408,8 @@ TextureCache::TextureCache()
 	const char *pColorMatrixProg = 
 		"uniform sampler2DRect samp9;\n"
 		"uniform vec4 colmat[7];\n"
-		"in vec2 uv0;\n"
-		"out vec4 ocol0;\n"
+		"VARYIN vec2 uv0;\n"
+		"COLOROUT(ocol0)\n"
 		"\n"
 		"void main(){\n"
 		"	vec4 texcol = texture2DRect(samp9, uv0);\n"
@@ -431,8 +420,8 @@ TextureCache::TextureCache()
 	const char *pDepthMatrixProg =
 		"uniform sampler2DRect samp9;\n"
 		"uniform vec4 colmat[5];\n"
-		"in vec2 uv0;\n"
-		"out vec4 ocol0;\n"
+		"VARYIN vec2 uv0;\n"
+		"COLOROUT(ocol0)\n"
 		"\n"
 		"void main(){\n"
 		"	vec4 texcol = texture2DRect(samp9, uv0);\n"
@@ -441,25 +430,24 @@ TextureCache::TextureCache()
 		"	ocol0 = texcol * mat4(colmat[0], colmat[1], colmat[2], colmat[3]) + colmat[4];"
 		"}\n";
 
-	
 	const char *VProgram =
-		"in vec2 rawpos;\n"
-		"in vec2 tex0;\n"
-		"out vec2 uv0;\n"
+		"ATTRIN vec2 rawpos;\n"
+		"ATTRIN vec2 tex0;\n"
+		"VARYOUT vec2 uv0;\n"
 		"void main()\n"
 		"{\n"
 		"	uv0 = tex0;\n"
 		"	gl_Position = vec4(rawpos,0,1);\n"
 		"}\n";
-		
+
 	ProgramShaderCache::CompileShader(s_ColorMatrixProgram, VProgram, pColorMatrixProg);
 	ProgramShaderCache::CompileShader(s_DepthMatrixProgram, VProgram, pDepthMatrixProg);
-	
+
 	s_ColorMatrixUniform = glGetUniformLocation(s_ColorMatrixProgram.glprogid, "colmat");
 	s_DepthMatrixUniform = glGetUniformLocation(s_DepthMatrixProgram.glprogid, "colmat");
 	s_ColorCbufid = -1;
 	s_DepthCbufid = -1;
-	
+
 	s_ActiveTexture = -1;
 	s_NextStage = -1;
 	for(int i=0; i<8; i++)
@@ -477,12 +465,6 @@ TextureCache::~TextureCache()
 		glDeleteVertexArrays(1, &it->second.vao);
 	}
 	s_VBO.clear();
-	
-	if (s_TempFramebuffer)
-	{
-		glDeleteFramebuffers(1, (GLuint*)&s_TempFramebuffer);
-		s_TempFramebuffer = 0;
-	}
 }
 
 void TextureCache::DisableStage(unsigned int stage)
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.h b/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.h
index a41c86e0b3..137d26704b 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.h
+++ b/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _TEXTUREMNGR_H_
 #define _TEXTUREMNGR_H_
@@ -41,6 +28,7 @@ private:
 	struct TCacheEntry : TCacheEntryBase
 	{
 		GLuint texture;
+		GLuint framebuffer;
 
 		PC_TexFormat pcfmt;
 
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.cpp b/Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.cpp
index c076563310..8e8ae4b21c 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 // Fast image conversion using OpenGL shaders.
 // This kind of stuff would be a LOT nicer with OpenCL.
@@ -66,9 +53,9 @@ static int s_cached_srcWidth = 0;
 static int s_cached_srcHeight = 0;
 
 static const char *VProgram =
-	"in vec2 rawpos;\n"
-	"in vec2 tex0;\n"
-	"out vec2 uv0;\n"
+	"ATTRIN vec2 rawpos;\n"
+	"ATTRIN vec2 tex0;\n"
+	"VARYOUT vec2 uv0;\n"
 	"void main()\n"
 	"{\n"
 	"	uv0 = tex0;\n"
@@ -80,8 +67,8 @@ void CreatePrograms()
 	// Output is BGRA because that is slightly faster than RGBA.
 	const char *FProgramRgbToYuyv =
 		"uniform sampler2DRect samp9;\n"
-		"in vec2 uv0;\n"
-		"out vec4 ocol0;\n"
+		"VARYIN vec2 uv0;\n"
+		"COLOROUT(ocol0)\n"
 		"void main()\n"
 		"{\n"
 		"	vec3 c0 = texture2DRect(samp9, uv0).rgb;\n"
@@ -96,8 +83,8 @@ void CreatePrograms()
 
 	const char *FProgramYuyvToRgb =
 		"uniform sampler2DRect samp9;\n"
-		"in vec2 uv0;\n"
-		"out vec4 ocol0;\n"
+		"VARYIN vec2 uv0;\n"
+		"COLOROUT(ocol0)\n"
 		"void main()\n"
 		"{\n"
 		"	vec4 c0 = texture2DRect(samp9, uv0).rgba;\n"
@@ -111,7 +98,7 @@ void CreatePrograms()
 		"		yComp + (2.018f * uComp),\n"
 		"		1.0f);\n"
 		"}\n";
-		
+
 	ProgramShaderCache::CompileShader(s_rgbToYuyvProgram, VProgram, FProgramRgbToYuyv);
 	ProgramShaderCache::CompileShader(s_yuyvToRgbProgram, VProgram, FProgramYuyvToRgb);
 }
@@ -140,14 +127,14 @@ SHADER &GetOrCreateEncodingShader(u32 format)
 #endif
 
 		ProgramShaderCache::CompileShader(s_encodingPrograms[format], VProgram, shader);
-    }
+	}
 	return s_encodingPrograms[format];
 }
 
 void Init()
 {
 	glGenFramebuffers(1, &s_texConvFrameBuffer);
-	
+
 	glGenBuffers(1, &s_encode_VBO );
 	glGenVertexArrays(1, &s_encode_VAO );
 	glBindBuffer(GL_ARRAY_BUFFER, s_encode_VBO );
@@ -160,7 +147,7 @@ void Init()
 	s_cached_sourceRc.bottom = -1;
 	s_cached_sourceRc.left = -1;
 	s_cached_sourceRc.right = -1;
-	
+
 	glGenBuffers(1, &s_decode_VBO );
 	glGenVertexArrays(1, &s_decode_VAO );
 	glBindBuffer(GL_ARRAY_BUFFER, s_decode_VBO );
@@ -211,8 +198,8 @@ void Shutdown()
 }
 
 void EncodeToRamUsingShader(GLuint srcTexture, const TargetRectangle& sourceRc,
-					    u8* destAddr, int dstWidth, int dstHeight, int readStride,
-						   	bool toTexture, bool linearFilter)
+						u8* destAddr, int dstWidth, int dstHeight, int readStride,
+							bool toTexture, bool linearFilter)
 {
 
 
@@ -250,10 +237,10 @@ void EncodeToRamUsingShader(GLuint srcTexture, const TargetRectangle& sourceRc,
 			(float)sourceRc.left, (float)sourceRc.top,
 			-1.f, 1.f,
 			(float)sourceRc.left, (float)sourceRc.bottom,
-			1.f, 1.f,
-			(float)sourceRc.right, (float)sourceRc.bottom,
 			1.f, -1.f,
-			(float)sourceRc.right, (float)sourceRc.top
+			(float)sourceRc.right, (float)sourceRc.top,
+			1.f, 1.f,
+			(float)sourceRc.right, (float)sourceRc.bottom
 		};
 		glBindBuffer(GL_ARRAY_BUFFER, s_encode_VBO );
 		glBufferData(GL_ARRAY_BUFFER, 4*4*sizeof(GLfloat), vertices, GL_STREAM_DRAW);
@@ -262,7 +249,7 @@ void EncodeToRamUsingShader(GLuint srcTexture, const TargetRectangle& sourceRc,
 	} 
 
 	glBindVertexArray( s_encode_VAO );
-	glDrawArrays(GL_TRIANGLE_FAN, 0, 4);
+	glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
 	
 	glBindTexture(GL_TEXTURE_RECTANGLE_ARB, 0);
 	
@@ -369,7 +356,7 @@ void EncodeToRamYUYV(GLuint srcTexture, const TargetRectangle& sourceRc, u8* des
 	EncodeToRamUsingShader(srcTexture, sourceRc, destAddr, dstWidth / 2, dstHeight, 0, false, false);
 	FramebufferManager::SetFramebuffer(0);
 	VertexShaderManager::SetViewportChanged();
-    TextureCache::DisableStage(0);
+	TextureCache::DisableStage(0);
 	g_renderer->RestoreAPIState();
 	GL_REPORT_ERRORD();
 }
@@ -426,10 +413,10 @@ void DecodeToTexture(u32 xfbAddr, int srcWidth, int srcHeight, GLuint destRender
 			(float)srcFmtWidth, (float)srcHeight,
 			1.f, 1.f,
 			(float)srcFmtWidth, 0.f,
-			-1.f, 1.f,
-			0.f, 0.f,
 			-1.f, -1.f,
-			0.f, (float)srcHeight
+			0.f, (float)srcHeight,
+			-1.f, 1.f,
+			0.f, 0.f
 		};
 		
 		glBindBuffer(GL_ARRAY_BUFFER, s_decode_VBO );
@@ -440,7 +427,7 @@ void DecodeToTexture(u32 xfbAddr, int srcWidth, int srcHeight, GLuint destRender
 	}
 	
 	glBindVertexArray( s_decode_VAO );
-	glDrawArrays(GL_TRIANGLE_FAN, 0, 4);
+	glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
 	
 	GL_REPORT_ERRORD();
 
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.h b/Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.h
index b226e20180..02467197d6 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.h
+++ b/Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _TEXTURECONVERTER_H_
 #define _TEXTURECONVERTER_H_
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp b/Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp
index 5ee101e3a8..3dc8548b1d 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "Globals.h"
 
@@ -50,7 +37,7 @@ extern NativeVertexFormat *g_nativeVertexFmt;
 
 namespace OGL
 {
-//This are the initially requeted size for the buffers expresed in bytes
+//This are the initially requested size for the buffers expressed in bytes
 const u32 MAX_IBUFFER_SIZE =  2*1024*1024;
 const u32 MAX_VBUFFER_SIZE = 16*1024*1024;
 
@@ -124,10 +111,12 @@ void VertexManager::Draw(u32 stride)
 	u32 triangle_index_size = IndexGenerator::GetTriangleindexLen();
 	u32 line_index_size = IndexGenerator::GetLineindexLen();
 	u32 point_index_size = IndexGenerator::GetPointindexLen();
+	GLenum triangle_mode = g_ActiveConfig.backend_info.bSupportsPrimitiveRestart?GL_TRIANGLE_STRIP:GL_TRIANGLES;
+	
 	if(g_ogl_config.bSupportsGLBaseVertex) {
 		if (triangle_index_size > 0)
 		{
-			glDrawElementsBaseVertex(GL_TRIANGLES, triangle_index_size, GL_UNSIGNED_SHORT, (u8*)NULL+s_offset[0], s_baseVertex);
+			glDrawElementsBaseVertex(triangle_mode, triangle_index_size, GL_UNSIGNED_SHORT, (u8*)NULL+s_offset[0], s_baseVertex);
 			INCSTAT(stats.thisFrame.numIndexedDrawCalls);
 		}
 		if (line_index_size > 0)
@@ -143,7 +132,7 @@ void VertexManager::Draw(u32 stride)
 	} else {
 		if (triangle_index_size > 0)
 		{
-			glDrawElements(GL_TRIANGLES, triangle_index_size, GL_UNSIGNED_SHORT, (u8*)NULL+s_offset[0]);
+			glDrawElements(triangle_mode, triangle_index_size, GL_UNSIGNED_SHORT, (u8*)NULL+s_offset[0]);
 			INCSTAT(stats.thisFrame.numIndexedDrawCalls);
 		}
 		if (line_index_size > 0)
@@ -234,7 +223,7 @@ void VertexManager::vFlush()
 				PixelShaderManager::SetTexDims(i, tentry->native_width, tentry->native_height, 0, 0);
 			}
 			else
-				ERROR_LOG(VIDEO, "error loading texture");
+				ERROR_LOG(VIDEO, "Error loading texture");
 		}
 	}
 
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/VertexManager.h b/Source/Plugins/Plugin_VideoOGL/Src/VertexManager.h
index 6a33799d98..e31c8d48ec 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/VertexManager.h
+++ b/Source/Plugins/Plugin_VideoOGL/Src/VertexManager.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _VERTEXMANAGER_H_
 #define _VERTEXMANAGER_H_
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.cpp b/Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.cpp
index 038021c490..acf72eeeee 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include <math.h>
 
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/main.cpp b/Source/Plugins/Plugin_VideoOGL/Src/main.cpp
index ddce3bb01f..74393fe121 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/main.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/main.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 
 
@@ -96,6 +83,7 @@ Make AA apply instantly during gameplay if possible
 #include "PerfQuery.h"
 
 #include "VideoState.h"
+#include "IndexGenerator.h"
 #include "VideoBackend.h"
 #include "ConfigManager.h"
 
@@ -141,7 +129,7 @@ void InitBackendInfo()
 	g_Config.backend_info.bSupportsPixelLighting = true;
 
 	// aamodes
-	const char* caamodes[] = {"None", "2x", "4x", "8x", "8x CSAA", "8xQ CSAA", "16x CSAA", "16xQ CSAA", "4x SSAA"};
+	const char* caamodes[] = {_trans("None"), "2x", "4x", "8x", "8x CSAA", "8xQ CSAA", "16x CSAA", "16xQ CSAA", "4x SSAA"};
 	g_Config.backend_info.AAModes.assign(caamodes, caamodes + sizeof(caamodes)/sizeof(*caamodes));
 
 	// pp shaders
@@ -156,7 +144,10 @@ void VideoBackend::ShowConfig(void *_hParent)
 	diag.ShowModal();
 #endif
 }
-
+void Test(u32 Data)
+{
+	printf("Data: %d\n", Data);
+}
 bool VideoBackend::Initialize(void *&window_handle)
 {
 	InitializeShared();
@@ -174,6 +165,9 @@ bool VideoBackend::Initialize(void *&window_handle)
 	if (!GLInterface->Create(window_handle))
 		return false;
 
+	// Do our OSD callbacks	
+	OSD::DoCallbacks(OSD::OSD_INIT);
+
 	s_BackendInitialized = true;
 
 	return true;
@@ -199,6 +193,7 @@ void VideoBackend::Video_Prepare()
 	g_perf_query = new PerfQuery;
 	Fifo_Init(); // must be done before OpcodeDecoder_Init()
 	OpcodeDecoder_Init();
+	IndexGenerator::Init();
 	VertexShaderManager::Init();
 	PixelShaderManager::Init();
 	ProgramShaderCache::Init();
@@ -220,6 +215,10 @@ void VideoBackend::Video_Prepare()
 void VideoBackend::Shutdown()
 {
 	s_BackendInitialized = false;
+
+	// Do our OSD callbacks	
+	OSD::DoCallbacks(OSD::OSD_SHUTDOWN);
+
 	GLInterface->Shutdown();
 }
 
@@ -253,6 +252,7 @@ void VideoBackend::Video_Cleanup() {
 		OpcodeDecoder_Shutdown();
 		delete g_renderer;
 		g_renderer = NULL;
+		GLInterface->ClearCurrent();
 	}
 }
 
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/main.h b/Source/Plugins/Plugin_VideoOGL/Src/main.h
index 1ee2175feb..03cc6fc174 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/main.h
+++ b/Source/Plugins/Plugin_VideoOGL/Src/main.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _MAIN_H_
 #define _MAIN_H_
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/stdafx.cpp b/Source/Plugins/Plugin_VideoOGL/Src/stdafx.cpp
index 168ca738eb..7c408e10b9 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/stdafx.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/stdafx.cpp
@@ -1,18 +1,5 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "stdafx.h"
\ No newline at end of file
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/stdafx.h b/Source/Plugins/Plugin_VideoOGL/Src/stdafx.h
index 8ade6faa40..2431184aaf 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/stdafx.h
+++ b/Source/Plugins/Plugin_VideoOGL/Src/stdafx.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #pragma once
 #define _WIN32_WINNT 0x501
diff --git a/Source/Plugins/Plugin_VideoSoftware/CMakeLists.txt b/Source/Plugins/Plugin_VideoSoftware/CMakeLists.txt
index 0488f728b8..cda287f511 100644
--- a/Source/Plugins/Plugin_VideoSoftware/CMakeLists.txt
+++ b/Source/Plugins/Plugin_VideoSoftware/CMakeLists.txt
@@ -10,7 +10,6 @@ set(SRCS	Src/BPMemLoader.cpp
 			Src/OpcodeDecoder.cpp
 			Src/SWPixelEngine.cpp
 			Src/Rasterizer.cpp
-			Src/RasterFont.cpp
 			Src/SWRenderer.cpp
 			Src/SetupUnit.cpp
 			Src/SWStatistics.cpp
@@ -37,11 +36,11 @@ if(USE_EGL)
 endif()
 
 if(USE_GLES)
-	set(SRCS ${SRCS}
-			../Plugin_VideoOGL/Src/GLUtil.cpp)
+	set(SRCS ${SRCS} ../Plugin_VideoOGL/Src/GLUtil.cpp)
 	set(LIBS ${LIBS}
 		GLESv2)
 else()
+	set(SRCS ${SRCS} Src/RasterFont.cpp)
 	set(LIBS ${LIBS}
 		GLEW
 		${OPENGL_LIBRARIES})
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/BPMemLoader.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/BPMemLoader.cpp
index 0d7c77c767..6317398f39 100644
--- a/Source/Plugins/Plugin_VideoSoftware/Src/BPMemLoader.cpp
+++ b/Source/Plugins/Plugin_VideoSoftware/Src/BPMemLoader.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "VideoCommon.h"
 #include "TextureDecoder.h"
@@ -29,67 +16,67 @@
 
 void InitBPMemory()
 {
-    memset(&bpmem, 0, sizeof(bpmem));
-    bpmem.bpMask = 0xFFFFFF;
+	memset(&bpmem, 0, sizeof(bpmem));
+	bpmem.bpMask = 0xFFFFFF;
 }
 
 void SWLoadBPReg(u32 value)
 {
-    //handle the mask register
+	//handle the mask register
 	int address = value >> 24;
 	int oldval = ((u32*)&bpmem)[address];
 	int newval = (oldval & ~bpmem.bpMask) | (value & bpmem.bpMask);
 
-    ((u32*)&bpmem)[address] = newval;
+	((u32*)&bpmem)[address] = newval;
 
 	//reset the mask register
 	if (address != 0xFE)
 		bpmem.bpMask = 0xFFFFFF;
 
-    SWBPWritten(address, newval);
+	SWBPWritten(address, newval);
 }
 
 void SWBPWritten(int address, int newvalue)
 {
-    switch (address)
+	switch (address)
 	{
-    case BPMEM_SCISSORTL:
-    case BPMEM_SCISSORBR:
-    case BPMEM_SCISSOROFFSET:
-        Rasterizer::SetScissor();
-        break;
+	case BPMEM_SCISSORTL:
+	case BPMEM_SCISSORBR:
+	case BPMEM_SCISSOROFFSET:
+		Rasterizer::SetScissor();
+		break;
 	case BPMEM_SETDRAWDONE: // This is called when the game is done drawing (eg: like in DX: Begin(); Draw(); End();)
 		switch (bpmem.drawdone & 0xFF)
-        {
-        case 0x02:
-            SWPixelEngine::SetFinish(); // may generate interrupt
-            DEBUG_LOG(VIDEO, "GXSetDrawDone SetPEFinish (value: 0x%02X)", (bpmem.drawdone & 0xFFFF));
-            break;
+		{
+		case 0x02:
+			SWPixelEngine::SetFinish(); // may generate interrupt
+			DEBUG_LOG(VIDEO, "GXSetDrawDone SetPEFinish (value: 0x%02X)", (bpmem.drawdone & 0xFFFF));
+			break;
 
-        default:
-            WARN_LOG(VIDEO, "GXSetDrawDone ??? (value 0x%02X)", (bpmem.drawdone & 0xFFFF));
-            break;
-        }
-        break;
+		default:
+			WARN_LOG(VIDEO, "GXSetDrawDone ??? (value 0x%02X)", (bpmem.drawdone & 0xFFFF));
+			break;
+		}
+		break;
 	case BPMEM_PE_TOKEN_ID: // Pixel Engine Token ID
-        DEBUG_LOG(VIDEO, "SetPEToken 0x%04x", (bpmem.petoken & 0xFFFF));
-        SWPixelEngine::SetToken(static_cast<u16>(bpmem.petokenint & 0xFFFF), false);
-        break;
-    case BPMEM_PE_TOKEN_INT_ID: // Pixel Engine Interrupt Token ID        
-        DEBUG_LOG(VIDEO, "SetPEToken + INT 0x%04x", (bpmem.petokenint & 0xFFFF));
-        SWPixelEngine::SetToken(static_cast<u16>(bpmem.petokenint & 0xFFFF), true);
-        break;
-    case BPMEM_TRIGGER_EFB_COPY:
-        EfbCopy::CopyEfb();
-        break;
-    case BPMEM_CLEARBBOX1:
-        SWPixelEngine::pereg.boxRight = newvalue >> 10;
-        SWPixelEngine::pereg.boxLeft = newvalue & 0x3ff;
-        break;
-    case BPMEM_CLEARBBOX2:
-        SWPixelEngine::pereg.boxBottom = newvalue >> 10;
-        SWPixelEngine::pereg.boxTop = newvalue & 0x3ff;
-        break;
+		DEBUG_LOG(VIDEO, "SetPEToken 0x%04x", (bpmem.petoken & 0xFFFF));
+		SWPixelEngine::SetToken(static_cast<u16>(bpmem.petokenint & 0xFFFF), false);
+		break;
+	case BPMEM_PE_TOKEN_INT_ID: // Pixel Engine Interrupt Token ID
+		DEBUG_LOG(VIDEO, "SetPEToken + INT 0x%04x", (bpmem.petokenint & 0xFFFF));
+		SWPixelEngine::SetToken(static_cast<u16>(bpmem.petokenint & 0xFFFF), true);
+		break;
+	case BPMEM_TRIGGER_EFB_COPY:
+		EfbCopy::CopyEfb();
+		break;
+	case BPMEM_CLEARBBOX1:
+		SWPixelEngine::pereg.boxRight = newvalue >> 10;
+		SWPixelEngine::pereg.boxLeft = newvalue & 0x3ff;
+		break;
+	case BPMEM_CLEARBBOX2:
+		SWPixelEngine::pereg.boxBottom = newvalue >> 10;
+		SWPixelEngine::pereg.boxTop = newvalue & 0x3ff;
+		break;
 	case BPMEM_CLEAR_PIXEL_PERF:
 		// TODO: I didn't test if the value written to this register affects the amount of cleared registers
 		SWPixelEngine::pereg.perfZcompInputZcomplocLo = 0;
@@ -105,16 +92,16 @@ void SWBPWritten(int address, int newvalue)
 		SWPixelEngine::pereg.perfEfbCopyClocksLo = 0;
 		SWPixelEngine::pereg.perfEfbCopyClocksHi = 0;
 		break;
-    case BPMEM_LOADTLUT0: // This one updates bpmem.tlutXferSrc, no need to do anything here.
+	case BPMEM_LOADTLUT0: // This one updates bpmem.tlutXferSrc, no need to do anything here.
 		break;
 	case BPMEM_LOADTLUT1: // Load a Texture Look Up Table
-        {
-            u32 tlutTMemAddr = (newvalue & 0x3FF) << 9;
-            u32 tlutXferCount = (newvalue & 0x1FFC00) >> 5; 
+		{
+			u32 tlutTMemAddr = (newvalue & 0x3FF) << 9;
+			u32 tlutXferCount = (newvalue & 0x1FFC00) >> 5; 
 
 			u8 *ptr = 0;
 
-            // TODO - figure out a cleaner way.
+			// TODO - figure out a cleaner way.
 			if (Core::g_CoreStartupParameter.bWii)
 				ptr = Memory::GetPointer(bpmem.tmem_config.tlut_src << 5);
 			else
@@ -125,7 +112,7 @@ void SWBPWritten(int address, int newvalue)
 			else
 				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)
@@ -166,36 +153,36 @@ void SWBPWritten(int address, int newvalue)
 		}
  		break;
 
-    case BPMEM_TEV_REGISTER_L:   // Reg 1
+	case BPMEM_TEV_REGISTER_L:   // Reg 1
 	case BPMEM_TEV_REGISTER_L+2: // Reg 2
 	case BPMEM_TEV_REGISTER_L+4: // Reg 3
 	case BPMEM_TEV_REGISTER_L+6: // Reg 4
 		{
 			int regNum = (address >> 1 ) & 0x3;
-            ColReg& reg = bpmem.tevregs[regNum].low;
-            bool konst = reg.type;
+			ColReg& reg = bpmem.tevregs[regNum].low;
+			bool konst = reg.type;
 
 			Rasterizer::SetTevReg(regNum, Tev::ALP_C, konst, reg.b); // A
-            Rasterizer::SetTevReg(regNum, Tev::RED_C, konst, reg.a); // R
+			Rasterizer::SetTevReg(regNum, Tev::RED_C, konst, reg.a); // R
 
 			break;
 		}
 
-    case BPMEM_TEV_REGISTER_H:   // Reg 1
+	case BPMEM_TEV_REGISTER_H:   // Reg 1
 	case BPMEM_TEV_REGISTER_H+2: // Reg 2
 	case BPMEM_TEV_REGISTER_H+4: // Reg 3
 	case BPMEM_TEV_REGISTER_H+6: // Reg 4
 		{
 			int regNum = (address >> 1 ) & 0x3;
-            ColReg& reg = bpmem.tevregs[regNum].high;
-            bool konst = reg.type;
+			ColReg& reg = bpmem.tevregs[regNum].high;
+			bool konst = reg.type;
 
-            Rasterizer::SetTevReg(regNum, Tev::GRN_C, konst, reg.b); // G
-            Rasterizer::SetTevReg(regNum, Tev::BLU_C, konst, reg.a); // B
+			Rasterizer::SetTevReg(regNum, Tev::GRN_C, konst, reg.b); // G
+			Rasterizer::SetTevReg(regNum, Tev::BLU_C, konst, reg.a); // B
 
 			break;
 		}
 
-    }
+	}
 }
 
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/BPMemLoader.h b/Source/Plugins/Plugin_VideoSoftware/Src/BPMemLoader.h
index 1a7da158c5..0ef122ec24 100644
--- a/Source/Plugins/Plugin_VideoSoftware/Src/BPMemLoader.h
+++ b/Source/Plugins/Plugin_VideoSoftware/Src/BPMemLoader.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _BPMEMLOADER_H_
 #define _BPMEMLOADER_H_
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/CPMemLoader.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/CPMemLoader.cpp
index a749c5b472..98734deeb5 100644
--- a/Source/Plugins/Plugin_VideoSoftware/Src/CPMemLoader.cpp
+++ b/Source/Plugins/Plugin_VideoSoftware/Src/CPMemLoader.cpp
@@ -1,18 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "VideoCommon.h"
 
@@ -22,10 +10,10 @@
 
 void SWLoadCPReg(u32 sub_cmd, u32 value)
 {
-    switch (sub_cmd & 0xF0)
+	switch (sub_cmd & 0xF0)
 	{
 	case 0x30:
-        MatrixIndexA.Hex = value;
+		MatrixIndexA.Hex = value;
 		break;
 
 	case 0x40:
@@ -60,7 +48,7 @@ void SWLoadCPReg(u32 sub_cmd, u32 value)
 	// Pointers to vertex arrays in GC RAM
 	case 0xA0:
 		arraybases[sub_cmd & 0xF] = value;
-        cached_arraybases[sub_cmd & 0xF] = Memory::GetPointer(value);
+		cached_arraybases[sub_cmd & 0xF] = Memory::GetPointer(value);
 		break;
 
 	case 0xB0:
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/CPMemLoader.h b/Source/Plugins/Plugin_VideoSoftware/Src/CPMemLoader.h
index 1470c5c5f6..5bbb2969ea 100644
--- a/Source/Plugins/Plugin_VideoSoftware/Src/CPMemLoader.h
+++ b/Source/Plugins/Plugin_VideoSoftware/Src/CPMemLoader.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _CPMEMLOADER_H_
 #define _CPMEMLOADER_H_
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/Clipper.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/Clipper.cpp
index c4755b50bf..ff71ee491d 100644
--- a/Source/Plugins/Plugin_VideoSoftware/Src/Clipper.cpp
+++ b/Source/Plugins/Plugin_VideoSoftware/Src/Clipper.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 /*
 Portions of this file are based off work by Markus Trenkwalder.
@@ -62,8 +49,8 @@ namespace Clipper
 
 	float m_ViewOffset[2];
 
-    OutputVertexData ClippedVertices[NUM_CLIPPED_VERTICES];
-    OutputVertexData *Vertices[NUM_INDICES];
+	OutputVertexData ClippedVertices[NUM_CLIPPED_VERTICES];
+	OutputVertexData *Vertices[NUM_INDICES];
 
 	void DoState(PointerWrap &p)
 	{
@@ -72,94 +59,94 @@ namespace Clipper
 			ClippedVertices[i].DoState(p);
 	}
 
-    void Init()
-    {
-        for (int i = 0; i < NUM_CLIPPED_VERTICES; ++i)
-            Vertices[i+3] = &ClippedVertices[i];
-    }
+	void Init()
+	{
+		for (int i = 0; i < NUM_CLIPPED_VERTICES; ++i)
+			Vertices[i+3] = &ClippedVertices[i];
+	}
 
-    void SetViewOffset()
-    {
-        m_ViewOffset[0] = swxfregs.viewport.xOrig - 342;
-        m_ViewOffset[1] = swxfregs.viewport.yOrig - 342;
-    }
+	void SetViewOffset()
+	{
+		m_ViewOffset[0] = swxfregs.viewport.xOrig - 342;
+		m_ViewOffset[1] = swxfregs.viewport.yOrig - 342;
+	}
 
-        
-    enum {
-	    SKIP_FLAG = -1,
-        CLIP_POS_X_BIT = 0x01,
-	    CLIP_NEG_X_BIT = 0x02,
-	    CLIP_POS_Y_BIT = 0x04,
-	    CLIP_NEG_Y_BIT = 0x08,
-	    CLIP_POS_Z_BIT = 0x10,
-	    CLIP_NEG_Z_BIT = 0x20
-    };
 
-    static inline int CalcClipMask(OutputVertexData *v)
-    {
-	    int cmask = 0;
-        Vec4 pos = v->projectedPosition;
-	    if (pos.w - pos.x < 0) cmask |= CLIP_POS_X_BIT;
-	    if (pos.x + pos.w < 0) cmask |= CLIP_NEG_X_BIT;
-	    if (pos.w - pos.y < 0) cmask |= CLIP_POS_Y_BIT;
-	    if (pos.y + pos.w < 0) cmask |= CLIP_NEG_Y_BIT;
-	    if (pos.w * pos.z > 0) cmask |= CLIP_POS_Z_BIT;
-	    if (pos.z + pos.w < 0) cmask |= CLIP_NEG_Z_BIT;
-	    return cmask;
-    }
+	enum {
+		SKIP_FLAG = -1,
+		CLIP_POS_X_BIT = 0x01,
+		CLIP_NEG_X_BIT = 0x02,
+		CLIP_POS_Y_BIT = 0x04,
+		CLIP_NEG_Y_BIT = 0x08,
+		CLIP_POS_Z_BIT = 0x10,
+		CLIP_NEG_Z_BIT = 0x20
+	};
 
-    static inline void AddInterpolatedVertex(float t, int out, int in, int& numVertices)
-    {
-        Vertices[numVertices]->Lerp(t, Vertices[out], Vertices[in]);
-        numVertices++;
-    }
+	static inline int CalcClipMask(OutputVertexData *v)
+	{
+		int cmask = 0;
+		Vec4 pos = v->projectedPosition;
+		if (pos.w - pos.x < 0) cmask |= CLIP_POS_X_BIT;
+		if (pos.x + pos.w < 0) cmask |= CLIP_NEG_X_BIT;
+		if (pos.w - pos.y < 0) cmask |= CLIP_POS_Y_BIT;
+		if (pos.y + pos.w < 0) cmask |= CLIP_NEG_Y_BIT;
+		if (pos.w * pos.z > 0) cmask |= CLIP_POS_Z_BIT;
+		if (pos.z + pos.w < 0) cmask |= CLIP_NEG_Z_BIT;
+		return cmask;
+	}
 
-    #define DIFFERENT_SIGNS(x,y) ((x <= 0 && y > 0) || (x > 0 && y <= 0))
+	static inline void AddInterpolatedVertex(float t, int out, int in, int& numVertices)
+	{
+		Vertices[numVertices]->Lerp(t, Vertices[out], Vertices[in]);
+		numVertices++;
+	}
 
-    #define CLIP_DOTPROD(I, A, B, C, D) \
-	    (Vertices[I]->projectedPosition.x * A + Vertices[I]->projectedPosition.y * B + Vertices[I]->projectedPosition.z * C + Vertices[I]->projectedPosition.w * D)
+	#define DIFFERENT_SIGNS(x,y) ((x <= 0 && y > 0) || (x > 0 && y <= 0))
 
-    #define POLY_CLIP( PLANE_BIT, A, B, C, D )                          \
-    {                                                                   \
-	    if (mask & PLANE_BIT) {                                         \
-		    int idxPrev = inlist[0];                                    \
-		    float dpPrev = CLIP_DOTPROD(idxPrev, A, B, C, D );            \
-		    int outcount = 0;                                           \
-                                                                        \
-		    inlist[n] = inlist[0];                                      \
-		    for (int j = 1; j <= n; j++) { 		                            \
-			    int idx = inlist[j];                                    \
-			    float dp = CLIP_DOTPROD(idx, A, B, C, D );                \
-			    if (dpPrev >= 0) {                                      \
-				    outlist[outcount++] = idxPrev;                      \
-			    }                                                       \
-                                                                        \
-			    if (DIFFERENT_SIGNS(dp, dpPrev)) {				        \
-				    if (dp < 0) {					                    \
-					    float t = dp / (dp - dpPrev);                   \
-					    AddInterpolatedVertex(t, idx, idxPrev, numVertices);         \
-				    } else {							                \
-					    float t = dpPrev / (dpPrev - dp);               \
-					    AddInterpolatedVertex(t, idxPrev, idx, numVertices);         \
-				    }								                    \
-				    outlist[outcount++] = numVertices - 1;              \
-			    }								                        \
-                                                                        \
-			    idxPrev = idx;							                \
-			    dpPrev = dp;							                \
-		    }									                        \
-                                                                        \
-		    if (outcount < 3)							                \
-			    continue;							                    \
-                                                                        \
-	 	    {									                        \
-			    int *tmp = inlist;				  	                    \
-			    inlist = outlist;				  	                    \
-			    outlist = tmp;					  	                    \
-			    n = outcount;					  	                    \
-		    }									                        \
-	    }									                            \
-    }
+	#define CLIP_DOTPROD(I, A, B, C, D) \
+		(Vertices[I]->projectedPosition.x * A + Vertices[I]->projectedPosition.y * B + Vertices[I]->projectedPosition.z * C + Vertices[I]->projectedPosition.w * D)
+
+	#define POLY_CLIP( PLANE_BIT, A, B, C, D )							\
+	{																	\
+		if (mask & PLANE_BIT) {											\
+			int idxPrev = inlist[0];									\
+			float dpPrev = CLIP_DOTPROD(idxPrev, A, B, C, D );			\
+			int outcount = 0;											\
+																		\
+			inlist[n] = inlist[0];										\
+			for (int j = 1; j <= n; j++) { 								\
+				int idx = inlist[j];									\
+				float dp = CLIP_DOTPROD(idx, A, B, C, D );				\
+				if (dpPrev >= 0) {										\
+					outlist[outcount++] = idxPrev;						\
+				}														\
+																		\
+				if (DIFFERENT_SIGNS(dp, dpPrev)) {						\
+					if (dp < 0) {										\
+						float t = dp / (dp - dpPrev);					\
+						AddInterpolatedVertex(t, idx, idxPrev, numVertices);		\
+					} else {											\
+						float t = dpPrev / (dpPrev - dp);				\
+						AddInterpolatedVertex(t, idxPrev, idx, numVertices);		\
+					}													\
+					outlist[outcount++] = numVertices - 1;				\
+				}														\
+																		\
+				idxPrev = idx;											\
+				dpPrev = dp;											\
+			}															\
+																		\
+			if (outcount < 3)											\
+				continue;												\
+																		\
+	 		{															\
+				int *tmp = inlist;										\
+				inlist = outlist;										\
+				outlist = tmp;											\
+				n = outcount;											\
+			}															\
+		}																\
+	}
 
 	#define LINE_CLIP(PLANE_BIT, A, B, C, D )					\
 	{															\
@@ -173,63 +160,63 @@ namespace Clipper
 				return;											\
 																\
 			if (neg_dp1) {										\
-				float t = dp1 / (dp1 - dp0);					\
+				float t = dp1 / (dp1 - dp0);						\
 				if (t > t1) t1 = t;								\
 			} else if (neg_dp0) {								\
-				float t = dp0 / (dp0 - dp1);					\
+				float t = dp0 / (dp0 - dp1);						\
 				if (t > t0) t0 = t;								\
 			}													\
 		}														\
 	}
 
-    void ClipTriangle(int *indices, int &numIndices)
-    {
-	    int mask = 0;
-    	
-	    mask |= CalcClipMask(Vertices[0]);
-        mask |= CalcClipMask(Vertices[1]);
-        mask |= CalcClipMask(Vertices[2]);
+	void ClipTriangle(int *indices, int &numIndices)
+	{
+		int mask = 0;
 
-        if (mask != 0)
-        {
-		    for(int i = 0; i < 3; i += 3)
-            {
-                int vlist[2][2*6+1];
-		        int *inlist = vlist[0], *outlist = vlist[1];
-                int n = 3;
-                int numVertices = 3;
+		mask |= CalcClipMask(Vertices[0]);
+		mask |= CalcClipMask(Vertices[1]);
+		mask |= CalcClipMask(Vertices[2]);
 
-		        inlist[0] = 0;
-		        inlist[1] = 1;
-		        inlist[2] = 2;
+		if (mask != 0)
+		{
+			for(int i = 0; i < 3; i += 3)
+			{
+				int vlist[2][2*6+1];
+				int *inlist = vlist[0], *outlist = vlist[1];
+				int n = 3;
+				int numVertices = 3;
 
-		        // mark this triangle as unused in case it should be completely 
-		        // clipped
-		        indices[0] = SKIP_FLAG;
-		        indices[1] = SKIP_FLAG;
-		        indices[2] = SKIP_FLAG;
+				inlist[0] = 0;
+				inlist[1] = 1;
+				inlist[2] = 2;
 
-		        POLY_CLIP(CLIP_POS_X_BIT, -1,  0,  0, 1);
-		        POLY_CLIP(CLIP_NEG_X_BIT,  1,  0,  0, 1);
-		        POLY_CLIP(CLIP_POS_Y_BIT,  0, -1,  0, 1);
-		        POLY_CLIP(CLIP_NEG_Y_BIT,  0,  1,  0, 1);
-		        POLY_CLIP(CLIP_POS_Z_BIT,  0,  0,  0, 1);
-		        POLY_CLIP(CLIP_NEG_Z_BIT,  0,  0,  1, 1);
+				// mark this triangle as unused in case it should be completely 
+				// clipped
+				indices[0] = SKIP_FLAG;
+				indices[1] = SKIP_FLAG;
+				indices[2] = SKIP_FLAG;
 
-                INCSTAT(swstats.thisFrame.numTrianglesClipped);
+				POLY_CLIP(CLIP_POS_X_BIT, -1,  0,  0, 1);
+				POLY_CLIP(CLIP_NEG_X_BIT,  1,  0,  0, 1);
+				POLY_CLIP(CLIP_POS_Y_BIT,  0, -1,  0, 1);
+				POLY_CLIP(CLIP_NEG_Y_BIT,  0,  1,  0, 1);
+				POLY_CLIP(CLIP_POS_Z_BIT,  0,  0,  0, 1);
+				POLY_CLIP(CLIP_NEG_Z_BIT,  0,  0,  1, 1);
 
-		        // transform the poly in inlist into triangles
-		        indices[0] = inlist[0];
-		        indices[1] = inlist[1];
-		        indices[2] = inlist[2];
-		        for (int j = 3; j < n; ++j) {
-			        indices[numIndices++] = inlist[0];
-			        indices[numIndices++] = inlist[j - 1];
-			        indices[numIndices++] = inlist[j];
-		        }
-            }
-	    }
-    }
+				INCSTAT(swstats.thisFrame.numTrianglesClipped);
+
+				// transform the poly in inlist into triangles
+				indices[0] = inlist[0];
+				indices[1] = inlist[1];
+				indices[2] = inlist[2];
+				for (int j = 3; j < n; ++j) {
+					indices[numIndices++] = inlist[0];
+					indices[numIndices++] = inlist[j - 1];
+					indices[numIndices++] = inlist[j];
+				}
+			}
+		}
+	}
 
 	void ClipLine(int *indices)
 	{
@@ -267,59 +254,61 @@ namespace Clipper
 
 		int numVertices = 2;
 
-		if (clip_mask[0]) {
+		if (clip_mask[0])
+		{
 			indices[0] = numVertices;
 			AddInterpolatedVertex(t0, 0, 1, numVertices);
 		}
 
-		if (clip_mask[1]) {
+		if (clip_mask[1])
+		{
 			indices[1] = numVertices;
 			AddInterpolatedVertex(t1, 1, 0, numVertices);
 		}
 	}
 
-    void ProcessTriangle(OutputVertexData *v0, OutputVertexData *v1, OutputVertexData *v2)
-    {
-        INCSTAT(swstats.thisFrame.numTrianglesIn)
+	void ProcessTriangle(OutputVertexData *v0, OutputVertexData *v1, OutputVertexData *v2)
+	{
+		INCSTAT(swstats.thisFrame.numTrianglesIn)
 
-        bool backface;
+		bool backface;
 
-        if(!CullTest(v0, v1, v2, backface))
-            return;
-        
-        int indices[NUM_INDICES] = { 0, 1, 2, SKIP_FLAG, SKIP_FLAG, SKIP_FLAG, SKIP_FLAG, SKIP_FLAG, SKIP_FLAG,
-                                     SKIP_FLAG, SKIP_FLAG, SKIP_FLAG, SKIP_FLAG, SKIP_FLAG, SKIP_FLAG,
-                                     SKIP_FLAG, SKIP_FLAG, SKIP_FLAG, SKIP_FLAG, SKIP_FLAG, SKIP_FLAG };
-        int numIndices = 3;
+		if(!CullTest(v0, v1, v2, backface))
+			return;
 
-        if (backface)
-        {
-            Vertices[0] = v0;
-            Vertices[1] = v2;
-            Vertices[2] = v1;
-        }
-        else
-        {
-            Vertices[0] = v0;
-            Vertices[1] = v1;
-            Vertices[2] = v2;
-        }
+		int indices[NUM_INDICES] = { 0, 1, 2, SKIP_FLAG, SKIP_FLAG, SKIP_FLAG, SKIP_FLAG, SKIP_FLAG, SKIP_FLAG,
+										SKIP_FLAG, SKIP_FLAG, SKIP_FLAG, SKIP_FLAG, SKIP_FLAG, SKIP_FLAG,
+										SKIP_FLAG, SKIP_FLAG, SKIP_FLAG, SKIP_FLAG, SKIP_FLAG, SKIP_FLAG };
+		int numIndices = 3;
 
-        ClipTriangle(indices, numIndices);
+		if (backface)
+		{
+			Vertices[0] = v0;
+			Vertices[1] = v2;
+			Vertices[2] = v1;
+		}
+		else
+		{
+			Vertices[0] = v0;
+			Vertices[1] = v1;
+			Vertices[2] = v2;
+		}
 
-        for(int i = 0; i+3 <= numIndices; i+=3)
-        {
+		ClipTriangle(indices, numIndices);
+
+		for(int i = 0; i+3 <= numIndices; i+=3)
+		{
 			_assert_(i < NUM_INDICES);
 			if(indices[i] != SKIP_FLAG)
-            {
-                PerspectiveDivide(Vertices[indices[i]]);
-                PerspectiveDivide(Vertices[indices[i+1]]);
-                PerspectiveDivide(Vertices[indices[i+2]]);
+			{
+				PerspectiveDivide(Vertices[indices[i]]);
+				PerspectiveDivide(Vertices[indices[i+1]]);
+				PerspectiveDivide(Vertices[indices[i+2]]);
 
-                Rasterizer::DrawTriangleFrontFace(Vertices[indices[i]], Vertices[indices[i+1]], Vertices[indices[i+2]]);                
-            }
-        }
-    }
+				Rasterizer::DrawTriangleFrontFace(Vertices[indices[i]], Vertices[indices[i+1]], Vertices[indices[i+2]]);                
+			}
+		}
+	}
 
 	void CopyVertex(OutputVertexData *dst, OutputVertexData *src, float dx, float dy, unsigned int sOffset)
 	{
@@ -343,7 +332,7 @@ namespace Clipper
 		int indices[4] = { 0, 1, SKIP_FLAG, SKIP_FLAG };
 
 		Vertices[0] = lineV0;
-        Vertices[1] = lineV1;
+		Vertices[1] = lineV1;
 
 		// point to a valid vertex to store to when clipping
 		Vertices[2] = &ClippedVertices[17];
@@ -356,7 +345,7 @@ namespace Clipper
 			OutputVertexData *v1 = Vertices[indices[1]];
 
 			PerspectiveDivide(v0);
-            PerspectiveDivide(v1);
+			PerspectiveDivide(v1);
 
 			float dx = v1->screenPosition.x - v0->screenPosition.x;
 			float dy = v1->screenPosition.y - v0->screenPosition.y;
@@ -393,57 +382,57 @@ namespace Clipper
 			Rasterizer::DrawTriangleFrontFace(&triangle[0], &triangle[1], &triangle[2]);
 		}
 	}
-        
-    bool CullTest(OutputVertexData *v0, OutputVertexData *v1, OutputVertexData *v2, bool &backface)
-    {
-        int mask = CalcClipMask(v0);
-        mask &= CalcClipMask(v1);
-        mask &= CalcClipMask(v2);
 
-        if(mask)
-        {
-            INCSTAT(swstats.thisFrame.numTrianglesRejected)
-            return false;
-        }
+	bool CullTest(OutputVertexData *v0, OutputVertexData *v1, OutputVertexData *v2, bool &backface)
+	{
+		int mask = CalcClipMask(v0);
+		mask &= CalcClipMask(v1);
+		mask &= CalcClipMask(v2);
 
-        float x0 = v0->projectedPosition.x;
-        float x1 = v1->projectedPosition.x;
-        float x2 = v2->projectedPosition.x;
-        float y1 = v1->projectedPosition.y;
-        float y0 = v0->projectedPosition.y;
-        float y2 = v2->projectedPosition.y;
-        float w0 = v0->projectedPosition.w;
-        float w1 = v1->projectedPosition.w;
-        float w2 = v2->projectedPosition.w;
+		if(mask)
+		{
+			INCSTAT(swstats.thisFrame.numTrianglesRejected)
+			return false;
+		}
 
-        float normalZDir = (x0*w2 - x2*w0)*y1 + (x2*y0 - x0*y2)*w1 + (y2*w0 - y0*w2)*x1; 
+		float x0 = v0->projectedPosition.x;
+		float x1 = v1->projectedPosition.x;
+		float x2 = v2->projectedPosition.x;
+		float y1 = v1->projectedPosition.y;
+		float y0 = v0->projectedPosition.y;
+		float y2 = v2->projectedPosition.y;
+		float w0 = v0->projectedPosition.w;
+		float w1 = v1->projectedPosition.w;
+		float w2 = v2->projectedPosition.w;
 
-        backface = normalZDir <= 0.0f;
+		float normalZDir = (x0*w2 - x2*w0)*y1 + (x2*y0 - x0*y2)*w1 + (y2*w0 - y0*w2)*x1; 
 
-        if ((bpmem.genMode.cullmode & 1) && !backface) // cull frontfacing
-        {
-            INCSTAT(swstats.thisFrame.numTrianglesCulled)
-            return false;
-        }
+		backface = normalZDir <= 0.0f;
 
-        if ((bpmem.genMode.cullmode & 2) && backface) // cull backfacing
-        {
-            INCSTAT(swstats.thisFrame.numTrianglesCulled)
-            return false;
-        }
+		if ((bpmem.genMode.cullmode & 1) && !backface) // cull frontfacing
+		{
+			INCSTAT(swstats.thisFrame.numTrianglesCulled)
+			return false;
+		}
 
-        return true;
-    }
+		if ((bpmem.genMode.cullmode & 2) && backface) // cull backfacing
+		{
+			INCSTAT(swstats.thisFrame.numTrianglesCulled)
+			return false;
+		}
 
-    void PerspectiveDivide(OutputVertexData *vertex)
-    {
-        Vec4 &projected = vertex->projectedPosition;
-        Vec3 &screen = vertex->screenPosition;
+		return true;
+	}
+
+	void PerspectiveDivide(OutputVertexData *vertex)
+	{
+		Vec4 &projected = vertex->projectedPosition;
+		Vec3 &screen = vertex->screenPosition;
+
+		float wInverse = 1.0f/projected.w;
+		screen.x = projected.x * wInverse * swxfregs.viewport.wd + m_ViewOffset[0];
+		screen.y = projected.y * wInverse * swxfregs.viewport.ht + m_ViewOffset[1];
+		screen.z = projected.z * wInverse * swxfregs.viewport.zRange + swxfregs.viewport.farZ;
+	}
 
-        float wInverse = 1.0f/projected.w;
-        screen.x = projected.x * wInverse * swxfregs.viewport.wd + m_ViewOffset[0];
-        screen.y = projected.y * wInverse * swxfregs.viewport.ht + m_ViewOffset[1];
-        screen.z = projected.z * wInverse * swxfregs.viewport.zRange + swxfregs.viewport.farZ;
-    }
-    
 }
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/Clipper.h b/Source/Plugins/Plugin_VideoSoftware/Src/Clipper.h
index babc8b4e88..f28db764c1 100644
--- a/Source/Plugins/Plugin_VideoSoftware/Src/Clipper.h
+++ b/Source/Plugins/Plugin_VideoSoftware/Src/Clipper.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _CLIPPER_H_
 #define _CLIPPER_H_
@@ -26,17 +13,17 @@
 
 namespace Clipper
 {
-    void Init();
+	void Init();
 
-    void SetViewOffset();
+	void SetViewOffset();
 
-    void ProcessTriangle(OutputVertexData *v0, OutputVertexData *v1, OutputVertexData *v2);
+	void ProcessTriangle(OutputVertexData *v0, OutputVertexData *v1, OutputVertexData *v2);
 
 	void ProcessLine(OutputVertexData *v0, OutputVertexData *v1);
 
-    bool CullTest(OutputVertexData *v0, OutputVertexData *v1, OutputVertexData *v2, bool &backface);
+	bool CullTest(OutputVertexData *v0, OutputVertexData *v1, OutputVertexData *v2, bool &backface);
 
-    void PerspectiveDivide(OutputVertexData *vertex);
+	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 57fc57a906..4472639a20 100644
--- a/Source/Plugins/Plugin_VideoSoftware/Src/DebugUtil.cpp
+++ b/Source/Plugins/Plugin_VideoSoftware/Src/DebugUtil.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "Common.h"
 
@@ -46,57 +33,57 @@ int BufferBase[NumObjectBuffers];
 
 void Init()
 {
-    for (int i = 0; i < NumObjectBuffers; i++)
-    {
-        memset(ObjectBuffer[i], 0, sizeof(ObjectBuffer[i]));
-        DrawnToBuffer[i] = false;
-        ObjectBufferName[i] = 0;
+	for (int i = 0; i < NumObjectBuffers; i++)
+	{
+		memset(ObjectBuffer[i], 0, sizeof(ObjectBuffer[i]));
+		DrawnToBuffer[i] = false;
+		ObjectBufferName[i] = 0;
 		BufferBase[i] = 0;
-    }
+	}
 }
 
 void SaveTexture(const char* filename, u32 texmap, s32 mip)
 {
-    FourTexUnits& texUnit = bpmem.tex[(texmap >> 2) & 1];
-    u8 subTexmap = texmap & 3;
+	FourTexUnits& texUnit = bpmem.tex[(texmap >> 2) & 1];
+	u8 subTexmap = texmap & 3;
 
-    TexImage0& ti0 = texUnit.texImage0[subTexmap];
+	TexImage0& ti0 = texUnit.texImage0[subTexmap];
 
 	u32 width = ti0.width + 1;
 	u32 height = ti0.height + 1;
 
 	u8 *data = new u8[width * height * 4];
-    
-    GetTextureBGRA(data, texmap, mip, width, height);
 
-    (void)SaveTGA(filename, width, height, data);
+	GetTextureBGRA(data, texmap, mip, width, height);
 
-    delete []data;
+	(void)SaveTGA(filename, width, height, data);
+
+	delete []data;
 }
 
 void GetTextureBGRA(u8 *dst, u32 texmap, s32 mip, u32 width, u32 height)
 {
-    u8 sample[4];    
+	u8 sample[4];
 
-    for (u32 y = 0; y < height; y++)
+	for (u32 y = 0; y < height; y++)
 	{
-        for (u32 x = 0; x < width; x++)
+		for (u32 x = 0; x < width; x++)
 		{
-            TextureSampler::SampleMip(x << 7, y << 7, mip, false, texmap, sample);
-            
+			TextureSampler::SampleMip(x << 7, y << 7, mip, false, texmap, sample);
+
 			// RGBA to BGRA
-            *(dst++) = sample[2];
-            *(dst++) = sample[1];
-            *(dst++) = sample[0];
-            *(dst++) = sample[3];
-        }
+			*(dst++) = sample[2];
+			*(dst++) = sample[1];
+			*(dst++) = sample[0];
+			*(dst++) = sample[3];
+		}
 	}
 }
 
 s32 GetMaxTextureLod(u32 texmap)
 {
 	FourTexUnits& texUnit = bpmem.tex[(texmap >> 2) & 1];
-    u8 subTexmap = texmap & 3;
+	u8 subTexmap = texmap & 3;
 
 	u8 maxLod = texUnit.texMode1[subTexmap].max_lod;
 	u8 mip = maxLod >> 4;
@@ -110,9 +97,9 @@ s32 GetMaxTextureLod(u32 texmap)
 
 void DumpActiveTextures()
 {
-    for (unsigned int stageNum = 0; stageNum < bpmem.genMode.numindstages; stageNum++)
-    {
-        u32 texmap = bpmem.tevindref.getTexMap(stageNum);
+	for (unsigned int stageNum = 0; stageNum < bpmem.genMode.numindstages; stageNum++)
+	{
+		u32 texmap = bpmem.tevindref.getTexMap(stageNum);
 
 		s32 maxLod = GetMaxTextureLod(texmap);
 		for (s32 mip = 0; mip <= maxLod; ++mip)
@@ -121,90 +108,96 @@ void DumpActiveTextures()
 						File::GetUserPath(D_DUMPTEXTURES_IDX).c_str(),
 						swstats.thisFrame.numDrawnObjects, stageNum, texmap, mip).c_str(), texmap, mip);
 		}
-    }
+	}
 
-    for (unsigned int stageNum = 0; stageNum <= bpmem.genMode.numtevstages; stageNum++)
-    {
-        int stageNum2 = stageNum >> 1;
-        int stageOdd = stageNum&1;
-        TwoTevStageOrders &order = bpmem.tevorders[stageNum2];
+	for (unsigned int stageNum = 0; stageNum <= bpmem.genMode.numtevstages; stageNum++)
+	{
+		int stageNum2 = stageNum >> 1;
+		int stageOdd = stageNum&1;
+		TwoTevStageOrders &order = bpmem.tevorders[stageNum2];
 
-        int texmap = order.getTexMap(stageOdd);
+		int texmap = order.getTexMap(stageOdd);
 
-        s32 maxLod = GetMaxTextureLod(texmap);
+		s32 maxLod = GetMaxTextureLod(texmap);
 		for (s32 mip = 0; mip <= maxLod; ++mip)
 		{
 			SaveTexture(StringFromFormat("%star%i_stage%i_map%i_mip%i.tga",
 						File::GetUserPath(D_DUMPTEXTURES_IDX).c_str(),
 						swstats.thisFrame.numDrawnObjects, stageNum, texmap, mip).c_str(), texmap, mip);
 		}
-    }
+	}
 }
 
 void DumpEfb(const char* filename)
 {
-    u8 *data = new u8[EFB_WIDTH * EFB_HEIGHT * 4];
-    u8 *writePtr = data;
-    u8 sample[4];    
+	u8 *data = new u8[EFB_WIDTH * EFB_HEIGHT * 4];
+	u8 *writePtr = data;
+	u8 sample[4];
 
-    for (int y = 0; y < EFB_HEIGHT; y++)
-        for (int x = 0; x < EFB_WIDTH; x++) {
-            EfbInterface::GetColor(x, y, sample);
-            // ABGR to BGRA
-            *(writePtr++) = sample[1];
-            *(writePtr++) = sample[2];
-            *(writePtr++) = sample[3];
-            *(writePtr++) = sample[0];
-        }
+	for (int y = 0; y < EFB_HEIGHT; y++)
+	{
+		for (int x = 0; x < EFB_WIDTH; x++)
+		{
+			EfbInterface::GetColor(x, y, sample);
+			// ABGR to BGRA
+			*(writePtr++) = sample[1];
+			*(writePtr++) = sample[2];
+			*(writePtr++) = sample[3];
+			*(writePtr++) = sample[0];
+		}
+	}
 
-    (void)SaveTGA(filename, EFB_WIDTH, EFB_HEIGHT, data);
+	(void)SaveTGA(filename, EFB_WIDTH, EFB_HEIGHT, data);
 
-    delete []data;
+	delete []data;
 }
 
 void DumpDepth(const char* filename)
 {
-    u8 *data = new u8[EFB_WIDTH * EFB_HEIGHT * 4];
-    u8 *writePtr = data;
+	u8 *data = new u8[EFB_WIDTH * EFB_HEIGHT * 4];
+	u8 *writePtr = data;
 
-    for (int y = 0; y < EFB_HEIGHT; y++)
-        for (int x = 0; x < EFB_WIDTH; x++) {
-            u32 depth = EfbInterface::GetDepth(x, y);
-            // depth to bgra
-            *(writePtr++) = (depth >> 16) & 0xff;
-            *(writePtr++) = (depth >> 8) & 0xff;            
-            *(writePtr++) = depth & 0xff;
-            *(writePtr++) = 255;
-        }
+	for (int y = 0; y < EFB_HEIGHT; y++)
+	{
+		for (int x = 0; x < EFB_WIDTH; x++)
+		{
+			u32 depth = EfbInterface::GetDepth(x, y);
+			// depth to bgra
+			*(writePtr++) = (depth >> 16) & 0xff;
+			*(writePtr++) = (depth >> 8) & 0xff;
+			*(writePtr++) = depth & 0xff;
+			*(writePtr++) = 255;
+		}
+	}
 
-    (void)SaveTGA(filename, EFB_WIDTH, EFB_HEIGHT, data);
+	(void)SaveTGA(filename, EFB_WIDTH, EFB_HEIGHT, data);
 
-    delete []data;
+	delete []data;
 }
 
 void DrawObjectBuffer(s16 x, s16 y, u8 *color, int bufferBase, int subBuffer, const char *name)
 {
-    int buffer = bufferBase + subBuffer;
+	int buffer = bufferBase + subBuffer;
 
 	u32 offset = (x + y * EFB_WIDTH) * 4;
-    u8 *dst = (u8*)&ObjectBuffer[buffer][offset];
-    *(dst++) = color[2];
-    *(dst++) = color[1];
-    *(dst++) = color[0];
-    *(dst++) = color[3];
+	u8 *dst = (u8*)&ObjectBuffer[buffer][offset];
+	*(dst++) = color[2];
+	*(dst++) = color[1];
+	*(dst++) = color[0];
+	*(dst++) = color[3];
 
-    DrawnToBuffer[buffer] = true;
-    ObjectBufferName[buffer] = name;
+	DrawnToBuffer[buffer] = true;
+	ObjectBufferName[buffer] = name;
 	BufferBase[buffer] = bufferBase;
 }
 
 void DrawTempBuffer(u8 *color, int buffer)
 {
 	u8 *dst = (u8*)&TempBuffer[buffer];
-    *(dst++) = color[2];
-    *(dst++) = color[1];
-    *(dst++) = color[0];
-    *(dst++) = color[3];
+	*(dst++) = color[2];
+	*(dst++) = color[1];
+	*(dst++) = color[0];
+	*(dst++) = color[3];
 }
 
 void CopyTempBuffer(s16 x, s16 y, int bufferBase, int subBuffer, const char *name)
@@ -215,69 +208,69 @@ void CopyTempBuffer(s16 x, s16 y, int bufferBase, int subBuffer, const char *nam
 	ObjectBuffer[buffer][offset] = TempBuffer[buffer];
 
 	DrawnToBuffer[buffer] = true;
-    ObjectBufferName[buffer] = name;
+	ObjectBufferName[buffer] = name;
 	BufferBase[buffer] = bufferBase;
 }
 
 void OnObjectBegin()
 {
-    if (!g_bSkipCurrentFrame)
-    {
-        if (g_SWVideoConfig.bDumpTextures && swstats.thisFrame.numDrawnObjects >= g_SWVideoConfig.drawStart && swstats.thisFrame.numDrawnObjects < g_SWVideoConfig.drawEnd)
-            DumpActiveTextures();
+	if (!g_bSkipCurrentFrame)
+	{
+		if (g_SWVideoConfig.bDumpTextures && swstats.thisFrame.numDrawnObjects >= g_SWVideoConfig.drawStart && swstats.thisFrame.numDrawnObjects < g_SWVideoConfig.drawEnd)
+			DumpActiveTextures();
 
-        if (g_SWVideoConfig.bHwRasterizer)
+		if (g_SWVideoConfig.bHwRasterizer)
 		{
-            HwRasterizer::BeginTriangles();
+			HwRasterizer::BeginTriangles();
 			drawingHwTriangles = true;
 		}
-    }
+	}
 }
 
 void OnObjectEnd()
 {
-    if (!g_bSkipCurrentFrame)
-    {
-        if (g_SWVideoConfig.bDumpObjects && swstats.thisFrame.numDrawnObjects >= g_SWVideoConfig.drawStart && swstats.thisFrame.numDrawnObjects < g_SWVideoConfig.drawEnd)
+	if (!g_bSkipCurrentFrame)
+	{
+		if (g_SWVideoConfig.bDumpObjects && swstats.thisFrame.numDrawnObjects >= g_SWVideoConfig.drawStart && swstats.thisFrame.numDrawnObjects < g_SWVideoConfig.drawEnd)
 			DumpEfb(StringFromFormat("%sobject%i.tga",
 						File::GetUserPath(D_DUMPFRAMES_IDX).c_str(),
 						swstats.thisFrame.numDrawnObjects).c_str());
 
-        if (g_SWVideoConfig.bHwRasterizer || drawingHwTriangles)
+		if (g_SWVideoConfig.bHwRasterizer || drawingHwTriangles)
 		{
-            HwRasterizer::EndTriangles();
+			HwRasterizer::EndTriangles();
 			drawingHwTriangles = false;
 		}
 
-        for (int i = 0; i < NumObjectBuffers; i++)
-        {
-            if (DrawnToBuffer[i])
-            {
-                DrawnToBuffer[i] = false;
+		for (int i = 0; i < NumObjectBuffers; i++)
+		{
+			if (DrawnToBuffer[i])
+			{
+				DrawnToBuffer[i] = false;
 				(void)SaveTGA(StringFromFormat("%sobject%i_%s(%i).tga",
 							File::GetUserPath(D_DUMPFRAMES_IDX).c_str(),
 							swstats.thisFrame.numDrawnObjects, ObjectBufferName[i], i - BufferBase[i]).c_str(),
 						EFB_WIDTH, EFB_HEIGHT, ObjectBuffer[i]);
 				memset(ObjectBuffer[i], 0, sizeof(ObjectBuffer[i]));
-            }
-        }
+			}
+		}
 
-        swstats.thisFrame.numDrawnObjects++;
-    }
+		swstats.thisFrame.numDrawnObjects++;
+	}
 }
 
 void OnFrameEnd()
 {
-    if (!g_bSkipCurrentFrame)
-    {
-        if (g_SWVideoConfig.bDumpFrames)
-        {
+	if (!g_bSkipCurrentFrame)
+	{
+		if (g_SWVideoConfig.bDumpFrames)
+		{
 			DumpEfb(StringFromFormat("%sframe%i_color.tga",
 						File::GetUserPath(D_DUMPFRAMES_IDX).c_str(), swstats.frameCount).c_str());
 			DumpDepth(StringFromFormat("%sframe%i_depth.tga",
 						File::GetUserPath(D_DUMPFRAMES_IDX).c_str(), swstats.frameCount).c_str());
-        }
-    }
+		}
+	}
 }
 
 }
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/DebugUtil.h b/Source/Plugins/Plugin_VideoSoftware/Src/DebugUtil.h
index efb104458d..89b0db9b72 100644
--- a/Source/Plugins/Plugin_VideoSoftware/Src/DebugUtil.h
+++ b/Source/Plugins/Plugin_VideoSoftware/Src/DebugUtil.h
@@ -1,37 +1,24 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _DEBUGUTIL_H
 #define _DEBUGUTIL_H
 
 namespace DebugUtil
 {
-    void Init();
+	void Init();
 
-    void GetTextureBGRA(u8 *dst, u32 texmap, s32 mip, u32 width, u32 height);
+	void GetTextureBGRA(u8 *dst, u32 texmap, s32 mip, u32 width, u32 height);
 
-    void DumpActiveTextures();
+	void DumpActiveTextures();
 
-    void OnObjectBegin();
-    void OnObjectEnd();
+	void OnObjectBegin();
+	void OnObjectEnd();
 
-    void OnFrameEnd();
+	void OnFrameEnd();
 
-    void DrawObjectBuffer(s16 x, s16 y, u8 *color, int bufferBase, int subBuffer, const char *name);
+	void DrawObjectBuffer(s16 x, s16 y, u8 *color, int bufferBase, int subBuffer, const char *name);
 
 	void DrawTempBuffer(u8 *color, int buffer);
 	void CopyTempBuffer(s16 x, s16 y, int bufferBase, int subBuffer, const char *name);
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/EfbCopy.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/EfbCopy.cpp
index 95566d0e26..303d5a06ad 100644
--- a/Source/Plugins/Plugin_VideoSoftware/Src/EfbCopy.cpp
+++ b/Source/Plugins/Plugin_VideoSoftware/Src/EfbCopy.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "BPMemLoader.h"
 #include "EfbCopy.h"
@@ -30,84 +17,83 @@
 
 namespace EfbCopy
 {
-    void CopyToXfb()
-    {
-        GLInterface->Update(); // just updates the render window position and the backbuffer size	
+	void CopyToXfb()
+	{
+		GLInterface->Update(); // just updates the render window position and the backbuffer size	
 
 		if (!g_SWVideoConfig.bHwRasterizer)
-        {
-            // copy to open gl for rendering
-            EfbInterface::UpdateColorTexture();
-            SWRenderer::DrawTexture(EfbInterface::efbColorTexture, EFB_WIDTH, EFB_HEIGHT);
-        }
+		{
+			// copy to open gl for rendering
+			EfbInterface::UpdateColorTexture();
+			SWRenderer::DrawTexture(EfbInterface::efbColorTexture, EFB_WIDTH, EFB_HEIGHT);
+		}
 
-        SWRenderer::SwapBuffer();
+		SWRenderer::SwapBuffer();
+	}
 
-    }
-
-    void CopyToRam()
-    {
-        if (!g_SWVideoConfig.bHwRasterizer)
+	void CopyToRam()
+	{
+		if (!g_SWVideoConfig.bHwRasterizer)
 		{
 			u8 *dest_ptr = Memory::GetPointer(bpmem.copyTexDest << 5);
 
 			TextureEncoder::Encode(dest_ptr);
 		}
-    }
+	}
 
-    void ClearEfb()
-    {
-        u32 clearColor = (bpmem.clearcolorAR & 0xff) << 24 | bpmem.clearcolorGB << 8 | (bpmem.clearcolorAR & 0xff00) >> 8;
+	void ClearEfb()
+	{
+		u32 clearColor = (bpmem.clearcolorAR & 0xff) << 24 | bpmem.clearcolorGB << 8 | (bpmem.clearcolorAR & 0xff00) >> 8;
 
-        int left   = bpmem.copyTexSrcXY.x;
-	    int top    = bpmem.copyTexSrcXY.y;
-        int right  = left + bpmem.copyTexSrcWH.x;
-	    int bottom = top + bpmem.copyTexSrcWH.y;
+		int left   = bpmem.copyTexSrcXY.x;
+		int top    = bpmem.copyTexSrcXY.y;
+		int right  = left + bpmem.copyTexSrcWH.x;
+		int bottom = top + bpmem.copyTexSrcWH.y;
 
-        for (u16 y = top; y <= bottom; y++)
-        {
-            for (u16 x = left; x <= right; x++)
-            {
-                EfbInterface::SetColor(x, y, (u8*)(&clearColor));
-                EfbInterface::SetDepth(x, y, bpmem.clearZValue);
-            }
-        }
-    }
+		for (u16 y = top; y <= bottom; y++)
+		{
+			for (u16 x = left; x <= right; x++)
+			{
+				EfbInterface::SetColor(x, y, (u8*)(&clearColor));
+				EfbInterface::SetDepth(x, y, bpmem.clearZValue);
+			}
+		}
+	}
 
-    void CopyEfb()
-    {
-        if (bpmem.triggerEFBCopy.copy_to_xfb)
-            DebugUtil::OnFrameEnd();
+	void CopyEfb()
+	{
+		if (bpmem.triggerEFBCopy.copy_to_xfb)
+			DebugUtil::OnFrameEnd();
 
-        if (!g_bSkipCurrentFrame)
-        {
-            if (bpmem.triggerEFBCopy.copy_to_xfb)
-            {
-                CopyToXfb();
-                Core::Callback_VideoCopiedToXFB(true);
+		if (!g_bSkipCurrentFrame)
+		{
+			if (bpmem.triggerEFBCopy.copy_to_xfb)
+			{
+				CopyToXfb();
+				Core::Callback_VideoCopiedToXFB(true);
 
-                swstats.frameCount++;
-            }
-            else
-            {
-                CopyToRam();
-            }
+				swstats.frameCount++;
+			}
+			else
+			{
+				CopyToRam();
+			}
 
-            if (bpmem.triggerEFBCopy.clear)
-            {
-                if (g_SWVideoConfig.bHwRasterizer)
-                    HwRasterizer::Clear();
-                else
-                    ClearEfb();
-            }
-        }
-        else
-        {
-            if (bpmem.triggerEFBCopy.copy_to_xfb)
-            {
-                // no frame rendered but tell that a frame has finished for frame skip counter
-                Core::Callback_VideoCopiedToXFB(false);
-            }
-        }
-    }    
+			if (bpmem.triggerEFBCopy.clear)
+			{
+				if (g_SWVideoConfig.bHwRasterizer)
+					HwRasterizer::Clear();
+				else
+					ClearEfb();
+			}
+		}
+		else
+		{
+			if (bpmem.triggerEFBCopy.copy_to_xfb)
+			{
+				// no frame rendered but tell that a frame has finished for frame skip counter
+				Core::Callback_VideoCopiedToXFB(false);
+			}
+		}
+	}
 }
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/EfbCopy.h b/Source/Plugins/Plugin_VideoSoftware/Src/EfbCopy.h
index 2053a44472..c2352eab34 100644
--- a/Source/Plugins/Plugin_VideoSoftware/Src/EfbCopy.h
+++ b/Source/Plugins/Plugin_VideoSoftware/Src/EfbCopy.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _EFB_COPY_H_
 #define _EFB_COPY_H_
@@ -23,9 +10,9 @@
 
 namespace EfbCopy
 {
-    // Copy the EFB to RAM as a texture format or XFB
-    // Clear the EFB if needed
-    void CopyEfb();    
+	// Copy the EFB to RAM as a texture format or XFB
+	// Clear the EFB if needed
+	void CopyEfb();
 }
 
 
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/EfbInterface.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/EfbInterface.cpp
index 77d87988c8..3d8ea0f9f1 100644
--- a/Source/Plugins/Plugin_VideoSoftware/Src/EfbInterface.cpp
+++ b/Source/Plugins/Plugin_VideoSoftware/Src/EfbInterface.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "Common.h"
 
@@ -29,17 +16,17 @@ u8 efb[EFB_WIDTH*EFB_HEIGHT*6];
 namespace EfbInterface
 {
 
-    u8 efbColorTexture[EFB_WIDTH*EFB_HEIGHT*4];
+	u8 efbColorTexture[EFB_WIDTH*EFB_HEIGHT*4];
 
-    inline u32 GetColorOffset(u16 x, u16 y)
-    {
-        return (x + y * EFB_WIDTH) * 3;
-    }
+	inline u32 GetColorOffset(u16 x, u16 y)
+	{
+		return (x + y * EFB_WIDTH) * 3;
+	}
 
-    inline u32 GetDepthOffset(u16 x, u16 y)
-    {
-        return (x + y * EFB_WIDTH) * 3 + DEPTH_BUFFER_START;
-    }
+	inline u32 GetDepthOffset(u16 x, u16 y)
+	{
+		return (x + y * EFB_WIDTH) * 3 + DEPTH_BUFFER_START;
+	}
 
 	void DoState(PointerWrap &p)
 	{
@@ -47,45 +34,45 @@ namespace EfbInterface
 		p.DoArray(efbColorTexture, EFB_WIDTH*EFB_HEIGHT*4);
 	}
 
-    void SetPixelAlphaOnly(u32 offset, u8 a)
-    {
-         switch (bpmem.zcontrol.pixel_format)
-        {
-        case PIXELFMT_RGB8_Z24:
-        case PIXELFMT_Z24:
-        case PIXELFMT_RGB565_Z16:
-            // do nothing
-            break;
-        case PIXELFMT_RGBA6_Z24:
-            {
+	void SetPixelAlphaOnly(u32 offset, u8 a)
+	{
+			switch (bpmem.zcontrol.pixel_format)
+		{
+		case PIXELFMT_RGB8_Z24:
+		case PIXELFMT_Z24:
+		case PIXELFMT_RGB565_Z16:
+			// do nothing
+			break;
+		case PIXELFMT_RGBA6_Z24:
+			{
 				u32 a32 = a;
 				u32 *dst = (u32*)&efb[offset];
 				u32 val = *dst & 0xffffffc0;
 				val |= (a32 >> 2) & 0x0000003f;
 				*dst = val;
-            }
-            break;        
-        default:
-            ERROR_LOG(VIDEO, "Unsupported pixel format: %i", bpmem.zcontrol.pixel_format);
-        }
-    }
+			}
+			break;
+		default:
+			ERROR_LOG(VIDEO, "Unsupported pixel format: %i", bpmem.zcontrol.pixel_format);
+		}
+	}
 
-    void SetPixelColorOnly(u32 offset, u8 *rgb)
-    {
-        switch (bpmem.zcontrol.pixel_format)
-        {
-        case PIXELFMT_RGB8_Z24:
-        case PIXELFMT_Z24:
-            {
+	void SetPixelColorOnly(u32 offset, u8 *rgb)
+	{
+		switch (bpmem.zcontrol.pixel_format)
+		{
+		case PIXELFMT_RGB8_Z24:
+		case PIXELFMT_Z24:
+			{
 				u32 src = *(u32*)rgb;
 				u32 *dst = (u32*)&efb[offset];
 				u32 val = *dst & 0xff000000;
 				val |= src >> 8;
 				*dst = val;
-            }
-            break;
-        case PIXELFMT_RGBA6_Z24:
-            {
+			}
+			break;
+		case PIXELFMT_RGBA6_Z24:
+			{
 				u32 src = *(u32*)rgb;
 				u32 *dst = (u32*)&efb[offset];
 				u32 val = *dst & 0xff00003f;
@@ -93,39 +80,39 @@ namespace EfbInterface
 				val |= (src >> 6) & 0x0003f000;	// green
 				val |= (src >> 8) & 0x00fc0000;	// red
 				*dst = val;
-            }
-            break;
-        case PIXELFMT_RGB565_Z16:
-            {
-                INFO_LOG(VIDEO, "PIXELFMT_RGB565_Z16 is not supported correctly yet");
-                u32 src = *(u32*)rgb;
+			}
+			break;
+		case PIXELFMT_RGB565_Z16:
+			{
+				INFO_LOG(VIDEO, "PIXELFMT_RGB565_Z16 is not supported correctly yet");
+				u32 src = *(u32*)rgb;
 				u32 *dst = (u32*)&efb[offset];
 				u32 val = *dst & 0xff000000;
 				val |= src >> 8;
 				*dst = val;
-            }
-            break;
-        default:
-            ERROR_LOG(VIDEO, "Unsupported pixel format: %i", bpmem.zcontrol.pixel_format);
-        }
-    }
+			}
+			break;
+		default:
+			ERROR_LOG(VIDEO, "Unsupported pixel format: %i", bpmem.zcontrol.pixel_format);
+		}
+	}
 
-    void SetPixelAlphaColor(u32 offset, u8 *color)
-    {
-         switch (bpmem.zcontrol.pixel_format)
-        {
-        case PIXELFMT_RGB8_Z24:
-        case PIXELFMT_Z24:
-            {
-                u32 src = *(u32*)color;
+	void SetPixelAlphaColor(u32 offset, u8 *color)
+	{
+			switch (bpmem.zcontrol.pixel_format)
+		{
+		case PIXELFMT_RGB8_Z24:
+		case PIXELFMT_Z24:
+			{
+				u32 src = *(u32*)color;
 				u32 *dst = (u32*)&efb[offset];
 				u32 val = *dst & 0xff000000;
 				val |= src >> 8;
 				*dst = val;
-            }
-            break;
-        case PIXELFMT_RGBA6_Z24:
-            {
+			}
+			break;
+		case PIXELFMT_RGBA6_Z24:
+			{
 				u32 src = *(u32*)color;
 				u32 *dst = (u32*)&efb[offset];
 				u32 val = *dst & 0xff000000;
@@ -134,332 +121,341 @@ namespace EfbInterface
 				val |= (src >> 6) & 0x0003f000;	// green
 				val |= (src >> 8) & 0x00fc0000;	// red
 				*dst = val;
-            }
-            break;
-        case PIXELFMT_RGB565_Z16:
-            {
-                INFO_LOG(VIDEO, "PIXELFMT_RGB565_Z16 is not supported correctly yet");
+			}
+			break;
+		case PIXELFMT_RGB565_Z16:
+			{
+				INFO_LOG(VIDEO, "PIXELFMT_RGB565_Z16 is not supported correctly yet");
 				u32 src = *(u32*)color;
 				u32 *dst = (u32*)&efb[offset];
 				u32 val = *dst & 0xff000000;
 				val |= src >> 8;
 				*dst = val;
-            }
-            break;
-        default:
-            ERROR_LOG(VIDEO, "Unsupported pixel format: %i", bpmem.zcontrol.pixel_format);
-        }
-    }
+			}
+			break;
+		default:
+			ERROR_LOG(VIDEO, "Unsupported pixel format: %i", bpmem.zcontrol.pixel_format);
+		}
+	}
 
-     void GetPixelColor(u32 offset, u8 *color)
-    {
-        switch (bpmem.zcontrol.pixel_format)
-        {
-        case PIXELFMT_RGB8_Z24:
-        case PIXELFMT_Z24:
-            {
-    			u32 src = *(u32*)&efb[offset];
+		void GetPixelColor(u32 offset, u8 *color)
+	{
+		switch (bpmem.zcontrol.pixel_format)
+		{
+		case PIXELFMT_RGB8_Z24:
+		case PIXELFMT_Z24:
+			{
+				u32 src = *(u32*)&efb[offset];
 				u32 *dst = (u32*)color;
 				u32 val = 0xff | ((src & 0x00ffffff) << 8);
 				*dst = val;
-            }
-            break;
-        case PIXELFMT_RGBA6_Z24:
-            {
+			}
+			break;
+		case PIXELFMT_RGBA6_Z24:
+			{
 				u32 src = *(u32*)&efb[offset];
 				color[ALP_C] = Convert6To8(src & 0x3f);
 				color[BLU_C] = Convert6To8((src >> 6) & 0x3f);
 				color[GRN_C] = Convert6To8((src >> 12) & 0x3f);
 				color[RED_C] = Convert6To8((src >> 18) & 0x3f);
-            }
-            break;
-        case PIXELFMT_RGB565_Z16:
-            {
-                INFO_LOG(VIDEO, "PIXELFMT_RGB565_Z16 is not supported correctly yet");
+			}
+			break;
+		case PIXELFMT_RGB565_Z16:
+			{
+				INFO_LOG(VIDEO, "PIXELFMT_RGB565_Z16 is not supported correctly yet");
 				u32 src = *(u32*)&efb[offset];
 				u32 *dst = (u32*)color;
 				u32 val = 0xff | ((src & 0x00ffffff) << 8);
 				*dst = val;
-            }
-            break;
-        default:
-            ERROR_LOG(VIDEO, "Unsupported pixel format: %i", bpmem.zcontrol.pixel_format);
-        }
-    }
+			}
+			break;
+		default:
+			ERROR_LOG(VIDEO, "Unsupported pixel format: %i", bpmem.zcontrol.pixel_format);
+		}
+	}
 
-    void SetPixelDepth(u32 offset, u32 depth)
-    {
-        switch (bpmem.zcontrol.pixel_format)
-        {
-        case PIXELFMT_RGB8_Z24:
-        case PIXELFMT_RGBA6_Z24:
-        case PIXELFMT_Z24:
-            {
-    			u32 *dst = (u32*)&efb[offset];
+	void SetPixelDepth(u32 offset, u32 depth)
+	{
+		switch (bpmem.zcontrol.pixel_format)
+		{
+		case PIXELFMT_RGB8_Z24:
+		case PIXELFMT_RGBA6_Z24:
+		case PIXELFMT_Z24:
+			{
+				u32 *dst = (u32*)&efb[offset];
 				u32 val = *dst & 0xff000000;
 				val |= depth & 0x00ffffff;
 				*dst = val;				
-            }
-            break;
-        case PIXELFMT_RGB565_Z16:
-            {
-                INFO_LOG(VIDEO, "PIXELFMT_RGB565_Z16 is not supported correctly yet");
+			}
+			break;
+		case PIXELFMT_RGB565_Z16:
+			{
+				INFO_LOG(VIDEO, "PIXELFMT_RGB565_Z16 is not supported correctly yet");
 				u32 *dst = (u32*)&efb[offset];
 				u32 val = *dst & 0xff000000;
 				val |= depth & 0x00ffffff;
 				*dst = val;		
-            }
-            break;
-        default:
-            ERROR_LOG(VIDEO, "Unsupported pixel format: %i", bpmem.zcontrol.pixel_format);
-        }        
-    }
+			}
+			break;
+		default:
+			ERROR_LOG(VIDEO, "Unsupported pixel format: %i", bpmem.zcontrol.pixel_format);
+		}
+	}
 
-     u32 GetPixelDepth(u32 offset)
-    {
-        u32 depth = 0;
+		u32 GetPixelDepth(u32 offset)
+	{
+		u32 depth = 0;
 
-        switch (bpmem.zcontrol.pixel_format)
-        {
-        case PIXELFMT_RGB8_Z24:
-        case PIXELFMT_RGBA6_Z24:
-        case PIXELFMT_Z24:
-            {
+		switch (bpmem.zcontrol.pixel_format)
+		{
+		case PIXELFMT_RGB8_Z24:
+		case PIXELFMT_RGBA6_Z24:
+		case PIXELFMT_Z24:
+			{
 				depth = (*(u32*)&efb[offset]) & 0x00ffffff;
-            }
-            break;
-        case PIXELFMT_RGB565_Z16:
-            {
-                INFO_LOG(VIDEO, "PIXELFMT_RGB565_Z16 is not supported correctly yet");
+			}
+			break;
+		case PIXELFMT_RGB565_Z16:
+			{
+				INFO_LOG(VIDEO, "PIXELFMT_RGB565_Z16 is not supported correctly yet");
 				depth = (*(u32*)&efb[offset]) & 0x00ffffff;
-            }
-            break;
-        default:
-            ERROR_LOG(VIDEO, "Unsupported pixel format: %i", bpmem.zcontrol.pixel_format);
-        }
+			}
+			break;
+		default:
+			ERROR_LOG(VIDEO, "Unsupported pixel format: %i", bpmem.zcontrol.pixel_format);
+		}
 
-        return depth;
-    }
+		return depth;
+	}
 
-    u32 GetSourceFactor(u8 *srcClr, u8 *dstClr, int mode)
-    {
-        switch (mode) {
-            case 0:  // zero
-                return 0;
-            case 1:  // one
-                return 0xffffffff;
-            case 2:  // dstclr
-                return *(u32*)dstClr;
-            case 3:  // invdstclr
-                return 0xffffffff - *(u32*)dstClr;                     
-            case 4:  // srcalpha
-                {
-                    u8 alpha = srcClr[ALP_C];
-                    u32 factor = alpha << 24 | alpha << 16 | alpha << 8 | alpha;
-                    return factor;
-                }
-            case 5:  // invsrcalpha
-                {
-                    u8 alpha = 0xff - srcClr[ALP_C];
-                    u32 factor = alpha << 24 | alpha << 16 | alpha << 8 | alpha;
-                    return factor;
-                }
-            case 6:  // dstalpha
-                {
-                    u8 alpha = dstClr[ALP_C];
-                    u32 factor = alpha << 24 | alpha << 16 | alpha << 8 | alpha;
-                    return factor;
-                }
-            case 7:  // invdstalpha
-                {
-                    u8 alpha = 0xff - dstClr[ALP_C];
-                    u32 factor = alpha << 24 | alpha << 16 | alpha << 8 | alpha;
-                    return factor;
-                }
-        }
+	u32 GetSourceFactor(u8 *srcClr, u8 *dstClr, int mode)
+	{
+		switch (mode) {
+			case 0:  // zero
+				return 0;
+			case 1:  // one
+				return 0xffffffff;
+			case 2:  // dstclr
+				return *(u32*)dstClr;
+			case 3:  // invdstclr
+				return 0xffffffff - *(u32*)dstClr;
+			case 4:  // srcalpha
+				{
+					u8 alpha = srcClr[ALP_C];
+					u32 factor = alpha << 24 | alpha << 16 | alpha << 8 | alpha;
+					return factor;
+				}
+			case 5:  // invsrcalpha
+				{
+					u8 alpha = 0xff - srcClr[ALP_C];
+					u32 factor = alpha << 24 | alpha << 16 | alpha << 8 | alpha;
+					return factor;
+				}
+			case 6:  // dstalpha
+				{
+					u8 alpha = dstClr[ALP_C];
+					u32 factor = alpha << 24 | alpha << 16 | alpha << 8 | alpha;
+					return factor;
+				}
+			case 7:  // invdstalpha
+				{
+					u8 alpha = 0xff - dstClr[ALP_C];
+					u32 factor = alpha << 24 | alpha << 16 | alpha << 8 | alpha;
+					return factor;
+				}
+		}
 
-        return 0;
-    }
+		return 0;
+	}
 
-    u32 GetDestinationFactor(u8 *srcClr, u8 *dstClr, int mode)
-    {
-        switch (mode) {
-            case 0:  // zero
-                return 0;
-            case 1:  // one
-                return 0xffffffff;
-             case 2:  // srcclr
-                return *(u32*)srcClr;
-            case 3:  // invsrcclr
-                return 0xffffffff - *(u32*)srcClr;            
-            case 4:  // srcalpha
-                {
-                    u8 alpha = srcClr[ALP_C];
-                    u32 factor = alpha << 24 | alpha << 16 | alpha << 8 | alpha;
-                    return factor;
-                }
-            case 5:  // invsrcalpha
-                {
-                    u8 alpha = 0xff - srcClr[ALP_C];
-                    u32 factor = alpha << 24 | alpha << 16 | alpha << 8 | alpha;
-                    return factor;
-                }
-            case 6:  // dstalpha
-                {
-                    u8 alpha = dstClr[ALP_C] & 0xff;
-                    u32 factor = alpha << 24 | alpha << 16 | alpha << 8 | alpha;
-                    return factor;
-                }
-            case 7:  // invdstalpha
-                {
-                    u8 alpha = 0xff - dstClr[ALP_C];
-                    u32 factor = alpha << 24 | alpha << 16 | alpha << 8 | alpha;
-                    return factor;
-                }
-        }
+	u32 GetDestinationFactor(u8 *srcClr, u8 *dstClr, int mode)
+	{
+		switch (mode) {
+			case 0:  // zero
+				return 0;
+			case 1:  // one
+				return 0xffffffff;
+				case 2:  // srcclr
+				return *(u32*)srcClr;
+			case 3:  // invsrcclr
+				return 0xffffffff - *(u32*)srcClr;
+			case 4:  // srcalpha
+				{
+					u8 alpha = srcClr[ALP_C];
+					u32 factor = alpha << 24 | alpha << 16 | alpha << 8 | alpha;
+					return factor;
+				}
+			case 5:  // invsrcalpha
+				{
+					u8 alpha = 0xff - srcClr[ALP_C];
+					u32 factor = alpha << 24 | alpha << 16 | alpha << 8 | alpha;
+					return factor;
+				}
+			case 6:  // dstalpha
+				{
+					u8 alpha = dstClr[ALP_C] & 0xff;
+					u32 factor = alpha << 24 | alpha << 16 | alpha << 8 | alpha;
+					return factor;
+				}
+			case 7:  // invdstalpha
+				{
+					u8 alpha = 0xff - dstClr[ALP_C];
+					u32 factor = alpha << 24 | alpha << 16 | alpha << 8 | alpha;
+					return factor;
+				}
+		}
 
-        return 0;
-    }
+		return 0;
+	}
 
-    void BlendColor(u8 *srcClr, u8 *dstClr)
-    {
-        u32 srcFactor = GetSourceFactor(srcClr, dstClr, bpmem.blendmode.srcfactor);
-        u32 dstFactor = GetDestinationFactor(srcClr, dstClr, bpmem.blendmode.dstfactor);
+	void BlendColor(u8 *srcClr, u8 *dstClr)
+	{
+		u32 srcFactor = GetSourceFactor(srcClr, dstClr, bpmem.blendmode.srcfactor);
+		u32 dstFactor = GetDestinationFactor(srcClr, dstClr, bpmem.blendmode.dstfactor);
 
-        for (int i = 0; i < 4; i++)
-        {
-            // add MSB of factors to make their range 0 -> 256
-            u32 sf = (srcFactor & 0xff);
-            sf += sf >> 7;
-            
-            u32 df = (dstFactor & 0xff);
-            df += df >> 7;
+		for (int i = 0; i < 4; i++)
+		{
+			// add MSB of factors to make their range 0 -> 256
+			u32 sf = (srcFactor & 0xff);
+			sf += sf >> 7;
 
-            u32 color = (srcClr[i] * sf + dstClr[i] * df) >> 8;
-            dstClr[i] = (color>255)?255:color;
+			u32 df = (dstFactor & 0xff);
+			df += df >> 7;
 
-            dstFactor >>= 8;
-            srcFactor >>= 8;
-        }
-    }
+			u32 color = (srcClr[i] * sf + dstClr[i] * df) >> 8;
+			dstClr[i] = (color>255)?255:color;
 
-    void LogicBlend(u32 srcClr, u32 &dstClr, int op)
-    {
-        switch (op) {
-            case 0:  // clear
-                dstClr = 0;
-                break;
-            case 1:  // and
-                dstClr = srcClr & dstClr;
-                break;
-            case 2:  // revand
-                dstClr = srcClr & (~dstClr);
-                break;
-            case 3:  // copy
-                dstClr = srcClr;
-                break;
-            case 4:  // invand
-                dstClr = (~srcClr) & dstClr;
-                break;
-            case 5:  // noop
+			dstFactor >>= 8;
+			srcFactor >>= 8;
+		}
+	}
+
+	void LogicBlend(u32 srcClr, u32 &dstClr, int op)
+	{
+		switch (op)
+		{
+			case 0:  // clear
+				dstClr = 0;
+				break;
+			case 1:  // and
+				dstClr = srcClr & dstClr;
+				break;
+			case 2:  // revand
+				dstClr = srcClr & (~dstClr);
+				break;
+			case 3:  // copy
+				dstClr = srcClr;
+				break;
+			case 4:  // invand
+				dstClr = (~srcClr) & dstClr;
+				break;
+			case 5:  // noop
 		// Do nothing
-                break;
-            case 6:  // xor
-                dstClr = srcClr ^ dstClr;
-                break;
-            case 7:  // or
-                dstClr = srcClr | dstClr;
-                break;
-            case 8:  // nor
-                dstClr = ~(srcClr | dstClr);
-                break;
-            case 9:  // equiv
-                dstClr = ~(srcClr ^ dstClr);
-                break;
-            case 10: // inv
-                dstClr = ~dstClr;
-                break;
-            case 11: // revor
-                dstClr = srcClr | (~dstClr);
-                break;
-            case 12: // invcopy
-                dstClr = ~srcClr;
-                break;
-            case 13: // invor
-                dstClr = (~srcClr) | dstClr;
-                break;
-            case 14: // nand
-                dstClr = ~(srcClr & dstClr);
-                break;
-            case 15: // set
-                dstClr = 0xffffffff;
-                break;
-        }
-    }
+				break;
+			case 6:  // xor
+				dstClr = srcClr ^ dstClr;
+				break;
+			case 7:  // or
+				dstClr = srcClr | dstClr;
+				break;
+			case 8:  // nor
+				dstClr = ~(srcClr | dstClr);
+				break;
+			case 9:  // equiv
+				dstClr = ~(srcClr ^ dstClr);
+				break;
+			case 10: // inv
+				dstClr = ~dstClr;
+				break;
+			case 11: // revor
+				dstClr = srcClr | (~dstClr);
+				break;
+			case 12: // invcopy
+				dstClr = ~srcClr;
+				break;
+			case 13: // invor
+				dstClr = (~srcClr) | dstClr;
+				break;
+			case 14: // nand
+				dstClr = ~(srcClr & dstClr);
+				break;
+			case 15: // set
+				dstClr = 0xffffffff;
+				break;
+		}
+	}
 
-    void SubtractBlend(u8 *srcClr, u8 *dstClr)
-    {
-        for (int i = 0; i < 4; i++)
-        {
-            int c = (int)dstClr[i] - (int)srcClr[i];
-            dstClr[i] = (c < 0)?0:c;
-        }
-    }
+	void SubtractBlend(u8 *srcClr, u8 *dstClr)
+	{
+		for (int i = 0; i < 4; i++)
+		{
+			int c = (int)dstClr[i] - (int)srcClr[i];
+			dstClr[i] = (c < 0)?0:c;
+		}
+	}
 
-    void BlendTev(u16 x, u16 y, u8 *color)
-    {
-        u32 dstClr;
-        u32 offset = GetColorOffset(x, y);
+	void BlendTev(u16 x, u16 y, u8 *color)
+	{
+		u32 dstClr;
+		u32 offset = GetColorOffset(x, y);
 
-        u8 *dstClrPtr = (u8*)&dstClr;
+		u8 *dstClrPtr = (u8*)&dstClr;
 
-        GetPixelColor(offset, dstClrPtr);        
+		GetPixelColor(offset, dstClrPtr);
 
-        if (bpmem.blendmode.blendenable)
-        {
-            if (bpmem.blendmode.subtract)
-                SubtractBlend(color, dstClrPtr);
-            else
-                BlendColor(color, dstClrPtr);
-        }
-        else if (bpmem.blendmode.logicopenable)
-            LogicBlend(*((u32*)color), dstClr, bpmem.blendmode.logicmode);
-        else
-            dstClrPtr = color;
+		if (bpmem.blendmode.blendenable)
+		{
+			if (bpmem.blendmode.subtract)
+				SubtractBlend(color, dstClrPtr);
+			else
+				BlendColor(color, dstClrPtr);
+		}
+		else if (bpmem.blendmode.logicopenable)
+		{
+			LogicBlend(*((u32*)color), dstClr, bpmem.blendmode.logicmode);
+		}
+		else
+		{
+			dstClrPtr = color;
+		}
 
-        if (bpmem.dstalpha.enable)
-            dstClrPtr[ALP_C] = bpmem.dstalpha.alpha;
+		if (bpmem.dstalpha.enable)
+			dstClrPtr[ALP_C] = bpmem.dstalpha.alpha;
 
 		if (bpmem.blendmode.colorupdate)
-        {
-            if (bpmem.blendmode.alphaupdate)
-                SetPixelAlphaColor(offset, dstClrPtr);
-            else
-                SetPixelColorOnly(offset, dstClrPtr);
-        }
-        else if (bpmem.blendmode.alphaupdate)
-            SetPixelAlphaOnly(offset, dstClrPtr[ALP_C]);
+		{
+			if (bpmem.blendmode.alphaupdate)
+				SetPixelAlphaColor(offset, dstClrPtr);
+			else
+				SetPixelColorOnly(offset, dstClrPtr);
+		}
+		else if (bpmem.blendmode.alphaupdate)
+		{
+			SetPixelAlphaOnly(offset, dstClrPtr[ALP_C]);
+		}
 
-        // branchless bounding box update
-        SWPixelEngine::pereg.boxLeft = SWPixelEngine::pereg.boxLeft>x?x:SWPixelEngine::pereg.boxLeft;
-        SWPixelEngine::pereg.boxRight = SWPixelEngine::pereg.boxRight<x?x:SWPixelEngine::pereg.boxRight;
-        SWPixelEngine::pereg.boxTop = SWPixelEngine::pereg.boxTop>y?y:SWPixelEngine::pereg.boxTop;
-        SWPixelEngine::pereg.boxBottom = SWPixelEngine::pereg.boxBottom<y?y:SWPixelEngine::pereg.boxBottom;
-    }
+		// branchless bounding box update
+		SWPixelEngine::pereg.boxLeft = SWPixelEngine::pereg.boxLeft>x?x:SWPixelEngine::pereg.boxLeft;
+		SWPixelEngine::pereg.boxRight = SWPixelEngine::pereg.boxRight<x?x:SWPixelEngine::pereg.boxRight;
+		SWPixelEngine::pereg.boxTop = SWPixelEngine::pereg.boxTop>y?y:SWPixelEngine::pereg.boxTop;
+		SWPixelEngine::pereg.boxBottom = SWPixelEngine::pereg.boxBottom<y?y:SWPixelEngine::pereg.boxBottom;
+	}
 
-    void SetColor(u16 x, u16 y, u8 *color)
-    {
-        u32 offset = GetColorOffset(x, y);
-        if (bpmem.blendmode.colorupdate)
-        {
-            if (bpmem.blendmode.alphaupdate)
-                SetPixelAlphaColor(offset, color);
-            else
-                SetPixelColorOnly(offset, color);
-        }
-        else if (bpmem.blendmode.alphaupdate)
-            SetPixelAlphaOnly(offset, color[ALP_C]);
-    }
+	void SetColor(u16 x, u16 y, u8 *color)
+	{
+		u32 offset = GetColorOffset(x, y);
+		if (bpmem.blendmode.colorupdate)
+		{
+			if (bpmem.blendmode.alphaupdate)
+				SetPixelAlphaColor(offset, color);
+			else
+				SetPixelColorOnly(offset, color);
+		}
+		else if (bpmem.blendmode.alphaupdate)
+		{
+			SetPixelAlphaOnly(offset, color[ALP_C]);
+		}
+	}
 
 	void SetDepth(u16 x, u16 y, u32 depth)
 	{
@@ -467,87 +463,87 @@ namespace EfbInterface
 			SetPixelDepth(GetDepthOffset(x, y), depth);
 	}
 
-    void GetColor(u16 x, u16 y, u8 *color)
-    {
-        u32 offset = GetColorOffset(x, y);
-        GetPixelColor(offset, color);
-    }
+	void GetColor(u16 x, u16 y, u8 *color)
+	{
+		u32 offset = GetColorOffset(x, y);
+		GetPixelColor(offset, color);
+	}
 
-    u32 GetDepth(u16 x, u16 y)
-    {
-        u32 offset = GetDepthOffset(x, y);
-        return GetPixelDepth(offset);        
-    }
+	u32 GetDepth(u16 x, u16 y)
+	{
+		u32 offset = GetDepthOffset(x, y);
+		return GetPixelDepth(offset);
+	}
 
-    u8 *GetPixelPointer(u16 x, u16 y, bool depth)
-    {
-        if (depth)
-            return &efb[GetDepthOffset(x, y)];
-        return &efb[GetColorOffset(x, y)];
-    }
+	u8 *GetPixelPointer(u16 x, u16 y, bool depth)
+	{
+		if (depth)
+			return &efb[GetDepthOffset(x, y)];
+		return &efb[GetColorOffset(x, y)];
+	}
 
-    void UpdateColorTexture()
-    {
-        u32 color;
+	void UpdateColorTexture()
+	{
+		u32 color;
 		u8* colorPtr = (u8*)&color;
 		u32* texturePtr = (u32*)efbColorTexture;
-        u32 textureAddress = 0;
-        u32 efbOffset = 0;
-        
-        for (u16 y = 0; y < EFB_HEIGHT; y++)
-        {
-            for (u16 x = 0; x < EFB_WIDTH; x++)
-            {
-                GetPixelColor(efbOffset, colorPtr);
-                efbOffset += 3;
+		u32 textureAddress = 0;
+		u32 efbOffset = 0;
+
+		for (u16 y = 0; y < EFB_HEIGHT; y++)
+		{
+			for (u16 x = 0; x < EFB_WIDTH; x++)
+			{
+				GetPixelColor(efbOffset, colorPtr);
+				efbOffset += 3;
 				texturePtr[textureAddress++] = Common::swap32(color);  // ABGR->RGBA
-            }
-        }
-    }
+			}
+		}
+	}
 
-    bool ZCompare(u16 x, u16 y, u32 z)
-    {
-        u32 offset = GetDepthOffset(x, y);        
-        u32 depth = GetPixelDepth(offset);
+	bool ZCompare(u16 x, u16 y, u32 z)
+	{
+		u32 offset = GetDepthOffset(x, y);
+		u32 depth = GetPixelDepth(offset);
 
-        bool pass;
+		bool pass;
 
-        switch (bpmem.zmode.func)
-        {
-            case COMPARE_NEVER:
-                pass = false;
-                break;
-            case COMPARE_LESS:
-                pass = z < depth;
-                break;
-            case COMPARE_EQUAL:
-                pass = z == depth;
-                break;
-            case COMPARE_LEQUAL:
-                pass = z <= depth;
-                break;
-            case COMPARE_GREATER:
-                pass = z > depth;
-                break;
-            case COMPARE_NEQUAL:
-                pass = z != depth;
-                break;
-            case COMPARE_GEQUAL:
-                pass = z >= depth;
-                break;
-            case COMPARE_ALWAYS:
-                pass = true;
-                break;
-            default:
-                pass = false;
-                ERROR_LOG(VIDEO, "Bad Z compare mode %i", bpmem.zmode.func);
-        }
+		switch (bpmem.zmode.func)
+		{
+			case COMPARE_NEVER:
+				pass = false;
+				break;
+			case COMPARE_LESS:
+				pass = z < depth;
+				break;
+			case COMPARE_EQUAL:
+				pass = z == depth;
+				break;
+			case COMPARE_LEQUAL:
+				pass = z <= depth;
+				break;
+			case COMPARE_GREATER:
+				pass = z > depth;
+				break;
+			case COMPARE_NEQUAL:
+				pass = z != depth;
+				break;
+			case COMPARE_GEQUAL:
+				pass = z >= depth;
+				break;
+			case COMPARE_ALWAYS:
+				pass = true;
+				break;
+			default:
+				pass = false;
+				ERROR_LOG(VIDEO, "Bad Z compare mode %i", bpmem.zmode.func);
+		}
 
-        if (pass && bpmem.zmode.updateenable)
-        {
-            SetPixelDepth(offset, z);
-        }
-    
-        return pass;
-    }
+		if (pass && bpmem.zmode.updateenable)
+		{
+			SetPixelDepth(offset, z);
+		}
+
+		return pass;
+	}
 }
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/EfbInterface.h b/Source/Plugins/Plugin_VideoSoftware/Src/EfbInterface.h
index fdad69567c..987c243bfd 100644
--- a/Source/Plugins/Plugin_VideoSoftware/Src/EfbInterface.h
+++ b/Source/Plugins/Plugin_VideoSoftware/Src/EfbInterface.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _EFB_INTERFACE_H_
 #define _EFB_INTERFACE_H_
@@ -22,32 +9,32 @@
 
 namespace EfbInterface
 {
-    const int DEPTH_BUFFER_START = EFB_WIDTH * EFB_HEIGHT * 3;
+	const int DEPTH_BUFFER_START = EFB_WIDTH * EFB_HEIGHT * 3;
 
 	enum { ALP_C, BLU_C, GRN_C, RED_C };
 
-    // color order is ABGR in order to emulate RGBA on little-endian hardware
+	// color order is ABGR in order to emulate RGBA on little-endian hardware
 
-    // does full blending of an incoming pixel
-    void BlendTev(u16 x, u16 y, u8 *color);
+	// does full blending of an incoming pixel
+	void BlendTev(u16 x, u16 y, u8 *color);
 
-    // compare z at location x,y
-    // writes it if it passes
-    // returns result of compare.
-    bool ZCompare(u16 x, u16 y, u32 z);
+	// compare z at location x,y
+	// writes it if it passes
+	// returns result of compare.
+	bool ZCompare(u16 x, u16 y, u32 z);
 
-    // sets the color and alpha
-    void SetColor(u16 x, u16 y, u8 *color);
-    void SetDepth(u16 x, u16 y, u32 depth);
+	// sets the color and alpha
+	void SetColor(u16 x, u16 y, u8 *color);
+	void SetDepth(u16 x, u16 y, u32 depth);
 
-    void GetColor(u16 x, u16 y, u8 *color);
-    u32 GetDepth(u16 x, u16 y);
+	void GetColor(u16 x, u16 y, u8 *color);
+	u32 GetDepth(u16 x, u16 y);
 
-    u8* GetPixelPointer(u16 x, u16 y, bool depth);
+	u8* GetPixelPointer(u16 x, u16 y, bool depth);
 
-    void UpdateColorTexture();
-    extern u8 efbColorTexture[EFB_WIDTH*EFB_HEIGHT*4]; // RGBA format
+	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 a1fd7c4733..5e3e4a4ae0 100644
--- a/Source/Plugins/Plugin_VideoSoftware/Src/HwRasterizer.cpp
+++ b/Source/Plugins/Plugin_VideoSoftware/Src/HwRasterizer.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "Common.h"
 #include "MemoryUtil.h"
@@ -369,10 +356,10 @@ namespace HwRasterizer
 
 		// 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)
+		//	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 9f07a44b19..250b951175 100644
--- a/Source/Plugins/Plugin_VideoSoftware/Src/HwRasterizer.h
+++ b/Source/Plugins/Plugin_VideoSoftware/Src/HwRasterizer.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _HW_RASTERIZER_H
 #define _HW_RASTERIZER_H
@@ -27,37 +14,37 @@ struct OutputVertexData;
 
 namespace HwRasterizer
 {
-    void Init();
+	void Init();
 	void Shutdown();
-		
+
 	void Prepare();
 
-    void BeginTriangles();
-    void EndTriangles();
+	void BeginTriangles();
+	void EndTriangles();
 
-    void DrawTriangleFrontFace(OutputVertexData *v0, OutputVertexData *v1, OutputVertexData *v2);
+	void DrawTriangleFrontFace(OutputVertexData *v0, OutputVertexData *v1, OutputVertexData *v2);
 
-    void Clear();
+	void Clear();
 
-    struct TexCacheEntry
-    {
-        TexImage0 texImage0; 
-        TexImage1 texImage1; 
-        TexImage2 texImage2; 
-        TexImage3 texImage3; 
-        TexTLUT texTlut;
+	struct TexCacheEntry
+	{
+		TexImage0 texImage0; 
+		TexImage1 texImage1; 
+		TexImage2 texImage2; 
+		TexImage3 texImage3; 
+		TexTLUT texTlut;
 
-        GLuint texture;
+		GLuint texture;
 
-        TexCacheEntry();
+		TexCacheEntry();
 
-        void Create();
-        void Destroy();
-        void Update();
-    };
+		void Create();
+		void Destroy();
+		void Update();
+	};
 
-    typedef std::map<u32, TexCacheEntry> TextureCache;
-    static TextureCache textures;
+	typedef std::map<u32, TexCacheEntry> TextureCache;
+	static TextureCache textures;
 }
 
 #endif 
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/NativeVertexFormat.h b/Source/Plugins/Plugin_VideoSoftware/Src/NativeVertexFormat.h
index e2d87e207e..2f0213d469 100644
--- a/Source/Plugins/Plugin_VideoSoftware/Src/NativeVertexFormat.h
+++ b/Source/Plugins/Plugin_VideoSoftware/Src/NativeVertexFormat.h
@@ -1,19 +1,6 @@
-// Copyright (C) 2003-2008 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _NATIVEVERTEXFORMAT_H
 #define _NATIVEVERTEXFORMAT_H
@@ -39,13 +26,13 @@ struct Vec4
 
 struct InputVertexData
 {
-    u8 posMtx;
-    u8 texMtx[8];
+	u8 posMtx;
+	u8 texMtx[8];
 
-    Vec3 position;    
-    Vec3 normal[3];
-    u8 color[2][4];
-    float texCoords[8][2];
+	Vec3 position;
+	Vec3 normal[3];
+	u8 color[2][4];
+	float texCoords[8][2];
 };
 
 struct OutputVertexData
@@ -54,45 +41,45 @@ struct OutputVertexData
 	enum { RED_C, GRN_C, BLU_C, ALP_C };
 
 	Vec3 mvPosition;
-    Vec4 projectedPosition;
-    Vec3 screenPosition;
-    Vec3 normal[3];
-    u8 color[2][4];
-    Vec3 texCoords[8];
+	Vec4 projectedPosition;
+	Vec3 screenPosition;
+	Vec3 normal[3];
+	u8 color[2][4];
+	Vec3 texCoords[8];
 
-    void Lerp(float t, OutputVertexData *a, OutputVertexData *b)
-    {
-        #define LINTERP(T, OUT, IN) (OUT) + ((IN - OUT) * T)
+	void Lerp(float t, OutputVertexData *a, OutputVertexData *b)
+	{
+		#define LINTERP(T, OUT, IN) (OUT) + ((IN - OUT) * T)
 
-        #define LINTERP_INT(T, OUT, IN) (OUT) + (((IN - OUT) * T) >> 8)
+		#define LINTERP_INT(T, OUT, IN) (OUT) + (((IN - OUT) * T) >> 8)
 
-        mvPosition = LINTERP(t, a->mvPosition, b->mvPosition);
+		mvPosition = LINTERP(t, a->mvPosition, b->mvPosition);
 
-        projectedPosition.x = LINTERP(t, a->projectedPosition.x, b->projectedPosition.x);
+		projectedPosition.x = LINTERP(t, a->projectedPosition.x, b->projectedPosition.x);
 		projectedPosition.y = LINTERP(t, a->projectedPosition.y, b->projectedPosition.y);
 		projectedPosition.z = LINTERP(t, a->projectedPosition.z, b->projectedPosition.z);
 		projectedPosition.w = LINTERP(t, a->projectedPosition.w, b->projectedPosition.w);
 
-        for (int i = 0; i < 3; ++i)
-        {
-            normal[i] = LINTERP(t, a->normal[i], b->normal[i]);
-        }
+		for (int i = 0; i < 3; ++i)
+		{
+			normal[i] = LINTERP(t, a->normal[i], b->normal[i]);
+		}
 
-        u16 t_int = (u16)(t * 256);
-        for (int i = 0; i < 4; ++i)
-        {
-            color[0][i] = LINTERP_INT(t_int, a->color[0][i], b->color[0][i]);
-            color[1][i] = LINTERP_INT(t_int, a->color[1][i], b->color[1][i]);
-        }
+		u16 t_int = (u16)(t * 256);
+		for (int i = 0; i < 4; ++i)
+		{
+			color[0][i] = LINTERP_INT(t_int, a->color[0][i], b->color[0][i]);
+			color[1][i] = LINTERP_INT(t_int, a->color[1][i], b->color[1][i]);
+		}
 
-        for (int i = 0; i < 8; ++i)
-        {
-            texCoords[i] = LINTERP(t, a->texCoords[i], b->texCoords[i]);
-        }
+		for (int i = 0; i < 8; ++i)
+		{
+			texCoords[i] = LINTERP(t, a->texCoords[i], b->texCoords[i]);
+		}
 
-        #undef LINTERP
-        #undef LINTERP_INT
-    }
+		#undef LINTERP
+		#undef LINTERP_INT
+	}
 	void DoState(PointerWrap &p)
 	{
 		mvPosition.DoState(p);
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/OpcodeDecoder.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/OpcodeDecoder.cpp
index 4848cb4d43..7c3408a316 100644
--- a/Source/Plugins/Plugin_VideoSoftware/Src/OpcodeDecoder.cpp
+++ b/Source/Plugins/Plugin_VideoSoftware/Src/OpcodeDecoder.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "Common.h"
 
@@ -61,258 +48,258 @@ void DoState(PointerWrap &p)
 
 void DecodePrimitiveStream(u32 iBufferSize)
 {
-    u32 vertexSize = vertexLoader.GetVertexSize();
+	u32 vertexSize = vertexLoader.GetVertexSize();
 
 	bool skipPrimitives = g_bSkipCurrentFrame ||
 		 swstats.thisFrame.numDrawnObjects < g_SWVideoConfig.drawStart ||
 		 swstats.thisFrame.numDrawnObjects >= g_SWVideoConfig.drawEnd;
 
-    if (skipPrimitives)
-    {
-        while (streamSize > 0 && iBufferSize >= vertexSize)
-        {
-            g_pVideoData += vertexSize;
-            iBufferSize -= vertexSize;
-            streamSize--;
-        }
-    }
-    else
-    {
-        while (streamSize > 0 && iBufferSize >= vertexSize)
-        {
-            vertexLoader.LoadVertex();
-            iBufferSize -= vertexSize;
-            streamSize--;
-        }
-    }
+	if (skipPrimitives)
+	{
+		while (streamSize > 0 && iBufferSize >= vertexSize)
+		{
+			g_pVideoData += vertexSize;
+			iBufferSize -= vertexSize;
+			streamSize--;
+		}
+	}
+	else
+	{
+		while (streamSize > 0 && iBufferSize >= vertexSize)
+		{
+			vertexLoader.LoadVertex();
+			iBufferSize -= vertexSize;
+			streamSize--;
+		}
+	}
 
-    if (streamSize == 0)
-    {
-        // return to normal command processing
-        ResetDecoding();
-    }
+	if (streamSize == 0)
+	{
+		// return to normal command processing
+		ResetDecoding();
+	}
 }
 
 void ReadXFData(u32 iBufferSize)
 {
-    _assert_msg_(VIDEO, iBufferSize >= (u32)(streamSize * 4), "Underflow during standard opcode decoding"); 
+	_assert_msg_(VIDEO, iBufferSize >= (u32)(streamSize * 4), "Underflow during standard opcode decoding"); 
 
-    u32 pData[16];
-    for (int i = 0; i < streamSize; i++)
-        pData[i] = DataReadU32();
-    SWLoadXFReg(streamSize, streamAddress, pData);
+	u32 pData[16];
+	for (int i = 0; i < streamSize; i++)
+		pData[i] = DataReadU32();
+	SWLoadXFReg(streamSize, streamAddress, pData);
 
-    // return to normal command processing
-    ResetDecoding();
+	// return to normal command processing
+	ResetDecoding();
 }
 
 void ExecuteDisplayList(u32 addr, u32 count)
 {
-    u8 *videoDataSave = g_pVideoData;
+	u8 *videoDataSave = g_pVideoData;
 
-    u8 *dlStart = Memory::GetPointer(addr);
+	u8 *dlStart = Memory::GetPointer(addr);
 
-    g_pVideoData = dlStart;
+	g_pVideoData = dlStart;
 
-    while (OpcodeDecoder::CommandRunnable(count))
-    {
-        OpcodeDecoder::Run(count);
+	while (OpcodeDecoder::CommandRunnable(count))
+	{
+		OpcodeDecoder::Run(count);
 
-        // if data was read by the opcode decoder then the video data pointer changed
-        u32 readCount = (u32)(g_pVideoData - dlStart);
-        dlStart = g_pVideoData;
+		// if data was read by the opcode decoder then the video data pointer changed
+		u32 readCount = (u32)(g_pVideoData - dlStart);
+		dlStart = g_pVideoData;
 
-        _assert_msg_(VIDEO, count >= readCount, "Display list underrun"); 
+		_assert_msg_(VIDEO, count >= readCount, "Display list underrun"); 
 
-        count -= readCount;
-    }
+		count -= readCount;
+	}
 
-    g_pVideoData = videoDataSave;
+	g_pVideoData = videoDataSave;
 }
 
 void DecodeStandard(u32 bufferSize)
 {
-    _assert_msg_(VIDEO, CommandRunnable(bufferSize), "Underflow during standard opcode decoding"); 
+	_assert_msg_(VIDEO, CommandRunnable(bufferSize), "Underflow during standard opcode decoding"); 
 
-    int Cmd = DataReadU8();
+	int Cmd = DataReadU8();
 
-    if (Cmd == GX_NOP)
-        return;
-    // Causes a SIGBUS error on Android
-    // XXX: Investigate
+	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)
-    {
-        inObjectStream = false;
-        DebugUtil::OnObjectEnd();
-    }
-    if (Cmd & 0x80 && !inObjectStream)
-    {
-        inObjectStream = true;
-        lastPrimCmd = Cmd & 0x87;
-        DebugUtil::OnObjectBegin();
-    }
+	// check if switching in or out of an object
+	// only used for debugging
+	if (inObjectStream && (Cmd & 0x87) != lastPrimCmd)
+	{
+		inObjectStream = false;
+		DebugUtil::OnObjectEnd();
+	}
+	if (Cmd & 0x80 && !inObjectStream)
+	{
+		inObjectStream = true;
+		lastPrimCmd = Cmd & 0x87;
+		DebugUtil::OnObjectBegin();
+	}
 #endif
-    switch(Cmd)
-    {
-    case GX_NOP:
-        break;
+	switch(Cmd)
+	{
+	case GX_NOP:
+		break;
 
-    case GX_LOAD_CP_REG: //0x08
-        {
-            u32 SubCmd = DataReadU8();
-            u32 Value = DataReadU32();
-            SWLoadCPReg(SubCmd, Value);
-        }
-        break;
+	case GX_LOAD_CP_REG: //0x08
+		{
+			u32 SubCmd = DataReadU8();
+			u32 Value = DataReadU32();
+			SWLoadCPReg(SubCmd, Value);
+		}
+		break;
 
-    case GX_LOAD_XF_REG:
-        {
-            u32 Cmd2 = DataReadU32();
-            streamSize = ((Cmd2 >> 16) & 15) + 1;
-            streamAddress = Cmd2 & 0xFFFF;
-            currentFunction = ReadXFData;
-            minCommandSize = streamSize * 4;
-            readOpcode = false;
-        }
-        break;
+	case GX_LOAD_XF_REG:
+		{
+			u32 Cmd2 = DataReadU32();
+			streamSize = ((Cmd2 >> 16) & 15) + 1;
+			streamAddress = Cmd2 & 0xFFFF;
+			currentFunction = ReadXFData;
+			minCommandSize = streamSize * 4;
+			readOpcode = false;
+		}
+		break;
 
-    case GX_LOAD_INDX_A: //used for position matrices
-        SWLoadIndexedXF(DataReadU32(), 0xC);
-        break;
-    case GX_LOAD_INDX_B: //used for normal matrices
-        SWLoadIndexedXF(DataReadU32(), 0xD);
-        break;
-    case GX_LOAD_INDX_C: //used for postmatrices
-        SWLoadIndexedXF(DataReadU32(), 0xE);
-        break;
-    case GX_LOAD_INDX_D: //used for lights
-        SWLoadIndexedXF(DataReadU32(), 0xF);
-        break;
+	case GX_LOAD_INDX_A: //used for position matrices
+		SWLoadIndexedXF(DataReadU32(), 0xC);
+		break;
+	case GX_LOAD_INDX_B: //used for normal matrices
+		SWLoadIndexedXF(DataReadU32(), 0xD);
+		break;
+	case GX_LOAD_INDX_C: //used for postmatrices
+		SWLoadIndexedXF(DataReadU32(), 0xE);
+		break;
+	case GX_LOAD_INDX_D: //used for lights
+		SWLoadIndexedXF(DataReadU32(), 0xF);
+		break;
 
-    case GX_CMD_CALL_DL:
-        {
-            u32 dwAddr  = DataReadU32();
-            u32 dwCount = DataReadU32();
-            ExecuteDisplayList(dwAddr, dwCount);
-        }			
-        break;
+	case GX_CMD_CALL_DL:
+		{
+			u32 dwAddr  = DataReadU32();
+			u32 dwCount = DataReadU32();
+			ExecuteDisplayList(dwAddr, dwCount);
+		}
+		break;
 
-    case 0x44:
-        // zelda 4 swords calls it and checks the metrics registers after that
-        break;
+	case 0x44:
+		// zelda 4 swords calls it and checks the metrics registers after that
+		break;
 
-    case GX_CMD_INVL_VC:// Invalidate	(vertex cache?)	
-        DEBUG_LOG(VIDEO, "Invalidate	(vertex cache?)");
-        break;
+	case GX_CMD_INVL_VC:// Invalidate	(vertex cache?)	
+		DEBUG_LOG(VIDEO, "Invalidate	(vertex cache?)");
+		break;
 
-    case GX_LOAD_BP_REG: //0x61
-        {
+	case GX_LOAD_BP_REG: //0x61
+		{
 			u32 cmd = DataReadU32();
-            SWLoadBPReg(cmd);
-        }
-        break;
+			SWLoadBPReg(cmd);
+		}
+		break;
 
-    // draw primitives 
-    default:
-        if (Cmd & 0x80)
-        {
+	// draw primitives 
+	default:
+		if (Cmd & 0x80)
+		{
 			u8 vatIndex = Cmd & GX_VAT_MASK;
-            u8 primitiveType = (Cmd & GX_PRIMITIVE_MASK) >> GX_PRIMITIVE_SHIFT;
-            vertexLoader.SetFormat(vatIndex, primitiveType);
-            
-            // switch to primitive processing
-            streamSize = DataReadU16();
-            currentFunction = DecodePrimitiveStream;
-            minCommandSize = vertexLoader.GetVertexSize();
-            readOpcode = false;
+			u8 primitiveType = (Cmd & GX_PRIMITIVE_MASK) >> GX_PRIMITIVE_SHIFT;
+			vertexLoader.SetFormat(vatIndex, primitiveType);
 
-            INCSTAT(swstats.thisFrame.numPrimatives);
-            DEBUG_LOG(VIDEO, "Draw begin");
-        }
-        else
-        {
-            PanicAlert("GFX: Unknown Opcode (0x%x).\n", Cmd);            
-            break;
-        }
-        break;
-    }
+			// switch to primitive processing
+			streamSize = DataReadU16();
+			currentFunction = DecodePrimitiveStream;
+			minCommandSize = vertexLoader.GetVertexSize();
+			readOpcode = false;
+
+			INCSTAT(swstats.thisFrame.numPrimatives);
+			DEBUG_LOG(VIDEO, "Draw begin");
+		}
+		else
+		{
+			PanicAlert("GFX: Unknown Opcode (0x%x).\n", Cmd);
+			break;
+		}
+		break;
+	}
 }
 
 
 void Init()
 {
-    inObjectStream = false;
-    lastPrimCmd = 0;
-    ResetDecoding();    
+	inObjectStream = false;
+	lastPrimCmd = 0;
+	ResetDecoding();
 }
 
 void ResetDecoding()
 {
-    currentFunction = DecodeStandard;
-    minCommandSize = 1;
-    readOpcode = true;
+	currentFunction = DecodeStandard;
+	minCommandSize = 1;
+	readOpcode = true;
 }
 
 bool CommandRunnable(u32 iBufferSize)
 {
-    if (iBufferSize < minCommandSize)
-        return false;
+	if (iBufferSize < minCommandSize)
+		return false;
 
-    if (readOpcode)
-    {
-        u8 Cmd = DataPeek8(0);
-        u32 minSize = 1;
+	if (readOpcode)
+	{
+		u8 Cmd = DataPeek8(0);
+		u32 minSize = 1;
 
-        switch(Cmd)
-        {
-        case GX_LOAD_CP_REG: //0x08
-            minSize = 6;
-            break;
+		switch(Cmd)
+		{
+		case GX_LOAD_CP_REG: //0x08
+			minSize = 6;
+			break;
 
-        case GX_LOAD_XF_REG:
-            minSize = 5;
-            break;
+		case GX_LOAD_XF_REG:
+			minSize = 5;
+			break;
 
-        case GX_LOAD_INDX_A: //used for position matrices
-            minSize = 5;
-            break;
-        case GX_LOAD_INDX_B: //used for normal matrices
-            minSize = 5;
-            break;
-        case GX_LOAD_INDX_C: //used for postmatrices
-            minSize = 5;
-            break;
-        case GX_LOAD_INDX_D: //used for lights
-            minSize = 5;
-            break;
+		case GX_LOAD_INDX_A: //used for position matrices
+			minSize = 5;
+			break;
+		case GX_LOAD_INDX_B: //used for normal matrices
+			minSize = 5;
+			break;
+		case GX_LOAD_INDX_C: //used for postmatrices
+			minSize = 5;
+			break;
+		case GX_LOAD_INDX_D: //used for lights
+			minSize = 5;
+			break;
 
-        case GX_CMD_CALL_DL:
-            minSize = 9;		
-            break;
+		case GX_CMD_CALL_DL:
+			minSize = 9;
+			break;
 
-        case GX_LOAD_BP_REG: //0x61
-            minSize = 5;
-            break;
+		case GX_LOAD_BP_REG: //0x61
+			minSize = 5;
+			break;
 
-        // draw primitives 
-        default:
-            if (Cmd & 0x80)
-			    minSize = 3;
-            break;
-        }
+		// draw primitives 
+		default:
+			if (Cmd & 0x80)
+				minSize = 3;
+			break;
+		}
 
-        return (iBufferSize >= minSize);
-    }
-    
-    return true;
+		return (iBufferSize >= minSize);
+	}
+
+	return true;
 }
 
 void Run(u32 iBufferSize)
 {
-    currentFunction(iBufferSize);
+	currentFunction(iBufferSize);
 }
 
 }
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/OpcodeDecoder.h b/Source/Plugins/Plugin_VideoSoftware/Src/OpcodeDecoder.h
index 53715b2832..20b7fe6be2 100644
--- a/Source/Plugins/Plugin_VideoSoftware/Src/OpcodeDecoder.h
+++ b/Source/Plugins/Plugin_VideoSoftware/Src/OpcodeDecoder.h
@@ -1,20 +1,6 @@
-// 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/
-
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _OPCODEDECODER_H_
 #define _OPCODEDECODER_H_
@@ -25,39 +11,39 @@
 namespace OpcodeDecoder
 {
 
-    #define GX_NOP                      0x00
+	#define GX_NOP                      0x00
 
-    #define GX_LOAD_BP_REG              0x61
-    #define GX_LOAD_CP_REG              0x08
-    #define GX_LOAD_XF_REG              0x10
-    #define GX_LOAD_INDX_A              0x20
-    #define GX_LOAD_INDX_B              0x28
-    #define GX_LOAD_INDX_C              0x30
-    #define GX_LOAD_INDX_D              0x38
+	#define GX_LOAD_BP_REG              0x61
+	#define GX_LOAD_CP_REG              0x08
+	#define GX_LOAD_XF_REG              0x10
+	#define GX_LOAD_INDX_A              0x20
+	#define GX_LOAD_INDX_B              0x28
+	#define GX_LOAD_INDX_C              0x30
+	#define GX_LOAD_INDX_D              0x38
 
-    #define GX_CMD_CALL_DL              0x40
-    #define GX_CMD_INVL_VC              0x48
+	#define GX_CMD_CALL_DL              0x40
+	#define GX_CMD_INVL_VC              0x48
 
-    #define GX_PRIMITIVE_MASK           0x78
-    #define GX_PRIMITIVE_SHIFT          3
-    #define GX_VAT_MASK                 0x07
+	#define GX_PRIMITIVE_MASK           0x78
+	#define GX_PRIMITIVE_SHIFT          3
+	#define GX_VAT_MASK                 0x07
 
-    //these are defined 1/8th of their real values and without their top bit
-    #define GX_DRAW_QUADS               0x0   //0x80
-    #define GX_DRAW_TRIANGLES           0x2   //0x90
-    #define GX_DRAW_TRIANGLE_STRIP      0x3   //0x98
-    #define GX_DRAW_TRIANGLE_FAN        0x4   //0xA0
-    #define GX_DRAW_LINES               0x5   //0xA8
-    #define GX_DRAW_LINE_STRIP          0x6   //0xB0
-    #define GX_DRAW_POINTS              0x7   //0xB8
+	//these are defined 1/8th of their real values and without their top bit
+	#define GX_DRAW_QUADS               0x0   //0x80
+	#define GX_DRAW_TRIANGLES           0x2   //0x90
+	#define GX_DRAW_TRIANGLE_STRIP      0x3   //0x98
+	#define GX_DRAW_TRIANGLE_FAN        0x4   //0xA0
+	#define GX_DRAW_LINES               0x5   //0xA8
+	#define GX_DRAW_LINE_STRIP          0x6   //0xB0
+	#define GX_DRAW_POINTS              0x7   //0xB8
 
-    void Init();
+	void Init();
 
-    void ResetDecoding();
+	void ResetDecoding();
 
-    bool CommandRunnable(u32 iBufferSize);
+	bool CommandRunnable(u32 iBufferSize);
 
-    void Run(u32 iBufferSize);
+	void Run(u32 iBufferSize);
 
 	void DoState(PointerWrap &p);
 }
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/RasterFont.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/RasterFont.cpp
index fe20146e31..2170d52137 100644
--- a/Source/Plugins/Plugin_VideoSoftware/Src/RasterFont.cpp
+++ b/Source/Plugins/Plugin_VideoSoftware/Src/RasterFont.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "../../Plugin_VideoOGL/Src/GLUtil.h"
 
@@ -23,110 +10,112 @@
 // globals
 
 const GLubyte rasters[][13] = {
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, 
-    {0x00, 0x00, 0x18, 0x18, 0x00, 0x00, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18}, 
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x36, 0x36, 0x36, 0x36}, 
-    {0x00, 0x00, 0x00, 0x66, 0x66, 0xff, 0x66, 0x66, 0xff, 0x66, 0x66, 0x00, 0x00}, 
-    {0x00, 0x00, 0x18, 0x7e, 0xff, 0x1b, 0x1f, 0x7e, 0xf8, 0xd8, 0xff, 0x7e, 0x18}, 
-    {0x00, 0x00, 0x0e, 0x1b, 0xdb, 0x6e, 0x30, 0x18, 0x0c, 0x76, 0xdb, 0xd8, 0x70}, 
-    {0x00, 0x00, 0x7f, 0xc6, 0xcf, 0xd8, 0x70, 0x70, 0xd8, 0xcc, 0xcc, 0x6c, 0x38}, 
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x1c, 0x0c, 0x0e}, 
-    {0x00, 0x00, 0x0c, 0x18, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x18, 0x0c}, 
-    {0x00, 0x00, 0x30, 0x18, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x18, 0x30}, 
-    {0x00, 0x00, 0x00, 0x00, 0x99, 0x5a, 0x3c, 0xff, 0x3c, 0x5a, 0x99, 0x00, 0x00}, 
-    {0x00, 0x00, 0x00, 0x18, 0x18, 0x18, 0xff, 0xff, 0x18, 0x18, 0x18, 0x00, 0x00}, 
-    {0x00, 0x00, 0x30, 0x18, 0x1c, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, 
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00}, 
-    {0x00, 0x00, 0x00, 0x38, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, 
-    {0x00, 0x60, 0x60, 0x30, 0x30, 0x18, 0x18, 0x0c, 0x0c, 0x06, 0x06, 0x03, 0x03}, 
-    {0x00, 0x00, 0x3c, 0x66, 0xc3, 0xe3, 0xf3, 0xdb, 0xcf, 0xc7, 0xc3, 0x66, 0x3c}, 
-    {0x00, 0x00, 0x7e, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x78, 0x38, 0x18}, 
-    {0x00, 0x00, 0xff, 0xc0, 0xc0, 0x60, 0x30, 0x18, 0x0c, 0x06, 0x03, 0xe7, 0x7e}, 
-    {0x00, 0x00, 0x7e, 0xe7, 0x03, 0x03, 0x07, 0x7e, 0x07, 0x03, 0x03, 0xe7, 0x7e}, 
-    {0x00, 0x00, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0xff, 0xcc, 0x6c, 0x3c, 0x1c, 0x0c}, 
-    {0x00, 0x00, 0x7e, 0xe7, 0x03, 0x03, 0x07, 0xfe, 0xc0, 0xc0, 0xc0, 0xc0, 0xff}, 
-    {0x00, 0x00, 0x7e, 0xe7, 0xc3, 0xc3, 0xc7, 0xfe, 0xc0, 0xc0, 0xc0, 0xe7, 0x7e}, 
-    {0x00, 0x00, 0x30, 0x30, 0x30, 0x30, 0x18, 0x0c, 0x06, 0x03, 0x03, 0x03, 0xff}, 
-    {0x00, 0x00, 0x7e, 0xe7, 0xc3, 0xc3, 0xe7, 0x7e, 0xe7, 0xc3, 0xc3, 0xe7, 0x7e}, 
-    {0x00, 0x00, 0x7e, 0xe7, 0x03, 0x03, 0x03, 0x7f, 0xe7, 0xc3, 0xc3, 0xe7, 0x7e}, 
-    {0x00, 0x00, 0x00, 0x38, 0x38, 0x00, 0x00, 0x38, 0x38, 0x00, 0x00, 0x00, 0x00}, 
-    {0x00, 0x00, 0x30, 0x18, 0x1c, 0x1c, 0x00, 0x00, 0x1c, 0x1c, 0x00, 0x00, 0x00}, 
-    {0x00, 0x00, 0x06, 0x0c, 0x18, 0x30, 0x60, 0xc0, 0x60, 0x30, 0x18, 0x0c, 0x06}, 
-    {0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00}, 
-    {0x00, 0x00, 0x60, 0x30, 0x18, 0x0c, 0x06, 0x03, 0x06, 0x0c, 0x18, 0x30, 0x60}, 
-    {0x00, 0x00, 0x18, 0x00, 0x00, 0x18, 0x18, 0x0c, 0x06, 0x03, 0xc3, 0xc3, 0x7e}, 
-    {0x00, 0x00, 0x3f, 0x60, 0xcf, 0xdb, 0xd3, 0xdd, 0xc3, 0x7e, 0x00, 0x00, 0x00}, 
-    {0x00, 0x00, 0xc3, 0xc3, 0xc3, 0xc3, 0xff, 0xc3, 0xc3, 0xc3, 0x66, 0x3c, 0x18}, 
-    {0x00, 0x00, 0xfe, 0xc7, 0xc3, 0xc3, 0xc7, 0xfe, 0xc7, 0xc3, 0xc3, 0xc7, 0xfe}, 
-    {0x00, 0x00, 0x7e, 0xe7, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xe7, 0x7e}, 
-    {0x00, 0x00, 0xfc, 0xce, 0xc7, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc7, 0xce, 0xfc}, 
-    {0x00, 0x00, 0xff, 0xc0, 0xc0, 0xc0, 0xc0, 0xfc, 0xc0, 0xc0, 0xc0, 0xc0, 0xff}, 
-    {0x00, 0x00, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xfc, 0xc0, 0xc0, 0xc0, 0xff}, 
-    {0x00, 0x00, 0x7e, 0xe7, 0xc3, 0xc3, 0xcf, 0xc0, 0xc0, 0xc0, 0xc0, 0xe7, 0x7e}, 
-    {0x00, 0x00, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xff, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3}, 
-    {0x00, 0x00, 0x7e, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x7e}, 
-    {0x00, 0x00, 0x7c, 0xee, 0xc6, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06}, 
-    {0x00, 0x00, 0xc3, 0xc6, 0xcc, 0xd8, 0xf0, 0xe0, 0xf0, 0xd8, 0xcc, 0xc6, 0xc3}, 
-    {0x00, 0x00, 0xff, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0}, 
-    {0x00, 0x00, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xdb, 0xff, 0xff, 0xe7, 0xc3}, 
-    {0x00, 0x00, 0xc7, 0xc7, 0xcf, 0xcf, 0xdf, 0xdb, 0xfb, 0xf3, 0xf3, 0xe3, 0xe3}, 
-    {0x00, 0x00, 0x7e, 0xe7, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xe7, 0x7e}, 
-    {0x00, 0x00, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xfe, 0xc7, 0xc3, 0xc3, 0xc7, 0xfe}, 
-    {0x00, 0x00, 0x3f, 0x6e, 0xdf, 0xdb, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0x66, 0x3c}, 
-    {0x00, 0x00, 0xc3, 0xc6, 0xcc, 0xd8, 0xf0, 0xfe, 0xc7, 0xc3, 0xc3, 0xc7, 0xfe}, 
-    {0x00, 0x00, 0x7e, 0xe7, 0x03, 0x03, 0x07, 0x7e, 0xe0, 0xc0, 0xc0, 0xe7, 0x7e}, 
-    {0x00, 0x00, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0xff}, 
-    {0x00, 0x00, 0x7e, 0xe7, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3}, 
-    {0x00, 0x00, 0x18, 0x3c, 0x3c, 0x66, 0x66, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3}, 
-    {0x00, 0x00, 0xc3, 0xe7, 0xff, 0xff, 0xdb, 0xdb, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3}, 
-    {0x00, 0x00, 0xc3, 0x66, 0x66, 0x3c, 0x3c, 0x18, 0x3c, 0x3c, 0x66, 0x66, 0xc3}, 
-    {0x00, 0x00, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x3c, 0x66, 0x66, 0xc3}, 
-    {0x00, 0x00, 0xff, 0xc0, 0xc0, 0x60, 0x30, 0x7e, 0x0c, 0x06, 0x03, 0x03, 0xff}, 
-    {0x00, 0x00, 0x3c, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x3c}, 
-    {0x00, 0x03, 0x03, 0x06, 0x06, 0x0c, 0x0c, 0x18, 0x18, 0x30, 0x30, 0x60, 0x60}, 
-    {0x00, 0x00, 0x3c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x3c}, 
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc3, 0x66, 0x3c, 0x18}, 
-    {0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, 
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x38, 0x30, 0x70}, 
-    {0x00, 0x00, 0x7f, 0xc3, 0xc3, 0x7f, 0x03, 0xc3, 0x7e, 0x00, 0x00, 0x00, 0x00}, 
-    {0x00, 0x00, 0xfe, 0xc3, 0xc3, 0xc3, 0xc3, 0xfe, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0}, 
-    {0x00, 0x00, 0x7e, 0xc3, 0xc0, 0xc0, 0xc0, 0xc3, 0x7e, 0x00, 0x00, 0x00, 0x00}, 
-    {0x00, 0x00, 0x7f, 0xc3, 0xc3, 0xc3, 0xc3, 0x7f, 0x03, 0x03, 0x03, 0x03, 0x03}, 
-    {0x00, 0x00, 0x7f, 0xc0, 0xc0, 0xfe, 0xc3, 0xc3, 0x7e, 0x00, 0x00, 0x00, 0x00}, 
-    {0x00, 0x00, 0x30, 0x30, 0x30, 0x30, 0x30, 0xfc, 0x30, 0x30, 0x30, 0x33, 0x1e}, 
-    {0x7e, 0xc3, 0x03, 0x03, 0x7f, 0xc3, 0xc3, 0xc3, 0x7e, 0x00, 0x00, 0x00, 0x00}, 
-    {0x00, 0x00, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xfe, 0xc0, 0xc0, 0xc0, 0xc0}, 
-    {0x00, 0x00, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x00, 0x00, 0x18, 0x00}, 
-    {0x38, 0x6c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x00, 0x00, 0x0c, 0x00}, 
-    {0x00, 0x00, 0xc6, 0xcc, 0xf8, 0xf0, 0xd8, 0xcc, 0xc6, 0xc0, 0xc0, 0xc0, 0xc0}, 
-    {0x00, 0x00, 0x7e, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x78}, 
-    {0x00, 0x00, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xfe, 0x00, 0x00, 0x00, 0x00}, 
-    {0x00, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xfc, 0x00, 0x00, 0x00, 0x00}, 
-    {0x00, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00}, 
-    {0xc0, 0xc0, 0xc0, 0xfe, 0xc3, 0xc3, 0xc3, 0xc3, 0xfe, 0x00, 0x00, 0x00, 0x00}, 
-    {0x03, 0x03, 0x03, 0x7f, 0xc3, 0xc3, 0xc3, 0xc3, 0x7f, 0x00, 0x00, 0x00, 0x00}, 
-    {0x00, 0x00, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xe0, 0xfe, 0x00, 0x00, 0x00, 0x00}, 
-    {0x00, 0x00, 0xfe, 0x03, 0x03, 0x7e, 0xc0, 0xc0, 0x7f, 0x00, 0x00, 0x00, 0x00}, 
-    {0x00, 0x00, 0x1c, 0x36, 0x30, 0x30, 0x30, 0x30, 0xfc, 0x30, 0x30, 0x30, 0x00}, 
-    {0x00, 0x00, 0x7e, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00}, 
-    {0x00, 0x00, 0x18, 0x3c, 0x3c, 0x66, 0x66, 0xc3, 0xc3, 0x00, 0x00, 0x00, 0x00}, 
-    {0x00, 0x00, 0xc3, 0xe7, 0xff, 0xdb, 0xc3, 0xc3, 0xc3, 0x00, 0x00, 0x00, 0x00}, 
-    {0x00, 0x00, 0xc3, 0x66, 0x3c, 0x18, 0x3c, 0x66, 0xc3, 0x00, 0x00, 0x00, 0x00}, 
-    {0xc0, 0x60, 0x60, 0x30, 0x18, 0x3c, 0x66, 0x66, 0xc3, 0x00, 0x00, 0x00, 0x00}, 
-    {0x00, 0x00, 0xff, 0x60, 0x30, 0x18, 0x0c, 0x06, 0xff, 0x00, 0x00, 0x00, 0x00}, 
-    {0x00, 0x00, 0x0f, 0x18, 0x18, 0x18, 0x38, 0xf0, 0x38, 0x18, 0x18, 0x18, 0x0f}, 
-    {0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18}, 
-    {0x00, 0x00, 0xf0, 0x18, 0x18, 0x18, 0x1c, 0x0f, 0x1c, 0x18, 0x18, 0x18, 0xf0}, 
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x8f, 0xf1, 0x60, 0x00, 0x00, 0x00} 
+	{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+	{0x00, 0x00, 0x18, 0x18, 0x00, 0x00, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18},
+	{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x36, 0x36, 0x36, 0x36},
+	{0x00, 0x00, 0x00, 0x66, 0x66, 0xff, 0x66, 0x66, 0xff, 0x66, 0x66, 0x00, 0x00},
+	{0x00, 0x00, 0x18, 0x7e, 0xff, 0x1b, 0x1f, 0x7e, 0xf8, 0xd8, 0xff, 0x7e, 0x18},
+	{0x00, 0x00, 0x0e, 0x1b, 0xdb, 0x6e, 0x30, 0x18, 0x0c, 0x76, 0xdb, 0xd8, 0x70},
+	{0x00, 0x00, 0x7f, 0xc6, 0xcf, 0xd8, 0x70, 0x70, 0xd8, 0xcc, 0xcc, 0x6c, 0x38},
+	{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x1c, 0x0c, 0x0e},
+	{0x00, 0x00, 0x0c, 0x18, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x18, 0x0c},
+	{0x00, 0x00, 0x30, 0x18, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x18, 0x30},
+	{0x00, 0x00, 0x00, 0x00, 0x99, 0x5a, 0x3c, 0xff, 0x3c, 0x5a, 0x99, 0x00, 0x00},
+	{0x00, 0x00, 0x00, 0x18, 0x18, 0x18, 0xff, 0xff, 0x18, 0x18, 0x18, 0x00, 0x00},
+	{0x00, 0x00, 0x30, 0x18, 0x1c, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+	{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00},
+	{0x00, 0x00, 0x00, 0x38, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+	{0x00, 0x60, 0x60, 0x30, 0x30, 0x18, 0x18, 0x0c, 0x0c, 0x06, 0x06, 0x03, 0x03},
+	{0x00, 0x00, 0x3c, 0x66, 0xc3, 0xe3, 0xf3, 0xdb, 0xcf, 0xc7, 0xc3, 0x66, 0x3c},
+	{0x00, 0x00, 0x7e, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x78, 0x38, 0x18},
+	{0x00, 0x00, 0xff, 0xc0, 0xc0, 0x60, 0x30, 0x18, 0x0c, 0x06, 0x03, 0xe7, 0x7e},
+	{0x00, 0x00, 0x7e, 0xe7, 0x03, 0x03, 0x07, 0x7e, 0x07, 0x03, 0x03, 0xe7, 0x7e},
+	{0x00, 0x00, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0xff, 0xcc, 0x6c, 0x3c, 0x1c, 0x0c},
+	{0x00, 0x00, 0x7e, 0xe7, 0x03, 0x03, 0x07, 0xfe, 0xc0, 0xc0, 0xc0, 0xc0, 0xff},
+	{0x00, 0x00, 0x7e, 0xe7, 0xc3, 0xc3, 0xc7, 0xfe, 0xc0, 0xc0, 0xc0, 0xe7, 0x7e},
+	{0x00, 0x00, 0x30, 0x30, 0x30, 0x30, 0x18, 0x0c, 0x06, 0x03, 0x03, 0x03, 0xff},
+	{0x00, 0x00, 0x7e, 0xe7, 0xc3, 0xc3, 0xe7, 0x7e, 0xe7, 0xc3, 0xc3, 0xe7, 0x7e},
+	{0x00, 0x00, 0x7e, 0xe7, 0x03, 0x03, 0x03, 0x7f, 0xe7, 0xc3, 0xc3, 0xe7, 0x7e},
+	{0x00, 0x00, 0x00, 0x38, 0x38, 0x00, 0x00, 0x38, 0x38, 0x00, 0x00, 0x00, 0x00},
+	{0x00, 0x00, 0x30, 0x18, 0x1c, 0x1c, 0x00, 0x00, 0x1c, 0x1c, 0x00, 0x00, 0x00},
+	{0x00, 0x00, 0x06, 0x0c, 0x18, 0x30, 0x60, 0xc0, 0x60, 0x30, 0x18, 0x0c, 0x06},
+	{0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00},
+	{0x00, 0x00, 0x60, 0x30, 0x18, 0x0c, 0x06, 0x03, 0x06, 0x0c, 0x18, 0x30, 0x60},
+	{0x00, 0x00, 0x18, 0x00, 0x00, 0x18, 0x18, 0x0c, 0x06, 0x03, 0xc3, 0xc3, 0x7e},
+	{0x00, 0x00, 0x3f, 0x60, 0xcf, 0xdb, 0xd3, 0xdd, 0xc3, 0x7e, 0x00, 0x00, 0x00},
+	{0x00, 0x00, 0xc3, 0xc3, 0xc3, 0xc3, 0xff, 0xc3, 0xc3, 0xc3, 0x66, 0x3c, 0x18},
+	{0x00, 0x00, 0xfe, 0xc7, 0xc3, 0xc3, 0xc7, 0xfe, 0xc7, 0xc3, 0xc3, 0xc7, 0xfe},
+	{0x00, 0x00, 0x7e, 0xe7, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xe7, 0x7e},
+	{0x00, 0x00, 0xfc, 0xce, 0xc7, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc7, 0xce, 0xfc},
+	{0x00, 0x00, 0xff, 0xc0, 0xc0, 0xc0, 0xc0, 0xfc, 0xc0, 0xc0, 0xc0, 0xc0, 0xff},
+	{0x00, 0x00, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xfc, 0xc0, 0xc0, 0xc0, 0xff},
+	{0x00, 0x00, 0x7e, 0xe7, 0xc3, 0xc3, 0xcf, 0xc0, 0xc0, 0xc0, 0xc0, 0xe7, 0x7e},
+	{0x00, 0x00, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xff, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3},
+	{0x00, 0x00, 0x7e, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x7e},
+	{0x00, 0x00, 0x7c, 0xee, 0xc6, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06},
+	{0x00, 0x00, 0xc3, 0xc6, 0xcc, 0xd8, 0xf0, 0xe0, 0xf0, 0xd8, 0xcc, 0xc6, 0xc3},
+	{0x00, 0x00, 0xff, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0},
+	{0x00, 0x00, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xdb, 0xff, 0xff, 0xe7, 0xc3},
+	{0x00, 0x00, 0xc7, 0xc7, 0xcf, 0xcf, 0xdf, 0xdb, 0xfb, 0xf3, 0xf3, 0xe3, 0xe3},
+	{0x00, 0x00, 0x7e, 0xe7, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xe7, 0x7e},
+	{0x00, 0x00, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xfe, 0xc7, 0xc3, 0xc3, 0xc7, 0xfe},
+	{0x00, 0x00, 0x3f, 0x6e, 0xdf, 0xdb, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0x66, 0x3c},
+	{0x00, 0x00, 0xc3, 0xc6, 0xcc, 0xd8, 0xf0, 0xfe, 0xc7, 0xc3, 0xc3, 0xc7, 0xfe},
+	{0x00, 0x00, 0x7e, 0xe7, 0x03, 0x03, 0x07, 0x7e, 0xe0, 0xc0, 0xc0, 0xe7, 0x7e},
+	{0x00, 0x00, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0xff},
+	{0x00, 0x00, 0x7e, 0xe7, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3},
+	{0x00, 0x00, 0x18, 0x3c, 0x3c, 0x66, 0x66, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3},
+	{0x00, 0x00, 0xc3, 0xe7, 0xff, 0xff, 0xdb, 0xdb, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3},
+	{0x00, 0x00, 0xc3, 0x66, 0x66, 0x3c, 0x3c, 0x18, 0x3c, 0x3c, 0x66, 0x66, 0xc3},
+	{0x00, 0x00, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x3c, 0x66, 0x66, 0xc3},
+	{0x00, 0x00, 0xff, 0xc0, 0xc0, 0x60, 0x30, 0x7e, 0x0c, 0x06, 0x03, 0x03, 0xff},
+	{0x00, 0x00, 0x3c, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x3c},
+	{0x00, 0x03, 0x03, 0x06, 0x06, 0x0c, 0x0c, 0x18, 0x18, 0x30, 0x30, 0x60, 0x60},
+	{0x00, 0x00, 0x3c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x3c},
+	{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc3, 0x66, 0x3c, 0x18},
+	{0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+	{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x38, 0x30, 0x70},
+	{0x00, 0x00, 0x7f, 0xc3, 0xc3, 0x7f, 0x03, 0xc3, 0x7e, 0x00, 0x00, 0x00, 0x00},
+	{0x00, 0x00, 0xfe, 0xc3, 0xc3, 0xc3, 0xc3, 0xfe, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0},
+	{0x00, 0x00, 0x7e, 0xc3, 0xc0, 0xc0, 0xc0, 0xc3, 0x7e, 0x00, 0x00, 0x00, 0x00},
+	{0x00, 0x00, 0x7f, 0xc3, 0xc3, 0xc3, 0xc3, 0x7f, 0x03, 0x03, 0x03, 0x03, 0x03},
+	{0x00, 0x00, 0x7f, 0xc0, 0xc0, 0xfe, 0xc3, 0xc3, 0x7e, 0x00, 0x00, 0x00, 0x00},
+	{0x00, 0x00, 0x30, 0x30, 0x30, 0x30, 0x30, 0xfc, 0x30, 0x30, 0x30, 0x33, 0x1e},
+	{0x7e, 0xc3, 0x03, 0x03, 0x7f, 0xc3, 0xc3, 0xc3, 0x7e, 0x00, 0x00, 0x00, 0x00},
+	{0x00, 0x00, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xfe, 0xc0, 0xc0, 0xc0, 0xc0},
+	{0x00, 0x00, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x00, 0x00, 0x18, 0x00},
+	{0x38, 0x6c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x00, 0x00, 0x0c, 0x00},
+	{0x00, 0x00, 0xc6, 0xcc, 0xf8, 0xf0, 0xd8, 0xcc, 0xc6, 0xc0, 0xc0, 0xc0, 0xc0},
+	{0x00, 0x00, 0x7e, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x78},
+	{0x00, 0x00, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xfe, 0x00, 0x00, 0x00, 0x00},
+	{0x00, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xfc, 0x00, 0x00, 0x00, 0x00},
+	{0x00, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+	{0xc0, 0xc0, 0xc0, 0xfe, 0xc3, 0xc3, 0xc3, 0xc3, 0xfe, 0x00, 0x00, 0x00, 0x00},
+	{0x03, 0x03, 0x03, 0x7f, 0xc3, 0xc3, 0xc3, 0xc3, 0x7f, 0x00, 0x00, 0x00, 0x00},
+	{0x00, 0x00, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xe0, 0xfe, 0x00, 0x00, 0x00, 0x00},
+	{0x00, 0x00, 0xfe, 0x03, 0x03, 0x7e, 0xc0, 0xc0, 0x7f, 0x00, 0x00, 0x00, 0x00},
+	{0x00, 0x00, 0x1c, 0x36, 0x30, 0x30, 0x30, 0x30, 0xfc, 0x30, 0x30, 0x30, 0x00},
+	{0x00, 0x00, 0x7e, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
+	{0x00, 0x00, 0x18, 0x3c, 0x3c, 0x66, 0x66, 0xc3, 0xc3, 0x00, 0x00, 0x00, 0x00},
+	{0x00, 0x00, 0xc3, 0xe7, 0xff, 0xdb, 0xc3, 0xc3, 0xc3, 0x00, 0x00, 0x00, 0x00},
+	{0x00, 0x00, 0xc3, 0x66, 0x3c, 0x18, 0x3c, 0x66, 0xc3, 0x00, 0x00, 0x00, 0x00},
+	{0xc0, 0x60, 0x60, 0x30, 0x18, 0x3c, 0x66, 0x66, 0xc3, 0x00, 0x00, 0x00, 0x00},
+	{0x00, 0x00, 0xff, 0x60, 0x30, 0x18, 0x0c, 0x06, 0xff, 0x00, 0x00, 0x00, 0x00},
+	{0x00, 0x00, 0x0f, 0x18, 0x18, 0x18, 0x38, 0xf0, 0x38, 0x18, 0x18, 0x18, 0x0f},
+	{0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18},
+	{0x00, 0x00, 0xf0, 0x18, 0x18, 0x18, 0x1c, 0x0f, 0x1c, 0x18, 0x18, 0x18, 0xf0},
+	{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x8f, 0xf1, 0x60, 0x00, 0x00, 0x00}
 };
 
 RasterFont::RasterFont()
 {
 	// set GL modes
 	glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
+
 	// create the raster font
 	fontOffset = glGenLists(128);
-	for (int i = 32; i < 127; i++) {
+	for (int i = 32; i < 127; i++)
+	{
 		glNewList(i + fontOffset, GL_COMPILE);
 		glBitmap(8, 13, 0.0f, 2.0f, 10.0f, 0.0f, rasters[i - 32]);
 		glEndList();
@@ -153,7 +142,8 @@ void RasterFont::printString(const char *s, double x, double y, double z)
 	char *s2 = temp_buffer;
 	memcpy(s2, s, length);
 	s2[length] = 0;
-	for (int i = 0; i < length; i++) {
+	for (int i = 0; i < length; i++)
+	{
 		if (s2[i] < 32 || s2[i] > 126)
 			s2[i] = '!';
 	}
@@ -209,7 +199,9 @@ void RasterFont::printMultilineText(const char *text, double start_x, double sta
 			*t++ = ' ';
 		}
 		else
+		{
 			*t++ = *text;
+		}
 
 		text++;
 	}
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/RasterFont.h b/Source/Plugins/Plugin_VideoSoftware/Src/RasterFont.h
index 3ebc684dd0..b30d99152d 100644
--- a/Source/Plugins/Plugin_VideoSoftware/Src/RasterFont.h
+++ b/Source/Plugins/Plugin_VideoSoftware/Src/RasterFont.h
@@ -1,41 +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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _RASTERFONT_H_
 #define _RASTERFONT_H_
 
-class RasterFont {
+class RasterFont
+{
 public:
-    RasterFont();
-    ~RasterFont(void);
-    static int debug;
-    
-    // some useful constants
-    enum	{char_width = 10};
-    enum	{char_height = 15};
-    
-    // and the happy helper functions
-    void printString(const char *s, double x, double y, double z=0.0);
-    void printCenteredString(const char *s, double y, int screen_width, double z=0.0);
+	RasterFont();
+	~RasterFont(void);
+	static int debug;
+
+	// some useful constants
+	enum	{char_width = 10};
+	enum	{char_height = 15};
+
+	// and the happy helper functions
+	void printString(const char *s, double x, double y, double z=0.0);
+	void printCenteredString(const char *s, double y, int screen_width, double z=0.0);
 
 	void printMultilineText(const char *text, double x, double y, double z, int bbWidth, int bbHeight);
 private:
-	int	fontOffset;
-    char *temp_buffer;
+	int fontOffset;
+	char *temp_buffer;
 	enum {TEMP_BUFFER_SIZE = 64 * 1024};
 };
 
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/Rasterizer.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/Rasterizer.cpp
index badb123fa0..f1fc5f5ac9 100644
--- a/Source/Plugins/Plugin_VideoSoftware/Src/Rasterizer.cpp
+++ b/Source/Plugins/Plugin_VideoSoftware/Src/Rasterizer.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "Common.h"
 
@@ -97,34 +84,34 @@ void Init()
 
 inline int iround(float x)
 {
-    int t;
+	int t;
 
 #if defined(_WIN32) && !defined(_M_X64)
-    __asm
-    {
-        fld  x
-        fistp t
-    }
+	__asm
+	{
+		fld  x
+		fistp t
+	}
 #else
 	t = (int)x;
 	if((x - t) >= 0.5)
 		return t + 1;
 #endif
 
-    return t;
+	return t;
 }
 
 void SetScissor()
 {
-    int xoff = bpmem.scissorOffset.x * 2 - 342;
-    int yoff = bpmem.scissorOffset.y * 2 - 342;
+	int xoff = bpmem.scissorOffset.x * 2 - 342;
+	int yoff = bpmem.scissorOffset.y * 2 - 342;
 
 	scissorLeft = bpmem.scissorTL.x - xoff - 342;
 	if (scissorLeft < 0) scissorLeft = 0;
 
 	scissorTop = bpmem.scissorTL.y - yoff - 342;
 	if (scissorTop < 0) scissorTop = 0;
-    
+
 	scissorRight = bpmem.scissorBR.x - xoff - 341;
 	if (scissorRight > EFB_WIDTH) scissorRight = EFB_WIDTH;
 
@@ -134,12 +121,12 @@ void SetScissor()
 
 void SetTevReg(int reg, int comp, bool konst, s16 color)
 {
-    tev.SetRegColor(reg, comp, konst, color);
+	tev.SetRegColor(reg, comp, konst, color);
 }
 
 inline void Draw(s32 x, s32 y, s32 xi, s32 yi)
 {
-    INCSTAT(swstats.thisFrame.rasterizedPixels);
+	INCSTAT(swstats.thisFrame.rasterizedPixels);
 
 	float dx = vertexOffsetX + (float)(x - vertex0X);
 	float dy = vertexOffsetY + (float)(y - vertex0Y);
@@ -184,7 +171,7 @@ inline void Draw(s32 x, s32 y, s32 xi, s32 yi)
 	// tex coords
 	for (unsigned int i = 0; i < bpmem.genMode.numtexgens; i++)
 	{
-		// multiply by 128 because TEV stores stores UVs as s17.7
+		// multiply by 128 because TEV stores UVs as s17.7
 		tev.Uv[i].s = (s32)(pixel.Uv[i][0] * 128);
 		tev.Uv[i].t = (s32)(pixel.Uv[i][1] * 128);
 	}
@@ -200,14 +187,14 @@ inline void Draw(s32 x, s32 y, s32 xi, s32 yi)
 		tev.TextureLod[i] = rasterBlock.TextureLod[i];
 		tev.TextureLinear[i] = rasterBlock.TextureLinear[i];
 	}
-   
-    tev.Draw();
+
+	tev.Draw();
 }
 
 void InitTriangle(float X1, float Y1, s32 xi, s32 yi)
 {
 	vertex0X = xi;
-    vertex0Y = yi;
+	vertex0Y = yi;
 
 	// adjust a little less than 0.5
 	const float adjust = 0.495f;
@@ -219,13 +206,13 @@ void InitTriangle(float X1, float Y1, s32 xi, s32 yi)
 void InitSlope(Slope *slope, float f1, float f2, float f3, float DX31, float DX12, float DY12, float DY31)
 {
 	float DF31 = f3 - f1;
-    float DF21 = f2 - f1;
-    float a = DF31 * -DY12 - DF21 * DY31;
-    float b = DX31 * DF21 + DX12 * DF31;    
-    float c = -DX12 * DY31 - DX31 * -DY12;
-    slope->dfdx = -a / c;
-    slope->dfdy = -b / c;
-    slope->f0 = f1;
+	float DF21 = f2 - f1;
+	float a = DF31 * -DY12 - DF21 * DY31;
+	float b = DX31 * DF21 + DX12 * DF31;
+	float c = -DX12 * DY31 - DX31 * -DY12;
+	slope->dfdx = -a / c;
+	slope->dfdy = -b / c;
+	slope->f0 = f1;
 }
 
 inline void CalculateLOD(s32 &lod, bool &linear, u32 texmap, u32 texcoord)
@@ -332,17 +319,17 @@ void BuildBlock(s32 blockX, s32 blockY)
 
 void DrawTriangleFrontFace(OutputVertexData *v0, OutputVertexData *v1, OutputVertexData *v2)
 {
-    INCSTAT(swstats.thisFrame.numTrianglesDrawn);
+	INCSTAT(swstats.thisFrame.numTrianglesDrawn);
 
-    if (g_SWVideoConfig.bHwRasterizer)
-    {
-        HwRasterizer::DrawTriangleFrontFace(v0, v1, v2);
-        return;
-    }
+	if (g_SWVideoConfig.bHwRasterizer)
+	{
+		HwRasterizer::DrawTriangleFrontFace(v0, v1, v2);
+		return;
+	}
 
-    // adapted from http://www.devmaster.net/forums/showthread.php?t=1884
+	// adapted from http://www.devmaster.net/forums/showthread.php?t=1884
 
-    // 28.4 fixed-pou32 coordinates. rounded to nearest and adjusted to match hardware output
+	// 28.4 fixed-pou32 coordinates. rounded to nearest and adjusted to match hardware output
 	// could also take floor and adjust -8
 	const s32 Y1 = iround(16.0f * v0->screenPosition[1]) - 9;
 	const s32 Y2 = iround(16.0f * v1->screenPosition[1]) - 9;
@@ -352,161 +339,160 @@ void DrawTriangleFrontFace(OutputVertexData *v0, OutputVertexData *v1, OutputVer
 	const s32 X2 = iround(16.0f * v1->screenPosition[0]) - 9;
 	const s32 X3 = iround(16.0f * v2->screenPosition[0]) - 9;
 
-    // Deltas
-    const s32 DX12 = X1 - X2;
-    const s32 DX23 = X2 - X3;
-    const s32 DX31 = X3 - X1;
+	// Deltas
+	const s32 DX12 = X1 - X2;
+	const s32 DX23 = X2 - X3;
+	const s32 DX31 = X3 - X1;
 
-    const s32 DY12 = Y1 - Y2;
-    const s32 DY23 = Y2 - Y3;
-    const s32 DY31 = Y3 - Y1;
+	const s32 DY12 = Y1 - Y2;
+	const s32 DY23 = Y2 - Y3;
+	const s32 DY31 = Y3 - Y1;
 
-    // Fixed-pos32 deltas
-    const s32 FDX12 = DX12 << 4;
-    const s32 FDX23 = DX23 << 4;
-    const s32 FDX31 = DX31 << 4;
+	// Fixed-pos32 deltas
+	const s32 FDX12 = DX12 << 4;
+	const s32 FDX23 = DX23 << 4;
+	const s32 FDX31 = DX31 << 4;
 
-    const s32 FDY12 = DY12 << 4;
-    const s32 FDY23 = DY23 << 4;
-    const s32 FDY31 = DY31 << 4;
+	const s32 FDY12 = DY12 << 4;
+	const s32 FDY23 = DY23 << 4;
+	const s32 FDY31 = DY31 << 4;
 
-    // Bounding rectangle
-    s32 minx = (min(min(X1, X2), X3) + 0xF) >> 4;
-    s32 maxx = (max(max(X1, X2), X3) + 0xF) >> 4;
-    s32 miny = (min(min(Y1, Y2), Y3) + 0xF) >> 4;
-    s32 maxy = (max(max(Y1, Y2), Y3) + 0xF) >> 4;
+	// Bounding rectangle
+	s32 minx = (min(min(X1, X2), X3) + 0xF) >> 4;
+	s32 maxx = (max(max(X1, X2), X3) + 0xF) >> 4;
+	s32 miny = (min(min(Y1, Y2), Y3) + 0xF) >> 4;
+	s32 maxy = (max(max(Y1, Y2), Y3) + 0xF) >> 4;
 
-    // scissor
-    minx = max(minx, scissorLeft);
-    maxx = min(maxx, scissorRight);
-    miny = max(miny, scissorTop);
-    maxy = min(maxy, scissorBottom);
+	// scissor
+	minx = max(minx, scissorLeft);
+	maxx = min(maxx, scissorRight);
+	miny = max(miny, scissorTop);
+	maxy = min(maxy, scissorBottom);
 
-    if (minx >= maxx || miny >= maxy)
-        return;
+	if (minx >= maxx || miny >= maxy)
+		return;
 
-    // Setup slopes
-    float fltx1 = v0->screenPosition.x;
-    float flty1 = v0->screenPosition.y;
-    float fltdx31 = v2->screenPosition.x - fltx1;
-    float fltdx12 = fltx1 - v1->screenPosition.x;
-    float fltdy12 = flty1 - v1->screenPosition.y;
-    float fltdy31 = v2->screenPosition.y - flty1;
+	// Setup slopes
+	float fltx1 = v0->screenPosition.x;
+	float flty1 = v0->screenPosition.y;
+	float fltdx31 = v2->screenPosition.x - fltx1;
+	float fltdx12 = fltx1 - v1->screenPosition.x;
+	float fltdy12 = flty1 - v1->screenPosition.y;
+	float fltdy31 = v2->screenPosition.y - flty1;
 
 	InitTriangle(fltx1, flty1, (X1 + 0xF) >> 4, (Y1 + 0xF) >> 4);
 
-    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);
+	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 || !g_SWVideoConfig.bZFreeze)
-	    InitSlope(&ZSlope, v0->screenPosition[2], v1->screenPosition[2], v2->screenPosition[2], fltdx31, fltdx12, fltdy12, fltdy31);
+		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++)
-    {
-        for(int comp = 0; comp < 4; comp++)
-            InitSlope(&ColorSlopes[i][comp], v0->color[i][comp], v1->color[i][comp], v2->color[i][comp], fltdx31, fltdx12, fltdy12, fltdy31);
-    }
+	for(unsigned int i = 0; i < bpmem.genMode.numcolchans; i++)
+	{
+		for(int comp = 0; comp < 4; comp++)
+			InitSlope(&ColorSlopes[i][comp], v0->color[i][comp], v1->color[i][comp], v2->color[i][comp], fltdx31, fltdx12, fltdy12, fltdy31);
+	}
 
-    for(unsigned int i = 0; i < bpmem.genMode.numtexgens; i++)
-    {
-        for(int comp = 0; comp < 3; comp++)
-            InitSlope(&TexSlopes[i][comp], v0->texCoords[i][comp] * w[0], v1->texCoords[i][comp] * w[1], v2->texCoords[i][comp] * w[2], fltdx31, fltdx12, fltdy12, fltdy31);
-    }
+	for(unsigned int i = 0; i < bpmem.genMode.numtexgens; i++)
+	{
+		for(int comp = 0; comp < 3; comp++)
+			InitSlope(&TexSlopes[i][comp], v0->texCoords[i][comp] * w[0], v1->texCoords[i][comp] * w[1], v2->texCoords[i][comp] * w[2], fltdx31, fltdx12, fltdy12, fltdy31);
+	}
 
-    // Start in corner of 8x8 block
-    minx &= ~(BLOCK_SIZE - 1);
-    miny &= ~(BLOCK_SIZE - 1);
-    
-    // Half-edge constants
-    s32 C1 = DY12 * X1 - DX12 * Y1;
-    s32 C2 = DY23 * X2 - DX23 * Y2;
-    s32 C3 = DY31 * X3 - DX31 * Y3;
+	// Start in corner of 8x8 block
+	minx &= ~(BLOCK_SIZE - 1);
+	miny &= ~(BLOCK_SIZE - 1);
 
-    // Correct for fill convention
-    if(DY12 < 0 || (DY12 == 0 && DX12 > 0)) C1++;
-    if(DY23 < 0 || (DY23 == 0 && DX23 > 0)) C2++;
-    if(DY31 < 0 || (DY31 == 0 && DX31 > 0)) C3++;
+	// Half-edge constants
+	s32 C1 = DY12 * X1 - DX12 * Y1;
+	s32 C2 = DY23 * X2 - DX23 * Y2;
+	s32 C3 = DY31 * X3 - DX31 * Y3;
 
-    // Loop through blocks
-    for(s32 y = miny; y < maxy; y += BLOCK_SIZE)
-    {
-        for(s32 x = minx; x < maxx; x += BLOCK_SIZE)
-        {
-            // Corners of block
-            s32 x0 = x << 4;
-            s32 x1 = (x + BLOCK_SIZE - 1) << 4;
-            s32 y0 = y << 4;
-            s32 y1 = (y + BLOCK_SIZE - 1) << 4;
+	// Correct for fill convention
+	if(DY12 < 0 || (DY12 == 0 && DX12 > 0)) C1++;
+	if(DY23 < 0 || (DY23 == 0 && DX23 > 0)) C2++;
+	if(DY31 < 0 || (DY31 == 0 && DX31 > 0)) C3++;
 
-            // Evaluate half-space functions
-            bool a00 = C1 + DX12 * y0 - DY12 * x0 > 0;
-            bool a10 = C1 + DX12 * y0 - DY12 * x1 > 0;
-            bool a01 = C1 + DX12 * y1 - DY12 * x0 > 0;
-            bool a11 = C1 + DX12 * y1 - DY12 * x1 > 0;
-            int a = (a00 << 0) | (a10 << 1) | (a01 << 2) | (a11 << 3);
-    
-            bool b00 = C2 + DX23 * y0 - DY23 * x0 > 0;
-            bool b10 = C2 + DX23 * y0 - DY23 * x1 > 0;
-            bool b01 = C2 + DX23 * y1 - DY23 * x0 > 0;
-            bool b11 = C2 + DX23 * y1 - DY23 * x1 > 0;
-            int b = (b00 << 0) | (b10 << 1) | (b01 << 2) | (b11 << 3);
-    
-            bool c00 = C3 + DX31 * y0 - DY31 * x0 > 0;
-            bool c10 = C3 + DX31 * y0 - DY31 * x1 > 0;
-            bool c01 = C3 + DX31 * y1 - DY31 * x0 > 0;
-            bool c11 = C3 + DX31 * y1 - DY31 * x1 > 0;
-            int c = (c00 << 0) | (c10 << 1) | (c01 << 2) | (c11 << 3);
+	// Loop through blocks
+	for(s32 y = miny; y < maxy; y += BLOCK_SIZE)
+	{
+		for(s32 x = minx; x < maxx; x += BLOCK_SIZE)
+		{
+			// Corners of block
+			s32 x0 = x << 4;
+			s32 x1 = (x + BLOCK_SIZE - 1) << 4;
+			s32 y0 = y << 4;
+			s32 y1 = (y + BLOCK_SIZE - 1) << 4;
 
-            // Skip block when outside an edge
-            if(a == 0x0 || b == 0x0 || c == 0x0) continue;
+			// Evaluate half-space functions
+			bool a00 = C1 + DX12 * y0 - DY12 * x0 > 0;
+			bool a10 = C1 + DX12 * y0 - DY12 * x1 > 0;
+			bool a01 = C1 + DX12 * y1 - DY12 * x0 > 0;
+			bool a11 = C1 + DX12 * y1 - DY12 * x1 > 0;
+			int a = (a00 << 0) | (a10 << 1) | (a01 << 2) | (a11 << 3);
+
+			bool b00 = C2 + DX23 * y0 - DY23 * x0 > 0;
+			bool b10 = C2 + DX23 * y0 - DY23 * x1 > 0;
+			bool b01 = C2 + DX23 * y1 - DY23 * x0 > 0;
+			bool b11 = C2 + DX23 * y1 - DY23 * x1 > 0;
+			int b = (b00 << 0) | (b10 << 1) | (b01 << 2) | (b11 << 3);
+
+			bool c00 = C3 + DX31 * y0 - DY31 * x0 > 0;
+			bool c10 = C3 + DX31 * y0 - DY31 * x1 > 0;
+			bool c01 = C3 + DX31 * y1 - DY31 * x0 > 0;
+			bool c11 = C3 + DX31 * y1 - DY31 * x1 > 0;
+			int c = (c00 << 0) | (c10 << 1) | (c01 << 2) | (c11 << 3);
+
+			// Skip block when outside an edge
+			if(a == 0x0 || b == 0x0 || c == 0x0)
+				continue;
 
 			BuildBlock(x, y);
 
-            // Accept whole block when totally covered
-            if(a == 0xF && b == 0xF && c == 0xF)
-            {
-                for(s32 iy = 0; iy < BLOCK_SIZE; iy++)
-                {
-                    for(s32 ix = 0; ix < BLOCK_SIZE; ix++)
-                    {                        
-                        Draw(x + ix, y + iy, ix, iy);
-                    }
-                }
-            }
-            else // Partially covered block
-            {
-                s32 CY1 = C1 + DX12 * y0 - DY12 * x0;
-                s32 CY2 = C2 + DX23 * y0 - DY23 * x0;
-                s32 CY3 = C3 + DX31 * y0 - DY31 * x0;
+			// Accept whole block when totally covered
+			if(a == 0xF && b == 0xF && c == 0xF)
+			{
+				for(s32 iy = 0; iy < BLOCK_SIZE; iy++)
+				{
+					for(s32 ix = 0; ix < BLOCK_SIZE; ix++)
+					{
+						Draw(x + ix, y + iy, ix, iy);
+					}
+				}
+			}
+			else // Partially covered block
+			{
+				s32 CY1 = C1 + DX12 * y0 - DY12 * x0;
+				s32 CY2 = C2 + DX23 * y0 - DY23 * x0;
+				s32 CY3 = C3 + DX31 * y0 - DY31 * x0;
 
-                for(s32 iy = 0; iy < BLOCK_SIZE; iy++)
-                {
-                    s32 CX1 = CY1;
-                    s32 CX2 = CY2;
-                    s32 CX3 = CY3;
+				for(s32 iy = 0; iy < BLOCK_SIZE; iy++)
+				{
+					s32 CX1 = CY1;
+					s32 CX2 = CY2;
+					s32 CX3 = CY3;
 
-                    for(s32 ix = 0; ix < BLOCK_SIZE; ix++)
-                    {
-                        if(CX1 > 0 && CX2 > 0 && CX3 > 0)
-                        {
-                            Draw(x + ix, y + iy, ix, iy);
-                        }
+					for(s32 ix = 0; ix < BLOCK_SIZE; ix++)
+					{
+						if(CX1 > 0 && CX2 > 0 && CX3 > 0)
+						{
+							Draw(x + ix, y + iy, ix, iy);
+						}
 
-                        CX1 -= FDY12;
-                        CX2 -= FDY23;
-                        CX3 -= FDY31;
-                    }
-
-                    CY1 += FDX12;
-                    CY2 += FDX23;
-                    CY3 += FDX31;
-                }
-            }
-        }
-    }
+						CX1 -= FDY12;
+						CX2 -= FDY23;
+						CX3 -= FDY31;
+					}
 
+					CY1 += FDX12;
+					CY2 += FDX23;
+					CY3 += FDX31;
+				}
+			}
+		}
+	}
 }
 
 
-
 }
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/Rasterizer.h b/Source/Plugins/Plugin_VideoSoftware/Src/Rasterizer.h
index 784c4a8d62..3f61fcaefe 100644
--- a/Source/Plugins/Plugin_VideoSoftware/Src/Rasterizer.h
+++ b/Source/Plugins/Plugin_VideoSoftware/Src/Rasterizer.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _RASTERIZER_H_
 #define _RASTERIZER_H_
@@ -23,19 +10,19 @@
 
 namespace Rasterizer
 {
-    void Init();
+	void Init();
 
-    void DrawTriangleFrontFace(OutputVertexData *v0, OutputVertexData *v1, OutputVertexData *v2);
+	void DrawTriangleFrontFace(OutputVertexData *v0, OutputVertexData *v1, OutputVertexData *v2);
 
-    void SetScissor();
+	void SetScissor();
 
-    void SetTevReg(int reg, int comp, bool konst, s16 color);
+	void SetTevReg(int reg, int comp, bool konst, s16 color);
 
-    struct Slope
-    {
-        float dfdx;
-        float dfdy;
-        float f0;
+	struct Slope
+	{
+		float dfdx;
+		float dfdy;
+		float f0;
 
 		float GetValue(float dx, float dy) { return f0 + (dfdx * dx) + (dfdy * dy); }
 		void DoState(PointerWrap &p)
@@ -44,7 +31,7 @@ namespace Rasterizer
 			p.Do(dfdy);
 			p.Do(f0);
 		}
-    };
+	};
 
 	struct RasterBlockPixel
 	{
@@ -62,7 +49,6 @@ namespace Rasterizer
 	};
 
 	void DoState(PointerWrap &p);
-    
 }
 
 #endif
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SWCommandProcessor.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/SWCommandProcessor.cpp
index 6cc4ee4dc8..5fd1353a94 100644
--- a/Source/Plugins/Plugin_VideoSoftware/Src/SWCommandProcessor.cpp
+++ b/Source/Plugins/Plugin_VideoSoftware/Src/SWCommandProcessor.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "Common.h"
 #include "Thread.h"
@@ -37,7 +24,7 @@ namespace SWCommandProcessor
 enum
 {
 	GATHER_PIPE_SIZE = 32,
-    INT_CAUSE_CP =  0x800
+	INT_CAUSE_CP =  0x800
 };
 
 // STATE_TO_SAVE
@@ -56,7 +43,7 @@ CPReg cpreg; // shared between gfx and emulator thread
 
 void DoState(PointerWrap &p)
 {
-	p.Do(cpreg);
+	p.DoPOD(cpreg);
 	p.DoArray(commandBuffer, commandBufferSize);
 	p.Do(readPos);
 	p.Do(writePos);
@@ -83,17 +70,17 @@ void UpdateInterrupts_Wrapper(u64 userdata, int cyclesLate)
 
 inline bool AtBreakpoint()
 {
-    return cpreg.ctrl.BPEnable && (cpreg.readptr == cpreg.breakpt);
+	return cpreg.ctrl.BPEnable && (cpreg.readptr == cpreg.breakpt);
 }
 
 void Init()
 {
-    cpreg.status.Hex = 0;
+	cpreg.status.Hex = 0;
 	cpreg.status.CommandIdle = 1;
 	cpreg.status.ReadIdle = 1;
 
-    cpreg.ctrl.Hex = 0;
-    cpreg.clear.Hex = 0;
+	cpreg.ctrl.Hex = 0;
+	cpreg.clear.Hex = 0;
 
 	cpreg.bboxleft = 0;
 	cpreg.bboxtop  = 0;
@@ -104,15 +91,15 @@ void Init()
 	
 	et_UpdateInterrupts = CoreTiming::RegisterEvent("UpdateInterrupts", UpdateInterrupts_Wrapper);
 
-    // internal buffer position
-    readPos = 0;
-    writePos = 0;
+	// internal buffer position
+	readPos = 0;
+	writePos = 0;
 
-    interruptSet = false;
-    interruptWaiting = false;
+	interruptSet = false;
+	interruptWaiting = false;
 
-    g_pVideoData = 0;
-    g_bSkipCurrentFrame = false;
+	g_pVideoData = 0;
+	g_bSkipCurrentFrame = false;
 }
 
 void Shutdown()
@@ -121,31 +108,32 @@ void Shutdown()
 
 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
-	FPURoundMode::SaveSIMDState();
-	FPURoundMode::LoadDefaultSIMDState();			
-        
-        // run the opcode decoder
-        do {
-        RunBuffer();
-        } while (cpreg.ctrl.GPReadEnable && !AtBreakpoint() && cpreg.readptr != cpreg.writeptr);
+	if (!SConfig::GetInstance().m_LocalCoreStartupParameter.bCPUThread)
+	{
+		// We are going to do FP math on the main thread so have to save the current state
+		FPURoundMode::SaveSIMDState();
+		FPURoundMode::LoadDefaultSIMDState();
 
-	FPURoundMode::LoadSIMDState();
-    }
+		// run the opcode decoder
+		do
+		{
+			RunBuffer();
+		} while (cpreg.ctrl.GPReadEnable && !AtBreakpoint() && cpreg.readptr != cpreg.writeptr);
+
+		FPURoundMode::LoadSIMDState();
+	}
 }
 
 void Read16(u16& _rReturnValue, const u32 _Address)
 {
-    u32 regAddr = (_Address & 0xFFF) >> 1;
+	u32 regAddr = (_Address & 0xFFF) >> 1;
 
-    DEBUG_LOG(COMMANDPROCESSOR, "(r): 0x%08x : 0x%08x", _Address, ((u16*)&cpreg)[regAddr]);
-   
-    if (regAddr < 0x20)
-        _rReturnValue = ((u16*)&cpreg)[regAddr];
-    else
-        _rReturnValue = 0;
+	DEBUG_LOG(COMMANDPROCESSOR, "(r): 0x%08x : 0x%08x", _Address, ((u16*)&cpreg)[regAddr]);
+
+	if (regAddr < 0x20)
+		_rReturnValue = ((u16*)&cpreg)[regAddr];
+	else
+		_rReturnValue = 0;
 }
 
 void Write16(const u16 _Value, const u32 _Address)
@@ -162,14 +150,14 @@ void Write16(const u16 _Value, const u32 _Address)
 
 	case CTRL_REGISTER:
 		{
-            cpreg.ctrl.Hex = _Value;
+			cpreg.ctrl.Hex = _Value;
 
 			DEBUG_LOG(COMMANDPROCESSOR,"\t write to CTRL_REGISTER : %04x", _Value);
 			DEBUG_LOG(COMMANDPROCESSOR, "\t GPREAD %s | CPULINK %s | BP %s || BPIntEnable %s | OvF %s | UndF %s"
-                , cpreg.ctrl.GPReadEnable ?				"ON" : "OFF"
-                , cpreg.ctrl.GPLinkEnable ?				"ON" : "OFF"
-                , cpreg.ctrl.BPEnable ?					"ON" : "OFF"
-                , cpreg.ctrl.BreakPointIntEnable ?		"ON" : "OFF"
+				, cpreg.ctrl.GPReadEnable ?				"ON" : "OFF"
+				, cpreg.ctrl.GPLinkEnable ?				"ON" : "OFF"
+				, cpreg.ctrl.BPEnable ?					"ON" : "OFF"
+				, cpreg.ctrl.BreakPointIntEnable ?		"ON" : "OFF"
 				, cpreg.ctrl.FifoOverflowIntEnable ?	"ON" : "OFF"
 				, cpreg.ctrl.FifoUnderflowIntEnable ?	"ON" : "OFF"
 				);
@@ -178,14 +166,14 @@ void Write16(const u16 _Value, const u32 _Address)
 
 	case CLEAR_REGISTER:
 		{
-            UCPClearReg tmpClear(_Value);
+			UCPClearReg tmpClear(_Value);
 
-            if (tmpClear.ClearFifoOverflow)
-                cpreg.status.OverflowHiWatermark = 0;
-            if (tmpClear.ClearFifoUnderflow)
-                cpreg.status.UnderflowLoWatermark = 0;
+			if (tmpClear.ClearFifoOverflow)
+				cpreg.status.OverflowHiWatermark = 0;
+			if (tmpClear.ClearFifoUnderflow)
+				cpreg.status.UnderflowLoWatermark = 0;
 
-            INFO_LOG(COMMANDPROCESSOR,"\t write to CLEAR_REGISTER : %04x",_Value);
+			INFO_LOG(COMMANDPROCESSOR,"\t write to CLEAR_REGISTER : %04x",_Value);
 		}		
 		break;
 
@@ -195,122 +183,122 @@ void Write16(const u16 _Value, const u32 _Address)
 		DEBUG_LOG(COMMANDPROCESSOR,"\t write to FIFO_TOKEN_REGISTER : %04x", _Value);
 		break;
 
-	case FIFO_BASE_LO:			
-        WriteLow ((u32 &)cpreg.fifobase, _Value & 0xFFE0);
+	case FIFO_BASE_LO:
+		WriteLow ((u32 &)cpreg.fifobase, _Value & 0xFFE0);
 		DEBUG_LOG(COMMANDPROCESSOR,"\t write to FIFO_BASE_LO. FIFO base is : %08x", cpreg.fifobase);
 		break;
-	case FIFO_BASE_HI:			
-        WriteHigh((u32 &)cpreg.fifobase, _Value);
+	case FIFO_BASE_HI:
+		WriteHigh((u32 &)cpreg.fifobase, _Value);
 		DEBUG_LOG(COMMANDPROCESSOR,"\t write to FIFO_BASE_HI. FIFO base is : %08x", cpreg.fifobase);
 		break;
-	case FIFO_END_LO:			
-        WriteLow ((u32 &)cpreg.fifoend, _Value & 0xFFE0);
+	case FIFO_END_LO:
+		WriteLow ((u32 &)cpreg.fifoend, _Value & 0xFFE0);
 		DEBUG_LOG(COMMANDPROCESSOR,"\t write to FIFO_END_LO. FIFO end is : %08x", cpreg.fifoend);
 		break;
 	case FIFO_END_HI:
-        WriteHigh((u32 &)cpreg.fifoend, _Value);
+		WriteHigh((u32 &)cpreg.fifoend, _Value);
 		DEBUG_LOG(COMMANDPROCESSOR,"\t write to FIFO_END_HI. FIFO end is : %08x", cpreg.fifoend);
 		break;
 
 	case FIFO_WRITE_POINTER_LO:
-        WriteLow ((u32 &)cpreg.writeptr, _Value & 0xFFE0);
+		WriteLow ((u32 &)cpreg.writeptr, _Value & 0xFFE0);
 		DEBUG_LOG(COMMANDPROCESSOR,"\t write to FIFO_WRITE_POINTER_LO. write ptr is : %08x", cpreg.writeptr);
 		break;
 	case FIFO_WRITE_POINTER_HI:
-        WriteHigh ((u32 &)cpreg.writeptr, _Value);
+		WriteHigh ((u32 &)cpreg.writeptr, _Value);
 		DEBUG_LOG(COMMANDPROCESSOR,"\t write to FIFO_WRITE_POINTER_HI. write ptr is : %08x", cpreg.writeptr);
 		break;
 	case FIFO_READ_POINTER_LO:
-        WriteLow ((u32 &)cpreg.readptr, _Value & 0xFFE0);
+		WriteLow ((u32 &)cpreg.readptr, _Value & 0xFFE0);
 		DEBUG_LOG(COMMANDPROCESSOR,"\t write to FIFO_READ_POINTER_LO. read ptr is : %08x", cpreg.readptr);
 		break;
 	case FIFO_READ_POINTER_HI:
-        WriteHigh ((u32 &)cpreg.readptr, _Value);
+		WriteHigh ((u32 &)cpreg.readptr, _Value);
 		DEBUG_LOG(COMMANDPROCESSOR,"\t write to FIFO_READ_POINTER_HI. read ptr is : %08x", cpreg.readptr);
 		break;
 
-    case FIFO_HI_WATERMARK_LO:
-        WriteLow ((u32 &)cpreg.hiwatermark, _Value);
+	case FIFO_HI_WATERMARK_LO:
+		WriteLow ((u32 &)cpreg.hiwatermark, _Value);
 		DEBUG_LOG(COMMANDPROCESSOR,"\t write to FIFO_HI_WATERMARK_LO. hiwatermark is : %08x", cpreg.hiwatermark);
 		break;
 	case FIFO_HI_WATERMARK_HI:
-        WriteHigh ((u32 &)cpreg.hiwatermark, _Value);
+		WriteHigh ((u32 &)cpreg.hiwatermark, _Value);
 		DEBUG_LOG(COMMANDPROCESSOR,"\t write to FIFO_HI_WATERMARK_HI. hiwatermark is : %08x", cpreg.hiwatermark);
 		break;
 	case FIFO_LO_WATERMARK_LO:
-        WriteLow ((u32 &)cpreg.lowatermark, _Value);
+		WriteLow ((u32 &)cpreg.lowatermark, _Value);
 		DEBUG_LOG(COMMANDPROCESSOR,"\t write to FIFO_LO_WATERMARK_LO. lowatermark is : %08x", cpreg.lowatermark);
 		break;
 	case FIFO_LO_WATERMARK_HI:
-        WriteHigh ((u32 &)cpreg.lowatermark, _Value);
+		WriteHigh ((u32 &)cpreg.lowatermark, _Value);
 		DEBUG_LOG(COMMANDPROCESSOR,"\t write to FIFO_LO_WATERMARK_HI. lowatermark is : %08x", cpreg.lowatermark);
 		break;
 
-    case FIFO_BP_LO:
-        WriteLow ((u32 &)cpreg.breakpt, _Value & 0xFFE0);
-		DEBUG_LOG(COMMANDPROCESSOR,"\t write to FIFO_BP_LO. breakpt is : %08x", cpreg.breakpt);
+	case FIFO_BP_LO:
+		WriteLow ((u32 &)cpreg.breakpt, _Value & 0xFFE0);
+		DEBUG_LOG(COMMANDPROCESSOR,"\t write to FIFO_BP_LO. breakpoint is : %08x", cpreg.breakpt);
 		break;
 	case FIFO_BP_HI:
-        WriteHigh ((u32 &)cpreg.breakpt, _Value);
-		DEBUG_LOG(COMMANDPROCESSOR,"\t write to FIFO_BP_HI. breakpt is : %08x", cpreg.breakpt);
+		WriteHigh ((u32 &)cpreg.breakpt, _Value);
+		DEBUG_LOG(COMMANDPROCESSOR,"\t write to FIFO_BP_HI. breakpoint is : %08x", cpreg.breakpt);
 		break;
 
-    case FIFO_RW_DISTANCE_LO:
-        WriteLow ((u32 &)cpreg.rwdistance, _Value & 0xFFE0);
+	case FIFO_RW_DISTANCE_LO:
+		WriteLow ((u32 &)cpreg.rwdistance, _Value & 0xFFE0);
 		DEBUG_LOG(COMMANDPROCESSOR,"\t write to FIFO_RW_DISTANCE_LO. rwdistance is : %08x", cpreg.rwdistance);
 		break;
 	case FIFO_RW_DISTANCE_HI:
-        WriteHigh ((u32 &)cpreg.rwdistance, _Value);
+		WriteHigh ((u32 &)cpreg.rwdistance, _Value);
 		DEBUG_LOG(COMMANDPROCESSOR,"\t write to FIFO_RW_DISTANCE_HI. rwdistance is : %08x", cpreg.rwdistance);
 		break;
-    }
+	}
 
-    RunGpu();
+	RunGpu();
 }
 
 void Read32(u32& _rReturnValue, const u32 _Address)
 {
 	_rReturnValue = 0;
-	_dbg_assert_msg_(COMMANDPROCESSOR, 0, "Read32 from CommandProccessor at 0x%08x", _Address);
+	_dbg_assert_msg_(COMMANDPROCESSOR, 0, "Read32 from CommandProcessor at 0x%08x", _Address);
 }
 
 void Write32(const u32 _Data, const u32 _Address)
 {
-	_dbg_assert_msg_(COMMANDPROCESSOR, 0, "Write32 at CommandProccessor at 0x%08x", _Address);
+	_dbg_assert_msg_(COMMANDPROCESSOR, 0, "Write32 at CommandProcessor at 0x%08x", _Address);
 }
 
 void STACKALIGN GatherPipeBursted()
 {
 	if (cpreg.ctrl.GPLinkEnable)
-    {
-        DEBUG_LOG(COMMANDPROCESSOR,"\t WGP burst. write thru : %08x", cpreg.writeptr);
+	{
+		DEBUG_LOG(COMMANDPROCESSOR,"\t WGP burst. write thru : %08x", cpreg.writeptr);
 
-        if (cpreg.writeptr == cpreg.fifoend)
-            cpreg.writeptr = cpreg.fifobase;
-        else
-            cpreg.writeptr += GATHER_PIPE_SIZE;
+		if (cpreg.writeptr == cpreg.fifoend)
+			cpreg.writeptr = cpreg.fifobase;
+		else
+			cpreg.writeptr += GATHER_PIPE_SIZE;
 
-        Common::AtomicAdd(cpreg.rwdistance, GATHER_PIPE_SIZE);
-    }
+		Common::AtomicAdd(cpreg.rwdistance, GATHER_PIPE_SIZE);
+	}
 
-    RunGpu();
+	RunGpu();
 }
 
 void UpdateInterrupts(u64 userdata)
 {
-    if (userdata)
+	if (userdata)
 	{
 		interruptSet = true;
-        INFO_LOG(COMMANDPROCESSOR,"Interrupt set");
-        ProcessorInterface::SetInterrupt(INT_CAUSE_CP, true);        
+		INFO_LOG(COMMANDPROCESSOR,"Interrupt set");
+		ProcessorInterface::SetInterrupt(INT_CAUSE_CP, true);
 	}
 	else
 	{
-        interruptSet = false;
+		interruptSet = false;
 		INFO_LOG(COMMANDPROCESSOR,"Interrupt cleared");
-        ProcessorInterface::SetInterrupt(INT_CAUSE_CP, false);        
+		ProcessorInterface::SetInterrupt(INT_CAUSE_CP, false);
 	}
-    interruptWaiting = false;
+	interruptWaiting = false;
 }
 
 void UpdateInterruptsFromVideoBackend(u64 userdata)
@@ -320,136 +308,138 @@ void UpdateInterruptsFromVideoBackend(u64 userdata)
 
 void ReadFifo()
 {
-    bool canRead = cpreg.readptr != cpreg.writeptr && writePos < (int)maxCommandBufferWrite;
-    bool atBreakpoint = AtBreakpoint();
+	bool canRead = cpreg.readptr != cpreg.writeptr && writePos < (int)maxCommandBufferWrite;
+	bool atBreakpoint = AtBreakpoint();
 
-    if (canRead && !atBreakpoint)
-    {
-        // read from fifo
-        u8 *ptr = Memory::GetPointer(cpreg.readptr);
-        int bytesRead = 0;
+	if (canRead && !atBreakpoint)
+	{
+		// read from fifo
+		u8 *ptr = Memory::GetPointer(cpreg.readptr);
+		int bytesRead = 0;
 
-        do
-        {
-            // copy to buffer
-            memcpy(&commandBuffer[writePos], ptr, GATHER_PIPE_SIZE);
-            writePos += GATHER_PIPE_SIZE;
-            bytesRead += GATHER_PIPE_SIZE;
+		do
+		{
+			// copy to buffer
+			memcpy(&commandBuffer[writePos], ptr, GATHER_PIPE_SIZE);
+			writePos += GATHER_PIPE_SIZE;
+			bytesRead += GATHER_PIPE_SIZE;
 
-            if (cpreg.readptr == cpreg.fifoend)
-            {
-                cpreg.readptr = cpreg.fifobase;
-                ptr = Memory::GetPointer(cpreg.readptr);
-            }
-            else
-            {
-                cpreg.readptr += GATHER_PIPE_SIZE;
-                ptr += GATHER_PIPE_SIZE;    
-            }
+			if (cpreg.readptr == cpreg.fifoend)
+			{
+				cpreg.readptr = cpreg.fifobase;
+				ptr = Memory::GetPointer(cpreg.readptr);
+			}
+			else
+			{
+				cpreg.readptr += GATHER_PIPE_SIZE;
+				ptr += GATHER_PIPE_SIZE;
+			}
 
-            canRead = cpreg.readptr != cpreg.writeptr && writePos < (int)maxCommandBufferWrite;
-            atBreakpoint = AtBreakpoint();
-        } while (canRead && !atBreakpoint);
+			canRead = cpreg.readptr != cpreg.writeptr && writePos < (int)maxCommandBufferWrite;
+			atBreakpoint = AtBreakpoint();
+		} while (canRead && !atBreakpoint);
 
-        Common::AtomicAdd(cpreg.rwdistance, -bytesRead);
-    }
+		Common::AtomicAdd(cpreg.rwdistance, -bytesRead);
+	}
 }
 
 void SetStatus()
 {
-    // overflow check
-    if (cpreg.rwdistance > cpreg.hiwatermark)
-        cpreg.status.OverflowHiWatermark = 1;
+	// overflow check
+	if (cpreg.rwdistance > cpreg.hiwatermark)
+		cpreg.status.OverflowHiWatermark = 1;
 
-    // underflow check
-    if (cpreg.rwdistance < cpreg.lowatermark)
-        cpreg.status.UnderflowLoWatermark = 1;
+	// underflow check
+	if (cpreg.rwdistance < cpreg.lowatermark)
+		cpreg.status.UnderflowLoWatermark = 1;
 
-    // breakpoint     
-    if (cpreg.ctrl.BPEnable)
-    {
-        if (cpreg.breakpt == cpreg.readptr)
-        {
-            if (!cpreg.status.Breakpoint)
-                INFO_LOG(COMMANDPROCESSOR, "Hit breakpoint at %x", cpreg.readptr);
-            cpreg.status.Breakpoint = 1;
-        }
-    }
-    else
-    {
-        if (cpreg.status.Breakpoint)
-            INFO_LOG(COMMANDPROCESSOR, "Cleared breakpoint at %x", cpreg.readptr);
-        cpreg.status.Breakpoint = 0;
-    }
+	// breakpoint
+	if (cpreg.ctrl.BPEnable)
+	{
+		if (cpreg.breakpt == cpreg.readptr)
+		{
+			if (!cpreg.status.Breakpoint)
+				INFO_LOG(COMMANDPROCESSOR, "Hit breakpoint at %x", cpreg.readptr);
+			cpreg.status.Breakpoint = 1;
+		}
+	}
+	else
+	{
+		if (cpreg.status.Breakpoint)
+			INFO_LOG(COMMANDPROCESSOR, "Cleared breakpoint at %x", cpreg.readptr);
+		cpreg.status.Breakpoint = 0;
+	}
 
-    cpreg.status.ReadIdle = cpreg.readptr == cpreg.writeptr;
+	cpreg.status.ReadIdle = cpreg.readptr == cpreg.writeptr;
 
-    bool bpInt = cpreg.status.Breakpoint && cpreg.ctrl.BreakPointIntEnable;
-    bool ovfInt = cpreg.status.OverflowHiWatermark && cpreg.ctrl.FifoOverflowIntEnable;
-    bool undfInt = cpreg.status.UnderflowLoWatermark && cpreg.ctrl.FifoUnderflowIntEnable;
+	bool bpInt = cpreg.status.Breakpoint && cpreg.ctrl.BreakPointIntEnable;
+	bool ovfInt = cpreg.status.OverflowHiWatermark && cpreg.ctrl.FifoOverflowIntEnable;
+	bool undfInt = cpreg.status.UnderflowLoWatermark && cpreg.ctrl.FifoUnderflowIntEnable;
 
-    bool interrupt = bpInt || ovfInt || undfInt;
+	bool interrupt = bpInt || ovfInt || undfInt;
 
-    if (interrupt != interruptSet && !interruptWaiting)
-    {
-        u64 userdata = interrupt?1:0;
-        if (SConfig::GetInstance().m_LocalCoreStartupParameter.bCPUThread)
-        {
-            interruptWaiting = true;
-            SWCommandProcessor::UpdateInterruptsFromVideoBackend(userdata);
-        }
-        else
-            SWCommandProcessor::UpdateInterrupts(userdata);
-    }
+	if (interrupt != interruptSet && !interruptWaiting)
+	{
+		u64 userdata = interrupt?1:0;
+		if (SConfig::GetInstance().m_LocalCoreStartupParameter.bCPUThread)
+		{
+			interruptWaiting = true;
+			SWCommandProcessor::UpdateInterruptsFromVideoBackend(userdata);
+		}
+		else
+		{
+			SWCommandProcessor::UpdateInterrupts(userdata);
+		}
+	}
 }
 
 bool RunBuffer()
 {
-    // fifo is read 32 bytes at a time
-    // read fifo data to internal buffer
-    if (cpreg.ctrl.GPReadEnable)
-        ReadFifo();
+	// fifo is read 32 bytes at a time
+	// read fifo data to internal buffer
+	if (cpreg.ctrl.GPReadEnable)
+		ReadFifo();
 
-    SetStatus();
-    
-    _dbg_assert_(COMMANDPROCESSOR, writePos >= readPos);
-    
-    g_pVideoData = &commandBuffer[readPos];
+	SetStatus();
 
-    u32 availableBytes = writePos - readPos;
+	_dbg_assert_(COMMANDPROCESSOR, writePos >= readPos);
 
-    while (OpcodeDecoder::CommandRunnable(availableBytes))
-    {
-        cpreg.status.CommandIdle = 0;
+	g_pVideoData = &commandBuffer[readPos];
 
-        OpcodeDecoder::Run(availableBytes);
+	u32 availableBytes = writePos - readPos;
 
-        // if data was read by the opcode decoder then the video data pointer changed
-        readPos = (u32)(g_pVideoData - &commandBuffer[0]);
-        _dbg_assert_(VIDEO, writePos >= readPos);
-        availableBytes = writePos - readPos;
-    }
+	while (OpcodeDecoder::CommandRunnable(availableBytes))
+	{
+		cpreg.status.CommandIdle = 0;
 
-    cpreg.status.CommandIdle = 1;
+		OpcodeDecoder::Run(availableBytes);
 
-    bool ranDecoder = false;
-        
-    // move data remaing in command buffer
-    if (readPos > 0)
-    {
-        memmove(&commandBuffer[0], &commandBuffer[readPos], availableBytes);
-        writePos -= readPos;
-        readPos = 0;
+		// if data was read by the opcode decoder then the video data pointer changed
+		readPos = (u32)(g_pVideoData - &commandBuffer[0]);
+		_dbg_assert_(VIDEO, writePos >= readPos);
+		availableBytes = writePos - readPos;
+	}
 
-        ranDecoder = true;
-    }
+	cpreg.status.CommandIdle = 1;
 
-    return ranDecoder;
+	bool ranDecoder = false;
+
+	// move data remaining in the command buffer
+	if (readPos > 0)
+	{
+		memmove(&commandBuffer[0], &commandBuffer[readPos], availableBytes);
+		writePos -= readPos;
+		readPos = 0;
+
+		ranDecoder = true;
+	}
+
+	return ranDecoder;
 }
 
 void SetRendering(bool enabled)
 {
-    g_bSkipCurrentFrame = !enabled;
+	g_bSkipCurrentFrame = !enabled;
 }
 
 } // end of namespace SWCommandProcessor
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SWCommandProcessor.h b/Source/Plugins/Plugin_VideoSoftware/Src/SWCommandProcessor.h
index 2f58f54db1..51cde8dbae 100644
--- a/Source/Plugins/Plugin_VideoSoftware/Src/SWCommandProcessor.h
+++ b/Source/Plugins/Plugin_VideoSoftware/Src/SWCommandProcessor.h
@@ -1,23 +1,10 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _COMMANDPROCESSOR_H_
 #define _COMMANDPROCESSOR_H_
-   
+
 #include "Common.h"
 
 class PointerWrap;
@@ -27,128 +14,128 @@ extern u8* g_pVideoData;
 
 namespace SWCommandProcessor
 {
-    // internal hardware addresses
-    enum
-    {
-	    STATUS_REGISTER				= 0x00,
-	    CTRL_REGISTER				= 0x02,
-	    CLEAR_REGISTER				= 0x04,
-	    FIFO_TOKEN_REGISTER			= 0x0E,
-	    FIFO_BOUNDING_BOX_LEFT		= 0x10,
-	    FIFO_BOUNDING_BOX_RIGHT		= 0x12,
-	    FIFO_BOUNDING_BOX_TOP		= 0x14,
-	    FIFO_BOUNDING_BOX_BOTTOM	= 0x16,
-	    FIFO_BASE_LO				= 0x20,
-	    FIFO_BASE_HI				= 0x22,
-	    FIFO_END_LO					= 0x24,
-	    FIFO_END_HI					= 0x26,
-	    FIFO_HI_WATERMARK_LO		= 0x28,
-	    FIFO_HI_WATERMARK_HI		= 0x2a,
-	    FIFO_LO_WATERMARK_LO		= 0x2c,
-	    FIFO_LO_WATERMARK_HI		= 0x2e,
-	    FIFO_RW_DISTANCE_LO			= 0x30,
-	    FIFO_RW_DISTANCE_HI			= 0x32,
-	    FIFO_WRITE_POINTER_LO		= 0x34,
-	    FIFO_WRITE_POINTER_HI		= 0x36,
-	    FIFO_READ_POINTER_LO		= 0x38,
-	    FIFO_READ_POINTER_HI		= 0x3A,
-	    FIFO_BP_LO					= 0x3C,
-	    FIFO_BP_HI					= 0x3E
-    };
+	// internal hardware addresses
+	enum
+	{
+		STATUS_REGISTER				= 0x00,
+		CTRL_REGISTER				= 0x02,
+		CLEAR_REGISTER				= 0x04,
+		FIFO_TOKEN_REGISTER			= 0x0E,
+		FIFO_BOUNDING_BOX_LEFT		= 0x10,
+		FIFO_BOUNDING_BOX_RIGHT		= 0x12,
+		FIFO_BOUNDING_BOX_TOP		= 0x14,
+		FIFO_BOUNDING_BOX_BOTTOM	= 0x16,
+		FIFO_BASE_LO				= 0x20,
+		FIFO_BASE_HI				= 0x22,
+		FIFO_END_LO					= 0x24,
+		FIFO_END_HI					= 0x26,
+		FIFO_HI_WATERMARK_LO		= 0x28,
+		FIFO_HI_WATERMARK_HI		= 0x2a,
+		FIFO_LO_WATERMARK_LO		= 0x2c,
+		FIFO_LO_WATERMARK_HI		= 0x2e,
+		FIFO_RW_DISTANCE_LO			= 0x30,
+		FIFO_RW_DISTANCE_HI			= 0x32,
+		FIFO_WRITE_POINTER_LO		= 0x34,
+		FIFO_WRITE_POINTER_HI		= 0x36,
+		FIFO_READ_POINTER_LO		= 0x38,
+		FIFO_READ_POINTER_HI		= 0x3A,
+		FIFO_BP_LO					= 0x3C,
+		FIFO_BP_HI					= 0x3E
+	};
 
-    // Fifo Status Register
-    union UCPStatusReg
-    {
-	    struct
-	    {
-		    u16 OverflowHiWatermark	:	1;
-		    u16 UnderflowLoWatermark:	1;
-		    u16 ReadIdle			:	1; // done reading
-		    u16 CommandIdle			:	1; // done processing commands
-		    u16 Breakpoint			:	1;
-		    u16						:	11;
-	    };
-	    u16 Hex;
-	    UCPStatusReg() {Hex = 0; }
-	    UCPStatusReg(u16 _hex) {Hex = _hex; }
-    };
+	// Fifo Status Register
+	union UCPStatusReg
+	{
+		struct
+		{
+			u16 OverflowHiWatermark	:	1;
+			u16 UnderflowLoWatermark:	1;
+			u16 ReadIdle			:	1; // done reading
+			u16 CommandIdle			:	1; // done processing commands
+			u16 Breakpoint			:	1;
+			u16						:	11;
+		};
+		u16 Hex;
+		UCPStatusReg() {Hex = 0; }
+		UCPStatusReg(u16 _hex) {Hex = _hex; }
+	};
 
-    // Fifo Control Register
-    union UCPCtrlReg
-    {
-	    struct
-	    {
-		    u16 GPReadEnable			:	1;
-		    u16 BPEnable           		:	1;
-		    u16 FifoOverflowIntEnable	:	1;
-		    u16 FifoUnderflowIntEnable	:	1;
-		    u16 GPLinkEnable			:	1;
-		    u16 BreakPointIntEnable		:	1;
-		    u16							:	10;
-	    };
-	    u16 Hex;
-	    UCPCtrlReg() {Hex = 0; }
-	    UCPCtrlReg(u16 _hex) {Hex = _hex; }
-    };
+	// Fifo Control Register
+	union UCPCtrlReg
+	{
+		struct
+		{
+			u16 GPReadEnable			:	1;
+			u16 BPEnable				:	1;
+			u16 FifoOverflowIntEnable	:	1;
+			u16 FifoUnderflowIntEnable	:	1;
+			u16 GPLinkEnable			:	1;
+			u16 BreakPointIntEnable		:	1;
+			u16							:	10;
+		};
+		u16 Hex;
+		UCPCtrlReg() {Hex = 0; }
+		UCPCtrlReg(u16 _hex) {Hex = _hex; }
+	};
 
-    // Fifo Control Register
-    union UCPClearReg
-    {
-	    struct
-	    {
-		    u16 ClearFifoOverflow		:	1;
-		    u16 ClearFifoUnderflow		:	1;
-		    u16 ClearMetrices			:	1;
-		    u16							:	13;
-	    };
-	    u16 Hex;
-	    UCPClearReg() {Hex = 0; }
-	    UCPClearReg(u16 _hex) {Hex = _hex; }
-    };
+	// Fifo Control Register
+	union UCPClearReg
+	{
+		struct
+		{
+			u16 ClearFifoOverflow		:	1;
+			u16 ClearFifoUnderflow		:	1;
+			u16 ClearMetrices			:	1;
+			u16							:	13;
+		};
+		u16 Hex;
+		UCPClearReg() {Hex = 0; }
+		UCPClearReg(u16 _hex) {Hex = _hex; }
+	};
 
-    struct CPReg
-    {
-        UCPStatusReg status;    // 0x00
-        UCPCtrlReg ctrl;        // 0x02
-        UCPClearReg clear;      // 0x04
-        u32 unk0;               // 0x06
-        u32 unk1;               // 0x0a
-        u16 token;              // 0x0e
-        u16 bboxleft;           // 0x10
-        u16 bboxtop;            // 0x12
-        u16 bboxright;          // 0x14
-        u16 bboxbottom;         // 0x16
-        u16 unk2;               // 0x18
-        u32 fifobase;           // 0x20
-        u32 fifoend;            // 0x24
-        u32 hiwatermark;        // 0x28
-        u32 lowatermark;        // 0x2c
-        u32 rwdistance;         // 0x30
-        u32 writeptr;           // 0x34
-        u32 readptr;            // 0x38
-        u32 breakpt;            // 0x3c
-    };
+	struct CPReg
+	{
+		UCPStatusReg status;    // 0x00
+		UCPCtrlReg ctrl;        // 0x02
+		UCPClearReg clear;      // 0x04
+		u32 unk0;               // 0x06
+		u32 unk1;               // 0x0a
+		u16 token;              // 0x0e
+		u16 bboxleft;           // 0x10
+		u16 bboxtop;            // 0x12
+		u16 bboxright;          // 0x14
+		u16 bboxbottom;         // 0x16
+		u16 unk2;               // 0x18
+		u32 fifobase;           // 0x20
+		u32 fifoend;            // 0x24
+		u32 hiwatermark;        // 0x28
+		u32 lowatermark;        // 0x2c
+		u32 rwdistance;         // 0x30
+		u32 writeptr;           // 0x34
+		u32 readptr;            // 0x38
+		u32 breakpt;            // 0x3c
+	};
 
-    extern CPReg cpreg;
+	extern CPReg cpreg;
 
-    // Init
-    void Init();
-    void Shutdown();
-    void DoState(PointerWrap &p);
+	// Init
+	void Init();
+	void Shutdown();
+	void DoState(PointerWrap &p);
 
-    bool RunBuffer();
-    void RunGpu();
+	bool RunBuffer();
+	void RunGpu();
 
-    // Read
-    void Read16(u16& _rReturnValue, const u32 _Address);
-    void Write16(const u16 _Data, const u32 _Address);
-    void Read32(u32& _rReturnValue, const u32 _Address);
-    void Write32(const u32 _Data, const u32 _Address);
+	// Read
+	void Read16(u16& _rReturnValue, const u32 _Address);
+	void Write16(const u16 _Data, const u32 _Address);
+	void Read32(u32& _rReturnValue, const u32 _Address);
+	void Write32(const u32 _Data, const u32 _Address);
 
-    // for CGPFIFO
-    void GatherPipeBursted();
-    void UpdateInterrupts(u64 userdata);
-    void UpdateInterruptsFromVideoBackend(u64 userdata);
+	// for CGPFIFO
+	void GatherPipeBursted();
+	void UpdateInterrupts(u64 userdata);
+	void UpdateInterruptsFromVideoBackend(u64 userdata);
 
 	void SetRendering(bool enabled);
 
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SWPixelEngine.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/SWPixelEngine.cpp
index 118e59629e..6c81aedac7 100644
--- a/Source/Plugins/Plugin_VideoSoftware/Src/SWPixelEngine.cpp
+++ b/Source/Plugins/Plugin_VideoSoftware/Src/SWPixelEngine.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 
 // http://developer.nvidia.com/object/General_FAQ.html#t6 !!!!!
@@ -35,8 +22,8 @@ namespace SWPixelEngine
 
 enum
 {
-    INT_CAUSE_PE_TOKEN    =  0x200, // GP Token
-    INT_CAUSE_PE_FINISH   =  0x400, // GP Finished
+	INT_CAUSE_PE_TOKEN    =  0x200, // GP Token
+	INT_CAUSE_PE_FINISH   =  0x400, // GP Finished
 };
 
 // STATE_TO_SAVE
@@ -50,7 +37,7 @@ static int et_SetFinishOnMainThread;
 
 void DoState(PointerWrap &p)
 {
-    p.Do(pereg);
+	p.DoPOD(pereg);
 	p.Do(g_bSignalTokenInterrupt);
 	p.Do(g_bSignalFinishInterrupt);
 	p.Do(et_SetTokenOnMainThread);
@@ -64,10 +51,10 @@ void SetFinish_OnMainThread(u64 userdata, int cyclesLate);
 
 void Init()
 {
-    memset(&pereg, 0, sizeof(pereg));
+	memset(&pereg, 0, sizeof(pereg));
 
-    et_SetTokenOnMainThread = false;
-    g_bSignalFinishInterrupt = false;
+	et_SetTokenOnMainThread = false;
+	g_bSignalFinishInterrupt = false;
 
 	et_SetTokenOnMainThread = CoreTiming::RegisterEvent("SetToken", SetToken_OnMainThread);
 	et_SetFinishOnMainThread = CoreTiming::RegisterEvent("SetFinish", SetFinish_OnMainThread);
@@ -77,10 +64,10 @@ void Read16(u16& _uReturnValue, const u32 _iAddress)
 {
 	DEBUG_LOG(PIXELENGINE, "(r16): 0x%08x", _iAddress);
 
-    u16 address = _iAddress & 0xFFF;
+	u16 address = _iAddress & 0xFFF;
 
-    if (address <= 0x2e)
-        _uReturnValue = ((u16*)&pereg)[address >> 1];
+	if (address <= 0x2e)
+		_uReturnValue = ((u16*)&pereg)[address >> 1];
 }
 
 void Write32(const u32 _iValue, const u32 _iAddress)
@@ -92,7 +79,7 @@ void Write16(const u16 _iValue, const u32 _iAddress)
 {
 	u16 address = _iAddress & 0xFFF;
 
-    switch (address)
+	switch (address)
 	{
 	case PE_CTRL_REGISTER:	
 		{
@@ -101,7 +88,7 @@ void Write16(const u16 _iValue, const u32 _iAddress)
 			if (tmpCtrl.PEToken)	g_bSignalTokenInterrupt = false;
 			if (tmpCtrl.PEFinish)	g_bSignalFinishInterrupt = false;
 
-            pereg.ctrl.PETokenEnable = tmpCtrl.PETokenEnable;
+			pereg.ctrl.PETokenEnable = tmpCtrl.PETokenEnable;
 			pereg.ctrl.PEFinishEnable = tmpCtrl.PEFinishEnable;
 			pereg.ctrl.PEToken = 0;		// this flag is write only
 			pereg.ctrl.PEFinish = 0;	// this flag is write only
@@ -112,7 +99,7 @@ void Write16(const u16 _iValue, const u32 _iAddress)
 		break;
 	default:
 		if (address <= 0x2e)
-            ((u16*)&pereg)[address >> 1] = _iValue;    
+			((u16*)&pereg)[address >> 1] = _iValue;
 		break;
 	}
 }
@@ -125,13 +112,13 @@ bool AllowIdleSkipping()
 void UpdateInterrupts()
 {
 	// check if there is a token-interrupt
-    if (g_bSignalTokenInterrupt	& pereg.ctrl.PETokenEnable)
-        ProcessorInterface::SetInterrupt(INT_CAUSE_PE_TOKEN, true);
+	if (g_bSignalTokenInterrupt	& pereg.ctrl.PETokenEnable)
+		ProcessorInterface::SetInterrupt(INT_CAUSE_PE_TOKEN, true);
 	else
 		ProcessorInterface::SetInterrupt(INT_CAUSE_PE_TOKEN, false);
 
 	// check if there is a finish-interrupt
-    if (g_bSignalFinishInterrupt & pereg.ctrl.PEFinishEnable)
+	if (g_bSignalFinishInterrupt & pereg.ctrl.PEFinishEnable)
 		ProcessorInterface::SetInterrupt(INT_CAUSE_PE_FINISH, true);
 	else
 		ProcessorInterface::SetInterrupt(INT_CAUSE_PE_FINISH, false);
@@ -142,7 +129,7 @@ void UpdateInterrupts()
 void SetToken_OnMainThread(u64 userdata, int cyclesLate)
 {
 	g_bSignalTokenInterrupt = true;
-    INFO_LOG(PIXELENGINE, "VIDEO Backend raises INT_CAUSE_PE_TOKEN (btw, token: %04x)", pereg.token);
+	INFO_LOG(PIXELENGINE, "VIDEO Backend raises INT_CAUSE_PE_TOKEN (btw, token: %04x)", pereg.token);
 	UpdateInterrupts();
 }
 
@@ -157,7 +144,7 @@ void SetFinish_OnMainThread(u64 userdata, int cyclesLate)
 void SetToken(const u16 _token, const int _bSetTokenAcknowledge)
 {
 	pereg.token = _token;
-    if (_bSetTokenAcknowledge) // set token INT
+	if (_bSetTokenAcknowledge) // set token INT
 	{
 		CoreTiming::ScheduleEvent_Threadsafe(0, et_SetTokenOnMainThread,
 			_token | (_bSetTokenAcknowledge << 16));
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SWPixelEngine.h b/Source/Plugins/Plugin_VideoSoftware/Src/SWPixelEngine.h
index 351e53456d..b61af07a06 100644
--- a/Source/Plugins/Plugin_VideoSoftware/Src/SWPixelEngine.h
+++ b/Source/Plugins/Plugin_VideoSoftware/Src/SWPixelEngine.h
@@ -1,19 +1,7 @@
-// Copyright (C) 2003-2009 Dolphin Project.
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
-// 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 _PIXELENGINE_H
 #define _PIXELENGINE_H
 
@@ -24,20 +12,20 @@ class PointerWrap;
 
 namespace SWPixelEngine
 {
-    // internal hardware addresses
-    enum
-    {
-	    PE_ZCONF         = 0x000, // Z Config
-	    PE_ALPHACONF     = 0x002, // Alpha Config
-	    PE_DSTALPHACONF  = 0x004, // Destination Alpha Config
-	    PE_ALPHAMODE     = 0x006, // Alpha Mode Config
-	    PE_ALPHAREAD     = 0x008, // Alpha Read
-	    PE_CTRL_REGISTER = 0x00a, // Control
-	    PE_TOKEN_REG     = 0x00e, // Token
-	    PE_BBOX_LEFT	 = 0x010, // Flip Left
-	    PE_BBOX_RIGHT	 = 0x012, // Flip Right
-	    PE_BBOX_TOP		 = 0x014, // Flip Top
-	    PE_BBOX_BOTTOM	 = 0x016, // Flip Bottom
+	// internal hardware addresses
+	enum
+	{
+		PE_ZCONF		 = 0x000, // Z Config
+		PE_ALPHACONF	 = 0x002, // Alpha Config
+		PE_DSTALPHACONF  = 0x004, // Destination Alpha Config
+		PE_ALPHAMODE	 = 0x006, // Alpha Mode Config
+		PE_ALPHAREAD	 = 0x008, // Alpha Read
+		PE_CTRL_REGISTER = 0x00a, // Control
+		PE_TOKEN_REG	 = 0x00e, // Token
+		PE_BBOX_LEFT	 = 0x010, // Flip Left
+		PE_BBOX_RIGHT	 = 0x012, // Flip Right
+		PE_BBOX_TOP		 = 0x014, // Flip Top
+		PE_BBOX_BOTTOM	 = 0x016, // Flip Bottom
 
 		// NOTE: Order not verified
 		// These indicate the number of quads that are being used as input/output for each particular stage
@@ -53,98 +41,98 @@ namespace SWPixelEngine
 		PE_PERF_BLEND_INPUT_H           = 0x2a,
 		PE_PERF_EFB_COPY_CLOCKS_L       = 0x2c,
 		PE_PERF_EFB_COPY_CLOCKS_H       = 0x2e,
-    };
+	};
 
-    union UPEZConfReg
-    {
-	    u16 Hex;
-	    struct 
-	    {
-		    u16 ZCompEnable	    : 1; // Z Comparator Enable
-		    u16 Function		: 3;
-		    u16 ZUpdEnable		: 1;
-		    u16				    : 11;
-	    };
-    };
+	union UPEZConfReg
+	{
+		u16 Hex;
+		struct 
+		{
+			u16 ZCompEnable		: 1; // Z Comparator Enable
+			u16 Function		: 3;
+			u16 ZUpdEnable		: 1;
+			u16					: 11;
+		};
+	};
 
-    union UPEAlphaConfReg
-    {
-	    u16 Hex;
-	    struct 
-	    {
-		    u16 BMMath			: 1; // GX_BM_BLEND || GX_BM_SUBSTRACT
-		    u16 BMLogic		    : 1; // GX_BM_LOGIC
-		    u16 Dither			: 1;
-		    u16 ColorUpdEnable	: 1;
-		    u16 AlphaUpdEnable	: 1;
-		    u16 DstFactor		: 3;
-		    u16 SrcFactor		: 3;
-		    u16 Substract		: 1; // Additive mode by default
-		    u16 BlendOperator	: 4;
-	    };
-    };
+	union UPEAlphaConfReg
+	{
+		u16 Hex;
+		struct 
+		{
+			u16 BMMath			: 1; // GX_BM_BLEND || GX_BM_SUBSTRACT
+			u16 BMLogic			: 1; // GX_BM_LOGIC
+			u16 Dither			: 1;
+			u16 ColorUpdEnable	: 1;
+			u16 AlphaUpdEnable	: 1;
+			u16 DstFactor		: 3;
+			u16 SrcFactor		: 3;
+			u16 Substract		: 1; // Additive mode by default
+			u16 BlendOperator	: 4;
+		};
+	};
 
-    union UPEDstAlphaConfReg
-    {
-	    u16 Hex;
-	    struct 
-	    {
-		    u16 DstAlpha		: 8;
-		    u16 Enable			: 1;
-		    u16				    : 7;
-	    };
-    };
+	union UPEDstAlphaConfReg
+	{
+		u16 Hex;
+		struct 
+		{
+			u16 DstAlpha		: 8;
+			u16 Enable			: 1;
+			u16					: 7;
+		};
+	};
 
-    union UPEAlphaModeConfReg
-    {
-	    u16 Hex;
-	    struct 
-	    {
-		    u16 Threshold		: 8;
-		    u16 CompareMode	    : 8;
-	    };
-    };
+	union UPEAlphaModeConfReg
+	{
+		u16 Hex;
+		struct 
+		{
+			u16 Threshold		: 8;
+			u16 CompareMode		: 8;
+		};
+	};
 
-    union UPEAlphaReadReg
-    {
-	    u16 Hex;
-	    struct 
-	    {
-		    u16 ReadMode	: 3;
-		    u16				: 13;
-	    };
-    };
+		union UPEAlphaReadReg
+	{
+		u16 Hex;
+		struct 
+		{
+			u16 ReadMode	: 3;
+			u16				: 13;
+		};
+	};
 
-     union UPECtrlReg
-    {
-	    struct 
-	    {
-		    u16 PETokenEnable	:	1;
-		    u16 PEFinishEnable	:	1;
-		    u16 PEToken		:	1; // write only
-		    u16 PEFinish		:	1; // write only
-		    u16				:	12;
-	    };
-	    u16 Hex;
-	    UPECtrlReg() {Hex = 0; }
-	    UPECtrlReg(u16 _hex) {Hex = _hex; }
-    };
+		union UPECtrlReg
+	{
+		struct 
+		{
+			u16 PETokenEnable	:	1;
+			u16 PEFinishEnable	:	1;
+			u16 PEToken			:	1; // write only
+			u16 PEFinish		:	1; // write only
+			u16					:	12;
+		};
+		u16 Hex;
+		UPECtrlReg() {Hex = 0; }
+		UPECtrlReg(u16 _hex) {Hex = _hex; }
+	};
 
-    struct PEReg
-    {
-        UPEZConfReg zconf;
-        UPEAlphaConfReg alphaConf;
-        UPEDstAlphaConfReg dstAlpha;
-        UPEAlphaModeConfReg alphaMode;
-        UPEAlphaReadReg alphaRead;
-        UPECtrlReg ctrl;
-        u16 unk0;
-        u16 token;
+	struct PEReg
+	{
+		UPEZConfReg zconf;
+		UPEAlphaConfReg alphaConf;
+		UPEDstAlphaConfReg dstAlpha;
+		UPEAlphaModeConfReg alphaMode;
+		UPEAlphaReadReg alphaRead;
+		UPECtrlReg ctrl;
+		u16 unk0;
+		u16 token;
 
-        u16 boxLeft;
-        u16 boxRight;
-        u16 boxTop;
-        u16 boxBottom;
+		u16 boxLeft;
+		u16 boxRight;
+		u16 boxTop;
+		u16 boxBottom;
 
 		u16 perfZcompInputZcomplocLo;
 		u16 perfZcompInputZcomplocHi;
@@ -206,24 +194,24 @@ namespace SWPixelEngine
 			if (++perfBlendInputLo == 0)
 				perfBlendInputHi++;
 		}
-    };
+	};
 
-    extern PEReg pereg;
+	extern PEReg pereg;
 
-    void Init();
-    void DoState(PointerWrap &p);
+	void Init();
+	void DoState(PointerWrap &p);
 
-    // Read
-    void Read16(u16& _uReturnValue, const u32 _iAddress);
+	// Read
+	void Read16(u16& _uReturnValue, const u32 _iAddress);
 
-    // Write
-    void Write16(const u16 _iValue, const u32 _iAddress);
-    void Write32(const u32 _iValue, const u32 _iAddress);
+	// Write
+	void Write16(const u16 _iValue, const u32 _iAddress);
+	void Write32(const u32 _iValue, const u32 _iAddress);
 
-    // gfx backend support
-    void SetToken(const u16 _token, const int _bSetTokenAcknowledge);
-    void SetFinish(void);
-    bool AllowIdleSkipping();    
+	// gfx backend support
+	void SetToken(const u16 _token, const int _bSetTokenAcknowledge);
+	void SetFinish(void);
+	bool AllowIdleSkipping();
 
 } // end of namespace SWPixelEngine
 
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.cpp
index 111e6ca57b..a395025808 100644
--- a/Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.cpp
+++ b/Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "Common.h"
 #include <math.h>
@@ -23,6 +10,8 @@
 #include "SWRenderer.h"
 #include "SWStatistics.h"
 
+#include "OnScreenDisplay.h"
+
 static GLuint s_RenderTarget = 0;
 
 static GLint attr_pos = -1, attr_tex = -1;
@@ -75,8 +64,6 @@ void CreateShaders()
 	uni_tex = glGetUniformLocation(program, "Texture");
 	attr_pos = glGetAttribLocation(program, "pos");
 	attr_tex = glGetAttribLocation(program, "TexCoordIn"); 
-	
-	
 }
 
 void SWRenderer::Prepare()
@@ -116,26 +103,65 @@ void SWRenderer::DrawDebugText()
 
 	if (g_SWVideoConfig.bShowStats) 
 	{
-        p+=sprintf(p,"Objects: %i\n",swstats.thisFrame.numDrawnObjects);
-        p+=sprintf(p,"Primatives: %i\n",swstats.thisFrame.numPrimatives);
-        p+=sprintf(p,"Vertices Loaded: %i\n",swstats.thisFrame.numVerticesLoaded);
+		p+=sprintf(p,"Objects: %i\n",swstats.thisFrame.numDrawnObjects);
+		p+=sprintf(p,"Primitives: %i\n",swstats.thisFrame.numPrimatives);
+		p+=sprintf(p,"Vertices Loaded: %i\n",swstats.thisFrame.numVerticesLoaded);
 
-        p+=sprintf(p,"Triangles Input:   %i\n",swstats.thisFrame.numTrianglesIn);
-        p+=sprintf(p,"Triangles Rejected:   %i\n",swstats.thisFrame.numTrianglesRejected);
-        p+=sprintf(p,"Triangles Culled:   %i\n",swstats.thisFrame.numTrianglesCulled);
-        p+=sprintf(p,"Triangles Clipped:  %i\n",swstats.thisFrame.numTrianglesClipped);
-        p+=sprintf(p,"Triangles Drawn:   %i\n",swstats.thisFrame.numTrianglesDrawn);
+		p+=sprintf(p,"Triangles Input:   %i\n",swstats.thisFrame.numTrianglesIn);
+		p+=sprintf(p,"Triangles Rejected:   %i\n",swstats.thisFrame.numTrianglesRejected);
+		p+=sprintf(p,"Triangles Culled:   %i\n",swstats.thisFrame.numTrianglesCulled);
+		p+=sprintf(p,"Triangles Clipped:  %i\n",swstats.thisFrame.numTrianglesClipped);
+		p+=sprintf(p,"Triangles Drawn:   %i\n",swstats.thisFrame.numTrianglesDrawn);
 
-        p+=sprintf(p,"Rasterized Pix:   %i\n",swstats.thisFrame.rasterizedPixels);
-        p+=sprintf(p,"TEV Pix In:   %i\n",swstats.thisFrame.tevPixelsIn);
-        p+=sprintf(p,"TEV Pix Out:   %i\n",swstats.thisFrame.tevPixelsOut);        
-    }
+		p+=sprintf(p,"Rasterized Pix:   %i\n",swstats.thisFrame.rasterizedPixels);
+		p+=sprintf(p,"TEV Pix In:   %i\n",swstats.thisFrame.tevPixelsIn);
+		p+=sprintf(p,"TEV Pix Out:   %i\n",swstats.thisFrame.tevPixelsOut);
+	}
 
 	// Render a shadow, and then the text.
 	SWRenderer::RenderText(debugtext_buffer, 21, 21, 0xDD000000);
 	SWRenderer::RenderText(debugtext_buffer, 20, 20, 0xFFFFFF00);
 }
+#ifdef ANDROID
+// XXX: This /really/ shouldn't be here
+// But for now, we don't have a generic way for all backends to draw the buttons on screen.
+// Once that is implemented, we can remove this
+void DrawButton(GLuint tex, float *coords)
+{
+        //Texture rectangle uses pixel coordinates
+#ifndef USE_GLES
+        GLfloat u_max = (GLfloat)width;
+        GLfloat v_max = (GLfloat)height;
 
+        static const GLfloat texverts[4][2] = {
+                {0, v_max},
+                {0, 0},
+                {u_max, 0},
+                {u_max, v_max}
+        };
+#else
+        static const GLfloat texverts[4][2] = {
+                {0, 1},
+                {0, 0},
+                {1, 0},
+                {1, 1}
+        };
+#endif
+        glBindTexture(TEX2D, tex);
+
+        glVertexAttribPointer(attr_pos, 2, GL_FLOAT, GL_FALSE, 0, coords);
+        glVertexAttribPointer(attr_tex, 2, GL_FLOAT, GL_FALSE, 0, texverts);
+        glEnableVertexAttribArray(attr_pos);
+        glEnableVertexAttribArray(attr_tex);
+                glActiveTexture(GL_TEXTURE0); 
+                glUniform1i(uni_tex, 0);
+                glDrawArrays(GL_TRIANGLE_FAN, 0, 4);
+        glDisableVertexAttribArray(attr_pos);
+        glDisableVertexAttribArray(attr_tex);
+
+        glBindTexture(TEX2D, 0); 
+}
+#endif
 void SWRenderer::DrawTexture(u8 *texture, int width, int height)
 {
 	GLsizei glWidth = (GLsizei)GLInterface->GetBackBufferWidth();
@@ -169,9 +195,9 @@ void SWRenderer::DrawTexture(u8 *texture, int width, int height)
 	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);
+	glUniform1i(uni_tex, 0);
+	glActiveTexture(GL_TEXTURE0);
+	glDrawArrays(GL_TRIANGLE_FAN, 0, 4);
 	glDisableVertexAttribArray(attr_pos);
 	glDisableVertexAttribArray(attr_tex);
 
@@ -181,12 +207,15 @@ void SWRenderer::DrawTexture(u8 *texture, int width, int height)
 
 void SWRenderer::SwapBuffer()
 {
+	// Do our OSD callbacks	
+	OSD::DoCallbacks(OSD::OSD_ONFRAME);
+
 	DrawDebugText();
 
 	glFlush();
 
 	GLInterface->Swap();
-    
+
 	swstats.ResetFrame();
 	
 	glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.h b/Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.h
index 98cec5f515..ba856936cb 100644
--- a/Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.h
+++ b/Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _RENDERER_H_
 #define _RENDERER_H_
@@ -22,16 +9,16 @@
 
 namespace SWRenderer
 {
-    void Init();
-    void Prepare();
-    void Shutdown();
+	void Init();
+	void Prepare();
+	void Shutdown();
 
-    void RenderText(const char* pstr, int left, int top, u32 color);
-    void DrawDebugText();
+	void RenderText(const char* pstr, int left, int top, u32 color);
+	void DrawDebugText();
 
-    void DrawTexture(u8 *texture, int width, int height);
+	void DrawTexture(u8 *texture, int width, int height);
 
-    void SwapBuffer();
+	void SwapBuffer();
 }
 
 #endif
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SWStatistics.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/SWStatistics.cpp
index 720c0de0a8..99b51b77a1 100644
--- a/Source/Plugins/Plugin_VideoSoftware/Src/SWStatistics.cpp
+++ b/Source/Plugins/Plugin_VideoSoftware/Src/SWStatistics.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "SWStatistics.h"
 
@@ -29,7 +16,7 @@ void Xchg(T& a, T&b)
 
 SWStatistics::SWStatistics()
 {
-    frameCount = 0;
+	frameCount = 0;
 }
 
 void SWStatistics::ResetFrame()
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SWStatistics.h b/Source/Plugins/Plugin_VideoSoftware/Src/SWStatistics.h
index 3f5bc0ab7c..d6d889337f 100644
--- a/Source/Plugins/Plugin_VideoSoftware/Src/SWStatistics.h
+++ b/Source/Plugins/Plugin_VideoSoftware/Src/SWStatistics.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "CommonTypes.h"
 #include "SWVideoConfig.h"
@@ -23,29 +10,29 @@
 
 struct SWStatistics
 {
-    struct ThisFrame
-    {
-        u32 numDrawnObjects;
-        u32 numPrimatives;
-        u32 numVerticesLoaded;
-        u32 numVerticesOut;
+	struct ThisFrame
+	{
+		u32 numDrawnObjects;
+		u32 numPrimatives;
+		u32 numVerticesLoaded;
+		u32 numVerticesOut;
 
-        u32 numTrianglesIn;
-        u32 numTrianglesRejected;
-        u32 numTrianglesCulled;
-        u32 numTrianglesClipped;
-        u32 numTrianglesDrawn;
+		u32 numTrianglesIn;
+		u32 numTrianglesRejected;
+		u32 numTrianglesCulled;
+		u32 numTrianglesClipped;
+		u32 numTrianglesDrawn;
 
-        u32 rasterizedPixels;
-        u32 tevPixelsIn;
-        u32 tevPixelsOut;        
-    };
+		u32 rasterizedPixels;
+		u32 tevPixelsIn;
+		u32 tevPixelsOut;
+	};
 
-    u32 frameCount;
-    SWStatistics();
+	u32 frameCount;
+	SWStatistics();
 
-    ThisFrame thisFrame;
-    void ResetFrame();
+	ThisFrame thisFrame;
+	void ResetFrame();
 };
 
 extern SWStatistics swstats;
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SWVertexLoader.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/SWVertexLoader.cpp
index 1c1eeb2005..f176acd635 100644
--- a/Source/Plugins/Plugin_VideoSoftware/Src/SWVertexLoader.cpp
+++ b/Source/Plugins/Plugin_VideoSoftware/Src/SWVertexLoader.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "Common.h"
 
@@ -41,72 +28,74 @@ extern float tcScale[8];
 
 
 SWVertexLoader::SWVertexLoader() :
-    m_VertexSize(0),
-    m_NumAttributeLoaders(0)
+	m_VertexSize(0),
+	m_NumAttributeLoaders(0)
  {
-     VertexLoader_Normal::Init();
-	 VertexLoader_Position::Init();
-	 VertexLoader_TextCoord::Init();
+	VertexLoader_Normal::Init();
+	VertexLoader_Position::Init();
+	VertexLoader_TextCoord::Init();
 
-     m_SetupUnit = new SetupUnit;     
+	m_SetupUnit = new SetupUnit;
  }
 
 SWVertexLoader::~SWVertexLoader()
 {
-    delete m_SetupUnit;
-    m_SetupUnit = NULL;
+	delete m_SetupUnit;
+	m_SetupUnit = NULL;
 }
 
 void SWVertexLoader::SetFormat(u8 attributeIndex, u8 primitiveType)
 {
-    m_CurrentVat = &g_VtxAttr[attributeIndex];
+	m_CurrentVat = &g_VtxAttr[attributeIndex];
 
-    posScale = 1.0f / float(1 << m_CurrentVat->g0.PosFrac);
-    tcScale[0] = 1.0f / float(1 << m_CurrentVat->g0.Tex0Frac);
-    tcScale[1] = 1.0f / float(1 << m_CurrentVat->g1.Tex1Frac);
-    tcScale[2] = 1.0f / float(1 << m_CurrentVat->g1.Tex2Frac);
-    tcScale[3] = 1.0f / float(1 << m_CurrentVat->g1.Tex3Frac);
-    tcScale[4] = 1.0f / float(1 << m_CurrentVat->g2.Tex4Frac);
-    tcScale[5] = 1.0f / float(1 << m_CurrentVat->g2.Tex5Frac);
-    tcScale[6] = 1.0f / float(1 << m_CurrentVat->g2.Tex6Frac);
-    tcScale[7] = 1.0f / float(1 << m_CurrentVat->g2.Tex7Frac);
+	posScale = 1.0f / float(1 << m_CurrentVat->g0.PosFrac);
+	tcScale[0] = 1.0f / float(1 << m_CurrentVat->g0.Tex0Frac);
+	tcScale[1] = 1.0f / float(1 << m_CurrentVat->g1.Tex1Frac);
+	tcScale[2] = 1.0f / float(1 << m_CurrentVat->g1.Tex2Frac);
+	tcScale[3] = 1.0f / float(1 << m_CurrentVat->g1.Tex3Frac);
+	tcScale[4] = 1.0f / float(1 << m_CurrentVat->g2.Tex4Frac);
+	tcScale[5] = 1.0f / float(1 << m_CurrentVat->g2.Tex5Frac);
+	tcScale[6] = 1.0f / float(1 << m_CurrentVat->g2.Tex6Frac);
+	tcScale[7] = 1.0f / float(1 << m_CurrentVat->g2.Tex7Frac);
 
-    //TexMtx
-    const u32 tmDesc[8] = {
-        g_VtxDesc.Tex0MatIdx, g_VtxDesc.Tex1MatIdx, g_VtxDesc.Tex2MatIdx, g_VtxDesc.Tex3MatIdx,
+	//TexMtx
+	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
+
+	// Colors
 	const u32 colDesc[2] = {g_VtxDesc.Color0, g_VtxDesc.Color1};
-    colElements[0] = m_CurrentVat->g0.Color0Elements;
-    colElements[1] = m_CurrentVat->g0.Color1Elements;
-    const u32 colComp[2] = {m_CurrentVat->g0.Color0Comp, m_CurrentVat->g0.Color1Comp};
+	colElements[0] = m_CurrentVat->g0.Color0Elements;
+	colElements[1] = m_CurrentVat->g0.Color1Elements;
+	const u32 colComp[2] = {m_CurrentVat->g0.Color0Comp, m_CurrentVat->g0.Color1Comp};
+
 	// TextureCoord
 	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 u32)((g_VtxDesc.Hex >> 31) & 3)
 	};
-    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 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 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
-    };
+	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
+	};
+
+	m_VertexSize = 0;
 
-    m_VertexSize = 0;
-	
 	// Reset pipeline
 	m_positionLoader = NULL;
-    m_normalLoader = NULL;
-    m_NumAttributeLoaders = 0;
+	m_normalLoader = NULL;
+	m_NumAttributeLoaders = 0;
 
-    // Reset vertex
-    // matrix index from xf regs or cp memory?
+	// Reset vertex
+	// matrix index from xf regs or cp memory?
 	if (swxfregs.MatrixIndexA.PosNormalMtxIdx != MatrixIndexA.PosNormalMtxIdx ||
 		swxfregs.MatrixIndexA.Tex0MtxIdx != MatrixIndexA.Tex0MtxIdx ||
 		swxfregs.MatrixIndexA.Tex1MtxIdx != MatrixIndexA.Tex1MtxIdx ||
@@ -126,39 +115,41 @@ void SWVertexLoader::SetFormat(u8 attributeIndex, u8 primitiveType)
 	}
 
 #if(1)
-    m_Vertex.posMtx = swxfregs.MatrixIndexA.PosNormalMtxIdx;
-    m_Vertex.texMtx[0] = swxfregs.MatrixIndexA.Tex0MtxIdx;
-    m_Vertex.texMtx[1] = swxfregs.MatrixIndexA.Tex1MtxIdx;
-    m_Vertex.texMtx[2] = swxfregs.MatrixIndexA.Tex2MtxIdx;
-    m_Vertex.texMtx[3] = swxfregs.MatrixIndexA.Tex3MtxIdx;
-    m_Vertex.texMtx[4] = swxfregs.MatrixIndexB.Tex4MtxIdx;
-    m_Vertex.texMtx[5] = swxfregs.MatrixIndexB.Tex5MtxIdx;
-    m_Vertex.texMtx[6] = swxfregs.MatrixIndexB.Tex6MtxIdx;
-    m_Vertex.texMtx[7] = swxfregs.MatrixIndexB.Tex7MtxIdx;
+	m_Vertex.posMtx = swxfregs.MatrixIndexA.PosNormalMtxIdx;
+	m_Vertex.texMtx[0] = swxfregs.MatrixIndexA.Tex0MtxIdx;
+	m_Vertex.texMtx[1] = swxfregs.MatrixIndexA.Tex1MtxIdx;
+	m_Vertex.texMtx[2] = swxfregs.MatrixIndexA.Tex2MtxIdx;
+	m_Vertex.texMtx[3] = swxfregs.MatrixIndexA.Tex3MtxIdx;
+	m_Vertex.texMtx[4] = swxfregs.MatrixIndexB.Tex4MtxIdx;
+	m_Vertex.texMtx[5] = swxfregs.MatrixIndexB.Tex5MtxIdx;
+	m_Vertex.texMtx[6] = swxfregs.MatrixIndexB.Tex6MtxIdx;
+	m_Vertex.texMtx[7] = swxfregs.MatrixIndexB.Tex7MtxIdx;
 #else
-    m_Vertex.posMtx = MatrixIndexA.PosNormalMtxIdx;
-    m_Vertex.texMtx[0] = MatrixIndexA.Tex0MtxIdx;
-    m_Vertex.texMtx[1] = MatrixIndexA.Tex1MtxIdx;
-    m_Vertex.texMtx[2] = MatrixIndexA.Tex2MtxIdx;
-    m_Vertex.texMtx[3] = MatrixIndexA.Tex3MtxIdx;
-    m_Vertex.texMtx[4] = MatrixIndexB.Tex4MtxIdx;
-    m_Vertex.texMtx[5] = MatrixIndexB.Tex5MtxIdx;
-    m_Vertex.texMtx[6] = MatrixIndexB.Tex6MtxIdx;
-    m_Vertex.texMtx[7] = MatrixIndexB.Tex7MtxIdx;
+	m_Vertex.posMtx = MatrixIndexA.PosNormalMtxIdx;
+	m_Vertex.texMtx[0] = MatrixIndexA.Tex0MtxIdx;
+	m_Vertex.texMtx[1] = MatrixIndexA.Tex1MtxIdx;
+	m_Vertex.texMtx[2] = MatrixIndexA.Tex2MtxIdx;
+	m_Vertex.texMtx[3] = MatrixIndexA.Tex3MtxIdx;
+	m_Vertex.texMtx[4] = MatrixIndexB.Tex4MtxIdx;
+	m_Vertex.texMtx[5] = MatrixIndexB.Tex5MtxIdx;
+	m_Vertex.texMtx[6] = MatrixIndexB.Tex6MtxIdx;
+	m_Vertex.texMtx[7] = MatrixIndexB.Tex7MtxIdx;
 #endif
 
-    if (g_VtxDesc.PosMatIdx != NOT_PRESENT) {
-        AddAttributeLoader(LoadPosMtx);
-        m_VertexSize++;
-    }
+	if (g_VtxDesc.PosMatIdx != NOT_PRESENT)
+	{
+		AddAttributeLoader(LoadPosMtx);
+		m_VertexSize++;
+	}
 
-    for (int i = 0; i < 8; ++i) {
-        if (tmDesc[i] != NOT_PRESENT)
-        {
-            AddAttributeLoader(LoadTexMtx, i);
-            m_VertexSize++;
-        }
-    }
+	for (int i = 0; i < 8; ++i)
+	{
+		if (tmDesc[i] != NOT_PRESENT)
+		{
+			AddAttributeLoader(LoadTexMtx, i);
+			m_VertexSize++;
+		}
+	}
 
 	// Write vertex position loader
 	m_positionLoader = VertexLoader_Position::GetFunction(g_VtxDesc.Position, m_CurrentVat->g0.PosFormat, m_CurrentVat->g0.PosElements);
@@ -178,14 +169,15 @@ void SWVertexLoader::SetFormat(u8 attributeIndex, u8 primitiveType)
 		{
 			ERROR_LOG(VIDEO, "VertexLoader_Normal::GetFunction returned zero!");
 		}
-        AddAttributeLoader(LoadNormal);
-    }
+		AddAttributeLoader(LoadNormal);
+	}
 
-	for (int i = 0; i < 2; i++) {
+	for (int i = 0; i < 2; i++)
+	{
 		switch (colDesc[i])
 		{
 		case NOT_PRESENT:
-            m_colorLoader[i] = NULL;
+			m_colorLoader[i] = NULL;
 			break;
 		case DIRECT:
 			switch (colComp[i])
@@ -198,7 +190,7 @@ void SWVertexLoader::SetFormat(u8 attributeIndex, u8 primitiveType)
 			case FORMAT_32B_8888:	m_VertexSize += 4; m_colorLoader[i] = (Color_ReadDirect_32b_8888); break;
 			default: _assert_(0); break;
 			}
-            AddAttributeLoader(LoadColor, i);
+			AddAttributeLoader(LoadColor, i);
 			break;
 		case INDEX8:	
 			m_VertexSize += 1;
@@ -212,7 +204,7 @@ void SWVertexLoader::SetFormat(u8 attributeIndex, u8 primitiveType)
 			case FORMAT_32B_8888:	m_colorLoader[i] = (Color_ReadIndex8_32b_8888); break;
 			default: _assert_(0); break;
 			}
-            AddAttributeLoader(LoadColor, i);
+			AddAttributeLoader(LoadColor, i);
 			break;
 		case INDEX16:
 			m_VertexSize += 2;
@@ -226,25 +218,26 @@ void SWVertexLoader::SetFormat(u8 attributeIndex, u8 primitiveType)
 			case FORMAT_32B_8888:	m_colorLoader[i] = (Color_ReadIndex16_32b_8888); break;
 			default: _assert_(0); break;
 			}
-            AddAttributeLoader(LoadColor, i);
+			AddAttributeLoader(LoadColor, i);
 			break;
 		}
 	}
 
 	// Texture matrix indices (remove if corresponding texture coordinate isn't enabled)
-	for (int i = 0; i < 8; i++) {
+	for (int i = 0; i < 8; i++)
+	{
 		const int desc = tcDesc[i];
 		const int format = tcFormat[i];
 		const int elements = tcElements[i];
 		_assert_msg_(VIDEO, NOT_PRESENT <= desc && desc <= INDEX16, "Invalid texture coordinates description!\n(desc = %d)", desc);
 		_assert_msg_(VIDEO, FORMAT_UBYTE <= format && format <= FORMAT_FLOAT, "Invalid texture coordinates format!\n(format = %d)", format);
-		_assert_msg_(VIDEO, 0 <= elements && elements <= 1, "Invalid number of texture coordinates elemnts!\n(elements = %d)", elements);
+		_assert_msg_(VIDEO, 0 <= elements && elements <= 1, "Invalid number of texture coordinates elements!\n(elements = %d)", elements);
 
 		m_texCoordLoader[i] = VertexLoader_TextCoord::GetFunction(desc, format, elements);
 		m_VertexSize += VertexLoader_TextCoord::GetSize(desc, format, elements);
 		if (m_texCoordLoader[i])
 			AddAttributeLoader(LoadTexCoord, i);
-    }
+	}
 
 	// special case if only pos and tex coord 0 and tex coord input is AB11
 	m_TexGenSpecialCase =
@@ -252,80 +245,79 @@ void SWVertexLoader::SetFormat(u8 attributeIndex, u8 primitiveType)
 		(g_VtxDesc.Tex0Coord != NOT_PRESENT) &&
 		(swxfregs.texMtxInfo[0].projection == XF_TEXPROJ_ST);
 
-
-    m_SetupUnit->Init(primitiveType);
+	m_SetupUnit->Init(primitiveType);
 }
 
 
 void SWVertexLoader::LoadVertex()
 {
-    for (int i = 0; i < m_NumAttributeLoaders; i++)
-        m_AttributeLoaders[i].loader(this, &m_Vertex, m_AttributeLoaders[i].index);
+	for (int i = 0; i < m_NumAttributeLoaders; i++)
+		m_AttributeLoaders[i].loader(this, &m_Vertex, m_AttributeLoaders[i].index);
 
-    OutputVertexData* outVertex = m_SetupUnit->GetVertex();
+	OutputVertexData* outVertex = m_SetupUnit->GetVertex();
 
-    // transform input data
-    TransformUnit::TransformPosition(&m_Vertex, outVertex);
+	// transform input data
+	TransformUnit::TransformPosition(&m_Vertex, outVertex);
 
-    if (g_VtxDesc.Normal != NOT_PRESENT)
-    {
-        TransformUnit::TransformNormal(&m_Vertex, m_CurrentVat->g0.NormalElements, outVertex);
-    }
+	if (g_VtxDesc.Normal != NOT_PRESENT)
+	{
+		TransformUnit::TransformNormal(&m_Vertex, m_CurrentVat->g0.NormalElements, outVertex);
+	}
 
-    TransformUnit::TransformColor(&m_Vertex, outVertex);
+	TransformUnit::TransformColor(&m_Vertex, outVertex);
 
-    TransformUnit::TransformTexCoord(&m_Vertex, outVertex, m_TexGenSpecialCase);
+	TransformUnit::TransformTexCoord(&m_Vertex, outVertex, m_TexGenSpecialCase);
 
-    m_SetupUnit->SetupVertex();
+	m_SetupUnit->SetupVertex();
 
-    INCSTAT(swstats.thisFrame.numVerticesLoaded)
+	INCSTAT(swstats.thisFrame.numVerticesLoaded)
 }
 
 void SWVertexLoader::AddAttributeLoader(AttributeLoader loader, u8 index)
 {
-    _assert_msg_(VIDEO, m_NumAttributeLoaders < 21, "Too many attribute loaders");
-    m_AttributeLoaders[m_NumAttributeLoaders].loader = loader;
-    m_AttributeLoaders[m_NumAttributeLoaders++].index = index;
+	_assert_msg_(VIDEO, m_NumAttributeLoaders < 21, "Too many attribute loaders");
+	m_AttributeLoaders[m_NumAttributeLoaders].loader = loader;
+	m_AttributeLoaders[m_NumAttributeLoaders++].index = index;
 }
 
 void SWVertexLoader::LoadPosMtx(SWVertexLoader *vertexLoader, InputVertexData *vertex, u8 unused)
 {
-    vertex->posMtx = DataReadU8() & 0x3f;
+	vertex->posMtx = DataReadU8() & 0x3f;
 }
 
 void SWVertexLoader::LoadTexMtx(SWVertexLoader *vertexLoader, InputVertexData *vertex, u8 index)
 {
-    vertex->texMtx[index] = DataReadU8() & 0x3f;
-}    
+	vertex->texMtx[index] = DataReadU8() & 0x3f;
+}
 
 void SWVertexLoader::LoadPosition(SWVertexLoader *vertexLoader, InputVertexData *vertex, u8 unused)
 {
-    VertexManager::s_pCurBufferPointer = (u8*)&vertex->position;
-    vertexLoader->m_positionLoader();
+	VertexManager::s_pCurBufferPointer = (u8*)&vertex->position;
+	vertexLoader->m_positionLoader();
 }
 
 void SWVertexLoader::LoadNormal(SWVertexLoader *vertexLoader, InputVertexData *vertex, u8 unused)
 {
 	VertexManager::s_pCurBufferPointer = (u8*)&vertex->normal;
-    vertexLoader->m_normalLoader();
+	vertexLoader->m_normalLoader();
 }
 
 void SWVertexLoader::LoadColor(SWVertexLoader *vertexLoader, InputVertexData *vertex, u8 index)
 {
-    u32 color;
-    VertexManager::s_pCurBufferPointer = (u8*)&color;
-    colIndex = index;
-    vertexLoader->m_colorLoader[index]();
+	u32 color;
+	VertexManager::s_pCurBufferPointer = (u8*)&color;
+	colIndex = index;
+	vertexLoader->m_colorLoader[index]();
 
-    // rgba -> abgr
-    *(u32*)vertex->color[index] = Common::swap32(color);
+	// rgba -> abgr
+	*(u32*)vertex->color[index] = Common::swap32(color);
 }
 
 void SWVertexLoader::LoadTexCoord(SWVertexLoader *vertexLoader, InputVertexData *vertex, u8 index)
 {
-    VertexManager::s_pCurBufferPointer = (u8*)&vertex->texCoords[index];
-    tcIndex = index;
-    vertexLoader->m_texCoordLoader[index]();
+	VertexManager::s_pCurBufferPointer = (u8*)&vertex->texCoords[index];
+	tcIndex = index;
+	vertexLoader->m_texCoordLoader[index]();
 }
 
 void SWVertexLoader::DoState(PointerWrap &p)
@@ -339,4 +331,4 @@ void SWVertexLoader::DoState(PointerWrap &p)
 	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 e05346a7a5..5008e7aeb2 100644
--- a/Source/Plugins/Plugin_VideoSoftware/Src/SWVertexLoader.h
+++ b/Source/Plugins/Plugin_VideoSoftware/Src/SWVertexLoader.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _VERTEXLOADER_H_
 #define _VERTEXLOADER_H_
@@ -28,48 +15,48 @@ class SetupUnit;
 
 class SWVertexLoader
 {
-    u32 m_VertexSize;
+	u32 m_VertexSize;
 
-    VAT* m_CurrentVat;
-    
-    TPipelineFunction m_positionLoader;
-    TPipelineFunction m_normalLoader;
-    TPipelineFunction m_colorLoader[2];
-    TPipelineFunction m_texCoordLoader[8];
+	VAT* m_CurrentVat;
 
-    InputVertexData m_Vertex;
+	TPipelineFunction m_positionLoader;
+	TPipelineFunction m_normalLoader;
+	TPipelineFunction m_colorLoader[2];
+	TPipelineFunction m_texCoordLoader[8];
 
-    typedef void (*AttributeLoader)(SWVertexLoader*, InputVertexData*, u8);
-    struct AttrLoaderCall
-    {
-        AttributeLoader loader;
-        u8 index;
-    };
-    AttrLoaderCall m_AttributeLoaders[1+8+1+1+2+8];
-    int m_NumAttributeLoaders;
-    void AddAttributeLoader(AttributeLoader loader, u8 index=0);
+	InputVertexData m_Vertex;
 
-    // attribute loader functions
-    static void LoadPosMtx(SWVertexLoader *vertexLoader, InputVertexData *vertex, u8 unused);
-    static void LoadTexMtx(SWVertexLoader *vertexLoader, InputVertexData *vertex, u8 index);
-    static void LoadPosition(SWVertexLoader *vertexLoader, InputVertexData *vertex, u8 unused);
-    static void LoadNormal(SWVertexLoader *vertexLoader, InputVertexData *vertex, u8 unused);
-    static void LoadColor(SWVertexLoader *vertexLoader, InputVertexData *vertex, u8 index);
-    static void LoadTexCoord(SWVertexLoader *vertexLoader, InputVertexData *vertex, u8 index);
+	typedef void (*AttributeLoader)(SWVertexLoader*, InputVertexData*, u8);
+	struct AttrLoaderCall
+	{
+		AttributeLoader loader;
+		u8 index;
+	};
+	AttrLoaderCall m_AttributeLoaders[1+8+1+1+2+8];
+	int m_NumAttributeLoaders;
+	void AddAttributeLoader(AttributeLoader loader, u8 index=0);
 
-    SetupUnit *m_SetupUnit;
+	// attribute loader functions
+	static void LoadPosMtx(SWVertexLoader *vertexLoader, InputVertexData *vertex, u8 unused);
+	static void LoadTexMtx(SWVertexLoader *vertexLoader, InputVertexData *vertex, u8 index);
+	static void LoadPosition(SWVertexLoader *vertexLoader, InputVertexData *vertex, u8 unused);
+	static void LoadNormal(SWVertexLoader *vertexLoader, InputVertexData *vertex, u8 unused);
+	static void LoadColor(SWVertexLoader *vertexLoader, InputVertexData *vertex, u8 index);
+	static void LoadTexCoord(SWVertexLoader *vertexLoader, InputVertexData *vertex, u8 index);
+
+	SetupUnit *m_SetupUnit;
 
 	bool m_TexGenSpecialCase;
 
 public:
-    SWVertexLoader();
-    ~SWVertexLoader();
+	SWVertexLoader();
+	~SWVertexLoader();
 
-    void SetFormat(u8 attributeIndex, u8 primitiveType);
+	void SetFormat(u8 attributeIndex, u8 primitiveType);
 
-    u32 GetVertexSize() { return m_VertexSize; }
+	u32 GetVertexSize() { return m_VertexSize; }
 
-    void LoadVertex();   
+	void LoadVertex();
 	void DoState(PointerWrap &p);
 };
 
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SWVideoConfig.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/SWVideoConfig.cpp
index a6705a5236..a6ebb97eb9 100644
--- a/Source/Plugins/Plugin_VideoSoftware/Src/SWVideoConfig.cpp
+++ b/Source/Plugins/Plugin_VideoSoftware/Src/SWVideoConfig.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "FileUtil.h"
 #include "IniFile.h"
@@ -47,7 +34,6 @@ SWVideoConfig::SWVideoConfig()
 
 void SWVideoConfig::Load(const char* ini_file)
 {
-	std::string temp;
 	IniFile iniFile;
 	iniFile.Load(ini_file);
 
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SWVideoConfig.h b/Source/Plugins/Plugin_VideoSoftware/Src/SWVideoConfig.h
index c042ae8cc5..94e3a6b2a8 100644
--- a/Source/Plugins/Plugin_VideoSoftware/Src/SWVideoConfig.h
+++ b/Source/Plugins/Plugin_VideoSoftware/Src/SWVideoConfig.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _VIDEOSOFTWARE_CONFIG_H_
 #define _VIDEOSOFTWARE_CONFIG_H_
@@ -25,14 +12,14 @@
 // NEVER inherit from this class.
 struct SWVideoConfig : NonCopyable
 {
-    SWVideoConfig();
-    void Load(const char* ini_file);
-    void Save(const char* ini_file);
+	SWVideoConfig();
+	void Load(const char* ini_file);
+	void Save(const char* ini_file);
 
-    // General
-    bool bFullscreen;
-    bool bHideCursor;
-    bool renderToMainframe;	
+	// General
+	bool bFullscreen;
+	bool bHideCursor;
+	bool renderToMainframe;	
 
 	bool bHwRasterizer;
 
@@ -40,18 +27,18 @@ struct SWVideoConfig : NonCopyable
 	bool bZComploc;
 	bool bZFreeze;
 
-    bool bShowStats;
+	bool bShowStats;
 
-    bool bDumpTextures;
-    bool bDumpObjects;
-    bool bDumpFrames;
+	bool bDumpTextures;
+	bool bDumpObjects;
+	bool bDumpFrames;
 
 	// Debug only
-    bool bDumpTevStages;
+	bool bDumpTevStages;
 	bool bDumpTevTextureFetches;
 
-    u32 drawStart;
-    u32 drawEnd;
+	u32 drawStart;
+	u32 drawEnd;
 };
 
 extern SWVideoConfig g_SWVideoConfig;
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp
index b524ded329..82aa72ab2e 100644
--- a/Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp
+++ b/Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 
 #include "Common.h"
@@ -43,6 +30,7 @@
 #include "SWVertexLoader.h"
 #include "SWStatistics.h"
 
+#include "OnScreenDisplay.h"
 #define VSYNC_ENABLED 0
 
 namespace SW
@@ -81,6 +69,8 @@ bool VideoSoftware::Initialize(void *&window_handle)
 		INFO_LOG(VIDEO, "%s", "SWRenderer::Create failed\n");
 		return false;
 	}
+	// Do our OSD callbacks	
+	OSD::DoCallbacks(OSD::OSD_INIT);
 
 	InitBPMemory();
 	InitXFMemory();
@@ -111,15 +101,15 @@ void VideoSoftware::DoState(PointerWrap& p)
 	OpcodeDecoder::DoState(p);
 	Clipper::DoState(p);
 	p.Do(swxfregs);
-    p.Do(bpmem);
-	p.Do(swstats);
+	p.Do(bpmem);
+	p.DoPOD(swstats);
 
 	// CP Memory
-    p.DoArray(arraybases, 16);
-    p.DoArray(arraystrides, 16);
-    p.Do(MatrixIndexA);
-    p.Do(MatrixIndexB);
-    p.Do(g_VtxDesc.Hex);
+	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");
 
@@ -162,7 +152,10 @@ void VideoSoftware::Shutdown()
 	// TODO: should be in Video_Cleanup
 	HwRasterizer::Shutdown();
 	SWRenderer::Shutdown();
-	
+
+	// Do our OSD callbacks	
+	OSD::DoCallbacks(OSD::OSD_SHUTDOWN);
+
 	GLInterface->Shutdown();
 }
 
@@ -207,30 +200,32 @@ u32 VideoSoftware::Video_AccessEFB(EFBAccessType type, u32 x, u32 y, u32 InputDa
 {
 	u32 value = 0;
 
-    switch (type)
-    {
-    case PEEK_Z:
-        {
-            value = EfbInterface::GetDepth(x, y);
-            break;
-        }
-    case POKE_Z:
-        break;
-    case PEEK_COLOR:
-        {
-            u32 color = 0;
-            EfbInterface::GetColor(x, y, (u8*)&color);
+	switch (type)
+	{
+	case PEEK_Z:
+		{
+			value = EfbInterface::GetDepth(x, y);
+			break;
+		}
 
-            // rgba to argb
-            value = (color >> 8) | (color & 0xff) << 24;
-            break;
-        }
-        
-    case POKE_COLOR:
-        break;
-    }
+	case POKE_Z:
+		break;
 
-    return value;
+	case PEEK_COLOR:
+		{
+			u32 color = 0;
+			EfbInterface::GetColor(x, y, (u8*)&color);
+
+			// rgba to argb
+			value = (color >> 8) | (color & 0xff) << 24;
+			break;
+		}
+
+	case POKE_COLOR:
+		break;
+	}
+
+	return value;
 }
 
 u32 VideoSoftware::Video_GetQueryResult(PerfQueryType type)
@@ -250,7 +245,7 @@ bool VideoSoftware::Video_Screenshot(const char *_szFilename)
 void VideoSoftware::Video_EnterLoop()
 {
 	std::lock_guard<std::mutex> lk(m_csSWVidOccupied);
-    fifoStateRun = true;
+	fifoStateRun = true;
 
 	while (fifoStateRun)
 	{
@@ -273,7 +268,7 @@ void VideoSoftware::Video_EnterLoop()
 
 void VideoSoftware::Video_ExitLoop()
 {
-    fifoStateRun = false;
+	fifoStateRun = false;
 }
 
 // TODO : could use the OSD class in video common, we would need to implement the Renderer class
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SetupUnit.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/SetupUnit.cpp
index d2185e31d5..f0cc179f25 100644
--- a/Source/Plugins/Plugin_VideoSoftware/Src/SetupUnit.cpp
+++ b/Source/Plugins/Plugin_VideoSoftware/Src/SetupUnit.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "SetupUnit.h"
 
@@ -27,7 +14,7 @@ void SetupUnit::Init(u8 primitiveType)
 {
 	m_PrimType = primitiveType;
 
-	m_VertexCounter = 0;    
+	m_VertexCounter = 0;
 	m_VertPointer[0] = &m_Vertices[0];
 	m_VertPointer[1] = &m_Vertices[1];
 	m_VertPointer[2] = &m_Vertices[2];
@@ -36,130 +23,130 @@ void SetupUnit::Init(u8 primitiveType)
 
 void SetupUnit::SetupVertex()
 {
-    switch(m_PrimType)
-    {
-    case GX_DRAW_QUADS:
-        SetupQuad();
-        break;
-    case GX_DRAW_TRIANGLES:
-        SetupTriangle();
-        break;
-    case GX_DRAW_TRIANGLE_STRIP:
-        SetupTriStrip();
-        break;
-    case GX_DRAW_TRIANGLE_FAN:
-        SetupTriFan();
-        break;
-    case GX_DRAW_LINES:
-        SetupLine();
-        break;
-    case GX_DRAW_LINE_STRIP:
-        SetupLineStrip();
-        break;
-    case GX_DRAW_POINTS:
-        SetupPoint();
-        break;
-    }
+	switch(m_PrimType)
+	{
+	case GX_DRAW_QUADS:
+		SetupQuad();
+		break;
+	case GX_DRAW_TRIANGLES:
+		SetupTriangle();
+		break;
+	case GX_DRAW_TRIANGLE_STRIP:
+		SetupTriStrip();
+		break;
+	case GX_DRAW_TRIANGLE_FAN:
+		SetupTriFan();
+		break;
+	case GX_DRAW_LINES:
+		SetupLine();
+		break;
+	case GX_DRAW_LINE_STRIP:
+		SetupLineStrip();
+		break;
+	case GX_DRAW_POINTS:
+		SetupPoint();
+		break;
+	}
 }
 
 
- void SetupUnit::SetupQuad()
- {
-    if (m_VertexCounter < 2)
-    {
-        m_VertexCounter++;
-        m_VertWritePointer = m_VertPointer[m_VertexCounter];
-        return;
-    }
+	void SetupUnit::SetupQuad()
+	{
+	if (m_VertexCounter < 2)
+	{
+		m_VertexCounter++;
+		m_VertWritePointer = m_VertPointer[m_VertexCounter];
+		return;
+	}
 
-    Clipper::ProcessTriangle(m_VertPointer[0], m_VertPointer[1], m_VertPointer[2]);
+	Clipper::ProcessTriangle(m_VertPointer[0], m_VertPointer[1], m_VertPointer[2]);
 
-    m_VertexCounter++;
-    m_VertexCounter &= 3;
-    m_VertWritePointer = &m_Vertices[m_VertexCounter & 1];
-    OutputVertexData* temp = m_VertPointer[1];
-    m_VertPointer[1] = m_VertPointer[2];
-    m_VertPointer[2] = temp;
- }
+	m_VertexCounter++;
+	m_VertexCounter &= 3;
+	m_VertWritePointer = &m_Vertices[m_VertexCounter & 1];
+	OutputVertexData* temp = m_VertPointer[1];
+	m_VertPointer[1] = m_VertPointer[2];
+	m_VertPointer[2] = temp;
+}
 
 void SetupUnit::SetupTriangle()
 {
-    if (m_VertexCounter < 2)
-    {
-        m_VertexCounter++;
-        m_VertWritePointer = m_VertPointer[m_VertexCounter];
-        return;
-    }
+	if (m_VertexCounter < 2)
+	{
+		m_VertexCounter++;
+		m_VertWritePointer = m_VertPointer[m_VertexCounter];
+		return;
+	}
 
-    Clipper::ProcessTriangle(m_VertPointer[0], m_VertPointer[1], m_VertPointer[2]);
+	Clipper::ProcessTriangle(m_VertPointer[0], m_VertPointer[1], m_VertPointer[2]);
 
-    m_VertexCounter = 0;
-    m_VertWritePointer = m_VertPointer[0];
+	m_VertexCounter = 0;
+	m_VertWritePointer = m_VertPointer[0];
 }
 
 void SetupUnit::SetupTriStrip()
 {
-    if (m_VertexCounter < 2)
-    {
-        m_VertexCounter++;
-        m_VertWritePointer = m_VertPointer[m_VertexCounter];
-        return;
-    }
+	if (m_VertexCounter < 2)
+	{
+		m_VertexCounter++;
+		m_VertWritePointer = m_VertPointer[m_VertexCounter];
+		return;
+	}
 
-    Clipper::ProcessTriangle(m_VertPointer[0], m_VertPointer[1], m_VertPointer[2]);
+	Clipper::ProcessTriangle(m_VertPointer[0], m_VertPointer[1], m_VertPointer[2]);
 
-    m_VertexCounter++;
-    m_VertPointer[2 - (m_VertexCounter & 1)] = m_VertPointer[0];
-    m_VertWritePointer = m_VertPointer[0];
+	m_VertexCounter++;
+	m_VertPointer[2 - (m_VertexCounter & 1)] = m_VertPointer[0];
+	m_VertWritePointer = m_VertPointer[0];
 
-    m_VertPointer[0] = &m_Vertices[(m_VertexCounter + 1) % 3];  
+	m_VertPointer[0] = &m_Vertices[(m_VertexCounter + 1) % 3];  
 }
 
 void SetupUnit::SetupTriFan()
 {
-    if (m_VertexCounter < 2)
-    {
-        m_VertexCounter++;
-        m_VertWritePointer = m_VertPointer[m_VertexCounter];
-        return;
-    }
+	if (m_VertexCounter < 2)
+	{
+		m_VertexCounter++;
+		m_VertWritePointer = m_VertPointer[m_VertexCounter];
+		return;
+	}
 
-    Clipper::ProcessTriangle(m_VertPointer[0], m_VertPointer[1], m_VertPointer[2]);
+	Clipper::ProcessTriangle(m_VertPointer[0], m_VertPointer[1], m_VertPointer[2]);
 
-    m_VertexCounter++;
-    m_VertPointer[1] = m_VertPointer[2];
-    m_VertPointer[2] = &m_Vertices[2 - (m_VertexCounter & 1)];
+	m_VertexCounter++;
+	m_VertPointer[1] = m_VertPointer[2];
+	m_VertPointer[2] = &m_Vertices[2 - (m_VertexCounter & 1)];
 
-    m_VertWritePointer = m_VertPointer[2];
+	m_VertWritePointer = m_VertPointer[2];
 }
 
 void SetupUnit::SetupLine()
 {
 	if (m_VertexCounter < 1)
-    {
-        m_VertexCounter++;
-        m_VertWritePointer = m_VertPointer[m_VertexCounter];
-        return;
-    }
+	{
+		m_VertexCounter++;
+		m_VertWritePointer = m_VertPointer[m_VertexCounter];
+		return;
+	}
 
-    Clipper::ProcessLine(m_VertPointer[0], m_VertPointer[1]);
+	Clipper::ProcessLine(m_VertPointer[0], m_VertPointer[1]);
 
-    m_VertexCounter = 0;
-    m_VertWritePointer = m_VertPointer[0];
+	m_VertexCounter = 0;
+	m_VertWritePointer = m_VertPointer[0];
 }
 
 void SetupUnit::SetupLineStrip()
 {
 	if (m_VertexCounter < 1)
-    {
-        m_VertexCounter++;
+	{
+		m_VertexCounter++;
 		m_VertWritePointer = m_VertPointer[m_VertexCounter];
-        return;
-    }
+		return;
+	}
 
 	m_VertexCounter++;
 
-    Clipper::ProcessLine(m_VertPointer[0], m_VertPointer[1]);
+	Clipper::ProcessLine(m_VertPointer[0], m_VertPointer[1]);
 
 	m_VertWritePointer = m_VertPointer[0];
 
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SetupUnit.h b/Source/Plugins/Plugin_VideoSoftware/Src/SetupUnit.h
index f337de21a2..bd4d0291c9 100644
--- a/Source/Plugins/Plugin_VideoSoftware/Src/SetupUnit.h
+++ b/Source/Plugins/Plugin_VideoSoftware/Src/SetupUnit.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 
 #ifndef _SETUPUNIT_H_
@@ -25,27 +12,27 @@
 
 class SetupUnit
 {
-    u8 m_PrimType;
-    int m_VertexCounter;
+	u8 m_PrimType;
+	int m_VertexCounter;
 
-    OutputVertexData m_Vertices[3];
-    OutputVertexData *m_VertPointer[3];
-    OutputVertexData *m_VertWritePointer;
-    
-    void SetupQuad();
-    void SetupTriangle();
-    void SetupTriStrip();
-    void SetupTriFan();
-    void SetupLine();
-    void SetupLineStrip();
-    void SetupPoint();
+	OutputVertexData m_Vertices[3];
+	OutputVertexData *m_VertPointer[3];
+	OutputVertexData *m_VertWritePointer;
+
+	void SetupQuad();
+	void SetupTriangle();
+	void SetupTriStrip();
+	void SetupTriFan();
+	void SetupLine();
+	void SetupLineStrip();
+	void SetupPoint();
 
 public:
-    void Init(u8 primitiveType);
+	void Init(u8 primitiveType);
 
-    OutputVertexData* GetVertex() { return m_VertWritePointer; }
+	OutputVertexData* GetVertex() { return m_VertWritePointer; }
 
-    void SetupVertex();
+	void SetupVertex();
 	void DoState(PointerWrap &p);
 };
 
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/Tev.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/Tev.cpp
index fa072508eb..7ab798e2fb 100644
--- a/Source/Plugins/Plugin_VideoSoftware/Src/Tev.cpp
+++ b/Source/Plugins/Plugin_VideoSoftware/Src/Tev.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "Common.h"
 
@@ -36,604 +23,609 @@
 
 void Tev::Init()
 {
-    FixedConstants[0] = 0;
-    FixedConstants[1] = 31;
-    FixedConstants[2] = 63;
-    FixedConstants[3] = 95;
-    FixedConstants[4] = 127;
-    FixedConstants[5] = 159;
-    FixedConstants[6] = 191;
-    FixedConstants[7] = 223;
-    FixedConstants[8] = 255;
+	FixedConstants[0] = 0;
+	FixedConstants[1] = 31;
+	FixedConstants[2] = 63;
+	FixedConstants[3] = 95;
+	FixedConstants[4] = 127;
+	FixedConstants[5] = 159;
+	FixedConstants[6] = 191;
+	FixedConstants[7] = 223;
+	FixedConstants[8] = 255;
 
-    for (int i = 0; i < 4; i++)
-        Zero16[i] = 0;
+	for (int i = 0; i < 4; i++)
+		Zero16[i] = 0;
 
-    m_ColorInputLUT[0][RED_INP] = &Reg[0][RED_C]; m_ColorInputLUT[0][GRN_INP] = &Reg[0][GRN_C]; m_ColorInputLUT[0][BLU_INP] = &Reg[0][BLU_C]; // prev.rgb
-    m_ColorInputLUT[1][RED_INP] = &Reg[0][ALP_C]; m_ColorInputLUT[1][GRN_INP] = &Reg[0][ALP_C]; m_ColorInputLUT[1][BLU_INP] = &Reg[0][ALP_C]; // prev.aaa
-    m_ColorInputLUT[2][RED_INP] = &Reg[1][RED_C]; m_ColorInputLUT[2][GRN_INP] = &Reg[1][GRN_C]; m_ColorInputLUT[2][BLU_INP] = &Reg[1][BLU_C]; // c0.rgb
-    m_ColorInputLUT[3][RED_INP] = &Reg[1][ALP_C]; m_ColorInputLUT[3][GRN_INP] = &Reg[1][ALP_C]; m_ColorInputLUT[3][BLU_INP] = &Reg[1][ALP_C]; // c0.aaa
-    m_ColorInputLUT[4][RED_INP] = &Reg[2][RED_C]; m_ColorInputLUT[4][GRN_INP] = &Reg[2][GRN_C]; m_ColorInputLUT[4][BLU_INP] = &Reg[2][BLU_C]; // c1.rgb
-    m_ColorInputLUT[5][RED_INP] = &Reg[2][ALP_C]; m_ColorInputLUT[5][GRN_INP] = &Reg[2][ALP_C]; m_ColorInputLUT[5][BLU_INP] = &Reg[2][ALP_C]; // c1.aaa
-    m_ColorInputLUT[6][RED_INP] = &Reg[3][RED_C]; m_ColorInputLUT[6][GRN_INP] = &Reg[3][GRN_C]; m_ColorInputLUT[6][BLU_INP] = &Reg[3][BLU_C]; // c2.rgb
-    m_ColorInputLUT[7][RED_INP] = &Reg[3][ALP_C]; m_ColorInputLUT[7][GRN_INP] = &Reg[3][ALP_C]; m_ColorInputLUT[7][BLU_INP] = &Reg[3][ALP_C]; // c2.aaa
-    m_ColorInputLUT[8][RED_INP] = &TexColor[RED_C]; m_ColorInputLUT[8][GRN_INP] = &TexColor[GRN_C]; m_ColorInputLUT[8][BLU_INP] = &TexColor[BLU_C]; // tex.rgb
-    m_ColorInputLUT[9][RED_INP] = &TexColor[ALP_C]; m_ColorInputLUT[9][GRN_INP] = &TexColor[ALP_C]; m_ColorInputLUT[9][BLU_INP] = &TexColor[ALP_C]; // tex.aaa
-    m_ColorInputLUT[10][RED_INP] = &RasColor[RED_C]; m_ColorInputLUT[10][GRN_INP] = &RasColor[GRN_C]; m_ColorInputLUT[10][BLU_INP] = &RasColor[BLU_C]; // ras.rgb
-    m_ColorInputLUT[11][RED_INP] = &RasColor[ALP_C]; m_ColorInputLUT[11][GRN_INP] = &RasColor[ALP_C]; m_ColorInputLUT[11][BLU_INP] = &RasColor[ALP_C]; // ras.rgb
-    m_ColorInputLUT[12][RED_INP] = &FixedConstants[8]; m_ColorInputLUT[12][GRN_INP] = &FixedConstants[8]; m_ColorInputLUT[12][BLU_INP] = &FixedConstants[8]; // one
-    m_ColorInputLUT[13][RED_INP] = &FixedConstants[4]; m_ColorInputLUT[13][GRN_INP] = &FixedConstants[4]; m_ColorInputLUT[13][BLU_INP] = &FixedConstants[4]; // half
-    m_ColorInputLUT[14][RED_INP] = &StageKonst[RED_C]; m_ColorInputLUT[14][GRN_INP] = &StageKonst[GRN_C]; m_ColorInputLUT[14][BLU_INP] = &StageKonst[BLU_C]; // konst
-    m_ColorInputLUT[15][RED_INP] = &FixedConstants[0]; m_ColorInputLUT[15][GRN_INP] = &FixedConstants[0]; m_ColorInputLUT[15][BLU_INP] = &FixedConstants[0]; // zero
+	m_ColorInputLUT[0][RED_INP] = &Reg[0][RED_C]; m_ColorInputLUT[0][GRN_INP] = &Reg[0][GRN_C]; m_ColorInputLUT[0][BLU_INP] = &Reg[0][BLU_C]; // prev.rgb
+	m_ColorInputLUT[1][RED_INP] = &Reg[0][ALP_C]; m_ColorInputLUT[1][GRN_INP] = &Reg[0][ALP_C]; m_ColorInputLUT[1][BLU_INP] = &Reg[0][ALP_C]; // prev.aaa
+	m_ColorInputLUT[2][RED_INP] = &Reg[1][RED_C]; m_ColorInputLUT[2][GRN_INP] = &Reg[1][GRN_C]; m_ColorInputLUT[2][BLU_INP] = &Reg[1][BLU_C]; // c0.rgb
+	m_ColorInputLUT[3][RED_INP] = &Reg[1][ALP_C]; m_ColorInputLUT[3][GRN_INP] = &Reg[1][ALP_C]; m_ColorInputLUT[3][BLU_INP] = &Reg[1][ALP_C]; // c0.aaa
+	m_ColorInputLUT[4][RED_INP] = &Reg[2][RED_C]; m_ColorInputLUT[4][GRN_INP] = &Reg[2][GRN_C]; m_ColorInputLUT[4][BLU_INP] = &Reg[2][BLU_C]; // c1.rgb
+	m_ColorInputLUT[5][RED_INP] = &Reg[2][ALP_C]; m_ColorInputLUT[5][GRN_INP] = &Reg[2][ALP_C]; m_ColorInputLUT[5][BLU_INP] = &Reg[2][ALP_C]; // c1.aaa
+	m_ColorInputLUT[6][RED_INP] = &Reg[3][RED_C]; m_ColorInputLUT[6][GRN_INP] = &Reg[3][GRN_C]; m_ColorInputLUT[6][BLU_INP] = &Reg[3][BLU_C]; // c2.rgb
+	m_ColorInputLUT[7][RED_INP] = &Reg[3][ALP_C]; m_ColorInputLUT[7][GRN_INP] = &Reg[3][ALP_C]; m_ColorInputLUT[7][BLU_INP] = &Reg[3][ALP_C]; // c2.aaa
+	m_ColorInputLUT[8][RED_INP] = &TexColor[RED_C]; m_ColorInputLUT[8][GRN_INP] = &TexColor[GRN_C]; m_ColorInputLUT[8][BLU_INP] = &TexColor[BLU_C]; // tex.rgb
+	m_ColorInputLUT[9][RED_INP] = &TexColor[ALP_C]; m_ColorInputLUT[9][GRN_INP] = &TexColor[ALP_C]; m_ColorInputLUT[9][BLU_INP] = &TexColor[ALP_C]; // tex.aaa
+	m_ColorInputLUT[10][RED_INP] = &RasColor[RED_C]; m_ColorInputLUT[10][GRN_INP] = &RasColor[GRN_C]; m_ColorInputLUT[10][BLU_INP] = &RasColor[BLU_C]; // ras.rgb
+	m_ColorInputLUT[11][RED_INP] = &RasColor[ALP_C]; m_ColorInputLUT[11][GRN_INP] = &RasColor[ALP_C]; m_ColorInputLUT[11][BLU_INP] = &RasColor[ALP_C]; // ras.rgb
+	m_ColorInputLUT[12][RED_INP] = &FixedConstants[8]; m_ColorInputLUT[12][GRN_INP] = &FixedConstants[8]; m_ColorInputLUT[12][BLU_INP] = &FixedConstants[8]; // one
+	m_ColorInputLUT[13][RED_INP] = &FixedConstants[4]; m_ColorInputLUT[13][GRN_INP] = &FixedConstants[4]; m_ColorInputLUT[13][BLU_INP] = &FixedConstants[4]; // half
+	m_ColorInputLUT[14][RED_INP] = &StageKonst[RED_C]; m_ColorInputLUT[14][GRN_INP] = &StageKonst[GRN_C]; m_ColorInputLUT[14][BLU_INP] = &StageKonst[BLU_C]; // konst
+	m_ColorInputLUT[15][RED_INP] = &FixedConstants[0]; m_ColorInputLUT[15][GRN_INP] = &FixedConstants[0]; m_ColorInputLUT[15][BLU_INP] = &FixedConstants[0]; // zero
 
-    m_AlphaInputLUT[0] = Reg[0]; // prev
-    m_AlphaInputLUT[1] = Reg[1]; // c0
-    m_AlphaInputLUT[2] = Reg[2]; // c1
-    m_AlphaInputLUT[3] = Reg[3]; // c2
-    m_AlphaInputLUT[4] = TexColor; // tex
-    m_AlphaInputLUT[5] = RasColor; // ras
-    m_AlphaInputLUT[6] = StageKonst; // konst
-    m_AlphaInputLUT[7] = Zero16; // zero
+	m_AlphaInputLUT[0] = Reg[0]; // prev
+	m_AlphaInputLUT[1] = Reg[1]; // c0
+	m_AlphaInputLUT[2] = Reg[2]; // c1
+	m_AlphaInputLUT[3] = Reg[3]; // c2
+	m_AlphaInputLUT[4] = TexColor; // tex
+	m_AlphaInputLUT[5] = RasColor; // ras
+	m_AlphaInputLUT[6] = StageKonst; // konst
+	m_AlphaInputLUT[7] = Zero16; // zero
 
-    for (int comp = 0; comp < 4; comp++)
-    {
-        m_KonstLUT[0][comp] = &FixedConstants[8];
-        m_KonstLUT[1][comp] = &FixedConstants[7];
-        m_KonstLUT[2][comp] = &FixedConstants[6];
-        m_KonstLUT[3][comp] = &FixedConstants[5];
-        m_KonstLUT[4][comp] = &FixedConstants[4];
-        m_KonstLUT[5][comp] = &FixedConstants[3];
-        m_KonstLUT[6][comp] = &FixedConstants[2];
-        m_KonstLUT[7][comp] = &FixedConstants[1];
+	for (int comp = 0; comp < 4; comp++)
+	{
+		m_KonstLUT[0][comp] = &FixedConstants[8];
+		m_KonstLUT[1][comp] = &FixedConstants[7];
+		m_KonstLUT[2][comp] = &FixedConstants[6];
+		m_KonstLUT[3][comp] = &FixedConstants[5];
+		m_KonstLUT[4][comp] = &FixedConstants[4];
+		m_KonstLUT[5][comp] = &FixedConstants[3];
+		m_KonstLUT[6][comp] = &FixedConstants[2];
+		m_KonstLUT[7][comp] = &FixedConstants[1];
 
-        m_KonstLUT[12][comp] = &KonstantColors[0][comp];
-        m_KonstLUT[13][comp] = &KonstantColors[1][comp];
-        m_KonstLUT[14][comp] = &KonstantColors[2][comp];
-        m_KonstLUT[15][comp] = &KonstantColors[3][comp];
+		m_KonstLUT[12][comp] = &KonstantColors[0][comp];
+		m_KonstLUT[13][comp] = &KonstantColors[1][comp];
+		m_KonstLUT[14][comp] = &KonstantColors[2][comp];
+		m_KonstLUT[15][comp] = &KonstantColors[3][comp];
 
-        m_KonstLUT[16][comp] = &KonstantColors[0][RED_C];
-        m_KonstLUT[17][comp] = &KonstantColors[1][RED_C];
-        m_KonstLUT[18][comp] = &KonstantColors[2][RED_C];
-        m_KonstLUT[19][comp] = &KonstantColors[3][RED_C];
-        m_KonstLUT[20][comp] = &KonstantColors[0][GRN_C];
-        m_KonstLUT[21][comp] = &KonstantColors[1][GRN_C];
-        m_KonstLUT[22][comp] = &KonstantColors[2][GRN_C];
-        m_KonstLUT[23][comp] = &KonstantColors[3][GRN_C];
-        m_KonstLUT[24][comp] = &KonstantColors[0][BLU_C];
-        m_KonstLUT[25][comp] = &KonstantColors[1][BLU_C];
-        m_KonstLUT[26][comp] = &KonstantColors[2][BLU_C];
-        m_KonstLUT[27][comp] = &KonstantColors[3][BLU_C];
-        m_KonstLUT[28][comp] = &KonstantColors[0][ALP_C];
-        m_KonstLUT[29][comp] = &KonstantColors[1][ALP_C];
-        m_KonstLUT[30][comp] = &KonstantColors[2][ALP_C];
-        m_KonstLUT[31][comp] = &KonstantColors[3][ALP_C];
-    }
+		m_KonstLUT[16][comp] = &KonstantColors[0][RED_C];
+		m_KonstLUT[17][comp] = &KonstantColors[1][RED_C];
+		m_KonstLUT[18][comp] = &KonstantColors[2][RED_C];
+		m_KonstLUT[19][comp] = &KonstantColors[3][RED_C];
+		m_KonstLUT[20][comp] = &KonstantColors[0][GRN_C];
+		m_KonstLUT[21][comp] = &KonstantColors[1][GRN_C];
+		m_KonstLUT[22][comp] = &KonstantColors[2][GRN_C];
+		m_KonstLUT[23][comp] = &KonstantColors[3][GRN_C];
+		m_KonstLUT[24][comp] = &KonstantColors[0][BLU_C];
+		m_KonstLUT[25][comp] = &KonstantColors[1][BLU_C];
+		m_KonstLUT[26][comp] = &KonstantColors[2][BLU_C];
+		m_KonstLUT[27][comp] = &KonstantColors[3][BLU_C];
+		m_KonstLUT[28][comp] = &KonstantColors[0][ALP_C];
+		m_KonstLUT[29][comp] = &KonstantColors[1][ALP_C];
+		m_KonstLUT[30][comp] = &KonstantColors[2][ALP_C];
+		m_KonstLUT[31][comp] = &KonstantColors[3][ALP_C];
+	}
 
-    m_BiasLUT[0] = 0;
-    m_BiasLUT[1] = 128;
-    m_BiasLUT[2] = -128;
-    m_BiasLUT[3] = 0;
+	m_BiasLUT[0] = 0;
+	m_BiasLUT[1] = 128;
+	m_BiasLUT[2] = -128;
+	m_BiasLUT[3] = 0;
 
-    m_ScaleLShiftLUT[0] = 0;
-    m_ScaleLShiftLUT[1] = 1;
-    m_ScaleLShiftLUT[2] = 2;
-    m_ScaleLShiftLUT[3] = 0;
+	m_ScaleLShiftLUT[0] = 0;
+	m_ScaleLShiftLUT[1] = 1;
+	m_ScaleLShiftLUT[2] = 2;
+	m_ScaleLShiftLUT[3] = 0;
 
-    m_ScaleRShiftLUT[0] = 0;
-    m_ScaleRShiftLUT[1] = 0;
-    m_ScaleRShiftLUT[2] = 0;
-    m_ScaleRShiftLUT[3] = 1;
+	m_ScaleRShiftLUT[0] = 0;
+	m_ScaleRShiftLUT[1] = 0;
+	m_ScaleRShiftLUT[2] = 0;
+	m_ScaleRShiftLUT[3] = 1;
 }
 
 inline s16 Clamp255(s16 in)
 {
-    return in>255?255:(in<0?0:in);
+	return in>255?255:(in<0?0:in);
 }
 
 inline s16 Clamp1024(s16 in)
 {
-     return in>1023?1023:(in<-1024?-1024:in);
+		return in>1023?1023:(in<-1024?-1024:in);
 }
 
 void Tev::SetRasColor(int colorChan, int swaptable)
 {
-    switch(colorChan)
-    {
-    case 0: // Color0
-        {
-            u8 *color = Color[0];
-            RasColor[RED_C] = color[bpmem.tevksel[swaptable].swap1];
-            RasColor[GRN_C] = color[bpmem.tevksel[swaptable].swap2];
-            swaptable++;
-            RasColor[BLU_C] = color[bpmem.tevksel[swaptable].swap1];
-            RasColor[ALP_C] = color[bpmem.tevksel[swaptable].swap2];
-        }
-        break;
-    case 1: // Color1
-        {
-            u8 *color = Color[1];
-            RasColor[RED_C] = color[bpmem.tevksel[swaptable].swap1];
-            RasColor[GRN_C] = color[bpmem.tevksel[swaptable].swap2];
-            swaptable++;
-            RasColor[BLU_C] = color[bpmem.tevksel[swaptable].swap1];
-            RasColor[ALP_C] = color[bpmem.tevksel[swaptable].swap2];
-        }
-        break;
-     case 5: // alpha bump
-        {
-            for(int i = 0; i < 4; i++)
-                RasColor[i] = AlphaBump;
-        }
-        break;
-    case 6: // alpha bump normalized
-        {
-            u8 normalized = AlphaBump | AlphaBump >> 5;
-            for(int i = 0; i < 4; i++)
-                RasColor[i] = normalized;
-        }
-        break;    
-    default: // zero
-        {
-            for(int i = 0; i < 4; i++)
-                RasColor[i] = 0;
-        }
-        break;
-    }
+	switch(colorChan)
+	{
+	case 0: // Color0
+		{
+			u8 *color = Color[0];
+			RasColor[RED_C] = color[bpmem.tevksel[swaptable].swap1];
+			RasColor[GRN_C] = color[bpmem.tevksel[swaptable].swap2];
+			swaptable++;
+			RasColor[BLU_C] = color[bpmem.tevksel[swaptable].swap1];
+			RasColor[ALP_C] = color[bpmem.tevksel[swaptable].swap2];
+		}
+		break;
+	case 1: // Color1
+		{
+			u8 *color = Color[1];
+			RasColor[RED_C] = color[bpmem.tevksel[swaptable].swap1];
+			RasColor[GRN_C] = color[bpmem.tevksel[swaptable].swap2];
+			swaptable++;
+			RasColor[BLU_C] = color[bpmem.tevksel[swaptable].swap1];
+			RasColor[ALP_C] = color[bpmem.tevksel[swaptable].swap2];
+		}
+		break;
+		case 5: // alpha bump
+		{
+			for(int i = 0; i < 4; i++)
+				RasColor[i] = AlphaBump;
+		}
+		break;
+	case 6: // alpha bump normalized
+		{
+			u8 normalized = AlphaBump | AlphaBump >> 5;
+			for(int i = 0; i < 4; i++)
+				RasColor[i] = normalized;
+		}
+		break;
+	default: // zero
+		{
+			for(int i = 0; i < 4; i++)
+				RasColor[i] = 0;
+		}
+		break;
+	}
 }
 
 void Tev::DrawColorRegular(TevStageCombiner::ColorCombiner &cc)
 {
-    InputRegType InputReg;
+	InputRegType InputReg;
 
-    for (int i = 0; i < 3; i++)
-    {
-        InputReg.a = *m_ColorInputLUT[cc.a][i];
-        InputReg.b = *m_ColorInputLUT[cc.b][i];
-        InputReg.c = *m_ColorInputLUT[cc.c][i];
-        InputReg.d = *m_ColorInputLUT[cc.d][i];
+	for (int i = 0; i < 3; i++)
+	{
+		InputReg.a = *m_ColorInputLUT[cc.a][i];
+		InputReg.b = *m_ColorInputLUT[cc.b][i];
+		InputReg.c = *m_ColorInputLUT[cc.c][i];
+		InputReg.d = *m_ColorInputLUT[cc.d][i];
 
-        u16 c = InputReg.c + (InputReg.c >> 7); 
+		u16 c = InputReg.c + (InputReg.c >> 7); 
 
-        s32 temp = InputReg.a * (256 - c) + (InputReg.b * c);
-        temp = cc.op?(-temp >> 8):(temp >> 8);
+		s32 temp = InputReg.a * (256 - c) + (InputReg.b * c);
+		temp = cc.op?(-temp >> 8):(temp >> 8);
 
-        s32 result = InputReg.d + temp + m_BiasLUT[cc.bias];
-        result = result << m_ScaleLShiftLUT[cc.shift];
-        result = result >> m_ScaleRShiftLUT[cc.shift];        
+		s32 result = InputReg.d + temp + m_BiasLUT[cc.bias];
+		result = result << m_ScaleLShiftLUT[cc.shift];
+		result = result >> m_ScaleRShiftLUT[cc.shift];
 
-        Reg[cc.dest][BLU_C + i] = result;
-    }
+		Reg[cc.dest][BLU_C + i] = result;
+	}
 }
 
 void Tev::DrawColorCompare(TevStageCombiner::ColorCombiner &cc)
 {
-    int cmp = (cc.shift<<1)|cc.op|8; // comparemode stored here
+	int cmp = (cc.shift<<1)|cc.op|8; // comparemode stored here
 
-    u32 a;
-    u32 b;
+	u32 a;
+	u32 b;
 
-    InputRegType InputReg;
+	InputRegType InputReg;
 
-    switch(cmp) {
-    case TEVCMP_R8_GT:        
-        {
-            a = *m_ColorInputLUT[cc.a][RED_INP] & 0xff;
-            b = *m_ColorInputLUT[cc.b][RED_INP] & 0xff;
-            for (int i = 0; i < 3; i++)
-            {
-                InputReg.c = *m_ColorInputLUT[cc.c][i];
-                InputReg.d = *m_ColorInputLUT[cc.d][i];
-                Reg[cc.dest][BLU_C + i] = InputReg.d + ((a > b) ? InputReg.c : 0);
-            }
-        }
-        break;
+	switch(cmp) {
+	case TEVCMP_R8_GT:
+		{
+			a = *m_ColorInputLUT[cc.a][RED_INP] & 0xff;
+			b = *m_ColorInputLUT[cc.b][RED_INP] & 0xff;
+			for (int i = 0; i < 3; i++)
+			{
+				InputReg.c = *m_ColorInputLUT[cc.c][i];
+				InputReg.d = *m_ColorInputLUT[cc.d][i];
+				Reg[cc.dest][BLU_C + i] = InputReg.d + ((a > b) ? InputReg.c : 0);
+			}
+		}
+		break;
 
-    case TEVCMP_R8_EQ:
-        {
-            a = *m_ColorInputLUT[cc.a][RED_INP] & 0xff;
-            b = *m_ColorInputLUT[cc.b][RED_INP] & 0xff;
-            for (int i = 0; i < 3; i++)
-            {
-                InputReg.c = *m_ColorInputLUT[cc.c][i];
-                InputReg.d = *m_ColorInputLUT[cc.d][i];
-                Reg[cc.dest][BLU_C + i] = InputReg.d + ((a == b) ? InputReg.c : 0);
-            }
-        }
-        break;
-    case TEVCMP_GR16_GT:
-        {
-            a = ((*m_ColorInputLUT[cc.a][GRN_INP] & 0xff) << 8) | (*m_ColorInputLUT[cc.a][RED_INP] & 0xff);
-            b = ((*m_ColorInputLUT[cc.b][GRN_INP] & 0xff) << 8) | (*m_ColorInputLUT[cc.b][RED_INP] & 0xff);
-            for (int i = 0; i < 3; i++)
-            {
-                InputReg.c = *m_ColorInputLUT[cc.c][i];
-                InputReg.d = *m_ColorInputLUT[cc.d][i];
-                Reg[cc.dest][BLU_C + i] = InputReg.d + ((a > b) ? InputReg.c : 0);
-            }
-        }
-        break;
-    case TEVCMP_GR16_EQ:
-        {
-            a = ((*m_ColorInputLUT[cc.a][GRN_C] & 0xff) << 8) | (*m_ColorInputLUT[cc.a][RED_INP] & 0xff);
-            b = ((*m_ColorInputLUT[cc.b][GRN_C] & 0xff) << 8) | (*m_ColorInputLUT[cc.b][RED_INP] & 0xff);
-            for (int i = 0; i < 3; i++)
-            {
-                InputReg.c = *m_ColorInputLUT[cc.c][i];
-                InputReg.d = *m_ColorInputLUT[cc.d][i];
-                Reg[cc.dest][BLU_C + i] = InputReg.d + ((a == b) ? InputReg.c : 0);
-            }
-        }
-        break;
-    case TEVCMP_BGR24_GT:
-        {
-            a = ((*m_ColorInputLUT[cc.a][BLU_C] & 0xff) << 16) | ((*m_ColorInputLUT[cc.a][GRN_C] & 0xff) << 8) | (*m_ColorInputLUT[cc.a][RED_INP] & 0xff);
-            b = ((*m_ColorInputLUT[cc.b][BLU_C] & 0xff) << 16) | ((*m_ColorInputLUT[cc.b][GRN_C] & 0xff) << 8) | (*m_ColorInputLUT[cc.b][RED_INP] & 0xff);
-            for (int i = 0; i < 3; i++)
-            {
-                InputReg.c = *m_ColorInputLUT[cc.c][i];
-                InputReg.d = *m_ColorInputLUT[cc.d][i];
-                Reg[cc.dest][BLU_C + i] = InputReg.d + ((a > b) ? InputReg.c : 0);
-            }
-        }
-        break;
-    case TEVCMP_BGR24_EQ:
-        {
-            a = ((*m_ColorInputLUT[cc.a][BLU_C] & 0xff) << 16) | ((*m_ColorInputLUT[cc.a][GRN_C] & 0xff) << 8) | (*m_ColorInputLUT[cc.a][RED_INP] & 0xff);
-            b = ((*m_ColorInputLUT[cc.b][BLU_C] & 0xff) << 16) | ((*m_ColorInputLUT[cc.b][GRN_C] & 0xff) << 8) | (*m_ColorInputLUT[cc.b][RED_INP] & 0xff);
-            for (int i = 0; i < 3; i++)
-            {
-                InputReg.c = *m_ColorInputLUT[cc.c][i];
-                InputReg.d = *m_ColorInputLUT[cc.d][i];
-                Reg[cc.dest][BLU_C + i] = InputReg.d + ((a == b) ? InputReg.c : 0);
-            }
-        }
-        break;
-    case TEVCMP_RGB8_GT:
-        for (int i = 0; i < 3; i++)
-        {
-            InputReg.a = *m_ColorInputLUT[cc.a][i];
-            InputReg.b = *m_ColorInputLUT[cc.b][i];
-            InputReg.c = *m_ColorInputLUT[cc.c][i];
-            InputReg.d = *m_ColorInputLUT[cc.d][i];
-            Reg[cc.dest][BLU_C + i] = InputReg.d + ((InputReg.a > InputReg.b) ? InputReg.c : 0);
-        }
-        break;
-    case TEVCMP_RGB8_EQ: 
-        for (int i = 0; i < 3; i++)
-        {
-            InputReg.a = *m_ColorInputLUT[cc.a][i];
-            InputReg.b = *m_ColorInputLUT[cc.b][i];
-            InputReg.c = *m_ColorInputLUT[cc.c][i];
-            InputReg.d = *m_ColorInputLUT[cc.d][i];
-            Reg[cc.dest][BLU_C + i] = InputReg.d + ((InputReg.a == InputReg.b) ? InputReg.c : 0);
-        }
-        break;
-    }          
+	case TEVCMP_R8_EQ:
+		{
+			a = *m_ColorInputLUT[cc.a][RED_INP] & 0xff;
+			b = *m_ColorInputLUT[cc.b][RED_INP] & 0xff;
+			for (int i = 0; i < 3; i++)
+			{
+				InputReg.c = *m_ColorInputLUT[cc.c][i];
+				InputReg.d = *m_ColorInputLUT[cc.d][i];
+				Reg[cc.dest][BLU_C + i] = InputReg.d + ((a == b) ? InputReg.c : 0);
+			}
+		}
+		break;
+	case TEVCMP_GR16_GT:
+		{
+			a = ((*m_ColorInputLUT[cc.a][GRN_INP] & 0xff) << 8) | (*m_ColorInputLUT[cc.a][RED_INP] & 0xff);
+			b = ((*m_ColorInputLUT[cc.b][GRN_INP] & 0xff) << 8) | (*m_ColorInputLUT[cc.b][RED_INP] & 0xff);
+			for (int i = 0; i < 3; i++)
+			{
+				InputReg.c = *m_ColorInputLUT[cc.c][i];
+				InputReg.d = *m_ColorInputLUT[cc.d][i];
+				Reg[cc.dest][BLU_C + i] = InputReg.d + ((a > b) ? InputReg.c : 0);
+			}
+		}
+		break;
+	case TEVCMP_GR16_EQ:
+		{
+			a = ((*m_ColorInputLUT[cc.a][GRN_C] & 0xff) << 8) | (*m_ColorInputLUT[cc.a][RED_INP] & 0xff);
+			b = ((*m_ColorInputLUT[cc.b][GRN_C] & 0xff) << 8) | (*m_ColorInputLUT[cc.b][RED_INP] & 0xff);
+			for (int i = 0; i < 3; i++)
+			{
+				InputReg.c = *m_ColorInputLUT[cc.c][i];
+				InputReg.d = *m_ColorInputLUT[cc.d][i];
+				Reg[cc.dest][BLU_C + i] = InputReg.d + ((a == b) ? InputReg.c : 0);
+			}
+		}
+		break;
+	case TEVCMP_BGR24_GT:
+		{
+			a = ((*m_ColorInputLUT[cc.a][BLU_C] & 0xff) << 16) | ((*m_ColorInputLUT[cc.a][GRN_C] & 0xff) << 8) | (*m_ColorInputLUT[cc.a][RED_INP] & 0xff);
+			b = ((*m_ColorInputLUT[cc.b][BLU_C] & 0xff) << 16) | ((*m_ColorInputLUT[cc.b][GRN_C] & 0xff) << 8) | (*m_ColorInputLUT[cc.b][RED_INP] & 0xff);
+			for (int i = 0; i < 3; i++)
+			{
+				InputReg.c = *m_ColorInputLUT[cc.c][i];
+				InputReg.d = *m_ColorInputLUT[cc.d][i];
+				Reg[cc.dest][BLU_C + i] = InputReg.d + ((a > b) ? InputReg.c : 0);
+			}
+		}
+		break;
+	case TEVCMP_BGR24_EQ:
+		{
+			a = ((*m_ColorInputLUT[cc.a][BLU_C] & 0xff) << 16) | ((*m_ColorInputLUT[cc.a][GRN_C] & 0xff) << 8) | (*m_ColorInputLUT[cc.a][RED_INP] & 0xff);
+			b = ((*m_ColorInputLUT[cc.b][BLU_C] & 0xff) << 16) | ((*m_ColorInputLUT[cc.b][GRN_C] & 0xff) << 8) | (*m_ColorInputLUT[cc.b][RED_INP] & 0xff);
+			for (int i = 0; i < 3; i++)
+			{
+				InputReg.c = *m_ColorInputLUT[cc.c][i];
+				InputReg.d = *m_ColorInputLUT[cc.d][i];
+				Reg[cc.dest][BLU_C + i] = InputReg.d + ((a == b) ? InputReg.c : 0);
+			}
+		}
+		break;
+	case TEVCMP_RGB8_GT:
+		for (int i = 0; i < 3; i++)
+		{
+			InputReg.a = *m_ColorInputLUT[cc.a][i];
+			InputReg.b = *m_ColorInputLUT[cc.b][i];
+			InputReg.c = *m_ColorInputLUT[cc.c][i];
+			InputReg.d = *m_ColorInputLUT[cc.d][i];
+			Reg[cc.dest][BLU_C + i] = InputReg.d + ((InputReg.a > InputReg.b) ? InputReg.c : 0);
+		}
+		break;
+	case TEVCMP_RGB8_EQ: 
+		for (int i = 0; i < 3; i++)
+		{
+			InputReg.a = *m_ColorInputLUT[cc.a][i];
+			InputReg.b = *m_ColorInputLUT[cc.b][i];
+			InputReg.c = *m_ColorInputLUT[cc.c][i];
+			InputReg.d = *m_ColorInputLUT[cc.d][i];
+			Reg[cc.dest][BLU_C + i] = InputReg.d + ((InputReg.a == InputReg.b) ? InputReg.c : 0);
+		}
+		break;
+	}
 }
 
 void Tev::DrawAlphaRegular(TevStageCombiner::AlphaCombiner &ac)
 {
-    InputRegType InputReg;
+	InputRegType InputReg;
 
-    InputReg.a = m_AlphaInputLUT[ac.a][ALP_C];
-    InputReg.b = m_AlphaInputLUT[ac.b][ALP_C];
-    InputReg.c = m_AlphaInputLUT[ac.c][ALP_C];
-    InputReg.d = m_AlphaInputLUT[ac.d][ALP_C];
+	InputReg.a = m_AlphaInputLUT[ac.a][ALP_C];
+	InputReg.b = m_AlphaInputLUT[ac.b][ALP_C];
+	InputReg.c = m_AlphaInputLUT[ac.c][ALP_C];
+	InputReg.d = m_AlphaInputLUT[ac.d][ALP_C];
 
-    u16 c = InputReg.c + (InputReg.c >> 7); 
+	u16 c = InputReg.c + (InputReg.c >> 7); 
 
-    s32 temp = InputReg.a * (256 - c) + (InputReg.b * c);
-    temp = ac.op?(-temp >> 8):(temp >> 8);
+	s32 temp = InputReg.a * (256 - c) + (InputReg.b * c);
+	temp = ac.op?(-temp >> 8):(temp >> 8);
 
-    s32 result = InputReg.d + temp + m_BiasLUT[ac.bias];
-    result = result << m_ScaleLShiftLUT[ac.shift];
-    result = result >> m_ScaleRShiftLUT[ac.shift];
+	s32 result = InputReg.d + temp + m_BiasLUT[ac.bias];
+	result = result << m_ScaleLShiftLUT[ac.shift];
+	result = result >> m_ScaleRShiftLUT[ac.shift];
 
-    Reg[ac.dest][ALP_C] = result;
+	Reg[ac.dest][ALP_C] = result;
 }
 
 void Tev::DrawAlphaCompare(TevStageCombiner::AlphaCombiner &ac)
 {
-    int cmp = (ac.shift<<1)|ac.op|8; // comparemode stored here
+	int cmp = (ac.shift<<1)|ac.op|8; // comparemode stored here
 
-    u32 a;
-    u32 b;
-    
-    InputRegType InputReg;
+	u32 a;
+	u32 b;
 
-    switch(cmp) {
-    case TEVCMP_R8_GT:        
-        {
-            a = m_AlphaInputLUT[ac.a][RED_C] & 0xff;
-            b = m_AlphaInputLUT[ac.b][RED_C] & 0xff;
-            InputReg.c = m_AlphaInputLUT[ac.c][ALP_C];
-            InputReg.d = m_AlphaInputLUT[ac.d][ALP_C];
-            Reg[ac.dest][ALP_C] = InputReg.d + ((a > b) ? InputReg.c : 0);
-        }
-        break;
+	InputRegType InputReg;
 
-    case TEVCMP_R8_EQ:
-        {
-            a = m_AlphaInputLUT[ac.a][RED_C] & 0xff;
-            b = m_AlphaInputLUT[ac.b][RED_C] & 0xff;
-            InputReg.c = m_AlphaInputLUT[ac.c][ALP_C];
-            InputReg.d = m_AlphaInputLUT[ac.d][ALP_C];
-            Reg[ac.dest][ALP_C] = InputReg.d + ((a == b) ? InputReg.c : 0);
-        }
-        break;
-    case TEVCMP_GR16_GT:
-        {
-            a = ((m_AlphaInputLUT[ac.a][GRN_C] & 0xff) << 8) | (m_AlphaInputLUT[ac.a][RED_C] & 0xff);
-            b = ((m_AlphaInputLUT[ac.b][GRN_C] & 0xff) << 8) | (m_AlphaInputLUT[ac.b][RED_C] & 0xff);
-            InputReg.c = m_AlphaInputLUT[ac.c][ALP_C];
-            InputReg.d = m_AlphaInputLUT[ac.d][ALP_C];
-            Reg[ac.dest][ALP_C] = InputReg.d + ((a > b) ? InputReg.c : 0);
-        }
-        break;
-    case TEVCMP_GR16_EQ:
-        {
-            a = ((m_AlphaInputLUT[ac.a][GRN_C] & 0xff) << 8) | (m_AlphaInputLUT[ac.a][RED_C] & 0xff);
-            b = ((m_AlphaInputLUT[ac.b][GRN_C] & 0xff) << 8) | (m_AlphaInputLUT[ac.b][RED_C] & 0xff);
-            InputReg.c = m_AlphaInputLUT[ac.c][ALP_C];
-            InputReg.d = m_AlphaInputLUT[ac.d][ALP_C];
-            Reg[ac.dest][ALP_C] = InputReg.d + ((a == b) ? InputReg.c : 0);
-        }
-        break;
-    case TEVCMP_BGR24_GT:
-        {
-            a = ((m_AlphaInputLUT[ac.a][BLU_C] & 0xff) << 16) | ((m_AlphaInputLUT[ac.a][GRN_C] & 0xff) << 8) | (m_AlphaInputLUT[ac.a][RED_C] & 0xff);
-            b = ((m_AlphaInputLUT[ac.b][BLU_C] & 0xff) << 16) | ((m_AlphaInputLUT[ac.b][GRN_C] & 0xff) << 8) | (m_AlphaInputLUT[ac.b][RED_C] & 0xff);
-            InputReg.c = m_AlphaInputLUT[ac.c][ALP_C];
-            InputReg.d = m_AlphaInputLUT[ac.d][ALP_C];
-            Reg[ac.dest][ALP_C] = InputReg.d + ((a > b) ? InputReg.c : 0);
-        }
-        break;
-    case TEVCMP_BGR24_EQ:
-        {
-            a = ((m_AlphaInputLUT[ac.a][BLU_C] & 0xff) << 16) | ((m_AlphaInputLUT[ac.a][GRN_C] & 0xff) << 8) | (m_AlphaInputLUT[ac.a][RED_C] & 0xff);
-            b = ((m_AlphaInputLUT[ac.b][BLU_C] & 0xff) << 16) | ((m_AlphaInputLUT[ac.b][GRN_C] & 0xff) << 8) | (m_AlphaInputLUT[ac.b][RED_C] & 0xff);
-            InputReg.c = m_AlphaInputLUT[ac.c][ALP_C];
-            InputReg.d = m_AlphaInputLUT[ac.d][ALP_C];
-            Reg[ac.dest][ALP_C] = InputReg.d + ((a == b) ? InputReg.c : 0);
-        }
-        break;
-    case TEVCMP_A8_GT:
-        {
-            InputReg.a = m_AlphaInputLUT[ac.a][ALP_C];
-            InputReg.b = m_AlphaInputLUT[ac.b][ALP_C];
-            InputReg.c = m_AlphaInputLUT[ac.c][ALP_C];
-            InputReg.d = m_AlphaInputLUT[ac.d][ALP_C];
-            Reg[ac.dest][ALP_C] = InputReg.d + ((InputReg.a > InputReg.b) ? InputReg.c : 0);
-        }
-        break;
-    case TEVCMP_A8_EQ:
-        {
-            InputReg.a = m_AlphaInputLUT[ac.a][ALP_C];
-            InputReg.b = m_AlphaInputLUT[ac.b][ALP_C];
-            InputReg.c = m_AlphaInputLUT[ac.c][ALP_C];
-            InputReg.d = m_AlphaInputLUT[ac.d][ALP_C];
-            Reg[ac.dest][ALP_C] = InputReg.d + ((InputReg.a == InputReg.b) ? InputReg.c : 0);
-        }
-        break;
-    }
+	switch(cmp) {
+	case TEVCMP_R8_GT:
+		{
+			a = m_AlphaInputLUT[ac.a][RED_C] & 0xff;
+			b = m_AlphaInputLUT[ac.b][RED_C] & 0xff;
+			InputReg.c = m_AlphaInputLUT[ac.c][ALP_C];
+			InputReg.d = m_AlphaInputLUT[ac.d][ALP_C];
+			Reg[ac.dest][ALP_C] = InputReg.d + ((a > b) ? InputReg.c : 0);
+		}
+		break;
+
+	case TEVCMP_R8_EQ:
+		{
+			a = m_AlphaInputLUT[ac.a][RED_C] & 0xff;
+			b = m_AlphaInputLUT[ac.b][RED_C] & 0xff;
+			InputReg.c = m_AlphaInputLUT[ac.c][ALP_C];
+			InputReg.d = m_AlphaInputLUT[ac.d][ALP_C];
+			Reg[ac.dest][ALP_C] = InputReg.d + ((a == b) ? InputReg.c : 0);
+		}
+		break;
+	case TEVCMP_GR16_GT:
+		{
+			a = ((m_AlphaInputLUT[ac.a][GRN_C] & 0xff) << 8) | (m_AlphaInputLUT[ac.a][RED_C] & 0xff);
+			b = ((m_AlphaInputLUT[ac.b][GRN_C] & 0xff) << 8) | (m_AlphaInputLUT[ac.b][RED_C] & 0xff);
+			InputReg.c = m_AlphaInputLUT[ac.c][ALP_C];
+			InputReg.d = m_AlphaInputLUT[ac.d][ALP_C];
+			Reg[ac.dest][ALP_C] = InputReg.d + ((a > b) ? InputReg.c : 0);
+		}
+		break;
+	case TEVCMP_GR16_EQ:
+		{
+			a = ((m_AlphaInputLUT[ac.a][GRN_C] & 0xff) << 8) | (m_AlphaInputLUT[ac.a][RED_C] & 0xff);
+			b = ((m_AlphaInputLUT[ac.b][GRN_C] & 0xff) << 8) | (m_AlphaInputLUT[ac.b][RED_C] & 0xff);
+			InputReg.c = m_AlphaInputLUT[ac.c][ALP_C];
+			InputReg.d = m_AlphaInputLUT[ac.d][ALP_C];
+			Reg[ac.dest][ALP_C] = InputReg.d + ((a == b) ? InputReg.c : 0);
+		}
+		break;
+	case TEVCMP_BGR24_GT:
+		{
+			a = ((m_AlphaInputLUT[ac.a][BLU_C] & 0xff) << 16) | ((m_AlphaInputLUT[ac.a][GRN_C] & 0xff) << 8) | (m_AlphaInputLUT[ac.a][RED_C] & 0xff);
+			b = ((m_AlphaInputLUT[ac.b][BLU_C] & 0xff) << 16) | ((m_AlphaInputLUT[ac.b][GRN_C] & 0xff) << 8) | (m_AlphaInputLUT[ac.b][RED_C] & 0xff);
+			InputReg.c = m_AlphaInputLUT[ac.c][ALP_C];
+			InputReg.d = m_AlphaInputLUT[ac.d][ALP_C];
+			Reg[ac.dest][ALP_C] = InputReg.d + ((a > b) ? InputReg.c : 0);
+		}
+		break;
+	case TEVCMP_BGR24_EQ:
+		{
+			a = ((m_AlphaInputLUT[ac.a][BLU_C] & 0xff) << 16) | ((m_AlphaInputLUT[ac.a][GRN_C] & 0xff) << 8) | (m_AlphaInputLUT[ac.a][RED_C] & 0xff);
+			b = ((m_AlphaInputLUT[ac.b][BLU_C] & 0xff) << 16) | ((m_AlphaInputLUT[ac.b][GRN_C] & 0xff) << 8) | (m_AlphaInputLUT[ac.b][RED_C] & 0xff);
+			InputReg.c = m_AlphaInputLUT[ac.c][ALP_C];
+			InputReg.d = m_AlphaInputLUT[ac.d][ALP_C];
+			Reg[ac.dest][ALP_C] = InputReg.d + ((a == b) ? InputReg.c : 0);
+		}
+		break;
+	case TEVCMP_A8_GT:
+		{
+			InputReg.a = m_AlphaInputLUT[ac.a][ALP_C];
+			InputReg.b = m_AlphaInputLUT[ac.b][ALP_C];
+			InputReg.c = m_AlphaInputLUT[ac.c][ALP_C];
+			InputReg.d = m_AlphaInputLUT[ac.d][ALP_C];
+			Reg[ac.dest][ALP_C] = InputReg.d + ((InputReg.a > InputReg.b) ? InputReg.c : 0);
+		}
+		break;
+	case TEVCMP_A8_EQ:
+		{
+			InputReg.a = m_AlphaInputLUT[ac.a][ALP_C];
+			InputReg.b = m_AlphaInputLUT[ac.b][ALP_C];
+			InputReg.c = m_AlphaInputLUT[ac.c][ALP_C];
+			InputReg.d = m_AlphaInputLUT[ac.d][ALP_C];
+			Reg[ac.dest][ALP_C] = InputReg.d + ((InputReg.a == InputReg.b) ? InputReg.c : 0);
+		}
+		break;
+	}
 }
 
 static bool AlphaCompare(int alpha, int ref, int comp)
 {
-    switch(comp) {
-    case ALPHACMP_ALWAYS:  return true;
-    case ALPHACMP_NEVER:   return false;
-    case ALPHACMP_LEQUAL:  return alpha <= ref;
-    case ALPHACMP_LESS:    return alpha < ref;
-    case ALPHACMP_GEQUAL:  return alpha >= ref;
-    case ALPHACMP_GREATER: return alpha > ref;
-    case ALPHACMP_EQUAL:   return alpha == ref;
-    case ALPHACMP_NEQUAL:  return alpha != ref;
-    }
-    return true;
+	switch(comp) {
+	case ALPHACMP_ALWAYS:  return true;
+	case ALPHACMP_NEVER:   return false;
+	case ALPHACMP_LEQUAL:  return alpha <= ref;
+	case ALPHACMP_LESS:    return alpha < ref;
+	case ALPHACMP_GEQUAL:  return alpha >= ref;
+	case ALPHACMP_GREATER: return alpha > ref;
+	case ALPHACMP_EQUAL:   return alpha == ref;
+	case ALPHACMP_NEQUAL:  return alpha != ref;
+	}
+	return true;
 }
 
 static bool TevAlphaTest(int alpha)
 {
-    bool comp0 = AlphaCompare(alpha, bpmem.alpha_test.ref0, bpmem.alpha_test.comp0);
-    bool comp1 = AlphaCompare(alpha, bpmem.alpha_test.ref1, bpmem.alpha_test.comp1);
+	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.alpha_test.logic) {
-    case 0: return comp0 && comp1; // and
-    case 1: return comp0 || comp1; // or
-    case 2: return comp0 ^ comp1; // xor
-    case 3: return !(comp0 ^ comp1); // xnor
-    }
-    return true;
+	switch (bpmem.alpha_test.logic)
+	{
+	case 0: return comp0 && comp1;   // and
+	case 1: return comp0 || comp1;   // or
+	case 2: return comp0 ^ comp1;    // xor
+	case 3: return !(comp0 ^ comp1); // xnor
+	}
+	return true;
 }
 
 inline s32 WrapIndirectCoord(s32 coord, int wrapMode)
 {
-    switch (wrapMode) {
-        case ITW_OFF:
-            return coord;
-        case ITW_256:
-            return (coord % (256 << 7));
-        case ITW_128:
-            return (coord % (128 << 7));
-        case ITW_64:
-            return (coord % (64 << 7));
-        case ITW_32:
-            return (coord % (32 << 7));
-        case ITW_16:
-            return (coord % (16 << 7));
-        case ITW_0:
-            return 0;
-    }
-    return 0;
+	switch (wrapMode)
+	{
+		case ITW_OFF:
+			return coord;
+		case ITW_256:
+			return (coord % (256 << 7));
+		case ITW_128:
+			return (coord % (128 << 7));
+		case ITW_64:
+			return (coord % (64 << 7));
+		case ITW_32:
+			return (coord % (32 << 7));
+		case ITW_16:
+			return (coord % (16 << 7));
+		case ITW_0:
+			return 0;
+	}
+	return 0;
 }
 
 void Tev::Indirect(unsigned int stageNum, s32 s, s32 t)
 {
-    TevStageIndirect &indirect = bpmem.tevind[stageNum];
-    u8 *indmap = IndirectTex[indirect.bt];
+	TevStageIndirect &indirect = bpmem.tevind[stageNum];
+	u8 *indmap = IndirectTex[indirect.bt];
 
-    s32 indcoord[3];
+	s32 indcoord[3];
 
-    // alpha bump select
-    switch (indirect.bs) {
-        case ITBA_OFF:
-            AlphaBump = 0;
-            break;
-         case ITBA_S:
+	// alpha bump select
+	switch (indirect.bs)
+	{
+		case ITBA_OFF:
+			AlphaBump = 0;
+			break;
+			case ITBA_S:
 			AlphaBump = indmap[TextureSampler::ALP_SMP];
-            break;
-        case ITBA_T:
-            AlphaBump = indmap[TextureSampler::BLU_SMP];
-            break;
-        case ITBA_U:
-            AlphaBump = indmap[TextureSampler::GRN_SMP];
-            break;
-    }
+			break;
+		case ITBA_T:
+			AlphaBump = indmap[TextureSampler::BLU_SMP];
+			break;
+		case ITBA_U:
+			AlphaBump = indmap[TextureSampler::GRN_SMP];
+			break;
+	}
 
-    // bias select
-    s16 biasValue = indirect.fmt==ITF_8?-128:1;
-    s16 bias[3];
-    bias[0] = indirect.bias&1?biasValue:0;
-    bias[1] = indirect.bias&2?biasValue:0;
-    bias[2] = indirect.bias&4?biasValue:0;
+	// bias select
+	s16 biasValue = indirect.fmt==ITF_8?-128:1;
+	s16 bias[3];
+	bias[0] = indirect.bias&1?biasValue:0;
+	bias[1] = indirect.bias&2?biasValue:0;
+	bias[2] = indirect.bias&4?biasValue:0;
 
-    // format
-    switch(indirect.fmt) {
-        case ITF_8:
-            indcoord[0] = indmap[TextureSampler::ALP_SMP] + bias[0];
-            indcoord[1] = indmap[TextureSampler::BLU_SMP] + bias[1];
-            indcoord[2] = indmap[TextureSampler::GRN_SMP] + bias[2];
-            AlphaBump = AlphaBump & 0xf8;
-            break;
-        case ITF_5:
-            indcoord[0] = (indmap[TextureSampler::ALP_SMP] & 0x1f) + bias[0];
-            indcoord[1] = (indmap[TextureSampler::BLU_SMP] & 0x1f) + bias[1];
-            indcoord[2] = (indmap[TextureSampler::GRN_SMP] & 0x1f) + bias[2];
-            AlphaBump = AlphaBump & 0xe0;
-            break;
-        case ITF_4:
-            indcoord[0] = (indmap[TextureSampler::ALP_SMP] & 0x0f) + bias[0];
-            indcoord[1] = (indmap[TextureSampler::BLU_SMP] & 0x0f) + bias[1];
-            indcoord[2] = (indmap[TextureSampler::GRN_SMP] & 0x0f) + bias[2];
-            AlphaBump = AlphaBump & 0xf0;
-            break;
-        case ITF_3:
-            indcoord[0] = (indmap[TextureSampler::ALP_SMP] & 0x07) + bias[0];
-            indcoord[1] = (indmap[TextureSampler::BLU_SMP] & 0x07) + bias[1];
-            indcoord[2] = (indmap[TextureSampler::GRN_SMP] & 0x07) + bias[2];
-            AlphaBump = AlphaBump & 0xf8;
-            break;
-        default:
-            PanicAlert("Tev::Indirect");
-            return;
-    }
+	// format
+	switch(indirect.fmt)
+	{
+		case ITF_8:
+			indcoord[0] = indmap[TextureSampler::ALP_SMP] + bias[0];
+			indcoord[1] = indmap[TextureSampler::BLU_SMP] + bias[1];
+			indcoord[2] = indmap[TextureSampler::GRN_SMP] + bias[2];
+			AlphaBump = AlphaBump & 0xf8;
+			break;
+		case ITF_5:
+			indcoord[0] = (indmap[TextureSampler::ALP_SMP] & 0x1f) + bias[0];
+			indcoord[1] = (indmap[TextureSampler::BLU_SMP] & 0x1f) + bias[1];
+			indcoord[2] = (indmap[TextureSampler::GRN_SMP] & 0x1f) + bias[2];
+			AlphaBump = AlphaBump & 0xe0;
+			break;
+		case ITF_4:
+			indcoord[0] = (indmap[TextureSampler::ALP_SMP] & 0x0f) + bias[0];
+			indcoord[1] = (indmap[TextureSampler::BLU_SMP] & 0x0f) + bias[1];
+			indcoord[2] = (indmap[TextureSampler::GRN_SMP] & 0x0f) + bias[2];
+			AlphaBump = AlphaBump & 0xf0;
+			break;
+		case ITF_3:
+			indcoord[0] = (indmap[TextureSampler::ALP_SMP] & 0x07) + bias[0];
+			indcoord[1] = (indmap[TextureSampler::BLU_SMP] & 0x07) + bias[1];
+			indcoord[2] = (indmap[TextureSampler::GRN_SMP] & 0x07) + bias[2];
+			AlphaBump = AlphaBump & 0xf8;
+			break;
+		default:
+			PanicAlert("Tev::Indirect");
+			return;
+	}
 
-    s64 indtevtrans[2] = { 0,0 };
+	s64 indtevtrans[2] = { 0,0 };
 
-    // matrix multiply
-    int indmtxid = indirect.mid & 3;
-    if (indmtxid)
-    {
-        IND_MTX &indmtx = bpmem.indmtx[indmtxid - 1];
-        int scale = ((u32)indmtx.col0.s0 << 0) |
-	                ((u32)indmtx.col1.s1 << 2) |
-	                ((u32)indmtx.col2.s2 << 4);
+	// matrix multiply
+	int indmtxid = indirect.mid & 3;
+	if (indmtxid)
+	{
+		IND_MTX &indmtx = bpmem.indmtx[indmtxid - 1];
+		int scale = ((u32)indmtx.col0.s0 << 0) |
+					((u32)indmtx.col1.s1 << 2) |
+					((u32)indmtx.col2.s2 << 4);
 
 		int shift;
 
-        switch (indirect.mid & 12) {
-            case 0:   
+		switch (indirect.mid & 12)
+		{
+			case 0:
 				shift = 3 + (17 - scale);
-                indtevtrans[0] = indmtx.col0.ma * indcoord[0] + indmtx.col1.mc * indcoord[1] + indmtx.col2.me * indcoord[2];
-                indtevtrans[1] = indmtx.col0.mb * indcoord[0] + indmtx.col1.md * indcoord[1] + indmtx.col2.mf * indcoord[2];
-                break;
-            case 4: // s matrix
+				indtevtrans[0] = indmtx.col0.ma * indcoord[0] + indmtx.col1.mc * indcoord[1] + indmtx.col2.me * indcoord[2];
+				indtevtrans[1] = indmtx.col0.mb * indcoord[0] + indmtx.col1.md * indcoord[1] + indmtx.col2.mf * indcoord[2];
+				break;
+			case 4: // s matrix
 				shift = 8 + (17 - scale);
-                indtevtrans[0] = s * indcoord[0];
-                indtevtrans[1] = t * indcoord[0];
-                break;
-            case 8: // t matrix
+				indtevtrans[0] = s * indcoord[0];
+				indtevtrans[1] = t * indcoord[0];
+				break;
+			case 8: // t matrix
 				shift = 8 + (17 - scale);
-                indtevtrans[0] = s * indcoord[1];
-                indtevtrans[1] = t * indcoord[1];
-                break;
-            default:
-                return;
-        }
+				indtevtrans[0] = s * indcoord[1];
+				indtevtrans[1] = t * indcoord[1];
+				break;
+			default:
+				return;
+		}
 
 		indtevtrans[0] = shift >= 0 ? indtevtrans[0] >> shift : indtevtrans[0] << -shift;
 		indtevtrans[1] = shift >= 0 ? indtevtrans[1] >> shift : indtevtrans[1] << -shift;
-    }
+	}
 
 	if (indirect.fb_addprev)
-    {
-        TexCoord.s += (int)(WrapIndirectCoord(s, indirect.sw) + indtevtrans[0]);
-        TexCoord.t += (int)(WrapIndirectCoord(t, indirect.tw) + indtevtrans[1]);
-    }
-    else
-    {
-        TexCoord.s = (int)(WrapIndirectCoord(s, indirect.sw) + indtevtrans[0]);
-        TexCoord.t = (int)(WrapIndirectCoord(t, indirect.tw) + indtevtrans[1]);
-    }
+	{
+		TexCoord.s += (int)(WrapIndirectCoord(s, indirect.sw) + indtevtrans[0]);
+		TexCoord.t += (int)(WrapIndirectCoord(t, indirect.tw) + indtevtrans[1]);
+	}
+	else
+	{
+		TexCoord.s = (int)(WrapIndirectCoord(s, indirect.sw) + indtevtrans[0]);
+		TexCoord.t = (int)(WrapIndirectCoord(t, indirect.tw) + indtevtrans[1]);
+	}
 }
 
 void Tev::Draw()
 {
-    _assert_(Position[0] >= 0 && Position[0] < EFB_WIDTH);
-    _assert_(Position[1] >= 0 && Position[1] < EFB_HEIGHT);
+	_assert_(Position[0] >= 0 && Position[0] < EFB_WIDTH);
+	_assert_(Position[1] >= 0 && Position[1] < EFB_HEIGHT);
 
-    INCSTAT(swstats.thisFrame.tevPixelsIn);
+	INCSTAT(swstats.thisFrame.tevPixelsIn);
 
-    for (unsigned int stageNum = 0; stageNum < bpmem.genMode.numindstages; stageNum++)
-    {
-        int stageNum2 = stageNum >> 1;
-        int stageOdd = stageNum&1;
+	for (unsigned int stageNum = 0; stageNum < bpmem.genMode.numindstages; stageNum++)
+	{
+		int stageNum2 = stageNum >> 1;
+		int stageOdd = stageNum&1;
 
-        u32 texcoordSel = bpmem.tevindref.getTexCoord(stageNum);
-        u32 texmap = bpmem.tevindref.getTexMap(stageNum);
+		u32 texcoordSel = bpmem.tevindref.getTexCoord(stageNum);
+		u32 texmap = bpmem.tevindref.getTexMap(stageNum);
 
 		const TEXSCALE& texscale = bpmem.texscale[stageNum2];
 		s32 scaleS = stageOdd ? texscale.ss1:texscale.ss0;
-        s32 scaleT = stageOdd ? texscale.ts1:texscale.ts0;
+		s32 scaleT = stageOdd ? texscale.ts1:texscale.ts0;
 
-        TextureSampler::Sample(Uv[texcoordSel].s >> scaleS, Uv[texcoordSel].t >> scaleT,
+		TextureSampler::Sample(Uv[texcoordSel].s >> scaleS, Uv[texcoordSel].t >> scaleT,
 			IndirectLod[stageNum], IndirectLinear[stageNum], texmap, IndirectTex[stageNum]);
 
 #if ALLOW_TEV_DUMPS
-        if (g_SWVideoConfig.bDumpTevStages)
-        {
+		if (g_SWVideoConfig.bDumpTevStages)
+		{
 			u8 stage[4] = { IndirectTex[stageNum][TextureSampler::ALP_SMP],
 							IndirectTex[stageNum][TextureSampler::BLU_SMP],
 							IndirectTex[stageNum][TextureSampler::GRN_SMP],
 							255};
 			DebugUtil::DrawTempBuffer(stage, INDIRECT + stageNum);
-        }
+		}
 #endif
-    }
+	}
 
-    for (unsigned int stageNum = 0; stageNum <= bpmem.genMode.numtevstages; stageNum++)
-    {
-        int stageNum2 = stageNum >> 1;
-        int stageOdd = stageNum&1;
-        TwoTevStageOrders &order = bpmem.tevorders[stageNum2];
-        TevKSel &kSel = bpmem.tevksel[stageNum2];        
+	for (unsigned int stageNum = 0; stageNum <= bpmem.genMode.numtevstages; stageNum++)
+	{
+		int stageNum2 = stageNum >> 1;
+		int stageOdd = stageNum&1;
+		TwoTevStageOrders &order = bpmem.tevorders[stageNum2];
+		TevKSel &kSel = bpmem.tevksel[stageNum2];
 
-        // stage combiners
-        TevStageCombiner::ColorCombiner &cc = bpmem.combiners[stageNum].colorC;
-        TevStageCombiner::AlphaCombiner &ac = bpmem.combiners[stageNum].alphaC;
+		// stage combiners
+		TevStageCombiner::ColorCombiner &cc = bpmem.combiners[stageNum].colorC;
+		TevStageCombiner::AlphaCombiner &ac = bpmem.combiners[stageNum].alphaC;
 
-        int texcoordSel = order.getTexCoord(stageOdd);
-        int texmap = order.getTexMap(stageOdd);
+		int texcoordSel = order.getTexCoord(stageOdd);
+		int texmap = order.getTexMap(stageOdd);
 
-        Indirect(stageNum, Uv[texcoordSel].s, Uv[texcoordSel].t);
+		Indirect(stageNum, Uv[texcoordSel].s, Uv[texcoordSel].t);
 
-        // sample texture
-        if (order.getEnable(stageOdd))
-        {
-            // RGBA
+		// sample texture
+		if (order.getEnable(stageOdd))
+		{
+			// RGBA
 			u8 texel[4];
-    
+
 			TextureSampler::Sample(TexCoord.s, TexCoord.t, TextureLod[stageNum], TextureLinear[stageNum], texmap, texel);
 
 #if ALLOW_TEV_DUMPS
@@ -641,91 +633,96 @@ void Tev::Draw()
 				DebugUtil::DrawTempBuffer(texel, DIRECT_TFETCH + stageNum);
 #endif
 
-            int swaptable = ac.tswap * 2;            
+			int swaptable = ac.tswap * 2;
 
-            TexColor[RED_C] = texel[bpmem.tevksel[swaptable].swap1];
-            TexColor[GRN_C] = texel[bpmem.tevksel[swaptable].swap2];
-            swaptable++;
-            TexColor[BLU_C] = texel[bpmem.tevksel[swaptable].swap1];
-            TexColor[ALP_C] = texel[bpmem.tevksel[swaptable].swap2];
-        }
+			TexColor[RED_C] = texel[bpmem.tevksel[swaptable].swap1];
+			TexColor[GRN_C] = texel[bpmem.tevksel[swaptable].swap2];
+			swaptable++;
+			TexColor[BLU_C] = texel[bpmem.tevksel[swaptable].swap1];
+			TexColor[ALP_C] = texel[bpmem.tevksel[swaptable].swap2];
+		}
 
-        // set konst for this stage
-        int kc = kSel.getKC(stageOdd);
-        int ka = kSel.getKA(stageOdd);
-        StageKonst[RED_C] = *(m_KonstLUT[kc][RED_C]);
-        StageKonst[GRN_C] = *(m_KonstLUT[kc][GRN_C]);
-        StageKonst[BLU_C] = *(m_KonstLUT[kc][BLU_C]);
-        StageKonst[ALP_C] = *(m_KonstLUT[ka][ALP_C]);
+		// set konst for this stage
+		int kc = kSel.getKC(stageOdd);
+		int ka = kSel.getKA(stageOdd);
+		StageKonst[RED_C] = *(m_KonstLUT[kc][RED_C]);
+		StageKonst[GRN_C] = *(m_KonstLUT[kc][GRN_C]);
+		StageKonst[BLU_C] = *(m_KonstLUT[kc][BLU_C]);
+		StageKonst[ALP_C] = *(m_KonstLUT[ka][ALP_C]);
 
-        // set color        
-        SetRasColor(order.getColorChan(stageOdd), ac.rswap * 2);
+		// set color
+		SetRasColor(order.getColorChan(stageOdd), ac.rswap * 2);
 
-        // combine inputs
-        if (cc.bias != 3)
-            DrawColorRegular(cc);
-        else
-            DrawColorCompare(cc);
+		// combine inputs
+		if (cc.bias != 3)
+			DrawColorRegular(cc);
+		else
+			DrawColorCompare(cc);
 
-        if (cc.clamp)
-        {
-            Reg[cc.dest][RED_C] = Clamp255(Reg[cc.dest][RED_C]);
-            Reg[cc.dest][GRN_C] = Clamp255(Reg[cc.dest][GRN_C]);
-            Reg[cc.dest][BLU_C] = Clamp255(Reg[cc.dest][BLU_C]);
-        }
-        else
-        {
-            Reg[cc.dest][RED_C] = Clamp1024(Reg[cc.dest][RED_C]);
-            Reg[cc.dest][GRN_C] = Clamp1024(Reg[cc.dest][GRN_C]);
-            Reg[cc.dest][BLU_C] = Clamp1024(Reg[cc.dest][BLU_C]);
-        }
+		if (cc.clamp)
+		{
+			Reg[cc.dest][RED_C] = Clamp255(Reg[cc.dest][RED_C]);
+			Reg[cc.dest][GRN_C] = Clamp255(Reg[cc.dest][GRN_C]);
+			Reg[cc.dest][BLU_C] = Clamp255(Reg[cc.dest][BLU_C]);
+		}
+		else
+		{
+			Reg[cc.dest][RED_C] = Clamp1024(Reg[cc.dest][RED_C]);
+			Reg[cc.dest][GRN_C] = Clamp1024(Reg[cc.dest][GRN_C]);
+			Reg[cc.dest][BLU_C] = Clamp1024(Reg[cc.dest][BLU_C]);
+		}
 
-        if (ac.bias != 3)
-            DrawAlphaRegular(ac);
-        else
-            DrawAlphaCompare(ac);
+		if (ac.bias != 3)
+			DrawAlphaRegular(ac);
+		else
+			DrawAlphaCompare(ac);
 
-        if (ac.clamp)
-            Reg[ac.dest][ALP_C] = Clamp255(Reg[ac.dest][ALP_C]);
-        else
-            Reg[ac.dest][ALP_C] = Clamp1024(Reg[ac.dest][ALP_C]);
+		if (ac.clamp)
+			Reg[ac.dest][ALP_C] = Clamp255(Reg[ac.dest][ALP_C]);
+		else
+			Reg[ac.dest][ALP_C] = Clamp1024(Reg[ac.dest][ALP_C]);
 
 #if ALLOW_TEV_DUMPS
-        if (g_SWVideoConfig.bDumpTevStages)
-        {
-            u8 stage[4] = {(u8)Reg[0][RED_C], (u8)Reg[0][GRN_C], (u8)Reg[0][BLU_C], (u8)Reg[0][ALP_C]};
+		if (g_SWVideoConfig.bDumpTevStages)
+		{
+			u8 stage[4] = {(u8)Reg[0][RED_C], (u8)Reg[0][GRN_C], (u8)Reg[0][BLU_C], (u8)Reg[0][ALP_C]};
 			DebugUtil::DrawTempBuffer(stage, DIRECT + stageNum);
-        }
+		}
 #endif
-    }
-    
-    // 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 (!TevAlphaTest(output[ALP_C]))
-        return;
+	// convert to 8 bits per component
+	// the results of the last tev stage are put onto the screen,
+	// regardless of the used destination register - TODO: Verify!
+	u32 color_index = bpmem.combiners[bpmem.genMode.numtevstages].colorC.dest;
+	u32 alpha_index = bpmem.combiners[bpmem.genMode.numtevstages].alphaC.dest;
+	u8 output[4] = {(u8)Reg[alpha_index][ALP_C], (u8)Reg[color_index][BLU_C], (u8)Reg[color_index][GRN_C], (u8)Reg[color_index][RED_C]};
 
-    // z texture
-    if (bpmem.ztex2.op)
-    {
-        u32 ztex = bpmem.ztex1.bias;
-        switch (bpmem.ztex2.type) {
-            case 0: // 8 bit
-                ztex += TexColor[ALP_C];
-                break;
-            case 1: // 16 bit
-                ztex += TexColor[ALP_C] << 8 | TexColor[RED_C];
-                break;
-            case 2: // 24 bit
-                ztex += TexColor[RED_C] << 16 | TexColor[GRN_C] << 8 | TexColor[BLU_C];
-                break;
-        }
+	if (!TevAlphaTest(output[ALP_C]))
+		return;
 
-        if (bpmem.ztex2.op == ZTEXTURE_ADD)
-            ztex += Position[2];
+	// z texture
+	if (bpmem.ztex2.op)
+	{
+		u32 ztex = bpmem.ztex1.bias;
+		switch (bpmem.ztex2.type)
+		{
+			case 0: // 8 bit
+				ztex += TexColor[ALP_C];
+				break;
+			case 1: // 16 bit
+				ztex += TexColor[ALP_C] << 8 | TexColor[RED_C];
+				break;
+			case 2: // 24 bit
+				ztex += TexColor[RED_C] << 16 | TexColor[GRN_C] << 8 | TexColor[BLU_C];
+				break;
+		}
 
-        Position[2] = ztex & 0x00ffffff;
-    }
+		if (bpmem.ztex2.op == ZTEXTURE_ADD)
+			ztex += Position[2];
+
+		Position[2] = ztex & 0x00ffffff;
+	}
 
 	// fog
 	if (bpmem.fog.c_proj_fsel.fsel)
@@ -759,7 +756,7 @@ void Tev::Draw()
 			float offset = (Position[0] - (bpmem.fogRange.Base.Center - 342)) / (float)swxfregs.viewport.wd;
 			// Based on that, choose the index such that points which are far away from the z-axis use the 10th "k" value and such that central points use the first value.
 			int index = 9 - std::abs(offset) * 9.f;
-			index = (index < 0) ? 0 : (index > 9) ? 9 : 0; // TODO: Shouldn't be necessary!
+			index = (index < 0) ? 0 : (index > 9) ? 9 : index; // TODO: Shouldn't be necessary!
 			// Look up coefficient... Seems like multiplying by 4 makes Fortune Street work properly (fog is too strong without the factor)
 			float k = bpmem.fogRange.K[index/2].GetValue(index%2) * 4.f;
 			float x_adjust = sqrt(offset*offset + k*k)/k;
@@ -802,12 +799,12 @@ void Tev::Draw()
 	if (late_ztest && bpmem.zmode.testenable)
 	{
 		// TODO: Check against hw if these values get incremented even if depth testing is disabled
-        SWPixelEngine::pereg.IncZInputQuadCount(false);
+		SWPixelEngine::pereg.IncZInputQuadCount(false);
 
-        if (!EfbInterface::ZCompare(Position[0], Position[1], Position[2]))
-            return;
+		if (!EfbInterface::ZCompare(Position[0], Position[1], Position[2]))
+			return;
 
-        SWPixelEngine::pereg.IncZOutputQuadCount(false);
+		SWPixelEngine::pereg.IncZOutputQuadCount(false);
 	}
 
 #if ALLOW_TEV_DUMPS
@@ -830,22 +827,22 @@ void Tev::Draw()
 	}
 #endif
 
-    INCSTAT(swstats.thisFrame.tevPixelsOut);
+	INCSTAT(swstats.thisFrame.tevPixelsOut);
 	SWPixelEngine::pereg.IncBlendInputQuadCount();
 
-    EfbInterface::BlendTev(Position[0], Position[1], output);
+	EfbInterface::BlendTev(Position[0], Position[1], output);
 }
 
 void Tev::SetRegColor(int reg, int comp, bool konst, s16 color)
 {
-    if (konst)
-    {
-        KonstantColors[reg][comp] = color;
-    }
-    else
-    {
-        Reg[reg][comp] = color;
-    }
+	if (konst)
+	{
+		KonstantColors[reg][comp] = color;
+	}
+	else
+	{
+		Reg[reg][comp] = color;
+	}
 }
 
 void Tev::DoState(PointerWrap &p)
@@ -856,21 +853,21 @@ void Tev::DoState(PointerWrap &p)
 	p.DoArray(TexColor,4);
 	p.DoArray(RasColor,4);
 	p.DoArray(StageKonst,4);
-    p.DoArray(Zero16,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(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(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 1d1bc8d2ba..d701625dfb 100644
--- a/Source/Plugins/Plugin_VideoSoftware/Src/Tev.h
+++ b/Source/Plugins/Plugin_VideoSoftware/Src/Tev.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _TEV_H_
 #define _TEV_H_
@@ -23,12 +10,13 @@
 
 class Tev
 { 
-	struct InputRegType {
-        unsigned a : 8;
-        unsigned b : 8;
-        unsigned c : 8;
-        signed   d : 11;
-    };
+	struct InputRegType
+	{
+		unsigned a : 8;
+		unsigned b : 8;
+		unsigned c : 8;
+		signed   d : 11;
+	};
 
 	struct TextureCoordinateType
 	{
@@ -36,26 +24,26 @@ class Tev
 		signed t : 24;
 	};
 
-    // color order: ABGR
-    s16 Reg[4][4];
-    s16 KonstantColors[4][4];
-    s16 TexColor[4];
-    s16 RasColor[4];
-    s16 StageKonst[4];
-    s16 Zero16[4];
-    
+	// color order: ABGR
+	s16 Reg[4][4];
+	s16 KonstantColors[4][4];
+	s16 TexColor[4];
+	s16 RasColor[4];
+	s16 StageKonst[4];
+	s16 Zero16[4];
+
 	s16 FixedConstants[9];
 	u8 AlphaBump;
-    u8 IndirectTex[4][4];
+	u8 IndirectTex[4][4];
 	TextureCoordinateType TexCoord;
 
-    s16 *m_ColorInputLUT[16][3];
-    s16 *m_AlphaInputLUT[8];        // values must point to ABGR color
-    s16 *m_KonstLUT[32][4];
-    u8 *m_RasColorLUT[8];
-    s16 m_BiasLUT[4];
-    u8 m_ScaleLShiftLUT[4];
-    u8 m_ScaleRShiftLUT[4];
+	s16 *m_ColorInputLUT[16][3];
+	s16 *m_AlphaInputLUT[8];        // values must point to ABGR color
+	s16 *m_KonstLUT[32][4];
+	u8 *m_RasColorLUT[8];
+	s16 m_BiasLUT[4];
+	u8 m_ScaleLShiftLUT[4];
+	u8 m_ScaleRShiftLUT[4];
 
 	// enumeration for color input LUT
 	enum
@@ -72,29 +60,29 @@ class Tev
 		INDIRECT = 32
 	};
 
-    void SetRasColor(int colorChan, int swaptable);
+	void SetRasColor(int colorChan, int swaptable);
 
-    void DrawColorRegular(TevStageCombiner::ColorCombiner &cc);
-    void DrawColorCompare(TevStageCombiner::ColorCombiner &cc);
-    void DrawAlphaRegular(TevStageCombiner::AlphaCombiner &ac);
-    void DrawAlphaCompare(TevStageCombiner::AlphaCombiner &ac);
+	void DrawColorRegular(TevStageCombiner::ColorCombiner &cc);
+	void DrawColorCompare(TevStageCombiner::ColorCombiner &cc);
+	void DrawAlphaRegular(TevStageCombiner::AlphaCombiner &ac);
+	void DrawAlphaCompare(TevStageCombiner::AlphaCombiner &ac);
 
-    void Indirect(unsigned int stageNum, s32 s, s32 t);
+	void Indirect(unsigned int stageNum, s32 s, s32 t);
 
 public:
 	s32 Position[3];
-    u8 Color[2][4]; // must be RGBA for correct swap table ordering
-    TextureCoordinateType Uv[8];
-    s32 IndirectLod[4];
+	u8 Color[2][4]; // must be RGBA for correct swap table ordering
+	TextureCoordinateType Uv[8];
+	s32 IndirectLod[4];
 	bool IndirectLinear[4];
 	s32 TextureLod[16];
 	bool TextureLinear[16];
 
-    void Init();
+	void Init();
 
-    void Draw();
+	void Draw();
 
-    void SetRegColor(int reg, int comp, bool konst, s16 color);
+	void SetRegColor(int reg, int comp, bool konst, s16 color);
 
 	enum { ALP_C, BLU_C, GRN_C, RED_C };
 
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/TextureEncoder.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/TextureEncoder.cpp
index 46d94f3af9..9874e13449 100644
--- a/Source/Plugins/Plugin_VideoSoftware/Src/TextureEncoder.cpp
+++ b/Source/Plugins/Plugin_VideoSoftware/Src/TextureEncoder.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "TextureEncoder.h"
 #include "EfbInterface.h"
@@ -28,26 +15,26 @@ namespace TextureEncoder
 
 inline void RGBA_to_RGBA8(u8 *src, u8 &r, u8 &g, u8 &b, u8 &a)
 {
-    u32 srcColor = *(u32*)src;
-    a = Convert6To8(srcColor & 0x3f);
-    b = Convert6To8((srcColor >> 6) & 0x3f);
-    g = Convert6To8((srcColor >> 12)& 0x3f);
-    r = Convert6To8((srcColor >> 18)& 0x3f);
+	u32 srcColor = *(u32*)src;
+	a = Convert6To8(srcColor & 0x3f);
+	b = Convert6To8((srcColor >> 6) & 0x3f);
+	g = Convert6To8((srcColor >> 12)& 0x3f);
+	r = Convert6To8((srcColor >> 18)& 0x3f);
 }
 
 inline void RGBA_to_RGB8(u8 *src, u8 &r, u8 &g, u8 &b)
 {
-    u32 srcColor = *(u32*)src;
-    b = Convert6To8((srcColor >> 6) & 0x3f);
-    g = Convert6To8((srcColor >> 12)& 0x3f);
-    r = Convert6To8((srcColor >> 18)& 0x3f);
+	u32 srcColor = *(u32*)src;
+	b = Convert6To8((srcColor >> 6) & 0x3f);
+	g = Convert6To8((srcColor >> 12)& 0x3f);
+	r = Convert6To8((srcColor >> 18)& 0x3f);
 }
 
 inline u8 RGB8_to_I(u8 r, u8 g, u8 b)
 {
-    // values multiplied by 256 to keep math integer
-    u16 val = 4096 + 66 * r + 129 * g + 25 * b;
-    return val >> 8;
+	// values multiplied by 256 to keep math integer
+	u16 val = 4096 + 66 * r + 129 * g + 25 * b;
+	return val >> 8;
 }
 
 // box filter sampling averages 4 samples with the source texel being the top left of the box
@@ -55,84 +42,92 @@ inline u8 RGB8_to_I(u8 r, u8 g, u8 b)
 
 inline void boxfilterRGBA_to_RGBA8(u8 *src, u8 &r, u8 &g, u8 &b, u8 &a)
 {
-    u16 r16 = 0, g16 = 0, b16 = 0, a16 = 0;
+	u16 r16 = 0, g16 = 0, b16 = 0, a16 = 0;
 
-    for (int y = 0; y < 2; y++) {
-        for (int x = 0; x < 2; x++) {
-            u32 srcColor = *(u32*)src;
+	for (int y = 0; y < 2; y++)
+	{
+		for (int x = 0; x < 2; x++)
+		{
+			u32 srcColor = *(u32*)src;
 
-            a16 += srcColor & 0x3f;
-            b16 += (srcColor >> 6) & 0x3f;
-            g16 += (srcColor >> 12) & 0x3f;
-            r16 += (srcColor >> 18) & 0x3f;
+			a16 += srcColor & 0x3f;
+			b16 += (srcColor >> 6) & 0x3f;
+			g16 += (srcColor >> 12) & 0x3f;
+			r16 += (srcColor >> 18) & 0x3f;
 
-            src += 3; // move to next pixel
-        }
-        src += (640 - 2) * 3; // move to next line
-    }
+			src += 3; // move to next pixel
+		}
+		src += (640 - 2) * 3; // move to next line
+	}
 
-    r = r16 + (r16 >> 6);
-    g = g16 + (g16 >> 6);
-    b = b16 + (b16 >> 6);
-    a = a16 + (a16 >> 6);
+	r = r16 + (r16 >> 6);
+	g = g16 + (g16 >> 6);
+	b = b16 + (b16 >> 6);
+	a = a16 + (a16 >> 6);
 }
 
 inline void boxfilterRGBA_to_RGB8(u8 *src, u8 &r, u8 &g, u8 &b)
 {
-    u16 r16 = 0, g16 = 0, b16 = 0;
+	u16 r16 = 0, g16 = 0, b16 = 0;
 
-    for (int y = 0; y < 2; y++) {
-        for (int x = 0; x < 2; x++) {
-            u32 srcColor = *(u32*)src;
+	for (int y = 0; y < 2; y++)
+	{
+		for (int x = 0; x < 2; x++)
+		{
+			u32 srcColor = *(u32*)src;
 
-            b16 += (srcColor >> 6) & 0x3f;
-            g16 += (srcColor >> 12) & 0x3f;
-            r16 += (srcColor >> 18) & 0x3f;
+			b16 += (srcColor >> 6) & 0x3f;
+			g16 += (srcColor >> 12) & 0x3f;
+			r16 += (srcColor >> 18) & 0x3f;
 
-            src += 3; // move to next pixel
-        }
-        src += (640 - 2) * 3; // move to next line
-    }
+			src += 3; // move to next pixel
+		}
+		src += (640 - 2) * 3; // move to next line
+	}
 
-    r = r16 + (r16 >> 6);
-    g = g16 + (g16 >> 6);
-    b = b16 + (b16 >> 6);
+	r = r16 + (r16 >> 6);
+	g = g16 + (g16 >> 6);
+	b = b16 + (b16 >> 6);
 }
 
 inline void boxfilterRGBA_to_x8(u8 *src, u8 &x8, int shift)
 {
-    u16 x16 = 0;
+	u16 x16 = 0;
 
-    for (int y = 0; y < 2; y++) {
-        for (int x = 0; x < 2; x++) {
-            u32 srcColor = *(u32*)src;
+	for (int y = 0; y < 2; y++)
+	{
+		for (int x = 0; x < 2; x++)
+		{
+			u32 srcColor = *(u32*)src;
 
-            x16 += (srcColor >> shift) & 0x3f;
+			x16 += (srcColor >> shift) & 0x3f;
 
-            src += 3; // move to next pixel
-        }
-        src += (640 - 2) * 3; // move to next line
-    }
+			src += 3; // move to next pixel
+		}
+		src += (640 - 2) * 3; // move to next line
+	}
 
-    x8 = x16 + (x16 >> 6);
+	x8 = x16 + (x16 >> 6);
 }
 
 inline void boxfilterRGBA_to_xx8(u8 *src, u8 &x1, u8 &x2, int shift1, int shift2)
 {
-    u16 x16_1 = 0;
-    u16 x16_2 = 0;
+	u16 x16_1 = 0;
+	u16 x16_2 = 0;
 
-    for (int y = 0; y < 2; y++) {
-        for (int x = 0; x < 2; x++) {
-            u32 srcColor = *(u32*)src;
+	for (int y = 0; y < 2; y++)
+	{
+		for (int x = 0; x < 2; x++)
+		{
+			u32 srcColor = *(u32*)src;
 
-            x16_1 += (srcColor >> shift1) & 0x3f;
-            x16_2 += (srcColor >> shift2) & 0x3f;
+			x16_1 += (srcColor >> shift1) & 0x3f;
+			x16_2 += (srcColor >> shift2) & 0x3f;
 
-            src += 3; // move to next pixel
-        }
-        src += (640 - 2) * 3; // move to next line
-    }
+			src += 3; // move to next pixel
+		}
+		src += (640 - 2) * 3; // move to next line
+	}
 
 	x1 = x16_1 + (x16_1 >> 6);
 	x2 = x16_2 + (x16_2 >> 6);
@@ -140,1295 +135,1300 @@ inline void boxfilterRGBA_to_xx8(u8 *src, u8 &x1, u8 &x2, int shift1, int shift2
 
 inline void boxfilterRGB_to_RGB8(u8 *src, u8 &r, u8 &g, u8 &b)
 {
-    u16 r16 = 0, g16 = 0, b16 = 0;
+	u16 r16 = 0, g16 = 0, b16 = 0;
 
-    for (int y = 0; y < 2; y++) {
-        for (int x = 0; x < 2; x++) {
+	for (int y = 0; y < 2; y++)
+	{
+		for (int x = 0; x < 2; x++)
+		{
+			b16 += src[0];
+			g16 += src[1];
+			r16 += src[2];
 
-            b16 += src[0];
-            g16 += src[1];
-            r16 += src[2];
+			src += 3; // move to next pixel
+		}
+		src += (640 - 2) * 3; // move to next line
+	}
 
-            src += 3; // move to next pixel
-        }
-        src += (640 - 2) * 3; // move to next line
-    }
-
-    r = r16 >> 2;
-    g = g16 >> 2;
-    b = b16 >> 2;
+	r = r16 >> 2;
+	g = g16 >> 2;
+	b = b16 >> 2;
 }
 
 inline void boxfilterRGB_to_x8(u8 *src, u8 &x8, int comp)
 {
-    u16 x16 = 0;
+	u16 x16 = 0;
 
-    for (int y = 0; y < 2; y++) {
-        for (int x = 0; x < 2; x++) {
+	for (int y = 0; y < 2; y++)
+	{
+		for (int x = 0; x < 2; x++)
+		{
 
-            x16 += src[comp];
+			x16 += src[comp];
 
-           src += 3; // move to next pixel
-        }
-        src += (640 - 2) * 3; // move to next line
-    }
+			src += 3; // move to next pixel
+		}
+		src += (640 - 2) * 3; // move to next line
+	}
 
-    x8 = x16 >> 2;
+	x8 = x16 >> 2;
 }
 
 inline void boxfilterRGB_to_xx8(u8 *src, u8 &x1, u8 &x2, int comp1, int comp2)
 {
-    u16 x16_1 = 0;
-    u16 x16_2 = 0;
+	u16 x16_1 = 0;
+	u16 x16_2 = 0;
 
-    for (int y = 0; y < 2; y++) {
-        for (int x = 0; x < 2; x++) {
+	for (int y = 0; y < 2; y++)
+	{
+		for (int x = 0; x < 2; x++)
+		{
 
-            x16_1 += src[comp1];
-            x16_2 += src[comp2];
+			x16_1 += src[comp1];
+			x16_2 += src[comp2];
 
-            src += 3; // move to next pixel
-        }
-        src += (640 - 2) * 3; // move to next line
-    }
+			src += 3; // move to next pixel
+		}
+		src += (640 - 2) * 3; // move to next line
+	}
 
-    x1 = x16_1 >> 2;
-    x2 = x16_2 >> 2;
+	x1 = x16_1 >> 2;
+	x2 = x16_2 >> 2;
 }
 
 void SetBlockDimensions(int blkWidthLog2, int blkHeightLog2, u16 &sBlkCount, u16 &tBlkCount, u16 &sBlkSize, u16 &tBlkSize)
 {
-    // if half_scale is 1 then the size is cut in half
-    u32 width = bpmem.copyTexSrcWH.x >> bpmem.triggerEFBCopy.half_scale;
-    u32 height = bpmem.copyTexSrcWH.y >> bpmem.triggerEFBCopy.half_scale;
+	// if half_scale is 1 then the size is cut in half
+	u32 width = bpmem.copyTexSrcWH.x >> bpmem.triggerEFBCopy.half_scale;
+	u32 height = bpmem.copyTexSrcWH.y >> bpmem.triggerEFBCopy.half_scale;
 
-    sBlkCount = (width >> blkWidthLog2) + 1;
-    tBlkCount = (height >> blkHeightLog2) + 1;
-    
-    sBlkSize = 1 << blkWidthLog2;
-    tBlkSize = 1 << blkHeightLog2;
+	sBlkCount = (width >> blkWidthLog2) + 1;
+	tBlkCount = (height >> blkHeightLog2) + 1;
+
+	sBlkSize = 1 << blkWidthLog2;
+	tBlkSize = 1 << blkHeightLog2;
 }
 
 void SetSpans(int sBlkSize, int tBlkSize, s32 &tSpan, s32 &sBlkSpan, s32 &tBlkSpan, s32 &writeStride)
 {
-    // width is 1 less than the number of pixels of width
-    u32 width = bpmem.copyTexSrcWH.x >> bpmem.triggerEFBCopy.half_scale;
-    u32 alignedWidth = (width + sBlkSize) & (~(sBlkSize-1));
+	// width is 1 less than the number of pixels of width
+	u32 width = bpmem.copyTexSrcWH.x >> bpmem.triggerEFBCopy.half_scale;
+	u32 alignedWidth = (width + sBlkSize) & (~(sBlkSize-1));
 
-    u32 readStride = 3 << bpmem.triggerEFBCopy.half_scale;
+	u32 readStride = 3 << bpmem.triggerEFBCopy.half_scale;
 
-    tSpan = (640 - sBlkSize) * readStride; // bytes to advance src pointer after each row of texels in a block
-    sBlkSpan = ((-640 * tBlkSize) + sBlkSize) * readStride; // bytes to advance src pointer after each block
-    tBlkSpan = ((640 * tBlkSize) - alignedWidth) * readStride; // bytes to advance src pointer after each row of blocks
+	tSpan = (640 - sBlkSize) * readStride; // bytes to advance src pointer after each row of texels in a block
+	sBlkSpan = ((-640 * tBlkSize) + sBlkSize) * readStride; // bytes to advance src pointer after each block
+	tBlkSpan = ((640 * tBlkSize) - alignedWidth) * readStride; // bytes to advance src pointer after each row of blocks
 
-    writeStride = bpmem.copyMipMapStrideChannels * 32;
+	writeStride = bpmem.copyMipMapStrideChannels * 32;
 }
 
-#define ENCODE_LOOP_BLOCKS                                  \
-        for (int tBlk = 0; tBlk < tBlkCount; tBlk++) {      \
-            dst = dstBlockStart;                            \
-            for (int sBlk = 0; sBlk < sBlkCount; sBlk++) {  \
-                for (int t = 0; t < tBlkSize; t++) {        \
-                    for (int s = 0; s < sBlkSize; s++) {    \
+#define ENCODE_LOOP_BLOCKS									\
+		for (int tBlk = 0; tBlk < tBlkCount; tBlk++) {		\
+			dst = dstBlockStart;							\
+			for (int sBlk = 0; sBlk < sBlkCount; sBlk++) {	\
+				for (int t = 0; t < tBlkSize; t++) {		\
+					for (int s = 0; s < sBlkSize; s++) {	\
 
 
-#define ENCODE_LOOP_SPANS                                   \
-                    }                                       \
-                    src += tSpan;                           \
-                }                                           \
-                src += sBlkSpan;                            \
-            }                                               \
-            src += tBlkSpan;                                \
-            dstBlockStart += writeStride;                   \
-        }                                                   \
+#define ENCODE_LOOP_SPANS									\
+					}										\
+					src += tSpan;							\
+				}											\
+				src += sBlkSpan;							\
+			}												\
+			src += tBlkSpan;								\
+			dstBlockStart += writeStride;					\
+		}													\
 
-#define ENCODE_LOOP_SPANS2                                  \
-                    }                                       \
-                    src += tSpan;                           \
-                }                                           \
-                src += sBlkSpan;                            \
-                dst += 32;                                  \
-            }                                               \
-            src += tBlkSpan;                                \
-            dstBlockStart += writeStride;                   \
-        }                                                   \
+#define ENCODE_LOOP_SPANS2									\
+					}										\
+					src += tSpan;							\
+				}											\
+				src += sBlkSpan;							\
+				dst += 32;									\
+			}												\
+			src += tBlkSpan;								\
+			dstBlockStart += writeStride;					\
+		}													\
 
 void EncodeRGBA6(u8 *dst, u8 *src, u32 format)
 {
-    u16 sBlkCount, tBlkCount, sBlkSize, tBlkSize;
-    s32 tSpan, sBlkSpan, tBlkSpan, writeStride;
-    u8 r, g, b, a;
-    u32 readStride = 3;
-    u8 *dstBlockStart = dst;
+	u16 sBlkCount, tBlkCount, sBlkSize, tBlkSize;
+	s32 tSpan, sBlkSpan, tBlkSpan, writeStride;
+	u8 r, g, b, a;
+	u32 readStride = 3;
+	u8 *dstBlockStart = dst;
 
-    switch(format)
-    {
-    case GX_TF_I4:
-        SetBlockDimensions(3, 3, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-        SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-        sBlkSize /= 2;
-        ENCODE_LOOP_BLOCKS
-        {
-            RGBA_to_RGB8(src, r, g, b);
-            src += readStride;
-            *dst = RGB8_to_I(r, g, b) & 0xf0;
+	switch(format)
+	{
+	case GX_TF_I4:
+		SetBlockDimensions(3, 3, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
+		sBlkSize /= 2;
+		ENCODE_LOOP_BLOCKS
+		{
+			RGBA_to_RGB8(src, r, g, b);
+			src += readStride;
+			*dst = RGB8_to_I(r, g, b) & 0xf0;
 
-            RGBA_to_RGB8(src, r, g, b);
-            src += readStride;
-            *dst |= RGB8_to_I(r, g, b) >> 4;
-            dst++;
-        }
-        ENCODE_LOOP_SPANS
-	    break;
+			RGBA_to_RGB8(src, r, g, b);
+			src += readStride;
+			*dst |= RGB8_to_I(r, g, b) >> 4;
+			dst++;
+		}
+		ENCODE_LOOP_SPANS
+		break;
 
-    case GX_TF_I8:
-        SetBlockDimensions(3, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-        SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-        ENCODE_LOOP_BLOCKS
-        {
-            RGBA_to_RGB8(src, r, g, b);
-            src += readStride;
-            *dst++ = RGB8_to_I(r, g, b);
-        }
-        ENCODE_LOOP_SPANS
-	    break;
+	case GX_TF_I8:
+		SetBlockDimensions(3, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			RGBA_to_RGB8(src, r, g, b);
+			src += readStride;
+			*dst++ = RGB8_to_I(r, g, b);
+		}
+		ENCODE_LOOP_SPANS
+		break;
 
-    case GX_TF_IA4:
-        SetBlockDimensions(3, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-        SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-        ENCODE_LOOP_BLOCKS
-        {
-            RGBA_to_RGBA8(src, r, g, b, a);
-            src += readStride;
-            *dst++ = (a & 0xf0) | (RGB8_to_I(r, g, b) >> 4);
-        }
-        ENCODE_LOOP_SPANS
-	    break;
+	case GX_TF_IA4:
+		SetBlockDimensions(3, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			RGBA_to_RGBA8(src, r, g, b, a);
+			src += readStride;
+			*dst++ = (a & 0xf0) | (RGB8_to_I(r, g, b) >> 4);
+		}
+		ENCODE_LOOP_SPANS
+		break;
 
-    case GX_TF_IA8:
-        SetBlockDimensions(2, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-        SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-        ENCODE_LOOP_BLOCKS
-        {
-            RGBA_to_RGBA8(src, r, g, b, a);
-            src += readStride;
-            *dst++ = a;
-            *dst++ = RGB8_to_I(r, g, b);            
-        }
-        ENCODE_LOOP_SPANS
-	    break;
+	case GX_TF_IA8:
+		SetBlockDimensions(2, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			RGBA_to_RGBA8(src, r, g, b, a);
+			src += readStride;
+			*dst++ = a;
+			*dst++ = RGB8_to_I(r, g, b);
+		}
+		ENCODE_LOOP_SPANS
+		break;
 
-    case GX_TF_RGB565:
-        SetBlockDimensions(2, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-        SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-        ENCODE_LOOP_BLOCKS
-        {
-            u32 srcColor = *(u32*)src;
-            src += readStride;
+	case GX_TF_RGB565:
+		SetBlockDimensions(2, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			u32 srcColor = *(u32*)src;
+			src += readStride;
 
 			u16 val = ((srcColor >> 8) & 0xf800) | ((srcColor >> 7) & 0x07e0) | ((srcColor >> 7) & 0x001e);
 			*(u16*)dst = Common::swap16(val);
-            dst+=2;
-        }
-        ENCODE_LOOP_SPANS
-	    break;
+			dst+=2;
+		}
+		ENCODE_LOOP_SPANS
+		break;
 
-    case GX_TF_RGB5A3:
-        SetBlockDimensions(2, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-        SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-        ENCODE_LOOP_BLOCKS
-        {
-            u32 srcColor = *(u32*)src;
-            src += readStride;
+	case GX_TF_RGB5A3:
+		SetBlockDimensions(2, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			u32 srcColor = *(u32*)src;
+			src += readStride;
 
-            u16 alpha = (srcColor << 9) & 0x7000;
-            u16 val;
-            if (alpha == 0x7000) // 555
+			u16 alpha = (srcColor << 9) & 0x7000;
+			u16 val;
+			if (alpha == 0x7000) // 555
 				val = 0x8000 | ((srcColor >> 9) & 0x7c00) | ((srcColor >> 8) & 0x03e0) | ((srcColor >> 7) & 0x001e);
-            else // 4443
-                val = alpha | ((srcColor >> 12) & 0x0f00) | ((srcColor >> 10) & 0x00f0) | ((srcColor >> 8) & 0x000f);
+			else // 4443
+				val = alpha | ((srcColor >> 12) & 0x0f00) | ((srcColor >> 10) & 0x00f0) | ((srcColor >> 8) & 0x000f);
 
-            *(u16*)dst = Common::swap16(val);   
-            dst+=2;
-        }
-        ENCODE_LOOP_SPANS
-	    break;
+			*(u16*)dst = Common::swap16(val);
+			dst+=2;
+		}
+		ENCODE_LOOP_SPANS
+		break;
 
-    case GX_TF_RGBA8:
-        SetBlockDimensions(2, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-        SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-        ENCODE_LOOP_BLOCKS
-        {
-            RGBA_to_RGBA8(src, dst[1], dst[32], dst[33], dst[0]); 
-            src += readStride;
-            dst += 2;
-        }
-        ENCODE_LOOP_SPANS2
-	    break;
+	case GX_TF_RGBA8:
+		SetBlockDimensions(2, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			RGBA_to_RGBA8(src, dst[1], dst[32], dst[33], dst[0]); 
+			src += readStride;
+			dst += 2;
+		}
+		ENCODE_LOOP_SPANS2
+		break;
 
-    case GX_CTF_R4:
-        SetBlockDimensions(3, 3, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-        SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-        sBlkSize /= 2;
-        ENCODE_LOOP_BLOCKS
-        {
-            u32 srcColor = *(u32*)src;
-            src += readStride;
-            *dst = (srcColor >> 16) & 0xf0;
+	case GX_CTF_R4:
+		SetBlockDimensions(3, 3, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
+		sBlkSize /= 2;
+		ENCODE_LOOP_BLOCKS
+		{
+			u32 srcColor = *(u32*)src;
+			src += readStride;
+			*dst = (srcColor >> 16) & 0xf0;
 
-            srcColor = *(u32*)src;
-            src += readStride;
-            *dst |= (srcColor >> 20) & 0x0f;
-            dst++;
-        }
-        ENCODE_LOOP_SPANS
-	    break;
+			srcColor = *(u32*)src;
+			src += readStride;
+			*dst |= (srcColor >> 20) & 0x0f;
+			dst++;
+		}
+		ENCODE_LOOP_SPANS
+		break;
 
-    case GX_CTF_RA4:
-        SetBlockDimensions(3, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-        SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-        ENCODE_LOOP_BLOCKS
-        {
-            u32 srcColor = *(u32*)src;
-            src += readStride;
-            *dst++ = ((srcColor << 2) & 0xf0) | ((srcColor >> 20) & 0x0f);
-        }
-        ENCODE_LOOP_SPANS
-	    break;
+	case GX_CTF_RA4:
+		SetBlockDimensions(3, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			u32 srcColor = *(u32*)src;
+			src += readStride;
+			*dst++ = ((srcColor << 2) & 0xf0) | ((srcColor >> 20) & 0x0f);
+		}
+		ENCODE_LOOP_SPANS
+		break;
 
-    case GX_CTF_RA8:
-        SetBlockDimensions(2, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-        SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-        ENCODE_LOOP_BLOCKS
-        {
-            u32 srcColor = *(u32*)src;
-            src += readStride;
-            *dst++ = Convert6To8(srcColor & 0x3f);
-            *dst++ = Convert6To8((srcColor >> 18) & 0x3f);
-        }
-        ENCODE_LOOP_SPANS
-	    break;
+	case GX_CTF_RA8:
+		SetBlockDimensions(2, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			u32 srcColor = *(u32*)src;
+			src += readStride;
+			*dst++ = Convert6To8(srcColor & 0x3f);
+			*dst++ = Convert6To8((srcColor >> 18) & 0x3f);
+		}
+		ENCODE_LOOP_SPANS
+		break;
 
-    case GX_CTF_A8:
-        SetBlockDimensions(3, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-        SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-        ENCODE_LOOP_BLOCKS
-        {
-            u32 srcColor = *(u32*)src;
-            *dst++ = Convert6To8(srcColor & 0x3f);
-            src += readStride;
-        }
-        ENCODE_LOOP_SPANS
-	    break;
+	case GX_CTF_A8:
+		SetBlockDimensions(3, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			u32 srcColor = *(u32*)src;
+			*dst++ = Convert6To8(srcColor & 0x3f);
+			src += readStride;
+		}
+		ENCODE_LOOP_SPANS
+		break;
 
-    case GX_CTF_R8:
-        SetBlockDimensions(3, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-        SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-        ENCODE_LOOP_BLOCKS
-        {
-            u32 srcColor = *(u32*)src;
-            *dst++ = Convert6To8((srcColor >> 18) & 0x3f);
-            src += readStride;
-        }
-        ENCODE_LOOP_SPANS
-	    break;
+	case GX_CTF_R8:
+		SetBlockDimensions(3, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			u32 srcColor = *(u32*)src;
+			*dst++ = Convert6To8((srcColor >> 18) & 0x3f);
+			src += readStride;
+		}
+		ENCODE_LOOP_SPANS
+		break;
 
-    case GX_CTF_G8:
-        SetBlockDimensions(3, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-        SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-        ENCODE_LOOP_BLOCKS
-        {
-            u32 srcColor = *(u32*)src;
-            *dst++ = Convert6To8((srcColor >> 12) & 0x3f);
-            src += readStride;
-        }
-        ENCODE_LOOP_SPANS
-	    break;
+	case GX_CTF_G8:
+		SetBlockDimensions(3, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			u32 srcColor = *(u32*)src;
+			*dst++ = Convert6To8((srcColor >> 12) & 0x3f);
+			src += readStride;
+		}
+		ENCODE_LOOP_SPANS
+		break;
 
-    case GX_CTF_B8:
-        SetBlockDimensions(3, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-        SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-        ENCODE_LOOP_BLOCKS
-        {
-            u32 srcColor = *(u32*)src;
-            *dst++ = Convert6To8((srcColor >> 6) & 0x3f);
-            src += readStride;
-        }
-        ENCODE_LOOP_SPANS
-	    break;
+	case GX_CTF_B8:
+		SetBlockDimensions(3, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			u32 srcColor = *(u32*)src;
+			*dst++ = Convert6To8((srcColor >> 6) & 0x3f);
+			src += readStride;
+		}
+		ENCODE_LOOP_SPANS
+		break;
 
-    case GX_CTF_RG8:
-        SetBlockDimensions(2, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-        SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-        ENCODE_LOOP_BLOCKS
-        {
-            u32 srcColor = *(u32*)src;
-            src += readStride;
-            *dst++ = Convert6To8((srcColor >> 12) & 0x3f);
-            *dst++ = Convert6To8((srcColor >> 18) & 0x3f);
-        }
-        ENCODE_LOOP_SPANS
-	    break;
+	case GX_CTF_RG8:
+		SetBlockDimensions(2, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			u32 srcColor = *(u32*)src;
+			src += readStride;
+			*dst++ = Convert6To8((srcColor >> 12) & 0x3f);
+			*dst++ = Convert6To8((srcColor >> 18) & 0x3f);
+		}
+		ENCODE_LOOP_SPANS
+		break;
 
-    case GX_CTF_GB8:
-	    SetBlockDimensions(2, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-        SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-        ENCODE_LOOP_BLOCKS
-        {
-            u32 srcColor = *(u32*)src;
-            src += readStride;
-            *dst++ = Convert6To8((srcColor >> 6) & 0x3f);
-            *dst++ = Convert6To8((srcColor >> 12) & 0x3f);                     
-        }
-        ENCODE_LOOP_SPANS
-        break;
+	case GX_CTF_GB8:
+		SetBlockDimensions(2, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			u32 srcColor = *(u32*)src;
+			src += readStride;
+			*dst++ = Convert6To8((srcColor >> 6) & 0x3f);
+			*dst++ = Convert6To8((srcColor >> 12) & 0x3f);
+		}
+		ENCODE_LOOP_SPANS
+		break;
 
-    default:
-	    PanicAlert("Unknown texture copy format: 0x%x\n", format);
-	    break;		
-    }
+	default:
+		PanicAlert("Unknown texture copy format: 0x%x\n", format);
+		break;
+	}
 }
 
 
 void EncodeRGBA6halfscale(u8 *dst, u8 *src, u32 format)
 {
-    u16 sBlkCount, tBlkCount, sBlkSize, tBlkSize;
-    s32 tSpan, sBlkSpan, tBlkSpan, writeStride;
-    u8 r, g, b, a;
-    u32 readStride = 6;
-    u8 *dstBlockStart = dst;
+	u16 sBlkCount, tBlkCount, sBlkSize, tBlkSize;
+	s32 tSpan, sBlkSpan, tBlkSpan, writeStride;
+	u8 r, g, b, a;
+	u32 readStride = 6;
+	u8 *dstBlockStart = dst;
 
-    switch(format)
-    {
-    case GX_TF_I4:
-        SetBlockDimensions(3, 3, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-        SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-        sBlkSize /= 2;
-        ENCODE_LOOP_BLOCKS
-        {
-            boxfilterRGBA_to_RGB8(src, r, g, b);
-            src += readStride;
-            *dst = RGB8_to_I(r, g, b) & 0xf0;
+	switch(format)
+	{
+	case GX_TF_I4:
+		SetBlockDimensions(3, 3, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
+		sBlkSize /= 2;
+		ENCODE_LOOP_BLOCKS
+		{
+			boxfilterRGBA_to_RGB8(src, r, g, b);
+			src += readStride;
+			*dst = RGB8_to_I(r, g, b) & 0xf0;
 
-            boxfilterRGBA_to_RGB8(src, r, g, b);
-            src += readStride;
-            *dst |= RGB8_to_I(r, g, b) >> 4;
-            dst++;
-        }
-        ENCODE_LOOP_SPANS
-	    break;
+			boxfilterRGBA_to_RGB8(src, r, g, b);
+			src += readStride;
+			*dst |= RGB8_to_I(r, g, b) >> 4;
+			dst++;
+		}
+		ENCODE_LOOP_SPANS
+		break;
 
-    case GX_TF_I8:
-        SetBlockDimensions(3, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-        SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-        ENCODE_LOOP_BLOCKS
-        {
-            boxfilterRGBA_to_RGB8(src, r, g, b);
-            src += readStride;
-            *dst++ = RGB8_to_I(r, g, b);
-        }
-        ENCODE_LOOP_SPANS
-	    break;
+	case GX_TF_I8:
+		SetBlockDimensions(3, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			boxfilterRGBA_to_RGB8(src, r, g, b);
+			src += readStride;
+			*dst++ = RGB8_to_I(r, g, b);
+		}
+		ENCODE_LOOP_SPANS
+		break;
 
-    case GX_TF_IA4:
-        SetBlockDimensions(3, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-        SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-        ENCODE_LOOP_BLOCKS
-        {
-            boxfilterRGBA_to_RGBA8(src, r, g, b, a);
-            src += readStride;
-            *dst++ = (a & 0xf0) | (RGB8_to_I(r, g, b) >> 4);
-        }
-        ENCODE_LOOP_SPANS
-	    break;
+	case GX_TF_IA4:
+		SetBlockDimensions(3, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			boxfilterRGBA_to_RGBA8(src, r, g, b, a);
+			src += readStride;
+			*dst++ = (a & 0xf0) | (RGB8_to_I(r, g, b) >> 4);
+		}
+		ENCODE_LOOP_SPANS
+		break;
 
-    case GX_TF_IA8:
-        SetBlockDimensions(2, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-        SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-        ENCODE_LOOP_BLOCKS
-        {
-            boxfilterRGBA_to_RGBA8(src, r, g, b, a);
-            src += readStride;
-            *dst++ = a;
-            *dst++ = RGB8_to_I(r, g, b);            
-        }
-        ENCODE_LOOP_SPANS
-	    break;
+	case GX_TF_IA8:
+		SetBlockDimensions(2, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			boxfilterRGBA_to_RGBA8(src, r, g, b, a);
+			src += readStride;
+			*dst++ = a;
+			*dst++ = RGB8_to_I(r, g, b);
+		}
+		ENCODE_LOOP_SPANS
+		break;
 
-    case GX_TF_RGB565:
-        SetBlockDimensions(2, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-        SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-        ENCODE_LOOP_BLOCKS
-        {
-            boxfilterRGBA_to_RGB8(src, r, g, b);
-            src += readStride;
+	case GX_TF_RGB565:
+		SetBlockDimensions(2, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			boxfilterRGBA_to_RGB8(src, r, g, b);
+			src += readStride;
 
-            u16 val = ((r << 8) & 0xf800) | ((g << 3) & 0x07e0) | ((b >> 3) & 0x001e); 
-            *(u16*)dst = Common::swap16(val);   
-            dst+=2;
-        }
-        ENCODE_LOOP_SPANS
-	    break;
+			u16 val = ((r << 8) & 0xf800) | ((g << 3) & 0x07e0) | ((b >> 3) & 0x001e); 
+			*(u16*)dst = Common::swap16(val);
+			dst+=2;
+		}
+		ENCODE_LOOP_SPANS
+		break;
 
-    case GX_TF_RGB5A3:
-        SetBlockDimensions(2, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-        SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-        ENCODE_LOOP_BLOCKS
-        {
-            boxfilterRGBA_to_RGBA8(src, r, g, b, a);
-            src += readStride;
+	case GX_TF_RGB5A3:
+		SetBlockDimensions(2, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			boxfilterRGBA_to_RGBA8(src, r, g, b, a);
+			src += readStride;
 
-            u16 val;
-            if (a >= 224) // 5551
-                val = 0x8000 | ((r << 7) & 0x7c00) | ((g << 2) & 0x03e0) | ((b >> 3) & 0x001e);
-            else // 4443
-                val = ((a << 7) & 0x7000) | ((r << 4) & 0x0f00) | (g & 0x00f0) | ((b >> 4) & 0x000f);
+			u16 val;
+			if (a >= 224) // 5551
+				val = 0x8000 | ((r << 7) & 0x7c00) | ((g << 2) & 0x03e0) | ((b >> 3) & 0x001e);
+			else // 4443
+				val = ((a << 7) & 0x7000) | ((r << 4) & 0x0f00) | (g & 0x00f0) | ((b >> 4) & 0x000f);
 
-            *(u16*)dst = Common::swap16(val);   
-            dst+=2;
-        }
-        ENCODE_LOOP_SPANS
-	    break;
+			*(u16*)dst = Common::swap16(val);
+			dst+=2;
+		}
+		ENCODE_LOOP_SPANS
+		break;
 
-    case GX_TF_RGBA8:
-        SetBlockDimensions(2, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-        SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-        ENCODE_LOOP_BLOCKS
-        {
-            boxfilterRGBA_to_RGBA8(src, dst[1], dst[32], dst[33], dst[0]); 
-            src += readStride;
-            dst += 2;
-        }
-        ENCODE_LOOP_SPANS2
-	    break;
+	case GX_TF_RGBA8:
+		SetBlockDimensions(2, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			boxfilterRGBA_to_RGBA8(src, dst[1], dst[32], dst[33], dst[0]); 
+			src += readStride;
+			dst += 2;
+		}
+		ENCODE_LOOP_SPANS2
+		break;
 
-    case GX_CTF_R4:
-        SetBlockDimensions(3, 3, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-        SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-        sBlkSize /= 2;
-        ENCODE_LOOP_BLOCKS
-        {
-            boxfilterRGBA_to_x8(src, r, 18);
-            src += readStride;
-            *dst = r & 0xf0;
+	case GX_CTF_R4:
+		SetBlockDimensions(3, 3, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
+		sBlkSize /= 2;
+		ENCODE_LOOP_BLOCKS
+		{
+			boxfilterRGBA_to_x8(src, r, 18);
+			src += readStride;
+			*dst = r & 0xf0;
 
-            boxfilterRGBA_to_x8(src, r, 18);
-            src += readStride;
-            *dst |= r >> 4;
-            dst++;
-        }
-        ENCODE_LOOP_SPANS
-	    break;
+			boxfilterRGBA_to_x8(src, r, 18);
+			src += readStride;
+			*dst |= r >> 4;
+			dst++;
+		}
+		ENCODE_LOOP_SPANS
+		break;
 
-    case GX_CTF_RA4:
-        SetBlockDimensions(3, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-        SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-        ENCODE_LOOP_BLOCKS
-        {
-            boxfilterRGBA_to_xx8(src, r, a, 18, 0);
-            src += readStride;
-            *dst++ = (a & 0xf0) | (r >> 4);
-        }
-        ENCODE_LOOP_SPANS
-	    break;
+	case GX_CTF_RA4:
+		SetBlockDimensions(3, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			boxfilterRGBA_to_xx8(src, r, a, 18, 0);
+			src += readStride;
+			*dst++ = (a & 0xf0) | (r >> 4);
+		}
+		ENCODE_LOOP_SPANS
+		break;
 
-    case GX_CTF_RA8:
-        SetBlockDimensions(2, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-        SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-        ENCODE_LOOP_BLOCKS
-        {
-            boxfilterRGBA_to_xx8(src, r, a, 18, 0);
-            src += readStride;
-            *dst++ = a;
-            *dst++ = r;
-        }
-        ENCODE_LOOP_SPANS
-	    break;
+	case GX_CTF_RA8:
+		SetBlockDimensions(2, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			boxfilterRGBA_to_xx8(src, r, a, 18, 0);
+			src += readStride;
+			*dst++ = a;
+			*dst++ = r;
+		}
+		ENCODE_LOOP_SPANS
+		break;
 
-    case GX_CTF_A8:
-        SetBlockDimensions(3, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-        SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-        ENCODE_LOOP_BLOCKS
-        {
-            boxfilterRGBA_to_x8(src, a, 0);
-            *dst++ = a;
-            src += readStride;
-        }
-        ENCODE_LOOP_SPANS
-	    break;
+	case GX_CTF_A8:
+		SetBlockDimensions(3, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			boxfilterRGBA_to_x8(src, a, 0);
+			*dst++ = a;
+			src += readStride;
+		}
+		ENCODE_LOOP_SPANS
+		break;
 
-    case GX_CTF_R8:
-        SetBlockDimensions(3, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-        SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-        ENCODE_LOOP_BLOCKS
-        {
-            boxfilterRGBA_to_x8(src, r, 18);
-            *dst++ = r;
-            src += readStride;
-        }
-        ENCODE_LOOP_SPANS
-	    break;
+	case GX_CTF_R8:
+		SetBlockDimensions(3, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			boxfilterRGBA_to_x8(src, r, 18);
+			*dst++ = r;
+			src += readStride;
+		}
+		ENCODE_LOOP_SPANS
+		break;
 
-    case GX_CTF_G8:
-        SetBlockDimensions(3, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-        SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-        ENCODE_LOOP_BLOCKS
-        {
-            boxfilterRGBA_to_x8(src, g, 12);
-            *dst++ = g;
-            src += readStride;
-        }
-        ENCODE_LOOP_SPANS
-	    break;
+	case GX_CTF_G8:
+		SetBlockDimensions(3, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			boxfilterRGBA_to_x8(src, g, 12);
+			*dst++ = g;
+			src += readStride;
+		}
+		ENCODE_LOOP_SPANS
+		break;
 
-    case GX_CTF_B8:
-        SetBlockDimensions(3, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-        SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-        ENCODE_LOOP_BLOCKS
-        {
-            boxfilterRGBA_to_x8(src, b, 6);
-            *dst++ = b;
-            src += readStride;
-        }
-        ENCODE_LOOP_SPANS
-	    break;
+	case GX_CTF_B8:
+		SetBlockDimensions(3, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			boxfilterRGBA_to_x8(src, b, 6);
+			*dst++ = b;
+			src += readStride;
+		}
+		ENCODE_LOOP_SPANS
+		break;
 
-    case GX_CTF_RG8:
-        SetBlockDimensions(2, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-        SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-        ENCODE_LOOP_BLOCKS
-        {
-            boxfilterRGBA_to_xx8(src, r, g, 18, 12);
-            src += readStride;
-            *dst++ = g;
-            *dst++ = r;
-        }
-        ENCODE_LOOP_SPANS
-	    break;
+	case GX_CTF_RG8:
+		SetBlockDimensions(2, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			boxfilterRGBA_to_xx8(src, r, g, 18, 12);
+			src += readStride;
+			*dst++ = g;
+			*dst++ = r;
+		}
+		ENCODE_LOOP_SPANS
+		break;
 
-    case GX_CTF_GB8:
-	    SetBlockDimensions(2, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-        SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-        ENCODE_LOOP_BLOCKS
-        {
-            boxfilterRGBA_to_xx8(src, g, b, 12, 6);
-            src += readStride;
-            *dst++ = b;
-            *dst++ = g;
-        }
-        ENCODE_LOOP_SPANS
-        break;
+	case GX_CTF_GB8:
+		SetBlockDimensions(2, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			boxfilterRGBA_to_xx8(src, g, b, 12, 6);
+			src += readStride;
+			*dst++ = b;
+			*dst++ = g;
+		}
+		ENCODE_LOOP_SPANS
+		break;
 
-    default:
-	    PanicAlert("Unknown texture copy format: 0x%x\n", format);
-	    break;		
-    }
+	default:
+		PanicAlert("Unknown texture copy format: 0x%x\n", format);
+		break;		
+	}
 }
 
 void EncodeRGB8(u8 *dst, u8 *src, u32 format)
 {
-    u16 sBlkCount, tBlkCount, sBlkSize, tBlkSize;
-    s32 tSpan, sBlkSpan, tBlkSpan, writeStride;
-    u32 readStride = 3;
-    u8 *dstBlockStart = dst;
+	u16 sBlkCount, tBlkCount, sBlkSize, tBlkSize;
+	s32 tSpan, sBlkSpan, tBlkSpan, writeStride;
+	u32 readStride = 3;
+	u8 *dstBlockStart = dst;
 
-    switch(format)
-    {
-    case GX_TF_I4:
-        SetBlockDimensions(3, 3, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-        SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-        sBlkSize /= 2;
-        ENCODE_LOOP_BLOCKS
-        {
-            *dst = RGB8_to_I(src[2], src[1], src[0]) & 0xf0;
-            src += readStride;
+	switch(format)
+	{
+	case GX_TF_I4:
+		SetBlockDimensions(3, 3, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
+		sBlkSize /= 2;
+		ENCODE_LOOP_BLOCKS
+		{
+			*dst = RGB8_to_I(src[2], src[1], src[0]) & 0xf0;
+			src += readStride;
 
-            *dst |= RGB8_to_I(src[2], src[1], src[0]) >> 4;
-            src += readStride;
-            dst++;
-        }
-        ENCODE_LOOP_SPANS
-	    break;
+			*dst |= RGB8_to_I(src[2], src[1], src[0]) >> 4;
+			src += readStride;
+			dst++;
+		}
+		ENCODE_LOOP_SPANS
+		break;
 
-    case GX_TF_I8:
-        SetBlockDimensions(3, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-        SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-        ENCODE_LOOP_BLOCKS
-        {
-            *dst++ = RGB8_to_I(src[2], src[1], src[0]);
-            src += readStride;
-        }
-        ENCODE_LOOP_SPANS
-	    break;
+	case GX_TF_I8:
+		SetBlockDimensions(3, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			*dst++ = RGB8_to_I(src[2], src[1], src[0]);
+			src += readStride;
+		}
+		ENCODE_LOOP_SPANS
+		break;
 
-    case GX_TF_IA4:
-        SetBlockDimensions(3, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-        SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-        ENCODE_LOOP_BLOCKS
-        {
-            *dst++ = 0xf0 | (RGB8_to_I(src[2], src[1], src[0]) >> 4);
-            src += readStride;
-        }
-        ENCODE_LOOP_SPANS
-	    break;
+	case GX_TF_IA4:
+		SetBlockDimensions(3, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			*dst++ = 0xf0 | (RGB8_to_I(src[2], src[1], src[0]) >> 4);
+			src += readStride;
+		}
+		ENCODE_LOOP_SPANS
+		break;
 
-    case GX_TF_IA8:
-        SetBlockDimensions(2, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-        SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-        ENCODE_LOOP_BLOCKS
-        {
-            *dst++ = 0xff;
-            *dst++ = RGB8_to_I(src[2], src[1], src[0]);
-            
-            src += readStride;
-        }
-        ENCODE_LOOP_SPANS
-	    break;
+	case GX_TF_IA8:
+		SetBlockDimensions(2, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			*dst++ = 0xff;
+			*dst++ = RGB8_to_I(src[2], src[1], src[0]);
 
-    case GX_TF_RGB565:
-        SetBlockDimensions(2, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-        SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-        ENCODE_LOOP_BLOCKS
-        {
-            u16 val = ((src[2] << 8) & 0xf800) | ((src[1] << 3) & 0x07e0) | ((src[0] >> 3) & 0x001e); 
-            *(u16*)dst = Common::swap16(val);
-            src += readStride;
-            dst+=2;
-        }
-        ENCODE_LOOP_SPANS
-	    break;
+			src += readStride;
+		}
+		ENCODE_LOOP_SPANS
+		break;
 
-    case GX_TF_RGB5A3:
-        SetBlockDimensions(2, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-        SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-        ENCODE_LOOP_BLOCKS
-        {
-            u16 val = 0x8000 | ((src[2] << 7) & 0x7c00) | ((src[1] << 2) & 0x03e0) | ((src[0] >> 3) & 0x001e);
-            *(u16*)dst = Common::swap16(val);
-            src += readStride;
-            dst+=2;
-        }
-        ENCODE_LOOP_SPANS
-	    break;
+	case GX_TF_RGB565:
+		SetBlockDimensions(2, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			u16 val = ((src[2] << 8) & 0xf800) | ((src[1] << 3) & 0x07e0) | ((src[0] >> 3) & 0x001e); 
+			*(u16*)dst = Common::swap16(val);
+			src += readStride;
+			dst+=2;
+		}
+		ENCODE_LOOP_SPANS
+		break;
 
-    case GX_TF_RGBA8:
-        SetBlockDimensions(2, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-        SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-        ENCODE_LOOP_BLOCKS
-        {
-            dst[0] = 0xff;
-            dst[1] = src[2];
-            dst[32] = src[1];
-            dst[33] = src[0];
-            src += readStride;
-            dst += 2;
-        }
-        ENCODE_LOOP_SPANS2
-	    break;
+	case GX_TF_RGB5A3:
+		SetBlockDimensions(2, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			u16 val = 0x8000 | ((src[2] << 7) & 0x7c00) | ((src[1] << 2) & 0x03e0) | ((src[0] >> 3) & 0x001e);
+			*(u16*)dst = Common::swap16(val);
+			src += readStride;
+			dst+=2;
+		}
+		ENCODE_LOOP_SPANS
+		break;
 
-    case GX_CTF_R4:
-        SetBlockDimensions(3, 3, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-        SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-        sBlkSize /= 2;
-        ENCODE_LOOP_BLOCKS
-        {
-            *dst = src[2] & 0xf0;
-            src += readStride;            
+	case GX_TF_RGBA8:
+		SetBlockDimensions(2, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			dst[0] = 0xff;
+			dst[1] = src[2];
+			dst[32] = src[1];
+			dst[33] = src[0];
+			src += readStride;
+			dst += 2;
+		}
+		ENCODE_LOOP_SPANS2
+		break;
 
-            *dst |= src[2] >> 4;
-            src += readStride;
-            
-            dst++;
-        }
-        ENCODE_LOOP_SPANS
-	    break;
+	case GX_CTF_R4:
+		SetBlockDimensions(3, 3, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
+		sBlkSize /= 2;
+		ENCODE_LOOP_BLOCKS
+		{
+			*dst = src[2] & 0xf0;
+			src += readStride;
 
-    case GX_CTF_RA4:
-        SetBlockDimensions(3, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-        SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-        ENCODE_LOOP_BLOCKS
-        {
-            *dst++ = 0xf0 | (src[2] >> 4);
-            src += readStride;
-        }
-        ENCODE_LOOP_SPANS
-	    break;
+			*dst |= src[2] >> 4;
+			src += readStride;
 
-    case GX_CTF_RA8:
-        SetBlockDimensions(2, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-        SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-        ENCODE_LOOP_BLOCKS
-        {
-            *dst++ = 0xff;
-            *dst++ = src[2];            
-            src += readStride;
-        }
-        ENCODE_LOOP_SPANS
-	    break;
+			dst++;
+		}
+		ENCODE_LOOP_SPANS
+		break;
 
-    case GX_CTF_A8:
-        SetBlockDimensions(3, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-        SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-        ENCODE_LOOP_BLOCKS
-        {
-            *dst++ = 0xff;
-        }
-        ENCODE_LOOP_SPANS
-	    break;
+	case GX_CTF_RA4:
+		SetBlockDimensions(3, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			*dst++ = 0xf0 | (src[2] >> 4);
+			src += readStride;
+		}
+		ENCODE_LOOP_SPANS
+		break;
 
-    case GX_CTF_R8:
-        SetBlockDimensions(3, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-        SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-        ENCODE_LOOP_BLOCKS
-        {
-            *dst++ = src[2];
-            src += readStride;
-        }
-        ENCODE_LOOP_SPANS
-	    break;
+	case GX_CTF_RA8:
+		SetBlockDimensions(2, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			*dst++ = 0xff;
+			*dst++ = src[2];
+			src += readStride;
+		}
+		ENCODE_LOOP_SPANS
+		break;
 
-    case GX_CTF_G8:
-        SetBlockDimensions(3, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-        SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-        ENCODE_LOOP_BLOCKS
-        {
-            *dst++ = src[1];
-            src += readStride;
-        }
-        ENCODE_LOOP_SPANS
-	    break;
+	case GX_CTF_A8:
+		SetBlockDimensions(3, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			*dst++ = 0xff;
+		}
+		ENCODE_LOOP_SPANS
+		break;
 
-    case GX_CTF_B8:
-        SetBlockDimensions(3, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-        SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-        ENCODE_LOOP_BLOCKS
-        {
-            *dst++ = src[0];
-            src += readStride;
-        }
-        ENCODE_LOOP_SPANS
-	    break;
+	case GX_CTF_R8:
+		SetBlockDimensions(3, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			*dst++ = src[2];
+			src += readStride;
+		}
+		ENCODE_LOOP_SPANS
+		break;
 
-    case GX_CTF_RG8:
-        SetBlockDimensions(2, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-        SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-        ENCODE_LOOP_BLOCKS
-        {
-            *dst++ = src[1];
-            *dst++ = src[2];
-            src += readStride;
-        }
-        ENCODE_LOOP_SPANS
-	    break;
+	case GX_CTF_G8:
+		SetBlockDimensions(3, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			*dst++ = src[1];
+			src += readStride;
+		}
+		ENCODE_LOOP_SPANS
+		break;
 
-    case GX_CTF_GB8:
-	    SetBlockDimensions(2, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-        SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-        ENCODE_LOOP_BLOCKS
-        {
-            *dst++ = src[0];
-            *dst++ = src[1];
-            src += readStride;        
-        }
-        ENCODE_LOOP_SPANS
-        break;
+	case GX_CTF_B8:
+		SetBlockDimensions(3, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			*dst++ = src[0];
+			src += readStride;
+		}
+		ENCODE_LOOP_SPANS
+		break;
 
-    default:
-	    PanicAlert("Unknown texture copy format: 0x%x\n", format);
-	    break;		
-    }
+	case GX_CTF_RG8:
+		SetBlockDimensions(2, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			*dst++ = src[1];
+			*dst++ = src[2];
+			src += readStride;
+		}
+		ENCODE_LOOP_SPANS
+		break;
+
+	case GX_CTF_GB8:
+		SetBlockDimensions(2, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			*dst++ = src[0];
+			*dst++ = src[1];
+			src += readStride;
+		}
+		ENCODE_LOOP_SPANS
+		break;
+
+	default:
+		PanicAlert("Unknown texture copy format: 0x%x\n", format);
+		break;		
+	}
 }
 
 void EncodeRGB8halfscale(u8 *dst, u8 *src, u32 format)
 {
-    u16 sBlkCount, tBlkCount, sBlkSize, tBlkSize;
-    s32 tSpan, sBlkSpan, tBlkSpan, writeStride;
-    u8 r, g, b;
-    u32 readStride = 6;
-    u8 *dstBlockStart = dst;
+	u16 sBlkCount, tBlkCount, sBlkSize, tBlkSize;
+	s32 tSpan, sBlkSpan, tBlkSpan, writeStride;
+	u8 r, g, b;
+	u32 readStride = 6;
+	u8 *dstBlockStart = dst;
 
-    switch(format)
-    {
-    case GX_TF_I4:
-        SetBlockDimensions(3, 3, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-        SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-        sBlkSize /= 2;
-        ENCODE_LOOP_BLOCKS
-        {
-            boxfilterRGB_to_RGB8(src, r, g, b);
-            *dst = RGB8_to_I(r, g, b) & 0xf0;
-            src += readStride;
+	switch(format)
+	{
+	case GX_TF_I4:
+		SetBlockDimensions(3, 3, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
+		sBlkSize /= 2;
+		ENCODE_LOOP_BLOCKS
+		{
+			boxfilterRGB_to_RGB8(src, r, g, b);
+			*dst = RGB8_to_I(r, g, b) & 0xf0;
+			src += readStride;
 
-            boxfilterRGB_to_RGB8(src, r, g, b);
-            *dst |= RGB8_to_I(r, g, b) >> 4;
-            src += readStride;
-            dst++;
-        }
-        ENCODE_LOOP_SPANS
-	    break;
+			boxfilterRGB_to_RGB8(src, r, g, b);
+			*dst |= RGB8_to_I(r, g, b) >> 4;
+			src += readStride;
+			dst++;
+		}
+		ENCODE_LOOP_SPANS
+		break;
 
-    case GX_TF_I8:
-        SetBlockDimensions(3, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-        SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-        ENCODE_LOOP_BLOCKS
-        {
-            boxfilterRGB_to_RGB8(src, r, g, b);
-            *dst++ = RGB8_to_I(r, g, b);
-            src += readStride;
-        }
-        ENCODE_LOOP_SPANS
-	    break;
+	case GX_TF_I8:
+		SetBlockDimensions(3, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			boxfilterRGB_to_RGB8(src, r, g, b);
+			*dst++ = RGB8_to_I(r, g, b);
+			src += readStride;
+		}
+		ENCODE_LOOP_SPANS
+		break;
 
-    case GX_TF_IA4:
-        SetBlockDimensions(3, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-        SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-        ENCODE_LOOP_BLOCKS
-        {
-            boxfilterRGB_to_RGB8(src, r, g, b);
-            *dst++ = 0xf0 | (RGB8_to_I(r, g, b) >> 4);
-            src += readStride;
-        }
-        ENCODE_LOOP_SPANS
-	    break;
+	case GX_TF_IA4:
+		SetBlockDimensions(3, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			boxfilterRGB_to_RGB8(src, r, g, b);
+			*dst++ = 0xf0 | (RGB8_to_I(r, g, b) >> 4);
+			src += readStride;
+		}
+		ENCODE_LOOP_SPANS
+		break;
 
-    case GX_TF_IA8:
-        SetBlockDimensions(2, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-        SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-        ENCODE_LOOP_BLOCKS
-        {
-            boxfilterRGB_to_RGB8(src, r, g, b);
-            *dst++ = 0xff;
-            *dst++ = RGB8_to_I(r, g, b);
-            src += readStride;
-        }
-        ENCODE_LOOP_SPANS
-	    break;
+	case GX_TF_IA8:
+		SetBlockDimensions(2, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			boxfilterRGB_to_RGB8(src, r, g, b);
+			*dst++ = 0xff;
+			*dst++ = RGB8_to_I(r, g, b);
+			src += readStride;
+		}
+		ENCODE_LOOP_SPANS
+		break;
 
-    case GX_TF_RGB565:
-        SetBlockDimensions(2, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-        SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-        ENCODE_LOOP_BLOCKS
-        {
-            boxfilterRGB_to_RGB8(src, r, g, b);
-            u16 val = ((r << 8) & 0xf800) | ((g << 3) & 0x07e0) | ((b >> 3) & 0x001e); 
-            *(u16*)dst = Common::swap16(val);
-            src += readStride;
-            dst+=2;
-        }
-        ENCODE_LOOP_SPANS
-	    break;
+	case GX_TF_RGB565:
+		SetBlockDimensions(2, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			boxfilterRGB_to_RGB8(src, r, g, b);
+			u16 val = ((r << 8) & 0xf800) | ((g << 3) & 0x07e0) | ((b >> 3) & 0x001e); 
+			*(u16*)dst = Common::swap16(val);
+			src += readStride;
+			dst+=2;
+		}
+		ENCODE_LOOP_SPANS
+		break;
 
-    case GX_TF_RGB5A3:
-        SetBlockDimensions(2, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-        SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-        ENCODE_LOOP_BLOCKS
-        {
-            boxfilterRGB_to_RGB8(src, r, g, b);
-            u16 val = 0x8000 | ((r << 7) & 0x7c00) | ((g << 2) & 0x03e0) | ((b >> 3) & 0x001e);
-            *(u16*)dst = Common::swap16(val);
-            src += readStride;
-            dst+=2;
-        }
-        ENCODE_LOOP_SPANS
-	    break;
+	case GX_TF_RGB5A3:
+		SetBlockDimensions(2, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			boxfilterRGB_to_RGB8(src, r, g, b);
+			u16 val = 0x8000 | ((r << 7) & 0x7c00) | ((g << 2) & 0x03e0) | ((b >> 3) & 0x001e);
+			*(u16*)dst = Common::swap16(val);
+			src += readStride;
+			dst+=2;
+		}
+		ENCODE_LOOP_SPANS
+		break;
 
-    case GX_TF_RGBA8:
-        SetBlockDimensions(2, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-        SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-        ENCODE_LOOP_BLOCKS
-        {
-            boxfilterRGB_to_RGB8(src, r, g, b);
-            dst[0] = 0xff;
-            dst[1] = r;
-            dst[32] = g;
-            dst[33] = b;
-            src += readStride;
-            dst += 2;
-        }
-        ENCODE_LOOP_SPANS2
-	    break;
+	case GX_TF_RGBA8:
+		SetBlockDimensions(2, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			boxfilterRGB_to_RGB8(src, r, g, b);
+			dst[0] = 0xff;
+			dst[1] = r;
+			dst[32] = g;
+			dst[33] = b;
+			src += readStride;
+			dst += 2;
+		}
+		ENCODE_LOOP_SPANS2
+		break;
 
-    case GX_CTF_R4:
-        SetBlockDimensions(3, 3, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-        SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-        sBlkSize /= 2;
-        ENCODE_LOOP_BLOCKS
-        {
-            boxfilterRGB_to_x8(src, r, 2);
-            *dst = r & 0xf0;
-            src += readStride;            
+	case GX_CTF_R4:
+		SetBlockDimensions(3, 3, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
+		sBlkSize /= 2;
+		ENCODE_LOOP_BLOCKS
+		{
+			boxfilterRGB_to_x8(src, r, 2);
+			*dst = r & 0xf0;
+			src += readStride;
 
-            boxfilterRGB_to_x8(src, r, 2);
-            *dst |= r >> 4;
-            src += readStride;
-            
-            dst++;
-        }
-        ENCODE_LOOP_SPANS
-	    break;
+			boxfilterRGB_to_x8(src, r, 2);
+			*dst |= r >> 4;
+			src += readStride;
 
-    case GX_CTF_RA4:
-        SetBlockDimensions(3, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-        SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-        ENCODE_LOOP_BLOCKS
-        {
-            boxfilterRGB_to_x8(src, r, 2);
-            *dst++ = 0xf0 | (r >> 4);
-            src += readStride;
-        }
-        ENCODE_LOOP_SPANS
-	    break;
+			dst++;
+		}
+		ENCODE_LOOP_SPANS
+		break;
 
-    case GX_CTF_RA8:
-        SetBlockDimensions(2, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-        SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-        ENCODE_LOOP_BLOCKS
-        {
-            boxfilterRGB_to_x8(src, r, 2);
-            *dst++ = 0xff;
-            *dst++ = r;
-            src += readStride;
-        }
-        ENCODE_LOOP_SPANS
-	    break;
+	case GX_CTF_RA4:
+		SetBlockDimensions(3, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			boxfilterRGB_to_x8(src, r, 2);
+			*dst++ = 0xf0 | (r >> 4);
+			src += readStride;
+		}
+		ENCODE_LOOP_SPANS
+		break;
 
-    case GX_CTF_A8:
-        SetBlockDimensions(3, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-        SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-        ENCODE_LOOP_BLOCKS
-        {
-            *dst++ = 0xff;
-        }
-        ENCODE_LOOP_SPANS
-	    break;
+	case GX_CTF_RA8:
+		SetBlockDimensions(2, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			boxfilterRGB_to_x8(src, r, 2);
+			*dst++ = 0xff;
+			*dst++ = r;
+			src += readStride;
+		}
+		ENCODE_LOOP_SPANS
+		break;
 
-    case GX_CTF_R8:
-        SetBlockDimensions(3, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-        SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-        ENCODE_LOOP_BLOCKS
-        {
-            boxfilterRGB_to_x8(src, r, 2);
-            *dst++ = r;
-            src += readStride;
-        }
-        ENCODE_LOOP_SPANS
-	    break;
+	case GX_CTF_A8:
+		SetBlockDimensions(3, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			*dst++ = 0xff;
+		}
+		ENCODE_LOOP_SPANS
+		break;
 
-    case GX_CTF_G8:
-        SetBlockDimensions(3, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-        SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-        ENCODE_LOOP_BLOCKS
-        {
-            boxfilterRGB_to_x8(src, g, 1);
-            *dst++ = g;
-            src += readStride;
-        }
-        ENCODE_LOOP_SPANS
-	    break;
+	case GX_CTF_R8:
+		SetBlockDimensions(3, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			boxfilterRGB_to_x8(src, r, 2);
+			*dst++ = r;
+			src += readStride;
+		}
+		ENCODE_LOOP_SPANS
+		break;
 
-    case GX_CTF_B8:
-        SetBlockDimensions(3, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-        SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-        ENCODE_LOOP_BLOCKS
-        {
-            boxfilterRGB_to_x8(src, b, 0);
-            *dst++ = b;
-            src += readStride;
-        }
-        ENCODE_LOOP_SPANS
-	    break;
+	case GX_CTF_G8:
+		SetBlockDimensions(3, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			boxfilterRGB_to_x8(src, g, 1);
+			*dst++ = g;
+			src += readStride;
+		}
+		ENCODE_LOOP_SPANS
+		break;
 
-    case GX_CTF_RG8:
-        SetBlockDimensions(2, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-        SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-        ENCODE_LOOP_BLOCKS
-        {
-            boxfilterRGB_to_xx8(src, r, g, 2, 1);
-            *dst++ = g;
-            *dst++ = r;
-            src += readStride;
-        }
-        ENCODE_LOOP_SPANS
-	    break;
+	case GX_CTF_B8:
+		SetBlockDimensions(3, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			boxfilterRGB_to_x8(src, b, 0);
+			*dst++ = b;
+			src += readStride;
+		}
+		ENCODE_LOOP_SPANS
+		break;
 
-    case GX_CTF_GB8:
-	    SetBlockDimensions(2, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-        SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-        ENCODE_LOOP_BLOCKS
-        {
-            boxfilterRGB_to_xx8(src, g, b, 1, 0);
-            *dst++ = b;
-            *dst++ = g;
-            src += readStride;        
-        }
-        ENCODE_LOOP_SPANS
-        break;
+	case GX_CTF_RG8:
+		SetBlockDimensions(2, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			boxfilterRGB_to_xx8(src, r, g, 2, 1);
+			*dst++ = g;
+			*dst++ = r;
+			src += readStride;
+		}
+		ENCODE_LOOP_SPANS
+		break;
 
-    default:
-	    PanicAlert("Unknown texture copy format: 0x%x\n", format);
-	    break;		
-    }
+	case GX_CTF_GB8:
+		SetBlockDimensions(2, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			boxfilterRGB_to_xx8(src, g, b, 1, 0);
+			*dst++ = b;
+			*dst++ = g;
+			src += readStride;
+		}
+		ENCODE_LOOP_SPANS
+		break;
+
+	default:
+		PanicAlert("Unknown texture copy format: 0x%x\n", format);
+		break;		
+	}
 }
 
 void EncodeZ24(u8 *dst, u8 *src, u32 format)
 {
-    u16 sBlkCount, tBlkCount, sBlkSize, tBlkSize;
-    s32 tSpan, sBlkSpan, tBlkSpan, writeStride;
-    u32 readStride = 3;
-    u8 *dstBlockStart = dst;
+	u16 sBlkCount, tBlkCount, sBlkSize, tBlkSize;
+	s32 tSpan, sBlkSpan, tBlkSpan, writeStride;
+	u32 readStride = 3;
+	u8 *dstBlockStart = dst;
 
-    switch(format)
-    {    
-    case GX_TF_Z8:
-        SetBlockDimensions(3, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-        SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-        ENCODE_LOOP_BLOCKS
-        {
-            *dst++ = src[2];
-            src += readStride;
-        }
-        ENCODE_LOOP_SPANS
-	    break;
+	switch(format)
+	{
+	case GX_TF_Z8:
+		SetBlockDimensions(3, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			*dst++ = src[2];
+			src += readStride;
+		}
+		ENCODE_LOOP_SPANS
+		break;
 
-    case GX_TF_Z16:
-        SetBlockDimensions(2, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-        SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-        ENCODE_LOOP_BLOCKS
-        {
-            *dst++ = src[1];
-            *dst++ = src[2];
-            src += readStride;
-        }
-        ENCODE_LOOP_SPANS
-	    break;
+	case GX_TF_Z16:
+		SetBlockDimensions(2, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			*dst++ = src[1];
+			*dst++ = src[2];
+			src += readStride;
+		}
+		ENCODE_LOOP_SPANS
+		break;
 
-    case GX_TF_Z24X8:
-        SetBlockDimensions(2, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-        SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-        ENCODE_LOOP_BLOCKS
-        {
-            dst[0] = 0xff;
-            dst[1] = src[2];
-            dst[32] = src[1];
-            dst[33] = src[0];
-            src += readStride;
-            dst += 2;
-        }
-        ENCODE_LOOP_SPANS2
-	    break;
+	case GX_TF_Z24X8:
+		SetBlockDimensions(2, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			dst[0] = 0xff;
+			dst[1] = src[2];
+			dst[32] = src[1];
+			dst[33] = src[0];
+			src += readStride;
+			dst += 2;
+		}
+		ENCODE_LOOP_SPANS2
+		break;
 
-    case GX_CTF_Z4:
-        SetBlockDimensions(3, 3, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-        SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-        sBlkSize /= 2;
-        ENCODE_LOOP_BLOCKS
-        {
-            *dst = src[2] & 0xf0;
-            src += readStride;            
+	case GX_CTF_Z4:
+		SetBlockDimensions(3, 3, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
+		sBlkSize /= 2;
+		ENCODE_LOOP_BLOCKS
+		{
+			*dst = src[2] & 0xf0;
+			src += readStride;
 
-            *dst |= src[2] >> 4;
-            src += readStride;
-            
-            dst++;
-        }
-        ENCODE_LOOP_SPANS
-	    break;
+			*dst |= src[2] >> 4;
+			src += readStride;
 
-    case GX_CTF_Z8M:
-        SetBlockDimensions(3, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-        SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-        ENCODE_LOOP_BLOCKS
-        {
-            *dst++ = src[1];
-            src += readStride;
-        }
-        ENCODE_LOOP_SPANS
-	    break;
+			dst++;
+		}
+		ENCODE_LOOP_SPANS
+		break;
 
-    case GX_CTF_Z8L:
-        SetBlockDimensions(3, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-        SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-        ENCODE_LOOP_BLOCKS
-        {
-            *dst++ = src[0];
-            src += readStride;
-        }
-        ENCODE_LOOP_SPANS
-	    break;
+	case GX_CTF_Z8M:
+		SetBlockDimensions(3, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			*dst++ = src[1];
+			src += readStride;
+		}
+		ENCODE_LOOP_SPANS
+		break;
 
-    case GX_CTF_Z16L:
-        SetBlockDimensions(2, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-        SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-        ENCODE_LOOP_BLOCKS
-        {
-            *dst++ = src[0];
-            *dst++ = src[1];
-            src += readStride;
-        }
-        ENCODE_LOOP_SPANS
-	    break;
+	case GX_CTF_Z8L:
+		SetBlockDimensions(3, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			*dst++ = src[0];
+			src += readStride;
+		}
+		ENCODE_LOOP_SPANS
+		break;
 
-    default:
-	    PanicAlert("Unknown texture copy format: 0x%x\n", format);
-	    break;		
-    }
+	case GX_CTF_Z16L:
+		SetBlockDimensions(2, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			*dst++ = src[0];
+			*dst++ = src[1];
+			src += readStride;
+		}
+		ENCODE_LOOP_SPANS
+		break;
+
+	default:
+		PanicAlert("Unknown texture copy format: 0x%x\n", format);
+		break;		
+	}
 }
 
 void EncodeZ24halfscale(u8 *dst, u8 *src, u32 format)
 {
-    u16 sBlkCount, tBlkCount, sBlkSize, tBlkSize;
-    s32 tSpan, sBlkSpan, tBlkSpan, writeStride;
-    u32 readStride = 6;
-    u8 r, g, b;
-    u8 *dstBlockStart = dst;
+	u16 sBlkCount, tBlkCount, sBlkSize, tBlkSize;
+	s32 tSpan, sBlkSpan, tBlkSpan, writeStride;
+	u32 readStride = 6;
+	u8 r, g, b;
+	u8 *dstBlockStart = dst;
 
-    switch(format)
-    {    
-    case GX_TF_Z8:
-        SetBlockDimensions(3, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-        SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-        ENCODE_LOOP_BLOCKS
-        {
-            boxfilterRGB_to_x8(src, b, 2);
-            *dst++ = b;
-            src += readStride;
-        }
-        ENCODE_LOOP_SPANS
-	    break;
+	switch(format)
+	{
+	case GX_TF_Z8:
+		SetBlockDimensions(3, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			boxfilterRGB_to_x8(src, b, 2);
+			*dst++ = b;
+			src += readStride;
+		}
+		ENCODE_LOOP_SPANS
+		break;
 
-    case GX_TF_Z16:
-        SetBlockDimensions(2, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-        SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-        ENCODE_LOOP_BLOCKS
-        {
-            boxfilterRGB_to_xx8(src, g, b, 1, 2);
-            *dst++ = b;
-            *dst++ = g;            
-            src += readStride;
-        }
-        ENCODE_LOOP_SPANS
-	    break;
+	case GX_TF_Z16:
+		SetBlockDimensions(2, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			boxfilterRGB_to_xx8(src, g, b, 1, 2);
+			*dst++ = b;
+			*dst++ = g;
+			src += readStride;
+		}
+		ENCODE_LOOP_SPANS
+		break;
 
-    case GX_TF_Z24X8:
-        SetBlockDimensions(2, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-        SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-        ENCODE_LOOP_BLOCKS
-        {
-            boxfilterRGB_to_RGB8(src, dst[33], dst[32], dst[1]); 
-            dst[0] = 255;
-            src += readStride;
-            dst += 2;
-        }
-        ENCODE_LOOP_SPANS2
-	    break;
+	case GX_TF_Z24X8:
+		SetBlockDimensions(2, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			boxfilterRGB_to_RGB8(src, dst[33], dst[32], dst[1]); 
+			dst[0] = 255;
+			src += readStride;
+			dst += 2;
+		}
+		ENCODE_LOOP_SPANS2
+		break;
 
-    case GX_CTF_Z4:
-        SetBlockDimensions(3, 3, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-        SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-        sBlkSize /= 2;
-        ENCODE_LOOP_BLOCKS
-        {
-            boxfilterRGB_to_x8(src, b, 2);
-            *dst = b & 0xf0;
-            src += readStride;            
+	case GX_CTF_Z4:
+		SetBlockDimensions(3, 3, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
+		sBlkSize /= 2;
+		ENCODE_LOOP_BLOCKS
+		{
+			boxfilterRGB_to_x8(src, b, 2);
+			*dst = b & 0xf0;
+			src += readStride;
 
-            boxfilterRGB_to_x8(src, b, 2);
-            *dst |= b >> 4;
-            src += readStride;
-            
-            dst++;
-        }
-        ENCODE_LOOP_SPANS
-	    break;
+			boxfilterRGB_to_x8(src, b, 2);
+			*dst |= b >> 4;
+			src += readStride;
 
-    case GX_CTF_Z8M:
-        SetBlockDimensions(3, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-        SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-        ENCODE_LOOP_BLOCKS
-        {
-            boxfilterRGB_to_x8(src, g, 1);
-            *dst++ = g;
-            src += readStride;
-        }
-        ENCODE_LOOP_SPANS
-	    break;
+			dst++;
+		}
+		ENCODE_LOOP_SPANS
+		break;
 
-    case GX_CTF_Z8L:
-        SetBlockDimensions(3, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-        SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-        ENCODE_LOOP_BLOCKS
-        {
-            boxfilterRGB_to_x8(src, r, 0);
-            *dst++ = r;
-            src += readStride;
-        }
-        ENCODE_LOOP_SPANS
-	    break;
+	case GX_CTF_Z8M:
+		SetBlockDimensions(3, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			boxfilterRGB_to_x8(src, g, 1);
+			*dst++ = g;
+			src += readStride;
+		}
+		ENCODE_LOOP_SPANS
+		break;
 
-    case GX_CTF_Z16L:
-        SetBlockDimensions(2, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
-        SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
-        ENCODE_LOOP_BLOCKS
-        {
-            boxfilterRGB_to_xx8(src, r, g, 0, 1);
-            *dst++ = g;
-            *dst++ = r;            
-            src += readStride;
-        }
-        ENCODE_LOOP_SPANS
-	    break;
+	case GX_CTF_Z8L:
+		SetBlockDimensions(3, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			boxfilterRGB_to_x8(src, r, 0);
+			*dst++ = r;
+			src += readStride;
+		}
+		ENCODE_LOOP_SPANS
+		break;
 
-    default:
-	    PanicAlert("Unknown texture copy format: 0x%x\n", format);
-	    break;		
-    }
+	case GX_CTF_Z16L:
+		SetBlockDimensions(2, 2, sBlkCount, tBlkCount, sBlkSize, tBlkSize);
+		SetSpans(sBlkSize, tBlkSize, tSpan, sBlkSpan, tBlkSpan, writeStride);
+		ENCODE_LOOP_BLOCKS
+		{
+			boxfilterRGB_to_xx8(src, r, g, 0, 1);
+			*dst++ = g;
+			*dst++ = r;
+			src += readStride;
+		}
+		ENCODE_LOOP_SPANS
+		break;
+
+	default:
+		PanicAlert("Unknown texture copy format: 0x%x\n", format);
+		break;		
+	}
 }
 
 void Encode(u8 *dest_ptr)
 {
-    int pixelformat = bpmem.zcontrol.pixel_format;
-    bool bFromZBuffer = pixelformat == PIXELFMT_Z24;
-    bool bIsIntensityFmt = bpmem.triggerEFBCopy.intensity_fmt > 0;
-    u32 copyfmt = ((bpmem.triggerEFBCopy.target_pixel_format / 2) + ((bpmem.triggerEFBCopy.target_pixel_format & 1) * 8));        
-    
-    // pack copy format information into a single variable
-    u32 format = copyfmt;
-    if (bFromZBuffer)
-    {
-	    format |= _GX_TF_ZTF;
-	    if (copyfmt == 11)
-		    format = GX_TF_Z16;
-	    else if (format < GX_TF_Z8 || format > GX_TF_Z24X8)
-		    format |= _GX_TF_CTF;
-    }
-    else
-	    if (copyfmt > GX_TF_RGBA8 || (copyfmt < GX_TF_RGB565 && !bIsIntensityFmt))
-		    format |= _GX_TF_CTF;
+	int pixelformat = bpmem.zcontrol.pixel_format;
+	bool bFromZBuffer = pixelformat == PIXELFMT_Z24;
+	bool bIsIntensityFmt = bpmem.triggerEFBCopy.intensity_fmt > 0;
+	u32 copyfmt = ((bpmem.triggerEFBCopy.target_pixel_format / 2) + ((bpmem.triggerEFBCopy.target_pixel_format & 1) * 8));        
 
-    u8 *src = EfbInterface::GetPixelPointer(bpmem.copyTexSrcXY.x, bpmem.copyTexSrcXY.y, bFromZBuffer);
+	// pack copy format information into a single variable
+	u32 format = copyfmt;
+	if (bFromZBuffer)
+	{
+		format |= _GX_TF_ZTF;
+		if (copyfmt == 11)
+			format = GX_TF_Z16;
+		else if (format < GX_TF_Z8 || format > GX_TF_Z24X8)
+			format |= _GX_TF_CTF;
+	}
+	else
+		if (copyfmt > GX_TF_RGBA8 || (copyfmt < GX_TF_RGB565 && !bIsIntensityFmt))
+			format |= _GX_TF_CTF;
 
-    if (bpmem.triggerEFBCopy.half_scale)
-    {
-        if (pixelformat == PIXELFMT_RGBA6_Z24)
-            EncodeRGBA6halfscale(dest_ptr, src, format);
-        else if (pixelformat == PIXELFMT_RGB8_Z24)
-            EncodeRGB8halfscale(dest_ptr, src, format);
-        else if (pixelformat == PIXELFMT_RGB565_Z16)  // not supported
-            EncodeRGB8halfscale(dest_ptr, src, format);
-        else if (pixelformat == PIXELFMT_Z24)
-            EncodeZ24halfscale(dest_ptr, src, format);
-    }
-    else
-    {
-        if (pixelformat == PIXELFMT_RGBA6_Z24)
-            EncodeRGBA6(dest_ptr, src, format);
-        else if (pixelformat == PIXELFMT_RGB8_Z24)
-            EncodeRGB8(dest_ptr, src, format);
-        else if (pixelformat == PIXELFMT_RGB565_Z16)  // not supported
-            EncodeRGB8(dest_ptr, src, format);
-        else if (pixelformat == PIXELFMT_Z24)
-            EncodeZ24(dest_ptr, src, format);
-    }
+	u8 *src = EfbInterface::GetPixelPointer(bpmem.copyTexSrcXY.x, bpmem.copyTexSrcXY.y, bFromZBuffer);
+
+	if (bpmem.triggerEFBCopy.half_scale)
+	{
+		if (pixelformat == PIXELFMT_RGBA6_Z24)
+			EncodeRGBA6halfscale(dest_ptr, src, format);
+		else if (pixelformat == PIXELFMT_RGB8_Z24)
+			EncodeRGB8halfscale(dest_ptr, src, format);
+		else if (pixelformat == PIXELFMT_RGB565_Z16)  // not supported
+			EncodeRGB8halfscale(dest_ptr, src, format);
+		else if (pixelformat == PIXELFMT_Z24)
+			EncodeZ24halfscale(dest_ptr, src, format);
+	}
+	else
+	{
+		if (pixelformat == PIXELFMT_RGBA6_Z24)
+			EncodeRGBA6(dest_ptr, src, format);
+		else if (pixelformat == PIXELFMT_RGB8_Z24)
+			EncodeRGB8(dest_ptr, src, format);
+		else if (pixelformat == PIXELFMT_RGB565_Z16)  // not supported
+			EncodeRGB8(dest_ptr, src, format);
+		else if (pixelformat == PIXELFMT_Z24)
+			EncodeZ24(dest_ptr, src, format);
+	}
 }
 
 
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/TextureEncoder.h b/Source/Plugins/Plugin_VideoSoftware/Src/TextureEncoder.h
index 031f20adf6..0921b720ea 100644
--- a/Source/Plugins/Plugin_VideoSoftware/Src/TextureEncoder.h
+++ b/Source/Plugins/Plugin_VideoSoftware/Src/TextureEncoder.h
@@ -1,20 +1,6 @@
-// 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/
-
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _OPCODEDECODER_H_
 #define _OPCODEDECODER_H_
@@ -23,7 +9,7 @@
 
 namespace TextureEncoder
 {
-    void Encode(u8 *dest_ptr);
+	void Encode(u8 *dest_ptr);
 }
 
 #endif
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/TextureSampler.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/TextureSampler.cpp
index 56101dc69d..f7c87ba513 100644
--- a/Source/Plugins/Plugin_VideoSoftware/Src/TextureSampler.cpp
+++ b/Source/Plugins/Plugin_VideoSoftware/Src/TextureSampler.cpp
@@ -1,19 +1,6 @@
-// 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/
-
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "TextureSampler.h"
 
@@ -30,51 +17,51 @@ namespace TextureSampler
 
 inline void WrapCoord(int &coord, int wrapMode, int imageSize)
 {
-    switch (wrapMode)
-    {
-        case 0: // clamp
-            coord = (coord>imageSize)?imageSize:(coord<0)?0:coord;
-            break;
-        case 1: // wrap
-            coord = coord % (imageSize + 1);
-            coord = (coord<0)?imageSize+coord:coord;
-            break;
-        case 2: // mirror
-            {
-                int sizePlus1 = imageSize + 1;
-                int div = coord / sizePlus1;
-                coord = coord - (div * sizePlus1);
-                coord = (coord<0)?-coord:coord;
-                coord = (div&1)?imageSize - coord:coord;
-            }
-            break;
-    }
+	switch (wrapMode)
+	{
+		case 0: // clamp
+			coord = (coord>imageSize)?imageSize:(coord<0)?0:coord;
+			break;
+		case 1: // wrap
+			coord = coord % (imageSize + 1);
+			coord = (coord<0)?imageSize+coord:coord;
+			break;
+		case 2: // mirror
+			{
+				int sizePlus1 = imageSize + 1;
+				int div = coord / sizePlus1;
+				coord = coord - (div * sizePlus1);
+				coord = (coord<0)?-coord:coord;
+				coord = (div&1)?imageSize - coord:coord;
+			}
+			break;
+	}
 }
 
 inline void SetTexel(u8 *inTexel, u32 *outTexel, u32 fract)
 {
-    outTexel[0] = inTexel[0] * fract;
-    outTexel[1] = inTexel[1] * fract;
-    outTexel[2] = inTexel[2] * fract;
-    outTexel[3] = inTexel[3] * fract;
+	outTexel[0] = inTexel[0] * fract;
+	outTexel[1] = inTexel[1] * fract;
+	outTexel[2] = inTexel[2] * fract;
+	outTexel[3] = inTexel[3] * fract;
 }
 
 inline void AddTexel(u8 *inTexel, u32 *outTexel, u32 fract)
 {
-    outTexel[0] += inTexel[0] * fract;
-    outTexel[1] += inTexel[1] * fract;
-    outTexel[2] += inTexel[2] * fract;
-    outTexel[3] += inTexel[3] * fract;
+	outTexel[0] += inTexel[0] * fract;
+	outTexel[1] += inTexel[1] * fract;
+	outTexel[2] += inTexel[2] * fract;
+	outTexel[3] += inTexel[3] * fract;
 }
 
 void Sample(s32 s, s32 t, s32 lod, bool linear, u8 texmap, u8 *sample)
 {
-    int baseMip = 0;
+	int baseMip = 0;
 	bool mipLinear = false;
 
 #if (ALLOW_MIPMAP)
 	FourTexUnits& texUnit = bpmem.tex[(texmap >> 2) & 1];
-    TexMode0& tm0 = texUnit.texMode0[texmap & 3];
+	TexMode0& tm0 = texUnit.texMode0[texmap & 3];
 
 	s32 lodFract = lod & 0xf;
 
@@ -91,7 +78,7 @@ void Sample(s32 s, s32 t, s32 lod, bool linear, u8 texmap, u8 *sample)
 	if (mipLinear)
 	{
 		u8 sampledTex[4];
-        u32 texel[4];
+		u32 texel[4];
 
 		SampleMip(s, t, baseMip, linear, texmap, sampledTex);
 		SetTexel(sampledTex, texel, (16 - lodFract));
@@ -100,25 +87,25 @@ void Sample(s32 s, s32 t, s32 lod, bool linear, u8 texmap, u8 *sample)
 		AddTexel(sampledTex, texel, lodFract);
 
 		sample[0] = (u8)(texel[0] >> 4);
-        sample[1] = (u8)(texel[1] >> 4);
-        sample[2] = (u8)(texel[2] >> 4);
-        sample[3] = (u8)(texel[3] >> 4);
+		sample[1] = (u8)(texel[1] >> 4);
+		sample[2] = (u8)(texel[2] >> 4);
+		sample[3] = (u8)(texel[3] >> 4);
 	}
 	else
 #endif
 	{
 		SampleMip(s, t, baseMip, linear, texmap, sample);
-	}	
+	}
 }
 
 void SampleMip(s32 s, s32 t, s32 mip, bool linear, u8 texmap, u8 *sample)
 {
 	FourTexUnits& texUnit = bpmem.tex[(texmap >> 2) & 1];
-    u8 subTexmap = texmap & 3;
+	u8 subTexmap = texmap & 3;
 
-    TexMode0& tm0 = texUnit.texMode0[subTexmap];
-    TexImage0& ti0 = texUnit.texImage0[subTexmap];
-    TexTLUT& texTlut = texUnit.texTlut[subTexmap];
+	TexMode0& tm0 = texUnit.texMode0[subTexmap];
+	TexImage0& ti0 = texUnit.texImage0[subTexmap];
+	TexTLUT& texTlut = texUnit.texTlut[subTexmap];
 
 	u8 *imageSrc, *imageSrcOdd = NULL;
 	if (texUnit.texImage1[subTexmap].image_type)
@@ -129,7 +116,7 @@ void SampleMip(s32 s, s32 t, s32 mip, bool linear, u8 texmap, u8 *sample)
 	}
 	else
 	{
-		u32 imageBase = texUnit.texImage3[subTexmap].image_base << 5;    
+		u32 imageBase = texUnit.texImage3[subTexmap].image_base << 5;
 		imageSrc = Memory::GetPointer(imageBase);
 	}
 
@@ -167,8 +154,8 @@ void SampleMip(s32 s, s32 t, s32 mip, bool linear, u8 texmap, u8 *sample)
 		}
 	}
 
-    if (linear)
-    {
+	if (linear)
+	{
 		// offset linear sampling
 		s -= 64;
 		t -= 64;
@@ -179,18 +166,18 @@ void SampleMip(s32 s, s32 t, s32 mip, bool linear, u8 texmap, u8 *sample)
 
 		// linear sampling
 		int imageSPlus1 = imageS + 1;
-        int fractS = s & 0x7f;
-        
-        int imageTPlus1 = imageT + 1;
-        int fractT = t & 0x7f;
+		int fractS = s & 0x7f;
 
-        u8 sampledTex[4];
-        u32 texel[4];
+		int imageTPlus1 = imageT + 1;
+		int fractT = t & 0x7f;
 
-        WrapCoord(imageS, tm0.wrap_s, imageWidth);
-        WrapCoord(imageT, tm0.wrap_t, imageHeight);
-        WrapCoord(imageSPlus1, tm0.wrap_s, imageWidth);
-        WrapCoord(imageTPlus1, tm0.wrap_t, imageHeight);
+		u8 sampledTex[4];
+		u32 texel[4];
+
+		WrapCoord(imageS, tm0.wrap_s, imageWidth);
+		WrapCoord(imageT, tm0.wrap_t, imageHeight);
+		WrapCoord(imageSPlus1, tm0.wrap_s, imageWidth);
+		WrapCoord(imageTPlus1, tm0.wrap_t, imageHeight);
 
 		if (!(ti0.format == GX_TF_RGBA8 && texUnit.texImage1[subTexmap].image_type))
 		{
@@ -221,26 +208,26 @@ void SampleMip(s32 s, s32 t, s32 mip, bool linear, u8 texmap, u8 *sample)
 			AddTexel(sampledTex, texel, (fractS) * (fractT));
 		}
 
-        sample[0] = (u8)(texel[0] >> 14);
-        sample[1] = (u8)(texel[1] >> 14);
-        sample[2] = (u8)(texel[2] >> 14);
-        sample[3] = (u8)(texel[3] >> 14);
-    }
-    else
-    {
+		sample[0] = (u8)(texel[0] >> 14);
+		sample[1] = (u8)(texel[1] >> 14);
+		sample[2] = (u8)(texel[2] >> 14);
+		sample[3] = (u8)(texel[3] >> 14);
+	}
+	else
+	{
 		// integer part of sample location
 		int imageS = s >> 7;
 		int imageT = t >> 7;
 
-        // nearest neighbor sampling
+		// nearest neighbor sampling
 		WrapCoord(imageS, tm0.wrap_s, imageWidth);
-        WrapCoord(imageT, tm0.wrap_t, imageHeight);
+		WrapCoord(imageT, tm0.wrap_t, imageHeight);
 
 		if (!(ti0.format == GX_TF_RGBA8 && texUnit.texImage1[subTexmap].image_type))
-			TexDecoder_DecodeTexel(sample, imageSrc, imageS, imageT, imageWidth, ti0.format, tlutAddress, texTlut.tlut_format);   
+			TexDecoder_DecodeTexel(sample, imageSrc, imageS, imageT, imageWidth, ti0.format, tlutAddress, texTlut.tlut_format);
 		else
-			TexDecoder_DecodeTexelRGBA8FromTmem(sample, imageSrc, imageSrcOdd, imageS, imageT, imageWidth);   
-    }
+			TexDecoder_DecodeTexelRGBA8FromTmem(sample, imageSrc, imageSrcOdd, imageS, imageT, imageWidth);
+	}
 }
 
 }
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/TextureSampler.h b/Source/Plugins/Plugin_VideoSoftware/Src/TextureSampler.h
index 2ec10af06e..28a2aa84d9 100644
--- a/Source/Plugins/Plugin_VideoSoftware/Src/TextureSampler.h
+++ b/Source/Plugins/Plugin_VideoSoftware/Src/TextureSampler.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _TEXTURESAMPLER_H_
 #define _TEXTURESAMPLER_H_
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/TransformUnit.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/TransformUnit.cpp
index e7bb4b91f2..a1c2bd190a 100644
--- a/Source/Plugins/Plugin_VideoSoftware/Src/TransformUnit.cpp
+++ b/Source/Plugins/Plugin_VideoSoftware/Src/TransformUnit.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "Common.h"
 
@@ -33,114 +20,114 @@ namespace TransformUnit
 
 void MultiplyVec2Mat24(const Vec3 &vec, const float *mat, Vec3 &result)
 {
-    result.x = mat[0] * vec.x + mat[1] * vec.y + mat[2] + mat[3];
-    result.y = mat[4] * vec.x + mat[5] * vec.y + mat[6] + mat[7];
+	result.x = mat[0] * vec.x + mat[1] * vec.y + mat[2] + mat[3];
+	result.y = mat[4] * vec.x + mat[5] * vec.y + mat[6] + mat[7];
 	result.z = 1.0f;
 }
 
 void MultiplyVec2Mat34(const Vec3 &vec, const float *mat, Vec3 &result)
 {
-    result.x = mat[0] * vec.x + mat[1] * vec.y + mat[2] + mat[3];
-    result.y = mat[4] * vec.x + mat[5] * vec.y + mat[6] + mat[7];
-    result.z = mat[8] * vec.x + mat[9] * vec.y + mat[10] + mat[11];
+	result.x = mat[0] * vec.x + mat[1] * vec.y + mat[2] + mat[3];
+	result.y = mat[4] * vec.x + mat[5] * vec.y + mat[6] + mat[7];
+	result.z = mat[8] * vec.x + mat[9] * vec.y + mat[10] + mat[11];
 }
 
 void MultiplyVec3Mat33(const Vec3 &vec, const float *mat, Vec3 &result)
 {
-    result.x = mat[0] * vec.x + mat[1] * vec.y + mat[2] * vec.z;
-    result.y = mat[3] * vec.x + mat[4] * vec.y + mat[5] * vec.z;
-    result.z = mat[6] * vec.x + mat[7] * vec.y + mat[8] * vec.z;
+	result.x = mat[0] * vec.x + mat[1] * vec.y + mat[2] * vec.z;
+	result.y = mat[3] * vec.x + mat[4] * vec.y + mat[5] * vec.z;
+	result.z = mat[6] * vec.x + mat[7] * vec.y + mat[8] * vec.z;
 }
 
 void MultiplyVec3Mat24(const Vec3 &vec, const float *mat, Vec3 &result)
 {
-    result.x = mat[0] * vec.x + mat[1] * vec.y + mat[2] * vec.z + mat[3];
-    result.y = mat[4] * vec.x + mat[5] * vec.y + mat[6] * vec.z + mat[7];
-    result.z = 1.0f;
+	result.x = mat[0] * vec.x + mat[1] * vec.y + mat[2] * vec.z + mat[3];
+	result.y = mat[4] * vec.x + mat[5] * vec.y + mat[6] * vec.z + mat[7];
+	result.z = 1.0f;
 }
 
 void MultiplyVec3Mat34(const Vec3 &vec, const float *mat, Vec3 &result)
 {
-    result.x = mat[0] * vec.x + mat[1] * vec.y + mat[2] * vec.z + mat[3];
-    result.y = mat[4] * vec.x + mat[5] * vec.y + mat[6] * vec.z + mat[7];
-    result.z = mat[8] * vec.x + mat[9] * vec.y + mat[10] * vec.z + mat[11];
+	result.x = mat[0] * vec.x + mat[1] * vec.y + mat[2] * vec.z + mat[3];
+	result.y = mat[4] * vec.x + mat[5] * vec.y + mat[6] * vec.z + mat[7];
+	result.z = mat[8] * vec.x + mat[9] * vec.y + mat[10] * vec.z + mat[11];
 }
 
 void MultipleVec3Perspective(const Vec3 &vec, const float *proj, Vec4 &result)
 {
-    result.x = proj[0] * vec.x + proj[1] * vec.z;
-    result.y = proj[2] * vec.y + proj[3] * vec.z;
-    //result.z = (proj[4] * vec.z + proj[5]);
-    result.z = (proj[4] * vec.z + proj[5]) * (1.0f - (float)1e-7);
-    result.w = -vec.z;
+	result.x = proj[0] * vec.x + proj[1] * vec.z;
+	result.y = proj[2] * vec.y + proj[3] * vec.z;
+	//result.z = (proj[4] * vec.z + proj[5]);
+	result.z = (proj[4] * vec.z + proj[5]) * (1.0f - (float)1e-7);
+	result.w = -vec.z;
 }
 
 void MultipleVec3Ortho(const Vec3 &vec, const float *proj, Vec4 &result)
 {
-    result.x = proj[0] * vec.x + proj[1];
-    result.y = proj[2] * vec.y + proj[3];
-    result.z = proj[4] * vec.z + proj[5];
-    result.w = 1;
+	result.x = proj[0] * vec.x + proj[1];
+	result.y = proj[2] * vec.y + proj[3];
+	result.z = proj[4] * vec.z + proj[5];
+	result.w = 1;
 }
 
 void TransformPosition(const InputVertexData *src, OutputVertexData *dst)
 {
-    const float* mat = (const float*)&swxfregs.posMatrices[src->posMtx * 4];    
-    MultiplyVec3Mat34(src->position, mat, dst->mvPosition);
+	const float* mat = (const float*)&swxfregs.posMatrices[src->posMtx * 4];
+	MultiplyVec3Mat34(src->position, mat, dst->mvPosition);
 
-    if (swxfregs.projection.type == GX_PERSPECTIVE)
-    {
-        MultipleVec3Perspective(dst->mvPosition, swxfregs.projection.rawProjection, dst->projectedPosition);
-    }
-    else
-    {
-        MultipleVec3Ortho(dst->mvPosition, swxfregs.projection.rawProjection, dst->projectedPosition);
-    }
+	if (swxfregs.projection.type == GX_PERSPECTIVE)
+	{
+		MultipleVec3Perspective(dst->mvPosition, swxfregs.projection.rawProjection, dst->projectedPosition);
+	}
+	else
+	{
+		MultipleVec3Ortho(dst->mvPosition, swxfregs.projection.rawProjection, dst->projectedPosition);
+	}
 }
 
 void TransformNormal(const InputVertexData *src, bool nbt, OutputVertexData *dst)
 {
-    const float* mat = (const float*)&swxfregs.normalMatrices[(src->posMtx & 31)  * 3];
+	const float* mat = (const float*)&swxfregs.normalMatrices[(src->posMtx & 31)  * 3];
 
-    if (nbt)
-    {
-        MultiplyVec3Mat33(src->normal[0], mat, dst->normal[0]);
-        MultiplyVec3Mat33(src->normal[1], mat, dst->normal[1]);
-        MultiplyVec3Mat33(src->normal[2], mat, dst->normal[2]);
-        dst->normal[0].normalize();
-    }
-    else
-    {
-        MultiplyVec3Mat33(src->normal[0], mat, dst->normal[0]);
-        dst->normal[0].normalize();
-    }    
+	if (nbt)
+	{
+		MultiplyVec3Mat33(src->normal[0], mat, dst->normal[0]);
+		MultiplyVec3Mat33(src->normal[1], mat, dst->normal[1]);
+		MultiplyVec3Mat33(src->normal[2], mat, dst->normal[2]);
+		dst->normal[0].normalize();
+	}
+	else
+	{
+		MultiplyVec3Mat33(src->normal[0], mat, dst->normal[0]);
+		dst->normal[0].normalize();
+	}
 }
 
 void TransformTexCoordRegular(const TexMtxInfo &texinfo, int coordNum, bool specialCase, const InputVertexData *srcVertex, OutputVertexData *dstVertex)
 {
-    const Vec3 *src;
-    switch (texinfo.sourcerow)
-    {
-        case XF_SRCGEOM_INROW:
-            src = &srcVertex->position;
-            break;
-        case XF_SRCNORMAL_INROW:
-            src = &srcVertex->normal[0];
-            break;
-        case XF_SRCBINORMAL_T_INROW:
-            src = &srcVertex->normal[1];
-            break;
-        case XF_SRCBINORMAL_B_INROW:
-            src = &srcVertex->normal[2];
-            break;
-        default:
-            _assert_(texinfo.sourcerow >= XF_SRCTEX0_INROW && texinfo.sourcerow <= XF_SRCTEX7_INROW);
-            src = (Vec3*)srcVertex->texCoords[texinfo.sourcerow - XF_SRCTEX0_INROW];
-            break;
-    }
+	const Vec3 *src;
+	switch (texinfo.sourcerow)
+	{
+		case XF_SRCGEOM_INROW:
+			src = &srcVertex->position;
+			break;
+		case XF_SRCNORMAL_INROW:
+			src = &srcVertex->normal[0];
+			break;
+		case XF_SRCBINORMAL_T_INROW:
+			src = &srcVertex->normal[1];
+			break;
+		case XF_SRCBINORMAL_B_INROW:
+			src = &srcVertex->normal[2];
+			break;
+		default:
+			_assert_(texinfo.sourcerow >= XF_SRCTEX0_INROW && texinfo.sourcerow <= XF_SRCTEX7_INROW);
+			src = (Vec3*)srcVertex->texCoords[texinfo.sourcerow - XF_SRCTEX0_INROW];
+			break;
+	}
 
-    const float *mat = (const float*)&swxfregs.posMatrices[srcVertex->texMtx[coordNum] * 4];
-    Vec3 *dst = &dstVertex->texCoords[coordNum];
+	const float *mat = (const float*)&swxfregs.posMatrices[srcVertex->texMtx[coordNum] * 4];
+	Vec3 *dst = &dstVertex->texCoords[coordNum];
 
 	if (texinfo.projection == XF_TEXPROJ_ST)
 	{
@@ -159,12 +146,12 @@ void TransformTexCoordRegular(const TexMtxInfo &texinfo, int coordNum, bool spec
 			MultiplyVec3Mat34(*src, mat, *dst);
 	}
 
-    if (swxfregs.dualTexTrans)
-    {
-        Vec3 tempCoord;
+	if (swxfregs.dualTexTrans)
+	{
+		Vec3 tempCoord;
 
-        // normalize
-        const PostMtxInfo &postInfo = swxfregs.postMtxInfo[coordNum];
+		// normalize
+		const PostMtxInfo &postInfo = swxfregs.postMtxInfo[coordNum];
 		const float *postMat = (const float*)&swxfregs.postMatrices[postInfo.index * 4];
 
 		if (specialCase)
@@ -180,7 +167,7 @@ void TransformTexCoordRegular(const TexMtxInfo &texinfo, int coordNum, bool spec
 			dst->z = 1.0f;
 		}
 		else
-		{		
+		{
 			if (postInfo.normalize)
 				tempCoord = dst->normalized();
 			else
@@ -188,320 +175,336 @@ void TransformTexCoordRegular(const TexMtxInfo &texinfo, int coordNum, bool spec
 
 			MultiplyVec3Mat34(tempCoord, postMat, *dst);
 		}
-    }
+	}
 }
 
 struct LightPointer
 {
-    u32 reserved[3];
-    u8 color[4];
-    Vec3 cosatt;
-    Vec3 distatt;
-    Vec3 pos;
-    Vec3 dir;
+	u32 reserved[3];
+	u8 color[4];
+	Vec3 cosatt;
+	Vec3 distatt;
+	Vec3 pos;
+	Vec3 dir;
 };
 
 inline void AddIntegerColor(const u8 *src, Vec3 &dst)
 {
-    dst.x += src[1];
-    dst.y += src[2];
-    dst.z += src[3];
+	dst.x += src[1];
+	dst.y += src[2];
+	dst.z += src[3];
 }
 
 inline void AddScaledIntegerColor(const u8 *src, float scale, Vec3 &dst)
 {
-    dst.x += src[1] * scale;
-    dst.y += src[2] * scale;
-    dst.z += src[3] * scale;
+	dst.x += src[1] * scale;
+	dst.y += src[2] * scale;
+	dst.z += src[3] * scale;
 }
 
 inline float Clamp(float val, float a, float b)
 {
-    return val<a?a:val>b?b:val;
+	return val<a?a:val>b?b:val;
 }
 
 inline float SafeDivide(float n, float d)
 {
-    return (d==0)?(n>0?1:0):n/d;
+	return (d==0) ? (n>0?1:0) : n/d;
 }
 
 void LightColor(const Vec3 &pos, const Vec3 &normal, u8 lightNum, const LitChannel &chan, Vec3 &lightCol)
 {
-    const LightPointer *light = (const LightPointer*)&swxfregs.lights[0x10*lightNum];
+	const LightPointer *light = (const LightPointer*)&swxfregs.lights[0x10*lightNum];
 
-    if (!(chan.attnfunc & 1)) {
-        // atten disabled
-        switch (chan.diffusefunc) {
-            case LIGHTDIF_NONE:
-                AddIntegerColor(light->color, lightCol);
-                break;
-            case LIGHTDIF_SIGN:
-                {
-                    Vec3 ldir = (light->pos - pos).normalized();
-                    float diffuse = ldir * normal;
-                    AddScaledIntegerColor(light->color, diffuse, lightCol);
-                }
-                break;
-            case LIGHTDIF_CLAMP:
-                {
-                    Vec3 ldir = (light->pos - pos).normalized();
-                    float diffuse = max(0.0f, ldir * normal);
-                    AddScaledIntegerColor(light->color, diffuse, lightCol);
-                }
-                break;
-            default: _assert_(0);
-        }
-    }
-    else { // spec and spot
-        // not sure about divide by zero checks
-        Vec3 ldir = light->pos - pos;
-        float attn;
+	if (!(chan.attnfunc & 1))
+	{
+		// atten disabled
+		switch (chan.diffusefunc)
+		{
+			case LIGHTDIF_NONE:
+				AddIntegerColor(light->color, lightCol);
+				break;
+			case LIGHTDIF_SIGN:
+				{
+					Vec3 ldir = (light->pos - pos).normalized();
+					float diffuse = ldir * normal;
+					AddScaledIntegerColor(light->color, diffuse, lightCol);
+				}
+				break;
+			case LIGHTDIF_CLAMP:
+				{
+					Vec3 ldir = (light->pos - pos).normalized();
+					float diffuse = max(0.0f, ldir * normal);
+					AddScaledIntegerColor(light->color, diffuse, lightCol);
+				}
+				break;
+			default: _assert_(0);
+		}
+	}
+	else // spec and spot
+	{
+		// not sure about divide by zero checks
+		Vec3 ldir = light->pos - pos;
+		float attn;
 
-        if (chan.attnfunc == 3) { // spot
-            float dist2 = ldir.length2();
-            float dist = sqrtf(dist2);
-            ldir = ldir / dist;
-            attn = max(0.0f, ldir * light->dir);
+		if (chan.attnfunc == 3) // spot
+		{ 
+			float dist2 = ldir.length2();
+			float dist = sqrtf(dist2);
+			ldir = ldir / dist;
+			attn = max(0.0f, ldir * light->dir);
 
-            float cosAtt = light->cosatt.x + (light->cosatt.y * attn) + (light->cosatt.z * attn * attn);
-            float distAtt = light->distatt.x + (light->distatt.y * dist) + (light->distatt.z * dist2);
-            attn = SafeDivide(max(0.0f, cosAtt), distAtt);
-        }
-        else if (chan.attnfunc == 1) { // specular
-            // donko - what is going on here?  655.36 is a guess but seems about right.
-            attn = (light->pos * normal) > -655.36 ? max(0.0f, (light->dir * normal)) : 0;
-            ldir.set(1.0f, attn, attn * attn);
+			float cosAtt = light->cosatt.x + (light->cosatt.y * attn) + (light->cosatt.z * attn * attn);
+			float distAtt = light->distatt.x + (light->distatt.y * dist) + (light->distatt.z * dist2);
+			attn = SafeDivide(max(0.0f, cosAtt), distAtt);
+		}
+		else if (chan.attnfunc == 1) // specular
+		{ 
+			// donko - what is going on here?  655.36 is a guess but seems about right.
+			attn = (light->pos * normal) > -655.36 ? max(0.0f, (light->dir * normal)) : 0;
+			ldir.set(1.0f, attn, attn * attn);
 
-            float cosAtt = max(0.0f, light->cosatt * ldir);
-            float distAtt = light->distatt * ldir;
-            attn = SafeDivide(max(0.0f, cosAtt), distAtt);
-        } else {
-            PanicAlert("LightColor");
-            return;
-        }
+			float cosAtt = max(0.0f, light->cosatt * ldir);
+			float distAtt = light->distatt * ldir;
+			attn = SafeDivide(max(0.0f, cosAtt), distAtt);
+		}
+		else
+		{
+			PanicAlert("LightColor");
+			return;
+		}
 
-        switch (chan.diffusefunc) {
-            case LIGHTDIF_NONE:
-                AddScaledIntegerColor(light->color, attn, lightCol);
-                break;
-            case LIGHTDIF_SIGN:
-                {
-                    float difAttn = ldir * normal;
-                    AddScaledIntegerColor(light->color, attn * difAttn, lightCol);
-                }
-                break;
+		switch (chan.diffusefunc)
+		{
+			case LIGHTDIF_NONE:
+				AddScaledIntegerColor(light->color, attn, lightCol);
+				break;
+			case LIGHTDIF_SIGN:
+				{
+					float difAttn = ldir * normal;
+					AddScaledIntegerColor(light->color, attn * difAttn, lightCol);
+				}
+				break;
 
-            case LIGHTDIF_CLAMP:
-                {
-                    float difAttn = max(0.0f, ldir * normal);
-                    AddScaledIntegerColor(light->color, attn * difAttn, lightCol);
-                }
-                break;
-            default: _assert_(0);
-        }
-    }
+			case LIGHTDIF_CLAMP:
+				{
+					float difAttn = max(0.0f, ldir * normal);
+					AddScaledIntegerColor(light->color, attn * difAttn, lightCol);
+				}
+				break;
+			default: _assert_(0);
+		}
+	}
 }
 
 void LightAlpha(const Vec3 &pos, const Vec3 &normal, u8 lightNum, const LitChannel &chan, float &lightCol)
 {
-    const LightPointer *light = (const LightPointer*)&swxfregs.lights[0x10*lightNum];
+	const LightPointer *light = (const LightPointer*)&swxfregs.lights[0x10*lightNum];
 
-    if (!(chan.attnfunc & 1)) {
-        // atten disabled
-        switch (chan.diffusefunc) {
-            case LIGHTDIF_NONE:
-                lightCol += light->color[0];
-                break;
-            case LIGHTDIF_SIGN:
-                {
-                    Vec3 ldir = (light->pos - pos).normalized();                    
-                    float diffuse = ldir * normal;
-                    lightCol += light->color[0] * diffuse;
-                }
-                break;
-            case LIGHTDIF_CLAMP:
-                {
-                    Vec3 ldir = (light->pos - pos).normalized();
-                    float diffuse = max(0.0f, ldir * normal);
-                    lightCol += light->color[0] * diffuse;
-                }
-                break;
-            default: _assert_(0);
-        }
-    }
-    else { // spec and spot
-        Vec3 ldir = light->pos - pos;
-        float attn;
+	if (!(chan.attnfunc & 1))
+	{
+		// atten disabled
+		switch (chan.diffusefunc)
+		{
+			case LIGHTDIF_NONE:
+				lightCol += light->color[0];
+				break;
+			case LIGHTDIF_SIGN:
+				{
+					Vec3 ldir = (light->pos - pos).normalized();
+					float diffuse = ldir * normal;
+					lightCol += light->color[0] * diffuse;
+				}
+				break;
+			case LIGHTDIF_CLAMP:
+				{
+					Vec3 ldir = (light->pos - pos).normalized();
+					float diffuse = max(0.0f, ldir * normal);
+					lightCol += light->color[0] * diffuse;
+				}
+				break;
+			default: _assert_(0);
+		}
+	}
+	else // spec and spot
+	{
+		Vec3 ldir = light->pos - pos;
+		float attn;
 
-        if (chan.attnfunc == 3) { // spot
-            float dist2 = ldir.length2();
-            float dist = sqrtf(dist2);
-            ldir = ldir / dist;
-            attn = max(0.0f, ldir * light->dir);
+		if (chan.attnfunc == 3) // spot
+		{
+			float dist2 = ldir.length2();
+			float dist = sqrtf(dist2);
+			ldir = ldir / dist;
+			attn = max(0.0f, ldir * light->dir);
 
-            float cosAtt = light->cosatt.x + (light->cosatt.y * attn) + (light->cosatt.z * attn * attn);
-            float distAtt = light->distatt.x + (light->distatt.y * dist) + (light->distatt.z * dist2);
-            attn = SafeDivide(max(0.0f, cosAtt), distAtt);
-        }
-        else /* if (chan.attnfunc == 1) */ { // specular
-            // donko - what is going on here?  655.36 is a guess but seems about right.
-            attn = (light->pos * normal) > -655.36 ? max(0.0f, (light->dir * normal)) : 0;
-            ldir.set(1.0f, attn, attn * attn);
+			float cosAtt = light->cosatt.x + (light->cosatt.y * attn) + (light->cosatt.z * attn * attn);
+			float distAtt = light->distatt.x + (light->distatt.y * dist) + (light->distatt.z * dist2);
+			attn = SafeDivide(max(0.0f, cosAtt), distAtt);
+		}
+		else /* if (chan.attnfunc == 1) */ // specular
+		{
+			// donko - what is going on here?  655.36 is a guess but seems about right.
+			attn = (light->pos * normal) > -655.36 ? max(0.0f, (light->dir * normal)) : 0;
+			ldir.set(1.0f, attn, attn * attn);
 
-            float cosAtt = light->cosatt * ldir;
-            float distAtt = light->distatt * ldir;
-            attn = SafeDivide(max(0.0f, cosAtt), distAtt);
-        }
+			float cosAtt = light->cosatt * ldir;
+			float distAtt = light->distatt * ldir;
+			attn = SafeDivide(max(0.0f, cosAtt), distAtt);
+		}
 
-        switch (chan.diffusefunc) {
-            case LIGHTDIF_NONE:
-                lightCol += light->color[0] * attn;
-                break;
-            case LIGHTDIF_SIGN:
-                {
-                    float difAttn = ldir * normal;
-                    lightCol += light->color[0] * attn * difAttn;
-                }
-                break;
+		switch (chan.diffusefunc)
+		{
+			case LIGHTDIF_NONE:
+				lightCol += light->color[0] * attn;
+				break;
+			case LIGHTDIF_SIGN:
+				{
+					float difAttn = ldir * normal;
+					lightCol += light->color[0] * attn * difAttn;
+				}
+				break;
 
-            case LIGHTDIF_CLAMP:
-                {
-                    float difAttn = max(0.0f, ldir * normal);
-                    lightCol += light->color[0] * attn * difAttn;
-                }
-                break;
-            default: _assert_(0);
-        }
-    }
+			case LIGHTDIF_CLAMP:
+				{
+					float difAttn = max(0.0f, ldir * normal);
+					lightCol += light->color[0] * attn * difAttn;
+				}
+				break;
+			default: _assert_(0);
+		}
+	}
 }
 
 void TransformColor(const InputVertexData *src, OutputVertexData *dst)
 {
-    for (u32 chan = 0; chan < swxfregs.nNumChans; chan++)
-    {
-        // abgr
-        u8 matcolor[4];
-        u8 chancolor[4];
+	for (u32 chan = 0; chan < swxfregs.nNumChans; chan++)
+	{
+		// abgr
+		u8 matcolor[4];
+		u8 chancolor[4];
 
-        // color
-        LitChannel &colorchan = swxfregs.color[chan];
-        if (colorchan.matsource)
-            *(u32*)matcolor = *(u32*)src->color[chan];  // vertex
-        else
-            *(u32*)matcolor = swxfregs.matColor[chan];
+		// color
+		LitChannel &colorchan = swxfregs.color[chan];
+		if (colorchan.matsource)
+			*(u32*)matcolor = *(u32*)src->color[chan];  // vertex
+		else
+			*(u32*)matcolor = swxfregs.matColor[chan];
 
-        if (colorchan.enablelighting)
-        {
-            Vec3 lightCol;
-            if (colorchan.ambsource)
-            {
-                // vertex
-                lightCol.x = src->color[chan][1];
-                lightCol.y = src->color[chan][2];
-                lightCol.z = src->color[chan][3];
-            }
-            else
-            {
-                u8 *ambColor = (u8*)&swxfregs.ambColor[chan];
-                lightCol.x = ambColor[1];
-                lightCol.y = ambColor[2];
-                lightCol.z = ambColor[3];
-            }
+		if (colorchan.enablelighting)
+		{
+			Vec3 lightCol;
+			if (colorchan.ambsource)
+			{
+				// vertex
+				lightCol.x = src->color[chan][1];
+				lightCol.y = src->color[chan][2];
+				lightCol.z = src->color[chan][3];
+			}
+			else
+			{
+				u8 *ambColor = (u8*)&swxfregs.ambColor[chan];
+				lightCol.x = ambColor[1];
+				lightCol.y = ambColor[2];
+				lightCol.z = ambColor[3];
+			}
 
-            u8 mask = colorchan.GetFullLightMask();
-            for (int i = 0; i < 8; ++i) {
-                if (mask&(1<<i))
-                    LightColor(dst->mvPosition, dst->normal[0], i, colorchan, lightCol);
-            }
+			u8 mask = colorchan.GetFullLightMask();
+			for (int i = 0; i < 8; ++i)
+			{
+				if (mask&(1<<i))
+					LightColor(dst->mvPosition, dst->normal[0], i, colorchan, lightCol);
+			}
 
-            float inv = 1.0f / 255.0f;
-            chancolor[1] = (u8)(matcolor[1] * Clamp(lightCol.x * inv, 0.0f, 1.0f));
-            chancolor[2] = (u8)(matcolor[2] * Clamp(lightCol.y * inv, 0.0f, 1.0f));
-            chancolor[3] = (u8)(matcolor[3] * Clamp(lightCol.z * inv, 0.0f, 1.0f));
-        }
-        else
-        {
-            *(u32*)chancolor = *(u32*)matcolor;
-        }
+			float inv = 1.0f / 255.0f;
+			chancolor[1] = (u8)(matcolor[1] * Clamp(lightCol.x * inv, 0.0f, 1.0f));
+			chancolor[2] = (u8)(matcolor[2] * Clamp(lightCol.y * inv, 0.0f, 1.0f));
+			chancolor[3] = (u8)(matcolor[3] * Clamp(lightCol.z * inv, 0.0f, 1.0f));
+		}
+		else
+		{
+			*(u32*)chancolor = *(u32*)matcolor;
+		}
 
-        // alpha
-        LitChannel &alphachan = swxfregs.alpha[chan];
-        if (alphachan.matsource)
-            matcolor[0] = src->color[chan][0];  // vertex
-        else
-            matcolor[0] = swxfregs.matColor[chan] & 0xff;
+		// alpha
+		LitChannel &alphachan = swxfregs.alpha[chan];
+		if (alphachan.matsource)
+			matcolor[0] = src->color[chan][0];  // vertex
+		else
+			matcolor[0] = swxfregs.matColor[chan] & 0xff;
 
-        if (swxfregs.alpha[chan].enablelighting)
-        {
-            float lightCol;
-            if (alphachan.ambsource)
-                lightCol = src->color[chan][0]; // vertex
-            else
-                lightCol = (float)(swxfregs.ambColor[chan] & 0xff);
+		if (swxfregs.alpha[chan].enablelighting)
+		{
+			float lightCol;
+			if (alphachan.ambsource)
+				lightCol = src->color[chan][0]; // vertex
+			else
+				lightCol = (float)(swxfregs.ambColor[chan] & 0xff);
 
-            u8 mask = alphachan.GetFullLightMask();
-            for (int i = 0; i < 8; ++i) {
-                if (mask&(1<<i))
-                    LightAlpha(dst->mvPosition, dst->normal[0], i, alphachan, lightCol);
-            }
+			u8 mask = alphachan.GetFullLightMask();
+			for (int i = 0; i < 8; ++i)
+			{
+				if (mask&(1<<i))
+					LightAlpha(dst->mvPosition, dst->normal[0], i, alphachan, lightCol);
+			}
 
-            chancolor[0] = (u8)(matcolor[0] * Clamp(lightCol / 255.0f, 0.0f, 1.0f));
-        }
-        else
-        {
-            chancolor[0] = matcolor[0];
-        }
+			chancolor[0] = (u8)(matcolor[0] * Clamp(lightCol / 255.0f, 0.0f, 1.0f));
+		}
+		else
+		{
+			chancolor[0] = matcolor[0];
+		}
 
-        // abgr -> rgba
-        *(u32*)dst->color[chan] = Common::swap32(*(u32*)chancolor);
-    }
+		// abgr -> rgba
+		*(u32*)dst->color[chan] = Common::swap32(*(u32*)chancolor);
+	}
 }
 
 void TransformTexCoord(const InputVertexData *src, OutputVertexData *dst, bool specialCase)
 {
-    for (u32 coordNum = 0; coordNum < swxfregs.numTexGens; coordNum++)
-    {
-        const TexMtxInfo &texinfo = swxfregs.texMtxInfo[coordNum];
+	for (u32 coordNum = 0; coordNum < swxfregs.numTexGens; coordNum++)
+	{
+		const TexMtxInfo &texinfo = swxfregs.texMtxInfo[coordNum];
 
-        switch (texinfo.texgentype)
-        {
-        case XF_TEXGEN_REGULAR:
-            TransformTexCoordRegular(texinfo, coordNum, specialCase, src, dst);
-            break;
-        case XF_TEXGEN_EMBOSS_MAP:
-            {
-                const LightPointer *light = (const LightPointer*)&swxfregs.lights[0x10*texinfo.embosslightshift];
+		switch (texinfo.texgentype)
+		{
+		case XF_TEXGEN_REGULAR:
+			TransformTexCoordRegular(texinfo, coordNum, specialCase, src, dst);
+			break;
+		case XF_TEXGEN_EMBOSS_MAP:
+			{
+				const LightPointer *light = (const LightPointer*)&swxfregs.lights[0x10*texinfo.embosslightshift];
 
-                Vec3 ldir = (light->pos - dst->mvPosition).normalized();
-                float d1 = ldir * dst->normal[1];
-                float d2 = ldir * dst->normal[2];
+				Vec3 ldir = (light->pos - dst->mvPosition).normalized();
+				float d1 = ldir * dst->normal[1];
+				float d2 = ldir * dst->normal[2];
 
-                dst->texCoords[coordNum].x = dst->texCoords[texinfo.embosssourceshift].x + d1;
-                dst->texCoords[coordNum].y = dst->texCoords[texinfo.embosssourceshift].y + d2;
-                dst->texCoords[coordNum].z = dst->texCoords[texinfo.embosssourceshift].z;
-            }
-            break;
-        case XF_TEXGEN_COLOR_STRGBC0:
-            _assert_(texinfo.sourcerow == XF_SRCCOLORS_INROW);
-            _assert_(texinfo.inputform == XF_TEXINPUT_AB11);
-            dst->texCoords[coordNum].x = (float)dst->color[0][0] / 255.0f;
-            dst->texCoords[coordNum].y = (float)dst->color[0][1] / 255.0f;
-            dst->texCoords[coordNum].z = 1.0f;
-            break;
-        case XF_TEXGEN_COLOR_STRGBC1:
-            _assert_(texinfo.sourcerow == XF_SRCCOLORS_INROW);
-            _assert_(texinfo.inputform == XF_TEXINPUT_AB11);
-            dst->texCoords[coordNum].x = (float)dst->color[1][0] / 255.0f;
-            dst->texCoords[coordNum].y = (float)dst->color[1][1] / 255.0f;
-            dst->texCoords[coordNum].z = 1.0f;
-            break;
-        default:
-            ERROR_LOG(VIDEO, "Bad tex gen type %i", texinfo.texgentype);
-        }
-    }
+				dst->texCoords[coordNum].x = dst->texCoords[texinfo.embosssourceshift].x + d1;
+				dst->texCoords[coordNum].y = dst->texCoords[texinfo.embosssourceshift].y + d2;
+				dst->texCoords[coordNum].z = dst->texCoords[texinfo.embosssourceshift].z;
+			}
+			break;
+		case XF_TEXGEN_COLOR_STRGBC0:
+			_assert_(texinfo.sourcerow == XF_SRCCOLORS_INROW);
+			_assert_(texinfo.inputform == XF_TEXINPUT_AB11);
+			dst->texCoords[coordNum].x = (float)dst->color[0][0] / 255.0f;
+			dst->texCoords[coordNum].y = (float)dst->color[0][1] / 255.0f;
+			dst->texCoords[coordNum].z = 1.0f;
+			break;
+		case XF_TEXGEN_COLOR_STRGBC1:
+			_assert_(texinfo.sourcerow == XF_SRCCOLORS_INROW);
+			_assert_(texinfo.inputform == XF_TEXINPUT_AB11);
+			dst->texCoords[coordNum].x = (float)dst->color[1][0] / 255.0f;
+			dst->texCoords[coordNum].y = (float)dst->color[1][1] / 255.0f;
+			dst->texCoords[coordNum].z = 1.0f;
+			break;
+		default:
+			ERROR_LOG(VIDEO, "Bad tex gen type %i", texinfo.texgentype);
+		}
+	}
 
 	for (u32 coordNum = 0; coordNum < swxfregs.numTexGens; coordNum++)
-    {
+	{
 		dst->texCoords[coordNum][0] *= (bpmem.texcoords[coordNum].s.scale_minus_1 + 1);
 		dst->texCoords[coordNum][1] *= (bpmem.texcoords[coordNum].t.scale_minus_1 + 1);
 	}
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/TransformUnit.h b/Source/Plugins/Plugin_VideoSoftware/Src/TransformUnit.h
index d5085e5728..974e44372d 100644
--- a/Source/Plugins/Plugin_VideoSoftware/Src/TransformUnit.h
+++ b/Source/Plugins/Plugin_VideoSoftware/Src/TransformUnit.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _TRANSFORM_UNIT_H_
 #define _TRANSFORM_UNIT_H_
@@ -23,15 +10,15 @@ struct OutputVertexData;
 
 namespace TransformUnit
 {
-    void MultiplyVec2Mat24(const float *vec, const float *mat, float *result);
-    void MultiplyVec2Mat34(const float *vec, const float *mat, float *result);
-    void MultiplyVec3Mat33(const float *vec, const float *mat, float *result);
-    void MultiplyVec3Mat34(const float *vec, const float *mat, float *result);
+	void MultiplyVec2Mat24(const float *vec, const float *mat, float *result);
+	void MultiplyVec2Mat34(const float *vec, const float *mat, float *result);
+	void MultiplyVec3Mat33(const float *vec, const float *mat, float *result);
+	void MultiplyVec3Mat34(const float *vec, const float *mat, float *result);
 
-    void TransformPosition(const InputVertexData *src, OutputVertexData *dst);
-    void TransformNormal(const InputVertexData *src, bool nbt, OutputVertexData *dst);
-    void TransformColor(const InputVertexData *src, OutputVertexData *dst);
-    void TransformTexCoord(const InputVertexData *src, OutputVertexData *dst, bool specialCase);
+	void TransformPosition(const InputVertexData *src, OutputVertexData *dst);
+	void TransformNormal(const InputVertexData *src, bool nbt, OutputVertexData *dst);
+	void TransformColor(const InputVertexData *src, OutputVertexData *dst);
+	void TransformTexCoord(const InputVertexData *src, OutputVertexData *dst, bool specialCase);
 }
 
 #endif
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/Vec3.h b/Source/Plugins/Plugin_VideoSoftware/Src/Vec3.h
index 80460edd60..d4b1502dcb 100644
--- a/Source/Plugins/Plugin_VideoSoftware/Src/Vec3.h
+++ b/Source/Plugins/Plugin_VideoSoftware/Src/Vec3.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _VEC3_H
 #define _VEC3_H
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp
index e7122d2f71..5f1f4aa2df 100644
--- a/Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp
+++ b/Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "VideoConfigDiag.h"
 #include "VideoConfigDialog.h"
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.h b/Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.h
index f9236fab50..a4ebedae62 100644
--- a/Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.h
+++ b/Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _VIDEOSOFTWARE_CONFIG_DIAG_H_
 #define _VIDEOSOFTWARE_CONFIG_DIAG_H_
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/XFMemLoader.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/XFMemLoader.cpp
index 081967a484..4580bafad8 100644
--- a/Source/Plugins/Plugin_VideoSoftware/Src/XFMemLoader.cpp
+++ b/Source/Plugins/Plugin_VideoSoftware/Src/XFMemLoader.cpp
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "VideoCommon.h"
 
@@ -26,15 +13,15 @@ XFRegisters swxfregs;
 
 void InitXFMemory()
 {
-    memset(&swxfregs, 0, sizeof(swxfregs));
+	memset(&swxfregs, 0, sizeof(swxfregs));
 }
 
 void XFWritten(u32 transferSize, u32 baseAddress)
 {
-    u32 topAddress = baseAddress + transferSize;
+	u32 topAddress = baseAddress + transferSize;
 
-    if (baseAddress <= 0x1026 && topAddress >= 0x1020)
-        Clipper::SetViewOffset();
+	if (baseAddress <= 0x1026 && topAddress >= 0x1020)
+		Clipper::SetViewOffset();
 
 	// fix lights so invalid values don't trash the lighting computations	
 	if (baseAddress <= 0x067f && topAddress >= 0x0604)
@@ -63,32 +50,32 @@ void XFWritten(u32 transferSize, u32 baseAddress)
 
 void SWLoadXFReg(u32 transferSize, u32 baseAddress, u32 *pData)
 {
-    u32 size = transferSize;
+	u32 size = transferSize;
 
-    // do not allow writes past registers
-    if (baseAddress + transferSize > 0x1058)
-    {
-        INFO_LOG(VIDEO, "xf load exceeds address space: %x %d bytes\n", baseAddress, transferSize);
+	// do not allow writes past registers
+	if (baseAddress + transferSize > 0x1058)
+	{
+		INFO_LOG(VIDEO, "xf load exceeds address space: %x %d bytes\n", baseAddress, transferSize);
 
-        if (baseAddress >= 0x1058)
-            size = 0;
-        else
-            size = 0x1058 - baseAddress;
-    }
-
-    if (size > 0) {
-        memcpy_gc( &((u32*)&swxfregs)[baseAddress], pData, size * 4);
-        XFWritten(transferSize, baseAddress);
-    }
+		if (baseAddress >= 0x1058)
+			size = 0;
+		else
+			size = 0x1058 - baseAddress;
+	}
 
+	if (size > 0)
+	{
+		memcpy_gc( &((u32*)&swxfregs)[baseAddress], pData, size * 4);
+		XFWritten(transferSize, baseAddress);
+	}
 }
 
 void SWLoadIndexedXF(u32 val, int array)
 {
-    int index = val >> 16;
-    int address = val & 0xFFF; //check mask
-    int size = ((val >> 12) & 0xF) + 1;
-    //load stuff from array to address in xf mem
+	int index = val >> 16;
+	int address = val & 0xFFF; //check mask
+	int size = ((val >> 12) & 0xF) + 1;
+	//load stuff from array to address in xf mem
 
 	u32 *pData = (u32*)Memory::GetPointer(arraybases[array] + arraystrides[array]*index);
 
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/XFMemLoader.h b/Source/Plugins/Plugin_VideoSoftware/Src/XFMemLoader.h
index 86e8e6c9d8..75e05110bf 100644
--- a/Source/Plugins/Plugin_VideoSoftware/Src/XFMemLoader.h
+++ b/Source/Plugins/Plugin_VideoSoftware/Src/XFMemLoader.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _XFMEMLOADER_H_
 #define _XFMEMLOADER_H_
@@ -31,49 +18,49 @@
 #define XF_TEXINPUT_AB11 0
 #define XF_TEXINPUT_ABC1 1
 
-#define XF_TEXGEN_REGULAR 0
-#define XF_TEXGEN_EMBOSS_MAP 1 // used when bump mapping
+#define XF_TEXGEN_REGULAR       0
+#define XF_TEXGEN_EMBOSS_MAP    1 // used when bump mapping
 #define XF_TEXGEN_COLOR_STRGBC0 2
 #define XF_TEXGEN_COLOR_STRGBC1 3
 
-#define XF_SRCGEOM_INROW 0 // input is abc
-#define XF_SRCNORMAL_INROW 1 // input is abc
-#define XF_SRCCOLORS_INROW 2
+#define XF_SRCGEOM_INROW       0 // input is abc
+#define XF_SRCNORMAL_INROW     1 // input is abc
+#define XF_SRCCOLORS_INROW     2
 #define XF_SRCBINORMAL_T_INROW 3 // input is abc
 #define XF_SRCBINORMAL_B_INROW 4 // input is abc
-#define XF_SRCTEX0_INROW   5
-#define XF_SRCTEX1_INROW   6
-#define XF_SRCTEX2_INROW   7
-#define XF_SRCTEX3_INROW   8
-#define XF_SRCTEX4_INROW   9
-#define XF_SRCTEX5_INROW   10
-#define XF_SRCTEX6_INROW   11
-#define XF_SRCTEX7_INROW   12
+#define XF_SRCTEX0_INROW       5
+#define XF_SRCTEX1_INROW       6
+#define XF_SRCTEX2_INROW       7
+#define XF_SRCTEX3_INROW       8
+#define XF_SRCTEX4_INROW       9
+#define XF_SRCTEX5_INROW      10
+#define XF_SRCTEX6_INROW      11
+#define XF_SRCTEX7_INROW      12
 
 #define GX_SRC_REG 0
 #define GX_SRC_VTX 1
 
 struct Light
 {
-    u32 useless[3]; 
-    u32 color;    //rgba
-    float a0;  //attenuation
-    float a1; 
-    float a2; 
-    float k0;  //k stuff
-    float k1; 
-    float k2; 
-    union
-    {
-        struct {
+	u32 useless[3];
+	u32 color;    //rgba
+	float a0;  //attenuation
+	float a1;
+	float a2;
+	float k0;  //k stuff
+	float k1;
+	float k2;
+	union
+	{
+		struct {
 			float dpos[3];
-            float ddir[3]; // specular lights only
-        };
-        struct {
-            float sdir[3];
-            float shalfangle[3]; // specular lights only
-        };
-    };
+			float ddir[3]; // specular lights only
+		};
+		struct {
+			float sdir[3];
+			float shalfangle[3]; // specular lights only
+		};
+	};
 };
 
 #define LIGHTDIF_NONE  0
@@ -83,74 +70,74 @@ struct Light
 #define LIGHTATTN_SPEC 0 // specular attenuation
 #define LIGHTATTN_SPOT 1 // distance/spotlight attenuation
 #define LIGHTATTN_NONE 2
-#define LIGHTATTN_DIR 3
+#define LIGHTATTN_DIR  3
 
 #define GX_PERSPECTIVE  0
 #define GX_ORTHOGRAPHIC 1
 
 union LitChannel
 {
-    struct
-    {
-        u32 matsource      : 1;
-        u32 enablelighting : 1;
-        u32 lightMask0_3   : 4;
-        u32 ambsource      : 1;
-        u32 diffusefunc    : 2; // LIGHTDIF_X
-        u32 attnfunc       : 2; // LIGHTATTN_X
-        u32 lightMask4_7   : 4;
-        u32 unused         : 17;
-    };
-    u32 hex;
-    unsigned int GetFullLightMask() const
-    {
-        return enablelighting ? (lightMask0_3 | (lightMask4_7 << 4)) : 0;
-    }
+	struct
+	{
+		u32 matsource      : 1;
+		u32 enablelighting : 1;
+		u32 lightMask0_3   : 4;
+		u32 ambsource      : 1;
+		u32 diffusefunc    : 2; // LIGHTDIF_X
+		u32 attnfunc       : 2; // LIGHTATTN_X
+		u32 lightMask4_7   : 4;
+		u32 unused         : 17;
+	};
+	u32 hex;
+	unsigned int GetFullLightMask() const
+	{
+		return enablelighting ? (lightMask0_3 | (lightMask4_7 << 4)) : 0;
+	}
 };
 
 union INVTXSPEC
 {
-    struct
-    {
-        u32 numcolors : 2;
-        u32 numnormals : 2; // 0 - nothing, 1 - just normal, 2 - normals and binormals
-        u32 numtextures : 4;
-        u32 unused : 24;
-    };
-    u32 hex;
+	struct
+	{
+		u32 numcolors : 2;
+		u32 numnormals : 2; // 0 - nothing, 1 - just normal, 2 - normals and binormals
+		u32 numtextures : 4;
+		u32 unused : 24;
+	};
+	u32 hex;
 };
 
 union TXFMatrixIndexA
 {
-    struct
-    {
-        u32 PosNormalMtxIdx : 6;
-        u32 Tex0MtxIdx : 6;
-        u32 Tex1MtxIdx : 6;
-        u32 Tex2MtxIdx : 6;
-        u32 Tex3MtxIdx : 6;
-    };
-    struct
-    {
-        u32 Hex : 30;
-        u32 unused : 2;
-    };
+	struct
+	{
+		u32 PosNormalMtxIdx : 6;
+		u32 Tex0MtxIdx : 6;
+		u32 Tex1MtxIdx : 6;
+		u32 Tex2MtxIdx : 6;
+		u32 Tex3MtxIdx : 6;
+	};
+	struct
+	{
+		u32 Hex : 30;
+		u32 unused : 2;
+	};
 };
 
 union TXFMatrixIndexB
 {
-    struct
-    {
-        u32 Tex4MtxIdx : 6;
-        u32 Tex5MtxIdx : 6;
-        u32 Tex6MtxIdx : 6;
-        u32 Tex7MtxIdx : 6;
-    };
-    struct
-    {
-        u32 Hex : 24;
-        u32 unused : 8;
-    };
+	struct
+	{
+		u32 Tex4MtxIdx : 6;
+		u32 Tex5MtxIdx : 6;
+		u32 Tex6MtxIdx : 6;
+		u32 Tex7MtxIdx : 6;
+	};
+	struct
+	{
+		u32 Hex : 24;
+		u32 unused : 8;
+	};
 };
 
 struct Viewport
@@ -171,68 +158,68 @@ struct Projection
 
 union TexMtxInfo
 {
-    struct 
-    {
-        u32 unknown : 1;
-        u32 projection : 1; // XF_TEXPROJ_X
-        u32 inputform : 2; // XF_TEXINPUT_X
-        u32 texgentype : 3; // XF_TEXGEN_X
-        u32 sourcerow : 5; // XF_SRCGEOM_X
-        u32 embosssourceshift : 3; // what generated texcoord to use
-        u32 embosslightshift : 3; // light index that is used
-    };
-    u32 hex;
+	struct 
+	{
+		u32 unknown    : 1;
+		u32 projection : 1; // XF_TEXPROJ_X
+		u32 inputform  : 2; // XF_TEXINPUT_X
+		u32 texgentype : 3; // XF_TEXGEN_X
+		u32 sourcerow  : 5; // XF_SRCGEOM_X
+		u32 embosssourceshift : 3; // what generated texcoord to use
+		u32 embosslightshift  : 3; // light index that is used
+	};
+	u32 hex;
 };
 
 union PostMtxInfo
 {
-    struct 
-    {
-        u32 index : 6; // base row of dual transform matrix
-        u32 unused : 2;
-        u32 normalize : 1; // normalize before send operation
-    };
-    u32 hex;
+	struct 
+	{
+		u32 index : 6; // base row of dual transform matrix
+		u32 unused : 2;
+		u32 normalize : 1; // normalize before send operation
+	};
+	u32 hex;
 };
 
 struct XFRegisters
 {
-    u32 posMatrices[256];           // 0x0000 - 0x00ff
-    u32 unk0[768];                  // 0x0100 - 0x03ff
-    u32 normalMatrices[96];         // 0x0400 - 0x045f
-    u32 unk1[160];                  // 0x0460 - 0x04ff
-    u32 postMatrices[256];          // 0x0500 - 0x05ff
-    u32 lights[128];                // 0x0600 - 0x067f
-    u32 unk2[2432];                 // 0x0680 - 0x0fff
-    u32 error;                      // 0x1000
-    u32 diag;                       // 0x1001
-    u32 state0;                     // 0x1002
-    u32 state1;                     // 0x1003
-    u32 xfClock;                    // 0x1004
-    u32 clipDisable;                // 0x1005
-    u32 perf0;                      // 0x1006
-    u32 perf1;                      // 0x1007
-    INVTXSPEC hostinfo;             // 0x1008 number of textures,colors,normals from vertex input
-    u32 nNumChans;                  // 0x1009
-    u32 ambColor[2];                // 0x100a, 0x100b
-    u32 matColor[2];                // 0x100c, 0x100d
-    LitChannel color[2];            // 0x100e, 0x100f
-    LitChannel alpha[2];            // 0x1010, 0x1011
-    u32 dualTexTrans;               // 0x1012
-    u32 unk3;                       // 0x1013
-    u32 unk4;                       // 0x1014
-    u32 unk5;                       // 0x1015
-    u32 unk6;                       // 0x1016
-    u32 unk7;                       // 0x1017
-    TXFMatrixIndexA MatrixIndexA;   // 0x1018
-    TXFMatrixIndexB MatrixIndexB;   // 0x1019
-    Viewport viewport;              // 0x101a - 0x101f
-    Projection projection;          // 0x1020 - 0x1026
-    u32 unk8[24];                   // 0x1027 - 0x103e
-    u32 numTexGens;                 // 0x103f
-    TexMtxInfo texMtxInfo[8];       // 0x1040 - 0x1047
-    u32 unk9[8];                    // 0x1048 - 0x104f
-    PostMtxInfo postMtxInfo[8];     // 0x1050 - 0x1057
+	u32 posMatrices[256];           // 0x0000 - 0x00ff
+	u32 unk0[768];                  // 0x0100 - 0x03ff
+	u32 normalMatrices[96];         // 0x0400 - 0x045f
+	u32 unk1[160];                  // 0x0460 - 0x04ff
+	u32 postMatrices[256];          // 0x0500 - 0x05ff
+	u32 lights[128];                // 0x0600 - 0x067f
+	u32 unk2[2432];                 // 0x0680 - 0x0fff
+	u32 error;                      // 0x1000
+	u32 diag;                       // 0x1001
+	u32 state0;                     // 0x1002
+	u32 state1;                     // 0x1003
+	u32 xfClock;                    // 0x1004
+	u32 clipDisable;                // 0x1005
+	u32 perf0;                      // 0x1006
+	u32 perf1;                      // 0x1007
+	INVTXSPEC hostinfo;             // 0x1008 number of textures,colors,normals from vertex input
+	u32 nNumChans;                  // 0x1009
+	u32 ambColor[2];                // 0x100a, 0x100b
+	u32 matColor[2];                // 0x100c, 0x100d
+	LitChannel color[2];            // 0x100e, 0x100f
+	LitChannel alpha[2];            // 0x1010, 0x1011
+	u32 dualTexTrans;               // 0x1012
+	u32 unk3;                       // 0x1013
+	u32 unk4;                       // 0x1014
+	u32 unk5;                       // 0x1015
+	u32 unk6;                       // 0x1016
+	u32 unk7;                       // 0x1017
+	TXFMatrixIndexA MatrixIndexA;   // 0x1018
+	TXFMatrixIndexB MatrixIndexB;   // 0x1019
+	Viewport viewport;              // 0x101a - 0x101f
+	Projection projection;          // 0x1020 - 0x1026
+	u32 unk8[24];                   // 0x1027 - 0x103e
+	u32 numTexGens;                 // 0x103f
+	TexMtxInfo texMtxInfo[8];       // 0x1040 - 0x1047
+	u32 unk9[8];                    // 0x1048 - 0x104f
+	PostMtxInfo postMtxInfo[8];     // 0x1050 - 0x1057
 };
 
 #define XFMEM_POSMATRICES        0x000
@@ -249,7 +236,7 @@ extern XFRegisters swxfregs;
 
 void InitXFMemory();
 
-void XFWritten(u32 transferSize, u32 baseAddress); 
+void XFWritten(u32 transferSize, u32 baseAddress);
 
 void SWLoadXFReg(u32 transferSize, u32 baseAddress, u32 *pData);
 
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/stdafx.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/stdafx.cpp
index edc6ada957..b602b39925 100644
--- a/Source/Plugins/Plugin_VideoSoftware/Src/stdafx.cpp
+++ b/Source/Plugins/Plugin_VideoSoftware/Src/stdafx.cpp
@@ -1,18 +1,5 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include "stdafx.h"
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/stdafx.h b/Source/Plugins/Plugin_VideoSoftware/Src/stdafx.h
index 94d032bc31..60f0912113 100644
--- a/Source/Plugins/Plugin_VideoSoftware/Src/stdafx.h
+++ b/Source/Plugins/Plugin_VideoSoftware/Src/stdafx.h
@@ -1,19 +1,6 @@
-// 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/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #pragma once
 #define _WIN32_WINNT 0x501